diff options
| author | Pavel Vinogradov | 2019-10-20 20:44:26 -0400 |
|---|---|---|
| committer | Pavel Vinogradov | 2019-10-20 20:44:26 -0400 |
| commit | 102db8b91b403515c2e6af198d9fd6865bf069ec (patch) | |
| tree | 777d4c0ef14728c388c57ea7e78a0abc4f53ed27 /crypto | |
| parent | bf4445e753629bf6e3a7be75c7779173a2276777 (diff) | |
crypto/nss: added 3.47 branch
Diffstat (limited to 'crypto')
| -rwxr-xr-x | crypto/nss/DETAILS | 4 | ||||
| -rw-r--r-- | crypto/nss/HISTORY | 5 | ||||
| -rwxr-xr-x | crypto/nss/PREPARE | 2 | ||||
| -rwxr-xr-x | crypto/nss/PRE_BUILD | 4 | ||||
| -rw-r--r-- | crypto/nss/nss-enable-pem.patch | 12 |
5 files changed, 12 insertions, 15 deletions
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS index 8c629b3bf2..9342d34f86 100755 --- a/crypto/nss/DETAILS +++ b/crypto/nss/DETAILS @@ -16,6 +16,10 @@ case $NSS_BRANCH in 3.46) VERSION=3.46.1 SOURCE_HASH=sha512:f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b + ;; + 3.47) + VERSION=3.47 + SOURCE_HASH=sha512:99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247 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 713ae8b9dc..de506e56a0 100644 --- a/crypto/nss/HISTORY +++ b/crypto/nss/HISTORY @@ -1,3 +1,8 @@ +2019-10-20 Pavel Vinogradov <public@sourcemage.org> + * DETAILS, PREPARE: added 3.47 branch + * PRE_BUILD, nss-enable-pem.patch: transformed the patch into sed + script + 2019-10-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS, PREPARE, PRE_BUILD, nss-3.14-config-1.patch, diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE index cbbb53e127..aafff70dbf 100755 --- a/crypto/nss/PREPARE +++ b/crypto/nss/PREPARE @@ -1,5 +1,5 @@ . "${GRIMOIRE}/FUNCTIONS" && -prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 && +prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 && if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then NSS_BRANCH=3.46 diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD index b795ac2cf6..7515b70394 100755 --- a/crypto/nss/PRE_BUILD +++ b/crypto/nss/PRE_BUILD @@ -11,10 +11,10 @@ if [[ "$NSS_PEM" == "y" ]]; then # New or old source trees are easy to tell apart. if test -e nss; then tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 && - patch -p3 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + sed "/DIRS/s;builtins;& pem;" -i nss/lib/ckfw/manifest.mn else # Playing safe with old stuff, no new PEM source there. tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 && - patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + sed "/DIRS/s;builtins;& pem;" -i mozilla/security/nss/lib/ckfw/manifest.mn fi fi diff --git a/crypto/nss/nss-enable-pem.patch b/crypto/nss/nss-enable-pem.patch deleted file mode 100644 index 665a148297..0000000000 --- a/crypto/nss/nss-enable-pem.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem ./mozilla/security/nss/lib/ckfw/manifest.mn ---- ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem 2008-08-05 16:34:23.000000000 -0700 -+++ ./mozilla/security/nss/lib/ckfw/manifest.mn 2008-08-05 16:34:30.000000000 -0700 -@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife - - CORE_DEPTH = ../../.. - --DIRS = builtins -+DIRS = builtins pem - - PRIVATE_EXPORTS = \ - ck.h \ |