update nss+nspr

1 files changed, 443 insertions, 0 deletions

diff --git a/package/nss/patches/001-lfs-nss-config+nss_pc.patch b/package/nss/patches/001-lfs-nss-config+nss_pc.patch
new file mode 100644
index 000000000..9907548cc
--- /dev/null
+++ b/package/nss/patches/001-lfs-nss-config+nss_pc.patch
@@ -0,0 +1,443 @@
+diff -Nur nss-3.13.6.orig/mozilla/security/nss/Makefile nss-3.13.6/mozilla/security/nss/Makefile
+--- nss-3.13.6.orig/mozilla/security/nss/Makefile	2011-11-05 23:59:15.000000000 +0100
++++ nss-3.13.6/mozilla/security/nss/Makefile	2012-10-01 12:37:24.000000000 +0200
+@@ -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:
+ ifdef NSS_DISABLE_DBM
+ 	@echo "skipping the build of DBM"
+diff -Nur nss-3.13.6.orig/mozilla/security/nss/Makefile.orig nss-3.13.6/mozilla/security/nss/Makefile.orig
+--- nss-3.13.6.orig/mozilla/security/nss/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
++++ nss-3.13.6/mozilla/security/nss/Makefile.orig	2011-11-05 23:59:15.000000000 +0100
+@@ -0,0 +1,185 @@
++#! gmake
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#######################################################################
++# (1) Include initial platform-independent assignments (MANDATORY).   #
++#######################################################################
++
++include manifest.mn
++
++#######################################################################
++# (2) Include "global" configuration information. (OPTIONAL)          #
++#######################################################################
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++#######################################################################
++# (3) Include "component" configuration information. (OPTIONAL)       #
++#######################################################################
++
++
++
++#######################################################################
++# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
++#######################################################################
++
++ifeq ($(OS_TARGET),WINCE)
++DIRS	= lib	# omit cmd since wince has no command line shell
++endif
++
++#######################################################################
++# (5) Execute "global" rules. (OPTIONAL)                              #
++#######################################################################
++
++include $(CORE_DEPTH)/coreconf/rules.mk
++
++#######################################################################
++# (6) Execute "component" rules. (OPTIONAL)                           #
++#######################################################################
++
++
++
++#######################################################################
++# (7) Execute "local" rules. (OPTIONAL).                              #
++#######################################################################
++
++nss_build_all: build_coreconf build_nspr build_dbm all
++
++nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
++
++build_coreconf:
++	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)
++
++clobber_coreconf:
++	cd $(CORE_DEPTH)/coreconf ;  $(MAKE) clobber
++
++NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status
++NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure
++
++#
++# Translate coreconf build options to NSPR configure options.
++#
++
++ifdef BUILD_OPT
++NSPR_CONFIGURE_OPTS += --disable-debug --enable-optimize
++endif
++ifdef USE_64
++NSPR_CONFIGURE_OPTS += --enable-64bit
++endif
++ifeq ($(OS_TARGET),WIN95)
++NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
++endif
++ifdef USE_DEBUG_RTL
++NSPR_CONFIGURE_OPTS += --enable-debug-rtl
++endif
++ifdef NS_USE_GCC
++NSPR_COMPILERS = CC=gcc CXX=g++
++endif
++
++#
++# Some pwd commands on Windows (for example, the pwd
++# command in Cygwin) return a pathname that begins
++# with a (forward) slash.  When such a pathname is
++# passed to Windows build tools (for example, cl), it
++# is mistaken as a command-line option.  If that is the case,
++# we use a relative pathname as NSPR's prefix on Windows.
++#
++
++USEABSPATH="YES"
++ifeq (,$(filter-out WIN%,$(OS_TARGET)))
++ifeq (,$(findstring :,$(shell pwd)))
++USEABSPATH="NO"
++endif
++endif
++ifeq ($(USEABSPATH),"YES")
++NSPR_PREFIX = $(shell pwd)/../../dist/$(OBJDIR_NAME)
++else
++NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME)
++endif
++
++$(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
++	$(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
++	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \
++	$(NSPR_COMPILERS) sh ../configure \
++	$(NSPR_CONFIGURE_OPTS) \
++	--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:
++ifdef NSS_DISABLE_DBM
++	@echo "skipping the build of DBM"
++else
++	cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
++endif
++
++clobber_dbm:
++	cd $(CORE_DEPTH)/dbm ; $(MAKE) clobber
++
++moz_import::
++ifeq (,$(filter-out WIN%,$(OS_TARGET)))
++	$(NSINSTALL) -D $(DIST)/include/nspr
++	cp $(DIST)/../include/nspr/*.h $(DIST)/include/nspr
++	cp $(DIST)/../include/* $(DIST)/include
++ifdef BUILD_OPT
++	cp $(DIST)/../WIN32_O.OBJ/lib/* $(DIST)/lib
++else
++	cp $(DIST)/../WIN32_D.OBJ/lib/* $(DIST)/lib
++endif
++	mv $(DIST)/lib/dbm32.lib $(DIST)/lib/dbm.lib
++else
++ifeq ($(OS_TARGET),OS2)
++	cp -rf $(DIST)/../include $(DIST)
++	cp -rf $(DIST)/../lib $(DIST)
++	cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX)
++else
++	$(NSINSTALL) -L ../../dist include $(DIST)
++	$(NSINSTALL) -L ../../dist lib $(DIST)
++	cp $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX)
++endif
++endif
++
++nss_RelEng_bld: build_coreconf import build_dbm all
++
++package:
++	$(MAKE) -C pkg publish
+diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/Makefile nss-3.13.6/mozilla/security/nss/config/Makefile
+--- nss-3.13.6.orig/mozilla/security/nss/config/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ nss-3.13.6/mozilla/security/nss/config/Makefile	2012-10-01 12:58:43.000000000 +0200
+@@ -0,0 +1,41 @@
++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: install libs
++
++export:
++install:
++	# Create the nss.pc file
++	mkdir -p $(DIST)/lib/pkgconfig
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@exec_prefix@,\$${prefix}," \
++	    -e "s,@libdir@,\$${prefix}/lib," \
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss.pc.in > nss.pc
++	chmod 0644 nss.pc
++	cp nss.pc $(DIST)/lib/pkgconfig
++
++	# Create the nss-config script
++	mkdir -p $(DIST)/bin
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss-config.in > nss-config
++	chmod 0755 nss-config
++	cp nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export install libs
++
+diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/nss-config.in nss-3.13.6/mozilla/security/nss/config/nss-config.in
+--- nss-3.13.6.orig/mozilla/security/nss/config/nss-config.in	1970-01-01 01:00:00.000000000 +0100
++++ nss-3.13.6/mozilla/security/nss/config/nss-config.in	2012-10-01 12:37:24.000000000 +0200
+@@ -0,0 +1,153 @@
++#!/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
++	nssutil
++	smime
++	ssl
++	softokn
++EOF
++	exit $1
++}
++
++if test $# -eq 0; then
++	usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=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
++      ;;
++    nss)
++      lib_nss=yes
++      ;;
++    nssutil)
++      lib_nssutil=yes
++      ;;
++    smime)
++      lib_smime=yes
++      ;;
++    ssl)
++      lib_ssl=yes
++      ;;
++    softokn)
++      lib_softokn=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="-L$libdir"
++      if test -n "$lib_nss"; then
++	libdirs="$libdirs -lnss${major_version}"
++      fi
++      if test -n "$lib_nssutil"; then
++        libdirs="$libdirs -lnssutil${major_version}"
++      fi
++      if test -n "$lib_smime"; then
++	libdirs="$libdirs -lsmime${major_version}"
++      fi
++      if test -n "$lib_ssl"; then
++	libdirs="$libdirs -lssl${major_version}"
++      fi
++      if test -n "$lib_softokn"; then
++        libdirs="$libdirs -lsoftokn${major_version}"
++      fi
++      echo $libdirs
++fi      
++
+diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/nss.pc.in nss-3.13.6/mozilla/security/nss/config/nss.pc.in
+--- nss-3.13.6.orig/mozilla/security/nss/config/nss.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ nss-3.13.6/mozilla/security/nss/config/nss.pc.in	2012-10-01 12:37:24.000000000 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
++Cflags: -I${includedir}
++
+diff -Nur nss-3.13.6.orig/mozilla/security/nss/manifest.mn nss-3.13.6/mozilla/security/nss/manifest.mn
+--- nss-3.13.6.orig/mozilla/security/nss/manifest.mn	2010-03-26 23:31:18.000000000 +0100
++++ nss-3.13.6/mozilla/security/nss/manifest.mn	2012-10-01 12:37:24.000000000 +0200
+@@ -42,6 +42,6 @@
+ 
+ RELEASE = nss
+ 
+-DIRS = lib cmd
++DIRS = lib cmd config
+ 
+