summaryrefslogtreecommitdiff
path: root/package/nss
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-05 13:14:02 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-05 13:14:02 +0200
commitde13f29c60dfdf7dc682ca9914c6f8c1479d3070 (patch)
tree8c9040d3020f2ba419d0a056c06ef371dcd7aff3 /package/nss
parentb0fb4a1e29e67c576523b981c96f01806a606424 (diff)
really update nss
Diffstat (limited to 'package/nss')
-rw-r--r--package/nss/Makefile21
-rw-r--r--package/nss/files/nss.pc11
2 files changed, 12 insertions, 20 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 1716dfa46..858eb24cf 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,18 +4,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= nss
-PKG_VERSION:= 3.13.3
+PKG_VERSION:= 3.13.6
PKG_RELEASE:= 2
PKG_MAJ_VERSION:= 3
PKG_MIN_VERSION:= 13
-PKG_PATCH_VERSION:= 3
-PKG_MD5SUM:= 006cb82fa900e9e664b4b14a9b7810ca
+PKG_PATCH_VERSION:= 6
+PKG_MD5SUM:= 15ea0e3b63cd0d18b5b75619afc46c3e
PKG_DESCR:= Network Security Services (NSS) library
PKG_SECTION:= libs
PKG_BUILDDEP:= nspr zlib
PKG_DEPENDS:= nspr
PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/
+PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_RTM/src/
PKG_NOPARALLEL:= 1
PKG_HOST_DEPENDS:= !cygwin
@@ -49,17 +49,20 @@ ALL_TARGET:= build_coreconf all
post-install:
$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
- ${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3}.so \
+ ${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3,softokn3}.so \
$(IDIR_NSS)/usr/lib
${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss
${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* \
${STAGING_TARGET_DIR}/usr/include/nss
- # needed for firefox
+ # needed for firefox and corosync
+ ${INSTALL_DIR} ${WRKINST}/usr/bin
+ ${INSTALL_BIN} ${WRKDIST}/dist/bin/nss-config \
+ ${WRKINST}/usr/bin
+ ${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
+ ${INSTALL_BIN} ${WRKDIST}/dist/lib/pkgconfig/nss.pc \
+ ${WRKINST}/usr/lib/pkgconfig
${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/lib
$(INSTALL_DATA) ${WRKDIST}/dist/lib/libcrmf.a \
${STAGING_TARGET_DIR}/usr/lib
- # needed for corosync
- $(INSTALL_DIR) ${WRKINST}/usr/lib/pkgconfig
- $(CP) ./files/nss.pc ${WRKINST}/usr/lib/pkgconfig
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nss/files/nss.pc b/package/nss/files/nss.pc
deleted file mode 100644
index 4350b73a9..000000000
--- a/package/nss/files/nss.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=/usr/bin
-libdir=${prefix}/lib
-includedir=${prefix}/include/nss3
-
-Name: NSS
-Description: Network Security Services
-Version: 3.12.3
-Requires: sqlite3 nspr >= 4.8
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}