diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-19 13:35:06 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-19 13:35:06 +0800 |
commit | 716e853082f85512d878931d3c2903f4a669c7e8 (patch) | |
tree | 3a24d58f313f014bb8f3aca107a85ec50d2fb1df /security/nss/files | |
parent | ea6bb0f0996a0cf559b13cfa9aef24e8199d6a23 (diff) | |
download | marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.gz marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.bz2 marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.lz marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.xz marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.tar.zst marcuscom-ports-716e853082f85512d878931d3c2903f4a669c7e8.zip |
Remove these ports now that they have been committed to FreeBSD.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8576 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/nss/files')
-rw-r--r-- | security/nss/files/nss-config.in | 137 | ||||
-rw-r--r-- | security/nss/files/nss.pc.in | 11 | ||||
-rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 62 | ||||
-rw-r--r-- | security/nss/files/patch-..::coreconf::command.mk | 9 | ||||
-rw-r--r-- | security/nss/files/patch-..::coreconf::rules.mk | 10 | ||||
-rw-r--r-- | security/nss/files/patch-Makefile | 11 | ||||
-rw-r--r-- | security/nss/files/patch-cmd::platlibs.mk | 14 | ||||
-rw-r--r-- | security/nss/files/patch-const | 46 | ||||
-rw-r--r-- | security/nss/files/patch-sysdb | 179 | ||||
-rw-r--r-- | security/nss/files/patch-tests | 10 |
10 files changed, 0 insertions, 489 deletions
diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in deleted file mode 100644 index d2605fec9..000000000 --- a/security/nss/files/nss-config.in +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MAJOR@ -minor_version=@MINOR@ -patch_version=@PATCH@ - -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=@exec_prefix@ -fi -if test -z "$includedir"; then - includedir=@includedir@ -fi -if test -z "$libdir"; then - libdir=@libdir@ -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,-R$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 --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in deleted file mode 100644 index 7b1714374..000000000 --- a/security/nss/files/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@PREFIX@ -exec_prefix=@PREFIX@ -libdir=@PREFIX@/lib/nss -includedir=@PREFIX@/include - -Name: NSS -Description: Mozilla Network Security Services -Version: @PORTVERSION@ -Requires: nspr -Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -Cflags: -I${includedir}/nss -I${includedir}/nss/nss diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk deleted file mode 100644 index 7a0417e0f..000000000 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ /dev/null @@ -1,62 +0,0 @@ ---- ../coreconf/FreeBSD.mk.orig Sat Jan 21 03:36:11 2006 -+++ ../coreconf/FreeBSD.mk Tue Jan 30 21:13:41 2007 -@@ -37,9 +37,9 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+DEFAULT_COMPILER = $(CC) -+CC ?= gcc -+CCC = $(CXX) - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) -@@ -49,8 +49,14 @@ - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -+OS_LIBS = $(BSD_LDOPTS) -+OPTIMIZER = - -+ifeq ($(OS_TEST),sparc64) - DSO_CFLAGS = -fPIC -+else -+DSO_CFLAGS = -fpic -+endif - DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) - - # -@@ -60,20 +66,18 @@ - USE_PTHREADS = 1 - DEFINES += -D_THREAD_SAFE -D_REENTRANT - OS_LIBS += -pthread --DSO_LDOPTS += -pthread -+DSO_LDOPTS += $(BSD_LDOPTS) - endif - - ARCH = freebsd - --MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+DLL_SUFFIX = so.1 - --ifeq ($(MOZ_OBJFORMAT),elf) --DLL_SUFFIX = so -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) - else --DLL_SUFFIX = so.1.0 -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) - endif -- --MKSHLIB = $(CC) $(DSO_LDOPTS) - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -83,3 +87,5 @@ - G++INCLUDES = -I/usr/include/g++ - - INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz diff --git a/security/nss/files/patch-..::coreconf::command.mk b/security/nss/files/patch-..::coreconf::command.mk deleted file mode 100644 index 1e3de66f7..000000000 --- a/security/nss/files/patch-..::coreconf::command.mk +++ /dev/null @@ -1,9 +0,0 @@ ---- ../coreconf/command.mk Mon Oct 10 19:46:12 2005 -+++ ../coreconf/command.mk Wed Jan 18 17:23:28 2006 -@@ -46,5 +46,5 @@ - LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) - LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) --CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ -+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ - $(XCFLAGS) - RANLIB = echo diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk deleted file mode 100644 index 59178ff6d..000000000 --- a/security/nss/files/patch-..::coreconf::rules.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- ../coreconf/rules.mk.orig Thu Apr 3 16:48:00 2003 -+++ ../coreconf/rules.mk Fri Apr 11 01:01:50 2003 -@@ -110,6 +110,7 @@ - endif - ifdef SHARED_LIBRARY - $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) -+ ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so)) - endif - ifdef IMPORT_LIBRARY - $(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR) diff --git a/security/nss/files/patch-Makefile b/security/nss/files/patch-Makefile deleted file mode 100644 index af20e9a2a..000000000 --- a/security/nss/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Thu Apr 14 20:28:40 2005 -+++ Makefile Tue Aug 30 15:32:11 2005 -@@ -78,7 +78,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_coreconf build_nspr build_dbm all -+nss_build_all: build_coreconf all - - build_coreconf: - cd $(CORE_DEPTH)/coreconf ; $(MAKE) diff --git a/security/nss/files/patch-cmd::platlibs.mk b/security/nss/files/patch-cmd::platlibs.mk deleted file mode 100644 index 4ac01e3e4..000000000 --- a/security/nss/files/patch-cmd::platlibs.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- cmd/platlibs.mk Wed Apr 6 17:35:41 2005 -+++ cmd/platlibs.mk Wed Jul 27 22:22:59 2005 -@@ -72,5 +72,4 @@ - $(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ -@@ -120,5 +118,4 @@ - $(CRYPTOLIB) \ - $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ - $(NULL) - diff --git a/security/nss/files/patch-const b/security/nss/files/patch-const deleted file mode 100644 index de5fae9f6..000000000 --- a/security/nss/files/patch-const +++ /dev/null @@ -1,46 +0,0 @@ ---- cmd/modutil/modutil.h Sun Apr 25 11:02:47 2004 -+++ cmd/modutil/modutil.h Fri Jul 22 17:35:20 2005 -@@ -53,6 +53,6 @@ - #include "error.h" - --Error FipsMode(char *arg); --Error ChkFipsMode(char *arg); -+Error FipsMode(const char *arg); -+Error ChkFipsMode(const char *arg); - Error AddModule(char *moduleName, char *libFile, char *ciphers, - char *mechanisms, char* modparms); ---- cmd/modutil/pk11.c Sun Apr 25 11:02:47 2004 -+++ cmd/modutil/pk11.c Fri Jul 22 17:36:48 2005 -@@ -53,5 +53,5 @@ - */ - Error --FipsMode(char *arg) -+FipsMode(const char *arg) - { - char *internal_name; -@@ -62,14 +62,16 @@ - SECMOD_GetInternalModule()->commonName); - if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) { -- PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError())); -+ PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name); - PR_smprintf_free(internal_name); - PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); - return FIPS_SWITCH_FAILED_ERR; - } -- PR_smprintf_free(internal_name); - if (!PK11_IsFIPS()) { -+ PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name); -+ PR_smprintf_free(internal_name); - PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]); - return FIPS_SWITCH_FAILED_ERR; - } -+ PR_smprintf_free(internal_name); - PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]); - } else { -@@ -112,5 +114,5 @@ - */ - Error --ChkFipsMode(char *arg) -+ChkFipsMode(const char *arg) - { - if(!PORT_Strcasecmp(arg, "true")) { diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb deleted file mode 100644 index 79d5f20ee..000000000 --- a/security/nss/files/patch-sysdb +++ /dev/null @@ -1,179 +0,0 @@ -This patches NSS' code to use the Operating System's standard <db.h> header -and the db-implementation from -lc. Seems to work on FreeBSD. - - -mi - ---- lib/softoken/cdbhdl.h Sun Apr 25 11:03:16 2004 -+++ lib/softoken/cdbhdl.h Fri Jul 22 00:25:16 2005 -@@ -43,6 +43,6 @@ - #define _CDBHDL_H_ - --#include "nspr.h" --#include "mcom_db.h" -+#include <nspr.h> -+#include <db.h> - #include "pcertt.h" - ---- lib/softoken/dbinit.c Tue Mar 29 13:21:18 2005 -+++ lib/softoken/dbinit.c Fri Jul 22 00:33:35 2005 -@@ -40,4 +40,5 @@ - - #include <ctype.h> -+#include <fcntl.h> - #include "seccomon.h" - #include "prinit.h" ---- lib/softoken/dbmshim.c Tue Mar 29 13:21:18 2005 -+++ lib/softoken/dbmshim.c Fri Jul 22 00:35:33 2005 -@@ -40,5 +40,6 @@ - * $Id: patch-sysdb,v 1.1 2006-12-09 15:17:54 ahze Exp $ - */ --#include "mcom_db.h" -+#include <db.h> -+#include <fcntl.h> - #include "secitem.h" - #include "secder.h" ---- lib/softoken/keydb.c Fri Jun 4 20:50:32 2004 -+++ lib/softoken/keydb.c Fri Jul 22 00:37:01 2005 -@@ -46,5 +46,6 @@ - #include "secitem.h" - #include "pcert.h" --#include "mcom_db.h" -+#include <db.h> -+#include <fcntl.h> - #include "lowpbe.h" - #include "secerr.h" ---- lib/softoken/pcertdb.c Tue Mar 29 13:21:18 2005 -+++ lib/softoken/pcertdb.c Fri Jul 22 00:40:00 2005 -@@ -44,5 +44,6 @@ - #include "lowkeyti.h" - #include "pcert.h" --#include "mcom_db.h" -+#include <db.h> -+#include <fcntl.h> - #include "pcert.h" - #include "secitem.h" ---- lib/softoken/pk11db.c Fri Apr 1 19:46:13 2005 -+++ lib/softoken/pk11db.c Fri Jul 22 00:42:01 2005 -@@ -42,5 +42,6 @@ - #include "pk11pars.h" - #include "pkcs11i.h" --#include "mcom_db.h" -+#include <db.h> -+#include <fcntl.h> - #include "cdbhdl.h" - #include "secerr.h" ---- lib/softoken/keydbi.h Tue Apr 27 19:04:38 2004 -+++ lib/softoken/keydbi.h Fri Jul 22 00:43:24 2005 -@@ -42,7 +42,7 @@ - #define _KEYDBI_H_ - --#include "nspr.h" -+#include <nspr.h> - #include "seccomon.h" --#include "mcom_db.h" -+#include <db.h> - - /* ---- lib/softoken/config.mk Mon May 24 20:13:11 2004 -+++ lib/softoken/config.mk Fri Jul 22 00:55:20 2005 -@@ -47,5 +47,4 @@ - $(CRYPTOLIB) \ - $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ - $(NULL) - ---- lib/certdb/certdb.c Sat Mar 5 03:03:03 2005 -+++ lib/certdb/certdb.c Fri Jul 22 01:02:11 2005 -@@ -53,5 +53,4 @@ - #include "keyhi.h" - #include "secitem.h" --#include "mcom_db.h" - #include "certdb.h" - #include "prprf.h" ---- lib/certdb/genname.c Sun Apr 25 11:03:03 2004 -+++ lib/certdb/genname.c Fri Jul 22 01:02:59 2005 -@@ -39,5 +39,4 @@ - #include "secitem.h" - #include "secoidt.h" --#include "mcom_db.h" - #include "secasn1.h" - #include "secder.h" ---- lib/certdb/stanpcertdb.c Thu Dec 2 16:34:15 2004 -+++ lib/certdb/stanpcertdb.c Fri Jul 22 01:03:19 2005 -@@ -38,5 +38,4 @@ - - #include "cert.h" --#include "mcom_db.h" - #include "certdb.h" - #include "secitem.h" ---- lib/certdb/xauthkid.c Sun Apr 25 11:03:03 2004 -+++ lib/certdb/xauthkid.c Fri Jul 22 01:03:54 2005 -@@ -40,6 +40,5 @@ - */ - --#include "prtypes.h" --#include "mcom_db.h" -+#include <prtypes.h> - #include "seccomon.h" - #include "secdert.h" ---- lib/certdb/xbsconst.c Sun Apr 25 11:03:03 2004 -+++ lib/certdb/xbsconst.c Fri Jul 22 01:05:41 2005 -@@ -39,6 +39,6 @@ - */ - --#include "prtypes.h" --#include "mcom_db.h" -+#include <limits.h> /* LONG_MAX */ -+#include <prtypes.h> - #include "seccomon.h" - #include "secdert.h" -@@ -48,5 +48,5 @@ - #include "certt.h" - #include "secder.h" --#include "prprf.h" -+#include <prprf.h> - #include "secerr.h" - ---- lib/certdb/xconst.c Tue Nov 9 01:13:32 2004 -+++ lib/certdb/xconst.c Fri Jul 22 01:06:20 2005 -@@ -39,6 +39,5 @@ - */ - --#include "prtypes.h" --#include "mcom_db.h" -+#include <prtypes.h> - #include "seccomon.h" - #include "secdert.h" -@@ -48,5 +47,5 @@ - #include "cert.h" - #include "secder.h" --#include "prprf.h" -+#include <prprf.h> - #include "xconst.h" - #include "genname.h" ---- lib/ckfw/dbm/ckdbm.h Wed Jan 19 21:25:47 2005 -+++ lib/ckfw/dbm/ckdbm.h Fri Jul 22 01:06:58 2005 -@@ -57,5 +57,5 @@ - #endif /* CKT_H */ - --#include "mcom_db.h" -+#include <db.h> - - NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance; ---- lib/freebl/mac_rand.c Sun Apr 25 11:03:08 2004 -+++ lib/freebl/mac_rand.c Fri Jul 22 01:08:19 2005 -@@ -40,5 +40,4 @@ - #endif - #include "secrng.h" --#include "mcom_db.h" - #ifdef XP_MAC - #include <Events.h> ---- lib/pk11wrap/secmodi.h Mon Mar 28 15:45:37 2005 -+++ lib/pk11wrap/secmodi.h Fri Jul 22 01:08:47 2005 -@@ -42,5 +42,5 @@ - #include "pkcs11.h" - #include "nssilock.h" --#include "mcom_db.h" -+#include <db.h> - #include "secoidt.h" - #include "secdert.h" diff --git a/security/nss/files/patch-tests b/security/nss/files/patch-tests deleted file mode 100644 index 2ff07f35a..000000000 --- a/security/nss/files/patch-tests +++ /dev/null @@ -1,10 +0,0 @@ ---- tests/common/init.sh Mon Apr 11 22:24:17 2005 -+++ tests/common/init.sh Fri Jul 22 16:55:36 2005 -@@ -197,5 +197,6 @@ - case $HOST in - *\.*) -- HOST=`echo $HOST | sed -e "s/\..*//"` -+ DOMSUF=${HOST#*.} # remove Smallest Prefix matching ``*.'' -+ HOST=${HOST%%.*} # remove Largest Suffix ``.*''. See sh(1) - ;; - ?*) |