Browse code

Merge branch 'master' of https://github.com/vmware/photon

archive authored on 2020/07/03 23:30:22
Showing 30 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        setuid implementation of a subset of user namespaces.
2 2
 Name:           bubblewrap
3
-Version:        0.3.0
3
+Version:        0.4.1
4 4
 Release:        1%{?dist}
5 5
 License:        LGPLv2+
6 6
 URL:            https://github.com/projectatomic/bubblewrap
... ...
@@ -8,7 +8,7 @@ Group:          Applications/System
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 Source0:        https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz
11
-%define sha1    bubblewrap=74a3c0f2942935be4ae6f82b43d59fdc9de92e83
11
+%define sha1    bubblewrap=00e121950ea494fcd9cfbe23971c0938d6be6755
12 12
 BuildRequires:  autoconf
13 13
 BuildRequires:  automake
14 14
 BuildRequires:  libtool
... ...
@@ -23,10 +23,7 @@ The original bubblewrap code existed before user namespaces - it inherits code f
23 23
 %setup -q
24 24
 %build
25 25
 
26
-./configure \
27
-    --prefix=%{_prefix} \
28
-    --bindir=%{_bindir} \
29
-    --libdir=%{_libdir} \
26
+%configure \
30 27
     --disable-silent-rules \
31 28
     --with-priv-mode=none
32 29
 make %{?_smp_mflags}
