deleted file mode 100644

@@ -1,88 +0,0 @@

-/*

- * Helper program to lock a file

- *

- * Using this in rpm-rebuilddb.sh to lock rpm directory

- * This will help to manage contention between rpm transactions & rebuilddb

- * operation.

- */

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <errno.h>

-#include <fcntl.h>

-#include <unistd.h>

-#include <signal.h>

-#include <stdint.h>

-#include <stdbool.h>

-

-/*

- * This file acts as a flag to indicate that lock is obtained

- */

-#define LOCK_FLAG "/var/run/.lkflg"

-

-static bool volatile sigint = false;

-

-static int32_t lock_fd = 0;

-

-static struct flock fl = {F_WRLCK, SEEK_SET, 0, 0, 0};

-

-void handle_sigint(int32_t sig)

-{

-    sigint = true;

-    fl.l_type = F_UNLCK;

-    if (fcntl(lock_fd, F_SETLK, &fl) < 0) {

-        perror("fcntl unlock\n");

-        exit(EXIT_FAILURE);

-    }

-

-    close(lock_fd);

-    lock_fd = -1;

-    unlink(LOCK_FLAG);

-    exit(EXIT_SUCCESS);

-}

-

-int32_t main(int32_t argc, char **argv)

-{

-    if (argc != 2) {

-        fprintf(stderr, "Usage: %s <file path>\n", argv[0]);

-        return -1;

-    }

-

-    lock_fd = open(argv[1], O_CREAT|O_RDWR);

-    if (lock_fd < 0) {

-        perror("open lock file\n");

-        return -1;

-    }

-

-    signal(SIGINT, handle_sigint);

-

-    fl.l_pid = 0;

-    printf("Trying to get lock on %s(pid: %d) ...\n", argv[1], getpid());

-    fflush(stdout);

-    if (fcntl(lock_fd, F_SETLKW, &fl) == -1) {

-        perror("fcntl lock\n");

-        return -1;

-    }

-

-    {

-        int32_t lockflg_fd = 0;

-        lockflg_fd = open(LOCK_FLAG, O_CREAT|O_RDWR);

-        if (lockflg_fd < 0) {

-            perror("open lock flag\n");

-            return -1;

-        }

-        close(lockflg_fd);

-    }

-    printf("Got lock(pid: %d)\n", getpid());

-    fflush(stdout);

-

-    while (!sigint) {

-        sleep(1);

-    }

-

-    if (lock_fd >= 0) {

-        handle_sigint(0);

-    }

-

-    return 0;

-}

deleted file mode 100644

@@ -1 +0,0 @@

-rpm-libs=4.17.0-1

@@ -1,9 +1,9 @@

-%define rpmhome %{_libdir}/rpm

+%define rpmhome %{_libdir}/%{name}

 Summary:    Package manager

 Name:       rpm

 Version:    4.18.0

-Release:    6%{?dist}

+Release:    7%{?dist}

 License:    GPLv2+

 URL:        http://rpm.org

 Group:      Applications/System

@@ -18,19 +18,12 @@ Source2:    macros.php

 Source3:    macros.perl

 Source4:    macros.vpath

 Source5:    macros.ldconfig

-Source6:    rpmdb-rebuild.sh

-Source7:    rpmdb-migrate.sh

-Source8:    rpmdb-rebuild.service

-Source9:    rpmdb-migrate.service

-Source10:   rpm.conf

-Source11:   lock.c

-

-Patch0:     rpmdb-rename-dir.patch

-Patch1:     silence-warning.patch

-Patch2:     sync-buf-cache.patch

-Patch3:     wait-for-lock.patch

-Patch4:     migrate-rpmdb.patch

-Patch5:     fix-race-condition-in-brp-strip.patch

+

+Patch0:     silence-warning.patch

+Patch1:     sync-buf-cache.patch

+Patch2:     wait-for-lock.patch

+Patch3:     migrate-rpmdb.patch

+Patch4:     fix-race-condition-in-brp-strip.patch

 Requires:   bash

 Requires:   zstd-libs

