From 633388aa0d49b87d723ed7475e434a514bd391bd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 11 Oct 2013 11:42:58 +0200
Subject: add latest version of firefox, update dependencies and fix nss
 package to include all necessary libraries for https support, tested only in
 qemu-i686 glibc for now

---
 package/nss/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'package/nss/Makefile')

diff --git a/package/nss/Makefile b/package/nss/Makefile
index fe448f6df..943d4b136 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.14.1
+PKG_VERSION:=		3.15.2
 PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	14
-PKG_PATCH_VERSION:=	1
-PKG_MD5SUM:=		f6f3a942d1eba3e26aa0382a5b5461d9
+PKG_MIN_VERSION:=	15
+PKG_PATCH_VERSION:=	2
+PKG_MD5SUM:=		154223568f9734c76c164b46c774450c
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		nspr zlib sqlite
@@ -21,7 +21,7 @@ PKG_NOPARALLEL:=	1
 PKG_HOST_DEPENDS:=	!cygwin
 PKG_ARCH_DEPENDS:=	!cris
 
-WRKSRC=			${WRKDIST}/mozilla/security/nss
+WRKSRC=			${WRKDIST}/nss
 
 include $(TOPDIR)/mk/package.mk
 
@@ -46,14 +46,14 @@ XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
 XAKE_FLAGS+=		NSS_DISABLE_DBM=1 OS_TEST=${CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
 XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_SYSTEM_SQLITE=1
 XAKE_FLAGS+=		NSS_USE_SYSTEM_ZLIB=1
-ALL_TARGET:=		build_coreconf all
+ALL_TARGET:=		all
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
-	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3,softokn3}.so \
+	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{nsssysinit,nssckbi,freebl3,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/* \
+	${INSTALL_DATA} ${WRKDIST}/dist/public/nss/* \
 		${STAGING_TARGET_DIR}/usr/include/nss
 	# needed for firefox and corosync
 	${INSTALL_DIR} ${WRKINST}/usr/bin
-- 
cgit v1.2.3