ossp-uuid is not required by rpm.org

[packages/rpm.git] / rpm-scripts-closefds.patch

diff --git a/rpm-scripts-closefds.patch b/rpm-scripts-closefds.patch
index da005dad6709ec3b4ced38d31e5c4278d39d157d..6be392ec7792856753674b5bbf1d6909a4e4d0dd 100644 (file)
--- a/rpm-scripts-closefds.patch
+++ b/rpm-scripts-closefds.patch
@@ -1,30 +1,28 @@
-diff -Nur rpm-4.0.2.orig/lib/rpminstall.c rpm-4.0.2/lib/rpminstall.c
---- rpm-4.0.2.orig/lib/rpminstall.c    Sat Feb 10 15:07:16 2001
-+++ rpm-4.0.2/lib/rpminstall.c Sun Sep  9 00:33:52 2001
-@@ -87,6 +87,13 @@
-       case RPMCALLBACK_INST_OPEN_FILE:
-       fd = Fopen(filename, "r.ufdio");
-       fd = fdLink(fd, "persist (showProgress)");
-+      {
-+          int oldfl=Fcntl(fd, F_GETFD, 0);
-+          if(oldfl >= 0) {
-+              oldfl |= FD_CLOEXEC; /* scripts shouldn't inherit rpm file descriptor */
-+              Fcntl(fd, F_SETFD, oldfl);
-+          }
-+      }
-       return fd;
+--- rpm-4.16.0/lib/rpminstall.c.orig   2020-05-28 12:04:25.040136702 +0200
++++ rpm-4.16.0/lib/rpminstall.c        2020-10-03 09:46:49.369707250 +0200
+@@ -4,6 +4,8 @@
  
-       case RPMCALLBACK_INST_CLOSE_FILE:
-diff -Nur rpm-4.0.2.orig/lib/uninstall.c rpm-4.0.2/lib/uninstall.c
---- rpm-4.0.2.orig/lib/uninstall.c     Mon Jan 22 16:59:13 2001
-+++ rpm-4.0.2/lib/uninstall.c  Sat Sep  8 23:58:22 2001
-@@ -388,6 +388,9 @@
-           if (Fileno(ts->scriptFd) > STDERR_FILENO) {
-               Fclose (ts->scriptFd);
+ #include "system.h"
+ 
++#include <fcntl.h>
++
+ #include <rpm/rpmcli.h>
+ #include <rpm/rpmtag.h>
+ #include <rpm/rpmlib.h>               /* rpmReadPackageFile, vercmp etc */
+@@ -114,8 +116,15 @@
+               Fclose(fd);
+               fd = NULL;
            }
+-      } else
 +      } else {
-+          if (Fileno(out) > STDERR_FILENO)
-+              Fclose (out);
-       }
++          long oldfl;
+           fd = fdLink(fd);
++          oldfl=Fcntl(fd, F_GETFD, 0);
++          if(oldfl >= 0) {
++              oldfl |= FD_CLOEXEC; /* scripts shouldn't inherit rpm file descriptor */
++              Fcntl(fd, F_SETFD, (void*)oldfl);
++          }
++      }
+       return (void *)fd;
+       break;
  
-       {   const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);