found a fix in the partysip cvs, works with >=libosip-2.0.7 and previous versions

4 files changed, 81 insertions, 4 deletions

diff --git a/net-misc/partysip/ChangeLog b/net-misc/partysip/ChangeLog
index f571b5d9bfcd..f79033d82f18 100644
--- a/net-misc/partysip/ChangeLog
+++ b/net-misc/partysip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/partysip
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.5 2004/09/21 19:46:44 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.6 2004/09/21 20:20:38 stkn Exp $
+
+  21 Sep 2004; <stkn@gentoo.org> +files/partysip-2.1.1-libosip2fix.diff,
+  partysip-2.1.1.ebuild:
+  found a fix in the partysip cvs, works with >=libosip-2.0.7 and previous
+  versions
 
   21 Sep 2004; <stkn@gentoo.org> partysip-2.1.1.ebuild:
   partysip won't compile with >=libosip-2.0.7, changing dependency to
diff --git a/net-misc/partysip/Manifest b/net-misc/partysip/Manifest
index 788363b0bc29..36a7d8371fd8 100644
--- a/net-misc/partysip/Manifest
+++ b/net-misc/partysip/Manifest
@@ -1,6 +1,7 @@
-MD5 1a00bd28e3bac6c4855ab01f8c332ba7 ChangeLog 797
+MD5 015c3577f7125bb127b33571ae5664d2 ChangeLog 982
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 0ef574407be84a6b9c4740c5842c9edf partysip-2.1.1.ebuild 1465
+MD5 fb07ffe4e4d235f4090c58270031d40a partysip-2.1.1.ebuild 1574
 MD5 6d09d636a5e5279fee121ef636931eb7 files/digest-partysip-2.1.1 197
 MD5 af1cd5cfc31c0ad22707ebfb4c5d4a42 files/partysip.confd 51
 MD5 2a6297d7481da765074b92d31c2f596e files/partysip.rc6 559
+MD5 0293eef57b96944ba281314e53623dd1 files/partysip-2.1.1-libosip2fix.diff 1866
diff --git a/net-misc/partysip/files/partysip-2.1.1-libosip2fix.diff b/net-misc/partysip/files/partysip-2.1.1-libosip2fix.diff
new file mode 100644
index 000000000000..39b91dc6517e
--- /dev/null
+++ b/net-misc/partysip/files/partysip-2.1.1-libosip2fix.diff
@@ -0,0 +1,62 @@
+===================================================================
+RCS file: /cvsroot/partysip/cvsroot/partysip/partysip/ppl/unix/ppldso.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- partysip/partysip/ppl/unix/ppldso.c	2003/05/14 15:40:14	1.7
++++ partysip/partysip/ppl/unix/ppldso.c	2004/02/13 18:50:24	1.8
+@@ -80,6 +80,7 @@
+  */
+ 
+ #include <ppl/ppl_dso.h>
++#include <osipparser2/osip_port.h>
+ 
+ #if !defined(DSO_USE_DLFCN) && !defined(DSO_USE_SHL) && !defined(DSO_USE_DYLD)
+ #error No DSO implementation specified.
+@@ -94,9 +95,6 @@
+ #if HAVE_STRING_H
+ #include <string.h>		/* for strerror() on HP-UX */
+ #endif
+-
+-void *osip_malloc (int len);
+-void osip_free (void *);
+ 
+ ppl_status_t
+ ppl_dso_unload (ppl_dso_handle_t * thedso)
+===================================================================
+RCS file: /cvsroot/partysip/cvsroot/partysip/partysip/ppl/unix/pplgetopt.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- partysip/partysip/ppl/unix/pplgetopt.c	2003/05/14 15:40:14	1.7
++++ partysip/partysip/ppl/unix/pplgetopt.c	2004/02/13 18:50:24	1.8
+@@ -53,9 +53,7 @@
+  */
+ 
+ #include <ppl/ppl_getopt.h>
+-
+-void *osip_malloc (int size);
+-void osip_free (void *);
++#include <osipparser2/osip_port.h>
+ 
+ #define EMSG    ""
+  
+ /* This is a modified version from Aymeric MOIZARD
+===================================================================
+RCS file: /cvsroot/partysip/cvsroot/partysip/partysip/ppl/unix/pplpipe.c,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- partysip/partysip/ppl/unix/pplpipe.c	2004/01/30 23:44:45	1.8
++++ partysip/partysip/ppl/unix/pplpipe.c	2004/02/13 18:50:24	1.9
+@@ -20,9 +20,8 @@
+ 
+ 
+ #include <ppl/ppl_pipe.h>
++#include <osipparser2/osip_port.h>
+ 
+-void *osip_malloc (int size);
+-void osip_free (void *);
+ 
+ PPL_DECLARE (ppl_pipe_t *) ppl_pipe ()
+ {
diff --git a/net-misc/partysip/partysip-2.1.1.ebuild b/net-misc/partysip/partysip-2.1.1.ebuild
index 2f4495d1e5ce..70868cdbc867 100644
--- a/net-misc/partysip/partysip-2.1.1.ebuild
+++ b/net-misc/partysip/partysip-2.1.1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.1.1.ebuild,v 1.5 2004/09/21 19:46:44 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.1.1.ebuild,v 1.6 2004/09/21 20:20:38 stkn Exp $
 
 #IUSE="gdbm berkdb debug"
 IUSE="debug"
 
+inherit eutils
+
 DESCRIPTION="Modular and extensible SIP proxy"
 HOMEPAGE="http://savannah.nongnu.org/projects/partysip/"
 SRC_URI="http://osip.atosc.org/download/partysip/${P}.tar.gz"
@@ -21,6 +23,13 @@ DEPEND="virtual/libc
 #	gdbm?   ( >=sys-libs/gdbm-1.8.0 )
 #	berkdb? ( >=sys-libs/db-4.1.20 )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/partysip-2.1.1-libosip2fix.diff
+}
+
 src_compile() {
 	local myconf