... ...
@@ -47,6 +44,8 @@ rm -rf %{buildroot}/*
47 47
 %{_datadir}/bash-completion/completions/bwrap
48 48
 
49 49
 %changelog
50
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.4.1-1
51
+-   Automatic Version Bump
50 52
 *   Mon Sep 03 2018 Keerthana K <keerthanak@vmware.com> 0.3.0-1
51 53
 -   Updated to version 0.3.0.
52 54
 *   Thu Aug 03 2017 Xiaolin Li <xiaolinl@vmware.com> 0.1.8-1
... ...
@@ -26,15 +26,15 @@ patch by Lerh Chuan Low; reviewed by jasobrown for CASSANDRA-14427
26 26
  delete mode 100644 lib/licenses/jackson-mapper-asl-1.9.13.txt
27 27
 
28 28
 diff --git a/CHANGES.txt b/CHANGES.txt
29
-index c0c02ad..698b223 100644
29
+index e50cb29..efbfe75 100644
30 30
 --- a/CHANGES.txt
31 31
 +++ b/CHANGES.txt
32 32
 @@ -1,4 +1,5 @@
33
- 3.11.5
33
+ 3.11.6
34 34
 + * Bump jackson version to >= 2.9.5 (CASSANDRA-14427)
35
-  * Fix SASI non-literal string comparisons (range operators) (CASSANDRA-15169)
36
-  * Make sure user defined compaction transactions are always closed (CASSANDRA-15123)
37
-  * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305)
35
+  * Fix bad UDT sstable metadata serialization headers written by C* 3.0 on upgrade and in sstablescrub (CASSANDRA-15035)
36
+  * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409)
37
+  * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
38 38
 diff --git a/lib/licenses/jackson-annotations-2.9.5.txt b/lib/licenses/jackson-annotations-2.9.5.txt
39 39
 new file mode 100644
40 40
 index 0000000..d645695
... ...
@@ -2,15 +2,15 @@
2 2
 %global __os_install_post %{nil}
3 3
 Summary:        Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store
4 4
 Name:           cassandra
5
-Version:        3.11.5
6
-Release:        3%{?dist}
5
+Version:        3.11.6
6
+Release:        1%{?dist}
7 7
 URL:            http://cassandra.apache.org/
8 8
 License:        Apache License, Version 2.0
9 9
 Group:          Applications/System
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12 12
 Source0:        https://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/%{version}/apache-%{name}-%{version}-src.tar.gz
13
-%define sha1    apache-cassandra=5e443e229819d70fcad963f3221109ab55a2c3a2
13
+%define sha1    apache-cassandra=ed81942259d1cb7f054c28b999461df11887de5f
14 14
 # https://search.maven.org/maven2/ch/qos/logback/logback-classic/1.2.0/logback-classic-1.2.0.jar
15 15
 # https://search.maven.org/maven2/ch/qos/logback/logback-core/1.2.0/logback-core-1.2.0.jar
16 16
 # https://search.maven.org/maven2/org/apache/thrift/libthrift/0.9.3/libthrift-0.9.3.jar
... ...
@@ -146,6 +146,8 @@ fi
146 146
 %exclude /var/opt/cassandra/build/lib
147 147
 
148 148
 %changelog
149
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 3.11.6-1
150
+-   Automatic Version Bump
149 151
 *   Wed Feb 05 2020 Ankit Jain <ankitja@vmware.com> 3.11.5-3
150 152
 -   Bump jackson version to >= 2.9.5
151 153
 *   Wed Feb 05 2020 Shreyas B. <shreyasb@vmware.com> 3.11.5-2
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Shell script to auto detect free size on disk and grow partition.
2 2
 Name:           cloud-utils
3
-Version:        0.30
4
-Release:        3%{?dist}
3
+Version:        0.31
4
+Release:        1%{?dist}
5 5
 License:        GPLv3
6 6
 Group:          System Environment
7 7
 Source0:        https://launchpad.net/cloud-utils/trunk/%{version}/+download/cloud-utils-%{version}.tar.gz
... ...
@@ -13,7 +13,7 @@ Requires:       gawk
13 13
 Requires:       (util-linux or toybox)
14 14
 BuildArch:      noarch
15 15
 
16
-%define sha1 cloud-utils=c90ccaaac0d5e28b0a0564770af2af2d2c95f0de
16
+%define sha1 cloud-utils=44ef173f0753bb28be970fdfc5a5a5a352c25ce0
17 17
 
18 18
 %description
19 19
 Cloud-utils brings in growpart script. This script is very useful for
... ...
@@ -35,6 +35,8 @@ cp man/growpart.* $RPM_BUILD_ROOT/%{_mandir}/man1/
35 35
 %doc %{_mandir}/man1/growpart.*
36 36
 
37 37
 %changelog
38
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.31-1
39
+-   Automatic Version Bump
38 40
 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.30-3
39 41
 -   Requires util-linux or toybox
40 42
 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.30-2
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        Docker
5 5
 Name:           docker
6 6
 Version:        18.06.2
7
-Release:        3%{?dist}
7
+Release:        4%{?dist}
8 8
 License:        ASL 2.0
9 9
 URL:            http://docs.docker.com
10 10
 Group:          Applications/File
... ...
@@ -47,6 +47,8 @@ Requires:       libseccomp
47 47
 Requires:       systemd
48 48
 Requires:       device-mapper-libs
49 49
 Requires:       shadow
50
+# bash completion uses awk
51
+Requires:       gawk
50 52
 
51 53
 %description
52 54
 Docker is an open source project to build, ship and run any application as a lightweight container.
... ...
@@ -232,6 +234,8 @@ rm -rf %{buildroot}/*
232 232
 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
233 233
 
234 234
 %changelog
235
+*   Mon Jun 15 2020 Alexey Makhalov <amakhalov@vmware.com> 18.06.2-4
236
+-   Requires: gawk
235 237
 *   Mon Apr 27 2020 Ankit Jain <ankitja@vmware.com> 18.06.2-3
236 238
 -   Multiple CVEs fixes
237 239
 -   Added Requires shadow
... ...
@@ -1,17 +1,17 @@
1 1
 Summary: Versatile resource statistics tool
2 2
 Name:    dstat
3
-Version: 0.7.2
4
-Release: 2%{?dist}
3
+Version: 0.7.4
4
+Release: 1%{?dist}
5 5
 License: GPLv2
6 6
 URL: http://dag.wiee.rs/home-made/dstat/
7 7
 Source: %{name}-%{version}.tar.bz2
8
-%define sha1 dstat=10baf061e3d38e1234fb99182fc53509adf07269
8
+%define sha1 dstat=446183fe3769903014f85ac76643f71b8daff1d8
9 9
 Group:      Development/Tools
10 10
 Vendor:     VMware, Inc.
11 11
 Distribution:  Photon
12 12
 
13 13
 %description
14
-Dstat gives you detailed selective information in columns and clearly indicates in what magnitude and unit the output is displayed. Less confusion, less mistakes. And most importantly, it makes it very easy to write plugins to collect your own counters and extend in ways you never expected. 
14
+Dstat gives you detailed selective information in columns and clearly indicates in what magnitude and unit the output is displayed. Less confusion, less mistakes. And most importantly, it makes it very easy to write plugins to collect your own counters and extend in ways you never expected.
15 15
 
16 16
 %prep
17 17
 %setup -q
... ...
@@ -30,6 +30,8 @@ Dstat gives you detailed selective information in columns and clearly indicates
30 30
 %{_datadir}/dstat/
31 31
 
32 32
 %changelog
33
+*Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.7.4-1
34
+-Automatic Version Bump
33 35
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.2-2
34 36
 -	GA - Bump release of all rpms
35 37
 *	Mon Nov 30 2015 Xiaolin Li <xiaolinl@vmware.com> 0.7.2-1
... ...
@@ -3,8 +3,8 @@
3 3
 
4 4
 Summary:        ECDSA cryptographic signature library (pure python)
5 5
 Name:           ecdsa
6
-Version:        0.13
7
-Release:        5%{?dist}
6
+Version:        0.15
7
+Release:        1%{?dist}
8 8
 License:        MIT
9 9
 Group:          System Environment/Security
10 10
 Vendor:         VMware, Inc.
... ...
@@ -12,13 +12,17 @@ Distribution:   Photon
12 12
 URL:            https://pypi.python.org/pypi/ecdsa
13 13
 
14 14
 Source0:        https://pypi.python.org/packages/source/e/ecdsa/%{name}-%{version}.tar.gz
15
-%define         sha1 ecdsa=7bcf6d1773d08bcc4bdd28cd05c545969f5aa162
15
+%define         sha1 ecdsa=5ac84f3012d807793bcb98a8e9c86c63b9965596
16 16
 
17 17
 BuildArch:      noarch
18 18
 
19 19
 BuildRequires:  python-setuptools
20 20
 BuildRequires:  python2-devel
21
+BuildRequires:  python3-devel
22
+BuildRequires:  python3-setuptools
23
+BuildRequires:  python3-xml
21 24
 
25
+Requires:       python3
22 26
 Requires:       python2
23 27
 
24 28
 %description
... ...
@@ -31,9 +35,6 @@ into other protocols.
31 31
 
32 32
 %package -n     python3-ecdsa
33 33
 Summary:        python3-ecdsa
34
-BuildRequires:  python3-devel
35
-BuildRequires:  python3-setuptools
36
-BuildRequires:  python3-xml
37 34
 Requires:       python3
38 35
 %description -n python3-ecdsa
39 36
 
... ...
@@ -72,6 +73,8 @@ python3 setup.py test
72 72
 %{python3_sitelib}/*
73 73
 
74 74
 %changelog
75
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.15-1
76
+-   Automatic Version Bump
75 77
 *   Mon Jun 19 2017 Xiaolin Li <xiaolinl@vmware.com> 0.13-5
76 78
 -   Add python3-setuptools and python3-xml to python3 sub package Buildrequires.
77 79
 *   Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.13-4
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:	Tools and libraries to manipulate EFI variables
2 2
 Name:		efivar
3
-Version:	36
4
-Release:	2%{?dist}
3
+Version:	37
4
+Release:	1%{?dist}
5 5
 License:	GPLv2
6 6
 URL:		https://github.com/rhboot/efivar
7 7
 Group:		System Environment/System Utilities
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: Photon
10 10
 Source0:	https://github.com/rhboot/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
11
-%define sha1 efivar=3c74c8a0d8bc7a39b74de52cad2a791c00cdfd67
11
+%define sha1 efivar=1ef24e0a06e1a42d7a93ba7a76b2970659c7c0c0
12 12
 Patch0:         util-h-add-unlikely-and-likely-macros.patch
13 13
 Patch1:         dp-h-make-format_guid-handle-misaligned-guid-pointers-safely.patch
14 14
 Patch2:         Fix-all-the-places-Werror-address-of-packed-member-catches.patch
... ...
@@ -58,6 +58,8 @@ rm -rf %{buildroot}/*
58 58
 %{_mandir}/man3/*
59 59
 
60 60
 %changelog
61
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 37-1
62
+-   Automatic Version Bump
61 63
 *   Thu Apr 02 2020 Alexey Makhalov <amakhalov@vmware.com> 36-2
62 64
 -   Fix compilation issue with gcc-8.4.0
63 65
 *   Tue Sep 18 2018 Sujay G <gsujay@vmware.com> 36-1
... ...
@@ -2,7 +2,7 @@
2 2
 Name:            elixir
3 3
 Summary:         A modern approach to programming for the Erlang VM
4 4
 Version:         1.8.2
5
-Release:         1%{?dist}
5
+Release:         2%{?dist}
6 6
 License:         ASL 2.0
7 7
 URL:             http://elixir-lang.org/
8 8
 Source0:         https://github.com/elixir-lang/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
... ...
@@ -14,6 +14,7 @@ BuildRequires:   git
14 14
 BuildRequires:   sed
15 15
 BuildRequires:   erlang
16 16
 Requires:        erlang
17
+Conflicts:       toybox < 0.8.2-3
17 18
 
18 19
 %description
19 20
 Elixir is a programming language built on top of the Erlang VM.
... ...
@@ -46,6 +47,8 @@ ln -s %{_datadir}/%{name}/%{version}/bin/{elixir,elixirc,iex,mix} %{buildroot}/%
46 46
 %{_datadir}/%{name}
47 47
 
48 48
 %changelog
49
+*   Tue Jun 30 2020 Prashant S Chauhan <psinghchauha@vmware.com> 1.8.2-2
50
+-   Do not conflict with toybox >= 0.8.2-3
49 51
 *   Tue Oct 29 2019 Keerthana K <keerthanak@vmware.com> 1.8.2-1
50 52
 -   Update to 1.8.2
51 53
 *   Mon Aug 26 2019 Keerthana K <keerthanak@vmware.com> 1.5.0-1
... ...
@@ -1,11 +1,11 @@
1 1
 Summary:	Google's C++ logging module
2 2
 Name:		glog
3
-Version:	0.3.5
3
+Version:	0.4.0
4 4
 Release:	1%{?dist}
5 5
 License:	BSD
6 6
 URL:		https://github.com/google/glog
7 7
 Source0:	https://github.com/google/glog/archive/%{name}-%{version}.tar.gz
8
-%define sha1 glog=61067502c5f9769d111ea1ee3f74e6ddf0a5f9cc
8
+%define sha1 glog=0d79fb524591dee0f46213e9a23f609f74e0cbb2
9 9
 Group:		Development/Tools
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution: 	Photon
... ...
@@ -35,6 +35,7 @@ The contains glog package doc files.
35 35
 %setup -n %{name}-%{version}
36 36
 
37 37
 %build
38
+./autogen.sh
38 39
 %configure \
39 40
     --disable-silent-rules
40 41
 make %{?_smp_mflags}
... ...
@@ -59,6 +60,8 @@ find %{buildroot} -name '*.la' -delete
59 59
 %{_docdir}/*
60 60
 
61 61
 %changelog
62
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.4.0-1
63
+-   Automatic Version Bump
62 64
 *   Mon Sep 10 2018 Michelle Wang <michellew@vmware.com> 0.3.5-1
63 65
 -   Update version to 0.3.5.
64 66
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.3.4-3
... ...
@@ -1,15 +1,16 @@
1
-diff -uNr iperf-3.1_orig/src/Makefile.am iperf-3.1/src/Makefile.am
2
-+++ iperf-3.1/src/Makefile.am	2015-11-03 10:28:49.642828592 -0800
3
-@@ -49,9 +49,9 @@
1
+diff --git a/src/Makefile.am b/src/Makefile.am
2
+index 11d3e17..4058cff 100644
3
+--- a/src/Makefile.am
4
+@@ -58,9 +58,9 @@ if ENABLE_PROFILING
4 5
  iperf3_profile_SOURCES  = main.c \
5
- 						  $(libiperf_la_SOURCES)
6
+                           $(libiperf_la_SOURCES)
6 7
  
7 8
 -iperf3_profile_CFLAGS   = -pg -g
8 9
 +iperf3_profile_CFLAGS   = -g
9 10
  iperf3_profile_LDADD    = libiperf.la
10 11
 -iperf3_profile_LDFLAGS  = -pg -g
11 12
 +iperf3_profile_LDFLAGS  = -g
13
+ endif
12 14
  
13 15
  # Specify the sources and various flags for the test cases
14
- t_timer_SOURCES         = t_timer.c
... ...
@@ -1,16 +1,16 @@
1 1
 Summary:        A network performance benchmark tool.
2 2
 Name:           iperf
3
-Version:        3.6
3
+Version:        3.8.1
4 4
 Release:        1%{?dist}
5 5
 License:        BSD
6 6
 URL:            https://github.com/esnet/iperf
7 7
 Group:          Applications/System
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
-#Source download URL: https://github.com/esnet/iperf/archive/3.6.tar.gz
10
+#Source download URL: https://github.com/esnet/iperf/archive/3.8.1.tar.gz
11 11
 Source0:        https://github.com/esnet/iperf/archive/%{name}-%{version}.tar.gz
12 12
 Patch1:         disablepg.patch
13
-%define sha1 iperf=a92382c168f183a276e7a812b94417392871a5bf
13
+%define sha1 iperf=b7d95e89589d7976ddc5c09bf308d472746400a5
14 14
 BuildRequires:  autoconf
15 15
 BuildRequires:  automake
16 16
 
... ...
@@ -33,19 +33,7 @@ Requires:       %{name} = %{version}-%{release}
33 33
 %build
34 34
 echo "VDBG optflags: " %{optflags}
35 35
 ./bootstrap.sh
36
-./configure \
37
-        CFLAGS="%{optflags}" \
38
-        CXXFLAGS="%{optflags}" \
39
-        --disable-silent-rules \
40
-        --prefix=%{_prefix} \
41
-        --bindir=%{_bindir} \
42
-        --sbindir=%{_sbindir} \
43
-        --includedir=%{_includedir} \
44
-        --libdir=%{_libdir} \
45
-        --mandir=%{_mandir} \
46
-        --infodir=%{_infodir} \
47
-        --datadir=%{_datarootdir} \
48
-        --sysconfdir=/etc
36
+%configure --disable-silent-rules
49 37
 make %{?_smp_mflags}
50 38
 
51 39
 %install
... ...
@@ -67,6 +55,8 @@ make %{?_smp_mflags} check
67 67
 %{_mandir}/man3/libiperf.3.gz
68 68
 
69 69
 %changelog
70
+*       Mon Jun 22 2020 Ankit Jain <ankitja@vmware.com> 3.8.1-1
71
+-       Automatic Version Bump
70 72
 *       Wed Sep 05 2018 Ankit Jain <ankitja@vmware.com> 3.6-1
71 73
 -       Upgraded to version 3.6
72 74
 *       Tue Mar 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.1.7-1
... ...
@@ -1,6 +1,6 @@
1
-Summary:    administration tool for IP sets 
1
+Summary:    administration tool for IP sets
2 2
 Name:       ipset
3
-Version:    6.38
3
+Version:    7.6
4 4
 Release:    1%{?dist}
5 5
 License:    GPLv2
6 6
 URL:        http://ipset.netfilter.org/
... ...
@@ -8,7 +8,7 @@ Group:      System Environment/tools
8 8
 Vendor:     VMware, Inc.
9 9
 Distribution: Photon
10 10
 Source0:     ipset.netfilter.org/%{name}-%{version}.tar.bz2
11
-%define sha1 ipset=7e5a25c449067e95c2e3a2c60768a1e301f12458
11
+%define sha1 ipset=6f2bcf61ae657a1c4ac5cce1c2523d3ca2127fde
12 12
 BuildRequires:    libmnl-devel
13 13
 Requires:         libmnl
14 14
 %description
... ...
@@ -24,7 +24,7 @@ then ipset may be the proper tool for you.
24 24
 %package devel
25 25
 Summary:    Development files for the ipset library
26 26
 Group:      Development/Libraries
27
-Requires:   ipset
27
+Requires:   %{name} = %{version}-%{release}
28 28
 
29 29
 %description devel
30 30
 Libraries and header files for ipset.
... ...
@@ -33,10 +33,7 @@ Libraries and header files for ipset.
33 33
 %setup -q
34 34
 
35 35
 %build
36
-./configure \
37
-    --prefix=%{_prefix} \
38
-    --bindir=%{_bindir} \
39
-    --libdir=%{_libdir} \
36
+%configure \
40 37
     --enable-static=no \
41 38
     --with-kmod=no
42 39
 make %{?_smp_mflags}
... ...
@@ -75,6 +72,8 @@ rm -rf %{buildroot}/*
75 75
 %{_libdir}/pkgconfig/libipset.pc
76 76
 
77 77
 %changelog
78
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 7.6-1
79
+-   Automatic Version Bump
78 80
 *   Thu Sep 06 2018 Ankit Jain <ankitja@vmware.com> 6.38-1
79 81
 -   Upgrading version to 6.38
80 82
 *   Tue Mar 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 6.32-1
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        linear algebra package
2 2
 Name:           lapack
3
-Version:        3.8.0
3
+Version:        3.9.0
4 4
 Release:        1%{?dist}
5 5
 URL:            http://www.netlib.org/lapack/
6 6
 License:        BSD
... ...
@@ -8,7 +8,7 @@ Group:          Development/Libraries
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 Source0:        http://www.netlib.org/%{name}/%{name}-%{version}.tar.gz
11
-%define         sha1 %{name}=55ac9d6be510883c5442c8aca967722cdf58fb29
11
+%define         sha1 %{name}=0451d180eed2b12b94aaae77e772d7573e87bec4
12 12
 
13 13
 BuildRequires:  cmake
14 14
 BuildRequires:  gfortran
... ...
@@ -67,6 +67,8 @@ mv %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/lapacke/.
67 67
 %exclude %{_libdir}/cmake/*
68 68
 
69 69
 %changelog
70
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 3.9.0-1
71
+-   Automatic Version Bump
70 72
 *   Thu Sep 20 2018 Ankit Jain <ankitja@vmware.com> 3.8.0-1
71 73
 -   Updated to version 3.8.0
72 74
 *   Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 3.7.0-1
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:	Text file viewer
2 2
 Name:		less
3
-Version:	530
3
+Version:	551
4 4
 Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.greenwoodsoftware.com/less
... ...
@@ -8,7 +8,7 @@ Group:		Applications/File
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10 10
 Source0:	http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
11
-%define sha1 %{name}=d8ba1f43e88b706ef701f978cd3262b5b44dffd6
11
+%define sha1 %{name}=7a2dbccd46697ba17189b1e19f75eee5115c19a2
12 12
 BuildRequires:	ncurses-devel
13 13
 Requires:	ncurses
14 14
 %description
... ...
@@ -27,6 +27,8 @@ make DESTDIR=%{buildroot} install
27 27
 %{_bindir}/*
28 28
 %{_mandir}/*/*
