Attachment #100080 for bug #139327

View | Details | Raw Unified | Return to bug 139327
Collapse All | Expand All

Lines 5-13 Link Here

(-)Makefile (-2 / +2 lines)
5	# $FreeBSD: ports/palm/synce-librapi2/Makefile,v 1.25 2009/08/22 00:34:29 amdmi3 Exp $	5	# $FreeBSD: ports/palm/synce-librapi2/Makefile,v 1.25 2009/08/22 00:34:29 amdmi3 Exp $
6		6
7	PORTNAME= librapi2	7	PORTNAME= librapi2
8	PORTVERSION= 0.13.1	8	PORTVERSION= 0.14
9	CATEGORIES?= palm	9	CATEGORIES?= palm
10	MASTER_SITES= SF/synce/SynCE/0.13	10	MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
11	PKGNAMEPREFIX?= synce-	11	PKGNAMEPREFIX?= synce-
12		12
13	MAINTAINER= webmaster@kibab.com	13	MAINTAINER= webmaster@kibab.com

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (librapi2-0.13.1.tar.gz) = f44ca31d8a8cd44e9eb517b35ed87419	1	MD5 (librapi2-0.14.tar.gz) = cffa19b32817db211ee21e1ac7c7eb5f
2	SHA256 (librapi2-0.13.1.tar.gz) = c3eac5062bcbe1896a74b33511fc050f9a9ad8ed48360a0f491006877079ea9c	2	SHA256 (librapi2-0.14.tar.gz) = 0a747b6f5c14921e2fc7b55a74f192274ddeef53d00056a84729319d48fe20bf
3	SIZE (librapi2-0.13.1.tar.gz) = 464141	3	SIZE (librapi2-0.14.tar.gz) = 493763

Lines 10-15 Link Here

(-)pkg-plist (+1 lines)
10	bin/pshortcut	10	bin/pshortcut
11	bin/pstatus	11	bin/pstatus
12	bin/rapiconfig	12	bin/rapiconfig
		13	bin/synce-database
13	bin/synce-install-cab	14	bin/synce-install-cab
14	bin/synce-list-programs	15	bin/synce-list-programs
15	bin/synce-registry	16	bin/synce-registry




--- src/support/rapi_context.c	2009-07-27 13:25:07.000000000 +0400
+++ src/support/rapi_context.c	2009-07-27 13:26:52.000000000 +0400
@@ -513,13 +513,19 @@
         /*
          *  odccm, synce-hal, or proxy ?
          */
+#if ENABLE_ODCCM_SUPPORT
         if (strcmp(transport, "odccm") == 0) {
             synce_socket_take_descriptor(context->socket, get_connection_from_odccm(info));
         }
