Date: Sun, 13 Dec 2015 03:59:14 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403651 - in head/security/nss_compat_ossl: . files Message-ID: <201512130359.tBD3xE8N077732@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Dec 13 03:59:14 2015 New Revision: 403651 URL: https://svnweb.freebsd.org/changeset/ports/403651 Log: - Add LICENSE_FILE - Pet portlint - Regenerate patches with `make makepatch` Modified: head/security/nss_compat_ossl/Makefile head/security/nss_compat_ossl/files/patch-src_ssl.c Modified: head/security/nss_compat_ossl/Makefile ============================================================================== --- head/security/nss_compat_ossl/Makefile Sun Dec 13 03:59:14 2015 (r403650) +++ head/security/nss_compat_ossl/Makefile Sun Dec 13 03:59:14 2015 (r403651) @@ -1,20 +1,22 @@ # $FreeBSD$ + PORTNAME= nss_compat_ossl PORTVERSION= 0.9.6 -MASTER_SITES= http://rcritten.fedorapeople.org/ CATEGORIES= security devel +MASTER_SITES= http://rcritten.fedorapeople.org/ MAINTAINER= ports@FreeBSD.org COMMENT= Source-level compatibility library for OpenSSL to NSS porting LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \ + libnss3.so:${PORTSDIR}/security/nss GNU_CONFIGURE= yes USES= pkgconfig libtool INSTALL_TARGET= install-strip USE_LDCONFIG= yes -LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \ - libnss3.so:${PORTSDIR}/security/nss - .include <bsd.port.mk> Modified: head/security/nss_compat_ossl/files/patch-src_ssl.c ============================================================================== --- head/security/nss_compat_ossl/files/patch-src_ssl.c Sun Dec 13 03:59:14 2015 (r403650) +++ head/security/nss_compat_ossl/files/patch-src_ssl.c Sun Dec 13 03:59:14 2015 (r403651) @@ -1,13 +1,16 @@ Index: src/ssl.c =================================================================== ---- src/ssl.c (revision 76) -+++ src/ssl.c (working copy) -@@ -1754,12 +1754,13 @@ +--- src/ssl.c.orig 2010-01-05 20:54:55 UTC ++++ src/ssl.c +@@ -1754,11 +1754,12 @@ SSL_METHOD *create_context(PRBool ssl2, if (SSL_OptionSet(s, SSL_HANDSHAKE_AS_SERVER, server) != SECSuccess) goto error; - if (SSL_OptionSet(s, SSL_ENABLE_SSL2, ssl2) != SECSuccess) - goto error; +- +- if (SSL_OptionSet(s, SSL_V2_COMPATIBLE_HELLO, ssl2) != SECSuccess) +- goto error; + /* Don't fail if enabling SSL2 options doesn't succeed as it may + * be disabled in NSS. So just ignore the return value from + * SSL_OptionSet(). @@ -15,9 +18,5 @@ Index: src/ssl.c + SSL_OptionSet(s, SSL_ENABLE_SSL2, ssl2); + SSL_OptionSet(s, SSL_V2_COMPATIBLE_HELLO, ssl2); -- if (SSL_OptionSet(s, SSL_V2_COMPATIBLE_HELLO, ssl2) != SECSuccess) -- goto error; -- if (SSL_OptionSet(s, SSL_ENABLE_SSL3, ssl3) != SECSuccess) goto error; -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512130359.tBD3xE8N077732>