updated patches

11 files changed, 84 insertions, 54 deletions

diff --git a/src/shared/package.sh b/src/shared/package.sh
index 8e44d95..2a1a822 100644
--- a/src/shared/package.sh
+++ b/src/shared/package.sh
@@ -158,7 +158,6 @@ package_patch() {
     echo "no"
   fi
 
-
   local ln_patch="$patch"
   [ "x$patch" == "xno" ] && ln_patch="$SRCDIR/patches/generic/$pkgbase$p.patch"
   ln -s "$ln_patch" .PATCH
diff --git a/src/stage3/patches/generic/dbus.patch b/src/stage3/patches/generic/dbus.patch
index 331dff7..0d81c28 100644
--- a/src/stage3/patches/generic/dbus.patch
+++ b/src/stage3/patches/generic/dbus.patch
@@ -1,12 +1,13 @@
---- a/PKGBUILD	2018-03-17 08:33:41.172013008 +0100
-+++ b/PKGBUILD	2018-03-17 08:43:27.904825444 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 14:01:54.301835807 +0200
++++ b/PKGBUILD	2018-06-05 14:03:35.098503480 +0200
 @@ -5,7 +5,7 @@
  # Contributor: Link Dupont <link@subpop.net>
  
  pkgbase=dbus
 -pkgname=(dbus dbus-docs)
 +pkgname=(dbus)
- pkgver=1.12.6
+ pkgver=1.12.8
  pkgrel=1
  pkgdesc="Freedesktop.org message bus system"
 @@ -13,7 +13,7 @@ url="https://wiki.freedesktop.org/www/So
@@ -15,6 +16,6 @@
  depends=(libsystemd expat)
 -makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz)
 +makedepends=(systemd docbook-xsl python git autoconf-archive)
- _commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8  # tags/dbus-1.12.6^0
+ _commit=f8902fa1c840e3fab807016e6a00647b6ef9dd41  # tags/dbus-1.12.8^0
  source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit"
          'dbus.sysusers')
diff --git a/src/stage3/patches/generic/git.patch b/src/stage3/patches/generic/git.patch
index 3d5e28d..e474666 100644
--- a/src/stage3/patches/generic/git.patch
+++ b/src/stage3/patches/generic/git.patch
@@ -1,6 +1,6 @@
 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
