diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-19 20:07:22 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-19 20:09:04 +0200 |
| commit | 2bd484a2c9104afeb116bf0ba70c3ca5682e9f25 (patch) | |
| tree | 0b6292ba3a8196a6d47af7772ab84f94d76dff48 /package | |
| parent | bdced13d263da09de74e605645c43183eb280d5b (diff) | |
update to latest upstream
Diffstat (limited to 'package')
| -rw-r--r-- | package/nss/Makefile | 17 | ||||
| -rw-r--r-- | package/nss/patches/patch-nss_cmd_manifest_mn | 10 | ||||
| -rw-r--r-- | package/nss/patches/patch-nss_coreconf_Linux_mk | 6 |
3 files changed, 21 insertions, 12 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile index 8a31b620f..b477645bc 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -4,19 +4,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nss -PKG_VERSION:= 3.15.3.1 -PKG_RELEASE:= 2 +PKG_VERSION:= 3.16.1 +PKG_RELEASE:= 1 PKG_MAJ_VERSION:= 3 -PKG_MIN_VERSION:= 15 -PKG_PATCH_VERSION:= 3 -PKG_PATCH2_VERSION:= 1 -PKG_MD5SUM:= 1d444fffdb1f890a000003b50295b5aa +PKG_MIN_VERSION:= 16 +PKG_PATCH_VERSION:= 1 +PKG_MD5SUM:= 97ccaa5d27aa59faf07c8b968dbaea1d PKG_DESCR:= network security services library -PKG_SECTION:= libs/misc +PKG_SECTION:= libs/crypto PKG_BUILDDEP:= nspr zlib sqlite PKG_DEPENDS:= nspr zlib libsqlite PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ -PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_${PKG_PATCH2_VERSION}_RTM/src/ +PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_RTM/src/ PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !cygwin @@ -57,7 +56,7 @@ do-install: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss ${INSTALL_DATA} ${WRKDIST}/dist/public/nss/* \ ${STAGING_TARGET_DIR}/usr/include/nss - # needed for firefox and corosync + # needed for firefox ${INSTALL_DIR} ${WRKINST}/usr/bin ${INSTALL_BIN} ${WRKDIST}/dist/bin/nss-config \ ${WRKINST}/usr/bin diff --git a/package/nss/patches/patch-nss_cmd_manifest_mn b/package/nss/patches/patch-nss_cmd_manifest_mn new file mode 100644 index 000000000..98b9accae --- /dev/null +++ b/package/nss/patches/patch-nss_cmd_manifest_mn @@ -0,0 +1,10 @@ +--- nss-3.16.1.orig/nss/cmd/manifest.mn 2014-05-02 05:27:18.000000000 +0200 ++++ nss-3.16.1/nss/cmd/manifest.mn 2014-06-19 14:32:39.000000000 +0200 +@@ -22,7 +22,6 @@ DIRS = lib \ + dbtest \ + derdump \ + digest \ +- httpserv \ + $(FIPSTEST_SRCDIR) \ + $(LOWHASHTEST_SRCDIR) \ + listsuites \ diff --git a/package/nss/patches/patch-nss_coreconf_Linux_mk b/package/nss/patches/patch-nss_coreconf_Linux_mk index d07a77e0d..3f08b564b 100644 --- a/package/nss/patches/patch-nss_coreconf_Linux_mk +++ b/package/nss/patches/patch-nss_coreconf_Linux_mk @@ -1,5 +1,5 @@ ---- 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 +--- nss-3.16.1.orig/nss/coreconf/Linux.mk 2014-05-02 05:27:18.000000000 +0200 ++++ nss-3.16.1/nss/coreconf/Linux.mk 2014-06-19 14:09:55.000000000 +0200 @@ -16,9 +16,9 @@ ifeq ($(USE_PTHREADS),1) IMPL_STRATEGY = _PTH endif @@ -13,7 +13,7 @@ DEFAULT_COMPILER = gcc -@@ -144,7 +144,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) +@@ -146,7 +146,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)) |