diff --git a/openldap-2.4.6-pie.patch b/openldap-2.4.6-pie.patch index ff3fbd2..51a6d60 100644 --- a/openldap-2.4.6-pie.patch +++ b/openldap-2.4.6-pie.patch @@ -2,14 +2,15 @@ Build both slapd as position-independent executables. This really should be threaded into the various autotools, but I guess this is what we have until that happens, if it happens. ---- openldap-2.2.13/servers/slapd/Makefile.in 2004-04-12 14:07:40.000000000 -0400 -+++ openldap-2.2.13/servers/slapd/Makefile.in 2004-06-15 13:45:45.000000000 -0400 -@@ -255,7 +255,7 @@ +diff -up openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3 openldap-2.4.11/servers/slapd/Makefile.in +--- openldap-2.4.11/servers/slapd/Makefile.in.backup_patch_3 2008-02-12 00:26:43.000000000 +0100 ++++ openldap-2.4.11/servers/slapd/Makefile.in 2008-07-25 13:13:37.000000000 +0200 +@@ -266,7 +266,7 @@ libslapi.a: slapi/.libs/libslapi.a cp slapi/.libs/libslapi.a . slapd: $(SLAPD_DEPENDS) @LIBSLAPI@ - $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \ + $(LTLINK) -pie -Wl,-z,defs -o $@ $(SLAPD_OBJECTS) $(LIBS) \ $(WRAP_LIBS) - rm -f $(SLAPTOOLS) + $(RM) $(SLAPTOOLS) for i in $(SLAPTOOLS); do \ diff --git a/openldap.spec b/openldap.spec index 5636698..5070f11 100644 --- a/openldap.spec +++ b/openldap.spec @@ -8,9 +8,6 @@ %define evolution_connector_includedir %{evolution_connector_prefix}/include %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib} -#TODO: rediff the patches which need fuzz -%define _default_patch_fuzz 2 - Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version}