summaryrefslogtreecommitdiff
path: root/package/nss
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:44:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:44:59 +0200
commitb803209ad0f1f198072695109b30a726e0411084 (patch)
tree3d5db865a71f72457d05fbe37cb25e96d67484f8 /package/nss
parentfaf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff)
fat commit to add support for firefox on ibm x40 via usb stick
- add support for IBM X40 notebook - add USB boot support - add firefox package - update and add all dependencies for firefox - add xorg intel driver - add dri support for xorg
Diffstat (limited to 'package/nss')
-rw-r--r--package/nss/Makefile8
-rw-r--r--package/nss/patches/patch-mozilla_security_coreconf_Linux_mk16
-rw-r--r--package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh13
3 files changed, 18 insertions, 19 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 842bfdeb6..28e4da1f8 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= nss
-PKG_VERSION:= 3.12.4
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 1ee3ed9c1900079319bd1de51388d856
+PKG_VERSION:= 3.12.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= da42596665f226de5eb3ecfc1ec57cd1
PKG_DESCR:= Network Security Services (NSS) library
PKG_SECTION:= libs
PKG_BUILDDEP+= nspr zlib
PKG_NOPARALLEL:= 1
PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/
-PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
+PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/
PKG_TARGET_DEPENDS:= !foxboard
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
index 68345c404..cfdf4a340 100644
--- a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
+++ b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
@@ -1,5 +1,5 @@
---- nss-3.12.4.orig/mozilla/security/coreconf/Linux.mk 2009-07-30 01:43:41.000000000 +0200
-+++ nss-3.12.4/mozilla/security/coreconf/Linux.mk 2009-12-11 20:45:13.000000000 +0100
+--- nss-3.12.6.orig/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100
++++ nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-04-12 20:18:32.000000000 +0200
@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
IMPL_STRATEGY = _PTH
endif
@@ -13,19 +13,19 @@
DEFAULT_COMPILER = gcc
-@@ -135,7 +135,7 @@ OS_PTHREAD = -lpthread
- endif
-
- OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
+@@ -133,7 +133,7 @@ endif
+ # not build with -ansi.
+ STANDARDS_CFLAGS = -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
+ OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
-OS_LIBS = $(OS_PTHREAD) -ldl -lc
+OS_LIBS = $(OS_PTHREAD)
ifdef USE_PTHREADS
DEFINES += -D_REENTRANT
-@@ -151,7 +151,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG)
+@@ -148,7 +148,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG)
+ # we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
- DSO_LDFLAGS =
-LDFLAGS += $(ARCHFLAG)
+#LDFLAGS += $(ARCHFLAG)
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 326f958d8..3d993d247 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,11 +1,10 @@
---- 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*)
+--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-12-08 02:33:37.000000000 +0100
++++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/sign.sh 2010-04-12 20:21:23.000000000 +0200
+@@ -35,6 +35,6 @@ WIN*)
ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
export ADDON_PATH
- echo ${2}/shlibsign -v -i ${5}
-- ${2}/shlibsign -v -i ${5}
-+ #disable for cross-compile
-+ #${2}/shlibsign -v -i ${5}
+ echo "${2}"/shlibsign -v -i "${5}"
+- "${2}"/shlibsign -v -i "${5}"
++ #"${2}"/shlibsign -v -i "${5}"
;;
esac