From ce2b9d541daaa45204ff8f4b6e0c68d12fa777de Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 6 Apr 2022 16:37:55 +0200 Subject: [PATCH] nss: updated to 3.77 --- nss/.footprint | 4 +++ nss/.signature | 8 +++--- nss/Pkgfile | 77 +++++++++++++++++++++++++++----------------------- 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/nss/.footprint b/nss/.footprint index 477d0af..735f2d4 100644 --- a/nss/.footprint +++ b/nss/.footprint @@ -85,6 +85,9 @@ drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/pkcs7t.h -rw-r--r-- root/root usr/include/nss/portreg.h -rw-r--r-- root/root usr/include/nss/preenc.h +drwxr-xr-x root/root usr/include/nss/private/ +-rw-r--r-- root/root usr/include/nss/private/alghmac.h +-rw-r--r-- root/root usr/include/nss/private/blapi.h -rw-r--r-- root/root usr/include/nss/secasn1.h -rw-r--r-- root/root usr/include/nss/secasn1t.h -rw-r--r-- root/root usr/include/nss/seccomon.h @@ -116,6 +119,7 @@ drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/utilrename.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libcrmf.a +-rw-r--r-- root/root usr/lib/libfreebl.a -rw-r--r-- root/root usr/lib/libfreebl3.chk -rwxr-xr-x root/root usr/lib/libfreebl3.so -rw-r--r-- root/root usr/lib/libfreeblpriv3.chk diff --git a/nss/.signature b/nss/.signature index f2eafb4..4024ac9 100644 --- a/nss/.signature +++ b/nss/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt-arm.pub -RWQh9Dk2FlLauMlrXiEm8O86C2xs8kHsVLqQwa647NMxU4NxISpN0PmyGTYSHhCWG5beIy+hQEyF3R3Z4tc7/RdTnpBRS4M7UA4= -SHA256 (Pkgfile) = 5a906fc4207b0e07ec2143f62d4a1079dcca34196d6c60e7cc8245ca219d458e -SHA256 (.footprint) = 72ba9181716688d416b972a723237d3dc69366707d6195f336bfb0ce63d781ea -SHA256 (nss-3.76.1.tar.gz) = e13104c374e2e1d7890d8f6bc18d0f18eb886ed4dbad4144d1c482f2983d232a +RWQh9Dk2FlLauJonKfeY6NOrTDUHWmUDWrQQNt5R1R7hyqTs20yADdsHhcU+k7aNSSgGANxSIapyXJjLWDY4UFK8bq+4hxcaxAw= +SHA256 (Pkgfile) = 0eb5c69849c3b7f2adbdd59f64f6ef049f794b371b0cc081ac5f0b3149a9b164 +SHA256 (.footprint) = a2cf52cf3c82009e9368d2669cdb01e3cb50d549f0e2d39a86bb04400ea3bee0 +SHA256 (nss-3.77.tar.gz) = 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd 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 8a1cbfa..b4380aa 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -5,37 +5,40 @@ # Depends on: nspr sqlite3 name=nss -version=3.76.1 +version=3.77 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-3.54-standalone-2.patch) build() { - 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 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - export NSS_ENABLE_TLS_1_3=1 - export BUILD_OPT=1 - export XCFLAGS="-Wno-error ${CFLAGS}" - export NSS_DISABLE_GTESTS=1 - - make -C nss - - install -d $PKG/usr/{bin,lib/pkgconfig,include/nss} - - cd dist/*.OBJ/bin - install -t "$PKG/usr/bin" *util shlibsign signtool signver ssltap - cd ../lib - install -t "$PKG/usr/lib" *.so - install -t "$PKG/usr/lib" -m644 libcrmf.a *.chk - cd ../../public/nss - install -t "$PKG/usr/include/nss" -m644 *.h - install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config + cd $name-$version/ + + patch -Np1 -i $SRC/nss-3.54-standalone-2.patch + + export NSPR_INCLUDE_DIR=/usr/include/nspr + export NSPR_LIB_DIR=/usr/lib + export NSS_USE_SYSTEM_SQLITE=1 + export USE_SYSTEM_ZLIB=1 + export NSS_ENABLE_ECC=1 + export NSS_ENABLE_TLS_1_3=1 + export BUILD_OPT=1 + export NSS_ENABLE_WERROR=0 + export NSS_DISABLE_GTESTS=1 + + make -C nss + + install -d $PKG/usr/{bin,lib/pkgconfig,include/nss/private} + + cd dist/*.OBJ/bin + install -t "$PKG/usr/bin" *util shlibsign signtool signver ssltap + cd ../lib + install -t "$PKG/usr/lib" *.so + install -t "$PKG/usr/lib" -m644 libcrmf.a libfreebl.a *.chk + cd ../../public/nss + install -t "$PKG/usr/include/nss" -m644 *.h + cd ../../private/nss + install -t "$PKG/usr/include/nss/private" -m644 blapi.h alghmac.h + install -m 0755 $SRC/nss-config.in $PKG/usr/bin/nss-config _version=$(printf "%i.%i.%i" ${version//./ }) sed -i "s/@VERSION@/$_version/" $PKG/usr/bin/nss-config @@ -43,14 +46,16 @@ build() { NSS_LIBS=`$PKG/usr/bin/nss-config --libs` NSS_CFLAGS=`$PKG/usr/bin/nss-config --cflags` NSPR_VERSION=`pkg-config --modversion nspr` - sed $SRC/nss.pc.in \ - -e "s,%libdir%,/usr/lib," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nss," \ - -e "s,%NSS_VERSION%,$version," \ - -e "s,%NSPR_VERSION%,$NSPR_VERSION," \ - -e "s,%FULL_NSS_LIBS%,$NSS_LIBS," \ - -e "s,%FULL_NSS_CFLAGS%,$NSS_CFLAGS," > \ - $PKG/usr/lib/pkgconfig/nss.pc + for module in nss; do + sed $SRC/$module.pc.in \ + -e "s,%libdir%,/usr/lib," \ + -e "s,%prefix%,/usr," \ + -e "s,%exec_prefix%,/usr/bin," \ + -e "s,%includedir%,/usr/include/nss," \ + -e "s,%NSS_VERSION%,$version," \ + -e "s,%NSPR_VERSION%,$NSPR_VERSION," \ + -e "s,%FULL_NSS_LIBS%,$NSS_LIBS," \ + -e "s,%FULL_NSS_CFLAGS%,$NSS_CFLAGS," > \ + $PKG/usr/lib/pkgconfig/$module.pc + done } -- 2.26.2