main/openldap: upgrade to 2.4.41

4 files changed, 7 insertions, 121 deletions

diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 4848d1568d..97239156c2 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
-pkgver=2.4.40
-pkgrel=5
+pkgver=2.4.41
+pkgrel=0
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 arch="all"
@@ -24,9 +24,6 @@ source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tg
 	openldap-2.4.11-libldap_r.patch
 	0001-dbd-enabled-by-default.patch
 	openldap-mqtt-overlay.patch
-	CVE-2015-1545.patch
-	CVE-2015-1546.patch
-	openldap-gcc-5.patch
 	slapd.initd
 	slapd.confd
 	slurpd.initd
@@ -150,39 +147,31 @@ mqtt() {
 	pkgdesc="OpenLDAP MQTT overlay"
 	depends=$pkgname
 	mkdir -p "$subpkgdir"/usr/lib/openldap
-	mv "$pkgdir"/usr/lib/openldap/mqtt.* "$subpkgdir"/usr/lib/openldap
+	mv "$pkgdir"/usr/lib/openldap/mqtt.* "$subpkgdir"/usr/lib/openldap || reutrn 1
+	rm "$subpkgdir"/usr/lib/openldap/mqtt.a
 }
 
-md5sums="423c1f23d2a0cb96b3e9baf7e9d7dda7  openldap-2.4.40.tgz
+md5sums="3f1a4cea52827e18feaedfdc1634b5d0  openldap-2.4.41.tgz
 2524e490ba334a760fa57057c16da7a9  openldap-2.4-ppolicy.patch
 d19d0502f046078ecd737e29e7552fa8  openldap-2.4.11-libldap_r.patch
 7b4eec9a90d2f7f727e0f9cb4653887c  0001-dbd-enabled-by-default.patch
 05266dddd5a9cc5de1b67ab62b6d26fb  openldap-mqtt-overlay.patch
-b7f994678db068bbe186ce92c73fb060  CVE-2015-1545.patch
-09f2be28af8aaf2883446c85d854cfe8  CVE-2015-1546.patch
-57e33508c67751c8b71b97f4f59a65e0  openldap-gcc-5.patch
 b1291a48e7f5228a88d8d479cc1c2714  slapd.initd
 b672311fca605c398240cd37a2ae080a  slapd.confd
 9ecb5712e8e4a8fe5bf0183254305f0d  slurpd.initd"
-sha256sums="d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb  openldap-2.4.40.tgz
+sha256sums="27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e  openldap-2.4.41.tgz
 355a8239355fcc5863ba7430d73af7ccad9e0211ae56180011d15d7418aa5b27  openldap-2.4-ppolicy.patch
 3310a89d38bc39e6eb4333799d475411b274482b8bccab212b3edfd4385db70e  openldap-2.4.11-libldap_r.patch
 8d1ee24c52928302acb876bc99cc75757eb15b278a10bfd3d43cabb332bcd3c4  0001-dbd-enabled-by-default.patch
 5de1464a6ae154e1556f7faa9494caf7ca94d26a0ef2f7d5abdc6aa2513cc1c9  openldap-mqtt-overlay.patch
-32d423d6b6bb8b16980de98f9ed1de581673c3a63de3a9b7d4841c2b037d27c1  CVE-2015-1545.patch
-07d6feebc366c14e42b5027239e12d5ec2981714b6a61a1365981c20d9fd87de  CVE-2015-1546.patch
-a8b4ff710a6a425159b6ce0ce4cc69c0bfbb7a4a91c88a77ec72eaadddde132b  openldap-gcc-5.patch
 454480c29e938a82fd46e490a0369586ed7c344a2ac559f95bbe813df6c07f8a  slapd.initd
 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d  slapd.confd
 3cdd67b848f470399c0e8aeb89031de152383deeaf9da1416596093c67594118  slurpd.initd"
-sha512sums="c803c4a82878891d60414d64dcb54a7c3f08675106ba13f50cba06034a97b3eee1c238761dd5ddad97d8c3f6675d9bbbec176d0340eb4a3bcd808f940baabab5  openldap-2.4.40.tgz
+sha512sums="d5a8ab7a7e7ea2f87b22e04706df501724a613cd76f81083786b5f441b1557e59ca7543c4618bbf2b6ea851e98e6e8c27f9165eecac6dd0070c00f8be85cde5b  openldap-2.4.41.tgz
 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38  openldap-2.4-ppolicy.patch
 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357  openldap-2.4.11-libldap_r.patch
 b0892e049feab931d6439374ecf2497c54fbf46daef622f9949f02a26cd4b20f73de7cff1e1d64894539dc599793ffbd61d7a5bba6e026f3966295cf6a39f1be  0001-dbd-enabled-by-default.patch
 9c7f41279e91ed995c91e9a8c543c797d9294a93cf260afdc03ab5777e45ed045a4d6a4d4d0180b5dc387dc04babca01d818fbfa8168309df44f4500d2a430a4  openldap-mqtt-overlay.patch
