Attachment 161524 Details for Bug 195147 – gammu mysql patch

[patch] gammu mysql patch

gammu-1.33.0-mysql.diff (text/plain), 9.30 KB, created by Lukasz Wasikowski on 2015-09-29 12:16:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukasz Wasikowski

Created: 2015-09-29 12:16:51 UTC

Size: 9.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398170)
>+++ Makefile	(working copy)
>@@ -18,8 +18,10 @@
> 
> CONFLICTS=	gammu-devel-[1-9]* gammu-python-[1-9]*
> 
>-OPTIONS_DEFINE=	BASH
>+OPTIONS_DEFINE=	BASH MYSQL
> 
>+MYSQL_USE=	mysql=yes
>+
> CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
> 
> USES=		cmake gettext pkgconfig python shebangfix
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 398170)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2011-12-21 17:25:37.000000000 +0400
>-+++ CMakeLists.txt	2011-12-23 14:57:04.447118270 +0400
>-@@ -120,7 +120,7 @@
>+--- CMakeLists.txt.orig	2013-05-29 09:49:13 UTC
>++++ CMakeLists.txt
>+@@ -120,7 +120,7 @@ check_symbol_exists (getpwnam "pwd.h" HA
>  check_symbol_exists (getgrnam "grp.h" HAVE_GETGRNAM)
>  check_symbol_exists (getpwuid "pwd.h" HAVE_GETPWUID)
>  check_symbol_exists (getuid "unistd.h" HAVE_GETUID)
>@@ -9,7 +9,7 @@
>  check_symbol_exists (setuid "unistd.h" HAVE_SETUID)
>  check_symbol_exists (setgid "unistd.h" HAVE_SETGID)
>  check_symbol_exists (SIGHUP "signal.h" HAVE_SIGHUP)
>-@@ -656,7 +656,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
>+@@ -637,7 +637,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
>  set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
>  mark_as_advanced (INSTALL_DOC_DIR)
>  
>Index: files/patch-bluetooth
>===================================================================
>--- files/patch-bluetooth	(revision 398170)
>+++ files/patch-bluetooth	(working copy)
>@@ -1,66 +0,0 @@
>---- libgammu/device/bluetoth/bluez.c.orig	2011-12-21 17:25:37.000000000 +0400
>-+++ libgammu/device/bluetoth/bluez.c	2011-12-23 15:05:14.498122134 +0400
>-@@ -23,6 +23,8 @@
>- #ifdef GSM_ENABLE_BLUETOOTHDEVICE
>- #ifdef BLUEZ_FOUND
>- 
>-+#define BDADDR_ANY NG_HCI_BDADDR_ANY
>-+
>- #include <stdlib.h>
>- #include <stdio.h>
>- #include <fcntl.h>
>-@@ -31,11 +33,7 @@
>- #include <sys/socket.h>
>- #include <sys/time.h>
>- #include <unistd.h>
>--#include <bluetooth/bluetooth.h>
>--#include <bluetooth/rfcomm.h>
>--#include <bluetooth/sdp.h>
>--#include <bluetooth/sdp_lib.h>
>--#include <bluetooth/hci_lib.h>
>-+#include <bluetooth.h>
>- 
>- #include "../../gsmcomon.h"
>- #include "../devfunc.h"
>-@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac
>- 	/* Some phones need time till they are accessible after SDP browsing */
>- 	for (tries = 0; tries < 5; tries++) {
>- 		GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
>--		struct sockaddr_rc 		laddr, raddr;
>-+		struct sockaddr_rfcomm 		laddr, raddr;
>- 		bdaddr_t			bdaddr;
>- 		int 				fd;
>- 
>-@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
>- 
>- 		smprintf(s, "Connecting to RF channel %i\n", port);
>- 
>--		fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
>-+		fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
>- 		if (fd < 0) {
>- 			smprintf(s, "Can't create socket\n");
>- 			continue;
>- 		}
>- 
>--		bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
>--		laddr.rc_family 	= AF_BLUETOOTH;
>--		laddr.rc_channel 	= 0;
>-+		bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
>-+		laddr.rfcomm_family 	= AF_BLUETOOTH;
>-+		laddr.rfcomm_channel 	= 0;
>- 
>- 		if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
>- 			smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
>-@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
>- 		}
>- 
>- 		str2ba(device, &bdaddr);
>--		bacpy(&raddr.rc_bdaddr, &bdaddr);
>--		raddr.rc_family = AF_BLUETOOTH;
>--		raddr.rc_channel = port;
>-+		bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
>-+		raddr.rfcomm_family = AF_BLUETOOTH;
>-+		raddr.rfcomm_channel = port;
>- 
>- 		if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
>- 			smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
>Index: files/patch-common.device.devfunc.c
>===================================================================
>--- files/patch-common.device.devfunc.c	(revision 398170)
>+++ files/patch-common.device.devfunc.c	(working copy)
>@@ -1,11 +0,0 @@
>---- libgammu/device/devfunc.c.orig	2010-07-12 15:51:05.000000000 +0400
>-+++ libgammu/device/devfunc.c	2011-01-28 13:21:17.938543134 +0300
>-@@ -15,6 +15,8 @@
>- #include <string.h>
>- #include <fcntl.h>
>- #include <stdlib.h>
>-+#include <sys/stat.h>
>-+#include <sys/socket.h>
>- #ifdef WIN32
>- #  include <winsock2.h>
>- #  include <io.h>
>Index: files/patch-common.service.gsmmisc.c
>===================================================================
>--- files/patch-common.service.gsmmisc.c	(revision 398170)
>+++ files/patch-common.service.gsmmisc.c	(working copy)
>@@ -1,10 +0,0 @@
>---- libgammu/service/gsmmisc.c.orig	2010-07-12 15:51:05.000000000 +0400
>-+++ libgammu/service/gsmmisc.c	2011-01-28 13:21:17.940543932 +0300
>-@@ -5,6 +5,7 @@
>- #include <string.h>
>- #include <stdlib.h>
>- #include <sys/stat.h>
>-+#include <sys/socket.h>
>- 
>- #include <gammu-keys.h>
>- #include <gammu-debug.h>
>Index: files/patch-libgammu_device_bluetoth_bluez.c
>===================================================================
>--- files/patch-libgammu_device_bluetoth_bluez.c	(revision 0)
>+++ files/patch-libgammu_device_bluetoth_bluez.c	(working copy)
>@@ -0,0 +1,66 @@
>+--- libgammu/device/bluetoth/bluez.c.orig	2013-05-29 09:49:14 UTC
>++++ libgammu/device/bluetoth/bluez.c
>+@@ -23,6 +23,8 @@
>+ #ifdef GSM_ENABLE_BLUETOOTHDEVICE
>+ #ifdef BLUEZ_FOUND
>+ 
>++#define BDADDR_ANY NG_HCI_BDADDR_ANY
>++
>+ #include <stdlib.h>
>+ #include <stdio.h>
>+ #include <fcntl.h>
>+@@ -31,11 +33,7 @@
>+ #include <sys/socket.h>
>+ #include <sys/time.h>
>+ #include <unistd.h>
>+-#include <bluetooth/bluetooth.h>
>+-#include <bluetooth/rfcomm.h>
>+-#include <bluetooth/sdp.h>
>+-#include <bluetooth/sdp_lib.h>
>+-#include <bluetooth/hci_lib.h>
>++#include <bluetooth.h>
>+ 
>+ #include "../../gsmcomon.h"
>+ #include "../devfunc.h"
>+@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac
>+ 	/* Some phones need time till they are accessible after SDP browsing */
>+ 	for (tries = 0; tries < 5; tries++) {
>+ 		GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
>+-		struct sockaddr_rc 		laddr, raddr;
>++		struct sockaddr_rfcomm 		laddr, raddr;
>+ 		bdaddr_t			bdaddr;
>+ 		int 				fd;
>+ 
>+@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
>+ 
>+ 		smprintf(s, "Connecting to RF channel %i\n", port);
>+ 
>+-		fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
>++		fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
>+ 		if (fd < 0) {
>+ 			smprintf(s, "Can't create socket\n");
>+ 			continue;
>+ 		}
>+ 
>+-		bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
>+-		laddr.rc_family 	= AF_BLUETOOTH;
>+-		laddr.rc_channel 	= 0;
>++		bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
>++		laddr.rfcomm_family 	= AF_BLUETOOTH;
>++		laddr.rfcomm_channel 	= 0;
>+ 
>+ 		if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
>+ 			smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
>+@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
>+ 		}
>+ 
>+ 		str2ba(device, &bdaddr);
>+-		bacpy(&raddr.rc_bdaddr, &bdaddr);
>+-		raddr.rc_family = AF_BLUETOOTH;
>+-		raddr.rc_channel = port;
>++		bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
>++		raddr.rfcomm_family = AF_BLUETOOTH;
>++		raddr.rfcomm_channel = port;
>+ 
>+ 		if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
>+ 			smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
>
>Property changes on: files/patch-libgammu_device_bluetoth_bluez.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-libgammu_device_devfunc.c
>===================================================================
>--- files/patch-libgammu_device_devfunc.c	(revision 0)
>+++ files/patch-libgammu_device_devfunc.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- libgammu/device/devfunc.c.orig	2013-05-29 09:49:14 UTC
>++++ libgammu/device/devfunc.c
>+@@ -15,6 +15,8 @@
>+ #include <string.h>
>+ #include <fcntl.h>
>+ #include <stdlib.h>
>++#include <sys/stat.h>
>++#include <sys/socket.h>
>+ #ifdef WIN32
>+ #  include <winsock2.h>
>+ #  include <io.h>
>
>Property changes on: files/patch-libgammu_device_devfunc.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-libgammu_service_gsmmisc.c
>===================================================================
>--- files/patch-libgammu_service_gsmmisc.c	(revision 0)
>+++ files/patch-libgammu_service_gsmmisc.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- libgammu/service/gsmmisc.c.orig	2013-05-29 09:49:14 UTC
>++++ libgammu/service/gsmmisc.c
>+@@ -5,6 +5,7 @@
>+ #include <string.h>
>+ #include <stdlib.h>
>+ #include <sys/stat.h>
>++#include <sys/socket.h>
>+ 
>+ #include <gammu-keys.h>
>+ #include <gammu-debug.h>
>
>Property changes on: files/patch-libgammu_service_gsmmisc.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 195147: 149559 | 161266 | 161267 | 161268 | 161269 | 161524 | 161525 | 161526 | 161527 | 161528 | 161529