+--- a/PKGBUILD	2018-06-05 08:23:49.458300076 +0200
++++ b/PKGBUILD	2018-06-05 08:24:47.231633983 +0200
 @@ -11,7 +11,6 @@ url="http://git-scm.com/"
  license=('GPL2')
  depends=('curl' 'expat>=2.0' 'perl>=5.14.0' 'perl-error' 'perl-mailtools'
@@ -9,23 +9,23 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  optdepends=('tk: gitk and git gui'
              'perl-libwww: git svn'
              'perl-term-readkey: git svn'
-@@ -55,12 +54,9 @@ build() {
- 
+@@ -64,12 +63,9 @@ build() {
    make \
+     "${make_paths[@]}" \
      "${make_options[@]}" \
 -    all doc
 +    all
  
--  make -C contrib/emacs prefix=/usr
+-  make -C contrib/emacs "${make_paths[@]}"
 -  make -C contrib/credential/gnome-keyring
 -  make -C contrib/credential/libsecret
--  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core all doc
-+  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core all
-   make -C contrib/mw-to-git prefix=/usr all
-   make -C contrib/diff-highlight prefix=/usr
+-  make -C contrib/subtree "${make_paths[@]}" all doc
++  make -C contrib/subtree "${make_paths[@]}" all
+   make -C contrib/mw-to-git "${make_paths[@]}" all
+   make -C contrib/diff-highlight "${make_paths[@]}"
  }
-@@ -92,7 +88,7 @@ package() {
-   make \
+@@ -103,7 +99,7 @@ package() {
+     "${make_paths[@]}" \
      "${make_options[@]}" \
      DESTDIR="$pkgdir" \
 -    install install-doc
@@ -33,12 +33,12 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  
    # bash completion
    mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
-@@ -100,18 +96,8 @@ package() {
+@@ -111,18 +107,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
 -  # emacs
--  make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install
+-  make -C contrib/emacs "${make_paths[@]}" DESTDIR="$pkgdir" install
 -  # gnome credentials helper
 -  install -m 0755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
 -      "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
@@ -48,8 +48,8 @@ diff -rupN a/PKGBUILD b/PKGBUILD
 -      "$pkgdir"/usr/lib/git-core/git-credential-libsecret
 -  make -C contrib/credential/libsecret clean
    # subtree installation
--  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install install-doc
-+  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install
+-  make -C contrib/subtree "${make_paths[@]}" DESTDIR="$pkgdir" install install-doc
++  make -C contrib/subtree "${make_paths[@]}" DESTDIR="$pkgdir" install
    # mediawiki installation
-   make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install
-   mv "$pkgdir"/Git/Mediawiki.pm "$pkgdir"/usr/share/perl5/vendor_perl/Git/ && rmdir "$pkgdir"/Git # TODO: fix install path!
+   make -C contrib/mw-to-git "${make_paths[@]}" DESTDIR="$pkgdir" install
+   # the rest of the contrib stuff
diff --git a/src/stage3/patches/generic/lapack.patch b/src/stage3/patches/generic/lapack.patch
index 777be87..19c36bd 100644
--- a/src/stage3/patches/generic/lapack.patch
+++ b/src/stage3/patches/generic/lapack.patch
@@ -1,5 +1,6 @@
---- a/PKGBUILD	2018-03-17 16:28:41.782588188 +0100
-+++ b/PKGBUILD	2018-03-17 16:56:33.167656401 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 21:05:44.792089550 +0200
++++ b/PKGBUILD	2018-06-05 21:14:13.185427953 +0200
 @@ -5,12 +5,12 @@
  # Contributor: Jason Taylor <jftaylor21@gmail.com>
  
@@ -7,12 +8,12 @@
 -pkgname=('lapack' 'blas' 'cblas' 'lapacke' 'lapack-doc')
 +pkgname=('lapack' 'blas' 'cblas' 'lapacke')
  pkgver=3.8.0
- pkgrel=1
+ pkgrel=2
  url="http://www.netlib.org/lapack"
  pkgdesc="Linear Algebra PACKage"
 -makedepends=('gcc-fortran' 'cmake' 'python' 'doxygen')
 +makedepends=('gcc-fortran' 'cmake' 'python')
- arch=('i686' 'x86_64')
+ arch=('x86_64')
  license=("custom")
  source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tar.gz LICENSE.blas)
 @@ -32,10 +32,6 @@ build() {
diff --git a/src/stage3/patches/generic/libuv.patch b/src/stage3/patches/generic/libuv.patch
index 56f7e72..630efc9 100644
--- a/src/stage3/patches/generic/libuv.patch
+++ b/src/stage3/patches/generic/libuv.patch
@@ -1,12 +1,13 @@
---- a/PKGBUILD	2018-03-15 19:18:02.566897558 +0100
-+++ b/PKGBUILD	2018-03-15 19:24:59.499643475 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 21:17:19.425429812 +0200
++++ b/PKGBUILD	2018-06-05 21:18:00.678763557 +0200
 @@ -9,7 +9,6 @@ arch=('x86_64')
  url="https://github.com/libuv/libuv"
  license=('custom')
- depends=('glibc')
+ depends=('glibc' 'libnsl')
 -makedepends=('python-sphinx')
  source=("https://github.com/libuv/libuv/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
- sha512sums=('4fa879e34c51ae428ebf72ce80873b8d12994ae1560f9d3577a693653bfd5bd4b4fda7ff457b98b5e60fc82546658300401d6545d677f31d2cd66be3d82e02da')
+ sha512sums=('60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0')
  
 @@ -18,7 +17,6 @@ build() {
  	./autogen.sh
diff --git a/src/stage3/patches/generic/openmpi.patch b/src/stage3/patches/generic/openmpi.patch
index 0e8956b..b0b428e 100644
--- a/src/stage3/patches/generic/openmpi.patch
+++ b/src/stage3/patches/generic/openmpi.patch
@@ -1,9 +1,10 @@
---- a/PKGBUILD	2018-03-17 13:27:04.195349927 +0100
-+++ b/PKGBUILD	2018-03-17 13:43:25.922320165 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 18:38:14.958667912 +0200
++++ b/PKGBUILD	2018-06-05 18:39:30.538668672 +0200
 @@ -10,7 +10,7 @@ url='https://www.open-mpi.org'
  arch=('x86_64')
  license=('custom:OpenMPI')
- depends=('libltdl' 'hwloc' 'openssh')
+ depends=('libltdl' 'hwloc' 'openssh' 'zlib' 'libnl')
 -makedepends=('inetutils' 'valgrind' 'gcc-fortran')
 +makedepends=('gcc-fortran')
  optdepends=('gcc-fortran: fortran support')
diff --git a/src/stage3/patches/generic/p11-kit.patch b/src/stage3/patches/generic/p11-kit.patch
index bbf67ea..d9e4823 100644
--- a/src/stage3/patches/generic/p11-kit.patch
+++ b/src/stage3/patches/generic/p11-kit.patch
@@ -1,12 +1,13 @@
---- a/PKGBUILD	2018-03-12 16:05:29.210682618 +0100
-+++ b/PKGBUILD	2018-03-12 16:29:51.449789889 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 02:21:58.501416775 +0200
++++ b/PKGBUILD	2018-06-05 08:23:26.441633177 +0200
 @@ -9,7 +9,7 @@ arch=(x86_64)
  url="https://p11-glue.freedesktop.org"
  license=(BSD)
  depends=(glibc libtasn1 libffi)
 -makedepends=(gtk-doc git)
 +makedepends=(git)
- _commit=f6b7a992e442218a5afdbf8ae1697c53f3f03991  # tags/0.23.10^0
+ _commit=3dd5810143e51dabdc58069e55b09a950349fa08  # tags/0.23.12^0
  source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit"
          0001-Build-and-install-libnssckbi-p11-kit.so.patch)
 @@ -41,7 +41,7 @@ build() {
diff --git a/src/stage3/patches/generic/pam.patch b/src/stage3/patches/generic/pam.patch
index 17ddc16..238cdef 100644
--- a/src/stage3/patches/generic/pam.patch
+++ b/src/stage3/patches/generic/pam.patch
@@ -1,16 +1,19 @@
---- a/PKGBUILD	2018-03-16 19:50:33.760376502 +0100
-+++ b/PKGBUILD	2018-03-16 20:00:05.124785161 +0100
-@@ -10,7 +10,7 @@ arch=('x86_64')
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 10:17:50.875035004 +0200
++++ b/PKGBUILD	2018-06-05 13:08:38.295137250 +0200
+@@ -9,8 +9,8 @@ pkgdesc="PAM (Pluggable Authentication M
+ arch=('x86_64')
  license=('GPL2')
  url="http://linux-pam.org"
- depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
+-depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
 -makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
++depends=('glibc' 'cracklib' 'libtirpc' 'pambase' 'libnsl')
 +makedepends=('flex' 'docbook-xml>=4.4' 'docbook-xsl')
  backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
- source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2
-         https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
-@@ -64,5 +71,5 @@ package() {
-   chmod +s $pkgdir/usr/bin/unix_chkpwd
+ source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2)
+ md5sums=('da4b2289b7cfb19583d54e9eaaef1c3a')
+@@ -32,5 +32,5 @@ package() {
+ 
    # remove doc which is not used anymore
    # FS #40749
 -  rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html
diff --git a/src/stage3/patches/generic/python-lxml.patch b/src/stage3/patches/generic/python-lxml.patch
index e9103e4..03cda8d 100644
--- a/src/stage3/patches/generic/python-lxml.patch
+++ b/src/stage3/patches/generic/python-lxml.patch
@@ -1,21 +1,22 @@
---- a/PKGBUILD	2018-03-15 22:28:13.742085702 +0100
-+++ b/PKGBUILD	2018-03-16 08:33:19.888281296 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 15:27:34.628553763 +0200
++++ b/PKGBUILD	2018-06-05 15:29:07.681888025 +0200
 @@ -3,14 +3,13 @@
  # Maintainer: Felix Yan <felixonmars@archlinux.org>
  
  pkgbase=python-lxml
 -pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
 +pkgname=('python-lxml' 'python2-lxml')
- pkgver=4.1.1
+ pkgver=4.2.1
  pkgrel=1
  arch=('x86_64')
  license=('BSD' 'custom')
  url="http://lxml.de/"
 -makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' 'epydoc' 'python2-pygments'
--             'python2-docutils')
+-             'python2-docutils' 'cython' 'cython2')
 +makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' 'cython' 'cython2')
  checkdepends=('python-cssselect' 'python2-cssselect' 'python-html5lib' 'python2-html5lib'
-               'python-beautifulsoup4' 'python2-beautifulsoup4' 'cython' 'cython2')
+               'python-beautifulsoup4' 'python2-beautifulsoup4')
  source=("https://github.com/lxml/lxml/archive/lxml-$pkgver.tar.gz")
 @@ -30,7 +29,6 @@ build() {
  
diff --git a/src/stage3/patches/generic/quota-tools.patch b/src/stage3/patches/generic/quota-tools.patch
new file mode 100644
index 0000000..0a4bfbc
--- /dev/null
+++ b/src/stage3/patches/generic/quota-tools.patch
@@ -0,0 +1,10 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-05 14:37:14.328523627 +0200
++++ b/PKGBUILD	2018-06-05 15:24:50.468552125 +0200
+@@ -28,5 +28,5 @@ package() {
+   head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ 
+ # remove conflicts with glibc
+-  rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x}
++  rm -f "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x}
+ }
diff --git a/src/stage3/patches/generic/systemd.patch b/src/stage3/patches/generic/systemd.patch
index 62177a6..1aa95dc 100644
--- a/src/stage3/patches/generic/systemd.patch
+++ b/src/stage3/patches/generic/systemd.patch
@@ -1,9 +1,10 @@
---- a/PKGBUILD	2018-03-16 18:23:58.112034593 +0100
-+++ b/PKGBUILD	2018-03-16 18:59:17.686017180 +0100
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-06 05:21:02.252386067 +0200
++++ b/PKGBUILD	2018-06-06 06:15:14.332418516 +0200
 @@ -85,6 +85,10 @@ sha512sums=('SKIP'
  _backports=(
-   # core: do not free heap-allocated strings (#8391) (FS#57741)
-   '5cbaad2f6795088db56063d20695c6444595822f'
+   # nspawn: wait for network namespace creation before interface setup (#8633)
+   '7511655807e90aa33ea7b71991401a79ec36bb41'
 +  # basic/macros: rename noreturn into _noreturn_ (#8456)
 +  '848e863acc51ecfb0f3955c498874588201d9130'
 +  # core: don't include libmount.h in a header file (#8580)
@@ -11,7 +12,18 @@
  )
  
  _reverts=(
-@@ -261,7 +265,7 @@ package_systemd() {
+@@ -134,7 +138,9 @@ prepare() {
+   git remote add -f upstream ../systemd
+   git checkout "$_commit"
+ 
+-  _validate_tag || return
++  # temporary hack due to upstream build issues
++  # https://tests.reproducible-builds.org/archlinux/core/systemd/build1.log
++  #_validate_tag || return
+ 
+   local c
+   for c in "${_backports[@]}"; do
+@@ -261,7 +267,7 @@ package_systemd() {
    rm -rv "$pkgdir"/etc/systemd/system/*
  
    # we'll create this on installation