Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (214a72f162c50a8caa0b1cb0b0e4b2e22d2d575e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (214a72f162c50a8caa0b1cb0b0e4b2e22d2d575e)
  • Date: Sat, 24 Aug 2013 08:25:21 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

crypto/nss/BUILD | 59 ++++---
crypto/nss/DEPENDS | 5
crypto/nss/DETAILS | 17 --
crypto/nss/HISTORY | 5
crypto/nss/INSTALL | 31 ++-
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 16 +-
crypto/nss/PRE_SUB_DEPENDS | 1
crypto/nss/SUB_DEPENDS | 14 +
crypto/nss/nss-3.15.1-standalone-2.patch | 241
+++++++++++++++++++++++++++++++
10 files changed, 334 insertions(+), 57 deletions(-)

New commits:
commit 214a72f162c50a8caa0b1cb0b0e4b2e22d2d575e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

nss: branch 3.15, version 3.15.1

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 58702b8..a0b9b1a 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -1,31 +1,36 @@
-export BUILD_OPT=1 &&
-export NSS_USE_SYSTEM_SQLITE=1 &&
-export NSS_ENABLE_ECC=1 &&
+MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1" &&

persistent_add MAKE_OPTS &&
-if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]
-then
- MAKE_OPTS="USE_64=1"
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ MAKE_OPTS="$MAKE_OPTS USE_64=1"
fi &&

-cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
-
-echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk &&
-
-if [[ $NSS_BRANCH == 3.11 ]]; then
- sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk
-fi &&
-
-make_single &&
-
-make $MAKE_OPTS &&
-
-cd ../dbm &&
-
-make $MAKE_OPTS &&
-
-cd ../nss &&
-
-make $MAKE_OPTS &&
-
-make_normal
+if [[ $NSS_BRANCH == "3.15" ]]; then
+ cd $SOURCE_DIRECTORY/nss &&
+ MAKE_OPTS="$MAKE_OPTS NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1
ZLIB_LIBS=-lz"
+ make_single &&
+ make $MAKE_OPTS &&
+ make_normal
+else
+ cd $SOURCE_DIRECTORY/mozilla/security/coreconf &&
+
+ echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' >> headers.mk
&&
+
+ if [[ $NSS_BRANCH == 3.11 ]]; then
+ sedit 's:$(DIST)/lib:/usr/lib/nspr:' location.mk
+ fi &&
+
+ make_single &&
+
+ make $MAKE_OPTS &&
+
+ cd ../dbm &&
+
+ make $MAKE_OPTS &&
+
+ cd ../nss &&
+
+ make $MAKE_OPTS &&
+
+ make_normal
+fi
diff --git a/crypto/nss/DEPENDS b/crypto/nss/DEPENDS
index 489833f..da8fb93 100755
--- a/crypto/nss/DEPENDS
+++ b/crypto/nss/DEPENDS
@@ -1,4 +1,7 @@
depends nspr &&
depends perl &&
depends sqlite &&
-depends zip
+depends zip &&
+if [[ $NSS_BRANCH == "3.15" ]]; then
+ depends zlib
+fi
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index fba0f10..54941c5 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,7 +1,7 @@
SPELL=nss

if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.14
+ NSS_BRANCH=3.15
fi

case $NSS_BRANCH in
@@ -16,18 +16,9 @@ case $NSS_BRANCH in
VERSION=3.12.11
SECURITY_PATCH=3
PATCHLEVEL=1
-# FFVERSION=3.6.2
-# SOURCE=$SPELL-$VERSION.tar.gz
SOURCE=nss-3.12.11.with.ckbi.1.88.tar.gz
-#
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_WITH_CKBI_1_88_RTM/src/$SOURCE

SOURCE_HASH=sha512:19601383313fe6457b1af03161a9902811a77715e8a9a04ec4e70fd8e9685b3883497b7a8c5f877728fea2144c3e14c0d811f13fe1cd39dccd95feb60d3eb57f
-# SOURCE=firefox-$FFVERSION.source.tar.bz2
-# SOURCE2=$SOURCE.asc
-# SOURCE2_IGNORE=signature
-# SOURCE_GPG=firefox.gpg:$SOURCE2:WORKS_FOR_ME
-#
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
-# SOURCE2_URL[0]=$SOURCE_URL.asc
;;
3.13)
VERSION=3.13.6
@@ -42,6 +33,12 @@ case $NSS_BRANCH in

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:4e8d8517ffb6d03da274afe9a7c50e2f0a15ffdd83e63f29a445e7aee829a8b7e2fbc772695322bd6acee81c052811735b542978044996156cb52dd7e4c001ec
;;
+ 3.15)
+ VERSION=3.15.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
+
SOURCE_HASH=sha512:173bd80771c9a64307750733a6aa2f716e61d4b060cc61d11ec741b0b214a33b188d3e23924c062f28587785077902266f3d30e60d2c141dc54d2679736f88ec
+ ;;
esac

SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 04e5e6d..e10bb31 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2013-08-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS, DEPENDS, PREPARE, PRE_BUILD, BUILD, INSTALL,
+ SUB_DEPENDS, PRE_SUB_DEPENDS, nss-3.15.1-standalone-2.patch:
+ Added 3.15 branch for version 3.15.1
+
2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.14.3
* nss-3.14.3_sync_with_upstream_softokn_changes.patch, PRE_BUILD:
diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index 5b816d2..704dd64 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,18 +1,33 @@
-cd $SOURCE_DIRECTORY/mozilla/dist &&
+if [[ $NSS_BRANCH == "3.15" ]]; then
+ cd $SOURCE_DIRECTORY/dist
+else
+ cd $SOURCE_DIRECTORY/mozilla/dist
+fi &&

