Fix invalid size error.

Package-Manager: portage-2.1.1-r2

5 files changed, 124 insertions, 9 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index ae0eaa01b354..0744be283efe 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipp2p
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.20 2007/01/04 13:18:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.21 2007/01/14 16:32:43 mrness Exp $
+
+*ipp2p-0.8.2-r2 (14 Jan 2007)
+
+  14 Jan 2007; Alin Năstac <mrness@gentoo.org>
+  +files/ipp2p-0.8.2-matchsize.patch, +ipp2p-0.8.2-r2.ebuild:
+  Fix invalid size error.
 
 *ipp2p-0.8.2-r1 (04 Jan 2007)
 
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 904cdf3b1df8..fcbf804aa40c 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ipp2p-0.8.2-matchsize.patch 881 RMD160 447ee341be70d5d1d5ba150e3b6272f47c21d1e7 SHA1 721cf163232354cfbe9357f6dbffbc7fb046100e SHA256 d8b2b087d83d1eb800365d5826628fe6a6cd7fd5c30344786abaafbba8bb5d54
+MD5 8590c3ea3711c4b31a4f3413ec9e9974 files/ipp2p-0.8.2-matchsize.patch 881
+RMD160 447ee341be70d5d1d5ba150e3b6272f47c21d1e7 files/ipp2p-0.8.2-matchsize.patch 881
+SHA256 d8b2b087d83d1eb800365d5826628fe6a6cd7fd5c30344786abaafbba8bb5d54 files/ipp2p-0.8.2-matchsize.patch 881
 DIST ipp2p-0.8.0.tar.gz 18910 RMD160 5e5825a28e626fcd96ce2e3bcf588d226426a1d3 SHA1 f854b974c7e1389c21f0ce568068e6d35d6b4a44 SHA256 18375c1a5ef5e65da78c18b089be1d26846ad0372ac476fd0385de1dbe0d295e
 DIST ipp2p-0.8.2.tar.gz 18976 RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 SHA1 98dbcf84b23e7afde3286fd0f1c1816b437d082e SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7
 EBUILD ipp2p-0.8.0.ebuild 1493 RMD160 2ecac54755aa8060ea859bedf6d771abead7e066 SHA1 a6f259188a37ddaa3ef3c831525d03bf4080804e SHA256 94f7baf5e8bade6603266b2cb292559eafb899718a61f3a977ead4ae79c0729f
@@ -11,14 +15,18 @@ EBUILD ipp2p-0.8.2-r1.ebuild 1670 RMD160 630e54ec10a0035deb500e7e6ecd71cb27cff1b
 MD5 9c716587773e0ed1dd7c60d9f85973ce ipp2p-0.8.2-r1.ebuild 1670
 RMD160 630e54ec10a0035deb500e7e6ecd71cb27cff1b4 ipp2p-0.8.2-r1.ebuild 1670
 SHA256 268d59f047985edaab43b32195d1870e9949ae09116e6ef677ad835b783a7b8f ipp2p-0.8.2-r1.ebuild 1670
+EBUILD ipp2p-0.8.2-r2.ebuild 1713 RMD160 54dc7a81243a8efb8dbb0b6cb464dfc39b4dbfc4 SHA1 eac74fc62c62483b053dbfa1285b9b761ebbd076 SHA256 d240f1acb8446460a5a4248ce7c8dea58d920c55b170277886a31f449bae371f
+MD5 09a745c5580b99c32a1b7d512371be4a ipp2p-0.8.2-r2.ebuild 1713
+RMD160 54dc7a81243a8efb8dbb0b6cb464dfc39b4dbfc4 ipp2p-0.8.2-r2.ebuild 1713
+SHA256 d240f1acb8446460a5a4248ce7c8dea58d920c55b170277886a31f449bae371f ipp2p-0.8.2-r2.ebuild 1713
 EBUILD ipp2p-0.8.2.ebuild 1487 RMD160 c5039efc71e09148a9baa67f165a85cbd359c050 SHA1 625186f642ede9bfd9000b2d1ceaa492654bbf91 SHA256 159a452cf0c8cfe174ffea102c44c60c78af23b6962a4377481b111a88949ddb
 MD5 3e626ea6f381850e2797ce7884b8568b ipp2p-0.8.2.ebuild 1487
 RMD160 c5039efc71e09148a9baa67f165a85cbd359c050 ipp2p-0.8.2.ebuild 1487
 SHA256 159a452cf0c8cfe174ffea102c44c60c78af23b6962a4377481b111a88949ddb ipp2p-0.8.2.ebuild 1487
