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

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Wed Nov 27 15:28:45 CET 2013 

Revision: 22589
          http://gar.svn.sourceforge.net/gar/?rev=22589&view=rev
Author:   cgrzemba
Date:     2013-11-27 14:28:43 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
nss/trunk: update version 3.14.4, fix Issue 5119

Modified Paths:
--------------
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/nss/trunk/checksums
    csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
    csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
    csw/mgar/pkg/nss/trunk/files/nss.pc

Added Paths:
-----------
    csw/mgar/pkg/nss/trunk/files/studio_m128i.patch

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2013-11-27 13:36:02 UTC (rev 22588)
+++ csw/mgar/pkg/nss/trunk/Makefile	2013-11-27 14:28:43 UTC (rev 22589)
@@ -25,7 +25,7 @@
 NAME = nss
 MAJOR_VERSION = 3
 MINOR_VERSION = 14
-PATCHLEVEL    = 1
+PATCHLEVEL    = 4
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
 # #VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
 GARTYPE = v2
@@ -47,7 +47,8 @@
 DISTFILES += mpl-tri-license-txt
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-GARCOMPILER = SOS12U3
+# GARCOMPILER = GCC4
+# GARCOMPILER = SOS12U3
 
 PACKAGES += CSWlibnss3
 CATALOGNAME_CSWlibnss3 = libnss3
@@ -58,8 +59,9 @@
 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibnss3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibnss3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibnssckbi
 CATALOGNAME_CSWlibnssckbi = libnssckbi
@@ -69,8 +71,9 @@
 RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibnssckb1 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibnssckb1 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibnssdbm3
 CATALOGNAME_CSWlibnssdbm3 = libnssdbm3
@@ -82,10 +85,11 @@
 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibgcc-s1
 # i368 needs that, sparcs hates that
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += surplus-dependency|CSWlibplc4
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibnssdbm3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibnssdbm3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibnssutil3
 CATALOGNAME_CSWlibnssutil3 = libnssutil3
@@ -95,8 +99,9 @@
 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibnssutil3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibnssutil3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibsmime3
 CATALOGNAME_CSWlibsmime3 = libsmime3
@@ -108,8 +113,9 @@
 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibsmine3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibsmine3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibsoftokn3
 CATALOGNAME_CSWlibsoftokn3 = libsoftokn3
@@ -122,8 +128,9 @@
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnssutil3 
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibsoftokn3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibsoftokn3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibssl3
 CATALOGNAME_CSWlibssl3 = libssl3
@@ -134,8 +141,9 @@
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnssutil3
+RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibssl3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibssl3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibfreebl3
 CATALOGNAME_CSWlibfreebl3 = libfreebl3
@@ -146,9 +154,10 @@
 PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*)
 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3
 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibgcc-s1
 # CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch
+# CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch
 
 PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev
@@ -236,7 +245,7 @@
 endif
 export NSPR_LIB_DIR
 
-# LD_OPTIONS = -z ignore -Bdirect
+# LD_OPTIONS = -z ignore
 ifeq ($(USE_64),1) 
   SQLITE_LIB_DIR = /opt/csw/lib/64
 #   LD_OPTIONS += -R/opt/csw/lib/64/\$$ISALIST
@@ -267,7 +276,7 @@
 # PATCHFILES  = whoami.patch
 
 # Required patches.
-PATCHFILES += include.patch
+# PATCHFILES += include.patch
 # PATCHFILES += ld-options.patch
 PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
 PATCHFILES += 0006-platlibs.mk-linking-bltest.patch
@@ -287,14 +296,14 @@
 	(cd $(WORKSRC)/mozilla/security/coreconf \
 		&& \
 	CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
-	gmake -j1)
+	gmake -j1 NS_USE_GCC=1 NO_MDUPDATE=1)
 	@$(MAKECOOKIE)
 
 build-dbm:
 	(cd $(WORKSRC)/mozilla/security/dbm \
 		&& \
 	CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
-	gmake -j1)
+	gmake -j1 NS_USE_GCC=1 NO_MDUPDATE=1)
 	@$(MAKECOOKIE)
 
 # There's an extra interpolation somehwere inside nss' build system, so $$$$
