[Midnightbsd-cvs] mports [25065] trunk/security/nss: update nss to 3.40

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 16 11:22:45 EST 2019 

Revision: 25065
          http://svnweb.midnightbsd.org/mports/?rev=25065
Author:   laffer1
Date:     2019-02-16 11:22:45 -0500 (Sat, 16 Feb 2019)
Log Message:
-----------
update nss to 3.40

Modified Paths:
--------------
    trunk/security/nss/Makefile
    trunk/security/nss/distinfo
    trunk/security/nss/files/patch-coreconf_MidnightBSD.mk
    trunk/security/nss/files/patch-coreconf_arch.mk
    trunk/security/nss/files/patch-lib-freebl-Makefile

Added Paths:
-----------
    trunk/security/nss/files/patch-coreconf-nsinstall_pathsub.c
    trunk/security/nss/files/patch-lib-freebl-config.mk
    trunk/security/nss/files/patch-lib-freebl-verified-kremlib.h
    trunk/security/nss/files/patch-lib-ssl-config.mk

Removed Paths:
-------------
    trunk/security/nss/files/patch-coreconf_rules.mk
    trunk/security/nss/files/patch-tests

Modified: trunk/security/nss/Makefile
===================================================================
--- trunk/security/nss/Makefile	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/Makefile	2019-02-16 16:22:45 UTC (rev 25065)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.39
+PORTVERSION=	3.40
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 
@@ -11,12 +11,12 @@
 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.10.8:devel/nspr \
+		sqlite3>=3.7.15:databases/sqlite3
+LIB_DEPENDS=	libnspr4.so:devel/nspr \
+		libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	sqlite3>=3.7.15:databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
 
@@ -32,6 +32,7 @@
 		NSS_DISABLE_GTESTS=1 \
 		NSS_USE_SYSTEM_SQLITE=1
 CFLAGS+=	-I${LOCALBASE}/include/nspr
+#CONFIGURE_TARGET=	${ARCH}-portbld-freebsd10.4
 
 SUB_FILES=	nss-config nss.pc
 SUB_LIST=	PORTVERSION=${PORTVERSION}

Modified: trunk/security/nss/distinfo
===================================================================
--- trunk/security/nss/distinfo	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/distinfo	2019-02-16 16:22:45 UTC (rev 25065)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535720153
-SHA256 (nss-3.39.tar.gz) = 6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b
-SIZE (nss-3.39.tar.gz) = 23048561
+TIMESTAMP = 1539662145
+SHA256 (nss-3.40.tar.gz) = 0562087b8bda072bf5964f8acf851f9c0997a59c384f4887cb517b3b628b32dd
+SIZE (nss-3.40.tar.gz) = 23308315

Added: trunk/security/nss/files/patch-coreconf-nsinstall_pathsub.c
===================================================================
--- trunk/security/nss/files/patch-coreconf-nsinstall_pathsub.c	                        (rev 0)
+++ trunk/security/nss/files/patch-coreconf-nsinstall_pathsub.c	2019-02-16 16:22:45 UTC (rev 25065)
@@ -0,0 +1,11 @@
+--- coreconf/nsinstall/pathsub.c.bak	2018-10-15 23:55:45.000000000 -0400
++++ coreconf/nsinstall/pathsub.c	2019-02-15 20:17:46.856310000 -0500
+@@ -5,7 +5,7 @@
+ /*
+ ** Pathname subroutines.
+ */
+-#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN)
++#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN) || defined(MIDNIGHTBSD)
+ #include <sys/types.h>
+ #endif /* FREEBSD */
+ #include <dirent.h>


Property changes on: trunk/security/nss/files/patch-coreconf-nsinstall_pathsub.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/security/nss/files/patch-coreconf_MidnightBSD.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_MidnightBSD.mk	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/files/patch-coreconf_MidnightBSD.mk	2019-02-16 16:22:45 UTC (rev 25065)
@@ -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 @@
+--- /dev/null	2019-02-15 20:11:00.000000000 -0500
++++ coreconf/MidnightBSD.mk	2019-02-15 20:13:51.391126000 -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
@@ -31,7 +34,7 @@
 +USE_64			= 1
 +endif
 +
-+OS_CFLAGS		= $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++OS_CFLAGS		= $(DSO_CFLAGS) -Wall -Wno-switch -DMIDNIGHTBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 +
 +DSO_CFLAGS		= -fPIC
 +DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
@@ -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_arch.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_arch.mk	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/files/patch-coreconf_arch.mk	2019-02-16 16:22:45 UTC (rev 25065)
@@ -1,6 +1,6 @@
---- coreconf/arch.mk.orig	2018-08-31 12:55:53 UTC
-+++ coreconf/arch.mk
-@@ -26,7 +26,7 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
+--- coreconf/arch.mk.orig	2018-10-15 23:55:45.000000000 -0400
++++ coreconf/arch.mk	2018-11-23 16:07:09.150320000 -0500
+@@ -26,7 +26,7 @@
  # Attempt to differentiate between sparc and x86 Solaris
  #
  
