diff options
| -rw-r--r-- | network/bitlbee/bitlbee.SlackBuild | 9 | ||||
| -rw-r--r-- | network/bitlbee/bitlbee.info | 6 | ||||
| -rw-r--r-- | network/bitlbee/rc.bitlbee | 32 |
3 files changed, 37 insertions, 10 deletions
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild index b6b8dd2a788d..473468aba40b 100644 --- a/network/bitlbee/bitlbee.SlackBuild +++ b/network/bitlbee/bitlbee.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# SlackBuild Script for bitlbee +# Slackware build script for "bitlbee". -# Copyright 2007-2014 Michiel van Wessem, Leicester, United Kingdom +# Copyright 2007-2016 Michiel van Wessem, Leicester, United Kingdom +# Copyright 2016 Marcel Saegebarth <marc@mos6581.de> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -10,7 +11,7 @@ # met: # # * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. +# notice, this list of conditions and the following disclaimer. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -25,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bitlbee -VERSION=${VERSION:-3.4.1} +VERSION=${VERSION:-3.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info index 7a58ec70528e..2a80fffaebf8 100644 --- a/network/bitlbee/bitlbee.info +++ b/network/bitlbee/bitlbee.info @@ -1,8 +1,8 @@ PRGNAM="bitlbee" -VERSION="3.4.1" +VERSION="3.4.2" HOMEPAGE="http://www.bitlbee.org" -DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.4.1.tar.gz" -MD5SUM="dc2d66c0b01d450ce8b44e1f8baf0378" +DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.4.2.tar.gz" +MD5SUM="3b620bf80c35d673cd08311792ec96be" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/bitlbee/rc.bitlbee b/network/bitlbee/rc.bitlbee index ea38ac886aba..369503820a9b 100644 --- a/network/bitlbee/rc.bitlbee +++ b/network/bitlbee/rc.bitlbee @@ -1,5 +1,31 @@ #!/bin/sh +# Slackware build script for "bitlbee". + +# Copyright 2007-2016 Michiel van Wessem, Leicester, United Kingdom +# Copyright 2016 Marcel Saegebarth <marc@mos6581.de> +# Copyright 2016 Avinash H. Duduskar <avinash.duduskar@gmail.com> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # /etc/rc.d/rc.bitlbee - Start/stop/restart the bitlbee daemon. # To make bitlbee start automatically at boot, make this # file executable: chmod 0755 /etc/rc.d/rc.bitlbee and add it @@ -15,7 +41,7 @@ SOCKFILE="/var/run/bitlbee.sock" bitlbee_start() { echo "Starting bitlbee on port $BITLBEE_PORT..." - CHECK=$(ps aux | grep /usr/sbin/bitlbee | grep -v grep) + CHECK=$(pgrep -u bitlbee -G 250 -l -f "/usr/sbin/bitlbee -u bitlbee -p $BITLBEE_PORT $BITLBEE_OPTS") STATUS=$? # make sure bitlbee isn't running yet @@ -40,12 +66,12 @@ bitlbee_stop() { if [ "$BITLBEE_OPTS" == "-D" ]; then if [ -r $PIDFILE ]; then kill $(cat $PIDFILE) - rm $PIDFILE $SOCKFILE + rm $PIDFILE echo "done" fi else killall bitlbee - rm $PIDFILE $SOCKFILE + rm $PIDFILE echo "done" fi } |