29 29
 %changelog
30
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 551-1
31
+-   Automatic Version Bump
30 32
 *   Mon Sep 17 2018 Ankit Jain <ankitja@vmware.com> 530-1
31 33
 -   Upgrade version to 530
32 34
 *   Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 487-1
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        Rsync libraries
2 2
 Name:           librsync
3
-Version:        2.0.2
3
+Version:        2.3.1
4 4
 Release:        1%{?dist}
5 5
 URL:            http://librsync.sourcefrog.net/
6 6
 License:        LGPLv2+
... ...
@@ -9,7 +9,7 @@ Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 #https://github.com/librsync/librsync/archive/v2.0.0.tar.gz
11 11
 Source0:        %{name}-%{version}.tar.gz
12
-%define sha1    librsync=f8e74edf82520e682e6c213f0de644874829da9a
12
+%define sha1    librsync=5127c8fa462b741f4943ece679bf83615cc47c17
13 13
 
14 14
 BuildRequires:  cmake
15 15
 
... ...
@@ -81,6 +81,8 @@ make test
81 81
 %{_libdir}/*.so
82 82
 
83 83
 %changelog
84
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 2.3.1-1
85
+-   Automatic Version Bump
84 86
 *   Sun Sep 30 2018 Bo Gan <ganb@vmware.com> 2.0.2-1
85 87
 -   Update to 2.0.2
86 88
 *   Wed Jun 28 2017 Chang Lee <changlee@vmware.com>  2.0.0-2
... ...
@@ -2,15 +2,15 @@
2 2
 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
3 3
 Summary:        Python SSH module
4 4
 Name:           paramiko
5
-Version:        2.4.2
6
-Release:        2%{?dist}
5
+Version:        2.7.1
6
+Release:        1%{?dist}
7 7
 License:        LGPL
8 8
 Group:          System Environment/Security
9 9
 Vendor:         VMware, Inc.
10 10
 Distribution:   Photon
11 11
 URL:            http://www.paramiko.org/
12 12
 Source0:        https://github.com/paramiko/paramiko/archive/paramiko-%{version}.tar.gz
13
-%define         sha1 paramiko=f9b9729b57f53f47ef09ae10af9bdc89a5c4201c
13
+%define         sha1 paramiko=a52fc133b817dc4d8b036bec71173c376e9dc38d
14 14
 
15 15
 BuildArch:      noarch
16 16
 
... ...
@@ -75,15 +75,15 @@ LANG=en_US.UTF-8 python3 test.py
75 75
 
76 76
 %files
77 77
 %defattr(-, root, root)
78
-%doc *.txt
79 78
 %{python2_sitelib}/*
80 79
 
81 80
 %files -n python3-paramiko
82 81
 %defattr(-, root, root)
83
-%doc *.txt
84 82
 %{python3_sitelib}/*
85 83
 
86 84
 %changelog
85
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 2.7.1-1
86
+-   Automatic Version Bump
87 87
 *   Wed Mar 06 2019 Tapas Kundu <tkundu@vmware.com> 2.4.2-2
88 88
 -   Added bcrypt and PyNaCl to requires.
89 89
 *   Thu Jan 10 2019 Siju Maliakkal <smaliakkal@vmware.com> 2.4.2-1
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:        PostgreSQL database engine
2 2
 Name:           postgresql
3
-Version:        11.5
3
+Version:        12.3
4 4
 Release:        1%{?dist}
5 5
 License:        PostgreSQL
6 6
 URL:            www.postgresql.org
... ...
@@ -9,7 +9,7 @@ Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 
11 11
 Source0:        http://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
12
-%define sha1    postgresql=24ceee589a0aec775ea7c4c4a001c710ff27a0d4
12
+%define sha1    postgresql=2730f6c0c22037646c84b902a13f5aaa56308ab8
13 13
 
14 14
 # Common libraries needed
15 15
 BuildRequires:  krb5-devel
... ...
@@ -113,11 +113,11 @@ rm -rf %{buildroot}/*
113 113
 %{_bindir}/pg_upgrade
114 114
 %{_bindir}/pg_waldump
115 115
 %{_bindir}/pg_xlogdump
116
+%{_bindir}/pg_checksums
116 117
 %{_bindir}/pgbench
117 118
 %{_bindir}/postgres
118 119
 %{_bindir}/postmaster
119 120
 %{_bindir}/vacuumlo
120
-%{_bindir}/pg_verify_checksums
121 121
 %{_datadir}/postgresql/*
122 122
 %{_libdir}/postgresql/*
123 123
 %{_docdir}/postgresql/extension/*.example
... ...
@@ -152,15 +152,17 @@ rm -rf %{buildroot}/*
152 152
 %{_libdir}/libecpg*.so
153 153
 %{_libdir}/libpgtypes*.so
154 154
 %{_libdir}/libpq*.so
155
-%{_libdir}/libpgcommon.a
155
+%{_libdir}/libpgcommon*.a
156 156
 %{_libdir}/libpgfeutils.a
157
-%{_libdir}/libpgport.a
157
+%{_libdir}/libpgport*.a
158 158
 %{_libdir}/libpq.a
159 159
 %{_libdir}/libecpg.a
160 160
 %{_libdir}/libecpg_compat.a
161 161
 %{_libdir}/libpgtypes.a
162 162
 
163 163
 %changelog
164
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 12.3-1
165
+-   Automatic Version Bump
164 166
 *   Mon Aug 12 2019 Shreenidhi Shedi <sshedi@vmware.com> 11.5-1
165 167
 -   Upgraded to version 11.5
166 168
 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 10.5-1
167 169
new file mode 100644
... ...
@@ -0,0 +1,260 @@
0
+From 4a7d22e490bb8ff836892cc99a1f54b85ccb0281 Mon Sep 17 00:00:00 2001
1
+From: Mark Williams <mrw@enotuniq.org>
2
+Date: Sun, 16 Feb 2020 19:00:10 -0800
3
+Subject: [PATCH] Fix several request smuggling attacks.
4
+
5
+1. Requests with multiple Content-Length headers were allowed (thanks
6
+to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400;
7
+
8
+2. Requests with a Content-Length header and a Transfer-Encoding
9
+header honored the first header (thanks to Jake Miller from Bishop
10
+Fox) and now fail with a 400;
11
+
12
+3. Requests whose Transfer-Encoding header had a value other than
13
+"chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail
14
+with a 400.
15
+---
16
+ src/twisted/web/http.py                   |  64 +++++++---
17
+ src/twisted/web/newsfragments/9770.bugfix |   1 +
18
+ src/twisted/web/test/test_http.py         | 137 ++++++++++++++++++++++
19
+ 3 files changed, 187 insertions(+), 15 deletions(-)
20
+ create mode 100644 src/twisted/web/newsfragments/9770.bugfix
21
+
22
+diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
23
+index f0fb05b4d69..06d830fe30f 100644
24
+--- a/src/twisted/web/http.py
25
+@@ -2171,6 +2171,51 @@ def _finishRequestBody(self, data):
26
+         self.allContentReceived()
27
+         self._dataBuffer.append(data)
28
+ 
29
++    def _maybeChooseTransferDecoder(self, header, data):
30
++        """
31
++        If the provided header is C{content-length} or
32
++        C{transfer-encoding}, choose the appropriate decoder if any.
33
++
34
++        Returns L{True} if the request can proceed and L{False} if not.
35
++        """
36
++
37
++        def fail():
38
++            self._respondToBadRequestAndDisconnect()
39
++            self.length = None
40
++
41
++        # Can this header determine the length?
42
++        if header == b'content-length':
43
++            try:
44
++                length = int(data)
45
++            except ValueError:
46
++                fail()
47
++                return False
48
++            newTransferDecoder = _IdentityTransferDecoder(
49
++                length, self.requests[-1].handleContentChunk, self._finishRequestBody)
50
++        elif header == b'transfer-encoding':
51
++            # XXX Rather poorly tested code block, apparently only exercised by
52
++            # test_chunkedEncoding
53
++            if data.lower() == b'chunked':
54
++                length = None
55
++                newTransferDecoder = _ChunkedTransferDecoder(
56
++                    self.requests[-1].handleContentChunk, self._finishRequestBody)
57
++            elif data.lower() == b'identity':
58
++                return True
59
++            else:
60
++                fail()
61
++                return False
62
++        else:
63
++            # It's not a length related header, so exit
64
++            return True
65
++
66
++        if self._transferDecoder is not None:
67
++            fail()
68
++            return False
69
++        else:
70
++            self.length = length
71
++            self._transferDecoder = newTransferDecoder
72
++            return True
73
++
74
+ 
75
+     def headerReceived(self, line):
76
+         """
77
+@@ -2196,21 +2241,10 @@ def headerReceived(self, line):
78
+ 
79
+         header = header.lower()
80
+         data = data.strip()
81
+-        if header == b'content-length':
82
+-            try:
83
+-                self.length = int(data)
84
+-            except ValueError:
85
+-                self._respondToBadRequestAndDisconnect()
86
+-                self.length = None
87
+-                return False
88
+-            self._transferDecoder = _IdentityTransferDecoder(
89
+-                self.length, self.requests[-1].handleContentChunk, self._finishRequestBody)
90
+-        elif header == b'transfer-encoding' and data.lower() == b'chunked':
91
+-            # XXX Rather poorly tested code block, apparently only exercised by
92
+-            # test_chunkedEncoding
93
+-            self.length = None
94
+-            self._transferDecoder = _ChunkedTransferDecoder(
95
+-                self.requests[-1].handleContentChunk, self._finishRequestBody)
96
++
97
++        if not self._maybeChooseTransferDecoder(header, data):
98
++            return False
99
++
100
+         reqHeaders = self.requests[-1].requestHeaders
101
+         values = reqHeaders.getRawHeaders(header)
102
+         if values is not None:
103
+diff --git a/src/twisted/web/newsfragments/9770.bugfix b/src/twisted/web/newsfragments/9770.bugfix
104
+new file mode 100644
105
+index 00000000000..4f1be97de8a
106
+--- /dev/null
107
+@@ -0,0 +1 @@
108
++Fix several request smuggling attacks: requests with multiple Content-Length headers were allowed (thanks to Jake Miller from Bishop Fox and ZeddYu Lu) and now fail with a 400; requests with a Content-Length header and a Transfer-Encoding header honored the first header (thanks to Jake Miller from Bishop Fox) and now fail with a 400; requests whose Transfer-Encoding header had a value other than "chunked" and "identity" (thanks to ZeddYu Lu) were allowed and now fail a 400.
109
+\ No newline at end of file
110
+diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
111
+index 0a0db09b750..578cb500cda 100644
112
+--- a/src/twisted/web/test/test_http.py
113
+@@ -2252,6 +2252,143 @@ def process(self):
114
+         self.flushLoggedErrors(AttributeError)
115
+ 
116
+ 
117
++    def assertDisconnectingBadRequest(self, request):
118
++        """
119
++        Assert that the given request bytes fail with a 400 bad
120
++        request without calling L{Request.process}.
121
++
122
++        @param request: A raw HTTP request
123
++        @type request: L{bytes}
124
++        """
125
++        class FailedRequest(http.Request):
126
++            processed = False
127
++            def process(self):
128
++                FailedRequest.processed = True
129
++
130
++        channel = self.runRequest(request, FailedRequest, success=False)
131
++        self.assertFalse(FailedRequest.processed, "Request.process called")
132
++        self.assertEqual(
133
++            channel.transport.value(),
134
++            b"HTTP/1.1 400 Bad Request\r\n\r\n")
135
++        self.assertTrue(channel.transport.disconnecting)
136
++
137
++
138
++    def test_duplicateContentLengths(self):
139
++        """
140
++        A request which includes multiple C{content-length} headers
141
++        fails with a 400 response without calling L{Request.process}.
142
++        """
143
++        self.assertRequestRejected([
144
++            b'GET /a HTTP/1.1',
145
++            b'Content-Length: 56',
146
++            b'Content-Length: 0',
147
++            b'Host: host.invalid',
148
++            b'',
149
++            b'',
150
++        ])
151
++
152
++
153
++    def test_duplicateContentLengthsWithPipelinedRequests(self):
154
++        """
155
++        Two pipelined requests, the first of which includes multiple
156
++        C{content-length} headers, trigger a 400 response without
157
++        calling L{Request.process}.
158
++        """
159
++        self.assertRequestRejected([
160
++            b'GET /a HTTP/1.1',
161
++            b'Content-Length: 56',
162
++            b'Content-Length: 0',
163
++            b'Host: host.invalid',
164
++            b'',
165
++            b'',
166
++            b'GET /a HTTP/1.1',
167
++            b'Host: host.invalid',
168
++            b'',
169
++            b'',
170
++        ])
171
++
172
++
173
++    def test_contentLengthAndTransferEncoding(self):
174
++        """
175
++        A request that includes both C{content-length} and
176
++        C{transfer-encoding} headers fails with a 400 response without
177
++        calling L{Request.process}.
178
++        """
179
++        self.assertRequestRejected([
180
++            b'GET /a HTTP/1.1',
181
++            b'Transfer-Encoding: chunked',
182
++            b'Content-Length: 0',
183
++            b'Host: host.invalid',
184
++            b'',
185
++            b'',
186
++        ])
187
++
188
++
189
++    def test_contentLengthAndTransferEncodingWithPipelinedRequests(self):
190
++        """
191
++        Two pipelined requests, the first of which includes both
192
++        C{content-length} and C{transfer-encoding} headers, triggers a
193
++        400 response without calling L{Request.process}.
194
++        """
195
++        self.assertRequestRejected([
196
++            b'GET /a HTTP/1.1',
197
++            b'Transfer-Encoding: chunked',
198
++            b'Content-Length: 0',
199
++            b'Host: host.invalid',
200
++            b'',
201
++            b'',
202
++            b'GET /a HTTP/1.1',
203
++            b'Host: host.invalid',
204
++            b'',
205
++            b'',
206
++        ])
207
++
208
++
209
++    def test_unknownTransferEncoding(self):
210
++        """
211
++        A request whose C{transfer-encoding} header includes a value
212
++        other than C{chunked} or C{identity} fails with a 400 response
213
++        without calling L{Request.process}.
214
++        """
215
++        self.assertRequestRejected([
216
++            b'GET /a HTTP/1.1',
217
++            b'Transfer-Encoding: unknown',
218
++            b'Host: host.invalid',
219
++            b'',
220
++            b'',
221
++        ])
222
++
223
++
224
++    def test_transferEncodingIdentity(self):
225
++        """
226
++        A request with a valid C{content-length} and a
227
++        C{transfer-encoding} whose value is C{identity} succeeds.
228
++        """
229
++        body = []
230
++
231
++        class SuccessfulRequest(http.Request):
232
++            processed = False
233
++            def process(self):
234
++                body.append(self.content.read())
235
++                self.setHeader(b'content-length', b'0')
236
++                self.finish()
237
++
238
++        request = b'''\
239
++GET / HTTP/1.1
240
++Host: host.invalid
241
++Content-Length: 2
242
++Transfer-Encoding: identity
243
++
244
++ok
245
++'''
246
++        channel = self.runRequest(request, SuccessfulRequest, False)
247
++        self.assertEqual(body, [b'ok'])
248
++        self.assertEqual(
249
++            channel.transport.value(),
250
++            b'HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n',
251
++        )
252
++
253
++
254
+ 
255
+ class QueryArgumentsTests(unittest.TestCase):
256
+     def testParseqs(self):
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        An asynchronous networking framework written in Python
5 5
 Name:           python-Twisted
6 6
 Version:        19.10.0
7
-Release:        3%{?dist}
7
+Release:        4%{?dist}
8 8
 License:        MIT
9 9
 Group:          Development/Languages/Python
10 10
 Vendor:         VMware, Inc.
... ...
@@ -12,9 +12,9 @@ Distribution:   Photon
12 12
 Url:            https://twistedmatrix.com
13 13
 Source0:        https://pypi.python.org/packages/source/T/Twisted/Twisted-%{version}.tar.bz2
14 14
 %define sha1 Twisted=38a7f1b9c63ba0d2db553e2d210af2fd01b3ed21
15
-Patch0:        extra_dependency.patch
16
-Patch1:        no_packet.patch
17
-
15
+Patch0:         extra_dependency.patch
16
+Patch1:         no_packet.patch
17
+Patch2:         CVE-2020-10108_10109.patch
18 18
 BuildRequires:  python2
19 19
 BuildRequires:  python2-libs
20 20
 BuildRequires:  python2-devel
... ...
@@ -77,6 +77,7 @@ Python 3 version.
77 77
 %setup -q -n Twisted-%{version}
78 78
 %patch0 -p1
79 79
 %patch1 -p1
80
+%patch2 -p1
80 81
 rm -rf ../p3dir
81 82
 cp -a . ../p3dir
82 83
 
... ...
@@ -135,6 +136,8 @@ popd
135 135
 %{_bindir}/cftp3
136 136
 
137 137
 %changelog
138
+*   Sat Jun 27 2020 Tapas Kundu <tkundu@vmware.com> 19.10.0-4
139
+-   Address CVE-2020-10108 and CVE-2020-10109
138 140
 *   Mon Jun 01 2020 Tapas Kundu <tkundu@vmware.com> 19.10.0-3
139 141
 -   Requires service_identity
140 142
 *   Wed Mar 04 2020 Tapas Kundu <tkundu@vmware.com> 19.10.0-2
141 143
new file mode 100644
... ...
@@ -0,0 +1,50 @@
0
+From ef764dde1cca2f25d00686673d1bc89448819571 Mon Sep 17 00:00:00 2001
1
+From: Seunghoon Woo <toad58@nate.com>
2
+Date: Mon, 10 Feb 2020 16:32:46 +0900
3
+Subject: [PATCH] [FIX] revisit CVE-2015-8080 vulnerability
4
+
5
+---
6
+ deps/lua/src/lua_struct.c | 10 ++++++----
7
+ 1 file changed, 6 insertions(+), 4 deletions(-)
8
+
9
+diff --git a/deps/lua/src/lua_struct.c b/deps/lua/src/lua_struct.c
10
+index 4d5f027b85c..c58c8e72b08 100644
11
+--- a/deps/lua/src/lua_struct.c
12
+@@ -89,12 +89,14 @@ typedef struct Header {
13
+ } Header;
14
+ 
15
+ 
16
+-static int getnum (const char **fmt, int df) {
17
++static int getnum (lua_State *L, const char **fmt, int df) {
18
+   if (!isdigit(**fmt))  /* no number? */
19
+     return df;  /* return default value */
20
+   else {
21
+     int a = 0;
22
+     do {
23
++      if (a > (INT_MAX / 10) || a * 10 > (INT_MAX - (**fmt - '0')))
24
++        luaL_error(L, "integral size overflow");
25
+       a = a*10 + *((*fmt)++) - '0';
26
+     } while (isdigit(**fmt));
27
+     return a;
28
+@@ -115,9 +117,9 @@ static size_t optsize (lua_State *L, char opt, const char **fmt) {
29
+     case 'f':  return sizeof(float);
30
+     case 'd':  return sizeof(double);
31
+     case 'x': return 1;
32
+-    case 'c': return getnum(fmt, 1);
33
++    case 'c': return getnum(L, fmt, 1);
34
+     case 'i': case 'I': {
35
+-      int sz = getnum(fmt, sizeof(int));
36
++      int sz = getnum(L, fmt, sizeof(int));
37
+       if (sz > MAXINTSIZE)
38
+         luaL_error(L, "integral size %d is larger than limit of %d",
39
+                        sz, MAXINTSIZE);
40
+@@ -150,7 +152,7 @@ static void controloptions (lua_State *L, int opt, const char **fmt,
41
+     case '>': h->endian = BIG; return;
42
+     case '<': h->endian = LITTLE; return;
43
+     case '!': {
44
+-      int a = getnum(fmt, MAXALIGN);
45
++      int a = getnum(L, fmt, MAXALIGN);
46
+       if (!isp2(a))
47
+         luaL_error(L, "alignment %d is not a power of 2", a);
48
+       h->align = a;
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	advanced key-value store
2 2
 Name:		redis
3 3
 Version:	5.0.5
4
-Release:	1%{?dist}
4
+Release:	2%{?dist}
5 5
 License:	BSD
6 6
 URL:		http://redis.io/
7 7
 Group:		Applications/Databases
... ...
@@ -10,6 +10,7 @@ Distribution:   Photon
10 10
 Source0:	http://download.redis.io/releases/%{name}-%{version}.tar.gz
11 11
 %define sha1 redis=71e38ae09ac70012b5bc326522b976bcb8e269d6
12 12
 Patch0:         redis-conf.patch
13
+Patch1:         CVE-2020-14147.patch
13 14
 BuildRequires:  gcc
14 15
 BuildRequires:  systemd
15 16
 BuildRequires:  make
... ...
@@ -25,6 +26,7 @@ Redis is an in-memory data structure store, used as database, cache and message
25 25
 %prep
26 26
 %setup -q
27 27
 %patch0 -p1
28
+%patch1 -p1
28 29
 
29 30
 %build
30 31
 make %{?_smp_mflags}
... ...
@@ -83,6 +85,8 @@ exit 0
83 83
 %config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/redis.conf
84 84
 
85 85
 %changelog
86
+* Wed Jun 24 2020 Shreyas B <shreyasb@vmware.com> 5.0.5-2
87
+- Fix for CVE-2020-14147
86 88
 * Mon Jul 22 2019 Shreyas B. <shreyasb@vmware.com> 5.0.5-1
87 89
 - Updated to version 5.0.5.
88 90
 * Tue Sep 11 2018 Keerthana K <keerthanak@vmware.com> 4.0.11-1
... ...
@@ -1,12 +1,12 @@
1 1
 Summary:        Thin provisioning tools
2 2
 Name:           thin-provisioning-tools
3
-Version:        0.7.0
3
+Version:        0.8.5
4 4
 Release:        1%{?dist}
5 5
 License:        GPLv3+
6 6
 Group:          System Environment/Base
7 7
 URL:            https://github.com/jthornber/thin-provisioning-tools
8 8
 Source0:        thin-provisioning-tools-%{version}.tar.gz
9
-%define sha1    thin-provisioning-tools=618dd1e11d34ba99ce2eb3880303283ade5b708e
9
+%define sha1    thin-provisioning-tools=69a716544832f6727db75e8c90938fbfb6a4704f
10 10
 Patch0:         thin-provisioning-tools-fix-for-gcc-6.3.patch
11 11
 BuildRequires:  expat-devel, libaio-devel, boost-devel
12 12
 Requires:       expat, libaio
... ...
@@ -43,29 +43,11 @@ rm -rf %{buildroot}
43 43
 %defattr(-,root,root,-)
44 44
 %doc COPYING README.md
45 45
 %{_mandir}/man8/*
46
-%{_sbindir}/pdata_tools
47
-%{_sbindir}/cache_check
48
-%{_sbindir}/cache_dump
49
-%{_sbindir}/cache_metadata_size
50
-%{_sbindir}/cache_restore
51
-%{_sbindir}/cache_repair
52
-%{_sbindir}/cache_writeback
53
-%{_sbindir}/era_check
54
-%{_sbindir}/era_dump
55
-%{_sbindir}/era_restore
56
-%{_sbindir}/era_invalidate
57
-%{_sbindir}/thin_check
58
-%{_sbindir}/thin_dump
59
-%{_sbindir}/thin_metadata_size
60
-%{_sbindir}/thin_restore
61
-%{_sbindir}/thin_repair
62
-%{_sbindir}/thin_rmap
63
-%{_sbindir}/thin_delta
64
-%{_sbindir}/thin_ls
65
-%{_sbindir}/thin_trim
66
-%{_sbindir}/thin_show_duplicates
46
+%{_sbindir}/*
67 47
 
68 48
 %changelog
49
+*   Wed Jun 10 2020 Gerrit Photon <photon-checkins@vmware.com> 0.8.5-1
50
+-   Automatic Version Bump
69 51
 *   Mon Sep 10 2018 Michelle Wang <michellew@vmware.com> 0.7.0-1
70 52
 -   Update version to stable release version 0.7.0.
71 53
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.3-3
... ...
@@ -1,6 +1,6 @@
1 1
 Name:           toybox
2 2
 Version:        0.8.2
3
-Release:        2%{?dist}
3
+Release:        3%{?dist}
4 4
 License:        BSD
5 5
 Summary:        Common Linux command line utilities in a single executable
6 6
 Url:            http://landley.net/toybox/
... ...
@@ -144,6 +144,10 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
144 144
 [ $2 -eq 0 ] || exit 0
145 145
 %mktoy /usr/bin/cmp
146 146
 
147
+%triggerpostun -- elixir
148
+[ $2 -eq 0 ] || exit 0
149
+%mktoy /usr/bin/mix
150
+
147 151
 %triggerpostun -- expect
148 152
 [ $2 -eq 0 ] || exit 0
149 153
 %mktoy /usr/bin/mkpasswd
... ...
@@ -384,6 +388,9 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
384 384
 # diffutils
385 385
 %ghost /usr/bin/cmp
386 386
 
387
+# elixir
388
+%ghost /usr/bin/mix
389
+
387 390
 # expect
388 391
 %ghost /usr/bin/mkpasswd
389 392
 
... ...
@@ -535,6 +542,9 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
535 535
 /usr/bin/uuencode
536 536
 
537 537
 %changelog
538
+*   Tue Jun 30 2020 Prashant S Chauhan <psinghchauhan@vmware.com> 0.8.2-3
539
+-   Avoid conflicts with other packages by not packaging (%ghost-ing) symlinks
540
+-   Added elixir
538 541
 *   Wed Apr 15 2020 Alexey Makhalov <amakhalov@vmware.com> 0.8.2-2
539 542
 -   Avoid conflicts with other packages by not packaging (%ghost-ing) symlinks
540 543
 -   Use system zlib as it is installed by tdnf
... ...
@@ -1,11 +1,11 @@
1 1
 Summary:        user space RCU (read-copy-update)
2 2
 Name:           userspace-rcu
3
-Version:        0.10.1
3
+Version:        0.12.1
4 4
 Release:        1%{?dist}
5 5
 License:        LGPLv2+
6 6
 URL:            https://github.com/urcu/userspace-rcu/releases
7 7
 Source:         %{name}-%{version}.tar.gz
8
-%define         sha1 userspace-rcu=4db9940e75797f59870c30df657731ea62d0bec5
8
+%define         sha1 userspace-rcu=20bc93b4b1aecf1e69fe5d205899ee2270148d9e
9 9
 Group:          Development/Tools
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
... ...
@@ -57,6 +57,8 @@ make %{?_smp_mflags} check
57 57
 
58 58
 
59 59
 %changelog
60
+*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.12.1-1
61
+-   Automatic Version Bump
60 62
 *   Mon Sep 10 2018 Michelle Wang <michellew@vmware.com> 0.10.1-1
61 63
 -   Updated to version 0.10.1.
62 64
 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 0.9.3-1
... ...
@@ -1,12 +1,11 @@
1
-diff -Naur xml-security-c-1.7.3.orig/xsec/tools/checksig/InteropResolver.cpp xml-security-c-1.7.3/xsec/tools/checksig/InteropResolver.cpp
2
-+++ xml-security-c-1.7.3/xsec/tools/checksig/InteropResolver.cpp	2017-03-11 19:23:48.540875297 -0800
3
-@@ -645,7 +645,7 @@
4
- 
5
- 	}
6
- 
7
--	return false;
8
-+	return NULL;
1
+--- xml-security-c-1.7.3.orig/xsec/tools/checksig/InteropResolver.cpp	2020-06-19 03:30:26.414051453 +0000
2
+@@ -422,7 +422,7 @@
3
+         }
4
+     }
5
+ 
6
+-    return false;
7
++    return NULL;
9 8
  
10 9
  }
11 10
  
... ...
@@ -1,47 +1,61 @@
1 1
 Summary:	C++ XML Signature and Encryption library.
2 2
 Name:		xml-security-c
3
-Version:	1.7.3
4
-Release:	3%{?dist}
3
+Version:	2.0.2
4
+Release:	1%{?dist}
5 5
 License:	Apache Software License
6 6
 URL:		http://santuario.apache.org/index.html
7 7
 Group:		Applications/System
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10 10
 Source0:	http://apache.mirrors.lucidnetworks.net/santuario/c-library/%{name}-%{version}.tar.gz
11
-%define sha1 xml-security-c=bcbe98e0bd3695a0b961a223cce53e2f35c4681b
11
+%define sha1 xml-security-c=281efe6701397036af420244be26815589cec982
12 12
 Patch0:		xml-security-c-fix-for-gcc-6.3.patch
13 13
 Requires:	openssl
14 14
 Requires:	xerces-c
15 15
 BuildRequires:	openssl-devel
16 16
 BuildRequires: 	xerces-c-devel >= 3.1
17 17
 %description
18
-XML-Security-C is the C++ XML Signature and Encryption library from the Apache Software Foundation. It is used for all XML Signature and Encryption processing in OpenSAML and Shibboleth.
18
+XML-Security-C is the C++ XML Signature and Encryption library from the Apache Software Foundation.
19
+It is used for all XML Signature and Encryption processing in OpenSAML and Shibboleth.
20
+
19 21
 %package	devel
20 22
 Summary:	XML Security C library headers
21 23
 Group:         	Development/Libraries
22 24
 Requires:       %{name} = %{version}-%{release}
23 25
 %description	devel
24 26
 This package contains development headers and static library for xml security.
27
+
25 28
 %prep
26 29
 %setup -q
27 30
 %patch0 -p1
31
+
28 32
 %build
29
-./configure --prefix=/usr
33
+%configure --prefix=/usr
30 34
 make %{?_smp_mflags}
35
+
31 36
 %install
32 37
 make DESTDIR=%{buildroot} install
38
+
33 39
 %post	-p /sbin/ldconfig
34 40
 %postun	-p /sbin/ldconfig
35
-%files 
41
+
42
+%files
36 43
 %defattr(-,root,root)
37 44
 %{_bindir}/*
38 45
 %{_libdir}/*.so.*
46
+
47
+
39 48
 %files	devel
40 49
 %defattr(-,root,root)
41 50
 %{_libdir}/*.so
42 51
 %{_libdir}/*.a
52
+%{_libdir}/*.la
53
+%{_libdir}/pkgconfig/*.pc
43 54
 %{_includedir}/*
55
+
44 56
 %changelog
57
+*   Wed Jun 10 2020 Gerrit Photon <photon-checkins@vmware.com> 2.0.2-1
58
+-   Automatic Version Bump
45 59
 *   Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.3-3
46 60
 -   Patch for gcc-6.3
47 61
 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.7.3-2
48 62
new file mode 100644
... ...
@@ -0,0 +1,18 @@
0
+diff --git a/bin/zkServer.sh b/bin/zkServer.sh
1
+--- a/bin/zkServer.sh  2020-06-19 23:40:37.997872185 +0000
2
+@@ -91,14 +91,7 @@
3
+     ZOOCFG="$2"
4
+ fi
5
+
6
+-if $cygwin
7
+-then
8
+-    ZOOCFG=`cygpath -wp "$ZOOCFG"`
9
+-    # cygwin has a "kill" in the shell itself, gets confused
10
+-    KILL=/bin/kill
11
+-else
12
+-    KILL=kill
13
+-fi
14
++KILL=kill
15
+
16
+ echo "Using config: $ZOOCFG" >&2
... ...
@@ -1,27 +1,33 @@
1
-Summary:        Highly reliable distributed coordination
2
-Name:           zookeeper
3
-Version:        3.4.14
4
-Release:        1%{?dist}
5
-URL:            http://zookeeper.apache.org/
6
-License:        Apache License, Version 2.0
7
-Group:          Applications/System
8
-Vendor:         VMware, Inc.
9
-Distribution:   Photon
10
-Source:         http://apache.claz.org/zookeeper/zookeeper/zookeeper-%{version}/%{name}-%{version}.tar.gz
11
-%define sha1 zookeeper=285a0c85112d9f99d42cbbf8fb750c9aa5474716
12
-Source1:        zookeeper.service
13
-Source2:        zkEnv.sh
14
-Patch0:	        zookeeper-3.4.8-server.patch
15
-BuildRequires:  systemd
16
-Requires:       systemd
17
-Requires:       openjre8
18
-Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd
19
-Requires(postun):/usr/sbin/userdel /usr/sbin/groupdel
1
+Summary:          Highly reliable distributed coordination
2
+Name:             zookeeper
3
+Version:          3.5.8
4
+Release:          1%{?dist}
5
+URL:              http://zookeeper.apache.org/
6
+License:          Apache License, Version 2.0
7
+Group:            Applications/System
8
+Vendor:           VMware, Inc.
9
+Distribution:     Photon
10
+Source:           %{name}-%{version}.tar.gz
11
+%define sha1      zookeeper=1953bdd512bafc69740b474ae41a07c550c408bb
12
+Source1:          zookeeper.service
13
+Source2:          zkEnv.sh
14
+Patch0:           zkSever_remove_cygwin_cypath.patch
15
+BuildRequires:    systemd
16
+Requires:         systemd
17
+Requires:         openjre8
18
+Requires(pre):    /usr/sbin/useradd /usr/sbin/groupadd
19
+Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
20 20
 %description
21
-ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
21
+ZooKeeper is a centralized service for maintaining configuration information, naming,
22
+providing distributed synchronization, and providing group services.
23
+All of these kinds of services are used in some form or another by distributed applications.
24
+Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable.
25
+Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them,
26
+which make them brittle in the presence of change and difficult to manage.
27
+Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.
22 28
 
23 29
 %prep
24
-%setup -q
30
+%setup -q -n apache-zookeeper-%{version}-bin
25 31
 %patch0 -p1
26 32
 
27 33
 %install
... ...
@@ -31,15 +37,11 @@ mkdir -p %{buildroot}%{_libdir}/java/zookeeper
31 31
 mkdir -p %{buildroot}%{_libdir}/zookeeper
32 32
 mkdir -p %{buildroot}%{_var}/log/zookeeper
33 33
 mkdir -p %{buildroot}%{_sysconfdir}/zookeeper
34
-mkdir -p %{buildroot}/sbin
35 34
 mkdir -p %{buildroot}%{_prefix}/share/zookeeper/templates/conf
36 35
 mkdir -p %{buildroot}%{_var}/zookeeper
37 36
 
38
-cp zookeeper-%{version}.jar %{buildroot}%{_libdir}/java/zookeeper
39
-cp src/packages/update-zookeeper-env.sh %{buildroot}/sbin/update-zookeeper-env.sh
40
-cp src/packages/templates/conf/zookeeper-env.sh %{buildroot}%{_prefix}/share/zookeeper/templates/conf
37
+cp lib/zookeeper-%{version}.jar %{buildroot}%{_libdir}/java/zookeeper
41 38
 cp conf/zoo_sample.cfg %{buildroot}%{_prefix}/share/zookeeper/templates/conf/zoo.cfg
42
-chmod 0755 %{buildroot}/sbin/*
43 39
 
44 40
 mv bin/* %{buildroot}%{_bindir}
45 41
 mv lib/*.jar %{buildroot}%{_libdir}/java/zookeeper
... ...
@@ -79,13 +81,14 @@ fi
79 79
 %files
80 80
 %defattr(-,root,root)
81 81
 %attr(0755,zookeeper,hadoop) %{_var}/log/zookeeper
82
-%attr(0775,zookeeper,hadoop) /sbin/update-zookeeper-env.sh
83 82
 %config(noreplace) %{_sysconfdir}/zookeeper/*
84 83
 /lib/systemd/system/zookeeper.service
85 84
 /lib/systemd/system-preset/50-zookeeper.preset
86 85
 %{_prefix}
87 86
 
88 87
 %changelog
88
+*   Wed Jun 10 2020 Gerrit Photon <photon-checkins@vmware.com> 3.5.8-1
89
+-   Automatic Version Bump
89 90
 *   Fri May 31 2019 Tapas Kundu <tkundu@vmware.com> 3.4.14-1
90 91
 -   Updated to release 3.4.14
91 92
 -   Fix for CVE-2019-0201
92 93
new file mode 100644
... ...
@@ -0,0 +1,30 @@
0
+# systemd
1
+
2
+systemd is a suite of basic building blocks for a Linux system. It provides a system and service manager that runs as Process ID 1 and starts the rest of the system.
3
+
4
+To manage the services run the following commands:
5
+
6
+- `systemctl` or `systemctl list-units` : This command lists the running units.
7
+- `systemctl --failed` : This command lists failed units.
8
+- `systemctl list-unit-files` : This command lists all the installed unit files. The unit files are usually present in **/usr/lib/systemd/system/** and **/etc/systemd/system/**.
9
+- `systemctl status pid` : This command displays the cgroup slice, memory and parent for a PID.
10
+- `systemctl start unit` : This command starts a unit immediately.
11
+- `systemctl stop unit` : This command stops a unit.
12
+- `systemctl restart unit` : This command restarts a unit.
13
+- `systemctl reload unit` : This command asks a unit to reload its configuration.
14
+- `systemctl status unit` : This command displays the status of a unit.
15
+- `systemctl enable unit` : This command enables a unit to run on startup.
16
+- `systemctl enable --now unit` : This command enables a unit to run on startup and start immediately.
17
+- `systemctl disable unit` : This command disables a unit and removes it from the startup program.
18
+- `systemctl mask unit` : This command masks a unit to make it impossible to start.
19
+- `systemctl unmask unit` : This command unmasks a unit.
20
+
21
+To get an overview of the system boot-up time, run the following command:
22
+```
23
+systemd-analyze
24
+```
25
+
26
+To view a list of all running units, sorted by the time they took to initialize (highest time on top), run the following command:
27
+```
28
+systemd-analyze blame
29
+```