Fix various directory paths. Add tinyproxy user and make it own its directories. Fix configuration file location as used in initd script.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 84 insertions, 3 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index 60fc65d28689..6957db3d954b 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/tinyproxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.16 2010/06/03 21:46:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.17 2010/06/03 22:30:52 jer Exp $
+
+*tinyproxy-1.8.1-r1 (03 Jun 2010)
+
+  03 Jun 2010; Jeroen Roovers <jer@gentoo.org> +tinyproxy-1.8.1-r1.ebuild:
+  Fix various directory paths. Add tinyproxy user and make it own its
+  directories. Fix configuration file location as used in initd script.
 
   03 Jun 2010; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.1.ebuild:
   Remove USE=doc, only use USE=minimal.
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index afb226350241..12af0cbf2229 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -9,6 +9,6 @@ DIST tinyproxy-1.8.1.tar.bz2 203177 RMD160 ab7816eb15245a01d9a65827f619b86f9bc8f
 EBUILD tinyproxy-1.6.3-r1.ebuild 1310 RMD160 0ad910aa3ca1a30ab2f50af20408e345533046b0 SHA1 b65ccef8dda53e1b29bdcad4d6747aa2d82fa0d0 SHA256 2da4838d042065d196a76e99dfb8f4f1b60f33672dc1fd6d8c35da3591f6f2b3
 EBUILD tinyproxy-1.6.4.ebuild 1316 RMD160 386f61b41c487d5299dfee91ca4d4c2b069ac430 SHA1 d21007905aa8a9795aacf7a96ba3f7dbae2805c0 SHA256 d30e3cf0bbe9af70b92112346b2a88813709baf292292e054cfc47e52908af8b
 EBUILD tinyproxy-1.6.5.ebuild 1415 RMD160 ee8f9c854161dc4d79561e883d4d8149160d71e9 SHA1 6357621902b1486441f3d3d043c4418b9c566ae5 SHA256 73bd704ab0ce30e6c7e89aed3075409d3043c0e9b4d4013399cdaa650cdcd4a7
-EBUILD tinyproxy-1.8.1.ebuild 1630 RMD160 29bade036dc0c629d24fa18cd0682f51222d2723 SHA1 1bb9a8be640ad7233ca842e898d19470b996932f SHA256 9139eccc2f4390b5cb7214b94889ff52b843921d49779762f7fdd9af963dbd11
-MISC ChangeLog 4190 RMD160 5fb0b4b854bdb1722384137b88d9ae90fbf11774 SHA1 5b42316bcf62ca645c36b051c7ae1009ce6f5d38 SHA256 0de8942d17249e621d077df50d739a04d6286d3fbd1faa4330c0bf70453c7031
+EBUILD tinyproxy-1.8.1-r1.ebuild 1996 RMD160 f582f9d46dcab44cfea5e3ec3bf53cadf9ccdece SHA1 f07f4a5105b202b874564ee2d74280b1132162c9 SHA256 82184ed59b22a1dddd4f158b7f714712efc62afe12712c9294de7466808ba57b
+MISC ChangeLog 4687 RMD160 d70335d187a3d522e9c519a05cc135696c81e481 SHA1 f9f8208a7dc544556e6af8ff17eafa90d52b3411 SHA256 8b13743e7fca078d77e59ec7527940895132723ee4e9ecd7c53d26fb48985313
 MISC metadata.xml 630 RMD160 76250d5d991441a1f924f5d30ef5dd3cc067ae2c SHA1 d4ae46a69e557cecc5cc6a718c3dfbd66d83afe2 SHA256 125f298a828e96a7d8be4387304188efe17746aa78b5baf5b6c0f60fbdedf616
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..10f0d0f91ee5
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1-r1.ebuild,v 1.1 2010/06/03 22:30:52 jer Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="http://www.banu.com/tinyproxy/"
+SRC_URI="http://www.banu.com/pub/${PN}/1.8/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="debug +filter-proxy minimal reverse-proxy transparent-proxy
+	+upstream-proxy +xtinyproxy-header"
+
+DEPEND="minimal? ( app-text/asciidoc )"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} "" "" "" ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	use minimal && epatch "${FILESDIR}/${P}-minimal.patch"
+	sed -i etc/${PN}.conf.in -e "s|nobody|${PN}|g" || die "sed failed"
+	sed \
+		"${FILESDIR}/${PN}.initd" \
+		-e "/CONFFILE/s:${PN}/::g" \
+		> "${WORKDIR}"/${PN}.initd \
+		|| die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	if use minimal; then
+		ln -s /bin/true ${T}/a2x
+		export PATH="${T}:${PATH}"
+	fi
+	econf \
+		--localstatedir=/var \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		$(use_enable debug) \
+		|| die "econf failed"
+}
+
+src_install() {
+	sed -i \
+		-e 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \
+		Makefile
+	emake DESTDIR="${D}" install || die "install failed"
+
+	if ! use minimal; then
+		dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+	fi
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+	keepdir /var/run/${PN}
+
+	newinitd "${WORKDIR}"/tinyproxy.initd tinyproxy
+}
+
+pkg_postinst() {
+	einfo "For filtering domains and URLs, enable filter option in the configuration file"
+	einfo "and add them to the filter file (one domain or URL per line)."
+}