diff options
43 files changed, 309 insertions, 751 deletions
diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index dfdd3ae61..a95050c83 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=cryptsetup -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=0 pkgdesc="Setup tool for block device encryption" url="https://gitlab.com/cryptsetup/cryptsetup" @@ -56,6 +56,6 @@ libs() { mv "$pkgdir"/lib "$subpkgdir"/ } -sha512sums="f5e2d733b1897f85aec0bd940efd9fb4f20e3628c39f1c00b3a9707ce4c0d9f4192e67dab0588a889ba148874c52bbb410634349490ff8ea7b779c5f8bd7bdd8 cryptsetup-2.2.0.tar.gz +sha512sums="697d77e756a3eeb8138f974a2259d4f7b9cd32c6d5569b0b04866747abb2a48ae5ed914a044ec8513bc66bbe0a9d10a439cb55f22c7c147b52561c870e964e65 cryptsetup-2.2.1.tar.gz 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd 81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd" diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index b0b3bc585..146fff618 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=fakeroot -pkgver=1.23 +pkgver=1.24 pkgrel=0 pkgdesc="Utility to provide a 'fake' root environment as a non-privileged user" arch="all" @@ -12,7 +12,7 @@ makedepends_host="libcap-dev acl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" checkdepends="bash sharutils" subpackages="$pkgname-doc" -source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.xz +source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz fakeroot-hide-dlsym-errors.patch fakeroot-no64.patch fakeroot-stdint.patch @@ -45,7 +45,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036 fakeroot_1.23.orig.tar.xz +sha512sums="b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 fakeroot_1.24.orig.tar.gz 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354 fakeroot-hide-dlsym-errors.patch 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD index 05a9d955a..c789cd3a0 100644 --- a/system/findutils/APKBUILD +++ b/system/findutils/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=findutils -pkgver=4.6.0 -pkgrel=2 +pkgver=4.7.0 +pkgrel=0 pkgdesc="GNU utilities for finding files" url="https://www.gnu.org/software/findutils/" arch="all" @@ -12,10 +12,10 @@ depends="" makedepends="" checkdepends="coreutils diffutils dejagnu" subpackages="$pkgname-doc $pkgname-lang" -source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz - localename-test-fix.patch +source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch sysmacros.patch + gnulib-test-datetime.patch " build() { @@ -39,7 +39,7 @@ package() { rm -rf "$pkgdir"/usr/lib } -sha512sums="41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4 findutils-4.6.0.tar.gz -39fc0bc7602dd5300cf0b5488a7d14b6d00e05fedd6067ff45a229e65ff020d0003c0bb8e43807d9874afeb39c1dae6d612182caeb7de76156e1bc6ceb50adfc localename-test-fix.patch -96351821572bee9e23760568b5a9f326c8727b6904a8b9f6fc8e5b8e14b42265c632cea09a913db830844f3015f91a03b9c4dd72862f40a3c3814556497434e2 gnulib-tests-dont-require-gpg-passphrase.patch -2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch" +sha512sums="650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e findutils-4.7.0.tar.xz +dc7e9c4fdd36d05ca230e3456a8005a5fcd353db07181e0d17ab66db4eb967e6bdfe3b6f1da0edbb38e973fea89ae174ea31e6839f59d3084b15f08de363f139 gnulib-tests-dont-require-gpg-passphrase.patch +2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch +8e367ba108b66ea27b2a289e51acbdf540d7e7ab5dfb8347a007eaf763355707db43c44e530fbec40f47578405880ff99d34eec97570365f2ab3439c4f1bf358 gnulib-test-datetime.patch" diff --git a/system/findutils/gnulib-test-datetime.patch b/system/findutils/gnulib-test-datetime.patch new file mode 100644 index 000000000..2b227fc27 --- /dev/null +++ b/system/findutils/gnulib-test-datetime.patch @@ -0,0 +1,24 @@ +--- coreutils-8.31/gnulib-tests/test-parse-datetime.c.old 2019-06-01 07:46:25.716292871 +0000 ++++ coreutils-8.31/gnulib-tests/test-parse-datetime.c 2019-06-01 22:07:59.456653669 +0000 +@@ -432,21 +432,5 @@ + ASSERT ( parse_datetime (&result, "TZ=\"\\\\\"", &now)); + ASSERT ( parse_datetime (&result, "TZ=\"\\\"\"", &now)); + +- /* Outlandishly-long time zone abbreviations should not cause problems. */ +- { +- static char const bufprefix[] = "TZ=\""; +- enum { tzname_len = 2000 }; +- static char const bufsuffix[] = "0\" 1970-01-01 01:02:03.123456789"; +- enum { bufsize = sizeof bufprefix - 1 + tzname_len + sizeof bufsuffix }; +- char buf[bufsize]; +- memcpy (buf, bufprefix, sizeof bufprefix - 1); +- memset (buf + sizeof bufprefix - 1, 'X', tzname_len); +- strcpy (buf + bufsize - sizeof bufsuffix, bufsuffix); +- ASSERT (parse_datetime (&result, buf, &now)); +- LOG (buf, now, result); +- ASSERT (result.tv_sec == 1 * 60 * 60 + 2 * 60 + 3 +- && result.tv_nsec == 123456789); +- } +- + return 0; + } diff --git a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch index 755126f64..46b921ff9 100644 --- a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch +++ b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch @@ -1,5 +1,5 @@ ---- findutils-4.6.0/tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 -+++ findutils-4.6.0/tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 +--- findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 ++++ findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 @@ -32,6 +32,7 @@ touch d/a b c && git config user.email "you@example.com" && diff --git a/system/findutils/localename-test-fix.patch b/system/findutils/localename-test-fix.patch deleted file mode 100644 index 666261f03..000000000 --- a/system/findutils/localename-test-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- findutils-4.6.0/tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000 -+++ findutils-4.6.0/tests/localename.c 2017-07-30 16:40:47.098541270 +0000 -@@ -40,7 +40,7 @@ - # if defined __APPLE__ && defined __MACH__ - # include <xlocale.h> - # endif --# if __GLIBC__ >= 2 && !defined __UCLIBC__ -+# if defined __linux__ - # include <langinfo.h> - # endif - # if !defined IN_LIBINTL -@@ -2692,16 +2692,19 @@ - locale_t thread_locale = uselocale (NULL); - if (thread_locale != LC_GLOBAL_LOCALE) - { --# if __GLIBC__ >= 2 && !defined __UCLIBC__ -+# if defined(_NL_LOCALE_NAME) -+ const char *name = nl_langinfo(_NL_LOCALE_NAME(category)); -+# if __GLIBC__ >= 2 && !defined __UCLIBC__ - /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in - glibc < 2.12. - See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */ -- const char *name = -- nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1))); -+ if (name[0] == '\0') -+ name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1))); - if (name[0] == '\0') - /* Fallback code for glibc < 2.4, which did not implement - nl_langinfo (_NL_LOCALE_NAME (category)). */ - name = thread_locale->__names[category]; -+# endif - return name; - # elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__) - /* FreeBSD, Mac OS X */ diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index b21a0be09..d41559e46 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd pkgver=0.1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -20,15 +20,11 @@ build() { } package() { - svcdir="$pkgdir/etc/s6-linux-init/current/run-image/service/mdevd" cd "$builddir" make DESTDIR="$pkgdir" install - mkdir -p -m 0755 "$svcdir" + mkdir -p -m 0755 "$pkgdir/etc" cp -f "$srcdir/mdev.conf" "$pkgdir/etc/" chmod 0644 "$pkgdir/etc/mdev.conf" - cp -f "$srcdir/mdevd.run" "$svcdir/run" - echo 3 > "$svcdir/notification-fd" - touch "$svcdir/down" } @@ -43,10 +39,14 @@ doc() { openrc() { rldir="$subpkgdir"/etc/runlevels/sysinit + svcdir="$subpkgdir/etc/s6-linux-init/current/run-image/service/mdevd" default_openrc - mkdir -p "$rldir" + mkdir -p "$rldir" "$svcdir" + cp -f "$srcdir/mdevd.run" "$svcdir/run" + chmod 0755 "$svcdir/run" + echo 3 > "$svcdir/notification-fd" + touch "$svcdir/down" ln -s ../../init.d/mdevd "$rldir/mdevd" - ln -s ../../init.d/mdevd-coldplug "$rldir/mdevd-coldplug" } sha512sums="94bbcaf0c39511da392c932c5d38ced7029727a46997877d03bba41fc7302df3d4400d3957be9361055e954f3a22b785db40d56bb2f031bc49bb2f398179efe0 mdevd-0.1.1.0.tar.gz diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index 5c95298d1..1cc77301b 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.23 -pkgrel=2 +pkgver=1.1.24 +pkgrel=0 pkgdesc="System library (libc) implementation" url="https://www.musl-libc.org/" arch="all" @@ -26,9 +26,7 @@ source="https://www.musl-libc.org/releases/musl-$pkgver.tar.gz 3001-make-real-lastlog-h.patch handle-aux-at_base.patch fgetspent_r.patch - powerpc-wchar_t.patch strftime-add-l-support.patch - x87-math.patch ldconfig getent.c @@ -119,14 +117,12 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09 musl-1.1.23.tar.gz +sha512sums="8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77 musl-1.1.24.tar.gz ef532aebeaa89b3274f7f75f1adaa4d1eea60f4e2822a6711c748768cc3a65a77ebd218d7a8ab41157684f7855dd4c5c2cdea7461b7569264d3517deba0ef9b2 amalgamation.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch -fda015fad0d0a65efb192c08d201b2f5b2bfff18c43b551855b119a1d63213bd417a93a6b2965e68243884c5b17b34a585795cc4cace603788d37149e933cfb1 powerpc-wchar_t.patch 7ed6c620a5ea5585c323936b1ff01eb7f01a1192240706a0d0470b661a7a03ea10ed17507c59678aaedce51b7a5ea839c2f528f19f12de02119bf4e47f7c3998 strftime-add-l-support.patch -e3c98f64e901ac08a4a7dfbb7c46fb6ecc1cc7e825a8f4834b5a9dd1cafaa2e8ee1ccf6c55c7f07cc4ede9c54cd039e61dec41df6b973fac1ad42e7d3faa1932 x87-math.patch cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/powerpc-wchar_t.patch b/system/musl/powerpc-wchar_t.patch deleted file mode 100644 index 62b24a5f1..000000000 --- a/system/musl/powerpc-wchar_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0da9cc40f861293db7baba3854b44d73658b168d Mon Sep 17 00:00:00 2001 -From: q66 <daniel@octaforge.org> -Date: Wed, 22 May 2019 13:18:53 +0200 -Subject: [PATCH] properly deal with wchar_t definition on 32-bit powerpc - -Clang defines it to be int, gcc defines it to be long. The old -code results in conflicts when building things with clang. This -same change is already incorporated for i386 in musl upstream, -so apply it to powerpc as well. - -diff --git a/arch/powerpc/bits/alltypes.h.in b/arch/powerpc/bits/alltypes.h.in ---- a/arch/powerpc/bits/alltypes.h.in -+++ b/arch/powerpc/bits/alltypes.h.in -@@ -6,8 +6,12 @@ TYPEDEF __builtin_va_list va_list; - TYPEDEF __builtin_va_list __isoc_va_list; - - #ifndef __cplusplus -+#ifdef __WCHAR_TYPE__ -+TYPEDEF __WCHAR_TYPE__ wchar_t; -+#else - TYPEDEF long wchar_t; - #endif -+#endif - - TYPEDEF float float_t; - TYPEDEF double double_t; diff --git a/system/musl/x87-math.patch b/system/musl/x87-math.patch deleted file mode 100644 index d21be43b3..000000000 --- a/system/musl/x87-math.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff --git a/src/math/i386/asin.s b/src/math/i386/asin.s -index a9f691bf..920d967a 100644 ---- a/src/math/i386/asin.s -+++ b/src/math/i386/asin.s -@@ -7,13 +7,10 @@ asinf: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret - - .global asinl - .type asinl,@function -@@ -30,11 +27,8 @@ asin: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fsts 4(%esp) --2: ret -+ ret - 1: fld %st(0) - fld1 - fsub %st(0),%st(1) -diff --git a/src/math/i386/atan.s b/src/math/i386/atan.s -index d73137b2..a26feae1 100644 ---- a/src/math/i386/atan.s -+++ b/src/math/i386/atan.s -@@ -10,8 +10,5 @@ atan: - fpatan - ret - # subnormal x, return x with underflow --1: fnstsw %ax -- and $16,%ax -- jnz 2f -- fsts 4(%esp) --2: ret -+1: fsts 4(%esp) -+ ret -diff --git a/src/math/i386/atan2.s b/src/math/i386/atan2.s -index a7d2979b..76b95f31 100644 ---- a/src/math/i386/atan2.s -+++ b/src/math/i386/atan2.s -@@ -10,8 +10,5 @@ atan2: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 1f - fsts 4(%esp) - 1: ret -diff --git a/src/math/i386/atan2f.s b/src/math/i386/atan2f.s -index 14b88ce5..c9408a90 100644 ---- a/src/math/i386/atan2f.s -+++ b/src/math/i386/atan2f.s -@@ -10,9 +10,6 @@ atan2f: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 1f - fld %st(0) - fmul %st(1) - fstps 4(%esp) -diff --git a/src/math/i386/atanf.s b/src/math/i386/atanf.s -index 8caddefa..893beac5 100644 ---- a/src/math/i386/atanf.s -+++ b/src/math/i386/atanf.s -@@ -10,10 +10,7 @@ atanf: - fpatan - ret - # subnormal x, return x with underflow --1: fnstsw %ax -- and $16,%ax -- jnz 2f -- fld %st(0) -+1: fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret -diff --git a/src/math/i386/exp.s b/src/math/i386/exp.s -index c7aa5b6e..df87c497 100644 ---- a/src/math/i386/exp.s -+++ b/src/math/i386/exp.s -@@ -7,13 +7,10 @@ expm1f: - cmp $0x01000000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fld %st(0) - fmul %st(1) - fstps 4(%esp) --2: ret -+ ret - - .global expm1l - .type expm1l,@function -@@ -30,11 +27,8 @@ expm1: - cmp $0x00200000,%eax - jae 1f - # subnormal x, return x with underflow -- fnstsw %ax -- and $16,%ax -- jnz 2f - fsts 4(%esp) --2: ret -+ ret - 1: fldl2e - fmulp - mov $0xc2820000,%eax -diff --git a/src/math/i386/log1p.s b/src/math/i386/log1p.s -index 6b6929c7..354f391a 100644 ---- a/src/math/i386/log1p.s -+++ b/src/math/i386/log1p.s -@@ -16,9 +16,6 @@ log1p: - fyl2x - ret - # subnormal x, return x with underflow --2: fnstsw %ax -- and $16,%ax -- jnz 1f -- fsts 4(%esp) -+2: fsts 4(%esp) - fstp %st(1) --1: ret -+ ret -diff --git a/src/math/i386/log1pf.s b/src/math/i386/log1pf.s -index c0bcd30f..4d3484cd 100644 ---- a/src/math/i386/log1pf.s -+++ b/src/math/i386/log1pf.s -@@ -16,10 +16,7 @@ log1pf: - fyl2x - ret - # subnormal x, return x with underflow --2: fnstsw %ax -- and $16,%ax -- jnz 1f -- fxch -+2: fxch - fmul %st(1) - fstps 4(%esp) --1: ret -+ ret - diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD index 4fefa4e22..f5d28b236 100644 --- a/system/python3/APKBUILD +++ b/system/python3/APKBUILD @@ -3,7 +3,7 @@ pkgname=python3 pkgver=3.6.9 _basever="${pkgver%.*}" -pkgrel=1 +pkgrel=2 pkgdesc="A high-level scripting language" url="https://www.python.org" arch="all" @@ -41,6 +41,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz musl-find_library.patch fix-xattrs-glibc.patch CVE-2019-16056.patch + CVE-2019-16935.patch " builddir="$srcdir/Python-$pkgver" @@ -60,6 +61,8 @@ builddir="$srcdir/Python-$pkgver" # - CVE-2019-9948 # 3.6.9-r1: # - CVE-2019-16056 +# 3.6.9-r2: +# - CVE-2019-16935 prepare() { default_prepare @@ -139,13 +142,14 @@ EOF # dumb fail="$fail test_ssl" # tries to do SSLv2 which we have disabled in OpenSSL - # needs network but doesn't declare it - fail="$fail test_normalization" + # hangs when run with other tests - run separately + fail="$fail test_threading" - # defaults from Tools/scripts/run_tests.py, with -network added - use="all,-largefile,-audio,-gui,-network" + # defaults from Tools/scripts/run_tests.py + -network,-urlfetch + use="all,-largefile,-audio,-gui,-network,-urlfetch" make quicktest TESTOPTS="--use '$use' --exclude $fail" + make test TESTOPTS="test_threading" } package() { @@ -188,4 +192,5 @@ wininst() { sha512sums="05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819 Python-3.6.9.tar.xz ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch 37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad fix-xattrs-glibc.patch -1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0 CVE-2019-16056.patch" +1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0 CVE-2019-16056.patch +7f94d887c81f79d90afd4a9621547c13cbdd0232250f62a686b26a63160a4d286a6db9b342d06b9b63af64f994835b489c37bab499a2093c3c2585dc7a04d8a1 CVE-2019-16935.patch" diff --git a/system/python3/CVE-2019-16935.patch b/system/python3/CVE-2019-16935.patch new file mode 100644 index 000000000..567eb90fc --- /dev/null +++ b/system/python3/CVE-2019-16935.patch @@ -0,0 +1,80 @@ +From 1698cacfb924d1df452e78d11a4bf81ae7777389 Mon Sep 17 00:00:00 2001 +From: Victor Stinner <vstinner@redhat.com> +Date: Sat, 28 Sep 2019 09:33:00 +0200 +Subject: [PATCH] bpo-38243, xmlrpc.server: Escape the server_title (GH-16373) + (GH-16441) + +Escape the server title of xmlrpc.server.DocXMLRPCServer +when rendering the document page as HTML. + +(cherry picked from commit e8650a4f8c7fb76f570d4ca9c1fbe44e91c8dfaa) +--- + Lib/test/test_docxmlrpc.py | 16 ++++++++++++++++ + Lib/xmlrpc/server.py | 3 ++- + .../2019-09-25-13-21-09.bpo-38243.1pfz24.rst | 3 +++ + 3 files changed, 21 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst + +diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py +index 00903337c07c2..d2adb21af0fb3 100644 +--- a/Lib/test/test_docxmlrpc.py ++++ b/Lib/test/test_docxmlrpc.py +@@ -1,5 +1,6 @@ + from xmlrpc.server import DocXMLRPCServer + import http.client ++import re + import sys + from test import support + threading = support.import_module('threading') +@@ -193,6 +194,21 @@ def test_annotations(self): + b'method_annotation</strong></a>(x: bytes)</dt></dl>'), + response.read()) + ++ def test_server_title_escape(self): ++ # bpo-38243: Ensure that the server title and documentation ++ # are escaped for HTML. ++ self.serv.set_server_title('test_title<script>') ++ self.serv.set_server_documentation('test_documentation<script>') ++ self.assertEqual('test_title<script>', self.serv.server_title) ++ self.assertEqual('test_documentation<script>', ++ self.serv.server_documentation) ++ ++ generated = self.serv.generate_html_documentation() ++ title = re.search(r'<title>(.+?)</title>', generated).group() ++ documentation = re.search(r'<p><tt>(.+?)</tt></p>', generated).group() ++ self.assertEqual('<title>Python: test_title<script></title>', title) ++ self.assertEqual('<p><tt>test_documentation<script></tt></p>', documentation) ++ + + if __name__ == '__main__': + unittest.main() +diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py +index 3e0dca027f068..efe593748968c 100644 +--- a/Lib/xmlrpc/server.py ++++ b/Lib/xmlrpc/server.py +@@ -106,6 +106,7 @@ def export_add(self, x, y): + + from xmlrpc.client import Fault, dumps, loads, gzip_encode, gzip_decode + from http.server import BaseHTTPRequestHandler ++import html + import http.server + import socketserver + import sys +@@ -904,7 +905,7 @@ def generate_html_documentation(self): + methods + ) + +- return documenter.page(self.server_title, documentation) ++ return documenter.page(html.escape(self.server_title), documentation) + + class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): + """XML-RPC and documentation request handler class. +diff --git a/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst +new file mode 100644 +index 0000000000000..98d7be129573a +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst +@@ -0,0 +1,3 @@ ++Escape the server title of :class:`xmlrpc.server.DocXMLRPCServer` ++when rendering the document page as HTML. ++(Contributed by Dong-hee Na in :issue:`38243`.) diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 2cb62343a..3bad54e5e 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=sudo -pkgver=1.8.27 +pkgver=1.8.28 if [ "${pkgver%_*}" != "$pkgver" ]; then _realver=${pkgver%_*}${pkgver#*_} else @@ -23,13 +23,15 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz fix-cross-compile.patch musl-fix-headers.patch - test-suite.patch + SIGUNUSED.patch " builddir="$srcdir"/$pkgname-$_realver # secfixes: # 1.8.20_p2-r0: -# - CVE-2017-1000368 +# - CVE-2017-1000368 +# 1.8.28: +# - CVE-2019-14287 build() { ./configure \ @@ -45,6 +47,11 @@ build() { --with-passprompt="[sudo] Password for %p: " \ --with-insults=disabled \ --with-all-insults + + # Workaround until SIGUNUSED.patch is not needed anymore + rm lib/util/mksiglist.h lib/util/mksigname.h + make -C lib/util DEVEL=1 mksiglist.h mksigname.h + make } @@ -60,7 +67,7 @@ package() { rm -rf "$pkgdir"/var/run } -sha512sums="0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac sudo-1.8.27.tar.gz +sha512sums="09e589cdfd18d7c43b0859a0e11c008b3cb995ae4f8c89c717c5242db9e5696361eb574ebe74a0b5316afffb3a8037f7a7f3c249176e8ed9caffeb4cd860ddc7 sudo-1.8.28.tar.gz f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c fix-cross-compile.patch dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62 musl-fix-headers.patch -3feb9f586fb36cdddaf61523926554533d73b4b03e7bfe5da40b754d68c4cc58c796310cc3a3419dd0d87d30d836d5f9921f5ea3c7c7a0099626f49c161279dc test-suite.patch" +2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78 SIGUNUSED.patch" diff --git a/system/sudo/SIGUNUSED.patch b/system/sudo/SIGUNUSED.patch new file mode 100644 index 000000000..969c3e82d --- /dev/null +++ b/system/sudo/SIGUNUSED.patch @@ -0,0 +1,16 @@ +--- sudo-1.8.28/lib/util/siglist.in 2019-10-10 11:32:54.000000000 -0500 ++++ sudo-1.8.28/lib/util/siglist.in 2019-10-14 16:42:46.259938722 -0500 +@@ -17,11 +17,12 @@ + EMT EMT trap + FPE Floating point exception + KILL Killed ++# before UNUSED (musl defines them as the same number) ++ SYS Bad system call + # before BUS (Older Linux doesn't really have a BUS, but defines it to UNUSED) + UNUSED Unused + BUS Bus error + SEGV Memory fault +- SYS Bad system call + PIPE Broken pipe + ALRM Alarm clock + TERM Terminated diff --git a/system/sudo/test-suite.patch b/system/sudo/test-suite.patch deleted file mode 100644 index eb19ff09c..000000000 --- a/system/sudo/test-suite.patch +++ /dev/null @@ -1,407 +0,0 @@ - -# HG changeset patch -# User Todd C. Miller <Todd.Miller@sudo.ws> -# Date 1552053510 25200 -# Node ID e82a381f4f3de693f880aab2781fd65c01030ec0 -# Parent 09a915110812b9d6603995aa27be94b71c5df1e7 -Test cvtsudoers stdout and stderr separately. -Fixes a test failure on systems with musl libc. Bug #873 - -diff -r 09a915110812 -r e82a381f4f3d MANIFEST ---- a/MANIFEST Wed Mar 06 20:15:11 2019 -0700 -+++ b/MANIFEST Fri Mar 08 06:58:30 2019 -0700 -@@ -450,6 +450,7 @@ - plugins/sudoers/regress/cvtsudoers/test24.sh - plugins/sudoers/regress/cvtsudoers/test25.out.ok - plugins/sudoers/regress/cvtsudoers/test25.sh -+plugins/sudoers/regress/cvtsudoers/test26.err.ok - plugins/sudoers/regress/cvtsudoers/test26.out.ok - plugins/sudoers/regress/cvtsudoers/test26.sh - plugins/sudoers/regress/cvtsudoers/test27.out.ok -@@ -465,6 +466,7 @@ - plugins/sudoers/regress/cvtsudoers/test31.conf - plugins/sudoers/regress/cvtsudoers/test31.out.ok - plugins/sudoers/regress/cvtsudoers/test31.sh -+plugins/sudoers/regress/cvtsudoers/test32.err.ok - plugins/sudoers/regress/cvtsudoers/test32.out.ok - plugins/sudoers/regress/cvtsudoers/test32.sh - plugins/sudoers/regress/cvtsudoers/test33.out.ok -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test1.sh ---- a/plugins/sudoers/regress/cvtsudoers/test1.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test1.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test user and host filters - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test10.sh ---- a/plugins/sudoers/regress/cvtsudoers/test10.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test10.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test command defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test11.sh ---- a/plugins/sudoers/regress/cvtsudoers/test11.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test11.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test12.sh ---- a/plugins/sudoers/regress/cvtsudoers/test12.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test12.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test13.sh ---- a/plugins/sudoers/regress/cvtsudoers/test13.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test13.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test14.sh ---- a/plugins/sudoers/regress/cvtsudoers/test14.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test14.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test that Aliases are removed when filtering by defaults type - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test15.sh ---- a/plugins/sudoers/regress/cvtsudoers/test15.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test15.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF - user1, user2, user3, %group1 host1, host2, host3 = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test16.sh ---- a/plugins/sudoers/regress/cvtsudoers/test16.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test16.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF - user1, user2, user3, %group1 host1, host2, host3 = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test17.sh ---- a/plugins/sudoers/regress/cvtsudoers/test17.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test17.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF - user1, user2, user3, %group1 host1, host2, host3 = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test18.sh ---- a/plugins/sudoers/regress/cvtsudoers/test18.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test18.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test filters and pruning - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF - user1, user2, user3, %group1 ALL = ALL - EOF -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test19.sh ---- a/plugins/sudoers/regress/cvtsudoers/test19.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test19.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,5 +3,4 @@ - # Test filters and pruning; alias contents don't get pruned - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test2.sh ---- a/plugins/sudoers/regress/cvtsudoers/test2.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test2.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test user and host filters, expanding aliases - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test20.sh ---- a/plugins/sudoers/regress/cvtsudoers/test20.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test20.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf - # - --exec 2>&1 - ./cvtsudoers -c $TESTDIR/test20.conf <<EOF - Defaults:SOMEUSERS authenticate, timestamp_timeout=0 - User_Alias SOMEUSERS = user1, user2, user3 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test21.sh ---- a/plugins/sudoers/regress/cvtsudoers/test21.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test21.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf - # - --exec 2>&1 - ./cvtsudoers -c $TESTDIR/test21.conf <<EOF - Defaults authenticate, timestamp_timeout=0 - User_Alias FULLTIMERS = user1, user2, user3 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test22.sh ---- a/plugins/sudoers/regress/cvtsudoers/test22.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test22.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP base filtering. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test23.sh ---- a/plugins/sudoers/regress/cvtsudoers/test23.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test23.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,6 +3,5 @@ - # Test round-tripping of sudoers -> LDIF -> sudoers - # - --exec 2>&1 - ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \ - ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#' -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test24.sh ---- a/plugins/sudoers/regress/cvtsudoers/test24.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test24.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,6 +3,5 @@ - # Test round-tripping of LDIF -> sudoers -> LDIF - # - --exec 2>&1 - ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \ - ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test25.sh ---- a/plugins/sudoers/regress/cvtsudoers/test25.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test25.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDIF base64 attribute parsing - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF - # defaults, SUDOers, sudo.ws - dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.err.ok ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -0,0 +1,3 @@ -+cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA== -+cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M= -+cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!== -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.out.ok ---- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -1,3 +0,0 @@ --cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA== --cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M= --cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!== -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.sh ---- a/plugins/sudoers/regress/cvtsudoers/test26.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test26.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDIF invalid base64 attribute parsing - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF - # defaults, SUDOers, sudo.ws - dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test27.sh ---- a/plugins/sudoers/regress/cvtsudoers/test27.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test27.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test base64 encoding of non-safe strings - # - --exec 2>&1 - ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF - Defaults badpass_message="Bad password¡" - -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test28.sh ---- a/plugins/sudoers/regress/cvtsudoers/test28.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test28.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP sudoOrder when converting to sudoers. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -f sudoers <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test29.sh ---- a/plugins/sudoers/regress/cvtsudoers/test29.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test29.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP sudoOrder when converting to sudoers. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -f sudoers <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test3.sh ---- a/plugins/sudoers/regress/cvtsudoers/test3.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test3.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test group and host filters - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test30.sh ---- a/plugins/sudoers/regress/cvtsudoers/test30.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test30.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -4,7 +4,6 @@ - # See https://bugzilla.sudo.ws/show_bug.cgi?id=853 - # - --exec 2>&1 - ./cvtsudoers -c "" -e -f json <<EOF - Cmnd_Alias CMDA=/path/to/cmda - Cmnd_Alias CMDB=/path/to/cmdb -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test31.sh ---- a/plugins/sudoers/regress/cvtsudoers/test31.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test31.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf with padding - # - --exec 2>&1 - ./cvtsudoers -c $TESTDIR/test31.conf <<EOF - Defaults authenticate, timestamp_timeout=0 - User_Alias FULLTIMERS = user1, user2, user3 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.err.ok ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -0,0 +1,1 @@ -+cvtsudoers: too many sudoers entries, maximum 10 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.out.ok ---- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok Fri Mar 08 06:58:30 2019 -0700 -@@ -1,4 +1,3 @@ --cvtsudoers: too many sudoers entries, maximum 10 - dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com - objectClass: top - objectClass: sudoRole -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.sh ---- a/plugins/sudoers/regress/cvtsudoers/test32.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test32.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test cvtsudoers.conf with invalid padding - # - --exec 2>&1 - ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF - user0 ALL = (ALL:ALL) ALL - user1 ALL = (ALL:ALL) ALL -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test33.sh ---- a/plugins/sudoers/regress/cvtsudoers/test33.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test33.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers. - # - --exec 2>&1 - ./cvtsudoers -c "" -i ldif -f sudoers <<EOF - dn: dc=sudo,dc=ws - objectClass: dcObject -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test4.sh ---- a/plugins/sudoers/regress/cvtsudoers/test4.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test4.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test group and host filters, expanding aliases - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test5.sh ---- a/plugins/sudoers/regress/cvtsudoers/test5.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test5.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test defaults type filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test6.sh ---- a/plugins/sudoers/regress/cvtsudoers/test6.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test6.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test global defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test7.sh ---- a/plugins/sudoers/regress/cvtsudoers/test7.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test7.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test user defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test8.sh ---- a/plugins/sudoers/regress/cvtsudoers/test8.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test8.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test runas defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers - - exit 0 -diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test9.sh ---- a/plugins/sudoers/regress/cvtsudoers/test9.sh Wed Mar 06 20:15:11 2019 -0700 -+++ b/plugins/sudoers/regress/cvtsudoers/test9.sh Fri Mar 08 06:58:30 2019 -0700 -@@ -3,7 +3,6 @@ - # Test host defaults filtering - # - --exec 2>&1 - ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers - - exit 0 - diff --git a/system/zsh/APKBUILD b/system/zsh/APKBUILD index 695a26a1d..a85083fc4 100644 --- a/system/zsh/APKBUILD +++ b/system/zsh/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=zsh pkgver=5.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="A very advanced and programmable command interpreter (shell)" url="https://www.zsh.org/" arch="all" @@ -178,6 +178,6 @@ _submv() { } sha512sums="a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0 zsh-5.7.1.tar.xz -7d46b958a3402214a1982a4fbb71b9916b385e295593202e2cc4893f278b4faec6950c02b9924551687e3f6e53c727d5b6f2a8d39bc0e7abe33bedc0110f96ac skel +d820fcf65bb3c52f23e968110b5df1188fc0b64079312f64d22ffe35de3b4f3055d4d629b3b0f97a1bfaddf62dbc80676af31c3a1a79645632082abfc854cf97 skel e90723eb790581419498f3ab86fb5d6cab4aaede8c87eb79ead7047d259b643cfb47f4d1beb06d03e038cfda3a20ef9dd4c1b417270ab55c688e166fe30ef4f6 zprofile 1675e016f97333cad89b587f4292d81b6bc10e27b75482e3e0c3808539c95bd49b907b6579fb98d817f77f2f2384c0df5afa3e2b6f43b6ae9b466925cd9ccffc zshrc" diff --git a/system/zsh/skel b/system/zsh/skel index e3ddddf99..92bd52b7b 100644 --- a/system/zsh/skel +++ b/system/zsh/skel @@ -1,4 +1,6 @@ # Lines configured by zsh-newuser-install HISTFILE=~/.histfile +HISTSIZE=1000 +SAVEHIST=1000 setopt appendhistory extendedglob # End of lines configured by zsh-newuser-install diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD index a806b93de..4a46b0c93 100644 --- a/user/acpid/APKBUILD +++ b/user/acpid/APKBUILD @@ -7,8 +7,8 @@ # Contributor: multiplexd <multi@in-addr.xyz> pkgname=acpid -pkgver=2.0.31 -pkgrel=1 +pkgver=2.0.32 +pkgrel=0 pkgdesc="Daemon for handling ACPI power management events" url="https://sourceforge.net/projects/acpid2/" arch="all" @@ -24,7 +24,6 @@ source="http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar acpid.confd" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,7 +36,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -m 755 -D "$srcdir"/acpid.initd \ @@ -50,7 +48,7 @@ package() { "$pkgdir"/etc/acpi/handler.sh } -sha512sums="05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a acpid-2.0.31.tar.xz +sha512sums="c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7 acpid-2.0.32.tar.xz 42e8a66c4fd4de3bf0b6adc359c5d5a08e45bf38fc2945c75ab0bf38058c10906e2c84f50895bb85b38e1a19646d91e40a875f2b45f67e07a9336d27bfa2dcd8 handler.sh 2ca236168ce6aaa56c980568c781d6e51590870b7a7936c74bf72532ef3f6c60a369f37597202f3a236d60637fd0daa6611d4ae0348484011ff71871a9914246 default 7381d30b5c6478cdbf5dff93ae95baa0b3b1fe0a04b02cf491831f1657d6f71b8eef121b7e78f3201d11a5856bfb30df0a57437c76e6fbe05ad88cd45e86ae64 acpid.initd diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index d46268780..9a484828f 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters -pkgver=1.25.5 +pkgver=1.25.6 pkgrel=0 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" @@ -59,4 +59,4 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="4e7126f4c439cb7392484dd3531023da5a1c885c7a6c7377260e7cccc2f3f51e3d0aa879965ecdb2625217d6f9ee1ca9c860c4fc05a7959697cd269696f10f59 cups-filters-1.25.5.tar.xz" +sha512sums="14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33 cups-filters-1.25.6.tar.xz" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index f9366a4de..bb270f035 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=enchant -pkgver=2.2.5 +pkgver=2.2.7 pkgrel=0 pkgdesc="Generic library for spell checking" url="https://abiword.github.io/enchant/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cc4d00ea2c94fcf2cef0281e13b86c49cfbff74c60315126bab8b1d91d8da1fb8fd0dc215a1eb44b07d8be33bc54cb9e63107874ef1caa04714fbe4b7484280f enchant-2.2.5.tar.gz" +sha512sums="696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6 enchant-2.2.7.tar.gz" diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD index 03ca23eb3..be9d4e369 100644 --- a/user/ethtool/APKBUILD +++ b/user/ethtool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=ethtool -pkgver=5.2 +pkgver=5.3 pkgrel=0 pkgdesc="Utility for controlling network drivers and hardware" url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/" @@ -39,4 +39,4 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/ } -sha512sums="6b59923d67727895748438d6fb02542dad108aa30fa1ae684af6b6493dbf5eb63fe56fa3fada062c8c7d78efa3dc3c574f874fa13efd81262b59725b193aa2c8 ethtool-5.2.tar.xz" +sha512sums="ad3651f74850e6773489baec27c51d077e3c080eb1d536a585ae05c618304880caf7598df5c9b1416c47ae9c4eac301032f6ea65fe47650dd9ecb7603c1857b0 ethtool-5.3.tar.xz" diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index 6bce7e08f..20a76707d 100644 --- a/user/fuse3/APKBUILD +++ b/user/fuse3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=fuse3 _pkgname=fuse -pkgver=3.6.2 +pkgver=3.7.0 pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" @@ -71,6 +71,6 @@ openrc() { install_if="openrc fuse-common=$pkgver-r$pkgrel" } -sha512sums="e5eb10c66e8585d47430e289d059a3a58ebf3823304fa35e9be413c8d194401ff5093fac82c7c6911b3c5afde6c1c156aa671d333b193d2d739a7ed1632c4bd8 fuse-3.6.2.tar.xz +sha512sums="512ac1fff38fa3fbe768ac02a6b138bb5c58ae9c0c898fde237faab9ecb48dafcb063879942d3845cd85af1f5fbe068626401e7da9afbd7ef2f0820757393585 fuse-3.7.0.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 9b7b14844..78da2678b 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.10 +pkgver=3.24.12 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -23,7 +23,6 @@ source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz builddir="$srcdir"/gtk+-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -45,7 +44,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install # use gtk-update-icon-cache from gtk+2.0 for now @@ -53,4 +51,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498 gtk+-3.24.10.tar.xz" +sha512sums="97554657d83db71ff8b3ea5f650ad38b1ffcc3e8d620be876b5ca435f693e229dffc7341a84bde71bdae13293f2c1d3b2ab1b80a02791132c8a7693cdc21f612 gtk+-3.24.12.tar.xz" diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD index 98fd59e1c..489f85cb5 100644 --- a/user/haveged/APKBUILD +++ b/user/haveged/APKBUILD @@ -3,22 +3,19 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=haveged -pkgver=1.9.4 -pkgrel=1 +pkgver=1.9.8 +pkgrel=0 pkgdesc="Entropy harvesting daemon using CPU timings" url="http://www.issihosts.com/haveged/" arch="all" license="GPL-3.0+" -subpackages="$pkgname-doc $pkgname-openrc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" makedepends="linux-headers" -source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/$pkgver.tar.gz - fix-cpu-cache-size-detection.patch +source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/v$pkgver.tar.gz haveged.initd haveged.confd" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,13 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/libhavege.la @@ -45,7 +39,6 @@ package() { "$pkgdir"/etc/conf.d/haveged } -sha512sums="20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d haveged-1.9.4.tar.gz -6279296b057f19daf25020ac14997268230af4b11510d6e5c4a86989c119d6b081d2501069af198772302d5cce1464514c749033a4928fb95671268825a84ba8 fix-cpu-cache-size-detection.patch +sha512sums="6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db haveged-1.9.8.tar.gz 5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd 58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd" diff --git a/user/haveged/fix-cpu-cache-size-detection.patch b/user/haveged/fix-cpu-cache-size-detection.patch deleted file mode 100644 index 07da2b46d..000000000 --- a/user/haveged/fix-cpu-cache-size-detection.patch +++ /dev/null @@ -1,15 +0,0 @@ -Some ARM cpus does not report the cache size or say it is -1 - -diff --git a/src/havegetune.c b/src/havegetune.c -index f1a99f2..de39c53 100644 ---- a/src/havegetune.c -+++ b/src/havegetune.c -@@ -795,6 +795,8 @@ static int vfs_configInfoCache( - ctype = vfs_configFile(pAnchor, path, vfs_configType); - strcpy(path+plen, "size"); - size = vfs_configFile(pAnchor, path, vfs_configInt); -+ if (size == -1) -+ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; - cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); - } - } diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 1f2106f48..7fdc018b7 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.61 +pkgver=7.0.8.68 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -16,7 +16,7 @@ makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev libxml2-dev librsvg-dev libraw-dev" checkdepends="freetype fontconfig lcms2 graphviz" subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx $pkgname-libs" -source="https://distfiles.adelielinux.org/source/ImageMagick/ImageMagick-$_pkgver.tar.lz" +source="https://dev.sick.bike/dist/ImageMagick-$_pkgver.tar.lz" builddir="$srcdir/ImageMagick-${_pkgver}" # secfixes: @@ -82,4 +82,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="e73b7dbb319ddef39613a4f306eb2d070c56c9a9953a75d9e12e0a7ab6c18fd0a0638eb84a6c2ea7873ba41b5aa0a1afb71cf77ccc9eec5c72a5da2faa72eeea ImageMagick-7.0.8-61.tar.lz" +sha512sums="575398c6894a2590f6bd2e1c318ce09b12f019f7b8fd0bec9d0d5ee3e94d4f364c493e2e3f37a219b651caa8cb2336a4873dde6da7b5711da096ab520adc2b23 ImageMagick-7.0.8-68.tar.lz" diff --git a/user/lcov/APKBUILD b/user/lcov/APKBUILD new file mode 100644 index 000000000..94bc30eb5 --- /dev/null +++ b/user/lcov/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lcov +pkgver=1.14 +pkgrel=0 +pkgdesc="Graphical frontend for GCC GCov" +url="http://ltp.sourceforge.net/coverage/lcov.php" +arch="noarch" +license="GPL-2.0+" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="https://downloads.sourceforge.net/ltp/lcov-$pkgver.tar.gz" + +build() { + make +} + +check() { + make test +} + +package() { + GIT_DIR= make PREFIX=/usr DESTDIR="$pkgdir" install +} + +sha512sums="2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc lcov-1.14.tar.gz" diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD index c58ebd06d..dcc71891e 100644 --- a/user/mutt/APKBUILD +++ b/user/mutt/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mutt -pkgver=1.12.1 +pkgver=1.12.2 pkgrel=0 pkgdesc="Small but very powerful text-mode email client" url="http://www.mutt.org" # No HTTPS @@ -56,4 +56,4 @@ package() { "$pkgdir"/etc/Muttrc.gpg.dist } -sha512sums="0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538 mutt-1.12.1.tar.gz" +sha512sums="a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd mutt-1.12.2.tar.gz" diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index 698c0c4d9..173f4da66 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=netqmail pkgver=1.06 -pkgrel=5 +pkgrel=6 pkgdesc="The qmail mail transfer agent (community version)" -url="http://www.qmail.org/$pkgname/" +url="http://www.netqmail.org/" arch="all" license="Public-Domain" provides=sendmail @@ -14,7 +14,7 @@ makedepends="utmps-dev" subpackages="$pkgname-doc $pkgname-openrc" install="$pkgname.post-install $pkgname.pre-deinstall" provider_priority=1 -source="http://www.qmail.org/$pkgname-$pkgver.tar.gz +source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz 0001-DESTDIR.patch 0002-qbiffutmpx-20170820.patch 0003-qmailremote-20170716.patch diff --git a/user/os-prober/APKBUILD b/user/os-prober/APKBUILD new file mode 100644 index 000000000..65ff5061b --- /dev/null +++ b/user/os-prober/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=os-prober +pkgver=1.77 +pkgrel=0 +pkgdesc="Utility to detect operating systems on hard drives" +url="http://joeyh.name/code/os-prober/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+ AND GPL-1.0+" +depends="/bin/sh" +makedepends="" +subpackages="" +source="http://deb.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.xz" + +build() { + make +} + +package() { + case $CTARGET_ARCH in + i486|i586|pmmx|x86*) + PROBE_ARCH=x86;; + ppc*) + PROBE_ARCH=powerpc;; + sparc*) + PROBE_ARCH=sparc;; + *) + PROBE_ARCH=$CTARGET_ARCH;; + esac + for probes in os-probes os-probes/mounted os-probes/init \ + linux-boot-probes linux-boot-probes/mounted; do + mkdir -p "$pkgdir/usr/lib/$probes" + for file in $probes/common/*; do + install -Dm644 $file "$pkgdir/usr/lib/$probes" + done + if [ -e "$probes/${PROBE_ARCH}" ]; then + install -Dm644 $probes/${PROBE_ARCH}/* \ + "$pkgdir/usr/lib/$probes" + fi + done + mkdir -p "$pkgdir"/usr/lib/os-prober "$pkgdir"/usr/bin + mkdir -p "$pkgdir"/usr/share/os-prober + install -Dm755 newns "$pkgdir"/usr/lib/os-prober/ + install -Dm755 os-prober "$pkgdir"/usr/bin/ + install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/ + install -Dm644 common.sh "$pkgdir"/usr/share/os-prober/ +} + +sha512sums="4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066abbbbb78f593f2564314c9adbd43f60e39b os-prober_1.77.tar.xz" diff --git a/user/py3-attrs/APKBUILD b/user/py3-attrs/APKBUILD index 0131140b4..5d3e04b20 100644 --- a/user/py3-attrs/APKBUILD +++ b/user/py3-attrs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jean-Louis Fuchs <ganwell@fangorn.ch> # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-attrs -pkgver=19.1.0 +pkgver=19.2.0 pkgrel=0 pkgdesc="Python classes without boilerplate" url="https://www.attrs.org" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="c7c13d1aa2c8f8b5459cda02dee8f311a22e3d198bda3d4c5508e6e1914004e53388d149fea61358784f28cebf8e712f7807018586eeaa87d31199085e59675a py3-attrs-19.1.0.tar.gz" +sha512sums="f7ad98edaf685e7ab85c26a93ab310d82e48927a64694a6fa947d110f6623103335a42e335ed9fd1d2bc61504e60ef8e8d0733603c980bf2c6c157f3429e8875 py3-attrs-19.2.0.tar.gz" diff --git a/user/py3-importlib_metadata/APKBUILD b/user/py3-importlib_metadata/APKBUILD index d642738f9..593099053 100644 --- a/user/py3-importlib_metadata/APKBUILD +++ b/user/py3-importlib_metadata/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-importlib_metadata _pkgname=importlib_metadata _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.19 +pkgver=0.23 pkgrel=0 pkgdesc="Python package metadata accessor" url="https://pypi.python.org/pypi/importlib_metadata" @@ -13,6 +13,7 @@ arch="noarch" license="Apache-2.0" depends="python3 py3-importlib_resources py3-zipp" makedepends="" +checkdepends="py3-packaging" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz scm.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -29,5 +30,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="2d0126e7430804b2295ec159778082806957cb86b5c7408c38064cc7c7e62229d382778284a5a231925ab336a7cc6da8e705f6bd7ae6da66f11acd1229bda17b py3-importlib_metadata-0.19.tar.gz -5aa0967a0c9e5c27434689586e51fcf3898a52f904d7ec92cf1eda15810da04b837ac0f5caea32d9f41733b13e826b06a1064b6f15e14c5fac5b2c4b6fd950c8 scm.patch" +sha512sums="56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a py3-importlib_metadata-0.23.tar.gz +12021ed7d2a358aa87c98ef7d410cc9680f71b3f31cb577b0d510b1220de240c6317ed59eceebfcded6d42d07887c013a05ed399a460616dba25cea0c33111b8 scm.patch" diff --git a/user/py3-importlib_metadata/scm.patch b/user/py3-importlib_metadata/scm.patch index 1c33ab959..adab51e0e 100644 --- a/user/py3-importlib_metadata/scm.patch +++ b/user/py3-importlib_metadata/scm.patch @@ -15,4 +15,4 @@ from setuptools import setup -setup(use_scm_version=True) -+setup(version='0.19') ++setup(version='0.23') diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD index 48d9a22dd..efc2a7b64 100644 --- a/user/py3-pillow/APKBUILD +++ b/user/py3-pillow/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-pillow _pkgname=Pillow _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A Python Imaging Library" url="https://pypi.org/project/Pillow" @@ -50,5 +50,5 @@ doc() { install -Dm644 LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="6e9404eaa6a7d01642b9201a0733eb208422070993aa214691f549e261350e0baad6eb2bcde6d5edfa47c232d89457b9185de24e55e9536dde7790124ea34a0f py3-pillow-6.1.0.tar.gz +sha512sums="6eeb51d764c85a9b1f4eb0a59bbff41541852d5e2988c0e32b03acb56010b7d398f5761daaa56731bde278e52a551b44fab5b662988e096e8fd53e5d15d4e083 py3-pillow-6.2.0.tar.gz c01e83a7cef6653a33f60acbcbc737f0d40ff0dbc792ce0b2ce52f21092d3071845830fa0f64b27a1c5e679c53df57e0ec2e89867ee717f938d4e6f19db77790 py3-pillow-scripts-b24479c.tar.gz" diff --git a/user/py3-pluggy/APKBUILD b/user/py3-pluggy/APKBUILD index 2604e972f..b5a750e5f 100644 --- a/user/py3-pluggy/APKBUILD +++ b/user/py3-pluggy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pluggy _pkgname=pluggy -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=0 pkgdesc="Plugin management and hook calling for Python" url="https://pypi.python.org/pypi/pluggy" @@ -12,7 +12,7 @@ options="!check" # Cyclic dependency with py3-pytest. Passes on x86_64 license="MIT" depends="python3 py3-importlib_metadata" makedepends="python3-dev" -#checkdepends="py3-pytest" +checkdepends="py3-pytest" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz scm.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -29,5 +29,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f py3-pluggy-0.12.0.tar.gz -7a5c4d3fe2d57b079c2589c2ca1b75d96ff2561cf5bfb7991b81828dd6de04f6b126633f248bb71a5f165174184792b5857f9c7678e694dd68e0ba2b1ffef627 scm.patch" +sha512sums="82cf7d8aa4a0e09f8ba5048cd7ce038f34ca1453fe0c5a7926a2113e64528d0861955f8544035b4ffd61f0227e3d30d8d4180a05bf80e0de4809546e990bd4c7 py3-pluggy-0.13.0.tar.gz +0d811c2ba311b64af7762d48f92d3df2d72e71398f5b42d4ae71a067810f6d4b6d0f0bc4a06529f7e335c54e70640cc8c82b00b5dccd54aee4310c24bfa5e7ce scm.patch" diff --git a/user/py3-pluggy/scm.patch b/user/py3-pluggy/scm.patch index 733e8d297..b96f0720a 100644 --- a/user/py3-pluggy/scm.patch +++ b/user/py3-pluggy/scm.patch @@ -6,7 +6,7 @@ long_description=long_description, - use_scm_version={"write_to": "src/pluggy/_version.py"}, - setup_requires=["setuptools-scm"], -+ version='0.12.0', ++ version='0.13.0', license="MIT license", platforms=["unix", "linux", "osx", "win32"], author="Holger Krekel", diff --git a/user/py3-pytest/APKBUILD b/user/py3-pytest/APKBUILD index 63616f400..e3d733947 100644 --- a/user/py3-pytest/APKBUILD +++ b/user/py3-pytest/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pytest _pkgname=pytest -pkgver=5.0.1 +pkgver=5.2.0 pkgrel=0 pkgdesc="A python test library" url="https://pypi.python.org/pypi/pytest" @@ -13,7 +13,7 @@ license="MIT" depends="python3 py3-atomicwrites py3-attrs py3-more-itertools py3-packaging py3-pluggy py3-py py3-six py3-wcwidth" makedepends="python3-dev" -#checkdepends="py3-pytest py3-hypothesis" +checkdepends="py3-pytest py3-hypothesis" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz scm.patch" builddir="$srcdir/$_pkgname-$pkgver" @@ -23,14 +23,14 @@ build() { } check() { + rm -f testing/test_junitxml.py # You would think you could get away with "python3 -m pytest" but no... PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db py3-pytest-5.0.1.tar.gz -c671edd19cf5bfe1502e2c42a1b301205417c5d4f564a8dd02ddad354021b0a8b4d01cc0f5d7c36b13d56583c18cd6a1db736b7d49634c0fb2d1159b429dafda scm.patch" +sha512sums="5c766c263cdafb5e1cdb65d883ac7f5b50da14356b074448f8458e78eda8916190142dbaf7006235c02647d600e40851848e5905df17f8dff0a9fb02a90bd78d py3-pytest-5.2.0.tar.gz +6c597ec2416017ebc0bf2e9df338234e3ab8ca187242bab2b8f411316cc04f3c29a9a939faab349b8201043c7c16ceefe614349793e2010e62f16d9e7aefa05f scm.patch" diff --git a/user/py3-pytest/scm.patch b/user/py3-pytest/scm.patch index ef45821cd..e3b923f1d 100644 --- a/user/py3-pytest/scm.patch +++ b/user/py3-pytest/scm.patch @@ -6,7 +6,7 @@ use_scm_version={"write_to": "src/_pytest/_version.py"}, - setup_requires=["setuptools-scm", "setuptools>=40.0"], + setup_requires=["setuptools>=40.0"], -+ version="5.0.1", ++ version="5.2.0", package_dir={"": "src"}, # fmt: off extras_require={ diff --git a/user/py3-virtualenv/APKBUILD b/user/py3-virtualenv/APKBUILD index bd609fdf2..1697099f9 100644 --- a/user/py3-virtualenv/APKBUILD +++ b/user/py3-virtualenv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-virtualenv _pkgname=virtualenv -pkgver=16.7.2 +pkgver=16.7.5 pkgrel=0 pkgdesc="Virtual Python Environment builder" url="https://pypi.org/project/virtualenv" @@ -20,7 +20,7 @@ builddir="$srcdir/$_pkgname-$pkgver" build() { python3 setup.py build - sed -ie "s/env python$/env python3/" virtualenv.py + sed -ie "s/env python$/env python3/" virtualenv.py } check() { @@ -31,7 +31,7 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="63467cd2e577d0d56b5fb3529d9fb12a64f08f756a5f1310487f0d64da8452c4743872c6b620984e0877e0a98b3080efc6bb8c58cc64c4f120da8e67e91044cc py3-virtualenv-16.7.2.tar.gz +sha512sums="60b734f688eec1491fe5dcc3652d42f3e44df89d0809d3ab563c5dab1b5e340404894f34a08994a5ad4d8c0f7c8bb995d8211f9378906957d34031720bb3c390 py3-virtualenv-16.7.5.tar.gz 22f05b9c3d35339a28f50f7a01d81df082a00609712a5c38b92fe5d5c98ea077ad76c7d5a5072968105622d06e40897a34878133a4b5fd895a62d1e0d9a8928e python3-provides.patch f5e2a5036c7dfa124b71914981c46955466cb718392a90a4d8536dde4c153eb9cf3a8539c5cf870bb820b6e518c8b781025b825e11924ea4533890fa31e5a951 python3.patch a5545b1dd3b0465233b983fd90cdfbd4514350e32a7d312107b9cfa83c8755f961bd483796a48697c9938fd44a60171c4368aa3f4b2760be8d2d8e053f719529 tests.patch" diff --git a/user/py3-zipp/APKBUILD b/user/py3-zipp/APKBUILD index ba2673027..aa57d3dc3 100644 --- a/user/py3-zipp/APKBUILD +++ b/user/py3-zipp/APKBUILD @@ -5,14 +5,14 @@ pkgname=py3-zipp _pkgname=zipp _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.5.2 +pkgver=0.6.0 pkgrel=0 pkgdesc="Backport of Python 3.7's zip.Path" url="https://pypi.python.org/pypi/zipp" arch="noarch" # Certified net clean license="MIT" -depends="python3" +depends="python3 py3-more-itertools" makedepends="" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz scm.patch" @@ -30,5 +30,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c py3-zipp-0.5.2.tar.gz -7e9061e3ba0e3ded95633f1baa1438f7bb7ea32cecd423001bcbafdfad93aca5bfe0a444035e41b31aeea66b31c86b22854b4f18b2cbbfda356986a2433ca677 scm.patch" +sha512sums="18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052 py3-zipp-0.6.0.tar.gz +6eee026c1a7a1a84c1b7584b86d4e95d1c7ba0cbed3554260196de842944a303be2f05a1c4492c95fb9592bef96906fbc643ce638a931d7d69f3e74a6647b935 scm.patch" diff --git a/user/py3-zipp/scm.patch b/user/py3-zipp/scm.patch index b7d0f690e..82c6f7e55 100644 --- a/user/py3-zipp/scm.patch +++ b/user/py3-zipp/scm.patch @@ -1,9 +1,9 @@ --- zipp-0.5.2/setup.cfg 2019-07-07 17:14:00.000000000 -0400 +++ zipp-0.5.2/setup.cfg 2019-08-06 05:03:34.500180967 -0400 @@ -22,7 +22,7 @@ packages = find: - include_package_data = true python_requires = >=2.7 install_requires = + more_itertools -setup_requires = setuptools_scm >= 1.15.0 +setup_requires = @@ -16,4 +16,4 @@ if __name__ == "__main__": - setuptools.setup(use_scm_version=True) -+ setuptools.setup(version='0.5.2') ++ setuptools.setup(version='0.6.0') diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD index bf6cb12c8..4ed262975 100644 --- a/user/talloc/APKBUILD +++ b/user/talloc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=talloc -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=0 pkgdesc="Memory pool management library" url="https://talloc.samba.org" @@ -45,4 +45,4 @@ py3() { "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388 talloc-2.2.0.tar.gz" +sha512sums="f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837 talloc-2.3.0.tar.gz" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index 953cc380c..335c0de4b 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2019.08.13 +pkgver=2019.09.28 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -63,4 +63,4 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61 youtube-dl-2019.08.13.tar.gz" +sha512sums="b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94 youtube-dl-2019.09.28.tar.gz" |