Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15321
Modified Files:
nss.1d.info
Added Files:
libnss.1d.info libnss.1d.patch
Log Message:
overhaul the packaging so it actually might work
--- NEW FILE: libnss.1d.info ---
Package: libnss.1d
Version: 3.12.6
Revision: 5
BuildDepends: <<
fink (>= 0.28),
nspr.0d (>= 4.8.4-4),
sqlite3-dev (>= 3.6.13-3)
<<
Depends: %N-shlibs (= %v-%r)
Conflicts: nss.1d
Replaces: nss.1d
BuildDependsOnly: true
BuildConflicts: nspr
Source:
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-%v.tar.gz
Source-MD5: da42596665f226de5eb3ecfc1ec57cd1
SourceDirectory: nss-%v/mozilla/security
PatchFile: %n.patch
PatchFile-MD5: e1705d31d55a51b32a9b0377398956b1
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.1d
CompileScript: <<
#!/bin/sh -ev
if grep -q 64 %p/var/lib/fink/path-prefix-10.6/compiler_wrapper ; then
export USE_64=1 ; fi
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@,6,; s,@prefix@,%p,' nss-config.in > nss-config
<<
InstallScript: <<
#!/bin/sh -ev
includedir=%p/include/nss.1d
libdir=%p/lib/nss.1d
mkdir -p %d$libdir
for file in \
libfreebl3.dylib \
libnss3.dylib \
libnssckbi.so \
libnssutil3.dylib \
libsmime3.dylib \
libsoftokn3.dylib \
libssl3.dylib \
; do
install -m 644 ../dist/*.OBJ/lib/$file %d$libdir
done
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 %d$includedir
install -m 644 ../dist/public/nss/*.h %d$includedir
<<
DocFiles: LICENSE
SplitOff: <<
Package: %N-shlibs
Depends: <<
nspr.0d-shlibs (>= 4.8.4-4),
sqlite3-shlibs (>= 3.6.13-3)
<<
Files: <<
lib/nss.1d
<<
Shlibs: <<
%p/lib/nss.1d/libnss3.dylib 1.0.1 %n (>= 3.12.6-5)
%p/lib/nss.1d/libnssutil3.dylib 1.0.1 %n (>= 3.12.6-5)
%p/lib/nss.1d/libsmime3.dylib 1.0.1 %n (>= 3.12.6-5)
%p/lib/nss.1d/libssl3.dylib 1.0.1 %n (>= 3.12.6-5)
!%p/lib/nss.1d/libfreebl3.dylib
!%p/lib/nss.1d/libsoftokn3.dylib
<<
DocFiles: LICENSE
<<
SplitOff2: <<
Package: nss-bin
Replaces: nss.1d-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: <<
Contains 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.
Sort-of 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). Rename libdir instead of trying to fighting
makefile zoo to set install_name (changing after-the-fact hard
because they dlopen each other...encoded in source not just
dyld links). Leaving some as .dylib even though might be
better as .so (or at least private in Shlibs?)
3.12.3->3.12.6 added symbols to public headers, so bump
compatibility_version manually.
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.
Reported unbuildable on x86_64:
drbg.c: In function 'RNG_RandomUpdate':
drbg:509: error: size of array 'arg' is negative
does lots of word-size determinations, apparently doesn't
do it correctly/self-consistently on this darwin arch
<<
License: Restrictive
Maintainer: Daniel Macks <[email protected]>
Homepage: http://www.mozilla.org/projects/security/pki/nss/
Index: nss.1d.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/nss.1d.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nss.1d.info 23 May 2010 21:08:37 -0000 1.6
+++ nss.1d.info 24 May 2010 20:43:34 -0000 1.7
@@ -1,12 +1,14 @@
Package: nss.1d
Version: 3.12.6
-Revision: 4
+Revision: 5
BuildDepends: <<
fink (>= 0.24.12),
nspr.0d (>= 4.8.4-4),
sqlite3-dev (>= 3.6.13-3)
<<
Depends: %N-shlibs (= %v-%r)
+Conflicts: libnss.1d
+Replaces: libnss.1d
BuildDependsOnly: true
BuildConflicts: nspr
Source:
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-%v.tar.gz
@@ -105,16 +107,11 @@
<<
SplitOff2: <<
Package: %N-bin
- Depends: <<
- %N-shlibs (>= %v-%r),
- nspr.0d-shlibs,
- sqlite3-shlibs (>= 3.6.13-3)
- <<
+ Depends: nss-bin, fink-obsolete-packages
InstallScript: <<
- mkdir -p %i/bin
- install -m 755 ../dist/*.OBJ/bin/* %i/bin
+ mkdir -p %i/share/installed-packages
+ touch %i/share/installed-packages/%n
<<
- DocFiles: LICENSE
<<
Description: Network Security Service
DescDetail: <<
--- NEW FILE: libnss.1d.patch ---
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/coreconf/Darwin.mk
nss-3.12.6/mozilla/security/coreconf/Darwin.mk
--- nss-3.12.6.orig/mozilla/security/coreconf/Darwin.mk 2010-02-04
13:59:10.000000000 -0500
+++ nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-03-26
03:07:56.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))
@@ -122,11 +121,11 @@
DSO_CFLAGS = -fPIC
# May override this with different compatibility and current version numbers.
-DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
+DARWIN_DYLIB_VERSIONS = -compatibility_version 1.0.1 -current_version 1.0.1
# May override this with -bundle to create a loadable module.
-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name
@executable_path/$(notdir $@) -headerpad_max_install_names
+DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -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.6.orig/mozilla/security/nss/cmd/platlibs.mk
nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk 2010-02-04
13:59:10.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-03-26
01:43:58.000000000 -0400
@@ -130,7 +130,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) \
@@ -179,6 +178,7 @@
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
+ -L$(SQLITE_LIB_DIR) \
$(SQLITE) \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
diff -Nurd -x'*~'
nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/config.mk
nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/config.mk
--- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/config.mk
2009-06-10 20:55:34.000000000 -0400
+++ nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/config.mk 2010-03-26
01:43:58.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=so
ifndef USE_64
DSO_LDOPTS = -bundle
endif
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/nss/nssinit.c
nss-3.12.6/mozilla/security/nss/lib/nss/nssinit.c
--- nss-3.12.6.orig/mozilla/security/nss/lib/nss/nssinit.c 2010-01-21
21:10:54.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss/lib/nss/nssinit.c 2010-03-26
01:43:58.000000000 -0400
@@ -275,7 +275,7 @@
#elif defined(HPUX) && !defined(__ia64) /* HP-UX PA-RISC */
"libnssckbi.sl";
#elif defined(DARWIN)
- "libnssckbi.dylib";
+ "libnssckbi.so";
#elif defined(XP_UNIX) || defined(XP_BEOS)
"libnssckbi.so";
#else
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk
nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk
--- nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk 2009-06-10
20:55:48.000000000 -0400
+++ nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk 2010-03-26
01:43:58.000000000 -0400
@@ -83,6 +83,7 @@
-L$(DIST)/lib \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
+ -L$(SQLITE_LIB_DIR) \
-lsqlite3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/sqlite/manifest.mn
nss-3.12.6/mozilla/security/nss/lib/sqlite/manifest.mn
--- nss-3.12.6.orig/mozilla/security/nss/lib/sqlite/manifest.mn 2010-01-09
00:04:37.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss/lib/sqlite/manifest.mn 2010-03-26
01:43:58.000000000 -0400
@@ -38,7 +38,7 @@
MODULE = nss
-LIBRARY_NAME = sqlite
+LIBRARY_NAME =
LIBRARY_VERSION = 3
MAPFILE = $(OBJDIR)/sqlite.def
DEFINES += -DSQLITE_THREADSAFE=1
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss-config.in
nss-3.12.6/mozilla/security/nss-config.in
--- nss-3.12.6.orig/mozilla/security/nss-config.in 1969-12-31
19:00:00.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss-config.in 2010-03-26 01:43:58.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.1d
+fi
+if test -z "$libdir"; then
+ libdir=${exec_prefix}/lib/nss.1d
+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.6.orig/mozilla/security/nss.pc.in
nss-3.12.6/mozilla/security/nss.pc.in
--- nss-3.12.6.orig/mozilla/security/nss.pc.in 1969-12-31 19:00:00.000000000
-0500
+++ nss-3.12.6/mozilla/security/nss.pc.in 2010-03-26 01:43:58.000000000
-0400
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/nss.1d
+includedir=${prefix}/include/nss.1d
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @VERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Cflags: -I${includedir}
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
