fix bug 147461

Package-Manager: portage-2.1.2-r5

4 files changed, 194 insertions, 16 deletions

diff --git a/net-dialup/capifwd/ChangeLog b/net-dialup/capifwd/ChangeLog
index c558d35c7f1f..b6686dfd68e9 100644
--- a/net-dialup/capifwd/ChangeLog
+++ b/net-dialup/capifwd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/capifwd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capifwd/ChangeLog,v 1.5 2006/09/23 07:47:28 mrness Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capifwd/ChangeLog,v 1.6 2007/02/03 00:41:10 blubb Exp $
+
+  03 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/capifwd-0.6.3-amd64.patch, +capifwd-0.6.3-r1.patch:
+  fix bug 147461
 
   23 Sep 2006; Alin Nastac <mrness@gentoo.org> files/capifwd-0.6.3.patch:
   Fix broken compilation on gcc-4.1, thanks to Michael Wyraz
diff --git a/net-dialup/capifwd/Manifest b/net-dialup/capifwd/Manifest
index cbb57950f8fe..e56533202c23 100644
--- a/net-dialup/capifwd/Manifest
+++ b/net-dialup/capifwd/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX capifwd-0.6.3-amd64.patch 3706 RMD160 9475f04f3e513ff5d13696e3ec0dcb1660575aaf SHA1 b3ac604fa9641a52a4814c87b961e6839837b0be SHA256 a6f7fcfb316de790091331f42ae512262d165eed0998dd90dc51be23cef9f067
+MD5 f335546e108709b4bbf4c644ae53e4cf files/capifwd-0.6.3-amd64.patch 3706
+RMD160 9475f04f3e513ff5d13696e3ec0dcb1660575aaf files/capifwd-0.6.3-amd64.patch 3706
+SHA256 a6f7fcfb316de790091331f42ae512262d165eed0998dd90dc51be23cef9f067 files/capifwd-0.6.3-amd64.patch 3706
 AUX capifwd-0.6.3.patch 1334 RMD160 7bc2c81877dfebcea0c87de40889b430ff9667ed SHA1 bc3e149ca24f2f03afe751c6a2c9ebe7c4b61e53 SHA256 6a8c516b644035a299dae0dd69c7fe7e626ce368666c14e3ec6bfc696ebc0a41
 MD5 72fd4ee50dc9756900df6cac64487ab5 files/capifwd-0.6.3.patch 1334
 RMD160 7bc2c81877dfebcea0c87de40889b430ff9667ed files/capifwd-0.6.3.patch 1334
@@ -18,10 +19,14 @@ EBUILD capifwd-0.6.3.ebuild 1014 RMD160 ffb32f48c1d4d97528316dd8995931ede88f9ffe
 MD5 0a6b7138c28ba440221aa43808312251 capifwd-0.6.3.ebuild 1014
 RMD160 ffb32f48c1d4d97528316dd8995931ede88f9ffe capifwd-0.6.3.ebuild 1014
 SHA256 b80421a548c118372f995043c0c89041be736b1634268e23c88934ca3ba8e43f capifwd-0.6.3.ebuild 1014
