mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openldap: upgrade to release 2.4.44

Browse Source 
Change-Id: I9af1bedd06410bed17b37adc6213125e0c4f1f29
Reviewed-on: https://gerrit.libreoffice.org/28393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Jochen Nitschke 2016-08-25 17:58:38 +02:00 committed by Michael Stahl
parent 7258908294
commit a5b29a702e
3 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
download.lst
View File

@ -122,7 +122,8 @@ export ODFVALIDATOR_JAR := a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-i
export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENLDAP_MD5SUM := 693ac26de86231f8dcae2b4e9d768e51
export OPENLDAP_TARBALL := openldap-2.4.44.tgz
export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0 export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669

2
external/openldap/UnpackedTarball_openldap.mk vendored
View File

@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap)) $(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap))
$(eval $(call gb_UnpackedTarball_add_patches,openldap,\ $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.31.patch \ external/openldap/openldap-2.4.44.patch.1 \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

80
external/openldap/openldap-2.4.31.patch → external/openldap/openldap-2.4.44.patch.1 vendored
View File

@ -1,24 +1,28 @@
--- misc/openldap-2.4.31/Makefile.in 2012-04-22 22:25:08.000000000 +0200 --- openldap.org/configure
+++ misc/build/openldap-2.4.31/Makefile.in 2012-07-16 13:53:47.140541654 +0200 +++ openldap/configure
@@ -13,7 +13,7 @@ @@ -15735,7 +15735,7 @@
## top-level directory of the distribution or, alternatively, at $as_echo_n "(cached) " >&6
## <http://www.OpenLDAP.org/license.html>. else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnss3 $LIBS"
+LIBS="-lnss3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-SUBDIRS= include libraries clients servers tests doc --- openldap.org/configure.in
+SUBDIRS= include libraries +++ openldap/configure.in
CLEANDIRS= @@ -1239,7 +1239,8 @@
INSTALLDIRS= AC_CHECK_HEADERS([nssutil.h])
if test "$ac_cv_header_nssutil_h" = yes ; then
AC_CHECK_LIB([nss3], [NSS_Initialize],
- [ have_moznss=yes ], [ have_moznss=no ])
+ [ have_moznss=yes ], [ have_moznss=no ],
+ [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ])
fi
@@ -32,7 +32,3 @@ if test "$have_moznss" = yes ; then
$(RM) config.status libtool stamp-h stamp-h.in --- openldap.org/libraries/libldap/tls_m.c
+++ openldap/libraries/libldap/tls_m.c
distclean: veryclean FORCE
-
-check: test
-test: FORCE
- cd tests; make test
--- misc/openldap-2.4.31/libraries/libldap/tls_m.c 2012-04-22 22:25:08.000000000 +0200
+++ misc/build/openldap-2.4.31/libraries/libldap/tls_m.c 2012-07-16 13:53:47.140541654 +0200
@@ -49,17 +49,17 @@ @@ -49,17 +49,17 @@
#include <termios.h> /* for echo on/off */ #include <termios.h> /* for echo on/off */
#endif #endif
@ -48,26 +52,22 @@
#undef NSS_VERSION_INT #undef NSS_VERSION_INT
#define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \ #define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
--- misc/openldap-2.4.31/configure.in 2012-04-22 21:25:08.000000000 +0100 --- openldap.org/Makefile.in
+++ misc/build/openldap-2.4.31/configure.in 2012-07-16 13:56:24.000000000 +0100 +++ openldap/Makefile.in
@@ -1232,7 +1232,8 @@ @@ -13,7 +13,7 @@
AC_CHECK_HEADERS([nssutil.h]) ## top-level directory of the distribution or, alternatively, at
if test "$ac_cv_header_nssutil_h" = yes ; then ## <http://www.OpenLDAP.org/license.html>.
AC_CHECK_LIB([nss3], [NSS_Initialize],
- [ have_moznss=yes ], [ have_moznss=no ])
+ [ have_moznss=yes ], [ have_moznss=no ],
+ [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ])
fi
if test "$have_moznss" = yes ; then -SUBDIRS= include libraries clients servers tests doc
--- misc/openldap-2.4.31/configure 2012-07-16 14:11:55.000000000 +0100 +SUBDIRS= include libraries
+++ misc/build/openldap-2.4.31/configure 2012-07-16 13:56:24.000000000 +0100 CLEANDIRS=
@@ -15718,7 +15718,7 @@ INSTALLDIRS=
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnss3 $LIBS"
+LIBS="-lnss3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -32,7 +32,3 @@
$(RM) config.status libtool stamp-h stamp-h.in
distclean: veryclean FORCE
-
-check: test
-test: FORCE
- cd tests; $(MAKE) test