OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Oct-2003 20:20:43
Branch: HEAD Handle: 2003102019204300
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix
Log:
include "trigger argument passing patch" from RPM BugDB
Summary:
Revision Changes Path
1.77 +1 -0 openpkg-src/openpkg/HISTORY
1.32 +37 -6 openpkg-src/openpkg/rpm.patch.bugfix
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.76 -r1.77 HISTORY
--- openpkg-src/openpkg/HISTORY 20 Oct 2003 15:26:26 -0000 1.76
+++ openpkg-src/openpkg/HISTORY 20 Oct 2003 18:20:43 -0000 1.77
@@ -2,6 +2,7 @@
2003
====
+20031020 include "trigger argument passing patch" from RPM BugDB
20031020 make "rpm --setperms" and "rpm --setugids" more portable by using Bash
20031020 finish porting to SCO UnixWare 7.1.3
20031019 port mostly to SCO UnixWare 7.1.3 (only some libtool issues remaining)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.31 -r1.32 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 20 Oct 2003 12:47:37 -0000 1.31
+++ openpkg-src/openpkg/rpm.patch.bugfix 20 Oct 2003 18:20:43 -0000 1.32
@@ -81,7 +81,7 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 4 Sep 2003 05:27:02 -0000
++++ lib/psm.c 20 Oct 2003 18:07:11 -0000
@@ -940,6 +940,8 @@
if (sfdno > STDERR_FILENO) {
xx = Fclose (scriptFd);
@@ -93,6 +93,37 @@
{ const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
+---------------------------------------------------------------------------
+| Fix trigger argument passing. For more details see RPM BugDB under:
+| http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=100509
++---------------------------------------------------------------------------
+Index: lib/psm.c
+--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
++++ lib/psm.c 20 Oct 2003 18:07:11 -0000
+@@ -1106,11 +1108,13 @@
+ const char ** triggerProgs;
+ int_32 * triggerIndices;
+ const char * sourceName;
++ const char * triggerName;
+ rpmRC rc = RPMRC_OK;
+ int xx;
+ int i;
+
+ xx = headerNVR(sourceH, &sourceName, NULL, NULL);
++ xx = headerNVR(triggeredH, &triggerName, NULL, NULL);
+
+ trigger = rpmdsInit(rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem));
+ if (trigger == NULL)
+@@ -1149,7 +1153,7 @@
+ { int arg1;
+ int index;
+
+- arg1 = rpmdbCountPackages(rpmtsGetRdb(ts), Name);
++ arg1 = rpmdbCountPackages(rpmtsGetRdb(ts), triggerName);
+ if (arg1 < 0) {
+ /* XXX W2DO? fails as "execution of script failed" */
+ rc = RPMRC_FAIL;
+
++---------------------------------------------------------------------------
| Make sure RPM does not try to set file owner/group on files during
| installation of _source_ RPMs. Instead, let it use the current
| run-time owner/group, because most of the time the owner/group in
@@ -102,8 +133,8 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 4 Sep 2003 05:27:02 -0000
-@@ -1710,6 +1712,7 @@
++++ lib/psm.c 20 Oct 2003 18:07:11 -0000
+@@ -1710,6 +1714,7 @@
uid = fi->uid;
gid = fi->gid;
@@ -111,7 +142,7 @@
if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
rpmMessage(RPMMESS_WARNING,
_("user %s does not exist - using root\n"),
-@@ -1727,6 +1730,7 @@
+@@ -1727,6 +1732,7 @@
/* XXX this diddles header memory. */
fi->fmodes[i] &= ~S_ISGID; /* turn off the sgid bit */
}
@@ -126,8 +157,8 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 4 Sep 2003 05:27:02 -0000
-@@ -2027,7 +2031,8 @@
++++ lib/psm.c 20 Oct 2003 18:07:11 -0000
+@@ -2027,7 +2033,8 @@
case PSM_CHROOT_IN:
{ const char * rootDir = rpmtsRootDir(ts);
/* Change root directory if requested and not already done. */
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
