[arch-commits] Commit in tinyproxy/trunk (PKGBUILD tinyproxy tinyproxy.service)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Thu May 30 23:55:36 UTC 2013
Date: Friday, May 31, 2013 @ 01:55:35
Author: seblu
Revision: 92032
upgpkg: tinyproxy 1.8.3-7
- /usr merge
- remove rc.d
Modified:
tinyproxy/trunk/PKGBUILD
tinyproxy/trunk/tinyproxy.service
Deleted:
tinyproxy/trunk/tinyproxy
-------------------+
PKGBUILD | 10 ++++------
tinyproxy | 50 --------------------------------------------------
tinyproxy.service | 2 +-
3 files changed, 5 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-30 23:43:09 UTC (rev 92031)
+++ PKGBUILD 2013-05-30 23:55:35 UTC (rev 92032)
@@ -4,7 +4,7 @@
pkgname=tinyproxy
pkgver=1.8.3
-pkgrel=6
+pkgrel=7
pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
arch=('i686' 'x86_64')
url='https://banu.com/tinyproxy/'
@@ -13,18 +13,17 @@
install="${pkgname}.install"
backup=('etc/tinyproxy/tinyproxy.conf')
source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2"
- 'tinyproxy'
'tinyproxy.tmpfiles.conf'
'tinyproxy.service')
md5sums=('292ac51da8ad6ae883d4ebf56908400d'
- '90eb2b3371e56d5a784fd826d4a6e5f8'
'3c2764578f26581346fe312da0519a3e'
- '299ca484c08d9873c74e1eb96f6a5cc0')
+ '41938243faca487a14beeee5114f244e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var --enable-transparent
+ ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --sbindir=/usr/bin \
+ --localstatedir=/var --enable-transparent
make
}
@@ -32,7 +31,6 @@
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -Dm0755 "${srcdir}/tinyproxy" "${pkgdir}/etc/rc.d/tinyproxy"
install -Dm0644 "${srcdir}/tinyproxy.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/tinyproxy.conf"
install -dm0755 -o nobody -g nobody "${pkgdir}/var/log/${pkgname}"
Deleted: tinyproxy
===================================================================
--- tinyproxy 2013-05-30 23:43:09 UTC (rev 92031)
+++ tinyproxy 2013-05-30 23:55:35 UTC (rev 92032)
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/tinyproxy)
-
-start() {
- stat_busy "Starting Tinyproxy"
-
- [ -z "$PID" ] && rm -f /var/run/tinyproxy/tinyproxy.pid && \
- /usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf 2>/dev/null
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon tinyproxy
- stat_done
- fi
-}
-
-stop() {
- stat_busy "Stopping Tinyproxy"
-
- [ ! -z "$PID" ] && kill $PID &> /dev/null
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon tinyproxy
- stat_done
- fi
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Modified: tinyproxy.service
===================================================================
--- tinyproxy.service 2013-05-30 23:43:09 UTC (rev 92031)
+++ tinyproxy.service 2013-05-30 23:55:35 UTC (rev 92032)
@@ -4,7 +4,7 @@
[Service]
Type=forking
-ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
+ExecStart=/usr/bin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
PIDFile=/run/tinyproxy/tinyproxy.pid
[Install]
More information about the arch-commits
mailing list