summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2005-07-19 10:12:12 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2005-07-19 10:12:12 +0000
commit89372a1c06715a5ba0a9144def6f9c0e0f2036bb (patch)
tree4e95c147af6972f9fa8cb1f018086bce5beb013a /app-arch/dpkg
parentversion bump. Dependancies added as per bug #99494. (diff)
downloadgentoo-2-89372a1c06715a5ba0a9144def6f9c0e0f2036bb.tar.gz
gentoo-2-89372a1c06715a5ba0a9144def6f9c0e0f2036bb.tar.bz2
gentoo-2-89372a1c06715a5ba0a9144def6f9c0e0f2036bb.zip
Hopefully fixed patch. *sigh*
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-arch/dpkg')
-rw-r--r--app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch19
1 files changed, 6 insertions, 13 deletions
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 328f3f50d4a9..368018a2afa0 100644
--- a/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch
+++ b/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch
@@ -1,14 +1,5 @@
---- lib/parse.c.orig 2005-07-07 18:51:15.000000000 +0200
-+++ lib/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[]= {
- /* NB: capitalisation of these strings is important. */
- { "Package", f_name, w_name },
- { "Essential", f_boolean, w_booleandefno, PKGIFPOFF(essential) },
+--- lib/parse.c.orig 2004-11-11 04:16:33.000000000 +0100
++++ lib/parse.c 2005-07-03 02:13:34.000000000 +0200
@@ -96,7 +96,7 @@
const char *fieldstart, *valuestart;
char *value= NULL;
@@ -18,13 +9,15 @@
struct stat stat;
if (warncount) *warncount= 0;
-@@ -194,9 +194,10 @@
+@@ -194,9 +194,13 @@
fieldstart= nick->canon;
fieldlen= strlen(fieldstart);
}
- for (fip= fieldinfos, ip= fieldencountered;
-- fip->name && strncasecmp(fieldstart,fip->name, fieldlen);
++ /*for (fip= fieldinfos, ip= fieldencountered;
+ fip->name && strncasecmp(fieldstart,fip->name, fieldlen);
- fip++, ip++);
++ fip++, ip++);*/
+ for (i=0, ip=fieldencountered;
+ fieldinfos[i].name && strncasecmp(fieldstart,fieldinfos[i].name, fieldlen);
+ i++, ip++);