From owner-svn-ports-all@freebsd.org Sun Dec 13 03:59:15 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA022A414C1; Sun, 13 Dec 2015 03:59:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E41A1C69; Sun, 13 Dec 2015 03:59:15 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBD3xEr9077734; Sun, 13 Dec 2015 03:59:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBD3xE8N077732; Sun, 13 Dec 2015 03:59:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512130359.tBD3xE8N077732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 13 Dec 2015 03:59:14 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2015 03:59:15 -0000 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 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; -