diff -r 6eb79a12ee37 -r fa72b60f59c9 openpkg/rpm.patch.bugfix --- a/openpkg/rpm.patch.bugfix Wed Mar 30 19:35:16 2011 +0200 +++ b/openpkg/rpm.patch.bugfix Wed Mar 30 19:37:58 2011 +0200 @@ -99,7 +99,7 @@ Index: lib/psm.c --- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6 +++ lib/psm.c 13 Sep 2006 13:38:29 -0000 -@@ -1106,11 +1108,13 @@ +@@ -1108,11 +1108,13 @@ const char ** triggerProgs; int_32 * triggerIndices; const char * sourceName; @@ -113,7 +113,7 @@ trigger = rpmdsInit(rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem)); if (trigger == NULL) -@@ -1149,7 +1153,7 @@ +@@ -1151,7 +1153,7 @@ { int arg1; int index; @@ -134,7 +134,7 @@ Index: lib/psm.c --- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6 +++ lib/psm.c 13 Sep 2006 13:38:32 -0000 -@@ -1710,6 +1714,7 @@ +@@ -1714,6 +1714,7 @@ uid = fi->uid; gid = fi->gid; @@ -142,7 +142,7 @@ if (fi->fuser && unameToUid(fi->fuser[i], &uid)) { rpmMessage(RPMMESS_WARNING, _("user %s does not exist - using root\n"), -@@ -1727,6 +1732,7 @@ +@@ -1731,6 +1732,7 @@ /* XXX this diddles header memory. */ fi->fmodes[i] &= ~S_ISGID; /* turn off the sgid bit */ } @@ -158,7 +158,7 @@ Index: lib/psm.c --- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6 +++ lib/psm.c 13 Sep 2006 13:38:33 -0000 -@@ -2027,7 +2033,8 @@ +@@ -2033,7 +2033,8 @@ case PSM_CHROOT_IN: { const char * rootDir = rpmtsRootDir(ts); /* Change root directory if requested and not already done. */