Browse code

nodejs, npth, nspr, nss: Upgrade to latest versions

Change-Id: I5c1aca71239979cdd8bf3b55aa29288a20d087d0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5636
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Him Kalyan Bordoloi authored on 2018/09/11 04:52:14
Showing 7 changed files
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.
2 2
 Name:           nodejs
3
-Version:        8.3.0
3
+Version:        9.9.0
4 4
 Release:        1%{?dist}
5 5
 License:        MIT
6 6
 Group:          Applications/System
7 7
 Vendor:         VMware, Inc.
8 8
 Distribution:   Photon
9 9
 URL:            https://github.com/nodejs/node
10
-Source0:        https://nodejs.org/download/release/v8.3.0/node-v%{version}.tar.xz
11
-%define         sha1 node=62969b076013b20370fd42b7441b3c7ab7ac924f
10
+Source0:        https://nodejs.org/download/release/v%{version}/node-v%{version}.tar.xz
11
+%define         sha1 node=ad14ef5f67aa22699f2eadc870cbf074c66c1f5f
12 12
 
13 13
 BuildRequires:  coreutils >= 8.22, openssl-devel >= 1.0.1
14 14
 Requires:       (coreutils >= 8.22 or toybox)
... ...
@@ -70,6 +70,8 @@ make cctest
70 70
 %{_datadir}/systemtap/tapset/node.stp
71 71
 
72 72
 %changelog
73
+*   Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 9.9.0-1
74
+-   Updated to version 9.9.0
73 75
 *   Wed Feb 14 2018 Xiaolin Li <xiaolinl@vmware.com> 8.3.0-1
74 76
 -   Updated to version 8.3.0
75 77
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 7.7.4-4
... ...
@@ -1,12 +1,12 @@
1 1
 Summary:	The New GNU Portable Threads Library.
2 2
 Name:		npth
3
-Version:	1.3
3
+Version:	1.6
4 4
 Release:	1%{?dist}
5 5
 License:	GPLv2+ and LGPLv3+
6 6
 URL:		https://github.com/gpg/npth
7 7
 Group:		System Environment/Libraries.
8 8
 Source0:        https://github.com/gpg/%{name}/archive/%{name}-%{version}.tar.gz 
