public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] gentoo-x86 commit in net-proxy/wwwoffle: ChangeLog wwwoffle-2.9h.ebuild wwwoffle-2.9e.ebuild wwwoffle-2.9d.ebuild
@ 2012-08-01 19:49 99% Jeroen Roovers (jer)
  0 siblings, 0 replies; 1+ results
From: Jeroen Roovers (jer) @ 2012-08-01 19:49 UTC (permalink / raw
  To: gentoo-commits

jer         12/08/01 19:49:05

  Modified:             ChangeLog wwwoffle-2.9e.ebuild
  Added:                wwwoffle-2.9h.ebuild
  Removed:              wwwoffle-2.9d.ebuild
  Log:
  Version bump. Inherit user, not eutils.
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.51                 net-proxy/wwwoffle/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/ChangeLog?r1=1.50&r2=1.51

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog	6 Apr 2012 22:00:48 -0000	1.50
+++ ChangeLog	1 Aug 2012 19:49:05 -0000	1.51
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/wwwoffle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.50 2012/04/06 22:00:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/ChangeLog,v 1.51 2012/08/01 19:49:05 jer Exp $
+
+*wwwoffle-2.9h (01 Aug 2012)
+
+  01 Aug 2012; Jeroen Roovers <jer@gentoo.org> -wwwoffle-2.9d.ebuild,
+  wwwoffle-2.9e.ebuild, +wwwoffle-2.9h.ebuild:
+  Version bump. Inherit user, not eutils.
 
   06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #63588



1.6                  net-proxy/wwwoffle/wwwoffle-2.9e.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild?r1=1.5&r2=1.6

Index: wwwoffle-2.9e.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wwwoffle-2.9e.ebuild	18 Nov 2009 18:45:07 -0000	1.5
+++ wwwoffle-2.9e.ebuild	1 Aug 2012 19:49:05 -0000	1.6
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v 1.5 2009/11/18 18:45:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9e.ebuild,v 1.6 2012/08/01 19:49:05 jer Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit user
 
 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
 SRC_URI="http://www.gedanken.demon.co.uk/download-wwwoffle/${P}.tgz"



1.1                  net-proxy/wwwoffle/wwwoffle-2.9h.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild?rev=1.1&content-type=text/plain

Index: wwwoffle-2.9h.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-proxy/wwwoffle/wwwoffle-2.9h.ebuild,v 1.1 2012/08/01 19:49:05 jer Exp $

EAPI=4
inherit user

DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
SRC_URI="http://www.gedanken.demon.co.uk/download-wwwoffle/${P}.tgz"
HOMEPAGE="http://www.gedanken.demon.co.uk/wwwoffle"

KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
LICENSE="GPL-2"
IUSE="gnutls ipv6 zlib"

RDEPEND="gnutls? ( net-libs/gnutls )
	zlib? ( sys-libs/zlib )"
DEPEND="dev-lang/perl
	sys-devel/flex
	${RDEPEND}"

# Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not

src_prepare() {
	sed -i cache/Makefile.in \
		-e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
		|| die
}

src_configure() {
	econf $(use_with zlib) \
		$(use_with gnutls) \
		$(use_with ipv6) || die "econf failed"
}

src_install() {
	default

	# documentation fix
	# del empty doc dirs
	rmdir "${D}/usr/doc/${PN}"/{it,nl,ru}
	dodir /usr/share/doc
	mv "${D}/usr/doc/${PN}" "${D}/usr/share/doc/${PF}"
	rmdir "${D}/usr/doc"

	# install the wwwoffled init script
	newinitd "${FILESDIR}/${PN}.initd" wwwoffled
	newinitd "${FILESDIR}/${PN}-online.initd" wwwoffled-online
	newconfd "${FILESDIR}/${PN}-online.confd" wwwoffled-online

	keepdir /var/spool/wwwoffle/{http,outgoing,monitor,lasttime,lastout,local}
	for number in 1 2 3 4 5 6 7 8 9; do
		keepdir "/var/spool/wwwoffle/prevtime${number}" "/var/spool/wwwoffle/prevout${number}"
	done

	# empty dirs are removed during update
	keepdir \
		/var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}

	touch \
		"${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log" \
		"${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log" \
		"${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"

	# TODO htdig indexing as part of initscripts

	# robots.txt modification - /var/spool/wwwoffle/html/en
	# 		- remove Disallow: /index
	sed -i -e "s|Disallow:.*/index|#Disallow: /index|" "${D}/var/spool/wwwoffle/html/en/robots.txt"
}

pkg_preinst() {
	# Add a wwwoffle user
	enewgroup wwwoffle
	enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle

	# Changing the user:group to wwwoffle:woffle
	fowners -R wwwoffle:wwwoffle /var/spool/wwwoffle /etc/wwwoffle
	sed -i -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
		"${D}/etc/wwwoffle/wwwoffle.conf"

}

pkg_postinst() {
	# fix permissions for those upgrading
	for number in 1 2 3 4 5 6 7 8 9;
	do
		[ ! -d "${ROOT}/var/spool/wwwoffle/prevtime${number}" ] && \
			keepdir "${ROOT}/var/spool/wwwoffle/prevtime${number}"
		[ ! -d "${ROOT}/var/spool/wwwoffle/prevout${number}" ] && \
			keepdir "${ROOT}/var/spool/wwwoffle/prevout${number}"
	done
	chown -R wwwoffle:wwwoffle "${ROOT}/var/spool/wwwoffle" "${ROOT}/etc/wwwoffle"

	[ -f "${T}/stopped" ] && \
		ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"

	einfo "wwwoffled should run as an ordinary user now. The run-uid and run-gid should be set"
	einfo "to \"wwwoffle\" in your /etc/wwwoffle/wwwoffle.conf. Please uncomment this if it hasn't been already"

	einfo "This is for your own security. Otherwise wwwoffle is run as root which is relay bad if"
	einfo "there is an exploit in this program that allows remote/local users to execute arbitary"
	einfo "commands as the root user."
}





^ permalink raw reply	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-08-01 19:49 99% [gentoo-commits] gentoo-x86 commit in net-proxy/wwwoffle: ChangeLog wwwoffle-2.9h.ebuild wwwoffle-2.9e.ebuild wwwoffle-2.9d.ebuild Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox