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: 28-Aug-2003 10:21:46
Branch: HEAD Handle: 2003082809214401
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:
fix unpacking of non-compressed tarballs and fix order and annotation
of the build/parsePrep.c patches
Summary:
Revision Changes Path
1.33 +1 -0 openpkg-src/openpkg/HISTORY
1.200 +1 -1 openpkg-src/openpkg/openpkg.spec
1.9 +22 -16 openpkg-src/openpkg/rpm.patch.bugfix
1.9 +36 -42 openpkg-src/openpkg/rpm.patch.feature
1.12 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.9 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.6314 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.32 -r1.33 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Aug 2003 09:52:25 -0000 1.32
+++ openpkg-src/openpkg/HISTORY 28 Aug 2003 08:21:45 -0000 1.33
@@ -2,6 +2,7 @@
2003
====
+20030828 fix unpacking of non-compressed tarballs
20030827 enhance and fix %post script to correctly rebuild RPM DB and import
OpenPGP public key
20030826 **** MAJOR UPGRADE FROM RPM 4.0.2 TO RPM 4.2.1 ****
20030820 name internal bootstrapping tarball just .tar instead of .tar.Z -- it is
no longer compressed.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.199 -r1.200 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 27 Aug 2003 21:10:15 -0000 1.199
+++ openpkg-src/openpkg/openpkg.spec 28 Aug 2003 08:21:45 -0000 1.200
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030827
+%define V_openpkg 20030828
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.8 -r1.9 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 27 Aug 2003 13:13:16 -0000 1.8
+++ openpkg-src/openpkg/rpm.patch.bugfix 28 Aug 2003 08:21:45 -0000 1.9
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Aug-2003
+## Created on: 28-Aug-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -23,21 +23,27 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 24 Aug 2003 13:10:15 -0000
-@@ -264,11 +296,12 @@
- "fi");
- } else {
- buf[0] = '\0';
-- t = stpcpy( stpcpy(buf, "tar "), taropts);
-+ t = stpcpy( stpcpy(buf, tar), taropts);
- *t++ = ' ';
- t = stpcpy(t, fn);
- }
-
-+ tar = _free(tar);
- urlfn = _free(urlfn);
- return buf;
- }
++++ build/parsePrep.c 28 Aug 2003 08:13:15 -0000
+@@ -584,12 +619,15 @@
+ saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)), '\n');
+ /[EMAIL PROTECTED]@*/
+ for (lines = saveLines; *lines; lines++) {
++ char *cp;
++ for (cp = *lines; *cp == ' ' || *cp == '\t'; cp++)
++ ;
+ res = 0;
+ /[EMAIL PROTECTED]@*/
+- if (! strncmp(*lines, "%setup", sizeof("%setup")-1)) {
+- res = doSetupMacro(spec, *lines);
+- } else if (! strncmp(*lines, "%patch", sizeof("%patch")-1)) {
+- res = doPatchMacro(spec, *lines);
++ if (! strncmp(cp, "%setup", sizeof("%setup")-1)) {
++ res = doSetupMacro(spec, cp);
++ } else if (! strncmp(cp, "%patch", sizeof("%patch")-1)) {
++ res = doPatchMacro(spec, cp);
+ } else {
+ appendLineStringBuf(spec->prep, *lines);
+ }
+---------------------------------------------------------------------------
| Remove access to not-existing beecrypt/ subdirectory
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.8 -r1.9 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 27 Aug 2003 13:13:16 -0000 1.8
+++ openpkg-src/openpkg/rpm.patch.feature 28 Aug 2003 08:21:45 -0000 1.9
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Aug-2003
+## Created on: 28-Aug-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -380,13 +380,10 @@
| In OpenPKG, the RPM package contains own local versions of the
| "patch" and "tar" tools, so we cannot accept hard-coded names here.
| Instead we expand a variable to allow us to direct RPM to our tools.
-| Also, we allow %setup and %patch macros whitespace-indented in
-| %prep, because both in OpenPKG we both have all scripts indented and
-| this way it is more flexible and clean.
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 24 Aug 2003 13:10:15 -0000
++++ build/parsePrep.c 28 Aug 2003 08:13:15 -0000
@@ -76,6 +76,7 @@
struct Source *sp;
rpmCompressedMagic compressed = COMPRESSED_NOT;
@@ -442,22 +439,6 @@
for (sp = spec->sources; sp != NULL; sp = sp->next) {
if ((sp->flags & RPMBUILD_ISSOURCE) && (sp->num == c)) {
-@@ -182,7 +197,15 @@
- return NULL;
- }
-
-+#ifndef OPENPKG
- urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
-+#else
-+ urlfn = rpmGetPath("%{_specdir}/", sp->source, NULL);
-+ if (access(urlfn, F_OK) == -1) {
-+ urlfn = _free(urlfn);
-+ urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
-+ }
-+#endif
-
- /[EMAIL PROTECTED]@*/ /* FIX: shrug */
- taropts = ((rpmIsVerbose() && !quietly) ? "-xvvf" : "-xf");
@@ -228,6 +251,10 @@
/[EMAIL PROTECTED]@*/ break;
}
@@ -485,26 +466,23 @@
t = stpcpy(t,
"\n"
"STATUS=$?\n"
-@@ -584,12 +617,15 @@
- saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)), '\n');
- /[EMAIL PROTECTED]@*/
- for (lines = saveLines; *lines; lines++) {
-+ char *cp;
-+ for (cp = *lines; *cp == ' ' || *cp == '\t'; cp++)
-+ ;
- res = 0;
- /[EMAIL PROTECTED]@*/
-- if (! strncmp(*lines, "%setup", sizeof("%setup")-1)) {
-- res = doSetupMacro(spec, *lines);
-- } else if (! strncmp(*lines, "%patch", sizeof("%patch")-1)) {
-- res = doPatchMacro(spec, *lines);
-+ if (! strncmp(cp, "%setup", sizeof("%setup")-1)) {
-+ res = doSetupMacro(spec, cp);
-+ } else if (! strncmp(cp, "%patch", sizeof("%patch")-1)) {
-+ res = doPatchMacro(spec, cp);
- } else {
- appendLineStringBuf(spec->prep, *lines);
- }
+@@ -264,11 +296,14 @@
+ "fi");
+ } else {
+ buf[0] = '\0';
+- t = stpcpy( stpcpy(buf, "tar "), taropts);
+- *t++ = ' ';
++ t = stpcpy(buf, tar);
++ t = stpcpy(t, " ");
++ t = stpcpy(t, taropts);
++ t = stpcpy(t, " ");
+ t = stpcpy(t, fn);
+ }
+
++ tar = _free(tar);
+ urlfn = _free(urlfn);
+ return buf;
+ }
+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
@@ -513,7 +491,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 24 Aug 2003 13:10:15 -0000
++++ build/parsePrep.c 28 Aug 2003 08:13:15 -0000
@@ -87,7 +88,15 @@
return NULL;
}
@@ -530,6 +508,22 @@
args[0] = '\0';
if (db) {
+@@ -182,7 +197,15 @@
+ return NULL;
+ }
+
++#ifndef OPENPKG
+ urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
++#else
++ urlfn = rpmGetPath("%{_specdir}/", sp->source, NULL);
++ if (access(urlfn, F_OK) == -1) {
++ urlfn = _free(urlfn);
++ urlfn = rpmGetPath("%{_sourcedir}/", sp->source, NULL);
++ }
++#endif
+
+ /[EMAIL PROTECTED]@*/ /* FIX: shrug */
+ taropts = ((rpmIsVerbose() && !quietly) ? "-xvvf" : "-xf");
+---------------------------------------------------------------------------
| Not everything on a system is RPM based (for instance OpenPKG is
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 27 Aug 2003 13:13:16 -0000 1.11
+++ openpkg-src/openpkg/rpm.patch.porting 28 Aug 2003 08:21:45 -0000 1.12
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Aug-2003
+## Created on: 28-Aug-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.8 -r1.9 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 27 Aug 2003 13:13:16 -0000 1.8
+++ openpkg-src/openpkg/rpm.patch.regen 28 Aug 2003 08:21:45 -0000 1.9
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Aug-2003
+## Created on: 28-Aug-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.6313 -r1.6314 news.txt
--- openpkg-web/news.txt 27 Aug 2003 20:23:25 -0000 1.6313
+++ openpkg-web/news.txt 28 Aug 2003 08:21:44 -0000 1.6314
@@ -1,3 +1,4 @@
+28-Aug-2003: Upgraded package: P<openpkg-20030828-20030828>
27-Aug-2003: Upgraded package: P<pango-1.2.5-20030827>
27-Aug-2003: Upgraded package: P<ccrypt-1.6-20030827>
27-Aug-2003: Upgraded package: P<tinyca-0.5.1-20030827>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
