[Midnightbsd-cvs] mports [19080] trunk/security/nss: nss 3.19
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 23 15:07:46 EDT 2015
Revision: 19080
http://svnweb.midnightbsd.org/mports/?rev=19080
Author: laffer1
Date: 2015-05-23 15:07:45 -0400 (Sat, 23 May 2015)
Log Message:
-----------
nss 3.19
Modified Paths:
--------------
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/security/nss/files/nss-config.in
trunk/security/nss/files/patch-sysdb
trunk/security/nss/pkg-plist
Added Paths:
-----------
trunk/security/nss/files/patch-coreconf_FreeBSD.mk
trunk/security/nss/files/patch-coreconf_MidnightBSD.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_config.mk
trunk/security/nss/files/patch-coreconf_rules.mk
trunk/security/nss/files/patch-coreconf_ruleset.mk
Removed Paths:
-------------
trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
trunk/security/nss/files/patch-..::coreconf::MidnightBSD.mk
trunk/security/nss/files/patch-..::coreconf::UNIX.mk
trunk/security/nss/files/patch-..::coreconf::command.mk
trunk/security/nss/files/patch-..::coreconf::config.mk
trunk/security/nss/files/patch-..::coreconf::rules.mk
trunk/security/nss/files/patch-..::coreconf::ruleset.mk
trunk/security/nss/files/patch-.._coreconf_arch.mk
trunk/security/nss/files/patch-Makefile
trunk/security/nss/files/patch-bug856300
trunk/security/nss/files/patch-lib-freebl-drbg.c
trunk/security/nss/files/patch-lib_softoken_manifest.mn
Modified: trunk/security/nss/Makefile
===================================================================
--- trunk/security/nss/Makefile 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/Makefile 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,10 +1,10 @@
# $MidnightBSD$
PORTNAME= nss
-PORTVERSION= 3.14.3
+PORTVERSION= 3.19
PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
+MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
MAINTAINER= ports at MidnightBSD.org
COMMENT= Libraries to support development of security-enabled applications
@@ -11,30 +11,29 @@
LICENSE= unknown
#mpl?
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ nspr>=4.10.5:${PORTSDIR}/devel/nspr
+LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= ${PREFIX}/lib/nss
-USE_GMAKE= yes
-USE_PERL5_BUILD=yes
+USES= cpe gmake perl5
+CPE_VENDOR= mozilla
+CPE_PRODUCT= network_security_services
+USE_PERL5= build
MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \
SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \
- NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1
-ALL_TARGET= nss_build_all
+ NSS_USE_SYSTEM_SQLITE=1
CFLAGS+= -I${LOCALBASE}/include/nspr
SUB_FILES= nss-config nss.pc
-SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \
- PORTVERSION=${PORTVERSION}
+SUB_LIST= PORTVERSION=${PORTVERSION}
-DIST= ${WRKSRC:H:H}/dist
+DIST= ${WRKSRC:H}/dist
-EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
- ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,}
+EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite
INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \
mangle modutil ocspclnt oidcalc p7content p7env p7sign \
@@ -41,7 +40,11 @@
p7verify pk12util rsaperf shlibsign signtool signver \
ssltap strsclnt symkeyutil vfychain vfyserv
-.if !defined(WITH_DEBUG)
+OPTIONS_DEFINE= DEBUG
+
+.include <bsd.mport.options.mk>
+
+.if ! ${PORT_OPTIONS:MDEBUG}
MAKE_ENV+= BUILD_OPT=1
BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ
.else
@@ -48,8 +51,6 @@
BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ
.endif
-.include <bsd.port.pre.mk>
-
.if ${ARCH} == amd64
USE_BINUTILS= # intel-gcm.s
CFLAGS+= -B${LOCALBASE}/bin
@@ -61,8 +62,8 @@
LD_LIBRARY_PATH="${BINS}/lib" \
${MAKE_ENV} \
./all.sh
- @if ${GREP} -F '>Failed<' \
- ${WRKSRC:H:H}/tests_results/security/*/results.html; then \
+ @if ${GREP} -Fh '>Failed<' \
+ ${WRKSRC:H}/tests_results/security/*/results.html; then \
echo "Some tests have failed. Let ${MAINTAINER} know."; \
exit 1; \
else \
@@ -97,4 +98,4 @@
${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/security/nss/distinfo
===================================================================
--- trunk/security/nss/distinfo 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/distinfo 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0
-SIZE (nss-3.14.3.tar.gz) = 6189790
+SHA256 (nss-3.19.tar.gz) = 989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b
+SIZE (nss-3.19.tar.gz) = 6951461
Modified: trunk/security/nss/files/nss-config.in
===================================================================
--- trunk/security/nss/files/nss-config.in 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/nss-config.in 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,6 +1,7 @@
#!/bin/sh
prefix=%%PREFIX%%
+version=%%PORTVERSION%%
usage()
{
@@ -64,7 +65,11 @@
echo_libdir=yes
;;
--version)
- echo %%PORTVERSION%%
+ case $version in
+ *.*.*) echo $version ;;
+ *.*) echo $version.0 ;;
+ *) echo $version.0.0 ;;
+ esac
;;
--cflags)
echo_cflags=yes
@@ -125,16 +130,16 @@
if test "$echo_libs" = "yes"; then
libdirs="-L$libdir"
if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl%%MAJOR_VERSION%%"
+ libdirs="$libdirs -lssl3"
fi
if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime%%MAJOR_VERSION%%"
+ libdirs="$libdirs -lsmime3"
fi
if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss%%MAJOR_VERSION%%"
+ libdirs="$libdirs -lnss3"
fi
if test -n "$lib_nssutil"; then
- libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%"
+ libdirs="$libdirs -lnssutil3"
fi
echo $libdirs
fi
Deleted: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,58 +0,0 @@
---- ../../security/coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200
-+++ ../../security/coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200
-@@ -37,9 +37,9 @@
-
- include $(CORE_DEPTH)/coreconf/UNIX.mk
-
--DEFAULT_COMPILER = gcc
--CC = gcc
--CCC = g++
-+DEFAULT_COMPILER = $(CC)
-+CC ?= gcc
-+CCC = $(CXX)
- RANLIB = ranlib
-
- CPU_ARCH = $(OS_TEST)
-@@ -52,6 +52,13 @@ endif
- ifeq ($(CPU_ARCH),amd64)
- CPU_ARCH = x86_64
- endif
-+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
-+CPU_ARCH = ppc
-+endif
-+
-+ifneq (,$(filter %64, $(OS_TEST)))
-+USE_64 = 1
-+endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -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
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
- else
--DLL_SUFFIX = so.1.0
-+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
- endif
--
--MKSHLIB = $(CC) $(DSO_LDOPTS)
- ifdef MAPFILE
- MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -87,4 +100,5 @@
-
- G++INCLUDES = -I/usr/include/g++
-
--INCLUDES += -I/usr/X11R6/include
-+USE_SYSTEM_ZLIB = 1
-+ZLIB_LIBS = -lz
Deleted: trunk/security/nss/files/patch-..::coreconf::MidnightBSD.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::MidnightBSD.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::MidnightBSD.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,69 +0,0 @@
---- /dev/null 2013-07-15 22:04:14.000000000 -0400
-+++ ../../security/coreconf/MidnightBSD.mk 2013-07-15 22:06:54.000000000 -0400
-@@ -0,0 +1,66 @@
-+#
-+# 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
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+include $(CORE_DEPTH)/coreconf/UNIX.mk
-+
-+DEFAULT_COMPILER = $(CC)
-+CC ?= gcc
-+CCC = $(CXX)
-+RANLIB = ranlib
-+
-+CPU_ARCH = $(OS_TEST)
-+ifeq ($(CPU_ARCH),i386)
-+CPU_ARCH = x86
-+endif
-+ifeq ($(CPU_ARCH),pc98)
-+CPU_ARCH = x86
-+endif
-+ifeq ($(CPU_ARCH),amd64)
-+CPU_ARCH = x86_64
-+endif
-+ifneq (,$(filter powerpc%, $(CPU_ARCH)))
-+CPU_ARCH = ppc
-+endif
-+
-+ifneq (,$(filter %64, $(OS_TEST)))
-+USE_64 = 1
-+endif
-+
-+OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+#
-+# The default implementation strategy for MidnightBSD is pthreads.
-+#
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS = 1
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS += -pthread
-+DSO_LDOPTS += -pthread
-+endif
-+
-+ARCH = midnightbsd
-+
-+ifndef MOZILLA_CLIENT
-+DLL_SUFFIX = so.1
-+endif
-+
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
-+else
-+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
-+endif
-+ifdef MAPFILE
-+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
-+G++INCLUDES = -I/usr/include/g++
-+
-+USE_SYSTEM_ZLIB = 1
-+ZLIB_LIBS = -lz
Deleted: trunk/security/nss/files/patch-..::coreconf::UNIX.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::UNIX.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::UNIX.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,13 +0,0 @@
---- ../coreconf/UNIX.mk~
-+++ ../coreconf/UNIX.mk
-@@ -42,10 +42,8 @@ AR = ar cr $@
- LDOPTS += -L$(SOURCE_LIB_DIR)
-
- ifdef BUILD_OPT
-- OPTIMIZER += -O
- DEFINES += -UDEBUG -DNDEBUG
- else
-- OPTIMIZER += -g
- USERNAME := $(shell whoami)
- USERNAME := $(subst -,_,$(USERNAME))
- DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)
Deleted: trunk/security/nss/files/patch-..::coreconf::command.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::command.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::command.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,9 +0,0 @@
---- ../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)
- RANLIB = echo
Deleted: trunk/security/nss/files/patch-..::coreconf::config.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::config.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::config.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,11 +0,0 @@
---- ../../security/coreconf/config.mk.orig 2013-07-15 21:55:47.000000000 -0400
-+++ ../../security/coreconf/config.mk 2013-07-15 21:56:08.000000000 -0400
-@@ -30,7 +30,7 @@
- # one for each OS release. #
- #######################################################################
-
--TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
-+TARGET_OSES = MidnightBSD FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
- AIX RISCOS WINNT WIN95 Linux Android
-
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
Deleted: trunk/security/nss/files/patch-..::coreconf::rules.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::rules.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::rules.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -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)
Deleted: trunk/security/nss/files/patch-..::coreconf::ruleset.mk
===================================================================
--- trunk/security/nss/files/patch-..::coreconf::ruleset.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-..::coreconf::ruleset.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,11 +0,0 @@
---- ../coreconf/ruleset.mk~
-+++ ../coreconf/ruleset.mk
-@@ -85,7 +85,7 @@
- #
-
- ifndef COMPILER_TAG
-- ifneq ($(DEFAULT_COMPILER), $(notdir $(firstword $(CC))))
-+ ifneq ($(DEFAULT_COMPILER), $(CC))
- #
- # Temporary define for the Client; to be removed when binary release is used
- #
Deleted: trunk/security/nss/files/patch-.._coreconf_arch.mk
===================================================================
--- trunk/security/nss/files/patch-.._coreconf_arch.mk 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-.._coreconf_arch.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,11 +0,0 @@
---- ../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 @@
- # Attempt to differentiate between sparc and x86 Solaris
- #
-
--OS_TEST := $(shell uname -m)
-+OS_TEST := $(shell uname -p)
- ifeq ($(OS_TEST),i86pc)
- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
- else
Deleted: trunk/security/nss/files/patch-Makefile
===================================================================
--- trunk/security/nss/files/patch-Makefile 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-Makefile 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,11 +0,0 @@
---- Makefile.orig Thu Apr 14 20:28:40 2005
-+++ Makefile Tue Aug 30 15:32:11 2005
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf all
-
- build_coreconf:
- cd $(CORE_DEPTH)/coreconf ; $(MAKE)
Deleted: trunk/security/nss/files/patch-bug856300
===================================================================
--- trunk/security/nss/files/patch-bug856300 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-bug856300 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,11 +0,0 @@
---- lib/freebl/Makefile~
-+++ lib/freebl/Makefile
-@@ -659,7 +659,7 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(
- # symbolic names to registers, for example,
- # .set Htbl, %rdi
- # So we can't use Clang's integrated assembler with intel-gcm.s.
--ifneq (,$(findstring clang,$(AS)))
-+ifneq (,$(findstring clang,$(shell $(AS) -v 2>&1)))
- $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as
- endif
- endif
Copied: trunk/security/nss/files/patch-coreconf_FreeBSD.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_FreeBSD.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_FreeBSD.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,58 @@
+--- 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 @@
+
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+-DEFAULT_COMPILER = gcc
+-CC = gcc
+-CCC = g++
++DEFAULT_COMPILER = $(CC)
++CC ?= gcc
++CCC = $(CXX)
+ RANLIB = ranlib
+
+ CPU_ARCH = $(OS_TEST)
+@@ -52,6 +52,13 @@ endif
+ ifeq ($(CPU_ARCH),amd64)
+ CPU_ARCH = x86_64
+ endif
++ifneq (,$(filter powerpc%, $(CPU_ARCH)))
++CPU_ARCH = ppc
++endif
++
++ifneq (,$(filter %64, $(OS_TEST)))
++USE_64 = 1
++endif
+
+ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+@@ -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
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
+ else
+-DLL_SUFFIX = so.1.0
++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+ endif
+-
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+ ifdef MAPFILE
+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+@@ -87,4 +100,5 @@
+
+ G++INCLUDES = -I/usr/include/g++
+
+-INCLUDES += -I/usr/X11R6/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
Copied: trunk/security/nss/files/patch-coreconf_MidnightBSD.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::MidnightBSD.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_MidnightBSD.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_MidnightBSD.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,69 @@
+--- /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 @@
++#
++# 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
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER = $(CC)
++CC ?= gcc
++CCC = $(CXX)
++RANLIB = ranlib
++
++CPU_ARCH = $(OS_TEST)
++ifeq ($(CPU_ARCH),i386)
++CPU_ARCH = x86
++endif
++ifeq ($(CPU_ARCH),pc98)
++CPU_ARCH = x86
++endif
++ifeq ($(CPU_ARCH),amd64)
++CPU_ARCH = x86_64
++endif
++ifneq (,$(filter powerpc%, $(CPU_ARCH)))
++CPU_ARCH = ppc
++endif
++
++ifneq (,$(filter %64, $(OS_TEST)))
++USE_64 = 1
++endif
++
++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS = -fPIC
++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++
++#
++# The default implementation strategy for MidnightBSD is pthreads.
++#
++ifndef CLASSIC_NSPR
++USE_PTHREADS = 1
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS += -pthread
++DSO_LDOPTS += -pthread
++endif
++
++ARCH = midnightbsd
++
++ifndef MOZILLA_CLIENT
++DLL_SUFFIX = so.1
++endif
++
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
++else
++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
++endif
++ifdef MAPFILE
++ MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++
++G++INCLUDES = -I/usr/include/g++
++
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
Copied: trunk/security/nss/files/patch-coreconf_UNIX.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::UNIX.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_UNIX.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_UNIX.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,13 @@
+--- coreconf/UNIX.mk~
++++ coreconf/UNIX.mk
+@@ -42,10 +42,8 @@ AR = ar cr $@
+ LDOPTS += -L$(SOURCE_LIB_DIR)
+
+ ifdef BUILD_OPT
+- OPTIMIZER += -O
+ DEFINES += -UDEBUG -DNDEBUG
+ else
+- OPTIMIZER += -g
+ USERNAME := $(shell whoami)
+ USERNAME := $(subst -,_,$(USERNAME))
+ DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)
Copied: trunk/security/nss/files/patch-coreconf_arch.mk (from rev 19060, trunk/security/nss/files/patch-.._coreconf_arch.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_arch.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_arch.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,11 @@
+--- 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 @@
+ # Attempt to differentiate between sparc and x86 Solaris
+ #
+
+-OS_TEST := $(shell uname -m)
++OS_TEST := $(shell uname -p)
+ ifeq ($(OS_TEST),i86pc)
+ OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+ else
Copied: trunk/security/nss/files/patch-coreconf_command.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::command.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_command.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_command.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,9 @@
+--- 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)
+ RANLIB = echo
Copied: trunk/security/nss/files/patch-coreconf_config.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::config.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_config.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_config.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,11 @@
+--- coreconf/config.mk.orig 2013-07-15 21:55:47.000000000 -0400
++++ coreconf/config.mk 2013-07-15 21:56:08.000000000 -0400
+@@ -30,7 +30,7 @@
+ # one for each OS release. #
+ #######################################################################
+
+-TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
++TARGET_OSES = MidnightBSD FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+ AIX RISCOS WINNT WIN95 Linux Android
+
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
Copied: trunk/security/nss/files/patch-coreconf_rules.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::rules.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_rules.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_rules.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,12 @@
+--- 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)
Copied: trunk/security/nss/files/patch-coreconf_ruleset.mk (from rev 19060, trunk/security/nss/files/patch-..::coreconf::ruleset.mk)
===================================================================
--- trunk/security/nss/files/patch-coreconf_ruleset.mk (rev 0)
+++ trunk/security/nss/files/patch-coreconf_ruleset.mk 2015-05-23 19:07:45 UTC (rev 19080)
@@ -0,0 +1,11 @@
+--- coreconf/ruleset.mk~
++++ coreconf/ruleset.mk
+@@ -85,7 +85,7 @@
+ #
+
+ ifndef COMPILER_TAG
+- ifneq ($(DEFAULT_COMPILER), $(notdir $(firstword $(CC))))
++ ifneq ($(DEFAULT_COMPILER), $(CC))
+ #
+ # Temporary define for the Client; to be removed when binary release is used
+ #
Deleted: trunk/security/nss/files/patch-lib-freebl-drbg.c
===================================================================
--- trunk/security/nss/files/patch-lib-freebl-drbg.c 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-lib-freebl-drbg.c 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,11 +0,0 @@
---- lib/freebl/drbg.c.orig 2010-10-30 16:25:53 -0400
-+++ lib/freebl/drbg.c 2010-10-30 16:26:35 -0400
-@@ -512,8 +512,6 @@
- if (bytes > PRNG_MAX_ADDITIONAL_BYTES) {
- bytes = PRNG_MAX_ADDITIONAL_BYTES;
- }
--#else
-- PR_STATIC_ASSERT(sizeof(size_t) <= 4);
- #endif
-
- PZ_Lock(globalrng->lock);
Deleted: trunk/security/nss/files/patch-lib_softoken_manifest.mn
===================================================================
--- trunk/security/nss/files/patch-lib_softoken_manifest.mn 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-lib_softoken_manifest.mn 2015-05-23 19:07:45 UTC (rev 19080)
@@ -1,13 +0,0 @@
---- lib/softoken/manifest.mn.orig 2010-07-30 04:33:26.000000000 +0200
-+++ lib/softoken/manifest.mn 2010-10-17 12:01:04.000000000 +0200
-@@ -47,9 +47,7 @@
-
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
-
--ifdef SQLITE_INCLUDE_DIR
--INCLUDES += -I$(SQLITE_INCLUDE_DIR)
--endif
-+INCLUDES += -I$(LOCALBASE)/include
-
- EXPORTS = \
- secmodt.h \
Modified: trunk/security/nss/files/patch-sysdb
===================================================================
--- trunk/security/nss/files/patch-sysdb 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/files/patch-sysdb 2015-05-23 19:07:45 UTC (rev 19080)
@@ -15,7 +15,7 @@
+++ lib/softoken/legacydb/dbmshim.c 2009-08-31 10:40:35.000000000 +0200
@@ -39,7 +39,8 @@
*
- * $Id: patch-sysdb,v 1.3 2013-07-16 02:24:05 laffer1 Exp $
+ * $Id: dbmshim.c,v 1.2 2007/06/13 00:24:57 rrelyea%redhat.com Exp $
*/
-#include "mcom_db.h"
+#include <db.h>
@@ -122,6 +122,17 @@
#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 @@
Modified: trunk/security/nss/pkg-plist
===================================================================
--- trunk/security/nss/pkg-plist 2015-05-23 18:29:38 UTC (rev 19079)
+++ trunk/security/nss/pkg-plist 2015-05-23 19:07:45 UTC (rev 19080)
@@ -80,6 +80,7 @@
include/nss/nss/pk11pub.h
include/nss/nss/pk11sdr.h
include/nss/nss/pkcs11.h
+include/nss/nss/pkcs1sig.h
include/nss/nss/pkcs11f.h
include/nss/nss/pkcs11n.h
include/nss/nss/pkcs11p.h
@@ -136,6 +137,3 @@
lib/nss/libssl3.so
lib/nss/libssl3.so.1
libdata/pkgconfig/nss.pc
- at dirrm lib/nss
- at dirrm include/nss/nss
- at dirrm include/nss
More information about the Midnightbsd-cvs
mailing list