bluez 4.101-1 màj port

6 files changed, 44 insertions, 101 deletions

diff --git a/bluez/.footprint.i686 b/bluez/.footprint.i686
index 0b0fb9d38..8cb404339 100644
--- a/bluez/.footprint.i686
+++ b/bluez/.footprint.i686
@@ -11,27 +11,29 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/bluetooth.conf
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/bluez
+-rwxr-xr--	root/root	etc/rc.d/init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K40bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K27bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K40bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K27bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K40bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K27bluetooth -> ../init.d/bluetooth
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+drwxr-xr-x	root/root	etc/sysconfig/
+-rw-r--r--	root/root	etc/sysconfig/bluetooth
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/hid2hci
 drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/97-bluetooth-hid2hci.rules
--rw-r--r--	root/root	lib/udev/rules.d/97-bluetooth.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ciptool
@@ -75,9 +77,9 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-0.10/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-0.10/libgstbluetooth.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-0.10/libgstbluetooth.so
 -rwxr-xr-x	root/root	usr/lib/libbluetooth.la
-lrwxrwxrwx	root/root	usr/lib/libbluetooth.so -> libbluetooth.so.3.12.0
-lrwxrwxrwx	root/root	usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.12.0
--rwxr-xr-x	root/root	usr/lib/libbluetooth.so.3.12.0
+lrwxrwxrwx	root/root	usr/lib/libbluetooth.so -> libbluetooth.so.3.13.0
+lrwxrwxrwx	root/root	usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.13.0
+-rwxr-xr-x	root/root	usr/lib/libbluetooth.so.3.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/bluez.pc
 drwxr-xr-x	root/root	usr/sbin/
@@ -88,6 +90,9 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/alsa/
 -rw-r--r--	root/root	usr/share/alsa/bluetooth.conf
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/org.bluez.service
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/ciptool.1.gz
diff --git a/bluez/.footprint.x86_64 b/bluez/.footprint.x86_64
index 0b0fb9d38..8cb404339 100644
--- a/bluez/.footprint.x86_64
+++ b/bluez/.footprint.x86_64
@@ -11,27 +11,29 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/bluetooth.conf
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/bluez
+-rwxr-xr--	root/root	etc/rc.d/init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K40bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K27bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K40bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K27bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S30bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S35bluetooth -> ../init.d/bluetooth
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K40bluez -> ../init.d/bluez
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K27bluetooth -> ../init.d/bluetooth
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+drwxr-xr-x	root/root	etc/sysconfig/
+-rw-r--r--	root/root	etc/sysconfig/bluetooth
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/hid2hci
 drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/97-bluetooth-hid2hci.rules
--rw-r--r--	root/root	lib/udev/rules.d/97-bluetooth.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ciptool
@@ -75,9 +77,9 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-0.10/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-0.10/libgstbluetooth.la
 -rwxr-xr-x	root/root	usr/lib/gstreamer-0.10/libgstbluetooth.so
 -rwxr-xr-x	root/root	usr/lib/libbluetooth.la
-lrwxrwxrwx	root/root	usr/lib/libbluetooth.so -> libbluetooth.so.3.12.0
-lrwxrwxrwx	root/root	usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.12.0
--rwxr-xr-x	root/root	usr/lib/libbluetooth.so.3.12.0
+lrwxrwxrwx	root/root	usr/lib/libbluetooth.so -> libbluetooth.so.3.13.0
+lrwxrwxrwx	root/root	usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.13.0
+-rwxr-xr-x	root/root	usr/lib/libbluetooth.so.3.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/bluez.pc
 drwxr-xr-x	root/root	usr/sbin/
