1. photon
  2. Commit f8d5c175b0e342eb02e9d32061240c4342302405
Browse code

Upgrade nss to 3.25

Change-Id: Iddd983e2d8105285a45e5c5f89879020dac47c65
Reviewed-on: http://photon-jenkins.eng.vmware.com/1147
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
(cherry picked from commit 1f1118477f67aa6b96ebc52134e4bb6183e7a396)
Reviewed-on: http://photon-jenkins.eng.vmware.com/1150

suezzelur authored on 2016/07/07 03:30:54
Showing 5 changed files
SPECS/nss/nss-3.15.4-standalone-1.patch
History View file @ f8d5c17
1 1 
deleted file mode 100644
... ... 
@@ -1,241 +0,0 @@
1 
-Submitted By:            Armin K. <krejzi at email dot com>
2 
-Date:                    2013-07-02
3 
-Initial Package Version: 3.15
4 
-Upstream Status:         Not applicable
5 
-Origin:                  Based on dj's original patch, rediffed and modified for 3.15
6 
-Description:             Adds auto-generated nss.pc and nss-config script, and allows
7 
-                         building without nspr in the source tree.
8 
-
9 
-+++ b/nss/config/Makefile	2013-07-02 14:53:56.684750636 +0200
10 
-@@ -0,0 +1,40 @@
11 
-+CORE_DEPTH = ..
12 
-+DEPTH      = ..
13 
-+
14 
-+include $(CORE_DEPTH)/coreconf/config.mk
15 
-+
16 
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
17 
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
18 
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
19 
-+PREFIX = /usr
20 
-+
21 
-+all: export libs
22 
-+
23 
-+export:
24 
-+	# Create the nss.pc file
25 
-+	mkdir -p $(DIST)/lib/pkgconfig
26 
-+	sed -e "s,@prefix@,$(PREFIX)," \
27 
-+	    -e "s,@exec_prefix@,\$${prefix}," \
28 
-+	    -e "s,@libdir@,\$${prefix}/lib," \
29 
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
30 
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
31 
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
32 
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
33 
-+	    nss.pc.in > nss.pc
34 
-+	chmod 0644 nss.pc
35 
-+	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
36 
-+
37 
-+	# Create the nss-config script
38 
-+	mkdir -p $(DIST)/bin
39 
-+	sed -e "s,@prefix@,$(PREFIX)," \
40 
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
41 
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
42 
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
43 
-+	    nss-config.in > nss-config
44 
-+	chmod 0755 nss-config
45 
-+	ln -sf ../../../nss/config/nss-config $(DIST)/bin
46 
-+
47 
-+libs:
48 
-+
49 
-+dummy: all export libs
50 
-+
51 
-+++ b/nss/config/nss-config.in	2013-07-02 14:52:58.328084334 +0200
52 
-@@ -0,0 +1,153 @@
53 
-+#!/bin/sh
54 
-+
55 
-+prefix=@prefix@
56 
-+
57 
-+major_version=@NSS_MAJOR_VERSION@
58 
-+minor_version=@NSS_MINOR_VERSION@
59 
-+patch_version=@NSS_PATCH_VERSION@
60 
-+
61 
-+usage()
62 
-+{
63 
-+	cat <<EOF
64 
-+Usage: nss-config [OPTIONS] [LIBRARIES]
65 
-+Options:
66 
-+	[--prefix[=DIR]]
67 
-+	[--exec-prefix[=DIR]]
68 
-+	[--includedir[=DIR]]
69 
-+	[--libdir[=DIR]]
70 
-+	[--version]
71 
-+	[--libs]
72 
-+	[--cflags]
73 
-+Dynamic Libraries:
74 
-+	nss
75 
-+	nssutil
76 
-+	smime
77 
-+	ssl
78 
-+	softokn
79 
-+EOF
80 
-+	exit $1
81 
-+}
82 
-+
83 
-+if test $# -eq 0; then
84 
-+	usage 1 1>&2
85 
-+fi
86 
-+
87 
-+lib_nss=yes
88 
-+lib_nssutil=yes
89 
-+lib_smime=yes
90 
-+lib_ssl=yes
91 
-+lib_softokn=yes
92 
-+
93 
-+while test $# -gt 0; do
94 
-+  case "$1" in
95 
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
96 
-+  *) optarg= ;;
97 
-+  esac
98 
-+
99 
-+  case $1 in
100 
-+    --prefix=*)
101 
-+      prefix=$optarg
102 
-+      ;;
103 
-+    --prefix)
104 
-+      echo_prefix=yes
105 
-+      ;;
106 
-+    --exec-prefix=*)
107 
-+      exec_prefix=$optarg
108 
-+      ;;
109 
-+    --exec-prefix)
110 
-+      echo_exec_prefix=yes
111 
-+      ;;
112 
-+    --includedir=*)
113 
-+      includedir=$optarg
114 
-+      ;;
115 
-+    --includedir)
116 
-+      echo_includedir=yes
117 
-+      ;;
118 
-+    --libdir=*)
119 
-+      libdir=$optarg
120 
-+      ;;
121 
-+    --libdir)
122 
-+      echo_libdir=yes
123 
-+      ;;
124 
-+    --version)
125 
-+      echo ${major_version}.${minor_version}.${patch_version}
126 
-+      ;;
127 
-+    --cflags)
128 
-+      echo_cflags=yes
129 
-+      ;;
130 
-+    --libs)
131 
-+      echo_libs=yes
132 
-+      ;;
133 
-+    nss)
134 
-+      lib_nss=yes
135 
-+      ;;
136 
-+    nssutil)
137 
-+      lib_nssutil=yes
138 
-+      ;;
139 
-+    smime)
140 
-+      lib_smime=yes
141 
-+      ;;
142 
-+    ssl)
143 
-+      lib_ssl=yes
144 
-+      ;;
145 
-+    softokn)
146 
-+      lib_softokn=yes
147 
-+      ;;
148 
-+    *)
149 
-+      usage 1 1>&2
150 
-+      ;;
151 
-+  esac
152 
-+  shift
153 
-+done
154 
-+
155 
-+# Set variables that may be dependent upon other variables
156 
-+if test -z "$exec_prefix"; then
157 
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
158 
-+fi
159 
-+if test -z "$includedir"; then
160 
-+    includedir=`pkg-config --variable=includedir nss`
161 
-+fi
162 
-+if test -z "$libdir"; then
163 
-+    libdir=`pkg-config --variable=libdir nss`
164 
-+fi
165 
-+
166 
-+if test "$echo_prefix" = "yes"; then
167 
-+    echo $prefix
168 
-+fi
169 
-+
170 
-+if test "$echo_exec_prefix" = "yes"; then
171 
-+    echo $exec_prefix
172 
-+fi
173 
-+
174 
-+if test "$echo_includedir" = "yes"; then
175 
-+    echo $includedir
176 
-+fi
177 
-+
178 
-+if test "$echo_libdir" = "yes"; then
179 
-+    echo $libdir
180 
-+fi
181 
-+
182 
-+if test "$echo_cflags" = "yes"; then
183 
-+    echo -I$includedir
184 
-+fi
185 
-+
186 
-+if test "$echo_libs" = "yes"; then
187 
-+      libdirs="-L$libdir"
188 
-+      if test -n "$lib_nss"; then
189 
-+	libdirs="$libdirs -lnss${major_version}"
190 
-+      fi
191 
-+      if test -n "$lib_nssutil"; then
192 
-+        libdirs="$libdirs -lnssutil${major_version}"
193 
-+      fi
194 
-+      if test -n "$lib_smime"; then
195 
-+	libdirs="$libdirs -lsmime${major_version}"
196 
-+      fi
197 
-+      if test -n "$lib_ssl"; then
198 
-+	libdirs="$libdirs -lssl${major_version}"
199 
-+      fi
200 
-+      if test -n "$lib_softokn"; then
201 
-+        libdirs="$libdirs -lsoftokn${major_version}"
202 
-+      fi
203 
-+      echo $libdirs
204 
-+fi
205 
-+
206 
-+++ b/nss/config/nss.pc.in	2013-07-02 14:52:58.328084334 +0200
207 
-@@ -0,0 +1,12 @@
208 
-+prefix=@prefix@
209 
-+exec_prefix=@exec_prefix@
210 
-+libdir=@libdir@
211 
-+includedir=@includedir@
212 
-+
213 
-+Name: NSS
214 
-+Description: Network Security Services
215 
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
216 
-+Requires: nspr >= 4.8
217 
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
218 
-+Cflags: -I${includedir}
219 
-+
220 
-+++ b/nss/Makefile	2013-07-02 14:52:58.328084334 +0200
221 
-@@ -44,7 +44,7 @@
222 
- # (7) Execute "local" rules. (OPTIONAL).                              #
223 
- #######################################################################
224 
-
225 
--nss_build_all: build_nspr all
226 
-+nss_build_all: all
227 
-
228 
- nss_clean_all: clobber_nspr clobber
229 
-
230 
-+++ b/nss/manifest.mn	2013-07-02 14:52:58.331417666 +0200
231 
-@@ -10,4 +10,4 @@
232 
-
233 
- RELEASE = nss
234 
-
235 
--DIRS = coreconf lib cmd
236 
-+DIRS = coreconf lib cmd config
SPECS/nss/nss-3.19-standalone-1.patch
History View file @ f8d5c17
237 1 
deleted file mode 100644
... ... 
@@ -1,245 +0,0 @@
1 
-Submitted By:            Armin K. <krejzi at email dot com>
2 
-Date:                    2014-09-26
3 
-Initial Package Version: 3.15
4 
-Comment:                 Modified manifest.mn diff (Fernando)
5 
-Upstream Status:         Not applicable
6 
-Origin:                  Based on dj's original patch, rediffed and modified for 3.15
7 
-Description:             Adds auto-generated nss.pc and nss-config script, and allows
8 
-                         building without nspr in the source tree.
9 
-
10 
-+++ b/nss/config/Makefile	2013-07-02 14:53:56.684750636 +0200
11 
-@@ -0,0 +1,40 @@
12 
-+CORE_DEPTH = ..
13 
-+DEPTH      = ..
14 
-+
15 
-+include $(CORE_DEPTH)/coreconf/config.mk
16 
-+
17 
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
18 
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
19 
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
20 
-+PREFIX = /usr
21 
-+
22 
-+all: export libs
23 
-+
24 
-+export:
25 
-+	# Create the nss.pc file
26 
-+	mkdir -p $(DIST)/lib/pkgconfig
27 
-+	sed -e "s,@prefix@,$(PREFIX)," \
28 
-+	    -e "s,@exec_prefix@,\$${prefix}," \
29 
-+	    -e "s,@libdir@,\$${prefix}/lib," \
30 
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
31 
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
32 
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
33 
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
34 
-+	    nss.pc.in > nss.pc
35 
-+	chmod 0644 nss.pc
36 
-+	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
37 
-+
38 
-+	# Create the nss-config script
39 
-+	mkdir -p $(DIST)/bin
40 
-+	sed -e "s,@prefix@,$(PREFIX)," \
41 
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
42 
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
43 
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
44 
-+	    nss-config.in > nss-config
45 
-+	chmod 0755 nss-config
46 
-+	ln -sf ../../../nss/config/nss-config $(DIST)/bin
47 
-+
48 
-+libs:
49 
-+
50 
-+dummy: all export libs
51 
-+
52 
-+++ b/nss/config/nss-config.in	2013-07-02 14:52:58.328084334 +0200
53 
-@@ -0,0 +1,153 @@
54 
-+#!/bin/sh
55 
-+
56 
-+prefix=@prefix@
57 
-+
58 
-+major_version=@NSS_MAJOR_VERSION@
59 
-+minor_version=@NSS_MINOR_VERSION@
60 
-+patch_version=@NSS_PATCH_VERSION@
61 
-+
62 
-+usage()
63 
-+{
64 
-+	cat <<EOF
65 
-+Usage: nss-config [OPTIONS] [LIBRARIES]
66 
-+Options:
67 
-+	[--prefix[=DIR]]
68 
-+	[--exec-prefix[=DIR]]
69 
-+	[--includedir[=DIR]]
70 
-+	[--libdir[=DIR]]
71 
-+	[--version]
72 
-+	[--libs]
73 
-+	[--cflags]
74 
-+Dynamic Libraries:
75 
-+	nss
76 
-+	nssutil
77 
-+	smime
78 
-+	ssl
79 
-+	softokn
80 
-+EOF
81 
-+	exit $1
82 
-+}
83 
-+
84 
-+if test $# -eq 0; then
85 
-+	usage 1 1>&2
86 
-+fi
87 
-+
88 
-+lib_nss=yes
89 
-+lib_nssutil=yes
90 
-+lib_smime=yes
91 
-+lib_ssl=yes
92 
-+lib_softokn=yes
93 
-+
94 
-+while test $# -gt 0; do
95 
-+  case "$1" in
96 
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
97 
-+  *) optarg= ;;
98 
-+  esac
99 
-+
100 
-+  case $1 in
101 
-+    --prefix=*)
102 
-+      prefix=$optarg
103 
-+      ;;
104 
-+    --prefix)
105 
-+      echo_prefix=yes
106 
-+      ;;
107 
-+    --exec-prefix=*)
108 
-+      exec_prefix=$optarg
109 
-+      ;;
110 
-+    --exec-prefix)
111 
-+      echo_exec_prefix=yes
112 
-+      ;;
113 
-+    --includedir=*)
114 
-+      includedir=$optarg
115 
-+      ;;
116 
-+    --includedir)
117 
-+      echo_includedir=yes
118 
-+      ;;
119 
-+    --libdir=*)
120 
-+      libdir=$optarg
121 
-+      ;;
122 
-+    --libdir)
123 
-+      echo_libdir=yes
124 
-+      ;;
125 
-+    --version)
126 
-+      echo ${major_version}.${minor_version}.${patch_version}
127 
-+      ;;
128 
-+    --cflags)
129 
-+      echo_cflags=yes
130 
-+      ;;
131 
-+    --libs)
132 
-+      echo_libs=yes
133 
-+      ;;
134 
-+    nss)
135 
-+      lib_nss=yes
136 
-+      ;;
137 
-+    nssutil)
138 
-+      lib_nssutil=yes
139 
-+      ;;
140 
-+    smime)
141 
-+      lib_smime=yes
142 
-+      ;;
143 
-+    ssl)
144 
-+      lib_ssl=yes
145 
-+      ;;
146 
-+    softokn)
147 
-+      lib_softokn=yes
148 
-+      ;;
149 
-+    *)
150 
-+      usage 1 1>&2
151 
-+      ;;
152 
-+  esac
153 
-+  shift
154 
-+done
155 
-+
156 
-+# Set variables that may be dependent upon other variables
157 
-+if test -z "$exec_prefix"; then
158 
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
159 
-+fi
160 
-+if test -z "$includedir"; then
161 
-+    includedir=`pkg-config --variable=includedir nss`
162 
-+fi
163 
-+if test -z "$libdir"; then
164 
-+    libdir=`pkg-config --variable=libdir nss`
165 
-+fi
166 
-+
167 
-+if test "$echo_prefix" = "yes"; then
168 
-+    echo $prefix
169 
-+fi
170 
-+
171 
-+if test "$echo_exec_prefix" = "yes"; then
172 
-+    echo $exec_prefix
173 
-+fi
174 
-+
175 
-+if test "$echo_includedir" = "yes"; then
176 
-+    echo $includedir
177 
-+fi
178 
-+
179 
-+if test "$echo_libdir" = "yes"; then
180 
-+    echo $libdir
181 
-+fi
182 
-+
183 
-+if test "$echo_cflags" = "yes"; then
184 
-+    echo -I$includedir
185 
-+fi
186 
-+
187 
-+if test "$echo_libs" = "yes"; then
188 
-+      libdirs="-L$libdir"
189 
-+      if test -n "$lib_nss"; then
190 
-+	libdirs="$libdirs -lnss${major_version}"
191 
-+      fi
192 
-+      if test -n "$lib_nssutil"; then
193 
-+        libdirs="$libdirs -lnssutil${major_version}"
194 
-+      fi
195 
-+      if test -n "$lib_smime"; then
196 
-+	libdirs="$libdirs -lsmime${major_version}"
197 
-+      fi
198 
-+      if test -n "$lib_ssl"; then
199 
-+	libdirs="$libdirs -lssl${major_version}"
200 
-+      fi
201 
-+      if test -n "$lib_softokn"; then
202 
-+        libdirs="$libdirs -lsoftokn${major_version}"
203 
-+      fi
204 
-+      echo $libdirs
205 
-+fi
206 
-+
207 
-+++ b/nss/config/nss.pc.in	2013-07-02 14:52:58.328084334 +0200
208 
-@@ -0,0 +1,12 @@
209 
-+prefix=@prefix@
210 
-+exec_prefix=@exec_prefix@
211 
-+libdir=@libdir@
212 
-+includedir=@includedir@
213 
-+
214 
-+Name: NSS
215 
-+Description: Network Security Services
216 
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
217 
-+Requires: nspr >= 4.8
218 
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
219 
-+Cflags: -I${includedir}
220 
-+
221 
-+++ b/nss/Makefile	2013-07-02 14:52:58.328084334 +0200
222 
-@@ -44,7 +44,7 @@
223 
- # (7) Execute "local" rules. (OPTIONAL).                              #
224 
- #######################################################################
225 
-
226 
--nss_build_all: build_nspr all
227 
-+nss_build_all: all
228 
-
229 
- nss_clean_all: clobber_nspr clobber
230 
-
231 
-+++ b/nss/manifest.mn	2014-09-26 16:51:11.386336520 -0300
232 
-@@ -10,7 +10,7 @@
233 
-
234 
- RELEASE = nss
235 
-
236 
--DIRS = coreconf lib cmd
237 
-+DIRS = coreconf lib cmd config
238 
-
239 
- ifdef NSS_BUILD_GTESTS
240 
- DIRS += external_tests
SPECS/nss/nss-3.21-standalone-1.patch
History View file @ f8d5c17
241 1 
deleted file mode 100644
... ... 
@@ -1,248 +0,0 @@
1 
-Submitted By:            Fernando de Oliveira <famobr at yahoo dot com dot br>
2 
-Date:                    2015-11-10
3 
-Initial Package Version: 3.21
4 
-Upstream Status:         Not applicable
5 
-Origin:                  Based on dj's original patch, rediffed and
6 
-                         modified for 3.15 by Armin K.
7 
-                         <krejzi at email dot com>
8 
-Description:             Adds auto-generated nss.pc and nss-config script, and
9 
-                         allows building without nspr in the source tree.
10 
-
11 
-diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile
12 
-+++ nss-3.21/nss/config/Makefile	2015-11-10 12:54:49.358835857 -0300
13 
-@@ -0,0 +1,40 @@
14 
-+CORE_DEPTH = ..
15 
-+DEPTH      = ..
16 
-+
17 
-+include $(CORE_DEPTH)/coreconf/config.mk
18 
-+
19 
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
20 
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
21 
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
22 
-+PREFIX = /usr
23 
-+
24 
-+all: export libs
25 
-+
26 
-+export:
27 
-+	# Create the nss.pc file
28 
-+	mkdir -p $(DIST)/lib/pkgconfig
29 
-+	sed -e "s,@prefix@,$(PREFIX)," \
30 
-+	    -e "s,@exec_prefix@,\$${prefix}," \
31 
-+	    -e "s,@libdir@,\$${prefix}/lib," \
32 
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
33 
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
34 
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
35 
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
36 
-+	    nss.pc.in > nss.pc
37 
-+	chmod 0644 nss.pc
38 
-+	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
39 
-+
40 
-+	# Create the nss-config script
41 
-+	mkdir -p $(DIST)/bin
42 
-+	sed -e "s,@prefix@,$(PREFIX)," \
43 
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
44 
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
45 
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
46 
-+	    nss-config.in > nss-config
47 
-+	chmod 0755 nss-config
48 
-+	ln -sf ../../../nss/config/nss-config $(DIST)/bin
49 
-+
50 
-+libs:
51 
-+
52 
-+dummy: all export libs
53 
-+
54 
-diff -Naur nss-3.21.orig/nss/config/nss-config.in nss-3.21/nss/config/nss-config.in
55 
-+++ nss-3.21/nss/config/nss-config.in	2015-11-10 12:54:49.359835835 -0300
56 
-@@ -0,0 +1,153 @@
57 
-+#!/bin/sh
58 
-+
59 
-+prefix=@prefix@
60 
-+
61 
-+major_version=@NSS_MAJOR_VERSION@
62 
-+minor_version=@NSS_MINOR_VERSION@
63 
-+patch_version=@NSS_PATCH_VERSION@
64 
-+
65 
-+usage()
66 
-+{
67 
-+	cat <<EOF
68 
-+Usage: nss-config [OPTIONS] [LIBRARIES]
69 
-+Options:
70 
-+	[--prefix[=DIR]]
71 
-+	[--exec-prefix[=DIR]]
72 
-+	[--includedir[=DIR]]
73 
-+	[--libdir[=DIR]]
74 
-+	[--version]
75 
-+	[--libs]
76 
-+	[--cflags]
77 
-+Dynamic Libraries:
78 
-+	nss
79 
-+	nssutil
80 
-+	smime
81 
-+	ssl
82 
-+	softokn
83 
-+EOF
84 
-+	exit $1
85 
-+}
86 
-+
87 
-+if test $# -eq 0; then
88 
-+	usage 1 1>&2
89 
-+fi
90 
-+
91 
-+lib_nss=yes
92 
-+lib_nssutil=yes
93 
-+lib_smime=yes
94 
-+lib_ssl=yes
95 
-+lib_softokn=yes
96 
-+
97 
-+while test $# -gt 0; do
98 
-+  case "$1" in
99 
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
100 
-+  *) optarg= ;;
101 
-+  esac
102 
-+
103 
-+  case $1 in
104 
-+    --prefix=*)
105 
-+      prefix=$optarg
106 
-+      ;;
107 
-+    --prefix)
108 
-+      echo_prefix=yes
109 
-+      ;;
110 
-+    --exec-prefix=*)
111 
-+      exec_prefix=$optarg
112 
-+      ;;
113 
-+    --exec-prefix)
114 
-+      echo_exec_prefix=yes
115 
-+      ;;
116 
-+    --includedir=*)
117 
-+      includedir=$optarg
118 
-+      ;;
119 
-+    --includedir)
120 
-+      echo_includedir=yes
121 
-+      ;;
122 
-+    --libdir=*)
123 
-+      libdir=$optarg
124 
-+      ;;
125 
-+    --libdir)
126 
-+      echo_libdir=yes
127 
-+      ;;
128 
-+    --version)
129 
-+      echo ${major_version}.${minor_version}.${patch_version}
130 
-+      ;;
131 
-+    --cflags)
132 
-+      echo_cflags=yes
133 
-+      ;;
134 
-+    --libs)
135 
-+      echo_libs=yes
136 
-+      ;;
137 
-+    nss)
138 
-+      lib_nss=yes
139 
-+      ;;
140 
-+    nssutil)
141 
-+      lib_nssutil=yes
142 
-+      ;;
143 
-+    smime)
144 
-+      lib_smime=yes
145 
-+      ;;
146 
-+    ssl)
147 
-+      lib_ssl=yes
148 
-+      ;;
149 
-+    softokn)
150 
-+      lib_softokn=yes
151 
-+      ;;
152 
-+    *)
153 
-+      usage 1 1>&2
154 
-+      ;;
155 
-+  esac
156 
-+  shift
157 
-+done
158 
-+
159 
-+# Set variables that may be dependent upon other variables
160 
-+if test -z "$exec_prefix"; then
161 
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
162 
-+fi
163 
-+if test -z "$includedir"; then
164 
-+    includedir=`pkg-config --variable=includedir nss`
165 
-+fi
166 
-+if test -z "$libdir"; then
167 
-+    libdir=`pkg-config --variable=libdir nss`
168 
-+fi
169 
-+
170 
-+if test "$echo_prefix" = "yes"; then
171 
-+    echo $prefix
172 
-+fi
173 
-+
174 
-+if test "$echo_exec_prefix" = "yes"; then
175 
-+    echo $exec_prefix
176 
-+fi
177 
-+
178 
-+if test "$echo_includedir" = "yes"; then
179 
-+    echo $includedir
180 
-+fi
181 
-+
182 
-+if test "$echo_libdir" = "yes"; then
183 
-+    echo $libdir
184 
-+fi
185 
-+
186 
-+if test "$echo_cflags" = "yes"; then
187 
-+    echo -I$includedir
188 
-+fi
189 
-+
190 
-+if test "$echo_libs" = "yes"; then
191 
-+      libdirs="-L$libdir"
192 
-+      if test -n "$lib_nss"; then
193 
-+	libdirs="$libdirs -lnss${major_version}"
194 
-+      fi
195 
-+      if test -n "$lib_nssutil"; then
196 
-+        libdirs="$libdirs -lnssutil${major_version}"
197 
-+      fi
198 
-+      if test -n "$lib_smime"; then
199 
-+	libdirs="$libdirs -lsmime${major_version}"
200 
-+      fi
201 
-+      if test -n "$lib_ssl"; then
202 
-+	libdirs="$libdirs -lssl${major_version}"
203 
-+      fi
204 
-+      if test -n "$lib_softokn"; then
205 
-+        libdirs="$libdirs -lsoftokn${major_version}"
206 
-+      fi
207 
-+      echo $libdirs
208 
-+fi
209 
-+
210 
-diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in
211 
-+++ nss-3.21/nss/config/nss.pc.in	2015-11-10 12:54:49.359835835 -0300
212 
-@@ -0,0 +1,12 @@
213 
-+prefix=@prefix@
214 
-+exec_prefix=@exec_prefix@
215 
-+libdir=@libdir@
216 
-+includedir=@includedir@
217 
-+
218 
-+Name: NSS
219 
-+Description: Network Security Services
220 
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
221 
-+Requires: nspr >= 4.8
222 
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
223 
-+Cflags: -I${includedir}
224 
-+
225 
-diff -Naur nss-3.21.orig/nss/Makefile nss-3.21/nss/Makefile
226 
-+++ nss-3.21/nss/Makefile	2015-11-10 12:54:49.359835835 -0300
227 
-@@ -46,7 +46,7 @@
228 
- # (7) Execute "local" rules. (OPTIONAL).                              #
229 
- #######################################################################
230 
-
231 
--nss_build_all: build_nspr all
232 
-+nss_build_all: all
233 
-
234 
- nss_clean_all: clobber_nspr clobber
235 
-
236 
-diff -Naur nss-3.21.orig/nss/manifest.mn nss-3.21/nss/manifest.mn
237 
-+++ nss-3.21/nss/manifest.mn	2015-11-10 12:59:22.439784449 -0300
238 
-@@ -10,4 +10,4 @@
239 
-
240 
- RELEASE = nss
241 
-
242 
--DIRS = coreconf lib cmd external_tests
243 
-+DIRS = coreconf lib cmd external_tests config
SPECS/nss/nss-3.25-standalone-1.patch
History View file @ f8d5c17
244 1 
new file mode 100644
... ... 
@@ -0,0 +1,248 @@
0 
+Submitted By:            Fernando de Oliveira <famobr at yahoo dot com dot br>
1 
+Date:                    2015-11-10
2 
+Initial Package Version: 3.21
3 
+Upstream Status:         Not applicable
4 
+Origin:                  Based on dj's original patch, rediffed and
5 
+                         modified for 3.15 by Armin K.
6 
+                         <krejzi at email dot com>
7 
+Description:             Adds auto-generated nss.pc and nss-config script, and
8 
+                         allows building without nspr in the source tree.
9 
+
10 
+diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile
11 
+--- nss-3.21.orig/nss/config/Makefile	1969-12-31 21:00:00.000000000 -0300
12 
+@@ -0,0 +1,40 @@
13 
++CORE_DEPTH = ..
14 
++DEPTH      = ..
15 
++
16 
++include $(CORE_DEPTH)/coreconf/config.mk
17 
++
18 
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
19 
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
20 
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
21 
++PREFIX = /usr
22 
++
23 
++all: export libs
24 
++
25 
++export:
26 
++	# Create the nss.pc file
27 
++	mkdir -p $(DIST)/lib/pkgconfig
28 
++	sed -e "s,@prefix@,$(PREFIX)," \
29 
++	    -e "s,@exec_prefix@,\$${prefix}," \
30 
++	    -e "s,@libdir@,\$${prefix}/lib," \
31 
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
32 
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
33 
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
34 
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
35 
++	    nss.pc.in > nss.pc
36 
++	chmod 0644 nss.pc
37 
++	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
38 
++
39 
++	# Create the nss-config script
40 
++	mkdir -p $(DIST)/bin
41 
++	sed -e "s,@prefix@,$(PREFIX)," \
42 
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
43 
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
44 
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
45 
++	    nss-config.in > nss-config
46 
++	chmod 0755 nss-config
47 
++	ln -sf ../../../nss/config/nss-config $(DIST)/bin
48 
++
49 
++libs:
50 
++
51 
++dummy: all export libs
52 
++
53 
+diff -Naur nss-3.21.orig/nss/config/nss-config.in nss-3.21/nss/config/nss-config.in
54 
+--- nss-3.21.orig/nss/config/nss-config.in	1969-12-31 21:00:00.000000000 -0300
55 
+@@ -0,0 +1,153 @@
56 
++#!/bin/sh
57 
++
58 
++prefix=@prefix@
59 
++
60 
++major_version=@NSS_MAJOR_VERSION@
61 
++minor_version=@NSS_MINOR_VERSION@
62 
++patch_version=@NSS_PATCH_VERSION@
63 
++
64 
++usage()
65 
++{
66 
++	cat <<EOF
67 
++Usage: nss-config [OPTIONS] [LIBRARIES]
68 
++Options:
69 
++	[--prefix[=DIR]]
70 
++	[--exec-prefix[=DIR]]
71 
++	[--includedir[=DIR]]
72 
++	[--libdir[=DIR]]
73 
++	[--version]
74 
++	[--libs]
75 
++	[--cflags]
76 
++Dynamic Libraries:
77 
++	nss
78 
++	nssutil
79 
++	smime
80 
++	ssl
81 
++	softokn
82 
++EOF
83 
++	exit $1
84 
++}
85 
++
86 
++if test $# -eq 0; then
87 
++	usage 1 1>&2
88 
++fi
89 
++
90 
++lib_nss=yes
91 
++lib_nssutil=yes
92 
++lib_smime=yes
93 
++lib_ssl=yes
94 
++lib_softokn=yes
95 
++
96 
++while test $# -gt 0; do
97 
++  case "$1" in
98 
++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
99 
++  *) optarg= ;;
100 
++  esac
101 
++
102 
++  case $1 in
103 
++    --prefix=*)
104 
++      prefix=$optarg
105 
++      ;;
106 
++    --prefix)
107 
++      echo_prefix=yes
108 
++      ;;
109 
++    --exec-prefix=*)
110 
++      exec_prefix=$optarg
111 
++      ;;
112 
++    --exec-prefix)
113 
++      echo_exec_prefix=yes
114 
++      ;;
115 
++    --includedir=*)
116 
++      includedir=$optarg
117 
++      ;;
118 
++    --includedir)
119 
++      echo_includedir=yes
120 
++      ;;
121 
++    --libdir=*)
122 
++      libdir=$optarg
123 
++      ;;
124 
++    --libdir)
125 
++      echo_libdir=yes
126 
++      ;;
127 
++    --version)
128 
++      echo ${major_version}.${minor_version}.${patch_version}
129 
++      ;;
130 
++    --cflags)
131 
++      echo_cflags=yes
132 
++      ;;
133 
++    --libs)
134 
++      echo_libs=yes
135 
++      ;;
136 
++    nss)
137 
++      lib_nss=yes
138 
++      ;;
139 
++    nssutil)
140 
++      lib_nssutil=yes
141 
++      ;;
142 
++    smime)
143 
++      lib_smime=yes
144 
++      ;;
145 
++    ssl)
146 
++      lib_ssl=yes
147 
++      ;;
148 
++    softokn)
149 
++      lib_softokn=yes
150 
++      ;;
151 
++    *)
152 
++      usage 1 1>&2
153 
++      ;;
154 
++  esac
155 
++  shift
156 
++done
157 
++
158 
++# Set variables that may be dependent upon other variables
159 
++if test -z "$exec_prefix"; then
160 
++    exec_prefix=`pkg-config --variable=exec_prefix nss`
161 
++fi
162 
++if test -z "$includedir"; then
163 
++    includedir=`pkg-config --variable=includedir nss`
164 
++fi
165 
++if test -z "$libdir"; then
166 
++    libdir=`pkg-config --variable=libdir nss`
167 
++fi
168 
++
169 
++if test "$echo_prefix" = "yes"; then
170 
++    echo $prefix
171 
++fi
172 
++
173 
++if test "$echo_exec_prefix" = "yes"; then
174 
++    echo $exec_prefix
175 
++fi
176 
++
177 
++if test "$echo_includedir" = "yes"; then
178 
++    echo $includedir
179 
++fi
180 
++
181 
++if test "$echo_libdir" = "yes"; then
182 
++    echo $libdir
183 
++fi
184 
++
185 
++if test "$echo_cflags" = "yes"; then
186 
++    echo -I$includedir
187 
++fi
188 
++
189 
++if test "$echo_libs" = "yes"; then
190 
++      libdirs="-L$libdir"
191 
++      if test -n "$lib_nss"; then
192 
++	libdirs="$libdirs -lnss${major_version}"
193 
++      fi
194 
++      if test -n "$lib_nssutil"; then
195 
++        libdirs="$libdirs -lnssutil${major_version}"
196 
++      fi
197 
++      if test -n "$lib_smime"; then
198 
++	libdirs="$libdirs -lsmime${major_version}"
199 
++      fi
200 
++      if test -n "$lib_ssl"; then
201 
++	libdirs="$libdirs -lssl${major_version}"
202 
++      fi
203 
++      if test -n "$lib_softokn"; then
204 
++        libdirs="$libdirs -lsoftokn${major_version}"
205 
++      fi
206 
++      echo $libdirs
207 
++fi
208 
++
209 
+diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in
210 
+--- nss-3.21.orig/nss/config/nss.pc.in	1969-12-31 21:00:00.000000000 -0300
211 
+@@ -0,0 +1,12 @@
212 
++prefix=@prefix@
213 
++exec_prefix=@exec_prefix@
214 
++libdir=@libdir@
215 
++includedir=@includedir@
216 
++
217 
++Name: NSS
218 
++Description: Network Security Services
219 
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
220 
++Requires: nspr >= 4.8
221 
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
222 
++Cflags: -I${includedir}
223 
++
224 
+diff -Naur nss-3.21.orig/nss/Makefile nss-3.21/nss/Makefile
225 
+--- nss-3.21.orig/nss/Makefile	2015-11-09 02:12:59.000000000 -0300
226 
+@@ -46,7 +46,7 @@
227 
+ # (7) Execute "local" rules. (OPTIONAL).                              #
228 
+ #######################################################################
229 
+
230 
+-nss_build_all: build_nspr all
231 
++nss_build_all: all
232 
+
233 
+ nss_clean_all: clobber_nspr clobber
234 
+
235 
+diff -Naur nss-3.21.orig/nss/manifest.mn nss-3.21/nss/manifest.mn
236 
+--- nss-3.21.orig/nss/manifest.mn	2015-11-09 02:12:59.000000000 -0300
237 
+@@ -10,4 +10,4 @@
238 
+
239 
+ RELEASE = nss
240 
+
241 
+-DIRS = coreconf lib cmd external_tests
242 
++DIRS = coreconf lib cmd external_tests config
SPECS/nss/nss.spec
History View file @ f8d5c17
... ... 
@@ -1,20 +1,20 @@
1 1 
 Summary:	Security client
