[arch-commits] Commit in ussp-push/trunk (3 files)

[Sergej Pupykin]

    Date: Tuesday, May 28, 2013 @ 13:24:33
  Author: spupykin
Revision: 91804

upgpkg: ussp-push 0.11-6

upd

Added:
  ussp-push/trunk/build-fix.patch
    (from rev 91803, ussp-push/trunk/ussp-push-remote-name.patch)
Modified:
  ussp-push/trunk/PKGBUILD
Deleted:
  ussp-push/trunk/ussp-push-remote-name.patch

-----------------------------+
 PKGBUILD                    |    6 +--
 build-fix.patch             |   66 ++++++++++++++++++++++++++++++++++++++++++
 ussp-push-remote-name.patch |   66 ------------------------------------------
 3 files changed, 69 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-28 11:21:14 UTC (rev 91803)
+++ PKGBUILD	2013-05-28 11:24:33 UTC (rev 91804)
@@ -12,13 +12,13 @@
 url="http://xmailserver.org/ussp-push.html"
 depends=('openobex')
 source=(http://xmailserver.org/$pkgname-$pkgver.tar.gz
-	ussp-push-remote-name.patch)
+	build-fix.patch)
 md5sums=('5c44983ee27809867041feff6bb4423a'
-         'bcd29432ac8fc8b2aa979fb22cabd5a6')
+         'b9020ea9bb34b811206366b407f5e3cd')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/ussp-push-remote-name.patch
+  patch -p1 <$srcdir/build-fix.patch
 }
 
 build() {

Copied: ussp-push/trunk/build-fix.patch (from rev 91803, ussp-push/trunk/ussp-push-remote-name.patch)
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2013-05-28 11:24:33 UTC (rev 91804)
@@ -0,0 +1,66 @@
+diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c
+--- ussp-push-0.11.old/src/obex_socket.c	2009-05-15 11:03:34.904797689 +0200
++++ ussp-push-0.11/src/obex_socket.c	2009-05-15 11:03:45.599797286 +0200
+@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
+ 	for (i = 0; i < niinf; i++) {
+ 		char devname[128];
+ 
+-		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
++		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
+ 				    devname, 100000) >= 0) {
+ 			if (strcasecmp(devname, btname) == 0) {
+ 				*btaddr = piinf[i].bdaddr;
+diff -wbBur ussp-push-0.11/src/obex_main.c ussp-push-0.11.q/src/obex_main.c
+--- ussp-push-0.11/src/obex_main.c	2008-08-25 00:48:53.000000000 +0400
++++ ussp-push-0.11.q/src/obex_main.c	2013-05-27 14:13:06.533474671 +0400
+@@ -85,41 +85,6 @@
+ int bt_debug;
+ 
+ 
+-
+-/*
+- * These two functions are from affix/profiles/obex/obex_io.c
+- */
+-int get_filesize(const char *filename)
+-{
+-	struct stat stats;
+-
+-	stat(filename, &stats);
+-	return (int) stats.st_size;
+-}
+-
+-uint8_t *easy_readfile(const char *filename, int *file_size)
+-{
+-	int actual;
+-	int fd;
+-	uint8_t *buf;
+-
+-	fd = open(filename, O_RDONLY, 0);
+-	if (fd == -1) {
+-		return NULL;
+-	}
+-	*file_size = get_filesize(filename);
+-	printf("name=%s, size=%d\n", filename, *file_size);
+-	if (!(buf = malloc(*file_size))) {
+-		return NULL;
+-	}
+-
+-	actual = read(fd, buf, *file_size);
+-	close(fd);
+-
+-	*file_size = actual;
+-	return buf;
+-}
+-
+ /*
+  * This function comes from affix/profiles/obex/obex_client.c .. All I changed
+  * was a BTERROR() macro.  The OBEX_HandleInput() calls inside the loop should
+@@ -197,7 +197,7 @@
+ 		*err = -1;
+ 		return NULL;
+ 	}
+-	if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) {
++	if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) {
+ 		BTERROR("OBEX_Init failed: %s\n", strerror(errno));
+ 		obex_free(gt);
+ 		*err = -1;

Deleted: ussp-push-remote-name.patch
===================================================================
--- ussp-push-remote-name.patch	2013-05-28 11:21:14 UTC (rev 91803)
+++ ussp-push-remote-name.patch	2013-05-28 11:24:33 UTC (rev 91804)
@@ -1,66 +0,0 @@
-diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c
---- ussp-push-0.11.old/src/obex_socket.c	2009-05-15 11:03:34.904797689 +0200
-+++ ussp-push-0.11/src/obex_socket.c	2009-05-15 11:03:45.599797286 +0200
-@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
- 	for (i = 0; i < niinf; i++) {
- 		char devname[128];
- 
--		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
-+		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
- 				    devname, 100000) >= 0) {
- 			if (strcasecmp(devname, btname) == 0) {
- 				*btaddr = piinf[i].bdaddr;
-diff -wbBur ussp-push-0.11/src/obex_main.c ussp-push-0.11.q/src/obex_main.c
---- ussp-push-0.11/src/obex_main.c	2008-08-25 00:48:53.000000000 +0400
-+++ ussp-push-0.11.q/src/obex_main.c	2013-05-27 14:13:06.533474671 +0400
-@@ -197,7 +197,7 @@
- 		*err = -1;
- 		return NULL;
- 	}
--	if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) {
-+	if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) {
- 		BTERROR("OBEX_Init failed: %s\n", strerror(errno));
- 		obex_free(gt);
- 		*err = -1;
-@@ -85,41 +85,6 @@
- int bt_debug;
- 
- 
--
--/*
-- * These two functions are from affix/profiles/obex/obex_io.c
-- */
--int get_filesize(const char *filename)
--{
--	struct stat stats;
--
--	stat(filename, &stats);
--	return (int) stats.st_size;
--}
--
--uint8_t *easy_readfile(const char *filename, int *file_size)
--{
--	int actual;
--	int fd;
--	uint8_t *buf;
--
--	fd = open(filename, O_RDONLY, 0);
--	if (fd == -1) {
--		return NULL;
--	}
--	*file_size = get_filesize(filename);
--	printf("name=%s, size=%d\n", filename, *file_size);
--	if (!(buf = malloc(*file_size))) {
--		return NULL;
--	}
--
--	actual = read(fd, buf, *file_size);
--	close(fd);
--
--	*file_size = actual;
--	return buf;
--}
--
- /*
-  * This function comes from affix/profiles/obex/obex_client.c .. All I changed
-  * was a BTERROR() macro.  The OBEX_HandleInput() calls inside the loop should