cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to znc-1.6.2.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2015-11-29 08:10:47 +00:00
parent 2f69058b74
commit 377874924c
3 changed files with 5 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/znc/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.27 2015/09/03 15:48:59 sthen Exp $
# $OpenBSD: Makefile,v 1.28 2015/11/29 08:10:47 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= advanced IRC bouncer
DISTNAME= znc-1.6.1
REVISION= 0
DISTNAME= znc-1.6.2
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}releases/

4
net/znc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (znc-1.6.1.tar.gz) = ukk5c2T0jW0yrlJCvBFm8h2XL4XdOQ1rvmimPsu2wUA=
SIZE (znc-1.6.1.tar.gz) = 1463397
SHA256 (znc-1.6.2.tar.gz) = 7vF3J8DGQz/tGv+6Dqdux/1gGY0vPCNNhSm9X7JvBZM=
SIZE (znc-1.6.2.tar.gz) = 1463898

54
net/znc/patches/patch-src_Csocket_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_Csocket_cpp,v 1.3 2015/09/03 15:48:59 sthen Exp $
$OpenBSD: patch-src_Csocket_cpp,v 1.4 2015/11/29 08:10:47 ajacoutot Exp $
--- src/Csocket.cpp.orig Tue Aug 4 00:00:04 2015
+++ src/Csocket.cpp Fri Aug 28 23:38:42 2015
@@ -47,6 +47,7 @@
@ -9,55 +9,3 @@ $OpenBSD: patch-src_Csocket_cpp,v 1.3 2015/09/03 15:48:59 sthen Exp $
#endif /* HAVE_LIBSSL */
#ifdef HAVE_ICU
@@ -1463,6 +1464,7 @@ bool Csock::SSLClientSetup()
switch( m_iMethod )
{
+#ifndef OPENSSL_NO_SSL3
case SSL3:
m_ssl_ctx = SSL_CTX_new( SSLv3_client_method() );
if( !m_ssl_ctx )
@@ -1471,6 +1473,7 @@ bool Csock::SSLClientSetup()
return( false );
}
break;
+#endif /* OPENSSL_NO_SSL3 */
case TLS12:
#if defined( TLS1_2_VERSION ) && defined( OPENSSL_VERSION_NUMBER ) && OPENSSL_VERSION_NUMBER >= 0x1000100f
m_ssl_ctx = SSL_CTX_new( TLSv1_2_client_method() );
@@ -1510,6 +1513,9 @@ bool Csock::SSLClientSetup()
break;
#endif /* OPENSSL_NO_SSL2 */
/* Fall through if SSL2 is disabled */
+#ifdef OPENSSL_NO_SSL3
+ case SSL3:
+#endif
case SSL23:
default:
if( m_iMethod != SSL23 )
@@ -1585,6 +1591,7 @@ SSL_CTX * Csock::SetupServerCTX()
SSL_CTX * pCTX = NULL;
switch( m_iMethod )
{
+#ifndef OPENSSL_NO_SSL3
case SSL3:
pCTX = SSL_CTX_new( SSLv3_server_method() );
if( !pCTX )
@@ -1593,6 +1600,7 @@ SSL_CTX * Csock::SetupServerCTX()
return( NULL );
}
break;
+#endif
case TLS12:
#if defined( TLS1_2_VERSION ) && defined( OPENSSL_VERSION_NUMBER ) && OPENSSL_VERSION_NUMBER >= 0x1000100f
pCTX = SSL_CTX_new( TLSv1_2_server_method() );
@@ -1632,6 +1640,9 @@ SSL_CTX * Csock::SetupServerCTX()
break;
#endif /* OPENSSL_NO_SSL2 */
/* Fall through if SSL2 is disabled */
+#ifndef OPENSSL_NO_SSL3
+ case SSL3:
+#endif
case SSL23:
default:
if( m_iMethod != SSL23 )