Browse code

curl: upgrade to v8.1.2

Fixes CVE-2023-28319.

elfutils: upgrade to v0.189 to fix build errors with latest curl

Change-Id: I1cf9a4559273ad83b8a28caa77ac75f708750849
Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/21238
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Shreenidhi Shedi authored on 2023/07/11 18:46:18
Showing 33 changed files
... ...
@@ -3,8 +3,8 @@
3 3
 Summary:        aws sdk for c++
4 4
 Group:          Development/Libraries
5 5
 Name:           aws-sdk-cpp
6
-Version:        1.10.30
7
-Release:        2%{?dist}
6
+Version:        1.11.117
7
+Release:        1%{?dist}
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 License:        Apache 2.0
... ...
@@ -19,19 +19,19 @@ URL:            https://github.com/aws/aws-sdk-cpp
19 19
 # cd aws-sdk-cpp-1.10.20 && ./prefetch_crt_dependency.sh && cd -
20 20
 # tar -I 'gzip -9' -cpf aws-sdk-cpp-1.10.20.tar.gz aws-sdk-cpp-1.10.20
21 21
 Source0: https://github.com/aws/aws-sdk-cpp/archive/refs/tags/%{name}-%{version}.tar.gz
22
-%define sha512 %{name}=9c3ae4ba18e76cf2aacea8412f1f808774af9bd1c3ccfc55c541833ca399775f008eec387870fa71fa067a0e3345d6e9f4486511426bfb7c40f2429a72878b4f
22
+%define sha512 %{name}=c398d2e5176d7369ea571aaa58ac240876929d5f97226de17282baeaadc0d7e20a3f2e8d4d348fbd3eaa365e09ad55631c0f6bb0d52b8a38c3ac935def5165c6
23 23
 
24
-Requires:       openssl-devel
25
-Requires:       curl-devel
26
-Requires:       zlib-devel
27
-Requires:       aws-sdk-core = %{version}-%{release}
28
-Requires:       aws-sdk-kinesis = %{version}-%{release}
29
-Requires:       aws-sdk-s3 = %{version}-%{release}
24
+Requires: openssl-devel
25
+Requires: curl-devel
26
+Requires: zlib-devel
27
+Requires: aws-sdk-core = %{version}-%{release}
28
+Requires: aws-sdk-kinesis = %{version}-%{release}
29
+Requires: aws-sdk-s3 = %{version}-%{release}
30 30
 
31
-BuildRequires:  cmake
32
-BuildRequires:  curl-devel
33
-BuildRequires:  openssl-devel
34
-BuildRequires:  zlib-devel
31
+BuildRequires: cmake
32
+BuildRequires: curl-devel
33
+BuildRequires: openssl-devel
34
+BuildRequires: zlib-devel
35 35
 
36 36
 %description
37 37
 The AWS SDK for C++ provides a modern C++ (version C++ 11 or later) interface for Amazon Web Services (AWS).
... ...
@@ -99,16 +99,26 @@ export CXXFLAGS="%{optflags} -Wno-stringop-truncation"
99 99
     -DCMAKE_INSTALL_LIBDIR=%{_libdir}
100 100
 
101 101
 cd %{__cmake_builddir}
102
-for component in "core" "kinesis" "s3"; do
103
-  pushd aws-cpp-sdk-${component}
102
+
103
+pushd ./src/aws-cpp-sdk-core
104
+%make_build
105
+popd
106
+
107
+for component in "kinesis" "s3"; do
108
+  pushd ./generated/src/aws-cpp-sdk-${component}
104 109
   %make_build
105 110
   popd
106 111
 done
107 112
 
108 113
 %install
109 114
 cd %{__cmake_builddir}
110
-for component in "core" "kinesis" "s3"; do
111
-  pushd aws-cpp-sdk-${component}
115
+
116
+pushd ./src/aws-cpp-sdk-core
117
+%make_install %{?_smp_mflags}
118
+popd
119
+
120
+for component in  "kinesis" "s3"; do
121
+  pushd ./generated/src/aws-cpp-sdk-${component}
112 122
   %make_install %{?_smp_mflags}
113 123
   popd
114 124
 done
