[Midnightbsd-cvs] mports [21686] trunk/security/nss: nss 3.26
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 16 00:19:32 EDT 2016
Revision: 21686
http://svnweb.midnightbsd.org/mports/?rev=21686
Author: laffer1
Date: 2016-08-16 00:19:31 -0400 (Tue, 16 Aug 2016)
Log Message:
-----------
nss 3.26
Modified Paths:
--------------
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/security/nss/files/patch-const
trunk/security/nss/files/patch-coreconf_MidnightBSD.mk
trunk/security/nss/files/patch-coreconf_command.mk
trunk/security/nss/files/patch-sysdb
trunk/security/nss/pkg-plist
Modified: trunk/security/nss/Makefile
===================================================================
--- trunk/security/nss/Makefile 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/Makefile 2016-08-16 04:19:31 UTC (rev 21686)
@@ -1,9 +1,8 @@
# $MidnightBSD$
PORTNAME= nss
-PORTVERSION= 3.20.2
-PORTREVISION= 1
-#DISTVERSIONSUFFIX= .with-ckbi-1.98
+PORTVERSION= 3.26
+#DISTVERSIONSUFFIX= -with-ckbi-1.98
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@@ -30,6 +29,8 @@
USE_PERL5= build
MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \
SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \
+ FREEBL_LOWHASH=1 \
+ NSS_DISABLE_GTESTS=1 \
NSS_USE_SYSTEM_SQLITE=1
CFLAGS+= -I${LOCALBASE}/include/nspr
@@ -40,7 +41,7 @@
EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
-INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \
+INSTALL_BINS= certcgi certutil cmsutil crlutil derdump makepqg \
mangle modutil ocspclnt oidcalc p7content p7env p7sign \
p7verify pk12util rsaperf shlibsign signtool signver \
ssltap strsclnt symkeyutil vfychain vfyserv
@@ -58,7 +59,7 @@
.if ${ARCH} == amd64
USE_BINUTILS= # intel-gcm.s
-CFLAGS+= -B${LOCALBASE}/bin
+CC+= -B${LOCALBASE}/bin
.endif
check regression-test test:
Modified: trunk/security/nss/distinfo
===================================================================
--- trunk/security/nss/distinfo 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/distinfo 2016-08-16 04:19:31 UTC (rev 21686)
@@ -1,2 +1,3 @@
-SHA256 (nss-3.20.2.tar.gz) = 141a3a59d57fbcd00b669bcaa4ccd2fd632a9306e2fb4623e89eed0a2e93f286
-SIZE (nss-3.20.2.tar.gz) = 6959455
+TIMESTAMP = 1470475306
+SHA256 (nss-3.26.tar.gz) = 91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564
+SIZE (nss-3.26.tar.gz) = 7386943
Modified: trunk/security/nss/files/patch-const
===================================================================
--- trunk/security/nss/files/patch-const 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/files/patch-const 2016-08-16 04:19:31 UTC (rev 21686)
@@ -18,25 +18,27 @@
+FipsMode(const char *arg)
{
char *internal_name;
-@@ -62,14 +62,16 @@
- SECMOD_GetInternalModule()->commonName);
- if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) {
-- PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError()));
-+ PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name);
- PR_smprintf_free(internal_name);
- PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
- return FIPS_SWITCH_FAILED_ERR;
- }
-- PR_smprintf_free(internal_name);
- if (!PK11_IsFIPS()) {
-+ PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name);
-+ PR_smprintf_free(internal_name);
- PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
- return FIPS_SWITCH_FAILED_ERR;
- }
-+ PR_smprintf_free(internal_name);
- PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]);
- } else {
+@@ -25,16 +25,18 @@ FipsMode(char *arg)
+ internal_name = PR_smprintf("%s",
+ SECMOD_GetInternalModule()->commonName);
+ if (SECMOD_DeleteInternalModule(internal_name) != SECSuccess) {
+- PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError()));
++ PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name);
+ PR_smprintf_free(internal_name);
+ PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
+ return FIPS_SWITCH_FAILED_ERR;
+ }
+- PR_smprintf_free(internal_name);
+ if (!PK11_IsFIPS()) {
++ PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name);
++ PR_smprintf_free(internal_name);
+ PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
+ return FIPS_SWITCH_FAILED_ERR;
+ }
++ PR_smprintf_free(internal_name);
+ PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]);
+ } else {
+ PR_fprintf(PR_STDERR, errStrings[FIPS_ALREADY_ON_ERR]);
@@ -112,5 +114,5 @@
*/
Error
Modified: trunk/security/nss/files/patch-coreconf_MidnightBSD.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_MidnightBSD.mk 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/files/patch-coreconf_MidnightBSD.mk 2016-08-16 04:19:31 UTC (rev 21686)
@@ -31,7 +31,7 @@
+USE_64 = 1
+endif
+
-+OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+DSO_CFLAGS = -fPIC
+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
Modified: trunk/security/nss/files/patch-coreconf_command.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_command.mk 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/files/patch-coreconf_command.mk 2016-08-16 04:19:31 UTC (rev 21686)
@@ -1,9 +1,11 @@
--- coreconf/command.mk Mon Oct 10 19:46:12 2005
+++ coreconf/command.mk Wed Jan 18 17:23:28 2006
-@@ -46,5 +46,5 @@
- LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- $(XCFLAGS)
+@@ -12,7 +12,7 @@ AS = $(CC)
+ ASFLAGS += $(CFLAGS)
+ CCF = $(CC) $(CFLAGS)
+ LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS)
+-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
++CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
+ $(DEFINES) $(INCLUDES) $(XCFLAGS)
+ PERL = perl
RANLIB = echo
Modified: trunk/security/nss/files/patch-sysdb
===================================================================
--- trunk/security/nss/files/patch-sysdb 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/files/patch-sysdb 2016-08-16 04:19:31 UTC (rev 21686)
@@ -108,7 +108,7 @@
-#include "prtypes.h"
+#include <prtypes.h>
- #include <limits.h> /* for LONG_MAX */
+ #include <limits.h> /* for LONG_MAX */
#include "seccomon.h"
#include "secdert.h"
--- lib/certdb/xconst.c.orig 2009-08-31 12:43:46.000000000 +0200
Modified: trunk/security/nss/pkg-plist
===================================================================
--- trunk/security/nss/pkg-plist 2016-08-16 04:12:07 UTC (rev 21685)
+++ trunk/security/nss/pkg-plist 2016-08-16 04:19:31 UTC (rev 21686)
@@ -1,6 +1,5 @@
bin/certcgi
bin/certutil
-bin/checkcert
bin/cmsutil
bin/crlutil
bin/derdump
@@ -48,6 +47,8 @@
include/nss/nss/keyhi.h
include/nss/nss/keyt.h
include/nss/nss/keythi.h
+include/nss/nss/lowkeyi.h
+include/nss/nss/lowkeyti.h
include/nss/nss/nss.h
include/nss/nss/nssb64.h
include/nss/nss/nssb64t.h
@@ -66,6 +67,7 @@
include/nss/nss/nssilckt.h
include/nss/nss/nssilock.h
include/nss/nss/nsslocks.h
+include/nss/nss/nsslowhash.h
include/nss/nss/nssrwlk.h
include/nss/nss/nssrwlkt.h
include/nss/nss/nssutil.h
@@ -122,6 +124,8 @@
lib/nss/libcrmf.a
lib/nss/libfreebl3.so
lib/nss/libfreebl3.so.1
+lib/nss/libfreeblpriv3.so
+lib/nss/libfreeblpriv3.so.1
lib/nss/libnss3.so
lib/nss/libnss3.so.1
lib/nss/libnssckbi.so
More information about the Midnightbsd-cvs
mailing list