pool/openldap2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 23752 from home:coolo:branches:openSUSE:Factory:branched

Browse Source 
Copy from home:coolo:branches:openSUSE:Factory:branched/openldap2 via accept of submit request 23752 revision 2.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/23752
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=21
This commit is contained in:
Ralf Haferkamp 2009-11-04 08:11:05 +00:00 committed by Git OBS Bridge
parent 3226bd34bc
commit d2cee4b9d0
3 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openldap2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 3 19:13:32 UTC 2009 - coolo@novell.com
- updated patches to apply with fuzz=0
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 28 13:59:18 UTC 2009 - rhafer@novell.com Mon Sep 28 13:59:18 UTC 2009 - rhafer@novell.com

106
pie-compile.dif
View File

@ -1,6 +1,8 @@
--- build/top.mk 2005/06/22 09:26:29 1.3 Index: build/top.mk
+++ build/top.mk 2005/06/22 12:20:52 ===================================================================
@@ -169,9 +169,9 @@ --- build/top.mk.orig
+++ build/top.mk
@@ -178,9 +178,9 @@ SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_L
WRAP_LIBS = @WRAP_LIBS@ WRAP_LIBS = @WRAP_LIBS@
# AutoConfig generated # AutoConfig generated
AC_CC = @CC@ AC_CC = @CC@
@ -12,21 +14,25 @@
AC_LIBS = @LIBS@ AC_LIBS = @LIBS@
KRB4_LIBS = @KRB4_LIBS@ KRB4_LIBS = @KRB4_LIBS@
--- libraries/liblunicode/Makefile.in 2005/06/22 12:25:47 1.1 Index: libraries/liblunicode/Makefile.in
+++ libraries/liblunicode/Makefile.in 2005/06/22 12:26:18 ===================================================================
@@ -29,6 +29,9 @@ --- libraries/liblunicode/Makefile.in.orig
LDAP_INCDIR= ../../include +++ libraries/liblunicode/Makefile.in
LDAP_LIBDIR= ../../libraries @@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c
$(MAKE) ucgendat
./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
+PIE_CFLAGS="-fPIE" +PIE_CFLAGS="-fPIE"
+PIE_LDFLAGS="-pie" +PIE_LDFLAGS="-pie"
+ +
ucgendat: $(XLIBS) ucgendat.o ucgendat: $(XLIBS) ucgendat.o
$(LTLINK) -o $@ ucgendat.o $(LIBS) $(LTLINK) -o $@ ucgendat.o $(LIBS)
./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
--- libraries/liblutil/Makefile.in 2005/06/22 12:29:51 1.1 Index: libraries/liblutil/Makefile.in
+++ libraries/liblutil/Makefile.in 2005/06/22 12:30:20 ===================================================================
@@ -19,6 +19,9 @@ --- libraries/liblutil/Makefile.in.orig
+++ libraries/liblutil/Makefile.in
@@ -19,6 +19,9 @@ PROGRAM = testavl
LDAP_INCDIR= ../../include LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
@ -36,9 +42,11 @@
NT_SRCS = ntservice.c NT_SRCS = ntservice.c
NT_OBJS = ntservice.o slapdmsg.res NT_OBJS = ntservice.o slapdmsg.res
--- servers/slapd/Makefile.in 2005/06/22 09:28:52 1.1 Index: servers/slapd/Makefile.in
+++ servers/slapd/Makefile.in 2005/06/22 10:04:38 ===================================================================
@@ -67,6 +67,9 @@ --- servers/slapd/Makefile.in.orig
+++ servers/slapd/Makefile.in
@@ -69,6 +69,9 @@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BA
SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
@ -48,11 +56,13 @@
XDEFS = $(MODULES_CPPFLAGS) XDEFS = $(MODULES_CPPFLAGS)
XLDFLAGS = $(MODULES_LDFLAGS) XLDFLAGS = $(MODULES_LDFLAGS)
--- servers/slapd/back-bdb/Makefile.in 2005/06/22 10:05:47 1.1 Index: servers/slapd/back-bdb/Makefile.in
+++ servers/slapd/back-bdb/Makefile.in 2005/06/22 10:06:22 ===================================================================
@@ -37,6 +37,9 @@ --- servers/slapd/back-bdb/Makefile.in.orig
+++ servers/slapd/back-bdb/Makefile.in
@@ -37,6 +37,9 @@ mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_BDB@_DEFS) MOD_DEFS = $(@BUILD_BDB@_DEFS)
MOD_LIBS = $(LDBM_LIBS) MOD_LIBS = $(BDB_LIBS)
+PIE_CFLAGS="-fPIE" +PIE_CFLAGS="-fPIE"
+PIE_LDFLAGS="-pie" +PIE_LDFLAGS="-pie"
@ -60,11 +70,13 @@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
--- servers/slapd/back-hdb/Makefile.in 2005/06/22 11:31:01 1.1 Index: servers/slapd/back-hdb/Makefile.in
+++ servers/slapd/back-hdb/Makefile.in 2005/06/22 11:31:41 ===================================================================
@@ -39,6 +39,9 @@ --- servers/slapd/back-hdb/Makefile.in.orig
+++ servers/slapd/back-hdb/Makefile.in
@@ -41,6 +41,9 @@ mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_HDB@_DEFS) MOD_DEFS = $(@BUILD_HDB@_DEFS)
MOD_LIBS = $(LDBM_LIBS) MOD_LIBS = $(BDB_LIBS)
+PIE_CFLAGS="-fPIE" +PIE_CFLAGS="-fPIE"
+PIE_LDFLAGS="-pie" +PIE_LDFLAGS="-pie"
@ -72,9 +84,11 @@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
--- servers/slapd/overlays/Makefile.in 2005/06/22 12:35:29 1.1 Index: servers/slapd/overlays/Makefile.in
+++ servers/slapd/overlays/Makefile.in 2005/06/22 12:35:47 ===================================================================
@@ -19,6 +19,9 @@ --- servers/slapd/overlays/Makefile.in.orig
+++ servers/slapd/overlays/Makefile.in
@@ -45,6 +45,9 @@ LTONLY_MOD = $(LTONLY_mod)
LDAP_INCDIR= ../../../include LDAP_INCDIR= ../../../include
LDAP_LIBDIR= ../../../libraries LDAP_LIBDIR= ../../../libraries
@ -84,9 +98,11 @@
MOD_DEFS = -DSLAPD_IMPORT MOD_DEFS = -DSLAPD_IMPORT
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
--- servers/slapd/back-relay/Makefile.in 2005/09/23 09:59:31 1.1 Index: servers/slapd/back-relay/Makefile.in
+++ servers/slapd/back-relay/Makefile.in 2005/09/23 09:59:12 ===================================================================
@@ -24,6 +24,9 @@ --- servers/slapd/back-relay/Makefile.in.orig
+++ servers/slapd/back-relay/Makefile.in
@@ -25,6 +25,9 @@ BUILD_MOD = @BUILD_RELAY@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_RELAY@_DEFS) MOD_DEFS = $(@BUILD_RELAY@_DEFS)
@ -96,9 +112,11 @@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)
--- servers/slapd/back-ldif/Makefile.in 2005/09/23 09:58:52 1.1 Index: servers/slapd/back-ldif/Makefile.in
+++ servers/slapd/back-ldif/Makefile.in 2005/09/23 09:58:54 ===================================================================
@@ -25,6 +25,9 @@ --- servers/slapd/back-ldif/Makefile.in.orig
+++ servers/slapd/back-ldif/Makefile.in
@@ -25,6 +25,9 @@ BUILD_MOD = yes
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(yes_DEFS) MOD_DEFS = $(yes_DEFS)
@ -108,9 +126,11 @@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
--- libraries/librewrite/Makefile.in 2005/09/23 10:16:37 1.1 Index: libraries/librewrite/Makefile.in
+++ libraries/librewrite/Makefile.in 2005/09/23 10:18:36 ===================================================================
@@ -26,6 +26,9 @@ --- libraries/librewrite/Makefile.in.orig
+++ libraries/librewrite/Makefile.in
@@ -26,6 +26,9 @@ OBJS = config.o context.o info.o ldapmap
LDAP_INCDIR= ../../include LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
@ -120,9 +140,11 @@
LIBRARY = librewrite.a LIBRARY = librewrite.a
PROGRAMS = rewrite PROGRAMS = rewrite
XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \ XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \
--- servers/slapd/back-ldap/Makefile.in 2005/12/09 08:58:44 1.1 Index: servers/slapd/back-ldap/Makefile.in
+++ servers/slapd/back-ldap/Makefile.in 2005/12/09 08:59:28 ===================================================================
@@ -27,6 +27,9 @@ --- servers/slapd/back-ldap/Makefile.in.orig
+++ servers/slapd/back-ldap/Makefile.in
@@ -29,6 +29,9 @@ BUILD_MOD = @BUILD_LDAP@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_LDAP@_DEFS) MOD_DEFS = $(@BUILD_LDAP@_DEFS)
@ -132,9 +154,11 @@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
--- servers/slapd/back-monitor/Makefile.in 2005/12/09 08:58:55 1.1 Index: servers/slapd/back-monitor/Makefile.in
+++ servers/slapd/back-monitor/Makefile.in 2005/12/09 08:59:48 ===================================================================
@@ -33,6 +33,9 @@ --- servers/slapd/back-monitor/Makefile.in.orig
+++ servers/slapd/back-monitor/Makefile.in
@@ -33,6 +33,9 @@ BUILD_MOD = @BUILD_MONITOR@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_MONITOR@_DEFS) MOD_DEFS = $(@BUILD_MONITOR@_DEFS)

10
slapo-collect-include.dif
View File

@ -1,12 +1,12 @@
Index: openldap-2.4.12/servers/slapd/overlays/collect.c Index: openldap-2.4.17/servers/slapd/overlays/collect.c
=================================================================== ===================================================================
--- openldap-2.4.12.orig/servers/slapd/overlays/collect.c --- openldap-2.4.17.orig/servers/slapd/overlays/collect.c
+++ openldap-2.4.12/servers/slapd/overlays/collect.c +++ openldap-2.4.17/servers/slapd/overlays/collect.c
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include "slap.h" #include "slap.h"
#include "config.h" #include "config.h"
+#include "lutil.h" +#include "lutil.h"
/* This is a cheap hack to implement a collective attribute. #include "lutil.h"
*