[Pkg-openldap-devel] r1434 - in openldap/trunk/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sun Jun 17 05:41:42 UTC 2012
tags 663724 pending
thanks
Author: vorlon
Date: 2012-06-17 05:41:41 +0000 (Sun, 17 Jun 2012)
New Revision: 1434
Added:
openldap/trunk/debian/patches/contrib-modules-use-dpkg-buildflags
Modified:
openldap/trunk/debian/changelog
openldap/trunk/debian/patches/autogroup-makefile
openldap/trunk/debian/patches/series
Log:
debian/patches/contrib-modules-use-dpkg-buildflags: pass CFLAGS to
contrib builds. Thanks to Simon Ruderich <simon at ruderich.org>.
Closes: #663724.
Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog 2012-06-17 02:45:45 UTC (rev 1433)
+++ openldap/trunk/debian/changelog 2012-06-17 05:41:41 UTC (rev 1434)
@@ -17,6 +17,11 @@
* debian/patches/heimdal-fix: fix arguments of
hdb_generate_key_set_password(). Closes: #664930
+ [ Steve Langasek ]
+ * debian/patches/contrib-modules-use-dpkg-buildflags: pass CFLAGS to
+ contrib builds. Thanks to Simon Ruderich <simon at ruderich.org>.
+ Closes: #663724.
+
-- Steve Langasek <vorlon at debian.org> Sun, 06 May 2012 17:04:29 -0700
openldap (2.4.28-1) unstable; urgency=low
Modified: openldap/trunk/debian/patches/autogroup-makefile
===================================================================
--- openldap/trunk/debian/patches/autogroup-makefile 2012-06-17 02:45:45 UTC (rev 1433)
+++ openldap/trunk/debian/patches/autogroup-makefile 2012-06-17 05:41:41 UTC (rev 1434)
@@ -1,5 +1,7 @@
---- a/contrib/slapd-modules/autogroup/Makefile
-+++ b/contrib/slapd-modules/autogroup/Makefile
+Index: trunk/contrib/slapd-modules/autogroup/Makefile
+===================================================================
+--- trunk.orig/contrib/slapd-modules/autogroup/Makefile
++++ trunk/contrib/slapd-modules/autogroup/Makefile
@@ -1,6 +1,6 @@
-LIBTOOL=../../../libtool
+LIBTOOL=../../../debian/build/libtool
@@ -12,7 +14,7 @@
@@ -16,12 +16,12 @@
autogroup.la: autogroup.lo
- $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 0:0:0 \
- -rpath $(libdir) -module -o $@ $?
+ -rpath /usr/lib/ldap -module -o $@ $?
Added: openldap/trunk/debian/patches/contrib-modules-use-dpkg-buildflags
===================================================================
--- openldap/trunk/debian/patches/contrib-modules-use-dpkg-buildflags (rev 0)
+++ openldap/trunk/debian/patches/contrib-modules-use-dpkg-buildflags 2012-06-17 05:41:41 UTC (rev 1434)
@@ -0,0 +1,40 @@
+Description: pass CFLAGS to contrib builds
+ $(CFLAGS) is missing from the compiler invocations for autogroup and
+ smbk5pwd, which means they're not being hardened.
+Author: Simon Ruderich <simon at ruderich.org>
+Bug-Debian: http://bugs.debian.org/663724
+
+Index: trunk/contrib/slapd-modules/autogroup/Makefile
+===================================================================
+--- trunk.orig/contrib/slapd-modules/autogroup/Makefile
++++ trunk/contrib/slapd-modules/autogroup/Makefile
+@@ -12,10 +12,10 @@
+ all: autogroup.la
+
+ autogroup.lo: autogroup.c
+- $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -Wall -c $?
++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -Wall -c $?
+
+ autogroup.la: autogroup.lo
+- $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 0:0:0 \
+ -rpath $(libdir) -module -o $@ $?
+
+ clean:
+Index: trunk/contrib/slapd-modules/smbk5pwd/Makefile
+===================================================================
+--- trunk.orig/contrib/slapd-modules/smbk5pwd/Makefile
++++ trunk/contrib/slapd-modules/smbk5pwd/Makefile
+@@ -41,10 +41,10 @@
+
+
+ smbk5pwd.lo: smbk5pwd.c
+- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
++ $(LIBTOOL) --mode=compile $(CC) $(OPT) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $?
+
+ smbk5pwd.la: smbk5pwd.lo
+- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
++ $(LIBTOOL) --mode=link $(CC) $(OPT) $(LDFLAGS) -version-info 0:0:0 \
+ -rpath $(moduledir) -module -o $@ $? $(LIBS)
+
+ clean:
Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series 2012-06-17 02:45:45 UTC (rev 1433)
+++ openldap/trunk/debian/patches/series 2012-06-17 05:41:41 UTC (rev 1434)
@@ -8,6 +8,7 @@
libldap-symbol-versions
getaddrinfo-is-threadsafe
do-not-second-guess-sonames
+contrib-modules-use-dpkg-buildflags
smbk5pwd-makefile
autogroup-makefile
ldap-conf-tls-cacertdir
More information about the Pkg-openldap-devel
mailing list