Date: Sat, 3 Oct 2009 11:45:20 GMT From: Alexander Logvinov <avl@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/139327: [PATCH] palm/synce-librapi2: update to 0.14 Message-ID: <200910031145.n93BjK4h054350@www.freebsd.org> Resent-Message-ID: <200910031150.n93Bo2uc024572@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 139327
>Category: ports
>Synopsis: [PATCH] palm/synce-librapi2: update to 0.14
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 03 11:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alexander Logvinov
>Release: 7.2-STABLE i386
>Organization:
>Environment:
>Description:
Update to 0.14.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/palm/synce-librapi2/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 22 Aug 2009 00:34:29 -0000 1.25
+++ Makefile 3 Oct 2009 11:38:16 -0000
@@ -5,9 +5,9 @@
# $FreeBSD: ports/palm/synce-librapi2/Makefile,v 1.25 2009/08/22 00:34:29 amdmi3 Exp $
PORTNAME= librapi2
-PORTVERSION= 0.13.1
+PORTVERSION= 0.14
CATEGORIES?= palm
-MASTER_SITES= SF/synce/SynCE/0.13
+MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
PKGNAMEPREFIX?= synce-
MAINTAINER= webmaster@kibab.com
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/palm/synce-librapi2/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 20 Mar 2009 23:20:55 -0000 1.10
+++ distinfo 3 Oct 2009 11:38:16 -0000
@@ -1,3 +1,3 @@
-MD5 (librapi2-0.13.1.tar.gz) = f44ca31d8a8cd44e9eb517b35ed87419
-SHA256 (librapi2-0.13.1.tar.gz) = c3eac5062bcbe1896a74b33511fc050f9a9ad8ed48360a0f491006877079ea9c
-SIZE (librapi2-0.13.1.tar.gz) = 464141
+MD5 (librapi2-0.14.tar.gz) = cffa19b32817db211ee21e1ac7c7eb5f
+SHA256 (librapi2-0.14.tar.gz) = 0a747b6f5c14921e2fc7b55a74f192274ddeef53d00056a84729319d48fe20bf
+SIZE (librapi2-0.14.tar.gz) = 493763
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/palm/synce-librapi2/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 27 Jul 2008 14:28:19 -0000 1.6
+++ pkg-plist 3 Oct 2009 11:38:16 -0000
@@ -10,6 +10,7 @@
bin/pshortcut
bin/pstatus
bin/rapiconfig
+bin/synce-database
bin/synce-install-cab
bin/synce-list-programs
bin/synce-registry
Index: files/patch-rapi_context.c
===================================================================
RCS file: files/patch-rapi_context.c
diff -N files/patch-rapi_context.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-rapi_context.c 3 Oct 2009 11:38:16 -0000
@@ -0,0 +1,24 @@
+--- 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;
Index: files/patch-src-rapi2-file_management2.c
===================================================================
RCS file: files/patch-src-rapi2-file_management2.c
diff -N files/patch-src-rapi2-file_management2.c
--- files/patch-src-rapi2-file_management2.c 26 Jan 2007 00:46:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- 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);
Index: files/patch-src_rapi_invoke.c
===================================================================
RCS file: files/patch-src_rapi_invoke.c
diff -N files/patch-src_rapi_invoke.c
--- files/patch-src_rapi_invoke.c 26 Jan 2007 00:46:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- src/rapi/invoke.c.orig Fri Jan 26 01:58:51 2007
-+++ src/rapi/invoke.c Fri Jan 26 01:59:15 2007
-@@ -1,6 +1,7 @@
- /* $Id: invoke.c 2355 2006-04-07 18:47:20Z voc $ */
- #include "rapi_api.h"
- #include "rapi_context.h"
-+#include <sys/socket.h>
- #include <assert.h>
- #include <stdlib.h>
-
Index: files/patch-tests-CeRapiInvoke-Makefile.in
===================================================================
RCS file: files/patch-tests-CeRapiInvoke-Makefile.in
diff -N files/patch-tests-CeRapiInvoke-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-tests-CeRapiInvoke-Makefile.in 3 Oct 2009 11:38:16 -0000
@@ -0,0 +1,10 @@
+--- tests/CeRapiInvoke/Makefile.in 2009-07-16 13:44:55.000000000 +0400
++++ tests/CeRapiInvoke/Makefile.in 2009-07-27 15:17:24.000000000 +0400
+@@ -227,6 +227,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CXXFLAGS = @LIBSYNCE_CFLAGS@ -Wall
++AM_CFLAGS= @LIBSYNCE_CFLAGS@ -Wall
+ AM_LDFLAGS = @LIBSYNCE_LIBS@
+ INCLUDES = -I$(top_srcdir)/src
+ CeRapiInvoke_SOURCES = CeRapiInvoke.cc ../../tools/pcommon.c
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910031145.n93BjK4h054350>