Package: openvas-libraries
Version: 2.0.4-2.1
Followup-For: Bug #744645
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Use dh_autotools-dev instead of manually copying config.{sub,guess}.
* Use dh-autoreconf to get new libtool macros for ppc64el.
* Disable autoheader to fix FTBFS.
* Don't hardcode the shell to fix another FTBFS.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: jessie/sid
APT prefers utopic-updates
APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500,
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-24-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u openvas-libraries-2.0.4/debian/control openvas-libraries-2.0.4/debian/control
--- openvas-libraries-2.0.4/debian/control
+++ openvas-libraries-2.0.4/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenVAS Maintainers <openvas-distro-...@wald.intevation.org>
Uploaders: Tim Brown <t...@nth-dimension.org.uk>, Javier Fernandez-Sanguino Pen~a <j...@debian.org>, Jan Wagner <w...@cyconet.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libgnutls-dev, libpcap-dev, libglib2.0-dev, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, dh-autoreconf, libgnutls-dev, libpcap-dev, libglib2.0-dev, dpatch
Homepage: http://www.openvas.org/
Vcs-Browser: http://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/openvas-libraries/packaging/debian/?root=openvas
Vcs-Svn: https://svn.wald.intevation.org/svn/openvas/trunk/openvas-libraries/packaging/debian/
diff -u openvas-libraries-2.0.4/debian/changelog openvas-libraries-2.0.4/debian/changelog
diff -u openvas-libraries-2.0.4/debian/rules openvas-libraries-2.0.4/debian/rules
--- openvas-libraries-2.0.4/debian/rules
+++ openvas-libraries-2.0.4/debian/rules
@@ -8,6 +8,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export AUTOHEADER=true
# These are used for cross-compiling and for saving the configure script
@@ -35,12 +36,8 @@
config.status: patch-stamp configure
dh_testdir
# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+ dh_autoreconf
+ dh_autotools-dev_updateconfig
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --localstatedir=/var CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -60,8 +57,9 @@
# Add here commands to clean up after the build process.
touch openvas-libraries.tmpl
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
+ dh_autotools-dev_restoreconfig
+ dh_autoreconf_clean
dh_clean
install: build
diff -u openvas-libraries-2.0.4/debian/patches/00list openvas-libraries-2.0.4/debian/patches/00list
--- openvas-libraries-2.0.4/debian/patches/00list
+++ openvas-libraries-2.0.4/debian/patches/00list
@@ -2,0 +3 @@
+10_shell.dpatch
only in patch2:
unchanged:
--- openvas-libraries-2.0.4.orig/debian/patches/10_shell.dpatch
+++ openvas-libraries-2.0.4/debian/patches/10_shell.dpatch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: don't hardcode the shell
+## Origin/Author: Logan Rosen <lo...@ubuntu.com>
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' openvas-libraries-2.0.4~/openvas-libraries.tmpl.in openvas-libraries-2.0.4/openvas-libraries.tmpl.in
+--- openvas-libraries-2.0.4~/openvas-libraries.tmpl.in 2009-08-07 06:23:15.000000000 -0400
++++ openvas-libraries-2.0.4/openvas-libraries.tmpl.in 2014-05-10 22:23:02.538354319 -0400
+@@ -21,7 +21,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+-SHELL = /bin/sh
++SHELL = @SHELL@
+ CONFIGURE_ARGS = @ac_configure_args@
+
+ @SET_MAKE@
