[arch-commits] Commit in partimage/trunk (PKGBUILD use-SSLv3-by-default.patch)

[Evangelos Foutras]

    Date: Wednesday, March 2, 2016 @ 20:38:42
  Author: foutrelis
Revision: 164238

Fix build with OpenSSL 1.0.2g

Added:
  partimage/trunk/use-SSLv3-by-default.patch
Modified:
  partimage/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 ++++-
 use-SSLv3-by-default.patch |   80 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-02 19:30:43 UTC (rev 164237)
+++ PKGBUILD	2016-03-02 19:38:42 UTC (rev 164238)
@@ -16,18 +16,25 @@
 install='partimage.install'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'partimage-0.6.9-zlib-1.2.6.patch'
+        'use-SSLv3-by-default.patch'
         'partimaged-gencrt'
         'partimaged.service')
 md5sums=('1bc046fd915c5debbafc85729464e513'
          '202c4334766041d98c5f67c9d62c3063'
+         '77c33f779186cd25e7c6543348ca5009'
          '2316b116227b07efb48266e660ca1ba1'
          '5f8dae511cdfbf097409a45e9642a372')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../partimage-0.6.9-zlib-1.2.6.patch
+  patch -Np1 -i ../use-SSLv3-by-default.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam
   make
   make pamfile

Added: use-SSLv3-by-default.patch
===================================================================
--- use-SSLv3-by-default.patch	                        (rev 0)
+++ use-SSLv3-by-default.patch	2016-03-02 19:38:42 UTC (rev 164238)
@@ -0,0 +1,80 @@
+From 8b05af027723ff3a64040275d4050ff0e992d629 Mon Sep 17 00:00:00 2001
+From: Marko Kohtala <marko.kohtala at gmail.com>
+Date: Sun, 9 Feb 2014 22:54:11 +0200
+Subject: [PATCH] Use SSLv3 by default
+
+SSLv2_client_method may be hidden. Use the SSLv23_client_method instead.
+
+This is a fix from Debian package partimage-0.6.8-2.2.
+
+Signed-off-by: Marko Kohtala <marko.kohtala at gmail.com>
+---
+ src/client/netclient.cpp | 3 +--
+ src/client/netclient.h   | 6 ------
+ src/server/netserver.cpp | 3 +--
+ src/server/netserver.h   | 6 ------
+ 4 files changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/src/client/netclient.cpp b/src/client/netclient.cpp
+index 30b8d5c..43b2672 100644
+--- a/src/client/netclient.cpp
++++ b/src/client/netclient.cpp
+@@ -43,9 +43,8 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
+     {
+       showDebug(3, "initializing client ssl\n");
+       SSLeay_add_ssl_algorithms();
+-      meth = SSLv2_client_method();
+       SSL_load_error_strings();
+-      ctx = SSL_CTX_new(meth);
++      ctx = SSL_CTX_new(SSLv23_client_method());
+       if (!ctx)
+         THROW(ERR_SSL_CTX);
+       m_bUseSSL = (ctx != NULL);
+diff --git a/src/client/netclient.h b/src/client/netclient.h
+index 8423798..9d98b39 100644
+--- a/src/client/netclient.h
++++ b/src/client/netclient.h
+@@ -35,12 +35,6 @@ class CNetClient : public CNet
+ #ifdef HAVE_SSL
+   SSL_CTX * ctx;
+   X509 * server_cert;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-  SSL_METHOD const * meth;
+-#else
+-  SSL_METHOD * meth;
+-#endif // OPENSSL_VERSION_NUMBER
+-
+ #endif
+   bool m_bUseSSL;
+   bool m_bMustLogin;
+diff --git a/src/server/netserver.cpp b/src/server/netserver.cpp
+index a542760..28c43cc 100644
+--- a/src/server/netserver.cpp
++++ b/src/server/netserver.cpp
+@@ -39,8 +39,7 @@ CNetServer::CNetServer( uint32_t ip4_addr, unsigned short int port):CNet()
+     {
+       SSL_load_error_strings();
+       SSLeay_add_ssl_algorithms();
+-      meth = SSLv23_server_method();
+-      ctx = SSL_CTX_new(meth);
++      ctx = SSL_CTX_new(SSLv23_server_method());
+       if (!ctx)
+         {
+           ERR_print_errors_fp(stderr);
+diff --git a/src/server/netserver.h b/src/server/netserver.h
+index 01f6b6c..29d2a32 100644
+--- a/src/server/netserver.h
++++ b/src/server/netserver.h
+@@ -41,12 +41,6 @@ class CNetServer : public CNet
+ #ifdef HAVE_SSL
+   SSL_CTX * ctx;
+   X509 * client_cert;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-  SSL_METHOD const * meth; 
+-#else
+-  SSL_METHOD * meth;
+-#endif // OPENSSL_VERSION_NUMBER
+- 
+   int err;
+ #endif
+