[csw-devel] SF.net SVN: gar:[7498] csw/mgar/pkg/nss/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sat Nov 28 16:59:39 CET 2009
Revision: 7498
http://gar.svn.sourceforge.net/gar/?rev=7498&view=rev
Author: wahwah
Date: 2009-11-28 15:59:39 +0000 (Sat, 28 Nov 2009)
Log Message:
-----------
nss: Merged changes based on Wan-Teh Chang's comments.
Modified Paths:
--------------
csw/mgar/pkg/nss/trunk/Makefile
csw/mgar/pkg/nss/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/nss/trunk/files/include.patch
csw/mgar/pkg/nss/trunk/files/ld-options.patch
csw/mgar/pkg/nss/trunk/files/nss.pc
csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch
csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch
csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch
csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch
csw/mgar/pkg/nss/trunk/files/whoami.patch
Removed Paths:
-------------
csw/mgar/pkg/nss/trunk/files/csw-include.patch
csw/mgar/pkg/nss/trunk/files/gln.patch
csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff
csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch
csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch
csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch
csw/mgar/pkg/nss/trunk/files/runtime-search-path.patch
csw/mgar/pkg/nss/trunk/files/shared-libs.patch
csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch
csw/mgar/pkg/nss/trunk/files/whoami.patch
Property Changed:
----------------
csw/mgar/pkg/nss/trunk/
Property changes on: csw/mgar/pkg/nss/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/nss/branches/upstream-work:7389-7497
Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/Makefile 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,145 +1,171 @@
# Copyright 2009 OpenCSW
# Distributed under the terms of the GNU General Public License v2
# $Id$
-
-
+#
# Based on the following resources:
# - http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild?view=markup
# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Build_instructions
# - https://developer.mozilla.org/en/NSS_reference/NSS_environment_variables
# - https://developer.mozilla.org/en/NSS_reference/Building_and_installing_NSS/Installation_guide
+#
+# A discussion:
+# - https://groups.google.com/group/mozilla.dev.tech.crypto/browse_thread/thread/709646e32fc4fad0#
+#
+# TODO: nss-config
+# TODO: a better nss.pc
-# Debugging mode, this is work in progress.
-GARFLAVOR = DBG
+# For DBG builds
+PATCHFILES = whoami.patch
+# I'll let Wan-Teh decide what and where to patch
+PATCHFILES += include.patch
+PATCHFILES += ld-options.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-amd64 = sqlite3-64.patch
+PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
+
+
GARNAME = nss
MAJOR_VERSION = 3
MINOR_VERSION = 12
-PATCHLEVEL = 4
+PATCHLEVEL = 4
GARVERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
CATEGORIES = lib
DESCRIPTION = Network Security Services library, implements PKI support
define BLURB
+ Network Security Services (NSS) is a set of libraries designed to support
+ cross-platform development of security-enabled client and server
+ applications. Applications built with NSS can support SSL v2 and v3, TLS,
+ PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and
+ other security standards.
endef
SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/
# TODO: Generate RTM_NAME from GARVERSION
RTM_NAME = NSS_3_12_4_RTM
-MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
-# This patch taken from http://bugs.gentoo.org/show_bug.cgi?id=256102
-PATCHFILES = nss-3.12.4.patch
-PATCHFILES += shared-libs.patch
-PATCHFILES += platlibs-sqlite3.patch
-PATCHFILES += platlibs-sunos.patch
-PATCHFILES += whoami.patch
-PATCHFILES += runtime-search-path.patch
-PATCHFILES += nss-3.12.4-gentoo-fixups-1.diff
-PATCHFILES += csw-include.patch
-PATCHFILES += gln.patch
-DIST_SUFFIX = -with-nspr-4.8
-DISTFILES = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX).tar.gz
-DISTNAME = $(GARNAME)-$(GARVERSION)$(DIST_SUFFIX)
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)$(DIST_SUFFIX).tar.gz
-REQUIRED_PKGS = CSWnspr CSWsqlite3
+MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+REQUIRED_PKGS = CSWnspr CSWsqlite3rt
PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWsqlite3devel
-CONFIGURE_SCRIPTS = nss
+CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = nss
INSTALL_SCRIPTS = nss
TEST_SCRIPTS =
BUILD64 = 1
+EXTRA_INC = $(prefix)/include
-install_libdir = $(prefix)/lib/nss
+libdir_install = $(prefix)/lib
includedir = $(prefix)/include/nss
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-ifeq (OPT,$(GARFLAVOR))
+ifneq (DBG,$(GARFLAVOR))
BUILD_OPT = 1
+ export BUILD_OPT
endif
-NSS_USE_SYSTEM_SQLITE = 1
+
+# 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_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
-USE_SYSTEM_ZLIB = 1
-ZLIB_LIBS = -lz
-NSDISTMODE = copy
+export NSPR_INCLUDE_DIR
+
NSS_ENABLE_ECC = 1
-XCFLAGS = $(CFLAGS)
-LDOPTS = $(LD_OPTIONS)
+export NSS_ENABLE_ECC
+
+# To avoid creating /opt/csw/lib/libsqlite3.so (already exists)
+NSS_USE_SYSTEM_SQLITE = 1
+export NSS_USE_SYSTEM_SQLITE
+
+# 64-bit suppport
ifeq ($(MODULATION),isa-sparcv9)
USE_64 = 1
export USE_64
-endif
+ NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib 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
+else
+ NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
endif
-export BUILD_OPT NSS_USE_SYSTEM_SQLITE NSPR_INCLUDE_DIR NSPR_LIB_DIR
-export USE_SYSTEM_ZLIB ZLIB_LIBS NSDISTMODE NSS_ENABLE_ECC XCFLAGS
+endif
+export NSPR_LIB_DIR
+# Based on:
+# http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com
+NSS_BINARIES = addbuiltin
+NSS_BINARIES += certutil
+NSS_BINARIES += cmsutil
+NSS_BINARIES += crlutil
+NSS_BINARIES += modutil
+NSS_BINARIES += pk12util
+NSS_BINARIES += signtool
+NSS_BINARIES += signver
+NSS_BINARIES += ssltap
+
include gar/category.mk
-configure-nss: respect-ldflags add-runtime-search-path
+build-nss: build-coreconf build-dbm build-nss-compile
@$(MAKECOOKIE)
-respect-ldflags:
- (cd $(WORKSRC)/mozilla/security/coreconf \
- && \
- gsed -i -e 's:SOURCE_PREFIX = $$(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $$(CORE_DEPTH)/dist:' \
- source.mk \
- && \
- gsed -i -e 's/\$$(MKSHLIB) -o/\$$(MKSHLIB) \$$(LDFLAGS) -o/g' rules.mk)
- @$(MAKECOOKIE)
-
-add-runtime-search-path:
- # Make sure that the runtime search path is added in all Makefiles.
- gfind $(WORKSRC) \( -name Makefile -o -name '*.mk' \) \
- -exec gsed -i -e 's|-L\$$(NSPR_LIB_DIR)|-L$$(NSPR_LIB_DIR) -R$$(NSPR_LIB_DIR)/$$$$ISALIST|' \
- {} \;
- # A form of assert
- gegrep -- '-R.*ISALIST' $(WORKSRC)/mozilla/security/nss/lib/freebl/config.mk
- @$(MAKECOOKIE)
-
-build-nss: build-coreconf build-dbm build-nss-compile
-
build-coreconf:
(cd $(WORKSRC)/mozilla/security/coreconf \
&& \
- $(BUILD_ENV) \
- && \
- gmake -j1 CC="$(CC)")
+ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
+ gmake -j1)
@$(MAKECOOKIE)
build-dbm:
(cd $(WORKSRC)/mozilla/security/dbm \
&& \
- $(BUILD_ENV) \
- && \
- gmake -j1 CC="$(CC)")
+ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS)' \
+ gmake -j1)
@$(MAKECOOKIE)
+# There's an extra interpolation somehwere inside nss' build system, so $$$$
+# needs to be used instead of $$.
build-nss-compile:
(cd $(WORKSRC)/mozilla/security/nss \
&& \
- $(BUILD_ENV) \
- && \
- gmake -j1 CC="$(CC)")
+ CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \
+ gmake -j1)
@$(MAKECOOKIE)
install-nss:
ginstall -d -m 755 $(DESTDIR)$(libdir)
- gcp -a $(WORKSRC)/mozilla/security/dist/*/lib/*.so $(DESTDIR)$(libdir)
+ for f in $(WORKSRC)/mozilla/dist/SunOS5*/lib/*.so; do \
+ ginstall -m 755 $${f} $(DESTDIR)$(libdir); \
+ if [ -r $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk ]; then \
+ ginstall -m 644 \
+ $(WORKSRC)/mozilla/dist/SunOS5*/lib/`basename $${f} .so`.chk \
+ $(DESTDIR)$(libdir); \
+ fi \
+ done
ginstall -d -m 755 $(DESTDIR)$(bindir)
- gcp -a $(WORKSRC)/mozilla/security/dist/*/bin/nss-config $(DESTDIR)$(bindir)
- ginstall -d -m 755 $(DESTDIR)/lib/pkgconfig
+ # TODO: nss-config
+ # gcp -a $(WORKSRC)/mozilla/dist/*/bin/nss-config $(DESTDIR)$(bindir)
+ ginstall -d -m 755 $(DESTDIR)$(includedir)
+ for f in \
+ $(WORKSRC)/mozilla/dist/public/nss/*.h; \
+ do \
+ ginstall -m 644 $${f} $(DESTDIR)$(includedir); \
+ done
+ for bin in $(NSS_BINARIES); do \
+ ginstall -m 755 \
+ $(WORKSRC)/mozilla/dist/*/bin/$${bin} \
+ $(DESTDIR)$(bindir)/`basename $${file}`; \
+ done
+ # Asserting that we have the right version in the .pc file
+ ggrep "Version: $(GARVERSION)" $(FILEDIR)/nss.pc \
+ || ( \
+ echo "Please adjust nss version in $(FILEDIR)/nss.pc" \
+ && \
+ false \
+ )
+ ginstall -d -m 755 $(DESTDIR)$(prefix)/lib/pkgconfig
ginstall -m 644 \
- $(WORKSRC)/mozilla/security/dist/*/lib/pkgconfig/nss.pc \
- $(DESTDIR)/lib/pkgconfig
- ginstall -d -m 755 $(DESTDIR)$(includedir)
- gcp -a $(WORKSRC)/mozilla/security/dist/private/nss/*.h $(DESTDIR)$(includedir)
- gcp -a $(WORKSRC)/mozilla/security/dist/public/nss/*.h $(DESTDIR)$(includedir)
- (cd $(DESTDIR)$(libdir); for file in *.so; do \
- mv $${file} $$(file).$(MINOR_VERSION); \
- ln -s $${file}.$(MINOR_VERSION) $${file}; \
- done)
- (for file in $(WORKSRC)/mozilla/security/dist/*/bin/*; do \
- ginstall -m 755 $${file} $(DESTDIR)$(bindir)/nss$$(basename $${file}); \
- done)
+ $(FILEDIR)/nss.pc \
+ $(DESTDIR)$(prefix)/lib/pkgconfig
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/checksums 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,10 +1,8 @@
-a1ce38c03b142eb2bd54f1f111661e30 csw-include.patch
-7116f8de3ac8b35104365c1b3fc6aea4 gln.patch
-63476fb10c2d14f7e0585fe327ae9341 nss-3.12.4-gentoo-fixups-1.diff
-8f76e381bf2339d731bfd5b8116c25a4 nss-3.12.4-with-nspr-4.8.tar.gz
-39b9d2431d4ff717d103b742fcaefb81 nss-3.12.4.patch
+4b2246d07092fe8b2f29a1a01e9bc821 include.patch
+79083e118f3d885957910fc845844c1c ld-options.patch
+1ee3ed9c1900079319bd1de51388d856 nss-3.12.4.tar.gz
+bd8d96c42238c7cfd07ec1ba21191066 platlibs-sqlite3-64.patch
f0f40bd021423ab1680b4d87cd19c1db platlibs-sqlite3.patch
-441f12a9396a89841d384d8c89a052ff platlibs-sunos.patch
-d41d8cd98f00b204e9800998ecf8427e runtime-search-path.patch
-90b4d32437b3e3fdadcf4f16339aa2ed shared-libs.patch
+cae46161d981e8aea822953b34339e60 sqlite3-32.patch
+b07d3de42785866c3c4385846fd8eb52 sqlite3-64.patch
221646aa1954b4a255ac03e7d8b0225d whoami.patch
Deleted: csw/mgar/pkg/nss/trunk/files/csw-include.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/csw-include.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,11 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-23 02:33:18.896095984 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/SunOS5.mk 2009-11-23 02:33:40.956347570 +0100
-@@ -104,7 +104,7 @@
- endif
- endif
-
--INCLUDES += -I/usr/dt/include -I/usr/openwin/include
-+INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/opt/csw/include
-
- RANLIB = echo
- CPU_ARCH = sparc
Deleted: csw/mgar/pkg/nss/trunk/files/gln.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/gln.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,35 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile.orig 2009-11-23 02:38:13.942222659 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/config/Makefile 2009-11-23 02:38:42.759423711 +0100
-@@ -13,7 +13,7 @@
- export:
- # Create the nss.pc file
- mkdir -p $(DIST)/lib/pkgconfig
-- sed -e "s, at prefix@,$(PREFIX)," \
-+ gsed -e "s, at prefix@,$(PREFIX)," \
- -e "s, at exec_prefix@,\$${prefix}," \
- -e "s, at libdir@,\$${prefix}/gentoo/nss," \
- -e "s, at includedir@,\$${prefix}/include/nss," \
-@@ -21,18 +21,18 @@
- -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
- -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
- nss.pc.in > nss.pc
-- chmod 0644 nss.pc
-- ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
-+ gchmod 0644 nss.pc
-+ gln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
-
- # Create the nss-config script
- mkdir -p $(DIST)/bin
-- sed -e "s, at prefix@,$(PREFIX)," \
-+ gsed -e "s, at prefix@,$(PREFIX)," \
- -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
- -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
- -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
- nss-config.in > nss-config
-- chmod 0755 nss-config
-- ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
-+ gchmod 0755 nss-config
-+ gln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
-
- libs:
-
Copied: csw/mgar/pkg/nss/trunk/files/include.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/include.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/include.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/include.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,11 @@
+--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 09:29:22.101030210 +0100
++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 09:29:33.419484372 +0100
+@@ -104,7 +104,7 @@
+ endif
+ endif
+
+-INCLUDES += -I/usr/dt/include -I/usr/openwin/include
++INCLUDES += -I/usr/dt/include -I/usr/openwin/include $(CPPFLAGS)
+
+ RANLIB = echo
+ CPU_ARCH = sparc
Copied: csw/mgar/pkg/nss/trunk/files/ld-options.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/ld-options.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/ld-options.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/ld-options.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,10 @@
+--- a/mozilla/security/coreconf/SunOS5.mk.orig 2009-11-26 11:52:54.279684353 +0100
++++ b/mozilla/security/coreconf/SunOS5.mk 2009-11-26 11:53:05.767884648 +0100
+@@ -175,6 +175,6 @@
+ RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
+ endif
+ else
+-RPATH = -R '$$ORIGIN'
++RPATH = $(LDFLAGS) $(LD_OPTIONS)
+ endif
+
Deleted: csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4-gentoo-fixups-1.diff 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,245 +0,0 @@
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/Makefile nss-3.12.4/mozilla/security/nss/config/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH = ../..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s, at prefix@,$(PREFIX)," \
-+ -e "s, at exec_prefix@,\$${prefix}," \
-+ -e "s, at libdir@,\$${prefix}/gentoo/nss," \
-+ -e "s, at includedir@,\$${prefix}/include/nss," \
-+ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s, at prefix@,$(PREFIX)," \
-+ -e "s, at NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s, at NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s, at NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in nss-3.12.4/mozilla/security/nss/config/nss-config.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+ nssutil
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-Wl,-R$libdir -L$libdir"
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.4/mozilla/security/nss/config/nss.pc.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION at .@NSS_MINOR_VERSION at .@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir}
-+Cflags: -I${includedir}
-+
-diff -urN nss-3.12.4-orig/mozilla/security/nss/Makefile nss-3.12.4/mozilla/security/nss/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
-
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
-
-@@ -140,12 +140,6 @@
- --with-dist-prefix='$(NSPR_PREFIX)' \
- --with-dist-includedir='$(NSPR_PREFIX)/include'
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
--
- build_dbm:
- ifndef NSS_DISABLE_DBM
- cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
-diff -urN nss-3.12.4-orig/mozilla/security/nss/manifest.mn nss-3.12.4/mozilla/security/nss/manifest.mn
---- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500
-+++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500
-@@ -42,6 +42,6 @@
-
- RELEASE = nss
-
--DIRS = lib cmd
-+DIRS = lib cmd config
-
-
Deleted: csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/nss-3.12.4.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,141 +0,0 @@
---- mozilla/security/nss/lib/freebl/stubs.c.dist 2009-09-16 17:46:24.600678560 +0100
-+++ b/mozilla/security/nss/lib/freebl/stubs.c 2009-09-16 18:09:59.275307160 +0100
-@@ -70,9 +70,32 @@
- #include <secitem.h>
- #include <blapi.h>
-
--#define FREEBL_NO_WEAK 1
-+#ifdef __sgi
-+# include <rld_interface.h>
-+# ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
-+# define _RLD_INTERFACE_DLFCN_H_DLADDR
-+ typedef struct Dl_info {
-+ const char * dli_fname;
-+ void * dli_fbase;
-+ const char * dli_sname;
-+ void * dli_saddr;
-+ int dli_version;
-+ int dli_reserved1;
-+ long dli_reserved[4];
-+ } Dl_info;
-+# endif
-+# define _RLD_DLADDR 14
-+int dladdr(void *address, Dl_info *dl);
-+
-+int dladdr(void *address, Dl_info *dl)
-+{
-+ void *v;
-+ v = _rld_new_interface(_RLD_DLADDR,address,dl);
-+ return (int)v;
-+}
-+#endif
-
--#define WEAK __attribute__((weak))
-+#define FREEBL_NO_WEAK 1
-
- #ifdef FREEBL_NO_WEAK
-
-@@ -93,17 +116,17 @@
- static type_##fn ptr_##fn = NULL
-
- #define STUB_SAFE_CALL0(fn) \
-- if (ptr_##fn) { return ptr_##fn(); }
-+ if (ptr_##fn) { ptr_##fn(); }
- #define STUB_SAFE_CALL1(fn,a1) \
-- if (ptr_##fn) { return ptr_##fn(a1); }
-+ if (ptr_##fn) { ptr_##fn(a1); }
- #define STUB_SAFE_CALL2(fn,a1,a2) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2); }
- #define STUB_SAFE_CALL3(fn,a1,a2,a3) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2,a3); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2,a3); }
- #define STUB_SAFE_CALL4(fn,a1,a2,a3,a4) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4); }
- #define STUB_SAFE_CALL6(fn,a1,a2,a3,a4,a5,a6) \
-- if (ptr_##fn) { return ptr_##fn(a1,a2,a3,a4,a5,a6); }
-+ if (ptr_##fn) { ptr_##fn(a1,a2,a3,a4,a5,a6); }
-
- #define STUB_FETCH_FUNCTION(fn) \
- ptr_##fn = (type_##fn) dlsym(lib,#fn); \
-@@ -118,6 +141,8 @@
- * libutil will not resolve these symbols.
- */
-
-+#define WEAK __attribute__((weak))
-+
- #define STUB_DECLARE(ret, fn, args) \
- WEAK extern ret fn args
-
-@@ -200,7 +225,7 @@ extern void
- PORT_Free_stub(void *ptr)
- {
- STUB_SAFE_CALL1(PORT_Free_Util, ptr);
-- return free(ptr);
-+ free(ptr);
- }
-
- extern void *
-@@ -220,14 +245,14 @@ PORT_ZFree_stub(void *ptr, size_t len)
- {
- STUB_SAFE_CALL2(PORT_ZFree_Util, ptr, len);
- memset(ptr, 0, len);
-- return free(ptr);
-+ free(ptr);
- }
-
- extern void
- PR_Free_stub(void *ptr)
- {
- STUB_SAFE_CALL1(PR_Free, ptr);
-- return free(ptr);
-+ free(ptr);
- }
-
- /*
-@@ -530,7 +555,7 @@ freebl_InitNSSUtil(void *lib)
- * fetch the library if it's loaded. For NSS it should already be loaded
- */
- #define freebl_getLibrary(libName) \
-- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
-+ dlopen (libName, RTLD_LAZY)
-
- #define freebl_releaseLibrary(lib) \
- if (lib) dlclose(lib)
-@@ -538,7 +563,7 @@ freebl_InitNSSUtil(void *lib)
- static void * FREEBLnsprGlobalLib = NULL;
- static void * FREEBLnssutilGlobalLib = NULL;
-
--void __attribute ((destructor)) FREEBL_unload()
-+void FREEBL_unload()
- {
- freebl_releaseLibrary(FREEBLnsprGlobalLib);
- freebl_releaseLibrary(FREEBLnssutilGlobalLib);
---- mozilla/security/nss/lib/freebl/nsslowhash.c.dist 2009-09-16 18:16:17.529500640 +0100
-+++ b/mozilla/security/nss/lib/freebl/nsslowhash.c 2009-09-16 18:16:37.634080480 +0100
-@@ -375,21 +375,21 @@ NSSLOWHASH_NewContext(NSSLOWInitContext
- void
- NSSLOWHASH_Begin(NSSLOWHASHContext *context)
- {
-- return context->hashObj->begin(context->hashCtxt);
-+ context->hashObj->begin(context->hashCtxt);
- }
-
- void
- NSSLOWHASH_Update(NSSLOWHASHContext *context, const unsigned char *buf,
- unsigned int len)
- {
-- return context->hashObj->update(context->hashCtxt, buf, len);
-+ context->hashObj->update(context->hashCtxt, buf, len);
- }
-
- void
- NSSLOWHASH_End(NSSLOWHASHContext *context, unsigned char *buf,
- unsigned int *ret, unsigned int len)
- {
-- return context->hashObj->end(context->hashCtxt, buf, ret, len);
-+ context->hashObj->end(context->hashCtxt, buf, ret, len);
- }
-
- void
Copied: csw/mgar/pkg/nss/trunk/files/nss.pc (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/nss.pc)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss.pc (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/nss.pc 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,11 @@
+prefix=/opt/csw
+exec_prefix=${prefix}
+libdir=${prefix}/lib/nss
+includedir=${prefix}/include/nss
+
+Name: NSS
+Description: Network Security Services
+Version: 3.12.4
+Requires: nspr >= 4.8.0
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir}
+Cflags: -I${includedir}
Copied: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3-64.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3-64.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-23 14:17:29.741267874 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-23 14:17:41.292422026 +0100
+@@ -82,7 +82,7 @@
+ endif
+ endif
+
+-SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3
++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib/64 -lsqlite3
+
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)
Deleted: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,11 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100
-@@ -80,7 +80,7 @@
- endif
- endif
-
--SQLITE=-lsqlite3
-+SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3
-
- ifdef NSS_DISABLE_DBM
- DBMLIB = $(NULL)
Copied: csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/platlibs-sqlite3.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/platlibs-sqlite3.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-21 17:28:09.997982796 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-21 17:28:32.107632453 +0100
+@@ -80,7 +80,7 @@
+ endif
+ endif
+
+-SQLITE=-lsqlite3
++SQLITE=-R/opt/csw/lib/$$ISALIST -L/opt/csw/lib -lsqlite3
+
+ ifdef NSS_DISABLE_DBM
+ DBMLIB = $(NULL)
Deleted: csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/platlibs-sunos.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,11 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk.orig 2009-11-22 14:31:53.252227901 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/platlibs.mk 2009-11-22 14:32:46.536330277 +0100
-@@ -48,6 +48,8 @@
- else
- EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
- endif
-+EXTRA_SHARED_LIBS += -R/opt/csw/lib/$$ISALIST
-+EXTRA_SHARED_LIBS += -R/opt/csw/lib/nspr/$$ISALIST
- endif
-
- ifeq ($(OS_ARCH), Linux)
Deleted: csw/mgar/pkg/nss/trunk/files/shared-libs.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/shared-libs.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,32 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-22 11:39:49.492474635 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/lib/softoken/config.mk 2009-11-22 11:40:51.857227138 +0100
-@@ -54,10 +54,14 @@
-
- ifdef NS_USE_GCC
- EXTRA_SHARED_LIBS += \
-+ -R/opt/csw/lib/$$ISALIST \
-+ -L/opt/csw/lib \
- -L$(DIST)/lib \
-+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \
- -L$(NSSUTIL_LIB_DIR) \
- -lnssutil3 \
- -lsqlite3 \
-+ -R$(NSPR_LIB_DIR)/$$ISALIST \
- -L$(NSPR_LIB_DIR) \
- -lplc4 \
- -lplds4 \
-@@ -80,10 +84,14 @@
- # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
- # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
- EXTRA_SHARED_LIBS += \
-+ -R/opt/csw/lib/$$ISALIST \
-+ -L/opt/csw/lib \
- -L$(DIST)/lib \
-+ -R$(NSSUTIL_LIB_DIR)/$$ISALIST \
- -L$(NSSUTIL_LIB_DIR) \
- -lnssutil3 \
- -lsqlite3 \
-+ -R$(NSPR_LIB_DIR)/$$ISALIST \
- -L$(NSPR_LIB_DIR) \
- -lplc4 \
- -lplds4 \
Deleted: csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/sign-under-dbx.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,15 +0,0 @@
-This file shows how to run shlibsign under dbx, the Sun Studio debugger, to see
-where it's aborting.
-
---- nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh.orig 2009-11-22 15:17:12.069116849 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/nss/cmd/shlibsign/./sign.sh 2009-11-22 15:17:54.559576926 +0100
-@@ -34,7 +34,7 @@
- export LIBRARY_PATH
- ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
- export ADDON_PATH
-- echo ${2}/shlibsign -v -i ${5}
-- ${2}/shlibsign -v -i ${5}
-+ echo /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5}
-+ /opt/studio/SOS11/SUNWspro/bin/dbx ${2}/shlibsign -v -i ${5}
- ;;
- esac
Copied: csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-32.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/sqlite3-32.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,18 @@
+--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100
++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:19.891579729 +0100
+@@ -57,6 +57,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+@@ -83,6 +84,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
Copied: csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/sqlite3-64.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/sqlite3-64.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,18 @@
+--- a/mozilla/security/nss/lib/softoken/config.mk.orig 2009-11-27 00:13:49.173159939 +0100
++++ b/mozilla/security/nss/lib/softoken/config.mk 2009-11-27 00:15:48.846636621 +0100
+@@ -57,6 +57,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib/64 \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
+@@ -83,6 +84,7 @@
+ -L$(DIST)/lib \
+ -L$(NSSUTIL_LIB_DIR) \
+ -lnssutil3 \
++ -L/opt/csw/lib/64 \
+ -lsqlite3 \
+ -L$(NSPR_LIB_DIR) \
+ -lplc4 \
Deleted: csw/mgar/pkg/nss/trunk/files/whoami.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 09:30:46 UTC (rev 7497)
+++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -1,11 +0,0 @@
---- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100
-+++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100
-@@ -46,7 +46,7 @@
- DEFINES += -UDEBUG -DNDEBUG
- else
- OPTIMIZER += -g
-- USERNAME := $(shell whoami)
-+ USERNAME := $(shell gwhoami)
- USERNAME := $(subst -,_,$(USERNAME))
- DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)
- endif
Copied: csw/mgar/pkg/nss/trunk/files/whoami.patch (from rev 7497, csw/mgar/pkg/nss/branches/upstream-work/files/whoami.patch)
===================================================================
--- csw/mgar/pkg/nss/trunk/files/whoami.patch (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/whoami.patch 2009-11-28 15:59:39 UTC (rev 7498)
@@ -0,0 +1,11 @@
+--- nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk.orig 2009-11-22 02:25:17.411354784 +0100
++++ nss-3.12.4-with-nspr-4.8/mozilla/security/coreconf/UNIX.mk 2009-11-22 02:25:24.833876220 +0100
+@@ -46,7 +46,7 @@
+ DEFINES += -UDEBUG -DNDEBUG
+ else
+ OPTIMIZER += -g
+- USERNAME := $(shell whoami)
++ USERNAME := $(shell gwhoami)
+ USERNAME := $(subst -,_,$(USERNAME))
+ DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)
+ 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