| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-10-16 00:00:31 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-10-16 00:00:31 UTC |
| parent | d4dbb935148c8460e3d0f4ae5b6e107c51c419fb |
| .SRCINFO | +3 | -3 |
| PKGBUILD | +2 | -2 |
| PKGBUILD.old | +134 | -0 |
diff --git a/.SRCINFO b/.SRCINFO index e677928..21807ed 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nss pkgdesc = Network Security Services - pkgver = 3.116 + pkgver = 3.117 pkgrel = 1 url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS arch = armv7h @@ -16,12 +16,12 @@ pkgbase = nss depends = sqlite depends = zlib depends = sh - source = hg+https://hg.mozilla.org/projects/nss#tag=NSS_3_116_RTM + source = hg+https://hg.mozilla.org/projects/nss#tag=NSS_3_117_RTM source = bundle.sh source = certdata2pem.py source = 0001-Don-t-USE_ARM_GCM.patch source = 0002-fix-armv8_c_lib-dependency.patch - b2sums = 204e41fc16928504f4a43bed793406999e39267f3bacbcb027f42d56846046c7f4c8e202df15e966f4325188689e0dd46c9b8a6eb9aa69965111c8703b4b6e72 + b2sums = dbcb22585bca4e028cca49710059f75c36c07d0f6e2ebab3ff11536f067ec82f507613225848dd5aea7e4d65427876bd5d356be200c7986b5a53070537b48cde b2sums = 4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6 b2sums = 6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510 b2sums = 8e442a1844012fafad9750631114167a842f32eba413380b1d9ca11b16c1c0e43b6b73d22280e6a55b5133e181530c8377cf6e030e5f8f2a842fa1c24b9aaeb6 diff --git a/PKGBUILD b/PKGBUILD index 50f18de..fdc2c64 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgname=( nss ca-certificates-mozilla ) -pkgver=3.116 +pkgver=3.117 pkgrel=1 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -39,7 +39,7 @@ source=( 0002-fix-armv8_c_lib-dependency.patch ) -b2sums=('204e41fc16928504f4a43bed793406999e39267f3bacbcb027f42d56846046c7f4c8e202df15e966f4325188689e0dd46c9b8a6eb9aa69965111c8703b4b6e72' +b2sums=('dbcb22585bca4e028cca49710059f75c36c07d0f6e2ebab3ff11536f067ec82f507613225848dd5aea7e4d65427876bd5d356be200c7986b5a53070537b48cde' '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6' '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510' '8e442a1844012fafad9750631114167a842f32eba413380b1d9ca11b16c1c0e43b6b73d22280e6a55b5133e181530c8377cf6e030e5f8f2a842fa1c24b9aaeb6' diff --git a/PKGBUILD.old b/PKGBUILD.old new file mode 100644 index 0000000..fdc2c64 --- /dev/null +++ b/PKGBUILD.old @@ -0,0 +1,134 @@ +# 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: