Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/stunnel/files: stunnel.rc6 stunnel.rc6.4.20 stunnel-4.21-libwrap.patch digest-stunnel-4.21 digest-stunnel-4.16
Date: Sat, 08 Dec 2007 10:38:34
Message-Id: E1J0x4k-0002iu-H8@stork.gentoo.org
1 ulm 07/12/08 10:38:26
2
3 Modified: stunnel.rc6
4 Added: stunnel.rc6.4.20 stunnel-4.21-libwrap.patch
5 digest-stunnel-4.21
6 Removed: digest-stunnel-4.16
7 Log:
8 Version bump, bug #197881.
9 (Portage version: 2.1.4_rc8)
10
11 Revision Changes Path
12 1.8 net-misc/stunnel/files/stunnel.rc6
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel.rc6?rev=1.8&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel.rc6?rev=1.8&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel.rc6?r1=1.7&r2=1.8
17
18 Index: stunnel.rc6
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6,v
21 retrieving revision 1.7
22 retrieving revision 1.8
23 diff -u -r1.7 -r1.8
24 --- stunnel.rc6 22 Jun 2005 04:28:25 -0000 1.7
25 +++ stunnel.rc6 8 Dec 2007 10:38:26 -0000 1.8
26 @@ -1,34 +1,34 @@
27 #!/sbin/runscript
28 -# Copyright 1999-2005 Gentoo Foundation
29 +# Copyright 1999-2007 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6,v 1.7 2005/06/22 04:28:25 ramereth Exp $
32
33 # Default pidfile location
34 PIDFILE="/var/run/stunnel/stunnel.pid"
35
36 checkconfig() {
37 - # To ensure backwards compatibility
38 - if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
39 - ewarn "Please update your stunnel.conf!"
40 - ewarn "pid should point to /var/run/stunnel/stunnel.pid"
41 - PIDFILE="/etc/stunnel/stunnel.pid"
42 - fi
43 + # To ensure backwards compatibility
44 + if grep -q /etc/stunnel/stunnel.pid /etc/stunnel/stunnel.conf; then
45 + ewarn "Please update your stunnel.conf!"
46 + ewarn "pid should point to /var/run/stunnel/stunnel.pid"
47 + PIDFILE="/etc/stunnel/stunnel.pid"
48 + fi
49 }
50
51 depend() {
52 - need net
53 + need net
54 }
55
56 start() {
57 - checkconfig
58 - ebegin "Starting stunnel"
59 - start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf
60 - eend $?
61 + checkconfig
62 + ebegin "Starting stunnel"
63 + start-stop-daemon --start --quiet --pidfile "${PIDFILE}" \
64 + --exec /usr/bin/stunnel -- /etc/stunnel/stunnel.conf
65 + eend $?
66 }
67
68 stop() {
69 - checkconfig
70 - ebegin "Stopping stunnel"
71 - start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
72 - eend $?
73 + checkconfig
74 + ebegin "Stopping stunnel"
75 + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
76 + eend $?
77 }
78
79
80
81 1.1 net-misc/stunnel/files/stunnel.rc6.4.20
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.20?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.20?rev=1.1&content-type=text/plain
85
86 Index: stunnel.rc6.4.20
87 ===================================================================
88 #!/sbin/runscript
89 # Copyright 1999-2005 Gentoo Foundation
90 # Distributed under the terms of the GNU General Public License v2
91 # $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.20,v 1.1 2007/12/08 10:38:26 ulm Exp $
92
93 # Default pidfile location
94 PIDFILE="/var/run/stunnel/stunnel.pid"
95
96 checkconfig() {
97 # To ensure backwards compatibility
98 if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
99 ewarn "Please update your stunnel.conf!"
100 ewarn "pid should point to /var/run/stunnel/stunnel.pid"
101 PIDFILE="/etc/stunnel/stunnel.pid"
102 fi
103 }
104
105 depend() {
106 need net
107 }
108
109 start() {
110 checkconfig
111 ebegin "Starting stunnel"
112 start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf
113 eend $?
114 }
115
116 stop() {
117 checkconfig
118 ebegin "Stopping stunnel"
119 start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
120 eend $?
121 }
122
123
124
125 1.1 net-misc/stunnel/files/stunnel-4.21-libwrap.patch
126
127 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel-4.21-libwrap.patch?rev=1.1&view=markup
128 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/stunnel-4.21-libwrap.patch?rev=1.1&content-type=text/plain
129
130 Index: stunnel-4.21-libwrap.patch
131 ===================================================================
132 --- stunnel-4.21/configure.ac 2007-08-09 00:43:10.000000000 +0200
133 +++ stunnel-4.21.new/configure.ac 2007-11-02 16:16:11.000000000 +0100
134 @@ -343,6 +343,7 @@
135 case "$enableval" in
136 yes) AC_MSG_RESULT([no])
137 AC_DEFINE(HAVE_LIBWRAP)
138 + LIBS="$LIBS -lwrap"
139 ;;
140 no) AC_MSG_RESULT([yes])
141 ;;
142
143
144
145 1.1 net-misc/stunnel/files/digest-stunnel-4.21
146
147 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/digest-stunnel-4.21?rev=1.1&view=markup
148 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/files/digest-stunnel-4.21?rev=1.1&content-type=text/plain
149
150 Index: digest-stunnel-4.21
151 ===================================================================
152 MD5 1eaec5228979beca4d548f453304e311 stunnel-4.21.tar.gz 528196
153 RMD160 e0f599bb44bbdd5178af9972110f71ee64cbf724 stunnel-4.21.tar.gz 528196
154 SHA256 b1121c1157c48320491f1929eb1f1c64ba20f76c7352c0df01c77cf09be19add stunnel-4.21.tar.gz 528196
155
156
157
158 --
159 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups