[arch-commits] Commit in tenshi/repos/community-any (12 files)
Florian Pritz
bluewind at nymeria.archlinux.org
Tue Jan 22 10:54:16 UTC 2013
Date: Tuesday, January 22, 2013 @ 11:54:15
Author: bluewind
Revision: 82639
archrelease: copy trunk to community-any
Added:
tenshi/repos/community-any/PKGBUILD
(from rev 82638, tenshi/trunk/PKGBUILD)
tenshi/repos/community-any/conf.diff
(from rev 82638, tenshi/trunk/conf.diff)
tenshi/repos/community-any/rc-conf
(from rev 82638, tenshi/trunk/rc-conf)
tenshi/repos/community-any/rc-script
(from rev 82638, tenshi/trunk/rc-script)
tenshi/repos/community-any/tenshi.install
(from rev 82638, tenshi/trunk/tenshi.install)
tenshi/repos/community-any/tenshi.service
(from rev 82638, tenshi/trunk/tenshi.service)
Deleted:
tenshi/repos/community-any/PKGBUILD
tenshi/repos/community-any/conf.diff
tenshi/repos/community-any/rc-conf
tenshi/repos/community-any/rc-script
tenshi/repos/community-any/tenshi.install
tenshi/repos/community-any/tenshi.service
----------------+
PKGBUILD | 90 +++++++++++++++++++--------------------
conf.diff | 26 +++++------
rc-conf | 6 +-
rc-script | 124 +++++++++++++++++++++++++++----------------------------
tenshi.install | 50 +++++++++++-----------
tenshi.service | 17 +++----
6 files changed, 157 insertions(+), 156 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-22 10:54:01 UTC (rev 82638)
+++ PKGBUILD 2013-01-22 10:54:15 UTC (rev 82639)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <flo at xinu.at>
-# Contributor: Ryan Corder <ryanc at greengrey.org>
-
-pkgname=tenshi
-pkgver=0.14
-pkgrel=2
-pkgdesc="real-time log monitor from the Gentoo Linux project"
-url="http://dev.inversepath.com/trac/tenshi"
-arch=(any)
-license=("custom")
-depends=('perl' perl-io-bufferedselect)
-install="$pkgname.install"
-source=(http://dev.inversepath.com/tenshi/$pkgname-$pkgver.tar.gz
- 'rc-script'
- 'rc-conf'
- 'tenshi.install'
- 'tenshi.service'
- 'conf.diff')
-backup=(etc/tenshi/tenshi.conf etc/conf.d/tenshi)
-md5sums=('9951f2995c4e08539a60026774da183a'
- '94104e395d33c4f72cb6bbfe3591b7a0'
- '302037a01958993b31988d3f50ee20b1'
- 'd8a70806f3a2a498d9d8ef2ecb171ad8'
- 'da1142f6dc1ca32efbcc3f01c7b16da3'
- '451250b1955b14691ca1c7124d1991f2')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- patch -i "$srcdir/conf.diff"
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" docdir=/usr/share/doc/tenshi install
- install -Dm644 "$srcdir/rc-conf" "$pkgdir/etc/conf.d/tenshi"
- install -Dm755 "$srcdir/rc-script" "$pkgdir/etc/rc.d/tenshi"
- install -Dm644 "$srcdir/tenshi.service" "$pkgdir/usr/lib/systemd/system/tenshi.service"
- install -dm755 "$pkgdir/usr/share/licenses/tenshi"
- mv "$pkgdir/usr/share/doc/tenshi/LICENSE" "$pkgdir/usr/share/licenses/tenshi/LICENSE"
- chmod 750 "$pkgdir/etc/tenshi" "$pkgdir/var/lib/tenshi"
-}
Copied: tenshi/repos/community-any/PKGBUILD (from rev 82638, tenshi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-01-22 10:54:15 UTC (rev 82639)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Florian Pritz <flo at xinu.at>
+# Contributor: Ryan Corder <ryanc at greengrey.org>
+
+pkgname=tenshi
+pkgver=0.14
+pkgrel=3
+pkgdesc="real-time log monitor from the Gentoo Linux project"
+url="http://dev.inversepath.com/trac/tenshi"
+arch=(any)
+license=("custom")
+depends=('perl' perl-io-bufferedselect)
+install="$pkgname.install"
+source=(http://dev.inversepath.com/tenshi/$pkgname-$pkgver.tar.gz
+ 'rc-script'
+ 'rc-conf'
+ 'tenshi.install'
+ 'tenshi.service'
+ 'conf.diff')
+backup=(etc/tenshi/tenshi.conf etc/conf.d/tenshi)
+md5sums=('9951f2995c4e08539a60026774da183a'
+ '94104e395d33c4f72cb6bbfe3591b7a0'
+ '302037a01958993b31988d3f50ee20b1'
+ 'd8a70806f3a2a498d9d8ef2ecb171ad8'
+ 'e9aed8f5cb265118c6481c061050f86b'
+ '451250b1955b14691ca1c7124d1991f2')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -i "$srcdir/conf.diff"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" docdir=/usr/share/doc/tenshi install
+ install -Dm644 "$srcdir/rc-conf" "$pkgdir/etc/conf.d/tenshi"
+ install -Dm755 "$srcdir/rc-script" "$pkgdir/etc/rc.d/tenshi"
+ install -Dm644 "$srcdir/tenshi.service" "$pkgdir/usr/lib/systemd/system/tenshi.service"
+ install -dm755 "$pkgdir/usr/share/licenses/tenshi"
+ mv "$pkgdir/usr/share/doc/tenshi/LICENSE" "$pkgdir/usr/share/licenses/tenshi/LICENSE"
+ chmod 750 "$pkgdir/etc/tenshi" "$pkgdir/var/lib/tenshi"
+}
Deleted: conf.diff
===================================================================
--- conf.diff 2013-01-22 10:54:01 UTC (rev 82638)
+++ conf.diff 2013-01-22 10:54:15 UTC (rev 82639)
@@ -1,13 +0,0 @@
---- tenshi_2011-01-01_194405.conf 2011-01-01 19:44:05.000000000 +0100
-+++ tenshi.conf 2011-01-01 19:44:23.000000000 +0100
-@@ -7,8 +7,8 @@
- set uid tenshi
- set gid tenshi
-
--set pidfile /var/run/tenshi.pid
--set logfile /var/log/messages
-+set pidfile /var/lib/tenshi/tenshi.pid
-+set logfile /var/log/everything.log
- set logfile /var/log/mail.log
- # set fifo /var/log/tenshi.fifo
- # set listen 127.0.0.1:514
Copied: tenshi/repos/community-any/conf.diff (from rev 82638, tenshi/trunk/conf.diff)
===================================================================
--- conf.diff (rev 0)
+++ conf.diff 2013-01-22 10:54:15 UTC (rev 82639)
@@ -0,0 +1,13 @@
+--- tenshi_2011-01-01_194405.conf 2011-01-01 19:44:05.000000000 +0100
++++ tenshi.conf 2011-01-01 19:44:23.000000000 +0100
+@@ -7,8 +7,8 @@
+ set uid tenshi
+ set gid tenshi
+
+-set pidfile /var/run/tenshi.pid
+-set logfile /var/log/messages
++set pidfile /var/lib/tenshi/tenshi.pid
++set logfile /var/log/everything.log
+ set logfile /var/log/mail.log
+ # set fifo /var/log/tenshi.fifo
+ # set listen 127.0.0.1:514
Deleted: rc-conf
===================================================================
--- rc-conf 2013-01-22 10:54:01 UTC (rev 82638)
+++ rc-conf 2013-01-22 10:54:15 UTC (rev 82639)
@@ -1,3 +0,0 @@
-TENSHI_CONFIG="/etc/tenshi/tenshi.conf"
-TENSHI_PID=`grep pidfile $TENSHI_CONFIG | cut -d\ -f3`
-TENSHI_OPTIONS="-c $TENSHI_CONFIG"
Copied: tenshi/repos/community-any/rc-conf (from rev 82638, tenshi/trunk/rc-conf)
===================================================================
--- rc-conf (rev 0)
+++ rc-conf 2013-01-22 10:54:15 UTC (rev 82639)
@@ -0,0 +1,3 @@
+TENSHI_CONFIG="/etc/tenshi/tenshi.conf"
+TENSHI_PID=`grep pidfile $TENSHI_CONFIG | cut -d\ -f3`
+TENSHI_OPTIONS="-c $TENSHI_CONFIG"
Deleted: rc-script
===================================================================
--- rc-script 2013-01-22 10:54:01 UTC (rev 82638)
+++ rc-script 2013-01-22 10:54:15 UTC (rev 82639)
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/tenshi ] && . /etc/conf.d/tenshi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`cat $TENSHI_PID 2>/dev/null`
-
-start() {
- stat_busy "Starting Tenshi log monitor"
- [ -z "$PID" ] && /usr/sbin/tenshi $TENSHI_OPTIONS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon tenshi
- stat_done
- fi
-}
-
-stop() {
- stat_busy "Stopping Tenshi log monitor"
- [ ! -z "$PID" ] && kill $PID
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f $TENSHI_PID
- rm_daemon tenshi
- stat_done
- fi
-}
-
-reload() {
- stat_busy "Reloading Tenshi log monitor"
- [ ! -z "$PID" ] && kill -HUP $PID
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- # calling 'stop' and 'start' without the $0 fails...
- $0 stop
- $0 start
- ;;
- reload)
- reload
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
Copied: tenshi/repos/community-any/rc-script (from rev 82638, tenshi/trunk/rc-script)
===================================================================
--- rc-script (rev 0)
+++ rc-script 2013-01-22 10:54:15 UTC (rev 82639)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# source application-specific settings
+[ -f /etc/conf.d/tenshi ] && . /etc/conf.d/tenshi
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`cat $TENSHI_PID 2>/dev/null`
+
+start() {
+ stat_busy "Starting Tenshi log monitor"
+ [ -z "$PID" ] && /usr/sbin/tenshi $TENSHI_OPTIONS
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon tenshi
+ stat_done
+ fi
+}
+
+stop() {
+ stat_busy "Stopping Tenshi log monitor"
+ [ ! -z "$PID" ] && kill $PID
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm -f $TENSHI_PID
+ rm_daemon tenshi
+ stat_done
+ fi
+}
+
+reload() {
+ stat_busy "Reloading Tenshi log monitor"
+ [ ! -z "$PID" ] && kill -HUP $PID
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ stat_done
+ fi
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ # calling 'stop' and 'start' without the $0 fails...
+ $0 stop
+ $0 start
+ ;;
+ reload)
+ reload
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+esac
+exit 0
Deleted: tenshi.install
===================================================================
--- tenshi.install 2013-01-22 10:54:01 UTC (rev 82638)
+++ tenshi.install 2013-01-22 10:54:15 UTC (rev 82639)
@@ -1,25 +0,0 @@
-post_install() {
- # create tenshi user
- if [ -z "`grep '^tenshi:' /etc/group`" ]; then
- groupadd tenshi
- fi
- if [ -z "`grep '^tenshi:' /etc/passwd`" ]; then
- useradd -d /var/lib/tenshi -g tenshi -s /bin/false tenshi
- else
- usermod -s /bin/false tenshi
- fi
-
- # set more secure permissions on config files, etc
- chown -R tenshi:tenshi /etc/tenshi
- chown -R tenshi:tenshi /var/lib/tenshi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- userdel tenshi &> /dev/null
- groupdel tenshi &> /dev/null
-}
-
Copied: tenshi/repos/community-any/tenshi.install (from rev 82638, tenshi/trunk/tenshi.install)
===================================================================
--- tenshi.install (rev 0)
+++ tenshi.install 2013-01-22 10:54:15 UTC (rev 82639)
@@ -0,0 +1,25 @@
+post_install() {
+ # create tenshi user
+ if [ -z "`grep '^tenshi:' /etc/group`" ]; then
+ groupadd tenshi
+ fi
+ if [ -z "`grep '^tenshi:' /etc/passwd`" ]; then
+ useradd -d /var/lib/tenshi -g tenshi -s /bin/false tenshi
+ else
+ usermod -s /bin/false tenshi
+ fi
+
+ # set more secure permissions on config files, etc
+ chown -R tenshi:tenshi /etc/tenshi
+ chown -R tenshi:tenshi /var/lib/tenshi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ userdel tenshi &> /dev/null
+ groupdel tenshi &> /dev/null
+}
+
Deleted: tenshi.service
===================================================================
--- tenshi.service 2013-01-22 10:54:01 UTC (rev 82638)
+++ tenshi.service 2013-01-22 10:54:15 UTC (rev 82639)
@@ -1,8 +0,0 @@
-[Unit]
-Description=real-time log monitor
-
-[Service]
-ExecStart=/usr/sbin/tenshi -c /etc/tenshi/tenshi.conf -f
-
-[Install]
-WantedBy=multi-user.target
Copied: tenshi/repos/community-any/tenshi.service (from rev 82638, tenshi/trunk/tenshi.service)
===================================================================
--- tenshi.service (rev 0)
+++ tenshi.service 2013-01-22 10:54:15 UTC (rev 82639)
@@ -0,0 +1,9 @@
+[Unit]
+Description=real-time log monitor
+
+[Service]
+ExecStart=/usr/sbin/tenshi -c /etc/tenshi/tenshi.conf -f
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list