-MISC ChangeLog 3553 RMD160 cb08c63f90cef527e0d4c549d706e264561c7d79 SHA1 5f085927cef497363a5d180e7bec3992fa8ac864 SHA256 8b1b1b51199d35f7caa1d9d8e2e788ab5f0a5f3ca5f130d1189769bcde9582b0
-MD5 64f6914fbcfc34792d590a2433bcb3a3 ChangeLog 3553
-RMD160 cb08c63f90cef527e0d4c549d706e264561c7d79 ChangeLog 3553
-SHA256 8b1b1b51199d35f7caa1d9d8e2e788ab5f0a5f3ca5f130d1189769bcde9582b0 ChangeLog 3553
+MISC ChangeLog 3721 RMD160 02d284977257719963b91e7c1c9a143c55170002 SHA1 4ee89affe1e659e57c5c679e26c180bb0fe49c92 SHA256 2deec3bfe614a9722bf9044fe7531de339d8b19ed89dd7b029261da30f221070
+MD5 9ca276e42399520490f9b7e6570b2a0b ChangeLog 3721
+RMD160 02d284977257719963b91e7c1c9a143c55170002 ChangeLog 3721
+SHA256 2deec3bfe614a9722bf9044fe7531de339d8b19ed89dd7b029261da30f221070 ChangeLog 3721
 MISC metadata.xml 839 RMD160 b60b70128145c55c72e5e8bf6aaead3859c1985c SHA1 0affaf5fd1e0e806c3f2f487406e6c6918974563 SHA256 b6788dee2536d343a9d66aad17c358fce18091ac2a710b2eae090d5e4afba9cd
 MD5 a29bcf1bb9a709d97b6c6a925154a690 metadata.xml 839
 RMD160 b60b70128145c55c72e5e8bf6aaead3859c1985c metadata.xml 839
@@ -32,10 +40,13 @@ SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/di
 MD5 3bd136616ef13f4f269a7c48a5d518be files/digest-ipp2p-0.8.2-r1 232
 RMD160 afd815301065b20a3fd7115191ed351d5d9efac3 files/digest-ipp2p-0.8.2-r1 232
 SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/digest-ipp2p-0.8.2-r1 232
