From ea9c118b7205b8c122439431f8fe9864207fceab Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 31 Oct 2019 17:46:23 +0100 Subject: nss: version bump 3.46 -> 3.47 Signed-off-by: Michael Olbrich --- .../nss-3.46/0001-nss-fix-nsinstall-build.patch | 43 ---------------------- patches/nss-3.46/0002-add-nss.pc.in.patch | 27 -------------- .../0003-HACK-don-t-build-the-commands.patch | 21 ----------- patches/nss-3.46/series | 6 --- .../nss-3.47/0001-nss-fix-nsinstall-build.patch | 43 ++++++++++++++++++++++ patches/nss-3.47/0002-add-nss.pc.in.patch | 27 ++++++++++++++ .../0003-HACK-don-t-build-the-commands.patch | 21 +++++++++++ patches/nss-3.47/series | 6 +++ rules/nss.make | 4 +- 9 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 patches/nss-3.46/0001-nss-fix-nsinstall-build.patch delete mode 100644 patches/nss-3.46/0002-add-nss.pc.in.patch delete mode 100644 patches/nss-3.46/0003-HACK-don-t-build-the-commands.patch delete mode 100644 patches/nss-3.46/series create mode 100644 patches/nss-3.47/0001-nss-fix-nsinstall-build.patch create mode 100644 patches/nss-3.47/0002-add-nss.pc.in.patch create mode 100644 patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch create mode 100644 patches/nss-3.47/series diff --git a/patches/nss-3.46/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.46/0001-nss-fix-nsinstall-build.patch deleted file mode 100644 index ab3f9133e..000000000 --- a/patches/nss-3.46/0001-nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Wenzong Fan -Date: Tue, 12 Apr 2016 11:33:52 +0200 -Subject: [PATCH] nss: fix nsinstall build - -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan ---- - nss/coreconf/nsinstall/Makefile | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile -index 1850bcb93cf7..75297de39ce1 100644 ---- a/nss/coreconf/nsinstall/Makefile -+++ b/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/patches/nss-3.46/0002-add-nss.pc.in.patch b/patches/nss-3.46/0002-add-nss.pc.in.patch deleted file mode 100644 index addc805b5..000000000 --- a/patches/nss-3.46/0002-add-nss.pc.in.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Lucas Stach -Date: Tue, 12 Apr 2016 11:36:26 +0200 -Subject: [PATCH] add nss.pc.in - -Signed-off-by: Michael Olbrich ---- - nss/nss.pc.in | 11 +++++++++++ - 1 file changed, 11 insertions(+) - create mode 100644 nss/nss.pc.in - -diff --git a/nss/nss.pc.in b/nss/nss.pc.in -new file mode 100644 -index 000000000000..b80838f8ca0d ---- /dev/null -+++ b/nss/nss.pc.in -@@ -0,0 +1,11 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include/nss -+ -+Name: NSS -+Description: Mozilla Network Security Services -+Version: @VERSION@ -+Requires: nspr -+Libs: -lnss3 -lnssutil3 -lsmime3 -lssl3 -+Cflags: -I${includedir} diff --git a/patches/nss-3.46/0003-HACK-don-t-build-the-commands.patch b/patches/nss-3.46/0003-HACK-don-t-build-the-commands.patch deleted file mode 100644 index 568d8f751..000000000 --- a/patches/nss-3.46/0003-HACK-don-t-build-the-commands.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Michael Olbrich -Date: Mon, 15 Apr 2019 18:11:49 +0200 -Subject: [PATCH] HACK: don't build the commands - -They are not needed or installed and have zlib as extra dependency. - -Signed-off-by: Michael Olbrich ---- - nss/manifest.mn | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nss/manifest.mn b/nss/manifest.mn -index 500a5ad64b62..03d8e620ea4b 100644 ---- a/nss/manifest.mn -+++ b/nss/manifest.mn -@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ - - RELEASE = nss - --DIRS = coreconf lib cmd cpputil gtests -+DIRS = coreconf lib cpputil gtests diff --git a/patches/nss-3.46/series b/patches/nss-3.46/series deleted file mode 100644 index f7f38f3be..000000000 --- a/patches/nss-3.46/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-nss-fix-nsinstall-build.patch -0002-add-nss.pc.in.patch -0003-HACK-don-t-build-the-commands.patch -# 5a106339b1aacb64732e0a72df6e0416 - git-ptx-patches magic diff --git a/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch new file mode 100644 index 000000000..ab3f9133e --- /dev/null +++ b/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch @@ -0,0 +1,43 @@ +From: Wenzong Fan +Date: Tue, 12 Apr 2016 11:33:52 +0200 +Subject: [PATCH] nss: fix nsinstall build + +Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 1850bcb93cf7..75297de39ce1 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++CFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + else diff --git a/patches/nss-3.47/0002-add-nss.pc.in.patch b/patches/nss-3.47/0002-add-nss.pc.in.patch new file mode 100644 index 000000000..addc805b5 --- /dev/null +++ b/patches/nss-3.47/0002-add-nss.pc.in.patch @@ -0,0 +1,27 @@ +From: Lucas Stach +Date: Tue, 12 Apr 2016 11:36:26 +0200 +Subject: [PATCH] add nss.pc.in + +Signed-off-by: Michael Olbrich +--- + nss/nss.pc.in | 11 +++++++++++ + 1 file changed, 11 insertions(+) + create mode 100644 nss/nss.pc.in + +diff --git a/nss/nss.pc.in b/nss/nss.pc.in +new file mode 100644 +index 000000000000..b80838f8ca0d +--- /dev/null ++++ b/nss/nss.pc.in +@@ -0,0 +1,11 @@ ++prefix=/usr ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include/nss ++ ++Name: NSS ++Description: Mozilla Network Security Services ++Version: @VERSION@ ++Requires: nspr ++Libs: -lnss3 -lnssutil3 -lsmime3 -lssl3 ++Cflags: -I${includedir} diff --git a/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch b/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch new file mode 100644 index 000000000..568d8f751 --- /dev/null +++ b/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch @@ -0,0 +1,21 @@ +From: Michael Olbrich +Date: Mon, 15 Apr 2019 18:11:49 +0200 +Subject: [PATCH] HACK: don't build the commands + +They are not needed or installed and have zlib as extra dependency. + +Signed-off-by: Michael Olbrich +--- + nss/manifest.mn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/manifest.mn b/nss/manifest.mn +index 500a5ad64b62..03d8e620ea4b 100644 +--- a/nss/manifest.mn ++++ b/nss/manifest.mn +@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ + + RELEASE = nss + +-DIRS = coreconf lib cmd cpputil gtests ++DIRS = coreconf lib cpputil gtests diff --git a/patches/nss-3.47/series b/patches/nss-3.47/series new file mode 100644 index 000000000..f7f38f3be --- /dev/null +++ b/patches/nss-3.47/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-nss-fix-nsinstall-build.patch +0002-add-nss.pc.in.patch +0003-HACK-don-t-build-the-commands.patch +# 5a106339b1aacb64732e0a72df6e0416 - git-ptx-patches magic diff --git a/rules/nss.make b/rules/nss.make index 49406fb95..373a9c01a 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss # # Paths and names # -NSS_VERSION := 3.46 -NSS_MD5 := 35064ecbf4c4610820d52ab4a86860f6 +NSS_VERSION := 3.47 +NSS_MD5 := 81e47f3c70c2c53f801ab39434c887fb NSS := nss-$(NSS_VERSION) NSS_SUFFIX := tar.gz NSS_URL := https://ftp.mozilla.org/pub/security/nss/releases/NSS_$(subst .,_,$(NSS_VERSION))_RTM/src/$(NSS).$(NSS_SUFFIX) -- cgit v1.2.3