From a4d33565bbd54aca7ca3e4b02e202602fc8f7be1 Mon Sep 17 00:00:00 2001 From: Jan Vcelak Date: Thu, 1 Mar 2012 14:20:35 +0100 Subject: [PATCH] new upstream release (2.4.30) Resolves: #798958 --- .gitignore | 1 + openldap-man-clients-missing-options.patch | 574 --------------------- openldap-result-write-polling.patch | 125 ----- openldap.spec | 19 +- sources | 2 +- 5 files changed, 13 insertions(+), 708 deletions(-) delete mode 100644 openldap-man-clients-missing-options.patch delete mode 100644 openldap-result-write-polling.patch diff --git a/.gitignore b/.gitignore index 1aff779..ab8bb38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /openldap-2.4.28.tgz /openldap-2.4.29.tgz +/openldap-2.4.30.tgz diff --git a/openldap-man-clients-missing-options.patch b/openldap-man-clients-missing-options.patch deleted file mode 100644 index 06c5056..0000000 --- a/openldap-man-clients-missing-options.patch +++ /dev/null @@ -1,574 +0,0 @@ -man: add missing options to the client tools - -Summary of changes: - - typo in '-o' in --help output - - manpages all tools: - + add -o description (general options) - + add -N description (reverse DNS SASL host name canonicalization) - -Author: Jan Vcelak -Upstream ITS: #7177 -Resolves: #796232 - -diff --git a/clients/tools/common.c b/clients/tools/common.c -index 0eacbbb..63e246c 100644 ---- a/clients/tools/common.c -+++ b/clients/tools/common.c -@@ -341,7 +341,7 @@ N_(" -I use SASL Interactive mode\n"), - N_(" -n show what would be done but don't actually do it\n"), - N_(" -N do not use reverse DNS to canonicalize SASL host name\n"), - N_(" -O props SASL security properties\n"), --N_(" -o [=[=] general options\n"), - N_(" nettimeout= (in seconds, or \"none\" or \"max\")\n"), - N_(" ldif-wrap= (in columns, or \"no\" for no wrapping)\n"), - N_(" -p port port on LDAP server\n"), -diff --git a/doc/man/man1/ldapcompare.1 b/doc/man/man1/ldapcompare.1 -index a732522..dba49fd 100644 ---- a/doc/man/man1/ldapcompare.1 -+++ b/doc/man/man1/ldapcompare.1 -@@ -37,12 +39,18 @@ ldapcompare \- LDAP compare tool - [\c - .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -174,6 +185,30 @@ Search extensions: - rp[/][/] (LDAP Sync refreshAndPersist) - .fi - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -184,6 +219,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the ID - depends on the actual SASL mechanism used. -diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1 -index c437074..e0822d0 100644 ---- a/doc/man/man1/ldapdelete.1 -+++ b/doc/man/man1/ldapdelete.1 -@@ -39,6 +39,10 @@ ldapdelete \- LDAP delete entry tool - [\c - .BI \-p \ ldapport\fR] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BI \-U \ authcid\fR] -@@ -53,6 +57,8 @@ ldapdelete \- LDAP delete entry tool - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-X \ authzid\fR] - [\c - .BI \-Y \ mech\fR] -@@ -180,6 +186,30 @@ Use \fIsizelimit\fP when searching for children DN to delete, - to circumvent any server-side size limit. Only useful in conjunction - with \fB\-r\fP. - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+or infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -190,6 +220,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the identity depends on the - actual SASL mechanism used. -diff --git a/doc/man/man1/ldapexop.1 b/doc/man/man1/ldapexop.1 -index f857dd2..84fb158 100644 ---- a/doc/man/man1/ldapexop.1 -+++ b/doc/man/man1/ldapexop.1 -@@ -36,16 +36,18 @@ ldapexop - [\c - .BR \-n ] - [\c --.BR \-N ] -+.BI \-o \ option=value\fR] - [\c --.BI \-O \ security-properties\fR] -+.BR \-V [ V ]] - [\c --.BI \-o \ opt\fR[\fP = optparam\fR]] -+.BI \-O \ security-properties\fR] - [\c - .BI \-p \ port\fR] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-R \ realm\fR] - [\c - .BI \-U \ authcid\fR] -@@ -166,18 +168,33 @@ only as needed. - Show what would be done but don't actually do it. - Useful for debugging in conjunction with \fB\-v\fP. - .TP --.BI \-N --Do not use reverse DNS to canonicalize SASL host name. -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. - .TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP --.BI \-o \ opt\fR[\fP = optparam\fR] --Specify general options: --.nf -- nettimeout= (in seconds, or "none" or "max") --.fi --.TP - .BI \-p \ port - Specify the TCP port where the ldap server is listening. - Deprecated in favor of \fB\-H\fP. -@@ -185,6 +202,9 @@ Deprecated in favor of \fB\-H\fP. - .BI \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.BI \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-R \ realm - Specify the realm of authentication ID for SASL bind. The form of the realm - depends on the actual SASL mechanism used. -diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1 -index 72740c6..afe7aae 100644 ---- a/doc/man/man1/ldapmodify.1 -+++ b/doc/man/man1/ldapmodify.1 -@@ -41,12 +41,18 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools - [\c - .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -91,12 +97,18 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools - [\c - .BR \-P \ { 2 \||\| 3 }] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -203,6 +215,30 @@ Deprecated in favor of \fB\-H\fP. - .BR \-P \ { 2 \||\| 3 } - Specify the LDAP protocol version to use. - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -243,6 +279,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the ID - depends on the actual SASL mechanism used. -diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1 -index 4eb14e7..3f04fa9 100644 ---- a/doc/man/man1/ldapmodrdn.1 -+++ b/doc/man/man1/ldapmodrdn.1 -@@ -41,12 +41,18 @@ ldapmodrdn \- LDAP rename entry tool - [\c - .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -145,6 +151,30 @@ Deprecated in favor of \fB\-H\fP. - .BR \-P \ { 2 \||\| 3 } - Specify the LDAP protocol version to use. - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -185,6 +215,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the ID - depends on the actual SASL mechanism used. -diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1 -index 6860ac4..647aac7 100644 ---- a/doc/man/man1/ldappasswd.1 -+++ b/doc/man/man1/ldappasswd.1 -@@ -39,12 +39,18 @@ ldappasswd \- change the password of an LDAP entry - [\c - .BI \-y \ passwdfile\fR] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -142,6 +148,30 @@ Use \fIpasswd\fP as the password to bind with. - Use complete contents of \fIpasswdfile\fP as the password for - simple authentication. - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -152,6 +182,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the ID - depends on the actual SASL mechanism used. -diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1 -index 1b147e6..9243e3e 100644 ---- a/doc/man/man1/ldapsearch.1 -+++ b/doc/man/man1/ldapsearch.1 -@@ -65,12 +67,18 @@ ldapsearch \- LDAP search tool - [\c - .BI \-z \ sizelimit\fR] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -310,6 +321,30 @@ means the maximum integer allowable by the protocol. - A server may impose a maximal sizelimit which only - the root user may override. - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -320,6 +355,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the ID - depends on the actual SASL mechanism used. -diff --git a/doc/man/man1/ldapwhoami.1 b/doc/man/man1/ldapwhoami.1 -index 39653d0..6891a5d 100644 ---- a/doc/man/man1/ldapwhoami.1 -+++ b/doc/man/man1/ldapwhoami.1 -@@ -33,12 +33,18 @@ ldapwhoami \- LDAP who am i? tool - [\c - .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] - [\c -+.BI \-o \ option=value\fR] -+[\c -+.BR \-V [ V ]] -+[\c - .BI \-O \ security-properties\fR] - [\c - .BR \-I ] - [\c - .BR \-Q ] - [\c -+.BR \-N ] -+[\c - .BI \-U \ authcid\fR] - [\c - .BI \-R \ realm\fR] -@@ -103,6 +109,30 @@ Deprecated in favor of \fB\-H\fP. - Specify an alternate TCP port where the ldap server is listening. - Deprecated in favor of \fB\-H\fP. - .TP -+.BR \-o \ \fIoption \fB= \fIvalue\fP -+Specify general options. -+.RS -+.TP -+.B nettimeout -+Network timeout after which the remote side inactivity will be assumed. The -+.I value -+is either a number of seconds, -+.B none -+for zero timeout, or -+.B max -+for infinite timeout. -+.TP -+.B ldif-wrap -+Width of the LDIF output. The -+.I value -+is either a number of columns, or -+.B no -+to disable output wrapping. -+.RE -+.TP -+.BR \-V [ V ] -+Print version info. If \fB\-VV\fP is used, the command will exit afterwards. -+.TP - .BI \-O \ security-properties - Specify SASL security properties. - .TP -@@ -143,6 +173,9 @@ only as needed. - .B \-Q - Enable SASL Quiet mode. Never prompt. - .TP -+.B \-N -+Disable reverse DNS lookups to canonicalize SASL host names. -+.TP - .BI \-U \ authcid - Specify the authentication ID for SASL bind. The form of the ID - depends on the actual SASL mechanism used. --- -1.7.6.5 - diff --git a/openldap-result-write-polling.patch b/openldap-result-write-polling.patch deleted file mode 100644 index 9c71c7d..0000000 --- a/openldap-result-write-polling.patch +++ /dev/null @@ -1,125 +0,0 @@ -ldap_result: only poll sockets for write as needed - -caused ldap_result() to return -1 in SSSD - -Author: Howard Chu -Upstream ITS: 7167 -Upstream commit: 33f6bc4fe623a2fdef02de1a84fdb93de1aad32a -Resolves: #771484 - ---- - libraries/libldap/ldap-int.h | 1 + - libraries/libldap/open.c | 2 -- - libraries/libldap/os-ip.c | 26 ++++++++++++++++++++++++++ - libraries/libldap/request.c | 1 + - libraries/libldap/result.c | 6 +++--- - 5 files changed, 31 insertions(+), 5 deletions(-) - -diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h -index c558d2a..ad37250 100644 ---- a/libraries/libldap/ldap-int.h -+++ b/libraries/libldap/ldap-int.h -@@ -622,6 +622,7 @@ LDAP_F (void) ldap_free_select_info( void *sip ); - LDAP_F (void) ldap_mark_select_write( LDAP *ld, Sockbuf *sb ); - LDAP_F (void) ldap_mark_select_read( LDAP *ld, Sockbuf *sb ); - LDAP_F (void) ldap_mark_select_clear( LDAP *ld, Sockbuf *sb ); -+LDAP_F (void) ldap_clear_select_write( LDAP *ld, Sockbuf *sb ); - LDAP_F (int) ldap_is_read_ready( LDAP *ld, Sockbuf *sb ); - LDAP_F (int) ldap_is_write_ready( LDAP *ld, Sockbuf *sb ); - -diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c -index 6b92ba6..a920953 100644 ---- a/libraries/libldap/open.c -+++ b/libraries/libldap/open.c -@@ -344,7 +344,6 @@ ldap_init_fd( - - /* Add the connection to the *LDAP's select pool */ - ldap_mark_select_read( ld, conn->lconn_sb ); -- ldap_mark_select_write( ld, conn->lconn_sb ); - - *ldp = ld; - return LDAP_SUCCESS; -@@ -502,7 +501,6 @@ ldap_open_internal_connection( LDAP **ldp, ber_socket_t *fdp ) - - /* Add the connection to the *LDAP's select pool */ - ldap_mark_select_read( ld, c->lconn_sb ); -- ldap_mark_select_write( ld, c->lconn_sb ); - - /* Make this connection an LDAP V3 protocol connection */ - rc = LDAP_VERSION3; -diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c -index daa765e..2864256 100644 ---- a/libraries/libldap/os-ip.c -+++ b/libraries/libldap/os-ip.c -@@ -966,6 +966,32 @@ ldap_mark_select_clear( LDAP *ld, Sockbuf *sb ) - #endif - } - -+void -+ldap_clear_select_write( LDAP *ld, Sockbuf *sb ) -+{ -+ struct selectinfo *sip; -+ ber_socket_t sd; -+ -+ sip = (struct selectinfo *)ld->ld_selectinfo; -+ -+ ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd ); -+ -+#ifdef HAVE_POLL -+ /* for UNIX poll(2) */ -+ { -+ int i; -+ for(i=0; i < sip->si_maxfd; i++) { -+ if( sip->si_fds[i].fd == sd ) { -+ sip->si_fds[i].events &= ~POLL_WRITE; -+ } -+ } -+ } -+#else -+ /* for UNIX select(2) */ -+ FD_CLR( sd, &sip->si_writefds ); -+#endif -+} -+ - - int - ldap_is_write_ready( LDAP *ld, Sockbuf *sb ) -diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c -index 88190a2..071391d 100644 ---- a/libraries/libldap/request.c -+++ b/libraries/libldap/request.c -@@ -202,6 +202,7 @@ ldap_int_flush_request( - - /* sent -- waiting for a response */ - ldap_mark_select_read( ld, lc->lconn_sb ); -+ ldap_clear_select_write( ld, lc->lconn_sb ); - } - return 0; - } -diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c -index b6e8e75..7241df9 100644 ---- a/libraries/libldap/result.c -+++ b/libraries/libldap/result.c -@@ -302,7 +302,7 @@ wait4msg( - if ( ber_sockbuf_ctrl( lc->lconn_sb, - LBER_SB_OPT_DATA_READY, NULL ) ) - { -- lc_ready = 1; -+ lc_ready = 2; /* ready at ber level, not socket level */ - break; - } - } -@@ -373,8 +373,8 @@ wait4msg( - } - } - LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); -- /* Quit looping if no one handled any events */ -- if (!serviced) -+ /* Quit looping if no one handled any socket events */ -+ if (!serviced && lc_ready == 1) - rc = -1; - } - LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); --- -1.7.7.6 - diff --git a/openldap.spec b/openldap.spec index 2986143..eb0e6fd 100644 --- a/openldap.spec +++ b/openldap.spec @@ -7,8 +7,8 @@ %global systemctl_bin /usr/bin/systemctl Name: openldap -Version: 2.4.29 -Release: 4%{?dist} +Version: 2.4.30 +Release: 1%{?dist} Summary: LDAP support libraries Group: System Environment/Daemons License: OpenLDAP @@ -37,10 +37,8 @@ Patch5: openldap-ldaprc-currentdir.patch Patch6: openldap-userconfig-setgid.patch Patch7: openldap-dns-priority.patch Patch8: openldap-syncrepl-unset-tls-options.patch -Patch9: openldap-result-write-polling.patch -Patch10: openldap-constraint-count.patch -Patch11: openldap-man-clients-missing-options.patch -Patch12: openldap-man-sasl-nocanon.patch +Patch9: openldap-constraint-count.patch +Patch10: openldap-man-sasl-nocanon.patch # Fedora specific patches Patch100: openldap-fedora-systemd.patch @@ -146,8 +144,6 @@ pushd openldap-%{version} %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 -%patch12 -p1 %patch100 -p1 @@ -659,6 +655,13 @@ exit 0 %{evolution_connector_prefix}/ %changelog +* Thu Mar 01 2012 Jan Vcelak 2.4.30-1 +- new upstream release + + server: fixes in mdb backend + + server: fixes in manual pages + + server: fixes in syncprov, syncrepl, and pcache +- removed patches which were merged upstream + * Wed Feb 22 2012 Jan Vcelak 2.4.29-4 - fix: missing options in manual pages of client tools (#796232) - fix: SASL_NOCANON option missing in ldap.conf manual page (#732915) diff --git a/sources b/sources index d5bff83..e1829a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9821ee7d3316c55030106589a6adb26e openldap-2.4.29.tgz +4f210937cf87e3467a536dd3fed1b8b4 openldap-2.4.30.tgz