[net-nds/389-ds-base] bump

2021-02-03 11:54:47 +01:00
parent 93f1495913
commit 4072399b9a
4 changed files with 79 additions and 67 deletions
--- a/net-nds/389-ds-base/files/389-ds-base-1.4.4.11-libxcrypt.patch
+++ b/net-nds/389-ds-base/files/389-ds-base-1.4.4.11-libxcrypt.patch
@@ -1,52 +0,0 @@
- Makefile.am                                     | 2 +-
- configure.ac                                    | 3 +--
- ldap/servers/plugins/pwdstorage/gost_yescrypt.c | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 83bde0a9a..acd68cc5a 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -193,7 +193,7 @@ LIBDL=@LIBDL@
- LIBCSTD=@LIBCSTD@
- LIBCRUN=@LIBCRUN@
- THREADLIB=@THREADLIB@
-LIBCRYPT=@LIBCRYPT@
-+LIBCRYPT=$(LIBXCRYPT_LIBS)
- 
- # We need to make sure that libpthread is linked before libc on HP-UX.
- if HPUX
-diff --git a/configure.ac b/configure.ac
-index a951828d6..7b08ac0b4 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -657,8 +657,6 @@ case $host in
-     # some programs use the native thread library directly
-     THREADLIB=-lpthread
-     AC_SUBST([THREADLIB], [$THREADLIB])
-    LIBCRYPT=-lcrypt
-    AC_SUBST([LIBCRYPT], [$LIBCRYPT])
-     AC_DEFINE([USE_POSIX_RWLOCKS], [1], [POSIX rwlocks])
-     ;;
-   *-*-freebsd*)
-@@ -806,6 +804,7 @@ AM_CONDITIONAL([SPARC],[test "x$TARGET" = xSPARC])
- 
- # Check for library dependencies
- PKG_CHECK_MODULES([EVENT], [libevent])
-+PKG_CHECK_MODULES([LIBXCRYPT], [libxcrypt])
- 
- if $PKG_CONFIG --exists nspr; then
-     PKG_CHECK_MODULES([NSPR], [nspr])
-diff --git a/ldap/servers/plugins/pwdstorage/gost_yescrypt.c b/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
-index 2af1c2919..2ddd30129 100644
--- a/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
-+++ b/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
-@@ -7,7 +7,7 @@
- #include <config.h>
- #endif
- 
-#include <crypt.h>
-+#include <xcrypt/crypt.h>
- #include <errno.h>
- 
- #include "pwdstorage.h"
--- a/net-nds/389-ds-base/files/389-ds-base-1.4.4.12-libxcrypt.patch
+++ b/net-nds/389-ds-base/files/389-ds-base-1.4.4.12-libxcrypt.patch
@@ -0,0 +1,66 @@
+From f38b124f05a169acfd55a279b9f6c178b58e73fc Mon Sep 17 00:00:00 2001
+From: Firstyear <william@blackhats.net.au>
+Date: Wed, 3 Feb 2021 09:48:48 +1000
+Subject: [PATCH] Issue 4588 - BUG - unable to compile without xcrypt (#4589)
+
+Bug Description: If xcrypt is not available, especially on some
+distros with older libraries, 389 was unable to build.
+
+Fix Description: Detect if we have xcrypt, and if not, add
+stubs that always error instead.
+
+fixes: https://github.com/389ds/389-ds-base/issues/4588
+
+Author: William Brown <william@blackhats.net.au>
+
+Review by: @progier389, @jchapma, @droideck (Thanks!)
+---
+ .../plugins/pwdstorage/gost_yescrypt.c        | 29 +++++++++++++++++--
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/ldap/servers/plugins/pwdstorage/gost_yescrypt.c b/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
+index 2af1c2919..67b39395e 100644
+--- a/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
+++ b/ldap/servers/plugins/pwdstorage/gost_yescrypt.c
+@@ -7,11 +7,12 @@
+ #include <config.h>
+ #endif
+ 
+-#include <crypt.h>
+-#include <errno.h>
+-
+ #include "pwdstorage.h"
+ 
+#include <crypt.h>
+
+#ifdef XCRYPT_VERSION_STR
+#include <errno.h>
+ int
+ gost_yescrypt_pw_cmp(const char *userpwd, const char *dbpwd)
+ {
+@@ -62,3 +63,25 @@ gost_yescrypt_pw_enc(const char *pwd)
+ 
+     return enc;
+ }
+
+#else
+
+/*
+ * We do not have xcrypt, so always fail all checks.
+ */
+int
+gost_yescrypt_pw_cmp(const char *userpwd __attribute__((unused)), const char *dbpwd __attribute__((unused)))
+{
+    slapi_log_err(SLAPI_LOG_ERR, GOST_YESCRYPT_SCHEME_NAME,
+                  "Unable to use gost_yescrypt_pw_cmp, xcrypt is not available.\n");
+    return 1;
+}
+
+char *
+gost_yescrypt_pw_enc(const char *pwd __attribute__((unused)))
+{
+    slapi_log_err(SLAPI_LOG_ERR, GOST_YESCRYPT_SCHEME_NAME,
+                  "Unable to use gost_yescrypt_pw_enc, xcrypt is not available.\n");
+    return NULL;
+}
+#endif