Author: sip Date: 2006-03-30 13:54:13 +0200 (Thu, 30 Mar 2006) New Revision: 1070 Added: crux-2.2/ports/opt/nss/nss-3.9.2-gcc4.patch Modified: crux-2.2/ports/opt/nss/.md5sum crux-2.2/ports/opt/nss/Pkgfile Log: nss: updated to 3.9.2, added gcc4 patch (thanks to jaeger) Modified: crux-2.2/ports/opt/nss/.md5sum =================================================================== --- crux-2.2/ports/opt/nss/.md5sum 2006-03-30 11:38:55 UTC (rev 1069) +++ crux-2.2/ports/opt/nss/.md5sum 2006-03-30 11:54:13 UTC (rev 1070) @@ -1 +1,2 @@ -9d6349eca70dc2ad06d2f6b01570faa7 nss-3.9.tar.gz +a3ab6ae2213780c0e20c5b9aa8f018e9 nss-3.9.2-gcc4.patch +c10b5100510dab1e3c94b76a4d7b1f23 nss-3.9.2.tar.gz Modified: crux-2.2/ports/opt/nss/Pkgfile =================================================================== --- crux-2.2/ports/opt/nss/Pkgfile 2006-03-30 11:38:55 UTC (rev 1069) +++ crux-2.2/ports/opt/nss/Pkgfile 2006-03-30 11:54:13 UTC (rev 1070) @@ -5,12 +5,14 @@ # Depends on: zip name=nss -version=3.9 +version=3.9.2 release=1 -source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_9_RTM/src/$name-$version.tar.gz) +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) build() { cd $name-$version + patch -p0 < ../$name-$version-gcc4.patch cd mozilla/security/nss export BUILD_OPT=1 make nss_build_all Added: crux-2.2/ports/opt/nss/nss-3.9.2-gcc4.patch =================================================================== --- crux-2.2/ports/opt/nss/nss-3.9.2-gcc4.patch (rev 0) +++ crux-2.2/ports/opt/nss/nss-3.9.2-gcc4.patch 2006-03-30 11:54:13 UTC (rev 1070) @@ -0,0 +1,46 @@ +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; +