nss: updated to 3.55

diff --git a/nss/.signature b/nss/.signature
index 02dd0ebb47a8b3bab032f4b2d53011f6e28e1b8c..e45d0c60c179d9827e6115d48f65e6bc2310fa5a 100644 (file)
--- a/nss/.signature
+++ b/nss/.signature
@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/opt-arm.pub
-RWQh9Dk2FlLauPy0VRIficETqnD00j32SK7g2FmQcm4YvgdIgaXCm9jCDBDEAgtyMt0mhbM0Mki/0i2WxUC2iGiCXby8Pfe1+gg=
-SHA256 (Pkgfile) = 312ecd4be6608a0cdd1f21c2bdb57dc99e13003e7d93483d2522b3ed621a3cc1
+RWQh9Dk2FlLauF5T5xGwBELL1HgiEya1i/9tjR6sw0p9sad+WjBuRSOdD4TueIf2o+kw+O33LKYAOY6ae7zVzXjRxoxn/Fd8hAA=
+SHA256 (Pkgfile) = 519d13c6f5be2305b2907d1d56513037222a0e1c1d0fd1c78f1b62fc338ad439
 SHA256 (.footprint) = 61b07e07e527c80636bf5f7bc092c8fd4c0b013c9bce26b06652cfeab22cd8b2
-SHA256 (nss-3.47.1.tar.gz) = 1ae3d1cb1de345b258788f2ef6b10a460068034c3fd64f42427a183d8342a6fb
+SHA256 (nss-3.55.tar.gz) = fc692e3db45a082ee6328cd989e795c171a00df9c518df090937f7604f850004
 SHA256 (nss-config.in) = 08dbc1202186308e86125b5c5e7e2d0e1bd1bd5ed65eab011b9af210f656aff5
 SHA256 (nss.pc.in) = 135fbde6866e422b7a436e18d5b8e0defbb67dde6b8e1dc9e84de14b5c645626
+SHA256 (nss-3.54-standalone-2.patch) = 607a29650c767f9451eaec1e35a48a3c8c9ce6a7099234417eb521a44653a371

diff --git a/nss/Pkgfile b/nss/Pkgfile
index e5ffc86cf6f6a86358f3749edaf0a49ebc646cee..2fb626329ad0fb108229dcb41b5de3bd7b4f6ba3 100644 (file)
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -5,16 +5,15 @@
 # Depends on: nspr sqlite3
 
 name=nss
-version=3.47.1
+version=3.55
 release=1
 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./_}_RTM/src/$name-$version.tar.gz \
-        nss-config.in nss.pc.in)
+        nss-config.in nss.pc.in nss-3.54-standalone-2.patch)
 
 build() {
-cd $name-$version/
-  sed -i nss/coreconf/Linux.mk \
-    -e 's|^CC.*=.*gcc$|#&|' \
-    -e 's|^CCC.*=.*g++$|#&|'
+  cd $name-$version/
+
+  patch -Np1 -i ../nss-3.54-standalone-2.patch
 
   export NSPR_INCLUDE_DIR=/usr/include/nspr
   export NSPR_LIB_DIR=/usr/lib
@@ -25,7 +24,7 @@ cd $name-$version/
   export XCFLAGS="-Wno-error ${CFLAGS}"
   export NSS_DISABLE_GTESTS=1
 
-  make -j1 -C nss
+  make -C nss
 
   install -d $PKG/usr/{bin,lib/pkgconfig,include/nss}
 

diff --git a/nss/nss-3.54-standalone-2.patch b/nss/nss-3.54-standalone-2.patch
new file mode 100644 (file)
index 0000000..d1db816
--- /dev/null
+++ b/nss/nss-3.54-standalone-2.patch
@@ -0,0 +1,267 @@
+Submitted By:            Xi Ruoyao <xry111_AT_mengyan1223_DOT_wang>
+Date:                    2020-05-31
+Initial Package Version: 3.12.4
+Upstream Status:         Not applicable
+Origin:                  Self, rediffed for nss-3.53.
+Description:             Adds auto-generated nss.pc and nss-config script, and
+                         allows building without nspr in the source tree.
+                         For 3.40.1, Requires: updated to nspr >= 4.20.
+                         For 3.46.1, Requires: updated to nspr >= 4.21.
+                         For 3.48, Requires: updated to nspr >= 4.24.
+                         For 3.51.1, Requires: updated to nspr >= 4.25.
+                         For 3.54, Requires: updated to nspr >= 4.26.
+
+diff -Nuar nss-3.53.orig/nss/config/Makefile nss-3.53/nss/config/Makefile
+--- nss-3.53.orig/nss/config/Makefile  1970-01-01 08:00:00.000000000 +0800
++++ nss-3.53/nss/config/Makefile       2020-05-31 13:48:14.423566855 +0800
+@@ -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 -Nuar nss-3.53.orig/nss/config/nss-config.in nss-3.53/nss/config/nss-config.in
+--- nss-3.53.orig/nss/config/nss-config.in     1970-01-01 08:00:00.000000000 +0800
++++ nss-3.53/nss/config/nss-config.in  2020-05-31 13:48:14.424566860 +0800
+@@ -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 -Nuar nss-3.53.orig/nss/config/nss.pc.in nss-3.53/nss/config/nss.pc.in
+--- nss-3.53.orig/nss/config/nss.pc.in 1970-01-01 08:00:00.000000000 +0800
++++ nss-3.53/nss/config/nss.pc.in      2020-05-31 13:48:14.424566860 +0800
+@@ -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.26
++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 -Nuar nss-3.53.orig/nss/Makefile nss-3.53/nss/Makefile
+--- nss-3.53.orig/nss/Makefile 2020-05-30 04:34:42.000000000 +0800
++++ nss-3.53/nss/Makefile      2020-05-31 13:48:51.500733022 +0800
+@@ -4,6 +4,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
++default: nss_build_all
++
+ #######################################################################
+ # (1) Include initial platform-independent assignments (MANDATORY).   #
+ #######################################################################
+@@ -48,12 +50,10 @@
+ #######################################################################
+ 
+ nss_build_all:
+-      $(MAKE) build_nspr
+       $(MAKE) all
+       $(MAKE) latest
+ 
+ nss_clean_all:
+-      $(MAKE) clobber_nspr
+       $(MAKE) clobber
+ 
+ NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
+diff -Nuar nss-3.53.orig/nss/manifest.mn nss-3.53/nss/manifest.mn
+--- nss-3.53.orig/nss/manifest.mn      2020-05-30 04:34:42.000000000 +0800
++++ nss-3.53/nss/manifest.mn   2020-05-31 13:48:30.652640413 +0800
+@@ -10,7 +10,7 @@
+ 
+ RELEASE = nss
+ 
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil gtests config
+ 
+ lib: coreconf
+ cmd: lib