@@ -88,6 +90,9 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/alsa/
 -rw-r--r--	root/root	usr/share/alsa/bluetooth.conf
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/org.bluez.service
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/ciptool.1.gz
diff --git a/bluez/.md5sum.i686 b/bluez/.md5sum.i686
index 88f53a5cd..f6b8779b2 100644
--- a/bluez/.md5sum.i686
+++ b/bluez/.md5sum.i686
@@ -1,2 +1 @@
-defb8d27ea2b9608c05f02711a7b78b2  bluez
-edb14c1eb02b3ecf0a356a031dbea5f0  bluez-4.99.tar.xz
+c828c172f01f20c6ecd7f407894956a2  bluez-4.101.tar.xz
diff --git a/bluez/.md5sum.x86_64 b/bluez/.md5sum.x86_64
index 88f53a5cd..f6b8779b2 100644
--- a/bluez/.md5sum.x86_64
+++ b/bluez/.md5sum.x86_64
@@ -1,2 +1 @@
-defb8d27ea2b9608c05f02711a7b78b2  bluez
-edb14c1eb02b3ecf0a356a031dbea5f0  bluez-4.99.tar.xz
+c828c172f01f20c6ecd7f407894956a2  bluez-4.101.tar.xz
diff --git a/bluez/Pkgfile b/bluez/Pkgfile
index f9ce231b8..0facd7dc5 100644
--- a/bluez/Pkgfile
+++ b/bluez/Pkgfile
@@ -6,12 +6,15 @@
 # Run on: alsa-lib,gst-plugins-base,libusb-compat,libnl,libsndfile,dbus-python,cups
 
 name=bluez
-version=4.99
+version=4.101
 release=1
-source=(http://www.kernel.org/pub/linux/bluetooth/$name-$version.tar.xz
-	bluez)
+source=(http://www.kernel.org/pub/linux/bluetooth/$name-$version.tar.xz)
 
 build() {
+	source /etc/blfs-bootscripts
+	wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+	tar xvf $scripts-$scriptsversion.tar.bz2
+
 	cd $name-$version
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -33,12 +36,6 @@ build() {
 
 	install -m644 network/network.conf input/input.conf audio/audio.conf serial/serial.conf $PKG/etc/bluetooth
 
-	mkdir -p $PKG/etc/rc.d/{init.d,rc0.d,rc1.d,rc2.d,rc3.d,rc4.d,rc5.d,rc6.d}
-	install -m755 $SRC/bluez $PKG/etc/rc.d/init.d/bluez
-	for i in 0 1 6
-		do ln -s ../init.d/bluez $PKG/etc/rc.d/rc${i}.d/K40bluez
-	done
-	for i in 2 3 4 5
-		do ln -s ../init.d/bluez $PKG/etc/rc.d/rc${i}.d/S30bluez
-	done
+	cd ../$scripts-$scriptsversion
+	make DESTDIR=$PKG install-bluetooth
 }
diff --git a/bluez/bluez b/bluez/bluez
deleted file mode 100755
index 6e3015eec..000000000
--- a/bluez/bluez
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-########################################################################
-# Begin bluez
-#
-# Description : Lancement du sous-système bluetooth
-#
-# Authors     : tnut
-# Update      : piernov - piernov@piernov.org
-#
-# Version     : 0.2
-#
-########################################################################
-
-### BEGIN INIT INFO
-# Provides:            bluez
-# Required-Start:      udev
-# Should-Start:
-# Required-Stop:
-# Should-Stop:
-# Default-Start:       2 3 4 5
-# Default-Stop:        0 6
-# Short-Description:   Lancement du sous-système bluetooth
-# Description:         Lance le démon bluez permettant la gestion des
-#                      périphériques Bluetooth.
-# X-LFS-Provided-By:   NuTyX
-### END INIT INFO
-
-
-. /lib/lsb/init-functions
-
-case "${1}" in
-	start)
-		log_info_msg "Starting bluetooth daemon..."
-		start_daemon /usr/sbin/bluetoothd
-		evaluate_retval
-		;;
-
-	stop)
-		log_info_msg "Stopping bluetooth daemon..."
-		killproc /usr/sbin/bluetoothd
-		evaluate_retval
-		;;
-
-
-	restart)
-		${0} stop
-		sleep 1
-		${0} start
-		;;
-
-	status)
-		statusproc /usr/sbin/bluetoothd
-		;;
-
-	*)
-		echo "Usage: ${0} {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/