summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-06-21 12:51:35 +0000
committerAnthony G. Basile <blueness@gentoo.org>2013-06-21 12:51:35 +0000
commit1ef610930eac2d1d64762a18d83df773110a3cc2 (patch)
treef28ade1f331ecbc1e585ee5096e37fdb6ef8317e /www-servers/varnish
parentAdd a live ebuild (diff)
downloadgentoo-2-1ef610930eac2d1d64762a18d83df773110a3cc2.tar.gz
gentoo-2-1ef610930eac2d1d64762a18d83df773110a3cc2.tar.bz2
gentoo-2-1ef610930eac2d1d64762a18d83df773110a3cc2.zip
Fix for automake-1.13, bug #468070
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'www-servers/varnish')
-rw-r--r--www-servers/varnish/ChangeLog6
-rw-r--r--www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch12
-rw-r--r--www-servers/varnish/varnish-3.0.4.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 2cc01920e7c0..37d7a3147d35 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/varnish
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.61 2013/06/18 01:01:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.62 2013/06/21 12:51:35 blueness Exp $
+
+ 21 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+ +files/varnish-3.0.4-fix-automake-1.13.patch, varnish-3.0.4.ebuild:
+ Fix for automake-1.13, bug #468070
18 Jun 2013; Anthony G. Basile <blueness@gentoo.org> files/varnishd.confd:
Be more explicit in varnishd.confd, bug #461624
diff --git a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
new file mode 100644
index 000000000000..0034c8071393
--- /dev/null
+++ b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
+--- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400
++++ varnish-3.0.4/configure.ac 2013-06-21 08:48:32.000000000 -0400
+@@ -4,7 +4,7 @@
+ AC_REVISION([$Id: varnish-3.0.4-fix-automake-1.13.patch,v 1.1 2013/06/21 12:51:35 blueness Exp $])
+ AC_INIT([Varnish], [3.0.4], [varnish-dev@varnish-cache.org])
+ AC_CONFIG_SRCDIR(include/varnishapi.h)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ # save command line CFLAGS for use in VCC_CC (to pass through things like -m64)
+ OCFLAGS="$CFLAGS"
diff --git a/www-servers/varnish/varnish-3.0.4.ebuild b/www-servers/varnish/varnish-3.0.4.ebuild
index ae0b772736d1..51588347230d 100644
--- a/www-servers/varnish/varnish-3.0.4.ebuild
+++ b/www-servers/varnish/varnish-3.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.4.ebuild,v 1.2 2013/06/16 13:10:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.4.ebuild,v 1.3 2013/06/21 12:51:35 blueness Exp $
EAPI="5"
@@ -35,6 +35,7 @@ RESTRICT="test" #315725
DOCS=( README doc/changes.rst )
PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch
"${FILESDIR}"/${PN}-3.0.4-automagic.patch
"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
)