sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (eda8bc72d6ac08b87c8e4d1521932e26f3f6887d)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (eda8bc72d6ac08b87c8e4d1521932e26f3f6887d)
Date: Tue, 9 Feb 2016 19:37:12 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

crypto/nss/BUILD | 2
crypto/nss/DETAILS | 4
crypto/nss/HISTORY | 6
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 9 -
crypto/nss/PRE_SUB_DEPENDS | 1
crypto/nss/SUB_DEPENDS | 3
crypto/nss/nss-3.21-standalone-1.patch | 248
+++++++++++++++++++++++++++++++++
http/firefox/DEPENDS | 2
http/firefox/DETAILS | 4
http/firefox/HISTORY | 4
11 files changed, 275 insertions(+), 10 deletions(-)

New commits:
commit eda8bc72d6ac08b87c8e4d1521932e26f3f6887d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 44.0.1

commit dae4ce74e76891f29c055d77ca653354465a9d6a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/nss: added 3.21.x branch

diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD
index 25b0660..7d26628 100755
--- a/crypto/nss/BUILD
+++ b/crypto/nss/BUILD
@@ -1,4 +1,4 @@
-MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1" &&
+MAKE_OPTS="BUILD_OPT=1 NSS_USE_SYSTEM_SQLITE=1 NSS_ENABLE_ECC=1
NSS_ENABLE_WERROR=0" &&

persistent_add MAKE_OPTS &&
if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 98ef212..d21ff51 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -30,6 +30,10 @@ case $NSS_BRANCH in
3.20)
VERSION=3.20.2

