Browse code

Fix syntax error in specs

Change-Id: I6d89f6674b3752e6bf6f5dc27b6ec9ee7aced0dc
Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/14744
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Tapas Kundu <tkundu@vmware.com>

Shreenidhi Shedi authored on 2021/11/29 21:18:03
Showing 46 changed files
... ...
@@ -33,21 +33,37 @@ The Linux-PAM-devel package contains libraries, header files and documentation
33 33
 for developing applications that use Linux-PAM.
34 34
 
35 35
 %prep
36
-%setup -q
36
+%autosetup -p1
37 37
 
38 38
 %build
39
-%configure \
39
+sh ./configure --host=%{_host} --build=%{_build} \
40 40
     $(test %{_host} != %{_build} && echo "--with-sysroot=/target-%{_arch}") \
41
-    --includedir=/usr/include/security \
41
+    CFLAGS="%{optflags}" \
42
+    CXXFLAGS="%{optflags}" \
43
+    --program-prefix= \
44
+    --disable-dependency-tracking \
45
+    --prefix=%{_prefix} \
46
+    --exec-prefix=%{_prefix} \
47
+    --bindir=%{_bindir} \
42 48
     --sbindir=/sbin \
49
+    --sysconfdir=%{_sysconfdir} \
50
+    --datadir=%{_datadir} \
51
+    --includedir=/usr/include/security \
52
+    --libdir=%{_libdir} \
53
+    --libexecdir=%{_libexecdir} \
54
+    --localstatedir=%{_localstatedir} \
55
+    --sharedstatedir=%{_sharedstatedir} \
56
+    --mandir=%{_mandir} \
57
+    --infodir=%{_infodir} \
43 58
     --enable-selinux \
44
-    --enable-securedir=/usr/lib/security \
45
-    --docdir=%{_docdir}/%{name}-%{version}
59
+    --docdir=%{_docdir}/%{name}-%{version} \
60
+    --enable-securedir=/usr/lib/security
46 61
 
47 62
 make %{?_smp_mflags}
63
+
48 64
 %install
49
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
50
-make install DESTDIR=%{buildroot}
65
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
66
+make install DESTDIR=%{buildroot} %{?_smp_mflags}
51 67
 chmod -v 4755 %{buildroot}/sbin/unix_chkpwd
52 68
 install -v -dm755 %{buildroot}/%{_docdir}/%{name}-%{version}
53 69
 ln -sf pam_unix.so %{buildroot}/usr/lib/security/pam_unix_auth.so
... ...
@@ -32,7 +32,7 @@ The original bubblewrap code existed before user namespaces - it inherits code f
32 32
 make %{?_smp_mflags}
33 33
 
34 34
 %install
35
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
35
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
36 36
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
37 37
 
38 38
 %check
... ...
@@ -46,7 +46,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr               \
46 46
 make %{?_smp_mflags}
47 47
 
48 48
 %install
49
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
49
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
50 50
 cd build
51 51
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
52 52
 
... ...
@@ -21,14 +21,14 @@ searched by regular expressions, and its ability to generate emacs-style
21 21
 TAGS files.
22 22
 
23 23
 %prep
24
-%setup -q
24
+%autosetup -p1
25 25
 
26 26
 %build
27 27
 %configure
28
-make
28
+make %{?_smp_mflags}
29 29
 
30 30
 %install
31
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
31
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
32 32
 %makeinstall
33 33
 
34 34
 %clean
... ...
@@ -40,7 +40,7 @@ rm -rf %{buildroot}
40 40
 %{_mandir}/man1/ctags*
41 41
 
42 42
 %changelog
43
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.8-2
44
--	GA - Bump release of all rpms
43
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.8-2
44
+- GA - Bump release of all rpms
45 45
 * Tue Jul 14 2015 Luis Zuniga <lzuniga@vmware.com> 5.8-1
46 46
 - Initial build for Photon
... ...
@@ -59,7 +59,7 @@ This package contains minimal set of shared curl libraries.
59 59
 make %{?_smp_mflags}
60 60
 
61 61
 %install
62
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
62
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
63 63
 %make_install
64 64
 install -v -d -m755 %{buildroot}/%{_docdir}/%{name}-%{version}
65 65
 find %{buildroot}/%{_libdir} -name '*.la' -delete
... ...
@@ -46,7 +46,7 @@ The tool will identify potentially vunlnerable software packages within Linux di
46 46
 make %{?_smp_mflags} CFLAGS="-w -g"
47 47
 
48 48
 %install
49
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
49
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
50 50
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
51 51
 install -m644 %{SOURCE1} %{buildroot}/usr/share/%{name}
52 52
 
... ...
@@ -7,20 +7,25 @@ URL:            http://cyrusimap.web.cmu.edu/
7 7
 Group:          System Environment/Security
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        ftp://ftp.cyrusimap.org/cyrus-sasl/%{name}-%{version}.tar.gz
11
-%define sha1    cyrus-sasl=fbfe6f298b0d2efcdab6a40bf47e16d003ae5dc6
12
+%define sha1    %{name}=fbfe6f298b0d2efcdab6a40bf47e16d003ae5dc6
13
+
12 14
 Patch0:         cyrus-sasl-2.1.26-fix-cross-compiling.patch
13 15
 Patch1:         avoid-to-call-AC_TRY_RUN.patch
14 16
 Patch2:         cyrus-sasl-CVE-2019-19906.patch
17
+
15 18
 BuildRequires:  systemd
16 19
 BuildRequires:  openssl-devel
17 20
 BuildRequires:  krb5-devel >= 1.12
18 21
 BuildRequires:  e2fsprogs-devel
19 22
 BuildRequires:  Linux-PAM-devel
23
+
20 24
 Requires:       openssl
21 25
 Requires:       krb5 >= 1.12
22 26
 Requires:       Linux-PAM
23 27
 Requires:       systemd
28
+
24 29
 %description
25 30
 The Cyrus SASL package contains a Simple Authentication and Security
26 31
 Layer, a method for adding authentication support to
... ...
@@ -65,7 +70,7 @@ popd
65 65
 make %{?_smp_mflags}
66 66
 
67 67
 %install
68
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
68
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
69 69
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
70 70
 find %{buildroot}/%{_libdir} -name '*.la' -delete
71 71
 install -D -m644 COPYING %{buildroot}/usr/share/licenses/%{name}/LICENSE
