[csw-devel] SF.net SVN: gar:[19645] csw/mgar/pkg/nss/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Sun Nov 11 10:36:22 CET 2012
Revision: 19645
http://gar.svn.sourceforge.net/gar/?rev=19645&view=rev
Author: cgrzemba
Date: 2012-11-11 09:36:22 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
nss/trunk: bump version
Modified Paths:
--------------
csw/mgar/pkg/nss/trunk/Makefile
csw/mgar/pkg/nss/trunk/checksums
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/0006-config.mk-linking.patch
csw/mgar/pkg/nss/trunk/files/0006-platlibs.mk-linking-bltest.patch
Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile 2012-11-11 09:34:55 UTC (rev 19644)
+++ csw/mgar/pkg/nss/trunk/Makefile 2012-11-11 09:36:22 UTC (rev 19645)
@@ -24,9 +24,10 @@
NAME = nss
MAJOR_VERSION = 3
-MINOR_VERSION = 13
-PATCHLEVEL = 6
-VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
+MINOR_VERSION = 14
+## PATCHLEVEL = 6
+## VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
+VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
GARTYPE = v2
DESCRIPTION = Network Security Services library
define BLURB
@@ -38,7 +39,8 @@
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_$(MAJOR_VERSION)_$(MINOR_VERSION)_$(PATCHLEVEL)_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
DISTFILES += mpl-tri-license-txt
@@ -139,9 +141,10 @@
PACKAGES += CSWlibfreebl3
CATALOGNAME_CSWlibfreebl3 = libfreebl3
SPKG_DESC_CSWlibfreebl3 += $(DESCRIPTION), libfreebl libs
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.chk)
+# PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so)
+# PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so(\.\d+)*)
+# PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.chk)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*)
RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3
RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4
CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch
@@ -264,7 +267,8 @@
PATCHFILES += include.patch
PATCHFILES += ld-options.patch
PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
-PATCHFILES += 0005-platlibs.mk-linking-bltest.patch
+PATCHFILES += 0006-platlibs.mk-linking-bltest.patch
+PATCHFILES += 0006-config.mk-linking.patch
PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch
# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html
@@ -300,7 +304,7 @@
build-nss-compile:
(cd $(WORKSRC)/mozilla/security/nss \
&& \
- gmake -j1 RPATH=-R\'/opt/csw/lib/\$$\$$ISALIST\')
+ gmake -j1 RPATH=-R\'/opt/csw/lib/\$$\$$ISALIST\' BUILD_SUN_PKG=1)
@$(MAKECOOKIE)
install-nss:
Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums 2012-11-11 09:34:55 UTC (rev 19644)
+++ csw/mgar/pkg/nss/trunk/checksums 2012-11-11 09:36:22 UTC (rev 19645)
@@ -1 +1 @@
-15ea0e3b63cd0d18b5b75619afc46c3e nss-3.13.6.tar.gz
+3918d5f9eb2996271cf62d52f084fd45 nss-3.14.tar.gz
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 2012-11-11 09:34:55 UTC (rev 19644)
+++ csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch 2012-11-11 09:36:22 UTC (rev 19645)
@@ -1,25 +1,14 @@
-From 48bbd74f294a85ea1880906689ca4ba02faf5840 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Thu, 19 Jan 2012 09:43:12 +0100
-Subject: [PATCH] change rpath for bins in platlibs.mk
-
----
- mozilla/security/nss/cmd/platlibs.mk | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mozilla/security/nss/cmd/platlibs.mk b/mozilla/security/nss/cmd/platlibs.mk
-index 88c053d..3563c9a 100644
--- a/mozilla/security/nss/cmd/platlibs.mk
+++ b/mozilla/security/nss/cmd/platlibs.mk
-@@ -46,7 +46,7 @@ else
- EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
- endif
+@@ -10,9 +10,9 @@ ifeq ($(BUILD_SUN_PKG), 1)
+
+ 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'
else
--EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += $(RPATH)
+-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
++EXTRA_SHARED_LIBS += -R '/opt/csw/lib/$$ISALIST'
endif
endif
---
-1.7.8.3
-
Added: csw/mgar/pkg/nss/trunk/files/0006-config.mk-linking.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0006-config.mk-linking.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0006-config.mk-linking.patch 2012-11-11 09:36:22 UTC (rev 19645)
@@ -0,0 +1,36 @@
+--- a/mozilla/security/nss/lib/softoken/config.mk
++++ b/mozilla/security/nss/lib/softoken/config.mk
+@@ -24,14 +24,14 @@ SQLITE_LIB_DIR ?= $(DIST)/lib
+
+ ifdef NS_USE_GCC
+ EXTRA_SHARED_LIBS += \
+- -L$(SQLITE_LIB_DIR) \
+- -l$(SQLITE_LIB_NAME) \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+ -lplds4 \
+ -lnspr4 \
++ -L$(SQLITE_LIB_DIR) \
++ -l$(SQLITE_LIB_NAME) \
+ $(NULL)
+ else # ! NS_USE_GCC
+
+@@ -49,14 +49,14 @@ else
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+- -L$(SQLITE_LIB_DIR) \
+- -l$(SQLITE_LIB_NAME) \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+ -lplds4 \
+ -lnspr4 \
++ -L$(SQLITE_LIB_DIR) \
++ -l$(SQLITE_LIB_NAME) \
+ $(NULL)
+ endif
+
Added: csw/mgar/pkg/nss/trunk/files/0006-platlibs.mk-linking-bltest.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0006-platlibs.mk-linking-bltest.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0006-platlibs.mk-linking-bltest.patch 2012-11-11 09:36:22 UTC (rev 19645)
@@ -0,0 +1,19 @@
+--- a/mozilla/security/nss/cmd/platlibs.mk
++++ b/mozilla/security/nss/cmd/platlibs.mk
+@@ -122,14 +122,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_NAME) \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+ -lplds4 \
+ -lnspr4 \
++ -L$(DIST)/lib \
++ -l$(SQLITE_LIB_NAME) \
+ $(NULL)
+ endif
+
Modified: csw/mgar/pkg/nss/trunk/files/nss.pc
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss.pc 2012-11-11 09:34:55 UTC (rev 19644)
+++ csw/mgar/pkg/nss/trunk/files/nss.pc 2012-11-11 09:36:22 UTC (rev 19645)
@@ -5,7 +5,7 @@
Name: NSS
Description: Network Security Services
-Version: 3.13.6
-Requires: nspr >= 4.8.9
+Version: 3.14
+Requires: nspr >= 4.9.2
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.
More information about the devel
mailing list