SOURCE_HASH=sha512:030cd019a43f326b06d5524390c166a1a6be52a3f5f05e2e4a651677d6031659cbfca6ddb5d492ba95e816672ac289a4d09da14fd54131aad6967496f471a7e7
+ ;;
+ 3.21)
+ VERSION=3.21
+
SOURCE_HASH=sha512:0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 599b307..113ccbc 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2016-02-09 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE, *SUB_DEPENDS: added 3.21.x branch
+ * BUILD: disabled -Werror flag
+ * PRE_BUILD, nss-3.21-standalone-1.patch: merged some elifs, added
+ patch for 3.21.x branch
+
2015-12-23 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, SUB_DEPENDS, PRE_SUB_DEPENDS, PREPARE: new 3.20 branch,
with version 3.20.2
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index ad8d5cf..16c9a48 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,4 +1,4 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 &&
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.20
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index ec206bf..21aa5c4 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,16 +1,15 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NSS_BRANCH == "3.19" ]] || [[ $NSS_BRANCH == "3.20" ]]; then
- patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
-elif [[ $NSS_BRANCH == "3.18" ]]; then
- patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
-elif [[ $NSS_BRANCH == "3.17" ]]; then
+if [[ $NSS_BRANCH == "3.19" ]] || [[ $NSS_BRANCH == "3.20" ]] ||
+ [[ $NSS_BRANCH == "3.18" ]] || [[ $NSS_BRANCH == "3.17" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; 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
+elif [[ $NSS_BRANCH == "3.21" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.21-standalone-1.patch
else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
fi &&
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index b5c5a27..899ec73 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -6,6 +6,7 @@ case $THIS_SUB_DEPENDS in
3.18.x) if [ $NSS_BRANCH == "3.18" ]; then return 0; fi;;
3.19.x) if [ $NSS_BRANCH == "3.19" ]; then return 0; fi;;
3.20.x) if [ $NSS_BRANCH == "3.20" ]; then return 0; fi;;
+ 3.21.x) if [ $NSS_BRANCH == "3.21" ]; 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 d9f4749..d202509 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -20,6 +20,9 @@ case $THIS_SUB_DEPENDS in
3.20.x) message "${MESSAGE_COLOR}3.20.x release needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_BRANCH="3.20"
;;
+ 3.21.x) message "${MESSAGE_COLOR}3.21.x release needed, forcing
it.${DEFAULT_COLOR}" &&
+ NSS_BRANCH="3.21"
+ ;;
PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_PEM="y"
;;
diff --git a/crypto/nss/nss-3.21-standalone-1.patch
b/crypto/nss/nss-3.21-standalone-1.patch
new file mode 100644
index 0000000..33b09b8
--- /dev/null
+++ b/crypto/nss/nss-3.21-standalone-1.patch
@@ -0,0 +1,248 @@
+Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot
br>
+Date: 2015-11-10
+Initial Package Version: 3.21
+Upstream Status: Not applicable
+Origin: Based on dj's original patch, rediffed and
+ modified for 3.15 by Armin K.
+ <krejzi at email dot com>
+Description: Adds auto-generated nss.pc and nss-config script,
and
+ allows building without nspr in the source tree.
+
+diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile
+--- nss-3.21.orig/nss/config/Makefile 1969-12-31 21:00:00.000000000 -0300
++++ nss-3.21/nss/config/Makefile 2015-11-10 12:54:49.358835857 -0300
+@@ -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
++
+diff -Naur nss-3.21.orig/nss/config/nss-config.in
nss-3.21/nss/config/nss-config.in
+--- nss-3.21.orig/nss/config/nss-config.in 1969-12-31 21:00:00.000000000
-0300
++++ nss-3.21/nss/config/nss-config.in 2015-11-10 12:54:49.359835835 -0300
+@@ -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
++
+diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in
+--- nss-3.21.orig/nss/config/nss.pc.in 1969-12-31 21:00:00.000000000 -0300
++++ nss-3.21/nss/config/nss.pc.in 2015-11-10 12:54:49.359835835 -0300
+@@ -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}
++
+diff -Naur nss-3.21.orig/nss/Makefile nss-3.21/nss/Makefile
+--- nss-3.21.orig/nss/Makefile 2015-11-09 02:12:59.000000000 -0300
++++ nss-3.21/nss/Makefile 2015-11-10 12:54:49.359835835 -0300
+@@ -46,7 +46,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_nspr all
++nss_build_all: all
+
+ nss_clean_all: clobber_nspr clobber
+
+diff -Naur nss-3.21.orig/nss/manifest.mn nss-3.21/nss/manifest.mn
+--- nss-3.21.orig/nss/manifest.mn 2015-11-09 02:12:59.000000000 -0300
++++ nss-3.21/nss/manifest.mn 2015-11-10 12:59:22.439784449 -0300
+@@ -10,4 +10,4 @@
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd external_tests
++DIRS = coreconf lib cmd external_tests config
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index e428a5c..19085cd 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -24,7 +24,7 @@ depends -sub APNG libpng '--enable-system-png'
&&
depends librsvg2 '--enable-svg' &&

depends nspr '--with-system-nspr' &&
-depends -sub "3.20.x" nss '--with-system-nss' &&
+depends -sub "3.21.x" nss '--with-system-nss' &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB"
sqlite '--enable-system-sqlite' &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index adf0cab..6d030cb 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,7 +1,7 @@
SPELL=firefox
- VERSION=44.0
+ VERSION=44.0.1
SOURCE=$SPELL-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:d7a2d3ee595dbf356795ba8029e298d8a69645e11d9201307008ad3a0d15b586cbc119d2273a83843621024d20cd67c7d490228f1c4c09b467cb5dcbd288a864
+
SOURCE_HASH=sha512:1e6c2cc4525bfb2362bac1338b721e1021b5f6f794a9db1bf794bfd26d62a7f5ea2887af569e04c9ecf81c9da6fc9f52ba14d238de7c8274e5fb8d1f729b2e2f

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SECURITY_PATCH=91
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8b0d9ef..f8faf88 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2016-02-09 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 44.0.1
+ * DEPENDS: switched to nss 3.21.x branch
+
2016-01-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 44.0

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (eda8bc72d6ac08b87c8e4d1521932e26f3f6887d), Pavel Vinogradov, 02/09/2016