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

 Summary:        cpio archive utility

 Name:           cpio

 Version:        2.13

-Release:        7%{?dist}

+Release:        8%{?dist}

 License:        GPLv3+

 URL:            http://www.gnu.org/software/cpio

 Group:          System Environment/System utilities

@@ -72,6 +72,8 @@ make %{?_smp_mflags} check

 %defattr(-,root,root)

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.13-8

+- Bump version as a part of lua upgrade

 * Wed Mar 29 2023 Shivani Agarwal <shivania2@vmware.com> 2.13-7

 - Updated newca new archive format patch

 * Mon Oct 04 2021 Alexey Makhalov <amakhalov@vmware.com> 2.13-6

@@ -5,7 +5,7 @@

 Summary:        The Behavioral Activity Monitor With Container Support

 Name:           falco

 Version:        0.32.2

-Release:        4%{?kernelsubrelease}%{?dist}

+Release:        5%{?kernelsubrelease}%{?dist}

 License:        GPLv2

 URL:            https://falco.org

 Group:          Applications/System

@@ -108,6 +108,8 @@ rm -rf %{buildroot}/*

 %{_includedir}/falcosecurity/*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.32.2-5

+- Bump version as a part of lua upgrade

 * Sat Jun 17 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.32.2-4

 - Bump version as a part of protobuf upgrade

 * Fri Jun 09 2023 Nitesh Kumar <kunitesh@vmware.com> 0.32.2-3

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

 Summary:        Gnuplot is a portable command-line driven graphing utility.

 Name:           gnuplot

 Version:        5.4.5

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Freeware

 URL:            http://www.gnuplot.info

 Group:          Applications

@@ -39,6 +39,8 @@ make check %{?_smp_mflags}

 %{_datadir}/*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.4.5-3

+- Bump version as a part of lua upgrade

 * Thu Dec 22 2022 Shreenidhi Shedi <sshedi@vmware.com> 5.4.5-2

 - Bump version as a part of readline upgrade

 * Fri Oct 28 2022 Gerrit Photon <photon-checkins@vmware.com> 5.4.5-1

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

 Summary:        A fast, reliable HA, load balancing, and proxy solution.

 Name:           haproxy

 Version:        2.7.3

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPL

 URL:            http://www.haproxy.org

 Group:          Applications/System

@@ -62,6 +62,8 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr

 %{_mandir}/*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.7.3-2

+- Bump version as a part of lua upgrade

 * Thu May 18 2023 Nitesh Kumar <kunitesh@vmware.com> 2.7.3-1

 - Version upgrade to v2.7.3 to fix CVE-2023-25725

 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.7.0-3

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

 Summary:        The Apache HTTP Server

 Name:           httpd

 Version:        2.4.56

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Apache License 2.0

 URL:            http://httpd.apache.org

 Group:          Applications/System

@@ -198,6 +198,8 @@ fi

 %{_bindir}/dbmmanage

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.4.56-2

+- Bump version as a part of lua upgrade

 * Mon Apr 03 2023 Nitesh Kumar <kunitesh@vmware.com> 2.4.56-1

 - Upgrade to v2.4.56 to fix following CVE's:

 - CVE-2023-25690, and CVE-2023-27522

@@ -3,7 +3,7 @@

 Summary:        A next generation, high-performance debugger.

 Name:           lldb

 Version:        15.0.7

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

 Group:          Development/Tools

@@ -100,6 +100,8 @@ rm -rf %{buildroot}/*

 %{python3_sitelib}/*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 15.0.7-5

+- Bump version as a part of lua upgrade

 * Fri Jun 09 2023 Nitesh Kumar <kunitesh@vmware.com> 15.0.7-4

 - Bump version as a part of ncurses upgrade to v6.4

 * Wed Apr 19 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 15.0.7-3

deleted file mode 100644

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

-From 469791491728f1c8f80199a4879a6027ff096740 Mon Sep 17 00:00:00 2001

-From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>

-Date: Sat, 16 Apr 2022 11:56:22 +0530

-Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is <const>

-

-[sshedi: ported the changes as per the needs of Photon]

-Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

- src/lparser.c | 1 +

- 1 file changed, 1 insertion(+)

-

-diff --git a/src/lparser.c b/src/lparser.c

-index 3abe3d7..a5cd552 100644

-+++ b/src/lparser.c

-@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) {

-     expdesc key;

-     singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */

-     lua_assert(var->k != VVOID);  /* this one must exist */

-+    luaK_exp2anyregup(fs, var);  /* but could be a constant */

-     codestring(&key, varname);  /* key is variable name */

-     luaK_indexed(fs, var, &key);  /* env[varname] */

-   }

-2.35.1

-

deleted file mode 100644

@@ -1,62 +0,0 @@

-From 968b5d29e97504462124dbb0263db7a12aa46a93 Mon Sep 17 00:00:00 2001

-From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>

-Date: Fri, 20 May 2022 13:14:33 -0300

-Subject: [PATCH] Save stack space while handling errors

-

-Because error handling (luaG_errormsg) uses slots from EXTRA_STACK,

-and some errors can recur (e.g., string overflow while creating an

-error message in 'luaG_runerror', or a C-stack overflow before calling

-the message handler), the code should use stack slots with parsimony.

-

-This commit fixes the bug "Lua-stack overflow when C stack overflows

-while handling an error".

- src/ldebug.c | 5 ++++-

- src/lvm.c    | 6 ++++--

- 2 files changed, 8 insertions(+), 3 deletions(-)

-

-diff --git a/src/ldebug.c b/src/ldebug.c

-index a716d95..fa15eaf 100644

-+++ b/src/ldebug.c

-@@ -824,8 +824,11 @@ l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {

-   va_start(argp, fmt);

-   msg = luaO_pushvfstring(L, fmt, argp);  /* format message */

-   va_end(argp);

--  if (isLua(ci))  /* if Lua function, add source:line information */

-+  if (isLua(ci)) {  /* if Lua function, add source:line information */

-     luaG_addinfo(L, msg, ci_func(ci)->p->source, getcurrentline(ci));

-+    setobjs2s(L, L->top - 2, L->top - 1);  /* remove 'msg' from the stack */

-+    L->top--;

-+  }

-   luaG_errormsg(L);

- }

- 

-diff --git a/src/lvm.c b/src/lvm.c

-index 2ec3440..154a626 100644

-+++ b/src/lvm.c

-@@ -656,8 +656,10 @@ void luaV_concat (lua_State *L, int total) {

-       /* collect total length and number of strings */

-       for (n = 1; n < total && tostring(L, s2v(top - n - 1)); n++) {

-         size_t l = vslen(s2v(top - n - 1));

--        if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl))

-+        if (l_unlikely(l >= (MAX_SIZE/sizeof(char)) - tl)) {

-+          L->top = top - total;  /* pop strings to avoid wasting stack */

-           luaG_runerror(L, "string length overflow");

-+        }

-         tl += l;

-       }

-       if (tl <= LUAI_MAXSHORTLEN) {  /* is result a short string? */

-@@ -672,7 +674,7 @@ void luaV_concat (lua_State *L, int total) {

-       setsvalue2s(L, top - n, ts);  /* create result */

-     }

-     total -= n-1;  /* got 'n' strings to create 1 new */

--    L->top -= n-1;  /* popped 'n' strings and pushed one */

-+    L->top = top - (n - 1);  /* popped 'n' strings and pushed one */

-   } while (total > 1);  /* repeat until only 1 result left */

- }

- 

-2.23.3

-

deleted file mode 100644

@@ -1,69 +0,0 @@

-From 3a025d1e34d79f8ea8c15ce55aad43b5b766c91f Mon Sep 17 00:00:00 2001

-From: Shreenidhi Shedi <sshedi@vmware.com>

-Date: Thu, 3 Dec 2020 16:49:07 +0530

-Subject: [PATCH] shared-library-patch

-

-Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

- Makefile     |  2 +-

- src/Makefile | 10 ++++++++--

- 2 files changed, 9 insertions(+), 3 deletions(-)

-

-diff --git a/Makefile b/Makefile

-index 1797df9..95eae89 100644

-+++ b/Makefile

-@@ -52,7 +52,7 @@ R= $V.1

- all:	$(PLAT)

- 

- $(PLATS) help test clean:

--	@cd src && $(MAKE) $@

-+	@cd src && $(MAKE) $@ V=$(V) R=$(R)

- 

- install: dummy

- 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)

-diff --git a/src/Makefile b/src/Makefile

-index 514593d..3b71497 100644

-+++ b/src/Makefile

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

- PLAT= guess

- 

- CC= gcc -std=gnu99

--CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)

-+CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)

- LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)

- LIBS= -lm $(SYSLIBS) $(MYLIBS)

- 

-@@ -33,6 +33,7 @@ CMCFLAGS= -Os

- PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris

- 

- LUA_A=	liblua.a

-+LUA_SO= liblua.so

- CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o

- LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o

- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)

-@@ -44,7 +45,7 @@ LUAC_T=	luac

- LUAC_O=	luac.o

- 

- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)

--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)

-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)

- ALL_A= $(LUA_A)

- 

- # Targets start here.

-@@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O)

- 	$(AR) $@ $(BASE_O)

- 	$(RANLIB) $@

- 

-+$(LUA_SO): $(CORE_O) $(LIB_O)

-+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)

-+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)

-+	ln -sf $(LUA_SO).$(R) $(LUA_SO)

-+

- $(LUA_T): $(LUA_O) $(LUA_A)

- 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

- 

-2.17.1

-

new file mode 100644

@@ -0,0 +1,69 @@

+From 3a025d1e34d79f8ea8c15ce55aad43b5b766c91f Mon Sep 17 00:00:00 2001

+From: Shreenidhi Shedi <sshedi@vmware.com>

+Date: Thu, 3 Dec 2020 16:49:07 +0530

+Subject: [PATCH] shared-library-patch

+

+Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

+---

+ Makefile     |  2 +-

+ src/Makefile | 10 ++++++++--

+ 2 files changed, 9 insertions(+), 3 deletions(-)

+

+diff --git a/Makefile b/Makefile

+index 1797df9..95eae89 100644

+--- a/Makefile

+@@ -52,7 +52,7 @@ R= $V.1

+ all:	$(PLAT)

+ 

+ $(PLATS) help test clean:

+-	@cd src && $(MAKE) $@

++	@cd src && $(MAKE) $@ V=$(V) R=$(R)

+ 

+ install: dummy

+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)

+diff --git a/src/Makefile b/src/Makefile

+index 514593d..3b71497 100644

+--- a/src/Makefile

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

+ PLAT= guess

+ 

+ CC= gcc -std=gnu99

+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)

++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)

+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)

+ LIBS= -lm $(SYSLIBS) $(MYLIBS)

+ 

+@@ -33,6 +33,7 @@ CMCFLAGS= -Os

+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris

+ 

+ LUA_A=	liblua.a

++LUA_SO= liblua.so

+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o

+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o

+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)

+@@ -44,7 +45,7 @@ LUAC_T=	luac

+ LUAC_O=	luac.o

+ 

+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)

+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)

++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)

+ ALL_A= $(LUA_A)

+ 

+ # Targets start here.

+@@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O)

+ 	$(AR) $@ $(BASE_O)

+ 	$(RANLIB) $@

+ 

++$(LUA_SO): $(CORE_O) $(LIB_O)

++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)

++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)

++	ln -sf $(LUA_SO).$(R) $(LUA_SO)

++

+ $(LUA_T): $(LUA_O) $(LUA_A)

+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)

+ 

+-- 

+2.17.1

+

@@ -8,8 +8,8 @@

 Summary:        Programming language

 Name:           lua

-Version:        5.4.4

-Release:        5%{?dist}

+Version:        5.4.6

+Release:        1%{?dist}

 License:        MIT

 URL:            http://www.lua.org

 Group:          Development/Tools

@@ -17,7 +17,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0: http://www.lua.org/ftp/%{name}-%{version}.tar.gz

-%define sha512 %{name}-%{version}=af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21

+%define sha512 %{name}-%{version}=d90c6903355ee1309cb0d92a8a024522ff049091a117ea21efb585b5de35776191cd67d17a65b18c2f9d374795b7c944f047576f0e3fe818d094b26f0e4845c5

 %if 0%{?bootstrap}

 Source1: http://www.lua.org/ftp/%{name}-%{bootstrap_version}.tar.gz