@@ -62,7 +55,7 @@ RPM package manager

 %package devel

 Summary:    Libraries and header files for rpm

-Provides:   pkgconfig(rpm)

+Provides:   pkgconfig(%{name})

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

 Requires:   zstd-devel

@@ -118,7 +111,7 @@ Requires: %{name} = %{version}-%{release}

 %description lang

 These are the additional language files of rpm.

-%package -n python3-rpm

+%package -n python3-%{name}

 Summary:  Python 3 bindings for rpm.

 Group:    Development/Libraries

 Requires: python3

@@ -129,7 +122,7 @@ Python3 rpm.

 %package plugin-systemd-inhibit

 Summary:  Rpm plugin for systemd inhibit functionality

-Requires: rpm-libs = %{version}-%{release}

+Requires: %{name}-libs = %{version}-%{release}

 Requires: dbus

 Requires: systemd

@@ -138,7 +131,7 @@ This plugin blocks systemd from entering idle, sleep or shutdown while an rpm

 transaction is running using the systemd-inhibit mechanism.

 %prep

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

+%autosetup -p1

 %build

 # pass -L opts to gcc as well to prioritize it over standard libs

@@ -147,8 +140,9 @@ sed -i '/library_dirs/d' python/setup.py.in

 sed -i 's/extra_link_args/library_dirs/g' python/setup.py.in

 sh autogen.sh --noconfigure

+

 %configure \

-  CPPFLAGS='-I/usr/include/nspr -I/usr/include/nss -DLUA_COMPAT_APIINTCASTS' \

+  CPPFLAGS='-I%{_includedir}/nspr -I%{_includedir}/nss -DLUA_COMPAT_APIINTCASTS' \

     --disable-dependency-tracking \

     --disable-static \

     --enable-python \

@@ -166,9 +160,6 @@ sh autogen.sh --noconfigure

 %make_build

-gcc -Wall -o lock %{SOURCE11}

-chmod 700 lock

-

 pushd python

 %py3_build

 popd

@@ -182,29 +173,19 @@ ln -sfv %{_bindir}/find-debuginfo %{buildroot}%{rpmhome}/find-debuginfo.sh

 %find_lang %{name}

 # System macros and prefix

-install -dm644 %{buildroot}%{_sysconfdir}/rpm

-install -vm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm

-install -vm644 %{SOURCE2} %{buildroot}%{rpmhome}/macros.d

-install -vm644 %{SOURCE3} %{buildroot}%{rpmhome}/macros.d

-install -vm644 %{SOURCE4} %{buildroot}%{rpmhome}/macros.d

-install -vm644 %{SOURCE5} %{buildroot}%{rpmhome}/macros.d

-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}

-

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

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

-mv lock %{buildroot}%{_libdir}/rpm

+install -dm644 %{buildroot}%{_sysconfdir}/%{name}

+install -vm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}

+install -vm644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}

+install -vm644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}

+install -vm644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}

+install -vm644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}

 pushd python

 %py3_install

 popd

-%check

 %if 0%{?with_check}

+%check

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

 make clean %{?_smp_mflags}

 %endif

@@ -212,35 +193,12 @@ make clean %{?_smp_mflags}

 %post libs -p /sbin/ldconfig

 %postun libs -p /sbin/ldconfig

-%pre

-# Symlink all rpmdb files to the new location if we're still using /var/lib/rpm

-if [ -d %{_sharedstatedir}/rpm ]; then

-  mkdir -p %{_libdir}/sysimage/rpm

-  rpmdb_files=$(find %{_sharedstatedir}/rpm -maxdepth 1 -type f | sed 's|^/var/lib/rpm/||g' | sort)

-  for fn in ${rpmdb_files[@]}; do

-  ln -sfr %{_sharedstatedir}/rpm/${fn} %{_libdir}/sysimage/rpm/${fn}

-  done

-fi

-

-%posttrans libs

-if [ -f %{_sharedstatedir}/rpm/Packages ]; then

-  if [ -x %{_bindir}/systemctl ]; then

