[Chinese-commits] [zhcon] 04/10: Prevent configure.in from adding rpath through LDFLAGS

[Anthony Fok]

This is an automated email from the git hooks/post-receive script.

foka pushed a commit to branch master
in repository zhcon.

commit 18117abb293ed3d6bed5ce146c07207336a44af5
Author: Anthony Fok <foka at debian.org>
Date:   Thu Nov 19 06:05:23 2015 -0700

    Prevent configure.in from adding rpath through LDFLAGS
    
    Instead of running chrpath, don't compile with rpath in the first place.
    
    Furthermore, by not messing with LDFLAGS in configure.in,
    Debian's hardening buildflags can be passed on,
    thus avoiding Lintian "hardening-no-relro" warning.
---
 debian/control                                     |  2 +-
 .../patches/0009-remove-rpath-from-configure.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  3 ---
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 3b713b6..3ed8d18 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
 Uploaders: Aron Xu <aron at debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, chrpath, libncurses5-dev,
+Build-Depends: debhelper (>= 9), dh-autoreconf, libncurses5-dev,
  bison, libpth-dev, unicon-imc2,
  libgpm-dev [linux-any], libbsd-dev [kfreebsd-any]
 Standards-Version: 3.9.3
diff --git a/debian/patches/0009-remove-rpath-from-configure.patch b/debian/patches/0009-remove-rpath-from-configure.patch
new file mode 100644
index 0000000..1c0ee65
--- /dev/null
+++ b/debian/patches/0009-remove-rpath-from-configure.patch
@@ -0,0 +1,27 @@
+Description: Prevent configure.in from adding rpath through LDFLAGS
+ Instead of running chrpath, don't compile with rpath in the first place.
+ .
+ Furthermore, by not messing with LDFLAGS in configure.in,
+ Debian's hardening buildflags can be passed on,
+ thus avoiding Lintian "hardening-no-relro" warning.
+
+Author: Anthony Fok <foka at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2015-11-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.in
++++ b/configure.in
+@@ -162,9 +163,9 @@
+     AC_DEFINE(HAVE_UNICON_LIB)
+     LIBS="-L/usr/lib/unicon $LIBS"
+     #CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include"
+-    LDFLAGS=" -Wl,-rpath=/usr/lib/unicon"
++    #LDFLAGS=" -Wl,-rpath=/usr/lib/unicon"
+     AC_SUBST(LIBS)
+-    AC_SUBST(LDFLAGS)
++    #AC_SUBST(LDFLAGS)
+ fi
+ 
+ dnl-----------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index 589b397..7960ca7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-enable-build-platforms.patch
 0007-better-jp-and-ko-handling.patch
 # 0008-default-to-utf8.patch
+0009-remove-rpath-from-configure.patch
diff --git a/debian/rules b/debian/rules
index 81262dd..a5a1ebf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,3 @@
 %:
 	touch config.rpath
 	dh $@ --with autoreconf
-override_dh_auto_install:
-	find . -type f -name zhcon -exec chrpath -d {} \;
-	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/zhcon.git