patch updates

12 files changed, 138 insertions, 111 deletions

diff --git a/src/stage2/patches/generic/file.patch b/src/stage2/patches/generic/file.patch
index 8aeaf1b..5271de7 100644
--- a/src/stage2/patches/generic/file.patch
+++ b/src/stage2/patches/generic/file.patch
@@ -1,11 +1,12 @@
---- a/PKGBUILD	2018-02-16 14:06:38.830608498 +0100
-+++ b/PKGBUILD	2018-02-16 14:13:14.468358210 +0100
-@@ -32,7 +32,7 @@ prepare() {
- 
- build() {
-   cd $pkgname-$pkgver
--  ./configure --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5
-+  ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr --datadir=/usr/share/file --enable-fsect-man5
-   make
- }
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-04 07:49:44.970750918 +0200
++++ b/PKGBUILD	2018-06-04 07:59:06.607423186 +0200
+@@ -38,6 +38,8 @@ build() {
+   # this breaks makepkg, specifically on the linux PKGBUILD's patch-*.xz
  
+   ./configure \
++    --host=@CHOST@ \
++    --build=@BUILDHOST@ \
+     --prefix=/usr \
+     --datadir=/usr/share/file \
+     --enable-fsect-man5 \
diff --git a/src/stage2/patches/generic/libidn2.patch b/src/stage2/patches/generic/libidn2.patch
index ca310c8..5d5f052 100644
--- a/src/stage2/patches/generic/libidn2.patch
+++ b/src/stage2/patches/generic/libidn2.patch
@@ -1,11 +1,12 @@
---- a/PKGBUILD	2018-02-16 14:27:03.120898876 +0100
-+++ b/PKGBUILD	2018-02-16 14:29:39.839309428 +0100
-@@ -24,7 +24,7 @@ prepare() {
- 
- build() {
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 22:51:32.770428709 +0200
++++ b/PKGBUILD	2018-06-04 06:30:31.070703483 +0200
+@@ -24,6 +24,8 @@ build() {
    cd $pkgname-$pkgver
--  ./configure --prefix=/usr
-+  ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr
-   make
- }
  
+   ./configure \
++    --host=@CHOST@ \
++    --build=@BUILDHOST@ \
+     --prefix=/usr \
+     --disable-static
+   make
diff --git a/src/stage2/patches/generic/lz4.patch b/src/stage2/patches/generic/lz4.patch
index 7e7810e..ffc2735 100644
--- a/src/stage2/patches/generic/lz4.patch
+++ b/src/stage2/patches/generic/lz4.patch
@@ -1,5 +1,6 @@
---- a/PKGBUILD	2018-02-16 19:31:06.236301056 +0100
-+++ b/PKGBUILD	2018-02-16 19:33:55.671497100 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-04 06:31:30.220704078 +0200
++++ b/PKGBUILD	2018-06-04 06:35:24.690706413 +0200
 @@ -19,7 +19,9 @@ build() {
    # do not use the main makefile, it calls sub make with -e
    # exported CLFAGS by makepkg break the version. see FS#50071
@@ -10,11 +11,11 @@
    make -C programs PREFIX=/usr lz4 lz4c
  }
  
-@@ -34,6 +36,7 @@ check() {
+@@ -33,6 +35,7 @@ check() {
+ 
  package() {
    cd $pkgname
-   # mandir is broken since 1.8.0
 +  CC=@CHOST@-gcc RANLIB=@CHOST@-ranlib AR=@CHOST@-ar \
-   make install PREFIX=/usr MANDIR=/usr/share/man/man1 DESTDIR="$pkgdir"
+   make install PREFIX=/usr DESTDIR="$pkgdir"
  }
  
diff --git a/src/stage2/patches/generic/pkg-config.patch b/src/stage2/patches/generic/pkg-config.patch
deleted file mode 100644
index 5f067b0..0000000
--- a/src/stage2/patches/generic/pkg-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/PKGBUILD	2018-02-21 22:16:49.089757092 +0100
-+++ b/PKGBUILD	2018-02-21 22:17:09.426104699 +0100
-@@ -22,7 +22,7 @@ validpgpkeys=('6B99CE97F17F48C27F722D710
- 
- build() {
-   cd $pkgname-$pkgver
--  ./configure --build=$CHOST --prefix=/usr
-+  ./configure --host=@CHOST@ --build=@BUILDHOST@ --prefix=/usr
-   make
- }
- 
diff --git a/src/stage2/patches/generic/pkgconf.patch b/src/stage2/patches/generic/pkgconf.patch
new file mode 100644
index 0000000..07a573c
--- /dev/null
+++ b/src/stage2/patches/generic/pkgconf.patch
@@ -0,0 +1,12 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-04 09:09:01.524131712 +0200
++++ b/PKGBUILD	2018-06-04 09:09:42.540798790 +0200
+@@ -42,6 +42,8 @@ prepare() {
+ build() {
+   cd build
+   ../$pkgname/configure \
++    --host=@CHOST@ \
++    --build=@BUILDHOST@ \
+     --prefix=/usr \
+     --sysconfdir=/etc \
+     --with-pkg-config-dir="$_pcdirs" \
diff --git a/src/stage3/patches/generic/bzip2.patch b/src/stage3/patches/generic/bzip2.patch
new file mode 100644
index 0000000..edfd9ac
--- /dev/null
+++ b/src/stage3/patches/generic/bzip2.patch
@@ -0,0 +1,12 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 16:03:04.616850837 +0200
++++ b/PKGBUILD	2018-06-03 16:37:39.606871542 +0200
+@@ -16,7 +16,7 @@ source=(http://www.bzip.org/$pkgver/bzip
+         fix-heap-use-after-free-bzip2recover.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch)
+ sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002'
+           '85ce76fdb67f52f152bba368c1de81132dcdbdb5'
+-          '95f6187491bcd980f869c6857a72edb3e43e1064')
++          '3318e71b4a6d9d350a61f47de495301a937fad8a')
+ build() {
+   cd "$srcdir/$pkgname-$pkgver"
+ 
diff --git a/src/stage3/patches/generic/git.patch b/src/stage3/patches/generic/git.patch
index e2e9c8a..3d5e28d 100644
--- a/src/stage3/patches/generic/git.patch
+++ b/src/stage3/patches/generic/git.patch
@@ -1,17 +1,18 @@
---- a/PKGBUILD	2018-03-12 10:30:18.914223617 +0100
-+++ b/PKGBUILD	2018-03-12 12:13:57.392250473 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 19:37:49.390312733 +0200
++++ b/PKGBUILD	2018-06-03 19:52:17.116988058 +0200
 @@ -11,7 +11,6 @@ url="http://git-scm.com/"
  license=('GPL2')
- depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre2'
-          'grep' 'shadow')
+ depends=('curl' 'expat>=2.0' 'perl>=5.14.0' 'perl-error' 'perl-mailtools'
+          'openssl' 'pcre2' 'grep' 'shadow')
 -makedepends=('python2' 'emacs' 'libgnome-keyring' 'xmlto' 'asciidoc')
  optdepends=('tk: gitk and git gui'
              'perl-libwww: git svn'
              'perl-term-readkey: git svn'
-@@ -47,12 +46,9 @@ build() {
-     USE_LIBPCRE2=1 \
-     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-     MAN_BOLD_LITERAL=1 \
+@@ -55,12 +54,9 @@ build() {
+ 
+   make \
+     "${make_options[@]}" \
 -    all doc
 +    all
  
@@ -23,16 +24,16 @@
    make -C contrib/mw-to-git prefix=/usr all
    make -C contrib/diff-highlight prefix=/usr
  }
-@@ -87,7 +83,7 @@ package() {
-     USE_LIBPCRE2=1 \
-     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-     MAN_BOLD_LITERAL=1 \
--    INSTALLDIRS=vendor DESTDIR="$pkgdir" install install-doc
-+    INSTALLDIRS=vendor DESTDIR="$pkgdir" install
+@@ -92,7 +88,7 @@ package() {
+   make \
+     "${make_options[@]}" \
+     DESTDIR="$pkgdir" \
+-    install install-doc
++    install
  
    # bash completion
    mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
-@@ -95,18 +91,8 @@ package() {
+@@ -100,18 +96,8 @@ package() {
    # fancy git prompt
    mkdir -p "$pkgdir"/usr/share/git/
    install -m 0644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
@@ -51,4 +52,4 @@
 +  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install
    # mediawiki installation
    make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install
-   # the rest of the contrib stuff
+   mv "$pkgdir"/Git/Mediawiki.pm "$pkgdir"/usr/share/perl5/vendor_perl/Git/ && rmdir "$pkgdir"/Git # TODO: fix install path!
diff --git a/src/stage3/patches/generic/gpgme.patch b/src/stage3/patches/generic/gpgme.patch
index 14cc92e..5e2be11 100644
--- a/src/stage3/patches/generic/gpgme.patch
+++ b/src/stage3/patches/generic/gpgme.patch
@@ -1,13 +1,14 @@
---- a/PKGBUILD	2018-03-17 22:21:06.935704351 +0100
-+++ b/PKGBUILD	2018-03-17 22:28:17.113022076 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 10:29:39.543317896 +0200
++++ b/PKGBUILD	2018-06-03 10:31:08.406652115 +0200
 @@ -4,14 +4,14 @@
  # Contributor: Sarah Hay <sarah@archlinux.org>
  
  pkgbase=gpgme
 -pkgname=(gpgme qgpgme python-gpgme python2-gpgme)
 +pkgname=(gpgme python-gpgme python2-gpgme)
- pkgver=1.10.0
- pkgrel=2
+ pkgver=1.11.1
+ pkgrel=1
  pkgdesc="A C wrapper library for GnuPG"
  arch=('x86_64')
  url="http://www.gnupg.org/related_software/gpgme/"
@@ -15,9 +16,9 @@
 -makedepends=('libgpg-error' 'gnupg' 'qt5-base' 'python' 'python2' 'swig')
 +makedepends=('libgpg-error' 'gnupg' 'python' 'python2')
  source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig})
- sha256sums=('1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693'
+ sha256sums=('2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f'
              'SKIP')
-@@ -37,9 +37,9 @@ package_gpgme() {
+@@ -40,9 +40,9 @@ package_gpgme() {
    make DESTDIR="${pkgdir}" install
  
    # split qgpgme
diff --git a/src/stage3/patches/generic/python.patch b/src/stage3/patches/generic/python.patch
index 6907f42..fffe249 100644
--- a/src/stage3/patches/generic/python.patch
+++ b/src/stage3/patches/generic/python.patch
@@ -1,9 +1,10 @@
---- a/PKGBUILD	2018-03-14 17:34:32.258085785 +0100
-+++ b/PKGBUILD	2018-03-14 17:58:54.047708630 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 16:39:27.916872622 +0200
++++ b/PKGBUILD	2018-06-03 17:44:52.873578452 +0200
 @@ -14,7 +14,7 @@ arch=('x86_64')
  license=('custom')
  url="http://www.python.org/"
- depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
+ depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'libnsl')
 -makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb')
 +makedepends=('sqlite')
  optdepends=('python-setuptools'
@@ -28,7 +29,7 @@
 -  export servernum=99
 -  while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
 -
--  LC_CTYPE=en_US.UTF-8 xvfb-run -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
+-  LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
 +   make EXTRA_CFLAGS="$CFLAGS"
  }
  
diff --git a/src/stage3/patches/generic/python2.patch b/src/stage3/patches/generic/python2.patch
index d0b17f4..cc700d0 100644
--- a/src/stage3/patches/generic/python2.patch
+++ b/src/stage3/patches/generic/python2.patch
@@ -1,14 +1,15 @@
---- a/PKGBUILD	2018-03-12 18:57:35.511430226 +0100
-+++ b/PKGBUILD	2018-03-12 19:00:59.926712159 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 10:32:25.883319558 +0200
++++ b/PKGBUILD	2018-06-03 10:32:59.146653221 +0200
 @@ -13,7 +13,6 @@ arch=('x86_64')
  license=('PSF')
  url="http://www.python.org/"
- depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+ depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'openssl' 'sqlite' 'zlib')
 -makedepends=('tk' 'bluez-libs')
  checkdepends=('gdb' 'file' 'xorg-server-xvfb')
  optdepends=('tk: for IDLE'
              'python2-setuptools'
-@@ -71,7 +70,7 @@ build() {
+@@ -67,7 +66,7 @@ build() {
    ./configure --prefix=/usr \
                --enable-shared \
                --with-threads \
diff --git a/src/stage3/patches/generic/sqlite.patch b/src/stage3/patches/generic/sqlite.patch
index 9b8a670..034466d 100644
--- a/src/stage3/patches/generic/sqlite.patch
+++ b/src/stage3/patches/generic/sqlite.patch
@@ -1,11 +1,12 @@
---- a/PKGBUILD	2018-03-31 09:12:38.249279305 +0200
-+++ b/PKGBUILD	2018-03-31 09:28:36.403188494 +0200
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 11:04:25.416672041 +0200
++++ b/PKGBUILD	2018-06-03 11:10:25.303342299 +0200
 @@ -3,7 +3,7 @@
  # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
  
  pkgbase="sqlite"
 -pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc' 'sqlite-analyzer')
 +pkgname=('sqlite' 'sqlite-tcl' 'sqlite-analyzer')
- _srcver=3220000
+ _srcver=3230100
  _docver=${_srcver}
  #_docver=3080001
diff --git a/src/stage3/patches/powerpc64le/pacman.patch b/src/stage3/patches/powerpc64le/pacman.patch
index a60d681..08efd4a 100644
--- a/src/stage3/patches/powerpc64le/pacman.patch
+++ b/src/stage3/patches/powerpc64le/pacman.patch
@@ -1,46 +1,6 @@
---- a/PKGBUILD	2018-03-17 22:43:27.776000901 +0100
-+++ b/PKGBUILD	2018-03-17 22:45:57.506623741 +0100
-@@ -20,8 +20,7 @@ groups=('base' 'base-devel' 'base-openrc
- depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme'
-          'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring'
-          'archlinuxarm-keyring' 'archlinux32-keyring')
--makedepends=('asciidoc')
--makedepends+=('openssl>=1.1' 'openssl-1.0') # for during openssl 1.0->1.1 rebuild; remove on next rebuild
-+makedepends+=('openssl>=1.1')
- checkdepends=('python2' 'fakechroot')
- optdepends=('cron: run specified programs at scheduled times and related tools')
- provides=("$pkgname-contrib")
-@@ -45,6 +43,7 @@ sha256sums=('dfd36086ad68564bcd977f4a1fa
-             '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
-             '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58'
-             'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a'
-+            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
-             '0d174c7c47921cfbb35dacb9d099095e78f6f67bfaa86836a3e588552f14ed03'
-             '1df848c5038a3f81ae4dc79a4072d340109b02f56292a5c4a20c59f735edd2b3'
-             '1cc4af1cf8e2133d4520827cc7d3ffad731892595f8e699909002d2e40ad8df9'
-@@ -71,7 +70,7 @@ build() {
-   cd "$pkgname-$pkgver"
- 
-   ./configure --prefix=/usr --sysconfdir=/etc \
--    --localstatedir=/var --enable-doc \
-+    --localstatedir=/var --disable-doc \
-     --with-scriptlet-shell=/usr/bin/bash \
-     --with-ldconfig=/usr/bin/ldconfig
-   make V=1
-@@ -96,6 +95,11 @@ build() {
-         mychost="armv7l-unknown-linux-gnueabihf"
-         myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt"
-         ;;
-+      @CARCH@)
-+        mycarch="@CARCH@"
-+        mychost="@CHOST@"
-+        myflags="@PLATFORM_FLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
-+        ;;
-     esac
-     myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
- 
---- /dev/null	2018-03-05 07:42:50.020223709 +0100
-+++ b/pacman.conf.powerpc64le	2018-03-17 22:43:27.778000923 +0100
+diff -rupN a/pacman.conf.powerpc64le b/pacman.conf.powerpc64le
+--- a/pacman.conf.powerpc64le	1970-01-01 01:00:00.000000000 +0100
++++ b/pacman.conf.powerpc64le	2018-06-03 10:20:46.073312571 +0200
 @@ -0,0 +1,120 @@
 +#
 +# /etc/pacman.conf
@@ -162,3 +122,49 @@
 +#[custom]
 +#SigLevel = Optional TrustAll
 +#Server = file:///home/custompkgs
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-03 10:17:48.609977468 +0200
++++ b/PKGBUILD	2018-06-03 10:20:39.373312504 +0200
+@@ -23,7 +23,6 @@ groups+=('base-openrc')
+ depends=('bash' 'glibc' 'libarchive' 'curl'
+          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+ depends+=('parabola-keyring' 'archlinuxarm-keyring' 'archlinux32-keyring')
+-makedepends=('asciidoc')
+ checkdepends=('python2' 'fakechroot')
+ provides=('pacman-parabola')
+ conflicts=('pacman-parabola')
+@@ -43,10 +42,11 @@ source=(https://sources.archlinux.org/ot
+         0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch)
+ sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3'
+             'SKIP'
+-            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
+             '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58'
++            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
++            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
+             'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a'
+-            '31565aae027a26bb0e9074aca89a012483dc078e0239dc225c3c15fced526607'
++            'ecef1e98eaaf207f4f2c3d07cfe13533866e1e774240eb833e8b3bd691ada95f'
+             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
+             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
+             '635ef682073878b6273e3376b00a89a572c4f5f39b118f7b0b4c7497a265a16c'
+@@ -72,7 +72,7 @@ build() {
+   cd "$pkgname-$pkgver"
+ 
+   ./configure --prefix=/usr --sysconfdir=/etc \
+-    --localstatedir=/var --enable-doc \
++    --localstatedir=/var --disable-doc \
+     --with-scriptlet-shell=/usr/bin/bash \
+     --with-ldconfig=/usr/bin/ldconfig
+   make V=1
+@@ -96,6 +96,11 @@ build() {
+         mychost="armv7l-unknown-linux-gnueabihf"
+         myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt"
+         ;;
++      @CARCH@)
++        mycarch="@CARCH@"
++        mychost="@CHOST@"
++        myflags="@PLATFORM_FLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
++        ;;
+     esac
+     myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+