jengelh/openldap2
SHA256
1
0
Fork 2
forked from pool/openldap2
Code Pull Requests Activity

checked in

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=23
This commit is contained in:
OBS User autobuild 2009-11-16 17:32:44 +00:00 committed by Git OBS Bridge
parent b4a89e2515
commit 4402337b0e
5 changed files with 48 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openldap2-client.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
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

4
openldap2-client.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package openldap2 (Version 2.4.17) # spec file for package openldap2-client (Version 2.4.17)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,7 +18,7 @@
# norootforbuild # norootforbuild
Name: openldap2-client Name: openldap2-client
BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel BuildRequires: cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
%if %sles_version == 9 %if %sles_version == 9
BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel

5
openldap2.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
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,8 +1,6 @@
Index: build/top.mk --- build/top.mk 2005/06/22 09:26:29 1.3
=================================================================== +++ build/top.mk 2005/06/22 12:20:52
--- build/top.mk.orig @@ -169,9 +169,9 @@
+++ 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@
@ -14,25 +12,21 @@ Index: build/top.mk
AC_LIBS = @LIBS@ AC_LIBS = @LIBS@
KRB4_LIBS = @KRB4_LIBS@ KRB4_LIBS = @KRB4_LIBS@
Index: libraries/liblunicode/Makefile.in --- libraries/liblunicode/Makefile.in 2005/06/22 12:25:47 1.1
=================================================================== +++ libraries/liblunicode/Makefile.in 2005/06/22 12:26:18
--- libraries/liblunicode/Makefile.in.orig @@ -29,6 +29,9 @@
+++ libraries/liblunicode/Makefile.in LDAP_INCDIR= ../../include
@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c LDAP_LIBDIR= ../../libraries
$(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
Index: libraries/liblutil/Makefile.in --- libraries/liblutil/Makefile.in 2005/06/22 12:29:51 1.1
=================================================================== +++ libraries/liblutil/Makefile.in 2005/06/22 12:30:20
--- libraries/liblutil/Makefile.in.orig @@ -19,6 +19,9 @@
+++ libraries/liblutil/Makefile.in
@@ -19,6 +19,9 @@ PROGRAM = testavl
LDAP_INCDIR= ../../include LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
@ -42,11 +36,9 @@ Index: libraries/liblutil/Makefile.in
NT_SRCS = ntservice.c NT_SRCS = ntservice.c
NT_OBJS = ntservice.o slapdmsg.res NT_OBJS = ntservice.o slapdmsg.res
Index: servers/slapd/Makefile.in --- servers/slapd/Makefile.in 2005/06/22 09:28:52 1.1
=================================================================== +++ servers/slapd/Makefile.in 2005/06/22 10:04:38
--- servers/slapd/Makefile.in.orig @@ -67,6 +67,9 @@
+++ servers/slapd/Makefile.in
@@ -69,6 +69,9 @@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BA
SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
@ -56,13 +48,11 @@ Index: servers/slapd/Makefile.in
XDEFS = $(MODULES_CPPFLAGS) XDEFS = $(MODULES_CPPFLAGS)
XLDFLAGS = $(MODULES_LDFLAGS) XLDFLAGS = $(MODULES_LDFLAGS)
Index: servers/slapd/back-bdb/Makefile.in --- servers/slapd/back-bdb/Makefile.in 2005/06/22 10:05:47 1.1
=================================================================== +++ servers/slapd/back-bdb/Makefile.in 2005/06/22 10:06:22
--- servers/slapd/back-bdb/Makefile.in.orig @@ -37,6 +37,9 @@
+++ 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 = $(BDB_LIBS) MOD_LIBS = $(LDBM_LIBS)
+PIE_CFLAGS="-fPIE" +PIE_CFLAGS="-fPIE"
+PIE_LDFLAGS="-pie" +PIE_LDFLAGS="-pie"
@ -70,13 +60,11 @@ Index: servers/slapd/back-bdb/Makefile.in
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)
Index: servers/slapd/back-hdb/Makefile.in --- servers/slapd/back-hdb/Makefile.in 2005/06/22 11:31:01 1.1
=================================================================== +++ servers/slapd/back-hdb/Makefile.in 2005/06/22 11:31:41
--- servers/slapd/back-hdb/Makefile.in.orig @@ -39,6 +39,9 @@
+++ 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 = $(BDB_LIBS) MOD_LIBS = $(LDBM_LIBS)
+PIE_CFLAGS="-fPIE" +PIE_CFLAGS="-fPIE"
+PIE_LDFLAGS="-pie" +PIE_LDFLAGS="-pie"
@ -84,11 +72,9 @@ Index: servers/slapd/back-hdb/Makefile.in
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)
Index: servers/slapd/overlays/Makefile.in --- servers/slapd/overlays/Makefile.in 2005/06/22 12:35:29 1.1
=================================================================== +++ servers/slapd/overlays/Makefile.in 2005/06/22 12:35:47
--- servers/slapd/overlays/Makefile.in.orig @@ -19,6 +19,9 @@
+++ 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
@ -98,11 +84,9 @@ Index: servers/slapd/overlays/Makefile.in
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)
Index: servers/slapd/back-relay/Makefile.in --- servers/slapd/back-relay/Makefile.in 2005/09/23 09:59:31 1.1
=================================================================== +++ servers/slapd/back-relay/Makefile.in 2005/09/23 09:59:12
--- servers/slapd/back-relay/Makefile.in.orig @@ -24,6 +24,9 @@
+++ 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)
@ -112,11 +96,9 @@ Index: servers/slapd/back-relay/Makefile.in
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)
Index: servers/slapd/back-ldif/Makefile.in --- servers/slapd/back-ldif/Makefile.in 2005/09/23 09:58:52 1.1
=================================================================== +++ servers/slapd/back-ldif/Makefile.in 2005/09/23 09:58:54
--- servers/slapd/back-ldif/Makefile.in.orig @@ -25,6 +25,9 @@
+++ 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)
@ -126,11 +108,9 @@ Index: servers/slapd/back-ldif/Makefile.in
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)
Index: libraries/librewrite/Makefile.in --- libraries/librewrite/Makefile.in 2005/09/23 10:16:37 1.1
=================================================================== +++ libraries/librewrite/Makefile.in 2005/09/23 10:18:36
--- libraries/librewrite/Makefile.in.orig @@ -26,6 +26,9 @@
+++ 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
@ -140,11 +120,9 @@ Index: libraries/librewrite/Makefile.in
LIBRARY = librewrite.a LIBRARY = librewrite.a
PROGRAMS = rewrite PROGRAMS = rewrite
XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \ XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \
Index: servers/slapd/back-ldap/Makefile.in --- servers/slapd/back-ldap/Makefile.in 2005/12/09 08:58:44 1.1
=================================================================== +++ servers/slapd/back-ldap/Makefile.in 2005/12/09 08:59:28
--- servers/slapd/back-ldap/Makefile.in.orig @@ -27,6 +27,9 @@
+++ 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)
@ -154,11 +132,9 @@ Index: servers/slapd/back-ldap/Makefile.in
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)
Index: servers/slapd/back-monitor/Makefile.in --- servers/slapd/back-monitor/Makefile.in 2005/12/09 08:58:55 1.1
=================================================================== +++ servers/slapd/back-monitor/Makefile.in 2005/12/09 08:59:48
--- servers/slapd/back-monitor/Makefile.in.orig @@ -33,6 +33,9 @@
+++ 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.17/servers/slapd/overlays/collect.c Index: openldap-2.4.12/servers/slapd/overlays/collect.c
=================================================================== ===================================================================
--- openldap-2.4.17.orig/servers/slapd/overlays/collect.c --- openldap-2.4.12.orig/servers/slapd/overlays/collect.c
+++ openldap-2.4.17/servers/slapd/overlays/collect.c +++ openldap-2.4.12/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"
#include "lutil.h" /* This is a cheap hack to implement a collective attribute.
*