diff --git a/0001-build-adjustments.dif b/0001-build-adjustments.dif index dc19032..ce7eed6 100644 --- a/0001-build-adjustments.dif +++ b/0001-build-adjustments.dif @@ -1,4 +1,4 @@ -From 437222f39c2199913ba818cae0acdebf2283c28f Mon Sep 17 00:00:00 2001 +From f8a35cec5591b61c3a39bb76a5410439e79d6aaf Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:04:07 +0200 Subject: build-adjustments @@ -20,7 +20,7 @@ index 66ac3bf..f09e0c3 100644 sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@$(ldap_subdir) diff --git a/configure.in b/configure.in -index bc98c57..d2ee4a4 100644 +index 0e44858..4f15898 100644 --- a/configure.in +++ b/configure.in @@ -67,7 +67,9 @@ dnl Determine host platform diff --git a/0002-slapd.conf.dif b/0002-slapd.conf.dif index c76eb2e..ed34f78 100644 --- a/0002-slapd.conf.dif +++ b/0002-slapd.conf.dif @@ -1,4 +1,4 @@ -From 7138ae220bf3bdeec9902bbd1de49efc96c3cbc8 Mon Sep 17 00:00:00 2001 +From cd4cb8676956b0db50fae7cc0ccb110d40788644 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:05:49 +0200 Subject: slapd.conf diff --git a/0003-LDAPI-socket-location.dif b/0003-LDAPI-socket-location.dif index 496846b..28c6ebe 100644 --- a/0003-LDAPI-socket-location.dif +++ b/0003-LDAPI-socket-location.dif @@ -1,4 +1,4 @@ -From 54d04b4c4a7d644a619d32f543167b9b7576b8f3 Mon Sep 17 00:00:00 2001 +From dcee2b0d5e2fdcc3224ea315c49057bb6b763fac Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:06:42 +0200 Subject: LDAPI socket location diff --git a/0004-libldap-use-gethostbyname_r.dif b/0004-libldap-use-gethostbyname_r.dif index 633f3f9..42c689f 100644 --- a/0004-libldap-use-gethostbyname_r.dif +++ b/0004-libldap-use-gethostbyname_r.dif @@ -1,4 +1,4 @@ -From 479d8ec0b9652a533d0c13df88f0c667336eeb0f Mon Sep 17 00:00:00 2001 +From 642b5d51f4fec7047de3692c5da3521a6a749ec2 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:08:03 +0200 Subject: libldap use gethostbyname_r diff --git a/0005-pie-compile.dif b/0005-pie-compile.dif index ad7a751..754acf2 100644 --- a/0005-pie-compile.dif +++ b/0005-pie-compile.dif @@ -1,4 +1,4 @@ -From 225d98a5ff2354929374ac9e0f1c01b3a4380451 Mon Sep 17 00:00:00 2001 +From fea5da62cd357a4fe5811b6399c5b32a1b43f455 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 12 Nov 2010 09:39:11 +0100 Subject: pie compile diff --git a/0006-assorted-fixes-for-back-config-DELETE-support.dif b/0006-assorted-fixes-for-back-config-DELETE-support.dif index 6bc812c..eae109b 100644 --- a/0006-assorted-fixes-for-back-config-DELETE-support.dif +++ b/0006-assorted-fixes-for-back-config-DELETE-support.dif @@ -1,14 +1,14 @@ -From 6479c8a2980e1a430861df162011780e675fc888 Mon Sep 17 00:00:00 2001 +From a9a050afc3983cfcaba8a96085c97b5a213199f5 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:08:56 +0200 Subject: assorted fixes for back-config DELETE support diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c -index 5f8ae10..507dd5a 100644 +index 623940b..47671bc 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c -@@ -5958,13 +5958,26 @@ config_back_delete( Operation *op, SlapReply *rs ) +@@ -5973,13 +5973,26 @@ config_back_delete( Operation *op, SlapReply *rs ) rs->sr_err = LDAP_UNWILLING_TO_PERFORM; } else if ( op->o_abandon ) { rs->sr_err = SLAPD_ABANDON; @@ -37,7 +37,7 @@ index 5f8ae10..507dd5a 100644 /* remove CfEntryInfo from the siblings list */ if ( ce->ce_parent->ce_kids == ce ) { -@@ -6026,6 +6039,7 @@ config_back_delete( Operation *op, SlapReply *rs ) +@@ -6041,6 +6054,7 @@ config_back_delete( Operation *op, SlapReply *rs ) #else rs->sr_err = LDAP_UNWILLING_TO_PERFORM; #endif /* SLAP_CONFIG_DELETE */ diff --git a/0007-No-Build-date-and-time-in-binaries.dif b/0007-No-Build-date-and-time-in-binaries.dif index 44244f3..3f25f89 100644 --- a/0007-No-Build-date-and-time-in-binaries.dif +++ b/0007-No-Build-date-and-time-in-binaries.dif @@ -1,4 +1,4 @@ -From 97e44c92dbf4665526259a2987861624b1766ce1 Mon Sep 17 00:00:00 2001 +From ffa5afc69917bbe153dcbddfbfac7d7b30eb0f9a Mon Sep 17 00:00:00 2001 From: Cristian Rodriguez Date: Tue, 5 Oct 2010 13:59:40 +0200 Subject: No Build date and time in binaries diff --git a/0008-Recover-on-DB-version-change.dif b/0008-Recover-on-DB-version-change.dif index c450634..55557bb 100644 --- a/0008-Recover-on-DB-version-change.dif +++ b/0008-Recover-on-DB-version-change.dif @@ -1,4 +1,4 @@ -From ab2b1f77bef1ab284db3f0975cff3fe7b0057b15 Mon Sep 17 00:00:00 2001 +From 6821a349975bad1bb6b85c4bf6ab82be92b5c51e Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 5 Oct 2010 14:20:22 +0200 Subject: Recover on DB version change diff --git a/0009-unregister_supported_control-backport.dif b/0009-unregister_supported_control-backport.dif index 820efb5..c1b8528 100644 --- a/0009-unregister_supported_control-backport.dif +++ b/0009-unregister_supported_control-backport.dif @@ -1,4 +1,4 @@ -From c07b502530f87626e53400c36d6468f8348f863b Mon Sep 17 00:00:00 2001 +From bf8d97b961515d698a7c9816e2af1feaa538b6bf Mon Sep 17 00:00:00 2001 From: ralf Date: Wed, 30 Jun 2010 10:38:01 +0000 Subject: unregister_supported_control() backport diff --git a/0010-Fix-exposure-of-SSS-VLV-controls-ITS-6647.dif b/0010-Fix-exposure-of-SSS-VLV-controls-ITS-6647.dif index ff8e1a0..a3b12b9 100644 --- a/0010-Fix-exposure-of-SSS-VLV-controls-ITS-6647.dif +++ b/0010-Fix-exposure-of-SSS-VLV-controls-ITS-6647.dif @@ -1,4 +1,4 @@ -From 297c178d36f1e09f1112e97cb139b9843a53ef7c Mon Sep 17 00:00:00 2001 +From aa567ba586b3f78ce9199929f2a058c17d0a6e29 Mon Sep 17 00:00:00 2001 From: ralf Date: Fri, 22 Jan 2010 17:01:25 +0000 Subject: Fix exposure of SSS/VLV controls (ITS#6647) @@ -11,10 +11,10 @@ Contains the following upstream commits: is removed (additional fix for ITS#6647) diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c -index ab52b3a..93d98b5 100644 +index bb779e6..010a0b9 100644 --- a/servers/slapd/overlays/sssvlv.c +++ b/servers/slapd/overlays/sssvlv.c -@@ -1276,6 +1276,10 @@ static int sssvlv_db_init( +@@ -1292,6 +1292,10 @@ static int sssvlv_db_init( if ( rc != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, "Failed to register VLV Request control '%s' (%d)\n", LDAP_CONTROL_VLVREQUEST, rc, 0 ); @@ -25,7 +25,7 @@ index ab52b3a..93d98b5 100644 return rc; } } -@@ -1311,6 +1315,15 @@ static int sssvlv_db_destroy( +@@ -1327,6 +1331,15 @@ static int sssvlv_db_destroy( ldap_pvt_thread_mutex_destroy( &sort_conns_mutex ); } diff --git a/openldap-2.4.24.tar.bz2 b/openldap-2.4.24.tar.bz2 deleted file mode 100644 index 54796ef..0000000 --- a/openldap-2.4.24.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0ca02bf15fc03e02aeb0168bf24b2c17d947b955e39e785fef91829eef6bd13 -size 4227463 diff --git a/openldap-2.4.25.tar.bz2 b/openldap-2.4.25.tar.bz2 new file mode 100644 index 0000000..c6d1b43 --- /dev/null +++ b/openldap-2.4.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf2b194106d96d73706dfd54e75ff929148b4b5de589af4a9dba8b0098eddfb7 +size 4236879 diff --git a/openldap2-client.changes b/openldap2-client.changes index ad5ff78..93a73c4 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Mar 29 15:29:38 UTC 2011 - rhafer@suse.de + +- Updated to 2.4.25, important changes: + * Fixed ldapsearch pagedresults loop (ITS#6755) + * Fixed tools for incompatible args (ITS#6849) + * Fixed libldap MozNSS crash (ITS#6863) + * Fixed slapd add objectclasses in order (ITS#6837) + * Added slapd ordering for uidNumber and gidNumber (ITS#6852) + * Fixed slapd segfault when adding values out of order (ITS#6858) + * Fixed slapd sortval handling (ITS#6845) + * Fixed slapd-bdb with slapadd/index quick option (ITS#6853) + * Fixed slapd-ldap chain cn=config support (ITS#6837) + * Fixed slapd-ldap chain with slapd.conf (ITS#6857) + * Fixed slapd-meta deadlock (ITS#6846) + * Fixed slapo-sssvlv with multiple requests (ITS#6850) + * Fixed contrib/lastbind install rules (ITS#6238) + * Fixed contrib/cloak install rules (ITS#6877) + +------------------------------------------------------------------- +Tue Feb 22 09:46:04 UTC 2011 - rhafer@suse.de + +- Surpress gcc warnings about extra format string arguments for 2.3.x + built as well. + ------------------------------------------------------------------- Mon Feb 14 11:09:36 UTC 2011 - rhafer@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index fba0c87..fddd95f 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client +# spec file for package openldap2 # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ %define run_test_suite 1 -Name: openldap2-client +Name: openldap2-client BuildRequires: cyrus-sasl-devel libopenssl-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif -Version: 2.4.24 +Version: 2.4.25 Release: 1 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 @@ -33,11 +33,11 @@ BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -db-devel libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Clients +Group: Productivity/Networking/LDAP/Servers Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP commandline client tools +Summary: The OpenLDAP Server %else Group: Productivity/Networking/LDAP/Clients Conflicts: openldap-client @@ -80,14 +80,6 @@ Authors: -------- The OpenLDAP Project -This package contains the OpenLDAP client utilities. - - -Authors: --------- - The OpenLDAP Project - - %package -n openldap2-back-perl License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Perl Back-End @@ -163,17 +155,6 @@ Authors: %else %description -The Lightweight Directory Access Protocol (LDAP) is used to access -online directory services. It runs directly over TCP and can be used to -access a stand-alone LDAP directory service or to access a directory -service that has an X.500 back-end. - - - -Authors: --------- - The OpenLDAP Project - This package contains the OpenLDAP client utilities. @@ -293,7 +274,7 @@ cd ../openldap-2.3.37 libtoolize --force #aclocal -I build autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" +export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED" ./configure --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ --localstatedir=/var/run/slapd --libexecdir=/usr/lib/openldap \ --libdir=%{_libdir} --mandir=%{_mandir} --enable-aci \ diff --git a/openldap2.changes b/openldap2.changes index ad5ff78..93a73c4 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Mar 29 15:29:38 UTC 2011 - rhafer@suse.de + +- Updated to 2.4.25, important changes: + * Fixed ldapsearch pagedresults loop (ITS#6755) + * Fixed tools for incompatible args (ITS#6849) + * Fixed libldap MozNSS crash (ITS#6863) + * Fixed slapd add objectclasses in order (ITS#6837) + * Added slapd ordering for uidNumber and gidNumber (ITS#6852) + * Fixed slapd segfault when adding values out of order (ITS#6858) + * Fixed slapd sortval handling (ITS#6845) + * Fixed slapd-bdb with slapadd/index quick option (ITS#6853) + * Fixed slapd-ldap chain cn=config support (ITS#6837) + * Fixed slapd-ldap chain with slapd.conf (ITS#6857) + * Fixed slapd-meta deadlock (ITS#6846) + * Fixed slapo-sssvlv with multiple requests (ITS#6850) + * Fixed contrib/lastbind install rules (ITS#6238) + * Fixed contrib/cloak install rules (ITS#6877) + +------------------------------------------------------------------- +Tue Feb 22 09:46:04 UTC 2011 - rhafer@suse.de + +- Surpress gcc warnings about extra format string arguments for 2.3.x + built as well. + ------------------------------------------------------------------- Mon Feb 14 11:09:36 UTC 2011 - rhafer@suse.de diff --git a/openldap2.spec b/openldap2.spec index c2f200c..35e2b02 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -24,7 +24,7 @@ BuildRequires: cyrus-sasl-devel libopenssl-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif -Version: 2.4.24 +Version: 2.4.25 Release: 1 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 @@ -33,11 +33,11 @@ BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -db-devel libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Clients +Group: Productivity/Networking/LDAP/Servers Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP commandline client tools +Summary: The OpenLDAP Server %else Group: Productivity/Networking/LDAP/Clients Conflicts: openldap-client @@ -274,7 +274,7 @@ cd ../openldap-2.3.37 libtoolize --force #aclocal -I build autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" +export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED" ./configure --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ --localstatedir=/var/run/slapd --libexecdir=/usr/lib/openldap \ --libdir=%{_libdir} --mandir=%{_mandir} --enable-aci \