-  systemctl --no-reload preset rpmdb-rebuild || :

-  fi

-  nohup bash %{rpmhome}/rpmdb-rebuild.sh &>/dev/null &

-fi

-

-if [ -d %{_sharedstatedir}/rpm ] && [ -x %{_bindir}/systemctl ]; then

-  touch %{_sharedstatedir}/rpm/.migratedb

-  systemctl --no-reload preset rpmdb-migrate || :

-fi

-

 %clean

 rm -rf %{buildroot}

 %files

 %defattr(-,root,root)

-%{_bindir}/rpm

+%{_bindir}/%{name}

 %{_bindir}/gendiff

 %{_bindir}/rpm2cpio

 %{_bindir}/rpmgraph

@@ -248,31 +206,31 @@ rm -rf %{buildroot}

 %{_bindir}/rpmquery

 %{_bindir}/rpmverify

 %{rpmhome}/rpmpopt-*

-%{rpmhome}/rpm.daily

-%{rpmhome}/rpm.log

-%{rpmhome}/rpm.supp

+%{rpmhome}/%{name}.daily

+%{rpmhome}/%{name}.log

+%{rpmhome}/%{name}.supp

 %{rpmhome}/rpm2cpio.sh

 %{rpmhome}/tgpg

 %{rpmhome}/platform

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

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

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

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

-%exclude %{_libdir}/rpm-plugins/dbus_announce.so

+%{_libdir}/%{name}-plugins/ima.so

+%{_libdir}/%{name}-plugins/syslog.so

+%{_libdir}/%{name}-plugins/prioreset.so

+%{_libdir}/%{name}-plugins/fsverity.so

+%exclude %{_libdir}/%{name}-plugins/dbus_announce.so

-%{_sysconfdir}/dbus-1/system.d/org.rpm.conf

+%{_sysconfdir}/dbus-1/system.d/org.%{name}.conf

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

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

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

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

-%{_mandir}/man8/rpm-misc.8.gz

-%{_mandir}/man8/rpm-plugin-ima.8.gz

-%{_mandir}/man8/rpm-plugin-prioreset.8.gz

-%{_mandir}/man8/rpm-plugin-syslog.8.gz

-%{_mandir}/man8/rpm-plugins.8.gz

-%{_mandir}/man8/rpm.8.gz

-%{_mandir}/man8/rpm-plugin-dbus-announce.8.gz

+%{_mandir}/man8/%{name}-misc.8.gz

+%{_mandir}/man8/%{name}-plugin-ima.8.gz

+%{_mandir}/man8/%{name}-plugin-prioreset.8.gz

+%{_mandir}/man8/%{name}-plugin-syslog.8.gz

+%{_mandir}/man8/%{name}-plugins.8.gz

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

