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
commitd216cef38572711c09255a4c1077385f4b3566fc (patch)
tree22161d3a284896ade124dd815ddb84896ca15ada /app-arch/dpkg
parentversion bump. Dependancies added as per bug #99494. (diff)
downloadhistorical-d216cef38572711c09255a4c1077385f4b3566fc.tar.gz
historical-d216cef38572711c09255a4c1077385f4b3566fc.tar.bz2
historical-d216cef38572711c09255a4c1077385f4b3566fc.zip
Hopefully fixed patch. *sigh*
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'app-arch/dpkg')
-rw-r--r--app-arch/dpkg/Manifest8
-rw-r--r--app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch19
2 files changed, 10 insertions, 17 deletions
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index cf0628c0eb58..1688694b4e76 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -6,11 +6,11 @@ MD5 fa02f20f5a615e964afe6782ca3c0531 dpkg-1.10.28.ebuild 1296
MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
MD5 0696aa314a61ed693110418de1dcb1c8 files/digest-dpkg-1.10.28 65
MD5 feb5a11111cc715877cc527c979ef699 files/dpkg-1.10.26.patch 840
-MD5 6550e6e5d6de164954ff53f87978bb9a files/dpkg-1.10.27.gcc4.patch 1188
+MD5 10e8a19287ea16a0bb96afee8b2ccec1 files/dpkg-1.10.27.gcc4.patch 899
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFC0T2u5mJXAu5GbtIRAnQ1AJsFud12trLHoesXyKtqJpdd1YHi9wCeJqec
-Y5UX0P/21cKCzGVfV++T+O4=
-=C3Ly
+iD8DBQFC3NNW5mJXAu5GbtIRAh2FAJ9ssfY6LMI4FfRY1xoCeBSL9P0zxACeLEqB
++88S0mNFhWR0ykbq/NPSRFo=
+=1WGv
-----END PGP SIGNATURE-----
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++);