Fix SSLv3

3 files changed, 21 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81fb05e3137a..1e1a03f69cec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = courier-imap
 	pkgdesc = IMAP(s)/POP3(s) Server
 	pkgver = 4.16.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.courier-mta.org/imap/
 	arch = i686
 	arch = x86_64
@@ -27,11 +27,13 @@ pkgbase = courier-imap
 	source = courier-imapd.service
 	source = courier-pop3d.service
 	source = courier-pop3d-ssl.service
+	source = SSLV3.patch
 	sha512sums = 42a685324b630835fe0c8735a67879e099f96eadf091c803368a9dd478a80b4ab47225fda6142942569c96b21355b5dac5e174ff434bcdc78784a810d2088609
 	sha512sums = fcbc553e2b4542f246762ed1b20f1ae6a8f2b7c808e9ac537577e21ad933a0b1b4ea04eabb900ef423e2f4d037f973e73bf5f7e8ff6f0e3f7997f26dfd39b09f
 	sha512sums = daec41de02a8b056a0b54e9c5446e144192762e4354875fb18b306473e006eadee74664e65f45e07e071b70158f741720a9acd41c14474d61ee0c619a59e8a98
 	sha512sums = 329ae0f76d5db53ed5392584ddfe7c4a10bfcec51a50c80d10fda1c318ab4929251ecc206403e045dba2c1d7388334473e2d8bf04dcfcc3d07301e89a609ea57
 	sha512sums = 337639e7c666e972ffc9d9fe58a897b3643582c80c22cf2503d616319c3e69969bba2fc629b4ae7f94a6f6a97ae0524b8c12426c5f05be4240e742a1f7c9d934
+	sha512sums = a8a4fa9f1fc24ebb420d1d09df96251a66abf2133bc7e6ffd7d5051e4153d96492fe7ca29b5ef8cffa9601ad8ebe277c9a91bce4418111c604fd08869f60f1f2
 
 pkgname = courier-imap
 
diff --git a/PKGBUILD b/PKGBUILD
index fd2675f2d16c..f0f63c319273 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=courier-imap
 pkgver=4.16.2
-pkgrel=2
+pkgrel=3
 pkgdesc="IMAP(s)/POP3(s) Server"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -22,16 +22,21 @@ source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgnam
 	courier-imapd-ssl.service
 	courier-imapd.service
 	courier-pop3d.service
-	courier-pop3d-ssl.service)
+	courier-pop3d-ssl.service
+	SSLV3.patch)
 sha512sums=('42a685324b630835fe0c8735a67879e099f96eadf091c803368a9dd478a80b4ab47225fda6142942569c96b21355b5dac5e174ff434bcdc78784a810d2088609'
 	    'fcbc553e2b4542f246762ed1b20f1ae6a8f2b7c808e9ac537577e21ad933a0b1b4ea04eabb900ef423e2f4d037f973e73bf5f7e8ff6f0e3f7997f26dfd39b09f'
 	    'daec41de02a8b056a0b54e9c5446e144192762e4354875fb18b306473e006eadee74664e65f45e07e071b70158f741720a9acd41c14474d61ee0c619a59e8a98'
 	    '329ae0f76d5db53ed5392584ddfe7c4a10bfcec51a50c80d10fda1c318ab4929251ecc206403e045dba2c1d7388334473e2d8bf04dcfcc3d07301e89a609ea57'
-	    '337639e7c666e972ffc9d9fe58a897b3643582c80c22cf2503d616319c3e69969bba2fc629b4ae7f94a6f6a97ae0524b8c12426c5f05be4240e742a1f7c9d934')
+	    '337639e7c666e972ffc9d9fe58a897b3643582c80c22cf2503d616319c3e69969bba2fc629b4ae7f94a6f6a97ae0524b8c12426c5f05be4240e742a1f7c9d934'
+
+'a8a4fa9f1fc24ebb420d1d09df96251a66abf2133bc7e6ffd7d5051e4153d96492fe7ca29b5ef8cffa9601ad8ebe277c9a91bce4418111c604fd08869f60f1f2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  patch -p1 -i "$srcdir/SSLV3.patch"
+
   # fix a tiny bug
   sed -i -e \
     's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \
diff --git a/SSLV3.patch b/SSLV3.patch
new file mode 100644
index 000000000000..f7edd7014514
--- /dev/null
+++ b/SSLV3.patch
@@ -0,0 +1,10 @@
+--- a/libs/tcpd/libcouriertls.c	2015-06-10 02:08:23.000000000 +0200
++++ b/libs/tcpd/libcouriertls.c	2016-03-13 16:41:59.000000000 +0100
+@@ -74,7 +74,6 @@
+     { "TLSv1",     &TLSv1_method,   SSL_OP_ALL },
+     { "TLS1",      &TLSv1_method,   SSL_OP_ALL },
+     { "SSL3+",     &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2 },
+-    { "SSL3",      &SSLv3_method,   SSL_OP_ALL },
+     { "SSL23",     &SSLv23_method,  SSL_OP_ALL },
+     { "",          &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },
+     { NULL,        &SSLv23_method,  SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },