[Pkg-voip-commits] r10504 - in /yate/trunk/debian: changelog patches/conf_no_lib_exec.patch patches/series rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Wed Jul  9 19:34:59 2014
New Revision: 10504

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10504
Log:
Use upstream patch (by Paul Chitescu) instead of chmod in debian/rules

Added:
    yate/trunk/debian/patches/conf_no_lib_exec.patch
Modified:
    yate/trunk/debian/changelog
    yate/trunk/debian/patches/series
    yate/trunk/debian/rules

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=10504&op=diff
==============================================================================
--- yate/trunk/debian/changelog	(original)
+++ yate/trunk/debian/changelog	Wed Jul  9 19:34:59 2014
@@ -7,7 +7,7 @@
   [ Tzafrir Cohen ]
   * Apply upstream patches to properly place files in multiarch pathes
     (Closes: #750272).
-  * Remove exec bit from modules (Closes: #714771).
+  * Upstream patch to remove exec bit from modules (Closes: #714771).
   * yate-dev: Add missing dependency yate-qt4 (Closes: #715135).
 
  -- Mark Purcell <msp at debian.org>  Sat, 31 May 2014 15:59:44 +1000

Added: yate/trunk/debian/patches/conf_no_lib_exec.patch
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/conf_no_lib_exec.patch?rev=10504&op=file
==============================================================================
--- yate/trunk/debian/patches/conf_no_lib_exec.patch	(added)
+++ yate/trunk/debian/patches/conf_no_lib_exec.patch	Wed Jul  9 19:34:59 2014
@@ -0,0 +1,71 @@
+From: Paul Chitescu <paulc at voip.null.ro>
+Subject: make libraries non-executables on Debian systems
+Origin: http://yate.null.ro/websvn/revision.php?repname=yate&rev=5866
+
+--- a/Makefile.in	(revision 5865)
++++ b/Makefile.in	(working copy)
+@@ -214,7 +214,7 @@ install-noconf: all
+ 		f=`readlink "$$i"` ; \
+ 		ln -sf "$$f" "$(DESTDIR)$(libdir)/$$i" ; \
+ 	    else \
+-		install $$i "$(DESTDIR)$(libdir)/" ; \
++		install @INSTALL_L@ $$i "$(DESTDIR)$(libdir)/" ; \
+ 	    fi \
+ 	done
+ 	@mkdir -p "$(DESTDIR)$(bindir)/" && \
+--- a/configure.in	(revision 5865)
++++ b/configure.in	(working copy)
+@@ -1559,6 +1559,31 @@ fi
+ fi
+ 
+ 
++INSTALL_L=""
++AC_ARG_ENABLE(lib-exec,AC_HELP_STRING([--enable-lib-exec],[Executable libraries and modules (default: auto)]),want_lib_exec=$enableval,want_lib_exec=auto)
++case "x$want_lib_exec" in
++    xyes)
++	;;
++    xno)
++	INSTALL_L="-m 0644"
++	;;
++    xauto)
++	AC_MSG_CHECKING([if shared libraries should be executable])
++	if stat -L "/usr/$ARCHLIB/libm.so" 2>/dev/null | grep -q '(0644/'; then
++	    want_lib_exec=no
++	    INSTALL_L="-m 0644"
++	else
++	    want_lib_exec=yes
++	fi
++	AC_MSG_RESULT([$want_lib_exec])
++	;;
++    *)
++	AC_ERROR([Invalid argument passed to --enable-lib-exec])
++	;;
++esac
++AC_SUBST(INSTALL_L)
++
++
+ INSTALL_D="install -D"
+ CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| *\)-g[[0-9]]*//' | sed 's/[[[:space:]]]\{2,\}/ /g'`
+ MODULE_CFLAGS="-fno-exceptions -fPIC $HAVE_GCC_FORMAT_CHECK $HAVE_BLOCK_RETURN"
+--- a/clients/qt4/Makefile.in	(revision 5865)
++++ b/clients/qt4/Makefile.in	(working copy)
+@@ -81,7 +81,7 @@ install: all
+ 		f=`readlink "../../$$i"` ; \
+ 		ln -sf "$$f" "$(DESTDIR)$(libdir)/$$i" ; \
+ 	    else \
+-		install ../../$$i "$(DESTDIR)$(libdir)/" ; \
++		install @INSTALL_L@ ../../$$i "$(DESTDIR)$(libdir)/" ; \
+ 	    fi \
+ 	done; \
+ 	mkdir -p "$(DESTDIR)$(incdir)" && \
+--- a/modules/Makefile.in	(revision 5865)
++++ b/modules/Makefile.in	(working copy)
+@@ -235,7 +235,7 @@ install: all do-install
+ 	    mkdir -p "$(DESTDIR)$(moddir)/$$i" ; \
+ 	done; \
+ 	for i in $(PROGS) ; do \
+-	    @INSTALL_D@ "$$i" "$(DESTDIR)$(moddir)/$$i" ; \
++	    @INSTALL_D@ @INSTALL_L@ "$$i" "$(DESTDIR)$(moddir)/$$i" ; \
+ 	done;
+ 
+ .PHONY: uninstall

Modified: yate/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/series?rev=10504&op=diff
==============================================================================
--- yate/trunk/debian/patches/series	(original)
+++ yate/trunk/debian/patches/series	Wed Jul  9 19:34:59 2014
@@ -4,3 +4,4 @@
 0002-Compile-daemon-as-PIE.patch
 yate-r5852.patch
 yate-r5853.patch
+conf_no_lib_exec.patch

Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=10504&op=diff
==============================================================================
--- yate/trunk/debian/rules	(original)
+++ yate/trunk/debian/rules	Wed Jul  9 19:34:59 2014
@@ -29,8 +29,6 @@
 
 override_dh_install:
 	dh_install -XCOPYING -XChangeLog -Xamrnbcodec.conf -Xh323chan.conf --fail-missing
-	chmod a-x $(CURDIR)/debian/*/usr/lib/*/yate/*.yate \
-		$(CURDIR)/debian/*/usr/lib/*/yate/*/*.yate
 
 get-orig-source:
 	@@dh_testdir