Skip to content

GitLab

N
nss
Commit 0f562dfd authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated nss to 3.54

parent e2b475ab
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 47 deletions
Makefile
View file @ 0f562dfd
all: all:
tar xf nss-3.44.1.tar.gz tar xf nss-3.54.tar.gz
patch -Np1 -d nss-3.44.1 < nss-3.44.1-standalone-1.patch patch -Np1 -d nss-3.54 < nss-3.54-standalone-1.patch
$(MAKE) -C nss-3.44.1/nss -j1 BUILD_OPT=1 NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz NSS_ENABLE_WERROR=0 $$([ $$(uname -m) = x86_64 ] || [ $$(uname -m) = aarch64 ] && echo USE_64=1) $$([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) $(MAKE) -C nss-3.54/nss -j1 BUILD_OPT=1 NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz NSS_ENABLE_WERROR=0 $$([ $$(uname -m) = x86_64 ] || [ $$(uname -m) = aarch64 ] && echo USE_64=1) $$([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1)
install -v -m755 nss-3.44.1/dist/Linux*/lib/*.so /usr/lib install -v -m755 nss-3.54/dist/Linux*/lib/*.so /usr/lib
install -v -m644 nss-3.44.1/dist/Linux*/lib/{*.chk,libcrmf.a} /usr/lib install -v -m644 nss-3.54/dist/Linux*/lib/{*.chk,libcrmf.a} /usr/lib
install -v -m755 -d /usr/include/nss install -v -m755 -d /usr/include/nss
cp -v -RL nss-3.44.1/dist/{public,private}/nss/* /usr/include/nss cp -v -RL nss-3.54/dist/{public,private}/nss/* /usr/include/nss
chmod -v 644 /usr/include/nss/* chmod -v 644 /usr/include/nss/*
install -v -m755 nss-3.44.1/dist/Linux*/bin/{certutil,nss-config,pk12util} /usr/bin install -v -m755 nss-3.54/dist/Linux*/bin/{certutil,nss-config,pk12util} /usr/bin
install -v -m644 nss-3.44.1/dist/Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig install -v -m644 nss-3.54/dist/Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig
rm -rf nss-3.44.1 rm -rf nss-3.54
nss-3.44.1-standalone-1.patch → nss-3.54-standalone-1.patch
View file @ 0f562dfd
Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> diff -uNr nss-3.54/nss/config/Makefile nss-3.54-standalone-1/nss/config/Makefile
Date: 2016-12-27 --- nss-3.54/nss/config/Makefile 1970-01-01 09:30:00.000000000 +0930
Initial Package Version: 3.12.4 +++ nss-3.54-standalone-1/nss/config/Makefile 2021-08-23 14:08:54.037926953 +0930
Upstream Status: Not applicable @@ -0,0 +1,42 @@
Origin: Self, rediffed for nss-3.28.
Description: Adds auto-generated nss.pc and nss-config script, and
allows building without nspr in the source tree.
For 3.40.1, Requires: updated to nspr >= 4.20.
diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
--- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600
+++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600
@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
-nss_build_all: build_nspr all latest
+nss_build_all: all latest
nss_clean_all: clobber_nspr clobber
diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
--- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600
@@ -0,0 +1,40 @@
+CORE_DEPTH = .. +CORE_DEPTH = ..
+DEPTH = .. +DEPTH = ..
+ +
...@@ -31,6 +10,7 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile ...@@ -31,6 +10,7 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` +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_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}'` +NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
+NSS_NSPR_MINIMUM = `head -n1 ../automation/release/nspr-version.txt`
+PREFIX = /usr +PREFIX = /usr
+ +
+all: export libs +all: export libs
...@@ -45,6 +25,7 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile ...@@ -45,6 +25,7 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ + -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ + -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ -e "s,@NSS_NSPR_MINIMUM@,$(NSS_NSPR_MINIMUM)," \
+ nss.pc.in > nss.pc + nss.pc.in > nss.pc
+ chmod 0644 nss.pc + chmod 0644 nss.pc
+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig + ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
...@@ -63,9 +44,9 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile ...@@ -63,9 +44,9 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
+ +
+dummy: all export libs +dummy: all export libs
+ +
diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in diff -uNr nss-3.54/nss/config/nss-config.in nss-3.54-standalone-1/nss/config/nss-config.in
--- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 --- nss-3.54/nss/config/nss-config.in 1970-01-01 09:30:00.000000000 +0930
+++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600 +++ nss-3.54-standalone-1/nss/config/nss-config.in 2021-08-23 14:08:54.037926953 +0930
@@ -0,0 +1,153 @@ @@ -0,0 +1,153 @@
+#!/bin/sh +#!/bin/sh
+ +
...@@ -220,9 +201,9 @@ diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-confi ...@@ -220,9 +201,9 @@ diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-confi
+ echo $libdirs + echo $libdirs
+fi +fi
+ +
diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in diff -uNr nss-3.54/nss/config/nss.pc.in nss-3.54-standalone-1/nss/config/nss.pc.in
--- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 --- nss-3.54/nss/config/nss.pc.in 1970-01-01 09:30:00.000000000 +0930
+++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600 +++ nss-3.54-standalone-1/nss/config/nss.pc.in 2021-08-23 14:08:54.037926953 +0930
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+prefix=@prefix@ +prefix=@prefix@
+exec_prefix=@exec_prefix@ +exec_prefix=@exec_prefix@
...@@ -232,16 +213,44 @@ diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in ...@@ -232,16 +213,44 @@ diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
+Name: NSS +Name: NSS
+Description: Network Security Services +Description: Network Security Services
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
+Requires: nspr >= 4.20 +Requires: nspr >= @NSS_NSPR_MINIMUM@
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ +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} +Cflags: -I${includedir}
+ +
diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn diff -uNr nss-3.54/nss/Makefile nss-3.54-standalone-1/nss/Makefile
--- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600 --- nss-3.54/nss/Makefile 2020-06-27 01:08:51.000000000 +0930
+++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600 +++ nss-3.54-standalone-1/nss/Makefile 2021-08-23 14:08:54.038926956 +0930
@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ @@ -4,6 +4,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+default: nss_build_all
+
#######################################################################
# (1) Include initial platform-independent assignments (MANDATORY). #
#######################################################################
@@ -48,12 +50,10 @@
#######################################################################
nss_build_all:
- $(MAKE) build_nspr
$(MAKE) all
$(MAKE) latest
nss_clean_all:
- $(MAKE) clobber_nspr
$(MAKE) clobber
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
diff -uNr nss-3.54/nss/manifest.mn nss-3.54-standalone-1/nss/manifest.mn
--- nss-3.54/nss/manifest.mn 2020-06-27 01:08:51.000000000 +0930
+++ nss-3.54-standalone-1/nss/manifest.mn 2021-08-23 14:08:54.038926956 +0930
@@ -10,7 +10,7 @@
RELEASE = nss RELEASE = nss
-DIRS = coreconf lib cmd cpputil gtests -DIRS = coreconf lib cmd cpputil gtests
+DIRS = coreconf lib cmd cpputil gtests config +DIRS = coreconf lib cmd cpputil gtests config
lib: coreconf
cmd: lib
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment