[Midnightbsd-cvs] mports [24527] trunk/security/nss: update to 3.39
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Oct 16 11:03:06 EDT 2018
Revision: 24527
http://svnweb.midnightbsd.org/mports/?rev=24527
Author: laffer1
Date: 2018-10-16 11:02:08 -0400 (Tue, 16 Oct 2018)
Log Message:
-----------
update to 3.39
Modified Paths:
--------------
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/security/nss/files/patch-bug301986
trunk/security/nss/files/patch-const
trunk/security/nss/files/patch-coreconf_FreeBSD.mk
trunk/security/nss/files/patch-coreconf_UNIX.mk
trunk/security/nss/files/patch-coreconf_arch.mk
trunk/security/nss/files/patch-coreconf_command.mk
trunk/security/nss/files/patch-coreconf_ruleset.mk
trunk/security/nss/files/patch-lib-freebl-Makefile
trunk/security/nss/files/patch-lib-freebl-unix_rand.c
trunk/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
trunk/security/nss/files/patch-lib_softoken_pkcs11c.c
trunk/security/nss/files/patch-sysdb
trunk/security/nss/files/patch-tests
trunk/security/nss/pkg-plist
Modified: trunk/security/nss/Makefile
===================================================================
--- trunk/security/nss/Makefile 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/Makefile 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= nss
-PORTVERSION= 3.26
-#DISTVERSIONSUFFIX= -with-ckbi-1.98
+PORTVERSION= 3.39
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@@ -9,8 +8,8 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Libraries to support development of security-enabled applications
-LICENSE= unknown
-#mpl?
+LICENSE= mpl
+LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
nspr>=4.10.8:${PORTSDIR}/devel/nspr \
@@ -41,7 +40,7 @@
EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
-INSTALL_BINS= certcgi certutil cmsutil crlutil derdump makepqg \
+INSTALL_BINS= certutil cmsutil crlutil derdump makepqg \
mangle modutil ocspclnt oidcalc p7content p7env p7sign \
p7verify pk12util rsaperf shlibsign signtool signver \
ssltap strsclnt symkeyutil vfychain vfyserv
@@ -57,6 +56,10 @@
BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ
.endif
+.if ${ARCH} == i386 && ! ${MACHINE_CPU:Msse2}
+USES+= compiler:c++14-lang # gcm.h
+.endif
+
.if ${ARCH} == amd64
USE_BINUTILS= # intel-gcm.s
CC+= -B${LOCALBASE}/bin
Modified: trunk/security/nss/distinfo
===================================================================
--- trunk/security/nss/distinfo 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/distinfo 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470475306
-SHA256 (nss-3.26.tar.gz) = 91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564
-SIZE (nss-3.26.tar.gz) = 7386943
+TIMESTAMP = 1535720153
+SHA256 (nss-3.39.tar.gz) = 6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b
+SIZE (nss-3.39.tar.gz) = 23048561
Modified: trunk/security/nss/files/patch-bug301986
===================================================================
--- trunk/security/nss/files/patch-bug301986 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-bug301986 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,11 +1,11 @@
---- lib/util/nssilckt.h~
+--- lib/util/nssilckt.h.orig 2018-08-31 12:55:53 UTC
+++ lib/util/nssilckt.h
-@@ -195,7 +195,7 @@ typedef enum {
+@@ -163,7 +163,7 @@ typedef enum {
** Declare the trace record
*/
struct pzTrace_s {
-- PRUint32 threadID; /* PR_GetThreadID() */
-+ pthread_t threadID; /* PR_GetThreadID() */
- nssILockOp op; /* operation being performed */
- nssILockType ltype; /* lock type identifier */
- PRIntervalTime callTime; /* time spent in function */
+- PRUint32 threadID; /* PR_GetThreadID() */
++ pthread_t threadID; /* PR_GetThreadID() */
+ nssILockOp op; /* operation being performed */
+ nssILockType ltype; /* lock type identifier */
+ PRIntervalTime callTime; /* time spent in function */
Modified: trunk/security/nss/files/patch-const
===================================================================
--- trunk/security/nss/files/patch-const 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-const 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,17 +1,20 @@
---- cmd/modutil/modutil.h Sun Apr 25 11:02:47 2004
-+++ cmd/modutil/modutil.h Fri Jul 22 17:35:20 2005
-@@ -53,6 +53,6 @@
+--- cmd/modutil/modutil.h.orig 2018-08-31 12:55:53 UTC
++++ cmd/modutil/modutil.h
+@@ -22,8 +22,8 @@
#include "error.h"
+ Error LoadMechanismList(void);
-Error FipsMode(char *arg);
-Error ChkFipsMode(char *arg);
+Error FipsMode(const char *arg);
+Error ChkFipsMode(const char *arg);
Error AddModule(char *moduleName, char *libFile, char *ciphers,
- char *mechanisms, char* modparms);
---- cmd/modutil/pk11.c Sun Apr 25 11:02:47 2004
-+++ cmd/modutil/pk11.c Fri Jul 22 17:36:48 2005
-@@ -53,5 +53,5 @@
+ char *mechanisms, char *modparms);
+ Error DeleteModule(char *moduleName);
+--- cmd/modutil/pk11.c.orig 2018-08-31 12:55:53 UTC
++++ cmd/modutil/pk11.c
+@@ -16,7 +16,7 @@
+ * disable FIPS mode on the internal module.
*/
Error
-FipsMode(char *arg)
@@ -18,6 +21,7 @@
+FipsMode(const char *arg)
{
char *internal_name;
+
@@ -25,16 +25,18 @@ FipsMode(char *arg)
internal_name = PR_smprintf("%s",
SECMOD_GetInternalModule()->commonName);
@@ -39,10 +43,12 @@
PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]);
} else {
PR_fprintf(PR_STDERR, errStrings[FIPS_ALREADY_ON_ERR]);
-@@ -112,5 +114,5 @@
+@@ -75,7 +77,7 @@ FipsMode(char *arg)
+ * If arg=="false", verify FIPS mode is disabled on the internal module.
*/
Error
-ChkFipsMode(char *arg)
+ChkFipsMode(const char *arg)
{
- if(!PORT_Strcasecmp(arg, "true")) {
+ if (!PORT_Strcasecmp(arg, "true")) {
+ if (PK11_IsFIPS()) {
Modified: trunk/security/nss/files/patch-coreconf_FreeBSD.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_FreeBSD.mk 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-coreconf_FreeBSD.mk 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,6 +1,6 @@
---- coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
-+++ coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
-@@ -37,9 +37,9 @@
+--- coreconf/FreeBSD.mk.orig 2018-08-31 12:55:53 UTC
++++ coreconf/FreeBSD.mk
+@@ -5,9 +5,9 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -13,43 +13,38 @@
RANLIB = ranlib
CPU_ARCH = $(OS_TEST)
-@@ -52,6 +52,13 @@ endif
+@@ -20,7 +20,17 @@ endif
ifeq ($(CPU_ARCH),amd64)
CPU_ARCH = x86_64
endif
++ifneq (,$(filter arm%, $(CPU_ARCH)))
++CPU_ARCH = arm
++endif
+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
+CPU_ARCH = ppc
+endif
-+
+
+ifneq (,$(filter %64, $(OS_TEST)))
+USE_64 = 1
+endif
++
+ OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ DSO_CFLAGS = -fPIC
+@@ -46,7 +56,11 @@ else
+ DLL_SUFFIX = so.1.0
+ endif
-@@ -70,15 +85,15 @@
-
- ARCH = freebsd
-
--MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+ifndef MOZILLA_CLIENT
-+DLL_SUFFIX = so.1
-+endif
-
--ifeq ($(MOZ_OBJFORMAT),elf)
--DLL_SUFFIX = so
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
- else
--DLL_SUFFIX = so.1.0
++else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
- endif
--
--MKSHLIB = $(CC) $(DSO_LDOPTS)
++endif
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +100,5 @@
+@@ -55,4 +69,5 @@ PROCESS_MAP_FILE = grep -v ';-' $< | \
G++INCLUDES = -I/usr/include/g++
Modified: trunk/security/nss/files/patch-coreconf_UNIX.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_UNIX.mk 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-coreconf_UNIX.mk 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,6 +1,6 @@
---- coreconf/UNIX.mk~
+--- coreconf/UNIX.mk.orig 2018-08-31 12:55:53 UTC
+++ coreconf/UNIX.mk
-@@ -42,10 +42,8 @@ AR = ar cr $@
+@@ -10,10 +10,8 @@ AR = ar cr $@
LDOPTS += -L$(SOURCE_LIB_DIR)
ifdef BUILD_OPT
Modified: trunk/security/nss/files/patch-coreconf_arch.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_arch.mk 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-coreconf_arch.mk 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,6 +1,6 @@
---- coreconf/arch.mk.orig 2011-03-03 18:13:52.000000000 +0100
-+++ coreconf/arch.mk 2011-03-03 18:14:09.000000000 +0100
-@@ -66,7 +66,7 @@
+--- coreconf/arch.mk.orig 2018-08-31 12:55:53 UTC
++++ coreconf/arch.mk
+@@ -26,7 +26,7 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
# Attempt to differentiate between sparc and x86 Solaris
#
Modified: trunk/security/nss/files/patch-coreconf_command.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_command.mk 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-coreconf_command.mk 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,9 +1,9 @@
---- coreconf/command.mk Mon Oct 10 19:46:12 2005
-+++ coreconf/command.mk Wed Jan 18 17:23:28 2006
+--- coreconf/command.mk.orig 2018-08-31 12:55:53 UTC
++++ coreconf/command.mk
@@ -12,7 +12,7 @@ AS = $(CC)
ASFLAGS += $(CFLAGS)
CCF = $(CC) $(CFLAGS)
- LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS)
+ LINK_DLL = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS)
-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
$(DEFINES) $(INCLUDES) $(XCFLAGS)
Modified: trunk/security/nss/files/patch-coreconf_ruleset.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_ruleset.mk 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-coreconf_ruleset.mk 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,6 +1,6 @@
---- coreconf/ruleset.mk~
+--- coreconf/ruleset.mk.orig 2018-08-31 12:55:53 UTC
+++ coreconf/ruleset.mk
-@@ -85,7 +85,7 @@
+@@ -53,7 +53,7 @@
#
ifndef COMPILER_TAG
Modified: trunk/security/nss/files/patch-lib-freebl-Makefile
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-Makefile 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-lib-freebl-Makefile 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,11 +1,11 @@
---- lib/freebl/Makefile~
+--- lib/freebl/Makefile.orig 2018-08-31 12:55:53 UTC
+++ lib/freebl/Makefile
-@@ -201,7 +201,7 @@ ifeq ($(USE_N32),1)
+@@ -215,7 +215,7 @@ ifeq ($(CPU_ARCH),x86)
endif
- endif
+ endif # Darwin
-ifeq ($(OS_TARGET),Linux)
+ifeq (,$(filter-out Linux MidnightBSD, $(OS_TARGET)))
ifeq ($(CPU_ARCH),x86_64)
ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s
- ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
+ ASFLAGS += -fPIC -Wa,--noexecstack
Modified: trunk/security/nss/files/patch-lib-freebl-unix_rand.c
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-unix_rand.c 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-lib-freebl-unix_rand.c 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,20 +1,20 @@
---- lib/freebl/unix_rand.c.orig 2010-10-30 16:11:44 -0400
-+++ lib/freebl/unix_rand.c 2010-10-30 16:12:40 -0400
-@@ -188,7 +188,7 @@
+--- lib/freebl/unix_rand.c.orig 2018-08-31 08:55:53.000000000 -0400
++++ lib/freebl/unix_rand.c 2018-10-16 10:57:04.926486000 -0400
+@@ -160,7 +160,7 @@
- #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
- || defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) \
-- || defined(NTO) || defined(__riscos__)
-+ || defined(NTO) || defined(MIDNIGHTBSD) || defined(__riscos__)
+ #endif
+
+-#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) || defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) || defined(NTO) || defined(__riscos__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
++#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(MIDNIGHTBSD) || defined(FREEBSD) || defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) || defined(NTO) || defined(__riscos__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
#include <sys/times.h>
- #define getdtablesize() sysconf(_SC_OPEN_MAX)
-@@ -946,7 +946,7 @@
+ static size_t
+@@ -759,7 +759,7 @@
+ for (cp = files; *cp; cp++)
+ RNG_FileForRNG(*cp);
- #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
- || defined(OPENBSD) || defined(DARWIN) || defined(LINUX) \
-- || defined(HPUX)
-+ || defined(HPUX) || defined(MIDNIGHTBSD)
+-#if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DARWIN) || defined(LINUX) || defined(HPUX)
++#if defined(BSDI) || defined(MIDNIGHTBSD) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DARWIN) || defined(LINUX) || defined(HPUX)
if (bytes)
return;
#endif
Modified: trunk/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
===================================================================
--- trunk/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,9 +1,9 @@
---- lib/freebl/mpi/mpcpucache.c.orig 2010-06-11 22:39:33.000000000 +0200
-+++ lib/freebl/mpi/mpcpucache.c 2010-06-11 22:40:20.000000000 +0200
-@@ -733,6 +733,32 @@ s_mpi_getProcessorLineSize()
+--- lib/freebl/mpi/mpcpucache.c.orig 2018-08-31 12:55:53 UTC
++++ lib/freebl/mpi/mpcpucache.c
+@@ -705,6 +705,32 @@ s_mpi_getProcessorLineSize()
#endif
- #if defined(__ppc64__)
+ #if defined(__ppc64__)
+
+#if defined(__MidnightBSD__)
+#include <sys/stddef.h>
@@ -17,7 +17,7 @@
+{
+ static int cacheline_size = 0;
+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-+ int clen;
++ size_t clen;
+
+ if (cacheline_size > 0)
+ return cacheline_size;
@@ -33,7 +33,7 @@
/*
* Sigh, The PPC has some really nice features to help us determine cache
* size, since it had lots of direct control functions to do so. The POWER
-@@ -785,6 +811,7 @@ s_mpi_getProcessorLineSize()
+@@ -758,6 +784,7 @@ s_mpi_getProcessorLineSize()
}
return 0;
}
Modified: trunk/security/nss/files/patch-lib_softoken_pkcs11c.c
===================================================================
--- trunk/security/nss/files/patch-lib_softoken_pkcs11c.c 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-lib_softoken_pkcs11c.c 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,22 +1,22 @@
---- lib/softoken/pkcs11c.c.orig 2010-05-05 14:36:05.000000000 +0000
-+++ lib/softoken/pkcs11c.c 2010-05-05 14:37:25.000000000 +0000
-@@ -4602,9 +4602,6 @@
- break;
+--- lib/softoken/pkcs11c.c.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/pkcs11c.c
+@@ -5772,9 +5772,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
+ break;
case NSSLOWKEYDSAKey:
- keyType = CKK_DSA;
-- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK :
-- CKR_KEY_TYPE_INCONSISTENT;
-- if(crv != CKR_OK) break;
- crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
- sizeof(keyType));
- if(crv != CKR_OK) break;
-@@ -4638,9 +4635,6 @@
- #ifdef NSS_ENABLE_ECC
+ keyType = CKK_DSA;
+- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;
+- if (crv != CKR_OK)
+- break;
+ crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
+ sizeof(keyType));
+ if (crv != CKR_OK)
+@@ -5814,9 +5811,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, SECItem *bpki)
+ /* what about fortezza??? */
case NSSLOWKEYECKey:
- keyType = CKK_EC;
-- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK :
-- CKR_KEY_TYPE_INCONSISTENT;
-- if(crv != CKR_OK) break;
- crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
- sizeof(keyType));
- if(crv != CKR_OK) break;
+ keyType = CKK_EC;
+- crv = (sftk_hasAttribute(key, CKA_NETSCAPE_DB)) ? CKR_OK : CKR_KEY_TYPE_INCONSISTENT;
+- if (crv != CKR_OK)
+- break;
+ crv = sftk_AddAttributeType(key, CKA_KEY_TYPE, &keyType,
+ sizeof(keyType));
+ if (crv != CKR_OK)
Modified: trunk/security/nss/files/patch-sysdb
===================================================================
--- trunk/security/nss/files/patch-sysdb 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-sysdb 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,6 +1,72 @@
---- lib/softoken/legacydb/cdbhdl.h.orig 2009-08-31 12:33:12.000000000 +0200
-+++ lib/softoken/legacydb/cdbhdl.h 2009-08-31 12:33:36.000000000 +0200
-@@ -43,7 +43,8 @@
+--- cmd/platlibs.mk.orig 2018-08-31 12:55:53 UTC
++++ cmd/platlibs.mk
+@@ -29,7 +29,7 @@ endif # BUILD_SUN_PKG
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)
+ else
+-DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
++DBMLIB = $(NULL)
+ endif
+
+ ifeq ($(NSS_BUILD_UTIL_ONLY),1)
+--- lib/certdb/xauthkid.c.orig 2018-08-31 12:55:53 UTC
++++ lib/certdb/xauthkid.c
+@@ -7,7 +7,7 @@
+ *
+ */
+
+-#include "prtypes.h"
++#include <prtypes.h>
+ #include "seccomon.h"
+ #include "secdert.h"
+ #include "secoidt.h"
+--- lib/certdb/xbsconst.c.orig 2018-08-31 12:55:53 UTC
++++ lib/certdb/xbsconst.c
+@@ -6,7 +6,7 @@
+ * X.509 v3 Basic Constraints Extension
+ */
+
+-#include "prtypes.h"
++#include <prtypes.h>
+ #include <limits.h> /* for LONG_MAX */
+ #include "seccomon.h"
+ #include "secdert.h"
+--- lib/certdb/xconst.c.orig 2018-08-31 12:55:53 UTC
++++ lib/certdb/xconst.c
+@@ -6,7 +6,7 @@
+ * X.509 Extension Encoding
+ */
+
+-#include "prtypes.h"
++#include <prtypes.h>
+ #include "seccomon.h"
+ #include "secdert.h"
+ #include "secoidt.h"
+--- lib/ckfw/dbm/ckdbm.h.orig 2018-08-31 12:55:53 UTC
++++ lib/ckfw/dbm/ckdbm.h
+@@ -23,7 +23,7 @@
+ #include "ckt.h"
+ #endif /* CKT_H */
+
+-#include "mcom_db.h"
++#include <db.h>
+
+ NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
+
+--- lib/manifest.mn.orig 2018-08-31 12:55:53 UTC
++++ lib/manifest.mn
+@@ -20,7 +20,7 @@ ifndef NSS_BUILD_UTIL_ONLY
+ SOFTOKEN_SRCDIRS = \
+ $(FREEBL_SRCDIR) \
+ $(SQLITE_SRCDIR) \
+- $(DBM_SRCDIR) \
++ $(NULL) \
+ $(SOFTOKEN_SRCDIR) \
+ $(NULL)
+ ifndef NSS_BUILD_SOFTOKEN_ONLY
+--- lib/softoken/legacydb/cdbhdl.h.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/cdbhdl.h
+@@ -9,7 +9,8 @@
#define _CDBHDL_H_
#include "nspr.h"
@@ -10,12 +76,21 @@
#include "pcertt.h"
#include "prtypes.h"
-
---- lib/softoken/legacydb/dbmshim.c.orig 2009-08-31 10:40:23.000000000 +0200
-+++ lib/softoken/legacydb/dbmshim.c 2009-08-31 10:40:35.000000000 +0200
-@@ -39,7 +39,8 @@
- *
- * $Id: dbmshim.c,v 1.2 2007/06/13 00:24:57 rrelyea%redhat.com Exp $
+--- lib/softoken/legacydb/config.mk.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/config.mk
+@@ -8,7 +8,6 @@ CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX
+
+ EXTRA_LIBS += \
+ $(CRYPTOLIB) \
+- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
+ $(NULL)
+
+ # can't do this in manifest.mn because OS_TARGET isn't defined there.
+--- lib/softoken/legacydb/dbmshim.c.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/dbmshim.c
+@@ -5,7 +5,8 @@
+ /*
+ * Berkeley DB 1.85 Shim code to handle blobs.
*/
-#include "mcom_db.h"
+#include <db.h>
@@ -23,9 +98,9 @@
#include "secitem.h"
#include "nssb64.h"
#include "blapi.h"
---- lib/softoken/legacydb/keydb.c.orig 2009-08-31 10:40:04.000000000 +0200
-+++ lib/softoken/legacydb/keydb.c 2009-08-31 10:40:08.000000000 +0200
-@@ -43,7 +43,6 @@
+--- lib/softoken/legacydb/keydb.c.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/keydb.c
+@@ -9,7 +9,6 @@
#include "blapi.h"
#include "secitem.h"
#include "pcert.h"
@@ -33,9 +108,9 @@
#include "secerr.h"
#include "keydbi.h"
---- lib/softoken/legacydb/keydbi.h.orig 2009-08-31 12:33:17.000000000 +0200
-+++ lib/softoken/legacydb/keydbi.h 2009-08-31 12:34:13.000000000 +0200
-@@ -43,5 +43,5 @@
+--- lib/softoken/legacydb/keydbi.h.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/keydbi.h
+@@ -10,7 +10,7 @@
#include "nspr.h"
#include "seccomon.h"
@@ -44,9 +119,9 @@
/*
* Handle structure for open key databases
---- lib/softoken/legacydb/pcertdb.c.orig 2009-08-31 10:40:52.000000000 +0200
-+++ lib/softoken/legacydb/pcertdb.c 2009-08-31 10:41:26.000000000 +0200
-@@ -41,7 +41,8 @@
+--- lib/softoken/legacydb/pcertdb.c.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/pcertdb.c
+@@ -7,7 +7,8 @@
*/
#include "lowkeyti.h"
#include "pcert.h"
@@ -56,91 +131,15 @@
#include "pcert.h"
#include "secitem.h"
#include "secder.h"
---- lib/softoken/legacydb/pk11db.c.orig 2009-08-31 10:40:57.000000000 +0200
-+++ lib/softoken/legacydb/pk11db.c 2009-08-31 10:41:55.000000000 +0200
-@@ -41,7 +41,8 @@
+--- lib/softoken/legacydb/pk11db.c.orig 2018-08-31 12:55:53 UTC
++++ lib/softoken/legacydb/pk11db.c
+@@ -8,7 +8,8 @@
+ */
- #include "pk11pars.h"
#include "lgdb.h"
-#include "mcom_db.h"
+#include <db.h>
+#include <fcntl.h>
#include "secerr.h"
+ #include "utilpars.h"
- #define FREE_CLEAR(p) if (p) { PORT_Free(p); p = NULL; }
---- lib/ckfw/dbm/ckdbm.h.orig 2009-08-31 10:46:00.000000000 +0200
-+++ lib/ckfw/dbm/ckdbm.h 2009-08-31 10:46:22.000000000 +0200
-@@ -59,7 +59,7 @@
- #include "ckt.h"
- #endif /* CKT_H */
-
--#include "mcom_db.h"
-+#include <db.h>
-
- NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
-
---- lib/softoken/legacydb/config.mk.orig 2009-08-31 12:39:49.000000000 +0200
-+++ lib/softoken/legacydb/config.mk 2009-08-31 12:40:03.000000000 +0200
-@@ -40,7 +40,6 @@
-
- EXTRA_LIBS += \
- $(CRYPTOLIB) \
-- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- $(NULL)
-
- # can't do this in manifest.mn because OS_TARGET isn't defined there.
---- lib/certdb/xauthkid.c.orig 2009-08-31 12:43:13.000000000 +0200
-+++ lib/certdb/xauthkid.c 2009-08-31 12:44:21.000000000 +0200
-@@ -39,7 +39,7 @@
- *
- */
-
--#include "prtypes.h"
-+#include <prtypes.h>
- #include "seccomon.h"
- #include "secdert.h"
- #include "secoidt.h"
---- lib/certdb/xbsconst.c.orig 2009-08-31 12:43:22.000000000 +0200
-+++ lib/certdb/xbsconst.c 2009-08-31 12:44:41.000000000 +0200
-@@ -38,7 +38,7 @@
- * X.509 v3 Basic Constraints Extension
- */
-
--#include "prtypes.h"
-+#include <prtypes.h>
- #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
-+++ lib/certdb/xconst.c 2009-08-31 12:44:50.000000000 +0200
-@@ -38,7 +38,7 @@
- * X.509 Extension Encoding
- */
-
--#include "prtypes.h"
-+#include <prtypes.h>
- #include "seccomon.h"
- #include "secdert.h"
- #include "secoidt.h"
---- lib/manifest.mn~
-+++ lib/manifest.mn
-@@ -20,7 +20,7 @@ DIRS = \
- $(UTIL_SRCDIR) \
- $(FREEBL_SRCDIR) \
- $(SQLITE_SRCDIR) \
-- $(DBM_SRCDIR) \
-+ $(NULL) \
- $(SOFTOKEN_SRCDIR) \
- base dev pki \
- libpkix \
---- cmd/platlibs.mk.orig 2009-08-31 12:57:13.000000000 +0200
-+++ cmd/platlibs.mk 2009-08-31 12:57:29.000000000 +0200
-@@ -85,7 +85,7 @@
- ifdef NSS_DISABLE_DBM
- DBMLIB = $(NULL)
- else
--DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-+DBMLIB = $(NULL)
- endif
-
- ifdef USE_STATIC_LIBS
Modified: trunk/security/nss/files/patch-tests
===================================================================
--- trunk/security/nss/files/patch-tests 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/files/patch-tests 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,10 +1,12 @@
---- tests/common/init.sh Mon Apr 11 22:24:17 2005
-+++ tests/common/init.sh Fri Jul 22 16:55:36 2005
-@@ -197,5 +197,6 @@
- case $HOST in
- *\.*)
+--- tests/common/init.sh.orig 2018-08-31 12:55:53 UTC
++++ tests/common/init.sh
+@@ -366,7 +366,8 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRU
+ if [ -z "${DOMSUF}" ]; then
+ DOMSUF=`echo $HOST | sed -e "s/^[^.]*\.//"`
+ fi
- HOST=`echo $HOST | sed -e "s/\..*//"`
+ DOMSUF=${HOST#*.} # remove Smallest Prefix matching ``*.''
+ HOST=${HOST%%.*} # remove Largest Suffix ``.*''. See sh(1)
;;
?*)
+ ;;
Modified: trunk/security/nss/pkg-plist
===================================================================
--- trunk/security/nss/pkg-plist 2018-10-16 04:07:37 UTC (rev 24526)
+++ trunk/security/nss/pkg-plist 2018-10-16 15:02:08 UTC (rev 24527)
@@ -1,4 +1,3 @@
-bin/certcgi
bin/certutil
bin/cmsutil
bin/crlutil
@@ -23,6 +22,7 @@
bin/symkeyutil
bin/vfychain
bin/vfyserv
+include/nss/nss/sslexp.h
include/nss/nss/base64.h
include/nss/nss/blapit.h
include/nss/nss/cert.h
@@ -38,6 +38,7 @@
include/nss/nss/crmft.h
include/nss/nss/cryptohi.h
include/nss/nss/cryptoht.h
+include/nss/nss/eccutil.h
include/nss/nss/ecl-exp.h
include/nss/nss/hasht.h
include/nss/nss/jar-ds.h
@@ -88,6 +89,7 @@
include/nss/nss/pkcs11p.h
include/nss/nss/pkcs11t.h
include/nss/nss/pkcs11u.h
+include/nss/nss/pkcs11uri.h
include/nss/nss/pkcs12.h
include/nss/nss/pkcs12t.h
include/nss/nss/pkcs7t.h
@@ -123,21 +125,12 @@
include/nss/nss/utilrename.h
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
-lib/nss/libnssckbi.so.1
lib/nss/libnssdbm3.so
-lib/nss/libnssdbm3.so.1
lib/nss/libnssutil3.so
-lib/nss/libnssutil3.so.1
lib/nss/libsmime3.so
-lib/nss/libsmime3.so.1
lib/nss/libsoftokn3.so
-lib/nss/libsoftokn3.so.1
lib/nss/libssl3.so
-lib/nss/libssl3.so.1
libdata/pkgconfig/nss.pc
More information about the Midnightbsd-cvs
mailing list