@@ -1,7 +1,7 @@

 Summary:        fork of the original IJG libjpeg which uses SIMD.

 Name:           libjpeg-turbo

 Version:        2.1.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        IJG

 URL:            http://sourceforge.net/projects/libjpeg-turbo

 Group:          System Environment/Libraries

@@ -64,6 +64,8 @@ find %{buildroot} -name "*.la" -delete

 %{_libdir}/pkgconfig/*.pc

 %changelog

+* Mon Apr 17 2023 Nitesh Kumar <kunitesh@vmware.com> 2.1.4-2

+- Bump version as a part of nasm v2.16.01 upgrade

 * Wed Aug 17 2022 Gerrit Photon <photon-checkins@vmware.com> 2.1.4-1

 - Automatic Version Bump

 * Fri Jun 17 2022 Shreenidhi Shedi <sshedi@vmware.com> 2.1.3-2

deleted file mode 100644

@@ -1,26 +0,0 @@

-From aa9324ae33870cd3b9d90251e380a6d704651a60 Mon Sep 17 00:00:00 2001

-From: Damjan Marion <damarion@cisco.com>

-Date: Mon, 17 Sep 2018 09:25:35 +0200

-Subject: [PATCH] Fix gcc-8 compilation

-

-Signed-off-by: Damjan Marion <damarion@cisco.com>

- include/nasmlib.h | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/include/nasmlib.h b/include/nasmlib.h

-index 79e866b..5f07d77 100644

-+++ b/include/nasmlib.h

-@@ -191,7 +191,7 @@ int64_t readstrnum(char *str, int length, bool *warn);

-  * seg_init: Initialise the segment-number allocator.

-  * seg_alloc: allocate a hitherto unused segment number.

-  */

--void pure_func seg_init(void);

-+int32_t pure_func seg_init(void);

- int32_t pure_func seg_alloc(void);

- 