+MD5 3bd136616ef13f4f269a7c48a5d518be files/digest-ipp2p-0.8.2-r2 232
+RMD160 afd815301065b20a3fd7115191ed351d5d9efac3 files/digest-ipp2p-0.8.2-r2 232
+SHA256 24a5af31ad5b60d4629f51b2ea39c7d2e0037b5e0d2990d62d55feda14bbfd12 files/digest-ipp2p-0.8.2-r2 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnP7KJnxX6mF440QRAqKDAJ9/EGJgoRdTo6UCkW8jVCFApJCytQCgs3fs
-3G1gOtDZahg90M8WcooHYfA=
-=axev
+iD8DBQFFqls2JnxX6mF440QRAry5AJ9103ZrzQuH9X/LKGXZM3fn1MGHdQCg+80O
+LRBj4EPWtUDC2yya7GDBfz8=
+=Ysz2
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.8.2-r2 b/net-firewall/ipp2p/files/digest-ipp2p-0.8.2-r2
new file mode 100644
index 000000000000..14106f32db3b
--- /dev/null
+++ b/net-firewall/ipp2p/files/digest-ipp2p-0.8.2-r2
@@ -0,0 +1,3 @@
+MD5 9dd745830f302d70d0b728013c1d6a0c ipp2p-0.8.2.tar.gz 18976
+RMD160 097cd4175af3f97f3687f343087b8fe0af20ba38 ipp2p-0.8.2.tar.gz 18976
+SHA256 b265f5a1ce62de5a6cc60b9af22134a8d19b23e14b47a897057bca91188e0ee7 ipp2p-0.8.2.tar.gz 18976
diff --git a/net-firewall/ipp2p/files/ipp2p-0.8.2-matchsize.patch b/net-firewall/ipp2p/files/ipp2p-0.8.2-matchsize.patch
new file mode 100644
index 000000000000..8e065f1cbe29
--- /dev/null
+++ b/net-firewall/ipp2p/files/ipp2p-0.8.2-matchsize.patch
@@ -0,0 +1,28 @@
+diff -Nru ipp2p-0.8.2.orig/ipt_ipp2p.c ipp2p-0.8.2/ipt_ipp2p.c
+--- ipp2p-0.8.2.orig/ipt_ipp2p.c	2006-09-27 12:52:00.000000000 +0300
++++ ipp2p-0.8.2/ipt_ipp2p.c	2007-01-14 18:26:23.000000000 +0200
+@@ -843,15 +843,6 @@
+ }
+ 									    
+ 
+-// TODO: find out what this structure is for (scheme taken
+-// from kernel sources)
+-// content seems to have a length of 8 bytes 
+-// (at least on my x86 machine)
+-struct ipp2p_match_info {
+-	long int dunno_what_this_is_for;
+-	long int i_also_dunno_what_this_is_for;
+-};
+-
+ static struct ipt_match ipp2p_match = { 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 	{ NULL, NULL }, 
+@@ -870,7 +861,7 @@
+ 	.name		= "ipp2p",
+ 	.match		= &match,
+ 	.family         = AF_INET,
+-	.matchsize      = sizeof(struct ipp2p_match_info),
++	.matchsize      = XT_ALIGN(sizeof(struct ipt_p2p_info)),
+ 	.checkentry	= &checkentry,
+ 	.me		= THIS_MODULE,
+ #endif
diff --git a/net-firewall/ipp2p/ipp2p-0.8.2-r2.ebuild b/net-firewall/ipp2p/ipp2p-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..f8455fb5e355
--- /dev/null
+++ b/net-firewall/ipp2p/ipp2p-0.8.2-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.2-r2.ebuild,v 1.1 2007/01/14 16:32:43 mrness Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="Netfilter module for dealing with P2P Applications."
+HOMEPAGE="http://www.ipp2p.org/index_en.html"
+SRC_URI="http://www.ipp2p.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/modutils
+	 >=net-firewall/iptables-1.2.11"
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+pkg_setup() {
+	CONFIG_CHECK="NETFILTER"
+	NETFILTER_ERROR="Your kernel is not configured to support Netfilter."
+	MODULE_NAMES="ipt_ipp2p(${PN}:${S}:${S})"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-matchsize.patch
+	convert_to_m Makefile
+
+	sed -i -e "s/^IPTABLES_VERSION/#IPTABLES_VERSION/" Makefile
+	if has_version '>=net-firewall/iptables-1.3.6' ; then
+	    sed -i -e "s/ld -shared/\$\(CC\) -shared/" Makefile
+	fi
+}
+
+src_compile() {
+	local IPTABLES_VERSION="$("${ROOT}"/sbin/iptables --version | cut -f2 -dv)"
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
+	    IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" libipt_ipp2p.so \
+	    || die "Failed to build iptables module"
+
+	local myARCH="${ARCH}"
+	ARCH="$(tc-arch-kernel)"
+	emake KERNEL_SRC="${KV_DIR}" \
+	    IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" \
+	    || die "Failed to build kernel module."
+	ARCH="${myARCH}"
+}
+
+src_install() {
+	exeinto /$(get_libdir)/iptables
+	doexe libipt_ipp2p.so
+
+	dodoc README
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}