Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8640 from Rmys/master

Browse Source 
nss ver. bump
This commit is contained in:
Rmys
2020-06-24 18:24:35 +03:00
committed by GitHub
parent 15942c6e12 36624a049f
commit b7d4ffd290
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/crypt/nss/actions.py
+6 -1
View File
@@ -18,6 +18,9 @@ def setup():
# Respect LDFLAGS
pisitools.dosed("nss/coreconf/rules.mk", "(\$\(MKSHLIB\))\s-o", r"\1 $(LDFLAGS) -o")
# Fix missing includes
shelltools.system("sed 's|-Ideprecated|-Ideprecated -I../util -I../softoken -I.|' -i nss/lib/freebl/Makefile")
# Create nss.pc and nss-config dynamically
shelltools.system("./generate-pc-config.sh")
@@ -39,8 +42,10 @@ def build():
shelltools.export("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS", "1")
autotools.make("-C nss/coreconf -j1")
autotools.make("-C nss/lib/util -j1")
autotools.make("-C nss/lib/dbm")
autotools.make("-C nss -j1")
autotools.make("-C nss/lib/sysinit -j1")
autotools.make("-C nss all -j1")
def install():
for binary in ["*util", "shlibsign", "signtool", "signver", "ssltap"]:
util/crypt/nss/files/dbm.patch
+22
View File
@@ -0,0 +1,22 @@
diff -Nuar a/nss/lib/dbm/src/manifest.mn b/nss/lib/dbm/src/manifest.mn
--- a/nss/lib/dbm/src/manifest.mn 2020-06-17 01:50:59.000000000 +0300
+++ b/nss/lib/dbm/src/manifest.mn 2020-06-23 15:21:36.589739910 +0300
@@ -5,6 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CORE_DEPTH = ../../..
+INCLUDES += -I../include
MODULE = dbm
diff -Nuar a/nss/lib/sysinit/manifest.mn b/nss/lib/sysinit/manifest.mn
--- a/nss/lib/sysinit/manifest.mn 2020-06-17 01:50:59.000000000 +0300
+++ b/nss/lib/sysinit/manifest.mn 2020-06-23 15:21:15.448741436 +0300
@@ -3,6 +3,7 @@
# 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/.
CORE_DEPTH = ../..
+INCLUDES += -I../util
MODULE = nss
util/crypt/nss/pspec.xml
+10 -1
View File
@@ -15,7 +15,7 @@
<IsA>library</IsA>
<Summary>Network Security Services</Summary>
<Description>Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.</Description>
<Archive sha1sum="15c56e41102a788cebc1df3cf46ca08b71ac0942" type="targz">https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_52_1_RTM/src/nss-3.52.1.tar.gz</Archive>
<Archive sha1sum="ee522d99ff582b849fe5190c1461f0633ffe1721" type="targz">https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_53_1_RTM/src/nss-3.53.1.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="dist/pkgconfig/nss.pc.in">nss.pc.in</AdditionalFile>
<AdditionalFile target="dist/pkgconfig/nss-config.in">nss-config.in</AdditionalFile>
@@ -33,6 +33,8 @@
<!-- Patches from Fedora -->
<Patch level="0">fedora/add-relro-linker-option.patch</Patch>
<!--<Patch level="0">fedora/nss-539183.patch</Patch>-->
<Patch level="1">dbm.patch</Patch>
</Patches>
</Source>
@@ -75,6 +77,13 @@
</Package>
<History>
<Update release="23">
<Date>2020-06-24</Date>
<Version>3.53.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="22">
<Date>2020-06-02</Date>
<Version>3.52.1</Version>