fix more uclibc bulk build errors and add sfdisk/parted

- add sfdisk and parted for nfsroot installations to cfdisk
- fix more uclibc bulk build errors

4 files changed, 22 insertions, 23 deletions

diff --git a/package/nss/Makefile b/package/nss/Makefile
index a837cd8d9..931d14a8c 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,15 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.12.3
+PKG_VERSION:=		3.12.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ecb7079ba4ebcf29b7716775384f1f18
+PKG_MD5SUM:=		1ee3ed9c1900079319bd1de51388d856
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/
+PKG_SITES:=		https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 WRKSRC=			${WRKDIST}/mozilla/security/nss
 
 include $(TOPDIR)/mk/package.mk
@@ -24,11 +23,13 @@ TCFLAGS+=		-DUSE_64
 MAKE_FLAGS+=		USE_64=1
 endif
 
-MAKE_FLAGS+=		NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" NATIVE_LDFLAGS="${HOSTLDFLAGS}"
+MAKE_FLAGS+=		NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}"
 TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/nspr
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/nspr
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+TLDFLAGS:=		''
+
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 MAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist NSS_DISABLE_DBM=1 OS_TEST=${ARCH} \
 			ARCHFLAG="${TCFLAGS} ${TCPPFLAGS}"
 ALL_TARGET:=		build_coreconf all
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk b/package/nss/patches/patch-mozilla_security_coreconf_arch_mk
index 1ebf69cc9..1fad6135a 100644
--- a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk
+++ b/package/nss/patches/patch-mozilla_security_coreconf_arch_mk
@@ -1,6 +1,6 @@
---- nss-3.12.3.orig/mozilla/security/coreconf/arch.mk	2009-03-11 19:54:24.000000000 +0100
-+++ nss-3.12.3/mozilla/security/coreconf/arch.mk	2009-06-24 21:46:32.910214640 +0200
-@@ -329,7 +329,7 @@ endif
+--- nss-3.12.4.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
++++ nss-3.12.4/mozilla/security/coreconf/arch.mk	2009-11-20 18:51:43.000000000 +0100
+@@ -324,7 +324,7 @@ endif
  # IMPL_STRATEGY may be defined too.
  #
  
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile b/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile
index db87f018b..5c6d1324c 100644
--- a/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile
+++ b/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile
@@ -1,13 +1,11 @@
---- nss-3.12.3.orig/mozilla/security/coreconf/nsinstall/Makefile	2005-10-06 00:25:37.000000000 +0200
-+++ nss-3.12.3/mozilla/security/coreconf/nsinstall/Makefile	2009-06-24 19:48:52.858310011 +0200
-@@ -65,6 +65,10 @@ ifdef NATIVE_FLAGS
- OS_CFLAGS=$(NATIVE_FLAGS)
+--- nss-3.12.4.orig/mozilla/security/coreconf/nsinstall/Makefile	2005-10-06 00:25:37.000000000 +0200
++++ nss-3.12.4/mozilla/security/coreconf/nsinstall/Makefile	2009-11-20 19:18:06.000000000 +0100
+@@ -62,7 +62,7 @@ CC=$(NATIVE_CC)
  endif
  
-+ifdef NATIVE_LDFLAGS
-+LDFLAGS=$(NATIVE_LDFLAGS)
-+endif
-+
- include $(DEPTH)/coreconf/rules.mk
+ ifdef NATIVE_FLAGS
+-OS_CFLAGS=$(NATIVE_FLAGS)
++CFLAGS=$(NATIVE_FLAGS)
+ endif
  
- # Redefine MAKE_OBJDIR for just this directory
+ include $(DEPTH)/coreconf/rules.mk
diff --git a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
index 9c643dacf..326f958d8 100644
--- a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
+++ b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
@@ -1,6 +1,6 @@
---- nss-3.12.3.orig/mozilla/security/nss/cmd/shlibsign/sign.sh	2006-01-18 21:56:28.000000000 +0100
-+++ nss-3.12.3/mozilla/security/nss/cmd/shlibsign/sign.sh	2009-06-24 21:27:49.462838938 +0200
-@@ -53,6 +53,7 @@ OpenVMS)
+--- nss-3.12.4.orig/mozilla/security/nss/cmd/shlibsign/sign.sh	2009-06-05 04:30:52.000000000 +0200
++++ nss-3.12.4/mozilla/security/nss/cmd/shlibsign/sign.sh	2009-11-20 18:51:43.000000000 +0100
+@@ -35,6 +35,7 @@ WIN*)
      ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
      export ADDON_PATH
      echo ${2}/shlibsign -v -i ${5}