commit 5f326f4684ccd22867e7d8026422f9a2a1f904f8 Author: Simone Rota <sip@crux.nu> Date: Fri Jan 19 00:34:37 2007 +0000 nss: updatd to 3.11.4 diff --git a/nss/.footprint b/nss/.footprint index f8b8e9c..9f2e8ed 100644 --- a/nss/.footprint +++ b/nss/.footprint @@ -1,86 +1,14 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/nspr-config +-rwxr-xr-x root/root usr/bin/nss-config drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/dbm/ -rw-r--r-- root/root usr/include/dbm/cdefs.h -rw-r--r-- root/root usr/include/dbm/mcom_db.h -rw-r--r-- root/root usr/include/dbm/ncompat.h --rw-r--r-- root/root usr/include/dbm/nsres.h -rw-r--r-- root/root usr/include/dbm/winfile.h drwxr-xr-x root/root usr/include/nspr/ -drwxr-xr-x root/root usr/include/nspr/md/ --rw-r--r-- root/root usr/include/nspr/md/_aix.h --rw-r--r-- root/root usr/include/nspr/md/_aix32.cfg --rw-r--r-- root/root usr/include/nspr/md/_aix64.cfg --rw-r--r-- root/root usr/include/nspr/md/_beos.cfg --rw-r--r-- root/root usr/include/nspr/md/_beos.h --rw-r--r-- root/root usr/include/nspr/md/_bsdi.cfg --rw-r--r-- root/root usr/include/nspr/md/_bsdi.h --rw-r--r-- root/root usr/include/nspr/md/_darwin.cfg --rw-r--r-- root/root usr/include/nspr/md/_darwin.h --rw-r--r-- root/root usr/include/nspr/md/_dgux.cfg --rw-r--r-- root/root usr/include/nspr/md/_dgux.h --rw-r--r-- root/root usr/include/nspr/md/_freebsd.cfg --rw-r--r-- root/root usr/include/nspr/md/_freebsd.h --rw-r--r-- root/root usr/include/nspr/md/_hpux.h --rw-r--r-- root/root usr/include/nspr/md/_hpux32.cfg --rw-r--r-- root/root usr/include/nspr/md/_hpux64.cfg --rw-r--r-- root/root usr/include/nspr/md/_irix.h --rw-r--r-- root/root usr/include/nspr/md/_irix32.cfg --rw-r--r-- root/root usr/include/nspr/md/_irix64.cfg --rw-r--r-- root/root usr/include/nspr/md/_linux.cfg --rw-r--r-- root/root usr/include/nspr/md/_linux.h --rw-r--r-- root/root usr/include/nspr/md/_macos.h --rw-r--r-- root/root usr/include/nspr/md/_ncr.cfg --rw-r--r-- root/root usr/include/nspr/md/_ncr.h --rw-r--r-- root/root usr/include/nspr/md/_nec.cfg --rw-r--r-- root/root usr/include/nspr/md/_nec.h --rw-r--r-- root/root usr/include/nspr/md/_netbsd.cfg --rw-r--r-- root/root usr/include/nspr/md/_netbsd.h --rw-r--r-- root/root usr/include/nspr/md/_nextstep.cfg --rw-r--r-- root/root usr/include/nspr/md/_nextstep.h --rw-r--r-- root/root usr/include/nspr/md/_nspr_pthread.h --rw-r--r-- root/root usr/include/nspr/md/_nto.cfg --rw-r--r-- root/root usr/include/nspr/md/_nto.h --rw-r--r-- root/root usr/include/nspr/md/_openbsd.cfg --rw-r--r-- root/root usr/include/nspr/md/_openbsd.h --rw-r--r-- root/root usr/include/nspr/md/_openvms.cfg --rw-r--r-- root/root usr/include/nspr/md/_openvms.h --rw-r--r-- root/root usr/include/nspr/md/_os2.cfg --rw-r--r-- root/root usr/include/nspr/md/_os2.h --rw-r--r-- root/root usr/include/nspr/md/_os2_errors.h --rw-r--r-- root/root usr/include/nspr/md/_osf1.cfg --rw-r--r-- root/root usr/include/nspr/md/_osf1.h --rw-r--r-- root/root usr/include/nspr/md/_pcos.h --rw-r--r-- root/root usr/include/nspr/md/_pth.h --rw-r--r-- root/root usr/include/nspr/md/_qnx.cfg --rw-r--r-- root/root usr/include/nspr/md/_qnx.h --rw-r--r-- root/root usr/include/nspr/md/_reliantunix.cfg --rw-r--r-- root/root usr/include/nspr/md/_reliantunix.h --rw-r--r-- root/root usr/include/nspr/md/_rhapsody.cfg --rw-r--r-- root/root usr/include/nspr/md/_rhapsody.h --rw-r--r-- root/root usr/include/nspr/md/_scoos.cfg --rw-r--r-- root/root usr/include/nspr/md/_scoos.h --rw-r--r-- root/root usr/include/nspr/md/_solaris.h --rw-r--r-- root/root usr/include/nspr/md/_solaris32.cfg --rw-r--r-- root/root usr/include/nspr/md/_solaris64.cfg --rw-r--r-- root/root usr/include/nspr/md/_sony.cfg --rw-r--r-- root/root usr/include/nspr/md/_sony.h --rw-r--r-- root/root usr/include/nspr/md/_sunos4.cfg --rw-r--r-- root/root usr/include/nspr/md/_sunos4.h --rw-r--r-- root/root usr/include/nspr/md/_unix_errors.h --rw-r--r-- root/root usr/include/nspr/md/_unixos.h --rw-r--r-- root/root usr/include/nspr/md/_unixware.cfg --rw-r--r-- root/root usr/include/nspr/md/_unixware.h --rw-r--r-- root/root usr/include/nspr/md/_unixware7.cfg --rw-r--r-- root/root usr/include/nspr/md/_win16.cfg --rw-r--r-- root/root usr/include/nspr/md/_win16.h --rw-r--r-- root/root usr/include/nspr/md/_win32_errors.h --rw-r--r-- root/root usr/include/nspr/md/_win95.cfg --rw-r--r-- root/root usr/include/nspr/md/_win95.h --rw-r--r-- root/root usr/include/nspr/md/_winnt.cfg --rw-r--r-- root/root usr/include/nspr/md/_winnt.h --rw-r--r-- root/root usr/include/nspr/md/prosdep.h --rw-r--r-- root/root usr/include/nspr/md/sunos4.h -rw-r--r-- root/root usr/include/nspr/nspr.h drwxr-xr-x root/root usr/include/nspr/obsolete/ -rw-r--r-- root/root usr/include/nspr/obsolete/pralarm.h @@ -137,7 +65,7 @@ drwxr-xr-x root/root usr/include/nspr/private/ -rw-r--r-- root/root usr/include/nspr/prtpool.h -rw-r--r-- root/root usr/include/nspr/prtrace.h -rw-r--r-- root/root usr/include/nspr/prtypes.h --rwxr-xr-x root/root usr/include/nspr/prvrsion.h +-rw-r--r-- root/root usr/include/nspr/prvrsion.h -rw-r--r-- root/root usr/include/nspr/prwin16.h drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/base64.h @@ -191,6 +119,8 @@ drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/p12t.h -rw-r--r-- root/root usr/include/nss/pk11func.h -rw-r--r-- root/root usr/include/nss/pk11pqg.h +-rw-r--r-- root/root usr/include/nss/pk11priv.h +-rw-r--r-- root/root usr/include/nss/pk11pub.h -rw-r--r-- root/root usr/include/nss/pk11sdr.h -rw-r--r-- root/root usr/include/nss/pkcs11.h -rw-r--r-- root/root usr/include/nss/pkcs11f.h @@ -227,15 +157,11 @@ drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/sslerr.h -rw-r--r-- root/root usr/include/nss/sslproto.h -rw-r--r-- root/root usr/include/nss/sslt.h --rw-r--r-- root/root usr/include/nss/swfort.h --rw-r--r-- root/root usr/include/nss/swfortt.h -rw-r--r-- root/root usr/include/nss/watcomfx.h -drwxr-xr-x root/root usr/include/seccmd/ --rw-r--r-- root/root usr/include/seccmd/secutil.h --rw-r--r-- root/root usr/include/seccmd/zconf.h --rw-r--r-- root/root usr/include/seccmd/zlib.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libfort.so +-rw-r--r-- root/root usr/lib/libcrmf.a +-rw-r--r-- root/root usr/lib/libfreebl3.chk +-rwxr-xr-x root/root usr/lib/libfreebl3.so -rwxr-xr-x root/root usr/lib/libnspr4.so -rwxr-xr-x root/root usr/lib/libnss3.so -rwxr-xr-x root/root usr/lib/libnssckbi.so @@ -245,4 +171,6 @@ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libsoftokn3.chk -rwxr-xr-x root/root usr/lib/libsoftokn3.so -rwxr-xr-x root/root usr/lib/libssl3.so --rwxr-xr-x root/root usr/lib/libswft.so +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/nspr.pc +-rw-r--r-- root/root usr/lib/pkgconfig/nss.pc diff --git a/nss/.md5sum b/nss/.md5sum index 048852a..4af2be3 100644 --- a/nss/.md5sum +++ b/nss/.md5sum @@ -1,2 +1,3 @@ -a3ab6ae2213780c0e20c5b9aa8f018e9 nss-3.9.2-gcc4.patch -c10b5100510dab1e3c94b76a4d7b1f23 nss-3.9.2.tar.gz +74af8ebdf94307f47ff8931adbef9c39 nss-3.11.4.tar.gz +9be73bd73e361e5e36edf77f456fa20a nss-3.11.tar.gz +b5b60b323add0e7cbc57544dd0938c02 nss-fixes.patch diff --git a/nss/Pkgfile b/nss/Pkgfile index ab563d1..e4a781e 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -1,28 +1,42 @@ # Description: Mozilla Network Security Services (NSS) # URL: http://www.mozilla.org/projects/security/pki/nss/ -# Maintainer: Simone Rota, sip at crux dot nu -# Packager: Simone Rota, sip at crux dot nu +# Maintainer: Brett Goulder, predatorfreak at dcaf-security dot org +# Packager: Simone Rota, sip at varlock dot com # Depends on: zip name=nss -version=3.9.2 +version=3.11.4 release=1 -source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_2_RTM/src/$name-$version.tar.gz \ - $name-$version-gcc4.patch) +source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_RTM/src/$name-3.11.tar.gz \ + ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_4_RTM/src/$name-$version.tar.gz \ + $name-fixes.patch) build() { - cd $name-$version - patch -p0 < ../$name-$version-gcc4.patch - cd mozilla/security/nss export BUILD_OPT=1 + cp -rp $name-$version/* $name-3.11 + cd $name-3.11 + patch -p1 < $SRC/$name-fixes.patch + #patch -p0 < $SRC/$name-$version-gcc-visibility.patch + cd mozilla/security/nss make nss_build_all make install - mkdir -p $PKG/usr/lib + mkdir -p $PKG/usr/lib/pkgconfig + mkdir -p $PKG/usr/bin/ mkdir -p $PKG/usr/include/nspr + mkdir -p $PKG/usr/include/nss find ../../dist/*/lib -type l \ - \( -name "*.so" -o -name "*.chk" \) \ - -exec cp -L {} $PKG/usr/lib \; - cp -Lr ../../dist/public/* $PKG/usr/include - cp -Lr ../../dist/*/include/* $PKG/usr/include/nspr + \( -name "*.so" -o -name "*.chk" \) \ + -exec cp -L {} $PKG/usr/lib \; + cp -Lr ../../dist/public/* $PKG/usr/include/ + cp -Lr ../../dist/*/include/* $PKG/usr/include/nspr + cp -Lr ../../nsprpub/Linux*/config/nspr-config $PKG/usr/bin/ + cp -Lr ../../nsprpub/lib/pkgconfig/nspr.pc $PKG/usr/lib/pkgconfig/ + cp -Lr lib/pkgconfig/nss.pc $PKG/usr/lib/pkgconfig/ + cp -Lr cmd/config/nss-config $PKG/usr/bin/ + cp -Lr ../../dist/*/lib/libcrmf.a $PKG/usr/lib/ + rm -rf $PKG/usr/include/nspr/md/ + chmod 644 $PKG/usr/include/nspr/prvrsion.h + chmod +x $PKG/usr/bin/nss-config + chmod +x $PKG/usr/bin/nspr-config } diff --git a/nss/nss-3.9.2-gcc4.patch b/nss/nss-3.9.2-gcc4.patch deleted file mode 100644 index 2d0a049..0000000 --- a/nss/nss-3.9.2-gcc4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h ---- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 -@@ -43,12 +43,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - extern const NSSOID *NSS_OID_RFC1274_UID; - extern const NSSOID *NSS_OID_RFC1274_EMAIL; - extern const NSSOID *NSS_OID_RFC2247_DC; -diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl ---- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 -@@ -233,12 +233,6 @@ - #include "nsspki1t.h" - #endif /* NSSPKI1T_H */ - --extern const NSSOID nss_builtin_oids[]; --extern const PRUint32 nss_builtin_oid_count; -- --/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ --/*extern const PRUint32 nss_attribute_type_alias_count;*/ -- - EOD - ; - -diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h ---- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 -+++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 -@@ -55,7 +55,9 @@ - - PR_BEGIN_EXTERN_C - --/* fgmr 19990505 moved these here from oiddata.h */ -+extern const NSSOID nss_builtin_oids[]; -+extern const PRUint32 nss_builtin_oid_count; -+ - extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; - extern const PRUint32 nss_attribute_type_alias_count; - diff --git a/nss/nss-fixes.patch b/nss/nss-fixes.patch new file mode 100644 index 0000000..6d92b5e --- /dev/null +++ b/nss/nss-fixes.patch @@ -0,0 +1,197 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2006-01-19 +Initial Package Version: 3.11 +Upstream Status: Unknown +Origin: Fedora CVS (nspr-config changes by Randy McMurchy) +Description: Adds pkgconfig files for NSS and NSPR, adds a + nss-config program, and corrects the nspr-config + program + + +diff -Naur nss-3.11-orig/mozilla/nsprpub/lib/pkgconfig/nspr.pc nss-3.11/mozilla/nsprpub/lib/pkgconfig/nspr.pc +--- nss-3.11-orig/mozilla/nsprpub/lib/pkgconfig/nspr.pc 1970-01-01 00:00:00.000000000 +0000 ++++ nss-3.11/mozilla/nsprpub/lib/pkgconfig/nspr.pc 2006-01-20 03:27:43.000000000 +0000 +@@ -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.1 ++Libs: -L/usr/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl ++Cflags: -I/usr/include/nspr ++ + +diff -Naur nss-3.11-orig/mozilla/security/nss/Makefile nss-3.11/mozilla/security/nss/Makefile +--- nss-3.11-orig/mozilla/security/nss/Makefile 2005-04-15 00:28:40.000000000 +0000 ++++ nss-3.11/mozilla/security/nss/Makefile 2006-01-20 03:27:43.000000000 +0000 +@@ -130,7 +130,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-orig/mozilla/security/nss/cmd/config/nss-config nss-3.11/mozilla/security/nss/cmd/config/nss-config +--- nss-3.11-orig/mozilla/security/nss/cmd/config/nss-config 1970-01-01 00:00:00.000000000 +0000 ++++ nss-3.11/mozilla/security/nss/cmd/config/nss-config 2006-01-20 03:27:43.000000000 +0000 +@@ -0,0 +1,137 @@ ++#!/bin/sh ++ ++prefix=/usr ++ ++major_version=3 ++minor_version=11 ++patch_version=0 ++ ++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-orig/mozilla/security/nss/lib/pkgconfig/nss.pc nss-3.11/mozilla/security/nss/lib/pkgconfig/nss.pc +--- nss-3.11-orig/mozilla/security/nss/lib/pkgconfig/nss.pc 1970-01-01 00:00:00.000000000 +0000 ++++ nss-3.11/mozilla/security/nss/lib/pkgconfig/nss.pc 2006-01-20 03:27:43.000000000 +0000 +@@ -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.0 ++Requires: nspr >= 4.6.1 ++Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 ++Cflags: -I${includedir}/nss ++