Attachment #161524 for bug #195147

Lines 18-25 Link Here

(-)Makefile (-1 / +3 lines)
18		18
19	CONFLICTS= gammu-devel-[1-9]* gammu-python-[1-9]*	19	CONFLICTS= gammu-devel-[1-9]* gammu-python-[1-9]*
20		20
21	OPTIONS_DEFINE= BASH	21	OPTIONS_DEFINE= BASH MYSQL
22		22
		23	MYSQL_USE= mysql=yes
		24
23	CMAKE_ARGS+= -DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata	25	CMAKE_ARGS+= -DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
24		26
25	USES= cmake gettext pkgconfig python shebangfix	27	USES= cmake gettext pkgconfig python shebangfix

Lines 1-6 Link Here

(-)files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2011-12-21 17:25:37.000000000 +0400	1	--- CMakeLists.txt.orig 2013-05-29 09:49:13 UTC
2	+++ CMakeLists.txt 2011-12-23 14:57:04.447118270 +0400	2	+++ CMakeLists.txt
3	@@ -120,7 +120,7 @@	3	@@ -120,7 +120,7 @@ check_symbol_exists (getpwnam "pwd.h" HA
4	check_symbol_exists (getgrnam "grp.h" HAVE_GETGRNAM)	4	check_symbol_exists (getgrnam "grp.h" HAVE_GETGRNAM)
5	check_symbol_exists (getpwuid "pwd.h" HAVE_GETPWUID)	5	check_symbol_exists (getpwuid "pwd.h" HAVE_GETPWUID)
6	check_symbol_exists (getuid "unistd.h" HAVE_GETUID)	6	check_symbol_exists (getuid "unistd.h" HAVE_GETUID)
Lines 9-15 Link Here
9	check_symbol_exists (setuid "unistd.h" HAVE_SETUID)	9	check_symbol_exists (setuid "unistd.h" HAVE_SETUID)
10	check_symbol_exists (setgid "unistd.h" HAVE_SETGID)	10	check_symbol_exists (setgid "unistd.h" HAVE_SETGID)
11	check_symbol_exists (SIGHUP "signal.h" HAVE_SIGHUP)	11	check_symbol_exists (SIGHUP "signal.h" HAVE_SIGHUP)
12	@@ -656,7 +656,7 @@ mark_as_advanced (INSTALL_DATA_DIR)	12	@@ -637,7 +637,7 @@ mark_as_advanced (INSTALL_DATA_DIR)
13	set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")	13	set (INSTALL_DOC_DIR "share/doc/gammu" CACHE STRING "Path for documentation installation")
14	mark_as_advanced (INSTALL_DOC_DIR)	14	mark_as_advanced (INSTALL_DOC_DIR)
15		15




--- 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));

Lines 1-11 Link Here

(-)files/patch-common.device.devfunc.c (-11 lines)
1	--- libgammu/device/devfunc.c.orig 2010-07-12 15:51:05.000000000 +0400
2	+++ libgammu/device/devfunc.c 2011-01-28 13:21:17.938543134 +0300
3	@@ -15,6 +15,8 @@
4	#include <string.h>
5	#include <fcntl.h>
6	#include <stdlib.h>
7	+#include <sys/stat.h>
8	+#include <sys/socket.h>
9	#ifdef WIN32
10	# include <winsock2.h>
11	# include <io.h>

Lines 1-10 Link Here

(-)files/patch-common.service.gsmmisc.c (-10 lines)
1	--- libgammu/service/gsmmisc.c.orig 2010-07-12 15:51:05.000000000 +0400
2	+++ libgammu/service/gsmmisc.c 2011-01-28 13:21:17.940543932 +0300
3	@@ -5,6 +5,7 @@
4	#include <string.h>
5	#include <stdlib.h>
6	#include <sys/stat.h>
7	+#include <sys/socket.h>
8
9	#include <gammu-keys.h>
10	#include <gammu-debug.h>




--- 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));

Line 0 Link Here

(-)files/patch-libgammu_device_devfunc.c (+11 lines)
	1	--- libgammu/device/devfunc.c.orig 2013-05-29 09:49:14 UTC
	2	+++ libgammu/device/devfunc.c
	3	@@ -15,6 +15,8 @@
	4	#include <string.h>
	5	#include <fcntl.h>
	6	#include <stdlib.h>
	7	+#include <sys/stat.h>
	8	+#include <sys/socket.h>
	9	#ifdef WIN32
	10	# include <winsock2.h>
	11	# include <io.h>

Line 0 Link Here

(-)files/patch-libgammu_service_gsmmisc.c (+10 lines)
	1	--- libgammu/service/gsmmisc.c.orig 2013-05-29 09:49:14 UTC
	2	+++ libgammu/service/gsmmisc.c
	3	@@ -5,6 +5,7 @@
	4	#include <string.h>
	5	#include <stdlib.h>
	6	#include <sys/stat.h>
	7	+#include <sys/socket.h>
	8
	9	#include <gammu-keys.h>
	10	#include <gammu-debug.h>

Return to bug 195147

