1.1 --- a/openpkg/rpm.patch.bugfix Wed Mar 30 19:35:16 2011 +0200
1.2 +++ b/openpkg/rpm.patch.bugfix Wed Mar 30 19:37:58 2011 +0200
1.3 @@ -99,7 +99,7 @@
1.4 Index: lib/psm.c
1.5 --- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
1.6 +++ lib/psm.c 13 Sep 2006 13:38:29 -0000
1.7 -@@ -1106,11 +1108,13 @@
1.8 +@@ -1108,11 +1108,13 @@
1.9 const char ** triggerProgs;
1.10 int_32 * triggerIndices;
1.11 const char * sourceName;
1.12 @@ -113,7 +113,7 @@
1.13
1.14 trigger = rpmdsInit(rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem));
1.15 if (trigger == NULL)
1.16 -@@ -1149,7 +1153,7 @@
1.17 +@@ -1151,7 +1153,7 @@
1.18 { int arg1;
1.19 int index;
1.20
1.21 @@ -134,7 +134,7 @@
1.22 Index: lib/psm.c
1.23 --- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
1.24 +++ lib/psm.c 13 Sep 2006 13:38:32 -0000
1.25 -@@ -1710,6 +1714,7 @@
1.26 +@@ -1714,6 +1714,7 @@
1.27
1.28 uid = fi->uid;
1.29 gid = fi->gid;
1.30 @@ -142,7 +142,7 @@
1.31 if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
1.32 rpmMessage(RPMMESS_WARNING,
1.33 _("user %s does not exist - using root\n"),
1.34 -@@ -1727,6 +1732,7 @@
1.35 +@@ -1731,6 +1732,7 @@
1.36 /* XXX this diddles header memory. */
1.37 fi->fmodes[i] &= ~S_ISGID; /* turn off the sgid bit */
1.38 }
1.39 @@ -158,7 +158,7 @@
1.40 Index: lib/psm.c
1.41 --- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
1.42 +++ lib/psm.c 13 Sep 2006 13:38:33 -0000
1.43 -@@ -2027,7 +2033,8 @@
1.44 +@@ -2033,7 +2033,8 @@
1.45 case PSM_CHROOT_IN:
1.46 { const char * rootDir = rpmtsRootDir(ts);
1.47 /* Change root directory if requested and not already done. */
