From ad3345e36bd1175074811c9c2c576d7fe73100a8 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Mon, 12 Jan 2015 08:21:16 +0000
Subject: [PATCH] fix building under no-SSLv2 world order

---
 qpopper/qpopper.patch | 35 ++++++++++++++++++++++++++++++++---
 qpopper/qpopper.spec  |  2 +-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/qpopper/qpopper.patch b/qpopper/qpopper.patch
index 10c13d9608..f099b833f0 100644
--- a/qpopper/qpopper.patch
+++ b/qpopper/qpopper.patch
@@ -1,6 +1,6 @@
 Index: popper/Makefile.in
 --- popper/Makefile.in.orig	2011-05-30 21:13:39.000000000 +0200
-+++ popper/Makefile.in	2011-07-01 22:53:50.000000000 +0200
++++ popper/Makefile.in	2015-01-12 09:17:25.456366192 +0100
 @@ -210,12 +210,10 @@
  	${CC}   ${OBJS} ${MISSING_OBJS} -o popper \
  	        ${mmangle_dir}/libmangle.a \
@@ -18,7 +18,7 @@ Index: popper/Makefile.in
  	cd ${password_dir} && ${MAKE} all
 Index: popper/main.c
 --- popper/main.c.orig	2011-05-30 21:13:39.000000000 +0200
-+++ popper/main.c	2011-07-01 22:52:54.000000000 +0200
++++ popper/main.c	2015-01-12 09:17:25.456366192 +0100
 @@ -655,6 +655,22 @@
  
  #endif /* not _DEBUG */
@@ -42,9 +42,22 @@ Index: popper/main.c
      memset ( &hints, 0, sizeof(hints) );
      hints.ai_socktype = SOCK_STREAM;
  #ifdef INET6
+Index: popper/pop_config.c
+--- popper/pop_config.c.orig	2011-05-30 21:13:39.000000000 +0200
++++ popper/pop_config.c	2015-01-12 09:18:28.597637080 +0100
+@@ -433,7 +433,9 @@
+ static mnemonic_map mnem_map_tls_vers [] =
+ {
+     { "default"         , QPOP_TLSvDEFAULT      }, 
++#if 0
+     { "SSLv2"           , QPOP_SSLv2            },
++#endif
+     { "SSLv3"           , QPOP_SSLv3            }, 
+     { "TLSv1"           , QPOP_TLSv1            },
+     { "SSLv23"          , QPOP_SSLv23           },
 Index: popper/pop_dropcopy.c
 --- popper/pop_dropcopy.c.orig	2011-05-30 21:13:39.000000000 +0200
-+++ popper/pop_dropcopy.c	2011-07-01 22:51:43.000000000 +0200
++++ popper/pop_dropcopy.c	2015-01-12 09:17:25.466233438 +0100
 @@ -1245,6 +1245,10 @@
              return pop_msg ( p, POP_FAILURE, HERE,
                               "[SYS/TEMP] Unable to get temp drop name" );
@@ -64,3 +77,19 @@ Index: popper/pop_dropcopy.c
      }
      else {
          /*
+Index: popper/pop_tls_openssl.c
+--- popper/pop_tls_openssl.c.orig	2011-05-30 21:13:40.000000000 +0200
++++ popper/pop_tls_openssl.c	2015-01-12 09:17:25.466233438 +0100
+@@ -318,10 +318,12 @@
+             pTLS->m_OpenSSLmeth = SSLv23_server_method();
+             break;
+ 
++#if 0
+         case QPOP_SSLv2:       /* SSL version 2 only */
+             DEBUG_LOG0 ( pPOP, "...setting method to SSLv2_server_method" );
+             pTLS->m_OpenSSLmeth = SSLv2_server_method();
+             break;
++#endif
+ 
+         case QPOP_SSLv3:       /* SSL version 3 only */
+             DEBUG_LOG0 ( pPOP, "...setting method to SSLv3_server_method" );
diff --git a/qpopper/qpopper.spec b/qpopper/qpopper.spec
index 9f1a72e7e5..d4a9cb0142 100644
--- a/qpopper/qpopper.spec
+++ b/qpopper/qpopper.spec
@@ -32,7 +32,7 @@ Class:        BASE
 Group:        Mail
 License:      GPL
 Version:      4.1.0
-Release:      20110701
+Release:      20150112
 
 #   package options
 %option       with_fsl  yes