[csw-devel] SF.net SVN: gar:[16778] csw/mgar/pkg/nss/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Mon Jan 16 16:50:10 CET 2012
Revision: 16778
http://gar.svn.sourceforge.net/gar/?rev=16778&view=rev
Author: cgrzemba
Date: 2012-01-16 15:50:09 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
nss/trunk: add patches for version 3.12.11
Modified Paths:
--------------
csw/mgar/pkg/nss/trunk/Makefile
csw/mgar/pkg/nss/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch
Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile 2012-01-16 14:04:44 UTC (rev 16777)
+++ csw/mgar/pkg/nss/trunk/Makefile 2012-01-16 15:50:09 UTC (rev 16778)
@@ -17,7 +17,7 @@
NAME = nss
MAJOR_VERSION = 3
MINOR_VERSION = 12
-PATCHLEVEL = 4
+PATCHLEVEL = 11
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
CATEGORIES = lib
define BLURB
@@ -29,29 +29,31 @@
endef
SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/
# TODO: Generate RTM_NAME from VERSION
-RTM_NAME = NSS_3_12_4_RTM
-MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
+RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_$(PATCHLEVEL)_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
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-PACKAGES = CSWlibnss3 CSWlibnss3-devel CSWlibnss3-tools
+PACKAGES = CSWlibnss3 CSWlibnss-dev CSWlibnss3-tools
SPKG_DESC_CSWlibnss3 = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support
-SPKG_DESC_CSWlibnss3-devel = libnss3 development files
+SPKG_DESC_CSWlibnss-dev = libnss development files
SPKG_DESC_CSWlibnss3-tools = libnss3 command-line utilities
-PKGFILES_CSWlibnss3-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibnss-dev = $(PKGFILES_DEVEL)
PKGFILES_CSWlibnss3-tools = $(bindir).*
-CATALOGNAME_CSWlibnss3-devel = libnss3_devel
+CATALOGNAME_CSWlibnss-dev = libnss_dev
CATALOGNAME_CSWlibnss3-tools = libnss3_tools
+OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel
RUNTIME_DEP_PKGS_CSWlibnss3 = CSWnspr CSWsqlite3rt
-RUNTIME_DEP_PKGS_CSWlibnss3-devel += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnss3
RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWnspr
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-devel CSWsqlite3devel
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = nss
INSTALL_SCRIPTS = nss
@@ -72,7 +74,7 @@
endif
# NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig
-NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//')
+NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --cflags-only-I nspr | gsed 's/-I//')
export NSPR_INCLUDE_DIR
NSS_ENABLE_ECC = 1
@@ -81,23 +83,28 @@
# To avoid creating /opt/csw/lib/libsqlite3.so (already exists)
NSS_USE_SYSTEM_SQLITE = 1
export NSS_USE_SYSTEM_SQLITE
+SQLITE_LIB_DIR = /opt/csw/lib
+export SQLITE_LIB_DIR
+SQLITE_INCLUDE_DIR = /opt/csw/include
+export SQLITE_INCLUDE_DIR
# 64-bit suppport
ifeq ($(MODULATION),isa-sparcv9)
USE_64 = 1
export USE_64
- NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
+ NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
else
ifeq ($(MODULATION),isa-amd64)
USE_64 = 1
export USE_64
- NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
+ NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
else
- NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
+ NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
endif
endif
export NSPR_LIB_DIR
+
# Based on:
# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com
NSS_BINARIES = addbuiltin
@@ -113,22 +120,26 @@
LICENSE = mpl-tri-license-txt
# For DBG builds
-PATCHFILES = whoami.patch
+# PATCHFILES = whoami.patch
# Required patches.
PATCHFILES += include.patch
PATCHFILES += ld-options.patch
-PATCHFILES += platlibs-sqlite3.patch
+# PATCHFILES += platlibs-sqlite3.patch
PATCHFILES_isa-sparcv8 = sqlite3-32.patch
PATCHFILES_isa-i386 = sqlite3-32.patch
PATCHFILES_isa-sparcv9 = sqlite3-64.patch
-PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch
+# PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch
PATCHFILES_isa-amd64 = sqlite3-64.patch
-PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
+# PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
+PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
+PATCHFILES += 0005-platlibs.mk-linking-bltest.patch
# http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html
-NOISAEXEC = 1
+# NOISAEXEC = 1
+CPPFLAGS=
+
include gar/category.mk
build-nss: build-coreconf build-dbm build-nss-compile
Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums 2012-01-16 14:04:44 UTC (rev 16777)
+++ csw/mgar/pkg/nss/trunk/checksums 2012-01-16 15:50:09 UTC (rev 16778)
@@ -1,9 +1 @@
-4b2246d07092fe8b2f29a1a01e9bc821 include.patch
-79083e118f3d885957910fc845844c1c ld-options.patch
-fd5baf22edc790b6fb5b84e4ba915cf0 mpl-tri-license-txt
-1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz
-bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch
-f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch
-cae46161d981e8aea822953b34339e60 sqlite3-32.patch
-b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch
-221646aa1954b4a255ac03e7d8b0225d whoami.patch
+ca0ca058380be200cf247ea2496b5352 nss-3.12.11.tar.gz
Added: csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch 2012-01-16 15:50:09 UTC (rev 16778)
@@ -0,0 +1,56 @@
+From 5ec3920b9ad8351ccbe372682ebc5a9843708b62 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 16 Jan 2012 15:29:00 +0100
+Subject: [PATCH 4/5] fix xarch and add SQLITE_LIB_DIR var
+
+---
+ mozilla/security/coreconf/SunOS5.mk | 6 +-----
+ mozilla/security/nss/lib/softoken/config.mk | 6 ++++--
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk
+index c0f8e63..a836398 100644
+--- a/mozilla/security/coreconf/SunOS5.mk
++++ b/mozilla/security/coreconf/SunOS5.mk
+@@ -132,11 +132,7 @@ endif
+ DSO_LDOPTS += -shared -h $(notdir $@)
+ else
+ ifeq ($(USE_64), 1)
+- ifeq ($(OS_TEST),i86pc)
+- DSO_LDOPTS +=-xarch=amd64
+- else
+- DSO_LDOPTS +=-xarch=v9
+- endif
++ DSO_LDOPTS += -m64
+ endif
+ DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+diff --git a/mozilla/security/nss/lib/softoken/config.mk b/mozilla/security/nss/lib/softoken/config.mk
+index 3a35944..75826b8 100644
+--- a/mozilla/security/nss/lib/softoken/config.mk
++++ b/mozilla/security/nss/lib/softoken/config.mk
+@@ -52,9 +52,11 @@ IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)
+ RES = $(OBJDIR)/$(LIBRARY_NAME).res
+ RESNAME = $(LIBRARY_NAME).rc
+
++SQLITE_LIB_DIR ?= $(DIST)/lib
++
+ ifdef NS_USE_GCC
+ EXTRA_SHARED_LIBS += \
+- -L$(DIST)/lib \
++ -L$(SQLITE_LIB_DIR) \
+ -l$(SQLITE_LIB_NAME) \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
+@@ -79,7 +81,7 @@ else
+ # $(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 \
+--
+1.7.8.3
+
Added: csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch 2012-01-16 15:50:09 UTC (rev 16778)
@@ -0,0 +1,38 @@
+From bddc0163686230f10e3c9d1f44fdce0529134ad7 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 16 Jan 2012 16:42:31 +0100
+Subject: [PATCH 5/5] platlibs.mk linking bltest
+
+---
+ mozilla/security/nss/cmd/platlibs.mk | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/mozilla/security/nss/cmd/platlibs.mk b/mozilla/security/nss/cmd/platlibs.mk
+index 5345dd2..88c053d 100644
+--- a/mozilla/security/nss/cmd/platlibs.mk
++++ b/mozilla/security/nss/cmd/platlibs.mk
+@@ -161,6 +161,7 @@ EXTRA_LIBS += \
+ $(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
+ $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
++ $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
+ $(CRYPTOLIB) \
+ $(DBMLIB) \
+ $(PKIXLIB) \
+@@ -173,10 +174,12 @@ ifeq ($(OS_ARCH), AIX)
+ EXTRA_SHARED_LIBS += -brtl
+ endif
+
++SQLITE_LIB_DIR ?= $(DIST)/lib
++
+ # $(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 \
+--
+1.7.8.3
+
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