Lines 1-66 Link Here

(-)files/patch-bluetooth (-66 lines)
1	--- libgammu/device/bluetoth/bluez.c.orig 2011-12-21 17:25:37.000000000 +0400
2	+++ libgammu/device/bluetoth/bluez.c 2011-12-23 15:05:14.498122134 +0400
3	@@ -23,6 +23,8 @@
4	#ifdef GSM_ENABLE_BLUETOOTHDEVICE
5	#ifdef BLUEZ_FOUND
6
7	+#define BDADDR_ANY NG_HCI_BDADDR_ANY
8	+
9	#include <stdlib.h>
10	#include <stdio.h>
11	#include <fcntl.h>
12	@@ -31,11 +33,7 @@
13	#include <sys/socket.h>
14	#include <sys/time.h>
15	#include <unistd.h>
16	-#include <bluetooth/bluetooth.h>
17	-#include <bluetooth/rfcomm.h>
18	-#include <bluetooth/sdp.h>
19	-#include <bluetooth/sdp_lib.h>
20	-#include <bluetooth/hci_lib.h>
21	+#include <bluetooth.h>
22
23	#include "../../gsmcomon.h"
24	#include "../devfunc.h"
25	@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac
26	/* Some phones need time till they are accessible after SDP browsing */
27	for (tries = 0; tries < 5; tries++) {
28	GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
29	- struct sockaddr_rc laddr, raddr;
30	+ struct sockaddr_rfcomm laddr, raddr;
31	bdaddr_t bdaddr;
32	int fd;
33
34	@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
35
36	smprintf(s, "Connecting to RF channel %i\n", port);
37
38	- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
39	+ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
40	if (fd < 0) {
41	smprintf(s, "Can't create socket\n");
42	continue;
43	}
44
45	- bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
46	- laddr.rc_family = AF_BLUETOOTH;
47	- laddr.rc_channel = 0;
48	+ bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
49	+ laddr.rfcomm_family = AF_BLUETOOTH;
50	+ laddr.rfcomm_channel = 0;
51
52	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
53	smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
54	@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
55	}
56
57	str2ba(device, &bdaddr);
58	- bacpy(&raddr.rc_bdaddr, &bdaddr);
59	- raddr.rc_family = AF_BLUETOOTH;
60	- raddr.rc_channel = port;
61	+ bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
62	+ raddr.rfcomm_family = AF_BLUETOOTH;
63	+ raddr.rfcomm_channel = port;
64
65	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
66	smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));

Line 0 Link Here

(-)files/patch-libgammu_device_bluetoth_bluez.c (+66 lines)
		1	--- libgammu/device/bluetoth/bluez.c.orig 2013-05-29 09:49:14 UTC
		2	+++ libgammu/device/bluetoth/bluez.c
		3	@@ -23,6 +23,8 @@
		4	#ifdef GSM_ENABLE_BLUETOOTHDEVICE
		5	#ifdef BLUEZ_FOUND
		6
		7	+#define BDADDR_ANY NG_HCI_BDADDR_ANY
		8	+
		9	#include <stdlib.h>
		10	#include <stdio.h>
		11	#include <fcntl.h>
		12	@@ -31,11 +33,7 @@
		13	#include <sys/socket.h>
		14	#include <sys/time.h>
		15	#include <unistd.h>
		16	-#include <bluetooth/bluetooth.h>
		17	-#include <bluetooth/rfcomm.h>
		18	-#include <bluetooth/sdp.h>
		19	-#include <bluetooth/sdp_lib.h>
		20	-#include <bluetooth/hci_lib.h>
		21	+#include <bluetooth.h>
		22
		23	#include "../../gsmcomon.h"
		24	#include "../devfunc.h"
		25	@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac
		26	/* Some phones need time till they are accessible after SDP browsing */
		27	for (tries = 0; tries < 5; tries++) {
		28	GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
		29	- struct sockaddr_rc laddr, raddr;
		30	+ struct sockaddr_rfcomm laddr, raddr;
		31	bdaddr_t bdaddr;
		32	int fd;
		33
		34	@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
		35
		36	smprintf(s, "Connecting to RF channel %i\n", port);
		37
		38	- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
		39	+ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
		40	if (fd < 0) {
		41	smprintf(s, "Can't create socket\n");
		42	continue;
		43	}
		44
		45	- bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
		46	- laddr.rc_family = AF_BLUETOOTH;
		47	- laddr.rc_channel = 0;
		48	+ bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
		49	+ laddr.rfcomm_family = AF_BLUETOOTH;
		50	+ laddr.rfcomm_channel = 0;
		51
		52	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
		53	smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
		54	@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
		55	}
		56
		57	str2ba(device, &bdaddr);
		58	- bacpy(&raddr.rc_bdaddr, &bdaddr);
		59	- raddr.rc_family = AF_BLUETOOTH;
		60	- raddr.rc_channel = port;
		61	+ bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
		62	+ raddr.rfcomm_family = AF_BLUETOOTH;
		63	+ raddr.rfcomm_channel = port;
		64
65	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
66	smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));