@@ -9,3 +9,12 @@
  ifeq ($(OS_TEST),i86pc)
      OS_RELEASE := $(shell uname -r)_$(OS_TEST)
  else
+@@ -106,7 +106,7 @@
+ # IRIX 6.5-ALPHA-1289139620.
+ #
+ 
+-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
++ifeq (,$(filter-out Linux FreeBSD MidnightBSD IRIX,$(OS_ARCH)))
+     OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
+ endif
+ 

Deleted: trunk/security/nss/files/patch-coreconf_rules.mk
===================================================================
--- trunk/security/nss/files/patch-coreconf_rules.mk	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/files/patch-coreconf_rules.mk	2019-02-16 16:22:45 UTC (rev 25065)
@@ -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	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/files/patch-lib-freebl-Makefile	2019-02-16 16:22:45 UTC (rev 25065)
@@ -1,6 +1,6 @@
---- lib/freebl/Makefile.orig	2018-08-31 12:55:53 UTC
-+++ lib/freebl/Makefile
-@@ -215,7 +215,7 @@ ifeq ($(CPU_ARCH),x86)
+--- lib/freebl/Makefile.orig	2018-10-15 23:55:45.000000000 -0400
++++ lib/freebl/Makefile	2018-11-23 15:56:14.883416000 -0500
+@@ -215,7 +215,7 @@
  endif
  endif # Darwin
  
@@ -9,3 +9,12 @@
  ifeq ($(CPU_ARCH),x86_64)
      ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
      ASFLAGS += -fPIC -Wa,--noexecstack
+@@ -298,7 +298,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 Linux MidnightBSD NetBSD OpenBSD, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 

Added: trunk/security/nss/files/patch-lib-freebl-config.mk
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-config.mk	                        (rev 0)
+++ trunk/security/nss/files/patch-lib-freebl-config.mk	2019-02-16 16:22:45 UTC (rev 25065)
@@ -0,0 +1,11 @@
+--- lib/freebl/config.mk.orig	2018-11-23 15:58:51.366450000 -0500
++++ lib/freebl/config.mk	2018-11-23 15:59:15.036996000 -0500
+@@ -90,7 +90,7 @@
+ endif
+ endif
+ 
+-ifeq (,$(filter-out DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
++ifeq (,$(filter-out DragonFly FreeBSD Linux MidnightBSD NetBSD OpenBSD, $(OS_TARGET)))
+ CFLAGS += -std=gnu99
+ endif
+ 


Property changes on: trunk/security/nss/files/patch-lib-freebl-config.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/nss/files/patch-lib-freebl-verified-kremlib.h
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-verified-kremlib.h	                        (rev 0)
+++ trunk/security/nss/files/patch-lib-freebl-verified-kremlib.h	2019-02-16 16:22:45 UTC (rev 25065)
@@ -0,0 +1,11 @@
+--- lib/freebl/verified/kremlib.h.bak	2018-10-15 23:55:45.000000000 -0400
++++ lib/freebl/verified/kremlib.h	2018-11-23 16:05:25.187442000 -0500
+@@ -222,7 +222,7 @@
+ #define be32toh(x) BE_32(x)
+ 
+ /* ... for the BSDs */
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__MidnightBSD__)
+ #include <sys/endian.h>
+ #elif defined(__OpenBSD__)
+ #include <endian.h>


Property changes on: trunk/security/nss/files/patch-lib-freebl-verified-kremlib.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/nss/files/patch-lib-ssl-config.mk
===================================================================
--- trunk/security/nss/files/patch-lib-ssl-config.mk	                        (rev 0)
+++ trunk/security/nss/files/patch-lib-ssl-config.mk	2019-02-16 16:22:45 UTC (rev 25065)
@@ -0,0 +1,10 @@
+--- lib/ssl/config.mk.orig	2018-11-23 15:54:20.341828000 -0500
++++ lib/ssl/config.mk	2018-11-23 15:54:37.116478000 -0500
+@@ -61,6 +61,6 @@
+ DEFINES += -DNSS_DISABLE_TLS_1_3
+ endif
+ 
+-ifeq (,$(filter-out DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
++ifeq (,$(filter-out DragonFly FreeBSD Linux MidnightBSD NetBSD OpenBSD, $(OS_TARGET)))
+ CFLAGS += -std=gnu99
+ endif


Property changes on: trunk/security/nss/files/patch-lib-ssl-config.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/security/nss/files/patch-tests
===================================================================
--- trunk/security/nss/files/patch-tests	2019-02-16 02:58:54 UTC (rev 25064)
+++ trunk/security/nss/files/patch-tests	2019-02-16 16:22:45 UTC (rev 25065)
@@ -1,12 +0,0 @@
---- 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)
-             ;;
-         ?*)
-             ;;

More information about the Midnightbsd-cvs mailing list