summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
-rw-r--r--nss.patch37
3 files changed, 48 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 56060be36d46..0e1193cc80cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,7 +34,9 @@ pkgbase = 389-ds-base
backup = etc/dirsrv/config/slapd-collations.conf
backup = etc/dirsrv/config/template-initconfig
source = https://releases.pagure.org/389-ds-base/389-ds-base-1.4.0.20.tar.bz2
+ source = nss.patch
sha512sums = bcd22f64b7e29a0d58dc19c428eaabb3674b5f2a6029f62eeadf4e21346bcb79e689d91e2689d01b625d731cac8b49150343975961a52c1552d2454038598c20
+ sha512sums = b34c7125176481791d71cf98a78cc6dbaa658b8398ad7bdd48944612b6078307aee2acbb065011098d21672fd504191f207711e36399edc35b49af9aede64337
pkgname = 389-ds-base
diff --git a/PKGBUILD b/PKGBUILD
index 0fbc1b58875a..6152ffb3b341 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,8 +29,15 @@ backup=(etc/default/dirsrv
etc/dirsrv/config/slapd-collations.conf
etc/dirsrv/config/template-initconfig)
options=(!libtool)
-source=("https://releases.pagure.org/389-ds-base/${pkgname}-${pkgver}.tar.bz2")
-sha512sums=('bcd22f64b7e29a0d58dc19c428eaabb3674b5f2a6029f62eeadf4e21346bcb79e689d91e2689d01b625d731cac8b49150343975961a52c1552d2454038598c20')
+source=("https://releases.pagure.org/389-ds-base/${pkgname}-${pkgver}.tar.bz2"
+ 'nss.patch')
+sha512sums=('bcd22f64b7e29a0d58dc19c428eaabb3674b5f2a6029f62eeadf4e21346bcb79e689d91e2689d01b625d731cac8b49150343975961a52c1552d2454038598c20'
+ 'b34c7125176481791d71cf98a78cc6dbaa658b8398ad7bdd48944612b6078307aee2acbb065011098d21672fd504191f207711e36399edc35b49af9aede64337')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -p1 < ../nss.patch
+}
build() {
cd "${pkgname}-${pkgver}"
diff --git a/nss.patch b/nss.patch
new file mode 100644
index 000000000000..cdbe2a26415b
--- /dev/null
+++ b/nss.patch
@@ -0,0 +1,37 @@
+diff -Naur 389-ds-base-1.4.0.20-orig 389-ds-base-1.4.0.20
+diff -Naur 389-ds-base-1.4.0.20-orig/include/ldaputil/certmap.h 389-ds-base-1.4.0.20/include/ldaputil/certmap.h
+--- 389-ds-base-1.4.0.20-orig/include/ldaputil/certmap.h 2019-01-04 09:54:10.990649622 -0500
++++ 389-ds-base-1.4.0.20/include/ldaputil/certmap.h 2019-01-04 09:54:24.961017809 -0500
+@@ -16,7 +16,7 @@
+ /* What was extcmap.h begins ... */
+
+ #include <ldap.h>
+-#include <nss3/cert.h>
++#include <nss/cert.h>
+
+ #ifndef NSAPI_PUBLIC
+ #define NSAPI_PUBLIC
+diff -Naur 389-ds-base-1.4.0.20-orig/ldap/servers/slapd/slapi-private.h 389-ds-base-1.4.0.20/ldap/servers/slapd/slapi-private.h
+--- 389-ds-base-1.4.0.20-orig/ldap/servers/slapd/slapi-private.h 2019-01-04 09:54:11.060651467 -0500
++++ 389-ds-base-1.4.0.20/ldap/servers/slapd/slapi-private.h 2019-01-04 09:54:40.511427639 -0500
+@@ -1371,7 +1371,7 @@
+ * The latter case, caller is responsible to free it.
+ */
+ /* vnum is supposed to be in one of the following:
+- * nss3/sslproto.h
++ * nss/sslproto.h
+ * #define SSL_LIBRARY_VERSION_2 0x0002
+ * #define SSL_LIBRARY_VERSION_3_0 0x0300
+ * #define SSL_LIBRARY_VERSION_TLS_1_0 0x0301
+diff -Naur 389-ds-base-1.4.0.20-orig/lib/ldaputil/examples/init.c 389-ds-base-1.4.0.20/lib/ldaputil/examples/init.c
+--- 389-ds-base-1.4.0.20-orig/lib/ldaputil/examples/init.c 2019-01-04 09:54:11.110652785 -0500
++++ 389-ds-base-1.4.0.20/lib/ldaputil/examples/init.c 2019-01-04 09:54:51.591719659 -0500
+@@ -15,7 +15,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <nss3/cert.h>
++#include <nss/cert.h>
+ #include "certmap.h" /* Public Certmap API */
+ #include "plugin.h" /* must define extern "C" functions */
+