diff --git a/security/nss/Makefile b/security/nss/Makefile index a9765778b57..66b77e9fc1f 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -1,16 +1,13 @@ -# $OpenBSD: Makefile,v 1.34 2013/03/11 11:41:26 espie Exp $ +# $OpenBSD: Makefile,v 1.35 2013/03/18 20:38:13 landry Exp $ SHARED_ONLY= Yes COMMENT= libraries to support development of security-enabled apps -VERSION= 3.14.1 -DISTNAME= nss-${VERSION}.with.ckbi.1.93 -WRKDIST = ${WRKDIR}/nss-${VERSION} -PKGNAME = nss-${VERSION} -REVISION = 0 +VERSION= 3.14.2 +DISTNAME = nss-${VERSION} -SO_VERSION= 33.0 +SO_VERSION= 33.1 .for _lib in freebl3 nss3 nssckbi nssdbm3 nssutil3 smime3 softokn3 ssl3 SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor @@ -22,13 +19,13 @@ MAINTAINER= Martynas Venckus # mozilla public license PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c pthread z nspr4 plc4 plds4 sqlite3 #for regular releases MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src/ \ http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src/ LIB_DEPENDS= devel/nspr>=4.9.4 +WANTLIB += c pthread z nspr4 plc4 plds4 sqlite3>=22 MAKE_ENV= BUILD_OPT=1 \ LOCALBASE="${LOCALBASE}" \ diff --git a/security/nss/distinfo b/security/nss/distinfo index 597f1af113c..438bd0504e5 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = 4i/8ymLWBAKRReT5BMWeSpZ6INEnbxI6keduyq5Iupg= -SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393 +SHA256 (nss-3.14.2.tar.gz) = oiaRIJ9MSYmBKTnH44xIod8J9LgOfOTGa2bJpZI1rpU= +SIZE (nss-3.14.2.tar.gz) = 6178419 diff --git a/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c b/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c deleted file mode 100644 index 4f3b075462f..00000000000 --- a/security/nss/patches/patch-mozilla_security_nss_lib_freebl_unix_rand_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-mozilla_security_nss_lib_freebl_unix_rand_c,v 1.11 2012/11/12 20:43:09 landry Exp $ ---- mozilla/security/nss/lib/freebl/unix_rand.c.orig Wed Apr 25 16:49:43 2012 -+++ mozilla/security/nss/lib/freebl/unix_rand.c Thu Nov 8 21:18:24 2012 -@@ -820,7 +820,6 @@ safe_pclose(FILE *fp) - /* Fork netstat to collect its output by default. Do not unset this unless - * another source of entropy is available - */ --#define DO_NETSTAT 1 - - void RNG_SystemInfoForRNG(void) - {