diff options
106 files changed, 1436 insertions, 687 deletions
diff --git a/experimental/mariadb/APKBUILD b/experimental/mariadb/APKBUILD deleted file mode 100644 index a99de6b25..000000000 --- a/experimental/mariadb/APKBUILD +++ /dev/null @@ -1,110 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=mariadb -pkgver=10.3.12 -pkgrel=0 -pkgdesc="Open source database server" -url="https://mariadb.org/" -arch="all" -options="!checkroot" # Tests must be run as normal user. -license="GPL-2.0-only" -pkgusers="mysql" -pkggroups="mysql" -depends="$pkgname-common" -depends_dev="openssl-dev zlib-dev" -makedepends="$depends_dev byacc cmake curl-dev libarchive-dev libedit-dev - libevent-dev libxml2-dev ncurses-dev pcre-dev xz-dev" -install="$pkgname.pre-install" -subpackages="$pkgname-doc $pkgname-openrc" -source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz - mariadb.initd - " - -build() { - cd "$builddir" - if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" - fi - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -DNDEBUG" \ - -DCMAKE_C_FLAGS="$CFLAGS -DNDEBUG" \ - -DMYSQL_DATADIR="/var/lib/mysql" \ - -DSYSCONFDIR="/etc/mysql" \ - -DINSTALL_BINDIR=bin \ - -DINSTALL_DOCDIR=share/doc/$pkgname-$pkgver \ - -DINSTALL_DOCREADMEDIR=share/doc/$pkgname-$pkgver \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_LIBDIR=lib \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mariadb \ - -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ - -DINSTALL_SCRIPTDIR=share/mariadb/scripts \ - -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SUPPORTFILESDIR="/usr/share/mariadb" \ - -DWITH_COMMENT="${DISTRO_NAME:-Adélie Linux}" \ - -DWITH_UNIT_TESTS=ON \ - -DWITH_LIBEDIT=1 \ - -DWITH_ZLIB=system \ - -DWITHOUT_LIBWRAP=1 \ - -DENABLED_LOCAL_INFILE=1 \ - -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \ - -DINSTALL_UNIX_ADDRDIR="/var/run/mysqld/mysqld.sock" \ - -DWITH_DEFAULT_COMPILER_OPTIONS=0 \ - -DWITH_DEFAULT_FEATURE_SET=0 \ - -DPKG_CONFIG_EXECUTABLE="/usr/bin/pkgconf" \ - -DPLUGIN_AUTH_GSSAPI=NO \ - -DAUTH_GSSAPI_PLUGIN_TYPE=OFF \ - -DCONC_WITH_EXTERNAL_ZLIB=YES \ - -DWITH_EXTERNAL_ZLIB=YES \ - -DSUFFIX_INSTALL_DIR="" \ - -DWITH_UNITTEST=OFF \ - -DCONNECT_WITH_MYSQL=ON \ - -DCONNECT_WITH_LIBXML2=system \ - -DCONNECT_WITH_ODBC=NO \ - -DCONNECT_WITH_JDBC=NO \ - -DPLUGIN_ARCHIVE=YES \ - -DPLUGIN_ARIA=YES \ - -DPLUGIN_BLACKHOLE=YES \ - -DPLUGIN_CASSANDRA=NO \ - -DPLUGIN_CSV=YES \ - -DPLUGIN_MYISAM=YES \ - -DWITH_ASAN=OFF \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNODB_BZIP2=OFF \ - -DWITH_INNODB_LZ4=OFF \ - -DWITH_INNODB_LZMA=ON \ - -DWITH_INNODB_LZO=OFF \ - -DWITH_INNODB_SNAPPY=OFF \ - -DWITH_JEMALLOC=NO \ - -DWITH_LIBARCHIVE=system \ - -DWITH_LIBNUMA=NO \ - -DWITH_LIBWRAP=OFF \ - -DWITH_LIBWSEP=OFF \ - -DWITH_MARIABACKUP=ON \ - -DWITH_PCRE=system \ - -DWITH_SYSTEMD=no \ - -DWITH_SSL=system \ - -DWITH_VALGRIND=OFF \ - -DWITH_ZLIB=system \ - -DSKIP_TESTS=ON - ${CMAKE_CROSSOPTS} - make -} - -check() { - cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - install -m644 -D "$srcdir"/mariadb.initd "$pkgdir"/etc/init.d/mariadb - rm -r "$pkgdir"/usr/mysql-test -} - -sha512sums="9dd2939684c4591db306be6afb34663626dfaae133f88dd31125c759dce16b9e9d767a9254e30d9ee5fa2ea027e223dd4799effba8a8b0e4638d5de9e2512003 mariadb-10.3.12.tar.gz -06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd" diff --git a/experimental/mariadb/mariadb.initd b/experimental/mariadb/mariadb.initd deleted file mode 100644 index 143ca8ff5..000000000 --- a/experimental/mariadb/mariadb.initd +++ /dev/null @@ -1,40 +0,0 @@ -#!/sbin/openrc-run - -getconf() { - v=$(my_print_defaults --mysqld | grep ^--$1) - [ -z $v ] && echo $2 || echo ${v#*=} -} - -retry="60" -extra_stopped_commands="setup" -command="/usr/bin/mysqld_safe" -command_args="--syslog --nowatch" -depend() { - use net - need localmount -} - -setup() { - ebegin "Creating a new MySQL database" - mysql_install_db --user=mysql --rpm - eend $? -} - -start_pre() { - pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid") - command_args="$command_args --pid-file=$pidfile" - required_dirs=$(getconf datadir "/var/lib/mysql") - if [ ! -d $required_dirs/mysql ]; then - eerror "Datadir '$required_dirs' is empty or invalid." - eerror "Run '/etc/init.d/mariadb setup' to create new database." - fi -} - -start_post() { - ewaitfile 10 $(getconf socket "/run/mysqld/mysqld.sock") -} - -stop_pre() { - pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid") -} - diff --git a/experimental/mariadb/mariadb.pre-install b/experimental/mariadb/mariadb.pre-install deleted file mode 100644 index ec71275ca..000000000 --- a/experimental/mariadb/mariadb.pre-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -groupadd -g 60 -r mysql -useradd -u 60 -c "MariaDB Database User" -d /var/lib/mysql -M -N -G mysql -r -s /sbin/nologin mysql diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index 78478e51e..86a15d28a 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=apk-tools -pkgver=2.10.3 -pkgrel=2 +pkgver=2.10.4 +pkgrel=0 pkgdesc="Alpine Package Keeper - package manager" url="https://git.alpinelinux.org/cgit/apk-tools/" arch="all" @@ -13,9 +13,9 @@ makedepends_host="zlib-dev openssl openssl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" subpackages="$pkgname-static" source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz - deep.patch - list.patch pmmx.patch + search.patch + virtual.patch " prepare() { @@ -69,7 +69,7 @@ static() { "$subpkgdir"/sbin/apk.static } -sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz -059f0368b096c53357db567bf720f049cf19a88dbf10dc2496a739dfe332a6487b87f07056d7cf6f0c8a385782821547d4aba8c393591c4070838f1c98819dda deep.patch -53d446734d32341cbd9ca00aedcd65d4d99220da354a9339837a6c79609a321f61ae917fb3cd9d4bffebcfc171d06c0f0d315e29a2d16285545c4fa085a75639 list.patch -746d00ce2af554a25db7ecea2b0a4d8f7399d2560efb6bf59ea144012d0163d3e0bad84c799bd706e8be6c0a543d4e35728d6beb269fddbbea626384009129cb pmmx.patch" +sha512sums="d2d9fde0aae9059236f68a3fc2f2186104bb9a099b15d296a6202a20ab2912638f10bb3b9edb70f359d060c5839573c3d50ef37d13095fa01c66dc3219ab6e39 apk-tools-2.10.4.tar.xz +78f863c83af8b245aa38416c47016bcbe95ea8e33802123f6ea54b3752eb3c1ee79e5d6fc76ddedd2fba522b82a7367837f4596321085d54397b27fd5edf3b2f pmmx.patch +5ac09eadabe44fe05c952c25df8f6daca292c63e6e5e3481d57603b8b3f1980385ccd87ad4a87b617353d1f936591afb9ee8815e4d8ec3e33913be2b3e3a3f84 search.patch +4e2a8db82e6e40ae4863d12ee55151468d6e8c383e2e2001015f469e07f47057bc9055ab52a4a04f2bffa41ec225f77a9bd6042d5e1fcbd2908d7393e3aed2a1 virtual.patch" diff --git a/system/apk-tools/deep.patch b/system/apk-tools/deep.patch deleted file mode 100644 index b9e361717..000000000 --- a/system/apk-tools/deep.patch +++ /dev/null @@ -1,50 +0,0 @@ -From b0be9f610c02bb2d5e681a3904940d311e9de298 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Mon, 3 Jun 2019 14:53:46 +0300 -Subject: solver: fix common dependency merging to inherit pinning and flags - -Notably this fixes occasional issues when doing upgrade with multiple -versions of same packages. Without this the upgrade flag is not always -propagated properly down the dependency chain. ---- - src/solver.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/solver.c b/src/solver.c -index e10cf8b..2121dd9 100644 ---- a/src/solver.c -+++ b/src/solver.c -@@ -462,6 +462,8 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name) - name->name, name0->name); - name0->ss.requirers++; - name_requirers_changed(ss, name0); -+ foreach_array_item(p, name0->providers) -+ inherit_pinning_and_flags(ss, p->pkg, pkg); - } - } - } -@@ -510,7 +512,6 @@ static int compare_providers(struct apk_solver_state *ss, - unsigned int solver_flags; - int r; - -- - /* Prefer existing package */ - if (pkgA == NULL || pkgB == NULL) - return (pkgA != NULL) - (pkgB != NULL); -@@ -675,8 +676,11 @@ static void select_package(struct apk_solver_state *ss, struct apk_name *name) - - if (name->ss.requirers || name->ss.has_iif) { - foreach_array_item(p, name->providers) { -- dbg_printf(" consider "PKG_VER_FMT" iif_triggered=%d, tag_ok=%d, selectable=%d, provider_priority=%d, installed=%d\n", -- PKG_VER_PRINTF(p->pkg), p->pkg->ss.iif_triggered, p->pkg->ss.tag_ok, p->pkg->ss.pkg_selectable, -+ dbg_printf(" consider "PKG_VER_FMT" iif_triggered=%d, tag_ok=%d, selectable=%d, available=%d, flags=0x%x, provider_priority=%d, installed=%d\n", -+ PKG_VER_PRINTF(p->pkg), -+ p->pkg->ss.iif_triggered, p->pkg->ss.tag_ok, -+ p->pkg->ss.pkg_selectable, p->pkg->ss.pkg_available, -+ p->pkg->ss.solver_flags, - p->pkg->provider_priority, p->pkg->ipkg != NULL); - /* Ensure valid pinning and install-if trigger */ - if (name->ss.requirers == 0 && --- -cgit v1.2.1 - diff --git a/system/apk-tools/list.patch b/system/apk-tools/list.patch deleted file mode 100644 index 9692c0c8c..000000000 --- a/system/apk-tools/list.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/list.c b/src/list.c -index e285e3f..dcbaeea 100644 ---- a/src/list.c -+++ b/src/list.c -@@ -61,7 +61,7 @@ static int is_orphaned(const struct apk_name *name) - /* repo 1 is always installed-db, so if other bits are set it means the package is available somewhere - * (either cache or in a proper repo) - */ -- return (repos & ~BIT(1)) == 0; -+ return (repos & ~BIT(0)) == 0; - } - - /* returns the currently installed package if there is a newer package that satisfies `name` */ -@@ -144,7 +144,7 @@ static void filter_package(const struct apk_package *pkg, const struct list_ctx - if (ctx->orphaned && !is_orphaned(pkg->name)) - return; - -- if (ctx->available && pkg->repos == BIT(1)) -+ if (ctx->available && pkg->repos == BIT(0)) - return; - - if (ctx->upgradable && !is_upgradable(pkg->name, pkg)) -0001-list-Detect-orphaned-packages-correctly.patch -0001-list-Detect-orphaned-packages-correctly.patch diff --git a/system/apk-tools/pmmx.patch b/system/apk-tools/pmmx.patch index 1b19edc94..e64ad6c0d 100644 --- a/system/apk-tools/pmmx.patch +++ b/system/apk-tools/pmmx.patch @@ -1,6 +1,6 @@ --- apk-tools-2.10.1/src/apk_defines.h.old 2018-09-10 08:04:03.000000000 +0000 +++ apk-tools-2.10.1/src/apk_defines.h 2019-01-04 03:31:41.900000000 +0000 -@@ -88,7 +88,7 @@ +@@ -89,7 +89,7 @@ #if defined(__x86_64__) #define APK_DEFAULT_ARCH "x86_64" #elif defined(__i386__) diff --git a/system/apk-tools/search.patch b/system/apk-tools/search.patch new file mode 100644 index 000000000..1c652356f --- /dev/null +++ b/system/apk-tools/search.patch @@ -0,0 +1,29 @@ +From 530a6e6847657aa9187acd187269ac25f7cdd932 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Tue, 9 Jul 2019 00:40:15 -0500 +Subject: [PATCH] search: Show in "simple" help output + +Most users probably want to know about the 'search' applet. + +Omission from 'apk --help' output reported by fungalnet[1]. + +[1]: https://www.reddit.com/r/AdelieLinux/comments/c8mtk9/apk_search/ +--- + src/search.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/search.c b/src/search.c +index 9a71747..0b00a3b 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -209,6 +209,7 @@ static struct apk_applet apk_search = { + .help = "Search package by PATTERNs or by indexed dependencies", + .arguments = "PATTERN", + .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE, ++ .command_groups = APK_COMMAND_GROUP_QUERY, + .context_size = sizeof(struct search_ctx), + .optgroups = { &optgroup_global, &optgroup_applet }, + .main = search_main, +-- +2.22.0 + diff --git a/system/apk-tools/virtual.patch b/system/apk-tools/virtual.patch new file mode 100644 index 000000000..31e6d6807 --- /dev/null +++ b/system/apk-tools/virtual.patch @@ -0,0 +1,109 @@ +From b45415b1096e76f40b32326d2798123f81fe5976 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Tue, 2 Jul 2019 15:27:57 +0300 +Subject: [PATCH 1/2] add: fix virtual package id generation + +Fixes 37fbafcd by adding more input to the hash than just second +grained time stamp - collisions would happen when running apk +scripted. + +For virtual package the hash works only as unique identifier, so +try to add elements that should make it unique in most cases. + +Fixes #10648 +--- + src/add.c | 51 +++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 35 insertions(+), 16 deletions(-) + +diff --git a/src/add.c b/src/add.c +index 2d342ab..e028736 100644 +--- a/src/add.c ++++ b/src/add.c +@@ -11,6 +11,7 @@ + + #include <errno.h> + #include <stdio.h> ++#include <unistd.h> + #include "apk_applet.h" + #include "apk_database.h" + #include "apk_print.h" +@@ -80,6 +81,38 @@ static int non_repository_check(struct apk_database *db) + return 1; + } + ++static struct apk_package *create_virtual_package(struct apk_database *db, struct apk_name *name) ++{ ++ char ver[32]; ++ struct apk_package *virtpkg; ++ struct tm tm; ++ EVP_MD_CTX *mdctx; ++ time_t now = apk_time(); ++ pid_t pid = getpid(); ++ ++ localtime_r(&now, &tm); ++ strftime(ver, sizeof ver, "%Y%m%d.%H%M%S", &tm); ++ ++ virtpkg = apk_pkg_new(); ++ if (virtpkg == NULL) return 0; ++ ++ virtpkg->name = name; ++ virtpkg->version = apk_blob_atomize(APK_BLOB_STR(ver)); ++ virtpkg->description = strdup("virtual meta package"); ++ virtpkg->arch = apk_blob_atomize(APK_BLOB_STR("noarch")); ++ ++ mdctx = EVP_MD_CTX_new(); ++ EVP_DigestInit_ex(mdctx, apk_checksum_default(), NULL); ++ EVP_DigestUpdate(mdctx, &tm, sizeof tm); ++ EVP_DigestUpdate(mdctx, &pid, sizeof pid); ++ EVP_DigestUpdate(mdctx, virtpkg->name->name, strlen(virtpkg->name->name) + 1); ++ virtpkg->csum.type = EVP_MD_CTX_size(mdctx); ++ EVP_DigestFinal_ex(mdctx, virtpkg->csum.data, NULL); ++ EVP_MD_CTX_free(mdctx); ++ ++ return virtpkg; ++} ++ + static int add_main(void *ctx, struct apk_database *db, struct apk_string_array *args) + { + struct add_ctx *actx = (struct add_ctx *) ctx; +@@ -93,10 +126,6 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array + + if (actx->virtpkg) { + apk_blob_t b = APK_BLOB_STR(actx->virtpkg); +- struct tm tm; +- time_t now; +- char ver[32]; +- + apk_blob_pull_dep(&b, db, &virtdep); + if (APK_BLOB_IS_NULL(b) || virtdep.conflict || + virtdep.result_mask != APK_DEPMASK_ANY || +@@ -104,24 +133,14 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array + apk_error("%s: bad package specifier"); + return -1; + } +- + if (virtdep.name->name[0] != '.' && non_repository_check(db)) + return -1; + +- now = apk_time(); +- localtime_r(&now, &tm); +- strftime(ver, sizeof ver, "%Y%m%d.%H%M%S", &tm); +- +- virtpkg = apk_pkg_new(); +- if (virtpkg == NULL) { ++ virtpkg = create_virtual_package(db, virtdep.name); ++ if (!virtpkg) { + apk_error("Failed to allocate virtual meta package"); + return -1; + } +- virtpkg->name = virtdep.name; +- apk_blob_checksum(APK_BLOB_STR(ver), apk_checksum_default(), &virtpkg->csum); +- virtpkg->version = apk_blob_atomize(APK_BLOB_STR(ver)); +- virtpkg->description = strdup("virtual meta package"); +- virtpkg->arch = apk_blob_atomize(APK_BLOB_STR("noarch")); + + virtdep.result_mask = APK_VERSION_EQUAL; + virtdep.version = virtpkg->version; +-- +2.22.0 + diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index e8819ca27..e5461c7d2 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=coreutils pkgver=8.31 -pkgrel=1 +pkgrel=3 pkgdesc="Basic file, shell, and text manipulation utilities" url="https://www.gnu.org/software/coreutils/" arch="all" @@ -30,17 +30,18 @@ build() { LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ + --prefix=/ \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --datarootdir=/usr/share \ + --libexecdir=/usr/libexec \ --enable-nls \ --without-gmp \ - --enable-no-install-program=hostname,su,kill,uptime \ + --enable-no-install-program=groups,hostname,su,kill,uptime \ --enable-install-program=arch \ --with-packager="Adélie" \ - --with-packager-bug-reports="https://bts.adelielinux.org/" \ - --enable-single-binary=symlinks + --with-packager-bug-reports="https://bts.adelielinux.org/" if [ ${CBUILD} != ${CHOST} ]; then set -- man/*.x @@ -56,24 +57,10 @@ check() { package() { make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/lib/charset.alias - rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true - - install -d "$pkgdir"/bin "$pkgdir"/usr/sbin - cd "$pkgdir"/usr/bin/ - - # We want to put these in /bin to match busybox (?) - local busybox_bin="base64 cat chgrp chmod chown cp date dd df echo - false ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir - sleep stat stty sync touch true uname" - - for i in $busybox_bin; do - rm "$pkgdir"/usr/bin/$i - ln -s ../usr/bin/coreutils "$pkgdir"/bin/$i - done - - rm "$pkgdir"/usr/bin/chroot - ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot + # stdbuf(1) requires a /usr/libexec/ .so + # env(1) needs to be in /usr/bin/ for compatibility with the rest of the world + mkdir -p "$pkgdir"/usr/bin + mv "$pkgdir"/bin/stdbuf "$pkgdir"/bin/env "$pkgdir"/usr/bin/ } sha512sums="ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af coreutils-8.31.tar.xz diff --git a/system/lddtree/APKBUILD b/system/lddtree/APKBUILD index fc8fa2101..0780a4fd1 100644 --- a/system/lddtree/APKBUILD +++ b/system/lddtree/APKBUILD @@ -2,24 +2,17 @@ # Maintainer: pkgname=lddtree pkgver=1.26 -pkgrel=1 +pkgrel=2 pkgdesc="List dynamic dependencies as a tree" url="https://github.com/ncopa/lddtree" arch="noarch" options="!check" license="GPL-2.0-only" -depends="scanelf" -depends_dev="" -makedepends="$depends_dev" +depends="scanelf cmd:which" +makedepends="" replaces="pax-utils" -install="" subpackages="" -source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz - " - -build() { - return 0 -} +source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz" package() { cd "$builddir" diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index 8287d3813..f00157787 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 pkgver=2.03.05 -pkgrel=0 +pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" arch="all" options="!check" # Test tries to use real /dev/mapper/control. license="GPL-2.0+ AND LGPL-2.1-only" # lvm2 will dlopen libs so we need to add explicit depend -depends="lvm2-libs=$pkgver-r$pkgrel" +depends="lvm2-libs=$pkgver-r$pkgrel util-linux" depends_dev="linux-headers" makedepends_build="coreutils libaio-dev" makedepends_host="$depends_dev util-linux-dev" @@ -17,7 +17,6 @@ makedepends="$makedepends_build $makedepends_host" source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz fix-stdio-usage.patch mallinfo.patch - library_dir-default-config.patch mlockall-default-config.patch lvm.initd lvm.confd @@ -32,6 +31,7 @@ subpackages=" device-mapper-libs:dm_libs device-mapper-event-libs:dm_event_libs $pkgname-libs + $pkgname-udev " builddir="$srcdir/LVM2.$pkgver" @@ -84,7 +84,7 @@ dm() { libs() { pkgdesc="LVM2 shared libraries" - depends= + depends="" mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/ mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/ @@ -93,22 +93,31 @@ libs() { dm_libs() { pkgdesc="Device-mapper shared library" - depends= + depends="" mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/ } dm_event_libs() { pkgdesc="Device-mapper event daemon shared library" - depends= + depends="" mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/ } +udev() { + pkgdesc="udev rules for LVM and device mapper" + install_if="$pkgname=$pkgver-r$pkgrel eudev" + + make -C "$builddir"/udev + install -m644 -Dt "$subpkgdir"/lib/udev/rules.d/ \ + "$builddir"/udev/*.rules +} + + sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz 6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch -33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd diff --git a/system/lvm2/library_dir-default-config.patch b/system/lvm2/library_dir-default-config.patch deleted file mode 100644 index 6e3b95832..000000000 --- a/system/lvm2/library_dir-default-config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./conf/example.conf.in.orig -+++ ./conf/example.conf.in -@@ -694,6 +694,7 @@ - # Configuration option global/library_dir. - # Search this directory first for shared libraries. - # This configuration option does not have a default value defined. -+ library_dir="/lib/device-mapper" - - # Configuration option global/locking_library. - # The external locking library to use for locking_type 2. diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 2699bd658..9c41ced39 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.44 +pkgver=3.44.1 _ver=${pkgver//./_} pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -141,7 +141,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="c4d7343a66f91c5888a121e266d1f1471da798a21d608a29caf598a828725e4bf9ea7411a105b23335f20bd7c12788dad567922ceeaebeb0c98fbf9bbe4006f7 nss-3.44.tar.gz +sha512sums="eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169 nss-3.44.1.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD index 0c0f36a10..96a6e6123 100644 --- a/system/pcre/APKBUILD +++ b/system/pcre/APKBUILD @@ -2,16 +2,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pcre pkgver=8.43 -pkgrel=0 +pkgrel=1 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" arch="all" license="BSD-3-Clause" -depends= +depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcrecpp libpcre16 libpcre32" -source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2" +source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2 + stack-frame-size-detection.patch + " # secfixes: # 8.40-r2: @@ -74,4 +76,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 pcre-8.43.tar.bz2" +sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 pcre-8.43.tar.bz2 +a088304318f7a04f90263efbab20b423e67fb6e3d829e7bc080fd44c29e98bc29cab992b73ed1b992af89cdf4606667af20572558a3a96549b7bd9479d0e6d88 stack-frame-size-detection.patch" diff --git a/system/pcre/stack-frame-size-detection.patch b/system/pcre/stack-frame-size-detection.patch new file mode 100644 index 000000000..54179a7d6 --- /dev/null +++ b/system/pcre/stack-frame-size-detection.patch @@ -0,0 +1,15 @@ +--- pcre-8.43/pcre_exec.c.old 2018-02-20 15:21:37.000000000 +0000 ++++ pcre-8.43/pcre_exec.c 2019-07-06 19:36:59.078411271 +0000 +@@ -509,6 +509,12 @@ + (e.g. stopped by repeated call or recursion limit) + */ + ++#ifdef __GNUC__ ++static int ++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, ++ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, ++ unsigned int rdepth) __attribute__((noinline,noclone)); ++#endif + static int + match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, + PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index 08b33c3e9..ef5094438 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.11 +pkgver=4.12 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" url="https://metacpan.org/release/Cpanel-JSON-XS" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="a14fe211b769184c28d946b9e88d9a380331d6a16c67a0f286fb4bf0f25e2a3b80f3df907bdf1a7eceaa8a34e69f13b3296cc135bc1ea2d2fcba6355dcf88579 Cpanel-JSON-XS-4.11.tar.gz" +sha512sums="8545095726d833d7404e8fc2a6e71a4f4b8e6c2f5d7d9939758bb8eb1ffcf33f28867a8e70fb1df995ec6c14eccde53c5c85fb6d3da2929337b15905d4195c5b Cpanel-JSON-XS-4.12.tar.gz" diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD index ae01038ca..593eb4886 100644 --- a/system/perl-net-ssleay/APKBUILD +++ b/system/perl-net-ssleay/APKBUILD @@ -2,17 +2,17 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-net-ssleay _realname=Net-SSLeay -pkgver=1.85 +pkgver=1.88 pkgrel=0 pkgdesc="Perl extension for using OpenSSL" url="https://metacpan.org/release/Net-SSLeay" arch="all" -license="GPL-2.0-only OR Artistic-1.0-Perl" +license="Artistic-2.0" depends="perl" makedepends="perl-dev openssl-dev zlib-dev" checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings" subpackages="$pkgname-doc" -source="https://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz" builddir="$srcdir/$_realname-$pkgver" build() { @@ -35,4 +35,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -sha512sums="74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b Net-SSLeay-1.85.tar.gz" +sha512sums="37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682 Net-SSLeay-1.88.tar.gz" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 70f8bbefa..aed46e575 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.1.0 +pkgver=1.0.2.0 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" @@ -109,7 +109,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="0b40601b25f88464b5ff63b7eddf6ffa30eb868d2d9652f3d6a608b8f508e46712214d6e674f74136e57dd4504eb71ef585c725ba1a6566cfc0a025e70cfadc9 s6-linux-init-1.0.1.0.tar.gz +sha512sums="1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843 s6-linux-init-1.0.2.0.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 4399681eb..aecdbcc4a 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.1583 +pkgver=8.1.1635 pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -81,6 +81,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1 vim-8.1.1583.tar.gz +sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/user/abiword/APKBUILD b/user/abiword/APKBUILD index 351961055..76ae5ea08 100644 --- a/user/abiword/APKBUILD +++ b/user/abiword/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abiword pkgver=3.0.2 pkgrel=0 @@ -11,26 +11,21 @@ license="GPL-2.0+" makedepends="bzip2-dev enchant-dev fribidi-dev goffice-dev gtk+3.0-dev libgsf-dev libjpeg-turbo-dev librsvg-dev libxslt-dev pcre-dev popt-dev wv-dev" - # openxml plugin makedepends="$makedepends boost-dev" - # collab plugin makedepends="$makedepends gnutls-dev libsoup-dev dbus-glib-dev" - subpackages="$pkgname-dev $pkgname-doc" - _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ freetranslation garble gdict gimp google hancom hrtext iscii kword \ latex loadbindings mht mif mswrite openwriter openxml opml paint \ passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \ xslfo" - source="https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz - fix-black-drawing-regression.patch" + fix-black-drawing-regression.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -42,7 +37,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD index aa674dfbb..c9ad2e28e 100644 --- a/user/acpid/APKBUILD +++ b/user/acpid/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: # Contributor: Morten Linderud <foxboron@archlinux.org> # Contributor: Sébastien Luttringer # Contributor: xduugu diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD new file mode 100644 index 000000000..52cf944e4 --- /dev/null +++ b/user/ccache/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=ccache +pkgver=3.7.1 +pkgrel=0 +pkgdesc="A fast C/C++ compiler cache" +url="https://ccache.dev/" +arch="all" +license="GPL-3.0+" +makedepends="zlib-dev" +checkdepends="bash perl" +subpackages="$pkgname-doc" +source="https://github.com/ccache/ccache/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" + +prepare() { + default_prepare + update_config_sub +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make test +} + +package() { + install -Dm 755 ccache "$pkgdir"/usr/bin/ccache + install -Dm 644 doc/ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1 + + local link= + mkdir -p "$pkgdir"/usr/lib/ccache/bin + + for link in cc gcc g++ cpp c++ ${CHOST}-cc ${CHOST}-gcc \ + ${CHOST}-g++ ${CHOST}-cpp ${CHOST}-c++; do + ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/$link + done +} + +sha512sums="68a716a91519020c1cd7efe07a36a7d8c040a8f26f627341e74fb6dffbf985389f949dad0b2cc35a78b37f5efdf1c112ccb3d23d8f379210c9adbaba6064763b ccache-3.7.1.tar.bz2" diff --git a/user/erl-rebar/APKBUILD b/user/erl-rebar/APKBUILD new file mode 100644 index 000000000..c4fe28bb2 --- /dev/null +++ b/user/erl-rebar/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=erl-rebar +pkgver=2.6.4 +pkgrel=0 +pkgdesc="Legacy Erlang build tool" +url="https://github.com/rebar/rebar" +arch="noarch" +license="Apache-2" +options="!tracedeps" +depends="erlang" +makedepends="erlang-dev" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/rebar/rebar/tar.gz/$pkgver" +builddir="$srcdir/rebar-$pkgver" + +build() { + ./bootstrap +} + +check() { + ./rebar -v eunit +} + +package() { + install -d -m755 $pkgdir/usr/bin/ + install -m755 ./rebar $pkgdir/usr/bin/ +} + +sha512sums="4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa erl-rebar-2.6.4.tar.gz" diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD new file mode 100644 index 000000000..a37633ae8 --- /dev/null +++ b/user/erl-rebar3/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +pkgname=erl-rebar3 +pkgver=3.11.1 +pkgrel=0 +pkgdesc="Erlang build tool" +url="http://www.rebar3.org/" +arch="noarch" +license="Apache-2" +options="!tracedeps" +depends="erlang" +makedepends="erlang-dev" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/erlang/rebar3/tar.gz/$pkgver" +builddir="$srcdir/rebar3-$pkgver" + +build() { + ./bootstrap +} + +check() { + ./rebar3 ct +} + +package() { + install -d -m755 $pkgdir/usr/bin/ + install -m755 ./rebar3 $pkgdir/usr/bin/ + gzip -c ./manpages/rebar3.1 > ./manpages/rebar3.1.gz + install -d -m755 $pkgdir/usr/share/man/man1/ + install -m644 ./manpages/rebar3.1.gz $pkgdir/usr/share/man/man1/ +} + +sha512sums="749368c8c19641d0c1083f1750438cfc5f1c75e284bd74b4f8ae368103e79a376f4bd91e85db35e1619116cd2f3b1a8dc2d3d89db19da8f4440e0b58d3c0a37c erl-rebar3-3.11.1.tar.gz" diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 8311d25a1..4f39d20a1 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=exo pkgver=0.12.6 -pkgrel=0 +pkgrel=1 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.0+ AND GPL-2.0+" makedepends="intltool glib-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libice-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/exo/0.12/exo-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/exo/0.12/exo-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index 953bb230e..81886c47e 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=garcon pkgver=0.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.0+" makedepends="intltool glib-dev libxfce4util-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/garcon/0.6/garcon-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gconf/APKBUILD b/user/gconf/APKBUILD index 1e9b30856..ce91ec018 100644 --- a/user/gconf/APKBUILD +++ b/user/gconf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=gconf pkgver=3.2.6 -pkgrel=4 +pkgrel=5 pkgdesc="GNOME configuration system" url="http://projects.gnome.org/gconf" arch="all" @@ -12,14 +12,11 @@ depends_dev="gtk+3.0-dev libxml2-dev polkit-dev" makedepends="$depends_dev dbus-glib-dev glib-dev gobject-introspection-dev intltool orbit2-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://download.gnome.org/sources/GConf/${pkgver%.*}/GConf-${pkgver}.tar.xz" - builddir="$srcdir"/GConf-"$pkgver" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index 253b9d86e..283227674 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric pkgver=1.12.45 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" arch="all" @@ -14,13 +14,12 @@ depends="" makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool itstool libgda-dev libxml2-utils perl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz cs.patch " build() { - YACC=yacc ./configure \ + LIBS="-lintl" YACC=yacc ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 0b5fc833b..91f8ef190 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice pkgver=0.10.44 pkgrel=0 @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 6e5ff59c7..00052daad 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -132,7 +132,7 @@ bios() { efi() { pkgdesc="$pkgdesc (EFI version)" - depends="$pkgname" + depends="$pkgname efibootmgr efivar" mkdir -p $subpkgdir/usr/lib/grub mv $pkgdir/usr/lib/grub/*-efi $subpkgdir/usr/lib/grub/ } diff --git a/user/gtk+2.0/APKBUILD b/user/gtk+2.0/APKBUILD index 962b80c4e..9fee775c2 100644 --- a/user/gtk+2.0/APKBUILD +++ b/user/gtk+2.0/APKBUILD @@ -1,58 +1,32 @@ -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gtk+2.0 pkgver=2.24.32 -pkgrel=1 -subpkg=gtk-update-icon-cache +pkgrel=2 pkgdesc="The GTK+ Toolkit (v2)" url="https://www.gtk.org/" arch="all" options="!check" # Requires xvfb, resulting in eventual circular dependency license="LGPL-2.0+" depends="shared-mime-info gtk-update-icon-cache" - -replaces="gtk+" -replaces_dev="gtk+-dev" -replaces_doc="gtk+-doc" - depends_dev="libxdamage-dev" # we add hicolor-icon-theme because the subpackage gtk-update-icon-cache # needs it. We need to force hicolor-icon-cache to be built before gtk+.2.0 -makedepends=" - autoconf automake libtool - $depends_dev - atk-dev - cairo-dev - cups-dev - expat-dev - gdk-pixbuf-dev - glib-dev - gnutls-dev - gobject-introspection-dev - gtk-doc - hicolor-icon-theme - libice-dev - libx11-dev - libxcomposite-dev - libxcursor-dev - libxext-dev - libxfixes-dev - libxrandr-dev - libxi-dev - pango-dev - zlib-dev" +makedepends="autoconf automake libtool $depends_dev + atk-dev cairo-dev cups-dev expat-dev gdk-pixbuf-dev glib-dev gnutls-dev + gobject-introspection-dev gtk-doc hicolor-icon-theme libice-dev + libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxfixes-dev + libxrandr-dev libxi-dev pango-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang + gtk-update-icon-cache:icon_cache" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +triggers="gtk-update-icon-cache.trigger=/usr/share/icons/*" source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz xid-collision-debug.patch gtk2-fixdso.patch " - -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" -triggers="$subpkg.trigger=/usr/share/icons/*" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $subpkg:icon_cache" -langdir="/usr/lib/locale" builddir="$srcdir"/gtk+-$pkgver prepare() { - cd "$builddir" default_prepare libtoolize --force \ && aclocal -I m4 \ @@ -61,8 +35,7 @@ prepare() { } build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -80,7 +53,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -98,7 +70,7 @@ icon_cache() { depends="hicolor-icon-theme" mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/"$subpkg" "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/gtk-update-icon-cache "$subpkgdir"/usr/bin } sha512sums="8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 gtk+-2.24.32.tar.xz diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD index cd7b8f100..e76b7f813 100644 --- a/user/gtkspell/APKBUILD +++ b/user/gtkspell/APKBUILD @@ -1,14 +1,13 @@ # Maintainer: pkgname=gtkspell pkgver=2.0.16 -pkgrel=10 +pkgrel=11 pkgdesc="Highlighting and replacement of misspelled words in Gtk software" url="http://gtkspell.sourceforge.net/" arch="all" license="GPL-2.0-only" makedepends="gtk+2.0-dev enchant-dev intltool" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz enchant-2.patch " @@ -19,7 +18,7 @@ prepare() { } build() { - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index d698c149d..e195793cc 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1583 +pkgver=8.1.1635 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1 vim-8.1.1583.tar.gz" +sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b vim-8.1.1635.tar.gz" diff --git a/user/gxmessage/APKBUILD b/user/gxmessage/APKBUILD index 70d3a9573..249864821 100644 --- a/user/gxmessage/APKBUILD +++ b/user/gxmessage/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gxmessage pkgver=3.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Display simple messages using GTK+" url=" " arch="all" @@ -10,12 +10,10 @@ license="GPL-3.0+" depends="" makedepends="gtk+3.0-dev intltool" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://downloads.sourceforge.net/gxmessage/gxmessage-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD index 83dc7d866..98fd59e1c 100644 --- a/user/haveged/APKBUILD +++ b/user/haveged/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Danilo Godec <danilo.godec@agenda.si> # Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: pkgname=haveged pkgver=1.9.4 pkgrel=1 diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD new file mode 100644 index 000000000..c9b8f4715 --- /dev/null +++ b/user/iptables/APKBUILD @@ -0,0 +1,66 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Molly Miller <adelie@m-squa.red> + +pkgname=iptables +pkgver=1.8.3 +pkgrel=0 +pkgdesc="Linux kernel firewall, NAT and packet mangling tools" +url="https://www.netfilter.org/projects/iptables/index.html" +arch="all" +options="!check" # no test suite +license="GPL-2.0+" +depends_dev="linux-headers" +# extra functionality may be enabled in the future if libmnl and +# libnetfilter_conntrack are packaged. +makedepends="$depends_dev libnftnl-dev bison flex autoconf automake" +subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc" +source="https://www.netfilter.org/projects/iptables/files/iptables-$pkgver.tar.bz2 + iptables.initd + iptables.confd + ip6tables.confd + " + +build() { + export CFLAGS="$CFLAGS -D_GNU_SOURCE" + ./configure \ + --build="$CBUILD" \ + --host="$CHOST" \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sbindir=/sbin \ + --without-kernel \ + --disable-nftables \ + --enable-devel \ + --enable-libipq \ + --enable-shared + + # do not use rpath - iptables seems to use old libtool which requires + # these hacks + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + + make +} + +package() { + make -j1 install DESTDIR="$pkgdir" + + mkdir -p "$pkgdir"/usr/include/libiptc \ + "$pkgdir"/usr/lib \ + "$pkgdir"/var/lib/iptables \ + "$pkgdir"/etc/iptables + + install -m644 include/iptables.h include/ip6tables.h \ + "$pkgdir"/usr/include/ + install include/libiptc/*.h "$pkgdir"/usr/include/libiptc/ + + install -D -m755 "$srcdir"/iptables.initd "$pkgdir"/etc/init.d/iptables + install -D -m755 "$srcdir"/iptables.initd "$pkgdir"/etc/init.d/ip6tables + install -D -m644 "$srcdir"/iptables.confd "$pkgdir"/etc/conf.d/iptables + install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables +} + +sha512sums="84b10080646077cbea78b7f3fcc58c6c6e1898213341c69862e1b48179f37a6820c3d84437c896071f966b61aa6d16b132d91948a85fd8c05740f29be3a0986d iptables-1.8.3.tar.bz2 +059b3bd8dd7dec60060ec5eb1e639fe8203207629f3a7dd4fdbe5ebca3f7e9b80df5592ebb27542e31830fd15a53cffac5772567053c104dfccf9b78613a31a1 iptables.initd +cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd +0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/user/iptables/ip6tables.confd b/user/iptables/ip6tables.confd new file mode 100644 index 000000000..1fa63f33a --- /dev/null +++ b/user/iptables/ip6tables.confd @@ -0,0 +1,14 @@ +# /etc/conf.d/ip6tables + +# Location in which ip6tables initscript will save set rules on +# service shutdown +IP6TABLES_SAVE="/etc/iptables/rules6-save" + +# Options to pass to ip6tables-save and ip6tables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# Enable/disable IPv6 forwarding with the rules +IPFORWARD="no" diff --git a/user/iptables/iptables.confd b/user/iptables/iptables.confd new file mode 100644 index 000000000..c9e5a685c --- /dev/null +++ b/user/iptables/iptables.confd @@ -0,0 +1,14 @@ +# /etc/conf.d/iptables + +# Location in which iptables initscript will save set rules on +# service shutdown +IPTABLES_SAVE="/etc/iptables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# Enable/disable IPv4 forwarding with the rules +IPFORWARD="no" diff --git a/user/iptables/iptables.initd b/user/iptables/iptables.initd new file mode 100644 index 000000000..98b52d0cd --- /dev/null +++ b/user/iptables/iptables.initd @@ -0,0 +1,136 @@ +#!/sbin/openrc-run +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.11.init,v 1.2 2011/12/04 10:15:59 swegener Exp $ + +description="IPv4/IPv6 packet filtering and NAT" +description_save="Save firewall state" +description_panic="Drop all packets" +description_reload="Reload configuration" + +extra_commands="save panic" +extra_started_commands="reload" + +iptables_name=${SVCNAME} +if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then + iptables_name="iptables" +fi + +iptables_bin="/sbin/${iptables_name}" +case ${iptables_name} in + iptables) iptables_proc="/proc/net/ip_tables_names" + iptables_save=${IPTABLES_SAVE} + sysctl_ipfwd=net.ipv4.ip_forward;; + ip6tables) iptables_proc="/proc/net/ip6_tables_names" + iptables_save=${IP6TABLES_SAVE} + sysctl_ipfwd=net.ipv6.conf.all.forwarding;; +esac + +depend() { + before net + after sysctl + use logger + provide firewall +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${iptables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkkernel() { + if [ ! -e ${iptables_proc} ] ; then + eerror "Your kernel lacks ${iptables_name} support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} +checkconfig() { + if [ ! -f ${iptables_save} ] ; then + eerror "Not starting ${iptables_name}. First create some rules then run:" + eerror "/etc/init.d/${iptables_name} save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ${iptables_name} state and starting firewall" + ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? + if yesno "${IPFORWARD}"; then + ebegin "Enabling forwarding" + /sbin/sysctl -w ${sysctl_ipfwd}=1 > /dev/null + eend $? + fi +} + +stop() { + if yesno "${IPFORWARD}"; then + ebegin "Disabling forwarding" + /sbin/sysctl -w ${sysctl_ipfwd}=0 > /dev/null + eend $? + fi + if yesno "${SAVE_ON_STOP}"; then + save || return 1 + fi + checkkernel || return 1 + ebegin "Stopping firewall" + local a + for a in $(cat ${iptables_proc}) ; do + set_table_policy $a ACCEPT + + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? +} + +reload() { + checkkernel || return 1 + ebegin "Flushing firewall" + local a + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + done + eend $? + + start +} + +save() { + ebegin "Saving ${iptables_name} state" + touch "${iptables_save}" + chmod 0600 "${iptables_save}" + ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" + eend $? +} + +panic() { + checkkernel || return 1 + if service_started ${iptables_name}; then + rc-service ${iptables_name} stop + fi + + local a + ebegin "Dropping all packets" + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} -F -t $a + ${iptables_bin} -X -t $a + + set_table_policy $a DROP + done + eend $? +} diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 432f60b07..f2796b3ea 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: Luis Ressel <aranea@aixah.de> pkgname=libnftnl pkgver=1.1.2 pkgrel=0 @@ -12,7 +12,6 @@ subpackages="$pkgname-dev" source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +23,10 @@ build() { } check() { - cd "$builddir"/tests - make check # builds test binaries + make -C tests check # builds test binaries } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index c8dccafca..172a0003d 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libpeas pkgver=1.22.0 -pkgrel=0 +pkgrel=1 pkgdesc="GObject-based plugin framework" url="https://gnome.org" arch="all" @@ -11,12 +11,10 @@ depends="" makedepends="intltool glib-dev gobject-introspection-dev gtk+3.0-dev py3-pygobject py3-pygobject-dev python3-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://download.gnome.org/sources/libpeas/${pkgver%.*}/libpeas-$pkgver.tar.xz" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" DISPLAY= make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index f1eddca71..3e99f60f2 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4ui pkgver=4.13.5 -pkgrel=0 +pkgrel=1 pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.0+ AND GPL-2.0+" makedepends="intltool gtk+3.0-dev gobject-introspection-dev vala-dev libxfce4util-dev xfconf-dev startup-notification-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/libxfce4ui/4.13/libxfce4ui-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index deb744a29..5ddc923d3 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libxfce4util pkgver=4.13.3 -pkgrel=0 +pkgrel=1 pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ GPL-2.0+" makedepends="intltool glib-dev gobject-introspection-dev vala" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/libxfce4util/4.13/libxfce4util-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfixes/APKBUILD b/user/libxfixes/APKBUILD index e08077bf5..ec31f710b 100644 --- a/user/libxfixes/APKBUILD +++ b/user/libxfixes/APKBUILD @@ -7,14 +7,13 @@ url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="MIT" -depends= +depends="" makedepends="libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" source="http://www.x.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2" builddir="$srcdir"/libXfixes-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,7 +25,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfont/APKBUILD b/user/libxfont/APKBUILD index 918cbc02e..c98112974 100644 --- a/user/libxfont/APKBUILD +++ b/user/libxfont/APKBUILD @@ -14,7 +14,6 @@ source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2" builddir="$srcdir/libXfont-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libxfont2/APKBUILD b/user/libxfont2/APKBUILD index fc2836f2b..3ebe3e051 100644 --- a/user/libxfont2/APKBUILD +++ b/user/libxfont2/APKBUILD @@ -18,7 +18,6 @@ builddir="$srcdir/libXfont2-$pkgver" # - CVE-2017-16611 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +31,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD new file mode 100644 index 000000000..0b211f2ce --- /dev/null +++ b/user/mariadb/APKBUILD @@ -0,0 +1,271 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Contributor: Dan Theisen <djt@hxx.in> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=mariadb +pkgver=10.4.6 +pkgrel=0 +pkgdesc="Open source database server" +url="https://mariadb.org/" +arch="all" +options="suid" # required for pam_auth plugin, which is needed for + # mysql_install_db to work +options="$options !dbg" # abuild can't handle splitting -dbg with the way + # this build's package() function works. +license="GPL-2.0-only" +pkgusers="mysql" +pkggroups="mysql" +depends="$pkgname-common" +depends_dev="openssl-dev zlib-dev" +makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev + libedit-dev libevent-dev libexecinfo-dev libxml2-dev ncurses-dev + linux-pam-dev pcre-dev xz-dev" +_mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket + perl-term-readkey" +subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded + $pkgname-common::noarch $pkgname-backup mytop::noarch $pkgname-openrc + $pkgname-doc $pkgname-dev" +source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz + crc32-power.patch + gcc_builtins_ppc.h + libedit.patch + ppchax.patch + mariadb.initd + mariadb-server.limits + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + + case "$CTARGET_ARCH" in + ppc) + cp "$srcdir"/gcc_builtins_ppc.h "$builddir"/include/atomic/gcc_builtins.h + ;; + esac + + local _release="\ + -DBUILD_CONFIG=mysql_release \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS=\"$CXXFLAGS -DNDEBUG\" \ + -DCMAKE_C_FLAGS=\"$CFLAGS -DNDEBUG\" \ + -DWITH_DEFAULT_COMPILER_OPTIONS=NO \ + -DWITH_DEFAULT_FEATURE_SET=NO " + + # NUMA is disabled because all arches do not support it + # SKIP_TESTS skips client unittests that require a server to be present + # JEMALLOC is reported to not work on musl, TODO: test this + # ASAN also doesn't work on musl iirc + local _deps="\ + -DWITH_MARIABACKUP=ON \ + -DWITH_NUMA=OFF \ + -DWITH_LIBNUMA=OFF \ + -DWITH_LIBWSREP=ON \ + -DWITH_UNIT_TESTS=ON \ + -DWITH_LIBEDIT=ON \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_UNITTEST=OFF \ + -DWITH_ASAN=OFF \ + -DWITH_JEMALLOC=OFF \ + -DWITH_LIBWRAP=OFF \ + -DWITH_SYSTEMD=no \ + -DWITH_VALGRIND=OFF \ + -DWITH_COMMENT=\"${DISTRO_NAME:-Adélie Linux}\" \ + -DENABLED_LOCAL_INFILE=ON \ + -DENABLED_PROFILING=OFF \ + -DSKIP_TESTS=ON " + + # AWS_KEY_MANAGEMENT makes this package non-redistributable, disable it + local _plugins="\ + -DPLUGIN_ARCHIVE=YES \ + -DPLUGIN_ARIA=YES \ + -DPLUGIN_BLACKHOLE=YES \ + -DPLUGIN_CSV=YES \ + -DPLUGIN_MYISAM=YES \ + -DAUTH_GSSAPI_PLUGIN_TYPE=NO \ + -DPLUGIN_AUTH_GSSAPI=NO \ + -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ + -DPLUGIN_CASSANDRA=NO \ + -DPLUGIN_FEEDBACK=NO " + + # Investigate turning more of these on + local _innodb="\ + -DWITH_INNODB_LZMA=YES \ + -DWITH_INNODB_BZIP2=NO \ + -DWITH_INNODB_LZ4=NO \ + -DWITH_INNODB_LZO=NO \ + -DWITH_INNODB_SNAPPY=NO " + + # MongoDB is not libre software, disable it + local _connect="\ + -DCONNECT_WITH_MYSQL=YES \ + -DCONNECT_WITH_MONGO=NO \ + -DCONNECT_WITH_ODBC=NO \ + -DCONNECT_WITH_JDBC=NO \ + -DCONNECT_WITH_LIBXML2=system " + + # non-portable things, things that don't work on musl, BE, 32-bit etc + local _evil="\ + -DPLUGIN_MROONGA=NO \ + -DPLUGIN_ROCKSDB=NO \ + -DPLUGIN_TOKUDB=NO " + + local _system_libs="\ + -DWITH_LIBARCHIVE=system \ + -DWITH_PCRE=system \ + -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_EXTERNAL_ZLIB=YES \ + -DCONC_WITH_EXTERNAL_ZLIB=YES " + + local _system_paths="\ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mariadb \ + -DMYSQL_UNIX_ADDR=/var/run/mariadb/mysqld.sock \ + -DINSTALL_UNIX_ADDRDIR=/var/run/mariadb/mysqld.sock \ + -DPKG_CONFIG_EXECUTABLE=/usr/bin/pkgconf \ + -DINSTALL_BINDIR=bin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SBINDIR=sbin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_LIBDIR=lib \ + -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ + -DINSTALL_DOCDIR=share/doc/$pkgname \ + -DINSTALL_DOCREADMEDIR=share/doc/$pkgname \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_MYSQLSHAREDIR=share/mariadb \ + -DINSTALL_SUPPORTFILESDIR=share/mariadb \ + -DSUFFIX_INSTALL_DIR=\"\" " + + _buildflags=$(echo "\ + ${_release}\ + ${_deps}\ + ${_plugins}\ + ${_innodb}\ + ${_connect}\ + ${_evil}\ + ${_system_libs}\ + ${_system_paths}\ + ${CMAKE_CROSSOPTS}" | tr -d '\t') + echo "Build Flags are: $_buildflags" + eval "cmake $_buildflags ." + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '^(test-connect)$' +} + +package() { + depends="$pkgname-client $pkgname-server" + install -m755 -D ${srcdir}/mariadb.initd ${pkgdir}/etc/init.d/mariadb +} + +openrc() { + default_openrc + depends="mariadb-server=$pkgver-r$pkgrel" +} + +_install_component() { + cd "$builddir" + component=$1 + prefix=$subpkgdir/usr + msg "Installing component \"$component\" into $prefix" + cmake -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DCOMPONENT=${component} \ + -P cmake_install.cmake +} + +libs() { + pkgdesc="Libraries for the MariaDB database" + _install_component SharedLibraries +} + +client() { + pkgdesc="The MariaDB database client" + depends="mariadb-common=$pkgver-r$pkgrel" + for part in Client ClientPlugins; do + _install_component ${part} + done +} + +server() { + pkgdesc="The MariaDB database server" + depends="mariadb-common=$pkgver-r$pkgrel" + install="$pkgname-server.pre-install" + for part in Server Server_Scripts IniFiles connect-engine; do + _install_component ${part} + done + + install -m755 -D ${srcdir}/mariadb-server.limits \ + ${subpkgdir}/etc/security/limits.d/mariadb.conf +} + + +common() { + pkgdesc="MariaDB common files for both server and client" + replaces="mysql-common" + depends= + + SHARE_PATH=${pkgdir}-server/usr/share + mkdir -p ${subpkgdir}/usr + mv $SHARE_PATH ${subpkgdir}/usr + + _install_component Common +} + +embedded() { + pkgdesc="MariaDB embedded server and embeddable library" + + # move mysql-embedded from client subpackage to embedded + mkdir -p ${subpkgdir}/usr/bin + BIN_PATH=${pkgdir}-client/usr/bin + mv $BIN_PATH/mysql_embedded ${subpkgdir}/usr/bin/ + + # move embedded mysqld libraries from server package to embedded + mkdir -p ${subpkgdir}/usr/lib + LIB_PATH=${pkgdir}-server/usr/lib + MYSQLD_ELIB=$(readlink $LIB_PATH/libmysqld.so) + mv $LIB_PATH/$MYSQLD_ELIB ${subpkgdir}/usr/lib/ + mv $LIB_PATH/libmysqld.so ${subpkgdir}/usr/lib/ + mv $LIB_PATH/libmariadbd.so ${subpkgdir}/usr/lib/ +} + +backup() { + pkgdesc="The mariabackup tool for physical online backups" + _install_component backup +} + +mytop() { + pkgdesc="Command line tool used for monitoring MariaDB performance" + depends="$_mytopdeps" + _install_component Mytop +} + +dev() { + replaces="libmysqlclient mysql-dev" + provides="mysql-dev=$pkgver-r$pkgrel" + depends="$pkgname-libs" + _install_component Development + + # move symlinks for static libs from libs subpackage to dev + LIB_PATH=${pkgdir}-libs/usr/lib + mv $LIB_PATH/libmysqlclient.a ${subpkgdir}/usr/lib/ + mv $LIB_PATH/libmysqlclient_r.a ${subpkgdir}/usr/lib/ +} + +doc() { + for part in ManPagesClient ManPagesServer ManPagesDevelopment; do + _install_component ${part} + done + default_doc +} + +sha512sums="b04c47f72de2473d7b5edd04b4785a1d7179bb1f429f30ba53ae6cfbbb413200d9803eff1072949b2e81fd7d2164ea34c68620d621d4181b913daa2293ae140c mariadb-10.4.6.tar.gz +03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch +15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h +41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch +0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch +1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd +d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/crc32-power.patch b/user/mariadb/crc32-power.patch new file mode 100644 index 000000000..aa269a599 --- /dev/null +++ b/user/mariadb/crc32-power.patch @@ -0,0 +1,8 @@ +--- mariadb-10.4.6/cmake/crc32.cmake.old 2019-06-17 22:00:31.000000000 +0000 ++++ mariadb-10.4.6/cmake/crc32.cmake 2019-07-06 22:02:39.704198796 +0000 +@@ -1,4 +1,4 @@ +-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") ++IF(FALSE) + SET(HAVE_CRC32_VPMSUM 1) + SET(CRC32_LIBRARY crc32-vpmsum) + ADD_SUBDIRECTORY(extra/crc32-vpmsum) diff --git a/user/mariadb/gcc_builtins_ppc.h b/user/mariadb/gcc_builtins_ppc.h new file mode 100644 index 000000000..8e492c58a --- /dev/null +++ b/user/mariadb/gcc_builtins_ppc.h @@ -0,0 +1,78 @@ +#ifndef ATOMIC_GCC_BUILTINS_INCLUDED +#define ATOMIC_GCC_BUILTINS_INCLUDED + +/* Copyright (c) 2017 MariaDB Foundation + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ + + +#define MY_MEMORY_ORDER_RELAXED __ATOMIC_RELAXED +#define MY_MEMORY_ORDER_CONSUME __ATOMIC_CONSUME +#define MY_MEMORY_ORDER_ACQUIRE __ATOMIC_ACQUIRE +#define MY_MEMORY_ORDER_RELEASE __ATOMIC_RELEASE +#define MY_MEMORY_ORDER_ACQ_REL __ATOMIC_ACQ_REL +#define MY_MEMORY_ORDER_SEQ_CST __ATOMIC_SEQ_CST + +#define my_atomic_store32_explicit(P, D, O) __atomic_store_4((P), (D), (O)) +#define my_atomic_store64_explicit(P, D, O) __atomic_store_8((P), (D), (O)) +#define my_atomic_storeptr_explicit(P, D, O) __atomic_store_4((P), (unsigned int)(D), (O)) + +#define my_atomic_load32_explicit(P, O) __atomic_load_4((P), (O)) +#define my_atomic_load64_explicit(P, O) __atomic_load_8((P), (O)) +#define my_atomic_loadptr_explicit(P, O) __atomic_load_4((P), (O)) + +#define my_atomic_fas32_explicit(P, D, O) __atomic_exchange_4((P), (D), (O)) +#define my_atomic_fas64_explicit(P, D, O) __atomic_exchange_8((P), (D), (O)) +#define my_atomic_fasptr_explicit(P, D, O) __atomic_exchange_4((P), (D), (O)) + +#define my_atomic_add32_explicit(P, A, O) __atomic_fetch_add_4((P), (A), (O)) +#define my_atomic_add64_explicit(P, A, O) __atomic_fetch_add_8((P), (A), (O)) + +#define my_atomic_cas32_weak_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 1, (S), (F)) +#define my_atomic_cas64_weak_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_8((P), (E), (D), 1, (S), (F)) +#define my_atomic_casptr_weak_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 1, (S), (F)) + +#define my_atomic_cas32_strong_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 0, (S), (F)) +#define my_atomic_cas64_strong_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_8((P), (E), (D), 0, (S), (F)) +#define my_atomic_casptr_strong_explicit(P, E, D, S, F) \ + __atomic_compare_exchange_4((P), (E), (D), 0, (S), (F)) + +#define my_atomic_store32(P, D) __atomic_store_4((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_store64(P, D) __atomic_store_8((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_storeptr(P, D) __atomic_store_4((P), (D), __ATOMIC_SEQ_CST) + +#define my_atomic_load32(P) __atomic_load_4((P), __ATOMIC_SEQ_CST) +#define my_atomic_load64(P) __atomic_load_8((P), __ATOMIC_SEQ_CST) +#define my_atomic_loadptr(P) __atomic_load_4((P), __ATOMIC_SEQ_CST) + +#define my_atomic_fas32(P, D) __atomic_exchange_4((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_fas64(P, D) __atomic_exchange_8((P), (D), __ATOMIC_SEQ_CST) +#define my_atomic_fasptr(P, D) __atomic_exchange_4((P), (D), __ATOMIC_SEQ_CST) + +#define my_atomic_add32(P, A) __atomic_fetch_add_4((P), (A), __ATOMIC_SEQ_CST) +#define my_atomic_add64(P, A) __atomic_fetch_add_8((P), (A), __ATOMIC_SEQ_CST) + +#define my_atomic_cas32(P, E, D) \ + __atomic_compare_exchange_4((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) +#define my_atomic_cas64(P, E, D) \ + __atomic_compare_exchange_8((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) +#define my_atomic_casptr(P, E, D) \ + __atomic_compare_exchange_4((P), (E), (D), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) + +#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */ diff --git a/user/mariadb/libedit.patch b/user/mariadb/libedit.patch new file mode 100644 index 000000000..14dc9db49 --- /dev/null +++ b/user/mariadb/libedit.patch @@ -0,0 +1,57 @@ +From d9342e88289fa588ea2f1a094dbfc32f0693e23d Mon Sep 17 00:00:00 2001 +From: Sebastian Kemper <sebastian_ml@gmx.net> +Date: Tue, 9 Apr 2019 22:28:10 +0200 +Subject: [PATCH] cmake: support new libedit interface + +libedit changed it's interface a while ago. MariaDB's cmake file doesn't +recognize the new interface, the compile test fails: + +/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)': +/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive] + int res= (*rl_completion_entry_function)(0,0); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ + +Fix this by adding a detection for the new interface as well. + +Run-tested on a MIPS machine. + +Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> +--- + cmake/readline.cmake | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/cmake/readline.cmake b/cmake/readline.cmake +index 12a8980b6a90..a2b2cc4c241f 100644 +--- a/cmake/readline.cmake ++++ b/cmake/readline.cmake +@@ -160,8 +160,20 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) + int res= (*rl_completion_entry_function)(0,0); + completion_matches(0,0); + }" +- LIBEDIT_INTERFACE) +- SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) ++ LIBEDIT_HAVE_COMPLETION_INT) ++ ++ CHECK_CXX_SOURCE_COMPILES(" ++ #include <stdio.h> ++ #include <readline.h> ++ int main(int argc, char **argv) ++ { ++ char res= *(*rl_completion_entry_function)(0,0); ++ completion_matches(0,0); ++ }" ++ LIBEDIT_HAVE_COMPLETION_CHAR) ++ IF(LIBEDIT_HAVE_COMPLETION_INT OR LIBEDIT_HAVE_COMPLETION_CHAR) ++ SET(USE_LIBEDIT_INTERFACE 1) ++ ENDIF() + ENDIF() + ENDMACRO() + +@@ -187,6 +199,7 @@ MACRO (MYSQL_CHECK_READLINE) + IF(USE_LIBEDIT_INTERFACE) + SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR}) + SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY}) ++ SET(USE_NEW_READLINE_INTERFACE ${LIBEDIT_HAVE_COMPLETION_CHAR}) + ELSE() + MYSQL_USE_BUNDLED_READLINE() + ENDIF() diff --git a/user/mariadb/mariadb-server.limits b/user/mariadb/mariadb-server.limits new file mode 100644 index 000000000..520783992 --- /dev/null +++ b/user/mariadb/mariadb-server.limits @@ -0,0 +1,3 @@ +#<domain> <type> <item> <value> +@mysql soft nofile 65535 +@mysql hard nofile 65535 diff --git a/user/mariadb/mariadb-server.pre-install b/user/mariadb/mariadb-server.pre-install new file mode 100644 index 000000000..de2bcd795 --- /dev/null +++ b/user/mariadb/mariadb-server.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -g 60 -r mysql +useradd -M -N -r -u 60 -g 60 -c "MariaDB Database User" -d /var/lib/mysql -s /sbin/nologin mysql + +mkdir /var/lib/mysql +chown mysql:mysql /var/lib/mysql diff --git a/user/mariadb/mariadb.initd b/user/mariadb/mariadb.initd new file mode 100644 index 000000000..4e1cf8d3e --- /dev/null +++ b/user/mariadb/mariadb.initd @@ -0,0 +1,47 @@ +#!/sbin/openrc-run + +getconf() { + v=$(my_print_defaults --mysqld | grep ^--$1) + [ -z $v ] && echo $2 || echo ${v#*=} +} + +retry="60" +extra_stopped_commands="setup" + +user=${MYSQLD_USER:-mysql} +group=${MYSQLD_GROUP:-mysql} +default_datadir=$(getconf datadir "/var/lib/mariadb") +datadir=${MYSQLD_DATADIR:-$default_datadir} + +command="/usr/bin/mysqld_safe" +command_args="--syslog --nowatch --user=$user" + +depend() { + use net + need localmount +} + +setup() { + checkpath -d -m 1775 -o $user:$group /run/mariadb + ebegin "Creating a new MySQL database in $datadir" + mysql_install_db --user=$user --datadir=$datadir + eend $? +} + +start_pre() { + pidfile=$(getconf pid-file "/run/mariadb/mysqld.pid") + command_args="$command_args --pid-file=$pidfile" + if [ ! -d $datadir/mysql ]; then + eerror "Data directory '$datadir' is empty or invalid." + eerror "Run '/etc/init.d/mariadb setup' to create new database." + fi +} + +start_post() { + ewaitfile 10 $(getconf socket "/run/mariadb/mysqld.sock") +} + +stop_pre() { + pidfile=$(getconf pid-file "/run/mariadb/mysqld.pid") +} + diff --git a/user/mariadb/ppchax.patch b/user/mariadb/ppchax.patch new file mode 100644 index 000000000..26ffb5189 --- /dev/null +++ b/user/mariadb/ppchax.patch @@ -0,0 +1,26 @@ +--- mariadb-10.4.6/configure.cmake.old 2019-06-17 22:00:31.000000000 +0000 ++++ mariadb-10.4.6/configure.cmake 2019-07-06 23:21:57.705655766 +0000 +@@ -922,6 +922,10 @@ + return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); + }" + HAVE_GCC_C11_ATOMICS) ++IF(NOT HAVE_GCC_C11_ATOMICS AND CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") ++ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} atomic) ++ SET(HAVE_GCC_C11_ATOMICS 1) ++ENDIF() + + IF(WITH_VALGRIND) + SET(HAVE_valgrind 1) +--- mariadb-10.4.6/mysys/CMakeLists.txt.old 2019-06-17 22:00:32.000000000 +0000 ++++ mariadb-10.4.6/mysys/CMakeLists.txt 2019-07-07 00:03:56.956394100 +0000 +@@ -91,6 +91,10 @@ + TARGET_LINK_LIBRARIES(mysys pthread) + ENDIF() + ++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") ++ TARGET_LINK_LIBRARIES(mysys atomic) ++ENDIF() ++ + ADD_EXECUTABLE(thr_lock thr_lock.c) + TARGET_LINK_LIBRARIES(thr_lock mysys) + SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN") diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index 7b848ad28..5ac314a65 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mousepad pkgver=0.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Simple text editor for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool glib-dev gtk+3.0-dev gtksourceview-3.0-dev dbus-glib-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/mousepad/0.4/mousepad-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index 3ef6d52aa..13cd0a2a2 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: Luis Ressel <aranea@aixah.de> pkgname=nftables pkgver=0.9.0 pkgrel=0 @@ -17,8 +17,6 @@ source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2 nftables.initd" build() { - cd "$builddir" - DB2MAN=docbook2x-man ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,8 +30,6 @@ build() { } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname diff --git a/user/nmap/APKBUILD b/user/nmap/APKBUILD index 3cf0b1db3..d8bdea9a9 100644 --- a/user/nmap/APKBUILD +++ b/user/nmap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nmap pkgver=7.70 -pkgrel=0 +pkgrel=1 pkgdesc="A network exploration tool and security/port scanner" url="https://nmap.org/" arch="all" @@ -14,7 +14,9 @@ subpackages=" $pkgname-scripts::noarch $pkgname-nselibs::noarch $pkgname-nping - $pkgname-ncat" + $pkgname-ncat + $pkgname-ncat-doc:ncat_doc + netcat::noarch" source="https://nmap.org/dist/$pkgname-$pkgver.tar.bz2" prepare() { @@ -23,7 +25,6 @@ prepare() { } build() { - cd "$builddir" # zenmap and ndiff require python 2 ./configure \ --build=$CBUILD \ @@ -44,12 +45,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } @@ -78,10 +77,26 @@ ncat() { mv "$pkgdir"/usr/bin/ncat "$subpkgdir"/usr/bin } +ncat_doc() { + pkgdesc="ncat utility (docs)" + install_if="nmap-ncat=$pkgver-r$pkgrel docs" + mkdir -p "$subpkgdir"/usr/share/man/man1 + mv "${pkgdir}-doc"/usr/share/man/man1/ncat.1.gz \ + "$subpkgdir"/usr/share/man/man1 +} + nping() { pkgdesc="$pkgdesc (nping tool)" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin } +netcat() { + pkgdesc="Symlinks for netcat and nc to ncat" + depends="$pkgname-ncat" + mkdir -p "$subpkgdir"/usr/bin + ln -s ncat "$subpkgdir"/usr/bin/netcat + ln -s ncat "$subpkgdir"/usr/bin/nc +} + sha512sums="084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 nmap-7.70.tar.bz2" diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD new file mode 100644 index 000000000..a6122fcc5 --- /dev/null +++ b/user/numactl/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Daniel Sabogal <dsabogalcc@gmail.com> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=numactl +pkgver=2.0.12 +pkgrel=0 +pkgdesc="Simple NUMA policy support" +url="https://github.com/numactl/numactl" +# ARM lacks the __NR_migrate_pages syscall +arch="all !armhf !armv7" +license="GPL-2.0+ AND LGPL-2.1" +makedepends="autoconf automake libtool linux-headers" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" +source="$pkgname-$pkgver.tar.gz::https://github.com/numactl/$pkgname/archive/v$pkgver.tar.gz + musl.patch" + +prepare() { + default_prepare + ./autogen.sh +} + +build() { + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man + make +} + +check() { + make check VERBOSE=1 TESTS='test/distance test/nodemap test/tbitmap' +} + +package() { + make DESTDIR="$pkgdir" install + + # provided by linux man-pages + rm -r "$pkgdir"/usr/share/man/man2 +} + +tools() { + pkgdesc="NUMA policy control tools" + + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr +} + +sha512sums="3814efd924d1c9152a30f6ae5b665afc20648226cd475d72b933c0ec4f30249af4e25110de17f144734b787ed765644dca09a657219806ab5c9c550abd45bf8e numactl-2.0.12.tar.gz +c24affa5a8a8ea83d7f0ee384dc0629e17a5c4201357132f770f894ad4236772116d96d8389d54fb99095af40d1ccbffc3170b5fb9cc88cfca39179f50bee9c9 musl.patch" diff --git a/user/numactl/musl.patch b/user/numactl/musl.patch new file mode 100644 index 000000000..009233f63 --- /dev/null +++ b/user/numactl/musl.patch @@ -0,0 +1,21 @@ +--- numactl-2.0.11/syscall.c.orig ++++ numactl-2.0.11/syscall.c +@@ -115,14 +115,16 @@ + + #endif + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11) ++#if defined(__GLIBC__) ++# if __GLIBC_PREREQ(2,11) + + /* glibc 2.11 seems to have working 6 argument sycall. Use the + glibc supplied syscall in this case. + The version cut-off is rather arbitary and could be probably + earlier. */ + +-#define syscall6 syscall ++# define syscall6 syscall ++#endif + #elif defined(__x86_64__) + /* 6 argument calls on x86-64 are often buggy in both glibc and + asm/unistd.h. Add a working version here. */ diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD index 4cb9121e2..c64f3c18b 100644 --- a/user/orage/APKBUILD +++ b/user/orage/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=orage pkgver=4.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Calendaring software for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,14 +10,12 @@ license="GPL-2.0+ AND BSD-3-Clause AND (LGPL-2.1-only OR MPL-1.0) AND (GPL-2.0+ makedepends="intltool gtk+2.0-dev dbus-glib-dev libnotify-dev popt-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2 +source="https://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2 libical-3.patch " build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD index 496594ae1..bbd53dfad 100644 --- a/user/parole/APKBUILD +++ b/user/parole/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=parole pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer-based media player for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+ AND LGPL-2.1+" makedepends="intltool gtk+3.0-dev dbus-glib-dev libxfce4ui-dev gstreamer-dev gst-plugins-base-dev libnotify-dev libice-dev" subpackages="$pkgname-dev $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/parole/1.0/parole-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/parole/1.0/parole-$pkgver.tar.bz2" build() { - cd "$builddir" - LIBS="-lX11" ./configure \ + LIBS="-lintl -lX11" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/perl-bit-vector/APKBUILD b/user/perl-bit-vector/APKBUILD new file mode 100644 index 000000000..90dc9385a --- /dev/null +++ b/user/perl-bit-vector/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-bit-vector +pkgver=7.4 +pkgrel=0 +pkgdesc="Efficient bit vector, set of integers and 'big int' math library" +url="https://metacpan.org/release/Bit-Vector" +arch="all" +license="Artistic-1.0-Perl" +makedepends="perl-dev perl-carp-clan" +subpackages="$pkgname-doc" +#https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz +source="https://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-$pkgver.tar.gz" +builddir="$srcdir/Bit-Vector-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 Bit-Vector-7.4.tar.gz" diff --git a/user/perl-carp-clan/APKBUILD b/user/perl-carp-clan/APKBUILD new file mode 100644 index 000000000..0a2586220 --- /dev/null +++ b/user/perl-carp-clan/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-carp-clan +pkgver=6.07 +pkgrel=0 +pkgdesc="Report modules as a 'clan' in Perl" +url="https://metacpan.org/pod/Carp::Clan" +arch="noarch" +license="Artistic-1.0-Perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Carp-Clan-$pkgver.tar.gz" +builddir="$srcdir/Carp-Clan-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="0180c2bd2ffe9f2b6c23d7e76bf3dd8ceeacfc842b09c2dab2f81d002ff7235ce2d145e53c55e375cb889291577cfcd4cb9be34b5445ae532cb9768979c57e41 Carp-Clan-6.07.tar.gz" diff --git a/user/perl-class-accessor/APKBUILD b/user/perl-class-accessor/APKBUILD new file mode 100644 index 000000000..6ea77357d --- /dev/null +++ b/user/perl-class-accessor/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Alyx Wolcott <alyx@leuhta.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-class-accessor +pkgver=0.51 +pkgrel=0 +pkgdesc="Perl class accessor generator" +url="https://metacpan.org/release/Class-Accessor" +arch="noarch" +license="Artistic-1.0-Perl" +depends="perl-sub-name" +makedepends="perl-dev perl-module-install" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-$pkgver.tar.gz" +builddir="$srcdir/Class-Accessor-$pkgver" + +build() { + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b Class-Accessor-0.51.tar.gz" diff --git a/user/perl-crypt-rijndael/APKBUILD b/user/perl-crypt-rijndael/APKBUILD index 5b9e1283a..6ae7262f7 100644 --- a/user/perl-crypt-rijndael/APKBUILD +++ b/user/perl-crypt-rijndael/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-crypt-rijndael _pkgreal=Crypt-Rijndael -pkgver=1.13 +pkgver=1.14 pkgrel=0 pkgdesc="Crypt::CBC compliant Rijndael encryption module" url="https://metacpan.org/release/Crypt-Rijndael" @@ -39,5 +39,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="46eea4eb6568d9bb70685314c6a29214552787c8cf138adb77271d07b85c16d83ee3faa53e6c3b7d0abb5cb735827407e970f954ae93123dfeaebb5fb34f1329 Crypt-Rijndael-1.13.tar.gz +sha512sums="a3c419142954dc2b430422f532b5349d0fb902a704335ba0708504a6a4a5d617835409916b76bc1b8dc8669c0f03356dab3ef90e5f7ea530b5fcc70bd1bf4eff Crypt-Rijndael-1.14.tar.gz 4f96e3f326c48bdca94aa721468f6c927a6af39ab9683bc69058a9330d733c96e656883890cf9f2c4588173784d248238dec82a49e8261c0cd9e1d794764d97e use-stdint_h.patch" diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index 9ebee6f7b..1c862ef14 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime-timezone _pkgname=DateTime-TimeZone -pkgver=2.35 +pkgver=2.36 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5d103d89586c24f9409baba8233c0655cdf7799d5fa58b5a8708eb883289c35cc6f04f2488c90987b91be17932054293bedac3b682dd534206848bd4778f0ce5 DateTime-TimeZone-2.35.tar.gz" +sha512sums="6958d4ac21f1ed641e31d86dad83153bf4ad763e499cb062d918ac292d3ed7339486470d9812d7c5fc27040bc8d39fa73fd9f34bf2fd72404743cb1e9cf18a85 DateTime-TimeZone-2.36.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 87a8c5a80..c196a7506 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-libyaml -pkgver=0.77 +pkgver=0.79 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="20d35718ebd318c2e7cfd618274dafb9c4489596e6ee77ca957f58d4971b7c712cbbf71517c9b29f316d0059b1b9f375aab57facc895c61c200cc0e40589de33 YAML-LibYAML-0.77.tar.gz" +sha512sums="47b0f2d42ff972224af6fffa09631c7bcf221867cba3a0f9d56ce48f5a34bde56f3fdedbf15c47843ef24aba65676bfc7df5ce3d26b8f50011f2730071ca4877 YAML-LibYAML-0.79.tar.gz" diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 1970f15af..965fde75b 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ristretto pkgver=0.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="Image viewer for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool libexif-dev gtk+2.0-dev libxfce4util-dev libxfce4ui-dev libmagic" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/ristretto/0.8/ristretto-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/ristretto/0.8/ristretto-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/ruby-bundler/APKBUILD b/user/ruby-bundler/APKBUILD new file mode 100644 index 000000000..d3c470b51 --- /dev/null +++ b/user/ruby-bundler/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Alyx Wolcott <alyx@leuhta.com> +_gemname=bundler +pkgname=ruby-$_gemname +pkgver=2.0.2 +pkgrel=0 +pkgdesc="Manage an application's gem dependencies" +url="https://bundler.io/" +arch="noarch" +license="MIT" +depends="ruby ruby-dev" +subpackages="$pkgname-doc" +options="!check" +source="https://rubygems.org/downloads/$_gemname-$pkgver.gem" +builddir="$srcdir/$_gemname-$pkgver" + +package() { + local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')" + + gem install --local \ + --install-dir "$gemdir" \ + --bindir "$pkgdir/usr/bin" \ + --ignore-dependencies \ + --no-document \ + --verbose \ + "$srcdir"/$_gemname-$pkgver.gem + + local n; for n in 1 5; do + mkdir -p "$pkgdir"/usr/share/man/man$n + mv "$gemdir"/gems/$_gemname-$pkgver/man/*.$n "$pkgdir"/usr/share/man/man$n/ + done + + rm -rf "$gemdir"/cache \ + "$gemdir"/build_info \ + "$gemdir"/doc \ + "$gemdir"/gems/$_gemname-$pkgver/man \ + "$gemdir"/gems/$_gemname-$pkgver/*.md +} + + +sha512sums="f41fe9e385fbf42859f3514b71abdaa1fd787f4ff4b1169b8ee40ea7778c114657c60ca3d6d6d72fbe972af0558f0cccd9c9f28cad7fc712ada27f037dce8a6a bundler-2.0.2.gem" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index b2f0fa449..c11154579 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -2,19 +2,18 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar-volman pkgver=0.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="Volume manager for Thunar" url="https://xfce.org" arch="all" license="GPL-2.0+" -makedepends="intltool libxfce4ui-dev thunar-dev exo-dev libgudev-dev libnotify-dev" +makedepends="exo-dev intltool libgudev-dev libnotify-dev libxfce4ui-dev + thunar-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 0f92f1070..7e7210458 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar pkgver=1.8.6 -pkgrel=0 +pkgrel=1 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,13 +11,11 @@ makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev vala-dev gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev libexif-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/thunar/1.8/Thunar-$pkgver.tar.bz2" builddir="$srcdir/Thunar-$pkgver" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 2f5685df1..27f7ee2b2 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=tumbler pkgver=0.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -12,12 +12,10 @@ makedepends="intltool dbus-glib-dev gdk-pixbuf-dev curl-dev freetype-dev libjpeg-turbo-dev libgsf-dev poppler-dev ffmpegthumbnailer-dev libopenraw-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD index 9159a6ff3..bbac9bafa 100644 --- a/user/wireguard-module-power8-64k/APKBUILD +++ b/user/wireguard-module-power8-64k/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8-64k" _kver="4.14.127-mc14" -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD index 3d55c8bdd..4405367b7 100644 --- a/user/wireguard-module-power8/APKBUILD +++ b/user/wireguard-module-power8/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="-power8" _kver="4.14.127-mc14" -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index c0e02fd93..fbe32d2d7 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -3,7 +3,7 @@ # KEEP THIS IN SYNC with the other wireguard-module packages. _kflavour="" _kver="4.14.127-mc14" -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 _pkgname="wireguard-module$_kflavour" pkgname="$_pkgname-$_kver" @@ -29,4 +29,4 @@ package() { make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index 2ae8d845b..97de72f1f 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=wireguard-tools _pkgreal=WireGuard -pkgver=0.0.20190601 +pkgver=0.0.20190702 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -43,4 +43,4 @@ _patch() { } -sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3 WireGuard-0.0.20190601.tar.xz" +sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501 WireGuard-0.0.20190702.tar.xz" diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index 549bc4181..f427f5425 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wpa_supplicant pkgver=2.8 -pkgrel=0 +pkgrel=1 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" @@ -14,6 +14,7 @@ makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev" source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz wpa_supplicant.initd wpa_supplicant.confd + wpa_supplicant.conf dbus.patch eloop.patch @@ -67,6 +68,8 @@ package() { "$pkgdir"/etc/init.d/wpa_supplicant install -Dm644 "$srcdir"/wpa_supplicant.confd \ "$pkgdir"/etc/conf.d/wpa_supplicant + install -Dm640 "$srcdir"/wpa_supplicant.conf \ + "$pkgdir"/etc/wpa_supplicant/wpa_supplicant.conf # work around netifrc braindamage mkdir -p "$pkgdir"/bin @@ -98,6 +101,7 @@ wpa_gui() { sha512sums="b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b wpa_supplicant-2.8.tar.gz 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc wpa_supplicant.initd 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd +f8b224b6c5a8adf378d8224beb49f2a99817d303f7e6a724943ecb3313ae85ce0fdd8291a20c95563470681ebf5d991ffa31094b9171e470e9690b38bba25738 wpa_supplicant.conf dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed dbus.patch 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch 221660fa0350442a7d8371686b2118861052a4613fb352b7f80079e3750b82f4e48efc378b9d617455007d1106552b695fdca506a3c338283986641f3848b202 config diff --git a/user/wpa_supplicant/wpa_supplicant.conf b/user/wpa_supplicant/wpa_supplicant.conf new file mode 100644 index 000000000..b8876ffd6 --- /dev/null +++ b/user/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,4 @@ +# Enable the control interface for wpa_cli and wpa_gui +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=wheel +update_config=1 diff --git a/user/wv/APKBUILD b/user/wv/APKBUILD index ec9a0a081..8211b555d 100644 --- a/user/wv/APKBUILD +++ b/user/wv/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: multiplexd <multi@in-addr.xyz> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wv pkgver=1.2.9 pkgrel=0 @@ -19,7 +19,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,7 +28,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index e9e904448..ee024e92d 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfburn pkgver=0.5.5 -pkgrel=0 +pkgrel=1 pkgdesc="CD burning utility for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev libxfce4ui-dev exo-dev libgudev-dev gstreamer-dev gst-plugins-base-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 92a917018..a38613cc7 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-appfinder pkgver=4.13.3 -pkgrel=0 +pkgrel=1 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev garcon-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-appfinder/4.13/xfce4-appfinder-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 9cb4c146c..b99788836 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-battery-plugin pkgver=1.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Battery monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD index e96f04999..2ca1be37e 100644 --- a/user/xfce4-clipman-plugin/APKBUILD +++ b/user/xfce4-clipman-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-clipman-plugin pkgver=1.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Clipboard management plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libqrencode-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 3aef0d879..3c8e305a9 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -2,26 +2,23 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-cpugraph-plugin pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Graphical CPU monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD index a1bac7cb1..3fdc09ddf 100644 --- a/user/xfce4-diskperf-plugin/APKBUILD +++ b/user/xfce4-diskperf-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-diskperf-plugin pkgver=2.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Disk performance monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="BSD-2-Clause AND GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD index db59691a5..c0d02810f 100644 --- a/user/xfce4-indicator-plugin/APKBUILD +++ b/user/xfce4-indicator-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-indicator-plugin pkgver=2.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="Application information plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libindicator-dev ido-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD index 139ec29b5..2b72c4f2c 100644 --- a/user/xfce4-netload-plugin/APKBUILD +++ b/user/xfce4-netload-plugin/APKBUILD @@ -2,20 +2,18 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-netload-plugin pkgver=1.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Network monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2 +source="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2 no-sysctl.patch" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 29a9bcee3..5bc42afc4 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-notifyd pkgver=0.4.4 -pkgrel=0 +pkgrel=1 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0-only AND GPL-2.0+" makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-$pkgver.tar.bz2" build() { - cd "$builddir" - LIBS="-lX11" ./configure \ + LIBS="-lintl -lX11" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index 9594fc9a8..9c844b5ca 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-panel pkgver=4.13.5 -pkgrel=0 +pkgrel=1 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="LGPL-2.1+ AND GPL-2.0+" makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev libwnck-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index dd6dab858..9fac4619b 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-power-manager pkgver=1.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev upower-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index 8a1e6cb34..6d7f04117 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-pulseaudio-plugin pkgver=0.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Pulseaudio plugin for the XFCE panel" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev keybinder-3.0-dev libnotify-dev dbus-glib-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index 376b6786d..8682bc2c6 100644 --- a/user/xfce4-sensors-plugin/APKBUILD +++ b/user/xfce4-sensors-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-sensors-plugin pkgver=1.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Hardware sensor monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index 5b431f963..45984c85d 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-session pkgver=4.13.2 -pkgrel=0 +pkgrel=1 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,12 +11,10 @@ depends="iceauth cmd:which xdg-user-dirs" makedepends="intltool gtk+3.0-dev libice-dev libsm-dev libxfce4util-dev libxfce4ui-dev libwnck-dev iceauth dbus-glib-dev polkit-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="https://archive.xfce.org/src/xfce/xfce4-session/4.13/xfce4-session-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index 7fc818d88..70798f6ce 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-settings pkgver=4.13.6 -pkgrel=0 +pkgrel=1 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+ AND MIT AND LGPL-2.0+" makedepends="intltool exo-dev garcon-dev libnotify-dev upower-dev libxklavier-dev xf86-input-libinput-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -28,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 7545e3a0a..c29c895c9 100644 --- a/user/xfce4-systemload-plugin/APKBUILD +++ b/user/xfce4-systemload-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-systemload-plugin pkgver=1.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="System load monitor plugin for the XFCE panel" url="https://xfce.org" arch="all" license="BSD-2-Clause" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index eca6f23c5..4ab646532 100644 --- a/user/xfce4-terminal/APKBUILD +++ b/user/xfce4-terminal/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-terminal pkgver=0.8.7.4 -pkgrel=0 +pkgrel=1 pkgdesc="Terminal for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index 910bd6425..9a910af8d 100644 --- a/user/xfce4-time-out-plugin/APKBUILD +++ b/user/xfce4-time-out-plugin/APKBUILD @@ -2,26 +2,23 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-time-out-plugin pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Forced computer break plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare chmod a+w config.sub update_config_sub } build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index 6e76d0772..b59b00931 100644 --- a/user/xfce4-timer-plugin/APKBUILD +++ b/user/xfce4-timer-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-timer-plugin pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Timer plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD index b4b386853..935a39a5f 100644 --- a/user/xfce4-verve-plugin/APKBUILD +++ b/user/xfce4-verve-plugin/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-verve-plugin pkgver=2.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="Command-line plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" makedepends="intltool libxfce4ui-dev xfce4-panel-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index 74dd12c7d..5486de7dd 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfconf pkgver=4.13.7 -pkgrel=0 +pkgrel=1 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -11,12 +11,10 @@ license="LGPL-2.1+ AND GPL-2.0+" depends="dbus" makedepends="intltool gtk+3.0-dev libxfce4util-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index b192385d0..af4013ff8 100644 --- a/user/xfdashboard/APKBUILD +++ b/user/xfdashboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfdashboard pkgver=0.7.5 -pkgrel=0 +pkgrel=1 pkgdesc="Gnome dashboard clone for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libwnck-dev libice-dev garcon-dev libxfce4ui-dev clutter-dev" subpackages="$pkgname-dev $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfdashboard/0.7/xfdashboard-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index 920f041d3..d4e435c18 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfdesktop pkgver=4.13.4 -pkgrel=0 +pkgrel=1 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev exo-dev garcon-dev libnotify-dev thunar-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfdesktop/4.13/xfdesktop-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD index 3484444cd..dc889ea14 100644 --- a/user/xfmpc/APKBUILD +++ b/user/xfmpc/APKBUILD @@ -2,19 +2,17 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfmpc pkgver=0.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Graphical music player daemon client for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -25,12 +23,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 130fc60d9..040bf7520 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfwm4 pkgver=4.13.2 -pkgrel=0 +pkgrel=1 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" @@ -10,12 +10,10 @@ license="GPL-2.0+" makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev gobject-introspection-dev vala-dev" subpackages="$pkgname-lang" -langdir="/usr/lib/locale" -source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/xsane/APKBUILD b/user/xsane/APKBUILD index 05cf220e4..3c17b6f6d 100644 --- a/user/xsane/APKBUILD +++ b/user/xsane/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xsane pkgver=0.999 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical scanning software" url=" " arch="all" @@ -12,15 +12,13 @@ depends="" makedepends="gtk+2.0-dev lcms2-dev libjpeg-turbo-dev libpng-dev sane-dev tiff-dev" subpackages="$pkgname-doc $pkgname-lang" -langdir="/usr/lib/locale" source="http://distfiles.gentoo.org/distfiles/xsane-$pkgver.tar.gz xsane-0.999-lcms2.patch xsane-0.999-libpng16.patch " build() { - cd "$builddir" - ./configure \ + LIBS="-lintl" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -31,7 +29,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } |