[Lunar-commits] <moonbase-other> nss: version bumped to 3.15.1.
Florin Braescu
florin at lunar-linux.org
Thu Aug 1 18:49:40 CEST 2013
commit bc1f61d7ae6b8cd8f5df9a5fbc8eb8c1c83a6d3d
Author: Florin Braescu <florin at lunar-linux.org>
Date: Thu, 01 Aug 2013 09:49:24 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/bc1f61d7ae6b8cd8f5df9a5fbc8eb8c1c83a6d3d
nss: version bumped to 3.15.1.
---
libs/nss/BUILD | +30/-14
libs/nss/DETAILS | +3/-6
libs/nss/nss-config.in | +145/-0
libs/nss/nss.pc.in | +11/-0
4 files changed, 189 insertions(+), 20 deletions(-)
--- a/libs/nss/BUILD
+++ b/libs/nss/BUILD
@@ -1,7 +1,5 @@
(
- patch_it $SOURCE_CACHE/$SOURCE2 1 &&
-
export WORKINGDIR=$PWD &&
export BUILD_OPT=1 &&
export NSS_USE_SYSTEM_SQLITE=1 &&
@@ -14,30 +12,48 @@
export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 &&
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 &&
- cd mozilla/security/coreconf &&
- sedit 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk &&
+ cd nss &&
+ cp $SCRIPT_DIRECTORY/nss-config.in nss-config.in &&
+ cp $SCRIPT_DIRECTORY/nss.pc.in nss.pc.in &&
+
+ sedit 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' coreconf/rules.mk &&
if [ "`arch`" == "x86_64" ]; then
export USE_64=1
fi &&
- make &&
- cd ../dbm &&
- make &&
- cd ../nss &&
- make &&
- cd ../.. &&
+ make &&
- export NSS_LINUXDIR=$(basename `ls -d $WORKINGDIR/mozilla/dist/Linux*`)
+ export NSS_LINUXDIR=$(basename `ls -d $WORKINGDIR/dist/Linux*`)
prepare_install &&
- install -v -m755 security/nss/config/nss-config /usr/bin &&
+ NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' lib/nss/nss.h | awk '{print $3}')
+ NSS_VMINOR=$(grep '#define.*NSS_VMINOR' lib/nss/nss.h | awk '{print $3}')
+ NSS_VPATCH=$(grep '#define.*NSS_VPATCH' lib/nss/nss.h | awk '{print $3}')
+ sed ./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,%NSS_VERSION%,${VERSION},g" \
+ > "./nss.pc"
mkdir -p /usr/lib/pkgconfig &&
- install -v -m644 security/nss/config/nss.pc /usr/lib/pkgconfig &&
+ install -v -m644 nss.pc /usr/lib/pkgconfig &&
+
+ sed ./nss-config.in \
+ -e "s, at libdir@,/usr/lib,g" \
+ -e "s, at prefix@,/usr/bin,g" \
+ -e "s, at exec_prefix@,/usr/bin,g" \
+ -e "s, at includedir@,/usr/include/nss,g" \
+ -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+ -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+ -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+ > "./nss-config"
+ install -v -m755 nss-config /usr/bin &&
- cd dist &&
+ cd ../dist &&
install -v -m755 ${NSS_LINUXDIR}/lib/*.so /usr/lib/ &&
--- a/libs/nss/DETAILS
+++ b/libs/nss/DETAILS
@@ -1,15 +1,12 @@
MODULE=nss
- VERSION=3.14
+ VERSION=3.15.1
SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE2=$MODULE-3.12.5-gentoo-fixups.diff
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src
SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src
- SOURCE2_URL=$PATCH_URL
- SOURCE_VFY=sha1:ace3642fb2ca67854ea7075d053ca01a6d81e616
- SOURCE2_VFY=sha1:dc4cacbd818c36fa7ebcf7a5dc876daeea79dd57
+ SOURCE_VFY=sha1:1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0
WEB_SITE=http://www.mozilla.org/projects/security/pki/nss
ENTERED=20060418
- UPDATED=20121029
+ UPDATED=20130731
PSAFE="no"
SHORT="a set of libraries for development of security-enabled applications"
--- /dev/null
+++ b/libs/nss/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@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=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir 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="-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
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
+fi
+
--- /dev/null
+++ b/libs/nss/nss.pc.in
@@ -0,0 +1,11 @@
+prefix=%prefix%
+exec_prefix=%exec_prefix%
+libdir=%libdir%
+includedir=%includedir%
+
+Name: NSS
+Description: Network Security Services
+Version: %NSS_VERSION%
+Requires: nspr
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
More information about the Lunar-commits
mailing list