... ...
@@ -136,43 +141,43 @@ rm -rf %{buildroot}/*
136 136
 %{_mandir}/man8/saslauthd.8.gz
137 137
 
138 138
 %changelog
139
-*   Thu Sep 02 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 2.1.27-5
140
--   Bump up release for openssl
141
-*   Fri Oct 30 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com>  2.1.27-4
142
--   Fix CVE-2019-19906
143
-*   Mon Oct 05 2020 Tapas Kundu <tkundu@vmware.com> 2.1.27-3
144
--   Enable login and plain
145
-*   Tue Sep 01 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com>  2.1.27-2
146
--   Make openssl 1.1.1 compatible
147
-*   Mon Aug 17 2020 Gerrit Photon <photon-checkins@vmware.com> 2.1.27-1
148
--   Automatic Version Bump
149
-*   Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 2.1.26-15
150
--   Cross compilation support
151
-*   Tue Nov 21 2017 Anish Swaminathan <anishs@vmware.com>  2.1.26-14
152
--   Update patch for memory leak fix
153
-*   Tue Oct 10 2017 Anish Swaminathan <anishs@vmware.com>  2.1.26-13
154
--   Add patch for memory leak fix
155
-*   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  2.1.26-12
156
--   Disabled saslauthd service by default
157
-*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-11
158
--   BuildRequires Linux-PAM-devel
159
-*   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2.1.26-10
160
--   Required krb5-devel.
161
-*   Wed Oct 05 2016 ChangLee <changlee@vmware.com> 2.1.26-9
162
--   Modified %check
163
-*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-8
164
--   Fixed logic to restart the active services after upgrade
165
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.26-7
166
--   GA - Bump release of all rpms
167
-*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-6
168
--   Fixing spec file to handle rpm upgrade scenario correctly
169
-*   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  2.1.26-5
170
--   Add systemd to Requires and BuildRequires.
171
-*   Wed Nov 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-4
172
--   Add saslauthd service to systemd.
173
-*   Tue Sep 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.26-3
174
--   Enable CRAM.
175
-*   Thu Jul 16 2015 Divya Thaluru <dthaluru@vmware.com> 2.1.26-2
176
--   Disabling parallel threads in make
177
-*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.26-1
178
--   Initial build. First version
139
+* Thu Sep 02 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 2.1.27-5
140
+- Bump up release for openssl
141
+* Fri Oct 30 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com>  2.1.27-4
142
+- Fix CVE-2019-19906
143
+* Mon Oct 05 2020 Tapas Kundu <tkundu@vmware.com> 2.1.27-3
144
+- Enable login and plain
145
+* Tue Sep 01 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com>  2.1.27-2
146
+- Make openssl 1.1.1 compatible
147
+* Mon Aug 17 2020 Gerrit Photon <photon-checkins@vmware.com> 2.1.27-1
148
+- Automatic Version Bump
149
+* Thu Nov 15 2018 Alexey Makhalov <amakhalov@vmware.com> 2.1.26-15
150
+- Cross compilation support
151
+* Tue Nov 21 2017 Anish Swaminathan <anishs@vmware.com>  2.1.26-14
152
+- Update patch for memory leak fix
153
+* Tue Oct 10 2017 Anish Swaminathan <anishs@vmware.com>  2.1.26-13
154
+- Add patch for memory leak fix
155
+* Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  2.1.26-12
156
+- Disabled saslauthd service by default
157
+* Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-11
158
+- BuildRequires Linux-PAM-devel
159
+* Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2.1.26-10
160
+- Required krb5-devel.
161
+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 2.1.26-9
162
+- Modified %check
163
+* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-8
164
+- Fixed logic to restart the active services after upgrade
165
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.26-7
166
+- GA - Bump release of all rpms
167
+* Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-6
168
+- Fixing spec file to handle rpm upgrade scenario correctly
169
+* Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  2.1.26-5
170
+- Add systemd to Requires and BuildRequires.
171
+* Wed Nov 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-4
172
+- Add saslauthd service to systemd.
173
+* Tue Sep 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.26-3
174
+- Enable CRAM.
175
+* Thu Jul 16 2015 Divya Thaluru <dthaluru@vmware.com> 2.1.26-2
176
+- Disabling parallel threads in make
177
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.26-1
178
+- Initial build. First version
... ...
@@ -7,13 +7,15 @@ URL:            http://github.com/dosfstools/dosfstools
7 7
 Group:          Filesystem Tools
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        http://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
11
-%define sha1    dosfstools=1aa7eef62a57339d0a275daf5c31f96d23429c11
12
+%define sha1    %{name}=1aa7eef62a57339d0a275daf5c31f96d23429c11
13
+
12 14
 %description
13 15
 dosfstools contains utilities for making and checking MS-DOS FAT filesystems.
14 16
 
15 17
 %prep
16
-%setup -q
18
+%autosetup -p1
17 19
 
18 20
 %build
19 21
 ./autogen.sh
... ...
@@ -21,8 +23,8 @@ dosfstools contains utilities for making and checking MS-DOS FAT filesystems.
21 21
 make %{?_smp_mflags}
22 22
 
23 23
 %install
24
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
25
-make DESTDIR=%{buildroot} PREFIX="/usr" install
24
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
25
+make DESTDIR=%{buildroot} PREFIX="/usr" install %{?_smp_mflags}
26 26
 
27 27
 %clean
28 28
 rm -rf %{buildroot}/*
... ...
@@ -34,13 +36,13 @@ rm -rf %{buildroot}/*
34 34
 %{_docdir}/dosfstools/*
35 35
 
36 36
 %changelog
37
-*  Mon Apr 12 2021 Gerrit Photon <photon-checkins@vmware.com> 4.2-1
38
--  Automatic Version Bump
39
-*  Thu May 04 2017 Chang Lee <changlee@vmware.com> 4.1-2
40
--  Add .vfat and .msdos symlinks back.
41
-*  Fri Mar 31 2017 Chang Lee <changlee@vmware.com> 4.1-1
42
--  Updated package version
43
-*  Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0.26-2
44
--  GA - Bump release of all rpms
45
-*  Tue Jul 01 2014 Sharath George <sharathg@vmware.com> 3.0.26-1
46
--  Initial build. First version
37
+* Mon Apr 12 2021 Gerrit Photon <photon-checkins@vmware.com> 4.2-1
38
+- Automatic Version Bump
39
+* Thu May 04 2017 Chang Lee <changlee@vmware.com> 4.1-2
40
+- Add .vfat and .msdos symlinks back.
41
+* Fri Mar 31 2017 Chang Lee <changlee@vmware.com> 4.1-1
42
+- Updated package version
43
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0.26-2
44
+- GA - Bump release of all rpms
45
+* Tue Jul 01 2014 Sharath George <sharathg@vmware.com> 3.0.26-1
46
+- Initial build. First version
... ...
@@ -7,24 +7,28 @@ URL:            http://ebtables.netfilter.org/
7 7
 Group:          System Environment/Security
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        ftp://ftp.netfilter.org/pub/ebtables/%{name}-v%{version}-4.tar.gz
11
-%define sha1    ebtables=907d3b82329e8fbb7aaaa98049732bd8dab022f9
12
+%define sha1    %{name}=907d3b82329e8fbb7aaaa98049732bd8dab022f9
12 13
 Source1:        ebtables_script
13 14
 Source2:        ebtables.service
15
+
14 16
 BuildRequires:  systemd
17
+
15 18
 Requires:       systemd
19
+
16 20
 %description
17 21
 The ebtables program is a filtering tool for a Linux-based bridging firewall. It enables transparent filtering of network traffic passing through a Linux bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. Advanced logging, MAC DNAT/SNAT and brouter facilities are also included.
18 22
 
19 23
 %prep
20
-%setup -q -n %{name}-v%{version}-4
24
+%autosetup -p1 -n %{name}-v%{version}-4
21 25
 
22 26
 %build
23 27
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
24 28
 
25 29
 %install
26
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
27
-make DESTDIR=%{buildroot} BINDIR=%{_sbindir} MANDIR=%{_mandir} install
30
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
31
+make DESTDIR=%{buildroot} BINDIR=%{_sbindir} MANDIR=%{_mandir} install %{?_smp_mflags}
28 32
 
29 33
 mkdir -p %{buildroot}/%{_libdir}/systemd/system
30 34
 install -vdm755 %{buildroot}/etc/systemd/scripts
... ...
@@ -45,9 +49,6 @@ echo "disable ebtables.service" > %{buildroot}%{_libdir}/systemd/system-preset/5
45 45
 /sbin/ldconfig
46 46
 %systemd_postun_with_restart ebtables.service
47 47
 
48
-#%check
49
-#Commented out %check due to the limited chroot environment of bind.
50
-
51 48
 %clean
52 49
 rm -rf %{buildroot}/*
53 50
 
... ...
@@ -64,13 +65,12 @@ rm -rf %{buildroot}/*
64 64
 %{_sysconfdir}/systemd/scripts/ebtables
65 65
 %exclude %{_sysconfdir}/rc.d/init.d/ebtables
66 66
 
67
-
68 67
 %changelog
69
-*   Wed Jul 05 2017 Chang Lee <changlee@vmware.com>  2.0.10-4
70
--   Commented out %check due to the limited chroot environment of bind.
71
-*   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  2.0.10-3
72
--   Disabled ebtables service by default
73
-*   Mon May 15 2017 Xiaolin Li <xiaolinl@vmware.com>  2.0.10-2
74
--   Added systemd to Requires and BuildRequires.
75
-*   Wed Jan 18 2017 Xiaolin Li <xiaolinl@vmware.com>  2.0.10-1
76
--   Initial build.
68
+* Wed Jul 05 2017 Chang Lee <changlee@vmware.com>  2.0.10-4
69
+- Commented out %check due to the limited chroot environment of bind.
70
+* Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  2.0.10-3
71
+- Disabled ebtables service by default
72
+* Mon May 15 2017 Xiaolin Li <xiaolinl@vmware.com>  2.0.10-2
73
+- Added systemd to Requires and BuildRequires.
74
+* Wed Jan 18 2017 Xiaolin Li <xiaolinl@vmware.com>  2.0.10-1
75
+- Initial build.
... ...
@@ -7,26 +7,33 @@ URL:		https://github.com/rhinstaller/efibootmgr/
7 7
 Group:		System Environment/System Utilities
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: Photon
10
+
10 11
 Source0:	https://github.com/rhinstaller/efibootmgr/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
11
-%define sha1 efibootmgr=9251d346285f96844049d305d5c021f434f7c6de
12
+%define sha1 %{name}=9251d346285f96844049d305d5c021f434f7c6de
13
+
12 14
 Patch0:        remove-extra-decl.patch
15
+
13 16
 BuildRequires: efivar-devel
14 17
 BuildRequires: pciutils
15 18
 BuildRequires: zlib
19
+
16 20
 %description
17 21
 efibootmgr is a userspace application used to modify the Intel Extensible Firmware Interface (EFI) Boot Manager. This application can create and destroy boot entries, change the boot order, change the next running boot option, and more.
22
+
18 23
 %prep
19
-%setup -q
20
-%patch0 -p1
24
+%autosetup -p1
25
+
21 26
 %build
22 27
 make %{?_smp_mflags} PREFIX=%{_prefix} EFIDIR=BOOT EFI_LOADER=grubx64.efi \
23 28
     libdir=%{_libdir} \
24 29
     bindir=%{_bindir}
30
+
25 31
 %install
26
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
32
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
27 33
 make DESTDIR=%{buildroot} \
28 34
     PREFIX=%{_prefix} EFIDIR=BOOT EFI_LOADER=grubx64.efi \
29
-    install
35
+    install %{?_smp_mflags}
36
+
30 37
 gzip -9 %{buildroot}%{_mandir}/man8/%{name}.8
31 38
 gzip -9 %{buildroot}%{_mandir}/man8/efibootdump.8
32 39
 
... ...
@@ -36,12 +43,13 @@ rm -rf %{buildroot}/*
36 36
 %defattr(-,root,root)
37 37
 %{_sbindir}/*
38 38
 %{_mandir}/man8/*
39
+
39 40
 %changelog
40
-*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 17-1
41
--   Automatic Version Bump
42
-*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 15-1
43
--   Version update.
44
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.12-2
45
--   GA - Bump release of all rpms
46
-*   Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.12-1
47
--   Initial build. First version. Install steps from spec file in source.
41
+* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 17-1
42
+- Automatic Version Bump
43
+* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 15-1
44
+- Version update.
45
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.12-2
46
+- GA - Bump release of all rpms
47
+* Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.12-1
48
+- Initial build. First version. Install steps from spec file in source.
... ...
@@ -7,12 +7,16 @@ URL:		https://github.com/rhboot/efivar
7 7
 Group:		System Environment/System Utilities
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: Photon
10
+
10 11
 Source0:	https://github.com/rhboot/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
11
-%define sha1 efivar=1ef24e0a06e1a42d7a93ba7a76b2970659c7c0c0
12
+%define sha1 %{name}=1ef24e0a06e1a42d7a93ba7a76b2970659c7c0c0
13
+
12 14
 Patch0:         util-h-add-unlikely-and-likely-macros.patch
13 15
 Patch1:         dp-h-make-format_guid-handle-misaligned-guid-pointers-safely.patch
14 16
 Patch2:         Fix-all-the-places-Werror-address-of-packed-member-catches.patch
17
+
15 18
 BuildRequires: popt-devel
19
+
16 20
 %description
17 21
 efivar provides a simle CLI to the UEFI variable facility
18 22
 
... ...
@@ -23,10 +27,7 @@ Requires:   %{name} = %{version}-%{release}
23 23
 It contains the libraries and header files to create applications
24 24
 
25 25
 %prep
26
-%setup -q
27
-%patch0 -p1
28
-%patch1 -p1
29
-%patch2 -p1
26
+%autosetup -p1
30 27
 
31 28
 %build
32 29
 # This package implements symbol versioning with toplevel ASM statments which is
... ...
@@ -35,11 +36,10 @@ It contains the libraries and header files to create applications
35 35
 make %{?_smp_mflags} PREFIX=%{_prefix} OPTIMIZE="-O2 -Wno-error=stringop-truncation"\
36 36
     libdir=%{_libdir} \
37 37
     bindir=%{_bindir}
38
+
38 39
 %install
39
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
40
-make DESTDIR=%{buildroot} \
41
-    PREFIX=%{_prefix} \
42
-    install
40
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
41
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install %{?_smp_mflags}
43 42
 
44 43
 %check
45 44
 make %{?_smp_mflags} test
... ...
@@ -61,19 +61,19 @@ rm -rf %{buildroot}/*
61 61
 %{_mandir}/man3/*
62 62
 
63 63
 %changelog
64
-*   Thu Jan 14 2021 Alexey Makhalov <amakhalov@vmware.com> 37-2
65
--   GCC-10 support.
66
-*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 37-1
67
--   Automatic Version Bump
68
-*   Thu Apr 02 2020 Alexey Makhalov <amakhalov@vmware.com> 36-2
69
--   Fix compilation issue with gcc-8.4.0
70
-*   Tue Sep 18 2018 Sujay G <gsujay@vmware.com> 36-1
71
--   Bump efivar version to 36
72
-*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 31-1
73
--   Version update. Added -devel subpackage.
74
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.20-3
75
--   GA - Bump release of all rpms
76
-*   Thu Apr 28 2016 Xiaolin Li <xiaolinl@vmware.com> 0.20-2
77
--   Fix build for linux 4.4.
78
-*   Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.20-1
79
--   Initial build.	First version
64
+* Thu Jan 14 2021 Alexey Makhalov <amakhalov@vmware.com> 37-2
65
+- GCC-10 support.
66
+* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 37-1
67
+- Automatic Version Bump
68
+* Thu Apr 02 2020 Alexey Makhalov <amakhalov@vmware.com> 36-2
69
+- Fix compilation issue with gcc-8.4.0
70
+* Tue Sep 18 2018 Sujay G <gsujay@vmware.com> 36-1
71
+- Bump efivar version to 36
72
+* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 31-1
73
+- Version update. Added -devel subpackage.
74
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.20-3
75
+- GA - Bump release of all rpms
76
+* Thu Apr 28 2016 Xiaolin Li <xiaolinl@vmware.com> 0.20-2
77
+- Fix build for linux 4.4.
78
+* Mon Jul 6 2015 Sharath George <sharathg@vmware.com> 0.20-1
79
+- Initial build.	First version
... ...
@@ -7,9 +7,12 @@ URL:            http://expat.sourceforge.net/
7 7
 Group:          System Environment/GeneralLibraries
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.xz
11
-%define sha1    expat=596a37d048b357a58990a538a8d83e2e38325122
12
+%define sha1    %{name}=596a37d048b357a58990a538a8d83e2e38325122
13
+
12 14
 Requires:       expat-libs = %{version}-%{release}
15
+
13 16
 %description
14 17
 The Expat package contains a stream oriented C library for parsing XML.
15 18
 
... ...
@@ -33,9 +36,9 @@ Requires:       expat = %{version}-%{release}
33 33
 The package contains expat doc files.
34 34
 
35 35
 %prep
36
-%setup -q
37
-%build
36
+%autosetup -p1
38 37
 
38
+%build
39 39
 %configure \
40 40
 	CFLAGS="%{optflags}" \
41 41
 	CXXFLAGS="%{optflags}" \
... ...
@@ -45,8 +48,8 @@ The package contains expat doc files.
45 45
 make %{?_smp_mflags}
46 46
 
47 47
 %install
48
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
49
-make DESTDIR=%{buildroot} install
48
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
49
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
50 50
 find %{buildroot}/%{_libdir} -name '*.la' -delete
51 51
 rm -rf %{buildroot}/%{_docdir}/%{name}
52 52
 %{_fixperms} %{buildroot}/*
... ...
@@ -58,14 +61,10 @@ make %{?_smp_mflags} check
58 58
 %postun	-p /sbin/ldconfig
59 59
 
60 60
 %post libs
61
-    # First argument is 1 => New Installation
62
-    # First argument is 2 => Upgrade
63
-    /sbin/ldconfig
61
+/sbin/ldconfig
64 62
 
65 63
 %postun libs
66
-    /sbin/ldconfig
67
-    # First argument is 0 => Uninstall
68
-    # First argument is 1 => Upgrade
64
+/sbin/ldconfig
69 65
 
70 66
 %clean
71 67
 rm -rf %{buildroot}/*
... ...
@@ -93,27 +92,27 @@ rm -rf %{buildroot}/*
93 93
 %doc AUTHORS Changes
94 94
 
95 95
 %changelog
96
-*   Mon Apr 12 2021 Gerrit Photon <photon-checkins@vmware.com> 2.3.0-1
97
--   Automatic Version Bump
98
-*   Fri Feb 19 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 2.2.9-3
99
--   Move documents to docs sub-package
100
-*   Mon Oct 05 2020 Tapas Kundu <tkundu@vmware.com> 2.2.9-2
101
--   Use ldconfig to resolve dependencies for lib
102
-*   Tue Oct 29 2019 Tapas Kundu <tkundu@vmware.com> 2.2.9-1
103
--   Fix for CVE-2019-15903
104
-*   Thu Oct 17 2019 Shreenidhi Shedi <sshedi@vmware.com> 2.2.7-1
105
--   Upgrade to version 2.2.7
106
-*   Mon Jul 8 2019 Siddharth Chandrasekaran <csiddharth@vmware.com> 2.2.6-2
107
--   Add patch for CVE-2018-20843
108
-*   Thu Sep 20 2018 Sujay G <gsujay@vmware.com> 2.2.6-1
109
--   Bump expat version to 2.2.6
110
-*   Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.2.4-1
111
--   Updating version, fixes CVE-2017-9233,  CVE-2016-9063, CVE-2016-0718
112
-*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.0-2
113
--   Added -libs and -devel subpackages
114
-*   Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 2.2.0-1
115
--   Updating Source/Fixing CVE-2015-1283.
116
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
117
--   GA - Bump release of all rpms
118
-*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.0-1
119
--   Initial build. First version
96
+* Mon Apr 12 2021 Gerrit Photon <photon-checkins@vmware.com> 2.3.0-1
97
+- Automatic Version Bump
98
+* Fri Feb 19 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 2.2.9-3
99
+- Move documents to docs sub-package
100
+* Mon Oct 05 2020 Tapas Kundu <tkundu@vmware.com> 2.2.9-2
101
+- Use ldconfig to resolve dependencies for lib
102
+* Tue Oct 29 2019 Tapas Kundu <tkundu@vmware.com> 2.2.9-1
103
+- Fix for CVE-2019-15903
104
+* Thu Oct 17 2019 Shreenidhi Shedi <sshedi@vmware.com> 2.2.7-1
105
+- Upgrade to version 2.2.7
106
+* Mon Jul 8 2019 Siddharth Chandrasekaran <csiddharth@vmware.com> 2.2.6-2
107
+- Add patch for CVE-2018-20843
108
+* Thu Sep 20 2018 Sujay G <gsujay@vmware.com> 2.2.6-1
109
+- Bump expat version to 2.2.6
110
+* Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.2.4-1
111
+- Updating version, fixes CVE-2017-9233,  CVE-2016-9063, CVE-2016-0718
112
+* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.0-2
113
+- Added -libs and -devel subpackages
114
+* Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 2.2.0-1
115
+- Updating Source/Fixing CVE-2015-1283.
116
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
117
+- GA - Bump release of all rpms
118
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.0-1
119
+- Initial build. First version
... ...
@@ -4,36 +4,37 @@ Version:      0.18
4 4
 Release:      3%{?dist}
5 5
 License:      GPLv2+
6 6
 URL:          http://fakeroot-ng.lingnu.com/
7
-Source0:      http://downloads.sourceforge.net/project/fakerootng/fakeroot-ng/%{version}/fakeroot-ng-%{version}.tar.gz
8
-%define sha1 fakeroot-ng=288dadbd50ff36a9eb11d4bc14213c6d1beaafaa
9 7
 Group:        System Environment/Base
10
-BuildRoot:    %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
11
-Group:        Development/Tools
12 8
 Vendor:       VMware, Inc.
13 9
 Distribution: Photon
10
+
11
+Source0:      http://downloads.sourceforge.net/project/fakerootng/fakeroot-ng/%{version}/fakeroot-ng-%{version}.tar.gz
12
+%define sha1 %{name}=288dadbd50ff36a9eb11d4bc14213c6d1beaafaa
13
+
14
+BuildRoot:    %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
14 15
 BuildArch:    x86_64
15 16
 
16 17
 %description
17
-Fakeroot-ng is a clean re-implementation of fakeroot. The core idea 
18
-is to run a program, but wrap all system calls that program performs 
19
-so that it thinks it is running as root, while it is, in practice, 
20
-running as an unprivileged user. When the program is trying to perform 
21
-a privileged operation (such as modifying a file's owner or creating 
22
-a block device), this operation is emulated, so that an unprivileged 
23
-operation is actually carried out, but the result of the privileged 
24
-operation is reported to the program whenever it attempts to query 
25
-the result. 
18
+Fakeroot-ng is a clean re-implementation of fakeroot. The core idea
19
+is to run a program, but wrap all system calls that program performs
20
+so that it thinks it is running as root, while it is, in practice,
21
+running as an unprivileged user. When the program is trying to perform
22
+a privileged operation (such as modifying a file's owner or creating
23
+a block device), this operation is emulated, so that an unprivileged
24
+operation is actually carried out, but the result of the privileged
25
+operation is reported to the program whenever it attempts to query
26
+the result.
26 27
 
27 28
 %prep
28
-%setup -q
29
+%autosetup -p1
29 30
 
30 31
 %build
31 32
 %configure
32 33
 make %{?_smp_mflags}
33 34
 
34 35
 %install
35
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
36
-make install DESTDIR=%{buildroot}
36
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
37
+make install DESTDIR=%{buildroot} %{?_smp_mflags}
37 38
 
38 39
 %check
39 40
 make %{?_smp_mflags} check
... ...
@@ -47,10 +48,9 @@ rm -rf %{buildroot}/*
47 47
 %doc %{_mandir}/man1/fakeroot-ng.1.gz
48 48
 
49 49
 %changelog
50
-*   Mon Oct 22 2018 Ajay Kaher <akaher@vmware.com> 0.18-3
51
--   Adding BuildArch
52
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.18-2
53
--   GA - Bump release of all rpms
54
-*   Fri Jul 10 2015 Luis Zuniga <lzuniga@vmware.com> 0.17-0.1
55
--   Initial build for Photon
56
-
50
+* Mon Oct 22 2018 Ajay Kaher <akaher@vmware.com> 0.18-3
51
+- Adding BuildArch
52
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.18-2
53
+- GA - Bump release of all rpms
54
+* Fri Jul 10 2015 Luis Zuniga <lzuniga@vmware.com> 0.17-0.1
55
+- Initial build for Photon
... ...
@@ -54,7 +54,7 @@ These are the additional language files of git.
54 54
 make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
55 55
 
56 56
 %install
57
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
57
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
58 58
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
59 59
 install -vdm 755 %{buildroot}/usr/share/bash-completion/completions
60 60
 install -m 0644 contrib/completion/git-completion.bash %{buildroot}/usr/share/bash-completion/completions/git
... ...
@@ -7,18 +7,23 @@ URL:            http://sourceforge.net/projects/gptfdisk/
7 7
 Group:          System Environment/Filesystem and Disk management
8 8
 Vendor:	        VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        http://downloads.sourceforge.net/project/gptfdisk/%{name}/%{version}/%{name}-%{version}.tar.gz
11 12
 %define sha1    gptfdisk=406ab2596e1911c916dce677ce7e903076d94c6d
13
+
12 14
 Patch0:         gptfdisk-1.0.7-convenience-1.patch
13 15
 Patch1:         gptfdisk-Makefile.patch
14
-Requires:       popt >= 1.16
16
+
15 17
 BuildRequires:  popt-devel
16 18
 BuildRequires:  ncurses-devel
17 19
 BuildRequires:  util-linux-devel
20
+
21
+Requires:       popt >= 1.16
18 22
 Requires:       ncurses
19 23
 Requires:       ncurses-devel
20 24
 Requires:       libstdc++
21 25
 Requires:       util-linux
26
+
22 27
 %description
23 28
 The gptfdisk package is a set of programs for creation and maintenance of GUID Partition
24 29
 Table (GPT) disk drives. A GPT partitioned disk is required for drives greater than 2 TB
... ...
@@ -50,21 +55,21 @@ rm -rf %{buildroot}/*
50 50
 %{_mandir}/man8/*
51 51
 
52 52
 %changelog
53
-*   Fri Nov 19 2021 Oliver Kurth <okurth@vmware.com> 1.0.7-2
54
--   Build with -tinfo
55
-*   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 1.0.7-1
56
--   Automatic Version Bump
57
-*   Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 1.0.5-1
58
--   Automatic Version Bump
59
-*   Tue Sep 11 2018 Anish Swaminathan <anishs@vmware.com> 1.0.4-1
60
--   Update version to 1.0.4
61
-*   Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 1.0.1-4
62
--   Fix dependency
63
-*   Wed Oct 05 2016 ChangLee <changlee@vmware.com> 1.0.1-3
64
--   Modified %check
65
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.1-2
66
--   GA - Bump release of all rpms
67
-*   Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.1-1
68
--   Updated Version.
69
-*   Thu Oct 30 2014 Divya Thaluru <dthaluru@vmware.com> 0.8.10-1
70
--   Initial build.	First version
53
+* Fri Nov 19 2021 Oliver Kurth <okurth@vmware.com> 1.0.7-2
54
+- Build with -tinfo
55
+* Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 1.0.7-1
56
+- Automatic Version Bump
57
+* Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 1.0.5-1
58
+- Automatic Version Bump
59
+* Tue Sep 11 2018 Anish Swaminathan <anishs@vmware.com> 1.0.4-1
60
+- Update version to 1.0.4
61
+* Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 1.0.1-4
62
+- Fix dependency
63
+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 1.0.1-3
64
+- Modified %check
65
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.1-2
66
+- GA - Bump release of all rpms
67
+* Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.1-1
68
+- Updated Version.
69
+* Thu Oct 30 2014 Divya Thaluru <dthaluru@vmware.com> 0.8.10-1
70
+- Initial build.	First version
... ...
@@ -43,7 +43,7 @@ sed -i "s/\/run/\/var\/run/g" contrib/systemd/haproxy.service
43 43
 sed -i "s/192.168.1.22/127.0.0.0/g" examples/transparent_proxy.cfg
44 44
 
45 45
 %install
46
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
46
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
47 47
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/haproxy TARGET=linux-glibc install %{?_smp_mflags}
48 48
 install -vDm755 contrib/systemd/haproxy.service \
49 49
        %{buildroot}/usr/lib/systemd/system/haproxy.service
... ...
@@ -36,7 +36,7 @@ echo "VDBG optflags: " %{optflags}
36 36
 make %{?_smp_mflags}
37 37
 
38 38
 %install
39
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
39
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
40 40
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
41 41
 
42 42
 %check
... ...
@@ -55,8 +55,8 @@ It contains the libraries and header files to create applications.
55 55
 make %{?_smp_mflags} V=0
56 56
 
57 57
 %install
58
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
59
-make DESTDIR=%{buildroot} install
58
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
59
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
60 60
 ln -sfv ../../sbin/xtables-multi %{buildroot}%{_libdir}/iptables-xml
61 61
 #   Install daemon scripts
62 62
 install -vdm755 %{buildroot}%{_unitdir}
... ...
@@ -11,10 +11,13 @@ URL:            http://ipxe.org
11 11
 Group:          System Environment/Daemons
12 12
 Vendor:         VMware, Inc.
13 13
 Distribution:   Photon
14
+
14 15
 #Download URL:  https://github.com/ipxe/ipxe/archive/v%{version}.tar.gz
15 16
 Source0:        %{name}-%{version}.tar.gz
16
-%define sha1    ipxe=b8ad3343e78461aaa897c1404d16c26f035f87ee
17
+%define sha1    %{name}=b8ad3343e78461aaa897c1404d16c26f035f87ee
18
+
17 19
 BuildArch:      x86_64
20
+
18 21
 BuildRequires:  binutils
19 22
 BuildRequires:  binutils-devel
20 23
 BuildRequires:  cdrkit
... ...
@@ -33,34 +36,34 @@ iPXE is the leading open source network boot firmware. It provides a full
33 33
 PXE implementation enhanced with additional features.
34 34
 
35 35
 %prep
36
-%setup -q -n %{name}-%{version}
36
+%autosetup -p1 -n %{name}-%{version}
37 37
 
38 38
 %build
39 39
 cd src
40 40
 make %{_smp_mflags}
41 41
 
42 42
 %install
43
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
44
-mkdir -p %{buildroot}/usr/share/ipxe
45
-install -vDm 644 src/bin/ipxe.{dsk,iso,lkrn,usb} %{buildroot}/usr/share/ipxe/
46
-install -vDm 644 src/bin/*.{rom,mrom} %{buildroot}/usr/share/ipxe/
43
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
44
+mkdir -p %{buildroot}%{_datadir}/%{name}
45
+install -vDm 644 src/bin/%{name}.{dsk,iso,lkrn,usb} %{buildroot}%{_datadir}/%{name}/
46
+install -vDm 644 src/bin/*.{rom,mrom} %{buildroot}%{_datadir}/%{name}/
47 47
 
48 48
 %files
49 49
 %defattr(-,root,root)
50
-/usr/share/ipxe/ipxe.dsk
51
-/usr/share/ipxe/ipxe.iso
52
-/usr/share/ipxe/ipxe.lkrn
53
-/usr/share/ipxe/ipxe.usb
54
-/usr/share/ipxe/10222000.rom
55
-/usr/share/ipxe/10500940.rom
56
-/usr/share/ipxe/10ec8139.rom
57
-/usr/share/ipxe/15ad07b0.rom
58
-/usr/share/ipxe/1af41000.rom
59
-/usr/share/ipxe/8086100e.mrom
60
-/usr/share/ipxe/8086100f.mrom
61
-/usr/share/ipxe/808610d3.mrom
62
-/usr/share/ipxe/80861209.rom
63
-/usr/share/ipxe/rtl8139.rom
50
+%{_datadir}/%{name}/%{name}.dsk
51
+%{_datadir}/%{name}/%{name}.iso
52
+%{_datadir}/%{name}/%{name}.lkrn
53
+%{_datadir}/%{name}/%{name}.usb
54
+%{_datadir}/%{name}/10222000.rom
55
+%{_datadir}/%{name}/10500940.rom
56
+%{_datadir}/%{name}/10ec8139.rom
57
+%{_datadir}/%{name}/15ad07b0.rom
58
+%{_datadir}/%{name}/1af41000.rom
59
+%{_datadir}/%{name}/8086100e.mrom
60
+%{_datadir}/%{name}/8086100f.mrom
61
+%{_datadir}/%{name}/808610d3.mrom
62
+%{_datadir}/%{name}/80861209.rom
63
+%{_datadir}/%{name}/rtl8139.rom
64 64
 
65 65
 %changelog
66 66
 *   Thu Apr 29 2021 Gerrit Photon <photon-checkins@vmware.com> 1.21.1-1
... ...
@@ -62,7 +62,7 @@ make %{?_smp_mflags}
62 62
 
63 63
 %install
64 64
 cd src
65
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
65
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
66 66
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
67 67
 find %{buildroot}/%{_libdir} -name '*.la' -delete
68 68
 for LIBRARY in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \
... ...
@@ -26,7 +26,7 @@ The lapack-devel package contains libraries and header files for
26 26
 developing applications that use lapack.
27 27
 
28 28
 %prep
29
-%setup
29
+%autosetup -p1
30 30
 
31 31
 %build
32 32
 mkdir -p build
... ...
@@ -41,14 +41,13 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
41 41
 make %{?_smp_mflags}
42 42
 
43 43
 %install
44
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
44
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
45 45
 cd build
46
-make DESTDIR=%{buildroot} install
46
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
47 47
 mkdir %{buildroot}/%{_includedir}/lapacke
48 48
 mv %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/lapacke/.
49 49
 
50
-%post   -p /sbin/ldconfig
51
-%postun -p /sbin/ldconfig
50
+%ldconfig_scriptlets
52 51
 
53 52
 %files
54 53
 %defattr(-,root,root)
... ...
@@ -67,11 +66,11 @@ mv %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/lapacke/.
67 67
 %exclude %{_libdir}/cmake/*
68 68
 
69 69
 %changelog
70
-*   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 3.9.1-1
71
--   Automatic Version Bump
72
-*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 3.9.0-1
73
--   Automatic Version Bump
74
-*   Thu Sep 20 2018 Ankit Jain <ankitja@vmware.com> 3.8.0-1
75
--   Updated to version 3.8.0
76
-*   Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 3.7.0-1
77
--   Initial packaging for Photon
70
+* Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 3.9.1-1
71
+- Automatic Version Bump
72
+* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 3.9.0-1
73
+- Automatic Version Bump
74
+* Thu Sep 20 2018 Ankit Jain <ankitja@vmware.com> 3.8.0-1
75
+- Updated to version 3.8.0
76
+* Fri Mar 03 2017 Xiaolin Li <xiaolinl@vmware.com> 3.7.0-1
77
+- Initial packaging for Photon
... ...
@@ -7,9 +7,12 @@ URL:		http://sourceware.org/libffi/
7 7
 Group:		System Environment/GeneralLibraries
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10
+
10 11
 Source0:	ftp://sourceware.org/pub/libffi/%{name}-%{version}.tar.gz
11
-%define sha1 libffi=8df6cb570c8d6596a67d1c0773bf00650154f7aa
12
+%define sha1 %{name}=8df6cb570c8d6596a67d1c0773bf00650154f7aa
13
+
12 14
 Provides:	pkgconfig(libffi)
15
+
13 16
 %if %{with_check}
14 17
 BuildRequires:  dejagnu
15 18
 %endif
... ...
@@ -26,7 +29,7 @@ Requires:   %{name} = %{version}-%{release}
26 26
 It contains the libraries and header files to create applications
27 27
 
28 28
 %prep
29
-%setup -q
29
+%autosetup -p1
30 30
 
31 31
 %build
32 32
 sed -e '/^includesdir/ s:$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:$(includedir):' \
... ...
@@ -37,9 +40,10 @@ sed -e '/^includedir/ s:${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include:@incl
37 37
 %configure \
38 38
 	--disable-static
39 39
 make %{?_smp_mflags}
40
+
40 41
 %install
41
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
42
-make DESTDIR=%{buildroot} install
42
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
43
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
43 44
 install -D -m644 LICENSE %{buildroot}/usr/share/licenses/%{name}/LICENSE
44 45
 find %{buildroot}/%{_lib64dir} -name '*.la' -delete
45 46
 rm -rf %{buildroot}/%{_infodir}
... ...
@@ -48,8 +52,8 @@ rm -rf %{buildroot}/%{_infodir}
48 48
 %check
49 49
 make %{?_smp_mflags} check
50 50
 
51
-%post	-p /sbin/ldconfig
52
-%postun	-p /sbin/ldconfig
51
+%ldconfig_scriptlets
52
+
53 53
 %clean
54 54
 rm -rf %{buildroot}/*
55 55
 
... ...
@@ -65,21 +69,21 @@ rm -rf %{buildroot}/*
65 65
 %{_mandir}/man3/*
66 66
 
67 67
 %changelog
68
-*   Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 3.3-1
69
--   Automatic Version Bump
70
-*   Fri Nov 09 2018 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-7
71
--   Cross compilation support
72
-*   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-6
73
--   Aarch64 support
74
-*   Wed Jul 12 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-5
75
--   Get tcl, expect and dejagnu from packages
76
-*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-4
77
--   Added -devel subpackage
78
-*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 3.2.1-3
79
--   Modified %check
80
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2.1-2
81
--   GA - Bump release of all rpms
82
-*   Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 3.2.1-1
83
--   Updated to version 3.2.1
84
-*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.1-1
85
--   Initial build.	First version
68
+* Wed Jul 08 2020 Gerrit Photon <photon-checkins@vmware.com> 3.3-1
69
+- Automatic Version Bump
70
+* Fri Nov 09 2018 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-7
71
+- Cross compilation support
72
+* Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-6
73
+- Aarch64 support
74
+* Wed Jul 12 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-5
75
+- Get tcl, expect and dejagnu from packages
76
+* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-4
77
+- Added -devel subpackage
78
+* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 3.2.1-3
79
+- Modified %check
80
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.2.1-2
81
+- GA - Bump release of all rpms
82
+* Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 3.2.1-1
83
+- Updated to version 3.2.1
84
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.1-1
85
+- Initial build.	First version
... ...
@@ -34,7 +34,7 @@ sed -i 's/int xsltMaxDepth = 3000/int xsltMaxDepth = 5000/g' libxslt/transform.c
34 34
     --without-python
35 35
 make %{?_smp_mflags}
36 36
 %install
37
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
37
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
38 38
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
39 39
 find %{buildroot} -name '*.la' -delete
40 40
 %{_fixperms} %{buildroot}/*
... ...
@@ -51,7 +51,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr               \
51 51
       -Wno-dev ..
52 52
 make %{?_smp_mflags}
53 53
 %install
54
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
54
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
55 55
 cd build
56 56
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
57 57
 
... ...
@@ -7,8 +7,9 @@ URL:            http://lz4.github.io/lz4/
7 7
 Group:          Applications
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        https://github.com/lz4/lz4/archive/v%{version}/%{name}-%{version}.tar.gz
11
-%define sha1    lz4=5a19554ef404a609123b756ddcbbb677df838f05
12
+%define sha1    %{name}=5a19554ef404a609123b756ddcbbb677df838f05
12 13
 
13 14
 %description
14 15
 LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU.
... ...
@@ -21,17 +22,16 @@ Requires:   %{name} = %{version}-%{release}
21 21
 Static libraries and header files for the support library for lz4.
22 22
 
23 23
 %prep
24
-%setup -q
24
+%autosetup -p1
25 25
 
26 26
 %build
27 27
 make %{?_smp_mflags} all
28 28
 
29 29
 %install
30
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
31
-make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} PREFIX=%{_prefix}
30
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
31
+make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} PREFIX=%{_prefix} %{?_smp_mflags}
32 32
 
33
-%post   -p /sbin/ldconfig
34
-%postun -p /sbin/ldconfig
33
+%ldconfig_scriptlets
35 34
 
36 35
 %files
37 36
 %defattr(-,root,root)
... ...
@@ -47,17 +47,14 @@ make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} PREFIX=%{_prefix}
47 47
 %{_libdir}/pkgconfig/*
48 48
 %{_includedir}/*
49 49
 
50
-
51 50
 %changelog
52
-*   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 1.9.3-1
53
--   Automatic Version Bump
54
-*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 1.9.2-1
55
--   Automatic Version Bump
56
-*   Wed Sep 05 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.8.2-1
57
--   Update to version 1.8.2
58
-*   Wed Mar 29 2017 Michelle Wang <michellew@vmware.com> 1.7.5-1
59
--   Update lz4 package to 1.7.5.
60
-*   Thu Dec 01 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.4-1
61
--   Add lz4 package.
62
-
63
-
51
+* Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 1.9.3-1
52
+- Automatic Version Bump
53
+* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 1.9.2-1
54
+- Automatic Version Bump
55
+* Wed Sep 05 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 1.8.2-1
56
+- Update to version 1.8.2
57
+* Wed Mar 29 2017 Michelle Wang <michellew@vmware.com> 1.7.5-1
58
+- Update lz4 package to 1.7.5.
59
+* Thu Dec 01 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.4-1
60
+- Add lz4 package.
64 61
deleted file mode 100644
... ...
@@ -1,25 +0,0 @@
1
-diff -Naur mercurial-4.7.1.orig/setup.py mercurial-4.7.1/setup.py
2
-+++ mercurial-4.7.1/setup.py	2018-10-25 11:31:11.557831626 +0530
3
-@@ -440,7 +440,7 @@
4
-     negative_opt = buildextnegops
5
- 
6
-     def initialize_options(self):
7
--        self.zstd = True
8
-+        self.zstd = False
9
-         return build_ext.initialize_options(self)
10
- 
11
-     def build_extensions(self):
12
-@@ -905,9 +905,9 @@
13
-               ['hgext/fsmonitor/pywatchman/bser.c']),
14
-     ]
15
- 
16
--sys.path.insert(0, 'contrib/python-zstandard')
17
--import setup_zstd
18
--extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd'))
19
-+#sys.path.insert(0, 'contrib/python-zstandard')
20
-+#import setup_zstd
21
-+#extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd'))
22
- 
23
- try:
24
-     from distutils import cygwinccompiler
25 1
deleted file mode 100644
... ...
@@ -1,31 +0,0 @@
1
-+++ b/mercurial/cext/manifest.c	Wed Sep 05 21:23:29 2018 +0900
2
-@@ -51,7 +51,12 @@
3
- {
4
- 	char *s = l->start;
5
- 	ssize_t llen = pathlen(l);
6
--	PyObject *hash = unhexlify(s + llen + 1, 40);
7
-+	PyObject *hash;
8
-+	if (llen + 1 + 40 + 1 > l->len) { /* path '\0' hash '\n' */
9
-+		PyErr_SetString(PyExc_ValueError, "manifest line too short");
10
-+		return NULL;
11
-+	}
12
-+	hash = unhexlify(s + llen + 1, 40);
13
- 	if (!hash) {
14
- 		return NULL;
15
- 	}
16
-@@ -249,10 +254,13 @@
17
- 	pl = pathlen(l);
18
- 	path = PyBytes_FromStringAndSize(l->start, pl);
19
- 	hash = nodeof(l);
20
-+	if (!path || !hash) {
21
-+		goto done;
22
-+	}
23
- 	consumed = pl + 41;
24
- 	flags = PyBytes_FromStringAndSize(l->start + consumed,
25
- 					   l->len - consumed - 1);
26
--	if (!path || !hash || !flags) {
27
-+	if (!flags) {
28
- 		goto done;
29
- 	}
30
- 	ret = PyTuple_Pack(3, path, hash, flags);
... ...
@@ -9,12 +9,14 @@ URL:            https://www.mercurial-scm.org
9 9
 Group:          System Environment/Security
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12
+
12 13
 Source0:        https://www.mercurial-scm.org/release/%{name}-%{version}.tar.gz
13
-%define sha1    mercurial=7ce13257550f9d22d483b42420ecf84b1b9ac3f4
14
-Patch0:         mercurial-disable-zstd.patch
14
+%define sha1    %{name}=7ce13257550f9d22d483b42420ecf84b1b9ac3f4
15
+
15 16
 BuildRequires:  python3
16 17
 BuildRequires:  python3-libs
17 18
 BuildRequires:  python3-devel
19
+
18 20
 Requires:       python3
19 21
 
20 22
 %description
... ...
@@ -22,14 +24,14 @@ Mercurial is a distributed source control management tool similar to Git and Baz
22 22
 Mercurial is written in Python and is used by projects such as Mozilla and Vim.
23 23
 
24 24
 %prep
25
-%setup -q
25
+%autosetup -p1
26 26
 
27 27
 %build
28 28
 ln -sf /usr/bin/python3 /usr/bin/python
29 29
 make %{?_smp_mflags} build
30 30
 
31 31
 %install
32
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
32
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
33 33
 mkdir -p %{buildroot}/%{_bindir}
34 34
 python3 setup.py install --skip-build --root %{buildroot}
35 35
 
... ...
@@ -59,51 +61,51 @@ rm -rf %{buildroot}/*
59 59
 %{python3_sitelib}/*
60 60
 
61 61
 %changelog
62
-*   Mon May 03 2021 Gerrit Photon <photon-checkins@vmware.com> 5.8-1
63
--   Automatic Version Bump
64
-*   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 5.7.1-1
65
--   Automatic Version Bump
66
-*   Tue Sep 01 2020 Gerrit Photon <photon-checkins@vmware.com> 5.5.1-1
67
--   Automatic Version Bump
68
-*   Thu Jul 16 2020 Gerrit Photon <photon-checkins@vmware.com> 5.5-1
69
--   Automatic Version Bump
70
-*   Tue Jun 23 2020 Tapas Kundu <tkundu@vmware.com> 5.4-1
71
--   Upgrade to 5.4
72
--   Build with python3
73
--   Mass removal python2
74
-*   Mon May 06 2019 Keerthana K <keerthanak@vmware.com> 4.7.1-3
75
--   Fix CVE-2018-17983
76
-*   Thu Oct 25 2018 Sujay G <gsujay@vmware.com> 4.7.1-2
77
--   Disable zstd
78
-*   Mon Sep 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.7.1-1
79
--   Update to version 4.7.1
80
-*   Tue Oct 17 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1
81
--   Update verion to 4.3.3 for CVE-2017-1000115, CVE-2017-1000116.
82
-*   Fri Aug 11 2017 Rongrong Qiu <rqiu@vmware.com> 4.1-4
83
--   update error info in make check for bug 1900338
84
-*   Fri Jun 16 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.1-3
85
--   Use python2 explicitly while building
86
-*   Tue Jun 13 2017 Xiaolin Li <xiaolinl@vmware.com> 4.1-2
87
--   Apply CVE-2017-9462 patch
88
-*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.1-1
89
--   Update package version
90
-*   Mon Jan 22 2017 Xiaolin Li <xiaolinl@vmware.com> 3.7.1-6
91
--   Install with setup.py.
92
-*   Tue Nov 22 2016 Xiaolin Li <xiaolinl@vmware.com> 3.7.1-5
93
--   Apply patches for CVE-2016-3068, CVE-2016-3069, CVE-2016-3105
94
-*   Fri Oct 07 2016 ChangLee <changlee@vmware.com> 3.7.1-4
95
--   Modified %check
96
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.7.1-3
97
--   GA - Bump release of all rpms
98
-*   Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.7.1-2
99
--   Edit postun script.
100
-*   Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 3.7.1-1
101
--   Updating Version.
102
-*   Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.1.2-4
103
--   Edit post script.
104
-*   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 3.1.2-3
105
--   Change path to /var/opt.
106
-*   Tue Jun 30 2015 Alexey Makhalov <amakhalov@vmware.com> 3.1.2-2
107
--   /etc/profile.d permission fix
108
-*   Mon Oct 13 2014 Divya Thaluru <dthaluru@vmware.com> 3.1.2-1
109
--   Initial build.  First version
62
+* Mon May 03 2021 Gerrit Photon <photon-checkins@vmware.com> 5.8-1
63
+- Automatic Version Bump
64
+* Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 5.7.1-1
65
+- Automatic Version Bump
66
+* Tue Sep 01 2020 Gerrit Photon <photon-checkins@vmware.com> 5.5.1-1
67
+- Automatic Version Bump
68
+* Thu Jul 16 2020 Gerrit Photon <photon-checkins@vmware.com> 5.5-1
69
+- Automatic Version Bump
70
+* Tue Jun 23 2020 Tapas Kundu <tkundu@vmware.com> 5.4-1
71
+- Upgrade to 5.4
72
+- Build with python3
73
+- Mass removal python2
74
+* Mon May 06 2019 Keerthana K <keerthanak@vmware.com> 4.7.1-3
75
+- Fix CVE-2018-17983
76
+* Thu Oct 25 2018 Sujay G <gsujay@vmware.com> 4.7.1-2
77
+- Disable zstd
78
+* Mon Sep 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.7.1-1
79
+- Update to version 4.7.1
80
+* Tue Oct 17 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1
81
+- Update verion to 4.3.3 for CVE-2017-1000115, CVE-2017-1000116.
82
+* Fri Aug 11 2017 Rongrong Qiu <rqiu@vmware.com> 4.1-4
83
+- update error info in make check for bug 1900338
84
+* Fri Jun 16 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.1-3
85
+- Use python2 explicitly while building
86
+* Tue Jun 13 2017 Xiaolin Li <xiaolinl@vmware.com> 4.1-2
87
+- Apply CVE-2017-9462 patch
88
+* Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.1-1
89
+- Update package version
90
+* Sun Jan 22 2017 Xiaolin Li <xiaolinl@vmware.com> 3.7.1-6
91
+- Install with setup.py.
92
+* Tue Nov 22 2016 Xiaolin Li <xiaolinl@vmware.com> 3.7.1-5
93
+- Apply patches for CVE-2016-3068, CVE-2016-3069, CVE-2016-3105
94
+* Fri Oct 07 2016 ChangLee <changlee@vmware.com> 3.7.1-4
95
+- Modified %check
96
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.7.1-3
97
+- GA - Bump release of all rpms
98
+* Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.7.1-2
99
+- Edit postun script.
100
+* Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 3.7.1-1
101
+- Updating Version.
102
+* Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.1.2-4
103
+- Edit post script.
104
+* Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 3.1.2-3
105
+- Change path to /var/opt.
106
+* Tue Jun 30 2015 Alexey Makhalov <amakhalov@vmware.com> 3.1.2-2
107
+- /etc/profile.d permission fix
108
+* Mon Oct 13 2014 Divya Thaluru <dthaluru@vmware.com> 3.1.2-1
109
+- Initial build.  First version
... ...
@@ -63,7 +63,7 @@ sh configure \
63 63
 make %{?_smp_mflags}
64 64
 make -C ntpstat-master CFLAGS="$CFLAGS" %{?_smp_mflags}
65 65
 %install
66
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
66
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
67 67
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
68 68
 install -v -m755    -d %{buildroot}%{_datadir}/doc/%{name}-%{version}
69 69
 cp -v -R html/*     %{buildroot}%{_datadir}/doc/%{name}-%{version}/
... ...
@@ -63,7 +63,7 @@ make depend %{?_smp_mflags}
63 63
 make %{?_smp_mflags}
64 64
 
65 65
 %install
66
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
66
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
67 67
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
68 68
 find %{buildroot}/%{_libdir} -name '*.la' -delete
69 69
 %{_fixperms} %{buildroot}/*
... ...
@@ -79,7 +79,7 @@ sh ./configure --host=%{_host} --build=%{_build} \
79 79
     --with-sandbox=rlimit
80 80
 make
81 81
 %install
82
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
82
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
83 83
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
84 84
 install -vdm755 %{buildroot}/var/lib/sshd
85 85
 echo "AllowTcpForwarding no" >> %{buildroot}/etc/ssh/sshd_config
... ...
@@ -29,7 +29,7 @@ Pgbouncer is a light-weight, robust connection pooler for PostgreSQL.
29 29
 make %{?_smp_mflags} V=1
30 30
 
31 31
 %install
32
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
32
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
33 33
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
34 34
 install -vdm 744 %{buildroot}/var/log/pgbouncer
35 35
 install -vdm 755 %{buildroot}/var/run/pgbouncer
... ...
@@ -210,7 +210,7 @@ sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_man
210 210
 make world %{?_smp_mflags}
211 211
 
212 212
 %install
213
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
213
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
214 214
 make install-world DESTDIR=%{buildroot} %{?_smp_mflags}
215 215
 # Remove anything related to Python 2.  These have no need to be
216 216
 # around as only Python 3 is supported.
... ...
@@ -208,7 +208,7 @@ sh ./configure \
208 208
 make world %{?_smp_mflags}
209 209
 
210 210
 %install
211
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
211
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
212 212
 make install-world DESTDIR=%{buildroot} %{?_smp_mflags}
213 213
 # Remove anything related to Python 2.  These have no need to be
214 214
 # around as only Python 3 is supported.
... ...
@@ -208,7 +208,7 @@ sh ./configure \
208 208
 make world %{?_smp_mflags}
209 209
 
210 210
 %install
211
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
211
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
212 212
 make install-world DESTDIR=%{buildroot} %{?_smp_mflags}
213 213
 # Remove anything related to Python 2.  These have no need to be
214 214
 # around as only Python 3 is supported.
... ...
@@ -41,7 +41,7 @@ done
41 41
 make %{?_smp_mflags} COPY="cp -p"
42 42
 
43 43
 %install
44
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
44
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
45 45
 %make_install
46 46
 
47 47
 %check
... ...
@@ -23,7 +23,7 @@ Socat is a command line based utility that establishes two bidirectional byte st
23 23
 make %{?_smp_mflags}
24 24
 
25 25
 %install
26
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
26
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
27 27
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
28 28
 find %{buildroot} -name '*.la' -delete
29 29
 find %{buildroot} -name '*.a' -delete
... ...
@@ -8,12 +8,15 @@ URL:            http://www.sqlite.org
8 8
 Group:          System Environment/GeneralLibraries
9 9
 Vendor:         VMware, Inc.
10 10
 Distribution:   Photon
11
+
11 12
 Source0:        http://sqlite.org/2020/%{name}-autoconf-%{sourcever}.tar.gz
12
-%define sha1    sqlite=f6875472fc86c679400ede139d1dfc6937003abc
13
+%define sha1    %{name}=f6875472fc86c679400ede139d1dfc6937003abc
14
+
13 15
 Obsoletes:      sqlite-autoconf
14 16
 Obsoletes:      sqlite-devel <= 3.27.2-5
15 17
 Requires:       sqlite-libs = %{version}-%{release}
16 18
 Provides:       sqlite3
19
+
17 20
 %description
18 21
 This package contains most of the static files that comprise the
19 22
 www.sqlite.org website including all of the SQL Syntax and the
... ...
@@ -39,7 +42,7 @@ Obsoletes:      sqlite-autoconf
39 39
 The sqlite3 library.
40 40
 
41 41
 %prep
42
-%setup -q -n %{name}-autoconf-%{sourcever}
42
+%autosetup -p1 -n %{name}-autoconf-%{sourcever}
43 43
 
44 44
 %build
45 45
 %configure \
... ...
@@ -50,11 +53,12 @@ The sqlite3 library.
50 50
     -DSQLITE_SECURE_DELETE=1"           \
51 51
     CXXFLAGS="%{optflags}"              \
52 52
     --disable-static
53
-make
53
+
54
+make %{?_smp_mflags}
54 55
 
55 56
 %install
56
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
57
-make DESTDIR=%{buildroot} install
57
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
58
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
58 59
 install -D -m644 sqlite3.1 %{buildroot}/%{_mandir}/man1/sqlite3.1
59 60
 find %{buildroot}/%{_libdir} -name '*.la' -delete
60 61
 rm -rf %{buildroot}/%{_infodir}
... ...
@@ -89,39 +93,39 @@ rm -rf %{buildroot}/*
89 89
 %{_libdir}/libsqlite3.so.0
90 90
 
91 91
 %changelog
92
-*   Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 3.35.5-1
93
--   Automatic Version Bump
94
-*   Fri Aug 28 2020 Gerrit Photon <photon-checkins@vmware.com> 3.33.0-1
95
--   Automatic Version Bump
96
-*   Fri Jul 03 2020 Shreyas B <shreyasb@vmware.com> 3.32.1-1
97
--   Upgrade to 3.32.1 & fix CVE-2020-15358
98
--   CVE-2020-13630 CVE-2020-13434 CVE-2020-13435 CVE-2020-13631 CVE-2020-13632
99
-*   Thu May 14 2020 Ankit Jain <ankitja@vmware.com> 3.31.1-1
100
--   Updated to 3.31.1
101
-*   Sun Feb 3 2019 Michelle Wang <michellew@vmware.com> 3.26.0-1
102
--   Upgrade to 3.26.0 for a critical Vulnerability named 'Magallan'.
103
-*   Fri Sep 21 2018 Srinidhi Rao <srinidhir@vmware.com> 3.25.1-1
104
--   Upgrade to version 3.25.1
105
-*   Tue Feb 20 2018 Xiaolin Li <xiaolinl@vmware.com> 3.22.0-1
106
--   Upgrade to version 3.22.0
107
-*   Fri Nov 10 2017 Xiaolin Li <xiaolinl@vmware.com> 3.21.0-1
108
--   Upgrade to version 3.21.0
109
-*   Fri Jul 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.19.3-1
110
--   Upgrading to version 3.19.0 and adding patch for CVE-2017-10989
111
-*   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 3.18.0-2
112
--   Added obseletes for deprecated sqlite-autoconf package
113
-*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 3.18.0-1
114
--   Version update
115
--   Package rename: sqlite-autoconf -> sqlite
116
-*   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.11.0-4
117
--   Added -devel and -libs subpackages
118
-*   Tue Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3
119
--   Modified %check
120
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11.0-2
121
--   GA - Bump release of all rpms
122
-*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.11.0-1
123
--   Updated to version 3.11.0
124
-*   Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> - 3.8.3.1-2
125
--   Fix versioning
126
-*   Tue Oct 7 2014 Divya Thaluru <dthaluru@vmware.com> 3080301-1
127
--   Initial build. First version
92
+* Tue Apr 13 2021 Gerrit Photon <photon-checkins@vmware.com> 3.35.5-1
93
+- Automatic Version Bump
94
+* Fri Aug 28 2020 Gerrit Photon <photon-checkins@vmware.com> 3.33.0-1
95
+- Automatic Version Bump
96
+* Fri Jul 03 2020 Shreyas B <shreyasb@vmware.com> 3.32.1-1
97
+- Upgrade to 3.32.1 & fix CVE-2020-15358
98
+- CVE-2020-13630 CVE-2020-13434 CVE-2020-13435 CVE-2020-13631 CVE-2020-13632
99
+* Thu May 14 2020 Ankit Jain <ankitja@vmware.com> 3.31.1-1
100
+- Updated to 3.31.1
101
+* Sun Feb 3 2019 Michelle Wang <michellew@vmware.com> 3.26.0-1
102
+- Upgrade to 3.26.0 for a critical Vulnerability named 'Magallan'.
103
+* Fri Sep 21 2018 Srinidhi Rao <srinidhir@vmware.com> 3.25.1-1
104
+- Upgrade to version 3.25.1
105
+* Tue Feb 20 2018 Xiaolin Li <xiaolinl@vmware.com> 3.22.0-1
106
+- Upgrade to version 3.22.0
107
+* Fri Nov 10 2017 Xiaolin Li <xiaolinl@vmware.com> 3.21.0-1
108
+- Upgrade to version 3.21.0
109
+* Fri Jul 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.19.3-1
110
+- Upgrading to version 3.19.0 and adding patch for CVE-2017-10989
111
+* Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 3.18.0-2
112
+- Added obseletes for deprecated sqlite-autoconf package
113
+* Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 3.18.0-1
114
+- Version update
115
+- Package rename: sqlite-autoconf -> sqlite
116
+* Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.11.0-4
117
+- Added -devel and -libs subpackages
118
+* Tue Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3
119
+- Modified %check
120
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11.0-2
121
+- GA - Bump release of all rpms
122
+* Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.11.0-1
123
+- Updated to version 3.11.0
124
+* Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> - 3.8.3.1-2
125
+- Fix versioning
126
+* Tue Oct 7 2014 Divya Thaluru <dthaluru@vmware.com> 3080301-1
127
+- Initial build. First version
... ...
@@ -7,8 +7,10 @@ License:        Public Domain
7 7
 Group:          System Environment/GeneralLibraries
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        ftp://ftp.za.freebsd.org/openbsd/distfiles/sqlite-%{version}.tar.gz
11 12
 %define sha1    sqlite=75db1cf3b00ea18ae8528e676fc9fdf698e2fe58
13
+
12 14
 Patch0:         0001-lemon-fix.patch
13 15
 
14 16
 %description
... ...
@@ -23,8 +25,7 @@ Requires: %{name} = %{version}
23 23
 Headers and development libraries for sqlite2
24 24
 
25 25
 %prep
26
-%setup -q -n sqlite-%{version}
27
-%patch0 -p1
26
+%autosetup -p1 -n sqlite-%{version}
28 27
 
29 28
 %build
30 29
 %configure \
... ...
@@ -34,11 +35,10 @@ Headers and development libraries for sqlite2
34 34
 make %{?_smp_mflags}
35 35
 
36 36
 %install
37
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
38
-make DESTDIR=%{buildroot} install
37
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
38
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
39 39
 
40
-%post -p /sbin/ldconfig
41
-%postun -p /sbin/ldconfig
40
+%ldconfig_scriptlets
42 41
 
43 42
 %files
44 43
 %defattr(-,root,root)
... ...
@@ -54,9 +54,9 @@ make DESTDIR=%{buildroot} install
54 54
 %{_libdir}/libsqlite.so
55 55
 
56 56
 %changelog
57
-*   Tue Sep 25 2018 Ajay Kaher <akaher@vmware.com> 2.8.17-3
58
--   adding patch to fix lemon segmentation fault
59
-*   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 2.8.17-2
60
--   Use standard configure macros
61
-*   Wed Apr 12 2017 Xiaolin Li <xiaolinl@vmware.com>  2.8.17-1
62
--   Initial build.  First version
57
+* Tue Sep 25 2018 Ajay Kaher <akaher@vmware.com> 2.8.17-3
58
+- adding patch to fix lemon segmentation fault
59
+* Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 2.8.17-2
60
+- Use standard configure macros
61
+* Wed Apr 12 2017 Xiaolin Li <xiaolinl@vmware.com>  2.8.17-1
62
+- Initial build.  First version
... ...
@@ -26,12 +26,11 @@ The strace graph is perl script, It displays a graph of invoked subprocesses, an
26 26
 useful for finding out what complex commands do
27 27
 
28 28
 %prep
29
-%setup -q
29
+%autosetup -p1
30 30
 
31 31
 %build
32 32
 %ifarch aarch64
33
-%configure          \
34
-    --disable-mpers \
33
+%configure --disable-mpers
35 34
 %else
36 35
 %configure
37 36
 %endif
... ...
@@ -43,11 +42,11 @@ sed -i 's/struct ucontext/ucontext_t/g' linux/arm/arch_sigreturn.c
43 43
 make %{?_smp_mflags}
44 44
 
45 45
 %install
46
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
47
-make install DESTDIR=%{buildroot}
46
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
47
+make install DESTDIR=%{buildroot} %{?_smp_mflags}
48 48
 
49 49
 %check
50
-make -k check
50
+make -k check %{?_smp_mflags}
51 51
 
52 52
 %clean
53 53
 rm -rf %{buildroot}/*
... ...
@@ -29,7 +29,7 @@ sed -i '/stdlib.h/a #include <stdint.h>' src/libstrongswan/utils/utils.h &&
29 29
 make %{?_smp_mflags}
30 30
 
31 31
 %install
32
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
32
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
33 33
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
34 34
 find %{buildroot} -name '*.la' -delete
35 35
 find %{buildroot} -name '*.a' -delete
... ...
@@ -64,29 +64,29 @@ rm -rf %{buildroot}/*
64 64
 %{_unitdir}/strongswan.service
65 65
 
66 66
 %changelog
67
-*   Mon Oct 25 2021 Tapas Kundu <tkundu@vmware.com> 5.9.0-3
68
--   Fix CVE-2021-41991 and CVE-2021-41990.
69
-*   Wed Jun 09 2021 Tapas Kundu <tkundu@vmware.com> 5.9.0-2
70
--   Enable systemd
71
-*   Mon Aug 10 2020 Gerrit Photon <photon-checkins@vmware.com> 5.9.0-1
72
--   Automatic Version Bump
73
-*   Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 5.8.4-1
74
--   Automatic Version Bump
75
-*   Fri Dec 21 2018 Keerthana K <keerthanak@vmware.com> 5.6.3-3
76
--   Fix for CVE-2018-16151 and CVE-2018-16152.
77
-*   Thu Dec 06 2018 Keerthana K <keerthanak@vmware.com> 5.6.3-2
78
--   Fixed make check failures.
79
-*   Mon Sep 17 2018 Tapas Kundu <tkundu@vmware.com> 5.6.3-1
80
--   Updated to 5.6.3 release
81
-*   Thu Aug 16 2018 Tapas Kundu <tkundu@vmware.com> 5.5.2-5
82
--   Fix for CVE-2018-10811
83
-*   Mon Jul 23 2018 Ajay Kaher <akaher@vmware.com> 5.5.2-4
84
--   Fix CVE-2018-5388
85
-*   Tue Oct 10 2017 Dheeraj Shetty <dheerajs@vmware.com> 5.5.2-3
86
--   Fix CVE-2017-11185 CVE-2017-9022 and CVE-2017-9023
87
-*   Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 5.5.2-2
88
--   Fix compilation issue for glibc-2.26
89
-*   Wed Apr 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 5.5.2-1
90
--   Update to version 5.5.2
91
-*   Wed Dec 21 2016 Xiaolin Li <xiaolinl@vmware.com>  5.5.1-1
92
--   Initial build.
67
+* Mon Oct 25 2021 Tapas Kundu <tkundu@vmware.com> 5.9.0-3
68
+- Fix CVE-2021-41991 and CVE-2021-41990.
69
+* Wed Jun 09 2021 Tapas Kundu <tkundu@vmware.com> 5.9.0-2
70
+- Enable systemd
71
+* Mon Aug 10 2020 Gerrit Photon <photon-checkins@vmware.com> 5.9.0-1
72
+- Automatic Version Bump
73
+* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 5.8.4-1
74
+- Automatic Version Bump
75
+* Fri Dec 21 2018 Keerthana K <keerthanak@vmware.com> 5.6.3-3
76
+- Fix for CVE-2018-16151 and CVE-2018-16152.
77
+* Thu Dec 06 2018 Keerthana K <keerthanak@vmware.com> 5.6.3-2
78
+- Fixed make check failures.
79
+* Mon Sep 17 2018 Tapas Kundu <tkundu@vmware.com> 5.6.3-1
80
+- Updated to 5.6.3 release
81
+* Thu Aug 16 2018 Tapas Kundu <tkundu@vmware.com> 5.5.2-5
82
+- Fix for CVE-2018-10811
83
+* Mon Jul 23 2018 Ajay Kaher <akaher@vmware.com> 5.5.2-4
84
+- Fix CVE-2018-5388
85
+* Tue Oct 10 2017 Dheeraj Shetty <dheerajs@vmware.com> 5.5.2-3
86
+- Fix CVE-2017-11185 CVE-2017-9022 and CVE-2017-9023
87
+* Thu Aug 24 2017 Alexey Makhalov <amakhalov@vmware.com> 5.5.2-2
88
+- Fix compilation issue for glibc-2.26
89
+* Wed Apr 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 5.5.2-1
90
+- Update to version 5.5.2
91
+* Wed Dec 21 2016 Xiaolin Li <xiaolinl@vmware.com>  5.5.1-1
92
+- Initial build.
... ...
@@ -7,13 +7,17 @@ URL:            https://www.sudo.ws/
7 7
 Group:          System Environment/Security
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        http://www.sudo.ws/sudo/dist/%{name}-%{version}.tar.gz
11
-%define sha1    sudo=1e9fccda4beccca811ecb48866776388c9c377ae
12
+%define sha1    %{name}=1e9fccda4beccca811ecb48866776388c9c377ae
13
+
12 14
 BuildRequires:  man-db
13 15
 BuildRequires:  Linux-PAM-devel
14 16
 BuildRequires:  sed
17
+
15 18
 Requires:       Linux-PAM
16 19
 Requires:       shadow
20
+
17 21
 Patch0:         CVE-2021-3156_1.patch
18 22
 Patch1:         CVE-2021-3156_2.patch
19 23
 Patch2:         CVE-2021-3156_3.patch
... ...
@@ -24,15 +28,27 @@ The Sudo package allows a system administrator to give certain users (or groups
24 24
 the ability to run some (or all) commands as root or another user while logging the commands and arguments.
25 25
 
26 26
 %prep
27
-%setup -q
28
-%patch0 -p1
29
-%patch1 -p1
30
-%patch2 -p1
31
-%patch3 -p1
27
+%autosetup -p1
32 28
 
33 29
 %build
34
-%configure \
30
+sh ./configure --host=%{_host} --build=%{_build} \
31
+    CFLAGS="%{optflags}" \
32
+    CXXFLAGS="%{optflags}" \
33
+    --program-prefix= \
34
+    --disable-dependency-tracking \
35
+    --prefix=%{_prefix} \
36
+    --exec-prefix=%{_prefix} \
37
+    --bindir=%{_bindir} \
38
+    --sbindir=%{_sbindir} \
39
+    --sysconfdir=%{_sysconfdir} \
40
+    --datadir=%{_datadir} \
41
+    --includedir=%{_includedir} \
42
+    --libdir=%{_libdir} \
35 43
     --libexecdir=%{_libdir} \
44
+    --localstatedir=%{_localstatedir} \
45
+    --sharedstatedir=%{_sharedstatedir} \
46
+    --mandir=%{_mandir} \
47
+    --infodir=%{_infodir} \
36 48
     --docdir=%{_docdir}/%{name}-%{version} \
37 49
     --with-all-insults \
38 50
     --with-env-editor \
... ...
@@ -42,8 +58,8 @@ the ability to run some (or all) commands as root or another user while logging
42 42
 make %{?_smp_mflags}
43 43
 
44 44
 %install
45
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
46
-make install DESTDIR=%{buildroot}
45
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
46
+make install DESTDIR=%{buildroot} %{?_smp_mflags}
47 47
 install -v -dm755 %{buildroot}/%{_docdir}/%{name}-%{version}
48 48
 find %{buildroot}/%{_libdir} -name '*.la' -delete
49 49
 find %{buildroot}/%{_libdir} -name '*.so~' -delete
... ...
@@ -99,52 +115,52 @@ rm -rf %{buildroot}/*
99 99
 %exclude  /etc/sudoers.dist
100 100
 
101 101
 %changelog
102
-*   Fri Jan 29 2021 Shreyas B. <shreyasb@vmware.com> 1.9.5-1
103
--   Upgrade sudo to v1.9.5
104
-*   Thu Jan 21 2021 Tapas Kundu <tkundu@vmware.com> 1.8.30-3
105
--   Fix CVE-2021-3156
106
-*   Thu Apr 02 2020 Shreyas B. <shreyasb@vmware.com> 1.8.30-2
107
--   Fix - Set RLIMIT_CORE to zero when it's failed to set to RLIM_INFINITY.
108
-*   Mon Jan 06 2020 Shreyas B. <shreyasb@vmware.com> 1.8.30-1
109
--   Upgrade sudo to v1.8.30 for fixing the CVE-2019-19232 & CVE-2019-19234.
110
-*   Tue Oct 15 2019 Shreyas B. <shreyasb@vmware.com> 1.8.23-2
111
--   Fix for CVE-2019-14287.
112
-*   Tue Sep 11 2018 Keerthana K <keerthanak@vmware.com> 1.8.23-1
113
--   Update to version 1.8.23.
114
-*   Thu Mar 01 2018 Anish Swaminathan <anishs@vmware.com> 1.8.20p2-5
115
--   Move includedir sudoers.d to end of sudoers file
116
-*   Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-4
117
--   No direct toybox dependency, shadow depends on toybox
118
-*   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-3
119
--   Requires shadow or toybox
120
-*   Fri Jul 07 2017 Chang Lee <changlee@vmware.com> 1.8.20p2-2
121
--   Including /usr/lib/tmpfiles.d/sudo.conf from %files
122
-*   Thu Jun 15 2017 Kumar Kaushik <kaushikk@vmware.com> 1.8.20p2-1
123
--   Udating version to 1.8.20p2, fixing CVE-2017-1000367 and CVE-2017-1000368
124
-*   Wed Apr 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.19p2-1
125
--   Update to version 1.8.19p2
126
-*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.8.18p1-3
127
--   BuildRequires Linux-PAM-devel
128
-*   Thu Oct 20 2016 Alexey Makhalov <amakhalov@vmware.com> 1.8.18p1-2
129
--   Remove --with-pam-login to use /etc/pam.d/sudo for `sudo -i`
130
--   Fix groupadd wheel warning during the %post action
131
-*   Tue Oct 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.8.18p1-1
132
--   Update to 1.8.18p1
133
-*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 1.8.15-4
134
--   Modified %check
135
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-3
136
--   GA - Bump release of all rpms
137
-*   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-2
138
--   Fix for upgrade issues
139
-*   Wed Jan 20 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-1
140
--   Update to 1.8.15-1.
141
-*   Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 1.8.11p1-5
142
--   Edit post script.
143
-*   Mon Jun 22 2015 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-4
144
--   Fixing permissions on /etc/sudoers file
145
-*   Fri May 29 2015 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-3
146
--   Adding sudo configuration and PAM config file
147
-*   Wed May 27 2015 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-2
148
--   Adding PAM support
149
-*   Thu Oct 09 2014 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-1
150
--   Initial build.  First version
102
+* Fri Jan 29 2021 Shreyas B. <shreyasb@vmware.com> 1.9.5-1
103
+- Upgrade sudo to v1.9.5
104
+* Thu Jan 21 2021 Tapas Kundu <tkundu@vmware.com> 1.8.30-3
105
+- Fix CVE-2021-3156
106
+* Thu Apr 02 2020 Shreyas B. <shreyasb@vmware.com> 1.8.30-2
107
+- Fix - Set RLIMIT_CORE to zero when it's failed to set to RLIM_INFINITY.
108
+* Mon Jan 06 2020 Shreyas B. <shreyasb@vmware.com> 1.8.30-1
109
+- Upgrade sudo to v1.8.30 for fixing the CVE-2019-19232 & CVE-2019-19234.
110
+* Tue Oct 15 2019 Shreyas B. <shreyasb@vmware.com> 1.8.23-2
111
+- Fix for CVE-2019-14287.
112
+* Tue Sep 11 2018 Keerthana K <keerthanak@vmware.com> 1.8.23-1
113
+- Update to version 1.8.23.
114
+* Thu Mar 01 2018 Anish Swaminathan <anishs@vmware.com> 1.8.20p2-5
115
+- Move includedir sudoers.d to end of sudoers file
116
+* Tue Oct 10 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-4
117
+- No direct toybox dependency, shadow depends on toybox
118
+* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.20p2-3
119
+- Requires shadow or toybox
120
+* Fri Jul 07 2017 Chang Lee <changlee@vmware.com> 1.8.20p2-2
121
+- Including /usr/lib/tmpfiles.d/sudo.conf from %files
122
+* Thu Jun 15 2017 Kumar Kaushik <kaushikk@vmware.com> 1.8.20p2-1
123
+- Udating version to 1.8.20p2, fixing CVE-2017-1000367 and CVE-2017-1000368
124
+* Wed Apr 12 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.19p2-1
125
+- Update to version 1.8.19p2
126
+* Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.8.18p1-3
127
+- BuildRequires Linux-PAM-devel
128
+* Thu Oct 20 2016 Alexey Makhalov <amakhalov@vmware.com> 1.8.18p1-2
129
+- Remove --with-pam-login to use /etc/pam.d/sudo for `sudo -i`
130
+- Fix groupadd wheel warning during the %post action
131
+* Tue Oct 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.8.18p1-1
132
+- Update to 1.8.18p1
133
+* Tue Oct 04 2016 ChangLee <changlee@vmware.com> 1.8.15-4
134
+- Modified %check
135
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-3
136
+- GA - Bump release of all rpms
137
+* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-2
138
+- Fix for upgrade issues
139
+* Wed Jan 20 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-1
140
+- Update to 1.8.15-1.
141
+* Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 1.8.11p1-5
142
+- Edit post script.
143
+* Mon Jun 22 2015 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-4
144
+- Fixing permissions on /etc/sudoers file
145
+* Fri May 29 2015 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-3
146
+- Adding sudo configuration and PAM config file
147
+* Wed May 27 2015 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-2
148
+- Adding PAM support
149
+* Thu Oct 09 2014 Divya Thaluru <dthaluru@vmware.com> 1.8.11p1-1
150
+- Initial build.  First version
... ...
@@ -103,7 +103,7 @@ $(dirname $(gcc -print-prog-name=cc1))/install-tools/mkheaders
103 103
 make %{?_smp_mflags}
104 104
 
105 105
 %install
106
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
106
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
107 107
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
108 108
 find %{buildroot} -name "*.la" -exec rm -f {} \;
109 109
 rm %{buildroot}/%{_libdir}/systemd/system/syslog-ng@.service
... ...
@@ -8,8 +8,10 @@ License:        LGPLv2+
8 8
 Group:          System Environment/Libraries
9 9
 Vendor:         VMware, Inc.
10 10
 Distribution:   Photon
11
+
11 12
 Source0:        http://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{version}-src.tar.gz
12 13
 %define sha1    tcl-core=8a51f3cf987e75f859b5e378f27d9182030cc3f7
14
+
13 15
 Patch0:         tcl-CVE-2021-35331.patch
14 16
 
15 17
 BuildRequires:  cmake
... ...
@@ -43,8 +45,8 @@ cd unix
43 43
 make %{?_smp_mflags}
44 44
 
45 45
 %install
46
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
47
-make DESTDIR=%{buildroot} install -C unix
46
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
47
+make DESTDIR=%{buildroot} install -C unix %{?_smp_mflags}
48 48
 
49 49
 ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
50 50
 
... ...
@@ -71,10 +73,9 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix
71 71
 
72 72
 %check
73 73
 cd unix
74
-make test
74
+make test %{?_smp_mflags}
75 75
 
76
-%post -p /sbin/ldconfig
77
-%postun -p /sbin/ldconfig
76
+%ldconfig_scriptlets
78 77
 
79 78
 %files
80 79
 %defattr(-,root,root)
... ...
@@ -98,15 +99,15 @@ make test
98 98
 %exclude %{_mandir}/man3/Thread.3.gz
99 99
 
100 100
 %changelog
101
-*   Thu Jul 15 2021 Nitesh Kumar <kunitesh@vmware.com> 8.6.10-2
102
--   Fix CVE-2021-35331
103
-*   Fri Jul 24 2020 Gerrit Photon <photon-checkins@vmware.com> 8.6.10-1
104
--   Automatic Version Bump
105
-*   Fri Sep 07 2018 Michelle Wang <michellew@vmware.com> 8.6.8-1
106
--   Update version to 8.6.8.
107
-*   Thu Jul 13 2017 Alexey Makhalov <amakhalov@vmware.com>  8.6.6-2
108
--   Package more files (private headers, etc). Took install section from
101
+* Thu Jul 15 2021 Nitesh Kumar <kunitesh@vmware.com> 8.6.10-2
102
+- Fix CVE-2021-35331
103
+* Fri Jul 24 2020 Gerrit Photon <photon-checkins@vmware.com> 8.6.10-1
104
+- Automatic Version Bump
105
+* Fri Sep 07 2018 Michelle Wang <michellew@vmware.com> 8.6.8-1
106
+- Update version to 8.6.8.
107
+* Thu Jul 13 2017 Alexey Makhalov <amakhalov@vmware.com>  8.6.6-2
108
+- Package more files (private headers, etc). Took install section from
109 109
     Fedora: http://pkgs.fedoraproject.org/cgit/rpms/tcl.git/tree/tcl.spec
110
--   Move init.tcl and other *.tck files to the main package
111
-*   Wed Apr 12 2017 Xiaolin Li <xiaolinl@vmware.com>  8.6.6-1
112
--   Initial build.  First version
110
+- Move init.tcl and other *.tck files to the main package
111
+* Wed Apr 12 2017 Xiaolin Li <xiaolinl@vmware.com>  8.6.6-1
112
+- Initial build.  First version
... ...
@@ -7,22 +7,23 @@ URL:            http://mama.indstate.edu/users/ice/tree/
7 7
 Group:          Applications
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
+
10 11
 Source0:        http://mama.indstate.edu/users/ice/tree/src/tree-%{version}.tgz
11
-%define sha1    tree=06934bf1f6a92af4eaec6bc61e568cec5e068ba1
12
+%define sha1    %{name}=06934bf1f6a92af4eaec6bc61e568cec5e068ba1
12 13
 
13 14
 %description
14 15
 Tree is a recursive directory listing command that produces a depth indented listing of files, which is colorized ala dircolors if the LS_COLORS environment variable is set and output is to tty. Tree has been ported and reported to work under the following operating systems: Linux, FreeBSD, OS X, Solaris, HP/UX, Cygwin, HP Nonstop and OS/2.
15 16
 
16 17
 %prep
17
-%setup -q
18
+%autosetup -p1
18 19
 
19 20
 %build
20 21
 make %{?_smp_mflags}
21 22
 
22 23
 %install
23
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
24
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
24 25
 make install BINDIR=%{buildroot}%{_bindir} \
25
-             MANDIR=%{buildroot}%{_mandir}/man1
26
+             MANDIR=%{buildroot}%{_mandir}/man1 %{?_smp_mflags}
26 27
 
27 28
 %files
28 29
 %defattr(-,root,root)
... ...
@@ -30,9 +31,7 @@ make install BINDIR=%{buildroot}%{_bindir} \
30 30
 %{_mandir}/man1/*
31 31
 
32 32
 %changelog
33
-*   Wed Jul 15 2020 Gerrit Photon <photon-checkins@vmware.com> 1.8.0-1
34
--   Automatic Version Bump
35
-*   Thu Dec 01 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.0-1
36
--   Add tree package.
37
-
38
-
33
+* Wed Jul 15 2020 Gerrit Photon <photon-checkins@vmware.com> 1.8.0-1
34
+- Automatic Version Bump
35
+* Thu Dec 01 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.0-1
36
+- Add tree package.
... ...
@@ -43,7 +43,7 @@ sh ./configure --host=%{_host} --build=%{_build} \
43 43
     --with-ssl=openssl
44 44
 make %{?_smp_mflags}
45 45
 %install
46
-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
46
+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
47 47
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
48 48
 install -vdm 755 %{buildroot}/etc
49 49
 cat >> %{buildroot}/etc/wgetrc <<-EOF