[SCM] Seamless communication between many kinds of Unix branch, debian, updated. fcbed33db731d61c9933b86a67ba22f8c81fd62b

Ole Streicher debian at liska.ath.cx
Thu Jul 25 09:08:29 UTC 2013


The following commit has been merged in the debian branch:
commit 2201bd74ccc5d44d3978ea4a11786187ef67ffa2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 25 10:52:59 2013 +0200

    Add hardening patches

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..e0608b4
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,31 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Add hardening flags
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -122,7 +122,7 @@
+ 
+ CC =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} ${AC_FLAGS}
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS}
+ 
+@@ -183,7 +183,7 @@
+ 		rm -f lib$(PACKAGE).tmp/xt*.o; \
+ 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
+ 		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \
++		./mklib -ldflags $(LDFLAGS) -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \
+ 		rm -rf lib$(PACKAGE).tmp)
+ 
+ mingw-dll:	$(LIBOBJS)
+@@ -202,7 +202,7 @@
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
++		./mklib -ldflags $(LDFLAGS) -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
+ 		rm -rf $(PACKAGE)tmp; )
+ 
+ diff:
diff --git a/debian/patches/series b/debian/patches/series
index ef868ac..32b16bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_paths.patch
 fix_manpages.patch
 install_tclxpa.patch
+hardening.patch

-- 
Seamless communication between many kinds of Unix



More information about the debian-science-commits mailing list