SF.net SVN: gar:[25474] csw/mgar/pkg/nss/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25474
          http://sourceforge.net/p/gar/code/25474
Author:   cgrzemba
Date:     2015-12-18 15:18:07 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
nss/trunk: update version 3.21

Modified Paths:
--------------
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/nss/trunk/checksums
    csw/mgar/pkg/nss/trunk/files/0002-cmd-platlib.mk.patch
    csw/mgar/pkg/nss/trunk/files/nss.pc

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2015-12-18 11:38:57 UTC (rev 25473)
+++ csw/mgar/pkg/nss/trunk/Makefile	2015-12-18 15:18:07 UTC (rev 25474)
@@ -24,10 +24,9 @@
 
 NAME = nss
 MAJOR_VERSION = 3
-MINOR_VERSION = 17
-PATCHLEVEL    = 4
-VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
-# #VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
+MINOR_VERSION = 21
+PATCHLEVEL    = 
+VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL))
 GARTYPE = v2
 
 DESCRIPTION = Network Security Services library
@@ -40,7 +39,7 @@
 endef
 SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/
 # TODO: Generate RTM_NAME from VERSION
-RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_$(PATCHLEVEL)_RTM
+RTM_NAME = NSS_$(subst .,_,$(VERSION))_RTM
 ## RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_RTM
 MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
@@ -59,7 +58,7 @@
 # PATCHFILES += 0006-platlibs.mk-linking-bltest.patch
 # PATCHFILES += 0006-config.mk-linking.patch
 # PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch
-PATCHFILES += 0001-softtoken-config.mk.patch
+# PATCHFILES += 0001-softtoken-config.mk.patch
 PATCHFILES += 0002-cmd-platlib.mk.patch
 PATCHFILES += 0003-sysinit-config.mk.patch
 PATCHFILES += 0005-SunOS5.mk.patch
@@ -212,7 +211,7 @@
 CHECKPKG_OVERRIDES_CSWnss3-tools += surplus-dependency|CSWlibfreebl3
 CHECKPKG_OVERRIDES_CSWnss3-tools += surplus-dependency|CSWlibnssdbm3
 CHECKPKG_OVERRIDES_CSWnss3-tools += surplus-dependency|CSWlibsoftokn3
-OBSOLETED_BY_CSWnss3-tools = CSWlibnss3-tools
+# OBSOLETED_BY_CSWnss3-tools = CSWlibnss3-tools
 
 BUILD_DEP_PKGS += CSWnspr-dev
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
@@ -303,11 +302,14 @@
 TEST_SCRIPTS =
 include gar/category.mk
 
+# Google Test require g++ 
+GTESTS = $(if $(filter SOS%,$(GARCOMPILER)), NSS_DISABLE_GTESTS=1)
+
 # build-nss: build-coreconf build-dbm build-nss-compile
 build-nss: 
 	(cd $(WORKSRC)/nss \
          CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
-        && env && gmake all prefix=$(prefix) BUILD_SUN_PKG=1 $(GARCOMP_FLAGS_$(GARCOMPILER)) NO_MDUPDATE=1)
+        && env && gmake all prefix=$(prefix) BUILD_SUN_PKG=1 $(GARCOMP_FLAGS_$(GARCOMPILER)) NO_MDUPDATE=1 $(GTESTS) )
 	@$(MAKECOOKIE)
 
 build-coreconf:

Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums	2015-12-18 11:38:57 UTC (rev 25473)
+++ csw/mgar/pkg/nss/trunk/checksums	2015-12-18 15:18:07 UTC (rev 25474)
@@ -1 +1 @@
-a77df26072cabf8afb26911b6fa9b755  nss-3.17.4.tar.gz
+3c8b2ed880dd3a8d86c9e0151afe6eba  nss-3.21.tar.gz

Modified: csw/mgar/pkg/nss/trunk/files/0002-cmd-platlib.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0002-cmd-platlib.mk.patch	2015-12-18 11:38:57 UTC (rev 25473)
+++ csw/mgar/pkg/nss/trunk/files/0002-cmd-platlib.mk.patch	2015-12-18 15:18:07 UTC (rev 25474)
@@ -21,11 +21,14 @@
  
  ifeq ($(OS_ARCH), Linux)
  ifeq ($(USE_64), 1)
+ 
+--- a/nss/cmd/platlibs.mk
++++ b/nss/cmd/platlibs.mk
 @@ -135,14 +135,14 @@ endif
  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
  # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
  EXTRA_SHARED_LIBS += \
--	-L$(DIST)/lib \
+-	-L$(SQLITE_LIB_DIR) \
 -	-l$(SQLITE_LIB_NAME) \
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
@@ -33,7 +36,7 @@
  	-lplc4 \
  	-lplds4 \
  	-lnspr4 \
-+	-L$(prefix)/lib \
++	-L$(SQLITE_LIB_DIR) \
 +	-l$(SQLITE_LIB_NAME) \
  	$(NULL)
  endif

Modified: csw/mgar/pkg/nss/trunk/files/nss.pc
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss.pc	2015-12-18 11:38:57 UTC (rev 25473)
+++ csw/mgar/pkg/nss/trunk/files/nss.pc	2015-12-18 15:18:07 UTC (rev 25474)
@@ -5,7 +5,7 @@
 
 Name: NSS
 Description: Network Security Services
-Version: 3.17.4
-Requires: nspr >= 4.10.7
+Version: 3.21
+Requires: nspr >= 4.10.10
 Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir}
 Cflags: -I${includedir}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.