vpnmain.cgi: Disable compression by default

[ipfire-2.x.git] / lfs / bluetooth

diff --git a/lfs/bluetooth b/lfs/bluetooth
index e5df30d1f6628f2495e866a3e320b9b5f5fa342f..2c57809546fccd09f555156fd4599d92b3fac0d1 100644 (file)
--- a/lfs/bluetooth
+++ b/lfs/bluetooth
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bluetooth
 PAK_VER    = 1
 
-DEPS       = "dbus glib"
+DEPS       = "dbus"
 
 ###############################################################################
 # Top-level Rules
@@ -108,7 +108,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
            --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
        cd $(DIR_SRC)/bluez-hcidump-1.42 && make $(MAKETUNING)
        cd $(DIR_SRC)/bluez-hcidump-1.42 && make install
-       mv -f /etc/udev/bluetooth.rules /etc/udev/rules.d/24-bluetooth.rules
+       mv -f /etc/udev/bluetooth.rules /lib/udev/rules.d/24-bluetooth.rules
+       # Patch udev rules for new udev version
+       sed -i -e "s/SYSFS{/ATTRS{/g" /lib/udev/rules.d/24-bluetooth.rules
+       sed -i -e "s/BUS==/SUBSYSTEMS==/g" /lib/udev/rules.d/24-bluetooth.rules
        # Change bluetooth peername to Hostname-devicenumber
        sed -i -e 's|name "BlueZ (%d)";|name "%h-%d";|g' /etc/bluetooth/hcid.conf
        # Create empty config files
@@ -121,5 +124,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        touch /var/ipfire/bluetooth/settings
        chown nobody:nobody /var/ipfire/bluetooth/settings
        chmod 644 /var/ipfire/bluetooth/settings
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/bluetooth /var/ipfire/backup/addons/includes/bluetooth
+
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,bluetooth)
+
        @rm -rf $(DIR_SRC)/bluez*
        @$(POSTBUILD)