diff options
28 files changed, 422 insertions, 37 deletions
diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD index 2e1c8a628..0147c92c6 100644 --- a/system/bubblewrap/APKBUILD +++ b/system/bubblewrap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=bubblewrap -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=0 pkgdesc="Unprivileged sandboxing tool" url="https://github.com/projectatomic/bubblewrap" @@ -46,6 +46,6 @@ bashcomp() { mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/ } -sha512sums="0dc033f83547112cedc706e4ef80e39ba0ee63f3750f93454a7b1a38aeb922ee660b3491a5a5d060fce9a7c4b326798a66814ad94f53f1e666c27a557fec17a4 bubblewrap-0.3.0.tar.gz +sha512sums="fbc44976f53fdf8913b94c57d1f26a3b87c773e86a289e58fd3d7b1c4ea7f33c862f1a38a4f791315358990928768a68334f0a171302c18a16c7e2e9f1a146dd bubblewrap-0.3.1.tar.gz 400a0446670ebf80f16739f1a7a2878aadc3099424f957ba09ec3df780506c23a11368f0578c9e352d7ca6473fa713df826fad7a20c50338aa5f9fa9ac6b84a4 realpath-workaround.patch f59cda3b09dd99db9ca6d97099a15bb2523e054063d677502317ae3165ba2e32105a0ae8f877afc3827bd28d093c9d9d413270f4c87d9fe5f26f3eee670d916e musl-fixes.patch" diff --git a/system/debianutils/APKBUILD b/system/debianutils/APKBUILD index fbcdfe041..8e79a7eef 100644 --- a/system/debianutils/APKBUILD +++ b/system/debianutils/APKBUILD @@ -32,7 +32,7 @@ package() { } which() { - provides_priority="10" + provider_priority=10 mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/which "$subpkgdir"/usr/bin/ # This will emit a warning about docs on abuild, but this is expected. diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD new file mode 100644 index 000000000..d4623a130 --- /dev/null +++ b/system/perl-encode-eucjpascii/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-encode-eucjpascii +pkgver=0.03 +pkgrel=0 +pkgdesc="Perl mapping of EUC-JP to ASCII" +url="https://metacpan.org/pod/Encode::EUCJPASCII" +arch="all" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl" +source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz" +builddir="$srcdir/Encode-EUCJPASCII-$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="0d7a06e1f5eaa20451ef360ef78372cb0ecf0c9a525efed5db0b55b0fc98b47c87eff4f9be069bdd7be50156f8edfc0cb9a257e9efd5a33130cc745dca12b7d8 Encode-EUCJPASCII-0.03.tar.gz" diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD new file mode 100644 index 000000000..197a05353 --- /dev/null +++ b/system/perl-encode-hanextra/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-encode-hanextra +pkgver=0.23 +pkgrel=0 +pkgdesc="Perl support for more Chinese encodings" +url="https://metacpan.org/pod/Encode::HanExtra" +arch="all" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl" +makedepends="perl-module-install" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-$pkgver.tar.gz" +builddir="$srcdir/Encode-HanExtra-$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="218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462 Encode-HanExtra-0.23.tar.gz" diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD new file mode 100644 index 000000000..ff4b70628 --- /dev/null +++ b/system/perl-encode-iso2022/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-encode-iso2022 +pkgver=0.04 +pkgrel=0 +pkgdesc="Perl support for ISO-2022 encodings" +url="https://metacpan.org/pod/Encode::ISO2022" +arch="all" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-ISO2022-$pkgver.tar.gz" +builddir="$srcdir/Encode-ISO2022-$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="d63de568cf81b74c618ee6e5299ec012fc1937ffdcaec31a3684609fefb2797286322037fdb6358d50afbf860b868c0e04542179a670800f3f591d0b48a497f1 Encode-ISO2022-0.04.tar.gz" diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD new file mode 100644 index 000000000..bb7887f4e --- /dev/null +++ b/system/perl-encode-jisx0213/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-encode-jisx0213 +pkgver=0.04 +pkgrel=0 +pkgdesc="Perl support for JIS X 0213 encodings" +url="https://metacpan.org/pod/Encode::JISX0213" +arch="all" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl perl-encode-iso2022" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Encode-JISX0213-$pkgver.tar.gz" +builddir="$srcdir/Encode-JISX0213-$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="79a2d0639c0f9134ab7ff053b62cac950751cacb7ba91b7b6ff5c12787900c0ee7dc4037ff5819d11b1efc0bbb871926763930f6d5d40073c07a671cab44365a Encode-JISX0213-0.04.tar.gz" diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD new file mode 100644 index 000000000..7adb38810 --- /dev/null +++ b/system/perl-mime-charset/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-mime-charset +pkgver=1.012.2 +pkgrel=0 +pkgdesc="Perl database for MIME character sets" +url="https://metacpan.org/pod/MIME::Charset" +arch="noarch" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl perl-encode-eucjpascii perl-encode-jisx0213 perl-encode-hanextra + perl-pod2-base" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/MIME-Charset-$pkgver.tar.gz" +builddir="$srcdir/MIME-Charset-$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="2273bf0b86eb042e5aa8bcf958eefefde7dce6701eea5ae8c0fe9997e7d3e90d837a7791ade30f84536a15116175c796daee60da6625f409d214844dfedfde4d MIME-Charset-1.012.2.tar.gz" diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD new file mode 100644 index 000000000..9d19f9e5c --- /dev/null +++ b/system/perl-pod2-base/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-pod2-base +pkgver=0.043 +pkgrel=0 +pkgdesc="Base module for POD translations" +url="https://metacpan.org/pod/distribution/POD2-Base/lib/POD2/Base.pod" +arch="noarch" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/F/FE/FERREIRA/POD2-Base-$pkgver.tar.gz" +builddir="$srcdir/POD2-Base-$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="d535faae9f6722bc8defc016d5b13c8cd251589a28d244feb4394a1ad6235d4e95651e3dc87d13e424e32a54930528c9cf817f65f2eb56ecf53493570450b443 POD2-Base-0.043.tar.gz" diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD new file mode 100644 index 000000000..111830823 --- /dev/null +++ b/system/perl-sgmls/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-sgmls +pkgver=1.1 +pkgrel=0 +pkgdesc="Perl module for processing output from sgmls and nsgmls" +url="https://metacpan.org/pod/release/RAAB/SGMLSpm-1.1/lib/SGMLS.pm" +arch="noarch" +license="GPL-2.0-only" +depends="perl" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/R/RA/RAAB/SGMLSpm-$pkgver.tar.gz" +sha512sums="0ca3f0f3265f20661ae88ad4764fbf82f226382f79f62c01653265cc7372524dfdf30ce5abffc0344624f5e6138e483952471f8c18d59794b40035af0b7526bc SGMLSpm-1.1.tar.gz" +builddir="$srcdir/SGMLSpm-$pkgver" + +prepare() { + chmod -R ug+w "$builddir" + cd "$builddir" + default_prepare +} + +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 +} + diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD new file mode 100644 index 000000000..1f10cb7bb --- /dev/null +++ b/system/perl-unicode-linebreak/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=perl-unicode-linebreak +pkgver=2018.003 +_univer=8.0.0 # update this and unicode.org URLs if sombok is ever updated +pkgrel=0 +pkgdesc="Perl implementation of the UAX#14 Unicode line-breaking algorithm" +url="https://metacpan.org/release/Unicode-LineBreak" +arch="all" +license="Artistic-1.0-Perl AND GPL-2.0+" +depends="perl perl-mime-charset" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-$pkgver.tar.gz + ftp://unicode.org/Public/$_univer/ucd/auxiliary/GraphemeBreakTest.txt + ftp://unicode.org/Public/$_univer/ucd/auxiliary/LineBreakTest.txt" +builddir="$srcdir/Unicode-LineBreak-$pkgver" + +prepare() { + cd "$builddir" + default_prepare + cp "$srcdir"/*Test.txt "$builddir"/test-data +} + +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="37fa931978e1f88667b13ef25eb3b2414a6b055f03fec5925b3605e06026f06af332179e07f35d58f61924f43f305a5bc5ef1d76a61e1d56568abf60c9bf8fc7 Unicode-LineBreak-2018.003.tar.gz +cc5a4fa7d53c127f749d0c45582f55f391ffdcfa2f2c91c41cb0a4f71e566f1657d4653a6a251c6ae4f769420701df6e0cf184e55413c602cbc5191f9dc99201 GraphemeBreakTest.txt +d2ffb02fb4d402e6a90937743721692c008b78045e295bd77bcdfcabc99fb1fdbfb0b4679b410bce4487eba115a7ef2e6d6bb03b0a47a7220fa4308eafbac74e LineBreakTest.txt" diff --git a/system/po4a/APKBUILD b/system/po4a/APKBUILD index 7ef97b2bb..7ba0d5b11 100644 --- a/system/po4a/APKBUILD +++ b/system/po4a/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Christian Kampka <christian@kampka.net> # Maintainer: pkgname=po4a -pkgver=0.51 -pkgrel=1 -_dlid=4214 +pkgver=0.54 +pkgrel=0 pkgdesc="Tools for helping translation of documentation" -url="https://po4a.alioth.debian.org" +url="https://po4a.org" arch="noarch" -options="!check" # comments changed format, it fails +options="!check" # massive incompetence license="GPL-2.0-only" -depends="perl gettext-tiny" +depends="perl gettext-tiny perl-sgmls perl-unicode-linebreak" makedepends="docbook-xsl perl-module-build diffutils" subpackages="$pkgname-doc $pkgname-lang" -source="https://alioth.debian.org/frs/download.php/file/${_dlid}/${pkgname}-${pkgver}.tar.gz" +source="https://github.com/mquinson/po4a/releases/download/v$pkgver/po4a-$pkgver.tar.gz" build() { cd "$builddir" @@ -32,4 +31,4 @@ package() { find ${pkgdir} -name .packlist -o -name perllocal.pod -delete } -sha512sums="dd4ecf4eab59c41466b11828b7a4e5e06cfa8b8a188f808b05ef5aa163ba463ebf44485225c4bbdefcdd42b56d5956d9bc96c34dba12557f098723b7edde18b6 po4a-0.51.tar.gz" +sha512sums="5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130 po4a-0.54.tar.gz" diff --git a/user/apr/APKBUILD b/user/apr/APKBUILD index 433424068..1d7ba9d30 100644 --- a/user/apr/APKBUILD +++ b/user/apr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=apr -pkgver=1.6.3 -pkgrel=2 +pkgver=1.6.5 +pkgrel=0 pkgdesc="The Apache Portable Runtime" url="http://apr.apache.org/" arch="all" @@ -45,5 +45,5 @@ dev() { mv "$subpkgdir"/usr/lib/*.so* "$pkgdir"/usr/lib/ } -sha512sums="f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996 apr-1.6.3.tar.bz2 +sha512sums="d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc apr-1.6.5.tar.bz2 9fb931e45f30fbe68af56849dfca148c09cdf85e300af14fb259cbd43470113288680bdb21189d4cf13f5ce95f8d28666822535e017e64ace5324339ab50cbef apr-1.6.2-dont-test-dlclose.patch" diff --git a/user/eudev/APKBUILD b/user/eudev/APKBUILD index ea5cdbd8b..766d99cfa 100644 --- a/user/eudev/APKBUILD +++ b/user/eudev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=eudev -pkgver=3.2.5 -pkgrel=2 +pkgver=3.2.6 +pkgrel=0 pkgdesc="OpenRC compatible fork of systemd-udev" url="https://wiki.gentoo.org/wiki/Project:Eudev" arch="all" @@ -104,7 +104,7 @@ openrc() { default_openrc } -sha512sums="f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c eudev-3.2.5.tar.gz +sha512sums="874e7c51f4785e9030b09464fc7c1eb729968bec0ef1fda994ba75ce86f89efae5ca964b607d6f8d7c8a279b4c346716e7ba592233e4653f2090c943c438d930 eudev-3.2.6.tar.gz 683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314 default-rules.patch ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5 load-fbcon.patch 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 udev-postmount.initd diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index dd03d34e2..dc049071d 100644 --- a/user/fuse3/APKBUILD +++ b/user/fuse3/APKBUILD @@ -12,7 +12,7 @@ license="GPL-2.0-only AND LGPL-2.1-only AND BSD-2-Clause" depends="fuse-common" makedepends="linux-headers meson eudev-dev python3 py3-six py3-pluggy py3-attrs py3-py" -#checkdepends="py3-pytest debianutils-which" +#checkdepends="py3-pytest cmd:which" subpackages="$pkgname-dev $pkgname-doc $_pkgname-common:common:noarch $_pkgname-openrc:openrc:noarch" source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 22353f613..233bbcb52 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=0 pkgdesc="A TLS protocol implementation" url="http://www.gnutls.org/" @@ -72,5 +72,5 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe gnutls-3.6.3.tar.xz +sha512sums="f39ac09b48ebf230653cbf82b29ded39a1403313067135495b23f428b35783f9ef073993157d1f284678abedd19e2cf1fd01af843001b88320ca17b346b219ab gnutls-3.6.4.tar.xz abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index 60da11871..985342a51 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.44 +pkgver=3.45 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a0b9a147cadec72b80b97d92e6fac9312f134ef71a4a67121cab3646668424379c14a9189b5bdd0d892790cc99edc955090967caf6816239151d0e8a19bcfbd7 highlight-3.44.tar.bz2" +sha512sums="9650f000d85890fe6953e6b3e051cc29f8f734d76b95784e029fed19adc9bb2f3307456cf6be51bbd21da183bae2db814e1ef844d2950b97fde0e4edc46fdd92 highlight-3.45.tar.bz2" diff --git a/user/hwdata/APKBUILD b/user/hwdata/APKBUILD index e0587ee7e..a25f9b891 100644 --- a/user/hwdata/APKBUILD +++ b/user/hwdata/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=hwdata -pkgver=0.315 +pkgver=0.316 pkgrel=0 pkgdesc="Hardware identification and configuration data" url="https://github.com/vcrhonek/hwdata" @@ -43,5 +43,5 @@ pci() { replaces="pciutils"; _mv pci.ids; } pnp() { _mv pnp.ids; } oui() { _mv oui.txt; } -sha512sums="143f51f9bf1415a73051fd2c81372c7acd8b133a87285b74b6923e95cc92f26cd7e7a758d73823a0f13e7a478afb2c967be53de76e626a5514cb8d4a0808af7d hwdata-0.315.tar.gz +sha512sums="8d43b91e6c410c43d6831f793a8e5a71903072ebc72cfd3414fa70fb76efaa873474bfbdd6af015970c3e43f7ba65eaa4e0a781f87ad1170be82afc793ef6d3c hwdata-0.316.tar.gz 88a786d8feb5c8b7de587ac70f3e4307d10ac5ed9b0edfc8711de1ba51808ca33a76df518cb5a508215c309289a079a778a91c3e6fc359d644d230de8d23f049 install-T.patch" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 8fe425d4a..ad8952d8f 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.11 +pkgver=7.0.8.12 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} -pkgrel=1 +pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" url="http://www.imagemagick.org/" arch="all" @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="b6f7493095097d3c551c70acd2181fb8e252750916534602646c7c765d756b5483c1bdd08b00d59f8b0bc3963729a2b64bf8cb467e3f23e26a4d35515b6d3b18 ImageMagick-7.0.8-11.tar.xz" +sha512sums="b4b9d252e12fe60cb046e64558465eea5e635fd133053732810f0cbc7e68efb2d2b4a336b28b3e7e985e659bb07eabc4709ed437f0f20e57bcc5a9a13fa3cc31 ImageMagick-7.0.8-12.tar.xz" diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD new file mode 100644 index 000000000..14d9235fc --- /dev/null +++ b/user/keepassxc/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Max Rees <maxcrees@me.com> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=keepassxc +pkgver=2.3.4 +pkgrel=0 +pkgdesc="A community revival of the KeePassX password manager" +url="https://keepassxc.org" +arch="all" +license="(GPL-2.0-only OR GPL-3.0-only) AND MIT AND BSD-4-Clause AND ISC AND (LGPL-2.1-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND CC0-1.0 AND Public-Domain AND LGPL-2.1+ AND LGPL-3.0+" +depends="hicolor-icon-theme" +makedepends="cmake xz qt5-qtbase-dev qt5-qttools-dev libgcrypt-dev + zlib-dev libxi-dev libxtst-dev qt5-qtx11extras-dev argon2-dev" +subpackages="$pkgname-doc" +source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" + +prepare() { + cd "$builddir" + mkdir build + default_prepare +} + +build() { + cd "$builddir/build" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo .. + make +} + +check() { + cd "$builddir/build" + make test +} + +package() { + cd "$builddir/build" + make DESTDIR="$pkgdir" install +} + +sha512sums="edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8 keepassxc-2.3.4-src.tar.xz" diff --git a/user/llvm6/APKBUILD b/user/llvm6/APKBUILD index 4372ac72f..5f7b04fad 100644 --- a/user/llvm6/APKBUILD +++ b/user/llvm6/APKBUILD @@ -26,6 +26,7 @@ source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz secure-plt.patch more-secure-plt.patch even-more-secure-plt.patch + ppc32-calling-convention.patch " builddir="$srcdir/$_pkgname-$pkgver.src" @@ -250,4 +251,5 @@ caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60c e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch 35d289641fa4d200b5a3f62f1d51da600a734641356b0dc6c54a3080dd89aec3b031e36af8b53be49c35346c1cbcce00268de7ec9b4f552bfd7bf84d3504d1c4 secure-plt.patch 3d4a0a478bf800ea262c577451e22a1dbd5a4258226e49c66a697559263c8aa4fc0fff642a3c80ac3dfbb3efd6d9c0dbeb41dae1250fc7946de821cfef1ce1f0 more-secure-plt.patch -deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch" +deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch +c3f596a1578a07ce0ee40c4e2576fe05ca6ca0c1b4f94b1f74c55cb09603afe7c846db9294fe28d83ca48633086bad422218e6d06e0d92173143fb298e06fb38 ppc32-calling-convention.patch" diff --git a/user/llvm6/ppc32-calling-convention.patch b/user/llvm6/ppc32-calling-convention.patch new file mode 100644 index 000000000..2e6d66427 --- /dev/null +++ b/user/llvm6/ppc32-calling-convention.patch @@ -0,0 +1,69 @@ +Index: trunk/lib/Target/PowerPC/PPCISelLowering.cpp +=================================================================== +--- trunk/lib/Target/PowerPC/PPCISelLowering.cpp ++++ trunk/lib/Target/PowerPC/PPCISelLowering.cpp +@@ -3511,9 +3511,14 @@ + // Argument stored in memory. + assert(VA.isMemLoc()); + ++ // Get the extended size of the argument type in stack + unsigned ArgSize = VA.getLocVT().getStoreSize(); +- int FI = MFI.CreateFixedObject(ArgSize, VA.getLocMemOffset(), +- isImmutable); ++ // Get the actual size of the argument type ++ unsigned ObjSize = VA.getValVT().getStoreSize(); ++ unsigned ArgOffset = VA.getLocMemOffset(); ++ // Stack objects in PPC32 are right justified. ++ ArgOffset += ArgSize - ObjSize; ++ int FI = MFI.CreateFixedObject(ArgSize, ArgOffset, isImmutable); + + // Create load nodes to retrieve arguments from the stack. + SDValue FIN = DAG.getFrameIndex(FI, PtrVT); +@@ -5468,10 +5473,15 @@ + Arg = PtrOff; + } + +- if (VA.isRegLoc()) { +- if (Arg.getValueType() == MVT::i1) +- Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg); ++ // When useCRBits() is true, there can be i1 arguments. ++ // It is because getRegisterType(MVT::i1) => MVT::i1, ++ // and for other integer types getRegisterType() => MVT::i32. ++ // Extend i1 and ensure callee will get i32. ++ if (Arg.getValueType() == MVT::i1) ++ Arg = DAG.getNode(Flags.isSExt() ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND, ++ dl, MVT::i32, Arg); + ++ if (VA.isRegLoc()) { + seenFloatArg |= VA.getLocVT().isFloatingPoint(); + // Put argument in a physical register. + RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg)); +Index: trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll +=================================================================== +--- trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll ++++ trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll +@@ -0,0 +1,24 @@ ++; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s ++target triple = "powerpc-unknown-linux-gnu" ++ ++define void @check_callee( ++ i32, i32, i32, i32, ++ i32, i32, i32, i32, ++ i1 zeroext %s1 ++) { ++ call void @check_caller( ++ i32 9, i32 9, i32 9, i32 9, ++ i32 9, i32 9, i32 9, i32 9, ++ i1 zeroext %s1) ++ ret void ++} ++ ++; CHECK-LABEL: @check_callee ++; CHECK: lbz {{[0-9]+}}, 27(1) ++; CHECK: stw {{[0-9]+}}, 8(1) ++ ++declare void @check_caller( ++ i32, i32, i32, i32, ++ i32, i32, i32, i32, ++ i1 zeroext ++) diff --git a/user/lsof/APKBUILD b/user/lsof/APKBUILD index 32fff3e16..a7e0c4768 100644 --- a/user/lsof/APKBUILD +++ b/user/lsof/APKBUILD @@ -8,7 +8,7 @@ url="https://people.freebsd.org/~abe" arch="all" license="zlib-acknowledgement" subpackages="$pkgname-doc" -makedepends="linux-headers debianutils-which utmps-dev" +makedepends="linux-headers cmd:which utmps-dev" source="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${pkgname}_${pkgver}.tar.gz utmps.patch test-enable-suite.patch diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD index 9d92f0276..fa68d8249 100644 --- a/user/opusfile/APKBUILD +++ b/user/opusfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=opusfile -pkgver=0.10 -pkgrel=1 +pkgver=0.11 +pkgrel=0 pkgdesc="High-level API for decoding and seeking within .opus files" url="http://www.opus-codec.org/" arch="all" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="302601c31ca28bff175cefa99ac16177122a786d043be229616e2c98b7ffaf4a96b8bb17ca16e31240325a92763f417315b54d8f1b2f4f63f445cb7ad43c4a37 opusfile-0.10.tar.gz" +sha512sums="ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349 opusfile-0.11.tar.gz" diff --git a/user/shunit2/APKBUILD b/user/shunit2/APKBUILD index 8a110ff6d..baa658cf8 100644 --- a/user/shunit2/APKBUILD +++ b/user/shunit2/APKBUILD @@ -9,7 +9,7 @@ arch="noarch" license="Apache-2.0" depends="/bin/sh" makedepends="" -checkdepends="debianutils-which bash dash zsh" +checkdepends="cmd:which bash dash zsh" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/kward/shunit2/archive/v$pkgver.tar.gz dash-negative-lineno.patch" diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD index 404c077be..32fcfbd7c 100644 --- a/user/sshfs/APKBUILD +++ b/user/sshfs/APKBUILD @@ -10,7 +10,7 @@ options="!check" # Requires fuse kernel module to be loaded and local ssh serve license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1-only" depends="openssh-client" makedepends="fuse3-dev glib-dev meson coreutils py3-docutils" -#checkdepends="py3-pytest debianutils-which" +#checkdepends="py3-pytest cmd:which" subpackages="$pkgname-doc" source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz" diff --git a/user/which/APKBUILD b/user/which/APKBUILD index 42e7e3b10..cea55c32a 100644 --- a/user/which/APKBUILD +++ b/user/which/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=which pkgver=2.21 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to show the full path of commands" url="http://savannah.gnu.org/projects/which" arch="all" @@ -10,6 +10,7 @@ license="GPL-2.0+ AND LGPL-2.0+ AND GPL-3.0+" makedepends="" subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +provider_priority=1 build() { cd "$builddir" diff --git a/user/xdotool/APKBUILD b/user/xdotool/APKBUILD index 35d7984cc..3aae63783 100644 --- a/user/xdotool/APKBUILD +++ b/user/xdotool/APKBUILD @@ -12,7 +12,7 @@ license="BSD-3-Clause" depends="" depends_dev="libx11-dev libxtst-dev libxinerama-dev libxkbcommon-dev" makedepends="$depends_dev perl" -#checkdepends="xvfb ruby-minitest debianutils-which lsof xdpyinfo xterm xwininfo" +#checkdepends="xvfb ruby-minitest cmd:which lsof xdpyinfo xterm xwininfo" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/jordansissel/xdotool/releases/download/v$pkgver/xdotool-$pkgver.tar.gz" diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD index 8719fc556..f30ebb39a 100644 --- a/user/xfce4-panel-profiles/APKBUILD +++ b/user/xfce4-panel-profiles/APKBUILD @@ -9,7 +9,7 @@ arch="noarch" options="!check" # no tests license="GPL-3.0+" depends="python3" -makedepends="intltool which" +makedepends="intltool cmd:which" subpackages="$pkgname-doc $pkgname-lang" source="http://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-$pkgver.tar.bz2" sha512sums="2d7980a79250414cc4611ccf573c2a3ee5eb510cf3ef6c32035ba23197eee1fded2e158cb50714dd935070916b07b3f33db02570f3d46a598144b4a2d3979ff4 xfce4-panel-profiles-1.0.8.tar.bz2" |