Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10845
Added Files:
nss.1d.info nss.1d.patch
Log Message:
new package...what a mess!
--- NEW FILE: nss.1d.patch ---
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/coreconf/Darwin.mk
nss-3.12.3/mozilla/security/coreconf/Darwin.mk
--- nss-3.12.3.orig/mozilla/security/coreconf/Darwin.mk 2009-03-20
03:19:35.000000000 -0400
+++ nss-3.12.3/mozilla/security/coreconf/Darwin.mk 2009-07-14
00:51:04.000000000 -0400
@@ -92,7 +92,6 @@
endif
endif
- LDFLAGS += $(DARWIN_SDK_LDFLAGS)
endif
# "Commons" are tentative definitions in a global scope, like this:
@@ -105,7 +104,7 @@
# definitions so that the linker can catch multiply-defined symbols.
# Also, common symbols are not allowed with Darwin dynamic libraries.
-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings
-fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings
-fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
ifdef BUILD_OPT
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
@@ -119,9 +118,9 @@
DSO_CFLAGS = -fPIC
# May override this with -bundle to create a loadable module.
-DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1
-install_name @executable_path/$(notdir $@) -headerpad_max_install_names
+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1
-install_name $(libdir)/$(notdir $@) -headerpad_max_install_names
-MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
+MKSHLIB = $(CC) $(DSO_LDOPTS)
DLL_SUFFIX = dylib
PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/nss/cmd/platlibs.mk
nss-3.12.3/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.12.3.orig/mozilla/security/nss/cmd/platlibs.mk 2008-12-02
18:24:46.000000000 -0500
+++ nss-3.12.3/mozilla/security/nss/cmd/platlibs.mk 2009-07-13
20:44:20.000000000 -0400
@@ -128,7 +128,6 @@
$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
$(PKIXLIB) \
$(DBMLIB) \
- $(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
@@ -201,6 +200,7 @@
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
+ -L$(SQLITE_LIB_DIR) \
$(SQLITE) \
-lnssutil3 \
-L$(NSPR_LIB_DIR) \
diff -Nurd -x'*~'
nss-3.12.3.orig/mozilla/security/nss/lib/ckfw/builtins/config.mk
nss-3.12.3/mozilla/security/nss/lib/ckfw/builtins/config.mk
--- nss-3.12.3.orig/mozilla/security/nss/lib/ckfw/builtins/config.mk
2009-03-20 03:19:36.000000000 -0400
+++ nss-3.12.3/mozilla/security/nss/lib/ckfw/builtins/config.mk 2009-07-14
03:14:53.000000000 -0400
@@ -47,7 +47,7 @@
PROGRAM =
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
- SHARED_LIBRARY =
$(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+ SHARED_LIBRARY =
$(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).so
RES = $(OBJDIR)/$(LIBRARY_NAME).res
RESNAME = $(LIBRARY_NAME).rc
endif
@@ -60,6 +60,7 @@
# To create a loadable module on Darwin, we must use -bundle.
#
ifeq ($(OS_TARGET),Darwin)
+DLL_SUFFIX=1d.so
ifndef USE_64
DSO_LDOPTS = -bundle
endif
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/nss/lib/nss/nssinit.c
nss-3.12.3/mozilla/security/nss/lib/nss/nssinit.c
--- nss-3.12.3.orig/mozilla/security/nss/lib/nss/nssinit.c 2008-08-21
21:33:03.000000000 -0400
+++ nss-3.12.3/mozilla/security/nss/lib/nss/nssinit.c 2009-07-14
02:30:42.000000000 -0400
@@ -303,7 +303,7 @@
#elif defined(HPUX) && !defined(__ia64) /* HP-UX PA-RISC */
"libnssckbi.sl";
#elif defined(DARWIN)
- "libnssckbi.dylib";
+ "libnssckbi.1d.so";
#elif defined(XP_UNIX) || defined(XP_BEOS)
"libnssckbi.so";
#else
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/nss/lib/softoken/config.mk
nss-3.12.3/mozilla/security/nss/lib/softoken/config.mk
--- nss-3.12.3.orig/mozilla/security/nss/lib/softoken/config.mk 2008-11-19
15:09:44.000000000 -0500
+++ nss-3.12.3/mozilla/security/nss/lib/softoken/config.mk 2009-07-13
20:43:17.000000000 -0400
@@ -86,6 +86,7 @@
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-lnssutil3 \
+ -L$(SQLITE_LIB_DIR) \
-lsqlite3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/nss/lib/sqlite/manifest.mn
nss-3.12.3/mozilla/security/nss/lib/sqlite/manifest.mn
--- nss-3.12.3.orig/mozilla/security/nss/lib/sqlite/manifest.mn 2007-08-15
11:30:05.000000000 -0400
+++ nss-3.12.3/mozilla/security/nss/lib/sqlite/manifest.mn 2009-07-13
23:32:49.000000000 -0400
@@ -38,7 +38,7 @@
MODULE = nss
-LIBRARY_NAME = sqlite
+LIBRARY_NAME =
LIBRARY_VERSION = 3
MAPFILE = $(OBJDIR)/sqlite.def
DEFINES += -DTHREADSAFE=1
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/nss-config.in
nss-3.12.3/mozilla/security/nss-config.in
--- nss-3.12.3.orig/mozilla/security/nss-config.in 1969-12-31
19:00:00.000000000 -0500
+++ nss-3.12.3/mozilla/security/nss-config.in 2009-07-13 23:44:32.000000000
-0400
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+pref...@prefix@
+
+major_versi...@mod_major_version@
+minor_versi...@mod_minor_version@
+patch_versi...@mod_patch_version@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ nssutil
+ ssl
+ smime
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=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
+ ;;
+ nssutil)
+ lib_nssutil=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=${exec_prefix}/lib/nss
+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="-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
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
+fi
+
diff -Nurd -x'*~' nss-3.12.3.orig/mozilla/security/nss.pc.in
nss-3.12.3/mozilla/security/nss.pc.in
--- nss-3.12.3.orig/mozilla/security/nss.pc.in 1969-12-31 19:00:00.000000000
-0500
+++ nss-3.12.3/mozilla/security/nss.pc.in 2009-07-13 23:42:01.000000000
-0400
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/nss
+includedir=${prefix}/include/nss
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @VERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Cflags: -I${includedir}
--- NEW FILE: nss.1d.info ---
Package: nss.1d
Version: 3.12.3
Revision: 1
BuildDepends: <<
fink (>= 0.24.12),
nspr.0d,
sqlite3 (>= 3.6.13-3)
<<
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Source:
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/nss-%v.tar.bz2
Source-MD5: ecb7079ba4ebcf29b7716775384f1f18
SourceDirectory: nss-%v/mozilla/security
PatchFile: %n.patch
PatchFile-MD5: b4ca6c889ba49e72bca0683f2c359696
PatchScript: <<
#!/bin/sh -ev
patch -p3 < %{PatchFile}
cp %p/include/sqlite3.h nss/lib/sqlite
echo "NSS is available under the Mozilla Public License, the GNU
General Public License, and the GNU Lesser General Public License." > LICENSE
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
SetMAKEFLAGS: MOZILLA_CLIENT=1 NSPR_INCLUDE_DIR=%p/include/nspr
NSPR_LIB_DIR=%p/lib/nspr SQLITE_LIB_DIR=%p/lib libdir=%p/lib/nss
CompileScript: <<
make -C nss build_coreconf
make -C dbm all
make -C nss/lib/sqlite all
make -C nss all
sed 's,@VERSION@,%v,; s,@prefix@,%p,' nss.pc.in > nss.pc
sed 's,@MOD_MAJOR_VERSION@,3,; s,@MOD_MINOR_VERSION@,12,;
s,@MOD_PATCH_VERSION@,3,; s,@prefix@,%p,' nss-config.in > nss-config
<<
InstallScript: <<
#!/bin/sh -ev
libdir=%p/lib/nss
mkdir -p %d$libdir
for file in \
libnss3.dylib \
libnssckbi.1d.so \
libnssutil3.dylib \
libsmime3.dylib \
libssl3.dylib \
; do
install -m 644 ../dist/*.OBJ/lib/$file %d$libdir
done
SO_VERSION=1d
pushd %d$libdir
files=lib*.dylib
linkers="lib*.dylib lib*.so"
echo "adjusting sonames of '$files' and links to them in
'$linkes'"
# loop through all linker libs
for file in $files; do
sofile=`echo $file | sed "s/\.dylib$/.${SO_VERSION}&/"`
# change SONAME to include libversion
install_name_tool -id $libdir/$sofile $file
# place actual file at libversioned, leaving ld link
mv $file $sofile
ln -s $sofile $file
# change dyld links pointing to SONAME
for dylib in $linkers; do
install_name_tool -change $libdir/$file
$libdir/$sofile $dylib
done
done
popd
mkdir -p %i/lib/pkgconfig
install -m 644 nss.pc %i/lib/pkgconfig
mkdir -p %i/bin
install -m 755 nss-config %i/bin
mkdir -p %i/include/nss
install -m 644 ../dist/public/nss/*.h %i/include/nss
<<
DocFiles: LICENSE
SplitOff: <<
Package: %N-shlibs
Depends: <<
nspr.0d-shlibs,
sqlite3-shlibs (>= 3.6.13-3)
<<
Files: <<
lib/nss/lib*.1d.dylib
lib/nss/lib*.1d.so
<<
Shlibs: <<
%p/lib/nss/libnss3.1d.dylib 1.0.0 %n (>= 3.12.3-1)
%p/lib/nss/libnssutil3.1d.dylib 1.0.0 %n (>= 3.12.3-1)
%p/lib/nss/libsmime3.1d.dylib 1.0.0 %n (>= 3.12.3-1)
%p/lib/nss/libssl3.1d.dylib 1.0.0 %n (>= 3.12.3-1)
<<
DocFiles: LICENSE
<<
SplitOff2: <<
Package: %N-bin
Depends: <<
%N-shlibs (>= %v-%r),
nspr.0d-shlibs,
sqlite3-shlibs (>= 3.6.13-3)
<<
InstallScript: <<
mkdir -p %i/bin
install -m 755 ../dist/*.OBJ/bin/* %i/bin
<<
DocFiles: LICENSE
<<
Description: Network Security Service
DescDetail: <<
This is a set of libraries designed to support cross-platform
development of security-enabled client and server applications. It can
support SSLv2 and v4, TLS, PKCS #5, #7, #11, #12, S/MIME, X.509 v3
certificates and other security standards.
<<
DescPackaging: <<
Continas export-restricted crypto and upstream makes a big
deal about following export restrictions even for source
mirrors. Setting License:Restrictive until we know better.
"LICENSE" is cut'n'pasted from upstream homepage.
Follow debian soname packaging convention and makefile magic
(moz projects don't seem too good about updating install_name
or compatibility_version when changing interface). Hack our
install_name after-the-fact instead of fighting makefile zoo.
Fix extension of loadable module and make sure it builds with
libversion to allow placement in -shlibs pkg.
Bury library files so don't accidentally find them (avoid
masking other pkgs' buried libs with a top-level one).
do not use SDKs...don't need portability or fat.
Not autotooled, just simple makefile, so pass flags as needed
to get paths for dep libs, etc. Thanks to debian's source
package for some hints about the variables and that need to
install by manual copying (and borrowed their nss.pc.in and
nss-config.in templates also).
Lots of missing internal dependencies...make sure to build
libs before other libs need to link against them. Yeesh:/
Hard to get local-then-global -I ordering, but fortunately,
nspr has buried headers and libs in its own private location.
Hack -L for sqlite3 where it's needed, and copy external
sqlite3.h into internal path (and don't actually build any
internal lib at all) rather than playing with global -I paths.
<<
License: Restrictive
Maintainer: Daniel Macks <dma...@netspace.org>
Homepage: http://www.mozilla.org/projects/security/pki/nss/
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
