Add http-via-header USE flag (#292715). Migrate to EAPI 2.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 110 insertions, 8 deletions

diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index b5aea393e9ea..aaa6ad541a7b 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/tinyproxy
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.12 2008/09/25 21:01:49 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.13 2009/11/29 09:58:56 mrness Exp $
+
+*tinyproxy-1.6.5 (29 Nov 2009)
+
+  29 Nov 2009; Alin Năstac <mrness@gentoo.org> +tinyproxy-1.6.5.ebuild,
+  +files/tinyproxy-no-via.patch, metadata.xml:
+  Add http-via-header USE flag (#292715). Migrate to EAPI 2.
 
 *tinyproxy-1.6.4 (25 Sep 2008)
 
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index b17018d460ee..2b1ac34bd957 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tinyproxy-no-via.patch 980 RMD160 746a63c13176d393d756f54b649271c375bf0f74 SHA1 6bc81b0d1ebc48e67bb7a8adb6e8dad8e7506ddc SHA256 1213ea21f6967d156566e09198037db5bf0f54fa70295009f357ab3017c86397
 AUX tinyproxy.initd 1068 RMD160 1a6ad426880ec112c61b85d2fc1816bebdffda9b SHA1 d4107fd238594046c3ef71839acc3a3d728f87c9 SHA256 dfcf5e4edca36408d9cc310dcc8d3fa5fe0e2bf1f9db5d6594b7b483a539f243
 DIST tinyproxy-1.6.3.tar.gz 467348 RMD160 a5503d03bdfe00fd232c643b518bd6c3e034dc33 SHA1 4f101f2a24d9b917fee03a65d27bdbbfc89f85f7 SHA256 cf4f2005fcd69f10087c598398c1a156d1827b9fb11c769ab6587b7b1ea4a2dc
 DIST tinyproxy-1.6.4.tar.gz 316567 RMD160 0a915591c87f2d3075fe7cf2934b98927668a17c SHA1 1afdd6a98e8b1f86ab2b667c0d15c1269edaa35c SHA256 d9ad234a1b1c080e2ac93449e5318611ffd727713352b6ea9ff77d10a71b0242
+DIST tinyproxy-1.6.5.tar.gz 318645 RMD160 90682ab61b2f85f60c60bb0ef75ffbfc8f1d8d8e SHA1 1386575ae4f5ca25233344ca5bf1fa91833fba8e SHA256 d6449d8c2e9a5d4afb1a705c351d1de69d07d64554f48c43ac2cfd7883c03d04
 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
-MISC ChangeLog 3272 RMD160 d6344f4126c3723c1cc737dc135d5458a8d70a6c SHA1 886dd0ed090594c9a0ff5b60646ca9f5b9c7c610 SHA256 2e1bd472b2ea4580d2e8e34a996b2614594c677b42a74167e9cb02bbc6887481
-MISC metadata.xml 320 RMD160 d194361fb7424aae5249d0b91714eedecf939813 SHA1 703993053e6d529e6a7229af62258c8948142d27 SHA256 f4d188b953c96f2b9ba2cf204a06a702e497644486c9f0dd77cba7a9eaa5b53b
+EBUILD tinyproxy-1.6.5.ebuild 1415 RMD160 ee8f9c854161dc4d79561e883d4d8149160d71e9 SHA1 6357621902b1486441f3d3d043c4418b9c566ae5 SHA256 73bd704ab0ce30e6c7e89aed3075409d3043c0e9b4d4013399cdaa650cdcd4a7
+MISC ChangeLog 3486 RMD160 33e5d71516382e8a27d1c54dfb0d53456916a1f6 SHA1 a81c10bb37d2f593c51765da70fe7686a26db58d SHA256 0341fae17a32dcfe0e26e05f76ce9c1c4481f31823bb2e6125cffde7bfbe2f68
+MISC metadata.xml 387 RMD160 b1293228143228f4a50bb66714a8dbd5857c9106 SHA1 9a0e7904d275297e9f7e23ecae789b573d254dc1 SHA256 fb7f115e9f69169c57870d14b8718af5d1515cbc68e0e51e377a75c1cf768815
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjb/EQACgkQPrHvTlXvhtvYuQCdGI1LYdYw/ld8xGDkNxn9ejtw
-eIoAn13eAey6uRtfxEvWubUPKwSzhtHY
-=4g9o
+iEYEARECAAYFAksSRmIACgkQ9A5kJBGSrstGgACgkjrcLCuBwGhcS5Xj9TozlTbT
+4/oAn3oHhvdDgydHLY2l6rk7cwLn9F5O
+=ZCh/
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tinyproxy/files/tinyproxy-no-via.patch b/net-proxy/tinyproxy/files/tinyproxy-no-via.patch
new file mode 100644
index 000000000000..575ec06765c3
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-no-via.patch
@@ -0,0 +1,40 @@
+--- src/reqs.c	2009-09-28 23:27:46.000000000 -0400
++++ ../reqs.c	2009-11-10 15:06:28.062785177 -0400
+@@ -1002,36 +1002,5 @@
+ 		 unsigned int major, unsigned int minor)
+ {
+-	ssize_t len;
+-	char hostname[512];
+-	char *data;
+-	int ret;
+-
+-	if (config.via_proxy_name) {
+-		strlcpy(hostname, config.via_proxy_name, sizeof(hostname));
+-	} else if (gethostname(hostname, sizeof(hostname)) < 0) {
+-		strcpy(hostname, "unknown");
+-	}
+-
+-	/*
+-	 * See if there is a "Via" header.  If so, again we need to do a bit
+-	 * of processing.
+-	 */
+-	len = hashmap_entry_by_key(hashofheaders, "via", (void **)&data);
+-	if (len > 0) {
+-		ret = write_message(fd,
+-				    "Via: %s, %hu.%hu %s (%s/%s)\r\n",
+-				    data,
+-				    major, minor,
+-				    hostname, PACKAGE, VERSION);
+-
+-		hashmap_remove(hashofheaders, "via");
+-	} else {
+-		ret = write_message(fd,
+-				    "Via: %hu.%hu %s (%s/%s)\r\n",
+-				    major, minor,
+-				    hostname, PACKAGE, VERSION);
+-	}
+-
+-	return ret;
++	return 1;
+ }
+ 
diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml
index c71417f73d4f..2c9461c4a0be 100644
--- a/net-proxy/tinyproxy/metadata.xml
+++ b/net-proxy/tinyproxy/metadata.xml
@@ -6,5 +6,6 @@
 <use>
 	<flag name='transparent-proxy'>Enables support for transparent
 		proxies</flag>
+	<flag name='http-via-header'>Add Via field to HTTP headers</flag>
 </use>
 </pkgmetadata>
diff --git a/net-proxy/tinyproxy/tinyproxy-1.6.5.ebuild b/net-proxy/tinyproxy/tinyproxy-1.6.5.ebuild
new file mode 100644
index 000000000000..9df2e1f15795
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.6.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.6.5.ebuild,v 1.1 2009/11/29 09:58:56 mrness Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="http://www.banu.com/tinyproxy/"
+SRC_URI="http://www.banu.com/pub/tinyproxy/1.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="debug socks5 +http-via-header transparent-proxy"
+
+DEPEND="socks5? ( net-proxy/dante )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use http-via-header || epatch "${FILESDIR}"/${PN}-no-via.patch
+}
+
+src_configure() {
+	econf \
+		--enable-xtinyproxy \
+		--enable-filter \
+		--enable-upstream \
+		`use_enable transparent-proxy` \
+		`use_enable debug` \
+		`use_enable debug profiling` \
+		`use_enable socks5 socks` \
+		|| die "econf failed"
+}
+
+src_install() {
+	sed -i \
+		-e 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \
+		Makefile
+	make DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	mv "${D}/usr/share/tinyproxy" "${D}/usr/share/doc/${PF}/html"
+
+	newinitd "${FILESDIR}/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)."
+}