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: 11-Sep-2003 21:15:31
Branch: HEAD Handle: 2003091120153000
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
disable RPM internal support for unzip(1)'ing .zip files
Summary:
Revision Changes Path
1.44 +1 -0 openpkg-src/openpkg/HISTORY
1.16 +25 -28 openpkg-src/openpkg/rpm.patch.bugfix
1.16 +81 -22 openpkg-src/openpkg/rpm.patch.feature
1.20 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.15 +1 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.43 -r1.44 HISTORY
--- openpkg-src/openpkg/HISTORY 11 Sep 2003 18:03:16 -0000 1.43
+++ openpkg-src/openpkg/HISTORY 11 Sep 2003 19:15:30 -0000 1.44
@@ -2,6 +2,7 @@
2003
====
+20030911 disable RPM internal support for unzip(1)'ing .zip files
20030911 improve Linux detection in "platform" script
20030909 remove one more GCC extensional feature (in RPM's file/file.h)
20030908 upgrade "platform" script to new "OSSP platform" implementation and
provide %{l_platform}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.15 -r1.16 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 9 Sep 2003 08:58:44 -0000 1.15
+++ openpkg-src/openpkg/rpm.patch.bugfix 11 Sep 2003 19:15:30 -0000 1.16
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 09-Sep-2003
+## Created on: 11-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -23,27 +23,24 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ 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);
- }
++++ build/parsePrep.c 11 Sep 2003 19:02:14 -0000
+@@ -264,11 +298,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;
+ }
+---------------------------------------------------------------------------
| Remove access to not-existing beecrypt/ subdirectory
@@ -138,7 +135,7 @@
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
-+++ rpmio/macro.c 26 Aug 2003 07:31:04 -0000
++++ rpmio/macro.c 11 Sep 2003 18:56:03 -0000
@@ -879,7 +882,7 @@
*/
/[EMAIL PROTECTED]@*/
@@ -166,7 +163,7 @@
#endif
opts = me->opts;
-@@ -1168,7 +1173,7 @@
+@@ -1168,7 +1175,7 @@
int c;
int rc = 0;
int negate;
@@ -175,7 +172,7 @@
int chkexist;
if (++mb->depth > max_macro_depth) {
-@@ -1202,7 +1207,7 @@
+@@ -1202,7 +1209,7 @@
if (mb->depth > 1) /* XXX full expansion for outermost level */
t = mb->t; /* save expansion pointer for printExpand */
negate = 0;
@@ -184,7 +181,7 @@
chkexist = 0;
switch ((c = *s)) {
default: /* %name substitution */
-@@ -1237,7 +1242,8 @@
+@@ -1237,7 +1244,8 @@
/* For "%name " macros ... */
/[EMAIL PROTECTED]@*/
if ((c = *fe) && isblank(c))
@@ -194,7 +191,7 @@
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/ break;
case '(': /* %(...) shell escape */
-@@ -1284,7 +1290,7 @@
+@@ -1284,7 +1292,7 @@
ge = se - 1;
/[EMAIL PROTECTED]@*/ break;
case ' ':
@@ -203,7 +200,7 @@
/[EMAIL PROTECTED]@*/ break;
default:
/[EMAIL PROTECTED]@*/ break;
-@@ -1438,7 +1444,7 @@
+@@ -1438,7 +1446,7 @@
/* Setup args for "%name " macros with opts */
if (me && me->opts != NULL) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.15 -r1.16 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 9 Sep 2003 08:58:44 -0000 1.15
+++ openpkg-src/openpkg/rpm.patch.feature 11 Sep 2003 19:15:30 -0000 1.16
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 09-Sep-2003
+## Created on: 11-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -406,10 +406,15 @@
| 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.
+| Remove "unzip" support, because in OpenPKG there are less than
+| a dozend packages requiring unpacking of .zip files. For these
+| it is fully sufficient to explicitly require the "infozip"
+| package (containing "unzip") and leaving the less portable
+| "unzip" out of the bootstrap package.
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 28 Aug 2003 08:13:15 -0000
++++ build/parsePrep.c 11 Sep 2003 19:02:14 -0000
@@ -76,6 +76,7 @@
struct Source *sp;
rpmCompressedMagic compressed = COMPRESSED_NOT;
@@ -476,7 +481,23 @@
if (compressed != COMPRESSED_NOT) {
const char *zipper;
int needtar = 1;
-@@ -254,8 +281,13 @@
+@@ -240,6 +267,7 @@
+ case COMPRESSED_BZIP2:
+ t = "%{_bzip2bin} -dc";
+ break;
++#if 0
+ case COMPRESSED_ZIP:
+ if (rpmIsVerbose() && !quietly)
+ t = "%{_unzipbin}";
+@@ -247,6 +275,7 @@
+ t = "%{_unzipbin} -qq";
+ needtar = 0;
+ break;
++#endif
+ }
+ zipper = rpmGetPath(t, NULL);
+ buf[0] = '\0';
+@@ -254,8 +283,13 @@
zipper = _free(zipper);
*t++ = ' ';
t = stpcpy(t, fn);
@@ -492,23 +513,26 @@
t = stpcpy(t,
"\n"
"STATUS=$?\n"
-@@ -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;
- }
+@@ -584,12 +621,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);
+ }
+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
@@ -517,7 +541,7 @@
+---------------------------------------------------------------------------
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
-+++ build/parsePrep.c 28 Aug 2003 08:13:15 -0000
++++ build/parsePrep.c 11 Sep 2003 19:02:14 -0000
@@ -87,7 +88,15 @@
return NULL;
}
@@ -999,7 +1023,7 @@
+---------------------------------------------------------------------------
Index: rpmio/macro.c
--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
-+++ rpmio/macro.c 26 Aug 2003 07:31:04 -0000
++++ rpmio/macro.c 11 Sep 2003 18:56:03 -0000
@@ -50,6 +50,9 @@
#include "debug.h"
@@ -1010,6 +1034,41 @@
#if defined(__LCLINT__)
/[EMAIL PROTECTED]@*/
extern const unsigned short int **__ctype_b_loc (void) /[EMAIL PROTECTED]/;
+
++---------------------------------------------------------------------------
+| Remove "unzip" support, because in OpenPKG there are less than
+| a dozend packages requiring unpacking of .zip files. For these
+| it is fully sufficient to explicitly require the "infozip"
+| package (containing "unzip") and leaving the less portable
+| "unzip" out of the bootstrap package.
++---------------------------------------------------------------------------
+Index: rpmio/macro.c
+--- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
++++ rpmio/macro.c 11 Sep 2003 18:56:03 -0000
+@@ -1114,9 +1119,11 @@
+ case 2: /* COMPRESSED_BZIP2 */
+ sprintf(be, "%%_bzip2 %s", b);
+ break;
++#if 0
+ case 3: /* COMPRESSED_ZIP */
+ sprintf(be, "%%_unzip %s", b);
+ break;
++#endif
+ }
+ b = be;
+ } else if (STREQ("S", f, fn)) {
+@@ -1717,9 +1725,11 @@
+
+ if ((magic[0] == 'B') && (magic[1] == 'Z')) {
+ *compressed = COMPRESSED_BZIP2;
++#if 0
+ } else if ((magic[0] == 0120) && (magic[1] == 0113) &&
+ (magic[2] == 0003) && (magic[3] == 0004)) { /* pkzip */
+ *compressed = COMPRESSED_ZIP;
++#endif
+ } else if (((magic[0] == 0037) && (magic[1] == 0213)) || /* gzip */
+ ((magic[0] == 0037) && (magic[1] == 0236)) || /* old gzip */
+ ((magic[0] == 0037) && (magic[1] == 0036)) || /* pack */
+---------------------------------------------------------------------------
| Reactivate build mode aliases which were removed in rpm-4.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.19 -r1.20 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 9 Sep 2003 08:58:44 -0000 1.19
+++ openpkg-src/openpkg/rpm.patch.porting 11 Sep 2003 19:15:30 -0000 1.20
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 09-Sep-2003
+## Created on: 11-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.14 -r1.15 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 9 Sep 2003 08:58:44 -0000 1.14
+++ openpkg-src/openpkg/rpm.patch.regen 11 Sep 2003 19:15:30 -0000 1.15
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 09-Sep-2003
+## Created on: 11-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
