Bug#685930: unblock: sslh/1.13b-3.2

[David Prévot <taffit@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package sslh

It fixes two RC-bug (thanks to Cyril Brulebois on debian-wb-team@l.d.o
for pointing to an actual fix for the second one), both FTBFS issues.

unblock sslh/1.13b-3.2

Thanks in advance.

Regards

David

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diffstat for sslh-1.13b sslh-1.13b

 changelog                    |   16 ++++++++++++++++
 control                      |    2 +-
 patches/ftbfs_localhost.diff |   17 +++++++++++++++++
 patches/series               |    1 +
 4 files changed, 35 insertions(+), 1 deletion(-)

diff -Nru sslh-1.13b/debian/changelog sslh-1.13b/debian/changelog
--- sslh-1.13b/debian/changelog	2012-06-21 06:16:28.000000000 -0400
+++ sslh-1.13b/debian/changelog	2012-08-26 11:38:46.000000000 -0400
@@ -1,3 +1,19 @@
+sslh (1.13b-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Restore debian/patch/ftbfs_localhost.diff, as autobuilders are still not
+    all fixed (Closes: #685928)
+
+ -- David Prévot <taffit@debian.org>  Sun, 26 Aug 2012 11:35:48 -0400
+
+sslh (1.13b-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: Build-Depends on lcov, which contains lcov and genhtml
+    that are used by upstream in the test suite code "t" (Closes: #684846)
+
+ -- David Prévot <taffit@debian.org>  Thu, 23 Aug 2012 17:40:55 -0400
+
 sslh (1.13b-3) unstable; urgency=low
 
   * debian/control: Build-Depends on psmisc, which contains killall and is
diff -Nru sslh-1.13b/debian/control sslh-1.13b/debian/control
--- sslh-1.13b/debian/control	2012-06-21 06:12:59.000000000 -0400
+++ sslh-1.13b/debian/control	2012-08-23 17:45:06.000000000 -0400
@@ -4,7 +4,7 @@
 Maintainer: Guillaume Delacour <gui@iroqwa.org>
 Build-Depends: debhelper (>= 9.0.0), libwrap0-dev, binutils, po-debconf,
                hardening-wrapper, libio-socket-inet6-perl, libconfig-dev,
-               psmisc
+               psmisc, lcov
 Standards-Version: 3.9.3
 Homepage: http://www.rutschle.net/tech/sslh.shtml
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sslh.git
diff -Nru sslh-1.13b/debian/patches/ftbfs_localhost.diff sslh-1.13b/debian/patches/ftbfs_localhost.diff
--- sslh-1.13b/debian/patches/ftbfs_localhost.diff	1969-12-31 20:00:00.000000000 -0400
+++ sslh-1.13b/debian/patches/ftbfs_localhost.diff	2012-08-26 11:41:05.000000000 -0400
@@ -0,0 +1,17 @@
+From: Guillaume Delacour <gui@iroqwa.org>
+Subject: Fix FTBFS if ip6-localhost don't resolv to ::1
+Last-Update: 2012-08-26
+
+--- a/t
++++ b/t
+@@ -8,8 +8,8 @@
+ 
+ # We use ports 9000, 9001 and 9002 -- hope that won't clash
+ # with anything...
+-my $ssh_address = "ip6-localhost:9000";
+-my $ssl_address = "ip6-localhost:9001";
++my $ssh_address = "::1:9000";
++my $ssl_address = "::1:9001";
+ my $sslh_port = 9002;
+ my $no_listen = 9003;  # Port on which no-one listens
+ my $pidfile = "/tmp/sslh_test.pid";
diff -Nru sslh-1.13b/debian/patches/series sslh-1.13b/debian/patches/series
--- sslh-1.13b/debian/patches/series	2012-06-21 06:11:06.000000000 -0400
+++ sslh-1.13b/debian/patches/series	2012-08-26 11:41:05.000000000 -0400
@@ -1 +1,2 @@
 minor_typo_manpage.diff
+ftbfs_localhost.diff