rpms/bluez-utils/devel .cvsignore, 1.18, 1.19 bluetooth.init, 1.7, 1.8 bluez-utils.spec, 1.60, 1.61 dund.init, 1.5, 1.6 pand.init, 1.5, 1.6 sources, 1.18, 1.19 hidd.conf, 1.2, NONE hidd.init, 1.6, NONE
David Woodhouse (dwmw2)
fedora-extras-commits at redhat.com
Wed Aug 1 14:53:08 UTC 2007
Author: dwmw2
Update of /cvs/extras/rpms/bluez-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24486
Modified Files:
.cvsignore bluetooth.init bluez-utils.spec dund.init pand.init
sources
Removed Files:
hidd.conf hidd.init
Log Message:
3.13
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 21 Jul 2007 09:40:08 -0000 1.18
+++ .cvsignore 1 Aug 2007 14:52:35 -0000 1.19
@@ -1 +1 @@
-bluez-utils-3.12.tar.gz
+bluez-utils-3.13.tar.gz
Index: bluetooth.init
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/bluetooth.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bluetooth.init 17 Apr 2006 18:07:51 -0000 1.7
+++ bluetooth.init 1 Aug 2007 14:52:35 -0000 1.8
@@ -31,15 +31,15 @@
start()
{
echo -n $"Starting Bluetooth services:"
- daemon /usr/sbin/hcid
- touch /var/lock/subsys/hcid
- daemon /usr/sbin/sdpd
- touch /var/lock/subsys/sdpd
+ daemon /usr/sbin/hcid -s
+ RETVAL=$?
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/hcid
[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
start_uarts
rfcomm bind all
touch /var/lock/subsys/bluetooth
echo ""
+ return $RETVAL
}
stop()
@@ -48,12 +48,12 @@
stop_uarts
rfcomm release all
[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
- killproc sdpd
- rm -f /var/lock/subsys/sdpd
killproc hcid
+ RETVAL=$?
rm -f /var/lock/subsys/hcid
rm -f /var/lock/subsys/bluetooth
echo ""
+ return $RETVAL
}
case "$1" in
@@ -63,21 +63,21 @@
stop)
stop
;;
- restart|reload)
+ force-reload|restart|reload)
stop
start
;;
- condrestart)
+ try-restart|condrestart)
[ -e /var/lock/subsys/bluetooth ] && (stop; start)
;;
status)
status hcid
- status sdpd
+ RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
- exit 1
+ exit 3
;;
esac
-exit 0
+exit $RETVAL
Index: bluez-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- bluez-utils.spec 21 Jul 2007 10:49:35 -0000 1.60
+++ bluez-utils.spec 1 Aug 2007 14:52:35 -0000 1.61
@@ -1,6 +1,6 @@
Summary: Bluetooth utilities
Name: bluez-utils
-Version: 3.12
+Version: 3.13
Release: 1%{?dist}
License: GPL
Group: Applications/System
@@ -8,13 +8,10 @@
Source1: bluetooth.init
Source2: pand.init
Source3: dund.init
-Source4: hidd.init
Source6: pand.conf
Source7: dund.conf
-Source8: hidd.conf
Source9: bluetooth.conf
Patch0: bluez-utils-2.3-conf.patch
-Patch1: bluez-utils-3.12-pand-man-page.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://www.bluez.org/
@@ -55,20 +52,19 @@
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \
--enable-all --disable-bcm203x --enable-alsa --enable-bccmd \
--enable-avctrl --enable-glib --enable-input --enable-echo \
- --enable-serial
+ --enable-serial --disable-sdpd
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev
rm -f $RPM_BUILD_ROOT/etc/default/bluetooth $RPM_BUILD_ROOT/etc/init.d/bluetooth
-for a in bluetooth dund hidd pand ; do
+for a in bluetooth dund pand ; do
install -D -m0755 $RPM_SOURCE_DIR/$a.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/$a
install -D -m0644 $RPM_SOURCE_DIR/$a.conf $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/$a
done
@@ -78,17 +74,20 @@
install -D -m0755 cups/bluetooth ${RPM_BUILD_ROOT}/usr/lib/cups/backend/bluetooth
mv $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/bluetooth.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/97-bluetooth.rules
+install -m0755 daemon/passkey-agent $RPM_BUILD_ROOT/%{_bindir}/passkey-agent
+install -m0755 daemon/auth-agent $RPM_BUILD_ROOT/%{_bindir}/auth-agent
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
+/sbin/chkconfig --del hidd >/dev/null 2>&1
+
/sbin/chkconfig --add bluetooth
-/sbin/chkconfig --add hidd
/sbin/chkconfig --add dund
/sbin/chkconfig --add pand
if [ "$1" = "1" ]; then
/sbin/service bluetooth condrestart >/dev/null 2>&1
- /sbin/service hidd condrestart >/dev/null 2>&1
/sbin/service dund condrestart >/dev/null 2>&1
/sbin/service pand condrestart >/dev/null 2>&1
fi
@@ -96,11 +95,9 @@
%preun
if [ "$1" = "0" ]; then
/sbin/service bluetooth stop >/dev/null 2>&1
- /sbin/service hidd stop >/dev/null 2>&1
/sbin/service dund stop >/dev/null 2>&1
/sbin/service pand stop >/dev/null 2>&1
/sbin/chkconfig --del bluetooth
- /sbin/chkconfig --del hidd
/sbin/chkconfig --del dund
/sbin/chkconfig --del pand
fi
@@ -126,6 +123,11 @@
/usr/lib/cups/backend/bluetooth
%changelog
+* Wed Aug 1 2007 David Woodhouse <dwmw2 at infradead.org> 3.13-1
+- Update to bluez-utils 3.13
+- Kill hidd init script -- the input service replaces it
+- Update other init scripts.
+
* Sat Jul 21 2007 David Woodhouse <dwmw2 at infradead.org> 3.12-1
- Update to bluez-utils 3.12
- Fix reference dev-up script in pand.1 (#213984)
Index: dund.init
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/dund.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dund.init 17 Apr 2006 17:59:40 -0000 1.5
+++ dund.init 1 Aug 2007 14:52:35 -0000 1.6
@@ -18,13 +18,14 @@
start()
{
- [ -z "$DUNDARGS" ] && exit 0
+ [ -z "$DUNDARGS" ] && exit 6
echo -n $"Starting dund: "
daemon /usr/bin/dund $DUNDARGS
-
- touch /var/lock/subsys/dund
- echo
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/dund
+ return $RETVAL
}
stop()
@@ -32,9 +33,11 @@
echo -n $"Shutting down dund: "
/usr/bin/dund -K
killproc dund
+ RETVAL=$?
rm -f /var/lock/subsys/dund
echo
+ return $RETVAL
}
# See how we were called.
@@ -45,19 +48,20 @@
stop)
stop
;;
- restart|reload)
+ force-reload|restart|reload)
stop
start
;;
- condrestart)
+ try-restart|condrestart)
[ -e /var/lock/subsys/dund ] && (stop; start)
;;
status)
status dund
+ RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
- exit 1
+ echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+ exit 3
esac
-exit 0
+exit $RETVAL
Index: pand.init
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/pand.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pand.init 17 Apr 2006 18:11:12 -0000 1.5
+++ pand.init 1 Aug 2007 14:52:35 -0000 1.6
@@ -18,14 +18,15 @@
start()
{
- [ -z "$PANDARGS" ] && exit 0
+ [ -z "$PANDARGS" ] && exit 6
[ -x /etc/bluetooth/pan/system-up ] && /etc/bluetooth/pan/system-up
echo -n $"Starting pand: "
daemon /usr/bin/pand $PANDARGS
-
- touch /var/lock/subsys/pand
+ RETVAL=$?
echo
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/pand
+ return $RETVAL
}
stop()
@@ -33,10 +34,11 @@
echo -n $"Shutting down pand: "
/usr/bin/pand -K
killproc pand
-
+ RETVAL=$?
[ -x /etc/bluetooth/pan/system-down ] && /etc/bluetooth/pan/system-down
rm -f /var/lock/subsys/pand
echo
+ return $RETVAL
}
[ -f /usr/bin/pand ] || exit 0
@@ -49,19 +51,20 @@
stop)
stop
;;
- restart|reload)
+ force-reload|restart|reload)
stop
start
;;
- condrestart)
+ try-restart|condrestart)
[ -e /var/lock/subsys/pand ] && (stop; start)
;;
status)
status pand
+ RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
- exit 1
+ echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+ exit 3
esac
-exit 0
+exit $RETVAL
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bluez-utils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 21 Jul 2007 09:40:08 -0000 1.18
+++ sources 1 Aug 2007 14:52:35 -0000 1.19
@@ -1 +1 @@
-ce95f814d65390c5b8221b74381a0f9a bluez-utils-3.12.tar.gz
+88df46a585b5823729f23adee58426d3 bluez-utils-3.13.tar.gz
--- hidd.conf DELETED ---
--- hidd.init DELETED ---
More information about the fedora-extras-commits
mailing list