-        else if (strcmp(transport, "hal") == 0) {
+        else
+#endif
+#if ENABLE_HAL_SUPPORT
+        if (strcmp(transport, "hal") == 0) {
             synce_socket_take_descriptor(context->socket, get_connection_from_hal(info));
         }
-        else if ( !synce_socket_connect_proxy(context->socket, synce_info_get_device_ip(info)) )
+        else
+#endif
+	if ( !synce_socket_connect_proxy(context->socket, synce_info_get_device_ip(info)) )
         {
             synce_error("failed to connect to proxy for %s", synce_info_get_device_ip(info));
             goto fail;




--- src/rapi2/file_management2.c.orig	Fri Jan 26 02:12:41 2007
+++ src/rapi2/file_management2.c	Fri Jan 26 02:13:40 2007
@@ -40,6 +40,7 @@
 {
     RapiContext* context = rapi_context_current();
     uint32_t count = 0;
+    uint32_t unknown;
 
     rapi_context_begin_command(context, 0x1a);
     rapi2_buffer_write_string(context->send_buffer, szPath);
@@ -50,7 +51,7 @@
 
     /* TODO Don't know this two uint32_t fields */
     rapi_buffer_read_uint32(context->recv_buffer, &context->last_error);
-    uint32_t unknown;
+
     rapi_buffer_read_uint32(context->recv_buffer, &unknown);
 
     rapi_buffer_read_uint32(context->recv_buffer, &count);

Removed Link Here

(-)files/patch-src_rapi_invoke.c (-10 lines)
1	--- src/rapi/invoke.c.orig Fri Jan 26 01:58:51 2007
2	+++ src/rapi/invoke.c Fri Jan 26 01:59:15 2007
3	@@ -1,6 +1,7 @@
4	/* $Id: invoke.c 2355 2006-04-07 18:47:20Z voc $ */
5	#include "rapi_api.h"
6	#include "rapi_context.h"
7	+#include <sys/socket.h>
8	#include <assert.h>
9	#include <stdlib.h>
10

Added Link Here

(-)files/patch-tests-CeRapiInvoke-Makefile.in (+10 lines)
1	--- tests/CeRapiInvoke/Makefile.in 2009-07-16 13:44:55.000000000 +0400
2	+++ tests/CeRapiInvoke/Makefile.in 2009-07-27 15:17:24.000000000 +0400
3	@@ -227,6 +227,7 @@
4	top_builddir = @top_builddir@
5	top_srcdir = @top_srcdir@
6	AM_CXXFLAGS = @LIBSYNCE_CFLAGS@ -Wall
7	+AM_CFLAGS= @LIBSYNCE_CFLAGS@ -Wall
8	AM_LDFLAGS = @LIBSYNCE_LIBS@
9	INCLUDES = -I$(top_srcdir)/src
10	CeRapiInvoke_SOURCES = CeRapiInvoke.cc ../../tools/pcommon.c

Return to bug 139327

Added Link Here

(-)files/patch-rapi_context.c (+24 lines)
1	--- src/support/rapi_context.c 2009-07-27 13:25:07.000000000 +0400
2	+++ src/support/rapi_context.c 2009-07-27 13:26:52.000000000 +0400
3	@@ -513,13 +513,19 @@
4	/*
5	* odccm, synce-hal, or proxy ?
6	*/
7	+#if ENABLE_ODCCM_SUPPORT
8	if (strcmp(transport, "odccm") == 0) {
9	synce_socket_take_descriptor(context->socket, get_connection_from_odccm(info));
10	}
11	- else if (strcmp(transport, "hal") == 0) {
12	+ else
13	+#endif
14	+#if ENABLE_HAL_SUPPORT
15	+ if (strcmp(transport, "hal") == 0) {
16	synce_socket_take_descriptor(context->socket, get_connection_from_hal(info));
17	}
18	- else if ( !synce_socket_connect_proxy(context->socket, synce_info_get_device_ip(info)) )
19	+ else
20	+#endif
21	+ if ( !synce_socket_connect_proxy(context->socket, synce_info_get_device_ip(info)) )
22	{
23	synce_error("failed to connect to proxy for %s", synce_info_get_device_ip(info));
24	goto fail;

Removed Link Here

(-)files/patch-src-rapi2-file_management2.c (-19 lines)
1	--- src/rapi2/file_management2.c.orig Fri Jan 26 02:12:41 2007
2	+++ src/rapi2/file_management2.c Fri Jan 26 02:13:40 2007
3	@@ -40,6 +40,7 @@
4	{
5	RapiContext* context = rapi_context_current();
6	uint32_t count = 0;
7	+ uint32_t unknown;
8
9	rapi_context_begin_command(context, 0x1a);
10	rapi2_buffer_write_string(context->send_buffer, szPath);
11	@@ -50,7 +51,7 @@
12
13	/* TODO Don't know this two uint32_t fields */
14	rapi_buffer_read_uint32(context->recv_buffer, &context->last_error);
15	- uint32_t unknown;
16	+
17	rapi_buffer_read_uint32(context->recv_buffer, &unknown);
18
19	rapi_buffer_read_uint32(context->recv_buffer, &count);