Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/ufdbguard: ufdbguard-1.24-r1.ebuild ChangeLog ufdbguard-1.24.ebuild ufdbguard-1.23-r1.ebuild
Date: Sun, 01 May 2011 16:06:01
Message-Id: 20110501160551.2FBBD20057@flycatcher.gentoo.org
1 flameeyes 11/05/01 16:05:51
2
3 Modified: ChangeLog
4 Added: ufdbguard-1.24-r1.ebuild
5 Removed: ufdbguard-1.24.ebuild ufdbguard-1.23-r1.ebuild
6 Log:
7 Update init script to wait to see if ufdb successfully started; add urls to the generated tables if present; add a variable to set options for ufdbGenTable and default to -W.
8
9 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.14 net-proxy/ufdbguard/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/ChangeLog?rev=1.14&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/ChangeLog?rev=1.14&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/ChangeLog?r1=1.13&r2=1.14
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v
21 retrieving revision 1.13
22 retrieving revision 1.14
23 diff -u -r1.13 -r1.14
24 --- ChangeLog 16 Feb 2011 10:41:26 -0000 1.13
25 +++ ChangeLog 1 May 2011 16:05:51 -0000 1.14
26 @@ -1,6 +1,15 @@
27 # ChangeLog for net-proxy/ufdbguard
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.13 2011/02/16 10:41:26 flameeyes Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.14 2011/05/01 16:05:51 flameeyes Exp $
31 +
32 +*ufdbguard-1.24-r1 (01 May 2011)
33 +
34 + 01 May 2011; Diego E. Pettenò <flameeyes@g.o>
35 + -ufdbguard-1.23-r1.ebuild, -ufdbguard-1.24.ebuild, +ufdbguard-1.24-r1.ebuild,
36 + files/ufdb.confd, files/ufdb.initd:
37 + Update init script to wait to see if ufdb successfully started; add urls to
38 + the generated tables if present; add a variable to set options for
39 + ufdbGenTable and default to -W.
40
41 16 Feb 2011; Diego E. Pettenò <flameeyes@g.o> metadata.xml:
42 Update metadata, I'll co-maintain 1.24 and later as well.
43
44
45
46 1.1 net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild?rev=1.1&content-type=text/plain
50
51 Index: ufdbguard-1.24-r1.ebuild
52 ===================================================================
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.24-r1.ebuild,v 1.1 2011/05/01 16:05:51 flameeyes Exp $
56
57 EAPI="2"
58
59 inherit eutils
60
61 MY_P="ufdbGuard-${PV}"
62
63 DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
64 HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
65 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
66 doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
67
68 LICENSE="GPL-2"
69 SLOT="0"
70 KEYWORDS="~amd64 ~x86"
71 IUSE="+httpd doc"
72
73 RDEPEND="dev-libs/openssl
74 app-arch/bzip2
75 net-misc/wget"
76
77 DEPEND="${RDEPEND}
78 sys-devel/bison
79 sys-devel/flex"
80
81 S="${WORKDIR}/${MY_P}"
82
83 pkg_setup() {
84 # create the squid user exactly as done by net-proxy/squid-3.1.9
85 enewgroup squid 31
86 enewuser squid 31 -1 /var/cache/squid squid
87 }
88
89 src_prepare() {
90 epatch "${FILESDIR}"/${PN}-1.23-parallel-make.patch
91 epatch "${FILESDIR}"/${P}-gentoo.patch
92
93 egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
94 sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
95 || die
96
97 # directory where ufdbhttpd is to be found
98 sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
99 src/ufdb.h.in || die
100 }
101
102 src_configure() {
103 econf \
104 --with-ufdb-user=squid \
105 --with-ufdb-config=/etc \
106 --with-ufdb-logdir=/var/log/ufdbguard \
107 --with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
108 --with-ufdb-images_dir=/usr/share/ufdbguard/images
109 }
110
111 src_install() {
112 dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf || die
113 doman doc/*.1 || die
114
115 dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
116 src/ufdbConvertDB || die
117 dosbin src/ufdbUpdate || die
118
119 exeinto /usr/libexec/ufdbguard
120 doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient || die
121
122 if use httpd; then
123 exeinto /usr/libexec/ufdbguard
124 doexe src/ufdbhttpd || die
125 fi
126
127 keepdir /usr/share/ufdbguard/blacklists
128
129 insinto /etc
130 doins src/ufdbGuard.conf || die
131
132 insinto /usr/share/ufdbguard/images
133 doins src/images/* || die
134
135 newconfd "${FILESDIR}"/ufdb.confd ufdb || die
136 newinitd "${FILESDIR}"/ufdb.initd ufdb || die
137
138 exeinto /etc/cron.daily
139 newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate || die
140
141 if use doc; then
142 insinto /usr/share/doc/${PF}
143 newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf || die
144 fi
145 }
146
147 pkg_postinst() {
148 elog "The default location for the blacklist database has been"
149 elog "moved to /usr/share/ufdbguard/blacklists."
150 elog ""
151 elog "The configuration file is no longer configurable in the"
152 elog "service file, and now resides at /etc/ufdbGuard.conf ."
153 elog ""
154 elog "The service script has been renamed from ufdbguad to simply"
155 elog "/etc/init.d/ufdb, to follow the official documentation, and"
156 elog "it gained a reload option with a reconfig alias."
157 elog ""
158 elog "You can configure the username and password parameters for"
159 elog "ufdbUpdate, to fetch the blacklist database provided by"
160 elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
161 elog "the script itself."
162 elog ""
163 elog "To enable ufdbguard in squid, you should add this to your"
164 elog "squid.conf:"
165 elog ""
166 elog " url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
167 elog " url_rewrite_children 64"
168 elog ""
169 if ! use httpd; then
170 elog "You chose to not install the lightweight http daemon that"
171 elog "comes with ufdbguard."
172 else
173 elog "The ufdb service will start both the ufdbguardd daemon and"
174 elog "the ufdbhttpd http daemon to provide a local redirect CGI."
175 elog "If you don't want this to happen, disable the httpd USE flag."
176 fi
177 if use doc; then
178 elog ""
179 elog "The reference manual has been installed as"
180 elog " /usr/share/doc/${PF}/ReferenceManual.pdf"
181 fi
182 }