Attachment #55010 for bug #83200

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

Lines 1-2 Link Here

(-)gammu/distinfo (-2 / +2 lines)
1	MD5 (gammu-1.00.0.tar.gz) = 9d921f9c5b6f3b8b76a69720e2d9f173	1	MD5 (gammu-1.01.0.tar.gz) = 1ae9d7d51158c9f0cb5d3b25e7e7e1e1
2	SIZE (gammu-1.00.0.tar.gz) = 850872	2	SIZE (gammu-1.01.0.tar.gz) = 860546

Lines 6-15 Link Here

(-)gammu/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= gammu	8	PORTNAME= gammu
9	PORTVERSION= 1.00.0	9	PORTVERSION= 1.01.0
10	PORTREVISION= 1
11	CATEGORIES= comms	10	CATEGORIES= comms
12	MASTER_SITES= http://www.kirill.spb.ru/gammu/	11	MASTER_SITES= http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/
13		12
14	MAINTAINER= kirill@solaris.ru	13	MAINTAINER= kirill@solaris.ru
15	COMMENT= GNU All Mobile Management Utilities	14	COMMENT= GNU All Mobile Management Utilities




diff -ru ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c
--- ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c	Thu Mar 10 10:35:58 2005
+++ common/device/bluetoth/bluez.c	Sat Jul  9 12:46:07 2005
@@ -23,6 +23,8 @@
 {
 	GSM_Error error;
 
-#ifdef BLUETOOTH_RF_SEARCHING
-	if (!mystrncasecmp(s->CurrentConfig->Connection, "bluerf", 6)) return bluetooth_findchannel(s);
-#endif
 	
 	switch (s->ConnectionType) {
 	case GCT_BLUEAT:
diff -ur common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c
--- common/device/bluetoth/bluez.c	Thu Nov 25 12:36:26 2004
+++ common/device/bluetoth/bluez.c	Thu Nov 25 12:46:56 2004
@@ -14,6 +14,8 @@
 #ifdef GSM_ENABLE_BLUETOOTHDEVICE
 #ifdef GSM_ENABLE_BLUEZ
 

 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -31,10 +33,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <unistd.h>

 
 #include "../../gsmcomon.h"
 #include "../devfunc.h"
@@ -43,21 +42,21 @@
 GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
 {
 	GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;

 
 	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
 		dbgprintf("Can't bind socket\n");
@@ -66,9 +65,9 @@
 	}
 
 	str2ba(device, &bdaddr);

Lines 1-5 Link Here

(-)gammu/files/patch-cfg-Makefile.glo (-5 / +14 lines)
1	--- cfg/Makefile.glo.orig Sat Jan 15 17:01:28 2005	1	--- ../gammu-1.01.0.orig/cfg/Makefile.glo Tue Apr 12 15:26:08 2005
2	+++ cfg/Makefile.glo Thu Mar 24 13:13:31 2005	2	+++ cfg/Makefile.glo Sat Jul 9 22:24:39 2005
3	@@ -122,7 +122,7 @@	3	@@ -122,7 +122,7 @@
4	@echo Making $<	4	@echo Making $<
5	@$(CC) -c $(CFLAGS) -I$(TOPDIR)/common/ $(CPPFLAGS) $.c -o $.o	5	@$(CC) -c $(CFLAGS) -I$(TOPDIR)/common/ $(CPPFLAGS) $.c -o $.o
Lines 9-15 Link Here
9		9
10	$(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)	10	$(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
11	@echo Linking gammu	11	@echo Linking gammu
12	@@ -227,7 +227,7 @@	12	@@ -136,7 +136,7 @@
		13
		14	$(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR): $(COMMON)
		15	@echo Linking libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR)
		16	- @$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON)
		17	+ @$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON)
		18	@$(LN) -s libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR)
		19	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(TOPDIR)/common/libGammu.so
		20
		21	@@ -230,7 +230,7 @@
13	@$(INSTALL) -m 0644 $(TOPDIR)/docs/docs/english/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)	22	@$(INSTALL) -m 0644 $(TOPDIR)/docs/docs/english/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)
14	@$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/english/gammu.1	23	@$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/english/gammu.1
15		24
Lines 18-24 Link Here
18		27
19	installonly: all	28	installonly: all
20	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)	29	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
21	@@ -244,8 +244,7 @@	30	@@ -247,8 +247,7 @@
22		31
23	@echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)	32	@echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
24	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)	33	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
Lines 28-34 Link Here
28	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so	37	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so
29		38
30	@echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)	39	@echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)
31	@@ -264,8 +263,8 @@	40	@@ -267,8 +266,8 @@
32	@$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h	41	@$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h
33		42
34	@echo Installing pkgconfig file	43	@echo Installing pkgconfig file




