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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 9c376cb8ff42e45aa7fcbf19d46a4595a3925d8d
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jun 16 17:26:02 2012 +0200

    revert fix to pass hardening flags to mkFileSum.c, suggested by upstream and fix cross-compilation

diff --git a/debian/patches/libs-use-dpkg-buildflags.diff b/debian/patches/libs-use-dpkg-buildflags.diff
deleted file mode 100644
index 5c9c330..0000000
--- a/debian/patches/libs-use-dpkg-buildflags.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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 900ab2d..f473898 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@ cas_configfile.c_good_default_paths.diff
 use_xdg-open_as_preview_default.diff
 fallocate.diff
 version_check.diff
-libs-use-dpkg-buildflags.diff
 libupnp-fix-publisherurl.patch
 gcc_4.7.diff

-- 
Git repository for pkg-amule