Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/wwwoffle: ChangeLog wwwoffle-2.9h.ebuild wwwoffle-2.9e.ebuild wwwoffle-2.9d.ebuild
Date: Wed, 01 Aug 2012 19:49:15
Message-Id: 20120801194905.6F01F2004B@flycatcher.gentoo.org
1 jer 12/08/01 19:49:05
2
3 Modified: ChangeLog wwwoffle-2.9e.ebuild
4 Added: wwwoffle-2.9h.ebuild
5 Removed: wwwoffle-2.9d.ebuild
6 Log:
7 Version bump. Inherit user, not eutils.
8
9 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.51 net-proxy/wwwoffle/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/ChangeLog?rev=1.51&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/ChangeLog?rev=1.51&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/ChangeLog?r1=1.50&r2=1.51
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v
21 retrieving revision 1.50
22 retrieving revision 1.51
23 diff -u -r1.50 -r1.51
24 --- ChangeLog 6 Apr 2012 22:00:48 -0000 1.50
25 +++ ChangeLog 1 Aug 2012 19:49:05 -0000 1.51
26 @@ -1,6 +1,12 @@
27 # ChangeLog for net-proxy/wwwoffle
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.50 2012/04/06 22:00:48 pacho Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.51 2012/08/01 19:49:05 jer Exp $
31 +
32 +*wwwoffle-2.9h (01 Aug 2012)
33 +
34 + 01 Aug 2012; Jeroen Roovers <jer@g.o> -wwwoffle-2.9d.ebuild,
35 + wwwoffle-2.9e.ebuild, +wwwoffle-2.9h.ebuild:
36 + Version bump. Inherit user, not eutils.
37
38 06 Apr 2012; Pacho Ramos <pacho@g.o> metadata.xml:
39 Drop maintainer due retirement, bug #63588
40
41
42
43 1.6 net-proxy/wwwoffle/wwwoffle-2.9e.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild?rev=1.6&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild?rev=1.6&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild?r1=1.5&r2=1.6
48
49 Index: wwwoffle-2.9e.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v
52 retrieving revision 1.5
53 retrieving revision 1.6
54 diff -u -r1.5 -r1.6
55 --- wwwoffle-2.9e.ebuild 18 Nov 2009 18:45:07 -0000 1.5
56 +++ wwwoffle-2.9e.ebuild 1 Aug 2012 19:49:05 -0000 1.6
57 @@ -1,10 +1,10 @@
58 -# Copyright 1999-2009 Gentoo Foundation
59 +# Copyright 1999-2012 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v 1.5 2009/11/18 18:45:07 armin76 Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v 1.6 2012/08/01 19:49:05 jer Exp $
63
64 EAPI="2"
65
66 -inherit eutils
67 +inherit user
68
69 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
70 SRC_URI="http://www.gedanken.demon.co.uk/download-wwwoffle/${P}.tgz"
71
72
73
74 1.1 net-proxy/wwwoffle/wwwoffle-2.9h.ebuild
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild?rev=1.1&content-type=text/plain
78
79 Index: wwwoffle-2.9h.ebuild
80 ===================================================================
81 # Copyright 1999-2012 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 # $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild,v 1.1 2012/08/01 19:49:05 jer Exp $
84
85 EAPI=4
86 inherit user
87
88 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
89 SRC_URI="http://www.gedanken.demon.co.uk/download-wwwoffle/${P}.tgz"
90 HOMEPAGE="http://www.gedanken.demon.co.uk/wwwoffle"
91
92 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
93 SLOT="0"
94 LICENSE="GPL-2"
95 IUSE="gnutls ipv6 zlib"
96
97 RDEPEND="gnutls? ( net-libs/gnutls )
98 zlib? ( sys-libs/zlib )"
99 DEPEND="dev-lang/perl
100 sys-devel/flex
101 ${RDEPEND}"
102
103 # Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
104
105 src_prepare() {
106 sed -i cache/Makefile.in \
107 -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
108 || die
109 }
110
111 src_configure() {
112 econf $(use_with zlib) \
113 $(use_with gnutls) \
114 $(use_with ipv6) || die "econf failed"
115 }
116
117 src_install() {
118 default
119
120 # documentation fix
121 # del empty doc dirs
122 rmdir "${D}/usr/doc/${PN}"/{it,nl,ru}
123 dodir /usr/share/doc
124 mv "${D}/usr/doc/${PN}" "${D}/usr/share/doc/${PF}"
125 rmdir "${D}/usr/doc"
126
127 # install the wwwoffled init script
128 newinitd "${FILESDIR}/${PN}.initd" wwwoffled
129 newinitd "${FILESDIR}/${PN}-online.initd" wwwoffled-online
130 newconfd "${FILESDIR}/${PN}-online.confd" wwwoffled-online
131
132 keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,lastout,local}
133 for number in 1 2 3 4 5 6 7 8 9; do
134 keepdir "/var/spool/wwwoffle/prevtime${number}" "/var/spool/wwwoffle/prevout${number}"
135 done
136
137 # empty dirs are removed during update
138 keepdir \
139 /var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
140
141 touch \
142 "${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log" \
143 "${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log" \
144 "${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"
145
146 # TODO htdig indexing as part of initscripts
147
148 # robots.txt modification - /var/spool/wwwoffle/html/en
149 # - remove Disallow: /index
150 sed -i -e "s|Disallow:.*/index|#Disallow: /index|" "${D}/var/spool/wwwoffle/html/en/robots.txt"
151 }
152
153 pkg_preinst() {
154 # Add a wwwoffle user
155 enewgroup wwwoffle
156 enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle
157
158 # Changing the user:group to wwwoffle:woffle
159 fowners -R wwwoffle:wwwoffle /var/spool/wwwoffle /etc/wwwoffle
160 sed -i -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
161 "${D}/etc/wwwoffle/wwwoffle.conf"
162
163 }
164
165 pkg_postinst() {
166 # fix permissions for those upgrading
167 for number in 1 2 3 4 5 6 7 8 9;
168 do
169 [ ! -d "${ROOT}/var/spool/wwwoffle/prevtime${number}" ] && \
170 keepdir "${ROOT}/var/spool/wwwoffle/prevtime${number}"
171 [ ! -d "${ROOT}/var/spool/wwwoffle/prevout${number}" ] && \
172 keepdir "${ROOT}/var/spool/wwwoffle/prevout${number}"
173 done
174 chown -R wwwoffle:wwwoffle "${ROOT}/var/spool/wwwoffle" "${ROOT}/etc/wwwoffle"
175
176 [ -f "${T}/stopped" ] && \
177 ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
178
179 einfo "wwwoffled should run as an ordinary user now. The run-uid and run-gid should be set"
180 einfo "to \"wwwoffle\" in your /etc/wwwoffle/wwwoffle.conf. Please uncomment this if it hasn't been already"
181
182 einfo "This is for your own security. Otherwise wwwoffle is run as root which is relay bad if"
183 einfo "there is an exploit in this program that allows remote/local users to execute arbitary"
184 einfo "commands as the root user."
185 }