From 68c853ea88f6365b27c8744f3e4b4246b3ded034 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 Aug 2016 13:29:27 +0200 Subject: [PATCH] nss; update to 3.26 --- srcpkgs/nss/files/nss.pc.in | 2 +- srcpkgs/nss/template | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/nss/files/nss.pc.in b/srcpkgs/nss/files/nss.pc.in index d47b9e14699..42cca9ff8e4 100644 --- a/srcpkgs/nss/files/nss.pc.in +++ b/srcpkgs/nss/files/nss.pc.in @@ -7,5 +7,5 @@ Name: NSS Description: Network Security Services Version: %NSS_VERSION% Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 Cflags: -I${includedir} diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 833a58eadaf..94edb6a569c 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,9 +1,7 @@ # Template file for 'nss' pkgname=nss -# reverted due https://github.com/voidlinux/void-packages/issues/4225 -reverts="3.24_1" -version=3.23 -revision=2 +version=3.26 +revision=1 hostmakedepends="perl" makedepends="zlib-devel nspr-devel sqlite-devel" depends="nspr>=4.12" @@ -12,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.mozilla.org/projects/security/pki/nss/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf +checksum=91783a570ab953693eb977ce47c501f04c104cec287fa011c91bcc8970d1c564 do_build() { # Respect LDFLAGS @@ -21,7 +19,9 @@ do_build() { export LIBRUNPATH= export BUILD_OPT=1 export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_WERROR=0 export NSS_ENABLE_ECC=1 + export FREEBL_NO_DEPEND=1 case "$XBPS_MACHINE" in aarch64*|x86_64*) _use64="USE_64=1";; @@ -108,7 +108,7 @@ do_install() { } nss-devel_package() { - depends="nspr-devel>=4.10 nss>=${version}_${revision}" + depends="nspr-devel>=4.12 nss>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/bin/nss-config