- /*

-2.17.1

-

@@ -1,6 +1,6 @@

 Summary:        Netwide Assembler.

 Name:           nasm

-Version:        2.15.05

+Version:        2.16.01

 Release:        1%{?dist}

 License:        BSD

 URL:            http://www.nasm.us

@@ -8,10 +8,11 @@ Group:          System Environment/Libraries

 Vendor:         VMware, Inc.

 Distribution:   Photon

 BuildArch:      x86_64

-Source0:        http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz

-%define sha1    nasm=d338409a03fc6d1508102881a675a00275fcb879

-Source1:        http://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05-xdoc.tar.xz

-%define sha1    nasm-%{version}-xdoc=3ea5c4fd84c9611a9c0378bebdbd1463413a3191

+

+Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}.tar.xz

+%define sha512  %{name}=51fccb5639ce019d9c423c0f279750ffbd74c64cd41dd3b185d1aa1a1aaed79c5d3cd8d4bebbc13ee249a375ed27457ea2abde1a4dbb24d354598fffd1254833

+Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/nasm-%{version}-xdoc.tar.xz

+%define sha512  %{name}-%{version}-xdoc=ec260c0a537b0172e6f2ac17118c744db8743886388a112e99bab1b8c8fee91547dade69dcfe9a15289b2b1a428e8c009048a468f7982b03dd4506abcafc0787

 %description

 NASM (Netwide Assembler) is an 80x86 assembler designed for portability and modularity.

@@ -23,16 +24,8 @@ Summary:        Detailed manual for the Netwide Assembler

 %description    doc

 Extensive documentation for the Netwide Assembler (NASM) in HTML and PDF formats.

-%package        rdoff

-Summary:        Tools for the RDOFF binary format, sometimes used with NASM.

-

-%description    rdoff

-Tools for the operating-system independent RDOFF binary format, which

-is sometimes used with the Netwide Assembler (NASM).  These tools

-include linker, library manager, loader, and information dump.

-

 %prep

-%setup -qn nasm-%{version}

+%autosetup -n %{name}-%{version}

 cd ../

 tar xf %{SOURCE1} --no-same-owner

@@ -46,7 +39,7 @@ rm -rf %{buildroot}

 mkdir -p %{buildroot}/%{_bindir}

 mkdir -p %{buildroot}/%{_mandir}/man1

 mkdir -p %{buildroot}/%{_docdir}

-make INSTALLROOT=%{buildroot} install install_rdf

+make INSTALLROOT=%{buildroot} install %{?_smp_mflags}

 # copy binaries for nasm

 cp nasm %{buildroot}/%{_bindir}/

@@ -54,16 +47,6 @@ cp ndisasm %{buildroot}/%{_bindir}/

 cp nasm.1* %{buildroot}/%{_mandir}/man1/

 cp ndisasm.1* %{buildroot}/%{_mandir}/man1/

-# copy binaries for nasm-rdoff

-cp rdoff/ldrdf %{buildroot}/%{_bindir}/

-cp rdoff/rdf2* %{buildroot}/%{_bindir}/

-rm %{buildroot}/%{_bindir}/rdf2*.*

-cp rdoff/rdfdump %{buildroot}/%{_bindir}/

-cp rdoff/rdflib %{buildroot}/%{_bindir}/

-cp rdoff/rdx %{buildroot}/%{_bindir}/

-cp rdoff/ldrdf.1* %{buildroot}/%{_mandir}/man1/

-cp rdoff/rd*.1* %{buildroot}/%{_mandir}/man1/

-

 # copy doc files

 mkdir -p %{buildroot}/%{_docdir}/html

 cp -r doc/html/*.html %{buildroot}/%{_docdir}/html/

@@ -87,27 +70,16 @@ make %{?_smp_mflags} -k test

 %{_docdir}/*.txt

 %{_docdir}/*.ps

-%files rdoff

-%{_bindir}/ldrdf

-%{_bindir}/rdf2bin

-%{_bindir}/rdf2com

-%{_bindir}/rdf2ihx

-%{_bindir}/rdf2ith

-%{_bindir}/rdf2srec

-%{_bindir}/rdfdump

-%{_bindir}/rdflib

-%{_bindir}/rdx

-%{_mandir}/man1/ldrdf.1*

-%{_mandir}/man1/rd*.1*

-

 %changelog

-*   Thu Jul 16 2020 Gerrit Photon <photon-checkins@vmware.com> 2.15.05-1

--   Automatic Version Bump

-*   Wed Apr 01 2020 Alexey Makhalov <amakhalov@vmware.com> 2.13.03-3

--   Fix compilation issue with gcc-8.4.0

-*   Thu Feb 28 2019 Keerthana K <keerthanak@vmware.com> 2.13.03-2

--   Adding BuildArch.

-*   Wed Sep 12 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 2.13.03-1

--   Upgrade version to 2.13.03

-*   Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 2.12.02-1

--   Initial version

+* Mon Apr 17 2023 Nitesh Kumar <kunitesh@vmware.com> 2.16.01-1

+- Upgrade to v2.16.01 to fix CVE-2021-45257

+* Thu Jul 16 2020 Gerrit Photon <photon-checkins@vmware.com> 2.15.05-1

+- Automatic Version Bump

+* Wed Apr 01 2020 Alexey Makhalov <amakhalov@vmware.com> 2.13.03-3

+- Fix compilation issue with gcc-8.4.0

+* Thu Feb 28 2019 Keerthana K <keerthanak@vmware.com> 2.13.03-2

+- Adding BuildArch.

+* Wed Sep 12 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 2.13.03-1

+- Upgrade version to 2.13.03

+* Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 2.12.02-1

+- Initial version

@@ -1,14 +1,14 @@

 %global security_hardening none

-Summary:    Simple kernel loader which boots from a FAT filesystem

-Name:       syslinux

-Version:    6.04

-Release:    8%{?dist}

-License:    GPLv2+

-URL:        http://www.syslinux.org

-Group:      Applications/System

-Vendor:     VMware, Inc.

-Distribution:   Photon

+Summary:      Simple kernel loader which boots from a FAT filesystem

+Name:         syslinux

+Version:      6.04

+Release:      9%{?dist}

+License:      GPLv2+

+URL:          http://www.syslinux.org

+Group:        Applications/System

+Vendor:       VMware, Inc.

+Distribution: Photon

 Source0:    https://www.kernel.org/pub/linux/utils/boot/%{name}/Testing/%{version}/%{name}-%{version}-pre1.tar.xz

 %define sha512  %{name}=7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98

@@ -87,6 +87,8 @@ rm %{buildroot}%{_bindir}/sha1pass

 %{_datadir}/%{name}/com32/*

 %changelog

+* Mon Apr 17 2023 Nitesh Kumar <kunitesh@vmware.com> 6.04-9

+- Bump version as a part of nasm v2.16.01 upgrade

 * Mon Jul 11 2022 Shreenidhi Shedi <sshedi@vmware.com> 6.04-8

 - Fix devel requires

 * Mon Feb 28 2022 Shreenidhi Shedi <sshedi@vmware.com> 6.04-7