|
1 # HG changeset patch |
|
2 # Parent 83cfabd19519f55d97af051a643dfdab63639525 |
|
3 fixed the init script |
|
4 |
|
5 diff --git a/debian/changelog b/debian/changelog |
|
6 --- a/debian/changelog |
|
7 +++ b/debian/changelog |
|
8 @@ -1,3 +1,19 @@ |
|
9 +havp (0.92a-2.ius.1) stable; urgency=low |
|
10 + |
|
11 + * Non-maintainer upload. |
|
12 + * fixed version string to ius |
|
13 + |
|
14 + -- Heiko Schlittermann <hs@schlittermann.de> Fri, 07 Oct 2011 15:51:29 +0200 |
|
15 + |
|
16 +havp (0.92a-2.1) stable; urgency=low |
|
17 + |
|
18 + * Non-maintainer upload. |
|
19 + * fixed init script and init script invocation |
|
20 + * pushed to 3.0 (quilt) source format |
|
21 + * added example config line to havp.config |
|
22 + |
|
23 + -- Heiko Schlittermann <hs@schlittermann.de> Fri, 07 Oct 2011 15:41:23 +0200 |
|
24 + |
|
25 havp (0.92a-2) stable; urgency=low |
|
26 |
|
27 * Non-maintainer upload. |
|
28 diff --git a/debian/compat b/debian/compat |
|
29 --- a/debian/compat |
|
30 +++ b/debian/compat |
|
31 @@ -1,1 +1,1 @@ |
|
32 -4 |
|
33 +7 |
|
34 diff --git a/debian/control b/debian/control |
|
35 --- a/debian/control |
|
36 +++ b/debian/control |
|
37 @@ -2,8 +2,9 @@ |
|
38 Section: net |
|
39 Priority: optional |
|
40 Maintainer: Rene Mayrhofer <rene.mayrhofer@gibraltar.at> |
|
41 -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libssl-dev, libclamav-dev, dpatch, docbook-to-man, po-debconf |
|
42 -Standards-Version: 3.8.1 |
|
43 +Build-Depends: debhelper (>= 7.0.0), autotools-dev, libssl-dev, libclamav-dev, docbook-to-man, po-debconf, |
|
44 + quilt (>= 0.46-7~) |
|
45 +Standards-Version: 3.9.1 |
|
46 |
|
47 Package: havp |
|
48 Architecture: any |
|
49 diff --git a/debian/havp.init b/debian/havp.init |
|
50 --- a/debian/havp.init |
|
51 +++ b/debian/havp.init |
|
52 @@ -1,11 +1,11 @@ |
|
53 #! /bin/sh |
|
54 ### BEGIN INIT INFO |
|
55 # Provides: havp |
|
56 -# Required-Start: $network |
|
57 -# Required-Stop: |
|
58 +# Required-Start: $network $remote_fs |
|
59 +# Required-Stop: $remote_fs $network |
|
60 # Should-Start: $named $time |
|
61 # Default-Start: 2 3 4 5 |
|
62 -# Default-Stop: 0 6 |
|
63 +# Default-Stop: 0 1 6 |
|
64 # Short-Description: HAVP virus-scanning HTTP proxy |
|
65 # Description: HAVP is a HTTP proxy that transparently scans all traffic for |
|
66 # viruses and blocks all infected files. |
|
67 @@ -95,9 +95,9 @@ |
|
68 # option to the "reload" entry above. If not, "force-reload" is |
|
69 # just the same as "restart". |
|
70 # |
|
71 -+ $0 stop |
|
72 + $0 stop |
|
73 sleep 1 |
|
74 -+ $0 start |
|
75 + $0 start |
|
76 ;; |
|
77 status) |
|
78 if [ ! -r $PIDFILE ]; then |
|
79 diff --git a/debian/havp.postinst b/debian/havp.postinst |
|
80 --- a/debian/havp.postinst |
|
81 +++ b/debian/havp.postinst |
|
82 @@ -37,7 +37,6 @@ |
|
83 fi |
|
84 # care for proper ownership in any case (e.g. updating from an earlier |
|
85 # havp package with different paths) |
|
86 - chown havp:havp /var/run/havp |
|
87 chown havp:havp /var/log/havp |
|
88 chown havp:havp /var/lib/havp |
|
89 chown havp:havp /var/spool/havp |
|
90 diff --git a/debian/havp.prerm b/debian/havp.prerm |
|
91 --- a/debian/havp.prerm |
|
92 +++ b/debian/havp.prerm |
|
93 @@ -1,4 +1,5 @@ |
|
94 #! /bin/sh |
|
95 +set -e |
|
96 # prerm script for havp |
|
97 # |
|
98 # see: dh_installdeb(1) |
|
99 diff --git a/debian/patches/00list b/debian/patches/00list |
|
100 deleted file mode 100644 |
|
101 --- a/debian/patches/00list |
|
102 +++ /dev/null |
|
103 @@ -1,3 +0,0 @@ |
|
104 -03_havp.config |
|
105 -04_params.cpp |
|
106 -05_add_ssltimeout_option |
|
107 \ No newline at end of file |
|
108 diff --git a/debian/patches/03_havp.config.dpatch b/debian/patches/03_havp.config.dpatch |
|
109 --- a/debian/patches/03_havp.config.dpatch |
|
110 +++ b/debian/patches/03_havp.config.dpatch |
|
111 @@ -1,39 +1,30 @@ |
|
112 -#! /bin/sh /usr/share/dpatch/dpatch-run |
|
113 -## 03_havp.config.dpatch by <mfladischer@home.fladi.at> |
|
114 -## adapted and cleaned up by Rene Mayrhofer |
|
115 -## |
|
116 -## All lines beginning with `## DP:' are a description of the patch. |
|
117 -## DP: Set PID file and SCANTEMPFILE to correct locations |
|
118 - |
|
119 -@DPATCH@ |
|
120 - |
|
121 ---- havp-0.85/etc/havp/havp.config.in.orig 2007-03-13 11:49:25.482732863 +0100 |
|
122 -+++ havp-0.85/etc/havp/havp.config.in 2007-03-13 11:50:33.667542226 +0100 |
|
123 +--- a/etc/havp/havp.config.in |
|
124 ++++ b/etc/havp/havp.config.in |
|
125 @@ -16,7 +16,7 @@ |
|
126 # You must remove this line for HAVP to start. |
|
127 # This makes sure you have (hopefully) reviewed the configuration. :) |
|
128 # Hint: You must enable some scanner! Find them in the end.. |
|
129 -REMOVETHISLINE deleteme |
|
130 +# REMOVETHISLINE deleteme |
|
131 - |
|
132 + |
|
133 # |
|
134 # For reasons of security it is recommended to run a proxy program |
|
135 -@@ -103,7 +103,7 @@ |
|
136 +@@ -113,7 +113,7 @@ |
|
137 # These characters are used by system to create unique named files. |
|
138 # |
|
139 # Default: |
|
140 -# SCANTEMPFILE /var/tmp/havp/havp-XXXXXX |
|
141 +# SCANTEMPFILE /var/spool/havp/havp-XXXXXX |
|
142 - |
|
143 + |
|
144 # |
|
145 - # Is scanner error fatal? |
|
146 -@@ -342,14 +342,14 @@ |
|
147 + # Directory for ClamAV and other scanner created tempfiles. |
|
148 +@@ -428,14 +428,14 @@ |
|
149 ##### ClamAV Library Scanner (libclamav) |
|
150 ##### |
|
151 - |
|
152 + |
|
153 -ENABLECLAMLIB false |
|
154 +ENABLECLAMLIB true |
|
155 - |
|
156 + |
|
157 # HAVP uses libclamav hardcoded pattern directory, which usually is |
|
158 -# /usr/local/share/clamav. You only need to set CLAMDBDIR, if you are |
|
159 +# /usr/share/clamav. You only need to set CLAMDBDIR, if you are |
|
160 @@ -42,6 +33,16 @@ |
|
161 # Default: NONE |
|
162 -# CLAMDBDIR /path/to/directory |
|
163 +# CLAMDBDIR /var/lib/clamav |
|
164 - |
|
165 - # Should we block encrypted archives? |
|
166 + |
|
167 + # Should we block broken executables? |
|
168 # |
|
169 +@@ -662,3 +662,9 @@ |
|
170 + # DRWEBSERVER 127.0.0.1 |
|
171 + # DRWEBPORT 3000 |
|
172 + |
|
173 ++# SSL connections may be silent for a while (mostly when "abused" |
|
174 ++# for other communication than HTTP). HAVP disconnects these connections |
|
175 ++# after several seconds. |
|
176 ++# |
|
177 ++# Default: |
|
178 ++# SSLTIMEOUT 20 |
|
179 diff --git a/debian/patches/04_params.cpp.dpatch b/debian/patches/04_params.cpp.dpatch |
|
180 --- a/debian/patches/04_params.cpp.dpatch |
|
181 +++ b/debian/patches/04_params.cpp.dpatch |
|
182 @@ -1,20 +1,12 @@ |
|
183 -#! /bin/sh /usr/share/dpatch/dpatch-run |
|
184 -## 04_params.cpp.dpatch by <mfladischer@home.fladi.at> |
|
185 -## adapted and cleaned up by Rene Mayrhofer |
|
186 -## |
|
187 -## All lines beginning with `## DP:' are a description of the patch. |
|
188 -## DP: Set PID file and SCANTEMPFILE to correct locations |
|
189 - |
|
190 -@DPATCH@ |
|
191 - |
|
192 ---- havp-0.85/havp/params.cpp.orig 2007-03-13 11:50:45.812848266 +0100 |
|
193 -+++ havp-0.85/havp/params.cpp 2007-03-13 11:51:19.209457684 +0100 |
|
194 -@@ -62,7 +62,7 @@ |
|
195 +--- a/havp/params.cpp |
|
196 ++++ b/havp/params.cpp |
|
197 +@@ -70,8 +70,8 @@ |
|
198 + SetConfig("WHITELIST", WHITELISTFILE); |
|
199 SetConfig("BLACKLIST", BLACKLISTFILE); |
|
200 SetConfig("TEMPLATEPATH", TEMPLATEPATH); |
|
201 - SetConfig("TEMPDIR", "/var/tmp"); |
|
202 +- SetConfig("SCANTEMPFILE", "/var/tmp/havp/havp-XXXXXX"); |
|
203 + SetConfig("TEMPDIR", "/var/spool/havp"); |
|
204 -- SetConfig("SCANTEMPFILE", "/var/tmp/havp/havp-XXXXXX"); |
|
205 + SetConfig("SCANTEMPFILE", "/var/spool/havp/havp-XXXXXX"); |
|
206 SetConfig("PIDFILE", PIDFILE); |
|
207 SetConfig("TRANSPARENT", "false"); |
|
208 diff --git a/debian/patches/05_add_ssltimeout_option.dpatch b/debian/patches/05_add_ssltimeout_option.dpatch |
|
209 --- a/debian/patches/05_add_ssltimeout_option.dpatch |
|
210 +++ b/debian/patches/05_add_ssltimeout_option.dpatch |
|
211 @@ -1,12 +1,3 @@ |
|
212 -#! /bin/sh /usr/share/dpatch/dpatch-run |
|
213 -## 05_add_ssltimeout_option.dpatch by Rene Mayrhofer, adapted from a patch by |
|
214 -## Heiko Schlittermann |
|
215 -## |
|
216 -## All lines beginning with `## DP:' are a description of the patch. |
|
217 -## DP: Add SSLTIMEOUT config option |
|
218 - |
|
219 -@DPATCH@ |
|
220 - |
|
221 --- a/havp/default.h.in |
|
222 +++ b/havp/default.h.in |
|
223 @@ -36,6 +36,7 @@ |
|
224 @@ -17,11 +8,9 @@ |
|
225 "MAXDOWNLOADSIZE","SCANNERTIMEOUT","STREAMUSERAGENT","STREAMSCANSIZE","SCANIMAGES", \ |
|
226 "SKIPMIME","SCANMIME", \ |
|
227 "ENABLECLAMLIB","CLAMDBDIR","CLAMBLOCKBROKEN","CLAMBLOCKMAX","CLAMBLOCKENCRYPTED", \ |
|
228 -diff --git a/havp/params.cpp b/havp/params.cpp |
|
229 -index 0f83c0c..5a18913 100644 |
|
230 --- a/havp/params.cpp |
|
231 +++ b/havp/params.cpp |
|
232 -@@ -86,6 +86,7 @@ void Params::SetDefaults() |
|
233 +@@ -86,6 +86,7 @@ |
|
234 SetConfig("SCANNERTIMEOUT", "10"); |
|
235 SetConfig("IGNOREVIRUS", ""); |
|
236 SetConfig("DISABLELOCKINGFOR","AVG:ALL"); |
|
237 @@ -29,11 +18,9 @@ |
|
238 //SCANNERS |
|
239 SetConfig("ENABLECLAMLIB","false"); |
|
240 SetConfig("CLAMDBDIR",""); |
|
241 -diff --git a/havp/sockethandler.cpp b/havp/sockethandler.cpp |
|
242 -index 28a119a..4cb5f24 100644 |
|
243 --- a/havp/sockethandler.cpp |
|
244 +++ b/havp/sockethandler.cpp |
|
245 -@@ -582,7 +582,7 @@ int SocketHandler::CheckForSSLData( int sockBrowser, int sockServer ) |
|
246 +@@ -582,7 +582,7 @@ |
|
247 fds = sockServer; |
|
248 } |
|
249 |
|
250 diff --git a/debian/patches/series b/debian/patches/series |
|
251 new file mode 100644 |
|
252 --- /dev/null |
|
253 +++ b/debian/patches/series |
|
254 @@ -0,0 +1,3 @@ |
|
255 +03_havp.config.dpatch |
|
256 +04_params.cpp.dpatch |
|
257 +05_add_ssltimeout_option.dpatch |
|
258 diff --git a/debian/rules b/debian/rules |
|
259 --- a/debian/rules |
|
260 +++ b/debian/rules |
|
261 @@ -72,11 +72,12 @@ |
|
262 install: build |
|
263 dh_testdir |
|
264 dh_testroot |
|
265 - dh_clean -k |
|
266 + dh_prep |
|
267 dh_installdirs |
|
268 |
|
269 # Add here commands to install the package into debian/havp. |
|
270 $(MAKE) install DESTDIR=$(CURDIR)/debian/havp |
|
271 + rmdir $(CURDIR)/debian/havp/var/run/havp |
|
272 |
|
273 # clean up to make lintian shut up... |
|
274 rm -r $(CURDIR)/debian/havp/var/tmp |
|
275 @@ -96,7 +97,7 @@ |
|
276 dh_installdocs |
|
277 dh_installexamples |
|
278 dh_installlogrotate |
|
279 - dh_installinit --error-handler=init_error |
|
280 + dh_installinit --error-handler=init_error |
|
281 dh_installman havp.1 |
|
282 dh_link |
|
283 dh_strip |
|
284 @@ -110,12 +111,12 @@ |
|
285 |
|
286 patch: patch-stamp |
|
287 patch-stamp: |
|
288 - dpatch apply-all |
|
289 - dpatch cat-all >patch-stamp |
|
290 + dh_quilt_patch |
|
291 + touch patch-stamp |
|
292 |
|
293 unpatch: |
|
294 - dpatch deapply-all |
|
295 - rm -rf patch-stamp debian/patched |
|
296 + dh_quilt_unpatch |
|
297 + rm -rf patch-stamp |
|
298 |
|
299 binary: binary-indep binary-arch |
|
300 .PHONY: build clean binary-indep binary-arch binary install |
|
301 diff --git a/debian/source/format b/debian/source/format |
|
302 new file mode 100644 |
|
303 --- /dev/null |
|
304 +++ b/debian/source/format |
|
305 @@ -0,0 +1,1 @@ |
|
306 +3.0 (quilt) |
|
307 diff --git a/debian/source/options b/debian/source/options |
|
308 new file mode 100644 |
|
309 --- /dev/null |
|
310 +++ b/debian/source/options |
|
311 @@ -0,0 +1,1 @@ |
|
312 +tar-ignore |
|
313 diff --git a/etc/havp/templates/ru/blacklist.html b/etc/havp/templates/ru/blacklist.html |
|
314 old mode 100755 |
|
315 new mode 100644 |
|
316 diff --git a/etc/havp/templates/ru/dns.html b/etc/havp/templates/ru/dns.html |
|
317 old mode 100755 |
|
318 new mode 100644 |
|
319 diff --git a/etc/havp/templates/ru/down.html b/etc/havp/templates/ru/down.html |
|
320 old mode 100755 |
|
321 new mode 100644 |
|
322 diff --git a/etc/havp/templates/ru/error.html b/etc/havp/templates/ru/error.html |
|
323 old mode 100755 |
|
324 new mode 100644 |
|
325 diff --git a/etc/havp/templates/ru/invalid.html b/etc/havp/templates/ru/invalid.html |
|
326 old mode 100755 |
|
327 new mode 100644 |
|
328 diff --git a/etc/havp/templates/ru/request.html b/etc/havp/templates/ru/request.html |
|
329 old mode 100755 |
|
330 new mode 100644 |
|
331 diff --git a/etc/havp/templates/ru/scanner.html b/etc/havp/templates/ru/scanner.html |
|
332 old mode 100755 |
|
333 new mode 100644 |
|
334 diff --git a/etc/havp/templates/ru/virus.html b/etc/havp/templates/ru/virus.html |
|
335 old mode 100755 |
|
336 new mode 100644 |