[med-svn] r11441 - in trunk/packages/pdb2pqr/trunk/debian: . patches

[Manuel Prinz]

Author: manuel
Date: 2012-06-22 20:39:08 +0000 (Fri, 22 Jun 2012)
New Revision: 11441

Added:
   trunk/packages/pdb2pqr/trunk/debian/patches/fix-hardening.patch
Modified:
   trunk/packages/pdb2pqr/trunk/debian/changelog
   trunk/packages/pdb2pqr/trunk/debian/patches/series
   trunk/packages/pdb2pqr/trunk/debian/rules
Log:
Pass hardening flags to linker

Modified: trunk/packages/pdb2pqr/trunk/debian/changelog
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/changelog	2012-06-22 12:20:15 UTC (rev 11440)
+++ trunk/packages/pdb2pqr/trunk/debian/changelog	2012-06-22 20:39:08 UTC (rev 11441)
@@ -2,6 +2,8 @@
 
   * Fixed build issues on HURD. Thanks to Barry deFreese for the patch!
     Closes: 674976.
+  * Pass hardening flags to linker. Added fix-hardening.patch, changed
+    debian/rules.
 
  -- Manuel Prinz <manuel at debian.org>  Thu, 21 Jun 2012 17:34:54 +0200
 

Added: trunk/packages/pdb2pqr/trunk/debian/patches/fix-hardening.patch
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/patches/fix-hardening.patch	                        (rev 0)
+++ trunk/packages/pdb2pqr/trunk/debian/patches/fix-hardening.patch	2012-06-22 20:39:08 UTC (rev 11441)
@@ -0,0 +1,14 @@
+Subject: Pass LDFLAGS to the linker for hardening
+From: Manuel Prinz <manuel at debian.org>
+Last-Update: 2012-06-22
+--- a/configure
++++ b/configure
+@@ -3308,7 +3308,7 @@
+ 
+ PY_SHARED=$PY_SHARED
+ 
+-PY_LDFLAGS=$PY_LDFLAGS
++PY_LDFLAGS="$PY_LDFLAGS $LDFLAGS"
+ 
+ PY_HEADER=$PY_HEADER
+ 

Modified: trunk/packages/pdb2pqr/trunk/debian/patches/series
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/patches/series	2012-06-22 12:20:15 UTC (rev 11440)
+++ trunk/packages/pdb2pqr/trunk/debian/patches/series	2012-06-22 20:39:08 UTC (rev 11441)
@@ -1,3 +1,4 @@
 fix-includes.patch
 fix-hashbangs.patch
 fix-hurd.patch
+fix-hardening.patch

Modified: trunk/packages/pdb2pqr/trunk/debian/rules
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/rules	2012-06-22 12:20:15 UTC (rev 11440)
+++ trunk/packages/pdb2pqr/trunk/debian/rules	2012-06-22 20:39:08 UTC (rev 11441)
@@ -6,13 +6,13 @@
 UPSTREAM := $(shell echo "$(VERSION)"   | sed 's/-.\+$$//')
 
 # Compile with -fPIC on all platforms (fix for #636204, #654240)
-CFLAGS   += -fPIC -I/usr/share/pyshared/numpy/core/include/numpy
-CPPFLAGS += -fPIC -I/usr/share/pyshared/numpy/core/include/numpy
-CXXFLAGS += -fPIC -I/usr/share/pyshared/numpy/core/include/numpy
-FFLAGS   += -fPIC
+export DEB_CFLAGS_MAINT_APPEND   = -fPIC -I/usr/share/pyshared/numpy/core/include/numpy
+export DEB_CPPFLAGS_MAINT_APPEND = -fPIC -I/usr/share/pyshared/numpy/core/include/numpy
+export DEB_CXXFLAGS_MAINT_APPEND = -fPIC -I/usr/share/pyshared/numpy/core/include/numpy
+export DEB_FFLAGS_MAINT_APPEND   = -fPIC
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --with autotools-dev
 
 override_dh_auto_clean:
 	( cd pdb2pka && \
@@ -21,7 +21,7 @@
 	dh_auto_clean
 
 override_dh_auto_configure:
-	dh_auto_configure -- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_configure
 	( cd pdb2pka && \
 	  cp -a pMC_mult_wrap.cpp pMC_mult_wrap.cpp.saved && \
 	  cp -a pMC_mult.py pMC_mult.py.saved && \