1. photon
  2. Commit 3f9464de629419186383c7ffe6147208078eca87
Browse code

Update expat to 2.2.4

Change-Id: Iba2f9e9d2323672b2151d671d64814ca4cfdc56f

Conflicts:
SPECS/libsolv/libsolv.spec
Change-Id: I6ea48e3a32b69a07ef71c242dd671a31fdddfea2
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3926
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

suezzelur authored on 2017/09/27 04:34:51
Showing 14 changed files
SPECS/XML-Parser/XML-Parser.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	XML-Parser perl module
2 2 
 Name:		XML-Parser
3 3 
 Version:	2.44
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPL+
6 6 
 URL:		http://search.cpan.org/~toddr/%{name}-%{version}/
7 7 
 Source0:		http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/%{name}-%{version}.tar.gz
... ... 
@@ -31,13 +31,15 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
31 31 
 %{_libdir}/perl5/*
32 32 
 %{_mandir}/man3/*
33 33 
 %changelog
34 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.44-2
35 
--	GA - Bump release of all rpms
34 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.44-3
35 
+-   Release bump for expat version update
36 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.44-2
37 
+-   GA - Bump release of all rpms
36 38 
 *   Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.44-1
37 39 
 -   Upgraded to version 2.44
38 
-*	Mon Feb 01 2016 Anish Swaminathan <anishs@vmware.com> 2.41-3
39 
--	Fix for multithreaded perl
40 
-*	Wed Jan 13 2016 Anish Swaminathan <anishs@vmware.com> 2.41-2
41 
--	Fix for new perl
42 
-*	Thu Oct 23 2014 Divya Thaluru <dthaluru@vmware.com> 2.41-1
43 
--	Initial build. First version
40 
+*   Mon Feb 01 2016 Anish Swaminathan <anishs@vmware.com> 2.41-3
41 
+-   Fix for multithreaded perl
42 
+*   Wed Jan 13 2016 Anish Swaminathan <anishs@vmware.com> 2.41-2
43 
+-   Fix for new perl
44 
+*   Thu Oct 23 2014 Divya Thaluru <dthaluru@vmware.com> 2.41-1
45 
+-   Initial build. First version
SPECS/dbus/dbus.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	DBus for systemd
2 2 
 Name:		dbus
3 3 
 Version:	1.8.8
4 
-Release:	5%{?dist}
4 
+Release:	6%{?dist}
5 5 
 License:	GPLv2+ or AFL
6 6 
 URL:		http://www.freedesktop.org/wiki/Software/dbus
7 7 
 Group:		Applications/File
... ... 
@@ -67,13 +67,15 @@ rm -f %{buildroot}%{_sharedstatedir}/dbus/machine-id
67 67 
 %{_libdir}/*.so
68 68
69 69 
 %changelog
70 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.8-5
71 
--	GA - Bump release of all rpms
72 
-*	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.8-4
73 
--	Created devel sub-package
70 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 1.8.8-6
71 
+-   Release bump for expat version update
72 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.8-5
73 
+-   GA - Bump release of all rpms
74 
+*   Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.8-4
75 
+-   Created devel sub-package
74 76 
 *   Thu Jun 25 2015 Sharath George <sharathg@vmware.com> 1.8.8-3
75 77 
 -   Remove debug files.
76 78 
 *   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.8.8-2
77 79 
 -   Update according to UsrMove.
78 
-*	Sun Apr 06 2014 Sharath George <sharathg@vmware.com> 1.8.8
79 
--	Initial build. First version
80 
+*   Sun Apr 06 2014 Sharath George <sharathg@vmware.com> 1.8.8
81 
+-   Initial build. First version
SPECS/expat/expat.spec
History View file @ 3f9464d
... ... 
@@ -1,6 +1,6 @@
1 1 
 Summary:	An XML parser library
2 2 
 Name:		expat
3 
-Version:	2.2.0
3 
+Version:	2.2.4
4 4 
 Release:	1%{?dist}
5 5 
 License:	MIT
6 6 
 URL:		http://expat.sourceforge.net/
... ... 
@@ -8,7 +8,7 @@ Group:		System Environment/GeneralLibraries
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution:	Photon
10 10 
 Source0:        https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
11 
-%define sha1 expat=8453bc52324be4c796fd38742ec48470eef358b3
11 
+%define sha1 expat=3394d6390c041a8f5dec1d5fe7c4af0a23ae4504
12 12 
 %description
13 13 
 The Expat package contains a stream oriented C library for parsing XML.
14 14 
 %prep
... ... 
@@ -26,6 +26,7 @@ make %{?_smp_mflags}
26 26 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
27 27 
 make DESTDIR=%{buildroot} install
28 28 
 find %{buildroot}/%{_libdir} -name '*.la' -delete
29 
+rm -rf %{buildroot}/%{_docdir}/%{name}
29 30 
 %{_fixperms} %{buildroot}/*
30 31 
 %check
31 32 
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
... ... 
@@ -35,12 +36,15 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
35 35 
 rm -rf %{buildroot}/*
36 36 
 %files
37 37 
 %defattr(-,root,root)
38 
+%doc AUTHORS Changes
38 39 
 %{_bindir}/*
39 40 
 %{_libdir}/*.so*
40 41 
 %{_libdir}/pkgconfig/*
41 42 
 %{_includedir}/*
42 43 
 %{_mandir}/man1/*
43 44 
 %changelog
45 
+*       Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.2.4-1
46 
+-       Updating version, fixes CVE-2017-9233,  CVE-2016-9063, CVE-2016-0718
44 47 
 *       Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 2.2.0-1
45 48 
 -       Updating Source/Fixing CVE-2015-1283.
46 49 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
SPECS/fontconfig/fontconfig.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	library for configuring and customizing font access.
2 2 
 Name:		fontconfig
3 3 
 Version:	2.12.1
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	BSD/GPL
6 6 
 URL:		https://www.freedesktop.org/wiki/Software/fontconfig/
7 7 
 Group:		System Environment/Libraries
... ... 
@@ -67,5 +67,7 @@ make %{?_smp_mflags} -k check
67 67 
 %{_mandir}/man3/*
68 68
69 69 
 %changelog
70 
-*       Fri Nov 11 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.12.1-1
71 
--       Initial version
70 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.12.1-2
71 
+-   Release bump for expat version update
72 
+*   Fri Nov 11 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.12.1-1
73 
+-   Initial version
SPECS/gdb/gdb.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        C debugger
2 2 
 Name:           gdb
3 3 
 Version:        7.8.2
4 
-Release:        7%{?dist}
4 
+Release:        8%{?dist}
5 5 
 License:        GPLv2+
6 6 
 URL:            http://www.gnu.org/software/%{name}
7 7 
 Source0:        http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.gz
... ... 
@@ -60,6 +60,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
60 60 
 %{_mandir}/*/*
