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

Please unblock package pound. It has been removed from testing due
openssl1.1. It has been fixed and user confirmed in #855458 that it is
working. Please find attach the debdiff against .2 which was in testing
earlier.

unblock pound/2.7-1.3

Sebastian
diff -Nru pound-2.7/debian/changelog pound-2.7/debian/changelog
--- pound-2.7/debian/changelog	2016-07-31 11:40:52.000000000 +0200
+++ pound-2.7/debian/changelog	2017-02-19 15:13:02.000000000 +0100
@@ -1,3 +1,10 @@
+pound (2.7-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build it with libssl1.0-dev for Jessie (Closes: #828511).
+
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc>  Sun, 19 Feb 2017 15:13:02 +0100
+
 pound (2.7-1.2) unstable; urgency=medium
 
   * Include .orig.tar.gz in upload.
diff -Nru pound-2.7/debian/control pound-2.7/debian/control
--- pound-2.7/debian/control	2016-07-30 21:10:00.000000000 +0200
+++ pound-2.7/debian/control	2017-02-19 15:12:47.000000000 +0100
@@ -2,7 +2,7 @@
 Section: net
 Priority: extra
 Maintainer: Brett Parker <idu...@sommitrealweird.co.uk>
-Build-Depends: debhelper (>= 9), libssl-dev (>= 1.0.2), autotools-dev, libpcre3-dev, openssl
+Build-Depends: debhelper (>= 9), libssl1.0-dev | libssl-dev (<< 1.1), autotools-dev, libpcre3-dev, openssl
 Standards-Version: 3.9.2
 Homepage: http://www.apsis.ch/pound/
 
diff -Nru pound-2.7/debian/patches/0002-add-support-openssl1.1-dhparam.patch pound-2.7/debian/patches/0002-add-support-openssl1.1-dhparam.patch
--- pound-2.7/debian/patches/0002-add-support-openssl1.1-dhparam.patch	1970-01-01 01:00:00.000000000 +0100
+++ pound-2.7/debian/patches/0002-add-support-openssl1.1-dhparam.patch	2017-02-19 15:10:59.000000000 +0100
@@ -0,0 +1,54 @@
+From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
+Date: Sun, 19 Feb 2017 14:34:38 +0100
+Subject: [PATCH] pound: Add support for openssl 1.1
+
+This patch adds support for "openssl dhparam -C" created header files where
+openssl binary itself is 1.1 but the code using the file is linked against
+1.0.2.
+This will not let the pound as compile against openssl 1.1.
+
+Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
+---
+ svc.c |   31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+--- a/svc.c
++++ b/svc.c
+@@ -1448,6 +1448,37 @@ do_RSAgen(void)
+     return;
+ }
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
++{
++	/* If the fields p and g in d are NULL, the corresponding input
++	 * parameters MUST be non-NULL.  q may remain NULL.
++	 */
++	if ((dh->p == NULL && p == NULL)
++	    || (dh->g == NULL && g == NULL))
++		return 0;
++
++	if (p != NULL) {
++		BN_free(dh->p);
++		dh->p = p;
++	}
++	if (q != NULL) {
++		BN_free(dh->q);
++		dh->q = q;
++	}
++	if (g != NULL) {
++		BN_free(dh->g);
++		dh->g = g;
++	}
++
++	if (q != NULL) {
++		dh->length = BN_num_bits(q);
++	}
++
++	return 1;
++}
++#endif
++
+ #include    "dh512.h"
+ 
+ #if DH_LEN == 1024
diff -Nru pound-2.7/debian/patches/series pound-2.7/debian/patches/series
--- pound-2.7/debian/patches/series	2016-07-30 22:50:48.000000000 +0200
+++ pound-2.7/debian/patches/series	2017-02-19 15:11:19.000000000 +0100
@@ -1 +1,2 @@
 0001-Add-MKCALENDAR-to-xHTTP-2-and-above.patch
+0002-add-support-openssl1.1-dhparam.patch

Reply via email to