diff --git a/.cvsignore b/.cvsignore index f0db64b..db30fe2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -openobex-1.1.tar.gz +openobex-1.2.tar.gz diff --git a/openobex-apps-1.0.0-push.patch b/openobex-apps-1.0.0-push.patch new file mode 100644 index 0000000..ee1a677 --- /dev/null +++ b/openobex-apps-1.0.0-push.patch @@ -0,0 +1,237 @@ +--- openobex-apps-1.0.0/apps/Makefile.am.push 2002-12-01 18:34:41.000000000 +0100 ++++ openobex-apps-1.0.0/apps/Makefile.am 2003-06-04 17:04:22.000000000 +0200 +@@ -9,7 +9,7 @@ + obex_put_common.c obex_put_common.h + + +-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test ++bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test obex_push + + obex_test_SOURCES = \ + obex_test.c obex_test.h \ +@@ -25,6 +25,10 @@ + + irobex_palm3_SOURCES = irobex_palm3.c + ++obex_push_SOURCES = obex_push.c ++obex_push_LDADD = @OPENOBEX_LIBS@ @BLUETOOTH_LIBS@ libmisc.a ++ ++man_MANS = obex_push.1 + + LDADD = @OPENOBEX_LIBS@ libmisc.a + +--- /dev/null 2003-01-30 11:24:37.000000000 +0100 ++++ openobex-apps-1.0.0/apps/obex_push.c 2003-06-04 17:04:22.000000000 +0200 +@@ -0,0 +1,170 @@ ++/********************************************************************* ++ * ++ * Filename: obex_push.c ++ * Version: 0.1 ++ * Description: Demonstrates use of PUSH command ++ * Status: Experimental. ++ * Author: Harald Hoyer ++#include ++ ++#ifndef _WIN32 ++#include ++#endif ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#if _WIN32 ++#include ++#else ++#include ++#include ++#include ++#include ++#endif /* _WIN32 */ ++ ++ ++#include ++#include ++ ++ ++#include ++#include "obex_put_common.h" ++#include "obex_io.h" ++ ++#define OBEX_PUSH_HANDLE 10 ++ ++#define TRUE 1 ++#define FALSE 0 ++ ++obex_t *handle = NULL; ++volatile int finished = FALSE; ++extern int last_rsp; ++ ++/* ++ * Function main (argc, ) ++ * ++ * Starts all the fun! ++ * ++ */ ++int main(int argc, char *argv[]) ++{ ++ obex_object_t *object; ++ int ret, exitval = EXIT_SUCCESS; ++ bdaddr_t bdaddr; ++ uint8_t channel; ++ char *filename; ++ if ((argc < 1) || (argc > 4)) { ++ printf ("Usage: %s [] [ ]\n", argv[0]); ++ return -1; ++ } ++ handle = OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0); ++ ++ switch (argc) { ++#ifdef HAVE_BLUETOOTH ++ case 4: ++ channel = atoi(argv[1]); ++ str2ba(argv[2], &bdaddr); ++ filename = argv[3]; ++ break; ++ case 3: ++ str2ba(argv[1], &bdaddr); ++ filename = argv[2]; ++ channel = OBEX_PUSH_HANDLE; ++ break; ++ case 2: ++ channel = atoi(argv[1]); ++ break; ++ case 1: ++ channel = OBEX_PUSH_HANDLE; ++ break; ++#endif ++ default: ++ printf("Wrong number of arguments\n"); ++ exit(0); ++ } ++ ++ printf("Send and receive files through bluetooth OBEX PUSH channel %d\n", channel); ++ if (argc <= 2) { ++ char cmd[1024]; ++ /* We are server*/ ++ snprintf(cmd, sizeof(cmd), "sdptool add --channel=%d OPUSH", channel); ++ system(cmd); ++ ++ printf("Waiting for files\n"); ++ BtOBEX_ServerRegister(handle, NULL, channel); ++ ++ while (!finished) ++ OBEX_HandleInput(handle, 1); ++ } ++ else { ++ /* We are a client */ ++ if (bacmp(&bdaddr, BDADDR_ANY) == 0) { ++ printf("Device address error! (Bluetooth)\n"); ++ return -1; ++ } ++ ++ /* Try to connect to peer */ ++ ret = BtOBEX_TransportConnect(handle, BDADDR_ANY, &bdaddr, ++ channel); ++ if (ret < 0) { ++ printf("Sorry, unable to connect!\n"); ++ return EXIT_FAILURE; ++ } ++ ++ object = OBEX_ObjectNew(handle, OBEX_CMD_CONNECT); ++ ret = do_sync_request(handle, object, FALSE); ++ if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0)) { ++ printf("Sorry, unable to connect!\n"); ++ return EXIT_FAILURE; ++ } ++ if ((object = build_object_from_file(handle, filename))) ++ { ++ ret = do_sync_request(handle, object, FALSE); ++ if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0)) ++ exitval = EXIT_FAILURE; ++ } else ++ exitval = EXIT_FAILURE; ++ ++ object = OBEX_ObjectNew(handle, OBEX_CMD_DISCONNECT); ++ ret = do_sync_request(handle, object, FALSE); ++ if ((last_rsp != OBEX_RSP_SUCCESS) || (ret < 0)) ++ exitval = EXIT_FAILURE; ++ ++ if (exitval == EXIT_SUCCESS) ++ printf("PUT successful\n"); ++ else ++ printf("PUT failed\n"); ++ } ++// sleep(1); ++ return exitval; ++} +--- /dev/null 2003-01-30 11:24:37.000000000 +0100 ++++ openobex-apps-1.0.0/src/obex_push.1 2003-06-04 17:05:59.000000000 +0200 +@@ -0,0 +1,39 @@ ++.TH OBEX_PUSH 1 "04 June 2003" "1.0.0" "openobex-apps" ++.SH NAME ++obex_push \- Push and Receive Files over the Bluetooth OBEX Push Channel ++.SH SYNOPSIS ++obex_push \fI[\fR\fB\fR\fI] \fI[\fR\fB \fR\fI] ++.SH DESCRIPTION ++obex_push can send and receive files over the Bluetooth OBEX Push Channel. ++.PP ++To configure your bluetooth device, you should do the following: ++.PP ++Add modules into /etc/modules.conf: ++.PP ++.RS ++.nf ++alias net-pf-31 bluez ++alias bt-proto-0 l2cap ++alias bt-proto-2 sco ++alias bt-proto-3 rfcomm ++.fi ++.RE ++.PP ++Link your bluetooth device with your computer. ++.PP ++You can see the SDP services with: ++.PP ++$ sdptool browse ++.PP ++.SH OPTIONS ++If no options are given, any files sent over bluetooth will be received over channel 10 and stored in /tmp. ++.PP ++If \fI\fR and \fI\fR are given, the file will be send to the device specified with \fI\fR. ++.TP ++\fI\fR - The bluetooth channel to use. Lookup the OBEX Push channel with sdptool browse . ++.TP ++\fI\fR - The bluetooth address of the device to send to. ++.TP ++\fI\fR - The file to send. ++.SH AUTHOR ++Harald Hoyer \fI\fR diff --git a/openobex-apps-flush.patch b/openobex-apps-flush.patch new file mode 100644 index 0000000..5fccf57 --- /dev/null +++ b/openobex-apps-flush.patch @@ -0,0 +1,10 @@ +--- openobex-apps-1.0.0/apps/obex_put_common.c.flush 2004-09-21 15:46:27.797739136 +0200 ++++ openobex-apps-1.0.0/apps/obex_put_common.c 2004-09-21 15:46:46.885837304 +0200 +@@ -167,6 +167,7 @@ + switch (event) { + case OBEX_EV_PROGRESS: + printf("."); ++ fflush(stdout); + break; + case OBEX_EV_REQDONE: + printf("\n"); diff --git a/openobex.spec b/openobex.spec index d6507d7..828913e 100644 --- a/openobex.spec +++ b/openobex.spec @@ -13,7 +13,7 @@ Patch4: openobex-apps-push.patch BuildRoot: %{_tmppath}/%{name}-root BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed -BuildRequires: automake autoconf +BuildRequires: automake autoconf libtool ExcludeArch: s390 s390x %description diff --git a/sources b/sources index d71e481..145446c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c93327b636333d58e1d6ac362970ac21 openobex-1.1.tar.gz +c92746ae7bd69255c2c41f51e9349c65 openobex-1.2.tar.gz