# HG changeset patch # User Dominique Corbex # Date 1366692966 -7200 # Node ID 0199371990b2c79ba0bb4b924bacbbd629b3dc5c # Parent 01ad1e61b761ac72d26ca47955409b1d788c895f connman: fix deps+bdeps diff -r 01ad1e61b761 -r 0199371990b2 connman/receipt --- a/connman/receipt Mon Apr 22 23:05:52 2013 +0200 +++ b/connman/receipt Tue Apr 23 06:56:06 2013 +0200 @@ -9,9 +9,11 @@ WEB_SITE="http://connman.net/" WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL" -DEPENDS="glib dbus iptables gnutls libnl udev wpa_supplicant" -BUILD_DEPENDS="glib-dev dbus-dev iptables iptables-dev gnutls-dev libnl-dev \ -openconnect udev-dev wpa_supplicant readline-dev ncursesw-dev openvpn bluez-dev" +DEPENDS="glib dbus iptables gnutls libnl udev wpa_supplicant dbus-helper" +BUILD_DEPENDS="glib-dev dbus-dev iptables-dev gnutls-dev libnl-dev +openconnect udev-dev wpa_supplicant readline-dev ncursesw-dev openvpn +bluez-dev ppp-dev" +SUGGESTED="xl2tpd pptpclient" # Rules to configure and make the package. compile_rules() @@ -28,11 +30,12 @@ --disable-gtk-doc \ --disable-neard \ --enable-threads \ + --enable-polkit \ --enable-openconnect \ --enable-vpnc \ --enable-openvpn \ - --enable-polkit \ --enable-client \ + --enable-test \ $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install } @@ -67,13 +70,13 @@ echo '' >> $root/etc/daemons.conf fi if [ -z "$root" ]; then - /etc/init.d/connmand start || continue + /etc/init.d/connman start || /etc/init.d/connman restart fi } pre_remove() { if [ -z "$1" ]; then - /etc/init.d/connmand stop + /etc/init.d/connman stop fi } diff -r 01ad1e61b761 -r 0199371990b2 connman/stuff/etc/init.d/connman --- a/connman/stuff/etc/init.d/connman Mon Apr 22 23:05:52 2013 +0200 +++ b/connman/stuff/etc/init.d/connman Tue Apr 23 06:56:06 2013 +0200 @@ -28,6 +28,7 @@ stop) if [ -z "$(pidof connmand)" ] ; then echo "$NAME is not running." + rm -rf $PIDFILE exit 1 fi echo -n "Stopping $DESC: $NAME... " @@ -48,9 +49,8 @@ status ;; *) - echo "" - echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]" - echo "" + printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart]\n" \ + "$(basename $0)" exit 1 ;; esac