r1677 - trunk/nss

djensen at linuxfromscratch.org djensen at linuxfromscratch.org
Tue Sep 19 05:24:14 PDT 2006


Author: djensen
Date: 2006-09-19 06:24:13 -0600 (Tue, 19 Sep 2006)
New Revision: 1677

Added:
   trunk/nss/nss-3.11.3-with-nspr-4.6.3-fedora_fixes-1.patch
Log:
updated nss patch to 3.11.3, note new bndleing, (with-nspr).

Added: trunk/nss/nss-3.11.3-with-nspr-4.6.3-fedora_fixes-1.patch
===================================================================
--- trunk/nss/nss-3.11.3-with-nspr-4.6.3-fedora_fixes-1.patch	                        (rev 0)
+++ trunk/nss/nss-3.11.3-with-nspr-4.6.3-fedora_fixes-1.patch	2006-09-19 12:24:13 UTC (rev 1677)
@@ -0,0 +1,195 @@
+Submitted By:            David Jensen <djensen_at_linuxfromscratch_dot_org>
+Date:                    2006-09-19
+Initial Package Version: 3.11
+Upstream Status:         Unknown
+Origin:                  Fedora CVS (nspr-config changes by Randy McMurchy). Update to:
+                         nss-3.11.3-with-nspr-4.6.3 by David Jensen
+Description:             Adds pkgconfig files for NSS and NSPR, adds a
+                         nss-config program, and corrects the nspr-config
+                         program
+
+
+diff -Naur nss-3.11.3.orig/mozilla/nsprpub/lib/pkgconfig/nspr.pc nss-3.11.3/mozilla/nsprpub/lib/pkgconfig/nspr.pc
+--- nss-3.11.3.orig/mozilla/nsprpub/lib/pkgconfig/nspr.pc	1969-12-31 18:00:00.000000000 -0600
++++ nss-3.11.3/mozilla/nsprpub/lib/pkgconfig/nspr.pc	2006-09-19 06:54:16.000000000 -0500
+@@ -0,0 +1,11 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=/usr/lib
++includedir=/usr/include
++
++Name: NSPR
++Description: The Netscape Portable Runtime
++Version: 4.6.3
++Libs: -L/usr/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl
++Cflags: -I/usr/include/nspr
++
+diff -Naur nss-3.11.3.orig/mozilla/security/nss/Makefile nss-3.11.3/mozilla/security/nss/Makefile
+--- nss-3.11.3.orig/mozilla/security/nss/Makefile	2006-09-19 06:53:45.000000000 -0500
++++ nss-3.11.3/mozilla/security/nss/Makefile	2006-09-19 06:54:16.000000000 -0500
+@@ -135,7 +135,7 @@
+ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
+ 	$(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+ 	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \
+-	$(NSPR_COMPILERS) sh ../configure \
++	$(NSPR_COMPILERS) sh ../configure --prefix=/usr --enable-optimize --disable-debug \
+ 	$(NSPR_CONFIGURE_OPTS) \
+ 	--with-dist-prefix='$(NSPR_PREFIX)' \
+ 	--with-dist-includedir='$(NSPR_PREFIX)/include'
+diff -Naur nss-3.11.3.orig/mozilla/security/nss/cmd/config/nss-config nss-3.11.3/mozilla/security/nss/cmd/config/nss-config
+--- nss-3.11.3.orig/mozilla/security/nss/cmd/config/nss-config	1969-12-31 18:00:00.000000000 -0600
++++ nss-3.11.3/mozilla/security/nss/cmd/config/nss-config	2006-09-19 06:54:16.000000000 -0500
+@@ -0,0 +1,137 @@
++#!/bin/sh
++
++prefix=/usr
++
++major_version=3
++minor_version=11
++patch_version=3
++
++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
++EOF
++	exit $1
++}
++
++if test $# -eq 0; then
++	usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=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
++      ;;
++    *)
++      usage 1 1>&2
++      ;;
++  esac
++  shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++    exec_prefix=${prefix}
++fi
++if test -z "$includedir"; then
++    includedir=${prefix}/include/nss
++fi
++if test -z "$libdir"; then
++    libdir=${prefix}/lib
++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,-rpath-link,$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
++      echo $libdirs
++fi
++
+diff -Naur nss-3.11.3.orig/mozilla/security/nss/lib/pkgconfig/nss.pc nss-3.11.3/mozilla/security/nss/lib/pkgconfig/nss.pc
+--- nss-3.11.3.orig/mozilla/security/nss/lib/pkgconfig/nss.pc	1969-12-31 18:00:00.000000000 -0600
++++ nss-3.11.3/mozilla/security/nss/lib/pkgconfig/nss.pc	2006-09-19 06:54:16.000000000 -0500
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=/usr/lib
++includedir=/usr/include
++
++Name: NSS
++Description: Mozilla Network Security Services
++Version: 3.11.3
++Requires: nspr >= 4.6.3
++Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
++Cflags: -I${includedir}/nss
++




More information about the patches mailing list