-56394c12b08862843ab7d4a76f5c7f13eaecb2d9717a9571d792c1aa7b77e5b2267525c7d7ecdb646beac736ca437b9f10a17cb18fd54e9f9f2a5d02904cfafa  CVE-2015-1545.patch
-9eb54e63fecc7ad59bf710803a7da275ea1de069d1a27d56ee01417d33035d90d89ab9903de82154f625c796145c1056d5a52ad8bfb8238c7ab5304c413fd25b  CVE-2015-1546.patch
-b59e475b906c41186e18f0d1fcb775855111a9d6072dc3a3421fcdc9f07528c724bcbb2e0fc2d15a725997e7976de6778f91b066b87c8ae902dd3a873017ee6f  openldap-gcc-5.patch
 1a5490a29a2be8382a64d3d07a36906d2189571f4c44d8ad96b769db58d91a33b2eee24fe10343ec26440fa61cfd406c4e95153dce29c2f315d1f13f5b0f47e8  slapd.initd
 8290769b63b3a5863622de2deb9269a0711ba5f4a225eb230d7c5097937b9d4e8cf5a998ee99232824e2335ae1b6e0114357b61c9611bc2460ebd195d12eabae  slapd.confd
 c8bffecdbd09583bec7720b5f6a5b9680b0eae055fd63f10736cf2fe25378b95acddf910e60f6408c9637a3fe48050299cfb500a6bc9a95a0ef135d5a4c4d5f9  slurpd.initd"
diff --git a/main/openldap/CVE-2015-1545.patch b/main/openldap/CVE-2015-1545.patch
deleted file mode 100644
index a642bed03b..0000000000
--- a/main/openldap/CVE-2015-1545.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c32e74763f77675b9e144126e375977ed6dc562c Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Mon, 19 Jan 2015 22:25:53 +0000
-Subject: [PATCH] ITS#8027 require non-empty AttributeList
-
----
- servers/slapd/overlays/deref.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
-index 9420e3e..05aa890 100644
---- a/servers/slapd/overlays/deref.c
-+++ b/servers/slapd/overlays/deref.c
-@@ -183,7 +183,8 @@ deref_parseCtrl (
- 		ber_len_t cnt = sizeof(struct berval);
- 		ber_len_t off = 0;
- 
--		if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR )
-+		if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR
-+			|| !cnt )
- 		{
- 			rs->sr_text = "Dereference control: derefSpec decoding error";
- 			rs->sr_err = LDAP_PROTOCOL_ERROR;
--- 
-1.7.10.4
-
diff --git a/main/openldap/CVE-2015-1546.patch b/main/openldap/CVE-2015-1546.patch
deleted file mode 100644
index c7d81bb721..0000000000
--- a/main/openldap/CVE-2015-1546.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2f1a2dd329b91afe561cd06b872d09630d4edb6a Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Wed, 4 Feb 2015 02:03:55 +0000
-Subject: [PATCH] ITS#8046 fix vrFilter_free
-
----
- servers/slapd/filter.c |   10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
-index b859f73..22c81c8 100644
---- a/servers/slapd/filter.c
-+++ b/servers/slapd/filter.c
-@@ -1158,14 +1158,10 @@ get_vrFilter( Operation *op, BerElement *ber,
- void
- vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
- {
--	ValuesReturnFilter	*p, *next;
-+	ValuesReturnFilter	*next;
- 
--	if ( vrf == NULL ) {
--		return;
--	}
--
--	for ( p = vrf; p != NULL; p = next ) {
--		next = p->vrf_next;
-+	for ( ; vrf != NULL; vrf = next ) {
-+		next = vrf->vrf_next;
- 
- 		switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
- 		case LDAP_FILTER_PRESENT:
--- 
-1.7.10.4
-
diff --git a/main/openldap/openldap-gcc-5.patch b/main/openldap/openldap-gcc-5.patch
deleted file mode 100644
index 40ba9de737..0000000000
--- a/main/openldap/openldap-gcc-5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek@redhat.com>
-Date: Wed, 11 Feb 2015 10:32:28 +0100
-Subject: [PATCH] fix libdb detection with gcc 5
-
-The old cpp version generated:
-__db_version 5
-
-The new output:
-__db_version
-            5
-
-Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
-Behavior with older versions of gcc is not changed.
----
- build/openldap.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/openldap.m4 b/build/openldap.m4
-index caf8fc2..bdcb4d6 100644
---- a/build/openldap.m4
-+++ b/build/openldap.m4
-@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
- #endif
- __db_version DB_VERSION_MAJOR
- ])
--	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- 	ol_cv_bdb_major=${3}
- ])
- case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
-@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
- #endif
- __db_version DB_VERSION_MINOR
- ])
--	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- 	ol_cv_bdb_minor=${3}
- ])
- case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
--- 
-2.1.0
-