... ...
@@ -126,19 +136,11 @@ rm -rf %{buildroot}/*
126 126
 
127 127
 %files
128 128
 %defattr(-,root,root,0755)
129
-%exclude %{_includedir}/aws/core
130
-%exclude %{_includedir}/aws/kinesis
131
-%exclude %{_includedir}/aws/s3
132
-%exclude %{_libdir}/pkgconfig/aws-cpp-sdk-core.pc
133
-%exclude %{_libdir}/pkgconfig/aws-cpp-sdk-kinesis.pc
134
-%exclude %{_libdir}/pkgconfig/aws-cpp-sdk-s3.pc
135
-%exclude %{_libdir}/libaws-cpp-sdk-core.so
136
-%exclude %{_libdir}/libaws-cpp-sdk-kinesis.so
137
-%exclude %{_libdir}/libaws-cpp-sdk-s3.so
138 129
 
139 130
 %files -n aws-sdk-core
140 131
 %defattr(-,root,root,0755)
141 132
 %{_includedir}/aws/core/*
133
+%{_includedir}/smithy/*
142 134
 %{_libdir}/pkgconfig/aws-cpp-sdk-core.pc
143 135
 
144 136
 %files -n aws-core-libs
... ...
@@ -164,6 +166,8 @@ rm -rf %{buildroot}/*
164 164
 %{_libdir}/libaws-cpp-sdk-s3.so
165 165
 
166 166
 %changelog
167
+* Wed Jul 12 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.11.117-1
168
+- Upgrade to v1.11.117
167 169
 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.10.30-2
168 170
 - Bump version as a part of zlib upgrade
169 171
 * Thu Dec 15 2022 Shreenidhi Shedi <sshedi@vmware.com> 1.10.30-1
... ...
@@ -3,7 +3,7 @@
3 3
 Name:            bcc
4 4
 Summary:         BPF Compiler Collection (BCC)
5 5
 Version:         0.25.0
6
-Release:         3%{?dist}
6
+Release:         4%{?dist}
7 7
 License:         ASL 2.0
8 8
 Vendor:          VMware, Inc.
9 9
 Distribution:    Photon
... ...
@@ -126,6 +126,8 @@ rm -rf %{buildroot}/*
126 126
 %{_datadir}/%{name}/man/*
127 127
 
128 128
 %changelog
129
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.25.0-4
130
+- Bump version as a part of elfutils upgrade
129 131
 * Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 0.25.0-3
130 132
 - Bump up due to change in elfutils
131 133
 * Tue Dec 06 2022 Prashant S Chauhan <psinghchauha@vmware.com> 0.25.0-2
... ...
@@ -1,6 +1,6 @@
1 1
 Name:           bpftrace
2 2
 Version:        0.16.0
3
-Release:        4%{?dist}
3
+Release:        5%{?dist}
4 4
 Summary:        High-level tracing language for Linux eBPF
5 5
 License:        ASL 2.0
6 6
 Vendor:         VMware, Inc.
... ...
@@ -79,6 +79,8 @@ rm -rf %{buildroot}/*
79 79
 %{_datadir}/%{name}/tools/doc/*.txt
80 80
 
81 81
 %changelog
82
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.16.0-5
83
+- Bump version as a part of elfutils upgrade
82 84
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 0.16.0-4
83 85
 - Bump version as a part of libbpf upgrade
84 86
 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.16.0-3
... ...
@@ -1,26 +1,30 @@
1 1
 Summary:        An URL retrieval utility and library
2 2
 Name:           curl
3
-Version:        7.86.0
4
-Release:        3%{?dist}
3
+Version:        8.1.2
4
+Release:        1%{?dist}
5 5
 License:        MIT
6 6
 URL:            http://curl.haxx.se
7 7
 Group:          System Environment/NetworkingLibraries
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10 10
 
11
-Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.gz
12
-%define sha512 %{name}=b2d30b4d145a3621862a0f5e6378b5099ba92f4be6e92f4e070ec1299fc5eacba851bf993efd613b366fb81642f3f5cccb6e02adcd472dccc9c5e65c1a51812c
11
+Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.xz
12
+%define sha512 %{name}=532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4
13 13
 
14
-BuildRequires:  ca-certificates
15
-BuildRequires:  openssl-devel
16
-BuildRequires:  krb5-devel
17
-BuildRequires:  libssh2-devel
14
+BuildRequires: ca-certificates
15
+BuildRequires: openssl-devel
16
+BuildRequires: krb5-devel
17
+BuildRequires: libssh2-devel
18 18
 
19
-Requires:       ca-certificates
20
-Requires:       openssl-libs
21
-Requires:       krb5
22
-Requires:       libssh2
23
-Requires:       %{name}-libs = %{version}-%{release}
19
+%if 0%{?with_check}
20
+BuildRequires: python3
21
+%endif
22
+
23
+Requires: ca-certificates
24
+Requires: openssl-libs
25
+Requires: krb5
26
+Requires: libssh2
27
+Requires: %{name}-libs = %{version}-%{release}
24 28
 
25 29
 %description
26 30
 The cURL package contains an utility and a library used for
... ...
@@ -41,12 +45,14 @@ Static libraries and header files for the support library for curl
41 41
 Summary:        Libraries for curl
42 42
 Group:          System Environment/Libraries
43 43
 Requires:       ca-certificates-pki
44
+Requires:       libssh2
45
+Requires:       krb5
44 46
 
45 47
 %description    libs
46 48
 This package contains minimal set of shared curl libraries.
47 49
 
48 50
 %prep
49
-%autosetup
51
+%autosetup -p1
50 52
 
51 53
 %build
52 54
 %configure \
... ...
@@ -67,10 +73,12 @@ This package contains minimal set of shared curl libraries.
67 67
 install -v -d -m755 %{buildroot}%{_docdir}/%{name}-%{version}
68 68
 %{_fixperms} %{buildroot}/*
69 69
 
70
+%if 0%{?with_check}
70 71
 %check
71
-make %{?_smp_mflags} check
72
+%make_build check
73
+%endif
72 74
 
73
-%post   -p /sbin/ldconfig
75
+%post -p /sbin/ldconfig
74 76
 %postun -p /sbin/ldconfig
75 77
 
76 78
 %clean
... ...
@@ -95,6 +103,8 @@ rm -rf %{buildroot}/*
95 95
 %{_libdir}/libcurl.so.*
96 96
 
97 97
 %changelog
98
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 8.1.2-1
99
+- Upgrade to v8.1.2
98 100
 * Wed Mar 08 2023 Shreenidhi Shedi <sshedi@vmware.com> 7.86.0-3
99 101
 - Require openssl-libs
100 102
 * Thu Jan 26 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 7.86.0-2
... ...
@@ -1,6 +1,6 @@
1 1
 Name:       debugedit
2 2
 Version:    5.0
3
-Release:    4%{?dist}
3
+Release:    5%{?dist}
4 4
 Summary:    Tools for debuginfo creation
5 5
 License:    GPLv3+ and GPLv2+ and LGPLv2+
6 6
 URL:        https://sourceware.org/debugedit
... ...
@@ -75,6 +75,8 @@ make check %{?_smp_mflags}
75 75
 %{_mandir}/man1/find-debuginfo.1*
76 76
 
77 77
 %changelog
78
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.0-5
79
+- Bump version as a part of elfutils upgrade
78 80
 * Wed Jan 25 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.0-4
79 81
 - Fix requires
80 82
 * Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 5.0-3
... ...
@@ -1,7 +1,7 @@
1 1
 Name:          dwarves
2 2
 Summary:       Debugging Information Manipulation Tools (pahole & friends)
3 3
 Version:       1.24
4
-Release:       2%{?dist}
4
+Release:       3%{?dist}
5 5
 Group:         Development/Tools
6 6
 Vendor:        VMware, Inc.
7 7
 Distribution:  Photon
... ...
@@ -103,6 +103,8 @@ rm -rf %{buildroot}
103 103
 %{_datadir}/*
104 104
 
105 105
 %changelog
106
+*  Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.24-3
107
+-  Bump version as a part of elfutils upgrade
106 108
 *  Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.24-2
107 109
 -  Bump version as a part of zlib upgrade
108 110
 *  Fri Apr 07 2023 Srish Srinivasan <ssrish@vmware.com> 1.24-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:    DWARF optimization and duplicate removal tool
2 2
 Name:       dwz
3 3
 Version:    0.15
4
-Release:    2%{?dist}
4
+Release:    3%{?dist}
5 5
 License:    GPLv2+ and GPLv3+
6 6
 URL:        https://sourceware.org/dwz
7 7
 Group:      Applications/System
... ...
@@ -51,6 +51,8 @@ make check %{?_smp_mflags}
51 51
 %{_mandir}/man1/%{name}.1*
52 52
 
53 53
 %changelog
54
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.15-3
55
+- Bump version as a part of elfutils upgrade
54 56
 * Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 0.15-2
55 57
 - Bump up due to change in elfutils
56 58
 * Tue Dec 13 2022 Gerrit Photon <photon-checkins@vmware.com> 0.15-1
... ...
@@ -3,8 +3,8 @@
3 3
 
4 4
 Summary:        A collection of utilities and DSOs to handle compiled objects
5 5
 Name:           elfutils
6
-Version:        0.188
7
-Release:        5%{?dist}
6
+Version:        0.189
7
+Release:        2%{?dist}
8 8
 License:        GPLv3+ and (GPLv2+ or LGPLv3+)
9 9
 Group:          Development/Tools
10 10
 URL:            https://sourceware.org/elfutils
... ...
@@ -12,28 +12,28 @@ Vendor:         VMware, Inc.
12 12
 Distribution:   Photon
13 13
 
14 14
 Source0: https://sourceware.org/elfutils/ftp/%{version}/%{name}-%{version}.tar.bz2
15
-%define sha512 %{name}=585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5
16
-
17
-Requires:       %{name}-libelf = %{version}-%{release}
18
-Requires:       glibc >= 2.7
19
-Requires:       bzip2-libs
20
-Requires:       libmicrohttpd
21
-Requires:       curl
22
-Requires:       libarchive
23
-Requires:       zstd
24
-
25
-BuildRequires:  gcc
26
-BuildRequires:  glibc
27
-BuildRequires:  bison
28
-BuildRequires:  flex
29
-BuildRequires:  m4
30
-BuildRequires:  gettext-devel
31
-BuildRequires:  bzip2-devel
32
-BuildRequires:  libmicrohttpd-devel
33
-BuildRequires:  curl-devel
34
-BuildRequires:  libarchive-devel
35
-BuildRequires:  sqlite-devel
36
-BuildRequires:  zstd-devel
15
+%define sha512 %{name}=93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71
16
+
17
+Requires: %{name}-libelf = %{version}-%{release}
18
+Requires: glibc >= 2.7
19
+Requires: bzip2-libs
20
+Requires: libmicrohttpd
21
+Requires: curl
22
+Requires: libarchive
23
+Requires: zstd
24
+
25
+BuildRequires: gcc
26
+BuildRequires: glibc
27
+BuildRequires: bison
28
+BuildRequires: flex
29
+BuildRequires: m4
30
+BuildRequires: gettext-devel
31
+BuildRequires: bzip2-devel
32
+BuildRequires: libmicrohttpd-devel
33
+BuildRequires: curl-devel
34
+BuildRequires: libarchive-devel
35
+BuildRequires: sqlite-devel
36
+BuildRequires: zstd-devel
37 37
 
38 38
 %description
39 39
 Elfutils is a collection of utilities, including ld (a linker),
... ...
@@ -115,7 +115,9 @@ These are the additional language files of %{name}.
115 115
 %autosetup -p1
116 116
 
117 117
 %build
118
-%configure --program-prefix=%{_programprefix}
118
+%configure \
119
+    --program-prefix=%{_programprefix}
120
+
119 121
 %make_build
120 122
 
121 123
 %install
... ...
@@ -137,18 +139,18 @@ chmod +x %{buildroot}%{_libdir}/lib*.so*
137 137
 
138 138
 %if 0%{?with_check}
139 139
 %check
140
-make %{?_smp_mflags} check
140
+%make_build check
141 141
 %endif
142 142
 
143 143
 %clean
144 144
 rm -rf %{buildroot}
145 145
 
146 146
 %ldconfig_scriptlets
147
+
147 148
 %ldconfig_scriptlets libelf
148 149
 
149 150
 %files
150 151
 %defattr(-,root,root)
151
-%doc COPYING COPYING-GPLV2 COPYING-LGPLV3 README TODO CONTRIBUTING
152 152
 %{_bindir}/eu-*
153 153
 %{_bindir}/debuginfod
154 154
 %{_bindir}/debuginfod-find
... ...
@@ -198,12 +200,17 @@ rm -rf %{buildroot}
198 198
 %{_libdir}/libelf.so
199 199
 
200 200
 %files libelf-devel-static
201
+%defattr(-,root,root)
201 202
 %{_libdir}/libelf.a
202 203
 
203 204
 %files libelf-lang -f %{name}.lang
204 205
 %defattr(-,root,root)
205 206
 
206 207
 %changelog
208
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.189-2
209
+- Bump version as a part of curl upgrade
210
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.189-1
211
+- Upgrade to v0.189
207 212
 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.188-5
208 213
 - Bump version as a part of zstd upgrade
209 214
 * Sat Jan 14 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 0.188-4
... ...
@@ -3,7 +3,7 @@
3 3
 Summary:        Internet Routing Protocol
4 4
 Name:           frr
5 5
 Version:        8.4.1
6
-Release:        3%{?dist}
6
+Release:        4%{?dist}
7 7
 License:        GPLv2+
8 8
 URL:            https://frrouting.org
9 9
 Group:          System Environment/Daemons
... ...
@@ -246,6 +246,8 @@ fi
246 246
 %{frr_libdir}/*.py
247 247
 
248 248
 %changelog
249
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 8.4.1-4
250
+- Bump version as a part of elfutils upgrade
249 251
 * Fri Jun 09 2023 Nitesh Kumar <kunitesh@vmware.com> 8.4.1-3
250 252
 - Bump version as a part of ncurses upgrade to v6.4
251 253
 * Tue Apr 11 2023 Brennan Lamoreaux <blamoreaux@vmware.com> 8.4.1-2
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:      Low-level libraries useful for providing data structure handling for C.
2 2
 Name:         glib
3 3
 Version:      2.75.2
4
-Release:      2%{?dist}
4
+Release:      3%{?dist}
5 5
 License:      LGPLv2+
6 6
 URL:          https://developer.gnome.org/glib
7 7
 Group:        Applications/System
... ...
@@ -113,6 +113,8 @@ CONFIGURE_OPTS=(
113 113
 %{_datadir}/glib-2.0/schemas/*
114 114
 
115 115
 %changelog
116
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.75.2-3
117
+- Bump version as a part of elfutils upgrade
116 118
 * Sat May 27 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.75.2-2
117 119
 - Exclude duplicate packaged files
118 120
 * Mon Jan 09 2023 Susant Sahani <ssahani@vmware.com> 2.75.2-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Basic and advanced IPV4-based networking
2 2
 Name:           iproute2
3 3
 Version:        6.0.0
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        GPLv2+
6 6
 URL:            https://wiki.linuxfoundation.org/networking/iproute2
7 7
 Group:          Applications/System
... ...
@@ -78,6 +78,8 @@ rm -rf %{buildroot}/*
78 78
 %{_mandir}/man3/*
79 79
 
80 80
 %changelog
81
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.0.0-2
82
+- Bump version as a part of elfutils upgrade
81 83
 * Mon Oct 17 2022 Shreenidhi Shedi <sshedi@vmware.com> 6.0.0-1
82 84
 - Upgrade to v6.0.0
83 85
 * Sat Feb 12 2022 Shreenidhi Shedi <sshedi@vmware.com> 5.12.0-3
... ...
@@ -1,7 +1,7 @@
1 1
 Name:           kpatch
2 2
 Summary:        Dynamic kernel patching
3 3
 Version:        0.9.8
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 URL:            http://github.com/dynup/kpatch
6 6
 License:        GPLv2
7 7
 Group:          System Environment/Kernel
... ...
@@ -115,6 +115,8 @@ cp %{SOURCE4} %{buildroot}%{_sysconfdir}/gen_livepatch/build-rpm.spec
115 115
 %{_sysconfdir}/gen_livepatch/build-rpm.spec
116 116
 
117 117
 %changelog
118
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.9.8-2
119
+- Bump version as a part of elfutils upgrade
118 120
 * Fri Mar 24 2023 Brennan Lamoreaux <blamoreaux@vmware.com> 0.9.8-1
119 121
 - Update to 0.9.8
120 122
 * Wed Feb 15 2023 Brennan Lamoreaux <blamoreaux@vmware.com> 0.9.7-4
... ...
@@ -1,20 +1,23 @@
1
-Summary: A New Scripting Dynamic Tracing Tool For Linux
2
-Name:    ktap
3
-Version: 0.4
4
-Release: rc1%{?kernelsubrelease}%{?dist}
5
-License: GPLv2
6
-URL: https://github.com/ktap/ktap
7
-Source: %{name}-master.zip
8
-%define sha1 ktap=8dca9a25e8917ad8cabdf176de487949c235ec80
1
+Summary:    A New Scripting Dynamic Tracing Tool For Linux
2
+Name:       ktap
3
+Version:    0.4
4
+Release:    rc1%{?kernelsubrelease}%{?dist}
5
+License:    GPLv2
6
+URL:        https://github.com/ktap/ktap
9 7
 Group:      Development/Tools
10 8
 Vendor:     VMware, Inc.
9
+Distribution:  Photon
10
+
11
+Source: %{name}-master.zip
12
+%define sha512 %{name}=e850a6adcb39e7bc5a95677f8fddb2edaebad931f65718aed1b582930a4c3fe2007bb3d1c97a4c5c236aea3e4defbbbf081c305f009129ebd7d0d5ba5b12e231
13
+
11 14
 Patch0:        linux-4.9-support.patch
12 15
 Patch1:        linux-4.14-support.patch
13
-Distribution:  Photon
16
+
14 17
 BuildRequires: elfutils-devel
15 18
 BuildRequires: linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
16
-BuildRequires: linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
17 19
 BuildRequires: unzip
20
+
18 21
 Requires: kmod
19 22
 Requires: linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
20 23
 
... ...
@@ -22,21 +25,22 @@ Requires: linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
22 22
 ktap is a new scripting dynamic tracing tool for Linux, it uses a scripting language and lets users trace the Linux kernel dynamically. ktap is designed to give operational insights with interoperability that allows users to tune, troubleshoot and extend the kernel and applications. It's similar to Linux Systemtap and Solaris Dtrace.
23 23
 
24 24
 %prep
25
-%setup -q -n ktap-master
26
-%patch0 -p1
27
-%patch1 -p1
25
+%autosetup -p1 -n %{name}-master
28 26
 
29 27
 %build
30
-make ktap
28
+%make_build ktap
31 29
 # ugly hack: deactivate security hardening to build kernel module
32 30
 # we need to remove sec hard specs file for that.
33
-rm -f `dirname $(gcc --print-libgcc-file-name)`/../specs
31
+rm -f $(dirname $(gcc --print-libgcc-file-name))/../specs
34 32
 #make KVERSION=%{KERNEL_VERSION}-%{KERNEL_RELEASE} mod
35 33
 
36 34
 %install
37 35
 mkdir -p %{buildroot}%{_bindir}
38 36
 #make install DESTDIR=%{buildroot} KVERSION=%{KERNEL_VERSION}-%{KERNEL_RELEASE}
39
-install -vm 755 ktap %{buildroot}%{_bindir}/
37
+install -vm 755 %{name} %{buildroot}%{_bindir}/
38
+
39
+%clean
40
+rm -rf %{buildroot}/*
40 41
 
41 42
 %post
42 43
 /sbin/depmod -a
... ...
@@ -46,29 +50,27 @@ install -vm 755 ktap %{buildroot}%{_bindir}/
46 46
 
47 47
 %files
48 48
 %defattr(-, root, root, 0755)
49
-%doc README.md
50
-%{_bindir}/ktap
49
+%{_bindir}/%{name}
51 50
 #/lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/extra/ktapvm.ko
52 51
 
53 52
 %changelog
54
-*   Fri Sep 11 2020 Bo Gan <ganb@vmware.com> 0.4-rc1
55
--   Temporarily deactivate kernel module build in preparation for kernel update
56
-*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 0.4-8
57
--   Update to linux-4.14.y. Added support patch
58
-*   Fri Jun 09 2017 Chang Lee <changlee@vmware.com> 0.4-7
59
--   Remove %check
60
-*   Thu Dec 15 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-6
61
--   Update to linux-4.9.0. Added support patch
62
-*   Wed Nov 30 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-5
63
--   Expand uname -r to have release number
64
-*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 0.4-4
65
--   Modified %check
66
-*   Mon Aug 1 2016 Divya Thaluru <dthaluru@vmware.com> 0.4-3
67
--   Added kernel macros
68
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.4-3
69
--   GA - Bump release of all rpms
70
-*   Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-2
71
--   Update to linux-4.4.8
72
-*   Fri Dec 04 2015 Xiaolin Li <xiaolinl@vmware.com> 0.4-1
73
--   Initial build.  First version
74
-
53
+* Fri Sep 11 2020 Bo Gan <ganb@vmware.com> 0.4-rc1
54
+- Temporarily deactivate kernel module build in preparation for kernel update
55
+* Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 0.4-8
56
+- Update to linux-4.14.y. Added support patch
57
+* Fri Jun 09 2017 Chang Lee <changlee@vmware.com> 0.4-7
58
+- Remove %check
59
+* Thu Dec 15 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-6
60
+- Update to linux-4.9.0. Added support patch
61
+* Wed Nov 30 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-5
62
+- Expand uname -r to have release number
63
+* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 0.4-4
64
+- Modified %check
65
+* Mon Aug 1 2016 Divya Thaluru <dthaluru@vmware.com> 0.4-3
66
+- Added kernel macros
67
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.4-3
68
+- GA - Bump release of all rpms
69
+* Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-2
70
+- Update to linux-4.4.8
71
+* Fri Dec 04 2015 Xiaolin Li <xiaolinl@vmware.com> 0.4-1
72
+- Initial build.  First version
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Libbpf library
2 2
 Name:           libbpf
3 3
 Version:        1.1.0
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 Group:          Development/System
6 6
 Vendor:         VMware, Inc.
7 7
 Distribution:   Photon
... ...
@@ -52,6 +52,8 @@ rm -rf %{buildroot}
52 52
 %attr(0644,-,-) %{_libdir}/pkgconfig/libbpf.pc
53 53
 
54 54
 %changelog
55
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.1.0-2
56
+- Bump version as a part of elfutils upgrade
55 57
 * Fri Apr 14 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 1.1.0-1
56 58
 - Upgrade to v1.1.0
57 59
 * Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 1.0.1-2
... ...
@@ -23,7 +23,7 @@
23 23
 Summary:        Kernel
24 24
 Name:           linux-esx
25 25
 Version:        6.1.10
26
-Release:        10%{?kat_build:.kat}%{?dist}
26
+Release:        11%{?kat_build:.kat}%{?dist}
27 27
 License:        GPLv2
28 28
 URL:            http://www.kernel.org
29 29
 Group:          System Environment/Kernel
... ...
@@ -498,6 +498,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
498 498
 %{_usrsrc}/linux-headers-%{uname_r}
499 499
 
500 500
 %changelog
501
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-11
502
+- Bump version as a part of elfutils upgrade
501 503
 * Wed Jun 21 2023 Garrett Goble <gobleg@vmware.com> 6.1.10-10
502 504
 - Adding SBX kernel driver
503 505
 * Tue Apr 25 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-9
... ...
@@ -16,7 +16,7 @@
16 16
 Summary:        Kernel
17 17
 Name:           linux-rt
18 18
 Version:        6.1.10
19
-Release:        10%{?kat_build:.kat}%{?dist}
19
+Release:        11%{?kat_build:.kat}%{?dist}
20 20
 License:        GPLv2
21 21
 URL:            http://www.kernel.org
22 22
 Group:          System Environment/Kernel
... ...
@@ -501,6 +501,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
501 501
 %{_usrsrc}/linux-headers-%{uname_r}
502 502
 
503 503
 %changelog
504
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-11
505
+- Bump version as a part of elfutils upgrade
504 506
 * Tue Apr 25 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-10
505 507
 - Remove dracut & initramfs from requires
506 508
 * Fri Apr 14 2023 Him Kalyan Bordoloi <bordoloih@vmware.com> 6.1.10-9
... ...
@@ -23,7 +23,7 @@
23 23
 Summary:        Kernel
24 24
 Name:           linux
25 25
 Version:        6.1.10
26
-Release:        13%{?kat_build:.kat}%{?dist}
26
+Release:        14%{?kat_build:.kat}%{?dist}
27 27
 License:        GPLv2
28 28
 URL:            http://www.kernel.org/
29 29
 Group:          System Environment/Kernel
... ...
@@ -704,6 +704,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
704 704
 %{_datadir}/bash-completion/completions/bpftool
705 705
 
706 706
 %changelog
707
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-14
708
+- Bump version as a part of elfutils upgrade
707 709
 * Fri Apr 28 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-13
708 710
 - Remove dracut & initramfs from requires
709 711
 * Wed Apr 26 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.1.10-12
... ...
@@ -1,57 +1,62 @@
1
-Summary:	ltrace intercepts and records dynamic library calls.
2
-Name:		ltrace
3
-Version:	0.7.3
4
-Release:	5%{?dist}
5
-License:	GPLv2+
6
-URL:		http://www.ltrace.org/
7
-Group:		Development/Debuggers
8
-Vendor:		VMware, Inc.
9
-Distribution:	Photon
10
-Source0:	http://www.ltrace.org/%{name}_%{version}.orig.tar.bz2
11
-%define sha512 ltrace=a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
12
-Patch0:		Move-get_hfa_type-from-IA64-backend-to-type.c-name-i.patch
13
-Patch1:		Set-child-stack-alignment-in-trace-clone.c.patch
14
-Patch2:		Implement-aarch64-support.patch
15
-Patch3:		add-missing-stdint.h-include.patch
16
-Patch4:		Add-missing-include-stdio.h.patch
17
-BuildRequires:	elfutils-libelf-devel
18
-Requires:	elfutils-libelf
1
+Summary:    ltrace intercepts and records dynamic library calls.
2
+Name:       ltrace
3
+Version:    0.7.3
4
+Release:    6%{?dist}
5
+License:    GPLv2+
6
+URL:        http://www.ltrace.org/
7
+Group:      Development/Debuggers
8
+Vendor:     VMware, Inc.
9
+Distribution:   Photon
10
+
11
+Source0: http://www.ltrace.org/%{name}_%{version}.orig.tar.bz2
12
+%define sha512 %{name}=a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
13
+
14
+%ifarch aarch64
15
+Patch0: Move-get_hfa_type-from-IA64-backend-to-type.c-name-i.patch
16
+Patch1: Set-child-stack-alignment-in-trace-clone.c.patch
17
+Patch2: Implement-aarch64-support.patch
18
+Patch3: add-missing-stdint.h-include.patch
19
+Patch4: Add-missing-include-stdio.h.patch
20
+%endif
21
+
22
+BuildRequires: elfutils-libelf-devel
23
+
24
+Requires: elfutils-libelf
25
+
19 26
 %description
20 27
 ltrace intercepts and records dynamic library calls which are called by an executed process and the signals received by that process. It can also intercept and print the system calls executed by the program.
21 28
 
22 29
 %prep
23
-# Using autosetup is not feasible
24
-%setup -q
25
-%ifarch aarch64
26
-%patch0 -p1
27
-%patch1 -p1
28
-%patch2 -p1
29
-%patch3 -p1
30
-%patch4 -p1
31
-%endif
30
+%autosetup -p1
32 31
 
33 32
 %build
34 33
 autoreconf -fiv
34
+
35 35
 %configure \
36
-	--disable-werror
36
+    --disable-werror
37 37
 
38
-make %{?_smp_mflags}
38
+%make_build
39 39
 
40 40
 %install
41
-make %{?_smp_mflags} install DESTDIR=%{buildroot}
41
+%make_install %{?_smp_mflags}
42 42
 
43
+%if 0%{?with_check}
43 44
 %check
44
-make %{?_smp_mflags} check
45
+%make_build check
46
+%endif
45 47
 
46 48
 %clean
47 49
 rm -rf %{buildroot}/*
48 50
 
49 51
 %files
50 52
 %defattr(-,root,root)
51
-%{_sysconfdir}/ltrace.conf
52 53
 %{_bindir}/*
53
-%{_datadir}
54
+%{_datadir}/*
55
+%config(noreplace) %{_sysconfdir}/%{name}.conf
56
+
54 57
 %changelog
58
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.7.3-6
59
+- Bump version as a part of elfutils upgrade
55 60
 * Fri Jan 06 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 0.7.3-5
56 61
 - Bump up due to change in elfutils
57 62
 * Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-4
... ...
@@ -61,4 +66,4 @@ rm -rf %{buildroot}/*
61 61
 * Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.3-2
62 62
 - GA - Bump release of all rpms
63 63
 * Wed Nov 25 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.7.3-1
64
-- Initial build.	First version
64
+- Initial build.    First version
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:       LTTng is an open source tracing framework for Linux.
2 2
 Name:          lttng-tools
3 3
 Version:       2.13.8
4
-Release:       3%{?dist}
4
+Release:       4%{?dist}
5 5
 License:       GPLv2 and LGPLv2
6 6
 URL:           https://lttng.org/download
7 7
 Group:         Development/Tools
... ...
@@ -49,6 +49,8 @@ find %{buildroot} -name '*.la' -delete
49 49
 %exclude %dir %{_libdir}/debug
50 50
 
51 51
 %changelog
52
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.13.8-4
53
+- Bump version as a part of elfutils upgrade
52 54
 * Tue May 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.13.8-3
53 55
 - Bump version as a part of nss upgrade
54 56
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 2.13.8-2
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Mesa is an OpenGL compatible 3D graphics library.
2 2
 Name:           mesa
3 3
 Version:        23.0.0
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        MIT
6 6
 URL:            http://www.mesa3d.org
7 7
 Group:          System Environment/Libraries
... ...
@@ -140,6 +140,8 @@ rm -rf %{buildroot}/*
140 140
 %{_libdir}/pkgconfig/gbm.pc
141 141
 
142 142
 %changelog
143
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 23.0.0-2
144
+- Bump version as a part of elfutils upgrade
143 145
 * Fri Feb 24 2023 Shivani Agarwal <shivania2@vmware.com> 23.0.0-1
144 146
 - Upgrade Version
145 147
 * Tue Jan 10 2023 Shivani Agarwal <shivania2@vmware.com> 22.3.0-1
... ...
@@ -6,7 +6,7 @@
6 6
 Summary:        OpenJDK
7 7
 Name:           openjdk11
8 8
 Version:        11.0.20
9
-Release:        2%{?dist}
9
+Release:        3%{?dist}
10 10
 License:        GNU General Public License V2
11 11
 URL:            https://github.com/openjdk/jdk11u
12 12
 Group:          Development/Tools
... ...
@@ -213,6 +213,8 @@ rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-*
213 213
 %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
214 214
 
215 215
 %changelog
216
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 11.0.20-3
217
+- Bump version as a part of elfutils upgrade
216 218
 * Mon Jul 10 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 11.0.20-2
217 219
 - Bump version as a part of cups upgrade
218 220
 * Fri Jun 16 2023 Shreenidhi Shedi <sshedi@vmware.com> 11.0.20-1
... ...
@@ -6,7 +6,7 @@
6 6
 Summary:        OpenJDK
7 7
 Name:           openjdk11
8 8
 Version:        11.0.18
9
-Release:        4%{?dist}
9
+Release:        5%{?dist}
10 10
 License:        GNU General Public License V2
11 11
 URL:            https://openjdk.java.net
12 12
 Group:          Development/Tools
... ...
@@ -207,6 +207,8 @@ rm -rf %{buildroot}/* \
207 207
 %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
208 208
 
209 209
 %changelog
210
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 11.0.18-5
211
+- Bump version as a part of elfutils upgrade
210 212
 * Mon Jul 10 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 11.0.18-4
211 213
 - Bump version as a part of cups upgrade
212 214
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 11.0.18-3
... ...
@@ -5,7 +5,7 @@
5 5
 Summary:    OpenJDK
6 6
 Name:       openjdk17
7 7
 Version:    17.0.6
8
-Release:    4%{?dist}
8
+Release:    5%{?dist}
9 9
 License:    GNU General Public License V2
10 10
 URL:        https://openjdk.java.net
11 11
 Group:      Development/Tools
... ...
@@ -200,6 +200,8 @@ rm -rf %{buildroot}/* %{_libdir}/jvm/OpenJDK-*
200 200
 %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
201 201
 
202 202
 %changelog
203
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 17.0.6-5
204
+- Bump version as a part of elfutils upgrade
203 205
 * Mon Jul 10 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 17.0.6-4
204 206
 - Bump version as a part of cups upgrade
205 207
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 17.0.6-3
... ...
@@ -5,7 +5,7 @@
5 5
 Summary:        OpenJDK
6 6
 Name:           openjdk17
7 7
 Version:        17.0.6
8
-Release:        4%{?dist}
8
+Release:        5%{?dist}
9 9
 License:        GNU General Public License V2
10 10
 URL:            https://openjdk.java.net
11 11
 Group:          Development/Tools
... ...
@@ -199,6 +199,8 @@ rm -rf %{buildroot}/* \
199 199
 %{_libdir}/jvm/OpenJDK-%{jdk_major_version}/lib/src.zip
200 200
 
201 201
 %changelog
202
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 17.0.6-5
203
+- Bump version as a part of elfutils upgrade
202 204
 * Mon Jul 10 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 17.0.6-4
203 205
 - Bump version as a part of cups upgrade
204 206
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 17.0.6-3
205 207
new file mode 100644
... ...
@@ -0,0 +1,40 @@
0
+
1
+From 4d8ca056c900cdb08556bbae2470ebb858369576 Mon Sep 17 00:00:00 2001
2
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
3
+Date: Fri, 20 Jan 2023 14:26:50 +0100
4
+Subject: [PATCH] Adapt to curl-7.87.0
5
+MIME-Version: 1.0
6
+Content-Type: text/plain; charset=UTF-8
7
+Content-Transfer-Encoding: 8bit
8
+
9
+curl-7.87.0 added CURLOPTDEPRECATED and some other helping macros for
10
+hinting a compiler to produce deprecation warnings. Those are not
11
+constants for libcurl and clobbered generated curlopt-constants.c
12
+file:
13
+
14
+curlopt-constants.c:19:51: error: 'CURL_DEPRECATED' undeclared (first use in this function)
15
+   19 |             if (strEQ(name, "DEPRECATED")) return CURL_DEPRECATED;
16
+      |                                                   ^~~~~~~~~~~~~~~
17
+
18
+This patch adjusts curl.h parser in Makefile.PL to skip them.
19
+
20
+Signed-off-by: Petr Písař <ppisar@redhat.com>
21
+---
22
+ Makefile.PL | 2 +-
23
+ 1 file changed, 1 insertion(+), 1 deletion(-)
24
+
25
+diff --git a/Makefile.PL b/Makefile.PL
26
+index b9e6a46..311b03a 100644
27
+--- a/Makefile.PL
28
+@@ -127,7 +127,7 @@ if (!defined($curl_h)) {
29
+     close H;
30
+ 
31
+     for my $e (sort @syms) {
32
+-       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|_LAST\z|_LASTENTRY\z)/) {
33
++       if($e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z)/) {
34
+           next;
35
+        }
36
+        my ($group) = $e =~ m/^([^_]+_)/;
37
+-- 
38
+2.39.1
... ...
@@ -1,3 +1,5 @@
1
+%define srcname WWW-Curl
2
+
1 3
 # Got the intial spec from Fedora and modified it
2 4
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((VMS|Win32|BSD::|DB\\)$)
3 5
 # unicore::Name - it's needed by perl, maybe problem of rpm
... ...
@@ -7,42 +9,49 @@
7 7
 Summary:        Perl extension interface for libcurl
8 8
 Name:           perl-WWW-Curl
9 9
 Version:        4.17
10
-Release:        8%{?dist}
10
+Release:        9%{?dist}
11 11
 License:        MIT
12 12
 Group:          Development/Libraries
13
-URL:            http://search.cpan.org/dist/WWW-Curl/
14
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
15
-%define sha512  WWW-Curl=bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6
13
+URL:            http://search.cpan.org/dist/WWW-Curl
16 14
 Vendor:         VMware, Inc.
17 15
 Distribution:   Photon
18
-# Fix Build issue with curl-7.72 version
19
-Patch0:         perl-www-curl-curl-7.66.0-compatibility.patch
20
-Patch1:         Define-CURL-as-void.patch
21
-Patch2:         Skip-preprocessor-symbol-only-CURL_STRICTER.patch
22
-Patch3:         Adapt-to-changes-in-cURL.patch
23
-BuildRequires:  perl
24
-BuildRequires:  perl-Module-Install
25
-BuildRequires:  perl-YAML-Tiny
26
-BuildRequires:  curl-devel
27
-Requires:       perl
28
-Requires:       curl
16
+
17
+Source0: http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-%{version}.tar.gz
18
+%define sha512 %{srcname}=bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6
19
+
20
+Patch0: perl-www-curl-curl-7.66.0-compatibility.patch
21
+Patch1: Define-CURL-as-void.patch
22
+Patch2: Skip-preprocessor-symbol-only-CURL_STRICTER.patch
23
+Patch3: Adapt-to-changes-in-cURL.patch
24
+Patch4: WWW-Curl-4.17-Adapt-to-curl-8.0.1.patch
25
+
26
+BuildRequires: perl
27
+BuildRequires: perl-Module-Install
28
+BuildRequires: perl-YAML-Tiny
29
+BuildRequires: curl-devel
30
+
31
+Requires: perl
32
+Requires: curl
33
+
29 34
 %description
30 35
 WWW::Curl is a Perl extension interface for libcurl.
31 36
 
32 37
 %prep
33
-%autosetup -n WWW-Curl-%{version}
34
-rm -rf inc && sed -i -e '/^inc\//d' MANIFEST
38
+%autosetup -p1 -n %{srcname}-%{version}
39
+rm -rf inc
40
+sed -i -e '/^inc\//d' MANIFEST
35 41
 
36 42
 %build
37 43
 perl Makefile.PL INSTALLDIRS=vendor
38
-make %{?_smp_mflags}
44
+%make_build
39 45
 
40 46
 %install
41 47
 make %{?_smp_mflags} pure_install DESTDIR=%{buildroot}
42
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
43
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
48
+find %{buildroot} -type f -name .packlist -delete
49
+find %{buildroot} -type f -name '*.bs' -size 0 -delete
44 50
 %{_fixperms} %{buildroot}/*
45 51
 
52
+%if 0%{?with_check}
46 53
 %check
47 54
 # These tests require network, use "--with network_tests" to execute them
48 55
 %{?!_with_network_tests: rm t/01basic.t }
... ...
@@ -56,14 +65,18 @@ find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
56 56
 %{?!_with_network_tests: rm t/18twinhandles.t }
57 57
 %{?!_with_network_tests: rm t/19multi.t }
58 58
 %{?!_with_network_tests: rm t/21write-to-scalar.t }
59
-make %{?_smp_mflags} test
59
+%make_buildtest
60
+%endif
60 61
 
61 62
 %files
63
+%defattr(-,root,root)
62 64
 %{perl_vendorarch}/auto/*
63 65
 %{perl_vendorarch}/WWW*
64 66
 %{_mandir}/man3/*
65 67
 
66 68
 %changelog
69
+* Thu Jul 13 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.17-9
70
+- Fix build error with latest curl
67 71
 * Thu Dec 08 2022 Dweep Advani <dadvani@vmware.com> 4.17-8
68 72
 - Perl version upgrade to 5.36.0
69 73
 * Mon Sep 21 2020 Dweep Advani <dadvani@vmware.com> 4.17-7
... ...
@@ -3,7 +3,7 @@
3 3
 Summary:    Package manager
4 4
 Name:       rpm
5 5
 Version:    4.18.0
6
-Release:    14%{?dist}
6
+Release:    15%{?dist}
7 7
 License:    GPLv2+
8 8
 URL:        http://rpm.org
9 9
 Group:      Applications/System
... ...
@@ -306,6 +306,8 @@ rm -rf %{buildroot}
306 306
 %{_mandir}/man8/%{name}-plugin-systemd-inhibit.8*
307 307
 
308 308
 %changelog
309
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-15
310
+- Bump version as a part of elfutils upgrade
309 311
 * Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-14
310 312
 - Bump version as a part of lua upgrade
311 313
 * Tue May 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-13
... ...
@@ -3,7 +3,7 @@
3 3
 Name:           systemd
4 4
 URL:            http://www.freedesktop.org/wiki/Software/systemd
5 5
 Version:        253
6
-Release:        5%{?dist}
6
+Release:        6%{?dist}
7 7
 License:        LGPLv2+ and GPLv2+ and MIT
8 8
 Summary:        System and Service Manager
9 9
 Group:          System Environment/Security
... ...
@@ -708,6 +708,8 @@ fi
708 708
 %files lang -f ../%{name}.lang
709 709
 
710 710
 %changelog
711
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 253-6
712
+- Bump version as a part of elfutils upgrade
711 713
 * Fri Jun 23 2023 Guruswamy Basavaiah <bguruswamy@vmware.com> 253-5
712 714
 - Increase SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST to 20
713 715
 * Tue May 23 2023 Guruswamy Basavaiah <bguruswamy@vmware.com> 253-4
... ...
@@ -8,7 +8,7 @@
8 8
 
9 9
 Name:          systemtap
10 10
 Version:       4.8
11
-Release:       11%{?dist}
11
+Release:       12%{?dist}
12 12
 Summary:       Programmable system-wide instrumentation system
13 13
 Group:         Development/System
14 14
 Vendor:        VMware, Inc.
... ...
@@ -389,6 +389,8 @@ fi
389 389
 %{_libexecdir}/systemtap/python/stap-resolve-module-function.py
390 390
 
391 391
 %changelog
392
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.8-12
393
+- Bump version as a part of elfutils upgrade
392 394
 * Tue May 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.8-11
393 395
 - Bump version as a part of nss upgrade
394 396
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 4.8-10
... ...
@@ -1,15 +1,16 @@
1 1
 Summary:        dnf/yum equivalent using C libs
2 2
 Name:           tdnf
3 3
 Version:        3.5.3
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 Vendor:         VMware, Inc.
6 6
 Distribution:   Photon
7 7
 License:        LGPLv2.1,GPLv2
8 8
 URL:            https://github.com/vmware/%{name}
9 9
 Group:          Applications/RPM
10 10
 
11
-Source0:        https://github.com/vmware/tdnf/archive/refs/tags/%{name}-%{version}.tar.gz
12
-%define sha512  %{name}=90cd8c9344ea6588e5eacb03880af73e864731e59777deaded133ca6fa922d71ca72cf00edf95d3e43a2355c40cac281470b2689c652c5214f09019799c7bc5a
11
+Source0: https://github.com/vmware/tdnf/archive/refs/tags/%{name}-%{version}.tar.gz
12
+%define sha512 %{name}=90cd8c9344ea6588e5eacb03880af73e864731e59777deaded133ca6fa922d71ca72cf00edf95d3e43a2355c40cac281470b2689c652c5214f09019799c7bc5a
13
+
13 14
 Patch0:         0001-do-not-nuke-RPMBUILD_DIR-in-pytests-since-it-can-be-.patch
14 15
 
15 16
 Requires:       rpm-libs
... ...
@@ -294,6 +295,8 @@ systemctl try-restart %{name}-cache-updateinfo.timer >/dev/null 2>&1 || :
294 294
 %{_unitdir}/%{name}-automatic-notifyonly.service
295 295
 
296 296
 %changelog
297
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 3.5.3-2
298
+- Bump version as a part of curl upgrade
297 299
 * Tue Jun 13 2023 Oliver Kurth <okurth@vmware.com> 3.5.3-1
298 300
 - update to 3.5.3
299 301
 - fix python test for python >= 3.11 #425
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        user space RCU (read-copy-update)
2 2
 Name:           userspace-rcu
3 3
 Version:        0.13.2
4
-Release:        4%{?dist}
4
+Release:        5%{?dist}
5 5
 License:        LGPLv2+
6 6
 URL:            https://github.com/urcu/userspace-rcu/releases
7 7
 Source:         %{name}-%{version}.tar.gz
... ...
@@ -54,6 +54,8 @@ make %{?_smp_mflags} check
54 54
 %{_includedir}/*
55 55
 
56 56
 %changelog
57
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.13.2-5
58
+- Bump version as a part of elfutils upgrade
57 59
 * Tue May 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.13.2-4
58 60
 - Bump version as a part of nss upgrade
59 61
 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 0.13.2-3
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Wireshark is the world's foremost protocol analyzer
2 2
 Name:           wireshark
3 3
 Version:        4.0.6
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 License:        GPL+
6 6
 URL:            http://www.wireshark.org
7 7
 Group:          Networking
... ...
@@ -99,6 +99,8 @@ rm -rf %{buildroot}%{_mandir} \
99 99
 %{_libdir}/pkgconfig/%{name}.pc
100 100
 
101 101
 %changelog
102
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.0.6-2
103
+- Bump version as a part of elfutils upgrade
102 104
 * Tue Jun 06 2023 Susant Sahani <ssahani@vmware.com> 4.0.6-1
103 105
 - Update version and fix CVE-2023-2953
104 106
 * Tue Apr 18 2023 Susant Sahani <ssahani@vmware.com> 4.0.5-1
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:          Z shell
2 2
 Name:             zsh
3 3
 Version:          5.9
4
-Release:          3%{?dist}
4
+Release:          4%{?dist}
5 5
 License:          MIT
6 6
 URL:              http://zsh.org
7 7
 Group:            System Environment/Shells
... ...
@@ -124,6 +124,8 @@ fi
124 124
 %config(noreplace) %{_sysconfdir}/z*
125 125
 
126 126
 %changelog
127
+* Tue Jul 11 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.9-4
128
+- Bump version as a part of elfutils upgrade
127 129
 * Wed Jan 25 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.9-3
128 130
 - Fix requires
129 131
 - Remove html sub package