OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Sep-2006 15:57:59
Branch: HEAD Handle: 2006091314575801
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
unpack source RPM package files as management user if called by super
user ("openpkg rpm -Uvh *.src.rpm")
Summary:
Revision Changes Path
1.373 +1 -0 openpkg-src/openpkg/HISTORY
1.61 +13 -13 openpkg-src/openpkg/rpm.patch.bugfix
1.64 +57 -5 openpkg-src/openpkg/rpm.patch.feature
1.70 +7 -7 openpkg-src/openpkg/rpm.patch.porting
1.60 +3 -3 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.372 -r1.373 HISTORY
--- openpkg-src/openpkg/HISTORY 13 Sep 2006 10:42:22 -0000 1.372
+++ openpkg-src/openpkg/HISTORY 13 Sep 2006 13:57:58 -0000 1.373
@@ -2,6 +2,7 @@
2006
====
+20060913 unpack source RPM package files as management user if called by
super user ("openpkg rpm -Uvh *.src.rpm")
20060913 do not rise privileges for "openpkg rc" when given --eval or
--print options
20060910 OpenPKG supports all major Unix platforms - remove explicit and
unmaintained platform support determination
20060905 upgrade to OpenSSL 0.9.8c
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.60 -r1.61 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 1 Jan 2006 13:17:53 -0000
1.60
+++ openpkg-src/openpkg/rpm.patch.bugfix 13 Sep 2006 13:57:58 -0000
1.61
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Aug-2005
+## Created on: 13-Sep-2006
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -49,7 +49,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:43:41 -0000
++++ configure.ac 13 Sep 2006 13:38:23 -0000
@@ -416,7 +417,7 @@
AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_LIB(beecrypt, mpfprintln, [
@@ -66,7 +66,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:43:42 -0000
++++ configure.ac 13 Sep 2006 13:38:26 -0000
@@ -1274,7 +1305,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ -81,8 +81,8 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 22 Jan 2004 21:42:23 -0000 1.2
-@@ -940,6 +940,8 @@
++++ lib/psm.c 13 Sep 2006 13:38:27 -0000
+@@ -940,6 +960,8 @@
if (sfdno > STDERR_FILENO) {
xx = Fclose (scriptFd);
}
@@ -98,8 +98,8 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 22 Jan 2004 21:42:23 -0000 1.2
-@@ -1106,11 +1108,13 @@
++++ lib/psm.c 13 Sep 2006 13:38:29 -0000
+@@ -1106,11 +1128,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 @@
+@@ -1149,7 +1173,7 @@
{ int arg1;
int index;
@@ -133,8 +133,8 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 22 Jan 2004 21:42:23 -0000 1.2
-@@ -1710,6 +1714,7 @@
++++ lib/psm.c 13 Sep 2006 13:38:32 -0000
+@@ -1710,6 +1734,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 @@
+@@ -1727,6 +1752,7 @@
/* XXX this diddles header memory. */
fi->fmodes[i] &= ~S_ISGID; /* turn off the sgid bit */
}
@@ -157,8 +157,8 @@
+---------------------------------------------------------------------------
Index: lib/psm.c
--- lib/psm.c 5 Jun 2003 12:43:18 -0000 1.1.1.6
-+++ lib/psm.c 22 Jan 2004 21:42:23 -0000 1.2
-@@ -2027,7 +2033,8 @@
++++ lib/psm.c 13 Sep 2006 13:38:33 -0000
+@@ -2027,7 +2053,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.63 -r1.64 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 1 Jan 2006 13:17:53 -0000
1.63
+++ openpkg-src/openpkg/rpm.patch.feature 13 Sep 2006 13:57:58 -0000
1.64
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Aug-2005
+## Created on: 13-Sep-2006
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -837,7 +837,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:44:17 -0000
++++ configure.ac 13 Sep 2006 13:39:07 -0000
@@ -53,7 +53,7 @@
AS=${AS-as}
AC_SUBST(AS)
@@ -871,7 +871,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:44:19 -0000
++++ configure.ac 13 Sep 2006 13:39:09 -0000
@@ -310,7 +311,7 @@
WITH_ZLIB_SUBDIR=
WITH_ZLIB_INCLUDE=
@@ -889,7 +889,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:44:20 -0000
++++ configure.ac 13 Sep 2006 13:39:11 -0000
@@ -324,38 +325,38 @@
localdone=
@@ -967,7 +967,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:44:22 -0000
++++ configure.ac 13 Sep 2006 13:39:12 -0000
@@ -1200,12 +1202,12 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
@@ -1006,6 +1006,58 @@
AC_SUBST(LIBRPMALIAS_FILENAME)
+---------------------------------------------------------------------------
+| If running as "susr", do not unpack source RPM packages with "susr"
+| file ownerships as the OpenPKG Set-UID wrapper switches from "musr"
+| to "susr" on "openpkg rpm -Uvh *.src.rpm". As a result the installed
+| files could be never removed again by "musr". It is more consistent
+| to always unpack as "musr" if possible.
++---------------------------------------------------------------------------
+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:39:15 -0000
+@@ -314,6 +314,20 @@
+
+ fi->uid = getuid();
+ fi->gid = getgid();
++#ifdef OPENPKG
++ if (fi->uid == 0) {
++ char *muid_str;
++ char *mgid_str;
++ uid_t *muid;
++ gid_t *mgid;
++ if ((muid_str = rpmExpand("%{l_muid}", NULL)) != NULL)
++ if ((muid = (uid_t)strtol(muid_str, (char **)NULL, 10)) > 0)
++ fi->uid = muid;
++ if ((mgid_str = rpmExpand("%{l_mgid}", NULL)) != NULL)
++ if ((mgid = (gid_t)strtol(mgid_str, (char **)NULL, 10)) > 0)
++ fi->gid = mgid;
++ }
++#endif
+ fi->astriplen = 0;
+ fi->striplen = 0;
+
+@@ -352,6 +366,9 @@
+ rpmrc = RPMRC_FAIL;
+ goto exit;
+ }
++#ifdef OPENPKG
++ chown(_sourcedir, fi->uid, fi->gid);
++#endif
+
+ _specdir = rpmGenPath(rpmtsRootDir(ts), "%{_specdir}", "");
+ rpmrc = rpmMkdirPath(_specdir, "specdir");
+@@ -359,6 +376,9 @@
+ rpmrc = RPMRC_FAIL;
+ goto exit;
+ }
++#ifdef OPENPKG
++ chown(_specdir, fi->uid, fi->gid);
++#endif
+
+ /* Build dnl/dil with {_sourcedir, _specdir} as values. */
+ if (i < fi->fc) {
+
++---------------------------------------------------------------------------
| RPM has two platform id canonicalizations: hard-coded ones in
| the "rpm" program and defined ones in the rpmrc files. The
| hard-coded ones make the defined ones inconsistent. Additionally,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.69 -r1.70 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 1 Jan 2006 13:17:53 -0000
1.69
+++ openpkg-src/openpkg/rpm.patch.porting 13 Sep 2006 13:57:59 -0000
1.70
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Aug-2005
+## Created on: 13-Sep-2006
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -36,7 +36,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:45:15 -0000
++++ configure.ac 13 Sep 2006 13:40:20 -0000
@@ -150,10 +151,10 @@
dnl XXX Test for libpthread.a that is NPTL aware (static link only).
dnl
@@ -59,7 +59,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:45:17 -0000
++++ configure.ac 13 Sep 2006 13:40:21 -0000
@@ -446,14 +447,17 @@
AC_CHECK_LIB(socket, socket)
])
@@ -91,7 +91,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:45:18 -0000
++++ configure.ac 13 Sep 2006 13:40:23 -0000
@@ -963,12 +967,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -114,7 +114,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:45:19 -0000
++++ configure.ac 13 Sep 2006 13:40:25 -0000
@@ -1141,9 +1146,6 @@
dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
@@ -136,7 +136,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 15 Aug 2005 09:45:21 -0000
++++ configure.ac 13 Sep 2006 13:40:29 -0000
@@ -1249,11 +1251,40 @@
AC_SUBST(OBJDUMP)
@@ -511,7 +511,7 @@
+---------------------------------------------------------------------------
Index: file/config.h.in
--- file/config.h.in 7 Mar 2003 19:39:18 -0000 1.1.1.1
-+++ file/config.h.in 15 Aug 2005 09:45:39 -0000
++++ file/config.h.in 13 Sep 2006 13:40:49 -0000
@@ -106,6 +106,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.59 -r1.60 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 1 Jan 2006 13:17:53 -0000
1.59
+++ openpkg-src/openpkg/rpm.patch.regen 13 Sep 2006 13:57:59 -0000
1.60
@@ -9,7 +9,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 15-Aug-2005
+## Created on: 13-Sep-2006
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -21,7 +21,7 @@
+---------------------------------------------------------------------------
Index: config.h.in
--- config.h.in 16 Jul 2003 17:17:13 -0000 1.1.1.18
-+++ config.h.in 15 Aug 2005 09:46:31 -0000
++++ config.h.in 13 Sep 2006 13:41:41 -0000
@@ -108,6 +108,9 @@
/* Define if you have the getmntent() function */
#undef HAVE_GETMNTENT
@@ -106,7 +106,7 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 15 Aug 2005 09:46:33 -0000
++++ configure 13 Sep 2006 13:41:43 -0000
@@ -467,7 +467,7 @@
# include <unistd.h>
#endif"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
