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 Date: 20-Jan-2004 16:17:12
Branch: HEAD Handle: 2004012015171100
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
Log:
- adjust widths in "rpm -qplv" output to allow longer owner/group
- regenerate rpm.patch.* files with latest CVS 1.12.x
Summary:
Revision Changes Path
1.107 +2 -0 openpkg-src/openpkg/HISTORY
1.266 +1 -1 openpkg-src/openpkg/openpkg.spec
1.39 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.40 +50 -5 openpkg-src/openpkg/rpm.patch.feature
1.48 +14 -12 openpkg-src/openpkg/rpm.patch.porting
1.38 +5 -5 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.106 -r1.107 HISTORY
--- openpkg-src/openpkg/HISTORY 13 Jan 2004 10:19:28 -0000 1.106
+++ openpkg-src/openpkg/HISTORY 20 Jan 2004 15:17:11 -0000 1.107
@@ -2,6 +2,8 @@
2004
====
+20040120 adjust widths in "rpm -qplv" output to allow longer owner/group
+20040120 regenerate rpm.patch.* files with latest CVS 1.12.x
20040113 add %status to rc.openpkg; this prevents warnings when no package provides
a status
20040112 settings from [smrn]gid options get lost; fix by introducing a temporary
variable
20040112 fix RPM internal handling of %_excludedocs macro
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.265 -r1.266 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 19 Jan 2004 12:04:57 -0000 1.265
+++ openpkg-src/openpkg/openpkg.spec 20 Jan 2004 15:17:11 -0000 1.266
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040119
+%define V_openpkg 20040120
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.38 -r1.39 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 12 Jan 2004 12:35:29 -0000 1.38
+++ openpkg-src/openpkg/rpm.patch.bugfix 20 Jan 2004 15:17:11 -0000 1.39
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jan-2004
+## Created on: 20-Jan-2004
##
## 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.feature
============================================================================
$ cvs diff -u -r1.39 -r1.40 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 12 Jan 2004 12:35:30 -0000 1.39
+++ openpkg-src/openpkg/rpm.patch.feature 20 Jan 2004 15:17:11 -0000 1.40
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jan-2004
+## Created on: 20-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -339,11 +339,10 @@
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
+++ build/build.c 15 Sep 2003 19:02:34 -0000
-@@ -337,6 +355,21 @@
-
+@@ -338,6 +356,21 @@
if (what & RPMBUILD_RMSPEC)
(void) Unlink(spec->specFile);
-+
+
+#ifdef OPENPKG
+ if (what & RPMBUILD_RMSOURCE) {
+ const char *pn;
@@ -358,9 +357,10 @@
+ pn = _free(pn);
+ }
+#endif
-
++
exit:
if (rc && rpmlogGetNrecs() > 0) {
+ rpmMessage(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
+---------------------------------------------------------------------------
| Do not declare any files as %doc files by default.
@@ -968,6 +968,51 @@
/* the uname() result goes through the arch_canon table */
canon = lookupInCanonTable(un.machine,
+
++---------------------------------------------------------------------------
+| In verbose file listing output, give the owner and group fields more
+| width and at the same time reduce the nlink and size fields to more
+| typical sizes within OpenPKG.
++---------------------------------------------------------------------------
+Index: lib/query.c
+--- lib/query.c 4 Jun 2003 18:24:14 -0000 1.1.1.13
++++ lib/query.c 20 Jan 2004 14:39:01 -0000
+@@ -33,7 +33,11 @@
+ /[EMAIL PROTECTED] *te @*/
+ {
+ char sizefield[15];
++#ifdef OPENPKG
++ char ownerfield[13+1], groupfield[13+1];
++#else
+ char ownerfield[8+1], groupfield[8+1];
++#endif
+ char timefield[100];
+ time_t when = mtime; /* important if sizeof(int_32) ! sizeof(time_t) */
+ struct tm * tm;
+@@ -58,7 +62,11 @@
+ groupfield[sizeof(groupfield)-1] = '\0';
+
+ /* this is normally right */
++#ifdef OPENPKG
++ sprintf(sizefield, "%8u", size);
++#else
+ sprintf(sizefield, "%12u", size);
++#endif
+
+ /* this knows too much about dev_t */
+
+@@ -98,7 +106,11 @@
+ (void)strftime(timefield, sizeof(timefield) - 1, fmt, tm);
+ }
+
++#ifdef OPENPKG
++ sprintf(te, "%s %d %-13s %-13s %8s %s %s", perms,
++#else
+ sprintf(te, "%s %4d %-8s%-8s %10s %s %s", perms,
++#endif
+ (int)nlink, ownerfield, groupfield, sizefield, timefield, namefield);
+ perms = _free(perms);
+ }
+---------------------------------------------------------------------------
| Enable the exlusion of "%doc" files by default.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.47 -r1.48 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 12 Jan 2004 12:35:30 -0000 1.47
+++ openpkg-src/openpkg/rpm.patch.porting 20 Jan 2004 15:17:11 -0000 1.48
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jan-2004
+## Created on: 20-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -177,16 +177,16 @@
# endif
filesystems = xcalloc((numAlloced + 1), sizeof(*filesystems)); /* XXX memory
leak */
-@@ -191,6 +197,9 @@
- if (getmntent(mtab, &item)) break;
- mntdir = item.our_mntdir;
+@@ -193,6 +199,9 @@
# elif HAVE_GETMNTINFO_R
-+ if (nextMount == mntCount) break;
-+ mntdir = mounts[nextMount++].f_mntonname;
-+# elif HAVE_GETMNTINFO
if (nextMount == mntCount) break;
mntdir = mounts[nextMount++].f_mntonname;
++# elif HAVE_GETMNTINFO
++ if (nextMount == mntCount) break;
++ mntdir = mounts[nextMount++].f_mntonname;
# endif
+
+ if (stat(mntdir, &sb)) {
+---------------------------------------------------------------------------
| Add support for Compaq/HP OSF1/Tru64.
@@ -935,7 +935,7 @@
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
+++ system.h 27 Aug 2003 13:07:49 -0000
-@@ -603,9 +599,14 @@
+@@ -603,11 +599,16 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ -943,14 +943,16 @@
+#elif defined(__GNUC__)
#define FILE_RCSID(id) \
static inline const char *rcsid(const char *p) { \
-+ return rcsid(p = id); \
-+}
+ return rcsid(p = id); \
+ }
+#else
+#define FILE_RCSID(id) \
+static const char *rcsid(const char *p) { \
- return rcsid(p = id); \
- }
++ return rcsid(p = id); \
++}
#endif
+
+ #endif /* H_SYSTEM */
+---------------------------------------------------------------------------
| Remove GCC'ism.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.37 -r1.38 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 12 Jan 2004 12:35:30 -0000 1.37
+++ openpkg-src/openpkg/rpm.patch.regen 20 Jan 2004 15:17:11 -0000 1.38
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 07-Jan-2004
+## Created on: 20-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -82,11 +82,10 @@
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
-@@ -585,6 +573,15 @@
-
+@@ -586,6 +574,15 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-+
+
+/* uint16_t */
+#undef uint16_t
+
@@ -95,9 +94,10 @@
+
+/* uint8_t */
+#undef uint8_t
-
++
/* Define to unsigned long or unsigned long long if <inttypes.h> and
<stdint.h> don't define. */
+ #undef uintmax_t
+---------------------------------------------------------------------------
| Corresponding patches in "configure" script after regeneration from
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