# don't overwrite OpenSSL's libssl.a static library
-cd */lib &&
+pushd */lib &&
mv -v libssl.a libssl3.a &&
-cd $SOURCE_DIRECTORY/mozilla/dist &&
+popd &&

-install -v -d -m755 $INSTALL_ROOT/usr/lib/nss &&
-install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
+install -v -d -m755 $INSTALL_ROOT/usr/lib &&
install -v -m755 */lib/*.so $INSTALL_ROOT/usr/lib &&
install -v -m755 */lib/*.chk $INSTALL_ROOT/usr/lib &&
install -v -m755 */lib/*.a $INSTALL_ROOT/usr/lib &&
+
+install -v -d -m755 $INSTALL_ROOT/usr/lib/pkgconfig &&
+if [[ $NSS_BRANCH == "3.15" ]]; then
+ install -v -m644 */lib/pkgconfig/nss.pc $INSTALL_ROOT/usr/lib/pkgconfig
+else
+ install -v -m644 ../security/nss/cmd/disttools/nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig
+fi &&
+
+install -v -d -m755 $INSTALL_ROOT/usr/bin &&
install -v -m755 */bin/* $INSTALL_ROOT/usr/bin &&
+if [[ $NSS_BRANCH != "3.15" ]]; then
+ install -v -m755 ../security/nss/cmd/disttools/nss-config
$INSTALL_ROOT/usr/bin
+fi &&
+
+install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
install -v -m644 private/nss/*.h $INSTALL_ROOT/usr/include/nss &&
install -v -m644 public/nss/*.h $INSTALL_ROOT/usr/include/nss &&
-install -v -m644 public/dbm/*.h $INSTALL_ROOT/usr/include/nss/ &&
-install -v -m755 ../security/nss/cmd/disttools/nss-config
$INSTALL_ROOT/usr/bin &&
-install -v -m644 ../security/nss/cmd/disttools/nss.pc
$INSTALL_ROOT/usr/lib/pkgconfig
+install -v -m644 public/dbm/*.h $INSTALL_ROOT/usr/include/nss
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 686f58a..3b52816 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13 3.14
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13 3.14 3.15
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index e1c1e62..429b805 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,16 +2,18 @@ default_pre_build &&

cd $SOURCE_DIRECTORY &&

-if [[ $NSS_BRANCH == "3.14" || $NSS_BRANCH == "DEFAULT" ]]; then
+if [[ $NSS_BRANCH == "3.15" || $NSS_BRANCH == "DEFAULT" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
+elif [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
fi &&

-if [[ "$NSS_PEM" == "y" ]]; then
-tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
-patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
-if [[ $NSS_BRANCH == "3.14" || $NSS_BRANCH == "DEFAULT" ]]; then
- patch -p1 <
$SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch
-fi
+if [[ "$NSS_PEM" == "y" && $NSS_BRANCH != "3.15" ]]; then
+ tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
+ patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
+ if [[ $NSS_BRANCH == "3.14" ]]; then
+ patch -p1 <
$SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch
+ fi
fi
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index eeb2144..ba9efc3 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
3.12.x) if [ $NSS_BRANCH == "3.12" ]; then return 0; fi;;
3.13.x) if [ $NSS_BRANCH == "3.13" ]; then return 0; fi;;
3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
+ 3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index f65ca3d..5a1ad57 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -5,7 +5,15 @@ case $THIS_SUB_DEPENDS in
NSS_BRANCH="3.13" ;;
3.14.x) echo "3.14.x release needed, forcing it." &&
NSS_BRANCH="3.14" ;;
- PEM) echo "nss with pem needed, forcing it." &&
- NSS_PEM="y" ;;
- *) echo "unknown sub-depends!"; return 1 ;;
+ 3.15.x) echo "3.15.x release needed, forcing it." &&
+ NSS_BRANCH="3.15" ;;
+ PEM) if [[ $NSS_BRANCH == "3.15" ]]; then
+ echo "pem is not supported yet for branch 3.15" &&
+ return 1
+ else
+ echo "nss with pem needed, forcing it." &&
+ NSS_PEM="y"
+ fi
+ ;;
+ *) echo "unknown sub-depends!"; return 1 ;;
esac
diff --git a/crypto/nss/nss-3.15.1-standalone-2.patch
b/crypto/nss/nss-3.15.1-standalone-2.patch
new file mode 100644
index 0000000..289dbc2
--- /dev/null
+++ b/crypto/nss/nss-3.15.1-standalone-2.patch
@@ -0,0 +1,241 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2013-07-02
+Initial Package Version: 3.15
+Upstream Status: Not applicable
+Origin: Based on dj's original patch, rediffed and modified
for 3.15
+Description: Adds auto-generated nss.pc and nss-config script,
and allows
+ building without nspr in the source tree.
+
+--- a/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/Makefile 2013-07-02 14:53:56.684750636 +0200
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- a/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss-config.in 2013-07-02 14:52:58.328084334 +0200
+@@ -0,0 +1,153 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_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
++ smime
++ ssl
++ softokn
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=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
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ softokn)
++ lib_softokn=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="-L$libdir"
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+--- a/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss.pc.in 2013-07-02 14:52:58.328084334 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@
-lsoftokn@NSS_MAJOR_VERSION@
++Cflags: -I${includedir}
++
+--- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200
++++ b/nss/Makefile 2013-07-02 14:52:58.328084334 +0200
+@@ -44,7 +44,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_nspr all
++nss_build_all: all
+
+ nss_clean_all: clobber_nspr clobber
+
+--- a/nss/manifest.mn 2013-05-28 23:43:24.000000000 +0200
++++ b/nss/manifest.mn 2013-07-02 14:52:58.331417666 +0200
+@@ -10,4 +10,4 @@
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config




Archive powered by MHonArc 2.6.24.

Top of Page