93 lines
5.1 KiB
Diff
93 lines
5.1 KiB
Diff
diff -Nru rpm-5.2.1.orig//lib/fsm.c rpm-5.2.1/lib/fsm.c
|
|
--- rpm-5.2.1.orig//lib/fsm.c 2009-03-27 22:17:42.000000000 +0100
|
|
+++ rpm-5.2.1/lib/fsm.c 2010-07-29 12:04:47.242751965 +0200
|
|
@@ -901,7 +901,7 @@
|
|
uid_t uid = fi->uid;
|
|
gid_t gid = fi->gid;
|
|
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
/* Make sure OpenPKG/Mandriva 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
|
|
@@ -910,7 +910,7 @@
|
|
course. */
|
|
#endif
|
|
if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
|
|
-#if defined(RPM_VENDOR_OPENPKG) ||defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) ||defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
if (!fi->isSource) {
|
|
#endif
|
|
if (fsm->goal == IOSM_PKGINSTALL)
|
|
@@ -918,13 +918,13 @@
|
|
_("user %s does not exist - using root\n"), fi->fuser[i]);
|
|
uid = 0;
|
|
finalMode &= ~S_ISUID; /* turn off suid bit */
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
}
|
|
#endif
|
|
}
|
|
|
|
if (fi->fgroup && gnameToGid(fi->fgroup[i], &gid)) {
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
if (!fi->isSource) {
|
|
#endif
|
|
if (fsm->goal == IOSM_PKGINSTALL)
|
|
@@ -932,7 +932,7 @@
|
|
_("group %s does not exist - using root\n"), fi->fgroup[i]);
|
|
gid = 0;
|
|
finalMode &= ~S_ISGID; /* turn off sgid bit */
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
}
|
|
#endif
|
|
}
|
|
diff -Nru rpm-5.2.1.orig//rpmio/iosm.c rpm-5.2.1/rpmio/iosm.c
|
|
--- rpm-5.2.1.orig//rpmio/iosm.c 2009-05-22 19:57:28.000000000 +0200
|
|
+++ rpm-5.2.1/rpmio/iosm.c 2010-07-29 12:04:02.032752064 +0200
|
|
@@ -957,7 +957,7 @@
|
|
uid_t uid = fi->uid;
|
|
gid_t gid = fi->gid;
|
|
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
/* Make sure OpenPKG/Mandriva 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
|
|
@@ -966,7 +966,7 @@
|
|
course. */
|
|
#endif
|
|
if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
if (!fi->isSource) {
|
|
#endif
|
|
if (iosm->goal == IOSM_PKGINSTALL)
|
|
@@ -974,13 +974,13 @@
|
|
_("user %s does not exist - using root\n"), fi->fuser[i]);
|
|
uid = 0;
|
|
finalMode &= ~S_ISUID; /* turn off suid bit */
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
}
|
|
#endif
|
|
}
|
|
|
|
if (fi->fgroup && gnameToGid(fi->fgroup[i], &gid)) {
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
if (!fi->isSource) {
|
|
#endif
|
|
if (iosm->goal == IOSM_PKGINSTALL)
|
|
@@ -988,7 +988,7 @@
|
|
_("group %s does not exist - using root\n"), fi->fgroup[i]);
|
|
gid = 0;
|
|
finalMode &= ~S_ISGID; /* turn off sgid bit */
|
|
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
|
|
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
|
|
}
|
|
#endif
|
|
}
|