commit fe9f4846e230c8620a16c2beebbe7c93dbb3fb1b Author: Brett Goulder <predatorfreak@dcaf-security.org> Date: Thu Feb 14 04:21:49 2008 -0500 nss: Assume maintainership, update to 3.11.9. diff --git a/nss/.footprint b/nss/.footprint index 9f2e8ed..86d8348 100644 --- a/nss/.footprint +++ b/nss/.footprint @@ -1,13 +1,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/certutil +-rwxr-xr-x root/root usr/bin/modutil -rwxr-xr-x root/root usr/bin/nspr-config -rwxr-xr-x root/root usr/bin/nss-config +-rwxr-xr-x root/root usr/bin/pk12util +-rwxr-xr-x root/root usr/bin/signtool +-rwxr-xr-x root/root usr/bin/ssltap 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/winfile.h drwxr-xr-x root/root usr/include/nspr/ -rw-r--r-- root/root usr/include/nspr/nspr.h drwxr-xr-x root/root usr/include/nspr/obsolete/ @@ -97,7 +97,6 @@ drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/nssb64t.h -rw-r--r-- root/root usr/include/nss/nssbase.h -rw-r--r-- root/root usr/include/nss/nssbaset.h --rw-r--r-- root/root usr/include/nss/nssck.api -rw-r--r-- root/root usr/include/nss/nssckbi.h -rw-r--r-- root/root usr/include/nss/nssckepv.h -rw-r--r-- root/root usr/include/nss/nssckft.h @@ -161,16 +160,28 @@ drwxr-xr-x root/root usr/include/nss/ drwxr-xr-x root/root usr/lib/ -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 --rwxr-xr-x root/root usr/lib/libplc4.so --rwxr-xr-x root/root usr/lib/libplds4.so --rwxr-xr-x root/root usr/lib/libsmime3.so +-rw-r--r-- root/root usr/lib/libfreebl3.so +-rwxr-xr-x root/root usr/lib/libnspr4.a +lrwxrwxrwx root/root usr/lib/libnspr4.so -> libnspr4.so.7 +-rwxr-xr-x root/root usr/lib/libnspr4.so.7 +-rw-r--r-- root/root usr/lib/libnss3.so +-rw-r--r-- root/root usr/lib/libnssb.a +-rw-r--r-- root/root usr/lib/libnssckbi.so +-rw-r--r-- root/root usr/lib/libnssckfw.a +-rwxr-xr-x root/root usr/lib/libplc4.a +lrwxrwxrwx root/root usr/lib/libplc4.so -> libplc4.so.7 +-rwxr-xr-x root/root usr/lib/libplc4.so.7 +-rwxr-xr-x root/root usr/lib/libplds4.a +lrwxrwxrwx root/root usr/lib/libplds4.so -> libplds4.so.7 +-rwxr-xr-x root/root usr/lib/libplds4.so.7 +-rw-r--r-- root/root usr/lib/libsmime3.so -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 +-rw-r--r-- root/root usr/lib/libsoftokn3.so +-rw-r--r-- root/root usr/lib/libssl3.so drwxr-xr-x root/root usr/lib/pkgconfig/ +lrwxrwxrwx root/root usr/lib/pkgconfig/mozilla-nspr.pc -> nspr.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/mozilla-nss.pc -> nss.pc -rw-r--r-- root/root usr/lib/pkgconfig/nspr.pc -rw-r--r-- root/root usr/lib/pkgconfig/nss.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/aclocal/ diff --git a/nss/.md5sum b/nss/.md5sum index 4af2be3..16a41ed 100644 --- a/nss/.md5sum +++ b/nss/.md5sum @@ -1,3 +1,5 @@ -74af8ebdf94307f47ff8931adbef9c39 nss-3.11.4.tar.gz -9be73bd73e361e5e36edf77f456fa20a nss-3.11.tar.gz -b5b60b323add0e7cbc57544dd0938c02 nss-fixes.patch +f937c37f45b116130fef34b15afb6fac nspr-4.7.tar.gz +bce1611f3117b53fc904cab549c09967 nspr.pc.in +5df54e8522bebf0f8c8c22e8f0df18fa nss-3.11.9.tar.gz +dcdd6c57768e7edbf0b145f7b16b55d7 nss-config.in +845ca9dc5a140b6dfa6d74ff4ba14283 nss.pc.in diff --git a/nss/Pkgfile b/nss/Pkgfile index e4a781e..fd4fe4c 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -1,42 +1,108 @@ # Description: Mozilla Network Security Services (NSS) -# URL: http://www.mozilla.org/projects/security/pki/nss/ +# URL: http://www.mozilla.org/projects/security/pki/nss +# Packager: Brett Goulder, predatorfreak at dcaf-security dot org # Maintainer: Brett Goulder, predatorfreak at dcaf-security dot org -# Packager: Simone Rota, sip at varlock dot com -# Depends on: zip name=nss -version=3.11.4 +version=3.11.9 release=1 -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) +source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/$name/releases/NSS_3_11_9_RTM/src/$name-$version.tar.gz \ +ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.7/src/nspr-4.7.tar.gz +nspr.pc.in +nss.pc.in +nss-config.in) build() { 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 + export XCFLAGS=${CFLAGS} + export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + cd $name-$version + mv $SRC/nspr-4.7/mozilla/* mozilla/ + ./mozilla/nsprpub/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --includedir=/usr/include/nspr \ + --enable-optimize="${CFLAGS}" \ + --disable-debug + make + export MINOR_VERSION=7 + make DESTDIR=$PKG install + cd $PKG/usr/lib + for file in *.so; do + mv ${file} ${file}.${MINOR_VERSION} + ln -s ${file}.${MINOR_VERSION} ${file} + done + cd $SRC/$name-$version + + export NSPR_INCLUDE_DIR="/usr/include/nspr" + export NSPR_LIB_DIR="/usr/lib" + + NSPR_LIBS=`./config/nspr-config --libs` + NSPR_CFLAGS=`./config/nspr-config --cflags` + NSPR_VERSION=`./config/nspr-config --version` 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 - 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 + sed $SRC/nspr.pc.in -e "s,%libdir%,/usr/lib," \ + -e "s,%prefix%,/usr," \ + -e "s,%exec_prefix%,/usr/bin," \ + -e "s,%includedir%,/usr/include/nspr," \ + -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ + -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ + -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > $PKG/usr/lib/pkgconfig/nspr.pc + ln -sf nspr.pc $PKG/usr/lib/pkgconfig/mozilla-nspr.pc + install -d $PKG/usr/bin + install -m755 config/nspr-config $PKG/usr/bin/nspr-config + + make -j 1 -C mozilla/security/coreconf + make -j 1 -C mozilla/security/dbm + make -j 1 -C mozilla/security/nss + + install -d $PKG/usr/include/nss + + NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` + NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` + NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` + + sed $SRC/nss.pc.in -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,4.6.7,g" \ + -e "s,%NSS_VERSION%,3.11.7,g" > \ + $PKG/usr/lib/pkgconfig/nss.pc + + ln -sf nss.pc $PKG/usr/lib/pkgconfig/mozilla-nss.pc + chmod 644 $PKG/usr/lib/pkgconfig/*.pc + + sed $SRC/nss-config.in -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr/bin,g" \ + -e "s,@exec_prefix@,/usr/bin,g" \ + -e "s,@includedir@,/usr/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ + -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ + -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ + > $PKG/usr/bin/nss-config + chmod 755 $PKG/usr/bin/nss-config + + for file in libnss3.so libssl3.so libsmime3.so \ + libsoftokn3.so libsoftokn3.chk libnssckbi.so \ + libfreebl3.so libfreebl3.chk; do + install -m644 mozilla/dist/*.OBJ/lib/${file} $PKG/usr/lib/ + done + + for file in libcrmf.a libnssb.a libnssckfw.a; do + install -m644 mozilla/dist/*.OBJ/lib/${file} $PKG/usr/lib/ + done + + for file in certutil modutil pk12util signtool ssltap; do + install -m755 mozilla/dist/*.OBJ/bin/${file} $PKG/usr/bin/ + done + + install -m644 mozilla/dist/public/nss/*.h $PKG/usr/include/nss/ + + rm -rf $PKG/usr/bin/compile-et.pl \ + $PKG/usr/bin/prerr.properties \ + $PKG/usr/share/aclocal/nspr.m4 \ + $PKG/usr/include/nspr/md } diff --git a/nss/nss-fixes.patch b/nss/nss-fixes.patch deleted file mode 100644 index 6d92b5e..0000000 --- a/nss/nss-fixes.patch +++ /dev/null @@ -1,197 +0,0 @@ -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 -+