diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 11:35:22 +0200 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 11:35:22 +0200 |
commit | e6dd9f20bbbe666a5f5e0bafec283a435b8b5c0b (patch) | |
tree | abaae8404ca29ef4a0b2878a0d53103c99f614e0 | |
parent | 27434f0ebbc605de04964f55fe1e35670c53a6bf (diff) |
fixing stage3 patches
-rw-r--r-- | src/stage2/patches/cryptsetup.patch | 2 | ||||
-rw-r--r-- | src/stage3/patches/openldap.patch (renamed from src/stage3/patches/libldap.patch) | 26 | ||||
-rw-r--r-- | src/stage3/patches/python-lxml.patch | 11 |
3 files changed, 28 insertions, 11 deletions
diff --git a/src/stage2/patches/cryptsetup.patch b/src/stage2/patches/cryptsetup.patch index af4cab2..dc1b214 100644 --- a/src/stage2/patches/cryptsetup.patch +++ b/src/stage2/patches/cryptsetup.patch @@ -5,7 +5,7 @@ url='https://gitlab.com/cryptsetup/cryptsetup/' groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux' 'json-c' 'argon2') -+depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux' 'json-c' 'argon2' 'fakeroot') ++depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux' 'json-c' 'argon2' 'fakeroot' 'util-linux') makedepends=('util-linux') options=('!emptydirs') validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazyland@gmail.com> diff --git a/src/stage3/patches/libldap.patch b/src/stage3/patches/openldap.patch index 7c29221..86b4950 100644 --- a/src/stage3/patches/libldap.patch +++ b/src/stage3/patches/openldap.patch @@ -1,15 +1,33 @@ --- a/PKGBUILD 2018-03-16 12:55:07.765361033 +0100 +++ b/PKGBUILD 2018-03-16 13:42:59.760946917 +0100 @@ -8,7 +8,7 @@ pkgrel=4 - arch=('x86_64') + arch=('i686' 'x86_64') url="https://www.openldap.org/" license=('custom') -makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc') -+makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'unixodbc') ++makedepends=('libltdl' 'e2fsprogs' 'util-linux' 'unixodbc') options=('!makeflags' 'emptydirs') source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service openldap.tmpfiles openldap.sysusers openldap-ntlm.patch) -@@ -82,7 +84,7 @@ package_openldap() { +@@ -40,7 +40,7 @@ build() { + --enable-dynamic --enable-syslog --enable-ipv6 --enable-local \ + --enable-crypt --enable-spasswd --enable-modules \ + --enable-backends --disable-ndb --enable-overlays=mod \ +- --with-cyrus-sasl --with-threads ++ --with-threads + make + + make -C contrib/slapd-modules/nssov OPT="$CFLAGS $CPPFLAGS" prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap +@@ -56,7 +56,7 @@ check() { + + package_libldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" +- depends=('libsasl' 'e2fsprogs') ++ depends=('e2fsprogs') + backup=('etc/openldap/ldap.conf') + + cd ${pkgbase}-${pkgver} +@@ -82,7 +82,7 @@ package_openldap() { backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif') cd ${pkgbase}-${pkgver} @@ -18,7 +36,7 @@ pushd ${dir} make DESTDIR="${pkgdir}" install popd -@@ -99,6 +101,8 @@ package_openldap() { +@@ -99,6 +99,8 @@ package_openldap() { rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 rm -r "${pkgdir}"/run diff --git a/src/stage3/patches/python-lxml.patch b/src/stage3/patches/python-lxml.patch index b248878..113f7f1 100644 --- a/src/stage3/patches/python-lxml.patch +++ b/src/stage3/patches/python-lxml.patch @@ -1,6 +1,6 @@ --- a/PKGBUILD 2018-03-15 22:28:13.742085702 +0100 +++ b/PKGBUILD 2018-03-16 08:33:19.888281296 +0100 -@@ -3,14 +3,14 @@ +@@ -3,14 +3,13 @@ # Maintainer: Felix Yan <felixonmars@archlinux.org> pkgbase=python-lxml @@ -12,13 +12,12 @@ license=('BSD' 'custom') url="http://lxml.de/" -makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' 'epydoc' 'python2-pygments' -- 'python2-docutils' 'cython' 'cython2') -+makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' -+ 'cython' 'cython2') +- 'python2-docutils') ++makedepends=('libxslt' 'python-setuptools' 'python2-setuptools') checkdepends=('python-cssselect' 'python2-cssselect' 'python-html5lib' 'python2-html5lib' - 'python-beautifulsoup4' 'python2-beautifulsoup4') + 'python-beautifulsoup4' 'python2-beautifulsoup4' 'cython' 'cython2') source=("https://github.com/lxml/lxml/archive/lxml-$pkgver.tar.gz") -@@ -30,7 +28,6 @@ build() { +@@ -30,7 +29,6 @@ build() { cd "$srcdir"/lxml-$pkgver-py2 python2 setup.py build |