Package: stunnel4
Version: 3:4.53-1.1
Followup-For: Bug #727511
User: [email protected]
Usertags: origin-ubuntu trusty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Use dh_autotools-dev to update config.{sub,guess} for new ports.
This should be self-explanatory. dh_autotools tends to get things
right while random copies go astray if config.{sub,guess} are hidden
in subdirectories and the like.
... Adam
-- System Information:
Debian Release: wheezy/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.12.0-2-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru stunnel4-4.53/debian/changelog stunnel4-4.53/debian/changelog
diff -Nru stunnel4-4.53/debian/rules stunnel4-4.53/debian/rules
--- stunnel4-4.53/debian/rules 2013-04-22 20:44:39.000000000 +0100
+++ stunnel4-4.53/debian/rules 2013-11-14 15:27:45.000000000 +0000
@@ -23,13 +23,7 @@
build-stamp:
dh_testdir
-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_autotools-dev_updateconfig
./configure --prefix=/usr $(SYSTEM) \
$(shell dpkg-buildflags --export=configure) \
--localstatedir=/var --sysconfdir=/etc \
@@ -44,7 +38,7 @@
dh_clean build-stamp debian/stunnel4.init doc/stunnel4.8 doc/stunnel4.fr.8 doc/stunnel4.pl.8
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.guess config.sub
+ dh_autotools-dev_restoreconfig
install: build-stamp
dh_testdir
