Updated patches for py-freebsd with 7.0 support.

(Portage version: 2.1.5.4)

2 files changed, 62 insertions, 0 deletions

diff --git a/dev-python/py-freebsd/files/fbsd7-netstat.patch b/dev-python/py-freebsd/files/fbsd7-netstat.patch
new file mode 100644
index 000000000000..11ae01cc4d6c
--- /dev/null
+++ b/dev-python/py-freebsd/files/fbsd7-netstat.patch
@@ -0,0 +1,10 @@
+--- src/netstat.c.orig	2007-08-17 13:07:10.654911645 -0500
++++ src/netstat.c	2007-08-17 13:07:19.496912514 -0500
+@@ -243,7 +243,6 @@
+ 		Py_DECREF(t);
+ 		p_int(type);        p_int(physical);
+ 		p_int(addrlen);     p_int(hdrlen);
+-		p_int(recvquota);   p_int(xmitquota);
+ 		p_long(mtu);        p_long(metric);
+ 		p_long(baudrate);   p_long(ipackets);
+ 		p_long(ierrors);    p_long(opackets);
diff --git a/dev-python/py-freebsd/files/process-fix.patch b/dev-python/py-freebsd/files/process-fix.patch
new file mode 100644
index 000000000000..910492080eb0
--- /dev/null
+++ b/dev-python/py-freebsd/files/process-fix.patch
@@ -0,0 +1,52 @@
+--- src/process.c.orig	Sun May  8 08:55:00 2005
++++ src/process.c	Sat Nov 25 18:12:52 2006
+@@ -51,10 +51,19 @@
+ static PyObject *
+ PyFB_setprogname(PyObject *self, PyObject *args)
+ {
+-	char *progname;
++	const char	*progname;
++	static PyObject	*namestr = NULL;
+ 
+ 	if (!PyArg_ParseTuple(args, "s:setprogname", &progname))
+ 		return NULL;
++	/*
++	 * Setprogname(3) does not copy the string, it only stores the
++	 * string pointer. Make sure that the string object does not
++	 * get garbage collected and its memory reused!
++	 */
++	Py_XDECREF(namestr);	/* maybe free old progname */
++	PyArg_ParseTuple(args, "O", &namestr);
++	Py_INCREF(namestr);	/* keep new progname object */
+ 
+ 	setprogname(progname);
+ 	Py_RETURN_NONE;
+@@ -64,16 +73,24 @@
+ static char PyFB_setproctitle__doc__[] =
+ "setproctitle(title):\n"
+ "The setproctitle() library routine sets the process title that\n"
+-"appears on the ps(1) command.";
++"appears on the ps(1) command. The progname and a colon are\n"
++"prepended automatically. This behaviour is suppressed when the\n"
++"title starts with a dash (-) character. Calling with a None\n"
++"argument restores a default process title.";
+ 
+ static PyObject *
+ PyFB_setproctitle(PyObject *self, PyObject *args)
+ {
+-	char *newtitle;
++	const char *newtitle;
+ 
+-	if (!PyArg_ParseTuple(args, "s:setproctitle", &newtitle))
++	if (!PyArg_ParseTuple(args, "z:setproctitle", &newtitle))
+ 		return NULL;
+ 
+-	setproctitle(newtitle);
++	if (newtitle == NULL)
++		setproctitle(NULL);
++	else if (*newtitle == '-')
++		setproctitle("-%s", newtitle+1);
++	else
++		setproctitle("%s", newtitle);
+ 	Py_RETURN_NONE;
+ }