diff --git a/srcpkgs/nss/nss-devel.template b/srcpkgs/nss/nss-devel.template index 2776ef9e09..0aaf4eb60d 100644 --- a/srcpkgs/nss/nss-devel.template +++ b/srcpkgs/nss/nss-devel.template @@ -1,7 +1,7 @@ # Template file for 'nss-devel'. # noarch=yes -depends="nspr-devel>=4.9.2 nss>=${version}" +depends="nspr-devel>=4.9.3 nss-${version}_${revision}" short_desc="${short_desc} (development files)" long_desc="${long_desc} diff --git a/srcpkgs/nss/patches/nss-no-rpath.patch b/srcpkgs/nss/patches/nss-no-rpath.patch deleted file mode 100644 index abf61b5b74..0000000000 --- a/srcpkgs/nss/patches/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 2fb225a686..ac4cda53d8 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,16 +1,16 @@ # Template file for 'nss' pkgname=nss -version=3.13.6 +version=3.14 _distver=$(echo $version|sed -e "s|\.|_|g") -revision=2 -makedepends="perl>=0 zlib-devel nspr-devel>=4.9 sqlite-devel" +revision=1 +makedepends="perl>=0 zlib-devel nspr-devel>=4.9.3 sqlite-devel" subpackages="$pkgname-devel" short_desc="Mozilla Network Security Services" maintainer="Juan RP " homepage="http://www.mozilla.org/projects/security/pki/nss/" license="GPL-2, MPL-1.1" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${_distver}_RTM/src/${pkgname}-${version}.tar.gz" -checksum=f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 +checksum=b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b long_desc=" Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled server applications. @@ -33,6 +33,7 @@ do_build() { make -C mozilla/security/${dir} \ LIBRUNPATH= BUILD_OPT=1 \ NSS_USE_SYSTEM_SQLITE=1 \ + NSS_ENABLE_ECC=1 \ NSPR_INCLUDE_DIR=/usr/include/nspr \ NSPR_LIB_DIR=/usr/lib \ XCFLAGS="${CFLAGS}" ${_use64}