@@ -303,7 +312,7 @@
 	@echo $(LD_OPTIONS)
 	(cd $(WORKSRC)/mozilla/security/nss \
 		&& env \
-	gmake -j1 BUILD_SUN_PKG=1)
+		&& gmake -j1 BUILD_SUN_PKG=1 NS_USE_GCC=1 NO_MDUPDATE=1)
 	@$(MAKECOOKIE)
 
 install-nss:

Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums	2013-11-27 13:36:02 UTC (rev 22588)
+++ csw/mgar/pkg/nss/trunk/checksums	2013-11-27 14:28:43 UTC (rev 22589)
@@ -1 +1 @@
-f6f3a942d1eba3e26aa0382a5b5461d9  nss-3.14.1.tar.gz
+9042e4447ae690cf6f83c34c25385588  nss-3.14.4.tar.gz

Modified: csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch	2013-11-27 13:36:02 UTC (rev 22588)
+++ csw/mgar/pkg/nss/trunk/files/0005-SunOS5.mk.patch	2013-11-27 14:28:43 UTC (rev 22589)
@@ -5,10 +5,10 @@
  # dependencies in the same directory where it resides.
  ifeq ($(USE_64), 1)
 -RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-+RPATH = -R'/opt/csw/lib/64/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
++RPATH = -R'/opt/csw/lib/64/$$ISALIST' -Wl,-M${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10,-B,direct,-z,ignore
  else
 -RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
-+RPATH = -R'/opt/csw/lib/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
++RPATH = -R'/opt/csw/lib/$$ISALIST' -Wl,-M${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10,-B,direct,-z,ignore
  endif
  else
  RPATH = -R '$$ORIGIN'

Modified: csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch	2013-11-27 13:36:02 UTC (rev 22588)
+++ csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch	2013-11-27 14:28:43 UTC (rev 22589)
@@ -5,10 +5,10 @@
  ifeq ($(OS_ARCH), SunOS) 
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
-+EXTRA_SHARED_LIBS += -R'/opt/csw/lib/64/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
++EXTRA_SHARED_LIBS += -R'/opt/csw/lib/64/$$ISALIST' -Wl,-M${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -Wl,-Bdirect -Wl,-zignore
  else
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
-+EXTRA_SHARED_LIBS += -R'/opt/csw/lib/$$ISALIST' -M ${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z ignore
++EXTRA_SHARED_LIBS += -R'/opt/csw/lib/$$ISALIST' -Wl,-M${HOME}/opencsw/.buildsys/v2/gar/lib/map.solaris10 -Wl,-Bdirect -Wl,-zignore
  endif
  endif
  

Modified: csw/mgar/pkg/nss/trunk/files/nss.pc
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss.pc	2013-11-27 13:36:02 UTC (rev 22588)
+++ csw/mgar/pkg/nss/trunk/files/nss.pc	2013-11-27 14:28:43 UTC (rev 22589)
@@ -5,7 +5,7 @@
 
 Name: NSS
 Description: Network Security Services
-Version: 3.14.1
+Version: 3.14.4
 Requires: nspr >= 4.9.2
 Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir}
 Cflags: -I${includedir}

Added: csw/mgar/pkg/nss/trunk/files/studio_m128i.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/studio_m128i.patch	                        (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/studio_m128i.patch	2013-11-27 14:28:43 UTC (rev 22589)
@@ -0,0 +1,17 @@
+diff --git a/mozilla/security/nss/lib/freebl/intel-gcm-wrap.c b/mozilla/security/nss/lib/freebl/intel-gcm-wrap.c
+index b2f6f5e..6ecebc7 100644
+--- a/mozilla/security/nss/lib/freebl/intel-gcm-wrap.c
++++ b/mozilla/security/nss/lib/freebl/intel-gcm-wrap.c
+@@ -29,6 +29,12 @@
+ #elif defined(__GNUC__)
+ #include <emmintrin.h>
+ #include <tmmintrin.h>
++#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++#include <sys/emmintrin.h>
++__m128i _mm_shuffle_epi8( 
++   __m128i a,
++   __m128i mask
++);
+ #endif
+ 
+ 

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

More information about the devel mailing list