--- ../gammu-1.01.0.orig/cfg/autoconf/configure.in	Tue Mar  8 19:16:22 2005
+++ cfg/autoconf/configure.in	Sat Jul  9 12:51:12 2005
@@ -185,17 +185,17 @@
      fi
      if test "$gsm_blue_stack" = unknown ; then
          AC_CHECK_HEADERS(bluetooth/bluetooth.h, 
-                 [gsm_blue_stack=Bluez
+                 [gsm_blue_stack=FreeBSD
                  LDLIBS="$LDLIBS -lbluetooth"
                  AC_CHECK_LIB(sdp, sdp_list_append, LDLIBS="$LDLIBS -lsdp")
                  AC_DEFINE(GSM_ENABLE_BLUEZ)

              [ if test x$withval = xyes; then
                      AC_MSG_WARN(Usage is: --with-bluedir=DIR)
                else
@@ -292,7 +292,7 @@
         [  --disable-bluefbus      Disable Nokia FBUS2 over Bluetooth stack
                           (Nokia 6210)],
         [gsm_enable_bluefbus2="no"],

                 AC_DEFINE(GSM_ENABLE_BLUEFBUS2)
                 gsm_enable_bluefbus2="yes"
           else
@@ -302,7 +302,7 @@
         [  --disable-bluephonet    Disable Nokia PHONET FBUS over Bluetooth
                           stack (all new Nokias)],
         [gsm_enable_bluephonet="no"],

                 AC_DEFINE(GSM_ENABLE_BLUEPHONET)
                 gsm_enable_bluephonet="yes"
           else
@@ -311,7 +311,7 @@
 AC_ARG_ENABLE(blueat,
         [  --disable-blueat        Disable AT commands over Bluetooth stack],
         [gsm_enable_blueat="no"],

                 AC_DEFINE(GSM_ENABLE_BLUEAT)
                 gsm_enable_blueat="yes"
           else
@@ -320,7 +320,7 @@
 AC_ARG_ENABLE(blueobex,
         [  --disable-blueobex      Disable OBEX over Bluetooth stack],
         [gsm_enable_blueobex="no"],

                 AC_DEFINE(GSM_ENABLE_BLUEOBEX)
                 gsm_enable_blueobex="yes"
           else
@@ -355,7 +355,7 @@
 AC_ARG_ENABLE(bluerfsearch,
         [  --disable-bluerfsearch  Disable searching for RF channels with Bluetooth stack],
         [gsm_enable_bluerfsearch="no"],
-        [if test $gsm_blue_stack = Bluez; then
+        [if test $gsm_blue_stack = FreeBSD; then
                 AC_DEFINE(BLUETOOTH_RF_SEARCHING)
                 gsm_enable_bluerfsearch="yes"
           fi])  
@@ -443,7 +443,7 @@
   Binaries                                      - $bindir
   RPM making directory                          - $RPM_DIR
   Temporary directory                           - $TEMP_DIR




include/gammu/phone/nokia/dct4/dct4func.h
include/gammu/phone/nokia/dct4/n3320.h
include/gammu/phone/nokia/dct4/n3650.h
include/gammu/phone/nokia/dct4/6510/6510cal.h
include/gammu/phone/nokia/dct4/6510/6510file.h
include/gammu/phone/nokia/dct4/6510/n6510.h
include/gammu/phone/obex/obexgen.h
include/gammu/phone/symbian/mroutgen.h
include/gammu/protocol/protocol.h

@dirrm include/gammu/phone/symbian
@dirrm include/gammu/phone/obex
@dirrm include/gammu/phone/nokia/dct3
@dirrm include/gammu/phone/nokia/dct4/6510
@dirrm include/gammu/phone/nokia/dct4
@dirrm include/gammu/phone/nokia
@dirrm include/gammu/phone/at

Return to bug 83200

Lines 1-20 Link Here

(-)gammu/files/patch-bluetooth (-20 / +7 lines)
1	diff -ur orig/bluetoth.c patched/bluetoth.c	1	diff -ru ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c
2	--- common/device/bluetoth/bluetoth.c Thu Nov 25 12:36:26 2004	2	--- ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c Thu Mar 10 10:35:58 2005
3	+++ common/device/bluetoth/bluetoth.c Thu Nov 25 12:46:22 2004	3	+++ common/device/bluetoth/bluez.c Sat Jul 9 12:46:07 2005
4	@@ -30,9 +30,6 @@	4	@@ -23,6 +23,8 @@
5	{
6	GSM_Error error;
7
8	-#ifdef BLUETOOTH_RF_SEARCHING
9	- if (!mystrncasecmp(s->CurrentConfig->Connection, "bluerf", 6)) return bluetooth_findchannel(s);
10	-#endif
11
12	switch (s->ConnectionType) {
13	case GCT_BLUEAT:
14	diff -ur common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c
15	--- common/device/bluetoth/bluez.c Thu Nov 25 12:36:26 2004
16	+++ common/device/bluetoth/bluez.c Thu Nov 25 12:46:56 2004
17	@@ -14,6 +14,8 @@
18	#ifdef GSM_ENABLE_BLUETOOTHDEVICE	5	#ifdef GSM_ENABLE_BLUETOOTHDEVICE
19	#ifdef GSM_ENABLE_BLUEZ	6	#ifdef GSM_ENABLE_BLUEZ
20		7
Lines 23-29 Link Here
23	#include <stdlib.h>	10	#include <stdlib.h>
24	#include <stdio.h>	11	#include <stdio.h>
25	#include <fcntl.h>	12	#include <fcntl.h>
26	@@ -22,10 +24,7 @@	13	@@ -31,10 +33,7 @@
27	#include <sys/socket.h>	14	#include <sys/socket.h>
28	#include <sys/time.h>	15	#include <sys/time.h>
29	#include <unistd.h>	16	#include <unistd.h>
Lines 35-41 Link Here
35		22
36	#include "../../gsmcomon.h"	23	#include "../../gsmcomon.h"
37	#include "../devfunc.h"	24	#include "../devfunc.h"
38	@@ -34,21 +33,21 @@	25	@@ -43,21 +42,21 @@
39	GSM_Error bluetooth_connect(GSM_StateMachine s, int port, char device)	26	GSM_Error bluetooth_connect(GSM_StateMachine s, int port, char device)
40	{	27	{
41	GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;	28	GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
Lines 62-68 Link Here
62		49
63	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {	50	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
64	dbgprintf("Can't bind socket\n");	51	dbgprintf("Can't bind socket\n");
65	@@ -57,9 +56,9 @@	52	@@ -66,9 +65,9 @@
66	}	53	}
67		54
68	str2ba(device, &bdaddr);	55	str2ba(device, &bdaddr);

Lines 1-11 Link Here

(-)gammu/files/patch-configure.in (-8 / +17 lines)
1	--- cfg/autoconf/configure.in.orig Sat Jan 15 13:45:26 2005	1	--- ../gammu-1.01.0.orig/cfg/autoconf/configure.in Tue Mar 8 19:16:22 2005
2	+++ cfg/autoconf/configure.in Thu Apr 14 08:27:47 2005	2	+++ cfg/autoconf/configure.in Sat Jul 9 12:51:12 2005
3	@@ -185,17 +185,17 @@	3	@@ -185,17 +185,17 @@
4	fi	4	fi
5	if test "$gsm_blue_stack" = unknown ; then	5	if test "$gsm_blue_stack" = unknown ; then
6	AC_CHECK_HEADERS(bluetooth/bluetooth.h,	6	AC_CHECK_HEADERS(bluetooth/bluetooth.h,
7	- [gsm_blue_stack=Bluez	7	- [gsm_blue_stack=Bluez
8	+ [gsm_blue_stack=FreeBSD	8	+ [gsm_blue_stack=FreeBSD
9	LDLIBS="$LDLIBS -lbluetooth"	9	LDLIBS="$LDLIBS -lbluetooth"
10	AC_CHECK_LIB(sdp, sdp_list_append, LDLIBS="$LDLIBS -lsdp")	10	AC_CHECK_LIB(sdp, sdp_list_append, LDLIBS="$LDLIBS -lsdp")
11	AC_DEFINE(GSM_ENABLE_BLUEZ)	11	AC_DEFINE(GSM_ENABLE_BLUEZ)
Lines 21-27 Link Here
21	[ if test x$withval = xyes; then	21	[ if test x$withval = xyes; then
22	AC_MSG_WARN(Usage is: --with-bluedir=DIR)	22	AC_MSG_WARN(Usage is: --with-bluedir=DIR)
23	else	23	else
24	@@ -287,7 +287,7 @@	24	@@ -292,7 +292,7 @@
25	[ --disable-bluefbus Disable Nokia FBUS2 over Bluetooth stack	25	[ --disable-bluefbus Disable Nokia FBUS2 over Bluetooth stack
26	(Nokia 6210)],	26	(Nokia 6210)],
27	[gsm_enable_bluefbus2="no"],	27	[gsm_enable_bluefbus2="no"],
Lines 30-36 Link Here
30	AC_DEFINE(GSM_ENABLE_BLUEFBUS2)	30	AC_DEFINE(GSM_ENABLE_BLUEFBUS2)
31	gsm_enable_bluefbus2="yes"	31	gsm_enable_bluefbus2="yes"
32	else	32	else
33	@@ -297,7 +297,7 @@	33	@@ -302,7 +302,7 @@
34	[ --disable-bluephonet Disable Nokia PHONET FBUS over Bluetooth	34	[ --disable-bluephonet Disable Nokia PHONET FBUS over Bluetooth
35	stack (all new Nokias)],	35	stack (all new Nokias)],
36	[gsm_enable_bluephonet="no"],	36	[gsm_enable_bluephonet="no"],
Lines 39-45 Link Here
39	AC_DEFINE(GSM_ENABLE_BLUEPHONET)	39	AC_DEFINE(GSM_ENABLE_BLUEPHONET)
40	gsm_enable_bluephonet="yes"	40	gsm_enable_bluephonet="yes"
41	else	41	else
42	@@ -306,7 +306,7 @@	42	@@ -311,7 +311,7 @@
43	AC_ARG_ENABLE(blueat,	43	AC_ARG_ENABLE(blueat,
44	[ --disable-blueat Disable AT commands over Bluetooth stack],	44	[ --disable-blueat Disable AT commands over Bluetooth stack],
45	[gsm_enable_blueat="no"],	45	[gsm_enable_blueat="no"],
Lines 48-54 Link Here
48	AC_DEFINE(GSM_ENABLE_BLUEAT)	48	AC_DEFINE(GSM_ENABLE_BLUEAT)
49	gsm_enable_blueat="yes"	49	gsm_enable_blueat="yes"
50	else	50	else
51	@@ -315,7 +315,7 @@	51	@@ -320,7 +320,7 @@
52	AC_ARG_ENABLE(blueobex,	52	AC_ARG_ENABLE(blueobex,
53	[ --disable-blueobex Disable OBEX over Bluetooth stack],	53	[ --disable-blueobex Disable OBEX over Bluetooth stack],
54	[gsm_enable_blueobex="no"],	54	[gsm_enable_blueobex="no"],
Lines 57-63 Link Here
57	AC_DEFINE(GSM_ENABLE_BLUEOBEX)	57	AC_DEFINE(GSM_ENABLE_BLUEOBEX)
58	gsm_enable_blueobex="yes"	58	gsm_enable_blueobex="yes"
59	else	59	else
60	@@ -438,7 +438,7 @@	60	@@ -355,7 +355,7 @@
		61	AC_ARG_ENABLE(bluerfsearch,
		62	[ --disable-bluerfsearch Disable searching for RF channels with Bluetooth stack],
		63	[gsm_enable_bluerfsearch="no"],
		64	- [if test $gsm_blue_stack = Bluez; then
		65	+ [if test $gsm_blue_stack = FreeBSD; then
		66	AC_DEFINE(BLUETOOTH_RF_SEARCHING)
		67	gsm_enable_bluerfsearch="yes"
		68	fi])
		69	@@ -443,7 +443,7 @@
61	Binaries - $bindir	70	Binaries - $bindir
62	RPM making directory - $RPM_DIR	71	RPM making directory - $RPM_DIR
63	Temporary directory - $TEMP_DIR	72	Temporary directory - $TEMP_DIR

Lines 64-72 Link Here

(-)gammu/pkg-plist (-3 / +4 lines)
64	include/gammu/phone/nokia/dct4/dct4func.h	64	include/gammu/phone/nokia/dct4/dct4func.h
65	include/gammu/phone/nokia/dct4/n3320.h	65	include/gammu/phone/nokia/dct4/n3320.h
66	include/gammu/phone/nokia/dct4/n3650.h	66	include/gammu/phone/nokia/dct4/n3650.h
67	include/gammu/phone/nokia/dct4/n6510.h	67	include/gammu/phone/nokia/dct4/6510/6510cal.h
68	include/gammu/phone/nokia/dct4/6510cal.h	68	include/gammu/phone/nokia/dct4/6510/6510file.h
69	include/gammu/phone/nokia/dct4/6510file.h	69	include/gammu/phone/nokia/dct4/6510/n6510.h
70	include/gammu/phone/obex/obexgen.h	70	include/gammu/phone/obex/obexgen.h
71	include/gammu/phone/symbian/mroutgen.h	71	include/gammu/phone/symbian/mroutgen.h
72	include/gammu/protocol/protocol.h	72	include/gammu/protocol/protocol.h
Lines 109-114 Link Here
109	@dirrm include/gammu/phone/symbian	109	@dirrm include/gammu/phone/symbian
110	@dirrm include/gammu/phone/obex	110	@dirrm include/gammu/phone/obex
111	@dirrm include/gammu/phone/nokia/dct3	111	@dirrm include/gammu/phone/nokia/dct3
		112	@dirrm include/gammu/phone/nokia/dct4/6510
112	@dirrm include/gammu/phone/nokia/dct4	113	@dirrm include/gammu/phone/nokia/dct4
113	@dirrm include/gammu/phone/nokia	114	@dirrm include/gammu/phone/nokia
114	@dirrm include/gammu/phone/at	115	@dirrm include/gammu/phone/at