9
-%define sha1 npth=d82a2db3c3687a427c39c741616e71be98fd351b
9
+%define sha1 npth=3f3c68d439c2f8a798423de38b9a6eb32c0c417e
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 
... ...
@@ -57,5 +57,7 @@ make %{?_smp_mflags} -k check
57 57
 %{_datadir}/aclocal/*
58 58
 
59 59
 %changelog
60
+*       Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 1.6-1
61
+-       Upgrade to 1.6.
60 62
 *       Tue Apr 11 2017 Danut Moraru <dmoraru@vmware.com> 1.3-1
61 63
 -       Initial Build.
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        Platform-neutral API
2 2
 Name:           nspr
3
-Version:        4.15
3
+Version:        4.20
4 4
 Release:        1%{?dist}
5 5
 License:        MPLv2.0
6 6
 URL:            http://ftp.mozilla.org/pub/mozilla.org
... ...
@@ -8,7 +8,7 @@ Group:          Applications/System
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 Source0:        http://ftp.mozilla.org/pub/nspr/releases/v%{version}/src/%{name}-%{version}.tar.gz
11
-%define sha1    nspr=56030e0177849034ba3027a23ae2a7f8ed41f379
11
+%define sha1    nspr=ef1e2ca3205fd1658a69ada2e0436266ca3065b5
12 12
 
13 13
 %description
14 14
 Netscape Portable Runtime (NSPR) provides a platform-neutral API
... ...
@@ -58,6 +58,8 @@ make DESTDIR=%{buildroot} install
58 58
 %{_datarootdir}/aclocal/*
59 59
 
60 60
 %changelog
61
+*   Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 4.20-1
62
+-   Upgrade to 4.20.
61 63
 *   Tue Jun 20 2017 Xiaolin Li <xiaolinl@vmware.com> 4.15-1
62 64
 -   Upgrade to 4.15.
63 65
 *   Fri May 05 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-2
64 66
deleted file mode 100644
... ...
@@ -1,246 +0,0 @@
1
-Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
2
-Date:                    2016-12-27
3
-Initial Package Version: 3.12.4
4
-Upstream Status:         Not applicable
5
-Origin:                  Self, rediffed for nss-3.28.
6
-Description:             Adds auto-generated nss.pc and nss-config script, and
7
-                         allows building without nspr in the source tree.
8
-
9
-diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
10
-+++ nss-3.28/nss/Makefile	2016-12-26 22:24:52.695146032 -0600
11
-@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
12
- # (7) Execute "local" rules. (OPTIONAL).                              #
13
- #######################################################################
14
- 
15
--nss_build_all: build_nspr all latest
16
-+nss_build_all: all latest
17
- 
18
- nss_clean_all: clobber_nspr clobber
19
- 
20
-diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
21
-+++ nss-3.28/nss/config/Makefile	2016-12-26 22:20:40.008205774 -0600
22
-@@ -0,0 +1,40 @@
23
-+CORE_DEPTH = ..
24
-+DEPTH      = ..
25
-+
26
-+include $(CORE_DEPTH)/coreconf/config.mk
27
-+
28
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
29
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
30
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
31
-+PREFIX = /usr
32
-+
33
-+all: export libs
34
-+
35
-+export:
36
-+	# Create the nss.pc file
37
-+	mkdir -p $(DIST)/lib/pkgconfig
38
-+	sed -e "s,@prefix@,$(PREFIX)," \
39
-+	    -e "s,@exec_prefix@,\$${prefix}," \
40
-+	    -e "s,@libdir@,\$${prefix}/lib," \
41
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
42
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
43
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
44
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
45
-+	    nss.pc.in > nss.pc
46
-+	chmod 0644 nss.pc
47
-+	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
48
-+
49
-+	# Create the nss-config script
50
-+	mkdir -p $(DIST)/bin
51
-+	sed -e "s,@prefix@,$(PREFIX)," \
52
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
53
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
54
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
55
-+	    nss-config.in > nss-config
56
-+	chmod 0755 nss-config
57
-+	ln -sf ../../../nss/config/nss-config $(DIST)/bin
58
-+
59
-+libs:
60
-+
61
-+dummy: all export libs
62
-+
63
-diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in
64
-+++ nss-3.28/nss/config/nss-config.in	2016-12-26 22:20:40.008205774 -0600
65
-@@ -0,0 +1,153 @@
66
-+#!/bin/sh
67
-+
68
-+prefix=@prefix@
69
-+
70
-+major_version=@NSS_MAJOR_VERSION@
71
-+minor_version=@NSS_MINOR_VERSION@
72
-+patch_version=@NSS_PATCH_VERSION@
73
-+
74
-+usage()
75
-+{
76
-+	cat <<EOF
77
-+Usage: nss-config [OPTIONS] [LIBRARIES]
78
-+Options:
79
-+	[--prefix[=DIR]]
80
-+	[--exec-prefix[=DIR]]
81
-+	[--includedir[=DIR]]
82
-+	[--libdir[=DIR]]
83
-+	[--version]
84
-+	[--libs]
85
-+	[--cflags]
86
-+Dynamic Libraries:
87
-+	nss
88
-+	nssutil
89
-+	smime
90
-+	ssl
91
-+	softokn
92
-+EOF
93
-+	exit $1
94
-+}
95
-+
96
-+if test $# -eq 0; then
97
-+	usage 1 1>&2
98
-+fi
99
-+
100
-+lib_nss=yes
101
-+lib_nssutil=yes
102
-+lib_smime=yes
103
-+lib_ssl=yes
104
-+lib_softokn=yes
105
-+
106
-+while test $# -gt 0; do
107
-+  case "$1" in
108
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
109
-+  *) optarg= ;;
110
-+  esac
111
-+
112
-+  case $1 in
113
-+    --prefix=*)
114
-+      prefix=$optarg
115
-+      ;;
116
-+    --prefix)
117
-+      echo_prefix=yes
118
-+      ;;
119
-+    --exec-prefix=*)
120
-+      exec_prefix=$optarg
121
-+      ;;
122
-+    --exec-prefix)
123
-+      echo_exec_prefix=yes
124
-+      ;;
125
-+    --includedir=*)
126
-+      includedir=$optarg
127
-+      ;;
128
-+    --includedir)
129
-+      echo_includedir=yes
130
-+      ;;
131
-+    --libdir=*)
132
-+      libdir=$optarg
133
-+      ;;
134
-+    --libdir)
135
-+      echo_libdir=yes
136
-+      ;;
137
-+    --version)
138
-+      echo ${major_version}.${minor_version}.${patch_version}
139
-+      ;;
140
-+    --cflags)
141
-+      echo_cflags=yes
142
-+      ;;
143
-+    --libs)
144
-+      echo_libs=yes
145
-+      ;;
146
-+    nss)
147
-+      lib_nss=yes
148
-+      ;;
149
-+    nssutil)
150
-+      lib_nssutil=yes
151
-+      ;;
152
-+    smime)
153
-+      lib_smime=yes
154
-+      ;;
155
-+    ssl)
156
-+      lib_ssl=yes
157
-+      ;;
158
-+    softokn)
159
-+      lib_softokn=yes
160
-+      ;;
161
-+    *)
162
-+      usage 1 1>&2
163
-+      ;;
164
-+  esac
165
-+  shift
166
-+done
167
-+
168
-+# Set variables that may be dependent upon other variables
169
-+if test -z "$exec_prefix"; then
170
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
171
-+fi
172
-+if test -z "$includedir"; then
173
-+    includedir=`pkg-config --variable=includedir nss`
174
-+fi
175
-+if test -z "$libdir"; then
176
-+    libdir=`pkg-config --variable=libdir nss`
177
-+fi
178
-+
179
-+if test "$echo_prefix" = "yes"; then
180
-+    echo $prefix
181
-+fi
182
-+
183
-+if test "$echo_exec_prefix" = "yes"; then
184
-+    echo $exec_prefix
185
-+fi
186
-+
187
-+if test "$echo_includedir" = "yes"; then
188
-+    echo $includedir
189
-+fi
190
-+
191
-+if test "$echo_libdir" = "yes"; then
192
-+    echo $libdir
193
-+fi
194
-+
195
-+if test "$echo_cflags" = "yes"; then
196
-+    echo -I$includedir
197
-+fi
198
-+
199
-+if test "$echo_libs" = "yes"; then
200
-+      libdirs="-L$libdir"
201
-+      if test -n "$lib_nss"; then
202
-+	libdirs="$libdirs -lnss${major_version}"
203
-+      fi
204
-+      if test -n "$lib_nssutil"; then
205
-+        libdirs="$libdirs -lnssutil${major_version}"
206
-+      fi
207
-+      if test -n "$lib_smime"; then
208
-+	libdirs="$libdirs -lsmime${major_version}"
209
-+      fi
210
-+      if test -n "$lib_ssl"; then
211
-+	libdirs="$libdirs -lssl${major_version}"
212
-+      fi
213
-+      if test -n "$lib_softokn"; then
214
-+        libdirs="$libdirs -lsoftokn${major_version}"
215
-+      fi
216
-+      echo $libdirs
217
-+fi      
218
-+
219
-diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
220
-+++ nss-3.28/nss/config/nss.pc.in	2016-12-26 22:22:53.300694346 -0600
221
-@@ -0,0 +1,12 @@
222
-+prefix=@prefix@
223
-+exec_prefix=@exec_prefix@
224
-+libdir=@libdir@
225
-+includedir=@includedir@
226
-+
227
-+Name: NSS
228
-+Description: Network Security Services
229
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
230
-+Requires: nspr >= 4.10
231
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
232
-+Cflags: -I${includedir}
233
-+
234
-diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
235
-+++ nss-3.28/nss/manifest.mn	2016-12-26 22:24:12.278991843 -0600
236
-@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
237
- 
238
- RELEASE = nss
239
- 
240
--DIRS = coreconf lib cmd gtests
241
-+DIRS = coreconf lib cmd gtests config
242 1
deleted file mode 100644
... ...
@@ -1,246 +0,0 @@
1
-Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
2
-Date:                    2016-12-27
3
-Initial Package Version: 3.12.4
4
-Upstream Status:         Not applicable
5
-Origin:                  Self, rediffed for nss-3.28.
6
-Description:             Adds auto-generated nss.pc and nss-config script, and
7
-                         allows building without nspr in the source tree.
8
-
9
-diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
10
-+++ nss-3.28/nss/Makefile	2016-12-26 22:24:52.695146032 -0600
11
-@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
12
- # (7) Execute "local" rules. (OPTIONAL).                              #
13
- #######################################################################
14
- 
15
--nss_build_all: build_nspr all latest
16
-+nss_build_all: all latest
17
- 
18
- nss_clean_all: clobber_nspr clobber
19
- 
20
-diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
21
-+++ nss-3.28/nss/config/Makefile	2016-12-26 22:20:40.008205774 -0600
22
-@@ -0,0 +1,40 @@
23
-+CORE_DEPTH = ..
24
-+DEPTH      = ..
25
-+
26
-+include $(CORE_DEPTH)/coreconf/config.mk
27
-+
28
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
29
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
30
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
31
-+PREFIX = /usr
32
-+
33
-+all: export libs
34
-+
35
-+export:
36
-+	# Create the nss.pc file
37
-+	mkdir -p $(DIST)/lib/pkgconfig
38
-+	sed -e "s,@prefix@,$(PREFIX)," \
39
-+	    -e "s,@exec_prefix@,\$${prefix}," \
40
-+	    -e "s,@libdir@,\$${prefix}/lib," \
41
-+	    -e "s,@includedir@,\$${prefix}/include/nss," \
42
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
43
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
44
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
45
-+	    nss.pc.in > nss.pc
46
-+	chmod 0644 nss.pc
47
-+	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
48
-+
49
-+	# Create the nss-config script
50
-+	mkdir -p $(DIST)/bin
51
-+	sed -e "s,@prefix@,$(PREFIX)," \
52
-+	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
53
-+	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
54
-+	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
55
-+	    nss-config.in > nss-config
56
-+	chmod 0755 nss-config
57
-+	ln -sf ../../../nss/config/nss-config $(DIST)/bin
58
-+
59
-+libs:
60
-+
61
-+dummy: all export libs
62
-+
63
-diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in
64
-+++ nss-3.28/nss/config/nss-config.in	2016-12-26 22:20:40.008205774 -0600
65
-@@ -0,0 +1,153 @@
66
-+#!/bin/sh
67
-+
68
-+prefix=@prefix@
69
-+
70
-+major_version=@NSS_MAJOR_VERSION@
71
-+minor_version=@NSS_MINOR_VERSION@
72
-+patch_version=@NSS_PATCH_VERSION@
73
-+
74
-+usage()
75
-+{
76
-+	cat <<EOF
77
-+Usage: nss-config [OPTIONS] [LIBRARIES]
78
-+Options:
79
-+	[--prefix[=DIR]]
80
-+	[--exec-prefix[=DIR]]
81
-+	[--includedir[=DIR]]
82
-+	[--libdir[=DIR]]
83
-+	[--version]
84
-+	[--libs]
85
-+	[--cflags]
86
-+Dynamic Libraries:
87
-+	nss
88
-+	nssutil
89
-+	smime
90
-+	ssl
91
-+	softokn
92
-+EOF
93
-+	exit $1
94
-+}
95
-+
96
-+if test $# -eq 0; then
97
-+	usage 1 1>&2
98
-+fi
99
-+
100
-+lib_nss=yes
101
-+lib_nssutil=yes
102
-+lib_smime=yes
103
-+lib_ssl=yes
104
-+lib_softokn=yes
105
-+
106
-+while test $# -gt 0; do
107
-+  case "$1" in
108
-+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
109
-+  *) optarg= ;;
110
-+  esac
111
-+
112
-+  case $1 in
113
-+    --prefix=*)
114
-+      prefix=$optarg
115
-+      ;;
116
-+    --prefix)
117
-+      echo_prefix=yes
118
-+      ;;
119
-+    --exec-prefix=*)
120
-+      exec_prefix=$optarg
121
-+      ;;
122
-+    --exec-prefix)
123
-+      echo_exec_prefix=yes
124
-+      ;;
125
-+    --includedir=*)
126
-+      includedir=$optarg
127
-+      ;;
128
-+    --includedir)
129
-+      echo_includedir=yes
130
-+      ;;
131
-+    --libdir=*)
132
-+      libdir=$optarg
133
-+      ;;
134
-+    --libdir)
135
-+      echo_libdir=yes
136
-+      ;;
137
-+    --version)
138
-+      echo ${major_version}.${minor_version}.${patch_version}
139
-+      ;;
140
-+    --cflags)
141
-+      echo_cflags=yes
142
-+      ;;
143
-+    --libs)
144
-+      echo_libs=yes
145
-+      ;;
146
-+    nss)
147
-+      lib_nss=yes
148
-+      ;;
149
-+    nssutil)
150
-+      lib_nssutil=yes
151
-+      ;;
152
-+    smime)
153
-+      lib_smime=yes
154
-+      ;;
155
-+    ssl)
156
-+      lib_ssl=yes
157
-+      ;;
158
-+    softokn)
159
-+      lib_softokn=yes
160
-+      ;;
161
-+    *)
162
-+      usage 1 1>&2
163
-+      ;;
164
-+  esac
165
-+  shift
166
-+done
167
-+
168
-+# Set variables that may be dependent upon other variables
169
-+if test -z "$exec_prefix"; then
170
-+    exec_prefix=`pkg-config --variable=exec_prefix nss`
171
-+fi
172
-+if test -z "$includedir"; then
173
-+    includedir=`pkg-config --variable=includedir nss`
174
-+fi
175
-+if test -z "$libdir"; then
176
-+    libdir=`pkg-config --variable=libdir nss`
177
-+fi
178
-+
179
-+if test "$echo_prefix" = "yes"; then
180
-+    echo $prefix
181
-+fi
182
-+
183
-+if test "$echo_exec_prefix" = "yes"; then
184
-+    echo $exec_prefix
185
-+fi
186
-+
187
-+if test "$echo_includedir" = "yes"; then
188
-+    echo $includedir
189
-+fi
190
-+
191
-+if test "$echo_libdir" = "yes"; then
192
-+    echo $libdir
193
-+fi
194
-+
195
-+if test "$echo_cflags" = "yes"; then
196
-+    echo -I$includedir
197
-+fi
198
-+
199
-+if test "$echo_libs" = "yes"; then
200
-+      libdirs="-L$libdir"
201
-+      if test -n "$lib_nss"; then
202
-+	libdirs="$libdirs -lnss${major_version}"
203
-+      fi
204
-+      if test -n "$lib_nssutil"; then
205
-+        libdirs="$libdirs -lnssutil${major_version}"
206
-+      fi
207
-+      if test -n "$lib_smime"; then
208
-+	libdirs="$libdirs -lsmime${major_version}"
209
-+      fi
210
-+      if test -n "$lib_ssl"; then
211
-+	libdirs="$libdirs -lssl${major_version}"
212
-+      fi
213
-+      if test -n "$lib_softokn"; then
214
-+        libdirs="$libdirs -lsoftokn${major_version}"
215
-+      fi
216
-+      echo $libdirs
217
-+fi      
218
-+
219
-diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
220
-+++ nss-3.28/nss/config/nss.pc.in	2016-12-26 22:22:53.300694346 -0600
221
-@@ -0,0 +1,12 @@
222
-+prefix=@prefix@
223
-+exec_prefix=@exec_prefix@
224
-+libdir=@libdir@
225
-+includedir=@includedir@
226
-+
227
-+Name: NSS
228
-+Description: Network Security Services
229
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
230
-+Requires: nspr >= 4.10
231
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
232
-+Cflags: -I${includedir}
233
-+
234
-diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
235
-+++ nss-3.28/nss/manifest.mn	2016-12-26 22:24:12.278991843 -0600
236
-@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
237
- 
238
- RELEASE = nss
239
- 
240
--DIRS = coreconf lib cmd gtests
241
-+DIRS = coreconf lib cmd gtests config
242 1
new file mode 100644
... ...
@@ -0,0 +1,246 @@
0
+Submitted By:            DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
1
+Date:                    2016-12-27
2
+Initial Package Version: 3.12.4
3
+Upstream Status:         Not applicable
4
+Origin:                  Self, rediffed for nss-3.28.
5
+Description:             Adds auto-generated nss.pc and nss-config script, and
6
+                         allows building without nspr in the source tree.
7
+
8
+diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
9
+--- nss-3.28-orig/nss/Makefile	2016-12-21 05:56:27.000000000 -0600
10
+@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
11
+ # (7) Execute "local" rules. (OPTIONAL).                              #
12
+ #######################################################################
13
+ 
14
+-nss_build_all: build_nspr all latest
15
++nss_build_all: all latest
16
+ 
17
+ nss_clean_all: clobber_nspr clobber
18
+ 
19
+diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
20
+--- nss-3.28-orig/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
21
+@@ -0,0 +1,40 @@
22
++CORE_DEPTH = ..
23
++DEPTH      = ..
24
++
25
++include $(CORE_DEPTH)/coreconf/config.mk
26
++
27
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
28
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
29
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
30
++PREFIX = /usr
31
++
32
++all: export libs
33
++
34
++export:
35
++	# Create the nss.pc file
36
++	mkdir -p $(DIST)/lib/pkgconfig
37
++	sed -e "s,@prefix@,$(PREFIX)," \
38
++	    -e "s,@exec_prefix@,\$${prefix}," \
39
++	    -e "s,@libdir@,\$${prefix}/lib," \
40
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
41
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
42
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
43
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
44
++	    nss.pc.in > nss.pc
45
++	chmod 0644 nss.pc
46
++	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
47
++
48
++	# Create the nss-config script
49
++	mkdir -p $(DIST)/bin
50
++	sed -e "s,@prefix@,$(PREFIX)," \
51
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
52
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
53
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
54
++	    nss-config.in > nss-config
55
++	chmod 0755 nss-config
56
++	ln -sf ../../../nss/config/nss-config $(DIST)/bin
57
++
58
++libs:
59
++
60
++dummy: all export libs
61
++
62
+diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in
63
+--- nss-3.28-orig/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
64
+@@ -0,0 +1,153 @@
65
++#!/bin/sh
66
++
67
++prefix=@prefix@
68
++
69
++major_version=@NSS_MAJOR_VERSION@
70
++minor_version=@NSS_MINOR_VERSION@
71
++patch_version=@NSS_PATCH_VERSION@
72
++
73
++usage()
74
++{
75
++	cat <<EOF
76
++Usage: nss-config [OPTIONS] [LIBRARIES]
77
++Options:
78
++	[--prefix[=DIR]]
79
++	[--exec-prefix[=DIR]]
80
++	[--includedir[=DIR]]
81
++	[--libdir[=DIR]]
82
++	[--version]
83
++	[--libs]
84
++	[--cflags]
85
++Dynamic Libraries:
86
++	nss
87
++	nssutil
88
++	smime
89
++	ssl
90
++	softokn
91
++EOF
92
++	exit $1
93
++}
94
++
95
++if test $# -eq 0; then
96
++	usage 1 1>&2
97
++fi
98
++
99
++lib_nss=yes
100
++lib_nssutil=yes
101
++lib_smime=yes
102
++lib_ssl=yes
103
++lib_softokn=yes
104
++
105
++while test $# -gt 0; do
106
++  case "$1" in
107
++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
108
++  *) optarg= ;;
109
++  esac
110
++
111
++  case $1 in
112
++    --prefix=*)
113
++      prefix=$optarg
114
++      ;;
115
++    --prefix)
116
++      echo_prefix=yes
117
++      ;;
118
++    --exec-prefix=*)
119
++      exec_prefix=$optarg
120
++      ;;
121
++    --exec-prefix)
122
++      echo_exec_prefix=yes
123
++      ;;
124
++    --includedir=*)
125
++      includedir=$optarg
126
++      ;;
127
++    --includedir)
128
++      echo_includedir=yes
129
++      ;;
130
++    --libdir=*)
131
++      libdir=$optarg
132
++      ;;
133
++    --libdir)
134
++      echo_libdir=yes
135
++      ;;
136
++    --version)
137
++      echo ${major_version}.${minor_version}.${patch_version}
138
++      ;;
139
++    --cflags)
140
++      echo_cflags=yes
141
++      ;;
142
++    --libs)
143
++      echo_libs=yes
144
++      ;;
145
++    nss)
146
++      lib_nss=yes
147
++      ;;
148
++    nssutil)
149
++      lib_nssutil=yes
150
++      ;;
151
++    smime)
152
++      lib_smime=yes
153
++      ;;
154
++    ssl)
155
++      lib_ssl=yes
156
++      ;;
157
++    softokn)
158
++      lib_softokn=yes
159
++      ;;
160
++    *)
161
++      usage 1 1>&2
162
++      ;;
163
++  esac
164
++  shift
165
++done
166
++
167
++# Set variables that may be dependent upon other variables
168
++if test -z "$exec_prefix"; then
169
++    exec_prefix=`pkg-config --variable=exec_prefix nss`
170
++fi
171
++if test -z "$includedir"; then
172
++    includedir=`pkg-config --variable=includedir nss`
173
++fi
174
++if test -z "$libdir"; then
175
++    libdir=`pkg-config --variable=libdir nss`
176
++fi
177
++
178
++if test "$echo_prefix" = "yes"; then
179
++    echo $prefix
180
++fi
181
++
182
++if test "$echo_exec_prefix" = "yes"; then
183
++    echo $exec_prefix
184
++fi
185
++
186
++if test "$echo_includedir" = "yes"; then
187
++    echo $includedir
188
++fi
189
++
190
++if test "$echo_libdir" = "yes"; then
191
++    echo $libdir
192
++fi
193
++
194
++if test "$echo_cflags" = "yes"; then
195
++    echo -I$includedir
196
++fi
197
++
198
++if test "$echo_libs" = "yes"; then
199
++      libdirs="-L$libdir"
200
++      if test -n "$lib_nss"; then
201
++	libdirs="$libdirs -lnss${major_version}"
202
++      fi
203
++      if test -n "$lib_nssutil"; then
204
++        libdirs="$libdirs -lnssutil${major_version}"
205
++      fi
206
++      if test -n "$lib_smime"; then
207
++	libdirs="$libdirs -lsmime${major_version}"
208
++      fi
209
++      if test -n "$lib_ssl"; then
210
++	libdirs="$libdirs -lssl${major_version}"
211
++      fi
212
++      if test -n "$lib_softokn"; then
213
++        libdirs="$libdirs -lsoftokn${major_version}"
214
++      fi
215
++      echo $libdirs
216
++fi      
217
++
218
+diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
219
+--- nss-3.28-orig/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
220
+@@ -0,0 +1,12 @@
221
++prefix=@prefix@
222
++exec_prefix=@exec_prefix@
223
++libdir=@libdir@
224
++includedir=@includedir@
225
++
226
++Name: NSS
227
++Description: Network Security Services
228
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
229
++Requires: nspr >= 4.10
230
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
231
++Cflags: -I${includedir}
232
++
233
+diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
234
+--- nss-3.28-orig/nss/manifest.mn	2016-12-21 05:56:27.000000000 -0600
235
+@@ -10,4 +10,4 @@ IMPORTS =	nspr20/v4.8 \
236
+ 
237
+ RELEASE = nss
238
+ 
239
+-DIRS = coreconf lib cmd cpputil gtests
240
++DIRS = coreconf lib cmd cpputil gtests config
... ...
@@ -1,15 +1,15 @@
1 1
 Summary:        Security client
2 2
 Name:           nss
3
-Version:        3.31
4
-Release:        5%{?dist}
3
+Version:        3.39
4
+Release:        1%{?dist}
5 5
 License:        MPLv2.0
6
-URL:            http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_31_RTM/src/%{name}-%{version}.tar.gz
6
+URL:            http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_39_RTM/src/%{name}-%{version}.tar.gz
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=006a13a5e52867c49ea1e7d986b7c02a3cd8ebfb
12
-Patch:          nss-3.31-standalone-1.patch
11
+%define sha1    nss=351e0e9607ead50174efe5f5107e2dc97e7358f2
12
+Patch:          nss-standalone-1.patch
13 13
 Requires:       nspr
14 14
 BuildRequires:  nspr-devel
15 15
 BuildRequires:  sqlite-devel
... ...
@@ -97,6 +97,8 @@ sudo -u test ./all.sh && userdel test -r -f
97 97
 %{_libdir}/libsoftokn3.so
98 98
 
99 99
 %changelog
100
+*   Mon Sep 10 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 3.39-1
101
+-   Upgrade to 3.39.
100 102
 *   Thu Dec 07 2017 Alexey Makhalov <amakhalov@vmware.com> 3.31-5
101 103
 -   Add static libcrmf.a library to devel package
102 104
 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.31-4