www-servers/varnish: punt oldest stable version 3.0.7

Package-Manager: portage-2.2.28

8 files changed, 0 insertions, 291 deletions

diff --git a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch b/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
deleted file mode 100644
index 93f3da3f878e..000000000000
--- a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc
-
-Because of the difference in how uClibc and glibc stack their header
-files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h
-on a uClibc system, whereas it does not on a glibc system.  This happens
-in mgt.h and mgt_main.c.  This patch refines the check in those files
-to take this fact into consideration.
-
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294
----
-
-diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
-index 905fbcc..5d3ab09 100644
---- a/bin/varnishd/mgt.h
-+++ b/bin/varnishd/mgt.h
-@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path;
- 		syslog(pri, fmt, __VA_ARGS__);		\
- 	} while (0)
- 
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
- #error "Keep pthreads out of in manager process"
- #endif
-diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
-index 1b7f1e3..dce42d9 100644
---- a/bin/varnishd/varnishd.c
-+++ b/bin/varnishd/varnishd.c
-@@ -656,6 +656,6 @@ main(int argc, char * const *argv)
- 	exit(exit_status);
- }
- 
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
- #error "Keep pthreads out of in manager process"
- #endif
diff --git a/www-servers/varnish/files/varnish-3.0.4-automagic.patch b/www-servers/varnish/files/varnish-3.0.4-automagic.patch
deleted file mode 100644
index 6a517cc9efeb..000000000000
--- a/www-servers/varnish/files/varnish-3.0.4-automagic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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-15 23:51:51.000000000 -0400
-@@ -87,15 +87,20 @@
- 
- save_LIBS="${LIBS}"
- LIBS=""
--AC_SEARCH_LIBS(initscr, [curses ncurses],
--	[have_curses=yes], [have_curses=no])
--CURSES_LIBS="${LIBS}"
--LIBS="${save_LIBS}"
--AC_SUBST(CURSES_LIBS)
--if test "$have_curses" = no; then
--	AC_MSG_WARN([curses not found; some tools will not be built])
--fi
--AC_CHECK_HEADERS([ncurses/curses.h curses.h])
-+AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools],
-+            [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)]))
-+
-+AS_IF([test "x$with_tools" != "xno"], [
-+  AC_SEARCH_LIBS(initscr, [curses ncurses],
-+    [have_curses=yes], [have_curses=no])
-+  CURSES_LIBS="${LIBS}"
-+  LIBS="${save_LIBS}"
-+  AC_SUBST(CURSES_LIBS)
-+  if test "$have_curses" = no; then
-+    AC_MSG_ERROR([curses not found, required to build additional tools])
-+  fi
-+  AC_CHECK_HEADERS([ncurses/curses.h curses.h])
-+])
- AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
- 
- save_LIBS="${LIBS}"
-@@ -266,7 +271,6 @@
- CFLAGS="${save_CFLAGS}" 
- 
- # Use jemalloc on Linux
--JEMALLOC_SUBDIR=
- JEMALLOC_LDADD=
- AC_ARG_WITH([jemalloc],
-             [AS_HELP_STRING([--with-jemalloc],
-@@ -274,18 +278,13 @@
-             [],
-             [with_jemalloc=check])
- 
--case $target in
--    *-*-linux*)
--        if test "x$with_jemalloc" != xno; then
--            AC_CHECK_LIB([jemalloc], [malloc_conf],
-+if test "x$with_jemalloc" != xno; then
-+      AC_CHECK_LIB([jemalloc], [malloc_conf],
-+            [JEMALLOC_LDADD="-ljemalloc"],
-+            [AC_CHECK_LIB([jemalloc], [jmalloc_conf],
-                   [JEMALLOC_LDADD="-ljemalloc"],
--                  [AC_MSG_NOTICE([No system jemalloc found, using bundled version])
--                   JEMALLOC_SUBDIR=libjemalloc
--                   JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la'])
--	fi
--	;;
--esac
--AC_SUBST(JEMALLOC_SUBDIR)
-+                        [AC_MSG_ERROR([No system jemalloc found])])])
-+fi
- AC_SUBST(JEMALLOC_LDADD)
- 
- # Userland slab allocator, available only on Solaris
-@@ -588,7 +587,6 @@
-     lib/libvcl/Makefile
-     lib/libvgz/Makefile
-     lib/libvmod_std/Makefile
--    lib/libjemalloc/Makefile
-     man/Makefile
-     redhat/Makefile
-     varnishapi.pc
---- varnish-3.0.4.orig/lib/Makefile.am	2013-06-14 04:39:32.000000000 -0400
-+++ varnish-3.0.4/lib/Makefile.am	2013-06-15 23:51:08.000000000 -0400
-@@ -6,14 +6,12 @@
- 	libvarnishapi \
- 	libvcl \
- 	libvgz \
--	libvmod_std \
--	@JEMALLOC_SUBDIR@
-+	libvmod_std
- 
--DIST_SUBDIRS = 	\
-+DIST_SUBDIRS = \
- 	libvarnishcompat \
- 	libvarnish \
- 	libvarnishapi \
- 	libvcl \
- 	libvgz \
--	libvmod_std \
--	libjemalloc
-+	libvmod_std
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
deleted file mode 100644
index 0034c8071393..000000000000
--- a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/varnish-3.0.5-fix-python-path.patch b/www-servers/varnish/files/varnish-3.0.5-fix-python-path.patch
deleted file mode 100644
index 4c927e364a61..000000000000
--- a/www-servers/varnish/files/varnish-3.0.5-fix-python-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur varnish-3.0.5.orig/lib/libvmod_std/vmod.py varnish-3.0.5/lib/libvmod_std/vmod.py
---- varnish-3.0.5.orig/lib/libvmod_std/vmod.py	2013-12-02 02:47:57.000000000 -0500
-+++ varnish-3.0.5/lib/libvmod_std/vmod.py	2014-01-16 13:21:50.763238020 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!/usr/bin/python
- #-
- # Copyright (c) 2010-2011 Varnish Software AS
- # All rights reserved.
diff --git a/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch b/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch
deleted file mode 100644
index 479e007938ba..000000000000
--- a/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur varnish-3.0.5.orig/lib/libvmod_std/vmod.py varnish-3.0.5/lib/libvmod_std/vmod.py
---- varnish-3.0.5.orig/lib/libvmod_std/vmod.py	2014-01-16 13:33:02.983247069 -0500
-+++ varnish-3.0.5/lib/libvmod_std/vmod.py	2014-01-16 13:42:36.848254794 -0500
-@@ -43,7 +43,7 @@
- if len(sys.argv) == 2:
- 	specfile = sys.argv[1]
- else:
--	specfile = "vmod.vcc"
-+	specfile = "/etc/varnish/vmod.vcc"
- 
- ctypes = {
- 	'IP':		"struct sockaddr_storage *",
diff --git a/www-servers/varnish/files/varnishd.confd-r2 b/www-servers/varnish/files/varnishd.confd-r2
deleted file mode 100644
index 699bc8e57d69..000000000000
--- a/www-servers/varnish/files/varnishd.confd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-# /etc/conf.d/varnishd
-
-VARNISHD="/usr/sbin/varnishd"
-VARNISHADM="/usr/bin/varnishadm"
-CONFIGFILE="/etc/varnish/default.vcl"
-
-# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
-# Ignore the config file, /etc/varnish/default.vcl
-VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80"
-
-# Alternatively, don't listen to a backend and use 
-# the config file
-#VARNISHD_OPTS="-a 127.0.0.1:8080 -f $CONFIGFILE"
-
-# Arguments passed to varnishncsa
-# Please see varnishncsa(1) for more options
-VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log"
-
-# Arguments passed to varnishncsa -F option
-# Please see varnishncsa(1) for more options
-# VARNISHNCSA_LOGFORMAT='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"'
-
-# We need to increase the number of open files (-n)
-# and the maximum amount off locked memory (-l)
-# See bug #459142
-rc_ulimit="-n 32786 -l 82000"
diff --git a/www-servers/varnish/files/varnishd.initd-r2 b/www-servers/varnish/files/varnishd.initd-r2
deleted file mode 100644
index 7edd50d76a51..000000000000
--- a/www-servers/varnish/files/varnishd.initd-r2
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_commands="configtest"
-extra_started_commands="reload"
-
-description_configtest="Run syntax tests for configuration files."
-description_reload="Reloads the configuration."
-
-depend() {
-	need net
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfig() {
-	${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your setup:"
-		${VARNISHD} -C -f ${CONFIGFILE}
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting varnish"
-	start-stop-daemon --quiet --start --pidfile /run/varnishd.pid \
-		--exec ${VARNISHD} -- \
-		-P /run/varnishd.pid \
-		${VARNISHD_OPTS} &> /dev/null
-	eend $?
-
-	if [ "${VARNISHNCSA_ARGS}" != "" ]; then
-		ebegin "Starting varnish logging"
-		start-stop-daemon --quiet --start --pidfile /run/varnishncsa.pid \
-			--exec /usr/bin/varnishncsa -- \
-			-D -P /run/varnishncsa.pid \
-			${VARNISHNCSA_ARGS} \
-			${VARNISHNCSA_LOGFORMAT:+-F "${VARNISHNCSA_LOGFORMAT}"}
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Stopping varnish"
-	start-stop-daemon --quiet --stop --pidfile /run/varnishd.pid
-	eend $?
-
-	if [ -e /run/varnishncsa.pid ]; then
-		ebegin "Stopping varnish logging"
-		start-stop-daemon --quiet --stop --pidfile /run/varnishncsa.pid
-		eend $?
-	fi
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading varnish"
-
-	$VARNISHADM vcl.list >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} cannot list configuration"
-		return 1
-	fi
-
-	new_config="reload_$(date +%FT%H:%M:%S)"
-	$VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} cannot load configuration"
-		return 1
-	fi
-	
-	$VARNISHADM vcl.use $new_config >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} cannot switch configuration"
-		return 1
-	fi
-
-	eend 0
-}
diff --git a/www-servers/varnish/files/varnishd.logrotate b/www-servers/varnish/files/varnishd.logrotate
deleted file mode 100644
index 62ee60007a2d..000000000000
--- a/www-servers/varnish/files/varnishd.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/varnish/*.log {
-  weekly
-  rotate 10
-  copytruncate
-  delaycompress
-  compress
-  notifempty
-  missingok
-}