Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (29adc8fcb5a3d65e4c6e80e3569b7bbf649168d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (29adc8fcb5a3d65e4c6e80e3569b7bbf649168d1)
  • Date: Sat, 20 Aug 2022 19:29:37 +0000

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

crypto/nss/DETAILS | 101 ------------
crypto/nss/HISTORY | 5
crypto/nss/PREPARE | 4
crypto/nss/PRE_BUILD | 6
crypto/nss/nss-3.17.2-standalone-2.patch | 244
------------------------------
crypto/nss/nss-3.32-standalone-1.patch | 246
-------------------------------
6 files changed, 12 insertions(+), 594 deletions(-)

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

crypto/nss: added 3.82 branch, removed old versions

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index b388076..b976780 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,102 +1,5 @@
SPELL=nss
case $NSS_BRANCH in
- 3.17)
- VERSION=3.17.4
-
SOURCE_HASH=sha512:dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89
- SECURITY_PATCH=2
- ;;
- 3.20)
- VERSION=3.20.2
-
SOURCE_HASH=sha512:030cd019a43f326b06d5524390c166a1a6be52a3f5f05e2e4a651677d6031659cbfca6ddb5d492ba95e816672ac289a4d09da14fd54131aad6967496f471a7e7
- ;;
- 3.45)
- VERSION=3.45
-
SOURCE_HASH=sha512:33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29
- ;;
- 3.46)
- VERSION=3.46.1
-
SOURCE_HASH=sha512:f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
- ;;
- 3.47)
- VERSION=3.47.1
-
SOURCE_HASH=sha512:ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9
- ;;
- 3.48)
- VERSION=3.48
-
SOURCE_HASH=sha512:71aefe323501dd8d750ed36606554f2e67ecb2bca85b55bc798d5dfc3a47f3d454348ca950971aaaafb16f6d847c098d2b1c40d40b50380e0c2540ed1b9a9e9a
- ;;
- 3.49)
- VERSION=3.49.2
-
SOURCE_HASH=sha512:fe0fe032db15853384a50b145dd6f3187a855109f0b81f1846312d33f8c628aededcbca4d199f974ae52530aec3f2312f80afbca3e5b97ed1ff96fcffafd2881
- ;;
- 3.51)
- VERSION=3.51.1
-
SOURCE_HASH=sha512:1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
- ;;
- 3.53)
- VERSION=3.53.1
-
SOURCE_HASH=sha512:5d7572999a007c513df4cbdf74769c1a4eb53eb8680da27a89fea770763d88b6bea80cd9ab20426a905396745129276cffb6dd9e8e1e6377fa98c0a103b522d0
- ;;
- 3.54)
- VERSION=3.54
-
SOURCE_HASH=sha512:9b9253469514c085730ae580f6544e882a8264e253687950627a4fa1eeb956287c9da46caf7d8988cd6363f6dee26cb8db755203375751fe53795697d7ae9b7b
- ;;
- 3.55)
- VERSION=3.55
-
SOURCE_HASH=sha512:acae7b803a3219cd4b78216cb8a6352805741e42eca6a42a5e6289ebbabc6189c7c6bc138cbd8a93d8631d06175c4d34e72957d49fe726adada6aaa2566e399e
- ;;
- 3.56)
- VERSION=3.56
-
SOURCE_HASH=sha512:f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
- ;;
- 3.57)
- VERSION=3.57
-
SOURCE_HASH=sha512:7e312d7539a26f57b968548935a7715cfa895aa61da21d0542ae45b71cb16f63167728534cdfd15f8eca68c75753a0df3d05e87b4c5acaabbda63c736e552ea2
- ;;
- 3.58)
- VERSION=3.58
-
SOURCE_HASH=sha512:03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
- ;;
- 3.59)
- VERSION=3.59.1
-
SOURCE_HASH=sha512:04ab31f4a3e8e448c14add7f8e4250206930fcf25743c887bc8b3c5220d1693da7b5a31cb0f4cd5bfb786feb2d2f9c3e9226f3602bfff6f90f4c28ed2d68f696
- ;;
- 3.60)
- VERSION=3.60.1
-
SOURCE_HASH=sha512:ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
- ;;
- 3.61)
- VERSION=3.61
-
SOURCE_HASH=sha512:b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
- ;;
- 3.62)
- VERSION=3.62
-
SOURCE_HASH=sha512:7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
- ;;
- 3.63)
- VERSION=3.63.1
-
SOURCE_HASH=sha512:62d1bc161fc8eea6be191dc23ec42042a2626e119b7329f6449cf78729775776fd8e9faebd0457c2413684c15be6e10722ee4a7087c7c3e103fe993f3acec730
- ;;
- 3.65)
- VERSION=3.65
-
SOURCE_HASH=sha512:6f980f44056c69c74754124ce16d4880fb47440146d55906584f70d1be8e74885570308914d4482b3ee676a1f5b1e529616eae8ccd6906d678394dd929dd0825
- ;;
- 3.66)
- VERSION=3.66
-
SOURCE_HASH=sha512:327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
- ;;
- 3.67)
- VERSION=3.67
-
SOURCE_HASH=sha512:1d3fa3fafbf3e54c9c3b54b0b3c291aebb48542380a1b704fa07359d3cefab93f166b31928c9db190ed58118e289e67ce8aa1619e4219d69b2c098484a22bc9d
- ;;
- 3.68)
- VERSION=3.68
-
SOURCE_HASH=sha512:be1197320620ffc9c00aa8aec14de71b5c0bdbfc286309fcc5e995c74d1249cea798fd226ba613b345719238b73883af9f2bc28e1e1f698563767295df518a6e
- ;;
- 3.69)
- VERSION=3.69
-
SOURCE_HASH=sha512:9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
- ;;
3.70)
VERSION=3.70