2 2 
 Name:		nss
3 
-Version:	3.21
4 
-Release:	2%{?dist}
3 
+Version:	3.25
4 
+Release:	1%{?dist}
5 5 
 License:	MPLv2.0
6 6 
 URL:		http://ftp.mozilla.org/pub/mozilla.org/security/nss
7 7 
 Group:		Applications/System
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution:	Photon
10 10 
 Source0:	%{name}-%{version}.tar.gz
11 
-%define sha1 nss=d4bbbd72b967443e8b65f504cdd157e3df93a84a
12 
-Patch:		nss-3.21-standalone-1.patch
11 
+%define sha1 nss=ffa55041a7904bb43afbc6821f479819d9802abf
12 
+Patch:		nss-3.25-standalone-1.patch
13 13 
 Requires:	nspr
14 14 
 Requires:	sqlite-autoconf
15 15 
 BuildRequires:	nspr
16 16 
 BuildRequires:	sqlite-autoconf
17 
-#BuildRequires:	readline-devel
17 
+
18 18 
 %description
19 19 
  The Network Security Services (NSS) package is a set of libraries
20 20 
  designed to support cross-platform development of security-enabled
... ... 
@@ -71,6 +71,8 @@ install -vm 644 Linux*/lib/pkgconfig/nss.pc %{buildroot}%{_libdir}/pkgconfig
71 71
72 72
73 73 
 %changelog
74 
+*       Tue Jul 05 2016 Anish Swaminathan <anishs@vmware.com> 3.25-1
75 
+-       Upgrade to 3.25
74 76 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.21-2
75 77 
 -	GA - Bump release of all rpms
76 78 
 * 	Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 3.21