Initial import, fixes bug #116899.

(Portage version: 2.0.53)

3 files changed, 65 insertions, 0 deletions

diff --git a/sys-apps/pcmcia-cs-pnptools/files/digest-pcmcia-cs-pnptools-3.2.8 b/sys-apps/pcmcia-cs-pnptools/files/digest-pcmcia-cs-pnptools-3.2.8
new file mode 100644
index 000000000000..5cc9da5c0ea4
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/files/digest-pcmcia-cs-pnptools-3.2.8
@@ -0,0 +1 @@
+MD5 0d6d65be8896eff081aee996049afaa5 pcmcia-cs-3.2.8.tar.gz 1271846
diff --git a/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-gcc4.patch b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-gcc4.patch
new file mode 100644
index 000000000000..11d13706df39
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-gcc4.patch
@@ -0,0 +1,24 @@
+diff -urp pcmcia-cs-3.2.8/debug-tools/lspnp.c pcmcia-cs-3.2.8-gcc4/debug-tools/lspnp.c
+--- pcmcia-cs-3.2.8/debug-tools/lspnp.c	2002-02-13 06:45:01.000000000 +0100
++++ pcmcia-cs-3.2.8-gcc4/debug-tools/lspnp.c	2005-05-08 10:08:07.000000000 +0200
+@@ -496,7 +496,7 @@ static char *dump_chain(u_char *buf, int
+ 		dump_io_fixed(r); break;
+ 	    }
+ 	}
+-	(u_char *)p += sz + 1;
++	p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
+diff -urp pcmcia-cs-3.2.8/debug-tools/setpnp.c pcmcia-cs-3.2.8-gcc4/debug-tools/setpnp.c
+--- pcmcia-cs-3.2.8/debug-tools/setpnp.c	2001-10-10 04:58:12.000000000 +0200
++++ pcmcia-cs-3.2.8-gcc4/debug-tools/setpnp.c	2005-05-08 10:08:07.000000000 +0200
+@@ -163,7 +163,7 @@ static char *update_chain(u_char *buf, i
+ 		break;
+ 	    }
+ 	}
+-	(u_char *)p += sz + 1;
++	p = (union pnp_resource *) ((u_char *)p + sz + 1);
+     }
+     return (u_char *)p;
+ }
diff --git a/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-move-pnp-ids.patch b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-move-pnp-ids.patch
new file mode 100644
index 000000000000..2913be2ac090
--- /dev/null
+++ b/sys-apps/pcmcia-cs-pnptools/files/pcmcia-cs-3.2.8-move-pnp-ids.patch
@@ -0,0 +1,40 @@
+diff -urp pcmcia-cs-3.2.8/debug-tools/lspnp.c pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/lspnp.c
+--- pcmcia-cs-3.2.8/debug-tools/lspnp.c	2002-02-13 06:45:01.000000000 +0100
++++ pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/lspnp.c	2005-04-13 00:21:58.000000000 +0200
+@@ -154,7 +154,7 @@ static void load_ids(void)
+     char s[133], *t;
+     int n;
+     struct eisa_id *id;
+-    FILE *f = fopen("/usr/share/pnp.ids", "r");
++    FILE *f = fopen("/usr/share/misc/pnp.ids", "r");
+     
+     if (f == NULL)
+ 	return;
+diff -urp pcmcia-cs-3.2.8/debug-tools/Makefile pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/Makefile
+--- pcmcia-cs-3.2.8/debug-tools/Makefile	2002-12-21 09:23:22.000000000 +0100
++++ pcmcia-cs-3.2.8-move-pnp-ids/debug-tools/Makefile	2005-04-13 00:21:37.000000000 +0200
+@@ -65,8 +65,8 @@ install: $(TOOLS)
+ 	cp -f dump_cis pack_cis $(PREFIX)/sbin
+ ifdef CONFIG_PNP_BIOS
+ 	cp -f lspnp setpnp $(PREFIX)/sbin
+-	@mkdir -p $(PREFIX)/usr/share
+-	cp -f pnp.ids $(PREFIX)/usr/share
++	@mkdir -p $(PREFIX)/usr/share/misc
++	cp -f pnp.ids $(PREFIX)/usr/share/misc
+ endif
+ 
+ include ../rules.mk
+diff -urp pcmcia-cs-3.2.8/man/lspnp.8 pcmcia-cs-3.2.8-move-pnp-ids/man/lspnp.8
+--- pcmcia-cs-3.2.8/man/lspnp.8	2000-06-12 23:24:49.000000000 +0200
++++ pcmcia-cs-3.2.8-move-pnp-ids/man/lspnp.8	2005-04-13 00:22:35.000000000 +0200
+@@ -36,8 +36,8 @@ boot (as opposed to current resource inf
+ .B \-v
+ Selects more verbose output.  Can be used more than once.
+ .SH FILES
+-.TP \w'/usr/share/pnp.ids\ \ \ \ |\|'u
+-/usr/share/pnp.ids
++.TP \w'/usr/share/misc/pnp.ids\ \ \ \ |\|'u
++/usr/share/misc/pnp.ids
+ A database of known Plug and Play device ID's.
+ .TP
+ /proc/bus/pnp/...