Index: head/security/nss/Makefile =================================================================== --- head/security/nss/Makefile (revision 410035) +++ head/security/nss/Makefile (revision 410036) @@ -1,102 +1,102 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.22.2 +PORTVERSION= 3.23 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ nspr>=4.12:${PORTSDIR}/devel/nspr \ sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss 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" \ FREEBL_LOWHASH=1 \ NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc SUB_LIST= PORTVERSION=${PORTVERSION} DIST= ${WRKSRC:H}/dist EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite 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 OPTIONS_DEFINE= DEBUG .include .if ! ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= BUILD_OPT=1 BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ .else BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CC+= -B${LOCALBASE}/bin .endif check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ LD_LIBRARY_PATH="${BINS}/lib" \ ${MAKE_ENV} \ ./all.sh @if ${GREP} -Fh '>Failed<' \ ${WRKSRC:H}/tests_results/security/*/results.html; then \ echo "Some tests have failed. Let ${MAINTAINER} know."; \ exit 1; \ else \ echo "All tests succeeded. Good news."; \ fi post-patch: @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"||' ${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \ ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \; ${INSTALL_LIB} ${BINS}/lib/*.so.1 \ ${STAGEDIR}${PREFIX}/lib/nss ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${STAGEDIR}${PREFIX}/lib/nss .for bin in ${INSTALL_BINS} ${INSTALL_PROGRAM} ${BINS}/bin/${bin} \ ${STAGEDIR}${PREFIX}/bin .endfor cd ${BINS}/lib && \ ${TAR} -cf - *.so | ${TAR} --unlink -C ${STAGEDIR}${PREFIX}/lib/nss -xf - ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: head/security/nss/distinfo =================================================================== --- head/security/nss/distinfo (revision 410035) +++ head/security/nss/distinfo (revision 410036) @@ -1,2 +1,2 @@ -SHA256 (nss-3.22.2.tar.gz) = 07d49287c527ac31200f02dcf8494cef19e936d8ed470802749c4dfc782d3650 -SIZE (nss-3.22.2.tar.gz) = 6982164 +SHA256 (nss-3.23.tar.gz) = 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf +SIZE (nss-3.23.tar.gz) = 7467001 Index: head/security/nss/files/patch-bug1226179 =================================================================== --- head/security/nss/files/patch-bug1226179 (revision 410035) +++ head/security/nss/files/patch-bug1226179 (nonexistent) @@ -1,156 +0,0 @@ -# HG changeset patch -# User Martin Thomson -# Date 1451888957 -39600 -# Mon Jan 04 17:29:17 2016 +1100 -# Node ID 7b4febd4ad04d5ffe8858a342f23cff58928ce10 -# Parent afa3eeff3ca6fed718fb29324368a026fbe8ffd8 -Bug 1226179 - Using -Werror on all unix platforms, r?gaston - -diff --git a/coreconf/Darwin.mk b/coreconf/Darwin.mk ---- coreconf/Darwin.mk -+++ coreconf/Darwin.mk -@@ -77,17 +77,17 @@ endif - # The meaning of a common is ambiguous. It may be a true definition: - # int x = 0; - # or it may be a declaration of a symbol defined in another file: - # extern int x; - # Use the -fno-common option to force all commons to become true - # definitions so that the linker can catch multiply-defined symbols. - # Also, common symbols are not allowed with Darwin dynamic libraries. - --OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(WARNING_CFLAGS) -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS) -+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS) - - ifdef BUILD_OPT - ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE)) - OPTIMIZER = -Oz - else - OPTIMIZER = -O2 - endif - ifdef MOZ_DEBUG_SYMBOLS -diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk ---- coreconf/Linux.mk -+++ coreconf/Linux.mk -@@ -1,15 +1,14 @@ - # - # 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 --include $(CORE_DEPTH)/coreconf/Werror.mk - - # - # The default implementation strategy for Linux is now pthreads - # - ifneq ($(OS_TARGET),Android) - USE_PTHREADS = 1 - endif - -@@ -135,17 +134,17 @@ endif - ifndef COMPILER_TAG - COMPILER_TAG := _$(CC_NAME) - endif - - ifeq ($(USE_PTHREADS),1) - OS_PTHREAD = -lpthread - endif - --OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) $(WARNING_CFLAGS) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR -+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR - OS_LIBS = $(OS_PTHREAD) -ldl -lc - - ifdef USE_PTHREADS - DEFINES += -D_REENTRANT - endif - - ARCH = linux - -diff --git a/coreconf/UNIX.mk b/coreconf/UNIX.mk ---- coreconf/UNIX.mk -+++ coreconf/UNIX.mk -@@ -57,8 +57,10 @@ else - INSTALL = $(NSINSTALL) - INSTALL += -R - endif - endif - - define MAKE_OBJDIR - if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi - endef -+ -+include $(CORE_DEPTH)/coreconf/Werror.mk -diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk ---- coreconf/WIN32.mk -+++ coreconf/WIN32.mk -@@ -118,24 +118,24 @@ ifdef NS_USE_GCC - OPTIMIZER += -g - NULLSTRING := - SPACE := $(NULLSTRING) # end of the line - USERNAME := $(subst $(SPACE),_,$(USERNAME)) - USERNAME := $(subst -,_,$(USERNAME)) - DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) - endif - else # !NS_USE_GCC -- OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ -- -D_CRT_NONSTDC_NO_WARNINGS -+ WARNING_CFLAGS = -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ -+ -D_CRT_NONSTDC_NO_WARNINGS - OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS - ifndef NSS_ENABLE_WERROR - NSS_ENABLE_WERROR = 1 - endif - ifeq ($(NSS_ENABLE_WERROR),1) -- OS_CFLAGS += -WX -+ WARNING_CFLAGS += -WX - endif - ifeq ($(_MSC_VER),$(_MSC_VER_6)) - ifndef MOZ_DEBUG_SYMBOLS - OS_DLLFLAGS += -PDB:NONE - endif - endif - ifdef USE_DYNAMICBASE - OS_DLLFLAGS += -DYNAMICBASE -diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk ---- coreconf/Werror.mk -+++ coreconf/Werror.mk -@@ -1,14 +1,14 @@ - # - # 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/. - --# This sets warning flags for unix-like operating systems. -+# This sets WARNING_CFLAGS for unix-like operating systems. - - ifndef CC_NAME - CC_NAME := $(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q') - export CC_NAME - endif - - ifndef WARNING_CFLAGS - # This tests to see if enabling the warning is possible before -diff --git a/coreconf/command.mk b/coreconf/command.mk ---- coreconf/command.mk -+++ coreconf/command.mk -@@ -7,18 +7,18 @@ - # Master "Core Components" default command macros; # - # can be overridden in .mk # - ####################################################################### - - AS = $(CC) - ASFLAGS += $(CFLAGS) - CCF = $(CC) $(CFLAGS) - LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS) --CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ -- $(XCFLAGS) -+CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \ -+ $(DEFINES) $(INCLUDES) $(XCFLAGS) - PERL = perl - RANLIB = echo - TAR = /bin/tar - # - # For purify - # - NOMD_CFLAGS += $(OPTIMIZER) $(NOMD_OS_CFLAGS) $(XP_DEFINE) $(DEFINES) \ - $(INCLUDES) $(XCFLAGS) Property changes on: head/security/nss/files/patch-bug1226179 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/nss/files/patch-bug1250891 =================================================================== --- head/security/nss/files/patch-bug1250891 (revision 410035) +++ head/security/nss/files/patch-bug1250891 (revision 410036) @@ -1,38 +1,95 @@ -# Drop poisonous -ansi from default *BSD flags - diff --git a/coreconf/FreeBSD.mk b/coreconf/FreeBSD.mk --- coreconf/FreeBSD.mk +++ coreconf/FreeBSD.mk @@ -21,7 +21,7 @@ ifeq ($(CPU_ARCH),amd64) CPU_ARCH = x86_64 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 $@) diff --git a/coreconf/NetBSD.mk b/coreconf/NetBSD.mk --- coreconf/NetBSD.mk +++ coreconf/NetBSD.mk @@ -26,7 +26,7 @@ else DLL_SUFFIX = so.1.0 endif -OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK +OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK OS_LIBS = -lcompat diff --git a/coreconf/OpenBSD.mk b/coreconf/OpenBSD.mk --- coreconf/OpenBSD.mk +++ coreconf/OpenBSD.mk @@ -26,7 +26,7 @@ endif DLL_SUFFIX = so.1.0 -OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD +OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DOPENBSD OS_LIBS = +diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk +--- coreconf/Werror.mk ++++ coreconf/Werror.mk +@@ -5,6 +5,12 @@ + + # This sets WARNING_CFLAGS for gcc-like compilers. + ++ifndef CC_IS_CLANG ++ CC_IS_CLANG := $(and $(findstring clang, $(shell $(CC) --version 2>&1)), 1) ++ # Export CC_IS_CLANG to save a shell invocation when recursing. ++ export CC_IS_CLANG ++endif ++ + ifndef CC_IS_GCC + CC_IS_GCC := $(shell $(CC) -x c -E -Wall -Werror /dev/null >/dev/null 2>&1 && echo 1) + # Export CC_IS_GCC to save a shell invocation when recursing. +@@ -38,7 +44,7 @@ ifndef WARNING_CFLAGS + disable_warning = $(shell $(CC) -x c -E -Werror -W$(1) /dev/null >/dev/null 2>&1 && echo -Wno-$(1)) + + WARNING_CFLAGS = -Wall +- ifeq ($(CC_NAME),clang) ++ ifdef CC_IS_CLANG + # -Qunused-arguments : clang objects to arguments that it doesn't understand + # and fixing this would require rearchitecture + WARNING_CFLAGS += -Qunused-arguments +@@ -62,10 +68,10 @@ ifndef WARNING_CFLAGS + NSS_ENABLE_WERROR = 0 + $(warning OS_TARGET is Android, disabling -Werror) + else +- ifeq ($(CC_NAME),clang) ++ ifdef CC_IS_CLANG + # Clang reports its version as an older gcc, but it's OK + NSS_ENABLE_WERROR = 1 +- else ifeq ($(CC_NAME),gcc) ++ else ifdef CC_IS_GCC + ifneq (,$(filter 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) + NSS_ENABLE_WERROR = 1 + endif +diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +--- lib/freebl/Makefile ++++ lib/freebl/Makefile +@@ -484,7 +484,7 @@ endif + + # poly1305-donna-x64-sse2-incremental-source.c requires __int128 support + # in GCC 4.6.0. +-ifeq ($(CC_NAME),clang) ++ifdef CC_IS_CLANG + HAVE_INT128_SUPPORT = 1 + else ifeq (1,$(CC_IS_GCC)) + ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) +@@ -697,7 +697,7 @@ ifdef INTEL_GCM + # 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,$(shell $(AS) --version))) ++ifdef CC_IS_CLANG + $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as + endif + endif