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 openpkg-web Date: 03-Sep-2003 16:23:49
Branch: HEAD Handle: 2003090315234702
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
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 the source RPM
(which is the owner/group of the files as staying on the package author
system) is not existing on the target system, of course.
PR: 246
Summary:
Revision Changes Path
1.37 +1 -0 openpkg-src/openpkg/HISTORY
1.206 +1 -1 openpkg-src/openpkg/openpkg.spec
1.13 +32 -4 openpkg-src/openpkg/rpm.patch.bugfix
1.13 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.17 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.12 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.6382 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.36 -r1.37 HISTORY
--- openpkg-src/openpkg/HISTORY 1 Sep 2003 09:38:21 -0000 1.36
+++ openpkg-src/openpkg/HISTORY 3 Sep 2003 14:23:48 -0000 1.37
@@ -2,6 +2,7 @@
2003
====
+20030903 patch RPM 4.2.1 so it does again (as 4.0.2) ignore file owner/group on
.src.rpm installation.
20030901 port RPM 4.2.1 to Solaris 2.6 (no "uintX_t") and non-GCC platforms (no
"inline")
20030901 port RPM 4.2.1 to OpenBSD/NetBSD, too.
20030830 replace Bash variable exporting constructs with compatible Bourne-Shell
constructs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.205 -r1.206 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 1 Sep 2003 07:03:47 -0000 1.205
+++ openpkg-src/openpkg/openpkg.spec 3 Sep 2003 14:23:48 -0000 1.206
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030901
+%define V_openpkg 20030903
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.12 -r1.13 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 1 Sep 2003 09:38:21 -0000 1.12
+++ openpkg-src/openpkg/rpm.patch.bugfix 3 Sep 2003 14:23:49 -0000 1.13
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 01-Sep-2003
+## Created on: 03-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -66,7 +66,7 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 24 Aug 2003 13:10:11 -0000
++++ lib/psm.c 3 Sep 2003 13:53:22 -0000
@@ -940,6 +940,8 @@
if (sfdno > STDERR_FILENO) {
xx = Fclose (scriptFd);
@@ -78,13 +78,41 @@
{ const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
+---------------------------------------------------------------------------
+| 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
+| the source RPM (which is the owner/group of the files as staying on
+| the package author system) is not existing on the target system, of
+| course.
++---------------------------------------------------------------------------
+Index: lib/psm.c
+--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
++++ lib/psm.c 3 Sep 2003 13:53:22 -0000
+@@ -1710,6 +1712,7 @@
+
+ uid = fi->uid;
+ gid = fi->gid;
++ if (headerIsEntry(fi->h, RPMTAG_SOURCEPACKAGE)) {
+ if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
+ rpmMessage(RPMMESS_WARNING,
+ _("user %s does not exist - using root\n"),
+@@ -1727,6 +1730,7 @@
+ /* XXX this diddles header memory. */
+ fi->fmodes[i] &= ~S_ISGID; /* turn off the sgid bit */
+ }
++ }
+ if (fi->fuids) fi->fuids[i] = uid;
+ if (fi->fgids) fi->fgids[i] = gid;
+ }
+
++---------------------------------------------------------------------------
| Fix --justdb operation by consistently use the same rootDir checks
| RPM uses everywhere else, too.
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 24 Aug 2003 13:10:11 -0000
-@@ -2027,7 +2029,8 @@
++++ lib/psm.c 3 Sep 2003 13:53:22 -0000
+@@ -2027,7 +2031,8 @@
case PSM_CHROOT_IN:
{ const char * rootDir = rpmtsRootDir(ts);
/* Change root directory if requested and not already done. */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.12 -r1.13 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 1 Sep 2003 09:38:21 -0000 1.12
+++ openpkg-src/openpkg/rpm.patch.feature 3 Sep 2003 14:23:49 -0000 1.13
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 01-Sep-2003
+## Created on: 03-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.16 -r1.17 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 1 Sep 2003 09:38:21 -0000 1.16
+++ openpkg-src/openpkg/rpm.patch.porting 3 Sep 2003 14:23:49 -0000 1.17
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 01-Sep-2003
+## Created on: 03-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 1 Sep 2003 09:38:21 -0000 1.11
+++ openpkg-src/openpkg/rpm.patch.regen 3 Sep 2003 14:23:49 -0000 1.12
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 01-Sep-2003
+## Created on: 03-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6381 -r1.6382 news.txt
--- openpkg-web/news.txt 3 Sep 2003 13:33:47 -0000 1.6381
+++ openpkg-web/news.txt 3 Sep 2003 14:23:47 -0000 1.6382
@@ -1,3 +1,4 @@
+03-Sep-2003: Upgraded package: P<openpkg-20030903-20030903>
03-Sep-2003: Upgraded package: P<subversion-0.28.2-20030903>
03-Sep-2003: Upgraded package: P<vim-6.2.72-20030903>
03-Sep-2003: Upgraded package: P<pgadmin-0.9.1.20030902-20030903>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
