CAN-2004-0626 fix (#55694).

5 files changed, 58 insertions, 14 deletions

diff --git a/sys-kernel/hppa-dev-sources/ChangeLog b/sys-kernel/hppa-dev-sources/ChangeLog
index 7d649ec6cbad..d06f46844fa1 100644
--- a/sys-kernel/hppa-dev-sources/ChangeLog
+++ b/sys-kernel/hppa-dev-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hppa-dev-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/ChangeLog,v 1.16 2004/06/24 22:57:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/ChangeLog,v 1.17 2004/07/03 21:09:24 gmsoft Exp $
+
+*hppa-dev-sources-2.6.7_p1-r1 (03 Jul 2004)
+
+  03 Jul 2004; Guy Martin <gmsoft@gentoo.org>
+  hppa-dev-sources-2.6.7_p1-r1.ebuild, files/CAN-2004-0626-death_packet.patch:
+  CAN-2004-0626 fix (#55694).
 
 *hppa-dev-sources-2.6.7_p1 (23 Jun 2004)
 
diff --git a/sys-kernel/hppa-dev-sources/Manifest b/sys-kernel/hppa-dev-sources/Manifest
index 8e3a91c233ff..042f30d030b5 100644
--- a/sys-kernel/hppa-dev-sources/Manifest
+++ b/sys-kernel/hppa-dev-sources/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a6abe20514453b048ed5b5459777ff16 ChangeLog 2933
+MD5 f1b3ae515c1f32812ecbf25193148a90 metadata.xml 223
 MD5 3a54ee0d69f421f6853cdbdd842f17f1 hppa-dev-sources-2.6.6_p4-r1.ebuild 1072
+MD5 54bc15f49fe21762e71f18994cae9d43 ChangeLog 3132
 MD5 a27203f1593243cea48be1b99f7757b2 hppa-dev-sources-2.6.7_p1.ebuild 1067
-MD5 f1b3ae515c1f32812ecbf25193148a90 metadata.xml 223
+MD5 840962cc0d85609317199b2fd0353c7b hppa-dev-sources-2.6.7_p1-r1.ebuild 1123
+MD5 c857b174f7e6a6b0ab2e26f9306ad0a0 files/ncr53c8xx.diff 3701
 MD5 b60da7697cdef1cea118a7766e2acc8e files/digest-hppa-dev-sources-2.6.6_p4-r1 129
 MD5 ce5fc85224c09cf512dc725ee88945e4 files/digest-hppa-dev-sources-2.6.7_p1 129
-MD5 c857b174f7e6a6b0ab2e26f9306ad0a0 files/ncr53c8xx.diff 3701
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4fCmHTu7gpaalycRAhQKAKDtwbsMHyMtjWEQLxttkzBxqVq9aQCg8VhY
-5kzvuqSvcBqbmJ00uJ4GUvk=
-=JeD8
------END PGP SIGNATURE-----
+MD5 c91330cc5b4044b6f59696095c2dc0fb files/CAN-2004-0626-death_packet.patch 423
+MD5 ce5fc85224c09cf512dc725ee88945e4 files/digest-hppa-dev-sources-2.6.7_p1-r1 129
diff --git a/sys-kernel/hppa-dev-sources/files/CAN-2004-0626-death_packet.patch b/sys-kernel/hppa-dev-sources/files/CAN-2004-0626-death_packet.patch
new file mode 100644
index 000000000000..f6eafac10930
--- /dev/null
+++ b/sys-kernel/hppa-dev-sources/files/CAN-2004-0626-death_packet.patch
@@ -0,0 +1,11 @@
+--- net/ipv4/netfilter/ip_tables.c.orig	2004-06-30 18:19:22.957763360 -0400
++++ net/ipv4/netfilter/ip_tables.c	2004-06-30 18:19:51.516421784 -0400
+@@ -1458,7 +1458,7 @@ tcp_find_option(u_int8_t option,
+ 		int *hotdrop)
+ {
+ 	/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
+-	char opt[60 - sizeof(struct tcphdr)];
++	u_int8_t opt[60 - sizeof(struct tcphdr)];
+ 	unsigned int i;
+ 
+ 	duprintf("tcp_match: finding option\n");
diff --git a/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r1 b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r1
new file mode 100644
index 000000000000..7e748cdf493c
--- /dev/null
+++ b/sys-kernel/hppa-dev-sources/files/digest-hppa-dev-sources-2.6.7_p1-r1
@@ -0,0 +1,2 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 c9354bcf2a81d22a23d6c0c1725717a1 patch-2.6.7-pa1.gz 125457
diff --git a/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild
new file mode 100644
index 000000000000..b927d41105f4
--- /dev/null
+++ b/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-dev-sources/hppa-dev-sources-2.6.7_p1-r1.ebuild,v 1.1 2004/07/03 21:09:24 gmsoft Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel-2
+OKV="${PV/_p*/}"
+PATCH_LEVEL="${PV/${OKV}_p/}"
+EXTRAVERSION="-pa${PATCH_LEVEL}"
+[ ! "${PR}" = "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV=${OKV}${EXTRAVERSION}
+S=${WORKDIR}/linux-${KV}
+
+
+DESCRIPTION="Full sources for the Linux kernel with patch for hppa"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 http://ftp.parisc-linux.org/cvs/linux-2.6/patch-${OKV}-pa${PATCH_LEVEL}.gz"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://parisc-linux.org"
+KEYWORDS="hppa -*"
+SLOT="${KV}"
+
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
+	cd ${S}
+
+	epatch ${DISTDIR}/patch-${OKV}-pa${PATCH_LEVEL}.gz
+	epatch ${FILESDIR}/ncr53c8xx.diff
+	epatch ${FILESDIR}/CAN-2004-0626-death_packet.patch
+
+}