61 61
62 62 
 %changelog
63 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 7.8.2-8
64 
+-   Release bump for expat version update
63 65 
 *   Fri Aug 25 2017 Anish Swaminathan <anishs@vmware.com> 7.8.2-7
64 66 
 -   Remove locale files that conflict with binutils locale files
65 67 
 *   Thu Jul 20 2017 Rui Gu <ruig@vmware.com> 7.8.2-6
SPECS/httpd-mod_jk/httpd-mod_jk.spec
History View file @ 3f9464d
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary:	Apache Tomcat Connector
5 5 
 Name:		httpd-mod_jk
6 6 
 Version:	1.2.42
7 
-Release:	1%{?dist}
7 
+Release:	2%{?dist}
8 8 
 License:	Apache
9 9 
 URL:		http://tomcat.apache.org/connectors-doc
10 10 
 Group:		Applications/System
... ... 
@@ -48,5 +48,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
48 48 
 %config(noreplace) %{_sysconfdir}/httpd/conf/workers.properties
49 49
50 50 
 %changelog
51 
-*	Tue Feb 21 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.42-1
52 
--	Initial build.	First version
51 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 1.2.42-2
52 
+-   Release bump for expat version update
53 
+*   Tue Feb 21 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.2.42-1
54 
+-   Initial build. First version
SPECS/httpd/httpd.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:    The Apache HTTP Server
2 2 
 Name:       httpd
3 3 
 Version:    2.4.27
4 
-Release:    2%{?dist}
4 
+Release:    3%{?dist}
5 5 
 License:    Apache License 2.0
6 6 
 URL:        http://httpd.apache.org/
7 7 
 Group:      Applications/System
... ... 
@@ -176,6 +176,8 @@ fi
176 176 
 %{_bindir}/dbmmanage
177 177
178 178 
 %changelog
179 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.4.27-3
180 
+-   Release bump for expat version update
179 181 
 *   Tue Aug 08 2017 Anish Swaminathan <anishs@vmware.com>  2.4.27-2
