Date: Saturday, April 9, 2011 @ 10:35:19
Author: bisson
Revision: 118945
remove /var/run and various cleanup
Added:
bitlbee/trunk/rc.d
(from rev 118926, bitlbee/trunk/bitlbee.rcd)
bitlbee/trunk/xinetd
(from rev 118926, bitlbee/trunk/bitlbee.xinetd)
Modified:
bitlbee/trunk/PKGBUILD
Deleted:
bitlbee/trunk/bitlbee.rcd
bitlbee/trunk/bitlbee.xinetd
----------------+
PKGBUILD | 14 ++++++--------
bitlbee.rcd | 54 ------------------------------------------------------
bitlbee.xinetd | 12 ------------
rc.d | 40 ++++++++++++++++++++++++++++++++++++++++
xinetd | 12 ++++++++++++
5 files changed, 58 insertions(+), 74 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-04-09 13:50:03 UTC (rev 118944)
+++ PKGBUILD 2011-04-09 14:35:19 UTC (rev 118945)
@@ -7,7 +7,7 @@
pkgname=bitlbee
pkgver=3.0.2
-pkgrel=1
+pkgrel=2
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to
IRC'
arch=('i686' 'x86_64')
url='http://www.bitlbee.org/'
@@ -15,11 +15,11 @@
depends=('gnutls' 'glib2' 'libotr')
optdepends=('xinetd: to run bitlbee through xinetd')
source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz";
- 'bitlbee.xinetd'
- 'bitlbee.rcd')
+ 'xinetd'
+ 'rc.d')
sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc'
'5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
- '299776783902cc2e20be49e2fe729572ca656383')
+ 'be09d29af3853825778331df451f16ca9e452d03')
backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt'
'etc/xinetd.d/bitlbee')
install=install
@@ -40,11 +40,9 @@
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- install -dm755 "${pkgdir}"/var/{lib,run}
install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee
- install -o65 -g65 -dm755 "${pkgdir}"/var/run/bitlbee
- install -Dm644 "${srcdir}"/bitlbee.xinetd
"${pkgdir}"/etc/xinetd.d/bitlbee
- install -Dm755 "${srcdir}"/bitlbee.rcd "${pkgdir}"/etc/rc.d/bitlbee
+ install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee
+ install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee
make DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" install-etc
Deleted: bitlbee.rcd
===================================================================
--- bitlbee.rcd 2011-04-09 13:50:03 UTC (rev 118944)
+++ bitlbee.rcd 2011-04-09 14:35:19 UTC (rev 118945)
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
- pidof -o %PPID /usr/sbin/bitlbee
-}
-
-case "$1" in
- start)
- stat_busy 'Starting Bitlbee'
- PID=$(get_pid)
- if [ -z "$PID" ]; then
- [ -f /var/run/bitlbee/bitlbee.pid ] && rm -f
/var/run/bitlbee/bitlbee.pid
- su -s /bin/sh -c '/usr/sbin/bitlbee -F' 'bitlbee'
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon bitlbee
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy 'Stopping Bitlbee'
- PID=$(get_pid)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/bitlbee/bitlbee.pid &> /dev/null
- rm_daemon bitlbee
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: bitlbee.xinetd
===================================================================
--- bitlbee.xinetd 2011-04-09 13:50:03 UTC (rev 118944)
+++ bitlbee.xinetd 2011-04-09 14:35:19 UTC (rev 118945)
@@ -1,12 +0,0 @@
-service bitlbee
-{
- type = UNLISTED
- socket_type = stream
- protocol = tcp
- wait = no
- user = bitlbee
- group = bitlbee
- server = /usr/sbin/bitlbee
- port = 6667
- disable = yes
-}
Copied: bitlbee/trunk/rc.d (from rev 118926, bitlbee/trunk/bitlbee.rcd)
===================================================================
--- rc.d (rev 0)
+++ rc.d 2011-04-09 14:35:19 UTC (rev 118945)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+name=bitlbee
+PID=$(pidof -o %PPID /usr/sbin/bitlbee)
+install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee
+
+case "$1" in
+start)
+ stat_busy "Starting $name daemon"
+ [[ -z "$PID" ]] && {
+ rm -f /var/run/bitlbee/bitlbee.pid
+ su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee
+ } && {
+ add_daemon $name
+ stat_done
+ } || { stat_fail; exit 1; }
+ ;;
+stop)
+ stat_busy "Stopping $name daemon"
+ [[ -n "$PID" ]] && {
+ kill $PID &>/dev/null
+ } && {
+ rm -f /var/run/bitlbee/bitlbee.pid
+ rm_daemon $name
+ stat_done
+ } || { stat_fail; exit 1; }
+ ;;
+restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+*)
+ echo "usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
Copied: bitlbee/trunk/xinetd (from rev 118926, bitlbee/trunk/bitlbee.xinetd)
===================================================================
--- xinetd (rev 0)
+++ xinetd 2011-04-09 14:35:19 UTC (rev 118945)
@@ -0,0 +1,12 @@
+service bitlbee
+{
+ type = UNLISTED
+ socket_type = stream
+ protocol = tcp
+ wait = no
+ user = bitlbee
+ group = bitlbee
+ server = /usr/sbin/bitlbee
+ port = 6667
+ disable = yes
+}
