fixing stage3 patches

3 files changed, 16 insertions, 25 deletions

diff --git a/src/stage3/patches/libsasl.patch b/src/stage3/patches/libsasl.patch
index 258bb08..58ac0fe 100644
--- a/src/stage3/patches/libsasl.patch
+++ b/src/stage3/patches/libsasl.patch
@@ -5,17 +5,26 @@
  license=('custom')
  options=('!makeflags')
 -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
-+makedepends=('libldap' 'krb5' 'openssl' 'sqlite')
++makedepends=('openssl' 'sqlite')
  source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
          cyrus-sasl-2.1.22-qa.patch
          cyrus-sasl-2.1.26-size_t.patch
-@@ -111,9 +111,6 @@ build() {
-       --enable-login \
+@@ -112,14 +112,14 @@ build() {
        --enable-ntlm \
        --disable-passdss \
--      --enable-sql \
+       --enable-sql \
 -      --with-mysql=/usr \
 -      --with-pgsql=/usr/lib \
++      --without-mysql \
++      --without-pgsql \
        --with-sqlite3=/usr/lib \
-       --enable-ldapdb \
+-      --enable-ldapdb \
++      --disable-ldapdb \
        --disable-macos-framework \
+       --with-pam \
+       --with-saslauthd=/var/run/saslauthd \
+-      --with-ldap \
++      --without-ldap \
+       --with-dblib=gdbm \
+       --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
+       --sysconfdir=/etc \
diff --git a/src/stage3/patches/openldap.patch b/src/stage3/patches/openldap.patch
index 86b4950..1a37a0b 100644
--- a/src/stage3/patches/openldap.patch
+++ b/src/stage3/patches/openldap.patch
@@ -5,28 +5,10 @@
  url="https://www.openldap.org/"
  license=('custom')
 -makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath' 'unixodbc')
-+makedepends=('libltdl' 'e2fsprogs' 'util-linux' 'unixodbc')
++makedepends=('libltdl' 'libsasl' '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)
-@@ -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')
  
diff --git a/src/stage3/patches/python-lxml.patch b/src/stage3/patches/python-lxml.patch
index 113f7f1..e9103e4 100644
--- a/src/stage3/patches/python-lxml.patch
+++ b/src/stage3/patches/python-lxml.patch
@@ -13,7 +13,7 @@
  url="http://lxml.de/"
 -makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' 'epydoc' 'python2-pygments'
 -             'python2-docutils')
-+makedepends=('libxslt' 'python-setuptools' 'python2-setuptools')
++makedepends=('libxslt' 'python-setuptools' 'python2-setuptools' 'cython' 'cython2')
  checkdepends=('python-cssselect' 'python2-cssselect' 'python-html5lib' 'python2-html5lib'
                'python-beautifulsoup4' 'python2-beautifulsoup4' 'cython' 'cython2')
  source=("https://github.com/lxml/lxml/archive/lxml-$pkgver.tar.gz")