diff options
Diffstat (limited to 'system')
128 files changed, 1301 insertions, 872 deletions
diff --git a/system/.rootbld-repositories b/system/.rootbld-repositories index b8c131a9a..dd670b51f 100644 --- a/system/.rootbld-repositories +++ b/system/.rootbld-repositories @@ -1,2 +1,2 @@ -https://distfiles.adelielinux.org/adelie/1.0-alpha6/system/ -https://distfiles.adelielinux.org/adelie/1.0-alpha6/user/ +https://distfiles.adelielinux.org/adelie/1.0-beta1/system/ +https://distfiles.adelielinux.org/adelie/1.0-beta1/user/ diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 72ded2739..baf4aac5c 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild pkgver=3.2.0_rc1 -pkgrel=3 +pkgrel=4 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/aports" arch="all" @@ -23,6 +23,7 @@ source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz 0001-abuild-continue-faking-POSIX-support-for-now.patch 0001-newapkbuild-fix-typo.patch 0002-newapkbuild-move-checksum-call-to-after-fetch.patch + use-pigz.patch " builddir="$srcdir/$pkgname-$pkgver+adelie" @@ -67,4 +68,5 @@ _rootbld() { sha512sums="8d9e66ec6a4e814f9be0a10b53c4b183afa97c9969d9bb86fdec0b9096756d6343cec4840fb61a5812eb4879e61c106adbdd286e63d9cfc4f8b66b6cad79557b abuild-3.2.0_rc1+adelie.tar.xz b7aa7ff9858eee2ff20eeed3b8da60d40e608b4da2676acb9c8b16ca6639283e5d70884888efd505fcd239bb462f726203e4773a4f706b16d07742b2a8631b6c 0001-abuild-continue-faking-POSIX-support-for-now.patch 4ef673998b8f28469eeb4d1448a664f7052686466a67b1a3f3cab1e249ad44308df92737da4eae3c3ffea06806f460e23fc1c0ddccd7f9e82c4e308cb63be029 0001-newapkbuild-fix-typo.patch -c6ebe8219c2e8ec9fc75da1c597b2d8d960e632286a6c7f1d1ffb6623b4d4acca54ae90a6c07637c589cbbe3ed2fb0da0c26a41df20cac0318b4894991e2dbf4 0002-newapkbuild-move-checksum-call-to-after-fetch.patch" +c6ebe8219c2e8ec9fc75da1c597b2d8d960e632286a6c7f1d1ffb6623b4d4acca54ae90a6c07637c589cbbe3ed2fb0da0c26a41df20cac0318b4894991e2dbf4 0002-newapkbuild-move-checksum-call-to-after-fetch.patch +b428baddee9b719898a6e7f87d3a990aa1000cac0b6bcf3890e7cafd0ee164164551e7c4699d12f29ea9b6364cc18722a5560b0b65b9d8f586caf739a5432313 use-pigz.patch" diff --git a/system/abuild/use-pigz.patch b/system/abuild/use-pigz.patch new file mode 100644 index 000000000..a917c8f81 --- /dev/null +++ b/system/abuild/use-pigz.patch @@ -0,0 +1,19 @@ +--- abuild-3.2.0_rc1+adelie/abuild.in.old 2018-05-20 03:17:19.884154704 +0000 ++++ abuild-3.2.0_rc1+adelie/abuild.in 2018-08-31 17:42:34.900000000 +0000 +@@ -1466,6 +1466,7 @@ + local datadir="$pkgbasedir"/$name + local subpkgname=$name + local subpkgarch=$(pkginfo_val arch $file) ++ local _mygzip=$(command -v pigz gzip | head -1) + + trace_apk_deps "$name" "$dir" "$subpkgarch" || return 1 + msg "Package size: ${size}" +@@ -1478,7 +1479,7 @@ + touch .dummy + set -- .dummy + fi +- tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz ++ tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | $_mygzip -9 >"$dir"/data.tar.gz + + msg "Create checksum..." + # append the hash for data.tar.gz diff --git a/system/acl/APKBUILD b/system/acl/APKBUILD index 3ca79ebab..9c5b0e74b 100644 --- a/system/acl/APKBUILD +++ b/system/acl/APKBUILD @@ -1,38 +1,30 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=acl -pkgver=2.2.52 -pkgrel=5 +pkgver=2.2.53 +pkgrel=0 pkgdesc="Access control list utilities" url="https://savannah.nongnu.org/projects/acl" arch="all" +# depends on order of nftw, and requires test machine to have ACLs enabled on FS +options="!check" license="LGPL-2.1+ AND GPL-2.0+" depends="" makedepends_build="gzip gettext-tiny" makedepends_host="attr-dev gettext-tiny-dev" makedepends="$makedepends_build $makedepends_host" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libacl" -# depends on order of nftw, and requires test machine to have ACLs enabled on FS -options="!check" -source="http://download.savannah.nongnu.org/releases/acl/acl-$pkgver.src.tar.gz" +source="https://download.savannah.nongnu.org/releases/acl/acl-$pkgver.tar.gz" prepare() { cd "$builddir" default_prepare - update_config_sub sed -i \ -e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \ configure # hack PATH with AC_PATH_PROG - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:$pkgname:" \ - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in } build() { cd "$builddir" - unset PLATFORM - export OPTIMIZER="${CFLAGS}" - export DEBUG=-DNDEBUG CONFIG_SHELL=/bin/sh ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -44,8 +36,7 @@ build() { package() { cd "$builddir" - make DIST_ROOT="$pkgdir" install install-lib install-dev - chown -R root:root "$pkgdir"/* + make DESTDIR="$pkgdir" install } libacl() { @@ -54,4 +45,4 @@ libacl() { mv "$pkgdir"/lib/libacl.so.* "$subpkgdir"/lib/ } -sha512sums="59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7 acl-2.2.52.src.tar.gz" +sha512sums="176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716 acl-2.2.53.tar.gz" diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 4bd4b1c26..5cebd3c92 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.8.1 -pkgrel=3 +pkgrel=6 pkgdesc="The Adélie Linux Base System" url="http://adelielinux.org/" arch="noarch" @@ -14,7 +14,7 @@ _core_depends="apk-tools adelie-keys shadow sysklogd patch sed nvi psmisc less" depends="adelie-core debianutils libarchive-tools file zsh binutils - console-setup sysklogd man-db tzdata" + console-setup sysklogd man-db tzdata gettys-openrc" makedepends="" makedepends_host="$depends" install="" @@ -66,20 +66,22 @@ doc() { DOCS="CONTRIBUTING.rst LICENSE README.rst" for _doc in $DOCS; do install -Dm644 "$srcdir"/$pkgname-$pkgver/$_doc \ - "$subpkgdir"/usr/share/doc/$pkgname/$_doc || return 1 + "$subpkgdir"/usr/share/doc/$pkgname/$_doc done } posix() { # We pull in vim for /usr/bin/ex, until apk has an alternatives system - depends="adelie-base at bc cflow ed fcron heirloom-pax m4 mailx mawk vim" + depends="adelie-base at bc cflow ed fcron heirloom-devtools + heirloom-pax mailx mawk vim" pkgdesc="$pkgdesc - Additional POSIX tools" mkdir -p "$subpkgdir" return 0 } lsb() { - depends="adelie-base gettext-tiny gzip libarchive-tools linux-pam make mawk ncurses nspr nss" + depends="adelie-base gettext-tiny gzip libarchive-tools linux-pam make + mawk ncurses nspr nss" pkgdesc="$pkgdesc - Additional LSB tools" mkdir -p "$subpkgdir" return 0 @@ -93,7 +95,7 @@ devkit() { } sha512sums="6eb6e2798e924caa911f3d070b1c955aa1abde42ac7b51224b2c4dc851a7dcfc586915ef8b3977a1cfb13a4f503003ea62acf59417daa8a2d4b6cc2e27b755ad adelie-base-0.8.1.tar.xz -50a2d4df4218594dd3288ac96d5336ad72318451a66540f4c86cdf31498fedf5e39ce3bfee423adbaca1ffcaf26aeaa82f17ed847bc25c0f193d2b5a5c121b97 group -cce002394e6febc678679ca829afd5d91d26a1d5c5d3ab59f52412c75de95008c2df7e775b7539054c132a8b65160e00c5315b4b66feb27dd714259198068fd5 passwd +37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group +1288d9d1ee77e1159bacbc94a44b2ae9c6dff94c5001be6e560cd5859f86181c47341317025d4999bc7d57cfcebb7974804514d981b7bd66ffd00c5edaf5360c passwd 5b87e0c73e7d73715467b09c9c228b14abfdc1567b3d8a3e6ef86694a9d016c798c22411c9c8ccf41920fbe185199f6d6dbd45d4bceb6652ab4a7bea87c4fe51 addgroup f50be377c781b1eefb1804ac9d96b4ebc64f80abe0d12b288413687a000e79ca30c531bbced2c63f9e4df59b1d8a71d0eda09ee82782eaafea453f2f1c2f7b8f adduser" diff --git a/system/adelie-base/group b/system/adelie-base/group index 20b392d9d..df4d3b55a 100644 --- a/system/adelie-base/group +++ b/system/adelie-base/group @@ -40,6 +40,8 @@ users:x:100:games catchlog:x:104: ntp:x:123: nofiles:x:200: +qmail:x:201: +qmaill:x:202: smmsp:x:209:smmsp locate:x:245: abuild:x:300: diff --git a/system/adelie-base/passwd b/system/adelie-base/passwd index 6ecdc2b67..48653288a 100644 --- a/system/adelie-base/passwd +++ b/system/adelie-base/passwd @@ -23,7 +23,14 @@ postgres:x:70:70:PostgreSQL Master User:/var/lib/postgresql:/bin/sh cyrus:x:85:12::/usr/cyrus:/sbin/nologin vpopmail:x:89:89:Mail Service User:/var/vpopmail:/sbin/nologin utmp:x:107:406:User tracking system:/var/empty:/sbin/nologin -catchlog:x:108:104:s6 logging system:/var/empty:/sbin/nologin +catchlog:x:108:104:s6 catch-all logger:/var/empty:/sbin/nologin +alias:x:109:200:qmail alias user:/var/qmail/alias:/sbin/nologin +qmaild:x:110:200:qmail daemon user:/var/qmail:/sbin/nologin +qmailp:x:111:200:qmail password user:/var/qmail:/sbin/nologin +qmailq:x:112:201:qmail queue user:/var/qmail:/sbin/nologin +qmailr:x:113:201:qmail remote user:/var/qmail:/sbin/nologin +qmails:x:114:201:qmail send user:/var/qmail:/sbin/nologin +qmaill:x:115:202:qmail logger user:/var/qmail:/sbin/nologin ntp:x:123:123:NTP User:/var/empty:/sbin/nologin smmsp:x:209:209:smmsp:/var/spool/mqueue:/sbin/nologin guest:x:405:100:Guest User:/dev/null:/sbin/nologin diff --git a/system/at/APKBUILD b/system/at/APKBUILD index 280156524..f876de3ca 100644 --- a/system/at/APKBUILD +++ b/system/at/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alexander Belkov <msun00@yandex.ru> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=at -pkgver=3.1.20 -pkgrel=3 +pkgver=3.1.23 +pkgrel=0 pkgdesc="Delayed job execution and batch processing daemon" url="https://packages.qa.debian.org/a/at.html" arch="all" @@ -55,7 +55,7 @@ package() { "$pkgdir"/etc/init.d/atd } -sha512sums="20a13512a86f988728f590712f5bf8a23f4dc44f4b42521a4dd4783dc1ba7ac2016ee87b4c2c14f2346a5839168a983d99c3195e947014aea3096a3db16d176f at_3.1.20.orig.tar.gz +sha512sums="ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd at_3.1.23.orig.tar.gz ec24581fd59de62a93a5914f57b811baaf00fcc8fe969a4c8d0eb0cb2fd939762871725fec406eb127763935ab95ea10e23f314144a5d08ede78ba3bcf231e4a 10-parsetime.l-1.patch 9c06a4e92f3820a85ba75be8c14cb02762f6a5d4f0182bb2faafe51f5de2e35b0ce91e7e81f6e5b3127732c36c8e23e276a103aa0419661a602df93df274f855 10-parsetime.y-1.patch ba57e93c9c90dc989e8ac299c12de13de0005b28fd934620a9a5b47af89db3c0dc63e39043ab3a50d313ed2bb4f4832b1f68db971b3f515c500a2b74ed18acbd 10-Makefile.in-1.patch diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD index 10fca7144..ac91b0e12 100644 --- a/system/attr/APKBUILD +++ b/system/attr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attr -pkgver=2.4.47 -pkgrel=9 +pkgver=2.4.48 +pkgrel=0 pkgdesc="Utilities for managing filesystem extended attributes" url="https://savannah.nongnu.org/projects/attr" arch="all" @@ -11,9 +11,7 @@ depends="" makedepends="libtool autoconf automake bash gettext-tiny gettext-tiny-dev" checkdepends="perl" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libattr" -source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.src.tar.gz - fix-decls.patch - fix-throw.patch +source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz test-runner-musl.patch test-runner-perl.patch " @@ -21,24 +19,18 @@ source="http://download.savannah.nongnu.org/releases/attr/attr-$pkgver.src.tar.g prepare() { cd "$builddir" default_prepare - update_config_sub - - sed -i -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in } build() { cd "$builddir" - OPTIMIZER="${CFLAGS}" DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/ \ + --prefix=/usr \ --exec-prefix=/ \ - --sbindir=/bin \ - --bindir=/usr/bin \ + --sbindir=/sbin \ --libdir=/lib \ - --libexecdir=/usr/lib \ --includedir=/usr/include \ --mandir=/usr/share/man \ --datadir=/usr/share @@ -47,17 +39,12 @@ build() { check() { cd "$builddir" - make tests + make check } package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - install install-lib install-dev - - # provided by man-pages - rm -r "$pkgdir"/usr/share/man/man2 \ - "$pkgdir"/usr/share/man/man5/attr.5 + make -j1 DESTDIR="$pkgdir" install } libattr() { @@ -67,8 +54,6 @@ libattr() { mv "$pkgdir"/lib/lib*.so.* "$subpkgdir"/lib/ } -sha512sums="2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 attr-2.4.47.src.tar.gz -fa7925f63c611e39b28adbf8fa3838bd91c245e4694957c1a8e212cb8f289eb62e04f50806227f6c1947d432ddf7633a471c13dd08d513d1e2b8a9ac1906cb33 fix-decls.patch -d758b864bac9bdbc3360df2e7a3bc7d04e06789975cf539b8e2b98b1d874744b55c80f0502e283f7233d6ec41f8a39624fe07b512a7fdc6af8d19dd3af5f9f5a fix-throw.patch +sha512sums="75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 attr-2.4.48.tar.gz da4b903ae0ba1c72bae60405745c1135d1c3c1cefd7525fca296f8dc7dac1e60e48eeba0ba80fddb035b24b847b00c5a9926d0d586c5d7989d0428e458d977d3 test-runner-musl.patch d10821cc73751171c6b9cc4172cf4c85be9b6e154782090a262a16fd69172a291c5d5c94587aebcf5b5d1e02c27769245d88f0aa86478193cf1a277ac7f4f18e test-runner-perl.patch" diff --git a/system/attr/fix-decls.patch b/system/attr/fix-decls.patch deleted file mode 100644 index 0de70a93d..000000000 --- a/system/attr/fix-decls.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 10 Jan 2014 13:56:37 +0000 -Subject: avoid glibc-specific DECLS defines - -This matches what we do in all the other headers. ---- -diff --git a/include/xattr.h b/include/xattr.h -index 70a84be..070d7c5 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -30,8 +30,9 @@ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - -- --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, - const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW; - extern int lremovexattr (const char *__path, const char *__name) __THROW; - extern int fremovexattr (int __filedes, const char *__name) __THROW; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ --- -cgit v0.9.0.2 diff --git a/system/attr/fix-throw.patch b/system/attr/fix-throw.patch deleted file mode 100644 index 220e3ad28..000000000 --- a/system/attr/fix-throw.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus <manu@netbsd.org> -Date: Mon, 30 Jun 2014 13:06:05 +0000 -Subject: Portability fixes - -- <features.h> is Linux specific -- Define __THROW for non glibc based systems ---- -diff --git a/include/xattr.h b/include/xattr.h -index 070d7c5..fd1f268 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -20,7 +20,18 @@ - #ifndef __XATTR_H__ - #define __XATTR_H__ - -+#if defined(linux) - #include <features.h> -+#endif -+ -+/* Portability non glibc c++ build systems */ -+#ifndef __THROW -+# if defined __cplusplus -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif - - #include <errno.h> - #ifndef ENOATTR --- -cgit v0.9.0.2 diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index f414e7542..921a1fdf3 100644 --- a/system/bison/APKBUILD +++ b/system/bison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bison -pkgver=3.0.5 +pkgver=3.1 pkgrel=0 pkgdesc="The GNU general-purpose parser generator" arch="all" @@ -38,4 +38,4 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2 bison-3.0.5.tar.xz" +sha512sums="2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152 bison-3.1.tar.xz" diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD index 2f73d6f45..2e1c8a628 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.2.0 +pkgver=0.3.0 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="746f10cd9f9852ca4679d589357402ec10c352e02f77384844a4657fd9b2952189a3299319fbefedd35358d39fd16ded63cc3db95041ed2091548183786b8b63 bubblewrap-0.2.0.tar.gz +sha512sums="0dc033f83547112cedc706e4ef80e39ba0ee63f3750f93454a7b1a38aeb922ee660b3491a5a5d060fce9a7c4b326798a66814ad94f53f1e666c27a557fec17a4 bubblewrap-0.3.0.tar.gz 400a0446670ebf80f16739f1a7a2878aadc3099424f957ba09ec3df780506c23a11368f0578c9e352d7ca6473fa713df826fad7a20c50338aa5f9fa9ac6b84a4 realpath-workaround.patch f59cda3b09dd99db9ca6d97099a15bb2523e054063d677502317ae3165ba2e32105a0ae8f877afc3827bd28d093c9d9d413270f4c87d9fe5f26f3eee670d916e musl-fixes.patch" diff --git a/system/busybox/APKBUILD b/system/busybox/APKBUILD index 83aa51665..44b3e352d 100644 --- a/system/busybox/APKBUILD +++ b/system/busybox/APKBUILD @@ -3,9 +3,9 @@ # Maintainer: pkgname=busybox pkgver=1.28.4 -pkgrel=1 +pkgrel=2 pkgdesc="Size optimized toolbox of many common UNIX utilities" -url="http://busybox.net" +url="https://busybox.net" arch="all" license="GPL-2.0-only AND GPL-2.0+" makedepends_build="openssl-dev" diff --git a/system/c-ares/APKBUILD b/system/c-ares/APKBUILD index 3effc2a1a..c2f577079 100644 --- a/system/c-ares/APKBUILD +++ b/system/c-ares/APKBUILD @@ -4,7 +4,7 @@ pkgname=c-ares pkgver=1.14.0 pkgrel=0 pkgdesc="Asynchronous DNS/name resolver library" -url="http://c-ares.haxx.se/" +url="https://c-ares.haxx.se/" arch="all" options="!checkroot" license="MIT" diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index f74bb7d76..9ea4e8c6f 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cmake -pkgver=3.11.4 +pkgver=3.12.1 pkgrel=0 pkgdesc="Cross-platform build system" -url="http://www.cmake.org" +url="https://cmake.org" arch="all" +options="!checkroot" license="CMake" makedepends="ncurses-dev curl-dev expat-dev zlib-dev bzip2-dev libarchive-dev libuv-dev xz-dev rhash-dev" -options="!checkroot" checkdepends="musl-utils file" subpackages="$pkgname-doc" @@ -18,7 +18,7 @@ case $pkgver in *.*.*) _v=v${pkgver%.*};; esac -source="http://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz" +source="https://cmake.org/files/$_v/cmake-${pkgver}.tar.gz" _parallel_opt() { local i n @@ -55,4 +55,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 cmake-3.11.4.tar.gz" +sha512sums="7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692 cmake-3.12.1.tar.gz" diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index f54e82463..840c55421 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=coreutils -pkgver=8.29 -pkgrel=2 +pkgver=8.30 +pkgrel=0 pkgdesc="Basic file, shell, and text manipulation utilities" url="http://www.gnu.org/software/coreutils/" arch="all" @@ -76,10 +76,10 @@ package() { ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot } -sha512sums="546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd coreutils-8.29.tar.xz +sha512sums="25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda coreutils-8.30.tar.xz bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b disable-csplit-io-err-test.patch 532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b disable-mbrtowc-test.patch -a6cbe77d2fd3655e59ead9ec5cfcc80ae8c1a688f779219910d9370a0e5f86195e2d3a1ca427a374d8457c5ca04ebb72f8bac0b7a7415337bac3545a85d22e3d localename-test-fix.patch" +86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf localename-test-fix.patch" [ ${CBUILD} != ${CHOST} ] && sha512sums="$sha512sums bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch diff --git a/system/coreutils/localename-test-fix.patch b/system/coreutils/localename-test-fix.patch index 9907eb67a..ff89319c7 100644 --- a/system/coreutils/localename-test-fix.patch +++ b/system/coreutils/localename-test-fix.patch @@ -1,14 +1,13 @@ +# if defined __APPLE__ && defined __MACH__ +# include <xlocale.h> +# endif +# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__ +# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__ +# include <langinfo.h> +# endif +# if !defined IN_LIBINTL --- coreutils-8.27/gnulib-tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000 +++ coreutils-8.27/gnulib-tests/localename.c 2017-07-30 16:40:47.098541270 +0000 -@@ -40,7 +40,7 @@ - # if defined __APPLE__ && defined __MACH__ - # include <xlocale.h> - # endif --# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__ -+# if (defined __linux__ && !defined __UCLIBC__) || defined __CYGWIN__ - # include <langinfo.h> - # endif - # if !defined IN_LIBINTL @@ -2692,16 +2692,19 @@ locale_t thread_locale = uselocale (NULL); if (thread_locale != LC_GLOBAL_LOCALE) diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 08e8007a5..e82cd55bf 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -6,14 +6,14 @@ pkgname=curl pkgver=7.60.0 pkgrel=0 pkgdesc="An URL retrival utility and library" -url="http://curl.haxx.se" +url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" makedepends_build="groff perl" makedepends_host="zlib-dev openssl-dev libssh2-dev" makedepends="$makedepends_build $makedepends_host" -source="http://curl.haxx.se/download/$pkgname-$pkgver.tar.bz2 +source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.bz2 " subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl" diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 228aa0616..e11528e2d 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -18,7 +18,9 @@ subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz ast-endianness.patch - config-ppc64" + config-ppc64 + futex-cmpxchg.patch + " builddir="$srcdir/linux-4.14" prepare() { @@ -80,4 +82,5 @@ src() { sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8 linux-4.14-mc9.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -fd810263d9aeeb2ec33c7872a9ccf52f474d79995d7f265f457226d62ab44456edf583e67fd4425c1e8025df0d359ebab566fbdcf8ce0a6c8c7ce36d726d3da6 config-ppc64" +fd810263d9aeeb2ec33c7872a9ccf52f474d79995d7f265f457226d62ab44456edf583e67fd4425c1e8025df0d359ebab566fbdcf8ce0a6c8c7ce36d726d3da6 config-ppc64 +64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel-power8/futex-cmpxchg.patch b/system/easy-kernel-power8/futex-cmpxchg.patch new file mode 100644 index 000000000..9e2aabfb7 --- /dev/null +++ b/system/easy-kernel-power8/futex-cmpxchg.patch @@ -0,0 +1,12 @@ +diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig +index 9f2b75f..d75d8ea 100644 +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig +@@ -190,6 +190,7 @@ config PPC + select HAVE_FTRACE_MCOUNT_RECORD + select HAVE_FUNCTION_GRAPH_TRACER + select HAVE_FUNCTION_TRACER ++ select HAVE_FUTEX_CMPXCHG if FUTEX + select HAVE_GCC_PLUGINS + select HAVE_GENERIC_GUP + select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 152e6b2b3..3bc4801be 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline pkgver=2.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A small scripting language for non-interactive scripts" url="http://skarnet.org/software/$pkgname/" arch="all" @@ -18,7 +18,7 @@ build() { ./configure \ --enable-shared \ --enable-static \ - --disable-allstatic \ + --enable-static-libc \ --libdir=/usr/lib \ --with-dynlib=/lib make diff --git a/system/expat/APKBUILD b/system/expat/APKBUILD index 8286b0db9..f57096314 100644 --- a/system/expat/APKBUILD +++ b/system/expat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=expat -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=0 pkgdesc="An XML Parser library written in C" url="https://libexpat.github.io/" @@ -12,6 +12,8 @@ subpackages="$pkgname-dev $pkgname-doc" builddir="$srcdir/$pkgname-$pkgver" # secfixes: +# 2.2.1-r0: +# - CVE-2016-9063 # 2.2.0-r1: # - CVE-2017-9233 @@ -35,4 +37,4 @@ package() { make DESTDIR="$pkgdir/" install } -sha512sums="8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637 expat-2.2.5.tar.bz2" +sha512sums="dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6 expat-2.2.6.tar.bz2" diff --git a/system/file/APKBUILD b/system/file/APKBUILD index b101f5b06..c870be1ef 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=file -pkgver=5.33 +pkgver=5.34 pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" @@ -38,4 +38,4 @@ libmagic() { mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr } -sha512sums="36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e file-5.33.tar.gz" +sha512sums="57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8 file-5.34.tar.gz" diff --git a/system/gdb/APKBUILD b/system/gdb/APKBUILD index 2bf45416d..b038ca23f 100644 --- a/system/gdb/APKBUILD +++ b/system/gdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdb -pkgver=8.1 +pkgver=8.2 pkgrel=0 pkgdesc="The GNU Debugger" url="https://www.sourceware.org/gdb/" @@ -56,7 +56,7 @@ package() { rm -rf "$pkgdir"/usr/lib } -sha512sums="ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357 gdb-8.1.tar.xz +sha512sums="11cc481bebc51eb6db73249ecb62b8c07455cf3db169f4860b3a83114849fbd2b5860a2db64488ba6c5909cf07b255c04770f1e36059eae6bee16d2a3581be90 gdb-8.2.tar.xz 986e68275f7692f39b5d8aedeb9f9e88f0e5bebb3f8c7f104933c525d35ca54fc90e18698c1e3e1009e8a188e5e70d6f252cb39e4c75e37db7bf479017e0da32 s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch diff --git a/system/gettys-openrc/APKBUILD b/system/gettys-openrc/APKBUILD new file mode 100644 index 000000000..c976cd275 --- /dev/null +++ b/system/gettys-openrc/APKBUILD @@ -0,0 +1,23 @@ +# Contributor: Laurent Bercot <ska-adelie@skarnet.org> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> +pkgname=gettys-openrc +pkgver=0.0.1.0 +pkgrel=3 +pkgdesc="Dynamic getty services" +url="http://adelielinux.org/" +arch="noarch" +options="!check" # No test suite. +license="NCSA" +depends="sysvinit execline" +source="gettys.confd gettys.initd" + +package() { + mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/etc/runlevels/sysinit + cp -f "$srcdir"/gettys.confd "$pkgdir"/etc/conf.d/gettys + cp -f "$srcdir"/gettys.initd "$pkgdir"/etc/init.d/gettys + chmod 0755 "$pkgdir"/etc/init.d/gettys + ln -sf ../../init.d/gettys "$pkgdir"/etc/runlevels/sysinit +} + +sha512sums="50039958291cd546c51ce5a30d319f5c5cf7d310fb3cd9f7ad1632fa4bc55775cdac740f76886ff5869a2cfa3f345e760672cebf7727c7ca2514358bcc17e531 gettys.confd +3b4c212bba04c2a100b2e48cbbcdf561f77cb1f4e0565b8d6304315e8edce54ec7891dafc7e82fe9d30a8fad7249e8f0e337f71c4ad8ec50cc140a4e5130648f gettys.initd" diff --git a/system/gettys-openrc/gettys.confd b/system/gettys-openrc/gettys.confd new file mode 100644 index 000000000..328690180 --- /dev/null +++ b/system/gettys-openrc/gettys.confd @@ -0,0 +1,14 @@ +# Set to the list of devices you want to spawn a getty on if the device exists + +GETTYS="tty1 tty2 tty3 tty4 tty5 tty6 hvc0" + + +# For every tty defined here, fill agetty options and baud rate if applicable + +GETTYS_hvc0_OPTIONS="-L" + +GETTYS_ttyS0_OPTIONS="-8 -h" +GETTYS_ttyS0_BAUDRATE="115200" + +GETTYS_ttyS1_OPTIONS="-8 -h" +GETTYS_ttyS1_BAUDRATE="115200" diff --git a/system/gettys-openrc/gettys.initd b/system/gettys-openrc/gettys.initd new file mode 100644 index 000000000..cf74b0e8a --- /dev/null +++ b/system/gettys-openrc/gettys.initd @@ -0,0 +1,38 @@ +#!/sbin/openrc-run + +description="Create s6 services for gettys on user-chosen terminals" + +depend() { + after dev-mount +} + +makeservice() { + set -e + tty="$1" + eval 'options="$GETTYS_'"$tty"'_OPTIONS"' + eval 'baud="$GETTYS_'"$tty"'_BAUDRATE"' + if test -z "$baud" ; then + baud=38400 + fi + mkdir -p -m 0755 "/run/early-services/getty-$tty" + { + echo '#!/bin/execlineb -P' + echo + echo "/sbin/agetty $options -- $baud $tty linux" + } > "/run/early-services/getty-$tty/run" + chmod 0755 "/run/early-services/getty-$tty/run" +} + +start() +{ + set -e + mkdir -m 0755 -p /run/early-services + . /etc/conf.d/gettys + for i in $GETTYS ; do + if test -c /dev/"$i" ; then + ebegin "Creating getty service for $i" + makeservice "$i" + eend $? + fi + done +} diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 7fdb90fff..d3b64080d 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.17.1 +pkgver=2.18.0 pkgrel=0 pkgdesc="A distributed version control system" url="https://www.git-scm.com/" @@ -60,7 +60,7 @@ build() { check() { cd "$builddir" - make prefix=/usr DESTDIR="$pkgdir" test + make prefix=/usr DESTDIR="$pkgdir" -j1 test } package() { @@ -167,8 +167,8 @@ subtree_doc() { gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 } -sha512sums="77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960 git-2.17.1.tar.xz +sha512sums="db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz 85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch -135645fa57c41c50bec6d09f7d3c92f26d30334b5f342d50942c24e0dd11106e40c36b11346c9e6cd69e98b7a9ebeec80e4e4f1506ef689f39d7ef4539727dae dont-test-other-encodings.patch +1e1cf54be8db0b7a63de2267f3cb0359070a50dcd940e5329a126f1d9f26b2596b93f2b836adc953e4d5b148bbba2eb8234dfeb2929ac3c1e3162507781141f6 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch index 98949bc1b..54a4012fe 100644 --- a/system/git/dont-test-other-encodings.patch +++ b/system/git/dont-test-other-encodings.patch @@ -191,3 +191,246 @@ We can't support Japanese people using musl cat >expected <<EOF author $UTF8_NAME summary $UTF8_MSG +--- git-2.18.0/t/t0028-working-tree-encoding.sh.old 2018-06-21 17:18:50.000000000 +0000 ++++ git-2.18.0/t/t0028-working-tree-encoding.sh 2018-09-05 17:42:14.650000000 +0000 +@@ -6,240 +6,4 @@ + + GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING + +-test_expect_success 'setup test files' ' +- git config core.eol lf && +- +- text="hallo there!\ncan you read me?" && +- echo "*.utf16 text working-tree-encoding=utf-16" >.gitattributes && +- printf "$text" >test.utf8.raw && +- printf "$text" | iconv -f UTF-8 -t UTF-16 >test.utf16.raw && +- printf "$text" | iconv -f UTF-8 -t UTF-32 >test.utf32.raw && +- +- # Line ending tests +- printf "one\ntwo\nthree\n" >lf.utf8.raw && +- printf "one\r\ntwo\r\nthree\r\n" >crlf.utf8.raw && +- +- # BOM tests +- printf "\0a\0b\0c" >nobom.utf16be.raw && +- printf "a\0b\0c\0" >nobom.utf16le.raw && +- printf "\376\777\0a\0b\0c" >bebom.utf16be.raw && +- printf "\777\376a\0b\0c\0" >lebom.utf16le.raw && +- printf "\0\0\0a\0\0\0b\0\0\0c" >nobom.utf32be.raw && +- printf "a\0\0\0b\0\0\0c\0\0\0" >nobom.utf32le.raw && +- printf "\0\0\376\777\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw && +- printf "\777\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw && +- +- # Add only UTF-16 file, we will add the UTF-32 file later +- cp test.utf16.raw test.utf16 && +- cp test.utf32.raw test.utf32 && +- git add .gitattributes test.utf16 && +- git commit -m initial +-' +- +-test_expect_success 'ensure UTF-8 is stored in Git' ' +- test_when_finished "rm -f test.utf16.git" && +- +- git cat-file -p :test.utf16 >test.utf16.git && +- test_cmp_bin test.utf8.raw test.utf16.git +-' +- +-test_expect_success 're-encode to UTF-16 on checkout' ' +- test_when_finished "rm -f test.utf16.raw" && +- +- rm test.utf16 && +- git checkout test.utf16 && +- test_cmp_bin test.utf16.raw test.utf16 +-' +- +-test_expect_success 'check $GIT_DIR/info/attributes support' ' +- test_when_finished "rm -f test.utf32.git" && +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.utf32 text working-tree-encoding=utf-32" >.git/info/attributes && +- git add test.utf32 && +- +- git cat-file -p :test.utf32 >test.utf32.git && +- test_cmp_bin test.utf8.raw test.utf32.git +-' +- +-for i in 16 32 +-do +- test_expect_success "check prohibited UTF-${i} BOM" ' +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes && +- echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes && +- +- # Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian) +- # but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32). +- # In these cases the BOM is prohibited. +- cp bebom.utf${i}be.raw bebom.utf${i}be && +- test_must_fail git add bebom.utf${i}be 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out && +- +- cp lebom.utf${i}le.raw lebom.utf${i}be && +- test_must_fail git add lebom.utf${i}be 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out && +- +- cp bebom.utf${i}be.raw bebom.utf${i}le && +- test_must_fail git add bebom.utf${i}le 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out && +- +- cp lebom.utf${i}le.raw lebom.utf${i}le && +- test_must_fail git add lebom.utf${i}le 2>err.out && +- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out && +- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out +- ' +- +- test_expect_success "check required UTF-${i} BOM" ' +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes && +- +- cp nobom.utf${i}be.raw nobom.utf${i} && +- test_must_fail git add nobom.utf${i} 2>err.out && +- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && +- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out && +- +- cp nobom.utf${i}le.raw nobom.utf${i} && +- test_must_fail git add nobom.utf${i} 2>err.out && +- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && +- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out +- ' +- +- test_expect_success "eol conversion for UTF-${i} encoded files on checkout" ' +- test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" && +- test_when_finished "git reset --hard HEAD^" && +- +- cat lf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >lf.utf${i}.raw && +- cat crlf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >crlf.utf${i}.raw && +- cp crlf.utf${i}.raw eol.utf${i} && +- +- cat >expectIndexLF <<-EOF && +- i/lf w/-text attr/text eol.utf${i} +- EOF +- +- git add eol.utf${i} && +- git commit -m eol && +- +- # UTF-${i} with CRLF (Windows line endings) +- rm eol.utf${i} && +- git -c core.eol=crlf checkout eol.utf${i} && +- test_cmp_bin crlf.utf${i}.raw eol.utf${i} && +- +- # Although the file has CRLF in the working tree, +- # ensure LF in the index +- git ls-files --eol eol.utf${i} >actual && +- test_cmp expectIndexLF actual && +- +- # UTF-${i} with LF (Unix line endings) +- rm eol.utf${i} && +- git -c core.eol=lf checkout eol.utf${i} && +- test_cmp_bin lf.utf${i}.raw eol.utf${i} && +- +- # The file LF in the working tree, ensure LF in the index +- git ls-files --eol eol.utf${i} >actual && +- test_cmp expectIndexLF actual +- ' +-done +- +-test_expect_success 'check unsupported encodings' ' +- test_when_finished "git reset --hard HEAD" && +- +- echo "*.set text working-tree-encoding" >.gitattributes && +- printf "set" >t.set && +- test_must_fail git add t.set 2>err.out && +- test_i18ngrep "true/false are no valid working-tree-encodings" err.out && +- +- echo "*.unset text -working-tree-encoding" >.gitattributes && +- printf "unset" >t.unset && +- git add t.unset && +- +- echo "*.empty text working-tree-encoding=" >.gitattributes && +- printf "empty" >t.empty && +- git add t.empty && +- +- echo "*.garbage text working-tree-encoding=garbage" >.gitattributes && +- printf "garbage" >t.garbage && +- test_must_fail git add t.garbage 2>err.out && +- test_i18ngrep "failed to encode" err.out +-' +- +-test_expect_success 'error if encoding round trip is not the same during refresh' ' +- BEFORE_STATE=$(git rev-parse HEAD) && +- test_when_finished "git reset --hard $BEFORE_STATE" && +- +- # Add and commit a UTF-16 file but skip the "working-tree-encoding" +- # filter. Consequently, the in-repo representation is UTF-16 and not +- # UTF-8. This simulates a Git version that has no working tree encoding +- # support. +- echo "*.utf16le text working-tree-encoding=utf-16le" >.gitattributes && +- echo "hallo" >nonsense.utf16le && +- TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) && +- git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le && +- COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) && +- git update-ref refs/heads/master $COMMIT && +- +- test_must_fail git checkout HEAD^ 2>err.out && +- test_i18ngrep "error: .* overwritten by checkout:" err.out +-' +- +-test_expect_success 'error if encoding garbage is already in Git' ' +- BEFORE_STATE=$(git rev-parse HEAD) && +- test_when_finished "git reset --hard $BEFORE_STATE" && +- +- # Skip the UTF-16 filter for the added file +- # This simulates a Git version that has no checkoutEncoding support +- cp nobom.utf16be.raw nonsense.utf16 && +- TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) && +- git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 && +- COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) && +- git update-ref refs/heads/master $COMMIT && +- +- git diff 2>err.out && +- test_i18ngrep "error: BOM is required" err.out +-' +- +-test_expect_success 'check roundtrip encoding' ' +- test_when_finished "rm -f roundtrip.shift roundtrip.utf16" && +- test_when_finished "git reset --hard HEAD" && +- +- text="hallo there!\nroundtrip test here!" && +- printf "$text" | iconv -f UTF-8 -t SHIFT-JIS >roundtrip.shift && +- printf "$text" | iconv -f UTF-8 -t UTF-16 >roundtrip.utf16 && +- echo "*.shift text working-tree-encoding=SHIFT-JIS" >>.gitattributes && +- +- # SHIFT-JIS encoded files are round-trip checked by default... +- GIT_TRACE=1 git add .gitattributes roundtrip.shift 2>&1 | +- grep "Checking roundtrip encoding for SHIFT-JIS" && +- git reset && +- +- # ... unless we overwrite the Git config! +- ! GIT_TRACE=1 git -c core.checkRoundtripEncoding=garbage \ +- add .gitattributes roundtrip.shift 2>&1 | +- grep "Checking roundtrip encoding for SHIFT-JIS" && +- git reset && +- +- # UTF-16 encoded files should not be round-trip checked by default... +- ! GIT_TRACE=1 git add roundtrip.utf16 2>&1 | +- grep "Checking roundtrip encoding for UTF-16" && +- git reset && +- +- # ... unless we tell Git to check it! +- GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-16, UTF-32" \ +- add roundtrip.utf16 2>&1 | +- grep "Checking roundtrip encoding for utf-16" && +- git reset && +- +- # ... unless we tell Git to check it! +- # (here we also check that the casing of the encoding is irrelevant) +- GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-32, utf-16" \ +- add roundtrip.utf16 2>&1 | +- grep "Checking roundtrip encoding for utf-16" && +- git reset +-' +- + test_done diff --git a/system/heirloom-devtools/APKBUILD b/system/heirloom-devtools/APKBUILD new file mode 100644 index 000000000..974afd1e0 --- /dev/null +++ b/system/heirloom-devtools/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=heirloom-devtools +pkgver=070527 +pkgrel=1 +pkgdesc="Development tools compatible with UNIX" +url="http://heirloom.sourceforge.net/devtools.html" +arch="all" +options="!check" # No test suite. +license="CDDL-1.0" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://superb-sea2.dl.sourceforge.net/project/heirloom/heirloom-devtools/$pkgver/heirloom-devtools-$pkgver.tar.bz2 + configure.patch + deauto.patch + lex-compiler.patch + make-no-rpc.patch + $pkgname-$pkgver-solaris.patch + $pkgname-$pkgver-64-bit.patch" + +build() { + cd "$builddir" + make -j1 CXXFLAGS="${CXXFLAGS} -DMAXNETNAMELEN=255" +} + +package() { + cd "$builddir" + make ROOT="$pkgdir" install +} + +sha512sums="1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055 heirloom-devtools-070527.tar.bz2 +d89c5b7490d11e6cab7491f7221f5b9f096b014dc3e9c642c6cc86660a6511303cc0c67df09cabfc820b34122cbed7fb672b7f8c59193d391cd87a40222aab64 configure.patch +ebe4ae6af3b49290bdb50b396ff23973b3d6ba1429953563fe2b0e43312c1cca85dd754a140aa65bb2163a8307fd68a9dce3e3c4d1fa08d2d908e49df952f730 deauto.patch +ac29808a3bd5439fe4d8e8765bddc4944951ac53c91cb24f60c117fe2441a234bd0d8c1dcc59ed996d9c220789cb03eade03ab858c07d673797fac295eb80b5a lex-compiler.patch +b3c5d271f2edd5a8f331bfaf88b2f75a639cc79005c489d04fed90b2b6dfb1286dcc3084f0c7729519da06f0d0318c91f5e30c08f849c8c548b0b622221f4aba make-no-rpc.patch +335fdabef9b9a8b93ffa6eab2b66d2db11af29b24989c4b64ea64695cfadd4471c31a865c2fcb823c1f4c11eebc1babb53ab83c9c2bdf83c05f497faf16e3f1c heirloom-devtools-070527-solaris.patch +5523e670c9c9d57f0415e30d1aab4dfcd7d8ad74e2535136afbbe4c6e407c713e7801cbcbf7ddbe798ab2790fc196a2fdbf9d5295fa8c475c73360f5e3a27066 heirloom-devtools-070527-64-bit.patch" diff --git a/system/heirloom-devtools/configure.patch b/system/heirloom-devtools/configure.patch new file mode 100644 index 000000000..6d4652175 --- /dev/null +++ b/system/heirloom-devtools/configure.patch @@ -0,0 +1,54 @@ +--- heirloom-devtools-070527/mk.config.old 2007-05-27 11:56:51.000000000 -0500 ++++ heirloom-devtools-070527/mk.config 2017-11-24 21:27:26.961471332 -0600 +@@ -17,12 +17,12 @@ + # + # A BSD-compatible install command. + # +-INSTALL=/usr/ucb/install ++INSTALL=/usr/bin/install + + # + # Prefix. + # + PREFIX=/usr/ccs + + # + # Where to place binaries. +@@ -32,7 +32,7 @@ + # + # Where to place additional binaries that aim at POSIX conformance. + # +-SUSBIN=/usr/5bin/posix ++SUSBIN=/usr/5bin + + # + # Where to place libraries. +@@ -47,7 +47,7 @@ + # + # Binaries are stripped with this command after installation. + # +-STRIP=strip ++STRIP=true + + # + # C++ compiler. +@@ -57,8 +57,8 @@ + # + # Compiler flags. + # +-CFLAGS=-O +-CXXFLAGS=-O ++CFLAGS ?= -O ++CXXFLAGS ?= -O + + # + # C preprocessor flags. +@@ -76,7 +76,7 @@ + # + # Linker flags. + # +-LDFLAGS= ++LDFLAGS ?= + + # + # Additional libraries to link with. diff --git a/system/heirloom-devtools/deauto.patch b/system/heirloom-devtools/deauto.patch new file mode 100644 index 000000000..76e98f2d4 --- /dev/null +++ b/system/heirloom-devtools/deauto.patch @@ -0,0 +1,19 @@ +--- heirloom-devtools-070527/make/bsd/bsd.cc.old 2007-01-21 20:11:25.000000000 -0600 ++++ heirloom-devtools-070527/make/bsd/bsd.cc 2017-12-12 04:18:01.749422384 -0600 +@@ -50,13 +50,13 @@ + extern SIG_PF + bsdsignal (int Signal, SIG_PF Handler) + { +- auto SIG_PF previous_handler; ++ SIG_PF previous_handler; + #ifdef SUN5_0 + #ifdef sun + previous_handler = sigset (Signal, Handler); + #else +- auto struct sigaction new_action; +- auto struct sigaction old_action; ++ struct sigaction new_action; ++ struct sigaction old_action; + + new_action.sa_flags = SA_SIGINFO; + new_action.sa_handler = (void (*) ()) Handler; diff --git a/system/heirloom-devtools/heirloom-devtools-070527-64-bit.patch b/system/heirloom-devtools/heirloom-devtools-070527-64-bit.patch new file mode 100644 index 000000000..d6c3cd7a5 --- /dev/null +++ b/system/heirloom-devtools/heirloom-devtools-070527-64-bit.patch @@ -0,0 +1,39 @@ +--- a/make/vroot/lock.cc 2007/01/18 15:06:32 1.1 ++++ b/make/vroot/lock.cc 2007/10/01 11:44:26 1.2 +@@ -31,7 +31,7 @@ + /* + * Portions Copyright (c) 2007 Gunnar Ritter, Freiburg i. Br., Germany + * +- * Sccsid @(#)lock.cc 1.4 (gritter) 01/13/07 ++ * Sccsid @(#)lock.cc 1.5 (gritter) 10/1/07 + */ + + #include <avo/intl.h> /* for NOCATGETS */ +@@ -53,7 +53,7 @@ + extern int sys_nerr; + #endif + +-static void file_lock_error(char *msg, char *file, char *str, int arg1, int arg2); ++static void file_lock_error(char *msg, char *file, char *str, const char *arg1, const char *arg2); + + #define BLOCK_INTERUPTS sigfillset(&newset) ; \ + sigprocmask(SIG_SETMASK, &newset, &oldset) +@@ -123,7 +123,7 @@ + + if (errno != EEXIST) { + file_lock_error(msg, name, NOCATGETS("symlink(%s, %s)"), +- (int) name, (int) lockname); ++ name, lockname); + fprintf(stderr, "%s", msg); + return errno; + } +@@ -171,7 +171,8 @@ + * Format a message telling why the lock could not be created. + */ + static void +-file_lock_error(char *msg, char *file, char *str, int arg1, int arg2) ++file_lock_error(char *msg, char *file, char *str, ++ const char *arg1, const char *arg2) + { + int len; + diff --git a/system/heirloom-devtools/heirloom-devtools-070527-solaris.patch b/system/heirloom-devtools/heirloom-devtools-070527-solaris.patch new file mode 100644 index 000000000..c6b394208 --- /dev/null +++ b/system/heirloom-devtools/heirloom-devtools-070527-solaris.patch @@ -0,0 +1,230 @@ +diff --git a/make/include/mksh/defs.h b/make/include/mksh/defs.h +index 1992205..8065a77 100644 +--- a/make/include/mksh/defs.h ++++ b/make/include/mksh/defs.h +@@ -63,7 +63,6 @@ + #include <widec.h> + #endif + +-#ifndef __sun + /* + * Definition of wchar functions. + */ +@@ -90,7 +89,6 @@ + # define wscmp(x,y) wcscmp(x,y) + # undef wsncmp + # define wsncmp(x,y,z) wcsncmp(x,y,z) +-#endif + + #if defined (__FreeBSD__) || defined (__APPLE__) || defined (__hpux) + extern "C" { wchar_t *wcsdup(const wchar_t *s); } +diff --git a/make/makestate/lock.c b/make/makestate/lock.c +index cdf7562..aa6083e 100644 +--- a/make/makestate/lock.c ++++ b/make/makestate/lock.c +@@ -42,18 +42,6 @@ + #include <sys/errno.h> + #include <errno.h> /* errno */ + +-#if defined(_LP64) +-/* +- * The symbols _sys_errlist and _sys_nerr are not visible in the +- * LP64 libc. Use strerror(3C) instead. +- */ +-#else /* #_LP64 */ +-#if defined (__sun) || defined (__hpux) +-extern char * sys_errlist[]; +-extern int sys_nerr; +-#endif +-#endif /* #_LP64 */ +- + static void file_lock_error(char *, char *, const char *, char *, char *); + + /* +@@ -167,16 +155,7 @@ file_lock_error(char * msg, char * file, const char * str, char * arg1, + len = strlen(msg); + sprintf(&msg[len], str, arg1, arg2); + strcat(msg, " failed - "); +-#if defined(_LP64) + /* Needs to be changed to use strerror(3C) instead. */ + len = strlen(msg); + sprintf(&msg[len], "errno %d", errno); +-#else /* #_LP64 */ +- if (errno < sys_nerr) { +- strcat(msg, sys_errlist[errno]); +- } else { +- len = strlen(msg); +- sprintf(&msg[len], "errno %d", errno); +- } +-#endif /* #_LP64 */ + } +diff --git a/make/mksh/macro.cc b/make/mksh/macro.cc +index 6ddb624..23b0315 100644 +--- a/make/mksh/macro.cc ++++ b/make/mksh/macro.cc +@@ -43,6 +43,7 @@ + /* + * Included files + */ ++#include <alloca.h> + #include <wordexp.h> + #include <mksh/dosys.h> /* sh_command2string() */ + #include <mksh/i18n.h> /* get_char_semantics_value() */ +@@ -1403,13 +1404,6 @@ found_it:; + new_value = ALLOC_WC(length); + new_value_allocated = true; + WCSTOMBS(mbs_buffer, old_vr); +-#ifdef __sun +- wsprintf(new_value, +- NOCATGETS("/usr/arch/%s/%s:%s"), +- ha->string_mb + 1, +- ta->string_mb + 1, +- mbs_buffer); +-#else + char * mbs_new_value = (char *)getmem(length); + sprintf(mbs_new_value, + NOCATGETS("/usr/arch/%s/%s:%s"), +@@ -1418,7 +1412,6 @@ found_it:; + mbs_buffer); + MBSTOWCS(new_value, mbs_new_value); + retmem_mb(mbs_new_value); +-#endif + } + if (new_value[0] != 0) { + setvar_daemon(virtual_root, +diff --git a/make/mksh/misc.cc b/make/mksh/misc.cc +index 11122cf..d617591 100644 +--- a/make/mksh/misc.cc ++++ b/make/mksh/misc.cc +@@ -382,30 +382,7 @@ setup_char_semantics(void) + char * + errmsg(int errnum) + { +-#ifndef __sun + return strerror(errnum); +-#else // __sun +- +- extern int sys_nerr; +-#ifdef SUN4_x +- extern char *sys_errlist[]; +-#endif +- char *errbuf; +- +- if ((errnum < 0) || (errnum > sys_nerr)) { +- errbuf = getmem(6+1+11+1); +- sprintf(errbuf, "Error %d", errnum); +- return errbuf; +- } else { +-#ifdef SUN4_x +- return(sys_errlist[errnum]); +-#endif +-#ifdef SUN5_0 +- return strerror(errnum); +-#endif +- +- } +-#endif // !__sun + } + + extern const char *progname; +diff --git a/make/src/implicit.cc b/make/src/implicit.cc +index 2d388cc..a1cee7e 100644 +--- a/make/src/implicit.cc ++++ b/make/src/implicit.cc +@@ -43,10 +43,13 @@ + /* + * Included files + */ ++#include <cstdio> + #include <mk/defs.h> + #include <mksh/macro.h> /* expand_value() */ + #include <mksh/misc.h> /* retmem() */ + ++using std::printf; ++ + /* + * Defined macros + */ +@@ -97,8 +100,6 @@ extern void add_target_to_chain(Name target, Chain * query); + * recursion_level Used for tracing + */ + +-extern int printf (const char *, ...); +- + static Boolean actual_doname = false; + + /* /tolik/ +diff --git a/make/src/nse_printdep.cc b/make/src/nse_printdep.cc +index 6201a18..38826d2 100644 +--- a/make/src/nse_printdep.cc ++++ b/make/src/nse_printdep.cc +@@ -37,9 +37,12 @@ + /* + * Included files + */ ++#include <cstdio> + #include <mk/defs.h> + #include <mksh/misc.h> /* get_prop() */ + ++using std::printf; ++ + /* + * File table of contents + */ +@@ -59,7 +62,6 @@ static void print_rule(register Name target); + static void print_rec_info(Name target); + static Boolean is_out_of_date(Property line); + extern void depvar_print_results (void); +-extern int printf (const char *, ...); + extern int _flsbuf (unsigned int, FILE *); + + /* +diff --git a/make/vroot/lock.cc b/make/vroot/lock.cc +index 1d6239b..1a20bc0 100644 +--- a/make/vroot/lock.cc ++++ b/make/vroot/lock.cc +@@ -48,11 +48,6 @@ + #include <signal.h> + #include <errno.h> /* errno */ + +-#if defined(sun) || defined(HP_UX) +-extern char *sys_errlist[]; +-extern int sys_nerr; +-#endif +- + static void file_lock_error(char *msg, char *file, char *str, int arg1, int arg2); + + #define BLOCK_INTERUPTS sigfillset(&newset) ; \ +@@ -179,20 +174,6 @@ file_lock_error(char *msg, char *file, char *str, int arg1, int arg2) + len = strlen(msg); + sprintf(&msg[len], str, arg1, arg2); + strcat(msg, " failed - "); +-#ifdef __sun +- if (errno < sys_nerr) { +-#ifdef SUN4_x +- strcat(msg, sys_errlist[errno]); +-#endif +-#ifdef SUN5_0 +- strcat(msg, strerror(errno)); +-#endif +- } else { +- len = strlen(msg); +- sprintf(&msg[len], NOCATGETS("errno %d"), errno); +- } +-#else + strcat(msg, strerror(errno)); +-#endif + } + +diff --git a/sccs/src/vc.c b/sccs/src/vc.c +index d7f7187..1c0ffb1 100644 +--- a/sccs/src/vc.c ++++ b/sccs/src/vc.c +@@ -37,6 +37,7 @@ + */ + /* from OpenSolaris "sccs:cmd/vc.c" */ + # include <defines.h> ++# include <limits.h> + # include <locale.h> + + diff --git a/system/heirloom-devtools/lex-compiler.patch b/system/heirloom-devtools/lex-compiler.patch new file mode 100644 index 000000000..e0d6e9967 --- /dev/null +++ b/system/heirloom-devtools/lex-compiler.patch @@ -0,0 +1,11 @@ +--- heirloom-devtools-070527/lex/sub1.c.old 2005-11-26 12:50:23.000000000 -0600 ++++ heirloom-devtools-070527/lex/sub1.c 2017-12-12 04:13:27.493347227 -0600 +@@ -162,7 +162,8 @@ + } + ++#undef index + int + index(int a, CHR *s) + { + int k; + for (k = 0; s[k]; k++) diff --git a/system/heirloom-devtools/make-no-rpc.patch b/system/heirloom-devtools/make-no-rpc.patch new file mode 100644 index 000000000..d80dd05dc --- /dev/null +++ b/system/heirloom-devtools/make-no-rpc.patch @@ -0,0 +1,12 @@ +--- heirloom-devtools-070527/make/src/pmake.cc.old 2007-01-18 09:34:13.000000000 -0600 ++++ heirloom-devtools-070527/make/src/pmake.cc 2017-12-12 04:21:31.058974256 -0600 +@@ -46,7 +46,9 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/utsname.h> ++#ifdef _sun + #include <rpc/rpc.h> /* host2netname(), netname2host() */ ++#endif + #include <unistd.h> /* getdomainname() */ + + /* diff --git a/system/heirloom-pax/APKBUILD b/system/heirloom-pax/APKBUILD index 3ccb03460..af918e06f 100644 --- a/system/heirloom-pax/APKBUILD +++ b/system/heirloom-pax/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=heirloom-pax pkgver=1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Portable Archive eXchange, the POSIX archival tool" url="http://heirloom.sourceforge.net/" arch="all" options="!check" # No test suite. license="Zlib" -depends="!libarchive<3.3.2-r3" -replaces="pax" +depends="" makedepends="bsd-compat-headers bzip2-dev zlib-dev" +replaces="pax" subpackages="$pkgname-doc" source="https://distfiles.adelielinux.org/source/${pkgname}-$pkgver.tar.xz" @@ -26,7 +26,9 @@ package() { mkdir -p "$pkgdir"/usr/5bin mkdir -p "$pkgdir"/usr/share/man/man1 make install ROOT="$pkgdir" - rm -r "$pkgdir"/usr/5bin # we don't need 1992 spec pax + rm "$pkgdir"/usr/5bin/pax # we don't need 1992 spec pax + # don't conflict with BSD cpio, which is needed for dracut + mv "$pkgdir"/usr/bin/cpio "$pkgdir"/usr/5bin/cpio } sha512sums="7b0ad20cc51b5bcec9c07e84c603e4891f636944f6f6bd13d3decb0e9d6b23d6164b663468ee2293b37721aae20334774f4e56fd8541ffceee934050e819b642 heirloom-pax-1.0.tar.xz" diff --git a/system/kmod/APKBUILD b/system/kmod/APKBUILD index b0aab15a3..2499dcdd6 100644 --- a/system/kmod/APKBUILD +++ b/system/kmod/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmod -pkgver=24 -pkgrel=1 +pkgver=25 +pkgrel=0 pkgdesc="Linux kernel module management utilities" url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary" arch="all" @@ -61,6 +61,6 @@ bashcomp() { } -sha512sums="58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779 kmod-24.tar.xz +sha512sums="d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252 kmod-25.tar.xz f2ea3527bfba182c5e15557c224a5bba8c7e2ea3d21cf604e6eb2277226dcf983c3aeb9ac44a322c7f2b4942b35135da999d63a5b946b829d3f3b09c050a0f17 strndupa.patch 7f0f89fe98167f71b7924f341ba701d001158225463c2f5e39f706a0224b1e952ee901b441f28cb15787563e83bb6e54eb752bf8669ae7c0ffbb11984542f354 kmod-static-nodes.initd" diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index e1bb7ee04..c3f3ceef6 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libarchive -pkgver=3.3.2 -pkgrel=4 +pkgver=3.3.3 +pkgrel=0 pkgdesc="Library for creating and reading streaming archives" url="http://libarchive.org/" arch="all" +options="!check" # needs EUC-JP and KOI8R support in iconv license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain" makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev attr-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://www.libarchive.org/downloads/$pkgname-$pkgver.tar.gz - seek-error.patch - CVE-2017-14166.patch" -options="!check" # needs EUC-JP and KOI8R support in iconv + seek-error.patch" builddir="$srcdir/$pkgname-$pkgver" # secfixes: @@ -54,8 +53,8 @@ tools() { mkdir -p "$subpkgdir"/usr/ mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ ln -s bsdtar "$subpkgdir"/usr/bin/tar + ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 libarchive-3.3.2.tar.gz -ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch -7cc9dbafd970c07fb4421b7a72a075cc0a000db77df4432222539c58625c93c45f01a144838b551980bc0c6dc5b4c3ab852eb1433006c3174581ba0897010dbe CVE-2017-14166.patch" +sha512sums="9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 libarchive-3.3.3.tar.gz +ff2567f243ba7e9ce20bc4f7fa422a922c5c23049004efdd8f71f29f93ab9be9aadd4c100e8c6dca318442d583fbad9bd6466017a23f83af18b9808c718b9fce seek-error.patch" diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD index 899ee01ab..bd5362f82 100644 --- a/system/libedit/APKBUILD +++ b/system/libedit/APKBUILD @@ -1,7 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libedit -pkgver=3.1_p20180525 +pkgver=20180525.3.1 +_realver=${pkgver/.3.1/-3.1} pkgrel=0 pkgdesc="Library providing line editing, history, and tokenisation functions" url="http://thrysoee.dk/editline/" @@ -10,12 +11,11 @@ license="BSD-2-Clause" depends="" depends_dev="ncurses-dev" # XXX is this always unconditionally needed? makedepends="$depends_dev autoconf automake" -install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://thrysoee.dk/editline/libedit-20180525-3.1.tar.gz +source="http://thrysoee.dk/editline/libedit-$_realver.tar.gz tinfo.patch " -builddir="$srcdir/$pkgname-20180525-3.1" +builddir="$srcdir/$pkgname-$_realver" prepare() { cd "$builddir" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index 4f8222cb9..803410a29 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,22 +1,19 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.31 +pkgver=1.32 pkgrel=0 pkgdesc="GnuPG runtime library" -url="http://www.gnupg.org" +url="https://www.gnupg.org" arch="all" license="LGPL-2.1+" depends="" -depends_dev="" makedepends="" -install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-lisp:lisp:noarch" source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 " -builddir="$srcdir"/$pkgname-$pkgver -build () { +build() { cd "$builddir" ./configure \ --build=$CBUILD \ @@ -43,4 +40,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="23983470be51035b2bc0cdbfa20f0915aec92c53c964c645eac51ba4e992b8436bd3a21f0b48d77d7c4ef178d2aacaf57ab33c7fad24b4f96f4ffb1d7116e67f libgpg-error-1.31.tar.bz2" +sha512sums="0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20 libgpg-error-1.32.tar.bz2" diff --git a/system/libuv/APKBUILD b/system/libuv/APKBUILD index 3ccba6e53..30dfc1ed6 100644 --- a/system/libuv/APKBUILD +++ b/system/libuv/APKBUILD @@ -2,7 +2,7 @@ # Conttributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuv -pkgver=1.19.1 +pkgver=1.23.0 pkgrel=0 pkgdesc="Cross-platform asychronous I/O" url="http://libuv.org" @@ -11,6 +11,7 @@ license="MIT AND BSD-2-Clause AND BSD-3-Clause AND ISC" makedepends="automake autoconf libtool linux-headers" subpackages="$pkgname-dev" source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz + disable-process-priority.patch disable-setuid-test.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -46,5 +47,6 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="516b17afe5ea12f5c53abe68ea5fac9853f20c89fff754c054c041bb9d88a55e5a691842e509348617444f6080311c963707dd272c91c7ff7baf2c4d516b2d7f libuv-v1.19.1.tar.gz +sha512sums="1fe36cf285bdcfee485633e095e731999485ea156f07769c0ff277df5e4e1314c434021b4b697cef8e7e7e4299b24b7ee837f3f6348b27b300feb6e6c2781e4d libuv-v1.23.0.tar.gz +58bc259a0f703fa6b8dda14909f718e14dfb9ddc9039ae13378f7e32e0ff7096774cbfb2964a0abb06f8a64a71cf298cc77b7475927df0fb50ce3f0e414a7787 disable-process-priority.patch 478d25c8905cd393b9ced0f1b16e70794a7ef20fb9eb212fd74e50beca3f5a33a6a5267616abecf470426ed3d00efec51df468745ff43c0de05c0ad8234f1eb3 disable-setuid-test.patch" diff --git a/system/libuv/disable-process-priority.patch b/system/libuv/disable-process-priority.patch new file mode 100644 index 000000000..f0f41fc95 --- /dev/null +++ b/system/libuv/disable-process-priority.patch @@ -0,0 +1,22 @@ +--- libuv-v1.23.0/test/test-list.h.old 2018-08-17 02:05:34.000000000 +0000 ++++ libuv-v1.23.0/test/test-list.h 2018-09-05 19:06:26.360000000 +0000 +@@ -214,7 +214,9 @@ + TEST_DECLARE (pipe_set_non_blocking) + TEST_DECLARE (pipe_set_chmod) + TEST_DECLARE (process_ref) ++#if 0 + TEST_DECLARE (process_priority) ++#endif + TEST_DECLARE (has_ref) + TEST_DECLARE (active) + TEST_DECLARE (embed) +@@ -690,7 +692,9 @@ + TEST_ENTRY (pipe_ref4) + TEST_HELPER (pipe_ref4, pipe_echo_server) + TEST_ENTRY (process_ref) ++#if 0 + TEST_ENTRY (process_priority) ++#endif + TEST_ENTRY (has_ref) + + TEST_ENTRY (loop_handles) diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD index 266a6fc93..e8b60b75f 100644 --- a/system/man-db/APKBUILD +++ b/system/man-db/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db -pkgver=2.8.3 -pkgrel=1 +pkgver=2.8.4 +pkgrel=0 pkgdesc="The man command and related utilities for examining on-line help files" url="http://www.nongnu.org/man-db/" arch="all" @@ -39,9 +39,8 @@ check() { package() { cd "$builddir" make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/charset.alias rm -r "${pkgdir}"/usr/lib/tmpfiles.d # systemd } -sha512sums="35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745 man-db-2.8.3.tar.xz +sha512sums="3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66 man-db-2.8.4.tar.xz 4bc9efaafa30dedb6da9d2a62436cf570bef5603b98494ca3c565c3e338b57a481ed40af2312a20cd9f64f965fc0c45607403d829339700c57f9dc0022d7c6ed man-db-2.8.3-iconv.patch" diff --git a/system/mawk/APKBUILD b/system/mawk/APKBUILD index 178969d34..ca9005ce5 100644 --- a/system/mawk/APKBUILD +++ b/system/mawk/APKBUILD @@ -1,15 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mawk -pkgver=20171017 +pkgver=1.3.4.20171017 pkgrel=0 pkgdesc="Pattern scanning and text processing language" url="https://invisible-island.net/mawk/mawk.html" arch="all" license="BSD-3-Clause" subpackages="$pkgname-doc" -source="https://invisible-mirror.net/archives/$pkgname/$pkgname-1.3.4-$pkgver.tgz" -builddir="$srcdir/$pkgname-1.3.4-$pkgver" +_dlver="${pkgver/.201/-201}" +source="https://invisible-mirror.net/archives/$pkgname/$pkgname-$_dlver.tgz" +builddir="$srcdir/$pkgname-$_dlver" build() { cd "$builddir" diff --git a/system/mpfr3/APKBUILD b/system/mpfr3/APKBUILD index 5d8b4e012..b648abf1a 100644 --- a/system/mpfr3/APKBUILD +++ b/system/mpfr3/APKBUILD @@ -3,7 +3,7 @@ pkgname=mpfr3 pkgver=3.1.6 pkgrel=0 pkgdesc="multiple-precision floating-point library" -url="http://www.mpfr.org/" +url="https://www.mpfr.org/" arch="all" license="LGPL-3.0+" depends="" diff --git a/system/musl/0001-sysconf-Add-_SC_XOPEN_UUCP.patch b/system/musl/0001-sysconf-Add-_SC_XOPEN_UUCP.patch deleted file mode 100644 index d792ede57..000000000 --- a/system/musl/0001-sysconf-Add-_SC_XOPEN_UUCP.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6f592a7812de3190f567174bbb4baa40790831dd Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 11 Apr 2018 23:22:33 -0500 -Subject: [PATCH 1/7] sysconf: Add _SC_XOPEN_UUCP - -We definitely don't /support/ UUCP, so return -1 for it. -But this value is required to be present in <unistd.h>. ---- - include/unistd.h | 1 + - src/conf/sysconf.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/include/unistd.h b/include/unistd.h -index 9485da7a..2b88bbb2 100644 ---- a/include/unistd.h -+++ b/include/unistd.h -@@ -417,6 +417,7 @@ int eaccess(const char *, int); - #define _SC_XOPEN_STREAMS 246 - #define _SC_THREAD_ROBUST_PRIO_INHERIT 247 - #define _SC_THREAD_ROBUST_PRIO_PROTECT 248 -+#define _SC_XOPEN_UUCP 249 - - #define _CS_PATH 0 - #define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 1 -diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c -index 9ce330a5..58830a09 100644 ---- a/src/conf/sysconf.c -+++ b/src/conf/sysconf.c -@@ -164,6 +164,7 @@ long sysconf(int name) - [_SC_XOPEN_STREAMS] = JT_ZERO, - [_SC_THREAD_ROBUST_PRIO_INHERIT] = -1, - [_SC_THREAD_ROBUST_PRIO_PROTECT] = -1, -+ [_SC_XOPEN_UUCP] = -1, - }; - - if (name >= sizeof(values)/sizeof(values[0]) || !values[name]) { --- -2.15.0 - diff --git a/system/musl/0002-confstr-Add-_CS_POSIX_V7_THREADS_.patch b/system/musl/0002-confstr-Add-_CS_POSIX_V7_THREADS_.patch deleted file mode 100644 index cd253b993..000000000 --- a/system/musl/0002-confstr-Add-_CS_POSIX_V7_THREADS_.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 94046871d24d5408adaf61941a4751c77abe06b6 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 11 Apr 2018 23:23:31 -0500 -Subject: [PATCH 2/7] confstr: Add _CS_POSIX_V7_THREADS_* - -This is used to determine what CFLAGS/LDFLAGS are needed to enable -compilation with threads on musl. We don't have any special ones, so -just return an empty string. - -This is required to be present in <unistd.h>. ---- - include/unistd.h | 2 ++ - src/conf/confstr.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/unistd.h b/include/unistd.h -index 2b88bbb2..68686dfd 100644 ---- a/include/unistd.h -+++ b/include/unistd.h -@@ -460,6 +460,8 @@ int eaccess(const char *, int); - #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147 - #define _CS_V6_ENV 1148 - #define _CS_V7_ENV 1149 -+#define _CS_POSIX_V7_THREADS_CFLAGS 1150 -+#define _CS_POSIX_V7_THREADS_LDFLAGS 1151 - - #ifdef __cplusplus - } -diff --git a/src/conf/confstr.c b/src/conf/confstr.c -index 02cb1aa2..3d417284 100644 ---- a/src/conf/confstr.c -+++ b/src/conf/confstr.c -@@ -7,7 +7,7 @@ size_t confstr(int name, char *buf, size_t len) - const char *s = ""; - if (!name) { - s = "/bin:/usr/bin"; -- } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>33U) { -+ } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>35U) { - errno = EINVAL; - return 0; - } --- -2.15.0 - diff --git a/system/musl/0003-pathconf-add-_PC_TIMESTAMP_RESOLUTION.patch b/system/musl/0003-pathconf-add-_PC_TIMESTAMP_RESOLUTION.patch deleted file mode 100644 index 21958a650..000000000 --- a/system/musl/0003-pathconf-add-_PC_TIMESTAMP_RESOLUTION.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1d486ac55014c39f225f12bac80202197c2bf9c6 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 11 Apr 2018 23:43:19 -0500 -Subject: [PATCH 3/7] pathconf: add _PC_TIMESTAMP_RESOLUTION - -Right now, this is a worst-case assumption; some kernels may actually -have a value of 100000 here (100 Hz timers). This is considered the -easiest implementation. - -This is required to be present in <unistd.h>. ---- - include/unistd.h | 1 + - src/conf/fpathconf.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/unistd.h b/include/unistd.h -index 68686dfd..1bdd3292 100644 ---- a/include/unistd.h -+++ b/include/unistd.h -@@ -274,6 +274,7 @@ int eaccess(const char *, int); - #define _PC_ALLOC_SIZE_MIN 18 - #define _PC_SYMLINK_MAX 19 - #define _PC_2_SYMLINKS 20 -+#define _PC_TIMESTAMP_RESOLUTION 21 - - #define _SC_ARG_MAX 0 - #define _SC_CHILD_MAX 1 -diff --git a/src/conf/fpathconf.c b/src/conf/fpathconf.c -index 8eb037e6..1eefac18 100644 ---- a/src/conf/fpathconf.c -+++ b/src/conf/fpathconf.c -@@ -25,7 +25,8 @@ long fpathconf(int fd, int name) - [_PC_REC_XFER_ALIGN] = 4096, - [_PC_ALLOC_SIZE_MIN] = 4096, - [_PC_SYMLINK_MAX] = SYMLINK_MAX, -- [_PC_2_SYMLINKS] = 1 -+ [_PC_2_SYMLINKS] = 1, -+ [_PC_TIMESTAMP_RESOLUTION] = 1000000, - }; - if (name >= sizeof(values)/sizeof(values[0])) { - errno = EINVAL; --- -2.15.0 - diff --git a/system/musl/0004-stdlib-Move-mkostemp-to-_GNU_SOURCE-_BSD_SOURCE.patch b/system/musl/0004-stdlib-Move-mkostemp-to-_GNU_SOURCE-_BSD_SOURCE.patch deleted file mode 100644 index 9814ba4eb..000000000 --- a/system/musl/0004-stdlib-Move-mkostemp-to-_GNU_SOURCE-_BSD_SOURCE.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3e9758004c131236d53e5fdca4bbeea7bf7efc28 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Tue, 17 Apr 2018 20:52:39 -0500 -Subject: [PATCH 4/7] stdlib: Move mkostemp to _GNU_SOURCE/_BSD_SOURCE - -This is not a POSIX function, it should not be visible there. ---- - include/stdlib.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/stdlib.h b/include/stdlib.h -index 42ca8336..d1f99fe1 100644 ---- a/include/stdlib.h -+++ b/include/stdlib.h -@@ -100,7 +100,6 @@ int posix_memalign (void **, size_t, size_t); - int setenv (const char *, const char *, int); - int unsetenv (const char *); - int mkstemp (char *); --int mkostemp (char *, int); - char *mkdtemp (char *); - int getsubopt (char **, char *const *, char **); - int rand_r (unsigned *); -@@ -138,6 +137,7 @@ void lcong48 (unsigned short [7]); - #include <alloca.h> - char *mktemp (char *); - int mkstemps (char *, int); -+int mkostemp (char *, int); - int mkostemps (char *, int, int); - void *valloc (size_t); - void *memalign(size_t, size_t); --- -2.15.0 - diff --git a/system/musl/0005-stdlib-Ensure-C11-fns-are-only-visible-in-C11.patch b/system/musl/0005-stdlib-Ensure-C11-fns-are-only-visible-in-C11.patch deleted file mode 100644 index 53235e0dd..000000000 --- a/system/musl/0005-stdlib-Ensure-C11-fns-are-only-visible-in-C11.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 36e0a4286937ccb25bc78392a679f496029765b0 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Tue, 17 Apr 2018 20:54:59 -0500 -Subject: [PATCH 5/7] stdlib: Ensure C11 fns are only visible in C11 - -aligned_alloc, at_quick_exit, and quick_exit are new in C11 and C++11. -Only make these symbols visible in those versions, to avoid polluting -the namespace of C99 and POSIX 2008 sources. ---- - include/stdlib.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/stdlib.h b/include/stdlib.h -index d1f99fe1..4bbaded0 100644 ---- a/include/stdlib.h -+++ b/include/stdlib.h -@@ -39,14 +39,18 @@ void *malloc (size_t); - void *calloc (size_t, size_t); - void *realloc (void *, size_t); - void free (void *); -+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L - void *aligned_alloc(size_t, size_t); -+#endif - - _Noreturn void abort (void); - int atexit (void (*) (void)); - _Noreturn void exit (int); - _Noreturn void _Exit (int); -+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L - int at_quick_exit (void (*) (void)); - _Noreturn void quick_exit (int); -+#endif - - char *getenv (const char *); - --- -2.15.0 - diff --git a/system/musl/0006-time-C11-visibility-fixes.patch b/system/musl/0006-time-C11-visibility-fixes.patch deleted file mode 100644 index 5252611b5..000000000 --- a/system/musl/0006-time-C11-visibility-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0979c50b831c67e0b4f4a560435b867b35cdac67 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Tue, 17 Apr 2018 21:03:15 -0500 -Subject: [PATCH 6/7] time: C11 visibility fixes - -The timespec_get function, and TIME_* macros, are only in C11. - -Since musl is compiled with -std=c99, TIME_UTC is unavailable in the -timespec_get implementation, so we use the raw value 1. ---- - include/time.h | 7 +++++-- - src/time/timespec_get.c | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/include/time.h b/include/time.h -index 672b3fc3..c5946dd0 100644 ---- a/include/time.h -+++ b/include/time.h -@@ -58,11 +58,14 @@ struct tm *gmtime (const time_t *); - struct tm *localtime (const time_t *); - char *asctime (const struct tm *); - char *ctime (const time_t *); --int timespec_get(struct timespec *, int); - --#define CLOCKS_PER_SEC 1000000L -+#if __STDC_VERSION__ >= 201112L -+int timespec_get(struct timespec *, int); - - #define TIME_UTC 1 -+#endif -+ -+#define CLOCKS_PER_SEC 1000000L - - #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ - || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ -diff --git a/src/time/timespec_get.c b/src/time/timespec_get.c -index 03c5a77b..c423b825 100644 ---- a/src/time/timespec_get.c -+++ b/src/time/timespec_get.c -@@ -6,7 +6,7 @@ int __clock_gettime(clockid_t, struct timespec *); - * are considered erroneous. */ - int timespec_get(struct timespec * ts, int base) - { -- if (base != TIME_UTC) return 0; -+ if (base != 1) return 0; - int ret = __clock_gettime(CLOCK_REALTIME, ts); - return ret < 0 ? 0 : base; - } --- -2.15.0 - diff --git a/system/musl/0007-abort-raise-SIGABRT-again-if-signal-is-ignored.patch b/system/musl/0007-abort-raise-SIGABRT-again-if-signal-is-ignored.patch deleted file mode 100644 index 4ab303c7d..000000000 --- a/system/musl/0007-abort-raise-SIGABRT-again-if-signal-is-ignored.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1316aae0c862240ff58b1cf38c92cd8cefd02a91 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Tue, 17 Apr 2018 22:08:48 -0500 -Subject: [PATCH 7/7] abort: raise SIGABRT again if signal is ignored - -POSIX requires that abort() gives the SIGABRT status to waitpid(3) and -friends. If a signal handler is installed, and erroneously returns, -then the status given to waitpid(3) is SIGSEGV instead of SIGABRT. - -This change gives another opportunity for the proper SIGABRT status to -be given to any process monitoring this one's process, before we fall -back to a_crash(), which should be sufficient. ---- - src/exit/abort.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/src/exit/abort.c b/src/exit/abort.c -index ecc0f735..5e5a87c3 100644 ---- a/src/exit/abort.c -+++ b/src/exit/abort.c -@@ -1,13 +1,31 @@ - #include <stdlib.h> - #include <signal.h> -+#include <string.h> - #include "syscall.h" - #include "pthread_impl.h" - #include "atomic.h" - - _Noreturn void abort(void) - { -+ struct sigaction abrtaction; -+ sigset_t abrtset; -+ - raise(SIGABRT); - __block_all_sigs(0); -+ -+ /* Unblock just SIGABRT, and set default handler */ -+ sigemptyset(&abrtset); -+ sigaddset(&abrtset, SIGABRT); -+ sigprocmask(SIG_UNBLOCK, &abrtset, 0); -+ -+ memset(&abrtaction, 0, sizeof(struct sigaction)); -+ abrtaction.sa_handler = SIG_DFL; -+ -+ sigaction(SIGABRT, &abrtaction, NULL); -+ -+ raise(SIGABRT); -+ -+ /* Ok, give up. */ - a_crash(); - raise(SIGKILL); - _Exit(127); --- -2.15.0 - diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index 221f11f2c..0505e9ebd 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.19 -pkgrel=11 +pkgver=1.1.20 +pkgrel=0 pkgdesc="System library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -18,18 +18,9 @@ nolibc) ;; *) subpackages="$subpackages $pkgname-utils";; esac source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz - 0001-sysconf-Add-_SC_XOPEN_UUCP.patch - 0002-confstr-Add-_CS_POSIX_V7_THREADS_.patch - 0003-pathconf-add-_PC_TIMESTAMP_RESOLUTION.patch - 0004-stdlib-Move-mkostemp-to-_GNU_SOURCE-_BSD_SOURCE.patch - 0005-stdlib-Ensure-C11-fns-are-only-visible-in-C11.patch - 0006-time-C11-visibility-fixes.patch - 0007-abort-raise-SIGABRT-again-if-signal-is-ignored.patch - + amalgamation.patch 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 3001-make-real-lastlog-h.patch - complex-math.patch - complex-math2.patch handle-aux-at_base.patch ldconfig @@ -81,6 +72,7 @@ package() { s390*) ARCH="s390x" ;; mips64*) ARCH="mips64" ;; mips*) ARCH="mips" ;; + m68k) ARCH="m68k" ;; esac make ARCH="$ARCH" prefix=/usr DESTDIR="$pkgdir" install-headers @@ -116,18 +108,10 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5 musl-1.1.19.tar.gz -801e0d8adf1ca3bec1c35ce4fe319be7ce7776967630ec27fea39c896dd0e26f047cae34d1b2702e730815789cdc6bd4df526e9078bf68294bcef35a94c498b1 0001-sysconf-Add-_SC_XOPEN_UUCP.patch -5b648ebfdff20f56c6b82b19361a0045a59be8dfef08f8c37f44e0f780ced5e7f3c4fcee12bb25b0cee62edf8c939bc60530550b4a8fcc2c3b1f40c1744f6307 0002-confstr-Add-_CS_POSIX_V7_THREADS_.patch -4ddfdc5ca9d2f86b0ac278e70155c5fd64ba5b012423de89f8c7e07be42ad02a0a965e915c6ce4e139345c981f0103bdd0145f7d732508aba7e8bddd42541c66 0003-pathconf-add-_PC_TIMESTAMP_RESOLUTION.patch -fb7ea456de9cd7cf36be8bc9fdd4e142c999758b1cf4ee93720724985f256ae80f4f426ced3ac5f732d1d9f4048993a017469b6755807da0231f08d5e0e8a467 0004-stdlib-Move-mkostemp-to-_GNU_SOURCE-_BSD_SOURCE.patch -e99dab95932c0c03d67da0248d63b71581050efed40c5e58b28e226925f6f436b6e7ddfbf03dc83ef4cabead2c9a6bd55a30e09c7ee250ef3482ac5206eb309b 0005-stdlib-Ensure-C11-fns-are-only-visible-in-C11.patch -d0d0817a4e1d57b74cb442a3bf8d8efe39a23a387275b75cba1b2fa354d8a7dc2fd843b5b67584aac86ec97ea394d602ec013c6e8a65da309915b0a80b4a8f98 0006-time-C11-visibility-fixes.patch -6f5f9b5fb5eba638b0d98c68c280dbcc2bdae58d94d9f6966f5de55f6dd5d7f3cdddd9ca758e8861e30841b80ba616a945fb2b885a31481707d578293b187ff0 0007-abort-raise-SIGABRT-again-if-signal-is-ignored.patch +sha512sums="d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d musl-1.1.20.tar.gz +3162b778101a46d9fb3a38927e3c4969781ccdabb9bb72de10d48ea31691215ecba605faee945ed86144a7e31fc948c31c2fee2881dc07897be3e82b6c6ff1e6 amalgamation.patch 2c8e1dde1834238097b2ee8a7bfb53471a0d9cff4a5e38b55f048b567deff1cdd47c170d0578a67b1a039f95a6c5fbb8cff369c75b6a3e4d7ed171e8e86ebb8c 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch -8909dc260968770ace8f3ffdc04c6c7d20933ff115b4fa3e512fb7460860a8216c73ca7a7ad54f59cb5988ef011f02bf18aa13cc2287cc64ffdb8db84ef69d47 complex-math.patch -c34ae0c8c2b05d82bc6bd341ceb29041f6e1a1d2c7b2f4f289ab620288bfb1e1ddabc4cb2fc85220c1fbe735874c38a9b00af636644584c7cd1e895d54564a22 complex-math2.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c diff --git a/system/musl/amalgamation.patch b/system/musl/amalgamation.patch new file mode 100644 index 000000000..d4d4465dc --- /dev/null +++ b/system/musl/amalgamation.patch @@ -0,0 +1,282 @@ +diff --git a/include/stdlib.h b/include/stdlib.h +index 42ca8336..4bbaded0 100644 +--- a/include/stdlib.h ++++ b/include/stdlib.h +@@ -39,14 +39,18 @@ void *malloc (size_t); + void *calloc (size_t, size_t); + void *realloc (void *, size_t); + void free (void *); ++#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L + void *aligned_alloc(size_t, size_t); ++#endif + + _Noreturn void abort (void); + int atexit (void (*) (void)); + _Noreturn void exit (int); + _Noreturn void _Exit (int); ++#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L + int at_quick_exit (void (*) (void)); + _Noreturn void quick_exit (int); ++#endif + + char *getenv (const char *); + +@@ -100,7 +104,6 @@ int posix_memalign (void **, size_t, size_t); + int setenv (const char *, const char *, int); + int unsetenv (const char *); + int mkstemp (char *); +-int mkostemp (char *, int); + char *mkdtemp (char *); + int getsubopt (char **, char *const *, char **); + int rand_r (unsigned *); +@@ -138,6 +141,7 @@ void lcong48 (unsigned short [7]); + #include <alloca.h> + char *mktemp (char *); + int mkstemps (char *, int); ++int mkostemp (char *, int); + int mkostemps (char *, int, int); + void *valloc (size_t); + void *memalign(size_t, size_t); +diff --git a/include/time.h b/include/time.h +index 672b3fc3..c5946dd0 100644 +--- a/include/time.h ++++ b/include/time.h +@@ -58,11 +58,14 @@ struct tm *gmtime (const time_t *); + struct tm *localtime (const time_t *); + char *asctime (const struct tm *); + char *ctime (const time_t *); +-int timespec_get(struct timespec *, int); + +-#define CLOCKS_PER_SEC 1000000L ++#if __STDC_VERSION__ >= 201112L ++int timespec_get(struct timespec *, int); + + #define TIME_UTC 1 ++#endif ++ ++#define CLOCKS_PER_SEC 1000000L + + #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ +diff --git a/include/unistd.h b/include/unistd.h +index 9485da7a..1bdd3292 100644 +--- a/include/unistd.h ++++ b/include/unistd.h +@@ -274,6 +274,7 @@ int eaccess(const char *, int); + #define _PC_ALLOC_SIZE_MIN 18 + #define _PC_SYMLINK_MAX 19 + #define _PC_2_SYMLINKS 20 ++#define _PC_TIMESTAMP_RESOLUTION 21 + + #define _SC_ARG_MAX 0 + #define _SC_CHILD_MAX 1 +@@ -417,6 +418,7 @@ int eaccess(const char *, int); + #define _SC_XOPEN_STREAMS 246 + #define _SC_THREAD_ROBUST_PRIO_INHERIT 247 + #define _SC_THREAD_ROBUST_PRIO_PROTECT 248 ++#define _SC_XOPEN_UUCP 249 + + #define _CS_PATH 0 + #define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 1 +@@ -459,6 +461,8 @@ int eaccess(const char *, int); + #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147 + #define _CS_V6_ENV 1148 + #define _CS_V7_ENV 1149 ++#define _CS_POSIX_V7_THREADS_CFLAGS 1150 ++#define _CS_POSIX_V7_THREADS_LDFLAGS 1151 + + #ifdef __cplusplus + } +diff --git a/src/conf/confstr.c b/src/conf/confstr.c +index 02cb1aa2..8f870a69 100644 +--- a/src/conf/confstr.c ++++ b/src/conf/confstr.c +@@ -6,8 +6,8 @@ size_t confstr(int name, char *buf, size_t len) + { + const char *s = ""; + if (!name) { +- s = "/bin:/usr/bin"; +- } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>33U) { ++ s = "/usr/5bin:/usr/bin:/bin"; ++ } else if ((name&~4U)!=1 && name-_CS_POSIX_V6_ILP32_OFF32_CFLAGS>35U) { + errno = EINVAL; + return 0; + } +diff --git a/src/conf/fpathconf.c b/src/conf/fpathconf.c +index e6aca5cf..b6a9d63e 100644 +--- a/src/conf/fpathconf.c ++++ b/src/conf/fpathconf.c +@@ -4,7 +4,7 @@ + + long fpathconf(int fd, int name) + { +- static const short values[] = { ++ static const long values[] = { + [_PC_LINK_MAX] = _POSIX_LINK_MAX, + [_PC_MAX_CANON] = _POSIX_MAX_CANON, + [_PC_MAX_INPUT] = _POSIX_MAX_INPUT, +@@ -25,7 +25,8 @@ long fpathconf(int fd, int name) + [_PC_REC_XFER_ALIGN] = 4096, + [_PC_ALLOC_SIZE_MIN] = 4096, + [_PC_SYMLINK_MAX] = -1, +- [_PC_2_SYMLINKS] = 1 ++ [_PC_2_SYMLINKS] = 1, ++ [_PC_TIMESTAMP_RESOLUTION] = 100000000, + }; + if (name >= sizeof(values)/sizeof(values[0])) { + errno = EINVAL; +diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c +index 45ef1c16..483e1635 100644 +--- a/src/conf/sysconf.c ++++ b/src/conf/sysconf.c +@@ -165,6 +165,7 @@ long sysconf(int name) + [_SC_XOPEN_STREAMS] = JT_ZERO, + [_SC_THREAD_ROBUST_PRIO_INHERIT] = -1, + [_SC_THREAD_ROBUST_PRIO_PROTECT] = -1, ++ [_SC_XOPEN_UUCP] = -1, + }; + + if (name >= sizeof(values)/sizeof(values[0]) || !values[name]) { +diff --git a/src/locale/setlocale.c b/src/locale/setlocale.c +index 40bc7ece..4d51cdfe 100644 +--- a/src/locale/setlocale.c ++++ b/src/locale/setlocale.c +@@ -25,6 +25,8 @@ char *setlocale(int cat, const char *name) + + if ((unsigned)cat > LC_ALL) return 0; + ++ if (name && (!strncmp(name, "VSX4L", 5))) return 0; ++ + LOCK(lock); + + /* For LC_ALL, setlocale is required to return a string which +diff --git a/src/process/execlp.c b/src/process/execlp.c +index 5eed886e..f6da398b 100644 +--- a/src/process/execlp.c ++++ b/src/process/execlp.c +@@ -1,6 +1,9 @@ + #include <unistd.h> ++#include <errno.h> + #include <stdarg.h> + ++extern int __execsh(const char *, char *const []); ++ + int execlp(const char *file, const char *argv0, ...) + { + int argc; +@@ -17,6 +20,11 @@ int execlp(const char *file, const char *argv0, ...) + argv[i] = va_arg(ap, char *); + argv[i] = NULL; + va_end(ap); +- return execvp(file, argv); ++ execvp(file, argv); ++ if (errno == ENOEXEC) { ++ errno = 0; ++ return __execsh(file, argv); ++ } ++ return -1; + } + } +diff --git a/src/process/execsh.c b/src/process/execsh.c +new file mode 100644 +index 00000000..180bb2aa +--- /dev/null ++++ b/src/process/execsh.c +@@ -0,0 +1,18 @@ ++#include <unistd.h> ++#include <errno.h> ++#include "libc.h" ++ ++int ++__execsh(const char *file, char *const argv[]) ++{ ++ int i, argc; ++ char **p; ++ ++ for (argc=1, p=(char **)argv; *p; ++argc, ++p); ++ ++ char *nargv[argc+1]; ++ nargv[0] = (char *)file; ++ for (i=0; i<argc; ++i) ++ nargv[i+1] = argv[i]; ++ return execv("/bin/sh", nargv); ++} +diff --git a/src/process/execvp.c b/src/process/execvp.c +index 2dddeddb..fdd0ca48 100644 +--- a/src/process/execvp.c ++++ b/src/process/execvp.c +@@ -6,6 +6,7 @@ + #include "libc.h" + + extern char **__environ; ++extern int __execsh(const char *, char *const []); + + int __execvpe(const char *file, char *const argv[], char *const envp[]) + { +@@ -56,7 +57,12 @@ int __execvpe(const char *file, char *const argv[], char *const envp[]) + + int execvp(const char *file, char *const argv[]) + { +- return __execvpe(file, argv, __environ); ++ __execvpe(file, argv, __environ); ++ if (errno == ENOEXEC) { ++ errno = 0; ++ return __execsh(file, argv); ++ } ++ return -1; + } + + weak_alias(__execvpe, execvpe); +diff --git a/src/process/system.c b/src/process/system.c +index 9135b815..aa01e13b 100644 +--- a/src/process/system.c ++++ b/src/process/system.c +@@ -19,7 +19,9 @@ int system(const char *cmd) + + pthread_testcancel(); + +- if (!cmd) return 1; ++ if (!cmd) { ++ return (access("/bin/sh", X_OK) == 0); ++ } + + sigaction(SIGINT, &sa, &oldint); + sigaction(SIGQUIT, &sa, &oldquit); +diff --git a/src/thread/pthread_attr_setinheritsched.c b/src/thread/pthread_attr_setinheritsched.c +index e540e846..4115e2fe 100644 +--- a/src/thread/pthread_attr_setinheritsched.c ++++ b/src/thread/pthread_attr_setinheritsched.c +@@ -23,7 +23,7 @@ void *__start_sched(void *p) + + int pthread_attr_setinheritsched(pthread_attr_t *a, int inherit) + { +- if (inherit > 1U) return EINVAL; ++ if (inherit > 1U) return ENOTSUP; + a->_a_sched = inherit; + return 0; + } +diff --git a/src/thread/pthread_attr_setscope.c b/src/thread/pthread_attr_setscope.c +index 46b520c0..933bdb38 100644 +--- a/src/thread/pthread_attr_setscope.c ++++ b/src/thread/pthread_attr_setscope.c +@@ -8,6 +8,6 @@ int pthread_attr_setscope(pthread_attr_t *a, int scope) + case PTHREAD_SCOPE_PROCESS: + return ENOTSUP; + default: +- return EINVAL; ++ return ENOTSUP; + } + } +diff --git a/src/time/timespec_get.c b/src/time/timespec_get.c +index 03c5a77b..c423b825 100644 +--- a/src/time/timespec_get.c ++++ b/src/time/timespec_get.c +@@ -6,7 +6,7 @@ int __clock_gettime(clockid_t, struct timespec *); + * are considered erroneous. */ + int timespec_get(struct timespec * ts, int base) + { +- if (base != TIME_UTC) return 0; ++ if (base != 1) return 0; + int ret = __clock_gettime(CLOCK_REALTIME, ts); + return ret < 0 ? 0 : base; + } diff --git a/system/musl/complex-math.patch b/system/musl/complex-math.patch deleted file mode 100644 index fff4b59c1..000000000 --- a/system/musl/complex-math.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ae2a01da2e388535da243b3d974aef74a3c06ae0 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Mon, 9 Apr 2018 12:33:17 -0400 -Subject: fix wrong result in casin and many related complex functions - -the factor of -i noted in the comment at the top of casin.c was -omitted from the actual code, yielding a result rotated 90 degrees and -propagating into errors in other functions defined in terms of casin. - -implement multiplication by -i as a rotation of the real and imaginary -parts of the result, rather than by actual multiplication, since the -latter cannot be optimized without knowledge that the operand is -finite. here, the rotation is the actual intent, anyway. ---- - src/complex/casin.c | 3 ++- - src/complex/casinf.c | 3 ++- - src/complex/casinl.c | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/complex/casin.c b/src/complex/casin.c -index dfdda98..01ed618 100644 ---- a/src/complex/casin.c -+++ b/src/complex/casin.c -@@ -12,5 +12,6 @@ double complex casin(double complex z) - x = creal(z); - y = cimag(z); - w = CMPLX(1.0 - (x - y)*(x + y), -2.0*x*y); -- return clog(CMPLX(-y, x) + csqrt(w)); -+ double complex r = clog(CMPLX(-y, x) + csqrt(w)); -+ return CMPLX(cimag(r), -creal(r)); - } -diff --git a/src/complex/casinf.c b/src/complex/casinf.c -index 93f0e33..4fcb76f 100644 ---- a/src/complex/casinf.c -+++ b/src/complex/casinf.c -@@ -10,5 +10,6 @@ float complex casinf(float complex z) - x = crealf(z); - y = cimagf(z); - w = CMPLXF(1.0 - (x - y)*(x + y), -2.0*x*y); -- return clogf(CMPLXF(-y, x) + csqrtf(w)); -+ float complex r = clogf(CMPLXF(-y, x) + csqrtf(w)); -+ return CMPLXF(cimagf(r), -crealf(r)); - } -diff --git a/src/complex/casinl.c b/src/complex/casinl.c -index 0916c60..3b7ceba 100644 ---- a/src/complex/casinl.c -+++ b/src/complex/casinl.c -@@ -15,6 +15,7 @@ long double complex casinl(long double complex z) - x = creall(z); - y = cimagl(z); - w = CMPLXL(1.0 - (x - y)*(x + y), -2.0*x*y); -- return clogl(CMPLXL(-y, x) + csqrtl(w)); -+ long double complex r = clogl(CMPLXL(-y, x) + csqrtl(w)); -+ return CMPLXL(cimagl(r), -creall(r)); - } - #endif --- -cgit v0.11.2 - diff --git a/system/musl/complex-math2.patch b/system/musl/complex-math2.patch deleted file mode 100644 index 49f5c3acd..000000000 --- a/system/musl/complex-math2.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 10e4bd3780050e75b72aac5d85c31816419bb17d Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Wed, 11 Apr 2018 15:05:22 -0400 -Subject: [PATCH 1/2] fix incorrect results for catan with some inputs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -the catan implementation from OpenBSD includes a FIXME-annotated -"overflow" branch that produces a meaningless and incorrect -large-magnitude result. it was reachable via three paths, -corresponding to gotos removed by this commit, in order: - -1. pure imaginary argument with imaginary component greater than 1 in - magnitude. this case does not seem at all exceptional and is - handled (at least with the quality currently expected from our - complex math functions) by the existing non-exceptional code path. - -2. arguments on the unit circle, including the pure-real argument 1.0. - these are not exceptional except for ±i, which should produce - results with infinite imaginary component and which lead to - computation of atan2(±0,0) in the existing non-exceptional code - path. such calls to atan2() however are well-defined by POSIX. - -3. the specific argument +i. this route should be unreachable due to - the above (2), but subtle rounding effects might have made it - possible in rare cases. continuing on the non-exceptional code path - in this case would lead to computing the (real) log of an infinite - argument, then producing a NAN when multiplying it by I. - -for now, remove the exceptional code paths entirely. replace the -multiplication by I with construction of a complex number using the -CMPLX macro so that the NAN issue (3) prevented cannot arise. - -with these changes, catan should give reasonably correct results for -real arguments, and should no longer give completely-wrong results for -pure-imaginary arguments outside the interval (-i,+i). ---- - src/complex/catan.c | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) - -diff --git a/src/complex/catan.c b/src/complex/catan.c -index 39ce6cf2..7dc2afeb 100644 ---- a/src/complex/catan.c -+++ b/src/complex/catan.c -@@ -91,29 +91,17 @@ double complex catan(double complex z) - x = creal(z); - y = cimag(z); - -- if (x == 0.0 && y > 1.0) -- goto ovrf; -- - x2 = x * x; - a = 1.0 - x2 - (y * y); -- if (a == 0.0) -- goto ovrf; - - t = 0.5 * atan2(2.0 * x, a); - w = _redupi(t); - - t = y - 1.0; - a = x2 + (t * t); -- if (a == 0.0) -- goto ovrf; - - t = y + 1.0; - a = (x2 + t * t)/a; -- w = w + (0.25 * log(a)) * I; -- return w; -- --ovrf: -- // FIXME -- w = MAXNUM + MAXNUM * I; -+ w = CMPLX(w, 0.25 * log(a)); - return w; - } --- -2.15.0 - diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index eaa4508bf..d3905f3fc 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ncurses -pkgver=6.1_p20180609 +pkgver=6.1_p20180901 _ver=${pkgver%_p*}-${pkgver#*_p} -pkgrel=5 +pkgrel=0 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/ncurses.html" arch="all" @@ -106,4 +106,4 @@ static() { mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ } -sha512sums="616975a1ef61ca6efb68c9411fb4d310f5472f4f58c277afaecacc42e2186358dbda1831f8d2f9fe5ef98ecabd8c3ea0e618762450e9cf99b92230277bca480c ncurses-6.1-20180609.tgz" +sha512sums="3c7983a80aba1cc69ad9ac2f43cd60bfe714c8e83b8eb6755ca6c5cf14d26d1e98c7407de34af74e58d52ca1d9446e04f2a76fd31a37377782aa4e515b35ba7e ncurses-6.1-20180901.tgz" diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index 46284cae3..a6da52de1 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr -pkgver=4.19 +pkgver=4.20 pkgrel=0 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" arch="all" options="!check" # No test suite. license="MPL-1.1 AND GPL-2.0-only AND LGPL-2.1-only" -depends= +depends="" # -dev package does not ship any symlinks so dependency cannot be autodetected depends_dev="nspr" makedepends="autoconf automake" @@ -60,5 +60,5 @@ package() { "$pkgdir"/usr/include/nspr/md } -sha512sums="45a48111d0f89db0649a5e1356719868ff81881f9cf48c22c1d13b0831978b103f19e9840d6a5359fcdc90d763c0a60f0a29f7840d756a5efbd53ce1afd36844 nspr-4.19.tar.gz +sha512sums="22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949 nspr-4.20.tar.gz ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch" diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index b6c1f5992..806441d20 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.38 +pkgver=3.39 _ver=${pkgver//./_} pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -9,7 +9,7 @@ url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" arch="all" options="!check" license="MPL-2.0" -depends= +depends="" depends_dev="nspr-dev" makedepends="nspr-dev sqlite-dev zlib-dev perl bsd-compat-headers" subpackages="$pkgname-static $pkgname-dev $pkgname-tools" @@ -147,7 +147,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab nss-3.38.tar.gz +sha512sums="16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f nss-3.39.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/openssl/3001-CVE-2018-0737.patch b/system/openssl/3001-CVE-2018-0737.patch deleted file mode 100644 index 162dc3d7f..000000000 --- a/system/openssl/3001-CVE-2018-0737.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001 -From: Billy Brumley <bbrumley@gmail.com> -Date: Wed, 11 Apr 2018 10:10:58 +0300 -Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont - both get called with BN_FLG_CONSTTIME flag set. - -CVE-2018-0737 - -Reviewed-by: Rich Salz <rsalz@openssl.org> -Reviewed-by: Matt Caswell <matt@openssl.org> -(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787) ---- - crypto/rsa/rsa_gen.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c -index 9ca5dfefb70..42b89a8dfaa 100644 ---- a/crypto/rsa/rsa_gen.c -+++ b/crypto/rsa/rsa_gen.c -@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, - if (BN_copy(rsa->e, e_value) == NULL) - goto err; - -+ BN_set_flags(rsa->p, BN_FLG_CONSTTIME); -+ BN_set_flags(rsa->q, BN_FLG_CONSTTIME); - BN_set_flags(r2, BN_FLG_CONSTTIME); - /* generate p and q */ - for (;;) { diff --git a/system/openssl/3002-CVE-2018-0732.patch b/system/openssl/3002-CVE-2018-0732.patch deleted file mode 100644 index 148e7c3bc..000000000 --- a/system/openssl/3002-CVE-2018-0732.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001 -From: Guido Vranken <guidovranken@gmail.com> -Date: Mon, 11 Jun 2018 19:38:54 +0200 -Subject: [PATCH] Reject excessively large primes in DH key generation. - -CVE-2018-0732 - -Signed-off-by: Guido Vranken <guidovranken@gmail.com> - -(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) - -Reviewed-by: Tim Hudson <tjh@openssl.org> -Reviewed-by: Matt Caswell <matt@openssl.org> -(Merged from https://github.com/openssl/openssl/pull/6457) ---- - crypto/dh/dh_key.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c -index 387558f1467..f235e0d682b 100644 ---- a/crypto/dh/dh_key.c -+++ b/crypto/dh/dh_key.c -@@ -130,10 +130,15 @@ static int generate_key(DH *dh) - int ok = 0; - int generate_new_key = 0; - unsigned l; -- BN_CTX *ctx; -+ BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; - BIGNUM *pub_key = NULL, *priv_key = NULL; - -+ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { -+ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); -+ return 0; -+ } -+ - ctx = BN_CTX_new(); - if (ctx == NULL) - goto err; diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD index 684f41bf1..7aeb36b7b 100644 --- a/system/openssl/APKBUILD +++ b/system/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openssl -pkgver=1.0.2o +pkgver=1.0.2p pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="https://www.openssl.org/" @@ -28,8 +28,6 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch 1002-backport-changes-from-upstream-padlock-module.patch 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch - 3001-CVE-2018-0737.patch - 3002-CVE-2018-0732.patch " # secfixes: @@ -143,7 +141,7 @@ dev() { default_dev } -sha512sums="8a2c93657c85143e76785bb32ee836908c31a6f5f8db993fa9777acba6079e630cdddd03edbad65d1587199fc13a1507789eacf038b56eb99139c2091d9df7fd openssl-1.0.2o.tar.gz +sha512sums="958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 openssl-1.0.2p.tar.gz 2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c 0002-busybox-basename.patch 58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch @@ -154,6 +152,4 @@ c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723e 5febe20948e3f12d981e378e1f4ea538711657aacb6865a1aa91339d4a04277e250f490a1f2abc2c6f290bdc2b1bffdba1d00983b4c09f7ea983eef8163f9420 0010-ssl-env-zlib.patch 8c181760d7a149aa18d246d50f1c0438ffb63c98677b05306dfc00400ad0429b47d31e7c8d85126005c67f743d23e7a8a81174ffe98556f4caf9cf6b04d9ff17 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch a3555440b5f544bfd6b9ad97557d8f4c1d673f6a35219f65056a72035d186be5f354717ddf9784899b602464d48657b090ade24379552d43af97609c0f48c389 1002-backport-changes-from-upstream-padlock-module.patch -6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch -70be7fb9abad901fd84e8028e328c5b2fb7feff18547cfb749c5f59faf06eceab9052f9979d721670f6f3e099ba59761e8394e986565d349dd25e9718eaa99f0 3001-CVE-2018-0737.patch -ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4 3002-CVE-2018-0732.patch" +6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch" diff --git a/system/perl-authen-sasl/APKBUILD b/system/perl-authen-sasl/APKBUILD index 611d30fa7..ad6f196ca 100644 --- a/system/perl-authen-sasl/APKBUILD +++ b/system/perl-authen-sasl/APKBUILD @@ -4,7 +4,7 @@ _realname=Authen-SASL pkgver=2.16 pkgrel=2 pkgdesc="SASL authentication framework for Perl" -url="http://search.cpan.org/dist/Authen-SASL/" +url="https://metacpan.org/release/Authen-SASL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-digest-hmac" diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index 801c2e226..aed5f54d1 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.04 +pkgver=4.06 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" -url="http://search.cpan.org/dist/Cpanel-JSON-XS/" +url="https://metacpan.org/release/Cpanel-JSON-XS" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="6b2479ee89f2b8c79ef979cecbdb6f29c28ee37ab530eabc9070728ba37063be3c5836571bea84d537dc93f8586cca71fd3bdca5e420c1d6a2eabf2547ca1db7 Cpanel-JSON-XS-4.04.tar.gz" +sha512sums="df765265c23982a6c5eb80d16d9c9e3b3ab9f0b34aa130df8da084936aa2b7e9f4b362466948925df7be9c448892eef93017cf1fa7be7f640b62c83493829cec Cpanel-JSON-XS-4.06.tar.gz" diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD index f551079de..e0febf493 100644 --- a/system/perl-dbd-sqlite/APKBUILD +++ b/system/perl-dbd-sqlite/APKBUILD @@ -5,7 +5,7 @@ _pkgname=DBD-SQLite pkgver=1.58 pkgrel=0 pkgdesc="Perl DBI SQLite module" -url="http://search.cpan.org/dist/$_pkgname" +url="https://metacpan.org/release/DBD-SQLite" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl-dbi" diff --git a/system/perl-dbi/APKBUILD b/system/perl-dbi/APKBUILD index c8d0efda4..007506a47 100644 --- a/system/perl-dbi/APKBUILD +++ b/system/perl-dbi/APKBUILD @@ -5,7 +5,7 @@ _realpkgname=DBI pkgver=1.641 pkgrel=0 pkgdesc="Database independent interface for Perl" -url="http://search.cpan.org/dist/${_realpkgname}" +url="https://metacpan.org/release/DBI" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends= diff --git a/system/perl-digest-hmac/APKBUILD b/system/perl-digest-hmac/APKBUILD index ccf09a834..3bca43d37 100644 --- a/system/perl-digest-hmac/APKBUILD +++ b/system/perl-digest-hmac/APKBUILD @@ -4,7 +4,7 @@ _realname=Digest-HMAC pkgver=1.03 pkgrel=1 pkgdesc="Keyed-Hashing for Message Authentication Perl module" -url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/" +url="https://metacpan.org/release/Digest-HMAC" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-digest-sha1" diff --git a/system/perl-digest-sha1/APKBUILD b/system/perl-digest-sha1/APKBUILD index 60205b85b..a9f19e206 100644 --- a/system/perl-digest-sha1/APKBUILD +++ b/system/perl-digest-sha1/APKBUILD @@ -5,7 +5,7 @@ _realname=Digest-SHA1 pkgver=2.13 pkgrel=11 pkgdesc="Perl interface to the SHA-1 algorithm" -url="http://search.cpan.org/dist/Digest-SHA1/" +url="https://metacpan.org/release/Digest-SHA1" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-encode-locale/APKBUILD b/system/perl-encode-locale/APKBUILD index 6f79efa94..a4dccf27c 100644 --- a/system/perl-encode-locale/APKBUILD +++ b/system/perl-encode-locale/APKBUILD @@ -5,7 +5,7 @@ _realname=Encode-Locale pkgver=1.05 pkgrel=2 pkgdesc="Perl module - Determine locale encoding" -url="http://search.cpan.org/~gaas" +url="https://metacpan.org/release/Encode-Locale" arch="noarch" license="GPL-2.0-only Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-error/APKBUILD b/system/perl-error/APKBUILD index 6c3a1235a..542627640 100644 --- a/system/perl-error/APKBUILD +++ b/system/perl-error/APKBUILD @@ -4,7 +4,7 @@ _realname=Error pkgver=0.17026 pkgrel=0 pkgdesc="Perl module error/exception handling in an OO-ish way" -url="http://search.cpan.org/dist/Error/" +url="https://metacpan.org/release/Error" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-extutils-config/APKBUILD b/system/perl-extutils-config/APKBUILD index c4eab6a9f..2c42337c2 100644 --- a/system/perl-extutils-config/APKBUILD +++ b/system/perl-extutils-config/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=ExtUtils-Config pkgver=0.008 pkgrel=0 pkgdesc="A wrapper library for Perl configuration" -url="http://search.cpan.org/dist/ExtUtils-Config/" +url="https://metacpan.org/release/ExtUtils-Config" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-extutils-helpers/APKBUILD b/system/perl-extutils-helpers/APKBUILD index d125cdb7f..310875cf2 100644 --- a/system/perl-extutils-helpers/APKBUILD +++ b/system/perl-extutils-helpers/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=ExtUtils-Helpers pkgver=0.026 pkgrel=0 pkgdesc="Various portability utilities for Perl module builders" -url="http://search.cpan.org/dist/ExtUtils-Helpers/" +url="https://metacpan.org/release/ExtUtils-Helpers" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-extutils-installpaths/APKBUILD b/system/perl-extutils-installpaths/APKBUILD index 459c61276..57d3ba2e5 100644 --- a/system/perl-extutils-installpaths/APKBUILD +++ b/system/perl-extutils-installpaths/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=ExtUtils-InstallPaths pkgver=0.012 pkgrel=0 pkgdesc="Build.PL install path logic made easy" -url="http://search.cpan.org/dist/ExtUtils-InstallPaths/" +url="https://metacpan.org/release/ExtUtils-InstallPaths" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-extutils-config" diff --git a/system/perl-file-listing/APKBUILD b/system/perl-file-listing/APKBUILD index 4e36cd844..89464b395 100644 --- a/system/perl-file-listing/APKBUILD +++ b/system/perl-file-listing/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-file-listing pkgver=6.04 pkgrel=2 pkgdesc="File::Listing perl module" -url="http://search.cpan.org/dist/File-Listing/" +url="https://metacpan.org/release/File-Listing" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-http-date" diff --git a/system/perl-file-remove/APKBUILD b/system/perl-file-remove/APKBUILD index bed356f5e..568b40155 100644 --- a/system/perl-file-remove/APKBUILD +++ b/system/perl-file-remove/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=File-Remove pkgver=1.57 pkgrel=1 pkgdesc="Remove files and directories" -url="http://search.cpan.org/dist/File-Remove/" +url="https://metacpan.org/release/File-Remove" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-html-parser/APKBUILD b/system/perl-html-parser/APKBUILD index f810d3748..60aede3a0 100644 --- a/system/perl-html-parser/APKBUILD +++ b/system/perl-html-parser/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=HTML-Parser pkgver=3.72 pkgrel=3 pkgdesc="Perl HTML parser" -url="http://search.cpan.org/dist/HTML-Parser/" +url="https://metacpan.org/release/HTML-Parser" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-html-tagset" diff --git a/system/perl-html-tagset/APKBUILD b/system/perl-html-tagset/APKBUILD index 607b5cc68..0427a8a5e 100644 --- a/system/perl-html-tagset/APKBUILD +++ b/system/perl-html-tagset/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=HTML-Tagset pkgver=3.20 pkgrel=2 pkgdesc="Useful data tables for parsing HTML" -url="http://search.cpan.org/dist/HTML-Tagset/" +url="https://metacpan.org/release/HTML-Tagset" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-http-cookies/APKBUILD b/system/perl-http-cookies/APKBUILD index dd2031356..f6b751771 100644 --- a/system/perl-http-cookies/APKBUILD +++ b/system/perl-http-cookies/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=HTTP-Cookies pkgver=6.04 pkgrel=1 pkgdesc="Perl HTTP cookie jars" -url="http://search.cpan.org/dist/HTTP-Cookies/" +url="https://metacpan.org/release/HTTP-Cookies" arch="noarch" license="GPL-2.0-only or Artistic-1.0-Perl" depends="perl perl-http-date perl-http-message" diff --git a/system/perl-http-daemon/APKBUILD b/system/perl-http-daemon/APKBUILD index f8f330398..b85717256 100644 --- a/system/perl-http-daemon/APKBUILD +++ b/system/perl-http-daemon/APKBUILD @@ -4,12 +4,11 @@ pkgname=perl-http-daemon pkgver=6.01 pkgrel=2 pkgdesc="HTTP::Daemon perl module" -url="http://search.cpan.org/dist/HTTP-Daemon/" +url="https://metacpan.org/release/HTTP-Daemon" arch="noarch" license="GPL-2.0-only or Artistic-1.0-Perl" depends="perl perl-http-date perl-http-message" makedepends="perl-dev" -install="" replaces="perl-libwww" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-$pkgver.tar.gz" diff --git a/system/perl-http-date/APKBUILD b/system/perl-http-date/APKBUILD index 2d4b83da4..b4a3f7829 100644 --- a/system/perl-http-date/APKBUILD +++ b/system/perl-http-date/APKBUILD @@ -5,7 +5,7 @@ _realname=HTTP-Date pkgver=6.02 pkgrel=2 pkgdesc="Perl module date conversion routines" -url="http://search.cpan.org/~gaas" +url="https://metacpan.org/release/HTTP-Date" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD index d5b178f38..26fae9ff0 100644 --- a/system/perl-http-message/APKBUILD +++ b/system/perl-http-message/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=HTTP-Message pkgver=6.18 pkgrel=0 pkgdesc="Perl class encapsulating HTTP-style messages" -url="http://search.cpan.org/dist/HTTP-Message/" +url="https://metacpan.org/release/HTTP-Message" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-lwp-mediatypes perl-encode-locale perl-http-date perl-uri perl-io-html" diff --git a/system/perl-http-negotiate/APKBUILD b/system/perl-http-negotiate/APKBUILD index 1efada759..98ebfb1da 100644 --- a/system/perl-http-negotiate/APKBUILD +++ b/system/perl-http-negotiate/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-http-negotiate pkgver=6.01 pkgrel=2 pkgdesc="HTTP::Negotiate perl module" -url="http://search.cpan.org/dist/HTTP-Negotiate/" +url="https://metacpan.org/release/HTTP-Negotiate" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-http-message" diff --git a/system/perl-io-html/APKBUILD b/system/perl-io-html/APKBUILD index c6c49d10f..b5e2c6c6e 100644 --- a/system/perl-io-html/APKBUILD +++ b/system/perl-io-html/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=IO-HTML pkgver=1.001 pkgrel=2 pkgdesc="Open an HTML file with automatic charset detection" -url="http://search.cpan.org/dist/IO-HTML/" +url="https://metacpan.org/release/IO-HTML" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-io-socket-ssl/APKBUILD b/system/perl-io-socket-ssl/APKBUILD index c5c982c33..fabe57860 100644 --- a/system/perl-io-socket-ssl/APKBUILD +++ b/system/perl-io-socket-ssl/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-io-socket-ssl _pkgreal=IO-Socket-SSL -pkgver=2.056 +pkgver=2.059 pkgrel=0 pkgdesc="Perl module implementing SSL/TLS with IO::Socket interface" -url="http://search.cpan.org/dist/IO-Socket-SSL/" +url="https://metacpan.org/release/IO-Socket-SSL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="ca-certificates perl-net-libidn perl-net-ssleay" @@ -37,4 +37,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="a3d580f977f8fd99f196a710f6eb5bc649d46e22d17f4e02660b2bab130629b34d1aff037974f320ce52121b13c1d77aa2f504278ec50530667e67413442b70b IO-Socket-SSL-2.056.tar.gz" +sha512sums="af3800d171036b026bcb502692f70d88c4a9f2546e465181ef9037467b942c94303840cc479403f5f0e6f0ad6b06918cbaf78f0b1447e5416594c819ed94a39b IO-Socket-SSL-2.059.tar.gz" diff --git a/system/perl-json-maybexs/APKBUILD b/system/perl-json-maybexs/APKBUILD index 5fe5367f3..cbea4a6d2 100644 --- a/system/perl-json-maybexs/APKBUILD +++ b/system/perl-json-maybexs/APKBUILD @@ -5,8 +5,8 @@ pkgname=perl-json-maybexs _pkgreal=JSON-MaybeXS pkgver=1.004000 pkgrel=0 -pkgdesc="Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>" -url="http://search.cpan.org/dist/JSON-MaybeXS/" +pkgdesc="Use <Cpanel::JSON::XS> with a fallback to <JSON::XS> and <JSON::PP>" +url="https://metacpan.org/release/JSON-MaybeXS" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-cpanel-json-xs" diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD index 946a515d9..1c6b4fdea 100644 --- a/system/perl-json/APKBUILD +++ b/system/perl-json/APKBUILD @@ -4,7 +4,7 @@ _pkgreal=JSON pkgver=2.97001 pkgrel=0 pkgdesc="Perl module implementing a JSON encoder/decoder" -url="http://search.cpan.org/dist/JSON/" +url="https://metacpan.org/release/JSON" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" makedepends="perl-dev" diff --git a/system/perl-libwww/APKBUILD b/system/perl-libwww/APKBUILD index ee7012f8a..c31dc6cfe 100644 --- a/system/perl-libwww/APKBUILD +++ b/system/perl-libwww/APKBUILD @@ -2,20 +2,20 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-libwww _realname=libwww-perl -pkgver=6.31 +pkgver=6.35 pkgrel=0 pkgdesc="Perl module - World Wide Web library" -url="http://search.cpan.org/~mschilli" +url="https://metacpan.org/release/libwww-perl" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl-http-date perl-http-cookies perl-net-http perl-http-daemon perl-html-parser perl-file-listing perl-www-robotrules - perl-http-negotiate perl-uri perl-http-message + perl-http-negotiate perl-uri perl-http-message perl-test-needs perl-lwp-mediatypes perl-encode-locale perl-try-tiny" makedepends="perl-dev perl-test-fatal perl-test-requiresinternet" install= subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/libwww-perl/libwww-perl/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-6.35.tar.gz" builddir="$srcdir/$_realname-$pkgver" build() { @@ -36,4 +36,4 @@ package() { find "$pkgdir" -name perllocal.pod -delete } -sha512sums="884612d01d0d5dd47f74c7e9fd44ec17f6f08069521710c84912cd11643097a5456e91c9339b888307c629199721aa20c449cf8f7e4ef6fd7be719ab637b3cf2 perl-libwww-6.31.tar.gz" +sha512sums="db7eea57fc85f80f351c3556f0747cf94100b5cd75a6fdd76006f6ada5c7087143660f724db70f3e5fe45f53cabce2dcbaece985551e74f546f71cd7d6d27e7a perl-libwww-6.35.tar.gz" diff --git a/system/perl-lwp-mediatypes/APKBUILD b/system/perl-lwp-mediatypes/APKBUILD index c2fdb7f43..51778d258 100644 --- a/system/perl-lwp-mediatypes/APKBUILD +++ b/system/perl-lwp-mediatypes/APKBUILD @@ -5,7 +5,7 @@ _realname=LWP-MediaTypes pkgver=6.02 pkgrel=2 pkgdesc="Perl module - guess media type for a file or a URL" -url="http://search.cpan.org/~gaas" +url="https://metacpan.org/release/LWP-MediaTypes" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-module-build-tiny/APKBUILD b/system/perl-module-build-tiny/APKBUILD index 646c6be04..05d2e73da 100644 --- a/system/perl-module-build-tiny/APKBUILD +++ b/system/perl-module-build-tiny/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Module-Build-Tiny pkgver=0.039 pkgrel=0 pkgdesc="A tiny replacement for Module::Build" -url="http://search.cpan.org/dist/Module-Build-Tiny/" +url="https://metacpan.org/release/Module-Build-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-extutils-installpaths perl-extutils-config perl-extutils-helpers perl-test-harness" diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD index 83ba709ca..dffb1853d 100644 --- a/system/perl-module-build/APKBUILD +++ b/system/perl-module-build/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Module-Build pkgver=0.4224 pkgrel=0 pkgdesc="Build and install Perl modules" -url="http://search.cpan.org/dist/Module-Build/" +url="https://metacpan.org/release/Module-Build" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-module-install/APKBUILD b/system/perl-module-install/APKBUILD index df5e2fc71..38b38df74 100644 --- a/system/perl-module-install/APKBUILD +++ b/system/perl-module-install/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Module-Install pkgver=1.19 pkgrel=1 pkgdesc="Standalone, extensible Perl module installer" -url="http://search.cpan.org/dist/Module-Install/" +url="https://metacpan.org/release/Module-Install" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpanmakedepends="perl-file-remove perl-module-build perl-module-scandeps perl-yaml-tiny" diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD index 20d41f61b..e8a1cdc73 100644 --- a/system/perl-module-scandeps/APKBUILD +++ b/system/perl-module-scandeps/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-scandeps _pkgreal=Module-ScanDeps -pkgver=1.24 +pkgver=1.25 pkgrel=0 pkgdesc="Recursively scan Perl code for dependencies" -url="http://search.cpan.org/dist/Module-ScanDeps/" +url="https://metacpan.org/release/Module-ScanDeps" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpanmakedepends="perl-test-requires" @@ -42,4 +42,4 @@ check() { make test } -sha512sums="7f3d9821aa863d8ebc78fb5fb3c7172ce133169ec54ed91b90e05ba50654b4bd0282b3a760adfc8b6bd553dda4116dbf51972bb2af94b59f6f04daeba996e889 Module-ScanDeps-1.24.tar.gz" +sha512sums="1d1d10b55147e68238465fc1e5e9248d926151394034f0bde32c0030ff9bbd685ebb1ed0c6c924769a2e38c2dc15621990b454438db5ef5699aeed378f02aec7 Module-ScanDeps-1.25.tar.gz" diff --git a/system/perl-net-http/APKBUILD b/system/perl-net-http/APKBUILD index 4197f33f5..879c5f966 100644 --- a/system/perl-net-http/APKBUILD +++ b/system/perl-net-http/APKBUILD @@ -4,12 +4,11 @@ pkgname=perl-net-http pkgver=6.18 pkgrel=0 pkgdesc="Low-level HTTP connection client library for Perl" -url="http://search.cpan.org/dist/Net-HTTP/" +url="https://metacpan.org/release/Net-HTTP" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-uri" makedepends="perl-dev" -install="" replaces="perl-libwww" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz" diff --git a/system/perl-net-libidn/APKBUILD b/system/perl-net-libidn/APKBUILD index 290e9b600..d8bac5b15 100644 --- a/system/perl-net-libidn/APKBUILD +++ b/system/perl-net-libidn/APKBUILD @@ -10,7 +10,6 @@ arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" makedepends="libidn-dev perl-dev" -install="" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/T/TH/THOR/$_realname-$pkgver.tar.gz" builddir="$srcdir/$_realname-$pkgver" diff --git a/system/perl-net-smtp-ssl/APKBUILD b/system/perl-net-smtp-ssl/APKBUILD index 67e08e266..05e7f7a05 100644 --- a/system/perl-net-smtp-ssl/APKBUILD +++ b/system/perl-net-smtp-ssl/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Net-SMTP-SSL pkgver=1.04 pkgrel=0 pkgdesc="SSL/TLS support for Net::SMTP" -url="http://search.cpan.org/dist/Net-SMTP-SSL/" +url="https://metacpan.org/release/Net-SMTP-SSL" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-io-socket-ssl perl-net-ssleay" diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD index 6e0256315..f39c464b7 100644 --- a/system/perl-net-ssleay/APKBUILD +++ b/system/perl-net-ssleay/APKBUILD @@ -5,7 +5,7 @@ _realname=Net-SSLeay pkgver=1.85 pkgrel=0 pkgdesc="Perl extension for using OpenSSL" -url="http://search.cpan.org/dist/Net-SSLeay/" +url="https://metacpan.org/release/Net-SSLeay" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-sub-uplevel/APKBUILD b/system/perl-sub-uplevel/APKBUILD index 6eb77aff4..035f67670 100644 --- a/system/perl-sub-uplevel/APKBUILD +++ b/system/perl-sub-uplevel/APKBUILD @@ -5,7 +5,7 @@ _realname=Sub-Uplevel pkgver=0.2800 pkgrel=0 pkgdesc="Perl module to apparently run a function in a higher stack frame" -url="http://search.cpan.org/~dagolden/$_realname-$pkgver/" +url="https://metacpan.org/release/Sub-Uplevel" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" diff --git a/system/perl-test-exception/APKBUILD b/system/perl-test-exception/APKBUILD index 25a978be2..4c1acf79c 100644 --- a/system/perl-test-exception/APKBUILD +++ b/system/perl-test-exception/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Exception pkgver=0.43 pkgrel=0 pkgdesc="Perl module for testing exception-based code" -url="http://search.cpan.org/dist/Test-Exception/" +url="https://metacpan.org/release/Test-Exception" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-sub-uplevel" diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD index 3cb20afdd..f9c0bbfd5 100644 --- a/system/perl-test-fatal/APKBUILD +++ b/system/perl-test-fatal/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Fatal pkgver=0.014 pkgrel=1 pkgdesc="incredibly simple helpers for testing code with exceptions" -url="http://search.cpan.org/dist/Test-Fatal/" +url="https://metacpan.org/release/Test-Fatal" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-try-tiny" diff --git a/system/perl-test-harness/APKBUILD b/system/perl-test-harness/APKBUILD index bca0490e7..082ee0e68 100644 --- a/system/perl-test-harness/APKBUILD +++ b/system/perl-test-harness/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Harness pkgver=3.42 pkgrel=0 pkgdesc="Run Perl standard test scripts with statistics" -url="http://search.cpan.org/dist/Test-Harness/" +url="https://metacpan.org/release/Test-Harness" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-test-leaktrace/APKBUILD b/system/perl-test-leaktrace/APKBUILD index 6e63eafa7..5ba02bf89 100644 --- a/system/perl-test-leaktrace/APKBUILD +++ b/system/perl-test-leaktrace/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-LeakTrace pkgver=0.16 pkgrel=0 pkgdesc="Traces memory leaks" -url="http://search.cpan.org/dist/Test-LeakTrace/" +url="https://metacpan.org/release/Test-LeakTrace" arch="all" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD index c40abbe62..1c2e096c3 100644 --- a/system/perl-test-needs/APKBUILD +++ b/system/perl-test-needs/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-test-needs pkgver=0.002005 pkgrel=0 pkgdesc="Perl module for skipping tests when modules aren't found" -url="https://metacpan.org/pod/Test::Needs" +url="https://metacpan.org/release/Test-Needs" arch="noarch" license="Artistic-2.0" depends="perl" diff --git a/system/perl-test-nowarnings/APKBUILD b/system/perl-test-nowarnings/APKBUILD index 42adbdfb4..f8ab7e3d2 100644 --- a/system/perl-test-nowarnings/APKBUILD +++ b/system/perl-test-nowarnings/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-test-nowarnings pkgver=1.04 pkgrel=2 pkgdesc="Perl module to ensure no warnings occur during testing" -url="http://search.cpan.org/dist/Test-NoWarnings/" +url="https://metacpan.org/release/Test-NoWarnings" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-test-simple" diff --git a/system/perl-test-pod/APKBUILD b/system/perl-test-pod/APKBUILD index a2ce5e98b..639ccdbd3 100644 --- a/system/perl-test-pod/APKBUILD +++ b/system/perl-test-pod/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=perl-test-pod _pkgreal=Test-Pod -pkgver=1.51 -pkgrel=2 +pkgver=1.52 +pkgrel=0 pkgdesc="Check for POD errors in files" -url="http://search.cpan.org/dist/Test-Pod/" +url="https://metacpan.org/release/Test-Pod" arch="noarch" license="GPL-2.0-only AND Artistic-1.0-Perl" cpandepends="" @@ -41,4 +41,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="bf4e8b2a71a79a5edec86991c7cbbcc929fa4f2eb403b411cd678fbdf89fe30c198e00a29db80ca9c98fe6655167c0a77e7f166f073a18711db3b1f3e5cd3c15 Test-Pod-1.51.tar.gz" +sha512sums="9b078488e1da8b907f5f3a46452aa9bfd49db61f1539d076dccebf9a8b476eaf0f539f00badc9c500b1e732a8827331b2286375924986efb990367767eeb8365 Test-Pod-1.52.tar.gz" diff --git a/system/perl-test-requires/APKBUILD b/system/perl-test-requires/APKBUILD index cc9459d38..a849fab33 100644 --- a/system/perl-test-requires/APKBUILD +++ b/system/perl-test-requires/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Requires pkgver=0.10 pkgrel=0 pkgdesc="Checks to see if a Perl module can be loaded" -url="http://search.cpan.org/dist/Test-Requires/" +url="https://metacpan.org/release/Test-Requires" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-test-requiresinternet/APKBUILD b/system/perl-test-requiresinternet/APKBUILD index db7b419a5..6a7dea85e 100644 --- a/system/perl-test-requiresinternet/APKBUILD +++ b/system/perl-test-requiresinternet/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-RequiresInternet pkgver=0.05 pkgrel=1 pkgdesc="Easily test network connectivity" -url="http://search.cpan.org/dist/Test-RequiresInternet/" +url="https://metacpan.org/release/Test-RequiresInternet" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" makedepends="perl-dev" diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index f47194d67..078869136 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -3,10 +3,10 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple -pkgver=1.302136 +pkgver=1.302140 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" -url="http://search.cpan.org/dist/Test-Simple/" +url="https://metacpan.org/release/Test-Simple" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" provides="perl-test-tester" @@ -47,4 +47,4 @@ doc() { replaces="perl-doc" } -sha512sums="80bc252a7d796ba6f43c61b50ea47ed12f391995d80a254a565627dc3d3728a4d8fa5395ca657c29630e19b3f22518c1c50774ce4e52abc52797c0adfdeac9aa Test-Simple-1.302136.tar.gz" +sha512sums="fb823470165e321f68bf761cb9fd31d9e2b3efb42a7ac25602f4a33624e3b8287f6210d502c6afe7723b5ad50c4b1fed2a1db166f151f9b9155d2bca4600766f Test-Simple-1.302140.tar.gz" diff --git a/system/perl-test-warn/APKBUILD b/system/perl-test-warn/APKBUILD index 0be6991fb..0ae630515 100644 --- a/system/perl-test-warn/APKBUILD +++ b/system/perl-test-warn/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Test-Warn pkgver=0.36 pkgrel=0 pkgdesc="Perl extension to test methods for warnings" -url="http://search.cpan.org/dist/Test-Warn/" +url="https://metacpan.org/release/Test-Warn" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="perl-sub-uplevel" diff --git a/system/perl-test-without-module/APKBUILD b/system/perl-test-without-module/APKBUILD index 48eb1162f..ce250cbbe 100644 --- a/system/perl-test-without-module/APKBUILD +++ b/system/perl-test-without-module/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=Test-Without-Module pkgver=0.20 pkgrel=0 pkgdesc="Test fallback behaviour in absence of Perl modules" -url="https://metacpan.org/pod/Test::Without::Module" +url="https://metacpan.org/release/Test-Without-Module" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" makedepends="perl-dev" diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD index fb93a3117..957139162 100644 --- a/system/perl-try-tiny/APKBUILD +++ b/system/perl-try-tiny/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=Try-Tiny pkgver=0.30 pkgrel=0 pkgdesc="Minimal Perl try/catch with proper environment preservation" -url="http://search.cpan.org/dist/Try-Tiny/" +url="https://metacpan.org/release/Try-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD index 6624a4621..5909ad364 100644 --- a/system/perl-uri/APKBUILD +++ b/system/perl-uri/APKBUILD @@ -4,13 +4,12 @@ pkgname=perl-uri pkgver=1.74 pkgrel=0 pkgdesc="Perl library for URI manipulation" -url="https://metacpan.org/pod/URI" +url="https://metacpan.org/release/URI" arch="noarch" license="GPL-1.0+ OR Artistic-1.0-Perl" depends="perl" makedepends="$depends" checkdepends="perl-test-needs" -install="" subpackages="$pkgname-doc" provides="perl-uri-escape" source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-$pkgver.tar.gz" diff --git a/system/perl-www-robotrules/APKBUILD b/system/perl-www-robotrules/APKBUILD index f2add4a41..dba5d1b34 100644 --- a/system/perl-www-robotrules/APKBUILD +++ b/system/perl-www-robotrules/APKBUILD @@ -4,12 +4,11 @@ pkgname=perl-www-robotrules pkgver=6.02 pkgrel=2 pkgdesc="Perl module for parsing /robots.txt files on HTTP servers" -url="http://search.cpan.org/dist/WWW-RobotRules/" +url="https://metacpan.org/release/WWW-RobotRules" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl perl-uri" makedepends="perl-dev" -install="" replaces="perl-libwww" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz" diff --git a/system/perl-yaml-syck/APKBUILD b/system/perl-yaml-syck/APKBUILD index e912ec396..c2eeac2f2 100644 --- a/system/perl-yaml-syck/APKBUILD +++ b/system/perl-yaml-syck/APKBUILD @@ -6,15 +6,11 @@ _pkgreal=YAML-Syck pkgver=1.30 pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" -url="http://search.cpan.org/dist/YAML-Syck/" +url="https://metacpan.org/release/YAML-Syck" arch="all" license="MIT" -cpandepends="" -cpanmakedepends="" -cpancheckdepends="" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -checkdepends="$cpancheckdepends" +depends="" +makedepends="perl-dev" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" diff --git a/system/perl-yaml-tiny/APKBUILD b/system/perl-yaml-tiny/APKBUILD index db3151174..466fcbe98 100644 --- a/system/perl-yaml-tiny/APKBUILD +++ b/system/perl-yaml-tiny/APKBUILD @@ -6,7 +6,7 @@ _pkgreal=YAML-Tiny pkgver=1.73 pkgrel=1 pkgdesc="YAML manipulation library for Perl" -url="http://search.cpan.org/dist/YAML-Tiny/" +url="https://metacpan.org/release/YAML-Tiny" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" cpandepends="" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 546c50f16..4ff68dce3 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 pkgver=2.7.2.0 -pkgrel=1 +pkgrel=4 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -10,11 +10,11 @@ options="!check" # No test suite. license="ISC" depends_dev="skalibs-dev execline-dev" makedepends="skalibs-dev>=2.7 execline-dev" -install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade" +install="$pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-doc" triggers="$pkgname.trigger=/run/service" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz - s6-svscanboot agetty-run" + s6-svscanboot" build() { @@ -22,7 +22,7 @@ build() { ./configure \ --enable-shared \ --enable-static \ - --disable-allstatic \ + --enable-static-libc \ --libdir=/usr/lib \ --libexecdir="/lib/$pkgname" \ --with-dynlib=/lib @@ -35,15 +35,6 @@ package() { cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot" mkdir -p -m 0755 "$pkgdir/etc/s6/early-services" "$pkgdir/var/lib/s6/services" chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" - - - # The getty scripts are created here - - for i in 1 2 3 4 5 6 ; do - mkdir -m 0755 "$pkgdir/etc/s6/early-services/getty-$i" - sed -e "s/%TTY%/tty$i/g" < "$srcdir/agetty-run" > "$pkgdir/etc/s6/early-services/getty-$i/run" - chmod 0755 "$pkgdir/etc/s6/early-services/getty-$i/run" - done } doc() { @@ -53,5 +44,4 @@ doc() { } sha512sums="0ab98c44324054effa0754efd117b3126a53fac7096979aacffd7d86128c5cb1f714205e30ca4e561ca3740646d1f36eb53b9e30d139d7ce4dc1b8cfb3e33123 s6-2.7.2.0.tar.gz -b4919f76498f86257e13210010a84284dd8574db062b96bcc527c0c5dcc2a35716ff0f3c4d23cb3ec7eed416f16aeec31247b1fda3bd06c1a8f6fd65cf32c6da s6-svscanboot -fb60b841da03583ba9f0f0541b45e4cf88fa5311b26376042e951317428dcaa6c81bb6c739c7a442ef0d36e1581a29cb9c4fb2d87411268fb23a033130fc8051 agetty-run" +bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e s6-svscanboot" diff --git a/system/s6/agetty-run b/system/s6/agetty-run deleted file mode 100644 index 79884efc7..000000000 --- a/system/s6/agetty-run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -/sbin/agetty 38400 %TTY% linux diff --git a/system/s6/s6-svscanboot b/system/s6/s6-svscanboot index 447a1a01b..8fa8ec5d5 100644 --- a/system/s6/s6-svscanboot +++ b/system/s6/s6-svscanboot @@ -40,6 +40,17 @@ if } +# Also link the early services defined in sysinit, if any + +if +{ + if -t { test -d /run/early-services } + forbacktickx -pnd"\n" i { ls -1 -U /run/early-services } + importas -u i i + ln -nsf ../early-services/$i /run/service/$i +} + + # Create the catch-all logger servicedir directly in the scandir # (It's too fundamental to be made configurable as an early service.) diff --git a/system/s6/s6.pre-install b/system/s6/s6.pre-install deleted file mode 100644 index 2c175a325..000000000 --- a/system/s6/s6.pre-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S catchlog 2>/dev/null -adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null - -exit 0 diff --git a/system/s6/s6.pre-upgrade b/system/s6/s6.pre-upgrade deleted file mode 100644 index 2c175a325..000000000 --- a/system/s6/s6.pre-upgrade +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S catchlog 2>/dev/null -adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null - -exit 0 diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD index f4cb086f6..e3fda9d85 100644 --- a/system/shimmy/APKBUILD +++ b/system/shimmy/APKBUILD @@ -1,20 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> - pkgname=shimmy -pkgver=0.4 +pkgver=0.5 pkgrel=0 pkgdesc="Utilities for stricter POSIX conformance" url="https://code.foxkit.us/adelie/shimmy" arch="all" +options="!check" # No test suite. license="NCSA" depends="" -makedepends="" subpackages="$pkgname-doc" -options="!check" -source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz" replaces="musl-utils" -builddir="$srcdir/shimmy-$pkgver" +source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz" build() { cd "$builddir" @@ -26,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="16947d649279dfdc508bcbe5be8be8ba7bd0b38e692862201a744e4cc770c6ffa3f7b3e37fc997e56c10bfb60abc001b944b6a6b340831894ad8d350f56bde8b shimmy-0.4.tar.xz" +sha512sums="a958d6297d23e784d7ecf22a53e4add890560ad13f81dc43f9dfffb697a5f4cd4d7de02d2a7e3cab7005374a674e7a5958349adddad1508b96bda94f45ef8158 shimmy-0.5.tar.xz" diff --git a/system/sqlite/APKBUILD b/system/sqlite/APKBUILD index 54e79ccc4..77eac113e 100644 --- a/system/sqlite/APKBUILD +++ b/system/sqlite/APKBUILD @@ -17,7 +17,7 @@ esac [ $_d -lt 10 ] && _d=0$_d _ver=${_a}${_b}${_c}${_d} -pkgrel=1 +pkgrel=2 pkgdesc="C library that implements an SQL database engine" url="https://sqlite.org/" arch="all" @@ -29,6 +29,7 @@ source="http://www.sqlite.org/2018/$pkgname-autoconf-$_ver.tar.gz subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" _amalgamation="-DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS3 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_COLUMN_METADATA \ diff --git a/system/ssmtp/APKBUILD b/system/ssmtp/APKBUILD index 53f7211b1..944f6505f 100644 --- a/system/ssmtp/APKBUILD +++ b/system/ssmtp/APKBUILD @@ -2,12 +2,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ssmtp pkgver=2.64 -pkgrel=11 +pkgrel=12 pkgdesc="Simple MTA to transmit mail to a mail hub" url="https://packages.debian.org/stable/mail/ssmtp" arch="all" options="!check" license="GPL-2.0+" +provides=/usr/sbin/sendmail depends= makedepends="openssl-dev autoconf" subpackages="$pkgname-doc" diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 7ac11deaf..4c0e5bd0f 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=4.23 +pkgver=4.24 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -59,7 +59,7 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="f7694c18a32fcdcfee8f54f866ff8102b6b1797c89d97daf91e62d8c8f642b937ffcbb5ee4c027b1eb3163125e2b65ab063e856657aff056c70b0dbfc46f0aea strace-4.23.tar.gz +sha512sums="14d5bb8722a3aeb9d1173e6ee040fbad6fd8a66182fd417f5ec699afcd3fc2f03a636a45a529ed1400881db5e766acdd37fd0f3d07da6e651a15abbc5c394c28 strace-4.24.tar.gz 273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch 44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch" diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD index 0d8ac292c..3e3fdc7b5 100644 --- a/system/sudo/APKBUILD +++ b/system/sudo/APKBUILD @@ -11,7 +11,7 @@ else fi pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" -url="http://www.sudo.ws/sudo/" +url="https://www.sudo.ws/sudo/" arch="all" options="suid" license="ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause AND Zlib" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 0bad1ac68..a9b40bf35 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.0204 -pkgrel=2 +pkgver=8.1.0346 +pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" arch="all" @@ -80,5 +80,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="e2629dc44a9cf6c73b589508c35a7f068fb22ae9f0802dbe7b6efa2b104598e1c1a9c0a8abacc256fee9f72b64a68ab984c443f27c57c8129c2754d49e099587 vim-8.1.0204.tar.gz +sha512sums="ce27d6d9215e80d84661aec4062f4730e4ed95cfbcedfdd46e73b5a5a1599ea709664c967c5e17ad3515341f79b59fb5c3ddc851cc84cd5717c0e68c6c82961c vim-8.1.0346.tar.gz 3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc" diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD index 5499c5e51..323ac3b40 100644 --- a/system/yaml/APKBUILD +++ b/system/yaml/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yaml -pkgver=0.1.7 +pkgver=0.2.1 pkgrel=0 pkgdesc="YAML 1.1 parser and emitter written in C" -url="http://pyyaml.org/wiki/LibYAML" +url="https://pyyaml.org/wiki/LibYAML" arch="all" license="MIT" depends="" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975 yaml-0.1.7.tar.gz" +sha512sums="97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 yaml-0.2.1.tar.gz" |