diff options
| -rw-r--r-- | app-mobilephone/obexftp/ChangeLog | 9 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/Manifest | 15 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/files/digest-obexftp-0.19 | 3 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/files/digest-obexftp-0.21 | 1 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch | 60 | ||||
| -rw-r--r-- | app-mobilephone/obexftp/obexftp-0.21.ebuild (renamed from app-mobilephone/obexftp/obexftp-0.19.ebuild) | 14 |
6 files changed, 82 insertions, 20 deletions
diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog index ca0f929870e4..2c67993f2d06 100644 --- a/app-mobilephone/obexftp/ChangeLog +++ b/app-mobilephone/obexftp/ChangeLog @@ -1,6 +1,13 @@ # 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.10 2006/05/06 06:07:55 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.11 2006/06/02 18:57:17 mrness Exp $ + +*obexftp-0.21 (02 Jun 2006) + + 02 Jun 2006; Alin Nastac <mrness@gentoo.org> + +files/obexftp-0.21-cobex_write.patch, -obexftp-0.19.ebuild, + +obexftp-0.21.ebuild: + Version bump. *obexftp-0.19-r1 (06 May 2006) diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest index d00d8232512b..e1116edc8b56 100644 --- a/app-mobilephone/obexftp/Manifest +++ b/app-mobilephone/obexftp/Manifest @@ -1,19 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 b95d5decf09736a4e22cfda00c36e2b9 ChangeLog 5555 MD5 580f449983ce97b01d8306c9056e93b6 files/digest-obexftp-0.18 64 -MD5 877bce89edb701ed9fb5021de3812e98 files/digest-obexftp-0.19 238 MD5 17cef382b7d9b74a67a45e34fbbcb81e files/digest-obexftp-0.19-r1 64 +MD5 46ce676213c444e0965a46f92c2521bc files/digest-obexftp-0.21 65 MD5 6a6fe66463cf754e0bffe6c432546d25 files/obexftp-0.19-cobex_write.patch 2292 +MD5 22ff2b0139e04ee668962537a486e8ab files/obexftp-0.21-cobex_write.patch 2292 MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336 MD5 8da2275ebba1a9f714b77ff81bebc309 obexftp-0.18.ebuild 1167 MD5 1fe0be310f8b162b9fecf3ee4ae975f4 obexftp-0.19-r1.ebuild 1295 -MD5 68d0780d9354665e56d195ada40c7360 obexftp-0.19.ebuild 1206 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFEXD1LjG8pv1lIUX4RAoH/AKCJ5Kkgv31Foh16kgzG5Yr4JP/qHwCglI94 -Q1ZkGy1W2pvCEKYiwRsDCTI= -=6RUL ------END PGP SIGNATURE----- +MD5 e84e0ad4d4461e3f9fddb6d2a31805ea obexftp-0.21.ebuild 1296 diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.19 b/app-mobilephone/obexftp/files/digest-obexftp-0.19 deleted file mode 100644 index 65160f785076..000000000000 --- a/app-mobilephone/obexftp/files/digest-obexftp-0.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 895212816ca94a8b56090d8671dc18fa obexftp-0.19.tar.gz 460515 -RMD160 f138815169814ff0e6fdcfff06a0f4ce67e872e0 obexftp-0.19.tar.gz 460515 -SHA256 31bb37aa5ab0d4c4dda9cdd908876adc8e3d2606924f9d350d10eac5ea5bdb1b obexftp-0.19.tar.gz 460515 diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.21 b/app-mobilephone/obexftp/files/digest-obexftp-0.21 new file mode 100644 index 000000000000..a00445972df3 --- /dev/null +++ b/app-mobilephone/obexftp/files/digest-obexftp-0.21 @@ -0,0 +1 @@ +MD5 b01d5388b5ae1aa3766301f70576ae6a obexftp-0.21.tar.bz2 353862 diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch b/app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch new file mode 100644 index 000000000000..db80309a5d8a --- /dev/null +++ b/app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch @@ -0,0 +1,60 @@ +diff -Nru obexftp-0.21.orig/multicobex/multi_cobex.c obexftp-0.21/multicobex/multi_cobex.c +--- obexftp-0.21.orig/multicobex/multi_cobex.c 2005-11-24 16:55:11.000000000 +0200 ++++ obexftp-0.21/multicobex/multi_cobex.c 2006-06-02 21:53:07.483151000 +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/obexftp-0.19.ebuild b/app-mobilephone/obexftp/obexftp-0.21.ebuild index c785fdfc1135..bcc716536ebe 100644 --- a/app-mobilephone/obexftp/obexftp-0.19.ebuild +++ b/app-mobilephone/obexftp/obexftp-0.21.ebuild @@ -1,11 +1,11 @@ # 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.ebuild,v 1.2 2006/03/06 20:36:14 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.21.ebuild,v 1.1 2006/06/02 18:57:18 mrness Exp $ -inherit perl-module flag-o-matic +inherit perl-module flag-o-matic eutils DESCRIPTION="File transfer over OBEX for mobile phones" -SRC_URI="http://triq.net/obexftp/${P}.tar.gz" +SRC_URI="http://triq.net/obexftp/${P}.tar.bz2" HOMEPAGE="http://triq.net/obex" SLOT="0" @@ -20,6 +20,12 @@ DEPEND=">=dev-libs/openobex-1.1 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 @@ -35,7 +41,7 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die "make install failed" + make DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS ChangeLog NEWS README* THANKS TODO dohtml doc/*.html |