diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2005-07-07 16:51:57 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2005-07-07 16:51:57 +0000 |
| commit | c368c771abf58a9a9ff6659dbfe7441c2ef249dc (patch) | |
| tree | 44698bdbe374c475ed0a71886876ae75f9590283 /app-arch/dpkg | |
| parent | bump, and removel older versions. (diff) | |
| download | gentoo-2-c368c771abf58a9a9ff6659dbfe7441c2ef249dc.tar.gz gentoo-2-c368c771abf58a9a9ff6659dbfe7441c2ef249dc.tar.bz2 gentoo-2-c368c771abf58a9a9ff6659dbfe7441c2ef249dc.zip | |
Fixed BUG #96394.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-arch/dpkg')
| -rw-r--r-- | app-arch/dpkg/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch | 51 |
2 files changed, 31 insertions, 26 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog index 3a1e743f1877..a841db98846c 100644 --- a/app-arch/dpkg/ChangeLog +++ b/app-arch/dpkg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/dpkg # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.33 2005/05/31 00:11:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.34 2005/07/07 16:51:57 kugelfang Exp $ + + 07 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> + files/dpkg-1.10.27.gcc4.patch: + Fixed BUG #96394 by replacing bogus gcc-4 patch. *dpkg-1.10.28 (31 May 2005) diff --git a/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch b/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch index f248d7565d86..a96682d28683 100644 --- a/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch +++ b/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch @@ -1,33 +1,34 @@ ---- lib/mlib.c~ 2005-02-10 16:24:17.000000000 +0100 -+++ lib/mlib.c 2005-05-04 16:13:58.000000000 +0200 -@@ -189,7 +189,7 @@ - switch(data->type) { - case BUFFER_WRITE_BUF: - memcpy(data->data.ptr, buf, length); -+ data->data.ptr = (char*)data->data.ptr + length; -- (char*)data->data.ptr += length; - break; - case BUFFER_WRITE_VBUF: - varbufaddbuf((struct varbuf *)data->data.ptr, buf, length); ---- lib/parse.c~ 2005-02-10 16:24:17.000000000 +0100 -+++ lib/parse.c 2005-05-04 16:13:25.000000000 +0200 +--- parse.c.orig 2005-07-07 18:51:15.000000000 +0200 ++++ parse.c 2005-07-07 18:53:35.000000000 +0200 @@ -39,7 +39,7 @@ #include <sys/mman.h> #endif -+const struct fieldinfo *fieldinfos = { --const struct fieldinfo fieldinfos[]= { +-const struct fieldinfo *fieldinfos = { ++const struct fieldinfo fieldinfos[]= { /* NB: capitalisation of these strings is important. */ { "Package", f_name, w_name }, { "Essential", f_boolean, w_booleandefno, PKGIFPOFF(essential) }, ---- include/parsedump.h~ 2005-02-10 16:24:17.000000000 +0100 -+++ include/parsedump.h 2005-05-04 16:13:36.000000000 +0200 -@@ -30,7 +30,7 @@ - const char *canon; - }; - -+extern const struct fieldinfo *fieldinfos; --extern const struct fieldinfo fieldinfos[]; - extern const struct nickname nicknames[]; - extern const int nfields; /* = elements in fieldinfos, including the sentinels */ +@@ -96,7 +96,7 @@ + const char *fieldstart, *valuestart; + char *value= NULL; + int fieldlen= 0, valuelen= 0; +- int *ip, c; ++ int *ip, c, i; + struct stat stat; + if (warncount) *warncount= 0; +@@ -194,9 +194,10 @@ + fieldstart= nick->canon; + fieldlen= strlen(fieldstart); + } +- for (fip= fieldinfos, ip= fieldencountered; +- fip->name && strncasecmp(fieldstart,fip->name, fieldlen); +- fip++, ip++); ++ for (i=0, ip=fieldencountered; ++ fieldinfos[i].name && strncasecmp(fieldstart,fieldinfos[i].name, fieldlen); ++ i++, ip++); ++ fip = &(fieldinfos[i]); + if (fip->name) { + value= realloc(value,valuelen+1); + memcpy(value,valuestart,valuelen); |