Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
207732b209

+ 6 - 4
package/nss/Makefile

@@ -4,11 +4,11 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
-PKG_VERSION:=		3.27.1
+PKG_VERSION:=		3.123.1
 PKG_RELEASE:=		1
 PKG_MAJ_VERSION:=	3
-PKG_MIN_VERSION:=	27_1
-PKG_HASH:=		fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b
+PKG_MIN_VERSION:=	123_1
+PKG_HASH:=		42065a3ff780a9710a3dddcd1cee9b9be2aa40628883cea851d562eb58b178b0
 PKG_DESCR:=		network security services library
 PKG_SECTION:=		libs/crypto
 PKG_BUILDDEP:=		nspr zlib sqlite
@@ -17,6 +17,8 @@ PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
 PKG_SITES:=		https://ftp.mozilla.org/pub/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_RTM/src/
 PKG_NOPARALLEL:=	1
 
+PKG_CFLINE_NSS:=	depends on ADK_BROKEN
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 WRKSRC=			${WRKDIST}/nss
 
@@ -36,7 +38,7 @@ endif
 
 MAKE_FLAGS+=		NATIVE_CC="${HOST_CC}" NATIVE_FLAGS="${HOST_CFLAGS}"
 TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/nspr
-TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/nspr
+TARGET_CFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/nspr -Wno-implicit-function-declaration
 
 XAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
 XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"

+ 0 - 12
package/nss/patches/patch-nss_cmd_shlibsign_sign_sh

@@ -1,12 +0,0 @@
---- 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

+ 0 - 24
package/nss/patches/patch-nss_coreconf_Linux_mk

@@ -1,24 +0,0 @@
---- nss-3.26.1.orig/nss/coreconf/Linux.mk	2016-09-26 18:31:01.000000000 +0200
-+++ nss-3.26.1/nss/coreconf/Linux.mk	2016-10-02 11:09:15.042562528 +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
- 
-@@ -159,7 +159,7 @@ ZDEFS_FLAG		= -Wl,-z,defs
- ifneq ($(USE_ASAN),1)
- DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
- endif
--LDFLAGS			+= $(ARCHFLAG)
-+#LDFLAGS			+= $(ARCHFLAG)
- 
- # On Maemo, we need to use the -rpath-link flag for even the standard system
- # library directories.

+ 0 - 12
package/nss/patches/patch-nss_coreconf_UNIX_mk

@@ -1,12 +0,0 @@
---- 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

+ 0 - 11
package/nss/patches/patch-nss_coreconf_command_mk

@@ -1,11 +0,0 @@
---- nss-3.23.orig/nss/coreconf/command.mk	2016-02-26 21:51:11.000000000 +0100
-+++ nss-3.23/nss/coreconf/command.mk	2016-03-12 19:34:11.232877235 +0100
-@@ -15,7 +15,7 @@ LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $
- CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \
-                 $(DEFINES) $(INCLUDES) $(XCFLAGS)
- PERL          = perl
--RANLIB        = echo
-+RANLIB        = ranlib
- TAR           = /bin/tar
- #
- # For purify

+ 0 - 23
package/nss/patches/patch-nss_coreconf_nsinstall_Makefile

@@ -1,23 +0,0 @@
---- 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

+ 0 - 11
package/nss/patches/patch-nss_coreconf_rules_mk

@@ -1,11 +0,0 @@
---- 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:

+ 0 - 8
package/nss/patches/patch-nss_manifest_mn

@@ -1,8 +0,0 @@
---- nss-3.23.orig/nss/manifest.mn	2016-02-26 21:51:11.000000000 +0100
-+++ nss-3.23/nss/manifest.mn	2016-03-12 19:42:48.660823505 +0100
-@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
- 
- RELEASE = nss
- 
--DIRS = coreconf lib cmd external_tests
-+DIRS = coreconf lib cmd config