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 +-
.../nss/patches/001-lfs-nss-config+nss_pc.patch | 241 ---------------------
.../patch-mozilla_security_coreconf_Linux_mk | 33 ---
.../patch-mozilla_security_coreconf_UNIX_mk | 12 -
.../patch-mozilla_security_coreconf_arch_mk | 11 -
.../patch-mozilla_security_coreconf_command_mk | 11 -
...ch-mozilla_security_coreconf_nsinstall_Makefile | 11 -
.../patch-mozilla_security_coreconf_rules_mk | 20 --
...atch-mozilla_security_nss_cmd_shlibsign_sign_sh | 10 -
.../patch-mozilla_security_nss_lib_freebl_stubs_c | 11 -
package/nss/patches/patch-nss_coreconf_Linux_mk | 24 ++
package/nss/patches/patch-nss_coreconf_UNIX_mk | 12 +
package/nss/patches/patch-nss_coreconf_command_mk | 11 +
package/nss/patches/patch-nss_manifest_mn | 8 +
package/nss/src/nss/config/Makefile | 41 ++++
package/nss/src/nss/config/nss-config.in | 155 +++++++++++++
package/nss/src/nss/config/nss.pc.in | 12 +
17 files changed, 271 insertions(+), 368 deletions(-)
delete mode 100644 package/nss/patches/001-lfs-nss-config+nss_pc.patch
delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk
delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_arch_mk
delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_command_mk
delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile
delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_rules_mk
delete mode 100644 package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
delete mode 100644 package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c
create mode 100644 package/nss/patches/patch-nss_coreconf_Linux_mk
create mode 100644 package/nss/patches/patch-nss_coreconf_UNIX_mk
create mode 100644 package/nss/patches/patch-nss_coreconf_command_mk
create mode 100644 package/nss/patches/patch-nss_manifest_mn
create mode 100644 package/nss/src/nss/config/Makefile
create mode 100644 package/nss/src/nss/config/nss-config.in
create mode 100644 package/nss/src/nss/config/nss.pc.in
(limited to 'package/nss')
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
diff --git a/package/nss/patches/001-lfs-nss-config+nss_pc.patch b/package/nss/patches/001-lfs-nss-config+nss_pc.patch
deleted file mode 100644
index 25784a052..000000000
--- a/package/nss/patches/001-lfs-nss-config+nss_pc.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/Makefile nss-3.14.1/mozilla/security/nss/config/Makefile
---- nss-3.14.1.orig//mozilla/security/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/config/Makefile 2013-02-01 18:15:55.000000000 +0100
-@@ -0,0 +1,41 @@
-+CORE_DEPTH = ../..
-+DEPTH = ../..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: install libs
-+
-+export:
-+install:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ cp nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ cp nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export install libs
-+
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/nss-config.in nss-3.14.1/mozilla/security/nss/config/nss-config.in
---- nss-3.14.1.orig//mozilla/security/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/config/nss-config.in 2013-02-01 18:15:55.000000000 +0100
-@@ -0,0 +1,153 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ nssutil
-+ smime
-+ ssl
-+ softokn
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_nss=yes
-+lib_nssutil=yes
-+lib_smime=yes
-+lib_ssl=yes
-+lib_softokn=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ softokn)
-+ lib_softokn=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-L$libdir"
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_softokn"; then
-+ libdirs="$libdirs -lsoftokn${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/nss.pc.in nss-3.14.1/mozilla/security/nss/config/nss.pc.in
---- nss-3.14.1.orig//mozilla/security/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/config/nss.pc.in 2013-02-01 18:15:55.000000000 +0100
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
-+Cflags: -I${includedir}
-+
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/Makefile nss-3.14.1/mozilla/security/nss/Makefile
---- nss-3.14.1.orig//mozilla/security/nss/Makefile 2012-11-14 02:14:07.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/Makefile 2013-02-01 18:15:52.000000000 +0100
-@@ -44,7 +44,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
-
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
-
-diff -Nur nss-3.14.1.orig//mozilla/security/nss/manifest.mn nss-3.14.1/mozilla/security/nss/manifest.mn
---- nss-3.14.1.orig//mozilla/security/nss/manifest.mn 2012-03-20 15:46:49.000000000 +0100
-+++ nss-3.14.1/mozilla/security/nss/manifest.mn 2013-02-01 18:15:55.000000000 +0100
-@@ -10,6 +10,6 @@
-
- RELEASE = nss
-
--DIRS = lib cmd
-+DIRS = lib cmd config
-
-
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
deleted file mode 100644
index 48a0fbc68..000000000
--- a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
+++ /dev/null
@@ -1,33 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/Linux.mk 2010-08-13 03:32:29.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-10-04 22:49:50.378508674 +0200
-@@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1)
- IMPL_STRATEGY = _PTH
- endif
-
--CC = gcc
--CCC = g++
--RANLIB = ranlib
-+CC ?= gcc
-+CCC ?= g++
-+RANLIB ?= ranlib
-
- DEFAULT_COMPILER = gcc
-
-@@ -137,7 +137,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
-@@ -152,7 +152,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))
--LDFLAGS += $(ARCHFLAG)
-+#LDFLAGS += $(ARCHFLAG)
-
- # On Maemo, we need to use the -rpath-link flag for even the standard system
- # library directories.
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk b/package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk
deleted file mode 100644
index 83616841a..000000000
--- a/package/nss/patches/patch-mozilla_security_coreconf_UNIX_mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/UNIX.mk 2008-10-03 21:12:41.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/UNIX.mk 2010-12-12 01:54:56.000000000 +0100
-@@ -38,7 +38,8 @@
- XP_DEFINE += -DXP_UNIX
- LIB_SUFFIX = a
- DLL_SUFFIX = so
--AR = ar cr $@
-+ARTOOL = ar
-+AR = $(ARTOOL) cr $@
- LDOPTS += -L$(SOURCE_LIB_DIR)
-
- ifdef BUILD_OPT
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk b/package/nss/patches/patch-mozilla_security_coreconf_arch_mk
deleted file mode 100644
index 1fad6135a..000000000
--- a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
- #
-
--OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
-+OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG).OBJ
-
- ifeq (,$(filter-out WIN%,$(OS_TARGET)))
- ifndef BUILD_OPT
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_command_mk b/package/nss/patches/patch-mozilla_security_coreconf_command_mk
deleted file mode 100644
index 518b2e5ea..000000000
--- a/package/nss/patches/patch-mozilla_security_coreconf_command_mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/command.mk 2007-10-23 23:55:00.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/command.mk 2010-10-12 14:44:35.000000000 +0200
-@@ -48,7 +48,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L
- CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- $(XCFLAGS)
- PERL = perl
--RANLIB = echo
-+RANLIB = ranlib
- TAR = /bin/tar
- #
- # For purify
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile b/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile
deleted file mode 100644
index 5c6d1324c..000000000
--- a/package/nss/patches/patch-mozilla_security_coreconf_nsinstall_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_FLAGS
--OS_CFLAGS=$(NATIVE_FLAGS)
-+CFLAGS=$(NATIVE_FLAGS)
- endif
-
- include $(DEPTH)/coreconf/rules.mk
diff --git a/package/nss/patches/patch-mozilla_security_coreconf_rules_mk b/package/nss/patches/patch-mozilla_security_coreconf_rules_mk
deleted file mode 100644
index d58086f58..000000000
--- a/package/nss/patches/patch-mozilla_security_coreconf_rules_mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/coreconf/rules.mk 2010-04-26 01:37:40.000000000 +0200
-+++ nss-3.12.8/mozilla/security/coreconf/rules.mk 2010-10-03 23:41:05.000000000 +0200
-@@ -281,7 +281,7 @@ ifdef MT
- fi
- endif # MSVC with manifest tool
- else
-- $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-+ $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
- endif
-
- get_objs:
-@@ -338,7 +338,7 @@ ifdef MT
- endif # MSVC with manifest tool
- endif
- else
-- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
-+ $(MKSHLIB) -o $@ $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
- chmod +x $@
- ifeq ($(OS_TARGET),Darwin)
- ifdef MAPFILE
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
deleted file mode 100644
index 3d993d247..000000000
--- a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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}"
-+ #"${2}"/shlibsign -v -i "${5}"
- ;;
- esac
diff --git a/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c b/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c
deleted file mode 100644
index 111203785..000000000
--- a/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/stubs.c 2010-04-29 02:17:52.000000000 +0200
-+++ nss-3.12.8/mozilla/security/nss/lib/freebl/stubs.c 2010-10-03 23:19:08.000000000 +0200
-@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib)
- * fetch the library if it's loaded. For NSS it should already be loaded
- */
- #define freebl_getLibrary(libName) \
-- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD)
-+ dlopen (libName, RTLD_LAZY)
-
- #define freebl_releaseLibrary(lib) \
- if (lib) dlclose(lib)
diff --git a/package/nss/patches/patch-nss_coreconf_Linux_mk b/package/nss/patches/patch-nss_coreconf_Linux_mk
new file mode 100644
index 000000000..d07a77e0d
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_Linux_mk
@@ -0,0 +1,24 @@
+--- nss-3.15.2.orig/nss/coreconf/Linux.mk 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/Linux.mk 2013-09-27 19:08:33.000000000 +0200
+@@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1)
+ IMPL_STRATEGY = _PTH
+ endif
+
+-CC = gcc
+-CCC = g++
+-RANLIB = ranlib
++CC ?= gcc
++CCC ?= g++
++RANLIB ?= ranlib
+
+ DEFAULT_COMPILER = gcc
+
+@@ -144,7 +144,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))
+-LDFLAGS += $(ARCHFLAG)
++#LDFLAGS += $(ARCHFLAG)
+
+ # On Maemo, we need to use the -rpath-link flag for even the standard system
+ # library directories.
diff --git a/package/nss/patches/patch-nss_coreconf_UNIX_mk b/package/nss/patches/patch-nss_coreconf_UNIX_mk
new file mode 100644
index 000000000..d744bcc0c
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_UNIX_mk
@@ -0,0 +1,12 @@
+--- nss-3.15.2.orig/nss/coreconf/UNIX.mk 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/UNIX.mk 2013-09-27 19:15:14.000000000 +0200
+@@ -6,7 +6,8 @@
+ XP_DEFINE += -DXP_UNIX
+ LIB_SUFFIX = a
+ DLL_SUFFIX = so
+-AR = ar cr $@
++ARTOOL = ar
++AR = $(ARTOOL) cr $@
+ LDOPTS += -L$(SOURCE_LIB_DIR)
+
+ ifdef BUILD_OPT
diff --git a/package/nss/patches/patch-nss_coreconf_command_mk b/package/nss/patches/patch-nss_coreconf_command_mk
new file mode 100644
index 000000000..91c922000
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_command_mk
@@ -0,0 +1,11 @@
+--- nss-3.15.2.orig/nss/coreconf/command.mk 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/command.mk 2013-09-27 19:07:39.000000000 +0200
+@@ -16,7 +16,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L
+ CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ $(XCFLAGS)
+ PERL = perl
+-RANLIB = echo
++RANLIB = ranlib
+ TAR = /bin/tar
+ #
+ # For purify
diff --git a/package/nss/patches/patch-nss_manifest_mn b/package/nss/patches/patch-nss_manifest_mn
new file mode 100644
index 000000000..91fc45073
--- /dev/null
+++ b/package/nss/patches/patch-nss_manifest_mn
@@ -0,0 +1,8 @@
+--- nss-3.15.2.orig/nss/manifest.mn 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/manifest.mn 2013-09-30 16:02:15.000000000 +0200
+@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
diff --git a/package/nss/src/nss/config/Makefile b/package/nss/src/nss/config/Makefile
new file mode 100644
index 000000000..d80816b60
--- /dev/null
+++ b/package/nss/src/nss/config/Makefile
@@ -0,0 +1,41 @@
+CORE_DEPTH = ..
+DEPTH = ..
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
+PREFIX = /usr
+
+all: install libs
+
+export:
+install:
+ # Create the nss.pc file
+ mkdir -p $(DIST)/lib/pkgconfig
+ sed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@exec_prefix@,\$${prefix}," \
+ -e "s,@libdir@,\$${prefix}/lib," \
+ -e "s,@includedir@,\$${prefix}/include/nss," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss.pc.in > nss.pc
+ chmod 0644 nss.pc
+ cp nss.pc $(DIST)/lib/pkgconfig
+
+ # Create the nss-config script
+ mkdir -p $(DIST)/bin
+ sed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss-config.in > nss-config
+ chmod 0755 nss-config
+ cp nss-config $(DIST)/bin
+
+libs:
+
+dummy: all export install libs
+
diff --git a/package/nss/src/nss/config/nss-config.in b/package/nss/src/nss/config/nss-config.in
new file mode 100644
index 000000000..d848206fb
--- /dev/null
+++ b/package/nss/src/nss/config/nss-config.in
@@ -0,0 +1,155 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@NSS_MAJOR_VERSION@
+minor_version=@NSS_MINOR_VERSION@
+patch_version=@NSS_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ nssutil
+ smime
+ ssl
+ softokn
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_nss=yes
+lib_nssutil=yes
+lib_smime=yes
+lib_ssl=yes
+lib_softokn=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ nss)
+ lib_nss=yes
+ ;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
+ smime)
+ lib_smime=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
+ softokn)
+ lib_softokn=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-L$libdir"
+ if test -n "$lib_nss"; then
+ libdirs="$libdirs -lnss${major_version}"
+ fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ if test -n "$lib_smime"; then
+ libdirs="$libdirs -lsmime${major_version}"
+ fi
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ prefix=@prefix@
+ fi
+
+ if test -n "$lib_softokn"; then
+ libdirs="$libdirs -lsoftokn${major_version}"
+ fi
+ echo $libdirs
+fi
+
diff --git a/package/nss/src/nss/config/nss.pc.in b/package/nss/src/nss/config/nss.pc.in
new file mode 100644
index 000000000..51f856883
--- /dev/null
+++ b/package/nss/src/nss/config/nss.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSS
+Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.8
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
+Cflags: -I${includedir}
+
--
cgit v1.2.3
From 19b403cb69ae6a686cdc54b55275fc31f294eceb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 11 Oct 2013 17:41:17 +0200
Subject: fix uclibc build
---
package/nss/Makefile | 5 +++--
.../nss/patches/patch-nss_cmd_shlibsign_sign_sh | 12 +++++++++++
.../patches/patch-nss_coreconf_nsinstall_Makefile | 23 ++++++++++++++++++++++
package/nss/patches/patch-nss_coreconf_rules_mk | 11 +++++++++++
package/nss/src/nss/config/Makefile | 6 +++---
5 files changed, 52 insertions(+), 5 deletions(-)
create mode 100644 package/nss/patches/patch-nss_cmd_shlibsign_sign_sh
create mode 100644 package/nss/patches/patch-nss_coreconf_nsinstall_Makefile
create mode 100644 package/nss/patches/patch-nss_coreconf_rules_mk
(limited to 'package/nss')
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 943d4b136..e3867d0fa 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= nss
PKG_VERSION:= 3.15.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MAJ_VERSION:= 3
PKG_MIN_VERSION:= 15
PKG_PATCH_VERSION:= 2
@@ -28,6 +28,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
+INSTALL_STYLE:= manual
ifneq ($(ADK_LINUX_64),)
ifeq ($(ADK_LINUX_MIPS),y)
@@ -48,7 +49,7 @@ XAKE_FLAGS+= ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_
XAKE_FLAGS+= NSS_USE_SYSTEM_ZLIB=1
ALL_TARGET:= all
-post-install:
+do-install:
$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{nsssysinit,nssckbi,freebl3,ssl3,smime3,nss3,nssutil3,softokn3}.so \
$(IDIR_NSS)/usr/lib
diff --git a/package/nss/patches/patch-nss_cmd_shlibsign_sign_sh b/package/nss/patches/patch-nss_cmd_shlibsign_sign_sh
new file mode 100644
index 000000000..4f3c535cb
--- /dev/null
+++ b/package/nss/patches/patch-nss_cmd_shlibsign_sign_sh
@@ -0,0 +1,12 @@
+--- nss-3.15.2.orig/nss/cmd/shlibsign/sign.sh 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/cmd/shlibsign/sign.sh 2013-10-11 15:18:48.000000000 +0200
+@@ -45,7 +45,7 @@ WIN*)
+ export LIBRARY_PATH
+ ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
+ export ADDON_PATH
+- echo "${2}"/shlibsign -v -i "${5}"
+- "${2}"/shlibsign -v -i "${5}"
++ #echo "${2}"/shlibsign -v -i "${5}"
++ #"${2}"/shlibsign -v -i "${5}"
+ ;;
+ esac
diff --git a/package/nss/patches/patch-nss_coreconf_nsinstall_Makefile b/package/nss/patches/patch-nss_coreconf_nsinstall_Makefile
new file mode 100644
index 000000000..251a628b1
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_nsinstall_Makefile
@@ -0,0 +1,23 @@
+--- nss-3.15.2.orig/nss/coreconf/nsinstall/Makefile 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/nsinstall/Makefile 2013-10-11 16:12:45.000000000 +0200
+@@ -18,19 +18,14 @@ INTERNAL_TOOLS = 1
+
+ include $(DEPTH)/coreconf/config.mk
+
+-ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+-PROGRAM =
+-else
+-TARGETS = $(PROGRAM)
+ INSTALL = true
+-endif
+
+ ifdef NATIVE_CC
+ CC=$(NATIVE_CC)
+ endif
+
+ ifdef NATIVE_FLAGS
+-OS_CFLAGS=$(NATIVE_FLAGS)
++CFLAGS=$(NATIVE_FLAGS)
+ endif
+
+ include $(DEPTH)/coreconf/rules.mk
diff --git a/package/nss/patches/patch-nss_coreconf_rules_mk b/package/nss/patches/patch-nss_coreconf_rules_mk
new file mode 100644
index 000000000..ff1485df4
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_rules_mk
@@ -0,0 +1,11 @@
+--- nss-3.15.2.orig/nss/coreconf/rules.mk 2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/rules.mk 2013-10-11 14:55:04.000000000 +0200
+@@ -249,7 +249,7 @@ ifdef MT
+ fi
+ endif # MSVC with manifest tool
+ else
+- $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++ $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+
+ get_objs:
diff --git a/package/nss/src/nss/config/Makefile b/package/nss/src/nss/config/Makefile
index d80816b60..1a913987b 100644
--- a/package/nss/src/nss/config/Makefile
+++ b/package/nss/src/nss/config/Makefile
@@ -8,10 +8,10 @@ NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
PREFIX = /usr
-all: install libs
+all: libs
export:
-install:
+libs:
# Create the nss.pc file
mkdir -p $(DIST)/lib/pkgconfig
sed -e "s,@prefix@,$(PREFIX)," \
@@ -35,7 +35,7 @@ install:
chmod 0755 nss-config
cp nss-config $(DIST)/bin
-libs:
+install:
dummy: all export install libs
--
cgit v1.2.3