| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-12-23 14:42:35 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-12-23 14:42:35 UTC |
| parent | 48b9beddb2e70b8eb9bf984833bbfd366e1cdc08 |
| .SRCINFO | +10 | -9 |
| 0001-Don-t-USE_ARM_GCM.patch | +4 | -4 |
| 0002-fix-armv8_c_lib-dependency.patch | +8 | -8 |
| PKGBUILD | +9 | -10 |
| PKGBUILD.old | +0 | -134 |
diff --git a/.SRCINFO b/.SRCINFO index 21807ed..28a1012 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,9 @@ pkgbase = nss pkgdesc = Network Security Services - pkgver = 3.117 + pkgver = 3.119 pkgrel = 1 - url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS + url = https://firefox-source-docs.mozilla.org/security/nss/index.html + arch = x86_64 arch = armv7h arch = aarch64 license = MPL-2.0 @@ -10,22 +11,22 @@ pkgbase = nss makedepends = mercurial makedepends = perl makedepends = python - depends = nspr>=4.35 - depends = p11-kit>=0.23.19 depends = glibc + depends = nspr + depends = p11-kit + depends = sh depends = sqlite depends = zlib - depends = sh - source = hg+https://hg.mozilla.org/projects/nss#tag=NSS_3_117_RTM + source = hg+https://hg.mozilla.org/projects/nss#tag=NSS_3_119_RTM source = bundle.sh source = certdata2pem.py source = 0001-Don-t-USE_ARM_GCM.patch source = 0002-fix-armv8_c_lib-dependency.patch - b2sums = dbcb22585bca4e028cca49710059f75c36c07d0f6e2ebab3ff11536f067ec82f507613225848dd5aea7e4d65427876bd5d356be200c7986b5a53070537b48cde + b2sums = fa65ad2e0504d5cb19cf72801aff067cbde2e0ec9b85c494df66e8676a1d287e53b93850017d123f7c6a72afb4c7b344f9827fd5b105c22d4a4e5a323d5f2981 b2sums = 4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6 b2sums = 6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510 - b2sums = 8e442a1844012fafad9750631114167a842f32eba413380b1d9ca11b16c1c0e43b6b73d22280e6a55b5133e181530c8377cf6e030e5f8f2a842fa1c24b9aaeb6 - b2sums = 670ed1e0223f23f88d5f7d9ae7a3a24ac31a19396e3a1cedb89bf87d8ce32afbad74bc7fb76e234c8f47d28ddb4fcd7386a1f7e78196c4fb03cff200ebbe985d + b2sums = c7126ea70883cc4ab0bcb98d2a22062a8a84583b51f6ac2f1aa19451a59bc3ab0f49ecb6250f1a1910e6e009c93b6771692d0ac2523d181ddb020501ca987649 + b2sums = 61119ff32d9573d176460e50447cd548211cad6ae63e8758ac42c74081513bf0243c0d81534c34ef2bfd34caff3b1022bb60457ebf3b111c3247b76b04a07eba pkgname = nss diff --git a/0001-Don-t-USE_ARM_GCM.patch b/0001-Don-t-USE_ARM_GCM.patch index 6326b7a..3ec5968 100644 --- a/0001-Don-t-USE_ARM_GCM.patch +++ b/0001-Don-t-USE_ARM_GCM.patch @@ -1,4 +1,4 @@ -From bd8f3a94a96819bfbbf06d240abcbda3354e7623 Mon Sep 17 00:00:00 2001 +From faaa3c7faf81cd9d8a01700e933dcdaeec429107 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 3 May 2020 13:15:03 -0600 Subject: [PATCH 1/2] Don't USE_ARM_GCM @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Don't USE_ARM_GCM 1 file changed, 4 deletions(-) diff --git a/lib/freebl/gcm.c b/lib/freebl/gcm.c -index c2cc18d91..c599031f1 100644 +index a2f63a6a8..f10a9a08f 100644 --- a/lib/freebl/gcm.c +++ b/lib/freebl/gcm.c @@ -22,10 +22,6 @@ @@ -21,7 +21,7 @@ index c2cc18d91..c599031f1 100644 -#define USE_ARM_GCM #endif - /* Forward declarations */ + #if defined(__ARM_NEON) || defined(__ARM_NEON__) -- -2.24.1 +2.51.2 diff --git a/0002-fix-armv8_c_lib-dependency.patch b/0002-fix-armv8_c_lib-dependency.patch index 2258130..2e30847 100644 --- a/0002-fix-armv8_c_lib-dependency.patch +++ b/0002-fix-armv8_c_lib-dependency.patch @@ -1,4 +1,4 @@ -From ef3212dda464008536d125c19924a2c27c8ea082 Mon Sep 17 00:00:00 2001 +From 506dcf5e09690ac1d5ce02589a247a5e786aa0a7 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Sun, 3 May 2020 13:08:54 -0600 Subject: [PATCH 2/2] fix armv8_c_lib dependency @@ -8,18 +8,18 @@ Subject: [PATCH 2/2] fix armv8_c_lib dependency 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp -index d780b2217..2dc5c851f 100644 +index 3d9969435..dea80a35d 100644 --- a/lib/freebl/freebl.gyp +++ b/lib/freebl/freebl.gyp -@@ -453,7 +453,7 @@ - 'dependencies': [ - 'gcm-aes-x86_c_lib', +@@ -603,7 +603,7 @@ + 'intel-gcm-wrap-nodepend_c_lib', ] -- }, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', { -+ }, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', { + }], +- [ 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', { ++ [ '(disable_arm_hw_aes==0 or disable_arm_hw_sha1==0 or disable_arm_hw_sha2==0) and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', { 'dependencies': [ 'armv8_c_lib', ], -- -2.24.1 +2.51.2 diff --git a/PKGBUILD b/PKGBUILD index fdc2c64..8686c57 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,19 +11,19 @@ pkgname=( nss ca-certificates-mozilla ) -pkgver=3.117 +pkgver=3.119 pkgrel=1 pkgdesc="Network Security Services" -url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" -arch=(armv7h aarch64) +url="https://firefox-source-docs.mozilla.org/security/nss/index.html" +arch=(x86_64 armv7h aarch64) license=(MPL-2.0) depends=( - 'nspr>=4.35' - 'p11-kit>=0.23.19' glibc + nspr + p11-kit + sh sqlite zlib - sh # nss-config script ) makedepends=( gyp @@ -38,12 +38,11 @@ source=( 0001-Don-t-USE_ARM_GCM.patch 0002-fix-armv8_c_lib-dependency.patch ) - -b2sums=('dbcb22585bca4e028cca49710059f75c36c07d0f6e2ebab3ff11536f067ec82f507613225848dd5aea7e4d65427876bd5d356be200c7986b5a53070537b48cde' +b2sums=('fa65ad2e0504d5cb19cf72801aff067cbde2e0ec9b85c494df66e8676a1d287e53b93850017d123f7c6a72afb4c7b344f9827fd5b105c22d4a4e5a323d5f2981' '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6' '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510' - '8e442a1844012fafad9750631114167a842f32eba413380b1d9ca11b16c1c0e43b6b73d22280e6a55b5133e181530c8377cf6e030e5f8f2a842fa1c24b9aaeb6' - '670ed1e0223f23f88d5f7d9ae7a3a24ac31a19396e3a1cedb89bf87d8ce32afbad74bc7fb76e234c8f47d28ddb4fcd7386a1f7e78196c4fb03cff200ebbe985d') + 'c7126ea70883cc4ab0bcb98d2a22062a8a84583b51f6ac2f1aa19451a59bc3ab0f49ecb6250f1a1910e6e009c93b6771692d0ac2523d181ddb020501ca987649' + '61119ff32d9573d176460e50447cd548211cad6ae63e8758ac42c74081513bf0243c0d81534c34ef2bfd34caff3b1022bb60457ebf3b111c3247b76b04a07eba') prepare() { mkdir -p certs diff --git a/PKGBUILD.old b/PKGBUILD.old deleted file mode 100644 index fdc2c64..0000000 --- a/PKGBUILD.old +++ /dev/null @@ -1,134 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -# ALARM: Kevin Mihelich <kevin@archlinuxarm.org> -# - remove --target x64 from build.sh line -# - add -Ddisable_arm32_neon=1 -Ddisable_arm_hw_aes=1 -Ddisable_arm_hw_sha1=1 -Ddisable_arm_hw_sha2=1 to build.sh -# - remove -march=armv8-a in AArch64 CFLAGS to not conflict with -march=armv8-a+crypto being added - -pkgbase=nss -pkgname=( - nss - ca-certificates-mozilla -) -pkgver=3.117 -pkgrel=1 -pkgdesc="Network Security Services" -url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" -arch=(armv7h aarch64) -license=(MPL-2.0) -depends=( - 'nspr>=4.35' - 'p11-kit>=0.23.19' - glibc - sqlite - zlib - sh # nss-config script -) -makedepends=( - gyp - mercurial - perl - python -) -source=( - "hg+https://hg.mozilla.org/projects/nss#tag=NSS_${pkgver//./_}_RTM" - bundle.sh - certdata2pem.py - 0001-Don-t-USE_ARM_GCM.patch - 0002-fix-armv8_c_lib-dependency.patch -) - -b2sums=('dbcb22585bca4e028cca49710059f75c36c07d0f6e2ebab3ff11536f067ec82f507613225848dd5aea7e4d65427876bd5d356be200c7986b5a53070537b48cde' - '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6' - '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510' - '8e442a1844012fafad9750631114167a842f32eba413380b1d9ca11b16c1c0e43b6b73d22280e6a55b5133e181530c8377cf6e030e5f8f2a842fa1c24b9aaeb6' - '670ed1e0223f23f88d5f7d9ae7a3a24ac31a19396e3a1cedb89bf87d8ce32afbad74bc7fb76e234c8f47d28ddb4fcd7386a1f7e78196c4fb03cff200ebbe985d') - -prepare() { - mkdir -p certs - ln -srft certs nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} - - cd nss - patch -p1 -i "${srcdir}"/0001-Don-t-USE_ARM_GCM.patch - patch -p1 -i "${srcdir}"/0002-fix-armv8_c_lib-dependency.patch -} - -build() { - local buildsh_options=( - --disable-tests - --enable-libpkix - --opt - --system-nspr - --system-sqlite - -Ddisable_arm32_neon=1 - -Ddisable_arm_hw_aes=1 - -Ddisable_arm_hw_sha1=1 - -Ddisable_arm_hw_sha2=1 - ) - [[ $CARCH == "aarch64" ]] && CFLAGS=`echo $CFLAGS | sed -e 's/-march=armv8-a//'` && CXXFLAGS="$CFLAGS" - - cd certs - ../certdata2pem.py - - cd .. - ./bundle.sh - - cd nss - ./build.sh "${buildsh_options[@]}" -} - -package_nss() { - local nsprver="$(pkg-config --modversion nspr)" - local libdir=/usr/lib includedir=/usr/include/nss - - sed nss/pkg/pkg-config/nss.pc.in \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,\${prefix},g" \ - -e "s,%libdir%,$libdir,g" \ - -e "s,%includedir%,$includedir,g" \ - -e "s,%NSPR_VERSION%,$nsprver,g" \ - -e "s,%NSS_VERSION%,$pkgver,g" | - install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc" - - ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc" - - install -Dt "$pkgdir$libdir" dist/Release/lib/*.so - - local vmajor vminor vpatch - { read vmajor; read vminor; read vpatch; } \ - < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h) - - sed nss/pkg/pkg-config/nss-config.in \ - -e "s,@prefix@,/usr,g" \ - -e "s,@exec_prefix@,/usr,g" \ - -e "s,@libdir@,$libdir,g" \ - -e "s,@includedir@,$includedir,g" \ - -e "s,@MOD_MAJOR_VERSION@,$vmajor,g" \ - -e "s,@MOD_MINOR_VERSION@,$vminor,g" \ - -e "s,@MOD_PATCH_VERSION@,$vpatch,g" | - install -D /dev/stdin "$pkgdir/usr/bin/nss-config" - - install -Dt "$pkgdir/usr/bin" \ - dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap} - - install -Dt "$pkgdir$includedir" -m644 dist/public/nss/*.h - - install -Dt "$pkgdir/usr/share/man/man1" -m644 \ - nss/doc/nroff/{*util,signtool,signver,ssltap}.1 - - # Replace built-in trust with p11-kit connection - #ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so" - #ln -sf p11-kit-trust.so "$pkgdir$libdir/libnssckbi.so" - rm -rf "$pkgdir$libdir/libnssckbi.so" -} - -package_ca-certificates-mozilla() { - pkgdesc="Mozilla's set of trusted CA certificates" - depends=('ca-certificates-utils>=20181109-3') - - install -Dm644 ca-bundle.trust.p11-kit \ - "$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit" -} - -# vim:set sw=2 sts=-1 et: