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

 Summary:        Creates a common metadata repository

 Name:           createrepo_c

 Version:        0.20.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2+

 Group:          System Environment/Base

 Vendor:         VMware, Inc.

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

 %{_libdir}/pkgconfig/%{name}.pc

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.20.1-2

+- Bump version as a part of rpm upgrade

 * Wed Sep 28 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.20.1-1

 - Upgrade to v0.20.1

 * Sat Jul 30 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.16.0-7

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

 Name:            drpm

 Summary:         A library for making, reading and applying deltarpm packages

 Version:         0.5.1

-Release:         3%{?dist}

+Release:         4%{?dist}

 License:         LGPLv2+ and BSD

 URL:             https://github.com/rpm-software-management/%{name}

 Vendor:          VMware, Inc.

@@ -67,6 +67,8 @@ cd %{__cmake_builddir}

 %{_libdir}/pkgconfig/%{name}.pc

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.5.1-4

+- Bump version as a part of rpm upgrade

 * Thu Jul 07 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.5.1-3

 - Bump version as a part of rpm upgrade

 * Mon Jun 20 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.5.1-2

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

 Summary:        Module manipulating metadata files

 Name:           libmodulemd

 Version:        2.14.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        MIT

 URL:            https://github.com/fedora-modularity/libmodulemd

 Group:          Applications/System

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

 %{_includedir}/modulemd-2.0/*.h

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 2.14.0-3

+- Bump version as a part of rpm upgrade

 * Tue Dec 06 2022 Prashant S Chauhan <psinghchauha@vmware.com> 2.14.0-2

 - Update release to compile with python 3.11

 * Fri Oct 07 2022 Shreenidhi Shedi <sshedi@vmware.com> 2.14.0-1

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

 Summary:        A free package dependency solver

 Name:           libsolv

 Version:        0.7.22

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        BSD

 URL:            https://github.com/openSUSE/libsolv

 Group:          Development/Tools

@@ -76,6 +76,8 @@ make %{?_smp_mflags} test

 %{_mandir}/man3/*

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 0.7.22-3

+- Bump version as a part of rpm upgrade

 * Tue Oct 04 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.7.22-2

 - Bump version as a part of zstd upgrade

 * Wed Sep 28 2022 Shreenidhi Shedi <sshedi@vmware.com> 0.7.22-1

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

 Summary:        Open Source Security Compliance Solution

 Name:           openscap

 Version:        1.3.6

-Release:        9%{?dist}

+Release:        10%{?dist}

 License:        GPL2+

 URL:            https://www.open-scap.org

 Group:          System Environment/Libraries

@@ -11,6 +11,8 @@ Distribution:   Photon

 Source0: https://github.com/OpenSCAP/openscap/releases/download/%{version}/openscap-%{version}.tar.gz

 %define sha512 %{name}=5e4d6c4addc15b2a0245b5caef80fda3020f1cac83ed4aa436ef3f1703d1d761060c931c2536fa68de7ad5bab002b79c8b2d1e5f7695d46249f4562f5a1569a0

+Patch0: use-correct-includes.patch

+

 BuildRequires:  xmlsec1-devel

 BuildRequires:  swig

 BuildRequires:  libxml2-devel

@@ -120,6 +122,8 @@ Python bindings.

 %{_libdir}/python%{python3_version}/*

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 1.3.6-10

+- Bump version as a part of rpm upgrade

 * Tue Dec 06 2022 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 1.3.6-9

 - Bump version as a part of xmlsec1 upgrade

 * Mon Oct 24 2022 Prashant S Chauhan <psinghchauha@vmware.com> 1.3.6-8

new file mode 100644

@@ -0,0 +1,58 @@

+From 8dec1bb5e9546e75ae6e7b7cf94cf00197ce3e5d Mon Sep 17 00:00:00 2001

+From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>

+Date: Tue, 24 May 2022 12:15:44 +0200

+Subject: [PATCH] Use correct includes

+

+rpmvercmp is defined in rpm/rpmver.h

+risdigit is defined in rpm/rpmstring.h

+

+Resolves: rhbz#2080210

+---

+ cmake/FindRPM.cmake                    | 3 +++

+ config.h.in                            | 1 +

+ src/OVAL/results/oval_cmp_evr_string.c | 5 +++++

+ 3 files changed, 9 insertions(+)

+

+diff --git a/cmake/FindRPM.cmake b/cmake/FindRPM.cmake

+index a666942eae..369d153fcc 100644

+--- a/cmake/FindRPM.cmake

+@@ -30,6 +30,9 @@ set(RPM_VERSION ${RPM_PKGCONF_VERSION})

+ if(RPM_VERSION)

+ 	string(COMPARE GREATER "4.6" ${RPM_VERSION} RPM46_FOUND)

+ 	string(COMPARE GREATER "4.7" ${RPM_VERSION} RPM47_FOUND)

++	if(NOT (RPM_VERSION VERSION_LESS "4.18"))

++		set(RPM418_FOUND 1)

++	endif()

+ endif()

+ 

+ # Set the include dir variables and the libraries and let libfind_process do the rest.

+diff --git a/config.h.in b/config.h.in

+index 1b72855822..bb1428afc8 100644

+--- a/config.h.in

+@@ -44,6 +44,7 @@

+ #cmakedefine HAVE_RPMVERCMP

+ #cmakedefine RPM46_FOUND

+ #cmakedefine RPM47_FOUND

++#cmakedefine RPM418_FOUND

+ 

+ #cmakedefine BZIP2_FOUND

+ 

+diff --git a/src/OVAL/results/oval_cmp_evr_string.c b/src/OVAL/results/oval_cmp_evr_string.c

+index 3bfc8ce5f9..3ba0fa0cbd 100644

+--- a/src/OVAL/results/oval_cmp_evr_string.c

+@@ -37,7 +37,12 @@

+ #include "common/_error.h"

+ 

+ #ifdef HAVE_RPMVERCMP

++#ifdef RPM418_FOUND

++#include <rpm/rpmver.h>

++#include <rpm/rpmstring.h>

++#else

+ #include <rpm/rpmlib.h>

++#endif

+ #else

+ #ifdef OS_WINDOWS

+ #include <malloc.h>

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

 Summary:        Commit RPMs to an OSTree repository

 Name:           rpm-ostree

 Version:        2022.13

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        LGPLv2+

 Group:          Applications/System

 URL:            https://github.com/projectatomic/rpm-ostree

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

 %{_bindir}/rpm-ostree-server/mkostreerepo

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 2022.13-4

+- Bump version as a part of rpm upgrade

 * Thu Nov 03 2022 Ankit Jain <ankitja@vmware.com> 2022.13-3

 - Fix build issue after glib update

 * Fri Oct 07 2022 Shreenidhi Shedi <sshedi@vmware.com> 2022.13-2

@@ -2,16 +2,16 @@

 Summary:    Package manager

 Name:       rpm

-Version:    4.17.1

-Release:    5%{?dist}

+Version:    4.18.0

+Release:    1%{?dist}

 License:    GPLv2+

 URL:        http://rpm.org

 Group:      Applications/System

 Vendor:     VMware, Inc.

 Distribution: Photon

-Source0:    https://github.com/rpm-software-management/rpm/archive/%{name}-%{version}.tar.bz2

-%define sha512  %{name}=d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85

+Source0: https://github.com/rpm-software-management/rpm/archive/%{name}-%{version}.tar.bz2

+%define sha512 %{name}=c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec

 Source1:    macros

 Source2:    macros.php

@@ -89,6 +89,7 @@ Conflicts:  libsolv < 0.7.19

 Shared libraries librpm and librpmio

 %package build

+Summary:  Binaries, scripts and libraries needed to build rpms.

 Requires: perl

 Requires: lua

 Requires: %{name}-devel = %{version}-%{release}

@@ -98,7 +99,6 @@ Requires: systemd-rpm-macros

 Requires: python3-macros

 Requires: dwz

 Requires: debugedit

-Summary:  Binaries, scripts and libraries needed to build rpms.

 %description build

 Binaries, libraries and scripts to build rpms.

@@ -157,7 +157,7 @@ sh autogen.sh --noconfigure

     --with-lua \

     --enable-nls

-%make_build %{?_smp_mflags}

+%make_build

 gcc -Wall -o lock %{SOURCE11}

 chmod 700 lock

@@ -166,12 +166,6 @@ pushd python

 %py3_build

 popd

-%check

-%if 0%{?with_check}

-make check TESTSUITEFLAGS=%{?_smp_mflags} || (cat tests/rpmtests.log; exit 1)

-make clean %{?_smp_mflags}

-%endif

-

 %install

 %make_install %{?_smp_mflags}

 find %{buildroot} -name '*.la' -delete

@@ -191,8 +185,8 @@ install -vm755 %{SOURCE6} %{buildroot}%{_libdir}/rpm

 install -vm755 %{SOURCE7} %{buildroot}%{_libdir}/rpm

 mkdir -p %{buildroot}%{_unitdir}

-install -vm644 %{SOURCE8} %{buildroot}/%{_unitdir}

-install -vm644 %{SOURCE9} %{buildroot}/%{_unitdir}

+install -vm644 %{SOURCE8} %{buildroot}%{_unitdir}

+install -vm644 %{SOURCE9} %{buildroot}%{_unitdir}

 mkdir -p %{buildroot}%{_sysconfdir}/tdnf/minversions.d

 install -vm644 %{SOURCE10} %{buildroot}%{_sysconfdir}/tdnf/minversions.d

@@ -202,6 +196,12 @@ pushd python

 %py3_install

 popd

+%check

+%if 0%{?with_check}

+make check TESTSUITEFLAGS=%{?_smp_mflags} || (cat tests/rpmtests.log; exit 1)

+make clean %{?_smp_mflags}

+%endif

+

 %post libs -p /sbin/ldconfig

 %postun libs -p /sbin/ldconfig

@@ -291,9 +291,11 @@ rm -rf %{buildroot}

 %config(noreplace) %{_sysconfdir}/tdnf/minversions.d/%{name}.conf

 %files build

+%defattr(-,root,root)

 %{_bindir}/rpmbuild

 %{_bindir}/rpmsign

 %{_bindir}/rpmspec

+%{_bindir}/rpmlua

 %{_libdir}/librpmbuild.so

 %{_libdir}/librpmbuild.so.*

 %{rpmhome}/macros.d/*

@@ -316,12 +318,14 @@ rm -rf %{buildroot}

 %{rpmhome}/*.prov

 %{rpmhome}/rpmdeps

 %{rpmhome}/find-debuginfo.sh

-

+%{rpmhome}/rpm_macros_provides.sh

+%{rpmhome}/rpmuncompress

 %{_mandir}/man1/gendiff.1*

 %{_mandir}/man8/rpmbuild.8*

 %{_mandir}/man8/rpmdeps.8*

 %{_mandir}/man8/rpmspec.8*

 %{_mandir}/man8/rpmsign.8.gz

+%{_mandir}/man8/rpmlua.8.gz

 %files devel

 %defattr(-,root,root)

@@ -340,10 +344,13 @@ rm -rf %{buildroot}

 %{python3_sitelib}/*

 %files plugin-systemd-inhibit

+%defattr(-,root,root)

 %{_libdir}/rpm-plugins/systemd_inhibit.so

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

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.18.0-1

+- Upgrade to v4.18.0

 * Mon Oct 10 2022 Prashant S Chauhan <psinghchauha@vmware.com> 4.17.1-5

 - Bump up to compile with python 3.11

 * Tue Oct 04 2022 Shreenidhi Shedi <sshedi@vmware.com> 4.17.1-4

@@ -1,4 +1,4 @@

-From 1f42872d9902c93d66f0494f6ab3a07b0864cc64 Mon Sep 17 00:00:00 2001

+From cdabb35460f45aa657707d3a8f4fec9a798c42dd Mon Sep 17 00:00:00 2001

 From: Shreenidhi Shedi <sshedi@vmware.com>

 Date: Mon, 13 Dec 2021 16:41:52 +0530

 Subject: [PATCH] lib/rpmdb.c: use a fallback method for renaming directories

@@ -34,12 +34,46 @@ https://github.com/torvalds/linux/blob/master/Documentation/filesystems/overlayf

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

 ---

- lib/rpmdb.c | 304 ++++++++++++++++++++++++++++++++++++++++++++++++----

- lib/rpmdb.h |  23 ++++

+ include/rpm/rpmdb.h |  23 ++++

+ lib/rpmdb.c         | 304 +++++++++++++++++++++++++++++++++++++++++---

  2 files changed, 306 insertions(+), 21 deletions(-)

+diff --git a/include/rpm/rpmdb.h b/include/rpm/rpmdb.h

+index afd0b85cc..55416e99d 100644

+--- a/include/rpm/rpmdb.h

+@@ -251,6 +251,29 @@ int rpmdbStat(const char *prefix, struct stat *statbuf);

+  */

+ int rpmdbFStat(rpmdb db, struct stat *statbuf);

+ 

++/** \ingroup rpmdb

++ * Recursively remove a directory

++ * @param               directory path

++ * @return         0 on success, -1 on error

++ */

++int removedir(const char *path);

++

++/** \ingroup rpmdb

++ * Copy file from source to destination

++ * @param src      source file name

++ * @param dst      destination file name

++ * @return         0 on success, -1 on error

++ */

++int copy_file(const char *src, const char *dst);

++

++/** \ingroup rpmdb

++ * Rename/Move directory from source to destination

++ * @param src      source directory path

++ * @param dst      destination directory path

++ * @return         0 on success, -1 on error

++ */

++int rename_dir(const char *src, const char *dst);

++

+ #ifdef __cplusplus

+ }

+ #endif

 diff --git a/lib/rpmdb.c b/lib/rpmdb.c

-index 2fa1f00fa..60867119b 100644

+index b3c5da62d..b9831db60 100644

 --- a/lib/rpmdb.c

 +++ b/lib/rpmdb.c

 @@ -9,6 +9,15 @@

@@ -58,7 +92,7 @@ index 2fa1f00fa..60867119b 100644

  #ifndef	DYING	/* XXX already in "system.h" */

  #include <fnmatch.h>

