diff options
147 files changed, 2588 insertions, 1118 deletions
diff --git a/system/paxmark/APKBUILD b/legacy/paxmark/APKBUILD index 3c9c69400..3c9c69400 100644 --- a/system/paxmark/APKBUILD +++ b/legacy/paxmark/APKBUILD diff --git a/system/paxmark/paxmark b/legacy/paxmark/paxmark index 87a84f4f7..87a84f4f7 100644 --- a/system/paxmark/paxmark +++ b/legacy/paxmark/paxmark diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD index 8304e5c7d..682f2e93c 100644 --- a/system/binutils/APKBUILD +++ b/system/binutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=binutils pkgver=2.32 -pkgrel=3 +pkgrel=4 pkgdesc="Tools necessary to build programs" url="https://www.gnu.org/software/binutils/" depends="" @@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" # non-PIC is unsupported by musl/ppc [ "${CARCH}" != "ppc" ] || options='!check' source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + arm-pie.patch binutils-ld-fix-static-linking.patch disable-gnu-mbind.patch disable-ifunc-tests.patch @@ -140,6 +141,7 @@ libs() { } sha512sums="d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz +2f862c473b357effe63221a47c4a34893eff50e4ab3c7b500b19754f3c7bf81ee695c35e5ce16f6c6fcd75696d270d04f282ae4c7d32b42a61b667ff1eccce8f arm-pie.patch ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49 binutils-ld-fix-static-linking.patch d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6 disable-gnu-mbind.patch 474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2 disable-ifunc-tests.patch diff --git a/system/binutils/arm-pie.patch b/system/binutils/arm-pie.patch new file mode 100644 index 000000000..f42477a04 --- /dev/null +++ b/system/binutils/arm-pie.patch @@ -0,0 +1,24 @@ +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=25056 +Author: Rich Felker <dalias@libc.org> +Upstream-Status: reported + +--- binutils-2.32/bfd/elf32-arm.c.orig 2019-10-02 07:47:36.153918869 -0400 ++++ binutils-2.32/bfd/elf32-arm.c 2019-10-02 08:37:09.108263016 -0400 +@@ -11624,7 +11624,7 @@ + { + /* If we don't know the module number, create a relocation + for it. */ +- if (bfd_link_pic (info)) ++ if (bfd_link_dll (info)) + { + Elf_Internal_Rela outrel; + +@@ -11728,7 +11728,7 @@ + now, and emit any relocations. If both an IE GOT and a + GD GOT are necessary, we emit the GD first. */ + +- if ((bfd_link_pic (info) || indx != 0) ++ if ((bfd_link_dll (info) || indx != 0) + && (h == NULL + || (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT + && !resolved_to_zero) diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index 38bdbf3ad..e667dcd0e 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.15.2 +pkgver=3.15.4 pkgrel=0 pkgdesc="Cross-platform build system" url="https://cmake.org" @@ -52,4 +52,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc cmake-3.15.2.tar.gz" +sha512sums="4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650 cmake-3.15.4.tar.gz" diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index 8c7c1a64b..287dfb603 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 -pkgver=5.2.0 -pkgrel=1 +pkgver=5.3.0 +pkgrel=0 pkgdesc="IP configuration, routing, and traffic control utilities" url="https://wiki.linuxfoundation.org/networking/iproute2" arch="all" @@ -55,4 +55,4 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1 iproute2-5.2.0.tar.xz" +sha512sums="c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157 iproute2-5.3.0.tar.xz" diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD index 5bf8dc29d..a31545601 100644 --- a/system/libcap-ng/APKBUILD +++ b/system/libcap-ng/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libcap-ng -pkgver=0.7.9 +pkgver=0.7.10 pkgrel=0 pkgdesc="POSIX capabilities library" url="https://people.redhat.com/sgrubb/libcap-ng/index.html" @@ -15,7 +15,6 @@ source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz " 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 } @@ -44,5 +41,5 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -sha512sums="095edabaf76a943aab0645b843b14e20b1733ba1d47a8e34d82f6586ca9a1512ba2677d232b13dd3900b913837401bb58bf74481970e967ba19041959dc43259 libcap-ng-0.7.9.tar.gz +sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def libcap-ng-0.7.10.tar.gz 8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324 fix-includes.patch" diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index 81990e112..534e6b137 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -11,7 +11,7 @@ subpackages="$pkgname-dev" source="https://distfiles.adelielinux.org/source/libucontext/libucontext-$pkgver.tar.xz" case "$CTARGET_ARCH" in -armhf) LIBUCONTEXT_ARCH="arm" ;; +arm*) LIBUCONTEXT_ARCH="arm" ;; ppc64le) LIBUCONTEXT_ARCH="ppc64" ;; pmmx) LIBUCONTEXT_ARCH="x86" ;; *) LIBUCONTEXT_ARCH="$CTARGET_ARCH" ;; diff --git a/system/lz4/APKBUILD b/system/lz4/APKBUILD index 281c3248c..b17306752 100644 --- a/system/lz4/APKBUILD +++ b/system/lz4/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lz4 -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=0 pkgdesc="LZ4: Extremely Fast Compression algorithm" url="https://github.com/lz4/lz4" arch="all" license="BSD-2-Clause GPL-2.0-only" -checkdepends="diffutils" +checkdepends="diffutils python3" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" @@ -27,4 +27,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e lz4-1.9.1.tar.gz" +sha512sums="ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1 lz4-1.9.2.tar.gz" diff --git a/system/mawk/APKBUILD b/system/mawk/APKBUILD index 8f2cd7faf..9c84905f8 100644 --- a/system/mawk/APKBUILD +++ b/system/mawk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mawk -pkgver=1.3.4.20171017 +pkgver=1.3.4.20190203 pkgrel=0 pkgdesc="Pattern scanning and text processing language" url="https://invisible-island.net/mawk/mawk.html" @@ -13,7 +13,6 @@ source="https://invisible-mirror.net/archives/$pkgname/$pkgname-$_dlver.tgz" builddir="$srcdir/$pkgname-$_dlver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,12 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install ln -s mawk "$pkgdir"/usr/bin/awk } check() { - cd "$builddir" make check } -sha512sums="4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27 mawk-1.3.4-20171017.tgz" +sha512sums="64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646 mawk-1.3.4-20190203.tgz" diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 9700b0491..667e2d189 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr -pkgver=4.21 +pkgver=4.22 pkgrel=0 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" @@ -60,6 +60,6 @@ package() { "$pkgdir"/usr/include/nspr/md } -sha512sums="4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c nspr-4.21.tar.gz +sha512sums="d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b nspr-4.22.tar.gz ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch 1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch" diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 20aea14c3..7f3cc141d 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.45 +pkgver=3.46.1 _ver=$(printf '%s' "$pkgver" | tr . _) pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -147,7 +147,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29 nss-3.45.tar.gz +sha512sums="f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b nss-3.46.1.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD index d75fa2fe5..da56a73f9 100644 --- a/system/parted/APKBUILD +++ b/system/parted/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=parted pkgver=3.2 -pkgrel=9 +pkgrel=1 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="https://www.gnu.org/software/parted/parted.html" arch="all" @@ -15,6 +15,7 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz bsd-endian.patch disable-two-tests.patch fix-includes.patch + posix-shell.patch sysmacros.patch tests-call-name-correctly.patch tests-python3.patch @@ -52,6 +53,7 @@ sha512sums="4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a7051 d3c16548cac315dad100c992c0b8446d1f7978cb45e867c69e746b25781c06802d3b4aab7d9346e44e68f61bb07e41ff65ef75d0dc6613f6fa8472b2e67a76a7 bsd-endian.patch b49eb0211c405a4ef69e1bb0079621c22fec4adf0309f0a58b5d881540913de01d05ccd3eb521f35c3cf6f4eb8aa0f4c5270ce3dea47270a5c3fe8fae635c6f0 disable-two-tests.patch 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch +6710a92cfb0a455de5e0c58f50c3c081c564307463c448fdc62521b868cb08fc10b2c558b284ec2e4ebbea7e940bda4b9e8e7aa7db58aec1b856451df9c54650 posix-shell.patch 5d2e8f22b6cd5bdd3289996848279a945ca09acd2862e82283bb769c2e4d61a24a31e1793d81385e8f3f1f4d48417e2308c5ea39dac47e832666363dde044ba7 sysmacros.patch 8bd86d2b0401566e7757c43d849b7f913cc4ec1bf50d5641dc72d7e278ca38db2ac746cd8dcc756b245021ea1f9738875b6a831f05185b9217d3f1c287944748 tests-call-name-correctly.patch 7486f98d535380a9e6598b9ac6153564319d5effa25456dc393cf3540ea47ac5b462be79cbd7d8efbd1fc2d2ef240a00873a2e2b138d4b4b0bb1494893de1eac tests-python3.patch" diff --git a/system/parted/posix-shell.patch b/system/parted/posix-shell.patch new file mode 100644 index 000000000..3418e31c6 --- /dev/null +++ b/system/parted/posix-shell.patch @@ -0,0 +1,69 @@ +--- parted-3.2/tests/t0205-gpt-list-clobbers-pmbr.sh.old 2014-06-15 18:17:43.000000000 +0000 ++++ parted-3.2/tests/t0205-gpt-list-clobbers-pmbr.sh 2019-10-04 23:36:26.560000000 +0000 +@@ -37,7 +37,7 @@ + # Write non-NUL bytes all over the MBR, so we're likely to see any change. + # However, be careful to leave the type of the first partition, 0xEE, + # as well as the final two magic bytes. +-printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1 ++printf '%0450d\356%059d\125\252' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1 + + dd if=$dev of=before count=1 || fail=1 + +--- parted-3.2/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh.old 2014-06-15 18:17:43.000000000 +0000 ++++ parted-3.2/tests/t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh 2019-10-04 23:37:08.760000000 +0000 +@@ -33,7 +33,7 @@ + # Write non-NUL bytes all over the MBR, so we're likely to see any change. + # However, be careful to leave the type of the first partition, 0xEE, + # as well as the final two magic bytes. +-printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1 ++printf '%0450d\356%059d\125\252' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1 + + dd if=$dev of=before count=1 || fail=1 + +--- parted-3.2/tests/t-local.sh.old 2014-06-15 18:17:43.000000000 +0000 ++++ parted-3.2/tests/t-local.sh 2019-10-04 23:48:32.670000000 +0000 +@@ -135,7 +135,7 @@ + peek_() + { + case $# in 2) ;; *) echo "usage: peek_ FILE 0_BASED_OFFSET" >&2; exit 1;; esac +- case $2 in *[^0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac ++ case $2 in *[!0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac + dd if="$1" bs=1 skip="$2" count=1 + } + +@@ -143,7 +143,7 @@ + { + case $# in 3) ;; *) echo "usage: poke_ FILE 0_BASED_OFFSET BYTE" >&2; exit 1;; + esac +- case $2 in *[^0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac ++ case $2 in *[!0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac + case $3 in ?) ;; *) echo "poke_: invalid byte: '$3'" >&2; exit 1 ;; esac + printf %s "$3" | dd of="$1" bs=1 seek="$2" count=1 conv=notrunc + } +@@ -152,7 +152,7 @@ + gpt1_pte_name_offset_() + { + local ss=$1 +- case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac ++ case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac + expr $ss \* 2 + 56 + return 0 + } +@@ -164,7 +164,7 @@ + case $# in 2) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac + local dev=$1 + local ss=$2 +- case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac ++ case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac + + # get the first byte of the name + local orig_pte_name_byte +@@ -185,7 +185,7 @@ + case $# in 3) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac + local dev=$1 + local ss=$2 +- case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac ++ case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac + local orig_byte=$3 + poke_ $dev $(gpt1_pte_name_offset_ $ss) "$orig_byte" || return 1 + } diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index ef1fa1492..7bca0e450 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="BSD-3-Clause" depends="" depends_dev="libedit-dev zlib-dev" -makedepends="$depends_dev paxmark" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcre2-16:_libpcre libpcre2-32:_libpcre" source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz" diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index e608e4637..537c1010a 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -31,11 +31,18 @@ # - CVE-2019-8323 # - CVE-2019-8324 # - CVE-2019-8325 +# 2.5.7-r0: +# - CVE-2012-6708 +# - CVE-2015-9251 +# - CVE-2019-15845 +# - CVE-2019-16201 +# - CVE-2019-16254 +# - CVE-2019-16255 # pkgname=ruby -pkgver=2.5.5 +pkgver=2.5.7 _abiver="${pkgver%.*}.0" -pkgrel=2 +pkgrel=0 pkgdesc="An object-oriented language for quick and easy programming" url="https://www.ruby-lang.org/" arch="all" @@ -307,7 +314,7 @@ _mvgem() { done } -sha512sums="06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec ruby-2.5.5.tar.xz +sha512sums="63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75 ruby-2.5.7.tar.xz 20e7e5ee9936a93872fe1ad836dd1fde001fe4a0e7ed54c26727ad83da3ceb0e6247681d9dd4f98a69e1b0250703ed8fc682d44075780d5f47faa1d5f58d2bdb rubygems-avoid-platform-specific-gems.patch 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch e99b36940fa8fdd445d82738c70b8fc042cab042a4662cab156578aad2dac9673a96da22b6676aa36beac08070e92a7798c60d6f36eeb169216c4c51864ce2fe fix-get_main_stack.patch diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 040754adc..1c6bcc854 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=5.2 +pkgver=5.3 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -51,6 +51,6 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35 strace-5.2.tar.xz +sha512sums="02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a strace-5.3.tar.xz 64bcd5a335d8117bf6d6eb1e47b47ef5d3df5bdc6e4c52379e0e8b099fd06e5d4fa362b3b88fbacec350783f65de589f2fb562d9df04e2895c8a74c8198e6cea fix-ppc-pt-regs-collision.patch 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 6b8685d86..2cb62343a 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -9,7 +9,7 @@ if [ "${pkgver%_*}" != "$pkgver" ]; then else _realver=$pkgver fi -pkgrel=0 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" url="https://www.sudo.ws/sudo/" arch="all" @@ -42,7 +42,9 @@ build() { --with-env-editor \ --with-pam \ --without-skey \ - --with-passprompt="[sudo] Password for %p: " + --with-passprompt="[sudo] Password for %p: " \ + --with-insults=disabled \ + --with-all-insults make } diff --git a/system/texinfo/APKBUILD b/system/texinfo/APKBUILD index 329bdfcdc..f11ebab45 100644 --- a/system/texinfo/APKBUILD +++ b/system/texinfo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=texinfo -pkgver=6.6 +pkgver=6.7 pkgrel=0 pkgdesc="Utilities to manage on-line documentation" url="https://www.gnu.org/software/texinfo/" @@ -30,4 +30,4 @@ package() { gzip "$pkgdir"/usr/share/info/* } -sha512sums="96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 texinfo-6.6.tar.xz" +sha512sums="da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7 texinfo-6.7.tar.xz" diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD index dc641bde4..cdcbdbc26 100644 --- a/system/tzdata/APKBUILD +++ b/system/tzdata/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tzdata -pkgver=2019b -_tzcodever=2019b +pkgver=2019c +_tzcodever=2019c _ptzver=0.5 pkgrel=0 pkgdesc="Time zone data" @@ -54,7 +54,7 @@ package() { "$pkgdir"/usr/bin/posixtz } -sha512sums="bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f tzcode2019b.tar.gz -c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc tzdata2019b.tar.gz +sha512sums="61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b tzcode2019c.tar.gz +2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 tzdata2019c.tar.gz 68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd posixtz-0.5.tar.xz f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467 0001-posixtz-fix-up-lseek.patch" diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD index 52ae967b5..868e90131 100644 --- a/system/xfsprogs/APKBUILD +++ b/system/xfsprogs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsprogs -pkgver=5.2.0 -pkgrel=1 +pkgver=5.2.1 +pkgrel=0 pkgdesc="XFS filesystem utilities" url="http://xfs.org/index.php/Main_Page" arch="all" @@ -48,6 +48,6 @@ base() { mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ } -sha512sums="ddc01a3aca3d84a2bb848a3954b1704056d0fc3fb302981bf67208e0435cf3887f44eefcdb40460b576fbe6cfb26a48ad6f032092829b3a2bb1ca4fae9fcc5f4 xfsprogs-5.2.0.tar.gz +sha512sums="4bf598b811dddae8dfc7e7086a157a53667602c80a34b0d037f94d3d8e35ad7172ac0b89ba83118a3bfa85d1127982cdb08fb3e30f38b63e3f124d19267d6532 xfsprogs-5.2.1.tar.gz c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch 29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch" diff --git a/system/zstd/APKBUILD b/system/zstd/APKBUILD index 72ae16746..89f6ed7a0 100644 --- a/system/zstd/APKBUILD +++ b/system/zstd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=zstd -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=0 pkgdesc="Fast real-time compression algorithm" url="https://facebook.github.io/zstd/" @@ -25,4 +25,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="b760f201ff8d018c422b030d3f59245b5f1cfd157ba8d6eb9fe9240e23d5739ca7b5a705b2d5e8ace703d041ab77bea66d735b283e51facfb18923794fabe213 zstd-1.4.2.tar.gz" +sha512sums="cb36772a59f79922e65c0f869384dca4ef2948c1d1440abcddecc7e3838efee5b547dad97b9023cdcf17bf10a32412b8f3b20a5e16b79314e61074987edecfab zstd-1.4.3.tar.gz" diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD index 31c586984..b864f1105 100644 --- a/user/alkimia/APKBUILD +++ b/user/alkimia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=alkimia -pkgver=8.0.1 +pkgver=8.0.2 pkgrel=0 pkgdesc="Library for common financial functionality" url="https://community.kde.org/Alkimia/libalkimia" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,13 +32,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="be943e854c6c2d3f85332b456be9fb3c3528fac403228a7d4ab9362856d53ea622ba9e96b70f7be47058aa0016eec78381dc7649db3b06938d4547ba1e181517 alkimia-8.0.1.tar.xz" +sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz" diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index 4f328d84f..7177dfbad 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.32.0 +pkgver=2.34.0 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -15,26 +15,17 @@ makedepends="$depends_dev at-spi2-core-dev glib-dev intltool libxml2-dev meson subpackages="$pkgname-dev" source="https://download.gnome.org/sources/at-spi2-atk/${pkgver%.*}/at-spi2-atk-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393 at-spi2-atk-2.32.0.tar.xz" +sha512sums="515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04 at-spi2-atk-2.34.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index edd3dd5f3..92c017b61 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.32.1 +pkgver=2.34.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -16,19 +16,16 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz" build() { - cd "$builddir" meson --prefix=/usr builddir/ ninja -C builddir/ } check() { - cd "$builddir" ninja -C builddir/ test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca at-spi2-core-2.32.1.tar.xz" +sha512sums="99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8 at-spi2-core-2.34.0.tar.xz" diff --git a/user/atk/APKBUILD b/user/atk/APKBUILD index c87c8dfd7..c6040d0c6 100644 --- a/user/atk/APKBUILD +++ b/user/atk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=atk -pkgver=2.32.0 +pkgver=2.34.1 pkgrel=0 pkgdesc="A library providing a set of interfaces for accessibility" url="https://www.gtk.org/" @@ -11,26 +11,17 @@ makedepends="glib-dev gobject-introspection-dev gtk-doc meson musl-utils ninja" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir _build -} - build() { - cd "$builddir"/_build - meson -Dprefix=/usr -Dintrospection=true -Ddocs=true - ninja + meson -Dprefix=/usr -Dintrospection=true -Ddocs=true build + ninja -C build } check() { - cd "$builddir"/_build - ninja test + ninja -C build test } package() { - cd "$builddir"/_build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22 atk-2.32.0.tar.xz" +sha512sums="a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e atk-2.34.1.tar.xz" diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD index 872c88857..3f142bcfc 100644 --- a/user/bind/APKBUILD +++ b/user/bind/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bind -pkgver=9.14.4 +pkgver=9.14.6 _p=${pkgver#*_p} _ver=${pkgver%_p*} _major=${pkgver%%.*} @@ -147,7 +147,7 @@ tools() { done } -sha512sums="f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 bind-9.14.4.tar.gz +sha512sums="129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 bind-9.14.6.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd diff --git a/user/bluez/APKBUILD b/user/bluez/APKBUILD index 02cdf5995..35e98e08b 100644 --- a/user/bluez/APKBUILD +++ b/user/bluez/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bluez -pkgver=5.50 +pkgver=5.51 pkgrel=0 pkgdesc="Linux Bluetooth protocol stack" url="http://www.bluez.org/" @@ -26,7 +26,6 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -43,12 +42,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make install DESTDIR="$pkgdir" install -D -m644 src/main.conf "$pkgdir"/etc/bluetooth/main.conf @@ -103,7 +100,7 @@ obexd() { mv "$pkgdir"/usr/lib/bluetooth/obexd "$subpkgdir"/usr/lib/bluetooth } -sha512sums="64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45 bluez-5.50.tar.xz +sha512sums="8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f bluez-5.51.tar.xz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd @@ -111,6 +108,6 @@ a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b34841 d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch 784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77 003-Increase-firmware-load-timeout-to-30s.patch 42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5 004-Move-the-43xx-firmware-into-lib-firmware.patch -41ce7ccf78cca97563f0ef31e01dac6eb4484c24fe57be360b5e8de8c5bff5845e9d395766f891bd3f123788344456c88c9fc00cd1bb7c6a1dca89d09f19172b bluez-5.40-obexd_without_systemd-1.patch +b7640a78cb33b3628564ebb2d8bcaf4255bddf5a25068838a9cc5fbd26d5d8dbf51e4b6b6fd2137fccae593482b2927ba13cb166be255be02d72a245ea60c3ff bluez-5.40-obexd_without_systemd-1.patch 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch 118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch" diff --git a/user/bluez/bluez-5.40-obexd_without_systemd-1.patch b/user/bluez/bluez-5.40-obexd_without_systemd-1.patch index 749787c5b..17433fccd 100644 --- a/user/bluez/bluez-5.40-obexd_without_systemd-1.patch +++ b/user/bluez/bluez-5.40-obexd_without_systemd-1.patch @@ -20,13 +20,13 @@ diff --git a/Makefile.obexd b/Makefile.obexd index 3760867..142e7c3 100644 --- a/Makefile.obexd +++ b/Makefile.obexd -@@ -2,12 +2,12 @@ +@@ -1,12 +1,12 @@ if SYSTEMD - systemduserunitdir = @SYSTEMD_USERUNITDIR@ + systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service +endif - dbussessionbusdir = @DBUS_SESSIONBUSDIR@ + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service -endif diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD index 6fffc1af6..f0093accf 100644 --- a/user/cbindgen/APKBUILD +++ b/user/cbindgen/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Samuel Holland <samuel@sholland.org> # Maintainer: Molly Miller <adelie@m-squa.red> pkgname=cbindgen -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=0 pkgdesc="Tool to generate C bindings from Rust code" url="https://github.com/eqrion/cbindgen" @@ -13,17 +13,52 @@ makedepends="cargo" source="" # dependencies taken from Cargo.lock -cargo_deps="$pkgname-$pkgver ansi_term-0.11.0 atty-0.2.13 bitflags-1.1.0 - c2-chacha-0.2.2 cfg-if-0.1.9 clap-2.33.0 getrandom-0.1.12 itoa-0.4.4 - lazy_static-1.4.0 libc-0.2.62 log-0.4.8 ppv-lite86-0.2.5 - proc-macro2-0.4.30 proc-macro2-1.0.3 quote-0.6.13 quote-1.0.2 - rand-0.7.0 rand_chacha-0.2.1 rand_core-0.5.1 rand_hc-0.2.0 - redox_syscall-0.1.56 remove_dir_all-0.5.2 ryu-1.0.0 serde-1.0.100 - serde_derive-1.0.100 serde_json-1.0.40 strsim-0.8.0 syn-0.15.44 - syn-1.0.5 tempfile-3.1.0 textwrap-0.11.0 toml-0.5.3 unicode-width-0.1.6 - unicode-xid-0.1.0 unicode-xid-0.2.0 vec_map-0.8.1 wasi-0.7.0 - winapi-0.3.8 winapi-i686-pc-windows-gnu-0.4.0 - winapi-x86_64-pc-windows-gnu-0.4.0" +cargo_deps="$pkgname-$pkgver +ansi_term-0.11.0 +atty-0.2.11 +autocfg-0.1.4 +bitflags-1.1.0 +cfg-if-0.1.9 +clap-2.33.0 +cloudabi-0.0.3 +fuchsia-cprng-0.1.1 +itoa-0.4.4 +libc-0.2.58 +log-0.4.6 +numtoa-0.1.0 +proc-macro2-1.0.0 +quote-1.0.0 +rand-0.6.5 +rand_chacha-0.1.1 +rand_core-0.3.1 +rand_core-0.4.0 +rand_hc-0.1.0 +rand_isaac-0.1.1 +rand_jitter-0.1.4 +rand_os-0.1.3 +rand_pcg-0.1.2 +rand_xorshift-0.1.1 +rdrand-0.4.0 +redox_syscall-0.1.54 +redox_termios-0.1.1 +remove_dir_all-0.5.2 +ryu-0.2.8 +serde-1.0.93 +serde_derive-1.0.99 +serde_json-1.0.39 +strsim-0.8.0 +syn-1.0.1 +tempfile-3.0.8 +termion-1.5.3 +textwrap-0.11.0 +toml-0.5.1 +unicode-width-0.1.5 +unicode-xid-0.2.0 +vec_map-0.8.1 +winapi-0.3.7 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +" source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" @@ -75,44 +110,48 @@ package() { } -sha512sums="134a748ec781dde54d7810d6f5f98a5a84784d4acdd13a4c13eb4ae67fc278ccd2b123eea56461a124e7aa17b99e0a5a20f39f06286ce259e6e3eb24c43f29ae cbindgen-0.9.0.tar.gz +sha512sums="0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b cbindgen-0.9.1.tar.gz a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz -4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz +9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz +811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz -d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14 c2-chacha-0.2.2.tar.gz 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz -0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518 getrandom-0.1.12.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz -e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 lazy_static-1.4.0.tar.gz -93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e libc-0.2.62.tar.gz -0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz -281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243 ppv-lite86-0.2.5.tar.gz -73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz -ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e proc-macro2-1.0.3.tar.gz -bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e quote-0.6.13.tar.gz -67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz -20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352 rand-0.7.0.tar.gz -30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 rand_chacha-0.2.1.tar.gz -4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz -bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 rand_hc-0.2.0.tar.gz -17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz +9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz +3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz +41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 numtoa-0.1.0.tar.gz +8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727 proc-macro2-1.0.0.tar.gz +64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0 quote-1.0.0.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz +201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz -b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0 ryu-1.0.0.tar.gz -bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282 serde-1.0.100.tar.gz -f47e62d3f30b15acf0e5435c5df939bb6089c060bf91e891a7cc0f9e7bb8243c5500a145ec41e6aba7fd1f5fb571e552dbc95eb78633d7a47ed08ed35f0b0848 serde_derive-1.0.100.tar.gz -d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842 serde_json-1.0.40.tar.gz +15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz +ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309 serde-1.0.93.tar.gz +6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e serde_derive-1.0.99.tar.gz +7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz -c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7 syn-0.15.44.tar.gz -4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc syn-1.0.5.tar.gz -a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz +10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f syn-1.0.1.tar.gz +88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 tempfile-3.0.8.tar.gz +1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb termion-1.5.3.tar.gz f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz -f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458 toml-0.5.3.tar.gz -d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05 unicode-width-0.1.6.tar.gz -cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 toml-0.5.1.tar.gz +bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz -1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 wasi-0.7.0.tar.gz -5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz +6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz" diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD index 4dfbcdec6..e8df804e5 100644 --- a/user/ccache/APKBUILD +++ b/user/ccache/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ccache -pkgver=3.7.2 +pkgver=3.7.4 pkgrel=0 pkgdesc="A fast C/C++ compiler cache" url="https://ccache.dev/" @@ -46,4 +46,4 @@ package() { done } -sha512sums="3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147 ccache-3.7.2.tar.xz" +sha512sums="cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146 ccache-3.7.4.tar.xz" diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index db7d90abe..052386d04 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: pkgname=certbot -pkgver=0.37.1 +pkgver=0.39.0 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -38,4 +38,4 @@ acme() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="c6a54a795823d5ba7178adc3c494703c120a7c748f402c2afa626eadeca6d73acd03e0ec96c553ef12f6839dfb268608b590efc6b0d574382f3c44a258059999 certbot-0.37.1.tar.gz" +sha512sums="17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0 certbot-0.39.0.tar.gz" diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD new file mode 100644 index 000000000..86ddd5c59 --- /dev/null +++ b/user/cloc/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=cloc +pkgver=1.84 +pkgrel=0 +pkgdesc="Perl utility for counting lines of code in various languages" +url="https://github.com/AlDanial/cloc" +arch="noarch" +license="GPL-2.0+" +depends="perl perl-regexp-common perl-algorithm-diff" +checkdepends="perl-parallel-forkmanager" +subpackages="$pkgname-doc" +source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz" + +build() { + cd Unix + make DESTDIR="$pkgdir" doc +} + +check() { + cd Unix + make DESTDIR="$pkgdir" test-perl +} + +package() { + cd Unix + make DESTDIR="$pkgdir" install +} + +sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz" diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD index 988cfbae5..88160df56 100644 --- a/user/dconf/APKBUILD +++ b/user/dconf/APKBUILD @@ -1,11 +1,12 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=dconf -pkgver=0.32.0 +pkgver=0.34.0 pkgrel=0 pkgdesc="Configuration management for the Gnome desktop environment" url="https://gnome.org" arch="all" +options="!check" # Requires running D-Bus daemon. license="LGPL-2.0+ AND LGPL-2.1+" depends="dbus" makedepends="meson ninja @@ -14,24 +15,19 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz" build() { - cd "$builddir" meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ + -Dprefix=/usr \ --buildtype=release \ - . output - ninja -C output + . build + ninja -C build } check() { - cd "$builddir" + ninja -C build test } package() { - cd "$builddir" - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 dconf-0.32.0.tar.xz" +sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index 7dc1343f9..8c9ed8bc0 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=7.2.2 +pkgver=8.0.6 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -47,6 +47,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8 dhcpcd-7.2.2.tar.xz +sha512sums="19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193 dhcpcd-8.0.6.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD index 438cf665b..a1db01ae7 100644 --- a/user/emacs/APKBUILD +++ b/user/emacs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=emacs -pkgver=26.2 +pkgver=26.3 pkgrel=0 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch="all" @@ -9,7 +9,7 @@ options="!check !dbg" url="https://www.gnu.org/software/emacs/" license="GPL-3.0+" depends="emacs-nox" -makedepends="autoconf automake linux-headers paxmark +makedepends="autoconf automake linux-headers librsvg-dev giflib-dev libxpm-dev gtk+2.0-dev gconf-dev alsa-lib-dev glib-dev fontconfig-dev libpng-dev libxml2-dev pango-dev tiff-dev libjpeg-turbo-dev ncurses-dev @@ -133,5 +133,5 @@ gtk2() { _subpackage gtk2 } -sha512sums="c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1 emacs-26.2.tar.xz +sha512sums="4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9 emacs-26.3.tar.xz 8898f309aeaf274366849bd5c56c8e2a1be94dfee2f01b20f1700bf26203f49b9600237e5090fc3d8eaad3ea246f803ffd493d0c04cb3512084a4e3bf58f8f5e gamedir.patch" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index ebaf536bf..aca2f0801 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -38,6 +38,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f fix-mutex-build.patch fix-seccomp-bpf.patch mozilla-build-arm.patch + ppc32-fix.patch + rust-32bit.patch rust-config.patch shut-up-warning.patch stackwalk-x86-ppc.patch @@ -108,8 +110,8 @@ prepare() { echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig # too much memory - if [ -z "$JOBS" ] || [ $JOBS -ge 16 ]; then - JOBS=16 + if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then + JOBS=32 fi echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig @@ -117,6 +119,10 @@ prepare() { pmmx|x86*) echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig ;; + ppc) + echo "ac_add_options --disable-webrtc" >> "$builddir"/mozconfig; + export LDFLAGS="$LDFLAGS -latomic" + ;; esac rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl @@ -200,6 +206,8 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch +06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch +7c615703dc9b8427eeadd13bc9beda02e1c3d986cac1167feaf48fdfdcc15b7456460d4d58f301054cf459242ee75bbcd76bf67e26c2a443bc5655975d24ca1b rust-32bit.patch 45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8 rust-config.patch 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch 452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch diff --git a/user/firefox-esr/ppc32-fix.patch b/user/firefox-esr/ppc32-fix.patch new file mode 100644 index 000000000..b4103c65f --- /dev/null +++ b/user/firefox-esr/ppc32-fix.patch @@ -0,0 +1,43 @@ +--- firefox-68.1.0/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp ++++ firefox-68.1.0/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp +@@ -45,11 +45,8 @@ invoke_copy_to_stack(uint32_t* d, + uint64_t tempu64; + + for(uint32_t i = 0; i < paramCount; i++, s++) { +- if(s->IsPtrData()) { +- if(s->type == nsXPTType::T_JSVAL) +- tempu32 = (uint32_t) &s->ptr; +- else +- tempu32 = (uint32_t) s->ptr; ++ if(s->IsIndirect()) { ++ tempu32 = (uint32_t) &s->val; + } + else { + switch(s->type) { +@@ -70,7 +67,7 @@ invoke_copy_to_stack(uint32_t* d, + } + } + +- if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { ++ if (!s->IsIndirect() && s->type == nsXPTType::T_DOUBLE) { + #ifndef __NO_FPRS__ + if (fpr < FPR_COUNT) + fpregs[fpr++] = s->val.d; +@@ -88,7 +85,7 @@ invoke_copy_to_stack(uint32_t* d, + d += 2; + } + } +- else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { ++ else if (!s->IsIndirect() && s->type == nsXPTType::T_FLOAT) { + #ifndef __NO_FPRS__ + if (fpr < FPR_COUNT) + fpregs[fpr++] = s->val.f; // if passed in registers, floats are promoted to doubles +@@ -99,7 +96,7 @@ invoke_copy_to_stack(uint32_t* d, + else + *((float*) d++) = s->val.f; + } +- else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64 ++ else if (!s->IsIndirect() && (s->type == nsXPTType::T_I64 + || s->type == nsXPTType::T_U64)) { + if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6 + if ((gpr + 1) < GPR_COUNT) { diff --git a/user/firefox-esr/rust-32bit.patch b/user/firefox-esr/rust-32bit.patch new file mode 100644 index 000000000..f9281cb7a --- /dev/null +++ b/user/firefox-esr/rust-32bit.patch @@ -0,0 +1,20 @@ +--- firefox-68.1.0/config/makefiles/rust.mk.old 2019-08-26 16:52:20.000000000 +0000 ++++ firefox-68.1.0/config/makefiles/rust.mk 2019-10-03 21:17:55.062373830 +0000 +@@ -47,7 +47,7 @@ + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds. +-cargo_rustc_flags += -C lto ++# OOMs on 32-bit machines: cargo_rustc_flags += -C lto + endif + endif + +@@ -246,7 +246,7 @@ + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + ifeq ($(OS_ARCH), Linux) +- $(call py_action,check_binary,--target --networking $@) ++# Fails because we disable LTO: $(call py_action,check_binary,--target --networking $@) + endif + endif + endif diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD index f89c0cac6..34b38ebf2 100644 --- a/user/freeglut/APKBUILD +++ b/user/freeglut/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=freeglut -pkgver=3.0.0 +pkgver=3.2.1 pkgrel=0 pkgdesc="free reimplementation of OpenGL Utility Toolkit (GLUT) library" url="http://freeglut.sourceforge.net/" @@ -10,11 +10,10 @@ options="!check" # No test suite. license="X11" depends_dev="mesa-dev libx11-dev libice-dev libxxf86vm-dev libxi-dev glu-dev" makedepends="$depends_dev cmake" -subpackages="$pkgname-dev $pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" cmake . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -24,10 +23,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0 freeglut-3.0.0.tar.gz" +sha512sums="aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 freeglut-3.2.1.tar.gz" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index f9e3fd7ce..365b7e906 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.60.3 +pkgver=2.62.0 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -14,10 +14,6 @@ makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool subpackages="$pkgname-lang" source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" -prepare() { - default_prepare -} - build() { meson -Dprefix=/usr _build ninja -C _build @@ -32,4 +28,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f glib-networking-2.60.3.tar.xz" +sha512sums="2b9b0414baba307d35f8f6539fcbf0cf224da1970c532b130718deeeaa85f5601b8285ce822888273afed7fa643b62310bf306bbfa22f465134af345f3cd0e9d glib-networking-2.62.0.tar.xz" diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 88376c187..480e596ff 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.62.0 +pkgver=2.62.1 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" @@ -75,7 +75,7 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="4a880f9cc0209e99e814c4ef0adf3ef82ec5cca413ebb3e6d2da17768b7099744ca57f0a86b5aeb443c8ee0b663581ddb8bb577fa7bcc645bd64817b39991d63 glib-2.62.0.tar.xz +sha512sums="098e59d0da4cdd282156c2941c52127d33f1749802b23901efd6b760db99f6944b5cef445d76660a159ad4b912bc9d03dbf8c24b7f15b28e9770f37ca082a57c glib-2.62.1.tar.xz 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch 657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch 0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD index 9ceb52bb2..a0bac403d 100644 --- a/user/glibmm/APKBUILD +++ b/user/glibmm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=glibmm -pkgver=2.60.0 +pkgver=2.62.0 pkgrel=0 pkgdesc="C++ interfaces for glib" url="https://gnome.org" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/glibmm/${pkgver%.*}/glibmm-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ea0477d5cb6e59019e87f929630ff32ac38dd5e4fb53fe84ef64b5b41c1090c8e10a0a67b26c786ab4d9ebf64b993fa0044333b4aa8554c331a0a6d02039c5ad glibmm-2.60.0.tar.xz" +sha512sums="f26fca5724c17d915480556b6918ae6e4999c14a25e7623cda3d37a59d6965310fc2b2d8a8500a849f1d0f00fd2d326eeddc690207846d38a13ae695ad0805de glibmm-2.62.0.tar.xz" diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index 37f1bc7ee..c1edaaa02 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=gmime -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=0 pkgdesc="MIME utility library" url="https://developer.gnome.org/gmime/" @@ -9,14 +9,19 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="gpgme-dev libidn2-dev zlib-dev" -makedepends="$depends_dev" checkdepends="gnupg" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - 3.2.3-broken-tests.patch" + 3.2.3-broken-tests.patch + " + +prepare() { + default_prepare + autoreconf -vif +} build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,20 +34,13 @@ build() { make } -prepare() { - default_prepare - autoreconf -vif -} - check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4 gmime-3.2.3.tar.xz +sha512sums="34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b gmime-3.2.4.tar.xz 443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 81dca7aed..cc92875e1 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.60.2 +pkgver=1.62.0 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -15,26 +15,17 @@ subpackages="$pkgname-doc $pkgname-dev" replaces="libgirepository" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" -prepare() { - cd "$builddir" - default_prepare - mkdir -p build -} - build() { - cd "$builddir"/build - meson -Dprefix=/usr - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } dev() { @@ -46,4 +37,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e gobject-introspection-1.60.2.tar.xz" +sha512sums="b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638 gobject-introspection-1.62.0.tar.xz" diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD index 185d15bdf..47bf9ddf4 100644 --- a/user/gsettings-desktop-schemas/APKBUILD +++ b/user/gsettings-desktop-schemas/APKBUILD @@ -1,45 +1,39 @@ # Maintainer: pkgname=gsettings-desktop-schemas -pkgver=3.32.0 +pkgver=3.34.0 pkgrel=0 pkgdesc="GSettings schemas shared by GNOME desktop components" url="https://developer.gnome.org/gio/unstable/GSettings.html" arch="noarch" -license="LGPL-2.0-or-later" +license="LGPL-2.0+" makedepends="glib-dev gobject-introspection-dev intltool meson ninja" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" prepare() { default_prepare - cd "$builddir" sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in } build() { - cd "$builddir" - mkdir -p build && cd build - meson -Dprefix=/usr .. - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } dev() { default_dev depends="$pkgname" - cd "$builddir" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/share/pkgconfig "$subpkgdir"/usr/lib } -sha512sums="cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc gsettings-desktop-schemas-3.32.0.tar.xz" +sha512sums="6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1 gsettings-desktop-schemas-3.34.0.tar.xz" diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index 1fcbe079d..02221d9c8 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20190316 +pkgver=20190818 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" @@ -16,12 +16,10 @@ source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz" builddir="$srcdir/hwids-hwids-$pkgver" build() { - cd "$builddir" make UDEV=yes } package() { - cd "$builddir" make DESTDIR="$pkgdir" DOCDIR="/usr/share/doc/$pkgname-$pkgver" \ MISCDIR="/usr/share/hwdata" UDEV=yes install } @@ -67,4 +65,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e hwids-20190316.tar.gz" +sha512sums="74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2 hwids-20190818.tar.gz" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 51f3e4f3e..896a990a4 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.3 +pkgver=4.4 pkgrel=0 pkgdesc="Lists of country, language, and currency names" -url=" " +url="https://salsa.debian.org/iso-codes-team/iso-codes" arch="noarch" license="LGPL-2.1+" depends="" makedepends="python3" subpackages="$pkgname-lang $pkgname-dev" -source="http://anduin.linuxfromscratch.org/BLFS/$pkgname/$pkgname-$pkgver.tar.xz" +source="https://salsa.debian.org/iso-codes-team/$pkgname/-/archive/$pkgname-$pkgver/$pkgname-$pkgname-$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-$pkgname-$pkgver" build() { ./configure \ @@ -27,4 +28,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="5217b8d9d7a0db3ee5f89831f9fb4938e79a7c33a73fcde9e057eb825a08973d6115aa7a709552cb9ef29c4ad094bb7a1e848cbb6f8fb01efb15d4205c235dc0 iso-codes-4.3.tar.xz" +sha512sums="fecb169889e86e87fa90b9ffbbb79d12d4ce4f0ea7b4f699b2ff978f88bdbb790e5b37120d9b696fb13db56845727b6ff102049878e06bbc26b258214eeb3c05 iso-codes-iso-codes-4.4.tar.bz2" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 8fc592ba8..448b4561c 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.2.5 +pkgver=4.2.7.1 pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" @@ -17,7 +17,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev libraw-dev quazip-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz" +source="https://download.kde.org/stable/krita/4.2.7/krita-$pkgver.tar.gz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -46,4 +46,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="113bbea7cda7c97ba22da5ab78eef8fe6b8db48b54380ee12d93d28fc00e3f93ee1e5f3dbd7c1d257a577206486235ac75f3d3ef1e21f8ffcd1c5e3aa6f3b224 krita-4.2.5.tar.gz" +sha512sums="e1ce1eb9e38d4dc9de3fb6d48a6b5364dad8da1782f3e5780949bed4d819ad1c70be62d5d61748bec04e18c7b46279d393e976e8f8209f35587eacd96b1a84ef krita-4.2.7.1.tar.gz" diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD index 5e586643b..d518e2996 100644 --- a/user/krusader/APKBUILD +++ b/user/krusader/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krusader -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=0 pkgdesc="Advanced, twin-panel (commander style) file manager" url="https://krusader.org/" @@ -18,7 +18,6 @@ source="https://download.kde.org/stable/krusader/$pkgver/krusader-$pkgver.tar.xz posix-headers.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,14 +33,12 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d krusader-2.7.1.tar.xz +sha512sums="8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b krusader-2.7.2.tar.xz 6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 000cc3d5f..d631f8629 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.3.4 +pkgver=3.3.6 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="91f3bcda48c194f5141f2f315bd3d89652ae4002a8fb0b765714358cb97e2093b13c8712ff1c16cf2e3a82024c8d1a1f136eaa0861387897ccd6cb123d137766 kstars-3.3.4.tar.xz" +sha512sums="07371c343456d60b3d5e7dd2fb13983926db811dc0ffedb56364c1a02783db501189328c7476762ac0535f43d372ace81d39f90cd0c170ce36385f8e5a185bf3 kstars-3.3.6.tar.xz" diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD index 0f816ab37..0a5a81798 100644 --- a/user/ktorrent/APKBUILD +++ b/user/ktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktorrent -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="BitTorrent client by KDE" url="https://www.kde.org/applications/internet/ktorrent/" @@ -19,7 +19,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/ktorrent/$pkgver/ktorrent-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,13 +34,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06 ktorrent-5.1.1.tar.xz" +sha512sums="b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621 ktorrent-5.1.2.tar.xz" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index a3ab3dff7..934c901f8 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev -pkgver=2.22 +pkgver=2.23 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45 libblockdev-2.22.tar.gz" +sha512sums="ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3 libblockdev-2.23.tar.gz" diff --git a/user/libdvbpsi/APKBUILD b/user/libdvbpsi/APKBUILD index 9f818977d..a61855055 100644 --- a/user/libdvbpsi/APKBUILD +++ b/user/libdvbpsi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libdvbpsi -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=0 pkgdesc="Library decoding and generating MPEG TS and DVB PSI tables" url="https://www.videolan.org/developers/libdvbpsi.html" @@ -14,7 +14,6 @@ source="https://download.videolan.org/pub/libdvbpsi/$pkgver/$pkgname-$pkgver.tar " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,14 +23,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309 libdvbpsi-1.3.2.tar.bz2 +sha512sums="70f9e783a947e026ea50afe98ad2b3bfce075bd8d76932f73a6253b077a3a180aa632e9a1fff20308e2f0f3f881d727b4e4aad9b8da2b384edf9a3a0f9eacc69 libdvbpsi-1.3.3.tar.bz2 f612bf80b07ec37a83477a37d78971c4bd4331eec86686a8bc7b247f43df2c047c89de419d5cef0b960de2032daedc81a4c380802c76b4dc081e1c09ad364dcb fix-includes.patch" diff --git a/user/libevdev/APKBUILD b/user/libevdev/APKBUILD index aac737a91..8e9083d17 100644 --- a/user/libevdev/APKBUILD +++ b/user/libevdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libevdev -pkgver=1.7.0 +pkgver=1.8.0 pkgrel=0 pkgdesc="Wrapper library for kernel event devices" url="https://www.freedesktop.org/wiki/Software/libevdev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f libevdev-1.7.0.tar.xz" +sha512sums="8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz" diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD index 13f07cfe0..27de81126 100644 --- a/user/libgd/APKBUILD +++ b/user/libgd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libgd pkgver=2.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="Library for dynamic image creation" url="http://libgd.github.io/" arch="all" @@ -15,10 +15,20 @@ subpackages="$pkgname-dev" replaces="gd" source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz CVE-2016-7568.patch + CVE-2018-5711.patch + CVE-2018-1000222.patch + CVE-2019-6977.patch + CVE-2019-6978.patch " +# secfixes: +# 2.2.5-r1: +# - CVE-2018-5711 +# - CVE-2018-1000222 +# - CVE-2019-6977 +# - CVE-2019-6978 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +41,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,4 +56,8 @@ dev() { } sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b libgd-2.2.5.tar.xz -8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch" +8310d11a2398e8617c9defc4500b9ce3897ac1026002ffa36000f1d1f8df19336005e8c1f6587533f1d787a4a54d7a3a28ad25bddbc966a018aedf4d8704a716 CVE-2016-7568.patch +d6577566814cbe2d93b141a4216b32acdeb2989dc1712eb137565081b913151bbb4c69911c96b2bb7c90695078a85152d368aad183de494d1283fde25021751b CVE-2018-5711.patch +d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b CVE-2018-1000222.patch +df84e469515f684d79ebad163e137401627310a984ac1ae6a4d31b739b3dc6d9144f101e9bfc3211af1d7cdbaa827721d21a9fe528e69b9b60a943ec8a7ab74b CVE-2019-6977.patch +3bf31941365a878bef899afa14a89e4ad0fbfb3280d34b2118c8484698e15eff600751ae3ce146a4f006e6c21730cb18899bae3538f6cc2651025274b40cf1ca CVE-2019-6978.patch" diff --git a/user/libgd/CVE-2018-1000222.patch b/user/libgd/CVE-2018-1000222.patch new file mode 100644 index 000000000..80f9712bf --- /dev/null +++ b/user/libgd/CVE-2018-1000222.patch @@ -0,0 +1,73 @@ +From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index bde0b9d3..78f40d9a 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) diff --git a/user/libgd/CVE-2018-5711.patch b/user/libgd/CVE-2018-5711.patch new file mode 100644 index 000000000..dff2b9ea2 --- /dev/null +++ b/user/libgd/CVE-2018-5711.patch @@ -0,0 +1,61 @@ +From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Wed, 29 Nov 2017 19:37:38 +0100 +Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx + +Due to a signedness confusion in `GetCode_` a corrupt GIF file can +trigger an infinite loop. Furthermore we make sure that a GIF without +any palette entries is treated as invalid *after* open palette entries +have been removed. + +CVE-2018-5711 + +See also https://bugs.php.net/bug.php?id=75571. +--- + src/gd_gif_in.c | 12 ++++++------ + tests/gif/.gitignore | 1 + + tests/gif/CMakeLists.txt | 1 + + tests/gif/Makemodule.am | 2 ++ + tests/gif/php_bug_75571.c | 28 ++++++++++++++++++++++++++++ + tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes + 6 files changed, 38 insertions(+), 6 deletions(-) + create mode 100644 tests/gif/php_bug_75571.c + create mode 100644 tests/gif/php_bug_75571.gif + +diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c +index daf26e79..0a8bd717 100644 +--- a/src/gd_gif_in.c ++++ b/src/gd_gif_in.c +@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd) + return 0; + } + +- if(!im->colorsTotal) { +- gdImageDestroy(im); +- return 0; +- } +- + /* Check for open colors at the end, so + * we can reduce colorsTotal and ultimately + * BitsPerPixel */ +@@ -351,6 +346,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd) + } + } + ++ if(!im->colorsTotal) { ++ gdImageDestroy(im); ++ return 0; ++ } ++ + return im; + } + +@@ -447,7 +447,7 @@ static int + GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) + { + int i, j, ret; +- unsigned char count; ++ int count; + + if(flag) { + scd->curbit = 0; diff --git a/user/libgd/CVE-2019-6977.patch b/user/libgd/CVE-2019-6977.patch new file mode 100644 index 000000000..4cfb9ab98 --- /dev/null +++ b/user/libgd/CVE-2019-6977.patch @@ -0,0 +1,21 @@ +Bug: https://bts.adelielinux.org/show_bug.cgi?id=159 +Backported-From: http://git.php.net/?p=php-src.git;a=commit;h=7a12dad4dd6c370835b13afae214b240082c7538 +Author: A. Wilcox <awilfox@adelielinux.org> +Bug: https://bugs.php.net/bug.php?id=77270 +Author: Christoph M. Becker <cmbecker69@gmx.de> +Committer: Stanislav Malyshev <stas@php.net> +Upstream-Status: unknown + +--- libgd-2.2.5/src/gd_color_match.c.old 2017-08-30 11:05:54.000000000 +0000 ++++ libgd-2.2.5/src/gd_color_match.c 2019-10-03 16:17:55.842322245 +0000 +@@ -31,8 +31,8 @@ + return -4; /* At least 1 color must be allocated */ + } + +- buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal); +- memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal ); ++ buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors); ++ memset( buf, 0, sizeof(unsigned long) * 5 * gdMaxColors ); + + for (x=0; x < im1->sx; x++) { + for( y=0; y<im1->sy; y++ ) { diff --git a/user/libgd/CVE-2019-6978.patch b/user/libgd/CVE-2019-6978.patch new file mode 100644 index 000000000..0cfdda919 --- /dev/null +++ b/user/libgd/CVE-2019-6978.patch @@ -0,0 +1,216 @@ +From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Thu, 17 Jan 2019 11:54:55 +0100 +Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr() + +Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we +must not call `gdDPExtractData()`; otherwise a double-free would +happen. Since `gdImage*Ctx()` are void functions, and we can't change +that for BC reasons, we're introducing static helpers which are used +internally. + +We're adding a regression test for `gdImageJpegPtr()`, but not for +`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to +trigger failure of the respective `gdImage*Ctx()` calls. + +This potential security issue has been reported by Solmaz Salimi (aka. +Rooney). +--- + src/gd_gif_out.c | 18 +++++++++++++++--- + src/gd_jpeg.c | 20 ++++++++++++++++---- + src/gd_wbmp.c | 21 ++++++++++++++++++--- + tests/jpeg/.gitignore | 1 + + tests/jpeg/CMakeLists.txt | 1 + + tests/jpeg/Makemodule.am | 3 ++- + tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++ + 7 files changed, 84 insertions(+), 11 deletions(-) + create mode 100644 tests/jpeg/jpeg_ptr_double_free.c + +diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c +index 298a5812..d5a95346 100644 +--- a/src/gd_gif_out.c ++++ b/src/gd_gif_out.c +@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx); + static void char_out(int c, GifCtx *ctx); + static void flush_char(GifCtx *ctx); + ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out); + + + +@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageGifCtx(im, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageGifCtx(im, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) + + */ + BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) ++{ ++ _gdImageGifCtx(im, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + { + gdImagePtr pim = 0, tim = im; + int interlace, BitsPerPixel; +@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + based temporary image. */ + pim = gdImageCreatePaletteFromTrueColor(im, 1, 256); + if(!pim) { +- return; ++ return 1; + } + tim = pim; + } +@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out) + /* Destroy palette based temporary image. */ + gdImageDestroy( pim); + } ++ ++ return 0; + } + + +diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c +index fc058420..96ef4302 100644 +--- a/src/gd_jpeg.c ++++ b/src/gd_jpeg.c +@@ -123,6 +123,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo) + exit(99); + } + ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality); ++ + /* + * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality + * QUALITY. If QUALITY is in the range 0-100, increasing values +@@ -237,8 +239,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageJpegCtx(im, out, quality); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageJpegCtx(im, out, quality)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } +@@ -259,6 +264,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile); + + */ + BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) ++{ ++ _gdImageJpegCtx(im, outfile, quality); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + { + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; +@@ -293,7 +304,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row) { + gdFree(row); + } +- return; ++ return 1; + } + + cinfo.err->emit_message = jpeg_emit_message; +@@ -334,7 +345,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + if(row == 0) { + gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n"); + jpeg_destroy_compress(&cinfo); +- return; ++ return 1; + } + + rowptr[0] = row; +@@ -411,6 +424,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality) + jpeg_finish_compress(&cinfo); + jpeg_destroy_compress(&cinfo); + gdFree(row); ++ return 0; + } + + +diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c +index f19a1c96..a49bdbec 100644 +--- a/src/gd_wbmp.c ++++ b/src/gd_wbmp.c +@@ -88,6 +88,8 @@ int gd_getin(void *in) + return (gdGetC((gdIOCtx *)in)); + } + ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out); ++ + /* + Function: gdImageWBMPCtx + +@@ -100,6 +102,12 @@ int gd_getin(void *in) + out - the stream where to write + */ + BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) ++{ ++ _gdImageWBMPCtx(image, fg, out); ++} ++ ++/* returns 0 on success, 1 on failure */ ++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + { + int x, y, pos; + Wbmp *wbmp; +@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + /* create the WBMP */ + if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) { + gd_error("Could not create WBMP\n"); +- return; ++ return 1; + } + + /* fill up the WBMP structure */ +@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out) + + /* write the WBMP to a gd file descriptor */ + if(writewbmp(wbmp, &gd_putout, out)) { ++ freewbmp(wbmp); + gd_error("Could not save WBMP\n"); ++ return 1; + } + + /* des submitted this bugfix: gdFree the memory. */ + freewbmp(wbmp); ++ ++ return 0; + } + + /* +@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageWBMPCtx(im, fg, out); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageWBMPCtx(im, fg, out)) { ++ rv = gdDPExtractData(out, size); ++ } else { ++ rv = NULL; ++ } + out->gd_free(out); + return rv; + } diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 4d03d3c27..cb6ba3fcd 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libical -pkgver=3.0.5 +pkgver=3.0.6 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656 libical-3.0.5.tar.gz" +sha512sums="d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc libical-3.0.6.tar.gz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 666516c77..5ed7e4e7b 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -31,4 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec libinput-1.14.0.tar.xz" +sha512sums="8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c libinput-1.14.1.tar.xz" diff --git a/user/libjpeg-turbo/APKBUILD b/user/libjpeg-turbo/APKBUILD index e35ca14b9..f64e03452 100644 --- a/user/libjpeg-turbo/APKBUILD +++ b/user/libjpeg-turbo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libjpeg-turbo -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=0 pkgdesc="Accelerated JPEG compression and decompression library" url="https://libjpeg-turbo.org/" @@ -47,4 +47,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08 libjpeg-turbo-2.0.2.tar.gz" +sha512sums="ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36 libjpeg-turbo-2.0.3.tar.gz" diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD index 575fca74b..c226584a7 100644 --- a/user/libktorrent/APKBUILD +++ b/user/libktorrent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libktorrent -pkgver=2.1 +pkgver=2.1.1 pkgrel=0 pkgdesc="Torrent handling library for KDE" url="https://www.kde.org/" @@ -13,10 +13,9 @@ depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev boost-dev qca-dev libgcrypt-dev" makedepends="cmake extra-cmake-modules $depends_dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/ktorrent/5.1/libktorrent-$pkgver.tar.xz" +source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,13 +31,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4 libktorrent-2.1.tar.xz" +sha512sums="5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37 libktorrent-2.1.1.tar.xz" diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD index f46f49f9b..5c97a2aec 100644 --- a/user/liblangtag/APKBUILD +++ b/user/liblangtag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liblangtag -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Interface library to access tags for identifying languages" url="https://bitbucket.org/tagoh/liblangtag" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f liblangtag-0.6.2.tar.bz2" +sha512sums="3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf liblangtag-0.6.3.tar.bz2" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD index 538c2ad0d..7301a17b2 100644 --- a/user/libnftnl/APKBUILD +++ b/user/libnftnl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=libnftnl -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Netfilter library providing interface to the nf_tables subsystem" url="https://netfilter.org/projects/libnftnl" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe libnftnl-1.1.3.tar.bz2" +sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2" diff --git a/user/libogg/APKBUILD b/user/libogg/APKBUILD index fc41e6f74..c452d7890 100644 --- a/user/libogg/APKBUILD +++ b/user/libogg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: pkgname=libogg -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=0 pkgdesc="Ogg bitstream and framing library" url="https://xiph.org/ogg/" arch="all" @@ -32,4 +32,4 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="16f9cbc7f5b77c1719d80e666995ad825a3d4b6facfa51e3df3b1a9678cca7dc3c4f6ee15096c394c97ed5e67fced1aaedacc563cddfe4e0c748dd39940b099e libogg-1.3.3.tar.gz" +sha512sums="aabe5de063a1963729ce0c055d538612d242b360d13f032d1508f0e82ad23f61d89d0b00386b358a87aba43317bb7a67b8e52361a41a079a1fc2bc6df61917d9 libogg-1.3.4.tar.gz" diff --git a/user/libpcap/APKBUILD b/user/libpcap/APKBUILD index f1c3cd9d7..714e098f2 100644 --- a/user/libpcap/APKBUILD +++ b/user/libpcap/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libpcap -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="System-independent interface for user-level packet capture" url="http://www.tcpdump.org/" @@ -14,8 +14,16 @@ source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz add-missing-header.patch " +# secfixes: +# 1.9.1-r0: +# - CVE-2018-16301 +# - CVE-2019-15161 +# - CVE-2019-15162 +# - CVE-2019-15163 +# - CVE-2019-15164 +# - CVE-2019-15165 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,9 +41,8 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install install-shared } -sha512sums="0ff25641f1e9d29082766caef45888c19214f770c4f378818caa73fcbc4ae54ad9195549c2499d4879ff46e35741d93b2b02cc5f3d6aa99e85a32194cf10bfe7 libpcap-1.9.0.tar.gz +sha512sums="ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08 libpcap-1.9.1.tar.gz d9bee430f26e647c4a7ddd5b1ddd588fadefd3a034710e9bdfa9ff1d8c18ad8f6c0be1c29c2261e7be89db7d7e545e30c7910f09f3f53701ce04421449328be2 add-missing-header.patch" diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD index 172a0003d..ed8bb27f2 100644 --- a/user/libpeas/APKBUILD +++ b/user/libpeas/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libpeas -pkgver=1.22.0 -pkgrel=1 +pkgver=1.24.0 +pkgrel=0 pkgdesc="GObject-based plugin framework" url="https://gnome.org" arch="all" +options="!check" # With Meson, you can't disable individual tests. + # Three require X11. Complain to Meson, not me. license="LGPL-2.1+" 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" +makedepends="glib-dev gobject-introspection-dev gtk+3.0-dev + meson ninja py3-pygobject py3-pygobject-dev python3-dev" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libpeas/${pkgver%.*}/libpeas-$pkgver.tar.xz" build() { - LIBS="-lintl" ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson -Dprefix=/usr build + ninja -C build } check() { - DISPLAY= make check + DISPLAY= ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91 libpeas-1.22.0.tar.xz" +sha512sums="b4baa03ded9d787e7a1ee2be943617f5c84564bf299699934c47ded6c60ff62a7f27ab2594cd0ffba2d8979d8b72113d1b5e910eebd80305f3aa538db0d45314 libpeas-1.24.0.tar.xz" diff --git a/user/libpwquality/APKBUILD b/user/libpwquality/APKBUILD index 8b0c98a81..af76e2f49 100644 --- a/user/libpwquality/APKBUILD +++ b/user/libpwquality/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpwquality -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="Password quality checking library" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-pwquality:py3" source="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$pkgver/libpwquality-$pkgver.tar.bz2" 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 } @@ -43,4 +40,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 libpwquality-1.4.0.tar.bz2" +sha512sums="0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257 libpwquality-1.4.1.tar.bz2" diff --git a/user/libqmi/APKBUILD b/user/libqmi/APKBUILD index f747cdd65..4b0f96ece 100644 --- a/user/libqmi/APKBUILD +++ b/user/libqmi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqmi -pkgver=1.22.4 +pkgver=1.24.0 pkgrel=0 pkgdesc="Library for interfacing with Qualcomm modems" url="https://www.freedesktop.org/wiki/Software/libqmi/" @@ -10,7 +10,9 @@ license="LGPL-2.0+" depends="" makedepends="glib-dev libgudev-dev python3" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz" +source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz + endian.patch + " build() { ./configure \ @@ -32,4 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eaa17cb7a19c73db0e1c50c714dab73ad5f97d85de86b74135085ecf31d048b80f2476509139832327925eeca97bee24e18bab33d87e814fe9b7f190ee823a34 libqmi-1.22.4.tar.xz" +sha512sums="e899765e67c1db0f758030e78b296015c476f938bb2afa01594b3e71a0b8d5fc2237c8272497aec891d5555523ecf0fecd69c4d0e14165c07072780621b3b502 libqmi-1.24.0.tar.xz +af01895913a66de52a79cb6de63a56025c8ee84ca7d62b91d3798d626b2eb133bc3c933fdac49d7b73874f3f641c158fb466b7567e6224d7d8a0b58e932a14d5 endian.patch" diff --git a/user/libqmi/endian.patch b/user/libqmi/endian.patch new file mode 100644 index 000000000..cf84b481b --- /dev/null +++ b/user/libqmi/endian.patch @@ -0,0 +1,69 @@ +From 6030b9bb2e0ed9f3824a34cef548feaefceb9e37 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Fri, 4 Oct 2019 17:45:10 -0500 +Subject: [PATCH 1/2] libqmi-glib: Fix message creation on BE systems + +Creation of the fake QMUX header wrote the length as a native value, which +caused the wrong value to be written on big endian systems. + +Before, a test run on a ppc64 system gave: + +ERROR:test-message.c:296:test_message_new_request_from_data: assertion failed: (self) + /libqmi-glib/message/new/request: OK + /libqmi-glib/message/new/request-from-data: FAIL + +Adding a g_assert_no_error gave the more helpful message: + +ERROR:test-message.c:296:test_message_new_request_from_data: assertion failed (error == NULL): QMUX length and buffer length don't match (3072 != 12) (qmi_core_error_quark, 4) + +After this commit is applied, all tests pass on a big endian ppc64 system. +--- + src/libqmi-glib/qmi-message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libqmi-glib/qmi-message.c b/src/libqmi-glib/qmi-message.c +index b82069e..41c5b43 100644 +--- a/src/libqmi-glib/qmi-message.c ++++ b/src/libqmi-glib/qmi-message.c +@@ -478,7 +478,7 @@ qmi_message_new_from_data (QmiService service, + /* Set up fake QMUX header */ + buffer = (struct full_message *)(self->data); + buffer->marker = QMI_MESSAGE_QMUX_MARKER; +- buffer->qmux.length = buffer_len - 1; ++ buffer->qmux.length = GUINT16_TO_LE(buffer_len - 1); + buffer->qmux.flags = 0; + buffer->qmux.service = service; + buffer->qmux.client = client_id; +-- +2.22.1 + +From e299023094516a5be3ffb05f66ea90c47e966811 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Fri, 4 Oct 2019 17:49:07 -0500 +Subject: [PATCH 2/2] libqmi-glib: Add small error test to test-message + +The previous commit was easier to diagnose with the error condition from +qmi_message_new_from_data provided. This change adds g_assert_no_error to +the test_message_new_request_from_data case so that any future issues can +be diagnosed quickly. +--- + src/libqmi-glib/test/test-message.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/libqmi-glib/test/test-message.c b/src/libqmi-glib/test/test-message.c +index b6ea711..e41917a 100644 +--- a/src/libqmi-glib/test/test-message.c ++++ b/src/libqmi-glib/test/test-message.c +@@ -292,7 +292,8 @@ test_message_new_request_from_data (void) + qmi = g_byte_array_new (); + g_byte_array_append (qmi, expected_buffer, sizeof (expected_buffer)); + +- self = qmi_message_new_from_data (QMI_SERVICE_DMS, 0x01, qmi, NULL); ++ self = qmi_message_new_from_data (QMI_SERVICE_DMS, 0x01, qmi, &error); ++ g_assert_no_error (error); + g_assert (self); + + /* check that the QMUX header contains the right values*/ +-- +2.22.1 + diff --git a/user/libraw/APKBUILD b/user/libraw/APKBUILD index 843c95427..d280c6402 100644 --- a/user/libraw/APKBUILD +++ b/user/libraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libraw -pkgver=0.19.4 +pkgver=0.19.5 pkgrel=0 pkgdesc="Read RAW image files from digital cameras" url="https://www.libraw.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c LibRaw-0.19.4.tar.gz" +sha512sums="4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826 LibRaw-0.19.5.tar.gz" diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD index bc75fb918..272f5dc82 100644 --- a/user/librdkafka/APKBUILD +++ b/user/librdkafka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=librdkafka -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="The Apache Kafka C/C++ library" url="https://github.com/edenhill/librdkafka" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6 librdkafka-1.1.0.tar.gz" +sha512sums="7caddeec09bd1556688f0011f5cae49f8b0cde55b8dbc1296b3d2a39879badc42b7f59369bb1938ce7c4c4ff8b0fe4f1973b923c3db603466c10a4c015306522 librdkafka-1.2.0.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index cb883270e..bb7f81e1f 100644 --- a/user/libsecret/APKBUILD +++ b/user/libsecret/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsecret -pkgver=0.18.8 +pkgver=0.19.1 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -10,9 +10,9 @@ options="!check" # Test suites require DBus-Python. license="LGPL-2.1+ AND LGPL-2.0+" depends="" makedepends="docbook-xsl glib-dev gobject-introspection-dev libgcrypt-dev - libxslt" + libxslt vala-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://ftp.acc.umu.se/pub/gnome/sources/libsecret/0.18/libsecret-$pkgver.tar.xz" +source="https://ftp.acc.umu.se/pub/gnome/sources/libsecret/${pkgver%.*}/libsecret-$pkgver.tar.xz" build() { ./configure \ @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4 libsecret-0.18.8.tar.xz" +sha512sums="134f98f09a1cc7c61b9011b2fb35900d9beccfc06d978f1ffab8b5286dc6caa176832e55e3bed498c6f3526f6f34998307f67cf7accc4c79e9abf1c17cc9c7c2 libsecret-0.19.1.tar.xz" diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index 65c1d4edc..37262a2ef 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,11 +1,12 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsoup -pkgver=2.66.2 +pkgver=2.68.1 pkgrel=0 pkgdesc="GObject-based HTTP library" url="https://wiki.gnome.org/Projects/libsoup" arch="all" +options="!check" # HSTS tests fail because .localdomain names fail to resolve. license="LGPL-2.0+ AND LGPL-2.1+" makedepends="glib-dev libxml2-dev sqlite-dev libpsl-dev intltool vala-dev gobject-introspection-dev glib-networking meson ninja krb5-dev" @@ -13,20 +14,16 @@ subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libsoup/${pkgver%.*}/libsoup-$pkgver.tar.xz" build() { - mkdir -p "$builddir"/build - cd "$builddir"/build - meson -Dprefix=/usr .. - ninja + meson -Dprefix=/usr build + ninja -C build } check() { - cd "$builddir"/build - ninja test + ninja -C build test } package() { - cd "$builddir"/build - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092 libsoup-2.66.2.tar.xz" +sha512sums="e670de61c7a20994cafcddf8eb33d5210d6b623955c66ca21fc13c13d0596e72d0f487e6cc29cde73edcff6307dedd33063013a49643081830876209a336c46b libsoup-2.68.1.tar.xz" diff --git a/user/libusb/APKBUILD b/user/libusb/APKBUILD index f163c64ab..649c84c6a 100644 --- a/user/libusb/APKBUILD +++ b/user/libusb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libusb -pkgver=1.0.22 -pkgrel=1 +pkgver=1.0.23 +pkgrel=0 pkgdesc="Library for USB device communication" url="https://libusb.info/" arch="all" @@ -11,7 +11,6 @@ makedepends="eudev-dev linux-headers" source="https://github.com/libusb/libusb/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -20,13 +19,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4 libusb-1.0.22.tar.bz2" +sha512sums="73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b libusb-1.0.23.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index 6becf5507..4560d319c 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,35 +1,29 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.2 +pkgver=1.3 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" arch="all" license="MIT" depends="" -makedepends="libx11-dev libxext-dev xorgproto-dev" +makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" subpackages="$pkgname-dev" -source="https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/libvdpau-1.2.tar.bz2" +source="https://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-$pkgver.tar.xz" build() { - LIBS="-lX11" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make + meson -Dprefix=/usr \ + build + ninja -C build } check() { - make check + ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f libvdpau-1.2.tar.bz2" +sha512sums="a839ed06ac3bb1ceaa8020e38f40f6dd1d1af066878effbc02e3b02f0917ccdad4059ac2a4428ca39265bda3ba02885d905231f365b86151bae28d135d8de3d5 libvdpau-1.3.tar.xz" diff --git a/user/libxfont2/APKBUILD b/user/libxfont2/APKBUILD index 3ebe3e051..dd9d5aeed 100644 --- a/user/libxfont2/APKBUILD +++ b/user/libxfont2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxfont2 -pkgver=2.0.3 -pkgrel=1 +pkgver=2.0.4 +pkgrel=0 pkgdesc="X11 font library from X.Org" url="https://www.X.Org/" arch="all" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b libXfont2-2.0.3.tar.bz2" +sha512sums="7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106 libXfont2-2.0.4.tar.bz2" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index 9953618d2..daabfc36e 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=0 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 libXvMC-1.0.11.tar.bz2" +sha512sums="62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 libXvMC-1.0.12.tar.bz2" diff --git a/user/links/APKBUILD b/user/links/APKBUILD index 5761ea7be..b942c40b0 100644 --- a/user/links/APKBUILD +++ b/user/links/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=links -pkgver=2.20.1 +pkgver=2.20.2 pkgrel=0 pkgdesc="Text Web browser, similar to Lynx" url="http://links.twibright.com/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7258e303a2012e9016385abd1e8882ffec47dd3baf479a54448742e41b03508d874387af6ea97c7ef9c4d37f2eecbe7bc0121d923df79b0f455f4f466747ca2 links-2.20.1.tar.bz2" +sha512sums="82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152 links-2.20.2.tar.bz2" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 841ad2744..4d50aa986 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2019.08.16 +pkgver=2019.09.30 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -50,4 +50,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="bf7d0444640919e2519ba9f5fb650a7f5bea43eab339845b54c3ac87a90eab9003f688c503dd2731a0d72b97e3019b246997d5e5e05db40a1638ca6f629598e7 live.2019.08.16.tar.gz" +sha512sums="6378d08153d0178d3b9ec191a7f57ed5c6bf6adf304bf1107db67bb6d050827b1a85ce157df576c2644aa3a819c47aa4dbf0300e3b223456cc6649eeadbd2324 live.2019.09.30.tar.gz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index f9ce9632f..dbceb82e5 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=luarocks -pkgver=3.1.3 +pkgver=3.2.1 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" arch="noarch" options="!check" # No test suite license="MIT" -depends="" +depends="lua5.3" makedepends="lua5.3-dev" source="https://luarocks.github.io/luarocks/releases/luarocks-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -23,8 +22,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="233e17cd89f99eb387b9e5256edb10c920fb0dd7a173561b24c09c45c341de62f85dba85787788546deef206022602d3f707291935da1a2aee5c05fcad6ddc1b luarocks-3.1.3.tar.gz" +sha512sums="9abf2c5477b9ab8e3caf485dd10fc154435b41efc13c7709f36a9182ccbd98d022738627f76901977a9b7c42ae61e5f139e78070d469094a7571910afbb747ff luarocks-3.2.1.tar.gz" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index aca78406b..9dced4d5f 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.7 +pkgver=10.4.8 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -29,7 +29,6 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad gcc_builtins_ppc.h libedit.patch ppchax.patch - types.patch mariadb.initd mariadb-server.limits " @@ -263,11 +262,10 @@ doc() { default_doc } -sha512sums="cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce mariadb-10.4.7.tar.gz +sha512sums="1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42 mariadb-10.4.8.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h 41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch 0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch -8dda61a8e0bc3d1712de36bc53e39dc348bc5bc9e37de37b644977df6144f8ee588e55674466dc8d45624d0cad91cc1e3d15e3951214d6d4fe783465592b1a2e types.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/types.patch b/user/mariadb/types.patch deleted file mode 100644 index 7f2917b47..000000000 --- a/user/mariadb/types.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mariadb-10.4.7/plugin/auth_pam/testing/pam_mariadb_mtr.c.old 2019-07-30 11:32:16.000000000 +0000 -+++ mariadb-10.4.7/plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-17 21:37:59.264353123 +0000 -@@ -56,7 +56,7 @@ - if (strcmp(r1, "crash pam module") == 0 && atoi(r2) == 616) - abort(); - -- if (strlen(r1) == (uint)atoi(r2) % 100) -+ if (strlen(r1) == (unsigned int)atoi(r2) % 100) - retval = PAM_SUCCESS; - else - retval = PAM_AUTH_ERR; diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 555799dab..487888387 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.51.1 +pkgver=0.51.2 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="b0b220de2a20c355cbd2f63aff195374ad8b2dae64f0dc4efb7abf84d7a9e70b6d4239d3d94b2b8ba2de5dd6e871589848b057c842c8f256016c666e9aa882f1 meson-0.51.1.tar.gz" +sha512sums="5d6bc5c59c026b67d065b28a5ce8c7901ffb9663d3cb1609ef1714ace50e3b1e0fc116466a34ba5ae8dbfb2337b7848008f3d865832ea537422221f1a6793ddd meson-0.51.2.tar.gz" diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD index ad0c17e63..5a5804d96 100644 --- a/user/modemmanager/APKBUILD +++ b/user/modemmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=modemmanager -pkgver=1.10.4 +pkgver=1.10.6 pkgrel=0 pkgdesc="Software to control mobile broadband modems" url="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -43,6 +43,6 @@ package() { "$srcdir"/01-org.freedesktop.ModemManager.rules } -sha512sums="ead9826efbd360cb47e52a8f8e8b44e92d2d93c6058f099e4bc2358c4ef03bec0b2631b6b4b552d75ff41ec9b6154b4f614c1be5a31e684c69cf3c04c9866dd7 ModemManager-1.10.4.tar.xz +sha512sums="9d0cdca7413c1ad7e44a0c65d620e3c36204919b896290878180c73d7843d217f7c759bcba1007cbed2ec75f615b7ab196989e90afddbcbbf38a1b4cd04a8e3a ModemManager-1.10.6.tar.xz 78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch 31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules" diff --git a/user/mosh/APKBUILD b/user/mosh/APKBUILD index c3136055d..7ec12f783 100644 --- a/user/mosh/APKBUILD +++ b/user/mosh/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mosh pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Mobile shell surviving disconnects with local echo and line editing" url="https://mosh.org" arch="all" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 079af13e3..02a0d0fdc 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=4.3 +pkgver=4.5 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -44,4 +44,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="3b16b70bdd98ea92cef99dfe5ee859e198bdb1dfa44e25aa200362958f77f8127c7c66aaf204637b768f10b3ea6f45f41417359b2f2608fab28ee9041057bf4f nano-4.3.tar.xz" +sha512sums="1caee1f559cb11efa7535f4682e7ff6e22802d01ca21733a67031e4ba7c5d3ca13c60f22f71460bb99eadd8d001aeb3783a5e34d1433583e8822fc13d063e4d9 nano-4.5.tar.xz" diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD index 0b1935ebe..6fb844bf9 100644 --- a/user/networkmanager/APKBUILD +++ b/user/networkmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=networkmanager -pkgver=1.20.0 +pkgver=1.20.4 pkgrel=0 pkgdesc="Network management daemon" url="https://wiki.gnome.org/Projects/NetworkManager" @@ -90,7 +90,7 @@ openrc() { "$subpkgdir"/etc/NetworkManager/dispatcher.d/ } -sha512sums="825c56a7530d813ba7ea2ec57034def560f4b0fb65a09dc70cd94dc897e2aabde11f18c6c4843da9c520531683e963037ce42270a6ffa5c7c5e9502bb80bdf1b NetworkManager-1.20.0.tar.xz +sha512sums="d08f7e8f5ea8f8567834a53a68ff7aeff09839658b73dc17b31dbdd7dd5c36b09f4e563c2ebc52d1e1574a84163e66e0bfee01c3762a222aa7154d18c09660cb NetworkManager-1.20.4.tar.xz a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256 editline.patch 0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f errno.patch 313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b musl.patch diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD index fb6e7a0ff..124c35dfd 100644 --- a/user/nftables/APKBUILD +++ b/user/nftables/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=nftables -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=0 pkgdesc="Netfilter tables userspace tools" url="https://netfilter.org/projects/nftables" @@ -43,7 +43,7 @@ package() { install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242 nftables-0.9.1.tar.bz2 -057786364c69fd3959bb5d38744829e56e91bddec3ff0e0b1c0bbbd818a7a49acb8077085e8eb8de88c155cfa6d8a34f1bdfb2ef27d73f3de11ec39d9fbbfe41 asciidoctor.patch +sha512sums="2d83b104af0d70f99a16c2e40afdb9bf89bd984323810e2895976c5e2e346bf09dd88850a391f295e335279adfdd39d34c13610cf8e6b801499dc0df2a5cecf6 nftables-0.9.2.tar.bz2 +f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch 4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd 58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nftables/asciidoctor.patch b/user/nftables/asciidoctor.patch index 7a7ed0fd7..11412a81b 100644 --- a/user/nftables/asciidoctor.patch +++ b/user/nftables/asciidoctor.patch @@ -18,7 +18,7 @@ index 01e1af9..7776932 100644 man_MANS = nft.8 libnftables-json.5 libnftables.3 endif --A2X_OPTS_MANPAGE = --doctype manpage --format manpage -D ${builddir} +-A2X_OPTS_MANPAGE = -L --doctype manpage --format manpage -D ${builddir} +A2X_OPTS_MANPAGE = --doctype manpage --backend manpage -D ${builddir} ASCIIDOC_MAIN = nft.txt diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD index a6122fcc5..f0ff082be 100644 --- a/user/numactl/APKBUILD +++ b/user/numactl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Daniel Sabogal <dsabogalcc@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=numactl -pkgver=2.0.12 +pkgver=2.0.13 pkgrel=0 pkgdesc="Simple NUMA policy support" url="https://github.com/numactl/numactl" @@ -43,5 +43,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="3814efd924d1c9152a30f6ae5b665afc20648226cd475d72b933c0ec4f30249af4e25110de17f144734b787ed765644dca09a657219806ab5c9c550abd45bf8e numactl-2.0.12.tar.gz +sha512sums="328e2c9ff102f3402f02aac0c94a06c3d352a026ffb6dc31edb4dca029a530719f6dd9903163f6c2eef1a24f6aac10c2a6a52cefcdf7cf0bd9e3844ac85096d8 numactl-2.0.13.tar.gz c24affa5a8a8ea83d7f0ee384dc0629e17a5c4201357132f770f894ad4236772116d96d8389d54fb99095af40d1ccbffc3170b5fb9cc88cfca39179f50bee9c9 musl.patch" diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD index d6eddcd70..f65d278ca 100644 --- a/user/opal-utils/APKBUILD +++ b/user/opal-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opal-utils -pkgver=6.3.1 +pkgver=6.5 pkgrel=0 pkgdesc="Tools for IBM FSP and OpenPOWER systems" url="https://lists.ozlabs.org/listinfo/skiboot" @@ -39,6 +39,6 @@ package() { done } -sha512sums="ad2156d864cedcf3d19e8ff094d12059703aaf9a5ea8403e230ecf33d331dae45e0f28a89c65ad05f94605e493bc8d42df92698847600810d5609bc56ade24b8 skiboot-6.3.1.tar.gz +sha512sums="f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571 skiboot-6.5.tar.gz e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch -944dd564a2c846a675544c8ecdb2fa4714235f3fd974e135a71220379640f94883811399fe03d2d697fcb49e219504af264af0f201a6a7b37029687dea6a28cf opal-prd.patch" +692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch" diff --git a/user/opal-utils/opal-prd.patch b/user/opal-utils/opal-prd.patch index 29b38cd43..90a23e333 100644 --- a/user/opal-utils/opal-prd.patch +++ b/user/opal-utils/opal-prd.patch @@ -1,6 +1,6 @@ --- skiboot-6.3.1/external/opal-prd/thunk.S.old 2019-05-10 06:50:45.000000000 +0000 +++ skiboot-6.3.1/external/opal-prd/thunk.S 2019-06-04 08:01:00.851806263 +0000 -@@ -1,4 +1,4 @@ +@@ -3,4 +3,4 @@ -#include <endian.h> +#define __BYTE_ORDER __BIG_ENDIAN #include <asm/unistd.h> diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD index 8ac3960b4..4861c4f9b 100644 --- a/user/openjdk8/APKBUILD +++ b/user/openjdk8/APKBUILD @@ -168,7 +168,6 @@ build() { --with-jdk-src-zip="$srcdir/jdk-$_dropsver.tar.xz" \ --with-langtools-src-zip="$srcdir/langtools-$_dropsver.tar.xz" \ --with-nashorn-src-zip="$srcdir/nashorn-$_dropsver.tar.xz" \ - --with-pax=paxmark \ --with-jdk-home="$_bootstrap_java_home" \ --with-pkgversion="Adelie ${pkgver}-r${pkgrel}" \ --enable-nss \ diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 026091d77..c5cf85a3a 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -28,4 +28,4 @@ package() { make install } -sha512sums="a84a219c049147e9566967f96a01c84dde587e38da37b34ef756da99a2d14f1d418492030098f63c4ac60cb0db553f474aaf3b8a00c8abfd98f66adc14f523e4 openttd-1.9.2-source.tar.xz" +sha512sums="e2208f730cf26c2df9b1950e885e20471060217dd47f2483db3f1cc86b40658d71208f27caab38a9fa513cfddb33c791a0972336dfa902a6d110ef246d936a34 openttd-1.9.3-source.tar.xz" diff --git a/user/orc/APKBUILD b/user/orc/APKBUILD index de40d3f31..fc760912f 100644 --- a/user/orc/APKBUILD +++ b/user/orc/APKBUILD @@ -2,37 +2,30 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=orc -pkgver=0.4.29 +pkgver=0.4.30 pkgrel=0 pkgdesc="The Oil Run-time Compiler" url="https://gstreamer.freedesktop.org/modules/orc.html" arch="all" license="BSD-2-Clause AND BSD-3-Clause" -makedepends="linux-headers" -subpackages="$pkgname-dev $pkgname-doc $pkgname-compiler" -source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz" +makedepends="linux-headers meson ninja" +subpackages="$pkgname-dev $pkgname-compiler" +source="https://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.xz + ppc-fixes.patch + " build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var - make + meson -Dprefix=/usr \ + build + ninja -C build } check() { - cd "$builddir" - make check + ninja -C build test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } dev() { @@ -47,4 +40,5 @@ compiler() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="57aa75bbefa9ba9ffcce97affd504c13c57612e2409863c011555bed6ff6ba224d38ed66b715bf103679a8ee28ddae427db3d78c7b4a2ddfa7dbd72a4fa81726 orc-0.4.29.tar.xz" +sha512sums="da254347f5ebb278f0932a7bfa878adc2a14c42c7e6a20a4e6bb68c0883e307fef57bef867d54e150bd1d875f79eee27f9d34aede410d3eddd4093e5b055cd22 orc-0.4.30.tar.xz +b049e4ab9e2ee71013cc1f387dfc24df97c25fcf72dd3fd0502d891ee5e1e305dd710a639839ac64f6a58383b18d49ccffd32645dc64255b15945920acaf56d6 ppc-fixes.patch" diff --git a/user/orc/ppc-fixes.patch b/user/orc/ppc-fixes.patch new file mode 100644 index 000000000..ab4aecd40 --- /dev/null +++ b/user/orc/ppc-fixes.patch @@ -0,0 +1,990 @@ +diff --git a/orc-test/orctest.c b/orc-test/orctest.c +index 614421b..d9cb9d5 100644 +--- a/orc-test/orctest.c ++++ b/orc-test/orctest.c +@@ -523,14 +523,14 @@ float_compare (OrcArray *array1, OrcArray *array2, int i, int j) + if (isnan(*(float *)ptr1) && isnan(*(float *)ptr2)) return TRUE; + if (*(float *)ptr1 == *(float *)ptr2) return TRUE; + if ((*(float *)ptr1 < 0.0) == (*(float *)ptr2 < 0.0) && +- abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2) <= 2)) ++ abs((orc_int32)(*(orc_uint32 *)ptr1 - *(orc_uint32 *)ptr2)) <= 2) + return TRUE; + return FALSE; + case 8: + if (isnan(*(double *)ptr1) && isnan(*(double *)ptr2)) return TRUE; + if (*(double *)ptr1 == *(double *)ptr2) return TRUE; + if ((*(double *)ptr1 < 0.0) == (*(double *)ptr2 < 0.0) && +- llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2) <= 2)) ++ llabs((orc_int64)(*(orc_uint64 *)ptr1 - *(orc_uint64 *)ptr2)) <= 2) + return TRUE; + return FALSE; + } +diff --git a/orc/orcpowerpc.c b/orc/orcpowerpc.c +index e054d07..ed98437 100644 +--- a/orc/orcpowerpc.c ++++ b/orc/orcpowerpc.c +@@ -208,7 +208,7 @@ powerpc_emit_srawi (OrcCompiler *compiler, int regd, int rega, int shift, + powerpc_get_regname(regd), + powerpc_get_regname(rega), shift); + +- insn = (31<<26) | (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); ++ insn = (31<<26) | (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); + insn |= (shift<<11) | (824<<1) | record; + + powerpc_emit (compiler, insn); +@@ -233,7 +233,7 @@ powerpc_emit_D (OrcCompiler *compiler, const char *name, + ORC_ASM_CODE(compiler," %s %s, %s, %d\n", name, + powerpc_get_regname(regd), + powerpc_get_regname(rega), imm); +- insn |= (powerpc_regnum (regd)<<21) | (powerpc_regnum (rega)<<16); ++ insn |= (powerpc_regnum (rega)<<21) | (powerpc_regnum (regd)<<16); + insn |= imm&0xffff; + + powerpc_emit (compiler, insn); +@@ -543,7 +543,7 @@ powerpc_load_constant (OrcCompiler *p, int i, int reg) + { + unsigned int insn; + +- ORC_ASM_CODE(p," addi %s, %s, %db - %s\n", ++ ORC_ASM_CODE(p," addi %s, %s, %df - %s\n", + powerpc_get_regname(greg), + powerpc_get_regname(greg), p->constants[i].label, p->program->name); + insn = (14<<26) | (powerpc_regnum (greg)<<21) | (powerpc_regnum (greg)<<16); +@@ -740,3 +740,42 @@ void powerpc_emit_label (OrcCompiler *compiler, int label) + powerpc_add_label (compiler, compiler->codeptr, label); + } + ++void ++powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) ++{ ++ if (IS_POWERPC_BE (compiler)) { ++ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } else { ++ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } ++} ++ ++void ++powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) ++{ ++ if (IS_POWERPC_BE (compiler)) { ++ ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } else { ++ ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", ++ powerpc_get_regname (vector_reg), ++ offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), ++ powerpc_get_regname (src_reg)); ++ powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), ++ offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); ++ } ++} +diff --git a/orc/orcpowerpc.h b/orc/orcpowerpc.h +index e6b315a..ba824b2 100644 +--- a/orc/orcpowerpc.h ++++ b/orc/orcpowerpc.h +@@ -138,6 +138,9 @@ void powerpc_emit_full_constants (OrcCompiler* p); + void powerpc_emit_load_address (OrcCompiler* compiler, int regd, int rega, int imm); + void powerpc_load_constant (OrcCompiler* p, int i, int reg); + ++void powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); ++void powerpc_store_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg); ++ + /* instructions */ + #define powerpc_emit_vand(p,a,b,c) powerpc_emit_VX_2 (p, "vand", 0x10000404, a, b, c) + #define powerpc_emit_vandc(p,a,b,c) powerpc_emit_VX_2 (p, "vandc", 0x10000444, a, b, c) +@@ -159,8 +162,10 @@ void powerpc_load_constant (OrcCompiler* p, int i, int reg); + + #define powerpc_emit_vmrghb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghb", 0x1000000c, a, b, c) + #define powerpc_emit_vmrghh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghh", 0x1000004c, a, b, c) ++#define powerpc_emit_vmrghw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrghw", 0x1000008c, a, b, c) + #define powerpc_emit_vmrglb(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglb", 0x1000010c, a, b, c) + #define powerpc_emit_vmrglh(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglh", 0x1000014c, a, b, c) ++#define powerpc_emit_vmrglw(p,a,b,c) powerpc_emit_VX_2 (p, "vmrglw", 0x1000018c, a, b, c) + + #define powerpc_emit_vpkshss(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshss", 0x1000018e, a, b, c) + #define powerpc_emit_vpkshus(p,a,b,c) powerpc_emit_VX_2 (p, "vpkshus", 0x1000010e, a, b, c) +diff --git a/orc/orcprogram-altivec.c b/orc/orcprogram-altivec.c +index 659115e..808b4e1 100644 +--- a/orc/orcprogram-altivec.c ++++ b/orc/orcprogram-altivec.c +@@ -18,6 +18,8 @@ static void orc_compiler_powerpc_init (OrcCompiler *compiler); + static unsigned int orc_compiler_powerpc_get_default_flags (void); + static void orc_compiler_powerpc_assemble (OrcCompiler *compiler); + static const char* powerpc_get_flag_name (int shift); ++static int orc_powerpc_assemble_copy_check (OrcCompiler *compiler); ++static void orc_powerpc_assemble_copy (OrcCompiler *compiler); + + + static void +@@ -199,8 +201,8 @@ powerpc_load_constants_outer (OrcCompiler *compiler) + } + } + +- orc_compiler_emit_invariants (compiler); +- ++ /* Load constants first, as they may be used by invariants */ ++ ORC_ASM_CODE(compiler,"# load constants\n"); + for(i=0;i<compiler->n_constants;i++) { + if (compiler->constants[i].is_long && + !compiler->constants[i].alloc_reg) { +@@ -212,6 +214,9 @@ powerpc_load_constants_outer (OrcCompiler *compiler) + } + } + } ++ ++ ORC_ASM_CODE(compiler,"# load invariants\n"); ++ orc_compiler_emit_invariants (compiler); + } + + static void +@@ -219,6 +224,7 @@ powerpc_load_inner_constants (OrcCompiler *compiler) + { + int i; + ++ ORC_ASM_CODE(compiler,"# load inner constants\n"); + for(i=0;i<ORC_N_COMPILER_VARIABLES;i++){ + if (compiler->vars[i].name == NULL) continue; + switch (compiler->vars[i].vartype) { +@@ -305,6 +311,11 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + int label_leave; + int set_vscr = FALSE; + ++ if (orc_powerpc_assemble_copy_check (compiler)) { ++ orc_powerpc_assemble_copy (compiler); ++ return; ++ } ++ + label_outer_loop_start = orc_compiler_label_new (compiler); + label_loop_start = orc_compiler_label_new (compiler); + label_leave = orc_compiler_label_new (compiler); +@@ -312,6 +323,8 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + { + int i; + ++ /* Emit invariants also to check for constants */ ++ orc_compiler_emit_invariants (compiler); + orc_powerpc_emit_loop (compiler, 0); + + compiler->codeptr = compiler->code; +@@ -486,3 +499,199 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) + powerpc_do_fixups (compiler); + } + ++static ++int orc_powerpc_assemble_copy_check (OrcCompiler *compiler) ++{ ++ if (compiler->program->n_insns == 1 && ++ compiler->program->is_2d == FALSE && ++ (strcmp (compiler->program->insns[0].opcode->name, "copyb") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyw") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyl") == 0 || ++ strcmp (compiler->program->insns[0].opcode->name, "copyq") == 0) && ++ (compiler->program->insns[0].flags & ++ (ORC_INSTRUCTION_FLAG_X2 | ORC_INSTRUCTION_FLAG_X4)) == 0 && ++ compiler->program->n_param_vars == 0 && ++ compiler->program->n_const_vars == 0) { ++ /* TODO: add param & const support if this turns out to be faster */ ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static ++void orc_powerpc_assemply_copy_loop (OrcCompiler *compiler, int size, ++ int shift, int next_label) ++{ ++ const int src = POWERPC_R5; ++ const int dst = POWERPC_R6; ++ const int count = POWERPC_R7; ++ const int tmp = POWERPC_R0; ++ const int vtmp = POWERPC_V0; ++ const int vperm = POWERPC_V1; ++ int label_copy; ++ ++ label_copy = orc_compiler_label_new (compiler); ++ ++ ORC_ASM_CODE(compiler," cmplwi %s, %d\n", ++ powerpc_get_regname(count), size); ++ powerpc_emit(compiler, 0x28000000|(powerpc_regnum(count)<<16)|(size&0xffff)); ++ ++ ORC_ASM_CODE(compiler," blt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41800000); ++ ++ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, src, size-1); ++ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41810000); ++ ++ powerpc_emit_D(compiler, "andi.", 0x70000000, tmp, dst, size-1); ++ ORC_ASM_CODE(compiler," bgt %d%c\n", next_label, ++ (compiler->labels[next_label]!=NULL) ? 'b' : 'f'); ++ powerpc_add_fixup (compiler, 0, compiler->codeptr, next_label); ++ powerpc_emit (compiler, 0x41810000); ++ ++ powerpc_emit_srawi (compiler, tmp, count, shift, 0); ++ ++ ORC_ASM_CODE (compiler, " mtctr %s\n", powerpc_get_regname(tmp)); ++ powerpc_emit (compiler, 0x7c0903a6 | (powerpc_regnum (tmp)<<21)); ++ ++ powerpc_emit_label (compiler, label_copy); ++ if (size == 16) { ++ ORC_ASM_CODE(compiler," lvx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c0000ce, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ ORC_ASM_CODE(compiler," stvx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c0001ce, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ } else { ++ switch (size) { ++ case 1: ++ ORC_ASM_CODE(compiler," lvebx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00000e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ case 2: ++ ORC_ASM_CODE(compiler," lvehx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00004e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ case 4: ++ ORC_ASM_CODE(compiler," lvewx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (src)); ++ powerpc_emit_X (compiler, 0x7c00008e, powerpc_regnum(vtmp), ++ 0, powerpc_regnum(src)); ++ break; ++ } ++ powerpc_load_align (compiler, vperm, 0, src); ++ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); ++ powerpc_store_align (compiler, vperm, 0, dst); ++ powerpc_emit_vperm (compiler, vtmp, vtmp, vtmp, vperm); ++ switch (size) { ++ case 1: ++ ORC_ASM_CODE(compiler," stvebx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00010e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ case 2: ++ ORC_ASM_CODE(compiler," stvehx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00014e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ case 4: ++ ORC_ASM_CODE(compiler," stvewx %s, 0, %s\n", ++ powerpc_get_regname (vtmp), ++ powerpc_get_regname (dst)); ++ powerpc_emit_X (compiler, 0x7c00018e, ++ powerpc_regnum(vtmp), ++ 0, powerpc_regnum(dst)); ++ break; ++ } ++ } ++ ++ powerpc_emit_addi (compiler, src, src, size); ++ powerpc_emit_addi (compiler, dst, dst, size); ++ powerpc_emit_addi (compiler, count, count, -size); ++ powerpc_emit_bne (compiler, label_copy); ++ ++ powerpc_emit_label (compiler, next_label); ++} ++ ++static ++void orc_powerpc_assemble_copy (OrcCompiler *compiler) ++{ ++ const int src = POWERPC_R5; ++ const int dst = POWERPC_R6; ++ const int count = POWERPC_V7; ++ OrcInstruction *insn; ++ int shift = 0; ++ int label_word; ++ int label_halfword; ++ int label_byte; ++ int label_done; ++ ++ insn = compiler->program->insns + 0; ++ ++ if (strcmp (insn->opcode->name, "copyw") == 0) { ++ shift = 1; ++ } else if (strcmp (insn->opcode->name, "copyl") == 0) { ++ shift = 2; ++ } else if (strcmp (insn->opcode->name, "copyq") == 0) { ++ shift = 3; ++ } ++ ++ label_word = orc_compiler_label_new (compiler); ++ label_halfword = orc_compiler_label_new (compiler); ++ label_byte = orc_compiler_label_new (compiler); ++ label_done = orc_compiler_label_new (compiler); ++ ++ powerpc_emit_prologue (compiler); ++ ++ powerpc_emit_load_address (compiler, ++ dst, ++ POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->dest_args[0]])); ++ powerpc_emit_load_address (compiler, ++ src, ++ POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[insn->src_args[0]])); ++ powerpc_emit_lwz (compiler, count, POWERPC_R3, ++ (int)ORC_STRUCT_OFFSET(OrcExecutor, n)); ++ ++ powerpc_emit_addi (compiler, POWERPC_R0, 0, shift); ++ ORC_ASM_CODE(compiler, " slw %s, %s, %s\n", ++ powerpc_get_regname(count), ++ powerpc_get_regname(count), ++ powerpc_get_regname(POWERPC_R0)); ++ powerpc_emit (compiler, (31<<26) | ++ (powerpc_regnum (count)<<21) | ++ (powerpc_regnum (count)<<16) | ++ (powerpc_regnum (POWERPC_R0)<<11) | (24<<1)); ++ ++ orc_powerpc_assemply_copy_loop (compiler, 16, 4, label_word); ++ orc_powerpc_assemply_copy_loop (compiler, 4, 2, label_halfword); ++ orc_powerpc_assemply_copy_loop (compiler, 2, 1, label_byte); ++ orc_powerpc_assemply_copy_loop (compiler, 1, 0, label_done); ++ ++ powerpc_emit_epilogue (compiler); ++ powerpc_do_fixups (compiler); ++} +diff --git a/orc/orcrules-altivec.c b/orc/orcrules-altivec.c +index fa40ac3..7729b69 100644 +--- a/orc/orcrules-altivec.c ++++ b/orc/orcrules-altivec.c +@@ -15,26 +15,6 @@ + + /* rules */ + +-static void +-powerpc_load_align (OrcCompiler *compiler, int vector_reg, int offset_reg, int src_reg) +-{ +- if (IS_POWERPC_BE (compiler)) { +- ORC_ASM_CODE(compiler," lvsl %s, %s, %s\n", +- powerpc_get_regname (vector_reg), +- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), +- powerpc_get_regname (src_reg)); +- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(vector_reg), +- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); +- } else { +- ORC_ASM_CODE(compiler," lvsr %s, %s, %s\n", +- powerpc_get_regname (vector_reg), +- offset_reg == 0 ? "0" : powerpc_get_regname (offset_reg), +- powerpc_get_regname (src_reg)); +- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(vector_reg), +- offset_reg == 0 ? 0 : powerpc_regnum(offset_reg), powerpc_regnum(src_reg)); +- } +-} +- + static inline int + powerpc_select_value (OrcCompiler *compiler, int be_value, int le_value) + { +@@ -322,19 +302,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + int perm = orc_compiler_get_temp_reg (compiler); + int tmp = orc_compiler_get_temp_reg (compiler); + +- if (IS_POWERPC_BE (compiler)) { +- ORC_ASM_CODE(compiler," lvsr %s, 0, %s\n", +- powerpc_get_regname (perm), +- powerpc_get_regname (dest->ptr_register)); +- powerpc_emit_X (compiler, 0x7c00004c, powerpc_regnum(perm), +- 0, powerpc_regnum(dest->ptr_register)); +- } else { +- ORC_ASM_CODE(compiler," lvsl %s, 0, %s\n", +- powerpc_get_regname (perm), +- powerpc_get_regname (dest->ptr_register)); +- powerpc_emit_X (compiler, 0x7c00000c, powerpc_regnum(perm), +- 0, powerpc_regnum(dest->ptr_register)); +- } ++ powerpc_store_align (compiler, perm, 0, dest->ptr_register); + powerpc_emit_vperm (compiler, tmp, src->alloc, src->alloc, perm); + + switch (size) { +@@ -370,8 +338,7 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + powerpc_regnum(tmp), + 0, powerpc_regnum(dest->ptr_register)); + +- powerpc_emit_D (compiler, "addi", 0x38000000, compiler->gp_tmpreg, +- 0, 4); ++ powerpc_emit_addi (compiler, compiler->gp_tmpreg, 0, 4); + + ORC_ASM_CODE(compiler," stvewx %s, %s, %s\n", + powerpc_get_regname (tmp), +@@ -397,6 +364,48 @@ powerpc_rule_storeX (OrcCompiler *compiler, void *user, OrcInstruction *insn) + } + } + ++static void ++powerpc_denormalize_sp_full(OrcCompiler *p, int reg, int zero, int mask) ++{ ++ int tmp = p->tmpreg; ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); ++ powerpc_emit_VX_2(p, "vcmpequw", 0x10000086, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgnsp", 0xf0000687, reg, reg, tmp); ++} ++ ++static void ++powerpc_denormalize_sp_zero(OrcCompiler *p, int reg, int zero) ++{ ++ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x7f800000, ++ 0x7f800000, 0x7f800000); ++ powerpc_denormalize_sp_full(p, reg, zero, mask); ++} ++ ++static void ++powerpc_denormalize_sp(OrcCompiler *p, int reg) ++{ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero(p, reg, zero); ++} ++ ++static void ++powerpc_denormalize_dp_full(OrcCompiler *p, int reg, int zero, int mask) ++{ ++ int tmp = p->tmpreg; ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, reg, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, reg, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, reg, reg, tmp); ++} ++ ++static void ++powerpc_denormalize_dp_zero(OrcCompiler *p, int reg, int zero) ++{ ++ int mask = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, ++ 0x7ff00000, 0x00000000); ++ powerpc_denormalize_dp_full(p, reg, zero, mask); ++} + + + #define RULE(name, opcode, code) \ +@@ -409,6 +418,33 @@ powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ + powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2);\ + } + ++#define RULE_DP(name, opcode, code) \ ++static void \ ++powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ ++{ \ ++ int src1 = ORC_SRC_ARG (p, insn, 0); \ ++ int src2 = ORC_SRC_ARG (p, insn, 1); \ ++ int dest = ORC_DEST_ARG (p, insn, 0); \ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ ++ powerpc_denormalize_dp_zero (p, src1, zero); \ ++ powerpc_denormalize_dp_zero (p, src2, zero); \ ++ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ ++ powerpc_denormalize_dp_zero (p, dest, zero); \ ++} ++ ++#define RULE_DP_SRC(name, opcode, code) \ ++static void \ ++powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ ++{ \ ++ int src1 = ORC_SRC_ARG (p, insn, 0); \ ++ int src2 = ORC_SRC_ARG (p, insn, 1); \ ++ int dest = ORC_DEST_ARG (p, insn, 0); \ ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); \ ++ powerpc_denormalize_dp_zero (p, src1, zero); \ ++ powerpc_denormalize_dp_zero (p, src2, zero); \ ++ powerpc_emit_VX_2 (p, opcode, code , dest, src1, src2); \ ++} ++ + #define RULE_SHIFT(name, opcode, code) \ + static void \ + powerpc_rule_ ## name (OrcCompiler *p, void *user, OrcInstruction *insn) \ +@@ -503,13 +539,11 @@ RULE(maxf, "vmaxfp", 0x1000040a) + RULE(minf, "vminfp", 0x1000044a) + RULE(cmpeqf, "vcmpeqfp", 0x100000c6) + +-RULE(addd, "xvadddp", 0xf0000307) +-RULE(subd, "xvsubdp", 0xf0000347) +-RULE(muld, "xvmuldp", 0xf0000387) +-RULE(divd, "xvdivdp", 0xf00003c7) +-RULE(mind, "xvmindp", 0xf0000747) +-RULE(maxd, "xvmaxdp", 0xf0000707) +-RULE(cmpeqd, "xvcmpeqdp", 0xf000031f) ++RULE_DP(addd, "xvadddp", 0xf0000307) ++RULE_DP(subd, "xvsubdp", 0xf0000347) ++RULE_DP(muld, "xvmuldp", 0xf0000387) ++RULE_DP(divd, "xvdivdp", 0xf00003c7) ++RULE_DP_SRC(cmpeqd, "xvcmpeqdp", 0xf000031f) + + RULE(addq, "vaddudm", 0x100000c0) + RULE(subq, "vsubudm", 0x100004c0) +@@ -541,13 +575,12 @@ powerpc_rule_mullb (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x11011303, 0x15051707, ++ 0x19091b0b, 0x1d0d1f0f); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); +- powerpc_emit_vsldoi (p, dest, dest, dest, 1); +- } else { +- powerpc_emit_vmulosb (p, dest, src1, src2); +- } ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -556,15 +589,12 @@ powerpc_rule_mulhsb (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, ++ 0x18081a0a, 0x1c0c1e0e); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulosb (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, src1, tmp); +- } ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -573,15 +603,12 @@ powerpc_rule_mulhub (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10001202, 0x14041606, ++ 0x18081a0a, 0x1c0c1e0e); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleub (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmuloub (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmuloub (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -590,16 +617,12 @@ powerpc_rule_mulhsw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesh (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulosh (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosh (p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -608,16 +631,12 @@ powerpc_rule_mulhuw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int perm = powerpc_get_constant_full(p, 0x10110001, 0x14150405, ++ 0x18190809, 0x1c1d0c0d); + +- if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleuh (p, dest, src1, src2); +- } else { +- int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 8); +- +- powerpc_emit_vmulouh (p, dest, src1, src2); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +- } ++ powerpc_emit_vmuleuh(p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulouh(p, dest, src1, src2); ++ powerpc_emit_vperm(p, dest, dest, p->tmpreg, perm); + } + + static void +@@ -765,10 +784,12 @@ powerpc_rule_mulsbw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmulesb (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosb (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesb (p, dest, src1, src2); ++ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulosb (p, dest, src1, src2); ++ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); + } + } + +@@ -779,10 +800,12 @@ powerpc_rule_mulubw (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmuleub (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmuloub (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleub (p, dest, src1, src2); ++ powerpc_emit_vmrghh (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmuloub (p, dest, src1, src2); ++ powerpc_emit_vmrglh (p, dest, p->tmpreg, dest); + } + } + +@@ -793,10 +816,12 @@ powerpc_rule_mulswl (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmulesh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulosh (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmulesh (p, dest, src1, src2); ++ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulosh (p, dest, src1, src2); ++ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); + } + } + +@@ -807,10 +832,12 @@ powerpc_rule_muluwl (OrcCompiler *p, void *user, OrcInstruction *insn) + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); + ++ powerpc_emit_vmuleuh (p, p->tmpreg, src1, src2); ++ powerpc_emit_vmulouh (p, dest, src1, src2); + if (IS_POWERPC_BE (p)) { +- powerpc_emit_vmuleuh (p, dest, src1, src2); ++ powerpc_emit_vmrghw (p, dest, p->tmpreg, dest); + } else { +- powerpc_emit_vmulouh (p, dest, src1, src2); ++ powerpc_emit_vmrglw (p, dest, p->tmpreg, dest); + } + } + +@@ -848,17 +875,13 @@ powerpc_rule_mulll (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int tmp = orc_compiler_get_temp_reg(p); ++ int perm = powerpc_get_constant_full(p, 0x14151617, 0x04050607, ++ 0x1c1d1e1f, 0x0c0d0e0f); + +- if (IS_POWERPC_BE (p)) { +- int perm; +- +- powerpc_emit_vmuleuw (p, dest, src1, src2); +- perm = powerpc_get_constant_full (p, 0x04050607, 0x04050607, +- 0x0c0d0e0f, 0x0c0d0e0f); +- powerpc_emit_vperm (p, dest, dest, dest, perm); +- } else { +- powerpc_emit_vmulouw (p, dest, src1, src2); +- } ++ powerpc_emit_vmulouw (p, tmp, src1, src2); ++ powerpc_emit_vmuleuw (p, dest, src1, src2); ++ powerpc_emit_vperm (p, dest, tmp, dest, perm); + } + + static void +@@ -1428,20 +1451,11 @@ powerpc_rule_divf (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); +- int y = orc_compiler_get_temp_reg (p); +- int t = orc_compiler_get_temp_reg (p); +- int c1; +- int c0; +- +- c1 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x3f800000); /* 1.0 */ +- +- powerpc_emit_VX_db (p, "vrefp", 0x1000010a, y, src2); +- +- powerpc_emit_VA_acb (p, "vnmsubfp", 0x1000002f, t, y, c1, src2); +- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, y, y, y, t); +- +- c0 = powerpc_get_constant (p, ORC_CONST_SPLAT_L, 0x00000000); /* 0.0 */ +- powerpc_emit_VA_acb (p, "vmaddfp", 0x1000002e, dest, y, c0, src1); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero (p, src1, zero); ++ powerpc_denormalize_sp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvdivsp", 0xf00002c7, dest, src1, src2); ++ powerpc_denormalize_sp_zero (p, dest, zero); + } + + static void +@@ -1521,8 +1535,10 @@ powerpc_rule_sqrtf(OrcCompiler* p, void* user, OrcInstruction* insn) + { + int src1 = ORC_SRC_ARG(p, insn, 0); + int dest = ORC_DEST_ARG(p, insn, 0); +- ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_sp_zero (p, src1, zero); + powerpc_emit_VX_db(p, "xvsqrtsp", 0xf000022f, dest, src1); ++ powerpc_denormalize_sp_zero (p, dest, zero); + } + + static void +@@ -1530,18 +1546,65 @@ powerpc_rule_sqrtd(OrcCompiler* p, void* user, OrcInstruction* insn) + { + int src1 = ORC_SRC_ARG(p, insn, 0); + int dest = ORC_DEST_ARG(p, insn, 0); +- ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); + powerpc_emit_VX_db(p, "xvsqrtdp", 0xf000032f, dest, src1); ++ powerpc_denormalize_dp_zero (p, dest, zero); + } + + static void +-powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) ++powerpc_rule_mind (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, ++ 0x7ff80000, 0x00000000); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int tmp = p->tmpreg; ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvmindp", 0xf0000747, tmp2, src2, src1); ++ // Handle QNaN ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp2, src1, tmp); ++} + +-// powerpc_emit_VXR (p, "vcmpgtfp", 0x100002c6, dest, src2, src1, FALSE); ++static void ++powerpc_rule_maxd (OrcCompiler *p, void *user, OrcInstruction *insn) ++{ ++ int src1 = ORC_SRC_ARG (p, insn, 0); ++ int src2 = ORC_SRC_ARG (p, insn, 1); ++ int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7ff80000, 0x00000000, ++ 0x7ff80000, 0x00000000); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int tmp3 = orc_compiler_get_temp_reg(p); ++ int tmp = p->tmpreg; ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); ++ powerpc_emit_VX_2(p, "xvmaxdp", 0xf0000707, tmp2, src2, src1); ++ // Handle QNaN ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src2, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp3, tmp2, src2, tmp); ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, mask); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, tmp3, src1, tmp); ++} ++ ++static void ++powerpc_rule_cmpltd (OrcCompiler *p, void *user, OrcInstruction *insn) ++{ ++ int src1 = ORC_SRC_ARG (p, insn, 0); ++ int src2 = ORC_SRC_ARG (p, insn, 1); ++ int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); + powerpc_emit_VX_2(p, "xvcmpgtdp", 0xf000035f, dest, src2, src1); + } + +@@ -1551,8 +1614,9 @@ powerpc_rule_cmpled (OrcCompiler *p, void *user, OrcInstruction *insn) + int src1 = ORC_SRC_ARG (p, insn, 0); + int src2 = ORC_SRC_ARG (p, insn, 1); + int dest = ORC_DEST_ARG (p, insn, 0); +- +-// powerpc_emit_VXR (p, "vcmpgefp", 0x100001c6, dest, src2, src1, FALSE); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ powerpc_denormalize_dp_zero (p, src1, zero); ++ powerpc_denormalize_dp_zero (p, src2, zero); + powerpc_emit_VX_2(p, "xvcmpgedp", 0xf000039f, dest, src2, src1); + } + +@@ -1561,11 +1625,13 @@ powerpc_rule_convld (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); + + if (IS_POWERPC_LE (p)) { + powerpc_emit_vsldoi(p, src1, src1, src1, 4); + } + powerpc_emit_VX_db (p, "xvcvsxddp", 0xf00003e3, dest, src1); ++ powerpc_denormalize_dp_zero (p, dest, zero); + } + + static void +@@ -1573,8 +1639,19 @@ powerpc_rule_convdl (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int mask = powerpc_get_constant_full (p, 0xfff00000, 0x00000000, ++ 0xfff00000, 0x00000000); ++ int nan = powerpc_get_constant_full (p, 0x7ff00000, 0x00000000, ++ 0x7ff00000, 0x00000000); ++ int maxint = powerpc_get_constant_full (p, 0x7fffffff, 0x7fffffff, ++ 0x7fffffff, 0x7fffffff); ++ int tmp = p->tmpreg; + ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, src1, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, nan); + powerpc_emit_VX_db (p, "xvcvdpsxws", 0xf0000363, dest, src1); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, dest, dest, maxint, tmp); ++ + if (IS_POWERPC_LE (p)) { + int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); + powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); +@@ -1586,11 +1663,23 @@ powerpc_rule_convfd (OrcCompiler *p, void *user, OrcInstruction *insn) + { + int src1 = ORC_SRC_ARG (p, insn, 0); + int dest = ORC_DEST_ARG (p, insn, 0); ++ int tmp2 = orc_compiler_get_temp_reg(p); ++ int zero = powerpc_get_constant (p, ORC_CONST_ZERO, 0); ++ int mask = powerpc_get_constant_full (p, 0x7f800000, 0x00000000, ++ 0x7f800000, 0x00000000); ++ int tmp = p->tmpreg; + + if (IS_POWERPC_LE (p)) { +- powerpc_emit_vsldoi(p, src1, src1, src1, 4); ++ powerpc_emit_vsldoi(p, tmp2, src1, src1, 4); ++ } else { ++ powerpc_emit_vor(p, tmp2, src1, src1); + } +- powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, src1); ++ powerpc_emit_VX_db (p, "xvcvspdp", 0xf0000727, dest, tmp2); ++ ++ powerpc_emit_VX_2(p, "xxland", 0xf0000417, tmp, tmp2, mask); ++ powerpc_emit_VX_2(p, "vcmpequd", 0x100000c7, tmp, tmp, zero); ++ powerpc_emit_VA(p, "xxsel", 0xf000003f, tmp, dest, zero, tmp); ++ powerpc_emit_VX_2(p, "xvcpsgndp", 0xf0000787, dest, dest, tmp); + } + + static void +@@ -1604,6 +1693,7 @@ powerpc_rule_convdf (OrcCompiler *p, void *user, OrcInstruction *insn) + int tmp = powerpc_get_constant (p, ORC_CONST_SPLAT_B, 32); + powerpc_emit_VX_2 (p, "vsro", 0x1000044c, dest, dest, tmp); + } ++ powerpc_denormalize_sp(p, dest); + } + + +@@ -1757,7 +1847,6 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) + REG(cmplef); + REG(cmpltf); + REG(mulf); +- REG(divf); + REG(convfl); + REG(convlf); + +@@ -1789,6 +1878,7 @@ orc_compiler_powerpc_register_rules (OrcTarget *target) + + rule_set = orc_rule_set_new(orc_opcode_set_get("sys"), target, ORC_TARGET_POWERPC_VSX); + ++ REG(divf); + REG(sqrtf); + REG(addd); + REG(subd); +diff --git a/orc/orctarget.h b/orc/orctarget.h +index 642bfe3..53000b3 100644 +--- a/orc/orctarget.h ++++ b/orc/orctarget.h +@@ -19,7 +19,7 @@ enum { + ORC_TARGET_FAST_DENORMAL = (1<<31) + }; + +-enum { ++typedef enum { + ORC_TARGET_POWERPC_64BIT = (1<<0), + ORC_TARGET_POWERPC_LE = (1<<1), + ORC_TARGET_POWERPC_ALTIVEC = (1<<2), +diff --git a/testsuite/exec_parse.c b/testsuite/exec_parse.c +index 0858413..859ad4e 100644 +--- a/testsuite/exec_parse.c ++++ b/testsuite/exec_parse.c +@@ -20,6 +20,7 @@ main (int argc, char *argv[]) + char *code; + int n; + int i; ++ int ret; + OrcProgram **programs; + const char *filename = NULL; + +@@ -45,7 +46,11 @@ main (int argc, char *argv[]) + + for(i=0;i<n;i++){ + if (verbose) printf("%s\n", programs[i]->name); +- orc_test_compare_output_full (programs[i], 0); ++ ret = orc_test_compare_output_full (programs[i], 0); ++ if (!ret) { ++ printf("failed %s\n", programs[i]->name); ++ error = TRUE; ++ } + orc_program_free (programs[i]); + } + +diff --git a/testsuite/memcpy_speed.c b/testsuite/memcpy_speed.c +index a1a69f1..4cf1c39 100644 +--- a/testsuite/memcpy_speed.c ++++ b/testsuite/memcpy_speed.c +@@ -102,7 +102,7 @@ main(int argc, char *argv[]) + max = 140; + } + +- for(i=0;i<max;i++){ ++ for(i=0;i<max;i+=2){ + double x = i*0.1 + 6.0; + int size = pow(2.0, x); + diff --git a/user/p11-kit/APKBUILD b/user/p11-kit/APKBUILD index fff4a60c6..b42538c03 100644 --- a/user/p11-kit/APKBUILD +++ b/user/p11-kit/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=p11-kit -pkgver=0.23.16.1 +pkgver=0.23.18.1 pkgrel=0 pkgdesc="Library for loading and sharing PKCS#11 modules" url="https://p11-glue.github.io/p11-glue/p11-kit.html" arch="all" license="BSD-3-Clause" depends="" -makedepends="libtasn1-dev libffi-dev" -install="" +makedepends="libffi-dev libtasn1-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-trust" source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -46,4 +42,4 @@ trust() { "$subpkgdir"/usr/lib/pkcs11/ } -sha512sums="7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7 p11-kit-0.23.16.1.tar.gz" +sha512sums="941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd p11-kit-0.23.18.1.tar.gz" diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD index f87f1c988..3e0bab284 100644 --- a/user/papirus-icons/APKBUILD +++ b/user/papirus-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=papirus-icons -pkgver=20190802 +pkgver=20190919 pkgrel=0 pkgdesc="Material, flat style icon theme" url="https://store.kde.org/p/1166289/" @@ -39,4 +39,4 @@ epapirus() { mv "$pkgdir"/usr/share/icons/ePapirus "$subpkgdir"/usr/share/icons/ } -sha512sums="880681502d0b405e8a7962d6978d0a6cac3aec386723b69655d97157f8c5140fc88b711d7983e91b2900841e420af73a58f3ecb13f5e6122cd754a6ca26d84db papirus-icons-20190802.tar.gz" +sha512sums="183765db87863f46d5036ea020ef5f4da5f74b6b519bdf9409f95e904209ba308abf46af29d5d8e86a1abe95e18975bd9114cfc929cd4620a9cef49e6a5c939b papirus-icons-20190919.tar.gz" diff --git a/user/perl-anyevent/APKBUILD b/user/perl-anyevent/APKBUILD index bf9518012..a321bd270 100644 --- a/user/perl-anyevent/APKBUILD +++ b/user/perl-anyevent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-anyevent -pkgver=7.16 +pkgver=7.17 pkgrel=0 pkgdesc="The DBI of event loop programming" url="https://metacpan.org/release/AnyEvent" @@ -9,7 +9,6 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/AnyEvent-$pkgver.tar.gz" builddir="$srcdir/AnyEvent-$pkgver" @@ -28,4 +27,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="27c794d5e78a7c359b0e48ef698be4ef56787b54f457d9397795abade9d55460f8acc086f8becabb37f1195d014cd441e3e9783dcca2e1c550c64453960d4cd4 AnyEvent-7.16.tar.gz" +sha512sums="c553cce80fa14e2f91031c569d1c30acf470871ddd1c122fa3dd36cd1ba5b7002e7ba1dea4c950d889c7c661b81042dd97975e195a5325190ad644babff81e0a AnyEvent-7.17.tar.gz" diff --git a/user/perl-dbd-pg/APKBUILD b/user/perl-dbd-pg/APKBUILD index 27099028d..770a052a2 100644 --- a/user/perl-dbd-pg/APKBUILD +++ b/user/perl-dbd-pg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-dbd-pg -pkgver=3.9.1 +pkgver=3.10.0 pkgrel=0 pkgdesc="PostgreSQL interface for Perl DBI" url="https://metacpan.org/release/DBD-Pg" @@ -32,6 +32,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="ef322012d25c46784ef9e25eb332f2fe57c6bc2102a7e7cf2f423ae6d77ec78d338e91f08734a932f46a0bc028e358a6cf84b6b41b5f9723905b240db24582f0 DBD-Pg-3.9.1.tar.gz +sha512sums="46c985bbdeeed4ef60d6fe06034fa0959df288f2b9bbd434e2716676a3cb7a1ded168a3cf87a6a82eb397eb8edcc023c0b85483e948ce31abcac64a1919580ba DBD-Pg-3.10.0.tar.gz f7032e7e63eb403778e3f42e1b7f7d472695175d3d8c30bc10062ffee6275b8f46635ea2a82ca2cc5c9de48f7bfa64cdfce56ce58846302bb32db0e4657dcee7 fix-tests.patch 3ff842f949e4c1805eb3c86ea8f52b12adbe65b966137c33e6b29eb1565f9983808fffacac8bda160be3bdfce0dd1cdbc79903bad0443335b48bf456dd7adb6c ppc32.patch" diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD new file mode 100644 index 000000000..77fe566db --- /dev/null +++ b/user/perl-parallel-forkmanager/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-parallel-forkmanager +pkgver=2.02 +pkgrel=0 +pkgdesc="Perl library for managing fork()-based parallelization" +url="https://metacpan.org/pod/Parallel::ForkManager" +arch="noarch" +license="Artistic-1.0-Perl OR GPL-2.0-only" +depends="perl perl-moo" +checkdepends="perl-test-warn" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Parallel-ForkManager-$pkgver.tar.gz" +builddir="$srcdir/Parallel-ForkManager-$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="2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb Parallel-ForkManager-2.02.tar.gz" diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD new file mode 100644 index 000000000..91cff6808 --- /dev/null +++ b/user/perl-regexp-common/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-regexp-common +_pkgname=Regexp-Common +pkgver=2017060201 +pkgrel=0 +pkgdesc="Perl library for common regular expression utilities" +url="https://metacpan.org/pod/Regexp::Common" +arch="noarch" +license="Artistic-1.0-Perl OR Artistic-2.0 OR BSD-3-Clause OR MIT" +depends="perl" +makedepends="" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-$pkgver.tar.gz" +builddir="$srcdir/Regexp-Common-$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="fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608 Regexp-Common-2017060201.tar.gz" diff --git a/user/perl-role-tiny/APKBUILD b/user/perl-role-tiny/APKBUILD index 8c25d2c34..03fa86a44 100644 --- a/user/perl-role-tiny/APKBUILD +++ b/user/perl-role-tiny/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-role-tiny -pkgver=2.000008 +pkgver=2.001001 pkgrel=0 pkgdesc="A minimalist role composition tool" url="https://metacpan.org/pod/Role::Tiny" @@ -28,4 +28,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c8a5032c18e1d441c8a8602037f3a7e5ee2a39b5f214bfd9dfdaa5f9a0e213d2b59278530b909d1bab1df40dfb4f49b58ef41c91b4f7f9a9a036278a373d12fb Role-Tiny-2.000008.tar.gz" +sha512sums="ea793dc17e534bd3fb5573d4445728b18dd61a77f3db25d890bf50e6d83baa245a6798276ae8bd5060478bf45a4782a2fa6b5c6a8029aed974293891bc5f8235 Role-Tiny-2.001001.tar.gz" diff --git a/user/perl-sub-quote/APKBUILD b/user/perl-sub-quote/APKBUILD index d8f15cd71..78112e4d8 100644 --- a/user/perl-sub-quote/APKBUILD +++ b/user/perl-sub-quote/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sub-quote -pkgver=2.006003 +pkgver=2.006006 pkgrel=0 pkgdesc="Efficient generation of subroutines via string eval" url="https://metacpan.org/release/Sub-Quote" @@ -9,26 +9,22 @@ arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" makedepends="perl-dev perl-test-fatal" -install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-$pkgver.tar.gz" builddir="$srcdir/Sub-Quote-$pkgver" build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d486556750fa8cf8152f86204ed2156ff33dd4ba467955c3f9621b67b68acb543f953eb1476297a85d3ee2bc9755072491ad9d34c33a496d5ba5828c687f6d83 Sub-Quote-2.006003.tar.gz" +sha512sums="19cd0504f039f3218d3f47b3b44714f0baed73a13f97c4552eb1816b7b03186b1bbdf48cc70c2cae616eb9ec81721b30217c7f788176d389df694c9b355ead64 Sub-Quote-2.006006.tar.gz" diff --git a/user/perl-test-tcp/APKBUILD b/user/perl-test-tcp/APKBUILD index d38939586..1639aeddf 100644 --- a/user/perl-test-tcp/APKBUILD +++ b/user/perl-test-tcp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-tcp _pkgname=Test-TCP -pkgver=2.20 +pkgver=2.21 pkgrel=0 pkgdesc="Testing library for Perl code using TCP" url="https://metacpan.org/release/Test-TCP" @@ -11,7 +11,7 @@ license="Artistic-1.0-Perl OR GPL-2.0-only" depends="perl-test-sharedfork" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Test-TCP-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/K/KA/KAZUHO/Test-TCP-$pkgver.tar.gz" builddir="$srcdir/Test-TCP-$pkgver" build() { @@ -28,4 +28,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="acd8c58f64f5a6d99468898a7ddd00485ff7cc9f1d992b93011692c16c467576ea39376f14401b637dc05463ae03c7cd8ea456be03fb39175b40202e7c4d6334 Test-TCP-2.20.tar.gz" +sha512sums="488679c4100ad2f7845177e1ebc1da2a91c3ac9e094270ce1ce3cc7f83a1ea4b80b429764da7c92da37e28fd6aed9f6f07b4fba8814d81a4433c7b252a86f9d5 Test-TCP-2.21.tar.gz" diff --git a/user/polkit-qt-1/APKBUILD b/user/polkit-qt-1/APKBUILD index bbfcde4f2..4a109e7d7 100644 --- a/user/polkit-qt-1/APKBUILD +++ b/user/polkit-qt-1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit-qt-1 -pkgver=0.112.0 +pkgver=0.113.0 pkgrel=0 pkgdesc="Qt wrapper library for PolicyKit" url="https://www.kde.org/" @@ -12,10 +12,9 @@ depends="" depends_dev="polkit-dev glib-dev" makedepends="$depends_dev cmake qt5-qtbase-dev" subpackages="$pkgname-dev" -source="https://download.kde.org/stable/apps/KDE4.x/admin/polkit-qt-1-$pkgver.tar.bz2" +source="https://download.kde.org/stable/$pkgname/polkit-qt-1-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -32,8 +31,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="4cb17389b54a09c53052f6d72aa5cbfe09ccb19f7fd4edf8b43ccd4751f5e88609c5f89777f4af92167d32eb2ce1e78537cea7bcfb60a90072d1fe02d6a59b50 polkit-qt-1-0.112.0.tar.bz2" +sha512sums="deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38 polkit-qt-1-0.113.0.tar.xz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index af1146761..338c8ad2d 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.4.6 +pkgver=3.4.7 pkgrel=0 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" @@ -91,6 +91,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961 postfix-3.4.6.tar.gz +sha512sums="2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68 postfix-3.4.7.tar.gz 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index 78a480016..cd4e52fbc 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=protobuf _gemname=google-protobuf -pkgver=3.8.0 +pkgver=3.10.0 _tstver=1.8.1 pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" @@ -116,5 +116,5 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2 protobuf-3.8.0.tar.gz +sha512sums="0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977 protobuf-3.10.0.tar.gz e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz" diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index 53eada11d..8b9f2def3 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=py3-certifi _pkgname=${pkgname#py3-} -pkgver=2019.6.16 +pkgver=2019.9.11 pkgrel=0 pkgdesc="Python package for providing Mozilla's CA Bundle" url="https://pypi.org/project/certifi" @@ -25,5 +25,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e certifi-2019.6.16.tar.gz +sha512sums="aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c certifi-2019.9.11.tar.gz f9c7d953b08d6ef87bae07605e2c09e9de1d1e60285fa1f5043beeae1d9f00f3b70fdf598585cd350df2632e22c0197ea2e8b76127e2927ad53880b60b349c9c use-system-certs.patch" diff --git a/user/py3-pbr/APKBUILD b/user/py3-pbr/APKBUILD index 0b45bbf34..77c687851 100644 --- a/user/py3-pbr/APKBUILD +++ b/user/py3-pbr/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pbr _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=5.4.2 +pkgver=5.4.3 pkgrel=0 pkgdesc="Python Build Reasonableness" url="https://pypi.org/project/pbr" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="fd1ff768ed589760a1c9d339f3ddaaa0f13723a196913b0524659085333bbb3485506998875b9e293935ece2bb2ea042fba317822ac171ef99bdd43103525bed pbr-5.4.2.tar.gz" +sha512sums="546a24a84152f7e6929e456de08302fbc0a6f736d2b6a88078c4e07eb1c12736c88d5319a3e756c14ad11e879fd9efbcd5f14b4159f11526080561534543e2df pbr-5.4.3.tar.gz" diff --git a/user/py3-pysocks/APKBUILD b/user/py3-pysocks/APKBUILD index b6ad62c26..aaefdb947 100644 --- a/user/py3-pysocks/APKBUILD +++ b/user/py3-pysocks/APKBUILD @@ -5,7 +5,7 @@ pkgname=py3-pysocks _pkgname=PySocks _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=0 pkgdesc="SOCKS client module for Python" url="https://github.com/Anorov/PySocks" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="cc08ecbf65b59b6c4d4a24e01490dba19d93f2deb2860a49c4fc5679a9ceaba1860f05faaf8e299cf195e184a844f11989595e5046b07e2b30f9f3c682950e52 PySocks-1.7.0.tar.gz" +sha512sums="cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016 PySocks-1.7.1.tar.gz" diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD index a0b15b675..2286dc298 100644 --- a/user/py3-recommonmark/APKBUILD +++ b/user/py3-recommonmark/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-recommonmark _pkgname=recommonmark _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=0 pkgdesc="Bridge between CommonMark and docutils" url="https://pypi.org/project/recommonmark/" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="581b3492e082ab4f0a53e50df0c9cfa3badda7ba9ee28dadbea85c55de96304257790e6aa06ebc793fba1d9ac399ce470fe821492106150b3a0db10dc734ee4b recommonmark-0.5.0.tar.gz" +sha512sums="f94f1ee426015478a95c2ed4b6ea87a75012447ae65d6623445f923d9d616b34efb055bcfde157862fcce38749c827905b839194fa1af3a1fe1cb7e11f18835a recommonmark-0.6.0.tar.gz" diff --git a/user/py3-transitions/APKBUILD b/user/py3-transitions/APKBUILD index 255e631d5..b877992d3 100644 --- a/user/py3-transitions/APKBUILD +++ b/user/py3-transitions/APKBUILD @@ -4,10 +4,10 @@ pkgname=py3-transitions _pkgname=${pkgname#py3-} _p="${_pkgname#?}" _p="${_pkgname%"$_p"}" -pkgver=0.6.9 +pkgver=0.7.1 pkgrel=0 pkgdesc="Python state machine library" -url="https://pypi.org/project/passlib/" +url="https://pypi.org/project/transitions/" arch="noarch" options="!check" # requires nose, pygraphviz license="MIT" @@ -30,4 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="0cef11d547ae631afcb3dad557ab81b425f825028639787337f700f19073d7cb4c69ba9b6284155b3be85fb3eac4c4abd5b0cf3104dff8d2098c219729de4352 transitions-0.6.9.tar.gz" +sha512sums="4802e6a914270a183f66e70cf648c5f09c25b63e9233fdeb65b231ad24847d023182c6a45eaa1d47780d1f5d7f6f23695a6e578d4eaae55bf7a7ff121561e06b transitions-0.7.1.tar.gz" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index ed6442453..bde1340a1 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.25.3 +pkgver=1.25.6 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001 py3-urllib3-1.25.3.tar.gz" +sha512sums="02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 py3-urllib3-1.25.6.tar.gz" diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD index 1e35fe052..0161221f4 100644 --- a/user/qastools/APKBUILD +++ b/user/qastools/APKBUILD @@ -1,22 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qastools -pkgver=0.21.0 +pkgver=0.22.0 pkgrel=0 pkgdesc="ALSA mixer and utilities for Qt" -url="https://xwmw.org/qastools/index.html" +url="https://gitlab.com/sebholt/qastools" arch="all" -license="GPL-3.0-only" +license="MIT" depends="bash" makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://downloads.sourceforge.net/qastools/qastools_$pkgver.tar.xz" -builddir="$srcdir/${pkgname}_${pkgver}" +source="https://gitlab.com/sebholt/qastools/-/archive/v$pkgver/qastools-v$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-v$pkgver" langdir="/usr/share/qastools/l10n" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -31,13 +30,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b qastools_0.21.0.tar.xz" +sha512sums="5f4c845df00e00236d61ad1009fc6aa529996e02a03aeb92211a12facf9bdce5e1626f4c97d96d88827dfe689bd961d1a2fd3f9164dca6947c08b4fc1d78483d qastools-v0.22.0.tar.bz2" diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD index fc95087c1..274706d9a 100644 --- a/user/recode/APKBUILD +++ b/user/recode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=recode -pkgver=3.7.2 +pkgver=3.7.6 pkgrel=0 pkgdesc="Character set conversion utilities" url=" " @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5371c41cc0f08c5a15b4682b777b5dbf754aecea6fe61a90661ec0020ca6325c7a11cb04b21b87e08d1da51ee4e226fd84cbb74d61bbca9d181e51d9bb17042 recode-3.7.2.tar.gz" +sha512sums="ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f recode-3.7.6.tar.gz" diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD index 19b42c0d1..1c2058d14 100644 --- a/user/redis/APKBUILD +++ b/user/redis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: V.Krishn <vkrishn4@gmail.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=redis -pkgver=5.0.5 +pkgver=5.0.6 pkgrel=0 pkgdesc="Advanced key-value store" url="https://redis.io/" @@ -30,7 +30,6 @@ source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz prepare() { default_prepare - cd "$builddir" sed -i -e 's|^daemonize .*|daemonize yes|' \ -e 's|^dir .*|dir /var/lib/redis/|' \ -e 's|^logfile .*|logfile /var/log/redis/redis\.log|' \ @@ -48,7 +47,6 @@ prepare() { } build() { - cd "$builddir" make PREFIX=/usr \ INSTALL_BIN="$pkgdir"/usr/bin \ MALLOC=libc \ @@ -57,12 +55,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/bin install -d -o redis -g redis \ "$pkgdir"/var/lib/redis \ @@ -83,7 +79,7 @@ package() { install } -sha512sums="78215ec02b7184e05788c7a368146ea53095a877a0e09174b4c9f175aeb9ba9174023c19e33bf62e4513b848e1841538d398e7c0a651c5c947255c1691cb4586 redis-5.0.5.tar.gz +sha512sums="19a4738ec4c3ac077d57857559557685c56b0ac58ccfff5aac88a099894fa9a2bbe18ef126522960e38d6c0e8b0f9a00755879305c07caaa5add41bc677d44f3 redis-5.0.6.tar.gz f768acea3e1868dbf0596085640c83e58d899860d7d647b0965fa858844c494d0a49b229fb417456d83f3e2690e5450950c31e0fa40529df85a9cde38d8981c4 fix-ppc-atomics.patch 856ae98e9e8670801827c3bd793dc14ed2c62c37365f8d04b452d7e1ab97300a0bf18c59b52ea686c2689d53aeed8e29e2c55207d3d4fb1fd8fc7fc820f33157 posix-runtest.patch 91b663f802aea9a473195940d3bf2ce3ca2af4e5b6e61a2d28ebbfe502ef2c764b574b7e87c49e60345d1a5d6b73d12920924c93b26be110c2ce824023347b6f redis.initd diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD index 0757ad517..fd3864d48 100644 --- a/user/rsibreak/APKBUILD +++ b/user/rsibreak/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rsibreak -pkgver=0.12.10 +pkgver=0.12.11 pkgrel=0 pkgdesc="Helps you avoid wrist injury by telling you when to stop for a rest" url="https://www.kde.org/applications/utilities/rsibreak/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e5c5dabe0efa05f53b5a0b5823ef856ca6806ac1a3a1a45f57f236789190718b2ab73af35ee6617a42eb672e06554687dd41f3ab02e9c37d25ef926fee2240c rsibreak-0.12.10.tar.xz" +sha512sums="78498b747eeef842e40170236ace9d1ddd8b1f4bcc378134f2935cd2cf1c6933d44fa232f2f9b0724ee6b2638a34e4f71ebee2eac7664946093ed4df8eeb12ec rsibreak-0.12.11.tar.xz" diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD index a2254eea9..cdd459e33 100644 --- a/user/ruby-rake-compiler/APKBUILD +++ b/user/ruby-rake-compiler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rake-compiler _gemname=${pkgname#ruby-} -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Provide a standard and simplified way to build and package Ruby extensions" url="https://github.com/rake-compiler/rake-compiler" @@ -42,5 +42,5 @@ package() { rm -r cache build_info doc } -sha512sums="fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268 ruby-rake-compiler-1.0.7.tar.gz +sha512sums="30b753d45a1180e034b520ad6385f2799098f0916d55e8b4729f5e3a29dabc1acfa292475edfb384c7809543e1c3e428e28db1bacb5383deb9f4bb31b18d6fe5 ruby-rake-compiler-1.0.8.tar.gz e68672541d62898bc72fb7e40f16bc75ed1d46eabedd18da60a6f0673d67bf63d990e191fb41d6034e3f6361662807030cbd8f0c817223a5d03c46a3a664f855 gemfile-remove-unwanted-files.patch" diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD index ab3808053..5ba129a65 100644 --- a/user/ruby-rspec-expectations/APKBUILD +++ b/user/ruby-rspec-expectations/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-expectations _gemname=${pkgname#ruby-} -pkgver=3.8.4 +pkgver=3.8.5 pkgrel=0 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec" url="https://relishapp.com/rspec/rspec-expectations/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8 ruby-rspec-expectations-3.8.4.tar.gz +sha512sums="3d7042e00e3b0f55c653abe0c4f581989c8d400cfaf8da23c45cd2511afc34044bf5979f202ad5cbf430667ce10703525c86d00f8a29fac150f8ff40312e5b14 ruby-rspec-expectations-3.8.5.tar.gz 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch" diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD index 314915d92..b89f955be 100644 --- a/user/ruby-rspec-mocks/APKBUILD +++ b/user/ruby-rspec-mocks/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-mocks _gemname=${pkgname#ruby-} -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=0 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking" url="https://relishapp.com/rspec/rspec-mocks/" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8 ruby-rspec-mocks-3.8.1.tar.gz +sha512sums="42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed ruby-rspec-mocks-3.8.2.tar.gz 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch" diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD index 12c754fc0..a91d0d9dc 100644 --- a/user/ruby-rspec-support/APKBUILD +++ b/user/ruby-rspec-support/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ruby-rspec-support _gemname=${pkgname#ruby-} -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=0 pkgdesc="Support utilities for RSpec gems" url="https://rubygems.org/gems/rspec-support" @@ -36,5 +36,5 @@ package() { "$gemdir"/doc } -sha512sums="9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc ruby-rspec-support-3.8.2.tar.gz +sha512sums="90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a ruby-rspec-support-3.8.3.tar.gz e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch" diff --git a/user/screen/APKBUILD b/user/screen/APKBUILD index e717f570d..53f650cbd 100644 --- a/user/screen/APKBUILD +++ b/user/screen/APKBUILD @@ -2,20 +2,21 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=screen -pkgver=4.6.2 +pkgver=4.7.0 pkgrel=0 pkgdesc="A window manager that multiplexes a physical terminal" url="http://ftp.gnu.org/gnu/screen/" arch="all" license="GPL-3.0+" options="!check" # No test suite. -makedepends="ncurses-dev utmps-dev" +makedepends="ncurses-dev utmps-dev libutempter-dev" subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz utmpx.patch" build() { cd "$builddir" + export CFLAGS="-DNONETHACK -DGETUTENT" LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,5 +40,5 @@ package() { install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc } -sha512sums="224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99 screen-4.6.2.tar.gz +sha512sums="44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745 screen-4.7.0.tar.gz 82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634 utmpx.patch" diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index 3e132dee4..4c5f6198b 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,24 +1,23 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.12 +pkgver=1.14 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" license="GPL-2.0+" depends="" -makedepends="glib-dev intltool libxml2-dev libxml2-utils" +makedepends="glib-dev itstool libxml2-dev libxml2-utils" subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" triggers="$pkgname.trigger=/usr/share/mime" -source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/$pkgname-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/aee9ae9646cbef724bbb1bd2ba146556/shared-mime-info-1.14.tar.xz" build() { ac_cv_func_fdatasync=no ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --enable-default-make-check \ --disable-update-mimedb make -j1 } @@ -31,4 +30,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="c9db138586fe4c789b5a89d3cdcf865d5b3258241accd254deecd7665e8b51fc538adeaeeda4fe332474f7d7ffa84f101cba26539a58e134201673d6d1495a2f shared-mime-info-1.12.tar.xz" +sha512sums="c25a4cec2e5aaa1e6aaef14f48f5910de5ccff1a5f3605da07fffea63e13624b945d7f40dfbe74fbfafd5364f143de88541c7fc5336d000ee16ad2eb06701c11 shared-mime-info-1.14.tar.xz" diff --git a/user/sntpd/APKBUILD b/user/sntpd/APKBUILD new file mode 100644 index 000000000..d15fbff92 --- /dev/null +++ b/user/sntpd/APKBUILD @@ -0,0 +1,47 @@ +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=sntpd +pkgver=3.0_git20190119 +_commit=7e372536855687f0af3c7ddde5fcb965b93d5d1e +pkgrel=0 +pkgdesc="A small SNTP client for UNIX systems, implementing RFC 1305 and RFC 4330" +url="https://github.com/troglobit/sntpd" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="autoconf automake" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/troglobit/sntpd/archive/$_commit.tar.gz + select.patch + " +builddir="$srcdir/$pkgname-$_commit" + +prepare() { + default_prepare + autoreconf -vif +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --disable-debug \ + --enable-replay \ + --without-systemd + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="49a9d16c2aef82c3d009f3e5678763d440764c67e4d7b27b07deac71ae9cb6d3b64a0991d3a79904b397441d9ce480287bb022d5e466fc99bbc393dc9d79b2a5 sntpd-3.0_git20190119.tar.gz +09ddc920bdbb00480859a8e9cd7b06bcfe73a6d51d070dde6bf78038bae11092fff9c72a401e1a3d7e3e6f6dcd1bdb6cec3b025ccc07608a8feb0ddaa854c678 select.patch" diff --git a/user/sntpd/select.patch b/user/sntpd/select.patch new file mode 100644 index 000000000..00121d80b --- /dev/null +++ b/user/sntpd/select.patch @@ -0,0 +1,12 @@ +select(3) does not modify its timeout in musl, as permitted by POSIX +--- sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c ++++ sntpd-7e372536855687f0af3c7ddde5fcb965b93d5d1e/src/sntpd.c +@@ -686,7 +686,7 @@ static void primary_loop(int usd, struct ntp_control *ntpc) + ERR(errno, "Failed select()"); + continue; + } +- if (to.tv_sec == 0) { ++ if (1) { + if (probes_sent >= ntpc->probe_count && ntpc->probe_count != 0) + break; + diff --git a/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch b/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch deleted file mode 100644 index 51f588818..000000000 --- a/user/squashfs-tools/0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch +++ /dev/null @@ -1,60 +0,0 @@ -From de03266983ceb62e5365aac84fcd3b2fd4d16e6f Mon Sep 17 00:00:00 2001 -From: Phillip Lougher <phillip@squashfs.org.uk> -Date: Thu, 18 Sep 2014 01:28:11 +0100 -Subject: [PATCH] mksquashfs: fix rare race in fragment waiting in filesystem - finalisation - -Fix a rare race condition in fragment waiting when finalising the -filesystem. This is a race condition that was initially fixed in 2009, -but inadvertantly re-introduced in the latest release when the code -was rewritten. - -Background: - -When finalising the filesystem, the main control thread needs to ensure -all the in-flight fragments have been queued to the writer thread before -asking the writer thread to finish, and then writing the metadata. - -It does this by waiting on the fragments_outstanding counter. Once this -counter reaches 0, it synchronises with the writer thread, waiting until -the writer thread reports no outstanding data to be written. - -However, the main thread can race with the fragment deflator thread(s) -because the fragment deflator thread(s) decrement the fragments_outstanding -counter and release the mutex before queueing the compressed fragment -to the writer thread, i.e. the offending code is: - - fragments_outstanding --; - pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); - -In extremely rare circumstances, the main thread may see the -fragments_outstanding counter is zero before the fragment -deflator sends the fragment buffer to the writer thread, and synchronise -with the writer thread, and finalise before the fragment has been written. - -The fix is to ensure the fragment is queued to the writer thread -before releasing the mutex. - -Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk> ---- - squashfs-tools/mksquashfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 87b7d86..f1fcff1 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -2419,8 +2419,8 @@ void *frag_deflator(void *arg) - write_buffer->block = bytes; - bytes += compressed_size; - fragments_outstanding --; -- pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); -+ pthread_mutex_unlock(&fragment_mutex); - TRACE("Writing fragment %lld, uncompressed size %d, " - "compressed size %d\n", file_buffer->block, - file_buffer->size, compressed_size); --- -2.10.2 - diff --git a/user/squashfs-tools/APKBUILD b/user/squashfs-tools/APKBUILD index 227faf11d..e33b06b16 100644 --- a/user/squashfs-tools/APKBUILD +++ b/user/squashfs-tools/APKBUILD @@ -1,35 +1,33 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=squashfs-tools -pkgver=4.3 -pkgrel=5 +pkgver=4.4 +pkgrel=0 pkgdesc="Tools for SquashFS, a highly compressed read-only filesystem" url="http://squashfs.sourceforge.net" arch="all" options="!check" # No test suite. license="GPL-2.0+" -depends= -makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev" -source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz +depends="" +makedepends="attr-dev lz4-dev lzo-dev xz-dev zlib-dev" +source="https://downloads.sourceforge.net/squashfs/squashfs$pkgver.tar.gz fix-compat.patch - vla-overlow.patch - CVE-2015-4645.patch - 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch -" -builddir="$srcdir/squashfs$pkgver" + " +builddir="$srcdir/squashfs$pkgver/$pkgname" + +# secfixes: +# 4.3-r5: +# - CVE-2015-4645 +# 4.4-r0: +# - CVE-2015-4646 build() { - cd "$builddir"/$pkgname make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 } package() { - cd "$builddir"/$pkgname mkdir -p "$pkgdir"/sbin cp -a mksquashfs unsquashfs "$pkgdir"/sbin } -sha512sums="854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 squashfs4.3.tar.gz -868e3923f98a7f8bb980fe8ab0d648e9ae9a55e324bea3830d6047aa348a4302dcb96d65bf59c6e04665891d822e18fad367a37c6704505b8492f64d749fc140 fix-compat.patch -975d09d047f4122866e83c4322ce3a15795c051b850d14a85a615c3beef970378e5a620ee16058b9c5104c53f973f9b3804d96c3ba1ab4f622f1e096c04e0360 vla-overlow.patch -77431a0a4a529ce63f1613a65a23af2fb8683a16d14ad1a5cfed3a9fac4df6a1212f081d1879ede188a25b77e860445058012131423c546657fb562069865d2c CVE-2015-4645.patch -1b2338a448ec8a2b75880ddc8c13f99392451847ab26277e1bc82b49a3a804796934e212dd1ba54a502940537a61891ee0103e913d0bda65cff0ca2827b8b41c 0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch" +sha512sums="e7119f82cea0eda8dffcbf15c9ee511ad457e004bfc0c5a5685e84785e49cf34f3c053036449af6bba0012cef48426f65958c97b9958d58f1b31175cb0bbbe24 squashfs4.4.tar.gz +12f5739aa32b9e15ba3d22e5953034f17867a8837475f13bde5bbc378dbded0483cde42c0cdfc5d33ab3723b9de752c71b5ba8f4301ca7b59aa4054d669c262d fix-compat.patch" diff --git a/user/squashfs-tools/CVE-2015-4645.patch b/user/squashfs-tools/CVE-2015-4645.patch deleted file mode 100644 index f69025f18..000000000 --- a/user/squashfs-tools/CVE-2015-4645.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/squashfs-tools/unsquash-4.c b/squashfs-tools/unsquash-4.c -index ecdaac796f09..2c0cf63daf67 100644 ---- a/squashfs-tools/unsquash-4.c -+++ b/squashfs-tools/unsquash-4.c -@@ -31,9 +31,9 @@ static unsigned int *id_table; - int read_fragment_table_4(long long *directory_table_end) - { - int res, i; -- int bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -- int indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -- long long fragment_table_index[indexes]; -+ size_t bytes = SQUASHFS_FRAGMENT_BYTES(sBlk.s.fragments); -+ size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); -+ long long *fragment_table_index; - - TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " - "from 0x%llx\n", sBlk.s.fragments, indexes, -@@ -44,6 +44,11 @@ int read_fragment_table_4(long long *directory_table_end) - return TRUE; - } - -+ fragment_table_index = malloc(indexes*sizeof(long long)); -+ if(fragment_table_index == NULL) -+ EXIT_UNSQUASH("read_fragment_table: failed to allocate " -+ "fragment table index\n"); -+ - fragment_table = malloc(bytes); - if(fragment_table == NULL) - EXIT_UNSQUASH("read_fragment_table: failed to allocate " diff --git a/user/squashfs-tools/fix-compat.patch b/user/squashfs-tools/fix-compat.patch index 2a3b33ca9..e93b6b827 100644 --- a/user/squashfs-tools/fix-compat.patch +++ b/user/squashfs-tools/fix-compat.patch @@ -1,6 +1,6 @@ ---- squashfs4.3.orig/squashfs-tools/action.c -+++ squashfs4.3/squashfs-tools/action.c -@@ -1905,6 +1905,9 @@ +--- squashfs-tools/action.c ++++ squashfs-tools/action.c +@@ -2236,6 +2236,9 @@ return 1; } @@ -10,9 +10,9 @@ TEST_FN(name, ACTION_ALL_LNK, \ return fnmatch(atom->argv[0], action_data->name, ---- squashfs4.3.orig/squashfs-tools/mksquashfs.c -+++ squashfs4.3/squashfs-tools/mksquashfs.c -@@ -4391,6 +4391,9 @@ +--- squashfs-tools/mksquashfs.c ++++ squashfs-tools/mksquashfs.c +@@ -4665,6 +4665,9 @@ return paths; } @@ -22,19 +22,9 @@ int excluded_match(char *name, struct pathname *path, struct pathnames **new) { ---- squashfs4.3.orig/squashfs-tools/pseudo.c -+++ squashfs4.3/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <sys/stat.h> - #include <ctype.h> - - #include "pseudo.h" ---- squashfs4.3.orig/squashfs-tools/unsquashfs.c -+++ squashfs4.3/squashfs-tools/unsquashfs.c -@@ -1410,6 +1410,9 @@ +--- squashfs-tools/unsquashfs.c ++++ squashfs-tools/unsquashfs.c +@@ -1457,6 +1457,9 @@ free(paths); } diff --git a/user/squashfs-tools/vla-overlow.patch b/user/squashfs-tools/vla-overlow.patch deleted file mode 100644 index a9840fe01..000000000 --- a/user/squashfs-tools/vla-overlow.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./squashfs-tools/unsquashfs.c.orig -+++ ./squashfs-tools/unsquashfs.c -@@ -2099,7 +2099,9 @@ - */ - void *inflator(void *arg) - { -- char tmp[block_size]; -+ char *tmp = malloc(block_size); -+ if(tmp == NULL) -+ EXIT_UNSQUASH("Out of memory allocating block buffer\n"); - - while(1) { - struct cache_entry *entry = queue_get(to_inflate); -@@ -2122,6 +2124,7 @@ - */ - cache_block_ready(entry, res == -1); - } -+ free(tmp); - } - - diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD index d273d4acc..f39d5c9d5 100644 --- a/user/tcpdump/APKBUILD +++ b/user/tcpdump/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=tcpdump -pkgver=4.9.2 -pkgrel=2 +pkgver=4.9.3 +pkgrel=0 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -11,7 +11,6 @@ depends="" makedepends="libpcap-dev openssl-dev perl" subpackages="$pkgname-doc" source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz - CVE-2017-16808.patch CVE-2018-19519.patch " @@ -20,9 +19,35 @@ source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz # - CVE-2018-19519 # 4.9.2-r2: # - CVE-2017-16808 +# 4.9.3-r0: +# - CVE-2018-10103 +# - CVE-2018-10105 +# - CVE-2018-14461 +# - CVE-2018-14462 +# - CVE-2018-14463 +# - CVE-2018-14464 +# - CVE-2018-14465 +# - CVE-2018-14466 +# - CVE-2018-14467 +# - CVE-2018-14468 +# - CVE-2018-14469 +# - CVE-2018-14470 +# - CVE-2018-14879 +# - CVE-2018-14880 +# - CVE-2018-14881 +# - CVE-2018-14882 +# - CVE-2018-16227 +# - CVE-2018-16228 +# - CVE-2018-16229 +# - CVE-2018-16230 +# - CVE-2018-16300 +# - CVE-2018-16301 +# - CVE-2018-16451 +# - CVE-2018-16452 +# - CVE-2019-15166 +# - CVE-2019-15167 build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,16 +59,13 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -sha512sums="e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b tcpdump-4.9.2.tar.gz -d7f4761bee96ec69cdb93602ea59518f238089967d1ede4e91d139febe0ffe0818d49ad19b96c741a379938c369952405dadd3be2766b6524c43c70066cb4fc4 CVE-2017-16808.patch +sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 tcpdump-4.9.3.tar.gz eb4232e434064ec59b07840aa394cfcc05c89e817f2d4ebeb4da1dbb1c910fe1805857356d6304ebdb16e32aa6476ce90f164aabc60501b493fd5601b380af7e CVE-2018-19519.patch" diff --git a/user/tcpdump/CVE-2017-16808.patch b/user/tcpdump/CVE-2017-16808.patch deleted file mode 100644 index 6b41aad8c..000000000 --- a/user/tcpdump/CVE-2017-16808.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 28f610026d901660dd370862b62ec328727446a2 Mon Sep 17 00:00:00 2001 -From: Denis Ovsienko <denis@ovsienko.info> -Date: Thu, 31 Aug 2017 21:15:37 +0100 -Subject: [PATCH] CVE-2017-16808/AoE: Add a missing bounds check. - -In aoev1_reserve_print() check bounds before trying to print an Ethernet -address. - -This fixes a buffer over-read discovered by Bhargava Shastry, -SecT/TU Berlin. ---- - print-aoe.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/print-aoe.c b/print-aoe.c -index 97e93df2e..2c78a55d3 100644 ---- a/print-aoe.c -+++ b/print-aoe.c -@@ -325,6 +325,7 @@ aoev1_reserve_print(netdissect_options *ndo, - goto invalid; - /* addresses */ - for (i = 0; i < nmacs; i++) { -+ ND_TCHECK2(*cp, ETHER_ADDR_LEN); - ND_PRINT((ndo, "\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; - } diff --git a/user/unbound/APKBUILD b/user/unbound/APKBUILD index d3af72308..e04ea0459 100644 --- a/user/unbound/APKBUILD +++ b/user/unbound/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> pkgname=unbound -pkgver=1.9.3 -pkgrel=1 +pkgver=1.9.4 +pkgrel=0 pkgdesc="A validating, recursive and caching DNS resolver" url="https://nlnetlabs.nl/projects/unbound/about/" arch="all" @@ -19,8 +19,6 @@ source="https://nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz unbound.initd" build() { - cd "$builddir" - # cachedb, dnscrypt and dnstap have yet unpackaged dependencies PYTHON_VERSION=3 ./configure \ --build=$CBUILD \ @@ -47,12 +45,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -do unbound "$pkgdir/etc/unbound/var" } @@ -70,6 +66,6 @@ python() { mv "$pkgdir/usr/lib/python"* "$subpkgdir" } -sha512sums="21e14dc1577adbe502a262d7fbe9aae0cd389cd9c0b822246beadf00f0ee875e268eeb3ce820433cbb01495d6b182c334b34b63b1bc33b08589a230810ccfe90 unbound-1.9.3.tar.gz +sha512sums="44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c unbound-1.9.4.tar.gz de9dc269553f5449c1757690c2a8a3b9f228964f5672d721cfdbc29e6fab8954907fa4fa3761dd6f705b3ccd2f729cc6e2fe870107feb68cca611589f8306b94 unbound.confd 6627cbcbcb4e04f596e7e0ffdbf80ceb54cdb59144cb89896e53503dfb41b99fd77d8b85d05e6670f77023b6eafec8885b00c0c8e4e34e3e638c52c037a7985e unbound.initd" diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index ea8652b3e..376ca208c 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=upower -pkgver=0.99.10 +pkgver=0.99.11 pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" @@ -10,8 +10,8 @@ license="GPL-2.0+" depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev - intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev" -source="https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" + libgudev-dev libusb-dev libxslt linux-headers polkit-dev" +source="https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz" build() { DATADIRNAME=share ./configure \ @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aefe1b2ff5a390f1ea9676fe7e753750bebc56034365a9183e946a8463904047da0a4ac71340eb2efedc16bce6f6d9ef4609ddca37dc1fc31b56bcdbfbbfa59d upower-0.99.10.tar.xz" +sha512sums="67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803 upower-0.99.11.tar.xz" diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index 1dbff373e..fa9acbd21 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=v4l-utils -pkgver=1.16.6 +pkgver=1.18.0 pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" @@ -14,6 +14,7 @@ source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2 qv4l2.svg qv4l2.desktop getsubopt.patch + types.patch " build() { @@ -73,7 +74,8 @@ ir_keytable() { "$subpkgdir"/etc } -sha512sums="f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58 v4l-utils-1.16.6.tar.bz2 +sha512sums="749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49 v4l-utils-1.18.0.tar.bz2 bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg 6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop -9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29 getsubopt.patch" +a09554deebd7597355c688e52180e0f4030842ccb26a144d1ac8a426836374237725d7b6b555027ca72e10c11e37bd596c7d69d87ee2f6b6d951daf4e50137f8 getsubopt.patch +ee1228cc06e399923953e5121a683347a7fe881c80c55faae0adf6ed836251da1b2c4d1561454daa6f42220c1171f827ca3e2b72cdac31b379495f23ff6c56bb types.patch" diff --git a/user/v4l-utils/getsubopt.patch b/user/v4l-utils/getsubopt.patch index c476e5ed7..6ad142ae0 100644 --- a/user/v4l-utils/getsubopt.patch +++ b/user/v4l-utils/getsubopt.patch @@ -7,7 +7,7 @@ diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common index 3ea6cd3..291fb3e 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -692,16 +692,17 @@ static bool parse_subset(char *optarg) +@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg) static bool parse_next_subopt(char **subs, char **value) { @@ -20,8 +20,7 @@ index 3ea6cd3..291fb3e 100644 - if (opt < 0 || *value) - return false; -- fprintf(stderr, "No value given to suboption <%s>\n", -- subopts[opt]); +- fprintf(stderr, "Missing suboption value\n"); - return true; + while (*p && *p != ',') + p++; @@ -33,4 +32,4 @@ index 3ea6cd3..291fb3e 100644 + return false; } - void common_cmd(int ch, char *optarg) + void common_cmd(const std::string &media_bus_info, int ch, char *optarg) diff --git a/user/v4l-utils/types.patch b/user/v4l-utils/types.patch new file mode 100644 index 000000000..56eb991a3 --- /dev/null +++ b/user/v4l-utils/types.patch @@ -0,0 +1,26 @@ +--- v4l-utils-1.18.0/utils/keytable/keymap.h.old 2019-09-22 09:22:54.000000000 +0000 ++++ v4l-utils-1.18.0/utils/keytable/keymap.h 2019-10-05 03:45:16.795852895 +0000 +@@ -2,6 +2,10 @@ + #ifndef __KEYMAP_H + #define __KEYMAP_H + ++#include <stdint.h> ++typedef uint32_t u_int32_t; ++typedef int error_t; ++ + struct keymap { + struct keymap *next; + char *name; +--- v4l-utils-1.18.0/utils/ir-ctl/keymap.h.old 2019-09-22 09:22:54.000000000 +0000 ++++ v4l-utils-1.18.0/utils/ir-ctl/keymap.h 2019-10-05 03:44:27.651163483 +0000 +@@ -2,6 +2,10 @@ + #ifndef __KEYMAP_H + #define __KEYMAP_H + ++#include <stdint.h> ++typedef uint32_t u_int32_t; ++typedef int error_t; ++ + struct keymap { + struct keymap *next; + char *name; diff --git a/user/viewres/APKBUILD b/user/viewres/APKBUILD index 0185ca839..c7117860f 100644 --- a/user/viewres/APKBUILD +++ b/user/viewres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=viewres -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="View widget class trees in software using Athena widgets (Xaw)" url="https://www.X.Org/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/viewres-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2" +sha512sums="3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2" diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index 0eee63bb6..8a852ec6f 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,37 +1,31 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vte -pkgver=0.56.3 +pkgver=0.58.0 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" arch="all" license="LGPL-2.1+ AND GPL-3.0+ AND LGPL-3.0+ AND MIT AND LGPL-2.0+" -makedepends="intltool gtk+3.0-dev gnutls-dev zlib-dev pcre2-dev - gobject-introspection-dev vala vala-dev libxml2-utils" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +makedepends="gnutls-dev gtk+3.0-dev gnutls-dev gobject-introspection-dev + libxml2-utils meson ninja pcre2-dev vala vala-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz exitcode.patch " build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson -Dprefix=/usr build + ninja -C build } check() { - make check + ninja -C build test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build install } -sha512sums="f78b3d532ca47e53c1bb51db6780697ce4692d493c0030d2dc4beb63a2595e44a43eb409ee31b94e4551eae259ac1baa8f06825a02fd66df8352e192f4ea1988 vte-0.56.3.tar.xz +sha512sums="4d0fc725e0c71921b3d235d434600ad3c0807d5c0e7bd62fb782d857254db334bb851b75382c9613a5af753b5d6a1c05b174731427a8560b9b14101b3cc38c06 vte-0.58.0.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index e5f49da9d..d18e9cf69 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,8 +2,8 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=weechat -pkgver=2.5 -pkgrel=1 +pkgver=2.6 +pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz libintl-fix.patch - python.patch " # secfixes: @@ -26,22 +25,18 @@ source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz # 1.9.1-r0: # - CVE-2017-14727 -prepare() { - cd "$builddir" - default_prepare +build() { + cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON -Bbuild . + make -C build } -build() { - cd "$builddir" - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON - make +check() { + cd "$builddir"/build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" -C build install } _plugin() { @@ -57,11 +52,5 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -check() { - cd "$builddir"/build - ctest -V -} - -sha512sums="1bf16c76e63668fc6d4b72d521f71980717b08bd2abc5c7f0825af32e6de9327c5c967067bfb025a0404eee627f54cecdd9f1f2b3618ea7a08798d8510a2487b weechat-2.5.tar.gz -59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch -b77bd5f31bf4547d1d5505fec5018b867f0b597ed0b6819d4ed0ff6a2b7f664f2308f6c1b094debc381673b4de6208f09ca36da3413eb72f40aca9924464d746 python.patch" +sha512sums="47698f9b275c4fad68cc786cf0739e6f7355428abf57b94e64df84725b001546783f4e6389d0ed51ff5108c50c48dba344c22da9f43bc6f6f90acedacc3e84a5 weechat-2.6.tar.gz +59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" diff --git a/user/weechat/python.patch b/user/weechat/python.patch deleted file mode 100644 index a6e194719..000000000 --- a/user/weechat/python.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- weechat-2.5/cmake/FindPython.cmake 2019-06-06 18:43:20.000000000 +0000 -+++ weechat-2.5/cmake/FindPython.cmake 2019-06-24 12:22:10.659972390 +0000 -@@ -25,7 +25,6 @@ - # - # PYTHON_EXECUTABLE = full path to the python binary - # PYTHON_INCLUDE_PATH = path to where python.h can be found --# PYTHON_LIBRARY = path to where libpython.so* can be found - # PYTHON_LFLAGS = python compiler options for linking - - if(PYTHON_FOUND) -@@ -38,11 +37,19 @@ - NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) -+ find_program(PYTHON_CONFIG -+ NAMES python3-config -+ PATHS /usr/bin /usr/local/bin /usr/pkg/bin -+ ) - else() - find_program(PYTHON_EXECUTABLE - NAMES python2.7 python2.6 python2.5 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) -+ find_program(PYTHON_CONFIG -+ NAMES python-config -+ PATHS /usr/bin /usr/local/bin /usr/pkg/bin -+ ) - endif() - - if(PYTHON_EXECUTABLE) -@@ -52,32 +59,17 @@ - ) - - execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))" -- OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH -- ) -- -- execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBS') + ' ' + get_config_var('LINKFORSHARED'))" -+ COMMAND ${PYTHON_CONFIG} --libs - OUTPUT_VARIABLE PYTHON_LFLAGS -+ OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - find_path(PYTHON_INCLUDE_PATH - NAMES Python.h - HINTS ${PYTHON_INC_DIR} - ) -- if(ENABLE_PYTHON3) -- find_library(PYTHON_LIBRARY -- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python -- HINTS ${PYTHON_POSSIBLE_LIB_PATH} -- ) -- else() -- find_library(PYTHON_LIBRARY -- NAMES python2.7 python2.6 python2.5 python -- HINTS ${PYTHON_POSSIBLE_LIB_PATH} -- ) -- endif() - -- if(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) -+ if(PYTHON_LFLAGS AND PYTHON_INCLUDE_PATH) - execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" - OUTPUT_VARIABLE PYTHON_VERSION -@@ -96,7 +88,6 @@ - mark_as_advanced( - PYTHON_EXECUTABLE - PYTHON_INCLUDE_PATH -- PYTHON_LIBRARY - PYTHON_LFLAGS - ) - ---- weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-06 18:43:20.000000000 +0000 -+++ weechat-2.5/src/plugins/python/CMakeLists.txt 2019-06-24 12:22:16.259972363 +0000 -@@ -24,8 +24,7 @@ - - if(PYTHON_FOUND) - include_directories(${PYTHON_INCLUDE_PATH}) -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PYTHON_LFLAGS}") -- target_link_libraries(python ${PYTHON_LIBRARY} weechat_plugins_scripts coverage_config) -+ target_link_libraries(python ${PYTHON_LFLAGS} weechat_plugins_scripts coverage_config) - endif() - - install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins) diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 5e72cbe9c..490c9a3e9 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 -pkgver=4.8.5 +pkgver=4.8.6 pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " @@ -10,8 +10,8 @@ license="MIT" depends="" makedepends="gmp-dev python3-dev cmd:which" subpackages="$pkgname-dev py3-$pkgname:py3:noarch" -source="https://github.com/Z3Prover/z3/archive/Z3-$pkgver.tar.gz" -builddir="$srcdir/z3-Z3-$pkgver" +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" +builddir="$srcdir/z3-z3-$pkgver" build() { PYTHON=python3 ./configure \ @@ -37,4 +37,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309 Z3-4.8.5.tar.gz" +sha512sums="d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1 z3-4.8.6.tar.gz" diff --git a/user/zola/APKBUILD b/user/zola/APKBUILD index 654c940e7..b3add1099 100644 --- a/user/zola/APKBUILD +++ b/user/zola/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=zola -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=0 pkgdesc="A fast static site generator in a single binary with everything built in" url="https://github.com/getzola/zola" @@ -19,83 +19,74 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/getzola/zola/archive/v$pkgve # dependencies taken from Cargo.lock cargo_deps=" actix-codec-0.1.2 -actix-connect-0.2.0 -actix-files-0.1.2 -actix-http-0.2.4 +actix-connect-0.2.5 +actix-files-0.1.4 +actix-http-0.2.10 actix-router-0.1.5 -actix-rt-0.2.3 -actix-server-0.5.1 -actix-server-config-0.1.1 -actix-service-0.4.1 -actix-threadpool-0.1.1 -actix-utils-0.4.1 -actix-web-1.0.2 +actix-rt-0.2.5 +actix-server-0.6.0 +actix-server-config-0.1.2 +actix-service-0.4.2 +actix-threadpool-0.1.2 +actix-utils-0.4.5 +actix-web-1.0.7 actix-web-codegen-0.1.2 -adler32-1.0.3 -aho-corasick-0.7.3 -ammonia-2.1.1 +adler32-1.0.4 +aho-corasick-0.7.6 +ammonia-3.0.0 ansi_term-0.11.0 -arc-swap-0.3.11 -arrayvec-0.4.10 -atty-0.2.11 -autocfg-0.1.4 -backtrace-0.3.30 -backtrace-sys-0.1.28 +arc-swap-0.4.3 +arrayvec-0.4.11 +atty-0.2.13 +autocfg-0.1.6 +backtrace-0.3.38 +backtrace-sys-0.1.31 base64-0.10.1 -bincode-1.1.4 -bitflags-1.1.0 +bincode-1.2.0 +bitflags-1.2.0 block-buffer-0.7.3 block-padding-0.1.4 -bstr-0.1.4 -build_const-0.2.1 +bstr-0.2.8 byte-tools-0.3.1 byteorder-1.3.2 bytes-0.4.12 -cc-1.0.37 -cfg-if-0.1.9 -chrono-0.4.6 +c2-chacha-0.2.2 +cc-1.0.45 +cfg-if-0.1.10 +chrono-0.4.9 +chrono-tz-0.5.1 clap-2.33.0 cloudabi-0.0.3 color_quant-1.0.1 cookie-0.12.0 cookie_store-0.7.0 -copyless-0.1.3 +copyless-0.1.4 core-foundation-0.6.4 core-foundation-sys-0.6.2 -crc-1.8.1 crc32fast-1.2.0 -crossbeam-channel-0.3.8 -crossbeam-deque-0.6.3 +crossbeam-channel-0.3.9 crossbeam-deque-0.7.1 -crossbeam-epoch-0.7.1 +crossbeam-epoch-0.7.2 crossbeam-queue-0.1.2 -crossbeam-utils-0.6.5 -csv-1.0.7 -csv-core-0.1.5 +crossbeam-utils-0.6.6 +csv-1.1.1 +csv-core-0.1.6 ctrlc-3.1.3 -deflate-0.7.19 -derive_more-0.14.1 +deflate-0.7.20 derive_more-0.15.0 deunicode-0.4.3 -digest-0.8.0 +digest-0.8.1 dtoa-0.4.4 -either-1.5.2 -elasticlunr-rs-2.3.5 -encoding-0.2.33 -encoding-index-japanese-1.20141219.5 -encoding-index-korean-1.20141219.5 -encoding-index-simpchinese-1.20141219.5 -encoding-index-singlebyte-1.20141219.5 -encoding-index-tradchinese-1.20141219.5 -encoding_index_tests-0.1.4 -encoding_rs-0.8.17 +either-1.5.3 +elasticlunr-rs-2.3.6 +encoding_rs-0.8.20 enum-as-inner-0.2.1 error-chain-0.12.1 failure-0.1.5 failure_derive-0.1.5 fake-simd-0.1.2 -filetime-0.2.5 -flate2-1.0.9 +filetime-0.2.7 +flate2-1.0.11 fnv-1.0.6 foreign-types-0.3.2 foreign-types-shared-0.1.1 @@ -106,60 +97,61 @@ fuchsia-cprng-0.1.1 fuchsia-zircon-0.3.3 fuchsia-zircon-sys-0.3.3 futf-0.1.4 -futures-0.1.27 +futures-0.1.29 futures-cpupool-0.1.8 -generic-array-0.12.0 -getopts-0.2.19 -gif-0.10.2 +generic-array-0.12.3 +getopts-0.2.21 +getrandom-0.1.12 +gif-0.10.3 glob-0.3.0 -globset-0.4.3 +globset-0.4.4 globwalk-0.7.1 -h2-0.1.24 +h2-0.1.26 hashbrown-0.5.0 heck-0.3.1 hostname-0.1.5 -html5ever-0.23.0 -http-0.1.17 +html5ever-0.24.1 +http-0.1.18 http-body-0.1.0 -httparse-1.3.3 +httparse-1.3.4 humansize-1.1.0 -humantime-1.2.0 -hyper-0.12.30 +humantime-1.3.0 +hyper-0.12.35 hyper-tls-0.3.2 idna-0.1.5 -ignore-0.4.7 -image-0.21.2 -indexmap-1.0.2 +idna-0.2.0 +ignore-0.4.10 +image-0.22.2 +indexmap-1.2.0 inflate-0.4.5 inotify-0.6.1 inotify-sys-0.1.3 iovec-0.1.2 ipconfig-0.2.1 itoa-0.4.4 -jpeg-decoder-0.1.15 +jpeg-decoder-0.1.16 kernel32-sys-0.2.2 language-tags-0.2.2 -lazy_static-1.3.0 +lazy_static-1.4.0 lazycell-1.2.1 -libc-0.2.58 +libc-0.2.62 line-wrap-0.1.1 linked-hash-map-0.5.2 lock_api-0.1.5 -lock_api-0.2.0 -log-0.4.6 +lock_api-0.3.1 +log-0.4.8 lru-cache-0.1.2 lzw-0.10.0 mac-0.1.1 -maplit-1.0.1 -markup5ever-0.8.1 +maplit-1.0.2 +markup5ever-0.9.0 matches-0.1.8 -memchr-2.2.0 -memoffset-0.2.1 -mime-0.3.13 -mime_guess-2.0.0-alpha.6 +memchr-2.2.1 +memoffset-0.5.1 +mime-0.3.14 +mime_guess-2.0.1 miniz-sys-0.1.12 -miniz_oxide-0.2.1 -miniz_oxide_c_api-0.2.1 +miniz_oxide-0.3.2 mio-0.6.19 mio-extras-2.0.5 mio-uds-0.6.7 @@ -170,72 +162,81 @@ new_debug_unreachable-1.0.3 nix-0.14.1 nodrop-0.1.13 nom-4.2.3 -notify-4.0.12 +notify-4.0.13 num-derive-0.2.5 num-integer-0.1.41 num-iter-0.1.39 num-rational-0.2.2 num-traits-0.2.8 num_cpus-1.10.1 -numtoa-0.1.0 -onig-4.3.2 +onig-4.3.3 onig_sys-69.1.0 -opaque-debug-0.2.2 -openssl-0.10.23 +opaque-debug-0.2.3 +open-1.3.2 +openssl-0.10.24 openssl-probe-0.1.2 -openssl-sys-0.9.47 +openssl-sys-0.9.49 owning_ref-0.4.0 parking_lot-0.7.1 -parking_lot-0.8.0 +parking_lot-0.9.0 parking_lot_core-0.4.0 -parking_lot_core-0.5.0 +parking_lot_core-0.6.2 +parse-zoneinfo-0.2.0 percent-encoding-1.0.1 -pest-2.1.1 +percent-encoding-2.1.0 +pest-2.1.2 pest_derive-2.1.0 -pest_generator-2.1.0 -pest_meta-2.1.1 +pest_generator-2.1.1 +pest_meta-2.1.2 phf-0.7.24 phf_codegen-0.7.24 phf_generator-0.7.24 phf_shared-0.7.24 -pkg-config-0.3.14 +pkg-config-0.3.16 plist-0.4.2 -png-0.14.1 +png-0.15.0 +ppv-lite86-0.2.5 precomputed-hash-0.1.1 proc-macro2-0.4.30 -publicsuffix-1.5.2 -pulldown-cmark-0.5.2 +proc-macro2-1.0.4 +publicsuffix-1.5.3 +pulldown-cmark-0.6.0 quick-error-1.2.2 -quote-0.6.12 +quote-0.6.13 +quote-1.0.2 rand-0.6.5 +rand-0.7.2 rand_chacha-0.1.1 +rand_chacha-0.2.1 rand_core-0.3.1 -rand_core-0.4.0 +rand_core-0.4.2 +rand_core-0.5.1 rand_hc-0.1.0 +rand_hc-0.2.0 rand_isaac-0.1.1 rand_jitter-0.1.4 rand_os-0.1.3 rand_pcg-0.1.2 rand_xorshift-0.1.1 -rayon-1.1.0 -rayon-core-1.5.0 +rayon-1.2.0 +rayon-core-1.6.0 rdrand-0.4.0 -redox_syscall-0.1.54 -redox_termios-0.1.1 -regex-1.1.7 -regex-syntax-0.6.7 +redox_syscall-0.1.56 +regex-1.3.1 +regex-automata-0.1.8 +regex-syntax-0.6.12 remove_dir_all-0.5.2 -reqwest-0.9.18 +reqwest-0.9.20 resolv-conf-0.6.2 rust-stemmers-1.1.0 -rustc-demangle-0.1.15 +rustc-demangle-0.1.16 rustc_version-0.2.3 -ryu-0.2.8 -safemem-0.3.0 -same-file-1.0.4 +ryu-1.0.0 +safemem-0.3.2 +same-file-1.0.5 sass-rs-0.2.2 -sass-sys-0.4.10 -schannel-0.1.15 +sass-sys-0.4.13 +schannel-0.1.16 scoped_threadpool-0.1.9 scopeguard-0.3.3 scopeguard-1.0.0 @@ -243,101 +244,100 @@ security-framework-0.3.1 security-framework-sys-0.3.1 semver-0.9.0 semver-parser-0.7.0 -serde-1.0.92 -serde_derive-1.0.92 -serde_json-1.0.39 +serde-1.0.101 +serde_derive-1.0.101 +serde_json-1.0.40 serde_urlencoded-0.5.5 +serde_urlencoded-0.6.1 sha-1-0.8.1 sha1-0.6.0 -signal-hook-0.1.9 -signal-hook-registry-1.0.1 +signal-hook-0.1.10 +signal-hook-registry-1.1.1 siphasher-0.2.3 slab-0.4.2 -slotmap-0.2.1 +slotmap-0.4.0 slug-0.1.4 smallvec-0.6.10 -socket2-0.3.9 +socket2-0.3.11 stable_deref_trait-1.1.1 -string-0.2.0 +string-0.2.1 string_cache-0.7.3 -string_cache_codegen-0.4.2 +string_cache_codegen-0.4.4 string_cache_shared-0.3.0 strsim-0.8.0 strum-0.15.0 strum_macros-0.15.0 -syn-0.15.37 +syn-0.15.44 +syn-1.0.5 synstructure-0.10.2 syntect-3.2.0 -tempfile-3.0.8 +tempfile-3.1.0 tendril-0.4.1 -tera-1.0.0-beta.10 +tera-1.0.0-beta.16 termcolor-1.0.5 -termion-1.5.3 textwrap-0.11.0 thread_local-0.3.6 threadpool-1.7.1 -tiff-0.2.2 +tiff-0.3.1 time-0.1.42 -tokio-0.1.21 +tokio-0.1.22 tokio-buf-0.1.1 tokio-codec-0.1.1 tokio-current-thread-0.1.6 -tokio-executor-0.1.7 +tokio-executor-0.1.8 tokio-io-0.1.12 tokio-reactor-0.1.9 tokio-signal-0.2.7 tokio-sync-0.1.6 tokio-tcp-0.1.3 -tokio-threadpool-0.1.14 +tokio-threadpool-0.1.15 tokio-timer-0.2.11 -tokio-trace-core-0.2.0 -tokio-udp-0.1.3 -toml-0.4.10 -toml-0.5.1 +tokio-udp-0.1.5 +toml-0.5.3 trust-dns-proto-0.7.4 trust-dns-resolver-0.11.1 try-lock-0.2.2 try_from-0.3.2 -typenum-1.10.0 -ucd-trie-0.1.1 -ucd-util-0.1.3 +typenum-1.11.2 +ucd-trie-0.1.2 unic-char-property-0.9.0 unic-char-range-0.9.0 unic-common-0.9.0 unic-segment-0.9.0 unic-ucd-segment-0.9.0 unic-ucd-version-0.9.0 -unicase-1.4.2 -unicase-2.4.0 +unicase-2.5.1 unicode-bidi-0.3.4 unicode-normalization-0.1.8 unicode-segmentation-1.3.0 -unicode-width-0.1.5 +unicode-width-0.1.6 unicode-xid-0.1.0 +unicode-xid-0.2.0 url-1.7.2 +url-2.1.0 utf-8-0.7.5 -utf8-ranges-1.0.3 uuid-0.7.4 -v_escape-0.7.2 -v_escape_derive-0.5.3 -v_htmlescape-0.4.3 -vcpkg-0.2.6 +v_escape-0.7.4 +v_escape_derive-0.5.5 +v_htmlescape-0.4.5 +vcpkg-0.2.7 vec_map-0.8.1 version_check-0.1.5 void-1.0.2 -walkdir-2.2.8 -want-0.0.6 +walkdir-2.2.9 +want-0.2.0 +wasi-0.7.0 widestring-0.4.0 winapi-0.2.8 -winapi-0.3.7 +winapi-0.3.8 winapi-build-0.1.1 winapi-i686-pc-windows-gnu-0.4.0 winapi-util-0.1.2 winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-1.0.1 -winreg-0.6.0 +wincolor-1.0.2 +winreg-0.6.2 winutil-0.1.1 -ws-0.8.1 +ws-0.9.0 ws2_32-sys-0.2.1 xml-rs-0.8.0 yaml-rust-0.4.3 @@ -428,85 +428,76 @@ zshcomp() { "$subpkgdir"/usr/share/zsh/site-functions } -sha512sums="be6a37eb489302c369f83a7c65dc9b1aafc7cea6994dab9297618ae2ecf5d0c2f838b8dd386bac8c17e0f24fa0d30d4fac2f4599e912f06a32525b4dce38215a zola-0.8.0.tar.gz +sha512sums="e9496b57e005a751e85533807f6be275d187baa3f4371a29416dd7d2373d9214ee3469b032102c0544782527f93692d9d71a40d20e34cfe776be058777374756 zola-0.9.0.tar.gz 2d1658901c383003ff8181f366b1c691754de50fdf74a07a89001c97dbf9320864238797cbd20a44643e8ea8ec107c3b226c8573c4a6379f94ffd286fe8db025 actix-codec-0.1.2.tar.gz -506c2644e2b111f08243ef4d4eee2bdfd30d0e713f3ae1a6d2e382a1b0e2e3af41ae9828a642174995267afa1a91e3cfe6ccd9d182b893803a92ff730879b0b7 actix-connect-0.2.0.tar.gz -66cb9eb29ac54fb518869260ee2698c2c064d75ea64a748d02667d43a163e17ff7de8825f629e2da7669bad4039dc1823d70b04070e21ccbaf1d55ebcbafc328 actix-files-0.1.2.tar.gz -c96bb8e0e5bbad590861035697a713c98b0792436d3bcac87cd4b4649d3cb2485a9711355f2e6fbb3b0c90a7147eea8e0af5524ce75a761ff4b0929c3f7d9137 actix-http-0.2.4.tar.gz +13ac8e3a7759c55dad12055f93f5eab9e9b692cc3d6439888359de3e386b9838485e2478cfee8601f48ab03f5ffcaa662774ba039995e625d4ddc4ccdbb8432a actix-connect-0.2.5.tar.gz +45e2cc4ca1a41d74e5e6f051912ec0b98b76115eb988e7aeb5374d110a9fefdcb0976b3e2cd9ab74f03f184e99fdf1f1779162f167418bcd0a7eec4e96aa4f79 actix-files-0.1.4.tar.gz +3b225984dac2e601b8b9d37d0a2ed348e9d74487c9422a12c855d5fc347e2fb7bec5c16eb7e5f473734fe38acb40943a05a15ca38357aa3690bb16791efe3d28 actix-http-0.2.10.tar.gz a01be9391df3227764ca3445301b82bd85dacf502edb6233fd0bdac1447cc1a4a7514952effbbce0c1b267088db3ac17ae4455a2232232aed056f1efff562e5f actix-router-0.1.5.tar.gz -8ea50d7db80272f33eee1a0c73e32a8613330ff83410c1b7f55f7df71b44697a48d80aac40cc1af014b349ec6144f41e79487058f188b822cd09195bf57b9c26 actix-rt-0.2.3.tar.gz -850fe799de268cc6cf440faa1b6254de1f7a5ac25dbcfaa07adfc5e798156102b783d5eec02903e41babc67e31d269825d5f2afce794f2ae670985af706b6fff actix-server-0.5.1.tar.gz -fdebce2eb4266edb7b66f3c62b2f5295c7a6075d1bf02862885a4942b05fef38ca6270de4a4ea56f5db1345036cd98800e585dff54c00c2179db982165d9b0a9 actix-server-config-0.1.1.tar.gz -2dc85a307ad0ff304beea4a8afdac93ce82c943fa300033b3019bb6bb58fa5d5242705e84072679655e35e7d4f933a7150a9417ad5a9098e926e850f8381f0cc actix-service-0.4.1.tar.gz -c290bf7c84996bd529c53d0314174eedcfb9440cb1adf580f4626fe8345b2a64b5054ee7514d7882b2a786f90a4ac5de64db0da346f93ee88ea382ce9f40f693 actix-threadpool-0.1.1.tar.gz -99166ab2185f8a4b5f4a850a5cb050adc6098869a9bbb333ebd68f9a71e1b741854b9cf5841812f8abc2c062d049e64c0ba7ccfd0303da4da0f7b7022fc17e57 actix-utils-0.4.1.tar.gz -ddb3777b74afc0787ecba8621bdafae44f96bfc9f1545dac32f7289a509882996e4cec5c4c7300db9a4c3cfc3d0235b9c76bde5bd865a594704ab346f79ee901 actix-web-1.0.2.tar.gz +289570966576600dc3c1d2641aaa6e858c7caa4e7b4c6474a6e459792a7d2914e0871127934e030e90635d3f00b42cfdb121b72f14e235a703561dfcbb37f149 actix-rt-0.2.5.tar.gz +3f8c8285f8a36b56f8775bf56c4d708955deacc162df8e3b198f7ec78dcd7107195ba84b9fa20799efd1a8325d2163f7c3683b4b92fbaa3135610a30c001af0c actix-server-0.6.0.tar.gz +69042aba68e57529719611d139e6793332830dd215c2f8d9dfd1f8db68590479295ed9bedcc764b06d3db24b8433a78e28b8253af3f23833f8c7cfecda3e0e2b actix-server-config-0.1.2.tar.gz +53497632a2dcb7ad4f3fc2fedabad735cabd0ff855983cba72bd844f5f5a34813b75fffd6809826f97fa3d373940e2b11470db16ee61de5c61d4102a4c6f84f4 actix-service-0.4.2.tar.gz +2b2dcabe2101cfdcd502de02a782275d23dea8a86fb594a6009bbfff59278dbf8b9344682f9c555432297b3847bbe60aaec1de39a0265fe52d810eafc474d4f4 actix-threadpool-0.1.2.tar.gz +7b657ca0c73ab897ea71223da65deaa8f000f16a33f5e31ba35146b449a0ae9db7cbdc6cbc885b4daf786352a33317ffbc59ce1c19132be680efe7cd16007f53 actix-utils-0.4.5.tar.gz +7870a3bb022904a4a030f6c0ae3ea5c34deb91ee483aa1144e3a9da5c5c2095da3b02119a81c58188696b3dbcaa718fa7682c4f501dd117c21f60f436794187d actix-web-1.0.7.tar.gz 28c445b11556be5a482adade25fa67431b0557b620aa51cf76552a441171c854c66c2db889210d8cd0a09382795a76524b5a60f1fa93a531dcec07e03cf3f4a0 actix-web-codegen-0.1.2.tar.gz -2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459 adler32-1.0.3.tar.gz -4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9 aho-corasick-0.7.3.tar.gz -88081fd9d0eee866c287961de80e60f489a8c89302283138707a2169af79f864af97ecc5ef53d18e5e28535a5a888840b404cc1f648afe0e4e315094c401c029 ammonia-2.1.1.tar.gz +5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123 adler32-1.0.4.tar.gz +120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1 aho-corasick-0.7.6.tar.gz +743aa0e68db8bd2f636ba75a6683e02c581dab74ddd14b8f3abaef5e55be3d3a58ba361bfe4bf6ad00da20c232011239c9b6a2622818f4a86a290aa628e74186 ammonia-3.0.0.tar.gz a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz -6358a28edf997b475bd1ac5860469b97c1605e36f1aecf7108bc26a11ddc96073ed5596bd2a331214b3cb431dccd7f9301c3b86b7cbcc331531c84e2409c6f5c arc-swap-0.3.11.tar.gz -8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f arrayvec-0.4.10.tar.gz -9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz -811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz -73eb9cecaa8baa9da571f49ac9a1e8e159d042e59b934df4b7474e4a49ade66aea69c49505b987855942856302790065f56f25b2e25657af00afc5afaf123c20 backtrace-0.3.30.tar.gz -4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d backtrace-sys-0.1.28.tar.gz +3e5ec14c30c2a061dde5bf1b61ffa753745d1b0fc31081c3a52e3c6b83593f790ce7c25d25bc35a50768a31e8f4dcbe63dd12a1606d2d6939f0096a5bdb6c877 arc-swap-0.4.3.tar.gz +6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4 arrayvec-0.4.11.tar.gz +4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz +ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe autocfg-0.1.6.tar.gz +a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe backtrace-0.3.38.tar.gz +6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0 backtrace-sys-0.1.31.tar.gz 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz -31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28 bincode-1.1.4.tar.gz -e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz +9b599115ff33531eaad003e2c928e83211373101a5ad6cac0dcc09af0b97a0cb157abfc432c1a8c68f303e07732ebd6e0ab776c771250356da9f50187e92b1d9 bincode-1.2.0.tar.gz +bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa bitflags-1.2.0.tar.gz 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf block-buffer-0.7.3.tar.gz db06c66edf77b0a6860d75e053b84b74b3f168a320598a7f1de0e55fa6801dda22010328c5b50a56a27aafb09ed61e3e27ad7221d650b546b3798652b767b02b block-padding-0.1.4.tar.gz -e961d6ffaa4edd78fd7b6cac944013a29790cb6bee512498fb76594ca3fb2992cf69bc5d4ad7e0bac7316f4f4017ba37dbacefe794336bf1557eccffa3381051 bstr-0.1.4.tar.gz -4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658 build_const-0.2.1.tar.gz +9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d bstr-0.2.8.tar.gz 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa byte-tools-0.3.1.tar.gz 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250 bytes-0.4.12.tar.gz -85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c cc-1.0.37.tar.gz -45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz -c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d chrono-0.4.6.tar.gz +d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14 c2-chacha-0.2.2.tar.gz +cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e cc-1.0.45.tar.gz +9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz +d68fdcc255a2b967ea3e18d30dba7bba76929fcfa216c2081426b4fd3846bed660bcec8f92eeccb3de88f6e08aae9ade1c5e5d14f36d0853fe9a4499bcd5a57f chrono-0.4.9.tar.gz +fddb6a5015fa87ce5d6d1024f73a497928233b0125ba31fe651cb03e6f9587e7664b360a27ae023bebfd7fbb29796d48a3c499255179d943fea372ce3e7b03dc chrono-tz-0.5.1.tar.gz f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz 690b0aecf48e5102efca22d4f25821159d4c3f726f5eac08159467bc586ab9f83eacd64aeab79162c006d434002930ceb1519037c846edd84745eda289a592b9 color_quant-1.0.1.tar.gz 4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821 cookie-0.12.0.tar.gz 40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4 cookie_store-0.7.0.tar.gz -d6ab4606e32f8d09dced40830c6e44847dd0f33113224a756e6afc5ceb22569e4f0fe20e242b8249d4cf717bdd3a3d8d7792887a71bf7e00650c07f787922ef0 copyless-0.1.3.tar.gz +2d170f9629030fda5fa964704330ae3200e51cd13d0b07d019ea01efddbf89a55a64c3df3e9f1440b6bfa807c4f7b619d3618602c32c8f954eac81fce71747d3 copyless-0.1.4.tar.gz 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632 core-foundation-0.6.4.tar.gz bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07 core-foundation-sys-0.6.2.tar.gz -db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a crc-1.8.1.tar.gz 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0 crc32fast-1.2.0.tar.gz -9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583 crossbeam-channel-0.3.8.tar.gz -a3248a310c10d09e5a9d394a4e7c571bb75c92c904924fd26b40a55d6fa97c054fa2f1a978ed52263d91b495702c5957dc69aa8793a5c42b4b9e83ac86d4f263 crossbeam-deque-0.6.3.tar.gz +4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919 crossbeam-channel-0.3.9.tar.gz 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2 crossbeam-deque-0.7.1.tar.gz -d527ea799c7f7f5dc960231aa5d24f27ed9389f3a92531046e77686d50740e8f35d1f42510a8e6695776c58e77a3be51aea0dbed459cf81cf8befee1ec573f84 crossbeam-epoch-0.7.1.tar.gz +672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8 crossbeam-epoch-0.7.2.tar.gz f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444 crossbeam-queue-0.1.2.tar.gz -5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8 crossbeam-utils-0.6.5.tar.gz -d3e69e0a93b55617b79a32e4429ea56eee03b5b01a9a62a132a41c0a4961db1bff418681ac3ebbfa30cb0c82ce2beeab2d9fa469a0514e5ff9ef64b969de4acb csv-1.0.7.tar.gz -fc223ef33b83ae306f6cc5a77b08323a802f8fa39054ad9c4cffc63ba3195344319bb66471d164fa6eed7ef3bec11fb8308b78a4fe42ff91413e9441f021d439 csv-core-0.1.5.tar.gz +771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 crossbeam-utils-0.6.6.tar.gz +de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6 csv-1.1.1.tar.gz +91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8 csv-core-0.1.6.tar.gz b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8 ctrlc-3.1.3.tar.gz -f2aedb6cd5d09daf4b2449fcd139f27a8a3ee97bdbd54b9f04611f308b96d9627579beafd1421266c3ca15d017c68872b957ba90e6813dd7cb07de5c9ac6a4f9 deflate-0.7.19.tar.gz -703951b04d07f90225b08f3688c2afa1d78511c82433d4430827592c5c5cab3b442c914420c533e91c929caad02044586d3f81a6e74bc32c12b9d75b2345e13e derive_more-0.14.1.tar.gz +3ed98605cb073c178052336a2ffa535e69480046f12a9152edaef9f10520123c013126f30767097e30047689fb2c25f27e9745d6269bbb0e04e644b00fc19682 deflate-0.7.20.tar.gz dd68892b97f104427a3df896680616b002c7f0cf2809279f7f6ed34287ce387fc7c41d95e91380ac93a8c3342645467af70e656d2515db0beba24ce456e2a8bb derive_more-0.15.0.tar.gz f3b9ca2055cd64d2f3035799f809976a0909e59b38ebec62b56e9037f32582f5cc99b72b1774dfbcc72e4d978570946cec46eb034fe71145c67e2241b9f84cd5 deunicode-0.4.3.tar.gz -b5c4b7d0d1131d2b24fa010839019fa5fc825a88bcda12f4b170b5d7bc93500319895a8c6282eda98be59e880825147f06d21eb9bea43828752cafc998b23e56 digest-0.8.0.tar.gz +186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 digest-0.8.1.tar.gz d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044 dtoa-0.4.4.tar.gz -88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187 either-1.5.2.tar.gz -18d91518b575a20b2b56c666022783fe1f1ee119b4edc98e01b1c42cbb2025741897516bdad69d6c1a8e0001db66f5618941c4b6ce5f202a25feda4c8209b16a elasticlunr-rs-2.3.5.tar.gz -10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e encoding-0.2.33.tar.gz -879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2 encoding-index-japanese-1.20141219.5.tar.gz -0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884 encoding-index-korean-1.20141219.5.tar.gz -caffc2a9b77545c2cc22bfcb38c886fba21e765ef49a3cfcfff88ebd76064432638bb432cd57a7ecd23bf2ea074c400c1f043a0589e5aa28024ed3ae0f59be75 encoding-index-simpchinese-1.20141219.5.tar.gz -648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a encoding-index-singlebyte-1.20141219.5.tar.gz -3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d encoding-index-tradchinese-1.20141219.5.tar.gz -0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6 encoding_index_tests-0.1.4.tar.gz -db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453 encoding_rs-0.8.17.tar.gz +5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2 either-1.5.3.tar.gz +63349de11a3b485ca9cf4961a951f286dc22842aa98229510eecb3e9e2fc5fe8deb03199eeabebb28e3adb24625ca78f4deead72af0696053c3a463228487731 elasticlunr-rs-2.3.6.tar.gz +601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d encoding_rs-0.8.20.tar.gz 37c8034c74e74e590d785af955f34989454bf8051608aed2968ec6e5609f492fa3fa4ca829404a13c1e2f987eb72403b8c9c3463e69b5bde0b5307fc4b8d7f8d enum-as-inner-0.2.1.tar.gz 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc error-chain-0.12.1.tar.gz 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc failure-0.1.5.tar.gz c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a failure_derive-0.1.5.tar.gz d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 fake-simd-0.1.2.tar.gz -cf7e453250b22f58ecc0d177f7042ca3d4ad6f58b3b88bb62942acccf17fa3e13bae70c91dc31b778cf9ae5becda8523958198021bdac48bfa78fe3827e1e540 filetime-0.2.5.tar.gz -89ebe7b8cbd24542989b1a15cd8c4b0b32ca1c0e25f0c874824d9d9443fb1e97ef7064509ea2bd32035abaa412e5eff180813b48811cc3088d046fe473f75654 flate2-1.0.9.tar.gz +410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a filetime-0.2.7.tar.gz +d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a flate2-1.0.11.tar.gz f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 fnv-1.0.6.tar.gz bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 foreign-types-0.3.2.tar.gz bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a foreign-types-shared-0.1.1.tar.gz @@ -517,60 +508,61 @@ ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 fuchsia-zircon-0.3.3.tar.gz 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 fuchsia-zircon-sys-0.3.3.tar.gz 4cd5ecbb8c180c9b390a6884edf65bfc3aff53ffe7b930cf2b432ff9c46a8c5a06001f3f412f99c41a60def52207e709ffa07a4b432ada488e77067fb5e1b3bf futf-0.1.4.tar.gz -5349e562640820de3f41662f40b3e0b2a76f8b63a34ef7f15318600a2e016d3d0e78a31ee3d3c35fffedae6f80d1bab9be7ca1ada573a6172aa703dd5ff5832a futures-0.1.27.tar.gz +16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200 futures-0.1.29.tar.gz 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6 futures-cpupool-0.1.8.tar.gz -ecad969ae86b7370ae0c68b67900216a63d0aaa39c50f541fbcb0c28c31c12f28290ba6d1ead061b563b8e7ccbb8a8867d69d3c57550c41c5627dc93fe7af5b4 generic-array-0.12.0.tar.gz -b9f344a10d67d99f7d4f21bfa0d940a677c9b50fb196718a5c3e08f5c46a4b9bb18983c7c12c9cf3d83136f3dce0a57bd2dca90c7461b9175bf26d733ca7eb62 getopts-0.2.19.tar.gz -dde1332c893d5bb74270f11f4942d8aef3de20eba339bd8836e4f0ebe543d47614494506fd8ba2bbb3c370b28223db04b8a07d3be7ea5a6e9551400c29f1dcdd gif-0.10.2.tar.gz +75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 generic-array-0.12.3.tar.gz +5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f getopts-0.2.21.tar.gz +0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518 getrandom-0.1.12.tar.gz +e189b2c745a0abd3ae1803724fab6dc36422d7c0fab760de40856f82d752096df875d15ba8f1c3dba6bdbba811a484babc4fc8bc2422c7998918dfda70387c1c gif-0.10.3.tar.gz 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 glob-0.3.0.tar.gz -255ffa4234c7014fc1de961fabb2a8b8f3285d72f84ac03d89f613467594767ef424b84bccaa4c68ae289ae603de189ddd4c44b0d156680aed1252ef961f748c globset-0.4.3.tar.gz +b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985 globset-0.4.4.tar.gz 889445498d83d9fcd4cd91bcc6bb72a476f4bee4f2cb74260abff2a8a18206583d883afb7b9e8dff83b878d9acede81ce12c9f81bab3b93ca0f401e2681d724f globwalk-0.7.1.tar.gz -d4786ec756617eccdadfa4eff8ff2731e62c9eb9dfca056bf83d02f24b1c73f677cd02b72ac81759df160e82bfe832a7108037c27dc82a4c385f7f2b00dd0436 h2-0.1.24.tar.gz +37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49 h2-0.1.26.tar.gz 96c878d0f9dd70eddb14be2c42df955956a334e768a021f6e14369244c9b0f199182566181d4cbdf137adf040f5a397a57d9ab3d503470fb3412f9edb44b2e01 hashbrown-0.5.0.tar.gz 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz 1b822bc6261cda2a52518c625790878eb4592fbccbea72b503da42322659b8e6c95ccac442753a6cf1d5d612413679221650e0c584bb06162c3b1c89d8bafb02 hostname-0.1.5.tar.gz -d3cc6419bb069394950e02e35fad5f619c996d9c41f9be51364c4b82033b09dbd3b8230d375c6a2d0aa312124dea2ffaa363494a1d24d19d01aa7012d80c951d html5ever-0.23.0.tar.gz -4ec143aec78ca3c0834eed20926ade333c282fedb81aa482b75f25daffb2584756ab337de5fa0e9e8d5d24f39d5f9976d51a9b08e94c50d162ab23564924cf23 http-0.1.17.tar.gz +1d11d085ee333b28fab8a5693d4eccce29d81bad08528b19f558a16b0ce19b0cb34ba6cf3960436a4c6057554e658af0732b5cb1e06b00559ff30075f0df2ad9 html5ever-0.24.1.tar.gz +850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726 http-0.1.18.tar.gz b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80 http-body-0.1.0.tar.gz -b7c3486fde1ec34c07b317df1ad03be6585c3a114a8abcc593dad4244ba372ff4faca9c25151c5c896609dce72523a9daceebd554efc396a937a0c80f87a2087 httparse-1.3.3.tar.gz +97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457 httparse-1.3.4.tar.gz dfca883bddb8562e7538522a560624bc98a53fc8ee712fc3e023e502ffe85ac7bbcd9a68a2718331bb206014dfdb74445bdab7d4aefedd047994219ad1b216a8 humansize-1.1.0.tar.gz -718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb humantime-1.2.0.tar.gz -fc99009efd1bb656c94072be62d07194d4033fc163b6db5aff2ce1091ed9dd837ca993b540b99041fc218d70aa5ef05103e278a3a6e35811652e2cbd4c6e5b12 hyper-0.12.30.tar.gz +2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da humantime-1.3.0.tar.gz +40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c hyper-0.12.35.tar.gz 9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c hyper-tls-0.3.2.tar.gz 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a idna-0.1.5.tar.gz -8db0fcaa966e81b4407700131f3b609165aa3db4fa046410a56f7e4f5a571f5f0bde399b022610f3967f0a640a1da5e268580b6d0e59b6f1be60687f0d3e9685 ignore-0.4.7.tar.gz -e45716fe305af10bb95ddd38db33a48cc379a7e5e1ef7b4a43fc5d2482310eaa50ffff7aed69394d51a423c698ba218a1ecbbd70f6ac7d1421f2089c046f11c5 image-0.21.2.tar.gz -cfae9d222efcce9ab15c5a8368db2865fbdb6819b4fc317ca0aed55c32ea312b5c5ca13130d4aabf08af1803c34d465a1a1209dabbce37e7a1a911faf5cfcfe8 indexmap-1.0.2.tar.gz +375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d idna-0.2.0.tar.gz +ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb ignore-0.4.10.tar.gz +3a4b3545e133616ccb9100aa0a11501e708da41b909b0407840cb26d834d13463a9021cc7662eb1a9a5c3361db7f4771b8397bddbd4223bcf9196ed46f892435 image-0.22.2.tar.gz +de0fa70403f5874133c0b9c97892ffa65b3adf4a1e307fff7039e3a37be0a07de5133d33edeb4d1ac9791b6ead7bffc53f2cf5876a732fadd58977d6d36bed38 indexmap-1.2.0.tar.gz 1392402f72a8463dc5cdaf815d8933e8dfcc914fb3a91e69c38e54deb7d55b5211e157b640b7cfa999400fb4d2e233a4a1a678147594dfa0be300894126d17f2 inflate-0.4.5.tar.gz f818c3a74f2525ae9e57e5a0f1625ac0b86a567f8e8ac92f93836371ae818a05b3ad92893f3e080d2f0e0f7d22d3f25ecb3de5cc744daebd8977301c9280b64c inotify-0.6.1.tar.gz 82ce82277ef2ef05888aae3a997461515d340c7286daefa4f54f7942fcdcbd1e29fbc60907ecdbcb00139db36462fb3c21ce64b9add2b785826adfaa54216a66 inotify-sys-0.1.3.tar.gz 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223 iovec-0.1.2.tar.gz b9c2e23476cebe74ba1f3ac15404a5c336f1d85c1320ef802cd4e3b23b8274855ee42545429c110fab88bb925799375753be3a2e78638c50be5f32666327691b ipconfig-0.2.1.tar.gz f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz -ad09e0bd9b06904cbed740d02c268a0e1568c1a5061f085cbd3488a69255cb66024a664954beb6ef48594267b71c7736aa8f197249e24ae2bdaa2d267708e5bc jpeg-decoder-0.1.15.tar.gz +9ae7d8add326e3b84f28763980499fc6570193fc7d819adaea0f396957505fc74837409e8dde023bdecb859139ba735b0dcc212e7f22928735c1862ff790120e jpeg-decoder-0.1.16.tar.gz 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b kernel32-sys-0.2.2.tar.gz 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6 language-tags-0.2.2.tar.gz -08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822 lazy_static-1.3.0.tar.gz +e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 lazy_static-1.4.0.tar.gz de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2 lazycell-1.2.1.tar.gz -9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz +93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e libc-0.2.62.tar.gz 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb line-wrap-0.1.1.tar.gz 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94 linked-hash-map-0.5.2.tar.gz e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde lock_api-0.1.5.tar.gz -23ba50a3b69903a83de43c63c09c56bb24fb69e2c43d020d1dd5df61bf45ad2ee3f49ab4263e069e311a48b5b7220f3e2d1417c7c98e3c6350f0036007564a0e lock_api-0.2.0.tar.gz -3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz +2180d07e06be22c02e4133b5436c4805ec791865a775a5deb7bcfd54130cb759b02a31e081d082bed418b066b9bcdafd36edcf44b5ac58120d1a6d2956fd9bdd lock_api-0.3.1.tar.gz +0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1 lru-cache-0.1.2.tar.gz 4f62b824a4ede1be1618e75734d109202ad85dcd219409412868433e92513f4f1953a3d85b570d5195cb9b6fcd7af08e0a56a9f1f4daea42d604b37f1218c2f2 lzw-0.10.0.tar.gz dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a mac-0.1.1.tar.gz -8cb6d865e4a3e73d5af5e41bd48e7f971f1a361a5ac7999f915bbd7156d5a90caa07c4ae82d428217b12a6736c362fc64dcafc757b4e7fb66f645cfddc11b175 maplit-1.0.1.tar.gz -0a91337a75e3af1a50e15369b35c467a7fa23c4c75f8f1ef4214484ccd627ebf7ad2128ade98d831f5cd2a243f030988994571617247cdf430c5320aea9a3f9b markup5ever-0.8.1.tar.gz +917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f maplit-1.0.2.tar.gz +ac321105b4631c7e9a2f987d0bee867effb8f86962e8d5a056b6009ea596389ea87f7f21bfc47f0fbfae24e8ae4e6e5e7a510f3694f677dd91d56ebb728cdf4b markup5ever-0.9.0.tar.gz 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 matches-0.1.8.tar.gz -19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088 memchr-2.2.0.tar.gz -4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530 memoffset-0.2.1.tar.gz -92805a4eaebb1f6146facf1edd0b9cc710731949141af6bfc2226edb7fbd749b04bd8a921e79c2f4a31b79d11053e36a4b7b9dba9be1405a1174a8600654e320 mime-0.3.13.tar.gz -b32bdea0942443aede186317a7e3b3d2e36e3bda56e43794c040aad6ddc1fb847bd380f514299800e449f188208c218680d4d07f16ab30c9c7cbab02c5245733 mime_guess-2.0.0-alpha.6.tar.gz +0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d memchr-2.2.1.tar.gz +8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e memoffset-0.5.1.tar.gz +7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471 mime-0.3.14.tar.gz +c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f mime_guess-2.0.1.tar.gz e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02 miniz-sys-0.1.12.tar.gz -8f3cc13b919c6dca6c4601ccc66e0102fce505ad4082e1eaaa6b132182b9cecd5e564752ba3c62b8e9db9c353f46623afbd6415119b342c746c3b72e214ed5d9 miniz_oxide-0.2.1.tar.gz -2347504ac3a45e502ace4192dee292ac656771dd9dc6557f66648b94e97e77cf7ba763b99ab9b81de053cd33756a7dd5d3ed5d2741ec88c2164729071823a9cc miniz_oxide_c_api-0.2.1.tar.gz +ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95 miniz_oxide-0.3.2.tar.gz a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097 mio-0.6.19.tar.gz 743fc56546d8bcb09efecda0d60007a175a2db2a75dc882b21fedeb8fc4fcfe98ac0a6d55b0e843b088aac4e24e57145d96b372cdfa39933efee2514ba2ebba9 mio-extras-2.0.5.tar.gz fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04 mio-uds-0.6.7.tar.gz @@ -581,72 +573,81 @@ d12686d789b0c37ae0b05881223b61737fd04092f10217caf4e6c9b8604e0a7734c9ff81b01ac204 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3 nix-0.14.1.tar.gz 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e nodrop-0.1.13.tar.gz 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54 nom-4.2.3.tar.gz -4d278f28f94b3b470d4928b8164db4f3b74ffd1552afd85d7c5f502380aea5e5256201ca702067993daa691babd532ffa12d44309f3a688c45c6e66d1b9c6e1c notify-4.0.12.tar.gz +2b4be105d216ece418cb52239f150cbf23b21b58acab6298fc2b57eee4b37516bb4e5fb8624501da61a540bfad5a97ac1e2ce74c4812cc8dc7c73815f1150d35 notify-4.0.13.tar.gz 63ec8a69a964fc7c4d6286c04503fb77acb6e3609237b3b4619418c06b11e96bff88e7cb10898718ae690a187cec75c8b96b9c3d524e171ec1678eb457d354d9 num-derive-0.2.5.tar.gz f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f num-integer-0.1.41.tar.gz 4f6e94c4f5e7ea1a95d76a61a4be4c5ac3b3e8ca0a2271b721c265881e47b0454525918aa207bcad738de8e19ca7c5e5c915a1c4c158d5c9c2e68d05649bdaf8 num-iter-0.1.39.tar.gz cbe0dadf88b0704543005c96e2bac7bf981a90dabfd6595b06ee21973acb304591929dfaf51b3e860456dbbb812e60c5700a4793b46214595092f4defdf8159b num-rational-0.2.2.tar.gz a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534 num-traits-0.2.8.tar.gz f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd num_cpus-1.10.1.tar.gz -41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 numtoa-0.1.0.tar.gz -f8915e2d001c4f2dbc77bce91f673f07c0bea36f47c9f5579d36de6e68bdd0623d0700f0b3dc6e82b747e17f6b7f35fea84717bf658990dfb284f4bbe5bb66be onig-4.3.2.tar.gz +6c8e06a9c2f0aa130df2e3ace50d3b24b8da6906ed6dd153d34cc2036e886e8c7848dd3861218a8981aeda30813c9c86d7d0b5b98eca20bda4632b56ae6d67c5 onig-4.3.3.tar.gz 676884bf338fe2d9726956eec5d26297f3eba03642766ee3e64d7e2f5a945d6da93521c19c2c11881b5bb2785f24e5e91febfc08f12729fe58d74e4494f08ae6 onig_sys-69.1.0.tar.gz -3bbe9ada50d8fbeb46a0d3ee624a8e2a4f8012ba018f7a9e2408817756c6aeae2804b89537685509cd4872b1ac19bdbe01b6e09d7ba22995d9046b99587fa157 opaque-debug-0.2.2.tar.gz -655db50c88b5503dd80649f467acea5452896fb97d39d82180dafa24180d7d92a1ef2e75ad46b0596f8ac13c2fccee3c7447fd45b54afe94cd261c4e218ec897 openssl-0.10.23.tar.gz +7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 opaque-debug-0.2.3.tar.gz +2dd2f5e018fa4089a79a24d8535b4a9d87c80792170083c2469f8335eb89a8a2986979296694509288f878ae27f8d3f690c4133bf0e19d12179cc896dbb9e3e0 open-1.3.2.tar.gz +2127ff5f9b8feb3b567362ea9988a125f39e524432c629481e5ab27f08e2bec20147fb14bfa2d10cecf357fef5f6d6447e8d045f157bac7c1a4e0175903e19ec openssl-0.10.24.tar.gz 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a openssl-probe-0.1.2.tar.gz -8d3a38a5f403cbd957b069c60d80f790f2030490847113b3050afbe769b4c692b581ec763656042973167dee6ca70939fe0f15cc1150db67731fb3808d98b6cf openssl-sys-0.9.47.tar.gz +814febad99cc74eb5fee60d58d685b2c956893db8f3f4994a6f5226261c8dc8ab569067959aec2aaf3fc684eaef6654f102a1f82a215e42b4a087c357693b6a4 openssl-sys-0.9.49.tar.gz 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba owning_ref-0.4.0.tar.gz d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed parking_lot-0.7.1.tar.gz -82937f87811a987652fad9c4018efa2dd214b4142c5a94c6629fc5bb0e9c49c13d9503783e3932fd0834f2a1afde6dce80aa488b2bcd32c95bf9a9d5ce139f93 parking_lot-0.8.0.tar.gz +148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331 parking_lot-0.9.0.tar.gz 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08 parking_lot_core-0.4.0.tar.gz -fd90b0a82713d329045da37ad4ab6b66d1e860f0a6ddcdf102e8740b98badfc83d6c056210618fb339271f1f68545090287528590d337d34a31bd7fdb70b0dc8 parking_lot_core-0.5.0.tar.gz +5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689 parking_lot_core-0.6.2.tar.gz +2344f2a14ea0245a4bcd1face932fd2b993349e9b81556821cf6edf1d85944455ea5bcdf521e0916a46175b5cde9a7d0f57ee48f5cf9204f98f635f7f3aaab22 parse-zoneinfo-0.2.0.tar.gz 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 percent-encoding-1.0.1.tar.gz -44573f10494b8710abbabce9ded07f2b33fb7791d607229133b8005395cb164e9a2702f621c3e8d35f9747de5bf4746dfdacde4960ec1bf8e0f0d6b0acc4f49b pest-2.1.1.tar.gz +98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a percent-encoding-2.1.0.tar.gz +c23624c33c986823d22b685e7297afb506254e2fc1b05e5a87e9b7f8c3e9c898312116fbc93517be5994eb1e3b9bbb20a479f8c72010873b790ea6cce2129a87 pest-2.1.2.tar.gz 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba pest_derive-2.1.0.tar.gz -6d8bc7f0cfa61ca0d9f07d6b1c3d84e6b1d0bcfcd4a9166f40d6c4dcced1084057b05d0255be4f61f4495efc8a29e82cadd3bb395e5d4a1224e38a98503655f7 pest_generator-2.1.0.tar.gz -48eb9ec17cdb0e957c809109ffb7f282c4924b9239392e3877f4bc4ec8485942635c5838619834f2f8b4c948aff8d9d23215b2c418c9924376621b715f7d4614 pest_meta-2.1.1.tar.gz +bf9f3912e99c5fe341d423afadde830abb0125dd0c8485c591e465b88dd047de273b1f185d417368879a3dc80965f13d6262557e8c158f357babd0587bbd5b62 pest_generator-2.1.1.tar.gz +b84b1faae2e56502e399c0d1befdf7a8aa458590ee7354ced0c785be64ebc59aad4c5b89f6715335605897ef0f03ce8675eca268c7f983ad831b8b109bd62c36 pest_meta-2.1.2.tar.gz 0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44 phf-0.7.24.tar.gz 2f01538937b89c0bb3e4f779b4347ae0d0515e6a99a6692a57898b8c97e33a02dbf918757b95800333cbbb60748593471e40260b767f8b87cb48e2a23a90d664 phf_codegen-0.7.24.tar.gz 793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7 phf_generator-0.7.24.tar.gz 5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca phf_shared-0.7.24.tar.gz -bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d pkg-config-0.3.14.tar.gz +13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572 pkg-config-0.3.16.tar.gz 667de29732a76dd6d7b9768c3e58edd8c21e62fe5dbbfe9a64a37de5488640aa42c04a8683596eee9a58b02dde1cb0f10e3edb9fc48b3d93e61dda0122357162 plist-0.4.2.tar.gz -bebe42859dcfc5a4bbdd3606c92d26d20dbd3b68a026756d1f65100759a872d119492f6d9042030911e4965d0faaa4a5341738ffb6cc87299df6100dbb5460b7 png-0.14.1.tar.gz +dd7d4ab9013196575f468a1b2598524973d031a3854c5e7954943ce21bfde4a6a9f7d373237063afc6a4a942ae36e3453f4d12dd1852aaa01e43487e87d332f8 png-0.15.0.tar.gz +281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243 ppv-lite86-0.2.5.tar.gz a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz -e86c5212acab88eb507c63dbea90002ad37206aca082d76097e09d4533b20adb000e5ddbcc1b0889ab8213a3eaae031c45044520db5875147df04ae356452640 publicsuffix-1.5.2.tar.gz -766b7e0b7a8c1b2453942d47ee13fbd41e1475593047df55319272ee9884d2ec5364a88baff69ea6b2133f23b82f9114505796ed07d6591b6365de02a9753cef pulldown-cmark-0.5.2.tar.gz +e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80 proc-macro2-1.0.4.tar.gz +6ce7c1e37190892d454f9b858041640eac6749a392264cecf6a64696dddcdb038a9b81b580991aa0727b1b015e05e0b7582baea17b82ed327eea30ca01cd555c publicsuffix-1.5.3.tar.gz +468cf46d0426fa9f2c5b9fdca60ca1c009d823fd1942e9983c9d5ab8b4dc47d455ef8342e41f19664c40c7379a0a9dad265381a6a5f7ad03b298cf37d06e71f6 pulldown-cmark-0.6.0.tar.gz f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b quick-error-1.2.2.tar.gz -5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798 quote-0.6.12.tar.gz +bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e quote-0.6.13.tar.gz +67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c rand-0.7.2.tar.gz 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 rand_chacha-0.2.1.tar.gz 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz -f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz +f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz +4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 rand_hc-0.2.0.tar.gz 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz -6727fb0c2039d196f76c1844395393c0bdf0590f443419d55f2bf5414df98338ba0269d31d8c4531f7b02e473fdcff90eb123cd426e9561858b9d0c028f3b825 rayon-1.1.0.tar.gz -7221e0e629e923aae2a2ff8e000c58ecc06fd71c00c2988a7664bd452464e210609e5f738c72bf8985ebbefb751f574de657d73189921ce9ee113594e72ccec9 rayon-core-1.5.0.tar.gz +351f7ddd2600001ef9655f290b743034402a56dcb04a25ac25afeaa549da5e399a8be72cd318d3d4a558d1a190bca7ce03386f3320e9909db48d9d1152154a52 rayon-1.2.0.tar.gz +78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c rayon-core-1.6.0.tar.gz 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz -38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz -201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz -17a06dc448c1be0910ddf5c03979fcd151d0a40acec5fedf96febe0f0fc52bda0252c40f8e7a18dcf3fa13f82f8a5b406b18f59e43713aec2adc2cae068f9120 regex-1.1.7.tar.gz -630e998b26ea7571591ff4259a5119d7762567253564b4a958cfd0f3f4de5857894e12eda469d940d8ed5572712b345e2859de282cdebf89a5108b97da71a073 regex-syntax-0.6.7.tar.gz +17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz +6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7 regex-1.3.1.tar.gz +41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a regex-automata-0.1.8.tar.gz +671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec regex-syntax-0.6.12.tar.gz d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz -bce46740921eab319dcdb6053708512a4d0e71d798d45bb3a793ac2aa69e2419762b99b528eeea82155d04af07d3c0dda76a893ee63d7533b607cc62e7c133f7 reqwest-0.9.18.tar.gz +c6683099c79ab48acd2b7abb903686f64e985bd239f3e348a7c6f80d248e3f2860d7f8eeca768244c8925794e96f6253d786e91d94b926bad2581f22f5a824e0 reqwest-0.9.20.tar.gz 5065fffb8fcc6afb2c42ee82cb09ebe879605e6ef2a6f02decf4892967730271bf4e798de02fdf37b4b55b0610f76689ef749ca85870b6656669af4cfd859473 resolv-conf-0.6.2.tar.gz 8f6ad0906f32259af6a5877b10432d6bc001a60dd094c93fa89aca544dd1e061f55c484a4ac524510f634b4a3491e170dae0619dd7fb5da11891d20fcd3ef0c7 rust-stemmers-1.1.0.tar.gz -9d10aae8df45db86fcee7fd51edc60961221cf2e3e74e826360fd01c8aa4dbf64eb1de4431309e6db89966f8f88c0933a35156835696f4693fc6f9d5c2e5fd1c rustc-demangle-0.1.15.tar.gz +36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063 rustc-demangle-0.1.16.tar.gz 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 rustc_version-0.2.3.tar.gz -15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz -c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f safemem-0.3.0.tar.gz -bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea same-file-1.0.4.tar.gz +b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0 ryu-1.0.0.tar.gz +6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda safemem-0.3.2.tar.gz +33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc same-file-1.0.5.tar.gz 6932f30eaba7eec56783e0b976fd0321666a182529b604a2f0c8b7ef00018bbba5d93ea487d674d1043681a73a8b98b808255de6bcb7474313dba671c1afadbc sass-rs-0.2.2.tar.gz -a232662f69f15b0b1352d2086dc179baebabd605e398419c9e9d3732a1cffd8d92ba9ae59330ee9c4c6aed24ea0260fe529055cd224243f244631a5b92c23d65 sass-sys-0.4.10.tar.gz -9c6f3cf370b76b8fd37cd26a5dfd686b532c30d47ef477548fa6994195dcfa053edcc2e8a395736768d5815b9f18db175be2e9d099767dd4ff4d9a8a3157675b schannel-0.1.15.tar.gz +dbee75ec407fa2065786cd572ceabafdf1b10ecfce5d21067c2834e72c45c6dfdd1f5d29f2dc1c01d14d9d2da6f433aaee1c18d088682c308cd678254cbf302e sass-sys-0.4.13.tar.gz +11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b schannel-0.1.16.tar.gz df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33 scoped_threadpool-0.1.9.tar.gz 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719 scopeguard-0.3.3.tar.gz 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37 scopeguard-1.0.0.tar.gz @@ -654,101 +655,100 @@ df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9 28c731aba35ff80dedf73978ba18f47a80ed308ad6f123467ab435f825680386f665d06f93a5703b8dd0b6893f805f5ae6875a0a7c8669a478c71c69448b2a54 security-framework-sys-0.3.1.tar.gz 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc semver-0.9.0.tar.gz 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f semver-parser-0.7.0.tar.gz -a8a33cf76a4f899205b2ede5e91859e03d038b178f685a36991c1836ab0c37f91ff50db4145e825838ac0fb4c526c9f496d00f87ac1790d101f4e83779fc5124 serde-1.0.92.tar.gz -37da456bb1392e4eacad07118dd8a6590552f455151f35bf4b350305772eddc8b232b61c36940c287df85b61ccc9867602cfc7012f7b7b645ab97cff45baeaab serde_derive-1.0.92.tar.gz -7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz +3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678 serde-1.0.101.tar.gz +08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417 serde_derive-1.0.101.tar.gz +d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842 serde_json-1.0.40.tar.gz 9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145 serde_urlencoded-0.5.5.tar.gz +e48b87717549d1b99f5759aa12b5c76507b26a6176a69f0a3c7297145b50b539344b43a827345096783256ac8053bf700505091c6d9d0e430bf01a990803d444 serde_urlencoded-0.6.1.tar.gz 7446e7564b5903e588911008f9367f9d9b0d96ae883d299ee4f10ec3d7a30abf1af1bc9c4f2172226f09071413116c12a8a67419246f7a7de95e9fdeec3aacb1 sha-1-0.8.1.tar.gz 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c sha1-0.6.0.tar.gz -441ffe909ab91d83ff567b05f10a83e25ab6ef0a2b3860c2497f78d0150a81b8cb85cf1724b88e3fe9499cabf394caf46197e4dd1984e71e95c2897b99b581f5 signal-hook-0.1.9.tar.gz -d23ca7f974777b6a2053fd04ec05eae73c54735d0370173fafdc2a39dde6cab3cef78b94cce3930a9105e70760022ffe96968a1adbd350efebf83aac707217f7 signal-hook-registry-1.0.1.tar.gz +a92898bd08d9870b3a59c92342d811b7911891862f5e4ff68b1c75ab7ad34535eac9d2b4e84e8a654421c4fc602cb2143f78d30b20a56c581d07b3dfe15efcae signal-hook-0.1.10.tar.gz +3947e3249861ef50d2261080dd47fb400fded19d5c8555c4bc65f10ededc7102c6eb26a299de961308310a9856d2a757d7a981a24e3bafa0cec72b55b515fba7 signal-hook-registry-1.1.1.tar.gz 7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0 siphasher-0.2.3.tar.gz f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661 slab-0.4.2.tar.gz -3659dbbfb5af247a88bfced29d0870aa24dc6d091f8d8c5c42827ca5d7736342cbb6a883922ad60cb5ffe52633f38229fc4f080ca8c117e5ad5950114d3caffe slotmap-0.2.1.tar.gz +039fa1edff498b8db274febbeae23e7f1f7d83794572b8009f3da494cbafbff1716deee4fcc7be71d59bc6d94e70ab9aabe262bcd1fb278773012bb1a087cca1 slotmap-0.4.0.tar.gz 2c85dabcca9400c5e2a3b409997403a6acb17357449df4ef9a7b27511c5a979bfcb1a4d80b7e7c36122233ee6d47e59507631dd6ac9e93d1610f54b9b160ee96 slug-0.1.4.tar.gz 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4 smallvec-0.6.10.tar.gz -526b2ef0a928357c1ff3ed998842afffe1d1e758ba480f922b0fe12cbb48cc811278554f99de63345e6c12b5027b738448adbfb46a78fd50555dd87e6a701e47 socket2-0.3.9.tar.gz +6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c socket2-0.3.11.tar.gz ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4 stable_deref_trait-1.1.1.tar.gz -ef6728259f8c281fcaf68a72d81135e7b357461b29d29bc87efbf5c16cf838e6aa66f30e9d57d60254d17eb5821c9d1514e488845607c5f3651892b666289c10 string-0.2.0.tar.gz +4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd string-0.2.1.tar.gz 4ee532350e951ff1423aba00c34054653e2a2e6fdda8fe86d4052407cbbcf51bf3765288e581e6dbd7031969cafc9727267b2ebaf23750eb3e866b855b567fc2 string_cache-0.7.3.tar.gz -1d0d91a6766a4985a833d5d0931b3331a37e1c97c82ccd4c85a92a8d338b3dfb6202a1a7c6c132e976a49f173d4fdbe5ff903120d20e6493d1be76af167b1026 string_cache_codegen-0.4.2.tar.gz +59a92121f4e0967da13c6a2f40cfefb0451c734af6555f014dfd885ef8b478a803253f0c36c7ec95cd78032f2f50d3614daa3828cdc85e28acb6f588472aca44 string_cache_codegen-0.4.4.tar.gz 1ccae53f80c250bcb715c3276133295f3543d0a8708fe4a990c1ac81a5c783c23d9e7e080fa7bd159397d0908f90cf1eb3453975750c121c1c36c80d3fd3cca3 string_cache_shared-0.3.0.tar.gz 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz 85eb70f7a514dbc7a69a4b002fe82c0787b907d37d3ce83e78b3f35317b0dccdf9f247f4b3cc7265e3f572d2bf9685e1f06254258f95c135e2fa26ae98715d64 strum-0.15.0.tar.gz fd0e363693bd34f0f8cd20d17a4fa12745e82b75de48d700ed5062312d202abba21d21bad434f22d4c467e9d6d3f8e4b1c5a7975aafed8418cc0c12d5f218f30 strum_macros-0.15.0.tar.gz -366963fdc56165ef699a5730e767159656ca0e893b995796a22673fd5eb5539ec84a0fa5d5223ce2acf7ddf6310e9609667cbd6f9634a2dd8c9b2591c5d28001 syn-0.15.37.tar.gz +c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7 syn-0.15.44.tar.gz +4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc syn-1.0.5.tar.gz 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458 synstructure-0.10.2.tar.gz 5b684a8f50f56b3f2a69fbde0623835a6a0ff44169ec6a558d6d0f702eb0921894061d9baf8edf9ec6802d7623f9073df365e68b4f33107bbb93807f32e4fadc syntect-3.2.0.tar.gz -88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 tempfile-3.0.8.tar.gz +a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz d94ef7c124d65317438de67e064616511df5e89081e3735982b315df0a8aab319ba16dc3b6513b1f92e0434da3d7aabdd9caf9b7ef28af9d84cf558ce662e693 tendril-0.4.1.tar.gz -f50844c06b4c2f1fd9f367cf6a3a55dfbe6ebcfab93a076e59c9f70a63b5a811160b1e587ebe07a7cb41aa88d568606db35983b0adfe1d004200c0fe8576b03a tera-1.0.0-beta.10.tar.gz +f31003a25ba0f51550bba2f1ce88720098a455c81907c4a86b519bff33e09869e03558a9746e9ed683d4b33b2a7703417bed470c0a1902cc12ed54cd2ee4bfd8 tera-1.0.0-beta.16.tar.gz d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca termcolor-1.0.5.tar.gz -1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb termion-1.5.3.tar.gz f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275 threadpool-1.7.1.tar.gz -468fa2b798fa443761ffb2924c0a5b767834687460de4faadf22da36e760dd77ce4e72d8947d220b6baf653d2fba44130c66c18868e590c6537ffe86076a7c2c tiff-0.2.2.tar.gz +1b6cc0da94d8b052448674ce3a9e72cd41de87245b1f6ac8aa900d61f3b99bcf0d455c513f7e87da14db4519368c7d725596e151a9e81134eb8366dce7254c3a tiff-0.3.1.tar.gz 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83 time-0.1.42.tar.gz -769d40887241e0b022cc2e6e0c079ba934f3f7a1de59af5c4a70dd539136a6eb4db24162545e51e8f54592830ec6a7ddea27bce6ec7eaf4b95f6a0f1b52f62fe tokio-0.1.21.tar.gz +d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1 tokio-0.1.22.tar.gz 42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81 tokio-buf-0.1.1.tar.gz 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044 tokio-codec-0.1.1.tar.gz 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6 tokio-current-thread-0.1.6.tar.gz -cdec6f468096abb09b5544dd0c792a1de09f48306b5749b960da25b4d9e694362a47efa4a1093285020fcf77e654157ba9d80ee4b8bffe6dc36b05f15f5a08b4 tokio-executor-0.1.7.tar.gz +b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334 tokio-executor-0.1.8.tar.gz 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149 tokio-io-0.1.12.tar.gz 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1 tokio-reactor-0.1.9.tar.gz 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f tokio-signal-0.2.7.tar.gz bebfe2173d544595cbc162fce2afe1574f267a08b77c8e056358cc4e959a94f1e899e47e76927e374ab1f51751079b283e0d13479a4a40c7f754cacad2578a1f tokio-sync-0.1.6.tar.gz ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336 tokio-tcp-0.1.3.tar.gz -166c0298a70fb6290d7a3d2017d160cbd585f254f465ffd50556bc4ffa09b5749e7295c3426aa5f98047338d8c4164cffdbf21debb0d8b5835d2ce7d211743db tokio-threadpool-0.1.14.tar.gz +aa36de397b8a0dc9376073bcb2e661ff5fddf2754b391b854d8683398cf56a69e79a6dbd3f6e76d9d851752757a75b79673cff36b9e1987ed4c30dd38f9d483f tokio-threadpool-0.1.15.tar.gz 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57 tokio-timer-0.2.11.tar.gz -78a77fcaf097619f11f8a22f75454da4727d139a7c7898123d01f632be57116b299fa5393160bd59b0904195c2c7a3e1e717ad25b80ae88d39f443422f1c061a tokio-trace-core-0.2.0.tar.gz -a2fd724ebe46b8fc8757558b6d267491b86ed5625ff91b212a6c77448231c72fa2b8e5c389cb27e93f2b924f48c88c154f23eb8721ecb93e7c1820c7c4dbead2 tokio-udp-0.1.3.tar.gz -15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160 toml-0.4.10.tar.gz -4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 toml-0.5.1.tar.gz +24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f tokio-udp-0.1.5.tar.gz +f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458 toml-0.5.3.tar.gz 45822fcd375f01e8e93b91c1806be6c653d202ca93a719af45661b8b5e016a802535774a2adf7ac503d889d4f9589d945c02ec651aa4cb81f443b60e7f082611 trust-dns-proto-0.7.4.tar.gz e44e36c9f51c80b858a976071f911081eca5c30fd82ed34ad5eccbf397b9782773f36340ecc3f0f8b4a19dbc7fe73cb50e9df36730deaf2e228b8728e3e00e6b trust-dns-resolver-0.11.1.tar.gz aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330 try-lock-0.2.2.tar.gz a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739 try_from-0.3.2.tar.gz -9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449 typenum-1.10.0.tar.gz -596383d8be0bae90e90ba4295d208b9e62911a2c7ffdd26ee269dfa9fa2ab270ca7189f0958bb31cc05c75621d8c6954e84c40a9235e6effdb30cb4791735212 ucd-trie-0.1.1.tar.gz -50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e ucd-util-0.1.3.tar.gz +c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a typenum-1.11.2.tar.gz +788d01f6b42bda3e18d18b5be53fcb3ca50c9c5f816b19d0fb37147f7dcdd08f5d535ef950c17ae92eca1b86ae6c3ae899a33d1bb767068dcef3820ef2c14607 ucd-trie-0.1.2.tar.gz ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d unic-char-property-0.9.0.tar.gz bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb unic-char-range-0.9.0.tar.gz 9212f99afd4c694a3a671963d63e5349f81adde6d5f50c92ec39d15e7ee24aa91eee63ba578a857c8b21380937860968a8e13cd16bb0ee0c0ccd96b3094ad155 unic-common-0.9.0.tar.gz cc2a27459dca554a78ce24fee42f0e4d0fbac37c42b4c5a1275f9e3b412cd1c813a4b4864857ddc33b549d99f10c9ce9c277b00f9fa7d93f130f5e47106d8fb3 unic-segment-0.9.0.tar.gz 04aab71f97785453dce7f561acfb2382a23d60a68735f3664577015a256191463dd6b1f90694e4440c4889eb9b6380c16c7a0ec2dfc2d49fc44a284eeca43c09 unic-ucd-segment-0.9.0.tar.gz 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b unic-ucd-version-0.9.0.tar.gz -f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac unicase-1.4.2.tar.gz -d4b7d0e217a8a9180cd01cbce4d1e2bc80a9dbeee735954968c0372c9679f4f84b73294952947890340f20f4f9158b70ec2c13adc11b1f0cb53aa893755cff22 unicase-2.4.0.tar.gz +fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd unicase-2.5.1.tar.gz 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e unicode-bidi-0.3.4.tar.gz 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547 unicode-normalization-0.1.8.tar.gz 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c unicode-segmentation-1.3.0.tar.gz -bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz +d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05 unicode-width-0.1.6.tar.gz cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz +590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 url-1.7.2.tar.gz +1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3 url-2.1.0.tar.gz 610dba6991597b117f3ec602c2c1df42da3a554bd452283f56867d53f1bdc7c0bac6e593b63ec3186016d886951397314ff7e0cf0bfae8015281a6afe77f19ec utf-8-0.7.5.tar.gz -24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8 utf8-ranges-1.0.3.tar.gz 5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265 uuid-0.7.4.tar.gz -d17c6b8b9120a98417edabf13d13a1ac8e082084c0cc0334e2ab5c366d275e8ad2ae80740a3867cdff5488de1ebd530169566f22a724f0e51432b626c3ea942a v_escape-0.7.2.tar.gz -74bae0243070408f090f56f044d97d239f1f4a236d089790ecc46c0364c2a478d94ea348640b20b10c7ad61d617c2da5acf7de0b77d41cbd5840e4db447c262a v_escape_derive-0.5.3.tar.gz -3797660070690067eff29c90a3359b35662afbdaa4019859988f7dd537cfd184586c9e2ce74994ddce7c255618062326ad8cdc6a1a9476a7f3c31c5cc581e535 v_htmlescape-0.4.3.tar.gz -55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e vcpkg-0.2.6.tar.gz +db2e64654b25ad839877649d6aaa36fa69e2ecb9dcd5510404dd9899244c00f6103135fb5c749b38c9479eba88ad868d408ee2e82343f81453efe1c29857cfc2 v_escape-0.7.4.tar.gz +0dee1a10798062093912edd9a1250f46bcea1e6fa0472895aaf637231cc616b0d9fd0822ac96f1bfa585b0283b4ab810f4eac0813f1275e66854791933843c3b v_escape_derive-0.5.5.tar.gz +a9bd1638df5b9f5e4a96ef453f9943af935f035308c3bc9cb613400054538ccc1e76c78b6bb9a135ce1128593be4fcf8630d8b6d8e185087322251750b676b80 v_htmlescape-0.4.5.tar.gz +d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b vcpkg-0.2.7.tar.gz 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362 version_check-0.1.5.tar.gz 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 void-1.0.2.tar.gz -c20ffc6485ccadcecd68aa21c356c27e11705828ceb3456b1dee4213363defc31b3f46a73cc00e0ea386d7765e333d095d34500f41707ff1a2569c45b5fd482d walkdir-2.2.8.tar.gz -65612379ffb46e5baeae46c7f6f3f3f03133ed9a99c5746bb405fd9b1bc3715739be199cf0f4ee3fa1ac5a2f624ca59fae75bfc14de19b4d5c80270c74f82a86 want-0.0.6.tar.gz +43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b walkdir-2.2.9.tar.gz +1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59 want-0.2.0.tar.gz +1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 wasi-0.7.0.tar.gz 88d82fdddb268e35497cab9a17f9cd3845b25084bc9932a3ec1fa256a4ff59307ff46e112fc26144eba6c57b4a094eb9d9687a51cda1839e03f7f06744a19b32 widestring-0.4.0.tar.gz 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe winapi-0.2.8.tar.gz -6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 winapi-build-0.1.1.tar.gz a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz -f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1 wincolor-1.0.1.tar.gz -2156d5c503b62f8c7300509bef337b2e57132071aca38a6d462cc3d2f572c91d16c8032ac72b1523d749741669fda7bb1300fd014e8fadac2a6fc66ffdc5dea5 winreg-0.6.0.tar.gz +b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10 wincolor-1.0.2.tar.gz +a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102 winreg-0.6.2.tar.gz 68afe1dce3d5daaaa6a15d023dcbf91d26b06f4319ddd76d0993d97c10fd8d9f6c2a76c87290347d50281640609aefbb9fc8f691ebd18104f566a005d84c43bc winutil-0.1.1.tar.gz -4c11c37f30cdf4b04bdcb309e7aad16768a13fe73da7c9f2e1b4b6d5591bf1dfe739aa94812bf80dce833f0ed625bba3e70b1c9fc6a0ce34fa9f342e1ac047e3 ws-0.8.1.tar.gz +c4763a8b5218c307622c9d017250098b7a1e69ed01e0b540464193811e34cf0138e2cecb2a709d59ba77dd041489f8dac85167ba981e462e21e93c34d051ef0a ws-0.9.0.tar.gz 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f ws2_32-sys-0.2.1.tar.gz 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd xml-rs-0.8.0.tar.gz 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3 yaml-rust-0.4.3.tar.gz" |