Browse code

Update libnl, nfs-utils, nspr, nss.

Change-Id: I14a74ac5f838fb26a1c7fec8ae36d34d98bdef6a
Reviewed-on: http://photon-jenkins.eng.vmware.com/395
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

xiaolin-vmware authored on 2016/01/22 04:13:55
Showing 5 changed files
... ...
@@ -1,12 +1,12 @@
1 1
 Summary:	Netlink Protocol Library Suite
2 2
 Name:		libnl
3
-Version:	3.2.25
4
-Release:	2%{?dist}
3
+Version:	3.2.27
4
+Release:	1%{?dist}
5 5
 License: 	LGPLv2+
6 6
 Group: 		System Environment/Libraries
7 7
 URL:		http://www.infradead.org/~tgr/libnl/
8 8
 Source0:	http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
9
-%define sha1 libnl=b7a4981f7edf7398256d35fd3c0b87bc84ae27d1
9
+%define sha1 libnl=10580ed4f548e63545e2d75d657d84a3b973e6d7
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 BuildRequires:	glib-devel
... ...
@@ -40,7 +40,7 @@ make DESTDIR=%{buildroot} install
40 40
 %files 
41 41
 %defattr(-,root,root)
42 42
 %{_sysconfdir}/*
43
-%{_sbindir}/*
43
+%{_bindir}/*
44 44
 %{_libdir}/*.so.*
45 45
 %{_libdir}/*.la
46 46
 %{_libdir}/*.a
... ...
@@ -54,6 +54,8 @@ make DESTDIR=%{buildroot} install
54 54
 %{_libdir}/pkgconfig/*.pc
55 55
 
56 56
 %changelog
57
+* 	Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 3.2.27-1
58
+- 	Updated to version 3.2.27
57 59
 *	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.2.25-2
58 60
 -	Updated build-requires after creating devel package for dbus. 
59 61
 *	Tue Jun 23 2015 Divya Thaluru <dthaluru@vmware.com> 3.2.25-1
... ...
@@ -1,12 +1,12 @@
1 1
 Summary:	NFS client utils
2 2
 Name:		nfs-utils
3
-Version:	1.3.2
4
-Release:	2%{?dist}
3
+Version:	1.3.3
4
+Release:	1%{?dist}
5 5
 License:	GPLv2+
6 6
 URL:		http://sourceforge.net/projects/nfs
7 7
 Group:		Applications/Nfs-utils-client
8 8
 Source0:    http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
9
-%define sha1 nfs-utils=138ad690992d4784c05024d814a2d49ee8ebf6be
9
+%define sha1 nfs-utils=7c561e6a22a626aed93766bdb0c34e9a4e77b9e7
10 10
 Source1:    nfs-client.service
11 11
 Source2:    nfs-client.target
12 12
 Source3:    rpc-statd.service
... ...
@@ -58,6 +58,8 @@ install -m644 %{SOURCE5} %{buildroot}/etc/default/nfs-utils
58 58
 /lib/systemd/system/*
59 59
 
60 60
 %changelog
61
+* 	Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 1.3.3-1
62
+- 	Updated to version 1.3.3
61 63
 *	Tue Dec 8 2015 Divya Thaluru <dthaluru@vmware.com> 1.3.2-2
62 64
 -	Adding systemd service files
63 65
 *	Tue Jul 14 2015 Rongrong Qiu <rqiu@vmware.com> 1.3.2-1
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:	Platform-neutral API
2 2
 Name:		nspr
3
-Version:	4.10.8
3
+Version:	4.11
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/mozilla.org/%{name}/releases/v%{version}/src/%{name}-%{version}.tar.gz
11
-%define sha1 nspr=c87c6a10e0e36866006b45c194d70cd8c67d0934
11
+%define sha1 nspr=171ba99640e1c4d8d5b8085f3a09622c05f9b7fc
12 12
 %description
13 13
 Netscape Portable Runtime (NSPR) provides a platform-neutral API
14 14
 for system level and libc like functions.
... ...
@@ -40,6 +40,8 @@ make DESTDIR=%{buildroot} install
40 40
 %{_libdir}/pkgconfig/*.pc
41 41
 %{_datarootdir}/aclocal/*
42 42
 %changelog
43
+* 	Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 4.11-1
44
+- 	Updated to version 4.11
43 45
 *	Fri May 29 2015 Alexey Makhalov <amakhalov@vmware.com> 4.10.8-1
44 46
 -	Version update. Firefox requirement.
45 47
 *	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.10.3-1
46 48
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
... ...
@@ -1,15 +1,15 @@
1 1
 Summary:	Security client
2 2
 Name:		nss
3
-Version:	3.19
4
-Release:	2%{?dist}
3
+Version:	3.21
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=5c344b28abe7e0529d58373c5005ccfc66869716
12
-Patch:		nss-3.19-standalone-1.patch
11
+%define sha1 nss=d4bbbd72b967443e8b65f504cdd157e3df93a84a
12
+Patch:		nss-3.21-standalone-1.patch
13 13
 Requires:	nspr
14 14
 Requires:	sqlite-autoconf
15 15
 BuildRequires:	nspr
... ...
@@ -71,6 +71,8 @@ install -vm 644 Linux*/lib/pkgconfig/nss.pc %{buildroot}%{_libdir}/pkgconfig
71 71
 
72 72
 
73 73
 %changelog
74
+* 	Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 3.21
75
+- 	Updated to version 3.21
74 76
 *       Tue Aug 04 2015 Kumar Kaushik <kaushikk@vmware.com> 3.19-2
75 77
 -       Version update. Firefox requirement.
76 78
 *	Fri May 29 2015 Alexey Makhalov <amakhalov@vmware.com> 3.19-1