diff --git a/0001-build-adjustments.dif b/0001-build-adjustments.dif index 5f71315..750daa2 100644 --- a/0001-build-adjustments.dif +++ b/0001-build-adjustments.dif @@ -1,9 +1,8 @@ -From 2a6dda988ea0b14931427cce835e8a6da5c3488e Mon Sep 17 00:00:00 2001 +From 5ea89a18adad1c9e03fc8792dd95a4ad80603025 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 16 Jun 2010 14:04:07 +0200 -Subject: build-adjustments +Subject: [PATCH 01/11] build-adjustments -- Don't strip binaries - Adjusted modules path - don't use automake macro diff --git a/0005-pie-compile.dif b/0005-pie-compile.dif index 8da876d..504dd29 100644 --- a/0005-pie-compile.dif +++ b/0005-pie-compile.dif @@ -1,181 +1,120 @@ -From c73e8eb5d25f22ffb1203a38becbe88da4fc9116 Mon Sep 17 00:00:00 2001 +From 0067c67787f5ce93c90f60d51e01c769c918520c Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp -Date: Wed, 16 Jun 2010 14:08:30 +0200 +Date: Fri, 12 Nov 2010 09:39:11 +0100 Subject: pie compile - 12 files changed, 35 insertions(+), 2 deletions(-) + 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build/top.mk b/build/top.mk -index eb4c825..4cb3da8 100644 +index eb4c825..6339d63 100644 --- a/build/top.mk +++ b/build/top.mk -@@ -178,9 +178,9 @@ SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \ - WRAP_LIBS = @WRAP_LIBS@ - # AutoConfig generated - AC_CC = @CC@ --AC_CFLAGS = @CFLAGS@ -+AC_CFLAGS = @CFLAGS@ $(PIE_CFLAGS) - AC_DEFS = @CPPFLAGS@ # @DEFS@ --AC_LDFLAGS = @LDFLAGS@ -+AC_LDFLAGS = @LDFLAGS@ $(PIE_LDFLAGS) - AC_LIBS = @LIBS@ +@@ -107,7 +107,7 @@ LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) + LTSTATIC = @LTSTATIC@ - KRB4_LIBS = @KRB4_LIBS@ -diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in -index 5348baa..7332d4e 100644 ---- a/libraries/liblunicode/Makefile.in -+++ b/libraries/liblunicode/Makefile.in -@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c $(srcdir)/UnicodeData.txt $(srcdir)/Comp - $(MAKE) ucgendat - ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt + LTLINK = $(LIBTOOL) --mode=link \ +- $(CC) $(LTSTATIC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS) ++ $(CC) -pie $(LTSTATIC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS) -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - ucgendat: $(XLIBS) ucgendat.o - $(LTLINK) -o $@ ucgendat.o $(LIBS) + LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=compile \ + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c +@@ -116,7 +116,7 @@ LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ + $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) -diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in -index b527966..a04e18e 100644 ---- a/libraries/liblutil/Makefile.in -+++ b/libraries/liblutil/Makefile.in -@@ -19,6 +19,9 @@ PROGRAM = testavl - LDAP_INCDIR= ../../include - LDAP_LIBDIR= ../../libraries + LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ +- $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c ++ $(CC) $(LT_CFLAGS) $(PIE_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - NT_SRCS = ntservice.c - NT_OBJS = ntservice.o slapdmsg.res - -diff --git a/libraries/librewrite/Makefile.in b/libraries/librewrite/Makefile.in -index 72678c1..a4e0bcc 100644 ---- a/libraries/librewrite/Makefile.in -+++ b/libraries/librewrite/Makefile.in -@@ -26,6 +26,9 @@ OBJS = config.o context.o info.o ldapmap.o map.o params.o rule.o \ - LDAP_INCDIR= ../../include - LDAP_LIBDIR= ../../libraries - -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - LIBRARY = librewrite.a - PROGRAMS = rewrite - XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \ -diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in -index c170d79..23a18eb 100644 ---- a/servers/slapd/Makefile.in -+++ b/servers/slapd/Makefile.in -@@ -69,6 +69,9 @@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@ - - SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ - -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - XDEFS = $(MODULES_CPPFLAGS) - XLDFLAGS = $(MODULES_LDFLAGS) + LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ + $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) +@@ -206,7 +206,7 @@ SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LI + # Our Defaults + CC = $(AC_CC) + DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES) +-CFLAGS = $(AC_CFLAGS) $(DEFS) ++CFLAGS = -fPIE $(AC_CFLAGS) $(DEFS) + LDFLAGS = $(LDAP_LIBPATH) $(AC_LDFLAGS) $(XLDFLAGS) + LIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS) diff --git a/servers/slapd/back-bdb/Makefile.in b/servers/slapd/back-bdb/Makefile.in -index f44dab2..d919931 100644 +index f44dab2..8123c72 100644 --- a/servers/slapd/back-bdb/Makefile.in +++ b/servers/slapd/back-bdb/Makefile.in -@@ -37,6 +37,9 @@ mod_DEFS = -DSLAPD_IMPORT +@@ -33,6 +33,8 @@ LDAP_LIBDIR= ../../../libraries + BUILD_OPT = "--enable-bdb" + BUILD_MOD = @BUILD_BDB@ + ++PIE_CFLAGS="-fPIE" ++ + mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_BDB@_DEFS) MOD_LIBS = $(BDB_LIBS) - -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) - UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) diff --git a/servers/slapd/back-hdb/Makefile.in b/servers/slapd/back-hdb/Makefile.in -index 5d8381c..a80d8c0 100644 +index 5d8381c..59bea01 100644 --- a/servers/slapd/back-hdb/Makefile.in +++ b/servers/slapd/back-hdb/Makefile.in -@@ -41,6 +41,9 @@ mod_DEFS = -DSLAPD_IMPORT - MOD_DEFS = $(@BUILD_HDB@_DEFS) - MOD_LIBS = $(BDB_LIBS) +@@ -37,6 +37,8 @@ LDAP_LIBDIR= ../../../libraries + BUILD_OPT = "--enable-hdb" + BUILD_MOD = @BUILD_HDB@ +PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" + - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) - UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) + mod_DEFS = -DSLAPD_IMPORT + MOD_DEFS = $(@BUILD_HDB@_DEFS) + MOD_LIBS = $(BDB_LIBS) diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in -index 64a4af8..51495d5 100644 +index 64a4af8..6b093c3 100644 --- a/servers/slapd/back-ldap/Makefile.in +++ b/servers/slapd/back-ldap/Makefile.in -@@ -29,6 +29,9 @@ BUILD_MOD = @BUILD_LDAP@ +@@ -26,6 +26,8 @@ LDAP_LIBDIR= ../../../libraries + BUILD_OPT = "--enable-ldap" + BUILD_MOD = @BUILD_LDAP@ + ++PIE_CFLAGS="-fPIE" ++ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_LDAP@_DEFS) -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) - UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) diff --git a/servers/slapd/back-ldif/Makefile.in b/servers/slapd/back-ldif/Makefile.in -index 29450ae..c47641f 100644 +index 29450ae..450caf2 100644 --- a/servers/slapd/back-ldif/Makefile.in +++ b/servers/slapd/back-ldif/Makefile.in -@@ -25,6 +25,9 @@ BUILD_MOD = yes +@@ -22,6 +22,8 @@ LDAP_LIBDIR= ../../../libraries + BUILD_OPT = "--enable-ldif" + BUILD_MOD = yes + ++PIE_CFLAGS="-fPIE" ++ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(yes_DEFS) -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) - UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in -index 6005b2d..a8f45a7 100644 +index 6005b2d..f4fd287 100644 --- a/servers/slapd/back-monitor/Makefile.in +++ b/servers/slapd/back-monitor/Makefile.in -@@ -33,6 +33,9 @@ BUILD_MOD = @BUILD_MONITOR@ +@@ -30,6 +30,8 @@ LDAP_LIBDIR= ../../../libraries + BUILD_OPT = "--enable-monitor" + BUILD_MOD = @BUILD_MONITOR@ + ++PIE_CFLAGS="-fPIE" ++ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_MONITOR@_DEFS) -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) - UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) diff --git a/servers/slapd/back-relay/Makefile.in b/servers/slapd/back-relay/Makefile.in -index a408f34..518c7e5 100644 +index a408f34..012cd07 100644 --- a/servers/slapd/back-relay/Makefile.in +++ b/servers/slapd/back-relay/Makefile.in -@@ -25,6 +25,9 @@ BUILD_MOD = @BUILD_RELAY@ +@@ -22,6 +22,8 @@ LDAP_LIBDIR= ../../../libraries + BUILD_OPT = "--enable-relay" + BUILD_MOD = @BUILD_RELAY@ + ++PIE_CFLAGS="-fPIE" ++ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_RELAY@_DEFS) -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) - UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) -diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in -index 0b7ce5c..7a48574 100644 ---- a/servers/slapd/overlays/Makefile.in -+++ b/servers/slapd/overlays/Makefile.in -@@ -46,6 +46,9 @@ LTONLY_MOD = $(LTONLY_mod) - LDAP_INCDIR= ../../../include - LDAP_LIBDIR= ../../../libraries - -+PIE_CFLAGS="-fPIE" -+PIE_LDFLAGS="-pie" -+ - MOD_DEFS = -DSLAPD_IMPORT - - shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) -- 1.7.1 diff --git a/0009-List-static-overlays-backends-when-with-VVV.dif b/0009-List-static-overlays-backends-when-with-VVV.dif new file mode 100644 index 0000000..396a5a8 --- /dev/null +++ b/0009-List-static-overlays-backends-when-with-VVV.dif @@ -0,0 +1,57 @@ +From 79ebaf1aab14b130ef980f593afb9ac6f9bfeb06 Mon Sep 17 00:00:00 2001 +From: Ralf Haferkamp +Date: Tue, 9 Nov 2010 16:26:24 +0100 +Subject: [PATCH 09/11] List static overlays/backends when with -VVV + + + 1 files changed, 20 insertions(+), 1 deletions(-) + +diff --git a/servers/slapd/main.c b/servers/slapd/main.c +index 6990e91..0cb0de1 100644 +--- a/servers/slapd/main.c ++++ b/servers/slapd/main.c +@@ -99,6 +99,9 @@ const char Versionstr[] = + OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Server (slapd)"; + #endif + ++extern OverlayInit slap_oinfo[]; ++extern BackendInfo slap_binfo[]; ++ + #define CHECK_NONE 0x00 + #define CHECK_CONFIG 0x01 + #define CHECK_LOGLEVEL 0x02 +@@ -340,7 +343,8 @@ usage( char *name ) + #if defined(HAVE_SETUID) && defined(HAVE_SETGID) + "\t-u user\t\tUser (id or name) to run as\n" + #endif +- "\t-V\t\tprint version info (-VV only)\n" ++ "\t-V\t\tprint version info (-VV exit afterwards, -VVV print\n" ++ "\t\t\tinfo about static overlays and backends)\n" + ); + } + +@@ -684,6 +688,21 @@ unhandled_option:; + + if ( version ) { + fprintf( stderr, "%s\n", Versionstr ); ++ if ( version > 2 ) { ++ if ( slap_oinfo[0].ov_type ) { ++ fprintf( stderr, "Included static overlays:\n"); ++ for ( i= 0 ; slap_oinfo[i].ov_type; i++ ) { ++ fprintf( stderr, " %s\n", slap_oinfo[i].ov_type ); ++ } ++ } ++ if ( slap_binfo[0].bi_type ) { ++ fprintf( stderr, "Included static backends:\n"); ++ for ( i= 0 ; slap_binfo[i].bi_type; i++ ) { ++ fprintf( stderr, " %s\n", slap_binfo[i].bi_type ); ++ } ++ } ++ } ++ + if ( version > 1 ) goto stop; + } + +-- +1.7.1 + diff --git a/README.dynamic-overlays b/README.dynamic-overlays new file mode 100644 index 0000000..c071a6b --- /dev/null +++ b/README.dynamic-overlays @@ -0,0 +1,19 @@ +Most of the OpenLDAP overlays are now compiled as dynamic modules in our +packages. If you want to use any of these in your setup make sure to put +the correct "olcModuleLoad" or "moduleload" statements in your configuration. +For details please see the slapd-config(5) and slapd.conf(5) manpages +(depending on which config mechanism you use). + +For a list of the list of included dynamic modules see the +"/usr/lib/openldap/modules/" directory. + +For convenience and backwards compatibility some overlays are are still +compiled statically into the slapd binary. To see which overlays that are +call "/usr/lib/openldap/slapd -VVV". Currently these are: + +syncprov (the provider part of syncrepl replication) +ppolicy (a LDAP Password Policy implementation) + +Documentations for the overlays can be found in the respective man pages +(named "slapo-") or the OpenLDAP Administration Guide which +is part of the "openldap2-doc" package. diff --git a/openldap2-client.changes b/openldap2-client.changes index 4469b69..8c69dc9 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Nov 12 12:31:57 UTC 2010 - rhafer@novell.com + +- Surpress gcc warnings about extra format string arguments. +- Split-off openldap2-doc (noarch) package (Admin Guide and IDs) +- Backported -VVV commandline switch for slapd from HEAD + (to list enabled static overlays) +- Build all overlays except syncprov and ppolicy as dynamic modules + (Fixes bnc#648479, FATE#307837) +- Added README.dynamic-overlays to point out some details about + dynamic overlays +- simplified pie-compile patch and adjusted it to work with + dynamic overlays + ------------------------------------------------------------------- Tue Oct 5 14:39:46 UTC 2010 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 6906b0c..d841ac1 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.23) +# spec file for package openldap2 (Version 2.4.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ %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 @@ -33,16 +33,16 @@ 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 Requires: libldap-2_4-2 = %{version} -Summary: The OpenLDAP commandline client tools +Summary: The OpenLDAP commandline client tools %endif AutoReqProv: on Source: openldap-%{version}.tar.bz2 @@ -51,7 +51,8 @@ Source2: addonschema.tar.gz Source3: DB_CONFIG Source4: sasl-slapd.conf Source5: README.update -Source6: schema2ldif +Source6: README.dynamic-overlays +Source7: schema2ldif Source100: openldap-2.3.37.tar.bz2 Patch1: 0001-build-adjustments.dif Patch2: 0002-slapd.conf.dif @@ -61,6 +62,7 @@ Patch5: 0005-pie-compile.dif Patch6: 0006-assorted-fixes-for-back-config-DELETE-support.dif Patch7: 0007-No-Build-date-and-time-in-binaries.dif Patch8: 0008-Recover-on-DB-version-change.dif +Patch9: 0009-List-static-overlays-backends-when-with-VVV.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -79,7 +81,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-perl -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Perl Back-End Requires: openldap2 = %{version} perl = %{perl_version} AutoReqProv: on @@ -96,7 +98,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-meta -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Meta Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -116,7 +118,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-sql -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP SQL Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -130,6 +132,26 @@ to do any programming. Authors: -------- The OpenLDAP Project + +%package -n openldap2-doc +License: BSD3c(or similar) ; openldap 2.8 +Summary: OpenLDAP Documentation +Group: Documentation/Other +AutoReqProv: on +Provides: openldap2:/usr/share/doc/packages/openldap2/drafts/README +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description -n openldap2-doc +The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts + +Authors: +-------- + The OpenLDAP Project + + + %else %description @@ -197,10 +219,12 @@ Authors: %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %if %suse_version == 1100 %patch200 -p1 %endif cp %{SOURCE5} . +cp %{SOURCE6} . cd ../openldap-2.3.37 %patch100 @@ -208,13 +232,12 @@ cd ../openldap-2.3.37 %{?suse_update_config:%{suse_update_config -f build}} libtoolize --force autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" +export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" export STRIP="" %configure \ --localstatedir=/var/run/slapd \ --libexecdir=/usr/lib/openldap \ --enable-wrappers \ - --enable-aclgroups \ --enable-spasswd \ --enable-modules \ --enable-shared \ @@ -234,7 +257,9 @@ export STRIP="" --enable-perl=mod \ --enable-sql=mod \ --enable-slp \ - --enable-overlays=yes \ + --enable-overlays=mod \ + --enable-syncprov=yes \ + --enable-ppolicy=yes \ %else --disable-slapd \ %endif @@ -305,6 +330,7 @@ chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so* install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif %if "%{name}" == "openldap2" +%define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.openldap $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.openldap install -m 644 *.schema $RPM_BUILD_ROOT/etc/openldap/schema @@ -314,6 +340,21 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ install -m 644 SuSEfirewall2.openldap $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/openldap rm -f `find doc/guide ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d` rm -rf doc/guide/release +install -d $RPM_BUILD_ROOT/%{DOCDIR}/adminguide \ + $RPM_BUILD_ROOT/%{DOCDIR}/images \ + $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 doc/guide/admin/* $RPM_BUILD_ROOT/%{DOCDIR}/adminguide +install -m 644 doc/guide/images/*.gif $RPM_BUILD_ROOT/%{DOCDIR}/images +install -m 644 doc/drafts/* $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 ANNOUNCEMENT \ + COPYRIGHT \ + INSTALL \ + LICENSE \ + README \ + CHANGES \ + %{SOURCE5} \ + %{SOURCE6} \ + $RPM_BUILD_ROOT/%{DOCDIR} rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example @@ -353,6 +394,24 @@ cat >openldap2.filelist <openldap2.filelist <>openldap2.filelist < openldap2-back-sql.filelist <openldap2-doc.filelist < %package -n openldap2-back-perl -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Perl Back-End Requires: openldap2 = %{version} perl = %{perl_version} AutoReqProv: on @@ -96,7 +98,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-meta -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Meta Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -116,7 +118,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-sql -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP SQL Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -130,6 +132,26 @@ to do any programming. Authors: -------- The OpenLDAP Project + +%package -n openldap2-doc +License: BSD3c(or similar) ; openldap 2.8 +Summary: OpenLDAP Documentation +Group: Documentation/Other +AutoReqProv: on +Provides: openldap2:/usr/share/doc/packages/openldap2/drafts/README +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description -n openldap2-doc +The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts + +Authors: +-------- + The OpenLDAP Project + + + %else %description @@ -197,10 +219,12 @@ Authors: %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %if %suse_version == 1100 %patch200 -p1 %endif cp %{SOURCE5} . +cp %{SOURCE6} . cd ../openldap-2.3.37 %patch100 @@ -208,13 +232,12 @@ cd ../openldap-2.3.37 %{?suse_update_config:%{suse_update_config -f build}} libtoolize --force autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" +export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" export STRIP="" %configure \ --localstatedir=/var/run/slapd \ --libexecdir=/usr/lib/openldap \ --enable-wrappers \ - --enable-aclgroups \ --enable-spasswd \ --enable-modules \ --enable-shared \ @@ -234,7 +257,9 @@ export STRIP="" --enable-perl=mod \ --enable-sql=mod \ --enable-slp \ - --enable-overlays=yes \ + --enable-overlays=mod \ + --enable-syncprov=yes \ + --enable-ppolicy=yes \ %else --disable-slapd \ %endif @@ -305,6 +330,7 @@ chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so* install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif %if "%{name}" == "openldap2" +%define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.openldap $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.openldap install -m 644 *.schema $RPM_BUILD_ROOT/etc/openldap/schema @@ -314,6 +340,21 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ install -m 644 SuSEfirewall2.openldap $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/openldap rm -f `find doc/guide ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d` rm -rf doc/guide/release +install -d $RPM_BUILD_ROOT/%{DOCDIR}/adminguide \ + $RPM_BUILD_ROOT/%{DOCDIR}/images \ + $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 doc/guide/admin/* $RPM_BUILD_ROOT/%{DOCDIR}/adminguide +install -m 644 doc/guide/images/*.gif $RPM_BUILD_ROOT/%{DOCDIR}/images +install -m 644 doc/drafts/* $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 ANNOUNCEMENT \ + COPYRIGHT \ + INSTALL \ + LICENSE \ + README \ + CHANGES \ + %{SOURCE5} \ + %{SOURCE6} \ + $RPM_BUILD_ROOT/%{DOCDIR} rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example @@ -353,6 +394,24 @@ cat >openldap2.filelist <openldap2.filelist <>openldap2.filelist < openldap2-back-sql.filelist <openldap2-doc.filelist <