+%{_mandir}/man8/%{name}-plugin-dbus-announce.8.gz

 %exclude %{_mandir}/fr/man8/*.gz

 %exclude %{_mandir}/ja/man8/*.gz

 %exclude %{_mandir}/ko/man8/*.gz

@@ -283,19 +241,13 @@ rm -rf %{buildroot}

 %files libs

 %defattr(-,root,root)

-%config(noreplace) %{_sysconfdir}/rpm/macros

+%config(noreplace) %{_sysconfdir}/%{name}/macros

 %{_libdir}/librpmio.so.*

 %{_libdir}/librpm.so.*

 %{rpmhome}/macros

 %{rpmhome}/rpmrc

 %{rpmhome}/rpmdb_*

-%{rpmhome}/rpmdb-rebuild.sh

-%{rpmhome}/rpmdb-migrate.sh

-%{rpmhome}/lock

 %{_bindir}/rpmdb

-%{_unitdir}/rpmdb-rebuild.service

-%{_unitdir}/rpmdb-migrate.service

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

 %files build

 %defattr(-,root,root)

@@ -305,7 +257,7 @@ rm -rf %{buildroot}

 %{_bindir}/rpmlua

 %{_libdir}/librpmbuild.so

 %{_libdir}/librpmbuild.so.*

-%{rpmhome}/macros.d/*

+%{_rpmmacrodir}/*

 %{rpmhome}/perl.req

 %{rpmhome}/find-lang.sh

 %{rpmhome}/find-provides

@@ -337,7 +289,7 @@ rm -rf %{buildroot}

 %files devel

 %defattr(-,root,root)

 %{_includedir}/*

-%{_libdir}/pkgconfig/rpm.pc

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

 %{_libdir}/librpmio.so

 %{_libdir}/librpm.so

 %{_libdir}/librpmsign.so

@@ -346,16 +298,18 @@ rm -rf %{buildroot}

 %files lang -f %{name}.lang

 %defattr(-,root,root)

-%files -n python3-rpm

+%files -n python3-%{name}

 %defattr(-,root,root,-)

 %{python3_sitelib}/*

 %files plugin-systemd-inhibit

 %defattr(-,root,root)

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

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

+%{_libdir}/%{name}-plugins/systemd_inhibit.so

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

 %changelog

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

+- Remove DB migration & DB rebuild logix & related files

 * Fri Jan 13 2023 Oliver Kurth <okurth@vmware.com> 4.18.0-6

 - add tools needed to rpm-build requires

 * Wed Jan 11 2023 Oliver Kurth <okurth@vmware.com> 4.18.0-5

deleted file mode 100644

@@ -1,18 +0,0 @@

-[Unit]

-Description=RPM database migration to /usr

-ConditionPathExists=/var/lib/rpm/.migratedb

-

-# This should run before any daemons that may open the rpmdb

-DefaultDependencies=no

-After=sysinit.target

-Before=basic.target shutdown.target

-Conflicts=shutdown.target

-# In case /var is remote-mounted

-RequiresMountsFor=/var

-

-[Service]

-Type=oneshot

-ExecStart=/usr/lib/rpm/rpmdb-migrate.sh

-

-[Install]

-WantedBy=basic.target

deleted file mode 100644

@@ -1,66 +0,0 @@

-#!/bin/bash

-

-# Script to migrate rpmdb from /var/lib/rpm to new rpmdb path at /usr

-#set -x

-

-# log file name

-log_fn="/var/log/rpmdb-migrate.log"

-

-# redirect stderr & stdout to log file

-exec > "${log_fn}" 2>&1

-

-sanity_check()

-{

-  if command -v rpm &> /dev/null; then

-    if rpm -q rpm &> /dev/null; then

-      return 0

-    fi

-  fi

-

-  if command -v tdnf &> /dev/null; then

-    if tdnf list installed tdnf --disablerepo=* &> /dev/null; then

-      return 0

-    fi

-  fi

-

-  # should not reach here

-  return 1

-}

-

-main()

-{

-  local dbpath_old="/var/lib/rpm"

-

-  if [ ! -f "${dbpath_old}/.migratedb" ]; then

-    echo "${dbpath_old}/.migratedb not preset, exit"

-    exit 0

-  fi

-

-  local dbpath_new="$(rpmdb -E '%_dbpath' 2>/dev/null)"

-

-  if [ "${dbpath_new}" = "${dbpath_old}" ]; then

-    echo "RpmDB path is still at ${dbpath_new}, exit"

-    exit 0

-  fi

-

-  if [ -L "${dbpath_old}" ]; then

-    echo "RpmDB has been migrated, exit"

-    rm -f "${dbpath_old}/.migratedb"

-    exit 0

-  fi

-

-  if ! rpmdb --rebuilddb; then

-    echo "ERROR: Failed to rebuild RpmDB" 1>&2

-    exit 1

-  fi

-

-  if ! sanity_check; then

-    echo "ERROR: sanity check failed" 1>&2

-    exit 1

-  fi

-

-  rm -rfv "${dbpath_old}"

-  ln -sfr "${dbpath_new}" "${dbpath_old}"

-}

-

-main

deleted file mode 100644

@@ -1,19 +0,0 @@

-[Unit]

-Description=RPM database rebuild

-ConditionPathExists=/usr/lib/sysimage/rpm/.rebuilddb

-

-# This should run before any daemons that may open the rpmdb

-DefaultDependencies=no

-After=sysinit.target

-Before=basic.target shutdown.target

-Conflicts=shutdown.target

-# In case /var is remote-mounted

-RequiresMountsFor=/var

-

-[Service]

-Type=oneshot

-ExecStart=/usr/lib/rpm/rpmdb-rebuild.sh

-ExecStartPost=rm -f /usr/lib/sysimage/rpm/.rebuilddb

-

-[Install]

-WantedBy=basic.target

deleted file mode 100644

@@ -1,177 +0,0 @@

-#!/bin/bash

-

-# Script to rebuild rpm backend db

-

-#set -x

-

-# log file name

-log_fn="/var/log/rpmdb-rebuild.log"

-

-# redirect stderr & stdout to log file

-exec > "${log_fn}" 2>&1

-

-rpmdb_dir="$(rpmdb -E '%_dbpath' 2>/dev/null)"

-

-# this serves as a key for systemd service

-if [ -x /usr/bin/systemctl ]; then

-  touch "${rpmdb_dir}/.rebuilddb"

-fi

-

-rpm_lock_fn="${rpmdb_dir}/.rpm.lock"

-lock_bin="/usr/lib/rpm/lock"

-lock_flag="/var/run/.lkflg"

-

-# Sometimes rebuilddb succeeds but rpm options won't work

-# this is a simple sanity check

-sanity_check()

-{

-  if command -v rpm &> /dev/null; then

-    if rpm -q rpm &> /dev/null; then

-      return 0

-    fi

-  fi

-

-  if command -v tdnf &> /dev/null; then

-    if tdnf list installed tdnf --disablerepo=* &> /dev/null; then

-      return 0

-    fi

-  fi

-

-  # should not reach here

-  return 1

-}

-

-lpid=""

-

-unlock()

-{

-  [ -f "${lock_flag}" ] && rm -f "${lock_flag}"

-  kill -9 "${lpid}"

-}

-

-get_lock()

-{

-  local retry=1500

-

-  # remove "$lock_flag" file to ensure that there is no leftover

-  [ -f "${lock_flag}" ] && rm -f "${lock_flag}"

-

-  "${lock_bin}" "${rpm_lock_fn}" &

-  lpid="$!"

-

-  # 5 min max delay

-  # while building ova & other images, transactions take time

-  while [ "${retry}" -gt 0 ]; do

-    if [ -f "${lock_flag}" ]; then

-      return 0

-    fi

-    sleep 0.2

-    retry=$((retry-1))

-  done

-

-  unlock

-  echo -e "\nERROR: failed to get lock"

-  exit 1

-}

-

-# Rebuild rpm db --> This should finish quick

-# Steps:

-# 1. Take backup of existing db

-# 2. Try rebuilding db

-# 3. If ok, do a sanity check and remove backup

-#    Else - remove the newly created /var/lib/rpmrebuilddb.* and retry

-#

-# If sanity check fails, revert backup data

-# Stops after 10 attempts

-try_rpm_rebuilddb()

-{

-  local retry=10

-  local backup_dir=""

-

-  if [ -x /usr/bin/systemctl ] && [ ! -f "${rpmdb_dir}/.rebuilddb" ]; then

-    echo "${rpmdb_dir}/.rebuilddb doesn't exist, quit"

-    exit 0

-  fi

-

-  # need 6 Xs, toybox mktemp doesn't work with 4 Xs

-  backup_dir="$(mktemp -d -p "${rpmdb_dir}"/.. .rpmdbXXXXXX)"

-  if [ "$?" -ne 0 ]; then

-    echo -e "\nERROR: failed to create backup directory"

-    return 1

-  fi

-

-  # During taking backup & restoring backup operations

-  # we need a lock, otherwise this might create contention.

-  #

-  # During this copy & restore operation, rpm transaction might run parallely

-  # and we might end up in an unlikely situation

-  if get_lock; then

-    # remove temporary lock files

-    rm -f "${rpmdb_dir}"/__db*

-

-    if ! cp -ar "${rpmdb_dir}"/* "${backup_dir}"; then

-      unlock

-      [ -d "${backup_dir}" ] && rm -rf "${backup_dir}"

-      echo -e "\nERROR: failed to copy contents to backup directory"

-      return 1

-    fi

-    unlock

-  fi

-

-  echo -e "\nINFO: took backup of rpmdb at ${backup_dir}"

-

-  while [ "${retry}" -gt 0 ]; do

-

-    if rpmdb --rebuilddb; then

-      if get_lock; then

-        if sanity_check; then

-          unlock

-

-          rm -rf "${backup_dir}" "${rpmdb_dir}"/.rebuilddb

-

-          if [ "${rpmdb_dir}" = "/usr/lib/sysimage/rpm" ]; then

-            rm -rf "/var/lib/rpm"

-            ln -sfr "${rpmdb_dir}" "/var/lib/rpm"

-          fi

-

-          echo -e "\nINFO: rpmdb --rebuild success"

-          return 0

-        fi

-

-        local err=0

-        echo -e "\n--- ERROR: SOMETHING WENT TOTALLY WRONG ---"

-        echo "Trying to restore RPMDB from backup directory"

-

-        if [ "${rpmdb_dir}" = "/var/lib/rpm" ] || [ "${rpmdb_dir}" = "/usr/lib/sysimage/rpm" ]; then

-          rm -f "${rpmdb_dir}"/*

-        fi

-

-        if ! cp -ar "${backup_dir}"/* "${rpmdb_dir}"; then

-          err=1

-          echo -e "\nERROR: failed copy contents from ${backup_dir} to ${rpmdb_dir}"

-        else

-          [ -d "${backup_dir}" ] && rm -rf "${backup_dir}"

-        fi

-

-        if [ "${err}" -eq 0 ]; then

-          echo -e "\nINFO: Revert from backup directory success"

-        fi

-

-        unlock

-        return 1

-      fi

-    fi

-

-    if ls "${rpmdb_dir}"/../rpmrebuilddb.* &> /dev/null; then

-      rm -rf "${rpmdb_dir}"/../rpmrebuilddb.*

-    fi

-

-    echo -e "\nERROR: failed to rebuild rpmdb, retrying"

-    retry=$((retry-1))

-

-  done

-

-  return 1

-}

-

-try_rpm_rebuilddb

deleted file mode 100644

@@ -1,531 +0,0 @@

-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

-

-While migrating rpm db from BDB to SQLITE in a docker container rename

-function throws EXDEV error.

-

-strace of `rpm --rebuilddb` shows

-```

-...

-rename("/var/lib/rpm", "/var/lib/rpmold.54") = -1 EXDEV (Invalid cross-device link)

-write(2, "error: ", 7error: )                  = 7

-write(2, "failed to replace old database w"..., 50failed to replace old database with new database!

-) = 50

-write(2, "error: ", 7error: )                  = 7

-write(2, "replace files in /var/lib/rpm wi"..., 82replace files in /var/lib/rpm with files from /var/lib/rpmrebuilddb.54 to recover

-) = 82

-fcntl(3, F_SETLK, {l_type=F_UNLCK, l_whence=SEEK_SET, l_start=0, l_len=0}) = 0

-rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0

-rt_sigprocmask(SIG_BLOCK, ~[RTMIN RT_1], [], 8) = 0

-rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0

-close(3)                                = 0

-exit_group(1)                           = ?

-+++ exited with 1 +++

-```

-

-This patch fixes this problem by using a wrapper for rename calls.

-If rename returns with EXDEV error, then we need to use fallback

-rename_dir function to achive the same.

-

-For more info:

-https://github.com/torvalds/linux/blob/master/Documentation/filesystems/overlayfs.rst#renaming-directories

-

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

- 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

-+++ b/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 b3c5da62d..b9831db60 100644

-+++ b/lib/rpmdb.c

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

- #include <errno.h>

- #include <dirent.h>

- #include <fcntl.h>

-+#include <fts.h>

-+#include <stdio.h>

-+#include <limits.h>

-+#include <string.h>

-+#include <stdlib.h>

-+#include <unistd.h>

-+#include <sys/stat.h>

-+#include <sys/types.h>

-+#include <sys/errno.h>

- 

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

- #include <fnmatch.h>

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

- 

- static rpmdb rpmdbUnlink(rpmdb db);

- 

-+static int create_dest_fn_path(const char *src, char *dst, int dstsize)

-+{

-+    char *fn = NULL;

-+    char *buf = NULL;

-+    int ret = -1;

-+

-+    if (src == NULL || dst == NULL || dstsize <= 0) {

-+        rpmlog(RPMLOG_ERR, "Invalid input argument(s)\n");

-+        return ret;

-+    }

-+

-+    buf = xcalloc(dstsize, 1);

-+

-+    fn = strrchr(src, '/');

-+    if (fn == NULL) {

-+        rpmlog(RPMLOG_ERR, "Wrong src path(%s)\n", src);

-+        goto end;

-+    }

-+

-+    fn++;

-+

-+    if (snprintf(buf, dstsize, "%s/%s", dst, fn) < 0) {

-+        rpmlog(RPMLOG_ERR, "snprintf failed\n");

-+        goto end;

-+    }

-+    strcpy(dst, buf);

-+

-+    ret = 0;

-+

-+end:

-+    free(buf);

-+    return ret;

-+}

-+

-+int removedir(const char *path)

-+{

-+    FTS *ftsp = NULL;

-+    FTSENT *ent = NULL;

-+    int retval = -1;

-+    char rpath[PATH_MAX] = {0};

-+

-+    if (path == NULL) {

-+        rpmlog(RPMLOG_ERR, "Invalid input argument(s)\n");

-+        return retval;

-+    }

-+

-+    if (realpath(path, rpath) == NULL) {

-+        rpmlog(RPMLOG_ERR, "'%s' doesn't exist\n", path);

-+        return retval;

-+    }

-+

-+    char *paths[] = {rpath, NULL};

-+    ftsp = fts_open(paths, FTS_PHYSICAL, NULL);

-+    if (ftsp == NULL) {

-+        rpmlog(RPMLOG_ERR, "fts_open: %s\n", strerror(errno));

-+        return retval;

-+    }

-+

-+    errno = 0;

-+    while ((ent = fts_read(ftsp))) {

-+        if (ent->fts_info & FTS_DP) {

-+            if (rmdir(ent->fts_path)) {

-+                rpmlog(RPMLOG_ERR, "rmdir(%s): %s\n", ent->fts_path,

-+                        strerror(errno));

-+            }

-+        } else if (ent->fts_info & FTS_F){

-+            if (unlink(ent->fts_path)) {

-+                rpmlog(RPMLOG_ERR, "unlink(%s): %s\n", ent->fts_path,

-+                        strerror(errno));

-+            }

-+        }

-+

-+        if (errno) {

-+            rpmlog(RPMLOG_ERR, "Failed to delete: %s\n", ent->fts_path);

-+            goto end;

-+        }

-+    }

-+

-+    retval = 0;

-+

-+end:

-+    fts_close(ftsp);

-+    return retval;

-+}

-+

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

-+{

-+    FILE *in = NULL;

-+    FILE *out = NULL;

-+    int retval = -1;

-+    char rbuf[BUFSIZ] = {0};

-+

-+    if (src == NULL || dst == NULL) {

-+        rpmlog(RPMLOG_ERR, "Invalid input argument(s)\n");

-+        goto end;

-+    }

-+

-+    in = fopen(src, "rb");

-+    out= fopen(dst, "wb");

-+    if (in == NULL || out == NULL) {

-+        rpmlog(RPMLOG_ERR, "fopen error: %s\n", strerror(errno));

-+        goto end;

-+    }

-+

-+    while (1) {

-+        size_t bytes_read = fread(rbuf, 1, BUFSIZ, in);

-+        if (ferror(in)) {

-+            rpmlog(RPMLOG_ERR, "fread error: %s\n", strerror(errno));

-+            goto end;