[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-91-gdeb8e1a

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit deb8e1a2eda9d6b6657c6051abe1b673dc0681e6
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 10 14:38:07 2013 +0100

    Added contrib_hardening_flags patch

diff --git a/debian/changelog b/debian/changelog
index 8f2ff97..c1dc413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ proftpd-dfsg (1.3.5~rc1-2) experimental; urgency=low
     the update-inetd tool superfluous.
     (closes: #626527)
   * Added Suggests for the new -geoip module.
+  * New patch: `contrib_hardening_flags' adds hardening flags to contrib/ modules.
+    (Thanks Simon Ruderich for the patch).
+    (closes: #668196)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jan 2013 10:57:37 +0100
 
diff --git a/debian/patches/contrib_hardening_flags b/debian/patches/contrib_hardening_flags
new file mode 100644
index 0000000..8210c3d
--- /dev/null
+++ b/debian/patches/contrib_hardening_flags
@@ -0,0 +1,42 @@
+Index: proftpd-dfsg/contrib/mod_load/Makefile.in
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_load/Makefile.in	2013-01-08 13:56:32.000000000 +0100
++++ proftpd-dfsg/contrib/mod_load/Makefile.in	2013-01-10 14:30:50.000000000 +0100
+@@ -17,6 +17,9 @@
+ # Necessary redefinitions
+ CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(MODULE_INCLUDES)
+ LDFLAGS=-L../../lib
++# Add (hardening) flags.
++CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
++LDFLAGS  += $(shell dpkg-buildflags --get LDFLAGS)
+ 
+ .c.o:
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+Index: proftpd-dfsg/contrib/mod_sftp/Makefile.in
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_sftp/Makefile.in	2013-01-09 13:06:28.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/Makefile.in	2013-01-10 14:30:50.000000000 +0100
+@@ -26,6 +26,9 @@
+ INCLUDES=-I. -I../.. -I../../include @INCLUDES@
+ CPPFLAGS= $(ADDL_CPPFLAGS) -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
+ LDFLAGS=-L../../lib @LIBDIRS@
++# Add (hardening) flags.
++CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
++LDFLAGS  += $(shell dpkg-buildflags --get LDFLAGS)
+ 
+ .c.o:
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+Index: proftpd-dfsg/contrib/mod_wrap2/Makefile.in
+===================================================================
+--- proftpd-dfsg.orig/contrib/mod_wrap2/Makefile.in	2013-01-08 13:56:32.000000000 +0100
++++ proftpd-dfsg/contrib/mod_wrap2/Makefile.in	2013-01-10 14:30:50.000000000 +0100
+@@ -17,6 +17,9 @@
+ # Necessary redefinitions
+ CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(MODULE_INCLUDES)
+ LDFLAGS=-L../../lib
++# Add (hardening) flags.
++CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
++LDFLAGS  += $(shell dpkg-buildflags --get LDFLAGS)
+ 
+ .c.o:
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
diff --git a/debian/patches/series b/debian/patches/series
index da36ad9..01d4f10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ mod_cap
 odbc
 silent
 use_hypen_in_manpage
+contrib_hardening_flags
diff --git a/debian/rules b/debian/rules
index 3de8289..e41aa98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ install: build
 	dh_prep
 	
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_STRIP="$(INSTALL_STRIP)" install
+	find -type f \(-executable -o -name \*.so\*\) -exec hardening-check {} +
 
 configure: configure-stamp
 configure-stamp: 

-- 
ProFTPD core package