[Midnightbsd-cvs] mports [22961] trunk/security/nss: force gcc 6 for now.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 24 13:39:26 EST 2017 

Revision: 22961
          http://svnweb.midnightbsd.org/mports/?rev=22961
Author:   laffer1
Date:     2017-11-24 13:39:26 -0500 (Fri, 24 Nov 2017)
Log Message:
-----------
force gcc 6 for now. Older versions fail to compile.

Modified Paths:
--------------
    trunk/security/nss/Makefile
    trunk/security/nss/distinfo
    trunk/security/nss/files/patch-bug301986
    trunk/security/nss/files/patch-coreconf_FreeBSD.mk
    trunk/security/nss/files/patch-coreconf_MidnightBSD.mk
    trunk/security/nss/files/patch-coreconf_command.mk
    trunk/security/nss/files/patch-lib-freebl-Makefile
    trunk/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
    trunk/security/nss/files/patch-lib_softoken_pkcs11c.c
    trunk/security/nss/pkg-plist

Removed Paths:
-------------
    trunk/security/nss/files/patch-coreconf_rules.mk
    trunk/security/nss/files/patch-lib-freebl-unix_rand.c

Modified: trunk/security/nss/Makefile
===================================================================
--- trunk/security/nss/Makefile	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/Makefile	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.26
+PORTVERSION=	3.34
 #DISTVERSIONSUFFIX=	-with-ckbi-1.98
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@@ -9,18 +9,18 @@
 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 \
-		sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	zip:archivers/zip \
+		nspr>=4.12:devel/nspr \
+		sqlite3>=3.7.15:databases/sqlite3
+LIB_DEPENDS=	libnspr4.so:devel/nspr \
+		libsqlite3.so:databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
 
+USE_GCC=6
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/nss
 USES=		cpe gmake perl5
@@ -57,6 +57,10 @@
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
+.if ${ARCH} == i386
+USES+=	compiler:c++14-lang # gcm.h
+.endif
+
 .if ${ARCH} == amd64
 USE_BINUTILS=	# intel-gcm.s
 CC+=	-B${LOCALBASE}/bin
@@ -91,7 +95,7 @@
 	    	-exec ${INSTALL_DATA} {} ${PREFIX}/include/nss/nss \;
 	${LN} -sf ${DIST}/${OPSYS}${OSREL}-RELEASE_OPT.OBJ ${BINS}
 	${LN} -sf ${DIST}/${OPSYS}${OSREL}-CURRENT_OPT.OBJ ${BINS}