-MISC ChangeLog 940 RMD160 de36dd3a090ddc89c8441ba2e81515ce45f4f424 SHA1 7b8d267e04cb979023c7945c31fedb06cdb49af8 SHA256 bfc8e2bc675bf6097a683809b00a6fad39185424adc3091162d5c5c33dff56c8
-MD5 14fe2f623f812657d0c7fd61790d39f7 ChangeLog 940
-RMD160 de36dd3a090ddc89c8441ba2e81515ce45f4f424 ChangeLog 940
-SHA256 bfc8e2bc675bf6097a683809b00a6fad39185424adc3091162d5c5c33dff56c8 ChangeLog 940
+MISC ChangeLog 1067 RMD160 63e9c0f93b0c11b2b56adf86b545e35d44252bb9 SHA1 f6bf315955cf7c61506b0cb441d56e8233d8b644 SHA256 654b79e079b2cbfc7402247f910336455ac5386558bca2253ec3591e994e47f7
+MD5 4bafb973e2aa6df2dd199880a3f2e42a ChangeLog 1067
+RMD160 63e9c0f93b0c11b2b56adf86b545e35d44252bb9 ChangeLog 1067
+SHA256 654b79e079b2cbfc7402247f910336455ac5386558bca2253ec3591e994e47f7 ChangeLog 1067
+MISC capifwd-0.6.3-r1.patch 1055 RMD160 09444c9fa345f0f397a32cb44f4fe11655136fa2 SHA1 5fcf5290612c7312119e707b07b59597418376c4 SHA256 f0ae2e8f08a4b6b8cc018229cf4af83fa4c73f50a0357ddb8bc6e7a43bb62b0e
+MD5 59ecf7bfcdc0b2b1d9acc384e3048284 capifwd-0.6.3-r1.patch 1055
+RMD160 09444c9fa345f0f397a32cb44f4fe11655136fa2 capifwd-0.6.3-r1.patch 1055
+SHA256 f0ae2e8f08a4b6b8cc018229cf4af83fa4c73f50a0357ddb8bc6e7a43bb62b0e capifwd-0.6.3-r1.patch 1055
 MISC metadata.xml 255 RMD160 8331377c6bfbab8137feab155c6a59130e27cff0 SHA1 f26e4fa2ab4d9b4158acab4330404635aaa0c862 SHA256 701d23f7e42c1af8736ef1d3a58ac13e4336ca380175a7791e5ebd9f950ee889
 MD5 d2acf377c86761937a704f2455f1e353 metadata.xml 255
 RMD160 8331377c6bfbab8137feab155c6a59130e27cff0 metadata.xml 255
@@ -29,10 +34,3 @@ SHA256 701d23f7e42c1af8736ef1d3a58ac13e4336ca380175a7791e5ebd9f950ee889 metadata
 MD5 47b0406c8970dd9827240a9d267bede5 files/digest-capifwd-0.6.3 241
 RMD160 1800a831b64b97ca2627d3306fca849691856a6e files/digest-capifwd-0.6.3 241
 SHA256 af8c2bc5d2d725af926f797a436a46edc4d3ad7a6422c95a194780a4deeeccdd files/digest-capifwd-0.6.3 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFFOaX3sf9c6kjmR8RAtyqAJ4zXxdbrdejnY62by3gru+cw7gwbQCfY18v