@@ -30,9 +30,6 @@ Patch0: lua-%{version}-shared-library.patch

 Patch1: lua-%{bootstrap_version}-shared-library.patch

 %endif

-Patch2: CVE-2022-28805.patch

-Patch3: CVE-2022-33099.patch

-

 BuildRequires: readline-devel

 Requires: readline

@@ -80,8 +77,6 @@ sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h

 sed -i 's/CFLAGS= -fPIC -O2 /CFLAGS= -fPIC -O2 -DLUA_COMPAT_MODULE /' src/Makefile

 %{__patch} -p1 < %{PATCH0}

-%{__patch} -p1 < %{PATCH2}

-%{__patch} -p1 < %{PATCH3}

 %build

 make VERBOSE=1 %{?_smp_mflags} linux

@@ -167,6 +162,8 @@ rm -rf %{buildroot}

 %{_mandir}/*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.4.6-1

+- Upgrade to v5.4.6

 * Thu Mar 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.4.4-5

 - Add lua-libs sub package

 * Wed Dec 21 2022 Shreenidhi Shedi <sshedi@vmware.com> 5.4.4-4

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

 Summary:        Nmap (“Network Mapper”) is a utility for network discovery and security auditing

 Name:           nmap

 Version:        7.93

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        Nmap

 URL:            http://nmap.org

 Group:          Networking

@@ -88,6 +88,8 @@ rm -rf %{buildroot}%{_datadir}/man/ \

 %{_bindir}/ncat

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 7.93-6

+- Bump version as a part of lua upgrade

 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 7.93-5

 - Bump version as a part of zlib upgrade

 * Thu Jan 26 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 7.93-4

@@ -10,7 +10,7 @@

 Summary:    A Fast and Scalable Web Platform by Extending NGINX with Lua

 Name:       openresty

 Version:    1.21.4.1

-Release:    6%{?dist}

+Release:    7%{?dist}

 License:    BSD

 URL:        https://openresty.org/en

 Group:      Applications/System

@@ -223,6 +223,8 @@ rm -rf %{buildroot}

 %{orprefix}/resty.index

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.21.4.1-7

+- Bump version as a part of lua upgrade

 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.21.4.1-6

 - Bump version as a part of zlib upgrade

 * Wed Mar 22 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.21.4.1-5

@@ -3,7 +3,7 @@

 Summary:    Package manager

 Name:       rpm

 Version:    4.18.0

-Release:    13%{?dist}

+Release:    14%{?dist}

 License:    GPLv2+

 URL:        http://rpm.org

 Group:      Applications/System

@@ -306,6 +306,8 @@ rm -rf %{buildroot}

 %{_mandir}/man8/%{name}-plugin-systemd-inhibit.8*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-14

+- Bump version as a part of lua upgrade

 * Tue May 09 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-13

 - Bump version as a part of nss upgrade

 * Fri Apr 14 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-12

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

 Summary:        Tools and Utilities for interaction with SCSI devices.

 Name:           sg3_utils

 Version:        1.47

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        BSD

 URL:            https://github.com/doug-gilbert/sg3_utils

 Group:          System/Tools.

@@ -55,6 +55,8 @@ install -m 755 scripts/rescan-scsi-bus.sh %{buildroot}%{_bindir}

 %{_includedir}/scsi/*

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.47-2

+- Bump version as a part of lua upgrade

 * Tue Apr 25 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.47-1

 - Upgrade to v1.47

 * Thu Apr 13 2023 Guruswamy Basavaiah <bguruswamy@vmware.com> 1.46-2

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

 Summary:        Intrusion Detection System

 Name:           suricata

 Version:        6.0.12

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -171,6 +171,8 @@ make %{?_smp_mflags} check

 %{_datadir}/%{name}/rules

 %changelog

+* Tue Jun 20 2023 Shreenidhi Shedi <sshedi@vmware.com> 6.0.12-3

+- Bump version as a part of lua upgrade

 * Tue May 23 2023 Guruswamy Basavaiah <bguruswamy@vmware.com> 6.0.12-2

 - Exclude suricata dependency on hyperscan in ARM

 * Fri Apr 28 2023 Guruswamy Basavaiah <bguruswamy@vmware.com> 6.0.12-1