[arch-commits] Commit in sslsplit/trunk (PKGBUILD no-ssl3.patch)

[Levente Polyak]

    Date: Thursday, March 3, 2016 @ 01:01:33
  Author: anthraxx
Revision: 164264

openssl rebuild

Added:
  sslsplit/trunk/no-ssl3.patch
Modified:
  sslsplit/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++---
 no-ssl3.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-02 22:51:54 UTC (rev 164263)
+++ PKGBUILD	2016-03-03 00:01:33 UTC (rev 164264)
@@ -2,7 +2,7 @@
 
 pkgname=sslsplit
 pkgver=0.4.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool for man-in-the-middle attacks against SSL/TLS encrypted network connections"
 url="https://www.roe.ch/SSLsplit"
 arch=('i686' 'x86_64')
@@ -9,11 +9,18 @@
 license=('BSD')
 depends=('libevent' 'openssl')
 checkdepends=('check')
-source=(https://mirror.roe.ch/rel/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc})
+source=(https://mirror.roe.ch/rel/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc}
+        no-ssl3.patch)
 sha512sums=('c3339b4d22eb8f94ad1bc161b2c2d9efcb2f2828985712a5580437077f4c0bd74657d42274c4a9118c92721b9bd1d8150cf83d89afef6144b20aba497ac1d69a'
-            'SKIP')
+            'SKIP'
+            '0c80471a881d29d285385e00dc1d36d27d796648b0327748263b7b78dfa6d728f0d7feaca719df3b74c0741740a350604173c9cb6f44ba5e68e34bd47a293856')
 validpgpkeys=('BFF9C7D7EA0EAC7F1AA55B3EFABE3324B5D3397E') # Daniel Roethlisberger <daniel at roe.ch>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < "${srcdir}/no-ssl3.patch"
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   make

Added: no-ssl3.patch
===================================================================
--- no-ssl3.patch	                        (rev 0)
+++ no-ssl3.patch	2016-03-03 00:01:33 UTC (rev 164264)
@@ -0,0 +1,66 @@
+From: Hilko Bengen <bengen at debian.org>
+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" :