180 182 
 -   Add shadow to requires
181 183 
 *   Mon Jul 24 2017 Anish Swaminathan <anishs@vmware.com>  2.4.27-1
SPECS/librepo/librepo.spec
History View file @ 3f9464d
... ... 
@@ -5,7 +5,7 @@
5 5 
 Summary:       	Repodata downloading library
6 6 
 Name:          	librepo
7 7 
 Version:       	1.7.17
8 
-Release:       	2%{?dist}
8 
+Release:       	3%{?dist}
9 9 
 License:       	LGPLv2+
10 10 
 URL:           	https://github.com/Tojaj/librepo/
11 11 
 Group:         	System Environment/Libraries
... ... 
@@ -74,13 +74,14 @@ cp %{_builddir}/%{librepo_name}-%{version}/librepo/*.h %{buildroot}%{_includedir
74 74 
 %{_includedir}/librepo/*.h
75 75
76 76 
 %changelog
77 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.17-2
78 
--	GA - Bump release of all rpms
79 
-*   Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.17-1
80 
--   Updated to version 1.7.17
77 
+* Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 1.7.17-3
78 
+- Release bump for expat version update
79 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.17-2
80 
+- GA - Bump release of all rpms
81 
+* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.17-1
82 
+- Updated to version 1.7.17
81 83 
 * Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 1.7.15-1
82 84 
 - Updated version and split devel package.
83 85 
 * Tue Dec 30 2014 Priyesh Padmavilasom <ppadmavilasom@vmware.com>
84 86 
 - initial specfile.
85 87
86 
-# EOF
SPECS/libsolv/libsolv.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Libsolv-0.6.19
2 2 
 Name:		libsolv
3 3 
 Version:	0.6.19
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	BSD
6 6 
 URL:		https://github.com/openSUSE/libsolv
7 7 
 Source0:	https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz
... ... 
@@ -40,6 +40,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
40 40 
 /usr/share/*
41 41 
 %{_includedir}/*
42 42 
 %changelog
43 
+*   Sat Sep 30 2017 Anish Swaminathan <anishs@vmware.com> 0.6.19-4
44 
+-   Release bump for expat version update
43 45 
 *   Fri Sep 29 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.19-3
44 46 
 -   added compile flag to support rich dependencies
45 47 
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.19-2
... ... 
@@ -52,5 +54,5 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
52 52 
 -   Updated build-requires after creating devel package for db.
53 53 
 *   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 0.6.6-2
54 54 
 -   Updated group.
55 
-*	Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 0.6.6-1
56 
--	Initial build. First version
55 
+*   Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 0.6.6-1
56 
+-   Initial build. First version
SPECS/python2/python2.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        A high-level scripting language
2 2 
 Name:           python2
3 3 
 Version:        2.7.13
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        PSF
6 6 
 URL:            http://www.python.org/
7 7 
 Group:          System Environment/Programming
... ... 
@@ -15,7 +15,7 @@ Patch2:         added-pyopenssl-ipaddress-certificate-validation.patch
15 15 
 BuildRequires:  pkg-config >= 0.28
16 16 
 BuildRequires:  bzip2-devel
17 17 
 BuildRequires:  openssl-devel
18 
-BuildRequires:  expat >= 2.1.0
18 
+BuildRequires:  expat >= 2.2.4
19 19 
 BuildRequires:  libffi >= 3.0.13
20 20 
 BuildRequires:  sqlite-autoconf
21 21 
 BuildRequires:  ncurses-devel >= 6.0-3
... ... 
@@ -38,7 +38,7 @@ version is for backward compatibility with other dependent packages.
38 38 
 Summary: The libraries for python runtime
39 39 
 Group: Applications/System
40 40 
 Requires:   sqlite-autoconf
41 
-Requires:   expat >= 2.1.0
41 
+Requires:   expat >= 2.2.4
42 42 
 Requires:   libffi >= 3.0.13
43 43 
 Requires:   ncurses >= 6.0-3
44 44 
 Requires:   coreutils
... ... 
@@ -219,6 +219,8 @@ rm -rf %{buildroot}/*
219 219 
 %{_bindir}/idle*
220 220
221 221 
 %changelog
222 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.7.13-3
223 
+-   Release bump for expat version update
222 224 
 *   Mon Apr 3 2017 Alexey Makhalov <amakhalov@vmware.com> 2.7.13-2
223 225 
 -   Use specified version of ncurses wich has long chtype and mmask_t
224 226 
     (see ncurses changelog)
SPECS/python3/python3.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        A high-level scripting language
2 2 
 Name:           python3
3 3 
 Version:        3.5.3
4 
-Release:        6%{?dist}
4 
+Release:        7%{?dist}
5 5 
 License:        PSF
6 6 
 URL:            http://www.python.org/
7 7 
 Group:          System Environment/Programming
... ... 
@@ -40,12 +40,12 @@ code. It is incompatible with Python 2.x releases.
40 40 
 %package libs
41 41 
 Summary:        The libraries for python runtime
42 42 
 Group:          Applications/System
43 
-BuildRequires:  expat >= 2.1.0
43 
+BuildRequires:  expat >= 2.2.4
44 44 
 BuildRequires:  libffi >= 3.0.13
45 45 
 BuildRequires:  ncurses-devel >= 6.0-3
46 46 
 BuildRequires:  sqlite-autoconf
47 47 
 Requires:       coreutils
48 
-Requires:       expat >= 2.1.0
48 
+Requires:       expat >= 2.2.4
49 49 
 Requires:       libffi >= 3.0.13
50 50 
 Requires:       ncurses >= 6.0-3
51 51 
 Requires:       sqlite-autoconf
... ... 
@@ -193,6 +193,8 @@ rm -rf %{buildroot}/*
193 193 
 %{_bindir}/idle*
194 194
195 195 
 %changelog
196 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 3.5.3-7
197 
+-   Release bump for expat version update
196 198 
 *   Thu Sep 14 2017 Kumar Kaushik <kaushikk@vmware.com> 3.5.3-6
197 199 
 -   Adding patch for socket cleanup issue, Bug # 1956257.
198 200 
 *   Fri Jul 28 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.3-5
SPECS/subversion/subversion.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        The Apache Subversion control system
2 2 
 Name:           subversion
3 3 
 Version:        1.9.4
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        Apache License 2.0
6 6 
 URL:            http://subversion.apache.org/
7 7 
 Group:          Utilities/System
... ... 
@@ -54,6 +54,8 @@ make -j1 DESTDIR=%{buildroot} install
54 54 
 %exclude %{_libdir}/debug/
55 55
56 56 
 %changelog
57 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 1.9.4-3
58 
+-   Release bump for expat version update
57 59 
 *   Mon Aug 28 2017 Xiaolin Li <xiaolinl@vmware.com> 1.9.4-2
58 60 
 -   Apply patch for CVE-2017-9800
59 61 
 *   Wed Nov 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.4-1
SPECS/thin-provisioning-tools/thin-provisioning-tools.spec
History View file @ 3f9464d
... ... 
@@ -4,7 +4,7 @@
4 4 
 Summary: 	Thin provisioning tools
5 5 
 Name:		thin-provisioning-tools
6 6 
 Version:	0.6.1
7 
-Release:	2%{?dist}
7 
+Release:	3%{?dist}
8 8 
 License:	GPLv3+
9 9 
 Group:		System Environment/Base
10 10 
 URL:		https://github.com/jthornber/thin-provisioning-tools
... ... 
@@ -76,8 +76,10 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
76 76 
 %{_sbindir}/thin_trim
77 77
78 78 
 %changelog
79 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.1-2
80 
--	GA - Bump release of all rpms
79 
+*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 0.6.1-3
80 
+-   Release bump for expat version update
81 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.1-2
82 
+- GA - Bump release of all rpms
81 83 
 * Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 0.6.1-1
82 84 
 - Updating version
83 85 
 * Tue Mar 3 2015 Divya Thaluru <dthaluru@vmware.com> 0.4.1-1
SPECS/unbound/unbound.spec
History View file @ 3f9464d
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        unbound dns server
2 2 
 Name:           unbound
3 3 
 Version:        1.6.0
4 
-Release:        1%{?dist}
4 
+Release:        2%{?dist}
5 5 
 Group:          System/Servers
6 6 
 Vendor:         VMware, Inc.
7 7 
 License:        BSD
... ... 
@@ -85,5 +85,7 @@ rm -rf %{buildroot}/*
85 85 
 %{_mandir}/*
86 86
87 87 
 %changelog
88 
+*  Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 1.6.0-2
89 
+-  Release bump for expat version update
88 90 
 *  Fri Jan 06 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.6.0-1
89 91 
 -  Initial