summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2009-10-22 21:32:10 +0000
committerAlin Năstac <mrness@gentoo.org>2009-10-22 21:32:10 +0000
commit9c29931b9b13718d9300df1016f970b8df83534c (patch)
treea4d03329c5ff708661f0fc7afdccd3d3e9d8a155 /net-proxy
parentVersion bump (#289691). (diff)
downloadgentoo-2-9c29931b9b13718d9300df1016f970b8df83534c.tar.gz
gentoo-2-9c29931b9b13718d9300df1016f970b8df83534c.tar.bz2
gentoo-2-9c29931b9b13718d9300df1016f970b8df83534c.zip
Version bump.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/privoxy/ChangeLog10
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch20
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch (renamed from net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch)64
-rw-r--r--net-proxy/privoxy/privoxy-3.0.10.ebuild77
-rw-r--r--net-proxy/privoxy/privoxy-3.0.11-r1.ebuild64
-rw-r--r--net-proxy/privoxy/privoxy-3.0.15_beta.ebuild (renamed from net-proxy/privoxy/privoxy-3.0.11.ebuild)15
6 files changed, 49 insertions, 201 deletions
diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index 00649930b398..6c2851fd0fed 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-proxy/privoxy
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.54 2009/09/27 14:32:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.55 2009/10/22 21:32:10 mrness Exp $
+
+*privoxy-3.0.15_beta (22 Oct 2009)
+
+ 22 Oct 2009; Alin Năstac <mrness@gentoo.org> -privoxy-3.0.10.ebuild,
+ -privoxy-3.0.11.ebuild, -privoxy-3.0.11-r1.ebuild,
+ -files/privoxy-3.0.11-gentoo.patch, -files/privoxy-3.0.11-timeout.patch,
+ +privoxy-3.0.15_beta.ebuild, +files/privoxy-3.0.15_beta-gentoo.patch:
+ Version bump.
27 Sep 2009; Brent Baude <ranger@gentoo.org> privoxy-3.0.12.ebuild:
Marking privoxy-3.0.12 ppc64 for bug 277487
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
deleted file mode 100644
index 0433e1d923ec..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- jcc.c 2009/03/08 14:19:23 1.231
-+++ jcc.c 2009/03/08 19:29:16 1.232
-@@ -2600,8 +2605,6 @@
- struct timeval timeout;
-
- memset(buf, 0, sizeof(buf));
-- memset(&timeout, 0, sizeof(timeout));
-- timeout.tv_sec = csp->config->socket_timeout;
-
- http = csp->http;
-
-@@ -2843,6 +2846,8 @@
- }
- #endif /* FEATURE_CONNECTION_KEEP_ALIVE */
-
-+ timeout.tv_sec = csp->config->socket_timeout;
-+ timeout.tv_usec = 0;
- n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout);
-
- if (n == 0)
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch
index 3276c1f2ac7e..7792e1616453 100644
--- a/net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch
+++ b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch
@@ -1,32 +1,6 @@
-diff -Nru privoxy-3.0.11-stable.orig/GNUmakefile.in privoxy-3.0.11-stable/GNUmakefile.in
---- privoxy-3.0.11-stable.orig/GNUmakefile.in 2009-02-08 18:35:48.000000000 +0000
-+++ privoxy-3.0.11-stable/GNUmakefile.in 2009-03-13 19:56:45.000000000 +0000
-@@ -1140,22 +1140,8 @@
- fi ;\
- $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- for i in $(CONFIGS); do \
-- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
-- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
-- $(ECHO) Installing fresh $$i;\
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-- elif [ -s "$(CONF_DEST)/$$i" ]; then \
-- $(ECHO) Installing $$i as $$i.new ;\
-- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
-- NEW=1;\
-- else \
-- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-- fi ;\
- done ;\
-- if [ -n "$$NEW" ]; then \
-- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
-- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
-- fi ;\
- [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
- $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
- $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
-diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config
---- privoxy-3.0.11-stable.orig/config 2009-02-19 17:26:26.000000000 +0000
-+++ privoxy-3.0.11-stable/config 2009-03-13 19:21:49.000000000 +0000
+diff -Nru privoxy-3.0.15-beta.orig/config privoxy-3.0.15-beta/config
+--- privoxy-3.0.15-beta.orig/config 2009-10-10 07:56:41.000000000 +0200
++++ privoxy-3.0.15-beta/config 2009-10-22 23:26:11.000000000 +0200
@@ -267,7 +267,7 @@
#
# No trailing "/", please.
@@ -54,9 +28,9 @@ diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config
#
#
# 2.7. trustfile
-diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable/default.action.master
---- privoxy-3.0.11-stable.orig/default.action.master 2009-02-12 19:08:32.000000000 +0000
-+++ privoxy-3.0.11-stable/default.action.master 2009-03-13 19:22:01.000000000 +0000
+diff -Nru privoxy-3.0.15-beta.orig/default.action.master privoxy-3.0.15-beta/default.action.master
+--- privoxy-3.0.15-beta.orig/default.action.master 2009-10-02 20:07:22.000000000 +0200
++++ privoxy-3.0.15-beta/default.action.master 2009-10-22 23:26:11.000000000 +0200
@@ -564,7 +564,7 @@
{ \
+change-x-forwarded-for{block} \
@@ -84,3 +58,29 @@ diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable
}
standard.Advanced
+diff -Nru privoxy-3.0.15-beta.orig/GNUmakefile.in privoxy-3.0.15-beta/GNUmakefile.in
+--- privoxy-3.0.15-beta.orig/GNUmakefile.in 2009-09-26 19:21:01.000000000 +0200
++++ privoxy-3.0.15-beta/GNUmakefile.in 2009-10-22 23:26:11.000000000 +0200
+@@ -901,22 +901,8 @@
+ fi ;\
+ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ for i in $(CONFIGS); do \
+- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
+- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+- $(ECHO) Installing fresh $$i;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+- elif [ -s "$(CONF_DEST)/$$i" ]; then \
+- $(ECHO) Installing $$i as $$i.new ;\
+- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+- NEW=1;\
+- else \
+- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+- fi ;\
+ done ;\
+- if [ -n "$$NEW" ]; then \
+- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
+- fi ;\
+ [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
+ $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+ $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
diff --git a/net-proxy/privoxy/privoxy-3.0.10.ebuild b/net-proxy/privoxy/privoxy-3.0.10.ebuild
deleted file mode 100644
index 25d82790fad8..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.10.ebuild,v 1.5 2008/11/13 00:31:37 ranger Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit toolchain-funcs autotools
-
-HOMEPAGE="http://www.privoxy.org
- http://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
-
-IUSE="selinux threads zlib"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-privoxy )"
-
-S="${WORKDIR}/${P/_/-}-stable"
-
-pkg_setup() {
- enewgroup privoxy
- enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- sed -e 's:confdir .:confdir /etc/privoxy:' \
- -e 's:logdir .:logdir /var/log/privoxy:' \
- -e 's:logfile logfile:logfile privoxy.log:' \
- -i config || die "sed failed."
- sed -e 's:^\+set-image-blocker{pattern}:+set-image-blocker{blank}:' \
- -i default.action.master || die "sed 2 failed."
- eautoreconf || die "autoreconf failed"
-}
-
-src_compile() {
- export CC=$(tc-getCC)
- econf \
- $(use_enable zlib) \
- $(use_enable threads pthread) \
- --enable-dynamic-pcre \
- --with-user=privoxy \
- --with-group=privoxy \
- --sysconfdir=/etc/privoxy \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install () {
- dosbin privoxy
- newinitd "${FILESDIR}/privoxy.initd" privoxy
- insinto /etc/logrotate.d
- newins "${FILESDIR}/privoxy.logrotate" privoxy
-
- insinto /etc/privoxy
- doins default.action default.filter config standard.action trust user.action
- insinto /etc/privoxy/templates
- doins templates/*
-
- doman privoxy.1
- dodoc README AUTHORS doc/text/faq.txt ChangeLog
- cd doc/webserver
- dohtml -r developer-manual faq man-page user-manual
-
- diropts -m 0750 -g privoxy -o privoxy
- keepdir /var/log/privoxy
-}
diff --git a/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild
deleted file mode 100644
index 95bdc22bbf78..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.11-r1.ebuild,v 1.1 2009/03/22 10:55:14 mrness Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs autotools
-
-HOMEPAGE="http://www.privoxy.org
- http://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
-
-IUSE="selinux threads zlib"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-privoxy )"
-
-S="${WORKDIR}/${P/_/-}-stable"
-
-pkg_setup() {
- enewgroup privoxy
- enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-timeout.patch # should be fixed in versions >= 3.0.12
- # autoreconf needs to be called even if we don't modify any autotools source files
- # See main makefile
- eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
- export CC=$(tc-getCC)
- econf \
- $(use_enable zlib) \
- $(use_enable threads pthread) \
- --enable-dynamic-pcre \
- --with-user=privoxy \
- --with-group=privoxy \
- --sysconfdir=/etc/privoxy \
- --docdir=/usr/share/doc/${PF} \
- || die "econf failed"
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- newinitd "${FILESDIR}/privoxy.initd" privoxy
- insinto /etc/logrotate.d
- newins "${FILESDIR}/privoxy.logrotate" privoxy
-
- diropts -m 0750 -g privoxy -o privoxy
- keepdir /var/log/privoxy
-}
diff --git a/net-proxy/privoxy/privoxy-3.0.11.ebuild b/net-proxy/privoxy/privoxy-3.0.15_beta.ebuild
index 308dc86e98ff..574eff9971a6 100644
--- a/net-proxy/privoxy/privoxy-3.0.11.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.15_beta.ebuild
@@ -1,15 +1,19 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.11.ebuild,v 1.1 2009/03/13 20:00:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.15_beta.ebuild,v 1.1 2009/10/22 21:32:10 mrness Exp $
EAPI="2"
inherit eutils toolchain-funcs autotools
+[ "${PV##*_}" = "beta" ] &&
+ PRIVOXY_STATUS="beta" ||
+ PRIVOXY_STATUS="stable"
+
HOMEPAGE="http://www.privoxy.org
http://sourceforge.net/projects/ijbswa/"
DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P/_/-}-stable-src.tar.gz"
+SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
IUSE="selinux threads zlib"
SLOT="0"
@@ -21,17 +25,14 @@ DEPEND="dev-libs/libpcre
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-privoxy )"
-S="${WORKDIR}/${P/_/-}-stable"
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
pkg_setup() {
enewgroup privoxy
enewuser privoxy -1 -1 /etc/privoxy privoxy
}
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
# autoreconf needs to be called even if we don't modify any autotools source files
# See main makefile