remove old version; take over the maintainership; fix program freeze (#131603)

(Portage version: 2.0.54)

9 files changed, 129 insertions, 68 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 19a412acc24e..ca0f929870e4 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.9 2006/02/25 15:20:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.10 2006/05/06 06:07:55 mrness Exp $
+
+*obexftp-0.19-r1 (06 May 2006)
+
+  06 May 2006; Alin Nastac <mrness@gentoo.org>
+  -files/obexftp-0.10.7-t610-jpg.patch,
+  +files/obexftp-0.19-cobex_write.patch, metadata.xml,
+  -obexftp-0.10.7-r1.ebuild, +obexftp-0.19-r1.ebuild:
+  Take over the maintainership of this package. Fix obexftp freeze when
+  sending file to Sony Ericsson z520 over usb cable using cdc_acm, thanks to
+  Simon Ruggier <Simon80@gmail.com> (#131603).
 
   25 Feb 2006; Alin Nastac <mrness@gentoo.org> obexftp-0.18.ebuild:
   Stable on x86.
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index a98ea626fb5d..b4360e58689b 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 29a739e02b3c8582f29fb24a5bac49ab ChangeLog 5129
-MD5 c133b8829ba299b03a0e6ab757ab5f22 files/digest-obexftp-0.10.7-r1 66
 MD5 580f449983ce97b01d8306c9056e93b6 files/digest-obexftp-0.18 64
 MD5 877bce89edb701ed9fb5021de3812e98 files/digest-obexftp-0.19 238
-MD5 520b09e250d549cadd0b0a39118225ec files/obexftp-0.10.7-t610-jpg.patch 307
-MD5 9860ed702775ec6730786768ec7c1abb metadata.xml 337
-MD5 0a9048c4cb20de34d8f94857ba8f92b4 obexftp-0.10.7-r1.ebuild 981
+MD5 17cef382b7d9b74a67a45e34fbbcb81e files/digest-obexftp-0.19-r1 64
+MD5 6a6fe66463cf754e0bffe6c432546d25 files/obexftp-0.19-cobex_write.patch 2292
+MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
 MD5 8da2275ebba1a9f714b77ff81bebc309 obexftp-0.18.ebuild 1167
+MD5 0e5453b3a5271e845adfb0685f3d17c3 obexftp-0.19-r1.ebuild 1292
 MD5 68d0780d9354665e56d195ada40c7360 obexftp-0.19.ebuild 1206
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDJ1LjG8pv1lIUX4RAuvnAJ9YqDZUDKAuqWjLkcS3AVKFIajn2ACg0TkD
-719Ft/SDCG2SPs7m2UTr5iM=
-=d366
------END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.10.7-r1 b/app-mobilephone/obexftp/files/digest-obexftp-0.10.7-r1
deleted file mode 100644
index 3386d5ed7bac..000000000000
--- a/app-mobilephone/obexftp/files/digest-obexftp-0.10.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e827f68bddc3c38229a08c264614f054 obexftp-0.10.7.tar.gz 378238
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.19-r1 b/app-mobilephone/obexftp/files/digest-obexftp-0.19-r1
new file mode 100644
index 000000000000..a1f8b0ad394e
--- /dev/null
+++ b/app-mobilephone/obexftp/files/digest-obexftp-0.19-r1
@@ -0,0 +1 @@
+MD5 895212816ca94a8b56090d8671dc18fa obexftp-0.19.tar.gz 460515
diff --git a/app-mobilephone/obexftp/files/obexftp-0.10.7-t610-jpg.patch b/app-mobilephone/obexftp/files/obexftp-0.10.7-t610-jpg.patch
deleted file mode 100644
index bf3d16646943..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.10.7-t610-jpg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp/object.c~	2004-11-18 23:37:36.000000000 +0100
-+++ obexftp/object.c	2005-01-09 18:01:01.000000000 +0100
-@@ -200,7 +200,7 @@
- 
- 	if (create == 0) {
- 		// set the 'Don't Create' bit
--		setpath_nohdr_data[1] ^= 2;
-+		setpath_nohdr_data[0] |= 2;
- 	}
- 	if (name) {
- 		ucname_len = strlen(name)*2 + 2;
diff --git a/app-mobilephone/obexftp/files/obexftp-0.19-cobex_write.patch b/app-mobilephone/obexftp/files/obexftp-0.19-cobex_write.patch
new file mode 100644
index 000000000000..becd250cde75
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.19-cobex_write.patch
@@ -0,0 +1,60 @@
+diff -Nru obexftp-0.19.orig/multicobex/multi_cobex.c obexftp-0.19/multicobex/multi_cobex.c
+--- obexftp-0.19.orig/multicobex/multi_cobex.c	2005-11-24 16:55:11.000000000 +0200
++++ obexftp-0.19/multicobex/multi_cobex.c	2006-04-29 21:13:47.955525000 +0300
+@@ -126,7 +126,7 @@
+ /* Called from OBEX-lib when data needs to be written */
+ int cobex_write(obex_t *self, void *data, uint8_t *buffer, int length)
+ {
+-	int actual;
++	int written;
+ 	cobex_t *c;
+         return_val_if_fail (self != NULL, -1);
+         return_val_if_fail (data != NULL, -1);
+@@ -137,24 +137,37 @@
+ 	DEBUG(3, "%s() Data %d bytes\n", __func__, length);
+ 
+ 	if (c->type == CT_ERICSSON || c->type == CT_SIEMENS) {
+-		actual = write(c->fd, buffer, length);
+-		if (actual < length)	{
+-			DEBUG(1, "Error writing to port (%d expected %d)\n", actual, length);
+-			return actual; /* or -1? */
++		int retries=0, chunk, fails=0;
++		written = 0;
++		for (retries = 0; written < length; retries++) {
++			chunk = write(c->fd, buffer+written, length-written);
++			if (chunk <= 0) {
++				if ( ++fails >= 10 ) { // to avoid infinite looping if something is really wrong
++					DEBUG(1, "%s() Error writing to port (written %d bytes out of %d, in %d retries)\n", __func__, written, length, retries);
++					return written;
++				}
++				usleep(1); // This mysteriously avoids a resource not available error on write()
++			} else {
++				written += chunk;
++				fails = 0; // Reset error counter on successful write op
++			}
+ 		}
+-		return actual;
++		
++		if (retries > 0)
++			DEBUG(2, "%s() Wrote %d bytes in %d retries\n", __func__, written, retries);
++		return written;
+ 	}
+ 
+ 	if (c->seq == 0){
+-		actual = bfb_send_first(c->fd, buffer, length);
+-		DEBUG(2, "%s() Wrote %d first packets (%d bytes)\n", __func__, actual, length);
++		written = bfb_send_first(c->fd, buffer, length);
++		DEBUG(2, "%s() Wrote %d first packets (%d bytes)\n", __func__, written, length);
+ 	} else {
+-		actual = bfb_send_next(c->fd, buffer, length, c->seq);
+-		DEBUG(2, "%s() Wrote %d packets (%d bytes)\n", __func__, actual, length);
++		written = bfb_send_next(c->fd, buffer, length, c->seq);
++		DEBUG(2, "%s() Wrote %d packets (%d bytes)\n", __func__, written, length);
+ 	}
+ 	c->seq++;
+ 
+-	return actual;
++	return written;
+ }
+ 
+ /* Called when input data is needed */
diff --git a/app-mobilephone/obexftp/metadata.xml b/app-mobilephone/obexftp/metadata.xml
index a5516b4d9e91..56600e7d54c2 100644
--- a/app-mobilephone/obexftp/metadata.xml
+++ b/app-mobilephone/obexftp/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>mobile-phone</herd>
 <maintainer>
-    <email>ticho@gentoo.org</email>
-    <name>Andrej Kacian</name>
+    <email>mrness@gentoo.org</email>
+    <name>Alin Nastac</name>
 </maintainer>
 <longdescription>File transfer over OBEX for mobile phones.</longdescription>
 </pkgmetadata>
diff --git a/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild
deleted file mode 100644
index b358b2af97b6..000000000000
--- a/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.10.7-r1.ebuild,v 1.3 2006/01/03 19:03:11 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="File transfer over OBEX for mobile phones"
-SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
-HOMEPAGE="http://triq.net/obex"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="bluetooth"
-
-RDEPEND=">=dev-libs/openobex-1.0.0
-	bluetooth? ( >=net-wireless/bluez-libs-2.6 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.10.7-t610-jpg.patch || die
-}
-
-src_compile() {
-	econf || die
-	sed -i -e 's:apps doc contrib:apps contrib:' Makefile
-	emake || die
-}
-
-src_install() {
-	dohtml doc/*.html doc/*.css doc/*.png doc/*.xml doc/*.xsl
-	doman doc/obexftp.1
-	rm -rf doc
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog README* THANKS TODO
-}
diff --git a/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild
new file mode 100644
index 000000000000..89eaa309539e
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild,v 1.1 2006/05/06 06:07:55 mrness Exp $
+
+inherit perl-module flag-o-matic eutils
+
+DESCRIPTION="File transfer over OBEX for mobile phones"
+SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
+HOMEPAGE="http://triq.net/obex"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bluetooth debug perl python swig tcltk"
+
+DEPEND=">=dev-libs/openobex-1.1
+	bluetooth? ( >=net-wireless/bluez-libs-2.19 )
+	perl? ( >=dev-lang/perl-5.8.6 )
+	python? ( >=dev-lang/python-2.4.2 )
+	tcltk? ( >=dev-lang/tcl-8.4.9 )
+	swig? ( >=dev-lang/swig-1.3.7 )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-cobex_write.patch"
+}
+
+src_compile() {
+	if use debug ; then
+		strip-flags
+		append-flags "-g -DOBEXFTP_DEBUG=5"
+	fi
+
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcltk tcl) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+	dohtml doc/*.html
+	insinto /usr/share/doc/${PF}/examples
+	doins -r apps/*_example.*
+	use perl && fixlocalpod
+}