Gentoo Archives: gentoo-commits

From: Austin English <wizardedit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/tinyproxy/files/
Date: Tue, 03 May 2016 19:18:04
Message-Id: 1462303021.2ea93f5a54590068eb88d68e889414e83cea51ed.wizardedit@gentoo
1 commit: 2ea93f5a54590068eb88d68e889414e83cea51ed
2 Author: Austin English <wizardedit <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 19:09:33 2016 +0000
4 Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 19:17:01 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea93f5a
7
8 net-proxy/tinyproxy: remove unused initd scripts
9
10 net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd | 45 -------------------------
11 net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd | 41 ----------------------
12 2 files changed, 86 deletions(-)
13
14 diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd
15 deleted file mode 100644
16 index d55aaae..0000000
17 --- a/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd
18 +++ /dev/null
19 @@ -1,45 +0,0 @@
20 -#!/sbin/runscript
21 -# Copyright 1999-2011 Gentoo Foundation
22 -# Distributed under the terms of the GNU General Public License v2
23 -# $Id$
24 -
25 -CONFFILE="/etc/${SVCNAME}.conf"
26 -
27 -depend() {
28 - use logger dns
29 - need net
30 -}
31 -
32 -checkconfig() {
33 - if [ ! -f "${CONFFILE}" ]; then
34 - eerror "Configuration file ${CONFFILE} not found!"
35 - return 1
36 - fi
37 -
38 - PIDFILE=$(sed -n -e 's/^[[:space:]]*PidFile[[:space:]]\+"\(.*\)"[[:space:]]*$/\1/p' "${CONFFILE}")
39 - return 0
40 -}
41 -
42 -start() {
43 - checkconfig || return 1
44 -
45 - ebegin "Starting tinyproxy"
46 - if [ -n "${PIDFILE}" ]; then
47 - start-stop-daemon --start --pidfile "${PIDFILE}" --startas /usr/sbin/tinyproxy -- -c "${CONFFILE}"
48 - else
49 - start-stop-daemon --start --exec /usr/sbin/tinyproxy -- -c "${CONFFILE}"
50 - fi
51 - eend $?
52 -}
53 -
54 -stop() {
55 - checkconfig || return 1
56 -
57 - ebegin "Stopping tinyproxy"
58 - if [ -n "${PIDFILE}" ]; then
59 - start-stop-daemon --stop --pidfile "${PIDFILE}"
60 - else
61 - start-stop-daemon --stop --exec /usr/sbin/tinyproxy
62 - fi
63 - eend $?
64 -}
65
66 diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd
67 deleted file mode 100644
68 index 0539996..0000000
69 --- a/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd
70 +++ /dev/null
71 @@ -1,41 +0,0 @@
72 -#!/sbin/runscript
73 -# Copyright 1999-2013 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -# $Id$
76 -
77 -get_config() {
78 - res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE")
79 -
80 - if [ "x$res" = "x" ]; then
81 - echo "$2"
82 - else
83 - eval echo "$res"
84 - fi
85 -}
86 -
87 -: ${CONFFILE:="/etc/${SVCNAME}.conf"}
88 -
89 -command=/usr/sbin/tinyproxy
90 -command_args="-c ${CONFFILE}"
91 -pidfile=$(get_config PidFile /var/run/tinyproxy/${SVCNAME}.pid)
92 -
93 -depend() {
94 - config "$CONFFILE"
95 -
96 - use dns
97 -
98 - [ "$(get_config Syslog Off)" = "On" ] && \
99 - use logger
100 -}
101 -
102 -start_pre() {
103 - piddir=$(dirname ${pidfile})
104 -
105 - if [ "${piddir}" = "/var/run" ]; then
106 - eerror "Please change your PidFile settings to be within the"
107 - eerror "/var/run/tinyproxy directory"
108 - eend 1
109 - else
110 - checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir}
111 - fi
112 -}