diff -Nru dillo-3.0.5/debian/changelog dillo-3.0.5/debian/changelog --- dillo-3.0.5/debian/changelog 2016-04-23 00:02:44.000000000 +0000 +++ dillo-3.0.5/debian/changelog 2016-11-20 01:03:51.000000000 +0000 @@ -1,8 +1,14 @@ -dillo (3.0.5-2build1) yakkety; urgency=medium +dillo (3.0.5-3) unstable; urgency=medium - * No-change rebuild for libpng soname change. + * Update path to global dillorc in README.Debian to current value. + * Document in README.Debian how to disable dillo's debug messages. + * Declare compliance with Debian Policy 3.9.8. + * Switch Vcs-Git header from git:// to https://. + * Switch DEP5 format header from http:// to https://. + * Switch to dh compat level 10, drop --parallel and --with autoreconf. + * Fix OpenSSL 1.1 related issues. (Closes: #845035) Thanks Hilko Bengen! - -- Matthias Klose Sat, 23 Apr 2016 00:02:44 +0000 + -- Axel Beckert Sun, 20 Nov 2016 02:03:51 +0100 dillo (3.0.5-2) unstable; urgency=medium diff -Nru dillo-3.0.5/debian/compat dillo-3.0.5/debian/compat --- dillo-3.0.5/debian/compat 2014-09-30 15:11:42.000000000 +0000 +++ dillo-3.0.5/debian/compat 2016-11-19 23:56:03.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru dillo-3.0.5/debian/control dillo-3.0.5/debian/control --- dillo-3.0.5/debian/control 2016-01-08 10:37:50.000000000 +0000 +++ dillo-3.0.5/debian/control 2016-11-19 23:56:12.000000000 +0000 @@ -2,8 +2,8 @@ Section: web Priority: extra Maintainer: Axel Beckert -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9~), +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10), dh-autoreconf, dpkg-dev (>= 1.16.1~), libfltk1.3-dev (>= 1.3.2-3~), @@ -13,7 +13,7 @@ libssl-dev, zlib1g-dev Homepage: http://www.dillo.org/ -Vcs-Git: git://anonscm.debian.org/collab-maint/dillo.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/dillo.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dillo.git Package: dillo diff -Nru dillo-3.0.5/debian/copyright dillo-3.0.5/debian/copyright --- dillo-3.0.5/debian/copyright 2015-04-26 01:31:25.000000000 +0000 +++ dillo-3.0.5/debian/copyright 2016-05-13 12:46:42.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Dillo Source: http://www.dillo.org/ License: GPL-3+ diff -Nru dillo-3.0.5/debian/patches/fix-OpenSSL-1.1-detection.patch dillo-3.0.5/debian/patches/fix-OpenSSL-1.1-detection.patch --- dillo-3.0.5/debian/patches/fix-OpenSSL-1.1-detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ dillo-3.0.5/debian/patches/fix-OpenSSL-1.1-detection.patch 2016-11-20 01:01:27.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Fix OpenSSL 1.1 detection and access to now opaque structures. +Bug-Debian: https://bugs.debian.org/845035 +Author: Axel Beckert +Forwarded: not-yet + +--- a/configure.ac ++++ b/configure.ac +@@ -286,7 +286,7 @@ + + if test "x$ssl_ok" = "xyes"; then + old_libs="$LIBS" +- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto) ++ AC_CHECK_LIB(ssl, SSL_new, ssl_ok=yes, ssl_ok=no, -lcrypto) + LIBS="$old_libs" + fi + +--- a/dpi/https.c ++++ b/dpi/https.c +@@ -476,7 +476,7 @@ + case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: + /*Either self signed and untrusted*/ + /*Extract CN from certificate name information*/ +- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { ++ if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) { + strcpy(buf, "(no CN given)"); + } else { + char *cn_end; diff -Nru dillo-3.0.5/debian/patches/series dillo-3.0.5/debian/patches/series --- dillo-3.0.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ dillo-3.0.5/debian/patches/series 2016-11-19 23:58:58.000000000 +0000 @@ -0,0 +1 @@ +fix-OpenSSL-1.1-detection.patch diff -Nru dillo-3.0.5/debian/README.Debian dillo-3.0.5/debian/README.Debian --- dillo-3.0.5/debian/README.Debian 2014-09-30 15:11:42.000000000 +0000 +++ dillo-3.0.5/debian/README.Debian 2016-05-13 12:40:09.000000000 +0000 @@ -1,5 +1,16 @@ +Dillo for Debian +================ To fully make use of dillo, you will want to copy the provided dillorc -file located in /etc/dillorc into ~/.dillo/ +file located in /etc/dillo/dillorc into ~/.dillo/ and edit it to you +likes. -This Debian package was created by Ron Farrer . +If you're annoyed by dillo's debug output, change the commented + + #show_msg=YES + +to + + show_msg=NO + + -- Axel Beckert , Fri, 13 May 2016 14:40:09 +0200 diff -Nru dillo-3.0.5/debian/rules dillo-3.0.5/debian/rules --- dillo-3.0.5/debian/rules 2016-01-30 10:48:25.000000000 +0000 +++ dillo-3.0.5/debian/rules 2016-11-19 23:37:38.000000000 +0000 @@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ --parallel --with autoreconf + dh $@ override_dh_auto_configure: dh_auto_configure -- --enable-ipv6 --enable-ssl