[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.3.1-4-7-gc6b9487

Sandro Tosi morph at debian.org
Sat Apr 7 22:27:26 UTC 2012


The following commit has been merged in the master branch:
commit c6b9487d580269526e4e23441024901a7fcbf0fd
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Apr 8 00:27:09 2012 +0200

    enable hardening flags for mkFileSum.c too; thanks to Simon Ruderich for the patch; Closes: #653503

diff --git a/debian/patches/libs-use-dpkg-buildflags.diff b/debian/patches/libs-use-dpkg-buildflags.diff
new file mode 100644
index 0000000..5c9c330
--- /dev/null
+++ b/debian/patches/libs-use-dpkg-buildflags.diff
@@ -0,0 +1,30 @@
+Description: Use (hardening) build flags from environment (dpkg-buildflags).
+ The BUILD_*FLAGS are not set to same values as *FLAGS and only used in this
+ Makefile.
+ .
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-03-12
+
+--- amule-2.3.1.orig/src/libs/ec/cpp/Makefile.in
++++ amule-2.3.1/src/libs/ec/cpp/Makefile.in
+@@ -623,7 +623,7 @@ uninstall-am:
+ 
+ 
+ mkFileSum$(BUILD_EXEEXT): $(top_srcdir)/src/utils/mkFileSum.c
+-	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $^ -o $@
++	$(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ ECVersion.h: EC-timestamp
+ 	@if test ! -f $@; then \
+--- amule-2.3.1.orig/src/libs/ec/cpp/Makefile.am
++++ amule-2.3.1/src/libs/ec/cpp/Makefile.am
+@@ -35,7 +35,7 @@ BUILT_SOURCES = ECVersion.h
+ CLEANFILES = ECVersion.h EC-timestamp mkFileSum$(BUILD_EXEEXT)
+ 
+ mkFileSum$(BUILD_EXEEXT): $(top_srcdir)/src/utils/mkFileSum.c
+-	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $^ -o $@
++	$(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ ECVersion.h: EC-timestamp
+ 	@if test ! -f $@; then \
diff --git a/debian/patches/series b/debian/patches/series
index e8ba385..af85bb3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ cas_configfile.c_good_default_paths.diff
 use_xdg-open_as_preview_default.diff
 fallocate.diff
 version_check.diff
+libs-use-dpkg-buildflags.diff

-- 
Git repository for pkg-amule



More information about the Pkg-amule-commits mailing list