From 12fb37d5f3aee470b90c4ea04e369e288258ae5b Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 10 Sep 2019 14:39:19 -0500
Subject: system/python3: fix test suite network access

---
 system/python3/APKBUILD | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index f14f72b1c..250f259b6 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -136,7 +136,13 @@ EOF
 	# dumb
 	fail="$fail test_ssl"					# tries to do SSLv2 which we have disabled in OpenSSL
 
-	make quicktest TESTOPTS="--exclude $fail"
+	# needs network but doesn't declare it
+	fail="$fail test_normalization"
+
+	# defaults from Tools/scripts/run_tests.py, with -network added
+	use="all,-largefile,-audio,-gui,-network"
+
+	make quicktest TESTOPTS="--use '$use' --exclude $fail"
 }
 
 package() {
-- 
cgit v1.2.3-60-g2f50


From 72863c501e3995abf8ce4f61d4b0e7f08b8bbf71 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 10 Sep 2019 14:41:23 -0500
Subject: system/fcron: depends=vim

---
 system/fcron/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/fcron/APKBUILD b/system/fcron/APKBUILD
index 15f9c2713..6b2998814 100644
--- a/system/fcron/APKBUILD
+++ b/system/fcron/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=fcron
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="periodical command scheduler for systems not always up"
 url="http://fcron.free.fr/"
 pkgusers="fcron"
@@ -10,7 +10,7 @@ pkggroups="fcron"
 arch="all"
 options="suid !check"  # No test suite.
 license="GPL"
-depends="cmd:sendmail"
+depends="cmd:sendmail vim"
 makedepends="perl"
 install="fcron.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
-- 
cgit v1.2.3-60-g2f50


From b7cf34763c2d97e4dc2695fca48b3e2ae5f1613d Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 10 Sep 2019 17:48:01 -0500
Subject: system/ssmtp: HTTP only source

---
 system/ssmtp/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/ssmtp/APKBUILD b/system/ssmtp/APKBUILD
index 7fa905760..64d2ae710 100644
--- a/system/ssmtp/APKBUILD
+++ b/system/ssmtp/APKBUILD
@@ -12,7 +12,8 @@ provides=/usr/sbin/sendmail
 depends=
 makedepends="openssl-dev autoconf"
 subpackages="$pkgname-doc"
-source="https://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
+# No HTTPS
+source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
 	generate_config.patch
 	libcrypto-underlinking.patch
 	inet6-getaddrinfo.patch
-- 
cgit v1.2.3-60-g2f50


From f8a052e59b022d3a906a673c7a0628cb3d68fdce Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 10 Sep 2019 18:04:29 -0500
Subject: system/zstd: +checkdepends=file

---
 system/zstd/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/zstd/APKBUILD b/system/zstd/APKBUILD
index de125ca8d..72ae16746 100644
--- a/system/zstd/APKBUILD
+++ b/system/zstd/APKBUILD
@@ -9,6 +9,7 @@ arch="all"
 license="BSD-3-Clause AND GPL-2.0-only"
 depends=""
 makedepends="lz4-dev xz-dev zlib-dev"
+checkdepends="file"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/facebook/zstd/releases/download/v$pkgver/zstd-$pkgver.tar.gz"
 
-- 
cgit v1.2.3-60-g2f50


From 76b441c021225224764c8ab916bd200b5b9c5681 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 10 Sep 2019 20:12:38 -0500
Subject: system/easy-kernel: $srcdir/.. != $startdir

---
 system/easy-kernel/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 7fccf2f76..d6eeb5c47 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -172,7 +172,7 @@ modules() {
 headers() {
 	pkgdesc="System headers provided by the Linux kernel"
 	cd "$builddir"
-	patch -Np1 -i "$srcdir"/../revert-broken-uapi.patch
+	patch -Np1 -i "$startdir"/revert-broken-uapi.patch
 
 	mkdir -p "$subpkgdir"/usr
 	make headers_install INSTALL_HDR_PATH="$subpkgdir/usr"
-- 
cgit v1.2.3-60-g2f50


From 3b0612cdf8eef6408efe10cce2bc9e48d9c9d1fc Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 10 Sep 2019 13:03:17 -0500
Subject: system/pcre*: use official URL and download

---
 system/pcre/APKBUILD  | 4 ++--
 system/pcre2/APKBUILD | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD
index aa043954c..4fa4ab7bc 100644
--- a/system/pcre/APKBUILD
+++ b/system/pcre/APKBUILD
@@ -4,14 +4,14 @@ pkgname=pcre
 pkgver=8.43
 pkgrel=2
 pkgdesc="Perl-compatible regular expression library"
-url="http://pcre.sourceforge.net"
+url="https://pcre.org"
 arch="all"
 license="BSD-3-Clause"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
 	libpcrecpp libpcre16 libpcre32"
-source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2
+source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.bz2
 	stack-frame-size-detection.patch
 	"
 
diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD
index 8ef326f32..ef1fa1492 100644
--- a/system/pcre2/APKBUILD
+++ b/system/pcre2/APKBUILD
@@ -4,7 +4,7 @@ pkgname=pcre2
 pkgver=10.33
 pkgrel=0
 pkgdesc="Perl-compatible regular expression library"
-url="http://pcre.sourceforge.net/"
+url="https://pcre.org"
 arch="all"
 license="BSD-3-Clause"
 depends=""
@@ -12,8 +12,7 @@ depends_dev="libedit-dev zlib-dev"
 makedepends="$depends_dev paxmark"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
 	libpcre2-16:_libpcre libpcre2-32:_libpcre"
-source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://ftp.pcre.org/pub/pcre/$pkgname-$pkgver.tar.gz"
 
 case "$CARCH" in
 	s390x) _enable_jit="";;
-- 
cgit v1.2.3-60-g2f50


From 37dc8b13f40d85ee22938ab60bbc6f03d823f593 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Sun, 2 Jun 2019 17:58:55 -0400
Subject: system/coreutils: fix test failure with bind mounts

df-symlink tests whether df output is consistent in regards to where
devices are mounted. Specifically, it tries to ensure that if there is a
1:1 mapping of the device ("source") corresponding to the current
directory "." ("target"), then `df --output=source,target .` should be
the same as `df --output=source,target $(df --out=source . | tail -n1)`.
However, this is not necessarily the case in the presence of bind
mounts. For example:

$ df --out=source .
Filesystem
/dev/sda4
$ df --out=source,target /dev/sda4
Filesystem     Mounted on
/dev/sda4      /
$ df --out=source,target .
Filesystem     Mounted on
/dev/sda4      /git

This can be fixed by adding the --all flag to ensure that duplicate
devices are printed, so that the 1:1-checking if statement actually
checks it correctly.
---
 system/coreutils/APKBUILD                        |  4 +++-
 system/coreutils/test-df-symlink-bindmount.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 system/coreutils/test-df-symlink-bindmount.patch

diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index ff7df9e00..2860b3a43 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -21,6 +21,7 @@ source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz
 	gnulib-tests-dont-require-gpg-passphrase.patch
 	gnulib-test-fixes.patch
 	localename-test-fix.patch
+	test-df-symlink-bindmount.patch
 	"
 [ "${CBUILD}" != "${CHOST}" ] && source="$source
 	051_all_coreutils-mangen.patch
@@ -73,7 +74,8 @@ bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a7
 86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf  localename-test-fix.patch
 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
 a1d014a683fb3b2e08e7392f7589fd92a565e2a4d0cac1cf960968dd3d990e020fdd3bb6aea2bbeaca3ba8f2522b4da3d75b93f414ebf83d8b26b5ccbb38a64d  gnulib-test-fixes.patch
-aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c  date-debug.patch"
+aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c  date-debug.patch
+0b90b7721dd01bd22eba50f73bc756930dd4a8bc78ec408ce7f155a02b520375023897b9d12872030735d908208b912ea7adfac9e8b4d055e617873d982eef56  test-df-symlink-bindmount.patch"
 [ "${CBUILD}" != "${CHOST}" ] && sha512sums="
 bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36  051_all_coreutils-mangen.patch
 "
diff --git a/system/coreutils/test-df-symlink-bindmount.patch b/system/coreutils/test-df-symlink-bindmount.patch
new file mode 100644
index 000000000..34b334ba8
--- /dev/null
+++ b/system/coreutils/test-df-symlink-bindmount.patch
@@ -0,0 +1,11 @@
+--- coreutils-8.31/tests/df/df-symlink.sh	2019-01-05 05:36:22.000000000 -0500
++++ coreutils-8.31/tests/df/df-symlink.sh	2019-05-30 23:57:10.260506897 -0400
+@@ -34,7 +34,7 @@
+ # I.e., '.' => /dev/mapper/fedora-home -> /dev/dm-2
+ # Restrict this test to systems with a 1:1 mapping between
+ # source and target.  This excludes for example BTRFS sub-volumes.
+-if test "$(df --output=source | grep -F "$disk" | wc -l)" = 1; then
++if test "$(df --all --output=source | grep -F "$disk" | wc -l)" = 1; then
+   df --out=source,target '.' > out || fail=1
+   compare exp out || fail=1
+ fi
-- 
cgit v1.2.3-60-g2f50


From 96cac2093872a7b647d2bde53af20d90ebd3ffe3 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Wed, 11 Sep 2019 05:52:59 -0500
Subject: system/fakeroot: sharty fire burning on the dance floor
 (checkdepends=sharutils)

---
 system/fakeroot/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD
index b08cd6289..b0b3bc585 100644
--- a/system/fakeroot/APKBUILD
+++ b/system/fakeroot/APKBUILD
@@ -10,7 +10,7 @@ depends=""
 makedepends_build="libtool autoconf automake po4a"
 makedepends_host="libcap-dev acl-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
-checkdepends="bash"
+checkdepends="bash sharutils"
 subpackages="$pkgname-doc"
 source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.xz
 	fakeroot-hide-dlsym-errors.patch
@@ -38,7 +38,7 @@ build() {
 }
 
 check() {
-	make check
+	make check VERBOSE=x
 }
 
 package() {
-- 
cgit v1.2.3-60-g2f50


From 1067b6142455d1f5f390d07ea722a69be4b803c4 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Wed, 11 Sep 2019 06:54:54 -0500
Subject: system/coreutils: skip bogus gnulib LOGNAME test

It is not necessarily true that LOGNAME will match the owner of the tty
to which stdin is connected (sudo, su, ...)
---
 system/coreutils/APKBUILD                |  2 +-
 system/coreutils/gnulib-test-fixes.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 2860b3a43..23d96edbd 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -73,7 +73,7 @@ bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a7
 532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b  disable-mbrtowc-test.patch
 86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf  localename-test-fix.patch
 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c  gnulib-tests-dont-require-gpg-passphrase.patch
-a1d014a683fb3b2e08e7392f7589fd92a565e2a4d0cac1cf960968dd3d990e020fdd3bb6aea2bbeaca3ba8f2522b4da3d75b93f414ebf83d8b26b5ccbb38a64d  gnulib-test-fixes.patch
+08f6de0e4c1615503a276fb7eb8abb3f1a996d3e9e4c789deb1507e9ac66364e3993591e37ee444d239c64bf3b7d61f909c0da5ead3047b75623cd846e9f868f  gnulib-test-fixes.patch
 aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c  date-debug.patch
 0b90b7721dd01bd22eba50f73bc756930dd4a8bc78ec408ce7f155a02b520375023897b9d12872030735d908208b912ea7adfac9e8b4d055e617873d982eef56  test-df-symlink-bindmount.patch"
 [ "${CBUILD}" != "${CHOST}" ] && sha512sums="
diff --git a/system/coreutils/gnulib-test-fixes.patch b/system/coreutils/gnulib-test-fixes.patch
index abe010f7d..5455cf7cd 100644
--- a/system/coreutils/gnulib-test-fixes.patch
+++ b/system/coreutils/gnulib-test-fixes.patch
@@ -33,3 +33,15 @@
 -
    return 0;
  }
+--- coreutils-8.31/gnulib-tests/test-getlogin.h	2019-01-04 10:14:43.000000000 -0600
++++ coreutils-8.31/gnulib-tests/test-getlogin.h	2019-09-11 06:50:47.791580246 -0500
+@@ -61,6 +61,9 @@ test_getlogin_result (const char *buf, i
+     struct stat stat_buf;
+     struct passwd *pwd;
+ 
++    fprintf (stderr, "Skipping test: this is a bogus assumption\n");
++    exit(77);
++
+     if (!isatty (STDIN_FILENO))
+       {
+          fprintf (stderr, "Skipping test: stdin is not a tty.\n");
-- 
cgit v1.2.3-60-g2f50


From 34908a6df0a38308174a2d27fec5169404de5075 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Wed, 11 Sep 2019 18:15:55 -0500
Subject: system/binutils: disable static 1d test for now (#170, #196)

---
 system/binutils/APKBUILD                |  2 ++
 system/binutils/disable-static-1d.patch | 42 +++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 system/binutils/disable-static-1d.patch

diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index c7924b43e..dadb06611 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -19,6 +19,7 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	disable-gnu-mbind.patch
 	disable-ifunc-tests.patch
 	disable-preinit-array-tests.patch
+	disable-static-1d.patch
 	remove-pr2404-tests.patch
 	remove-pr19719-test.patch
 	remove-pr19553c-test.patch
@@ -139,6 +140,7 @@ ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735
 d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6  disable-gnu-mbind.patch
 474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2  disable-ifunc-tests.patch
 3537752e63cef0b5ef136d003ff7e814ba66b12624d817430112d0f291a792e8960fa69a78036f526af835441b3ee483d6a53d55c7b3dd8ee96f0399682dbcbe  disable-preinit-array-tests.patch
+d4543d2f77808d317d17a5f0eb9af21540ef8543fceaed4e3524213e31e058333321f3ba3b495199e3b57bfd0c4164929cf679369470389e26871b8895cb0110  disable-static-1d.patch
 32ab4215669c728648179c124632467573a3d4675e79f0f0d221c22eb2ec1ca5488b79910bd09142f90a1e0d0b81d99ca4846297f4f9561f158db63745facb66  remove-pr2404-tests.patch
 a193d1fa7f42d91915960460a15e4d24e0df529d81e23014bcf45d283fae76bb7b300fdcb0d0a9d521cdb9137322efa1dc357112596d6ae7a7fd05988ac359b9  remove-pr19719-test.patch
 39ef9c76dd5db6b15f11ffa8061f7ca844fb79c3fb9879c3b1466eef332a28b833597c87003ab9f260b1b85023fae264659088aee27cad7e5aa77b2d58b9a3f6  remove-pr19553c-test.patch
diff --git a/system/binutils/disable-static-1d.patch b/system/binutils/disable-static-1d.patch
new file mode 100644
index 000000000..daca64319
--- /dev/null
+++ b/system/binutils/disable-static-1d.patch
@@ -0,0 +1,42 @@
+The "No PLT (static 1d)" link test fails on pmmx and x86_64.
+lea is being emitted instead of mov.
+
+https://bts.adelielinux.org/show_bug.cgi?id=170
+https://bts.adelielinux.org/show_bug.cgi?id=196
+
+--- binutils-2.32/ld/testsuite/ld-x86-64/no-plt.exp	2019-01-19 10:01:34.000000000 -0600
++++ binutils-2.32/ld/testsuite/ld-x86-64/no-plt.exp	2019-09-11 17:21:27.232257151 -0500
+@@ -100,15 +100,6 @@ run_cc_link_tests [list \
+ 	"no-plt-1c" \
+     ] \
+     [list \
+-	"No PLT (static 1d)" \
+-	"-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
+-	"no-plt-1d" \
+-    ] \
+-    [list \
+ 	"No PLT (PIE 1e)" \
+ 	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+--- binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-01-19 10:01:33.000000000 -0600
++++ binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-09-11 18:03:48.012302603 -0500
+@@ -102,15 +102,6 @@ run_cc_link_tests [list \
+ 	"no-plt-1c" \
+     ] \
+     [list \
+-	"No PLT (static 1d)" \
+-	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
+-	"no-plt-1d" \
+-    ] \
+-    [list \
+ 	"No PLT (PIE 1e)" \
+ 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-- 
cgit v1.2.3-60-g2f50


From 5288e2ca3c782ef019828c98d33f7f4e711a60cb Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Wed, 11 Sep 2019 19:39:21 -0500
Subject: system/libssh2: kneecap test that relies on tty group access

---
 system/libssh2/APKBUILD        |  6 ++++--
 system/libssh2/test-sshd.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 system/libssh2/test-sshd.patch

diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD
index 913934a46..401fa2cf0 100644
--- a/system/libssh2/APKBUILD
+++ b/system/libssh2/APKBUILD
@@ -10,7 +10,8 @@ license="BSD-3-Clause"
 checkdepends="openssh-server"
 makedepends="openssl-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz"
+source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz
+	test-sshd.patch"
 
 build() {
 	./configure \
@@ -33,4 +34,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17  libssh2-1.9.0.tar.gz"
+sha512sums="41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17  libssh2-1.9.0.tar.gz
+eef3c43184d53a3c655915ad61d182a88d9cced75ba8f8dde73ccf771ff4aeaa0f26e95aeb53601d7c47d96a2421c98678e9baf497f3883faa4427a091eea62c  test-sshd.patch"
diff --git a/system/libssh2/test-sshd.patch b/system/libssh2/test-sshd.patch
new file mode 100644
index 000000000..6cc6d711e
--- /dev/null
+++ b/system/libssh2/test-sshd.patch
@@ -0,0 +1,33 @@
+--- libssh2-1.9.0/tests/ssh2.sh	2010-10-25 17:15:14.000000000 -0500
++++ libssh2-1.9.0/tests/ssh2.sh	2019-09-11 18:52:25.932354801 -0500
+@@ -28,6 +28,7 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host
+     -o 'UsePrivilegeSeparation no' \
+     -o 'StrictModes no' \
+     -D \
++    -e \
+     $libssh2_sshd_params &
+ sshdpid=$!
+ 
+--- libssh2-1.9.0/tests/ssh2.c	2019-03-26 08:08:54.000000000 -0500
++++ libssh2-1.9.0/tests/ssh2.c	2019-09-11 19:38:03.782403778 -0500
+@@ -143,20 +143,6 @@ int main(int argc, char *argv[])
+      */
+     libssh2_channel_setenv(channel, "FOO", "bar");
+ 
+-    /* Request a terminal with 'vanilla' terminal emulation
+-     * See /etc/termcap for more options
+-     */
+-    if(libssh2_channel_request_pty(channel, "vanilla")) {
+-        fprintf(stderr, "Failed requesting pty\n");
+-        goto skip_shell;
+-    }
+-
+-    /* Open a SHELL on that pty */
+-    if(libssh2_channel_shell(channel)) {
+-        fprintf(stderr, "Unable to request shell on allocated pty\n");
+-        goto shutdown;
+-    }
+-
+     ec = 0;
+ 
+   skip_shell:
-- 
cgit v1.2.3-60-g2f50


From fcbe5e492440c689fc170127ce6d05e833e4f56e Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Thu, 12 Sep 2019 19:57:30 -0500
Subject: system/cmake: disable CTestTestUpload in check()

---
 system/cmake/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD
index 6cfe2f61c..38bdbf3ad 100644
--- a/system/cmake/APKBUILD
+++ b/system/cmake/APKBUILD
@@ -44,7 +44,8 @@ build() {
 }
 
 check() {
-	CTEST_OUTPUT_ON_FAILURE=TRUE bin/ctest
+	# skip CTestTestUpload: tries to upload something during check...
+	CTEST_OUTPUT_ON_FAILURE=TRUE bin/ctest -E CTestTestUpload
 }
 
 package() {
-- 
cgit v1.2.3-60-g2f50


From 01f5c4c43e7f0ad357b39e6307413c46aa9d1f7d Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 17 Sep 2019 14:02:23 -0500
Subject: system/binutils: disable failing pmmx tests (#196)

---
 system/binutils/APKBUILD                |   8 +-
 system/binutils/BTS-170.patch           |  42 ++++++++
 system/binutils/BTS-196.patch           | 173 ++++++++++++++++++++++++++++++++
 system/binutils/disable-static-1d.patch |  42 --------
 4 files changed, 220 insertions(+), 45 deletions(-)
 create mode 100644 system/binutils/BTS-170.patch
 create mode 100644 system/binutils/BTS-196.patch
 delete mode 100644 system/binutils/disable-static-1d.patch

diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index dadb06611..490ab485e 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -19,7 +19,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	disable-gnu-mbind.patch
 	disable-ifunc-tests.patch
 	disable-preinit-array-tests.patch
-	disable-static-1d.patch
 	remove-pr2404-tests.patch
 	remove-pr19719-test.patch
 	remove-pr19553c-test.patch
@@ -31,6 +30,8 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	CVE-2019-9077.patch
 	CVE-2019-12972.patch
 	CVE-2019-14250.patch
+	BTS-170.patch
+	BTS-196.patch
 	"
 
 if [ "$CHOST" != "$CTARGET" ]; then
@@ -140,7 +141,6 @@ ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735
 d378fdf1964f8f2bd0b1e62827ac5884bdf943aa435ec89c29fc84bb045d406b733fffaff8fdd8bd1cba8ddea7701c4cf6ccf3ed76a8a3df9c72b447737575a6  disable-gnu-mbind.patch
 474ab24097bbb5b24433620549e5234fe65c547824c1342f693c718ffbc81e2d968259cce2d650b55200dd1ec89da207ea2db10c551cd9941285c4600b4297b2  disable-ifunc-tests.patch
 3537752e63cef0b5ef136d003ff7e814ba66b12624d817430112d0f291a792e8960fa69a78036f526af835441b3ee483d6a53d55c7b3dd8ee96f0399682dbcbe  disable-preinit-array-tests.patch
-d4543d2f77808d317d17a5f0eb9af21540ef8543fceaed4e3524213e31e058333321f3ba3b495199e3b57bfd0c4164929cf679369470389e26871b8895cb0110  disable-static-1d.patch
 32ab4215669c728648179c124632467573a3d4675e79f0f0d221c22eb2ec1ca5488b79910bd09142f90a1e0d0b81d99ca4846297f4f9561f158db63745facb66  remove-pr2404-tests.patch
 a193d1fa7f42d91915960460a15e4d24e0df529d81e23014bcf45d283fae76bb7b300fdcb0d0a9d521cdb9137322efa1dc357112596d6ae7a7fd05988ac359b9  remove-pr19719-test.patch
 39ef9c76dd5db6b15f11ffa8061f7ca844fb79c3fb9879c3b1466eef332a28b833597c87003ab9f260b1b85023fae264659088aee27cad7e5aa77b2d58b9a3f6  remove-pr19553c-test.patch
@@ -151,4 +151,6 @@ f52d21f194c2d7dbdc56e93636d3228034ee1718b457e5a5ce289bba2454155846d1ff6ea8530d11
 a46b9211608e2f35219b95363a5ba90506742dcb9e4bd4a43915af6c0b3e74bd8339a8318dc2923c0952ef579112412cb1cf619a5f090066769a852587b27d03  CVE-2019-9075.patch
 c0f50f1a843480f29b3895c8814df9801b9f90260edbaff1831aa5738fedd07a9e6b7a79f5b6f9be34df4954dbf02feb5232ebbecc596277fc2fe63673ed347c  CVE-2019-9077.patch
 9109a6ff9c55f310f86a1561fe6b404534928d402672490059bbe358f77c0c2a7f73c8b67f0a4450f00ba1776452858b63fa60cf2ec0744104a6b077e8fa3e42  CVE-2019-12972.patch
-c277202272d9883741c2530a94c6d50d55dd9d0a9efaa43a1f8c9fc7529bd45e635255c0d90035dfc5920d5387010a4259612a4d711260a95d7b3d9fa6500e4f  CVE-2019-14250.patch"
+c277202272d9883741c2530a94c6d50d55dd9d0a9efaa43a1f8c9fc7529bd45e635255c0d90035dfc5920d5387010a4259612a4d711260a95d7b3d9fa6500e4f  CVE-2019-14250.patch
+d4543d2f77808d317d17a5f0eb9af21540ef8543fceaed4e3524213e31e058333321f3ba3b495199e3b57bfd0c4164929cf679369470389e26871b8895cb0110  BTS-170.patch
+dec581f7314f893f927acdaeb4436f5576a69418aaac3edd374a0efc473aeedda419f10e193adb59e02d37d03f576bf383821ec560d7aa21c1e4aec24e868375  BTS-196.patch"
diff --git a/system/binutils/BTS-170.patch b/system/binutils/BTS-170.patch
new file mode 100644
index 000000000..daca64319
--- /dev/null
+++ b/system/binutils/BTS-170.patch
@@ -0,0 +1,42 @@
+The "No PLT (static 1d)" link test fails on pmmx and x86_64.
+lea is being emitted instead of mov.
+
+https://bts.adelielinux.org/show_bug.cgi?id=170
+https://bts.adelielinux.org/show_bug.cgi?id=196
+
+--- binutils-2.32/ld/testsuite/ld-x86-64/no-plt.exp	2019-01-19 10:01:34.000000000 -0600
++++ binutils-2.32/ld/testsuite/ld-x86-64/no-plt.exp	2019-09-11 17:21:27.232257151 -0500
+@@ -100,15 +100,6 @@ run_cc_link_tests [list \
+ 	"no-plt-1c" \
+     ] \
+     [list \
+-	"No PLT (static 1d)" \
+-	"-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
+-	"no-plt-1d" \
+-    ] \
+-    [list \
+ 	"No PLT (PIE 1e)" \
+ 	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
+--- binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-01-19 10:01:33.000000000 -0600
++++ binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-09-11 18:03:48.012302603 -0500
+@@ -102,15 +102,6 @@ run_cc_link_tests [list \
+ 	"no-plt-1c" \
+     ] \
+     [list \
+-	"No PLT (static 1d)" \
+-	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
+-	"no-plt-1d" \
+-    ] \
+-    [list \
+ 	"No PLT (PIE 1e)" \
+ 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
diff --git a/system/binutils/BTS-196.patch b/system/binutils/BTS-196.patch
new file mode 100644
index 000000000..a49bd3ed2
--- /dev/null
+++ b/system/binutils/BTS-196.patch
@@ -0,0 +1,173 @@
+https://bts.adelielinux.org/show_bug.cgi?id=196
+
+--- binutils-2.32/ld/testsuite/ld-i386/i386.exp	2019-01-19 10:01:33.000000000 -0600
++++ binutils-2.32/ld/testsuite/ld-i386/i386.exp	2019-09-17 13:47:29.921108280 -0500
+@@ -1035,23 +1035,6 @@ if { [isnative]
+ 	    "pr18900.out" \
+ 	] \
+ 	[list \
+-	    "Run pr19031" \
+-	    "$NOPIE_LDFLAGS tmpdir/pr19031.so" \
+-	    "-Wa,-mx86-used-note=yes" \
+-	    { pr19031b.S pr19031c.c } \
+-	    "pr19031" \
+-	    "pr19031.out" \
+-	    "$NOPIE_CFLAGS" \
+-	] \
+-	[list \
+-	    "Run got1" \
+-	    "$NOPIE_LDFLAGS tmpdir/got1d.so" \
+-	    "-Wa,-mx86-used-note=yes" \
+-	    { got1a.S got1b.c got1c.c } \
+-	    "got1" \
+-	    "got1.out" \
+-	] \
+-	[list \
+ 	    "Run property 1" \
+ 	    "" \
+ 	    "-Wa,-mx86-used-note=yes" \
+@@ -1159,8 +1142,6 @@ if { [isnative]
+     ]
+ 
+     undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
+-    undefined_weak "-fPIE" "$NOPIE_LDFLAGS"
+-    undefined_weak "-fPIE" "-pie"
+     undefined_weak "-fPIE" "-z nodynamic-undefined-weak $NOPIE_LDFLAGS"
+     undefined_weak "-fPIE" "-pie -z nodynamic-undefined-weak"
+ }
+@@ -1327,15 +1308,6 @@ if { [isnative]
+ 	    "$NOPIE_CFLAGS" \
+ 	] \
+ 	[list \
+-	    "Run pr22001-1" \
+-	    "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
+-	    "-Wa,-mx86-used-note=yes" \
+-	    { pr22001-1b.c } \
+-	    "pr22001-1" \
+-	    "pass.out" \
+-	    "$NOPIE_CFLAGS" \
+-	] \
+-	[list \
+ 	    "Run pr22001-1 (PIE 1)" \
+ 	    "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
+ 	    "-Wa,-mx86-used-note=yes" \
+@@ -1370,15 +1342,6 @@ if { [isnative]
+ 	    "-fPIC" \
+ 	] \
+ 	[list \
+-	    "Run pr21997-1" \
+-	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
+-	    "-Wa,-mx86-used-note=yes" \
+-	    { pr21997-1b.c } \
+-	    "pr21997-1" \
+-	    "pass.out" \
+-	    "$NOPIE_CFLAGS" \
+-	] \
+-	[list \
+ 	    "Run pr21997-1 (PIC 1)" \
+ 	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
+ 	    "-Wa,-mx86-used-note=yes" \
+--- binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-09-17 13:51:35.771111471 -0500
++++ binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-09-17 14:00:48.581118647 -0500
+@@ -66,69 +66,6 @@ run_cc_link_tests [list \
+ 	"libno-plt-1a.so" \
+     ] \
+     [list \
+-	"Build libno-plt-1b.so" \
+-	"-shared tmpdir/no-plt-extern1a.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr libno-plt-1b.rd} \
+-	 {objdump -dwrj.text libno-plt-1b.dd}} \
+-	"libno-plt-1b.so" \
+-    ] \
+-    [list \
+-	"No PLT (dynamic 1a)" \
+-	"$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1a.rd} {objdump -dwrj.text no-plt-1a.dd}} \
+-	"no-plt-1a" \
+-    ] \
+-    [list \
+-	"No PLT (dynamic 1b)" \
+-	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1b.rd} {objdump -dwrj.text no-plt-1b.dd}} \
+-	"no-plt-1b" \
+-    ] \
+-    [list \
+-	"No PLT (dynamic 1c)" \
+-	"$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1c.rd} {objdump -dwrj.text no-plt-1c.dd}} \
+-	"no-plt-1c" \
+-    ] \
+-    [list \
+-	"No PLT (PIE 1e)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1e.rd} {objdump -dwrj.text no-plt-1e.dd}} \
+-	"no-plt-1e" \
+-    ] \
+-    [list \
+-	"No PLT (PIE 1f)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	{{readelf -Wr no-plt-1f.rd} {objdump -dwrj.text no-plt-1f.dd}} \
+-	"no-plt-1f" \
+-    ] \
+-    [list \
+-	"No PLT (PIE 1g)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	{{readelf -Wr no-plt-1g.rd} {objdump -dwrj.text no-plt-1g.dd}} \
+-	"no-plt-1g" \
+-    ] \
+-    [list \
+ 	"No PLT (dynamic 1h)" \
+ 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
+@@ -146,15 +83,6 @@ run_cc_link_tests [list \
+ 	{{readelf -Wr no-plt-1i.rd} {objdump -dwrj.text no-plt-1i.dd}} \
+ 	"no-plt-1i" \
+     ] \
+-    [list \
+-	"No PLT (static 1j)" \
+-	"-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	{{readelf -Wr no-plt-1j.rd} {objdump -dwrj.text no-plt-1j.dd}} \
+-	"no-plt-1j" \
+-    ] \
+ ]
+ 
+ run_ld_link_exec_tests [list \
+@@ -239,15 +167,6 @@ run_ld_link_exec_tests [list \
+ 	"no-plt-1i" \
+ 	"pass.out" \
+     ] \
+-    [list \
+-	"No PLT (static 1j)" \
+-	"-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{dummy.s} \
+-	"no-plt-1j" \
+-	"pass.out" \
+-    ] \
+ ]
+ 
+ # Run-time tests which require working IFUNC support.
diff --git a/system/binutils/disable-static-1d.patch b/system/binutils/disable-static-1d.patch
deleted file mode 100644
index daca64319..000000000
--- a/system/binutils/disable-static-1d.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-The "No PLT (static 1d)" link test fails on pmmx and x86_64.
-lea is being emitted instead of mov.
-
-https://bts.adelielinux.org/show_bug.cgi?id=170
-https://bts.adelielinux.org/show_bug.cgi?id=196
-
---- binutils-2.32/ld/testsuite/ld-x86-64/no-plt.exp	2019-01-19 10:01:34.000000000 -0600
-+++ binutils-2.32/ld/testsuite/ld-x86-64/no-plt.exp	2019-09-11 17:21:27.232257151 -0500
-@@ -100,15 +100,6 @@ run_cc_link_tests [list \
- 	"no-plt-1c" \
-     ] \
-     [list \
--	"No PLT (static 1d)" \
--	"-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
--	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
--	"-Wa,-mx86-used-note=yes" \
--	{dummy.s} \
--	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
--	"no-plt-1d" \
--    ] \
--    [list \
- 	"No PLT (PIE 1e)" \
- 	"-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
- 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
---- binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-01-19 10:01:33.000000000 -0600
-+++ binutils-2.32/ld/testsuite/ld-i386/no-plt.exp	2019-09-11 18:03:48.012302603 -0500
-@@ -102,15 +102,6 @@ run_cc_link_tests [list \
- 	"no-plt-1c" \
-     ] \
-     [list \
--	"No PLT (static 1d)" \
--	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
--	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
--	"-Wa,-mx86-used-note=yes" \
--	{dummy.s} \
--	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
--	"no-plt-1d" \
--    ] \
--    [list \
- 	"No PLT (PIE 1e)" \
- 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
- 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-- 
cgit v1.2.3-60-g2f50


From a53244f05ed3c6d7e39d40cd04d084333ae39aa1 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Tue, 17 Sep 2019 15:41:25 -0500
Subject: system/binutils: disable further tests that rely on the failing pmmx
 ones (#196)

---
 system/binutils/APKBUILD      |  2 +-
 system/binutils/BTS-196.patch | 52 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index 490ab485e..33e6579c0 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -153,4 +153,4 @@ c0f50f1a843480f29b3895c8814df9801b9f90260edbaff1831aa5738fedd07a9e6b7a79f5b6f9be
 9109a6ff9c55f310f86a1561fe6b404534928d402672490059bbe358f77c0c2a7f73c8b67f0a4450f00ba1776452858b63fa60cf2ec0744104a6b077e8fa3e42  CVE-2019-12972.patch
 c277202272d9883741c2530a94c6d50d55dd9d0a9efaa43a1f8c9fc7529bd45e635255c0d90035dfc5920d5387010a4259612a4d711260a95d7b3d9fa6500e4f  CVE-2019-14250.patch
 d4543d2f77808d317d17a5f0eb9af21540ef8543fceaed4e3524213e31e058333321f3ba3b495199e3b57bfd0c4164929cf679369470389e26871b8895cb0110  BTS-170.patch
-dec581f7314f893f927acdaeb4436f5576a69418aaac3edd374a0efc473aeedda419f10e193adb59e02d37d03f576bf383821ec560d7aa21c1e4aec24e868375  BTS-196.patch"
+9cc17d9fe3fc1351d1f6b4fc1c916254529f3304c95db6f4698b867eeb623210b914dc798fb837eafbad2b287b78b31c4ed5482b3151a2992864da04e1dd5fac  BTS-196.patch"
diff --git a/system/binutils/BTS-196.patch b/system/binutils/BTS-196.patch
index a49bd3ed2..08316d279 100644
--- a/system/binutils/BTS-196.patch
+++ b/system/binutils/BTS-196.patch
@@ -155,7 +155,57 @@ https://bts.adelielinux.org/show_bug.cgi?id=196
  ]
  
  run_ld_link_exec_tests [list \
-@@ -239,15 +167,6 @@ run_ld_link_exec_tests [list \
+@@ -168,24 +96,6 @@ run_ld_link_exec_tests [list \
+ 	"pass.out" \
+     ] \
+     [list \
+-	"No PLT (dynamic 1b)" \
+-	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1b" \
+-	"pass.out" \
+-    ] \
+-    [list \
+-	"No PLT (dynamic 1c)" \
+-	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1c" \
+-	"pass.out" \
+-    ] \
+-    [list \
+ 	"No PLT (static 1d)" \
+ 	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
+@@ -204,24 +114,6 @@ run_ld_link_exec_tests [list \
+ 	"pass.out" \
+     ] \
+     [list \
+-	"No PLT (PIE 1f)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1f" \
+-	"pass.out" \
+-    ] \
+-    [list \
+-	"No PLT (PIE 1g)" \
+-	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
+-	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
+-	"-Wa,-mx86-used-note=yes" \
+-	{ dummy.s } \
+-	"no-plt-1g" \
+-	"pass.out" \
+-    ] \
+-    [list \
+ 	"No PLT (dynamic 1h)" \
+ 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
+ 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
+@@ -239,15 +131,6 @@ run_ld_link_exec_tests [list \
  	"no-plt-1i" \
  	"pass.out" \
      ] \
-- 
cgit v1.2.3-60-g2f50


From 48545ebadf2369ca84622698234df68b8b36dba6 Mon Sep 17 00:00:00 2001
From: Luis Ressel <aranea@aixah.de>
Date: Fri, 20 Sep 2019 01:28:03 +0200
Subject: Prefer ssmtp over netqmail and postfix for cmd:sendmail

This is required to automatically build fcron.
---
 system/ssmtp/APKBUILD  | 1 +
 user/netqmail/APKBUILD | 1 +
 user/postfix/APKBUILD  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/system/ssmtp/APKBUILD b/system/ssmtp/APKBUILD
index 64d2ae710..4d77bb213 100644
--- a/system/ssmtp/APKBUILD
+++ b/system/ssmtp/APKBUILD
@@ -9,6 +9,7 @@ arch="all"
 options="!check"
 license="GPL-2.0+"
 provides=/usr/sbin/sendmail
+provider_priority=10
 depends=
 makedepends="openssl-dev autoconf"
 subpackages="$pkgname-doc"
diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index 8329792ad..698c0c4d9 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -13,6 +13,7 @@ depends="execline s6 s6-networking"
 makedepends="utmps-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.post-install $pkgname.pre-deinstall"
+provider_priority=1
 source="http://www.qmail.org/$pkgname-$pkgver.tar.gz
 	0001-DESTDIR.patch
 	0002-qbiffutmpx-20170820.patch
diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD
index 25e50d8ac..af1146761 100644
--- a/user/postfix/APKBUILD
+++ b/user/postfix/APKBUILD
@@ -16,6 +16,7 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc
 	$pkgname-pgsql $pkgname-sqlite"
 pkgusers="postfix"
 pkggroups="postfix postdrop"
+provider_priority=1
 source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz
 	honour-config-directory.patch
 	postfix.initd
-- 
cgit v1.2.3-60-g2f50