-@@ -53,6 +62,247 @@

+@@ -52,6 +61,247 @@

  static rpmdb rpmdbUnlink(rpmdb db);

@@ -306,7 +340,7 @@ index 2fa1f00fa..60867119b 100644

  static int buildIndexes(rpmdb db)

  {

      int rc = 0;

-@@ -492,7 +742,7 @@ static int openDatabase(const char * prefix,

+@@ -456,7 +706,7 @@ static int openDatabase(const char * prefix,

      if (dbp)

  	*dbp = NULL;

@@ -315,7 +349,7 @@ index 2fa1f00fa..60867119b 100644

  	return 1;

      db = newRpmdb(prefix, dbpath, mode, perms, flags);

-@@ -570,7 +820,7 @@ int rpmdbVerify(const char * prefix)

+@@ -526,7 +776,7 @@ int rpmdbVerify(const char * prefix)

      if (db != NULL) {

  	int xx;

@@ -324,7 +358,7 @@ index 2fa1f00fa..60867119b 100644

  	if (db->db_pkgs)

  	    rc += dbiVerify(db->db_pkgs, 0);

  	rc += dbiForeach(db->db_indexes, db->db_ndbi, dbiVerify, 0);

-@@ -583,7 +833,7 @@ int rpmdbVerify(const char * prefix)

+@@ -539,7 +789,7 @@ int rpmdbVerify(const char * prefix)

  }

  Header rpmdbGetHeaderAt(rpmdb db, unsigned int offset)

@@ -333,7 +367,7 @@ index 2fa1f00fa..60867119b 100644

      rpmdbMatchIterator mi = rpmdbInitIterator(db, RPMDBI_PACKAGES,

  					      &offset, sizeof(offset));

      Header h = headerLink(rpmdbNextIterator(mi));

-@@ -755,7 +1005,7 @@ static rpmRC dbiFindMatches(rpmdb db, dbiIndex dbi,

+@@ -711,7 +961,7 @@ static rpmRC dbiFindMatches(rpmdb db, dbiIndex dbi,

      /* No matches on the name, anything else wont match either */

      if (rc != RPMRC_OK)

  	goto exit;

@@ -342,7 +376,7 @@ index 2fa1f00fa..60867119b 100644

      /* If we got matches on name and nothing else was specified, we're done */

      if (epoch < 0 && version == NULL && release == NULL && arch == NULL)

  	goto exit;

-@@ -1300,7 +1550,7 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTagVal tag,

+@@ -1246,7 +1496,7 @@ int rpmdbSetIteratorRE(rpmdbMatchIterator mi, rpmTagVal tag,

      mi->mi_re = xrealloc(mi->mi_re, (mi->mi_nre + 1) * sizeof(*mi->mi_re));

      mire = mi->mi_re + mi->mi_nre;

      mi->mi_nre++;

@@ -351,7 +385,7 @@ index 2fa1f00fa..60867119b 100644

      mire->tag = tag;

      mire->mode = mode;

      mire->pattern = allpat;

-@@ -1752,7 +2002,7 @@ static rpmdbMatchIterator indexIterInit(rpmdb db, rpmDbiTagVal rpmtag,

+@@ -1694,7 +1944,7 @@ static rpmdbMatchIterator indexIterInit(rpmdb db, rpmDbiTagVal rpmtag,

  	    }

  	}

      }

@@ -360,7 +394,7 @@ index 2fa1f00fa..60867119b 100644

      return mi;

  }

-@@ -1811,9 +2061,9 @@ rpmdbMatchIterator rpmdbInitPrefixIterator(rpmdb db, rpmDbiTagVal rpmtag,

+@@ -1749,9 +1999,9 @@ rpmdbMatchIterator rpmdbInitPrefixIterator(rpmdb db, rpmDbiTagVal rpmtag,

   * Convert current tag data to db key

   * @param tagdata	Tag data container

   * @param[out] keylen	Length of key

@@ -372,7 +406,7 @@ index 2fa1f00fa..60867119b 100644

  {

      const void * data = NULL;

      unsigned int size = 0;

-@@ -1961,7 +2211,7 @@ int rpmdbIndexIteratorNextTd(rpmdbIndexIterator ii, rpmtd keytd)

+@@ -1893,7 +2143,7 @@ int rpmdbIndexIteratorNextTd(rpmdbIndexIterator ii, rpmtd keytd)

  	    break;

  	}

      }

@@ -381,7 +415,7 @@ index 2fa1f00fa..60867119b 100644

      return rc;

  }

-@@ -2039,11 +2289,11 @@ static void logAddRemove(const char *dbiname, int removing, rpmtd tagdata)

+@@ -1960,11 +2210,11 @@ static void logAddRemove(const char *dbiname, int removing, rpmtd tagdata)

      rpm_count_t c = rpmtdCount(tagdata);

      if (c == 1 && rpmtdType(tagdata) == RPM_STRING_TYPE) {

  	rpmlog(RPMLOG_DEBUG, "%s \"%s\" %s %s index.\n",

@@ -395,7 +429,7 @@ index 2fa1f00fa..60867119b 100644

  		removing ? "from" : "to", dbiname);

      }

  }

-@@ -2316,7 +2566,7 @@ int rpmdbAdd(rpmdb db, Header h)

+@@ -2237,7 +2487,7 @@ int rpmdbAdd(rpmdb db, Header h)

      ret = pkgdbOpen(db, 0, &dbi);

      if (ret)

  	goto exit;

@@ -404,7 +438,7 @@ index 2fa1f00fa..60867119b 100644

      rpmsqBlock(SIG_BLOCK);

      dbCtrl(db, DB_CTRL_LOCK_RW);

-@@ -2326,7 +2576,7 @@ int rpmdbAdd(rpmdb db, Header h)

+@@ -2247,7 +2497,7 @@ int rpmdbAdd(rpmdb db, Header h)

      dbiCursorFree(dbi, dbc);

      /* Add associated data to secondary indexes */

@@ -413,7 +447,7 @@ index 2fa1f00fa..60867119b 100644

  	for (int dbix = 0; dbix < db->db_ndbi; dbix++) {

  	    rpmDbiTag rpmtag = db->db_tags[dbix];

-@@ -2372,7 +2622,7 @@ static int rpmdbRemoveFiles(char * pattern)

+@@ -2293,7 +2543,7 @@ static int rpmdbRemoveFiles(char * pattern)

  static int rpmdbRemoveDatabase(const char *dbpath)

  {

@@ -422,7 +456,7 @@ index 2fa1f00fa..60867119b 100644

      char *pattern;

      pattern = rpmGetPath(dbpath, "/*", NULL);

-@@ -2381,11 +2631,23 @@ static int rpmdbRemoveDatabase(const char *dbpath)

+@@ -2302,11 +2552,23 @@ static int rpmdbRemoveDatabase(const char *dbpath)

      pattern = rpmGetPath(dbpath, "/.??*", NULL);

      rc += rpmdbRemoveFiles(pattern);

      free(pattern);

@@ -447,7 +481,7 @@ index 2fa1f00fa..60867119b 100644

  static int rpmdbMoveDatabase(const char * prefix, const char * srcdbpath,

  			     const char * dbpath, const char * tmppath)

  {

-@@ -2398,14 +2660,14 @@ static int rpmdbMoveDatabase(const char * prefix, const char * srcdbpath,

+@@ -2319,14 +2581,14 @@ static int rpmdbMoveDatabase(const char * prefix, const char * srcdbpath,

      char * oldkeys = rpmGetPath(old, "/", "pubkeys", NULL);

      char * destkeys = rpmGetPath(dest, "/", "pubkeys", NULL);

@@ -465,7 +499,7 @@ index 2fa1f00fa..60867119b 100644

  	if (xx) {

  	    rpmlog(RPMLOG_ERR, _("could also not restore old database from %s\n"),

  		   old);

-@@ -2416,7 +2678,7 @@ static int rpmdbMoveDatabase(const char * prefix, const char * srcdbpath,

+@@ -2337,7 +2599,7 @@ static int rpmdbMoveDatabase(const char * prefix, const char * srcdbpath,

      }

      if (access(oldkeys, F_OK ) != -1) {

@@ -474,7 +508,7 @@ index 2fa1f00fa..60867119b 100644

  	if (xx) {

  	    rpmlog(RPMLOG_ERR, _("Could not get public keys from %s\n"), oldkeys);

  	    goto exit;

-@@ -2447,7 +2709,7 @@ static int rpmdbSetPermissions(char * src, char * dest)

+@@ -2368,7 +2630,7 @@ static int rpmdbSetPermissions(char * src, char * dest)

      struct stat st;

      int xx, rc = -1;

      char * filepath;

@@ -483,7 +517,7 @@ index 2fa1f00fa..60867119b 100644

      if (stat(dest, &st) < 0)

  	    goto exit;

      if (stat(src, &st) < 0)

-@@ -2580,7 +2842,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,

+@@ -2501,7 +2763,7 @@ int rpmdbRebuild(const char * prefix, rpmts ts,

      rpmdbClose(newdb);

      if (failed) {

@@ -492,40 +526,6 @@ index 2fa1f00fa..60867119b 100644

  		_("failed to rebuild database: original database "

  		"remains in place\n"));

-diff --git a/lib/rpmdb.h b/lib/rpmdb.h

-index c8f838cac..bd91060ac 100644

-+++ b/lib/rpmdb.h

-@@ -251,6 +251,29 @@ int rpmdbStat(const char *prefix, struct stat *statbuf);

-  */

- int rpmdbFStat(rpmdb db, struct stat *statbuf);

- 

-+/** \ingroup rpmdb

-+ * Recursively remove a directory

-+ * @param               directory path

-+ * @return 		0 on success, -1 on error

-+ */

-+int removedir(const char *path);

-+

-+/** \ingroup rpmdb

-+ * Copy file from source to destination

-+ * @param src		source file name

-+ * @param dst		destination file name

-+ * @return 		0 on success, -1 on error

-+ */

-+int copy_file(const char *src, const char *dst);

-+

-+/** \ingroup rpmdb

-+ * Rename/Move directory from source to destination

-+ * @param src		source directory path

-+ * @param dst		destination directory path

-+ * @return 		0 on success, -1 on error

-+ */

-+int rename_dir(const char *src, const char *dst);

-+

- #ifdef __cplusplus

- }

- #endif

 -- 

-2.25.1

+2.39.0

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

 Name:          systemtap

 Version:       4.8

-Release:       3%{?dist}

+Release:       4%{?dist}

 Summary:       Programmable system-wide instrumentation system

 Group:         Development/System

 Vendor:        VMware, Inc.

@@ -390,6 +390,8 @@ fi

 %{_libexecdir}/systemtap/python/stap-resolve-module-function.py

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 4.8-4

+- Bump version as a part of rpm upgrade

 * Thu Dec 08 2022 Dweep Advani <dadvani@vmware.com> 4.8-3

 - Rebuild for perl version upgrade to 5.36.0

 * Tue Dec 06 2022 Prashant S Chauhan <psinghchauha@vmware.com> 4.8-2

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

 Summary:        dnf/yum equivalent using C libs

 Name:           tdnf

 Version:        3.4.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 Vendor:         VMware, Inc.

 Distribution:   Photon

 License:        LGPLv2.1,GPLv2

@@ -258,6 +258,8 @@ systemctl try-restart %{name}-cache-updateinfo.timer >/dev/null 2>&1 || :

 %{_unitdir}/%{name}-automatic-notifyonly.service

 %changelog

+* Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 3.4.4-2

+- Bump version as a part of rpm upgrade

 * Fri Dec 09 2022 Oliver Kurth <okurth@vmware.com> 3.4.4-1

 - update to 3.4.4

 * Fri Dec 02 2022 Prashant S Chauhan <psinghchauha@vmware.com> 3.4.3-2