fix build on FreeBSD 8, by Dmitri Bogomolov, bug #364605

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 71 insertions, 6 deletions

diff --git a/dev-python/py-freebsd/ChangeLog b/dev-python/py-freebsd/ChangeLog
index 4dd240aab358..c83d2d76ef76 100644
--- a/dev-python/py-freebsd/ChangeLog
+++ b/dev-python/py-freebsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/py-freebsd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/ChangeLog,v 1.6 2010/12/30 21:27:48 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/ChangeLog,v 1.7 2011/07/08 00:03:28 aballier Exp $
+
+  08 Jul 2011; Alexis Ballier <aballier@gentoo.org>
+  +files/freebsd8_patch-src-jail.c, py-freebsd-0.9.3-r1.ebuild:
+  fix build on FreeBSD 8, by Dmitri Bogomolov, bug #364605
 
   30 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   py-freebsd-0.9.3-r1.ebuild:
diff --git a/dev-python/py-freebsd/Manifest b/dev-python/py-freebsd/Manifest
index d8f54187c145..a49568702c38 100644
--- a/dev-python/py-freebsd/Manifest
+++ b/dev-python/py-freebsd/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fbsd7-netstat.patch 390 RMD160 40b4d4b2707614cd11bde6909fb925dbecdd201b SHA1 a5c973fedee0c04d6d5e71a9ae217780d642d65b SHA256 acfede837e7cacb16ee17c550ec6bdc9cfd907e3727468f2227d90061d6fdd14
+AUX freebsd8_patch-src-jail.c 1208 RMD160 c76ae8495c7d82d9e624d930a5cf81fdbb805ef1 SHA1 ec1b37f87202eee143ae3d0c69a9fc3d511bba2c SHA256 c57a5210e6efe1711780d546a2c54bf67ff298b1cc3e282508e0e434de9a7d63
 AUX process-fix.patch 1608 RMD160 717636d785118ab8979c5527ce1368fba6bc252d SHA1 0f7e211d2ed9b5ece5210768fca2b7e3fc145fda SHA256 5a3bdc5f54d73eead3bbf59515b3ae5f363e42f695a03accf5bd88ff17bb85f8
 DIST py-freebsd-0.9.3.tar.gz 26995 RMD160 16d891dcc4d1af67c9bd1b92072eddc28f6aa14a SHA1 a8b46a15fc0f530c86ceb9d32e4c38c5784af777 SHA256 4792a5f9d124bd7634890dceeccd9995149176d4d36e17e882eadd4d23b46f92
-EBUILD py-freebsd-0.9.3-r1.ebuild 1266 RMD160 e2968ab5689e30f0eda4231094aff8570d47500d SHA1 3355f20e2bc357097e63e94bb152610b147a3670 SHA256 1a5d5c4099dc710dcc229fb6d27177656aa07ca83eff29ea007b658c2d0c48c0
-MISC ChangeLog 1207 RMD160 4efe1651537bc74344154a15158b11b9bed486a8 SHA1 a23b3d994a7c09fdd3b14da12cb08fba8c117cd4 SHA256 7ec6a4b1282f8a02b64621890c4bd01fd19e6e0c37b36239d466bb1334e75bff
+EBUILD py-freebsd-0.9.3-r1.ebuild 1314 RMD160 ad728daa35c79d759a99db02127810043e02963d SHA1 292eb0b81864e4eb418f6045b087ddbf8b8f6c8b SHA256 ab6b0d8d4e4ba0ee070839c92d8ab13c488527a7c2e73e9a34df1ead91efcef8
+MISC ChangeLog 1383 RMD160 ba92bc4ec9a4eff21d51aa3d7599e6502ec2b7c7 SHA1 2187e75d873157dedd1ecc7759fe76e64ee00e1a SHA256 2e9cfcbb04f51f227f0453f7e3e719cc13a514f81b6dba30137c529673f1ed94
 MISC metadata.xml 176 RMD160 f70cb6f594542f1bbce030c5c44b8de48dd4392a SHA1 c5a4dcb6c566ea6fdb13828d63376a82563853bb SHA256 17e1b3544b5836d88f6ed59f62fefa3b1e80fc05c81b07df31b5e607a05719b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4WSVYACgkQvFcC4BYPU0qSdACdHL+ELRJWky6H/P+5i5ryR75W
+ZkYAoLvr2T53yhyEpZjYWyAH9MAN0mSd
+=Q9av
+-----END PGP SIGNATURE-----
diff --git a/dev-python/py-freebsd/files/freebsd8_patch-src-jail.c b/dev-python/py-freebsd/files/freebsd8_patch-src-jail.c
new file mode 100644
index 000000000000..685af1201f08
--- /dev/null
+++ b/dev-python/py-freebsd/files/freebsd8_patch-src-jail.c
@@ -0,0 +1,49 @@
+Fix build on FreeBSD 8
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/py-freebsd/files/freebsd8_patch-src-jail.c
+https://bugs.gentoo.org/show_bug.cgi?id=364605
+
+--- src/jail.c.orig	2005-05-08 06:55:00.000000000 +0000
++++ src/jail.c	2008-12-23 13:54:31.000000000 +0000
+@@ -40,21 +40,37 @@ static PyObject *
+ PyFB_jail(PyObject *self, PyObject *args)
+ {
+ 	struct jail jp;
++	struct in_addr ia;
+ 	char *ipaddr;
++	int error;
+ 
+ 	if (!PyArg_ParseTuple(args, "sss:jail", &(jp.path),
+ 			      &(jp.hostname), &ipaddr))
+ 		return NULL;
+ 
+-	jp.version   = 0;
+-	jp.ip_number = inet_addr(ipaddr);
+-
+-	if (jp.ip_number == INADDR_NONE) {
++	ia.s_addr	= inet_addr(ipaddr);
++	if (ia.s_addr == INADDR_NONE) {
+ 		PyErr_SetString(PyExc_ValueError, "malformed internet address");
+ 		return NULL;
+ 	}
+ 
+-	if (jail(&jp) == -1)
++	jp.version	= JAIL_API_VERSION;
++	jp.jailname	= NULL;
++	jp.ip4s		= 1;
++	jp.ip4		= malloc(jp.ip4s * sizeof(struct in_addr));
++	if (jp.ip4 == NULL) {
++		PyErr_SetString(PyExc_ValueError, "Cannot allocate memory");
++		return NULL;
++	}
++	jp.ip4->s_addr = ia.s_addr;
++	jp.ip6s		= 0;
++	jp.ip6		= NULL;
++
++	error = jail(&jp);
++
++	free(jp.ip4);
++
++	if (error == -1)
+ 		return OSERROR();
+ 
+ 	Py_RETURN_NONE;
diff --git a/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild b/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild
index f3b7edb44f0f..519071b21890 100644
--- a/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild
+++ b/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild,v 1.3 2010/12/30 21:27:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-freebsd/py-freebsd-0.9.3-r1.ebuild,v 1.4 2011/07/08 00:03:28 aballier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -28,6 +28,7 @@ src_prepare() {
 	distutils_src_prepare
 	epatch "${FILESDIR}/fbsd7-netstat.patch"
 	epatch "${FILESDIR}/process-fix.patch"
+	epatch "${FILESDIR}/freebsd8_patch-src-jail.c"
 }
 
 src_test() {