diff options
| -rw-r--r-- | package/openldap/Makefile | 4 | ||||
| -rw-r--r-- | package/openldap/patches/patch-build_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/openldap/patches/patch-configure | 33 | ||||
| -rw-r--r-- | package/openldap/patches/patch-configure_in | 31 |
4 files changed, 66 insertions, 13 deletions
diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 411aeeb62..0b14f8be9 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.4.41 +PKG_VERSION:= 2.4.42 PKG_RELEASE:= 1 -PKG_HASH:= 27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e +PKG_HASH:= eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63 PKG_DESCR:= ldap client libraries PKG_SECTION:= libs/misc PKG_DEPENDS:= libsasl2 libdb libpthread libuuid libstdcxx libncurses diff --git a/package/openldap/patches/patch-build_ltmain_sh b/package/openldap/patches/patch-build_ltmain_sh deleted file mode 100644 index b96b508b6..000000000 --- a/package/openldap/patches/patch-build_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- openldap-2.4.36.orig/build/ltmain.sh 2013-08-16 20:12:59.000000000 +0200 -+++ openldap-2.4.36/build/ltmain.sh 2013-10-31 21:12:49.000000000 +0100 -@@ -1668,7 +1668,7 @@ EOF - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/openldap/patches/patch-configure b/package/openldap/patches/patch-configure new file mode 100644 index 000000000..248f06e8a --- /dev/null +++ b/package/openldap/patches/patch-configure @@ -0,0 +1,33 @@ +--- openldap-2.4.42.orig/configure 2015-08-14 17:25:28.000000000 +0200 ++++ openldap-2.4.42/configure 2015-10-22 07:28:53.000000000 +0200 +@@ -22223,29 +22223,10 @@ $as_echo "$as_me: WARNING: Strong authen + fi + fi + +-if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then +- dev=no +- if test -r /dev/urandom ; then +- dev="/dev/urandom"; +- elif test -r /idev/urandom ; then +- dev="/idev/urandom"; +- elif test -r /dev/srandom ; then +- dev="/dev/srandom"; +- elif test -r /dev/random ; then +- dev="/dev/random"; +- elif test -r /idev/random ; then +- dev="/idev/random"; +- fi +- +- if test $dev != no ; then +- + cat >>confdefs.h <<_ACEOF +-#define URANDOM_DEVICE "$dev" ++#define URANDOM_DEVICE "/dev/urandom" + _ACEOF + +- fi +-fi +- + ol_link_fetch=no + if test $ol_with_fetch != no ; then + ol_LIBS=$LIBS diff --git a/package/openldap/patches/patch-configure_in b/package/openldap/patches/patch-configure_in new file mode 100644 index 000000000..5bd5b2503 --- /dev/null +++ b/package/openldap/patches/patch-configure_in @@ -0,0 +1,31 @@ +--- openldap-2.4.42.orig/configure.in 2015-08-14 17:25:28.000000000 +0200 ++++ openldap-2.4.42/configure.in 2015-10-22 07:23:38.000000000 +0200 +@@ -2147,26 +2147,8 @@ else + fi + fi + +-dnl ---------------------------------------------------------------- +-dnl Check for entropy sources +-if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then +- dev=no +- if test -r /dev/urandom ; then +- dev="/dev/urandom"; +- elif test -r /idev/urandom ; then +- dev="/idev/urandom"; +- elif test -r /dev/srandom ; then +- dev="/dev/srandom"; +- elif test -r /dev/random ; then +- dev="/dev/random"; +- elif test -r /idev/random ; then +- dev="/idev/random"; +- fi +- +- if test $dev != no ; then +- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) +- fi +-fi ++# set unconditionally to /dev/urandom for Linux cross-compilation ++AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"/dev/urandom",[set to urandom device]) + + dnl ---------------------------------------------------------------- + dnl |