diff -Nru sslsplit-0.4.11+dfsg/debian/changelog sslsplit-0.4.11+dfsg/debian/changelog --- sslsplit-0.4.11+dfsg/debian/changelog 2015-03-31 09:41:14.000000000 +0000 +++ sslsplit-0.4.11+dfsg/debian/changelog 2015-11-22 14:12:44.000000000 +0000 @@ -1,3 +1,10 @@ +sslsplit (0.4.11+dfsg-2) unstable; urgency=medium + + * Fix FTBFS due to removed SSLv3_method (Closes: #805097) + * Add Vcs-* headers + + -- Hilko Bengen Sun, 22 Nov 2015 14:29:30 +0100 + sslsplit (0.4.11+dfsg-1) unstable; urgency=medium * New upstream version diff -Nru sslsplit-0.4.11+dfsg/debian/control sslsplit-0.4.11+dfsg/debian/control --- sslsplit-0.4.11+dfsg/debian/control 2015-03-11 07:25:24.000000000 +0000 +++ sslsplit-0.4.11+dfsg/debian/control 2015-11-22 14:12:44.000000000 +0000 @@ -6,6 +6,8 @@ libssl-dev, libevent-dev, check, pkg-config, openssl, Standards-Version: 3.9.6 Homepage: http://www.roe.ch/SSLsplit +Vcs-Git: git://anonscm.debian.org/collab-maint/sslsplit.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/sslsplit.git;a=summary Package: sslsplit Architecture: any diff -Nru sslsplit-0.4.11+dfsg/debian/patches/0004-Use-OPENSSL_NO_SSL3_METHOD-to-determine-whether-SSLv.patch sslsplit-0.4.11+dfsg/debian/patches/0004-Use-OPENSSL_NO_SSL3_METHOD-to-determine-whether-SSLv.patch --- sslsplit-0.4.11+dfsg/debian/patches/0004-Use-OPENSSL_NO_SSL3_METHOD-to-determine-whether-SSLv.patch 1970-01-01 00:00:00.000000000 +0000 +++ sslsplit-0.4.11+dfsg/debian/patches/0004-Use-OPENSSL_NO_SSL3_METHOD-to-determine-whether-SSLv.patch 2015-11-22 14:12:44.000000000 +0000 @@ -0,0 +1,66 @@ +From: Hilko Bengen +Date: Sun, 22 Nov 2015 14:25:42 +0100 +Subject: Use OPENSSL_NO_SSL3_METHOD to determine whether SSLv3_method is + available + +As suggested by Kurt Roeckx +--- + opts.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/opts.c b/opts.c +index 0189af8..f23b357 100644 +--- a/opts.c ++++ b/opts.c +@@ -143,11 +143,11 @@ opts_proto_force(opts_t *opts, const char *optarg, const char *argv0) + opts->sslmethod = SSLv2_method; + } else + #endif /* SSL_OP_NO_SSLv2 && WITH_SSLV2 */ +-#ifdef SSL_OP_NO_SSLv3 ++#ifndef OPENSSL_NO_SSL3_METHOD + if (!strcmp(optarg, "ssl3")) { + opts->sslmethod = SSLv3_method; + } else +-#endif /* SSL_OP_NO_SSLv3 */ ++#endif /* OPENSSL_NO_SSL3_METHOD */ + #ifdef SSL_OP_NO_TLSv1 + if (!strcmp(optarg, "tls10") || !strcmp(optarg, "tls1")) { + opts->sslmethod = TLSv1_method; +@@ -182,11 +182,11 @@ opts_proto_disable(opts_t *opts, const char *optarg, const char *argv0) + opts->no_ssl2 = 1; + } else + #endif /* SSL_OP_NO_SSLv2 && WITH_SSLV2 */ +-#ifdef SSL_OP_NO_SSLv3 ++#ifndef OPENSSL_NO_SSL3_METHOD + if (!strcmp(optarg, "ssl3")) { + opts->no_ssl3 = 1; + } else +-#endif /* SSL_OP_NO_SSLv3 */ ++#endif /* OPENSSL_NO_SSL3_METHOD */ + #ifdef SSL_OP_NO_TLSv1 + if (!strcmp(optarg, "tls10") || !strcmp(optarg, "tls1")) { + opts->no_tls10 = 1; +@@ -219,9 +219,9 @@ opts_proto_dbg_dump(opts_t *opts) + #if defined(SSL_OP_NO_SSLv2) && defined(WITH_SSLV2) + (opts->sslmethod == SSLv2_method) ? "nossl2" : + #endif /* SSL_OP_NO_SSLv2 && WITH_SSLV2 */ +-#ifdef SSL_OP_NO_SSLv3 ++#ifndef OPENSSL_NO_SSL3_METHOD + (opts->sslmethod == SSLv3_method) ? "ssl3" : +-#endif /* SSL_OP_NO_SSLv3 */ ++#endif /* OPENSSL_NO_SSL3_METHOD */ + #ifdef SSL_OP_NO_TLSv1 + (opts->sslmethod == TLSv1_method) ? "tls10" : + #endif /* SSL_OP_NO_TLSv1 */ +@@ -236,9 +236,9 @@ opts_proto_dbg_dump(opts_t *opts) + opts->no_ssl2 ? " -ssl2" : + #endif /* SSL_OP_NO_SSLv2 && WITH_SSLV2 */ + "", +-#ifdef SSL_OP_NO_SSLv3 ++#ifndef OPENSSL_NO_SSL3_METHOD + opts->no_ssl3 ? " -ssl3" : +-#endif /* SSL_OP_NO_SSLv3 */ ++#endif /* OPENSSL_NO_SSL3_METHOD */ + "", + #ifdef SSL_OP_NO_TLSv1 + opts->no_tls10 ? " -tls10" : diff -Nru sslsplit-0.4.11+dfsg/debian/patches/series sslsplit-0.4.11+dfsg/debian/patches/series --- sslsplit-0.4.11+dfsg/debian/patches/series 2015-03-11 07:25:31.000000000 +0000 +++ sslsplit-0.4.11+dfsg/debian/patches/series 2015-11-22 14:12:26.000000000 +0000 @@ -1,3 +1,4 @@ 0001-Provide-extra-pki-session.pem-for-tests.patch 0002-Fix-Lintian-warnings-about-manpage.patch 0003-Use-pkg-config-to-determine-linker-flags-for-test-pr.patch +0004-Use-OPENSSL_NO_SSL3_METHOD-to-determine-whether-SSLv.patch