[bluez/f14/master] - Update to 4.77
Bastien Nocera
hadess at fedoraproject.org
Wed Oct 27 18:18:36 UTC 2010
commit a8a6e784e368a9d65685eb1a5566426812580fac
Author: Bastien Nocera <hadess at hadess.net>
Date: Wed Oct 27 19:16:30 2010 +0100
- Update to 4.77
.gitignore | 7 ++++
0001-Add-sixaxis-cable-pairing-plugin.patch | 28 ++++++++--------
...Also-run-bluetoothd-on-udev-change-events.patch | 24 --------------
0001-systemd-install-systemd-unit-files.patch | 26 +++++++-------
0002-build-Fix-parallel-build.patch | 34 ++++++++++++++++++++
bluez.spec | 14 +++++---
sources | 2 +-
7 files changed, 77 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3334f7..67dce9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
bluez-4.69.tar.gz
+bluez-4.70.tar.gz
+/bluez-4.71.tar.gz
+/bluez-4.72.tar.gz
+/bluez-4.73.tar.gz
+/bluez-4.74.tar.gz
+/bluez-4.76.tar.gz
+/bluez-4.77.tar.gz
diff --git a/0001-Add-sixaxis-cable-pairing-plugin.patch b/0001-Add-sixaxis-cable-pairing-plugin.patch
index bc415ce..706e7ca 100644
--- a/0001-Add-sixaxis-cable-pairing-plugin.patch
+++ b/0001-Add-sixaxis-cable-pairing-plugin.patch
@@ -1,4 +1,4 @@
-From 930d4ff4c8ce7344cd8c69c149bb695d82fa9548 Mon Sep 17 00:00:00 2001
+From 4165e66ef8517cf48e90be7ccb3ba4f4fcd57153 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 1 Sep 2009 17:32:48 +0100
Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -17,11 +17,11 @@ address, and added to the database of the current default adapter.
create mode 100644 plugins/cable.c
diff --git a/Makefile.am b/Makefile.am
-index 7895be2..8bf6c88 100644
+index 6e8fc7d..8636530 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -192,6 +192,11 @@ builtin_sources += attrib/main.c \
- attrib/example.h attrib/example.c
+@@ -195,6 +195,11 @@ builtin_sources += health/hdp_main.c health/hdp_types.h \
+ health/hdp_util.h health/hdp_util.c
endif
+if CABLE
@@ -32,16 +32,16 @@ index 7895be2..8bf6c88 100644
builtin_modules += hciops
builtin_sources += plugins/hciops.c
-@@ -237,7 +242,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+@@ -240,7 +245,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
src/dbus-common.c src/dbus-common.h \
src/dbus-hci.h src/dbus-hci.c
src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
-- @CAPNG_LIBS@ -ldl
-+ @CAPNG_LIBS@ @CABLE_LIBS@ -ldl
+- @CAPNG_LIBS@ -ldl -lrt
++ @CAPNG_LIBS@ @CABLE_LIBS@ -ldl -lrt
src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
- -Wl,--version-script=src/bluetooth.ver
- src_bluetoothd_DEPENDENCIES = src/bluetooth.ver lib/libbluetooth.la
-@@ -352,7 +357,7 @@ EXTRA_DIST += doc/manager-api.txt \
+ -Wl,--version-script=$(srcdir)/src/bluetooth.ver
+
+@@ -356,7 +361,7 @@ EXTRA_DIST += doc/manager-api.txt \
AM_YFLAGS = -d
@@ -51,7 +51,7 @@ index 7895be2..8bf6c88 100644
INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
diff --git a/acinclude.m4 b/acinclude.m4
-index a4e5e2f..eb0936a 100644
+index 287f07d..aab0c15 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -146,6 +146,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -97,14 +97,14 @@ index a4e5e2f..eb0936a 100644
AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
-@@ -371,4 +386,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -372,4 +387,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
AM_CONDITIONAL(MAEMO6PLUGIN, test "${maemo6_enable}" = "yes")
+ AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
])
diff --git a/configure.ac b/configure.ac
-index 6fda7fe..0ef9d4c 100644
+index 13a154c..59b0693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ AC_PATH_GLIB
@@ -507,5 +507,5 @@ index 0000000..d74c771
+BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
--
-1.7.2.3
+1.7.3.1
diff --git a/0001-systemd-install-systemd-unit-files.patch b/0001-systemd-install-systemd-unit-files.patch
index 900cae5..2857471 100644
--- a/0001-systemd-install-systemd-unit-files.patch
+++ b/0001-systemd-install-systemd-unit-files.patch
@@ -1,7 +1,7 @@
-From bbdb8577cae7446865840ced5b007b9b39b548a3 Mon Sep 17 00:00:00 2001
+From b3483ab0b821d29bbeb6aa5630b36bc126a89441 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Wed, 21 Jul 2010 19:20:44 +0200
-Subject: [PATCH] systemd: install systemd unit files
+Subject: [PATCH 3/3] systemd: install systemd unit files
This also enables bus activation for bluetoothd, but only if systemd is
running. Only if that's the case we can make sure in a race-free fashion
@@ -18,10 +18,10 @@ that bluetoothd is not started twice at the same time.
create mode 100644 scripts/org.bluez.service
diff --git a/Makefile.am b/Makefile.am
-index 65d4312..a2b53e8 100644
+index e855713..1edd6a2 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -301,7 +301,8 @@ endif
+@@ -344,7 +344,8 @@ endif
CLEANFILES += $(rules_DATA)
EXTRA_DIST += scripts/bluetooth.rules \
@@ -31,7 +31,7 @@ index 65d4312..a2b53e8 100644
if PCMCIA
udevdir = $(libexecdir)/udev
-@@ -309,6 +310,20 @@ udevdir = $(libexecdir)/udev
+@@ -352,6 +353,20 @@ udevdir = $(libexecdir)/udev
dist_udev_SCRIPTS = scripts/bluetooth_serial
endif
@@ -52,7 +52,7 @@ index 65d4312..a2b53e8 100644
EXTRA_DIST += doc/manager-api.txt \
doc/adapter-api.txt doc/device-api.txt \
doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
-@@ -328,9 +343,9 @@ pkgconfigdir = $(libdir)/pkgconfig
+@@ -376,9 +391,9 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = bluez.pc
@@ -65,19 +65,19 @@ index 65d4312..a2b53e8 100644
MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure config.h.in config.sub config.guess \
diff --git a/configure.ac b/configure.ac
-index b004f6e..86b398f 100644
+index d375ac9..6619a42 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -64,5 +64,14 @@ if (test "${enable_netlink}" = "yes"); then
+@@ -56,5 +56,14 @@ if (test "${enable_capng}" = "yes"); then
+ AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
fi
- AM_CONDITIONAL(NETLINK, test "${enable_netlink}" = "yes")
+# systemd
+
+AC_ARG_WITH([systemdsystemunitdir],
-+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+ [],
-+ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++ [],
++ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+
@@ -120,5 +120,5 @@ index 0000000..2a3b057
+User=root
+SystemdService=bluetooth.service
--
-1.7.0.1
+1.7.3.1
diff --git a/0002-build-Fix-parallel-build.patch b/0002-build-Fix-parallel-build.patch
new file mode 100644
index 0000000..e1069d1
--- /dev/null
+++ b/0002-build-Fix-parallel-build.patch
@@ -0,0 +1,34 @@
+From ad21a880935863d3592cae708147ef54c796222d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Wed, 27 Oct 2010 18:54:49 +0100
+Subject: [PATCH 2/3] build: Fix parallel build
+
+Fix parallel build where parser.h won't have been generated when
+we're trying to compile kword itself.
+
+ YACC tools/parser.c
+ LEX tools/lexer.c
+conflicts: 3 shift/reduce
+ CC tools/kword.o
+tools/kword.c:36:20: fatal error: parser.h: No such file or directory
+compilation terminated.
+---
+ Makefile.tools | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.tools b/Makefile.tools
+index 405a42b..797b53d 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -12,6 +12,8 @@ sbin_PROGRAMS += tools/hciattach tools/hciconfig
+ noinst_PROGRAMS += tools/avinfo tools/ppporc \
+ tools/hcieventmask tools/hcisecfilter
+
++tools/kword.c: tools/parser.h
++
+ tools_rfcomm_SOURCES = tools/main.c tools/parser.y tools/lexer.l \
+ tools/kword.h tools/kword.c
+ EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \
+--
+1.7.3.1
+
diff --git a/bluez.spec b/bluez.spec
index 55fe47c..23883a0 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
Summary: Bluetooth utilities
Name: bluez
-Version: 4.71
-Release: 5%{?dist}.1
+Version: 4.77
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -13,12 +13,11 @@ Source6: pand.conf
Source7: rfcomm.init
Source8: bluez-uinput.modules
-# https://bugzilla.redhat.com/show_bug.cgi?id=634205
-# http://thread.gmane.org/gmane.linux.bluez.kernel/7853
-Patch1: 0001-Also-run-bluetoothd-on-udev-change-events.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=450081
# http://thread.gmane.org/gmane.linux.bluez.kernel/1687
Patch2: bluez-try-utf8-harder.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/8645
+Patch3: 0002-build-Fix-parallel-build.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=498756
Patch4: bluez-socket-mobile-cf-connection-kit.patch
# http://thread.gmane.org/gmane.linux.bluez.kernel/2396
@@ -132,8 +131,8 @@ This includes hidd, dund and pand.
%prep
%setup -q
-%patch1 -p1 -b .udev
%patch2 -p1 -b .non-utf8-name
+%patch3 -p1 -b .parallel
%patch4 -p1 -b .socket-mobile
%patch5 -p1 -b .cable-pairing
%patch6 -p1 -b .systemd
@@ -299,6 +298,9 @@ fi
%{_mandir}/man1/pand.1.gz
%changelog
+* Wed Oct 27 2010 Bastien Nocera <bnocera at redhat.com> 4.77-1
+- Update to 4.77
+
* Wed Sep 29 2010 jkeating - 4.71-5.1
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index 9153f2c..a817d95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d54c99e1aa554b623bf4eaad9ae9aa0a bluez-4.71.tar.gz
+58644b9d65bc7c73a19e9a38f56b165d bluez-4.77.tar.gz
More information about the scm-commits
mailing list