rpms
/
openldap
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reapplied all patches 

added series file to support quilt
This commit is contained in:
Jan Vcelak 2011-02-14 13:10:53 +01:00
parent 202278bcf4
commit f81fb151c9
11 changed files with 56 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openldap-evolution-ntlm.patch
View File

@ -1,10 +1,9 @@
Get rid of this patch as soon as possible. Get rid of this patch as soon as possible.
More details are provided in README.evolution More details are provided in README.evolution
diff -uNPrp openldap-2.4.23.old/include/ldap.h openldap-2.4.23.new/include/ldap.h --- openldap-2.4.24.orig/include/ldap.h
--- openldap-2.4.23.old/include/ldap.h 2010-06-10 20:48:36.000000000 +0200 +++ openldap-2.4.24/include/ldap.h
+++ openldap-2.4.23.new/include/ldap.h 2010-08-24 18:17:46.306679878 +0200 @@ -2518,5 +2518,26 @@ ldap_parse_deref_control LDAP_P((
@@ -2487,5 +2487,26 @@ ldap_parse_deref_control LDAP_P((
LDAPControl **ctrls, LDAPControl **ctrls,
LDAPDerefRes **drp )); LDAPDerefRes **drp ));
@ -31,9 +30,8 @@ diff -uNPrp openldap-2.4.23.old/include/ldap.h openldap-2.4.23.new/include/ldap.
+ +
LDAP_END_DECL LDAP_END_DECL
#endif /* _LDAP_H */ #endif /* _LDAP_H */
diff -uNPrp openldap-2.4.23.old/libraries/libldap/Makefile.in openldap-2.4.23.new/libraries/libldap/Makefile.in --- openldap-2.4.24.orig/libraries/libldap/Makefile.in
--- openldap-2.4.23.old/libraries/libldap/Makefile.in 2010-04-13 22:22:55.000000000 +0200 +++ openldap-2.4.24/libraries/libldap/Makefile.in
+++ openldap-2.4.23.new/libraries/libldap/Makefile.in 2010-08-24 18:17:46.306679878 +0200
@@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur @@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur
SRCS = bind.c open.c result.c error.c compare.c search.c \ SRCS = bind.c open.c result.c error.c compare.c search.c \
controls.c messages.c references.c extended.c cyrus.c \ controls.c messages.c references.c extended.c cyrus.c \
@ -52,9 +50,8 @@ diff -uNPrp openldap-2.4.23.old/libraries/libldap/Makefile.in openldap-2.4.23.ne
filter.lo free.lo sort.lo passwd.lo whoami.lo \ filter.lo free.lo sort.lo passwd.lo whoami.lo \
getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \ getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \ request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
diff -uNPrp openldap-2.4.23.old/libraries/libldap/ntlm.c openldap-2.4.23.new/libraries/libldap/ntlm.c --- /dev/null
--- openldap-2.4.23.old/libraries/libldap/ntlm.c 1970-01-01 01:00:00.000000000 +0100 +++ openldap-2.4.24/libraries/libldap/ntlm.c
+++ openldap-2.4.23.new/libraries/libldap/ntlm.c 2010-08-24 18:17:46.330680333 +0200
@@ -0,0 +1,137 @@ @@ -0,0 +1,137 @@
+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
+/* +/*

10
openldap-export-ldif.patch
View File

@ -4,9 +4,8 @@ mozldap with openldap in FreeIPA project.
Upstream: ITS #6194 Upstream: ITS #6194
Author: Rich Megginson <rmeggins@redhat.com> Author: Rich Megginson <rmeggins@redhat.com>
diff -uNPrp openldap-2.4.23.old/include/Makefile.in openldap-2.4.23.new/include/Makefile.in --- openldap-2.4.24.orig/include/Makefile.in
--- openldap-2.4.23.old/include/Makefile.in 2010-04-13 22:22:47.000000000 +0200 +++ openldap-2.4.24/include/Makefile.in
+++ openldap-2.4.23.new/include/Makefile.in 2010-08-19 17:40:29.073805139 +0200
@@ -20,7 +20,8 @@ install-local: FORCE @@ -20,7 +20,8 @@ install-local: FORCE
for header in $(srcdir)/lber.h lber_types.h \ for header in $(srcdir)/lber.h lber_types.h \
$(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \ $(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
@ -17,9 +16,8 @@ diff -uNPrp openldap-2.4.23.old/include/Makefile.in openldap-2.4.23.new/include/
do \ do \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \ $(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
done done
diff -uNPrp openldap-2.4.23.old/libraries/liblutil/Makefile.in openldap-2.4.23.new/libraries/liblutil/Makefile.in --- openldap-2.4.24.orig/libraries/liblutil/Makefile.in
--- openldap-2.4.23.old/libraries/liblutil/Makefile.in 2010-04-19 18:53:01.000000000 +0200 +++ openldap-2.4.24/libraries/liblutil/Makefile.in
+++ openldap-2.4.23.new/libraries/liblutil/Makefile.in 2010-08-19 17:40:20.424679962 +0200
@@ -14,6 +14,9 @@ @@ -14,6 +14,9 @@
## <http://www.OpenLDAP.org/license.html>. ## <http://www.OpenLDAP.org/license.html>.

5
openldap-ldaprc-currentdir.patch
View File

@ -4,9 +4,8 @@ Resolves: #38402
Upstream: ITS #1131 Upstream: ITS #1131
Author: Henning Schmiedehausen <hps@intermeta.de> Author: Henning Schmiedehausen <hps@intermeta.de>
diff -u -uNPrp openldap-2.4.23.old/libraries/libldap/init.c openldap-2.4.23.new/libraries/libldap/init.c --- openldap-2.4.24.orig/libraries/libldap/init.c
--- openldap-2.4.23.old/libraries/libldap/init.c 2010-04-13 22:22:57.000000000 +0200 +++ openldap-2.4.24/libraries/libldap/init.c
+++ openldap-2.4.23.new/libraries/libldap/init.c 2010-08-24 15:34:27.780680598 +0200
@@ -346,9 +346,6 @@ static void openldap_ldap_init_w_usercon @@ -346,9 +346,6 @@ static void openldap_ldap_init_w_usercon
if(path != NULL) { if(path != NULL) {
LDAP_FREE(path); LDAP_FREE(path);

40
openldap-manpages.patch
View File

@ -2,9 +2,8 @@ Various manual pages changes:
* removes LIBEXECDIR from slapd.8 * removes LIBEXECDIR from slapd.8
* removes references to non-existing manpages (bz 624616) * removes references to non-existing manpages (bz 624616)
diff -uNPrp openldap-2.4.23.old/doc/man/man1/ldapmodify.1 openldap-2.4.23.new/doc/man/man1/ldapmodify.1 --- openldap-2.4.24.orig/doc/man/man1/ldapmodify.1
--- openldap-2.4.23.old/doc/man/man1/ldapmodify.1 2010-04-13 22:22:36.000000000 +0200 +++ openldap-2.4.24/doc/man/man1/ldapmodify.1
+++ openldap-2.4.23.new/doc/man/man1/ldapmodify.1 2010-08-19 17:42:10.256805450 +0200
@@ -364,9 +364,7 @@ exit status and a diagnostic message bei @@ -364,9 +364,7 @@ exit status and a diagnostic message bei
.BR ldap_add_ext (3), .BR ldap_add_ext (3),
.BR ldap_delete_ext (3), .BR ldap_delete_ext (3),
@ -16,20 +15,18 @@ diff -uNPrp openldap-2.4.23.old/doc/man/man1/ldapmodify.1 openldap-2.4.23.new/do
.SH AUTHOR .SH AUTHOR
The OpenLDAP Project <http://www.openldap.org/> The OpenLDAP Project <http://www.openldap.org/>
.SH ACKNOWLEDGEMENTS .SH ACKNOWLEDGEMENTS
diff -uNPrp openldap-2.4.23.old/doc/man/man5/ldap.conf.5 openldap-2.4.23.new/doc/man/man5/ldap.conf.5 --- openldap-2.4.24.orig/doc/man/man5/ldap.conf.5
--- openldap-2.4.23.old/doc/man/man5/ldap.conf.5 2010-04-13 22:22:41.000000000 +0200 +++ openldap-2.4.24/doc/man/man5/ldap.conf.5
+++ openldap-2.4.23.new/doc/man/man5/ldap.conf.5 2010-08-19 17:43:25.312805428 +0200
@@ -317,6 +317,7 @@ certificates in separate individual file @@ -317,6 +317,7 @@ certificates in separate individual file
.B TLS_CACERT .B TLS_CACERT
is always used before is always used before
.B TLS_CACERTDIR. .B TLS_CACERTDIR.
+The specified directory must be managed with the OpenSSL c_rehash utility. +The specified directory must be managed with the OpenSSL c_rehash utility.
This parameter is ignored with GNUtls. This parameter is ignored with GnuTLS.
.TP
.B TLS_CERT <filename> When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
diff -uNPrp openldap-2.4.23.old/doc/man/man5/ldif.5 openldap-2.4.23.new/doc/man/man5/ldif.5 --- openldap-2.4.24.orig/doc/man/man5/ldif.5
--- openldap-2.4.23.old/doc/man/man5/ldif.5 2010-04-13 22:22:41.000000000 +0200 +++ openldap-2.4.24/doc/man/man5/ldif.5
+++ openldap-2.4.23.new/doc/man/man5/ldif.5 2010-08-19 17:42:10.256805450 +0200
@@ -270,8 +270,7 @@ commands. @@ -270,8 +270,7 @@ commands.
.BR ldapmodify (1), .BR ldapmodify (1),
.BR slapadd (8), .BR slapadd (8),
@ -40,10 +37,9 @@ diff -uNPrp openldap-2.4.23.old/doc/man/man5/ldif.5 openldap-2.4.23.new/doc/man/
.LP .LP
"LDAP Data Interchange Format," Good, G., RFC 2849. "LDAP Data Interchange Format," Good, G., RFC 2849.
.SH ACKNOWLEDGEMENTS .SH ACKNOWLEDGEMENTS
diff -uNPrp openldap-2.4.23.old/doc/man/man5/slapd-config.5 openldap-2.4.23.new/doc/man/man5/slapd-config.5 --- openldap-2.4.24.orig/doc/man/man5/slapd-config.5
--- openldap-2.4.23.old/doc/man/man5/slapd-config.5 2010-06-10 19:17:53.000000000 +0200 +++ openldap-2.4.24/doc/man/man5/slapd-config.5
+++ openldap-2.4.23.new/doc/man/man5/slapd-config.5 2010-08-19 17:42:10.258805346 +0200 @@ -2068,7 +2068,6 @@ default slapd configuration directory
@@ -1995,7 +1995,6 @@ default slapd configuration directory
.BR slapd.conf (5), .BR slapd.conf (5),
.BR slapd.overlays (5), .BR slapd.overlays (5),
.BR slapd.plugin (5), .BR slapd.plugin (5),
@ -51,10 +47,9 @@ diff -uNPrp openldap-2.4.23.old/doc/man/man5/slapd-config.5 openldap-2.4.23.new/
.BR slapd (8), .BR slapd (8),
.BR slapacl (8), .BR slapacl (8),
.BR slapadd (8), .BR slapadd (8),
diff -uNPrp openldap-2.4.23.old/doc/man/man5/slapd.conf.5 openldap-2.4.23.new/doc/man/man5/slapd.conf.5 --- openldap-2.4.24.orig/doc/man/man5/slapd.conf.5
--- openldap-2.4.23.old/doc/man/man5/slapd.conf.5 2010-04-16 20:05:07.000000000 +0200 +++ openldap-2.4.24/doc/man/man5/slapd.conf.5
+++ openldap-2.4.23.new/doc/man/man5/slapd.conf.5 2010-08-19 17:42:10.261805644 +0200 @@ -1998,7 +1998,6 @@ default slapd configuration file
@@ -1927,7 +1927,6 @@ default slapd configuration file
.BR slapd.backends (5), .BR slapd.backends (5),
.BR slapd.overlays (5), .BR slapd.overlays (5),
.BR slapd.plugin (5), .BR slapd.plugin (5),
@ -62,9 +57,8 @@ diff -uNPrp openldap-2.4.23.old/doc/man/man5/slapd.conf.5 openldap-2.4.23.new/do
.BR slapd (8), .BR slapd (8),
.BR slapacl (8), .BR slapacl (8),
.BR slapadd (8), .BR slapadd (8),
diff -uNPrp openldap-2.4.23.old/doc/man/man8/slapd.8 openldap-2.4.23.new/doc/man/man8/slapd.8 --- openldap-2.4.24.orig/doc/man/man8/slapd.8
--- openldap-2.4.23.old/doc/man/man8/slapd.8 2010-04-13 22:22:46.000000000 +0200 +++ openldap-2.4.24/doc/man/man8/slapd.8
+++ openldap-2.4.23.new/doc/man/man8/slapd.8 2010-08-19 17:44:19.996680613 +0200
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
.SH NAME .SH NAME
slapd \- Stand-alone LDAP Daemon slapd \- Stand-alone LDAP Daemon

7
openldap-reentrant-gethostby.patch
View File

@ -7,9 +7,8 @@ the functions, even if we're not being compiled for use in libldap_r
Resolves: #179730 Resolves: #179730
Author: Jeffery Layton <jlayton@redhat.com> Author: Jeffery Layton <jlayton@redhat.com>
diff -uNPrp openldap-2.4.23.old/libraries/libldap/util-int.c openldap-2.4.23.new/libraries/libldap/util-int.c --- openldap-2.4.24.orig/libraries/libldap/util-int.c
--- openldap-2.4.23.old/libraries/libldap/util-int.c 2010-04-19 18:53:01.000000000 +0200 +++ openldap-2.4.24/libraries/libldap/util-int.c
+++ openldap-2.4.23.new/libraries/libldap/util-int.c 2010-08-19 17:47:52.456805354 +0200
@@ -52,8 +52,8 @@ extern int h_errno; @@ -52,8 +52,8 @@ extern int h_errno;
#ifndef LDAP_R_COMPILE #ifndef LDAP_R_COMPILE
# undef HAVE_REENTRANT_FUNCTIONS # undef HAVE_REENTRANT_FUNCTIONS
@ -21,7 +20,7 @@ diff -uNPrp openldap-2.4.23.old/libraries/libldap/util-int.c openldap-2.4.23.new
#else #else
# include <ldap_pvt_thread.h> # include <ldap_pvt_thread.h>
@@ -330,7 +330,7 @@ ldap_pvt_csnstr(char *buf, size_t len, u @@ -312,7 +312,7 @@ ldap_pvt_csnstr(char *buf, size_t len, u
#define BUFSTART (1024-32) #define BUFSTART (1024-32)
#define BUFMAX (32*1024-32) #define BUFMAX (32*1024-32)

5
openldap-security-pie.patch
View File

@ -3,9 +3,8 @@ address space layout randomization (ASLD).
Author: Thomas Woerner <twoerner@redhat.com> Author: Thomas Woerner <twoerner@redhat.com>
diff -uNPrp openldap-2.4.23.old/servers/slapd/Makefile.in openldap-2.4.23.new/servers/slapd/Makefile.in --- openldap-2.4.24.orig/servers/slapd/Makefile.in
--- openldap-2.4.23.old/servers/slapd/Makefile.in 2010-04-13 22:23:09.000000000 +0200 +++ openldap-2.4.24/servers/slapd/Makefile.in
+++ openldap-2.4.23.new/servers/slapd/Makefile.in 2010-08-24 15:09:08.999680712 +0200
@@ -266,7 +266,7 @@ libslapi.a: slapi/.libs/libslapi.a @@ -266,7 +266,7 @@ libslapi.a: slapi/.libs/libslapi.a
cp slapi/.libs/libslapi.a . cp slapi/.libs/libslapi.a .

5
openldap-slapd-conf.patch
View File

@ -1,8 +1,7 @@
Updates initial slapd configuration. Updates initial slapd configuration.
diff -uNPrp openldap-2.4.23.old/servers/slapd/slapd.conf openldap-2.4.23.new/servers/slapd/slapd.conf --- openldap-2.4.24.orig/servers/slapd/slapd.conf
--- openldap-2.4.23.old/servers/slapd/slapd.conf 2007-02-13 21:22:22.000000000 +0100 +++ openldap-2.4.24/servers/slapd/slapd.conf
+++ openldap-2.4.23.new/servers/slapd/slapd.conf 2010-11-22 17:39:02.334511902 +0100
@@ -2,22 +2,71 @@ @@ -2,22 +2,71 @@
# See slapd.conf(5) for details on configuration options. # See slapd.conf(5) for details on configuration options.
# This file should NOT be world readable. # This file should NOT be world readable.

10
openldap-smbk5pwd-overlay.patch
View File

@ -3,9 +3,8 @@ Compile smbk5pwd together with other overlays.
Resolves: 550895 Resolves: 550895
Author: Jan Šafránek <jsafrane@redhat.com> Author: Jan Šafránek <jsafrane@redhat.com>
diff -urNPp openldap-2.4.23.old/contrib/slapd-modules/smbk5pwd/README openldap-2.4.23.new/contrib/slapd-modules/smbk5pwd/README --- openldap-2.4.24.orig/contrib/slapd-modules/smbk5pwd/README
--- openldap-2.4.23.old/contrib/slapd-modules/smbk5pwd/README 2010-04-13 22:22:30.000000000 +0200 +++ openldap-2.4.24/contrib/slapd-modules/smbk5pwd/README
+++ openldap-2.4.23.new/contrib/slapd-modules/smbk5pwd/README 2010-08-23 13:20:33.338687818 +0200
@@ -1,3 +1,8 @@ @@ -1,3 +1,8 @@
+******************************************************* +*******************************************************
+Red Hat note: Kerberos support is NOT compiled into +Red Hat note: Kerberos support is NOT compiled into
@ -15,9 +14,8 @@ diff -urNPp openldap-2.4.23.old/contrib/slapd-modules/smbk5pwd/README openldap-2
This directory contains a slapd overlay, smbk5pwd, that extends the This directory contains a slapd overlay, smbk5pwd, that extends the
PasswordModify Extended Operation to update Kerberos keys and Samba PasswordModify Extended Operation to update Kerberos keys and Samba
password hashes for an LDAP user. password hashes for an LDAP user.
diff -urNPp openldap-2.4.23.old/servers/slapd/overlays/Makefile.in openldap-2.4.23.new/servers/slapd/overlays/Makefile.in --- openldap-2.4.24.orig/servers/slapd/overlays/Makefile.in
--- openldap-2.4.23.old/servers/slapd/overlays/Makefile.in 2010-04-13 22:23:44.000000000 +0200 +++ openldap-2.4.24/servers/slapd/overlays/Makefile.in
+++ openldap-2.4.23.new/servers/slapd/overlays/Makefile.in 2010-08-23 13:20:33.338687818 +0200
@@ -33,7 +33,8 @@ SRCS = overlays.c \ @@ -33,7 +33,8 @@ SRCS = overlays.c \
syncprov.c \ syncprov.c \
translucent.c \ translucent.c \

5
openldap-sql-linking.patch
View File

@ -1,9 +1,8 @@
Removes unnecessary linking of SQL libraries into slapd. This makes openldap-servers package Removes unnecessary linking of SQL libraries into slapd. This makes openldap-servers package
independent on libodbc. (SQL backend is packaged separately in openldap-servers-sql.) independent on libodbc. (SQL backend is packaged separately in openldap-servers-sql.)
diff -uNPrp openldap-2.4.23.old/build/top.mk openldap-2.4.23.new/build/top.mk --- openldap-2.4.24.orig/build/top.mk
--- openldap-2.4.23.old/build/top.mk 2010-04-13 22:22:22.000000000 +0200 +++ openldap-2.4.24/build/top.mk
+++ openldap-2.4.23.new/build/top.mk 2010-08-25 15:58:18.477648731 +0200
@@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@ @@ -201,7 +201,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@ SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@ SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@

7
openldap-userconfig-setgid.patch
View File

@ -3,10 +3,9 @@ This patch adds the same behavior for GID.
Author: Nalin Dahyabhai <nalin@redhat.com> Author: Nalin Dahyabhai <nalin@redhat.com>
diff -uNPrp openldap-2.4.23.old/libraries/libldap/init.c openldap-2.4.23.new/libraries/libldap/init.c --- openldap-2.4.24.orig/libraries/libldap/init.c
--- openldap-2.4.23.old/libraries/libldap/init.c 2010-04-13 22:22:57.000000000 +0200 +++ openldap-2.4.24/libraries/libldap/init.c
+++ openldap-2.4.23.new/libraries/libldap/init.c 2010-08-24 17:25:07.207682002 +0200 @@ -670,7 +670,7 @@ void ldap_int_initialize( struct ldapopt
@@ -663,7 +663,7 @@ void ldap_int_initialize( struct ldapopt
openldap_ldap_init_w_sysconf(LDAP_CONF_FILE); openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
#ifdef HAVE_GETEUID #ifdef HAVE_GETEUID

10
series Normal file
View File

@ -0,0 +1,10 @@
openldap-slapd-conf.patch
openldap-manpages.patch
openldap-security-pie.patch
openldap-sql-linking.patch
openldap-reentrant-gethostby.patch
openldap-export-ldif.patch
openldap-smbk5pwd-overlay.patch
openldap-ldaprc-currentdir.patch
openldap-userconfig-setgid.patch
openldap-evolution-ntlm.patch