head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.2 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.4.0.8 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.6 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.4 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.2 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.3.0.20 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.18 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.16 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.14 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.12 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.10 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.8 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.6 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.2 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.2.0.28 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.26 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.24 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.16 pkgsrc-2008Q1:1.2.0.14 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.12 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.10 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.8 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.6 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.4 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.2 pkgsrc-2006Q3-base:1.2; locks; strict; comment @# @; 1.5 date 2013.03.15.08.18.43; author plunky; state dead; branches; next 1.4; 1.4 date 2012.02.16.17.40.29; author hans; state Exp; branches; next 1.3; 1.3 date 2009.07.20.05.56.03; author hasso; state Exp; branches; next 1.2; 1.2 date 2006.07.24.17.07.15; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2006.07.17.12.29.57; author xtraeme; state Exp; branches; next ; desc @@ 1.5 log @Update to ObexFTP 0.24 There is a new maintainer, Hendrik Sattler and the sources are held at gitorius.org. Build is changed to CMake and although it does not appear in the ChangeLog below, I forwarded all the NetBSD related patches that pkgsrc had (and more in fact, to get it working) although I would still say that obexapp is the better program. From the ChangeLog: ObexFTP 0.24 (released 2013-03-05) ---------------------------------- * Maintainer changed from Christian to Hendrik * change build system to using CMake * integrate obexfs-0.12 * fix build for OpenOBEX-1.7 ObexFTP 0.23 (released 2009-02-17) ---------------------------------- * allow win32 to use hci src names * adding a simpler connect wrapper * show OBEX_HandleInput errors * catch errors and let the user know * print timeout stats if available * sdp unregister more verbose * upgrading btkit * fix for win32 without bt * replacing deprecated automake vars * sizeof() fixes * removing bdaddr_t reference from obexftpd.c * adding bootstrap helper * concurrency bug in extconf.rb generated Makefile (fix by Alin Năstac) * switching from POD to asciidoc * clearing gnu-style implicit rules ObexFTP 0.22 (released 2008-06-15) ---------------------------------- * added proper unicode support * added support for transparent OBEX-over-AT mode * rewritten at-command function * added specific error messages * refactored to flexible bt_kit layer * fixed cache root duplicates * fixed off-by-one and unfreed mem in cache layer * added pkg-config file * added example code * switched to doxygen * added python binding callbacks * portable packed structs * enabled linux hci dev names for source selection * Python binding uses distutils now, tested by Adam Williamson * removed exit from bt discovery * Better autodetection for possible language bindings * reworked win32 support * Motorola SLVR L2 cobex fix by Andrey Rahmatullin * now using AC_HELP_STRING for compat with autoconf <=2.57 * added hci selection support, drafted by Manuel Naranjo * switched obexftp cli to new discovery api * prefer PCSUITE over FTP, req. by Martin Storsjö for Series 60 2nd Ed. * fixed compile error with >=swig-1.3.28 * renamed sdp browse function * fixed month/day swapping in atotime, spotted by Dr. Johannes Zellner * added BFC compatibility for newer Siemens phones * added PCSOFTWARE uuid support for SHARP phones * added motorola support * end bfb mode properly * added CPROT=0 support from 3GPP 27.007 * fixed ericsson init * fixed invalid conn_id in disconnect rep. by Alan J. McFarlane * better create flag handling in setpath * Changed LDADD to LIBADD sug. by Sergey Vlasov * obexftpd clean up by Hendrik Sattler * 64-bit fixes by Hendrik Sattler * Removed all (dangerous) obex_headerdata_t casts * Reorganized all swig-dependant Makefiles * Applied cobex write patch from Simon Ruggier * Applied from Frode Isaksen ObexFTP 0.21 (released 2006-06-27) ---------------------------------- 2006-05-26 Christian W. Zuckschwerdt * Fixes to obexftpd suggested by Hendrik Sattler 2006-05-24 Christian W. Zuckschwerdt * Added ruby binding * Added preliminary discovery function @ text @$NetBSD: patch-ai,v 1.4 2012/02/16 17:40:29 hans Exp $ --- apps/obexftpd.c.orig 2006-04-13 07:57:55.000000000 +0200 +++ apps/obexftpd.c @@@@ -23,6 +23,10 @@@@ * Created at: Don, 2 Okt 2003 */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@@@ -45,6 +49,14 @@@@ #include #endif /*_WIN32*/ +#ifdef HAVE_BLUETOOTH +#if defined(__NetBSD__) || defined(__DragonFly__) +#include +#else +#include +#endif +#endif /* HAVE_BLUETOOTH */ + /* just until there is a server layer in obexftp */ #include @@@@ -56,6 +68,8 @@@@ #include "obexftp_sdp.h" +#define DEFFILEMOD (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) /* 0644 */ + /* define this to "", "\r\n" or "\n" */ #define EOLCHARS "\n" @@@@ -72,7 +86,9 @@@@ //BEGIN of constant +#ifdef HAVE_BLUETOOTH bdaddr_t *bt_src = NULL; +#endif char *device = NULL; int channel = 10; /* OBEX_PUSH_HANDLE */ @@@@ -698,7 +714,7 @@@@ static int safe_save_file(char *name, co #ifdef _WIN32 fd = open(filename, O_RDWR | O_CREAT, 0); #else - fd = open(filename, O_RDWR | O_CREAT, DEFFILEMODE); + fd = open(filename, O_RDWR | O_CREAT, DEFFILEMOD); #endif if ( fd < 0) { @@@@ -934,16 +950,21 @@@@ static void start_server(int transport) exit(0); } - if (transport==OBEX_TRANS_BLUETOOTH && 0 > obexftp_sdp_register()) - { - //OBEX_Cleanup(handle); - fprintf(stderr, "register to SDP Server failed.\n"); - exit(0); - } - else - { - use_sdp = 1; - } +#ifdef HAVE_BLUETOOTH + if (transport==OBEX_TRANS_BLUETOOTH) + { + if (0 > obexftp_sdp_register()) + { + //OBEX_Cleanup(handle); + fprintf(stderr, "register to SDP Server failed.\n"); + exit(0); + } + else + { + use_sdp = 1; + } + } +#endif reset: handle = OBEX_Init(transport, obex_event, 0); @@@@ -963,12 +984,14 @@@@ reset: exit(-1); } break; +#ifdef HAVE_BLUETOOTH case OBEX_TRANS_BLUETOOTH: if (0 > BtOBEX_ServerRegister(handle, bt_src, channel)) { perror("failed to register bluetooth server"); exit(-1); } break; +#endif case OBEX_TRANS_IRDA: if (0 > IrOBEX_ServerRegister(handle, "")) { perror("failed to register IrDA server"); @@@@ -1002,11 +1025,13 @@@@ reset: goto reset; } +#ifdef HAVE_BLUETOOTH if (use_sdp) { fprintf(stderr, "sdp unregister\n"); obexftp_sdp_unregister(); } +#endif } @ 1.4 log @Fix build on SunOS. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ @ 1.3 log @Bluetooth support for DragonFly. Bump PKGREVISION. PR pkg/41640. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.2 2006/07/24 17:07:15 xtraeme Exp $ d31 29 a59 1 @@@@ -934,16 +946,21 @@@@ static void start_server(int transport) d91 1 a91 1 @@@@ -963,12 +980,14 @@@@ reset: d106 1 a106 1 @@@@ -1002,11 +1021,13 @@@@ reset: @ 1.2 log @Merge in patches to make this build again on NetBSD without bluetooth, thanks to dillo for that. @ text @d1 1 a1 1 $NetBSD$ d21 1 a21 1 +#ifdef __NetBSD__ @ 1.1 log @Update to 0.20 (latest stable version): Changes: * Motorola support, tested with models v710/e815 * object caching and directory parsing (for things like ObexFS) * Nokia support via IrDA and Bluetooth * Siemens S65 support * Everything but data goes to stderr for more simple redirection. * VMO converter (gsm and wav) split into seperate package. * Ericsson and Siemens cable support unified (still testing). pkgsrc changes: * NetBSD bluetooth support, thanks to Iain Hibbert for finishing it. @ text @d3 2 a4 2 --- apps/obexftpd.c.orig 2006-07-09 16:43:20.000000000 +0200 +++ apps/obexftpd.c 2006-07-09 16:45:04.000000000 +0200 d31 61 @