-PatHQaOsZus6e1aTKWR+Umc=
-=711J
------END PGP SIGNATURE-----
diff --git a/net-dialup/capifwd/capifwd-0.6.3-r1.patch b/net-dialup/capifwd/capifwd-0.6.3-r1.patch
new file mode 100644
index 000000000000..fff192b310e0
--- /dev/null
+++ b/net-dialup/capifwd/capifwd-0.6.3-r1.patch
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capifwd/capifwd-0.6.3-r1.patch,v 1.1 2007/02/03 00:41:10 blubb Exp $
+
+inherit eutils
+
+DESCRIPTION="A daemon forwarding CAPI messages to capi20proxy clients"
+HOMEPAGE="http://capi20proxy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/capi20proxy/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-dialup/capi4k-utils"
+
+S="${WORKDIR}/linux-server"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P}-amd64.patch"
+
+	#Replace obsolete sys_errlist with strerror
+	sed -i -e 's:sys_errlist *\[ *errno *\]:strerror(errno):' \
+		src/capifwd.c src/capi/waitforsignal.c src/auth/auth.c || \
+		die "failed to replace sys_errlist"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+	dodoc AUTHORS ChangeLog README
+
+	# install init-script
+	newinitd "${FILESDIR}/capifwd.init" capifwd
+	newconfd "${FILESDIR}/capifwd.conf" capifwd
+}
diff --git a/net-dialup/capifwd/files/capifwd-0.6.3-amd64.patch b/net-dialup/capifwd/files/capifwd-0.6.3-amd64.patch
new file mode 100644
index 000000000000..c387b567be5b
--- /dev/null
+++ b/net-dialup/capifwd/files/capifwd-0.6.3-amd64.patch
@@ -0,0 +1,136 @@
+--- src/protocol.h	2002-10-30 16:16:06.000000000 +0100
++++ src/protocol.h	2007-02-03 01:27:40.000000000 +0100
+@@ -53,6 +53,7 @@
+ #ifndef __PROTOCOL_H__
+ #define __PROTOCOL_H__
+ #include <time.h>
++#include <sys/types.h>
+ 
+ // Operating System types
+ 
+@@ -109,20 +110,20 @@
+ #define revision "$Revision: 1.1 $"
+ 
+ struct __version_t {
+- unsigned long major;  // major version for incompatible versions
+- unsigned long minor;  // minor version for compatible versions
++ uint32_t major;  // major version for incompatible versions
++ uint32_t minor;  // minor version for compatible versions
+ };
+ 
+ // CLIENT REQUESTS //
+ // protocol specific
+ struct REQUEST_PROXY_HELO {  // type number: 99
+- char name[64];    // name of the client (for logging)
+- int os;      // operating system of the client
++ uint8_t name[64];    // name of the client (for logging)
++ uint32_t os;      // operating system of the client
+  struct __version_t version; // version of the client
+ };
+ 
+ struct REQUEST_PROXY_AUTH {  // type number: 98
+- unsigned long auth_type;   // authentication type desired
++ uint32_t auth_type;   // authentication type desired
+ };
+ 
+ struct REQUEST_PROXY_KEEPALIVE {  // type number: 97
+@@ -171,11 +172,11 @@
+ 
+ // protocol specific
+ struct ANSWER_PROXY_HELO {  // type number: 99
+- char name[64];    // some kind of name for the server (zero-terminated)
+- int os;      // the operating system of the server
++ int8_t name[64];    // some kind of name for the server (zero-terminated)
++ int32_t os;      // the operating system of the server
+  struct __version_t version; // the version of the server
+- unsigned long auth_type;  // the server tells the client which auth-methods it supports (each bit represents one method) !changed!
+- int timeout;			// in seconds, -1 means no timeout
++ int32_t auth_type;  // the server tells the client which auth-methods it supports (each bit represents one method) !changed!
++ int32_t timeout;			// in seconds, -1 means no timeout
+ };
+ 
+ struct ANSWER_PROXY_AUTH {  // type number: 98
+@@ -185,7 +186,7 @@
+ };
+ 
+ struct ANSWER_PROXY_SHUTDOWN {  // type number: 96
+- char reason[128];
++ int8_t reason[128];
+  // z.B. "Ich muss dringend aufs Klo!"; :-)
+  // no answer from the client expected
+ };
+@@ -208,7 +209,7 @@
+ };
+ 
+ struct ANSWER_CAPI_MANUFACTURER { // type number: 6
+- char manufacturer[64];
++ int8_t manufacturer[64];
+ };
+ 
+ struct ANSWER_CAPI_VERSION {  // type number: 7
+@@ -217,11 +218,11 @@
+ };
+ 
+ struct ANSWER_CAPI_SERIAL {  // type number: 8
+- char serial[8];
++ int8_t serial[8];
+ };
+ 
+ struct ANSWER_CAPI_PROFILE {  // type number: 9
+- char profile[64];
++ int8_t profile[64];
+ };
+ 
+ struct ANSWER_CAPI_INSTALLED { // type number: 10
+@@ -229,30 +230,30 @@
+ 
+ 
+ struct REQUEST_HEADER {
+- unsigned message_len;
+- unsigned header_len;
+- unsigned body_len;
+- unsigned data_len;
+-
+- unsigned  message_id;
+- unsigned  message_type;
+- unsigned  long app_id;		// must be long!
+- unsigned  controller_id;
+- unsigned  session_id;
++ int32_t message_len;
++ int32_t header_len;
++ int32_t body_len;
++ int32_t data_len;
++
++ int32_t  message_id;
++ int32_t  message_type;
++ int32_t  app_id;
++ int32_t  controller_id;
++ int32_t  session_id;
+ };
+ 
+ 
+ struct ANSWER_HEADER {
+- unsigned message_len;
+- unsigned header_len;
+- unsigned body_len;
+- unsigned data_len;
+-
+- unsigned  message_id;
+- unsigned  message_type;
+- unsigned  long app_id;		// must be long!
+- unsigned  session_id;
+- unsigned  proxy_error;
+- unsigned long capi_error;
++ int32_t message_len;
++ int32_t header_len;
++ int32_t body_len;
++ int32_t data_len;
++
++ int32_t  message_id;
++ int32_t  message_type;
++ int32_t  app_id;
++ int32_t  session_id;
++ int32_t  proxy_error;
++ int32_t  capi_error;
+ };
+ #endif