-	${INSTALL_DATA} ${BINS}/lib/*.so.1 \
+	${INSTALL_DATA} ${BINS}/lib/*.so \
 		${PREFIX}/lib/nss
 	${INSTALL_DATA} ${BINS}/lib/libcrmf.a \
 	    	${PREFIX}/lib/nss

Modified: trunk/security/nss/distinfo
===================================================================
--- trunk/security/nss/distinfo	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/distinfo	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470475306
-SHA256 (nss-3.26.tar.gz) = 91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564
-SIZE (nss-3.26.tar.gz) = 7386943
+TIMESTAMP = 1510646485
+SHA256 (nss-3.34.tar.gz) = 0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5
+SIZE (nss-3.34.tar.gz) = 9586315

Modified: trunk/security/nss/files/patch-bug301986
===================================================================
--- trunk/security/nss/files/patch-bug301986	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-bug301986	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,11 +1,11 @@
 --- lib/util/nssilckt.h~
 +++ 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-coreconf_FreeBSD.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_FreeBSD.mk	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-coreconf_FreeBSD.mk	2017-11-24 18:39:26 UTC (rev 22961)
@@ -13,10 +13,13 @@
  RANLIB			= ranlib
  
  CPU_ARCH		= $(OS_TEST)
-@@ -52,6 +52,13 @@ endif
+@@ -52,6 +52,16 @@ 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
@@ -27,25 +30,16 @@
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
  
-@@ -70,15 +85,15 @@
+@@ -46,7 +56,11 @@ else
+ DLL_SUFFIX		= so.1.0
+ endif
  
- 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

Modified: trunk/security/nss/files/patch-coreconf_MidnightBSD.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_MidnightBSD.mk	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-coreconf_MidnightBSD.mk	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,6 +1,6 @@
---- /dev/null	2013-07-15 22:04:14.000000000 -0400
-+++ coreconf/MidnightBSD.mk	2013-07-15 22:06:54.000000000 -0400
-@@ -0,0 +1,66 @@
+--- coreconf/MidnightBSD.mk.orig	2017-11-24 13:20:03.920401712 -0500
++++ coreconf/MidnightBSD.mk	2017-11-24 13:21:22.882714831 -0500
+@@ -0,0 +1,73 @@
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,6 +23,9 @@
 +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
@@ -48,8 +51,12 @@
 +
 +ARCH			= midnightbsd
 +
-+ifndef MOZILLA_CLIENT
-+DLL_SUFFIX		= so.1
++MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX		= so
++else
++DLL_SUFFIX		= so.1.0
 +endif
 +
 +ifneq (,$(filter alpha ia64,$(OS_TEST)))

Modified: trunk/security/nss/files/patch-coreconf_command.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_command.mk	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-coreconf_command.mk	2017-11-24 18:39:26 UTC (rev 22961)
@@ -3,7 +3,7 @@
 @@ -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)

Deleted: trunk/security/nss/files/patch-coreconf_rules.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_rules.mk	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-coreconf_rules.mk	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,12 +0,0 @@
---- coreconf/rules.mk.orig	Sat Jan  6 00:48:54 2007
-+++ coreconf/rules.mk	Fri Mar 23 10:15:46 2007
-@@ -114,6 +114,9 @@
- endif
- ifdef SHARED_LIBRARY
- 	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+ifndef MOZILLA_CLIENT
-+	ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
-+endif
- ifdef MOZ_DEBUG_SYMBOLS
- ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
- 	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)

Modified: trunk/security/nss/files/patch-lib-freebl-Makefile
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-Makefile	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-lib-freebl-Makefile	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,11 +1,20 @@
---- lib/freebl/Makefile~
-+++ lib/freebl/Makefile
-@@ -201,7 +201,7 @@ ifeq ($(USE_N32),1)
+--- lib/freebl/Makefile.orig	2017-09-20 02:47:27.000000000 -0400
++++ lib/freebl/Makefile	2017-11-24 13:04:18.948060981 -0500
+@@ -213,7 +213,7 @@
  endif
- endif
+ endif # Darwin
  
 -ifeq ($(OS_TARGET),Linux)
-+ifeq (,$(filter-out Linux MidnightBSD, $(OS_TARGET)))
++ifeq (,$(filter-out Linux FreeBSD 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
+@@ -296,7 +296,7 @@
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS FreeBSD MidnightBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 

Deleted: trunk/security/nss/files/patch-lib-freebl-unix_rand.c
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-unix_rand.c	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-lib-freebl-unix_rand.c	2017-11-24 18:39:26 UTC (rev 22961)
@@ -1,20 +0,0 @@
---- 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 @@
- 
- #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__)
- #include <sys/times.h>
- 
- #define getdtablesize() sysconf(_SC_OPEN_MAX)
-@@ -946,7 +946,7 @@
- 
- #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
-     || defined(OPENBSD) || defined(DARWIN) || defined(LINUX) \
--    || defined(HPUX)
-+    || defined(HPUX) || defined(MIDNIGHTBSD)
-     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	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c	2017-11-24 18:39:26 UTC (rev 22961)
@@ -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()
+@@ -705,6 +705,32 @@ s_mpi_getProcessorLineSize()
  #endif
  
- #if defined(__ppc64__) 
+ #if defined(__ppc64__)
 +
 +#if defined(__MidnightBSD__)
 +#include <sys/stddef.h>
@@ -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	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/files/patch-lib_softoken_pkcs11c.c	2017-11-24 18:39:26 UTC (rev 22961)
@@ -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;
+@@ -5679,9 +5679,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S
+             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)
+@@ -5722,9 +5719,6 @@ sftk_unwrapPrivateKey(SFTKObject *key, S
+ #ifndef NSS_DISABLE_ECC
          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/pkg-plist
===================================================================
--- trunk/security/nss/pkg-plist	2017-11-24 16:53:36 UTC (rev 22960)
+++ trunk/security/nss/pkg-plist	2017-11-24 18:39:26 UTC (rev 22961)
@@ -23,6 +23,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 +39,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 +90,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 +126,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