Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/ufdbguard/files/, net-proxy/ufdbguard/
Date: Thu, 29 Dec 2016 12:56:53
Message-Id: 1483016179.1c84f048f7a6ecdd05e7452a32e6dfee9ef915ab.soap@gentoo
1 commit: 1c84f048f7a6ecdd05e7452a32e6dfee9ef915ab
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 12:51:24 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 12:56:19 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c84f048
7
8 net-proxy/ufdbguard: Remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 net-proxy/ufdbguard/Manifest | 4 -
13 .../files/ufdbguard-1.23-parallel-make.patch | 133 --------------------
14 .../files/ufdbguard-1.29-parallel-make.patch | 132 --------------------
15 net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild | 132 --------------------
16 net-proxy/ufdbguard/ufdbguard-1.29.ebuild | 136 ---------------------
17 5 files changed, 537 deletions(-)
18
19 diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
20 index 015427e..e44ac3c 100644
21 --- a/net-proxy/ufdbguard/Manifest
22 +++ b/net-proxy/ufdbguard/Manifest
23 @@ -1,6 +1,2 @@
24 -DIST ufdbGuard-1.24.tar.gz 747635 SHA256 6e5df4ef7f5d13d1ad2a0902449c9909cc013242f3783925800df5011bd3446c SHA512 980cdd7785e6e8dd04cf9004bae0361bdba614b5c1683f113fc7ce49da029089b73850393226f4ea001fe6d1f43008b167a7b1fa3579a9616ffbcf15a5a4f4cb WHIRLPOOL d29e6f2c4f9a5c6a857ce64c8865257cdf4743a835fb81b1bc1463cd4eae391488e98061a04135e053fe03480134f599ac232ca339866a8755029f4e95675d28
25 -DIST ufdbGuard-1.29.tar.gz 948006 SHA256 f97a683fba5e1867b9bde16d0ec118651b93ae419037d3fad0144c95add8bed6 SHA512 06e286508eba8081aecaa31021f18385f163f87edae90a4b399e0f3ca0d06165f5ac11baa5b615bdaaf9bbc03c107c69103f05761904fc06a0715c8f44abdc58 WHIRLPOOL 84d43ba2b5108acb9fc4ac0013d27c7f47dbb9ad6b7b6277853278b32a9040e0865e897b8bf5a3963216d3303506f90fe0844d9f5b49614154087eb0339f300d
26 DIST ufdbGuard-1.32.4.tar.gz 2499206 SHA256 037d2652087a544e4bfa10fefcb9e155e730536baf39331b3e9dca26c605e3df SHA512 189cb67c533ab71ba1d3292a376d746e0565a3bf5de17f4407c5892ee24c20cd2574752bdcb08be19621a93114cc69a89767c581d531027ecbf6487ef3119d91 WHIRLPOOL 56ae089ff7463bf2184ae04d15105fe183fa39be807b8440fbd0b4520d47282136e4f07cd5821502a57b2698aab37b8e3ff585b69a2b553bd08c4bbe00f6022d
27 -DIST ufdbguard-1.24-manual.pdf 491034 SHA256 7185161d912202510ec1767fc0239f48c2a98f948afb3a207ea55c341e03e459 SHA512 64e3102e44c9db18e7f43bcd6743c36034400dfbeef572810feaf3adb7d762511b6fa57d09e934eb92abd9e84fdd838d898ab5f386da6e96d936e2626bcbfd51 WHIRLPOOL d06ac95dc5df217a4a5a15eaf847af431098c2f35510fa8c03a313c37c71eb325efdd5e50d4e0999e6a70f63f62db9d46c633c5a994c4f40a0662a7058220f8c
28 -DIST ufdbguard-1.29-manual.pdf 513184 SHA256 00b75668ca82037c9be6eab3a83755189890b2a3bb239409db765195f26c2f8b SHA512 9b321202a60428e7962087b19b7e0b72241fdb99d5068e68dceadf3087b85d56e11c80e3a410b101aae35f9f5f179ee0e13053024c29ff0868c39ed645edcbb2 WHIRLPOOL cd1573102abe6b4d359520930491b6a2fbef0601bcdccaaf78adf79bbf570c48bbfa1f0bb5e5e0b9ab9360cc9ca41643e2cbed2140414603bdca7bca32bbecf9
29 DIST ufdbguard-1.32.4-manual.pdf 642626 SHA256 42a954d45697a1ea7c4dc8d97faa7e02e2f52414461b4bf73fe975a7a3ebb57d SHA512 98444689c07da3ce9937675b45607ea88fc5a10c65051746cd821650788ec21cbc836a043a486de51813b85d836e255bb3a64a62252808dfe93310e6e169fdb1 WHIRLPOOL 2cb798f2e201e1b7e203ae9d8742336c2b0036b139a842df6c5943a52d4e118aaea97d68fc9e8dbec15a489273f96191c45c82263208fab0644b16c0eabece1d
30
31 diff --git a/net-proxy/ufdbguard/files/ufdbguard-1.23-parallel-make.patch b/net-proxy/ufdbguard/files/ufdbguard-1.23-parallel-make.patch
32 deleted file mode 100644
33 index 3f95f2c..00000000
34 --- a/net-proxy/ufdbguard/files/ufdbguard-1.23-parallel-make.patch
35 +++ /dev/null
36 @@ -1,133 +0,0 @@
37 ---- a/src/Makefile.in 2010-04-12 04:39:43.000000000 +0200
38 ---- b/src/Makefile.in 2010-05-07 05:26:03.000000000 +0200
39 -@@ -135,8 +135,8 @@
40 - # Dependencies for installing
41 - #
42 -
43 --daemon:
44 -- cd mtserver; make
45 -+daemon: $(UFDBOBJS)
46 -+ cd mtserver; $(MAKE)
47 -
48 - ufdbhttpd: ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o
49 - $(LINK) ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o $(LIBS)
50 -@@ -235,7 +235,7 @@
51 - $(RM) $(bindir)/ufdbhttpd
52 -
53 - install.mt::
54 -- cd mtserver ; make
55 -+ cd mtserver ; $(MAKE)
56 - $(INSTALL_PROGRAM) mtserver/ufdbguardd $(bindir)/ufdbguardd
57 - $(INSTALL_PROGRAM) mtserver/ufdbgclient $(bindir)/ufdbgclient
58 -
59 -@@ -272,8 +272,8 @@
60 - $(RM) *~ *.bak core core.* *.log *.log.[0-9] *.error
61 - $(RM) *.o y.tab.c y.tab.h ufdbGuard ufdbGenTable ufdbAnalyse ufdbPrintTable ufdbhttpd
62 - $(RM) ipv6 iptst rwtest lex.yy.c
63 -- -@cd mtserver && make clean
64 -- -@cd api 2>/dev/null && make clean
65 -+ -@cd mtserver && $(MAKE) clean
66 -+ -@cd api 2>/dev/null && $(MAKE) clean
67 -
68 - realclean:: clean
69 - @echo making $@ in `basename \`pwd\``
70 -@@ -286,11 +286,11 @@
71 - distclean:: realclean
72 - @echo making $@ in `basename \`pwd\``
73 - $(RM) Makefile sg.h config.h ufdbUpdate ufdbConvertDB ufdbGuard.conf
74 -- -cd mtserver ; make distclean
75 -+ -cd mtserver ; $(MAKE) distclean
76 -
77 - apidistclean: distclean
78 - @echo making $@ in `basename \`pwd\``
79 -- -cd api ; make distclean
80 -+ -cd api ; $(MAKE) distclean
81 -
82 - grab: ufdbGrab
83 - ./ufdbGrab $(cfgdir) $(logdir)
84 -@@ -532,25 +532,25 @@
85 - $(CC) --version
86 -
87 - g2953:
88 -- make clean
89 -- CC=/usr/local/gcc/2.95.3/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
90 -+ $(MAKE) clean
91 -+ CC=/usr/local/gcc/2.95.3/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
92 -
93 - g344:
94 -- make clean
95 -- CC=/usr/local/gcc/3.4.4/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
96 -+ $(MAKE) clean
97 -+ CC=/usr/local/gcc/3.4.4/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
98 -
99 - g401:
100 -- make clean
101 -- CC=/usr/local/gcc/4.0.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
102 -+ $(MAKE) clean
103 -+ CC=/usr/local/gcc/4.0.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
104 -
105 - g411:
106 -- make clean
107 -- CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
108 -+ $(MAKE) clean
109 -+ CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
110 -
111 - qinst:
112 - /etc/init.d/squid stop
113 - /etc/init.d/ufdb stop
114 -- make install
115 -+ $(MAKE) install
116 - /etc/init.d/ufdb start
117 - /etc/init.d/squid start
118 -
119 ---- a/src/mtserver/Makefile.in 2010-04-12 02:56:20.000000000 +0200
120 ---- b/src/mtserver/Makefile.in 2010-05-07 05:26:03.000000000 +0200
121 -@@ -48,10 +48,10 @@
122 - $(LINK) ufdbgclient.o -L. -lufdbd $(SOLARIS_LIBS)
123 -
124 - ../lex.yy.o:
125 -- cd .. ; make lex.yy.o
126 -+ cd .. ; $(MAKE) lex.yy.o
127 -
128 - ../y.tab.o:
129 -- cd .. ; make y.tab.o
130 -+ cd .. ; $(MAKE) y.tab.o
131 -
132 - $(MYLIB): ../crypt.o ../lex.yy.o ../sgDiv.o ../sgLog.o ../ufdbLookup.o \
133 - ../ufdblib.o ../y.tab.o ../ufdbbase.o
134 -@@ -60,7 +60,7 @@
135 - ../ufdblib.o ../y.tab.o ../ufdbbase.o
136 -
137 - ptmalloc3/libptmalloc3.a:
138 -- cd ptmalloc3 ; make linux-pthread
139 -+ cd ptmalloc3 ; $(MAKE) linux-pthread
140 -
141 - $(MYLIBSSL): ../ufdbchkport.o ../httpsQueue.o ../ufdbHashtable.o
142 - -@rm -f $(MYLIBSSL)
143 -@@ -102,7 +102,7 @@
144 - ./ufdbgclient -p $(PORT) -l . -d "www.sex.com" 10.1.1.1 kees
145 -
146 - ../../test/blacklist/domains.ufdb: ../../test/blacklist/domains
147 -- cd ../../test ; make blacklist/domains.ufdb
148 -+ cd ../../test ; $(MAKE) blacklist/domains.ufdb
149 -
150 - LEAKOPTS= --leak-check=full --show-reachable=yes
151 - LEAKOPTS=
152 -@@ -382,7 +382,7 @@
153 - time ./ufdbgclient -p $(PORT) -l . < ../100000 > /dev/null 2>&1
154 -
155 - tt:
156 -- make tp3
157 -+ $(MAKE) tp3
158 - sleep 3
159 - kill -HUP `ps -ef | grep ufdbguardd | grep -v grep | head -1 | awk '{ print $$2 }'`
160 -
161 -@@ -455,6 +455,6 @@
162 -
163 -
164 - g411:
165 -- make clean
166 -- CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) all
167 -+ $(MAKE) clean
168 -+ CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) all
169 -
170
171 diff --git a/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch b/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch
172 deleted file mode 100644
173 index 61ef580..00000000
174 --- a/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch
175 +++ /dev/null
176 @@ -1,132 +0,0 @@
177 ---- a/src/Makefile.in 2010-04-12 04:39:43.000000000 +0200
178 ---- b/src/Makefile.in 2010-05-07 05:26:03.000000000 +0200
179 -@@ -135,8 +135,8 @@
180 - # Dependencies for installing
181 - #
182 -
183 --daemon:
184 -- cd mtserver; make
185 -+daemon: $(UFDBOBJS)
186 -+ cd mtserver; $(MAKE)
187 -
188 - ufdbhttpd: ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o
189 - $(LINK) ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o $(LIBS)
190 -@@ -235,6 +235,6 @@
191 - $(RM) $(bindir)/ufdbhttpd
192 -
193 - install.mt::
194 -- cd mtserver ; make
195 -+ cd mtserver ; $(MAKE)
196 - $(INSTALL_PROGRAM) mtserver/ufdbguardd $(bindir)/ufdbguardd
197 - $(INSTALL_PROGRAM) mtserver/ufdbgclient $(bindir)/ufdbgclient
198 -@@ -272,8 +272,8 @@
199 - $(RM) *~ *.bak core core.* *.log *.log.[0-9] *.error
200 - $(RM) *.o y.tab.c y.tab.h ufdbGuard ufdbGenTable ufdbAnalyse ufdbPrintTable ufdbhttpd
201 - $(RM) ipv6 iptst rwtest lex.yy.c
202 -- -@cd mtserver && make clean
203 -- -@cd api 2>/dev/null && make clean
204 -+ -@cd mtserver && $(MAKE) clean
205 -+ -@cd api 2>/dev/null && $(MAKE) clean
206 -
207 - realclean:: clean
208 - @echo making $@ in `basename \`pwd\``
209 -@@ -286,11 +286,11 @@
210 - distclean:: realclean
211 - @echo making $@ in `basename \`pwd\``
212 - $(RM) Makefile sg.h config.h ufdbUpdate ufdbConvertDB ufdbGuard.conf
213 -- -cd mtserver ; make distclean
214 -+ -cd mtserver ; $(MAKE) distclean
215 -
216 - apidistclean: distclean
217 - @echo making $@ in `basename \`pwd\``
218 -- -cd api ; make distclean
219 -+ -cd api ; $(MAKE) distclean
220 -
221 - grab: ufdbGrab
222 - ./ufdbGrab $(cfgdir) $(logdir)
223 -@@ -532,25 +532,25 @@
224 - $(CC) --version
225 -
226 - g2953:
227 -- make clean
228 -- CC=/usr/local/gcc/2.95.3/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
229 -+ $(MAKE) clean
230 -+ CC=/usr/local/gcc/2.95.3/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
231 -
232 - g344:
233 -- make clean
234 -- CC=/usr/local/gcc/3.4.4/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
235 -+ $(MAKE) clean
236 -+ CC=/usr/local/gcc/3.4.4/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
237 -
238 - g401:
239 -- make clean
240 -- CC=/usr/local/gcc/4.0.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
241 -+ $(MAKE) clean
242 -+ CC=/usr/local/gcc/4.0.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
243 -
244 - g411:
245 -- make clean
246 -- CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
247 -+ $(MAKE) clean
248 -+ CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
249 -
250 - qinst:
251 - /etc/init.d/squid stop
252 - /etc/init.d/ufdb stop
253 -- make install
254 -+ $(MAKE) install
255 - /etc/init.d/ufdb start
256 - /etc/init.d/squid start
257 -
258 ---- a/src/mtserver/Makefile.in 2010-04-12 02:56:20.000000000 +0200
259 ---- b/src/mtserver/Makefile.in 2010-05-07 05:26:03.000000000 +0200
260 -@@ -48,10 +48,10 @@
261 - $(LINK) ufdbgclient.o -L. -lufdbd $(SOLARIS_LIBS)
262 -
263 - ../lex.yy.o:
264 -- cd .. ; make lex.yy.o
265 -+ cd .. ; $(MAKE) lex.yy.o
266 -
267 - ../y.tab.o:
268 -- cd .. ; make y.tab.o
269 -+ cd .. ; $(MAKE) y.tab.o
270 -
271 - $(MYLIB): ../crypt.o ../lex.yy.o ../sgDiv.o ../sgLog.o ../ufdbLookup.o \
272 - ../ufdblib.o ../y.tab.o ../ufdbbase.o
273 -@@ -60,7 +60,7 @@
274 - ../ufdblib.o ../y.tab.o ../ufdbbase.o
275 -
276 - ptmalloc3/libptmalloc3.a:
277 -- cd ptmalloc3 ; make linux-pthread
278 -+ cd ptmalloc3 ; $(MAKE) linux-pthread
279 -
280 - $(MYLIBSSL): ../ufdbchkport.o ../httpsQueue.o ../ufdbHashtable.o
281 - -@rm -f $(MYLIBSSL)
282 -@@ -102,7 +102,7 @@
283 - ./ufdbgclient -p $(PORT) -l . -d "www.sex.com" 10.1.1.1 kees
284 -
285 - ../../test/blacklist/domains.ufdb: ../../test/blacklist/domains
286 -- cd ../../test ; make blacklist/domains.ufdb
287 -+ cd ../../test ; $(MAKE) blacklist/domains.ufdb
288 -
289 - LEAKOPTS= --leak-check=full --show-reachable=yes
290 - LEAKOPTS=
291 -@@ -382,7 +382,7 @@
292 - time ./ufdbgclient -p $(PORT) -l . < ../100000 > /dev/null 2>&1
293 -
294 - tt:
295 -- make tp3
296 -+ $(MAKE) tp3
297 - sleep 3
298 - kill -HUP `ps -ef | grep ufdbguardd | grep -v grep | head -1 | awk '{ print $$2 }'`
299 -
300 -@@ -455,6 +455,6 @@
301 -
302 -
303 - g411:
304 -- make clean
305 -- CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) all
306 -+ $(MAKE) clean
307 -+ CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) all
308 -
309
310 diff --git a/net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild b/net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild
311 deleted file mode 100644
312 index 483d900..00000000
313 --- a/net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild
314 +++ /dev/null
315 @@ -1,132 +0,0 @@
316 -# Copyright 1999-2015 Gentoo Foundation
317 -# Distributed under the terms of the GNU General Public License v2
318 -# $Id$
319 -
320 -EAPI="2"
321 -
322 -inherit eutils user
323 -
324 -MY_P="ufdbGuard-${PV}"
325 -
326 -DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy"
327 -HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
328 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
329 - doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
330 -
331 -LICENSE="GPL-2"
332 -SLOT="0"
333 -KEYWORDS="~amd64 x86"
334 -IUSE="+httpd doc"
335 -
336 -RDEPEND="dev-libs/openssl
337 - app-arch/bzip2
338 - net-misc/wget"
339 -
340 -DEPEND="${RDEPEND}
341 - sys-devel/bison
342 - sys-devel/flex"
343 -
344 -RDEPEND="${RDEPEND}
345 - sys-apps/openrc"
346 -
347 -S="${WORKDIR}/${MY_P}"
348 -
349 -pkg_setup() {
350 - enewgroup squid
351 - enewuser squid -1 -1 /var/cache/squid squid
352 -}
353 -
354 -src_prepare() {
355 - epatch "${FILESDIR}"/${PN}-1.23-parallel-make.patch
356 - epatch "${FILESDIR}"/${P}-gentoo.patch
357 -
358 - egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
359 - sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
360 - || die
361 -
362 - # directory where ufdbhttpd is to be found
363 - sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
364 - src/ufdb.h.in || die
365 -}
366 -
367 -src_configure() {
368 - econf \
369 - --with-ufdb-user=squid \
370 - --with-ufdb-config=/etc \
371 - --with-ufdb-logdir=/var/log/ufdbguard \
372 - --with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
373 - --with-ufdb-images_dir=/usr/share/ufdbguard/images
374 -}
375 -
376 -src_install() {
377 - dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf || die
378 - doman doc/*.1 || die
379 -
380 - dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
381 - src/ufdbConvertDB || die
382 - dosbin src/ufdbUpdate || die
383 -
384 - exeinto /usr/libexec/ufdbguard
385 - doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient || die
386 -
387 - if use httpd; then
388 - exeinto /usr/libexec/ufdbguard
389 - doexe src/ufdbhttpd || die
390 - fi
391 -
392 - keepdir /usr/share/ufdbguard/blacklists
393 -
394 - insinto /etc
395 - doins src/ufdbGuard.conf || die
396 -
397 - insinto /usr/share/ufdbguard/images
398 - doins src/images/* || die
399 -
400 - newconfd "${FILESDIR}"/ufdb.confd ufdb || die
401 - newinitd "${FILESDIR}"/ufdb.initd ufdb || die
402 -
403 - exeinto /etc/cron.daily
404 - newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate || die
405 -
406 - if use doc; then
407 - insinto /usr/share/doc/${PF}
408 - newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf || die
409 - fi
410 -}
411 -
412 -pkg_postinst() {
413 - elog "The default location for the blacklist database has been"
414 - elog "moved to /usr/share/ufdbguard/blacklists."
415 - elog ""
416 - elog "The configuration file is no longer configurable in the"
417 - elog "service file, and now resides at /etc/ufdbGuard.conf ."
418 - elog ""
419 - elog "The service script has been renamed from ufdbguad to simply"
420 - elog "/etc/init.d/ufdb, to follow the official documentation, and"
421 - elog "it gained a reload option with a reconfig alias."
422 - elog ""
423 - elog "You can configure the username and password parameters for"
424 - elog "ufdbUpdate, to fetch the blacklist database provided by"
425 - elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
426 - elog "the script itself."
427 - elog ""
428 - elog "To enable ufdbguard in squid, you should add this to your"
429 - elog "squid.conf:"
430 - elog ""
431 - elog " url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
432 - elog " url_rewrite_children 64"
433 - elog ""
434 - if ! use httpd; then
435 - elog "You chose to not install the lightweight http daemon that"
436 - elog "comes with ufdbguard."
437 - else
438 - elog "The ufdb service will start both the ufdbguardd daemon and"
439 - elog "the ufdbhttpd http daemon to provide a local redirect CGI."
440 - elog "If you don't want this to happen, disable the httpd USE flag."
441 - fi
442 - if use doc; then
443 - elog ""
444 - elog "The reference manual has been installed as"
445 - elog " /usr/share/doc/${PF}/ReferenceManual.pdf"
446 - fi
447 -}
448
449 diff --git a/net-proxy/ufdbguard/ufdbguard-1.29.ebuild b/net-proxy/ufdbguard/ufdbguard-1.29.ebuild
450 deleted file mode 100644
451 index 4b55345..00000000
452 --- a/net-proxy/ufdbguard/ufdbguard-1.29.ebuild
453 +++ /dev/null
454 @@ -1,136 +0,0 @@
455 -# Copyright 1999-2015 Gentoo Foundation
456 -# Distributed under the terms of the GNU General Public License v2
457 -# $Id$
458 -
459 -EAPI="4"
460 -
461 -inherit eutils flag-o-matic user
462 -
463 -MY_P="ufdbGuard-${PV}"
464 -
465 -DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy"
466 -HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
467 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
468 - doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
469 -
470 -LICENSE="GPL-2"
471 -SLOT="0"
472 -KEYWORDS="~amd64 ~x86"
473 -IUSE="+httpd doc"
474 -
475 -RDEPEND="dev-libs/openssl
476 - app-arch/bzip2
477 - net-misc/wget"
478 -
479 -DEPEND="${RDEPEND}
480 - sys-devel/bison
481 - sys-devel/flex"
482 -
483 -RDEPEND="${RDEPEND}
484 - sys-apps/openrc"
485 -
486 -S="${WORKDIR}/${MY_P}"
487 -
488 -pkg_setup() {
489 - enewgroup squid
490 - enewuser squid -1 -1 /var/cache/squid squid
491 -}
492 -
493 -src_prepare() {
494 - epatch "${FILESDIR}"/${PN}-1.29-parallel-make.patch
495 - epatch "${FILESDIR}"/${PN}-1.24-gentoo.patch
496 -
497 - egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
498 - sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
499 - || die
500 -
501 - # directory where ufdbhttpd is to be found
502 - sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
503 - src/ufdb.h.in || die
504 -}
505 -
506 -src_configure() {
507 - # better safe than sorry, the code has a number of possible
508 - # breakage, and at least one certain breakage.
509 - append-flags -fno-strict-aliasing
510 -
511 - econf \
512 - --with-ufdb-user=squid \
513 - --with-ufdb-config=/etc \
514 - --with-ufdb-logdir=/var/log/ufdbguard \
515 - --with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
516 - --with-ufdb-images_dir=/usr/share/ufdbguard/images
517 -}
518 -
519 -src_install() {
520 - dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf
521 - doman doc/*.1
522 -
523 - dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
524 - src/ufdbConvertDB
525 - dosbin src/ufdbUpdate
526 -
527 - exeinto /usr/libexec/ufdbguard
528 - doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
529 -
530 - if use httpd; then
531 - exeinto /usr/libexec/ufdbguard
532 - doexe src/ufdbhttpd
533 - fi
534 -
535 - keepdir /usr/share/ufdbguard/blacklists
536 -
537 - insinto /etc
538 - doins src/ufdbGuard.conf
539 -
540 - insinto /usr/share/ufdbguard/images
541 - doins src/images/*
542 -
543 - newconfd "${FILESDIR}"/ufdb.confd ufdb
544 - newinitd "${FILESDIR}"/ufdb.initd.2 ufdb
545 -
546 - exeinto /etc/cron.daily
547 - newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
548 -
549 - if use doc; then
550 - insinto /usr/share/doc/${PF}
551 - newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
552 - fi
553 -}
554 -
555 -pkg_postinst() {
556 - elog "The default location for the blacklist database has been"
557 - elog "moved to /usr/share/ufdbguard/blacklists."
558 - elog ""
559 - elog "The configuration file is no longer configurable in the"
560 - elog "service file, and now resides at /etc/ufdbGuard.conf ."
561 - elog ""
562 - elog "The service script has been renamed from ufdbguad to simply"
563 - elog "/etc/init.d/ufdb, to follow the official documentation, and"
564 - elog "it gained a reload option with a reconfig alias."
565 - elog ""
566 - elog "You can configure the username and password parameters for"
567 - elog "ufdbUpdate, to fetch the blacklist database provided by"
568 - elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
569 - elog "the script itself."
570 - elog ""
571 - elog "To enable ufdbguard in squid, you should add this to your"
572 - elog "squid.conf:"
573 - elog ""
574 - elog " url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
575 - elog " url_rewrite_children 64"
576 - elog ""
577 - if ! use httpd; then
578 - elog "You chose to not install the lightweight http daemon that"
579 - elog "comes with ufdbguard."
580 - else
581 - elog "The ufdb service will start both the ufdbguardd daemon and"
582 - elog "the ufdbhttpd http daemon to provide a local redirect CGI."
583 - elog "If you don't want this to happen, disable the httpd USE flag."
584 - fi
585 - if use doc; then
586 - elog ""
587 - elog "The reference manual has been installed as"
588 - elog " /usr/share/doc/${PF}/ReferenceManual.pdf"
589 - fi
590 -}