SOURCE_HASH=sha512:9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
@@ -144,6 +47,10 @@ case $NSS_BRANCH in
3.81)
VERSION=3.81

SOURCE_HASH=sha512:206faa29ff9fc9c70f85cbb86690b55bd11003a1a5b1d49f5f3731fdd1221690f957a17d912ee5272505afb938968327f4532ae8f5d2d77e6e13370768229747
+ ;;
+ 3.82)
+ VERSION=3.82
+
SOURCE_HASH=sha512:6e0f28c3f776178ab2d97c6e2436aa10d72c9c2668aea1a6695ccf49e8c3c4cd2d266168508bcb456c655f2e692dceb44eae53c80d50076d7156db3deac70057
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 25fbc43..65a0e3b 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2022-08-20 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PRE_BUILD, PREPARE: added 3.82 branch, removed old versions
+ (3.17-3.69), default branch is 3.70 now
+ * nss-3.17.2-standalone-2.patch, nss-3.32-standalone-1.patch: dropped
+
2022-07-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PRE_BUILD, PREPARE: added 3.81 branch

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index f67fcb2..ad8e8d0 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 3.49 3.51 3.53
3.54 3.55 3.56 3.57 3.58 3.59 3.60 3.61 3.62 3.63 3.65 3.66 3.67 3.68 3.69
3.70 3.71 3.72 3.73 3.74 3.75 3.76 3.77 3.78 3.79 3.80 3.81 &&
+prepare_select_branch DEFAULT 3.70 3.71 3.72 3.73 3.74 3.75 3.76 3.77 3.78
3.79 3.80 3.81 3.82 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
- NSS_BRANCH=3.56
+ NSS_BRANCH=3.70
fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index ea8d7b0..897a764 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,11 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-case "${NSS_BRANCH}" in
- 3.1[7-9] | 3.20) patch -p1 <
"${SPELL_DIRECTORY}/nss-3.17.2-standalone-2.patch" ;;
-3.3[2-9] | 3.4[0-9] | 3.5[0-1] ) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.32-standalone-1.patch" ;;
- 3.5[3-9] | 3.6[0-9] | 3.7[0-9] | 3.8[0-9] ) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.53-standalone-1.patch" ;;
-esac &&
+patch -p1 < "${SCRIPT_DIRECTORY}/nss-3.53-standalone-1.patch" &&

if [[ "$NSS_PEM" == "y" ]]; then
# New or old source trees are easy to tell apart.
diff --git a/crypto/nss/nss-3.17.2-standalone-2.patch
b/crypto/nss/nss-3.17.2-standalone-2.patch
deleted file mode 100644
index 13b474f..0000000
--- a/crypto/nss/nss-3.17.2-standalone-2.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-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,7 +10,7 @@
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd
-+DIRS = coreconf lib cmd config
-
- ifdef NSS_BUILD_GTESTS
- DIRS += external_tests
diff --git a/crypto/nss/nss-3.32-standalone-1.patch
b/crypto/nss/nss-3.32-standalone-1.patch
deleted file mode 100644
index 825a493..0000000
--- a/crypto/nss/nss-3.32-standalone-1.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
-Date: 2016-12-27
-Initial Package Version: 3.12.4
-Upstream Status: Not applicable
-Origin: Self, rediffed for nss-3.28.
-Description: Adds auto-generated nss.pc and nss-config script,
and
- allows building without nspr in the source tree.
-
-diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
---- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600
-+++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600
-@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
-
- nss_clean_all: clobber_nspr clobber
-
-diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
---- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600
-@@ -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 -Naurp nss-3.28-orig/nss/config/nss-config.in
nss-3.28/nss/config/nss-config.in
---- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000
-0600
-+++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600
-@@ -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 -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
---- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600
-@@ -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.10
-+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 -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
---- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600
-+++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600
-@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd cpputil gtests
-+DIRS = coreconf lib cmd cpputil gtests config



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (29adc8fcb5a3d65e4c6e80e3569b7bbf649168d1), Pavel Vinogradov, 08/20/2022

Archive powered by MHonArc 2.6.24.

Top of Page