| 1 |
commit: d41320f2858a9dca4139e74b44d7f0c32fed2f7b |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 10 18:06:06 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 10 18:06:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41320f2 |
| 7 |
|
| 8 |
www-servers/varnish: punt oldest stable version 3.0.7 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
www-servers/varnish/Manifest | 1 - |
| 13 |
.../files/varnish-3.0.3-pthread-uclibc.patch | 35 -------- |
| 14 |
.../varnish/files/varnish-3.0.4-automagic.patch | 94 ------------------- |
| 15 |
.../files/varnish-3.0.4-fix-automake-1.13.patch | 12 --- |
| 16 |
.../files/varnish-3.0.5-fix-python-path.patch | 9 -- |
| 17 |
.../files/varnish-3.0.5-path-to-vmod_vcc.patch | 12 --- |
| 18 |
www-servers/varnish/files/varnishd.confd-r2 | 26 ------ |
| 19 |
www-servers/varnish/files/varnishd.initd-r2 | 94 ------------------- |
| 20 |
www-servers/varnish/files/varnishd.logrotate | 9 -- |
| 21 |
www-servers/varnish/metadata.xml | 1 - |
| 22 |
www-servers/varnish/varnish-3.0.7.ebuild | 100 --------------------- |
| 23 |
11 files changed, 393 deletions(-) |
| 24 |
|
| 25 |
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest |
| 26 |
index 4076f56..cbeb55c 100644 |
| 27 |
--- a/www-servers/varnish/Manifest |
| 28 |
+++ b/www-servers/varnish/Manifest |
| 29 |
@@ -1,3 +1,2 @@ |
| 30 |
-DIST varnish-3.0.7.tar.gz 2102037 SHA256 a27e9f11391617fab27cc6edc31d3c8681b8d6975f8c2cd07f6e081bc54c24ce SHA512 5fa9749305eb1a546ef4aae8a1797247fcc9098e1661453b9b87916da9fbc60d76bc0de9542ab17136e3da4b256c8a547aded2b4372dbbb54c44e93eff34a061 WHIRLPOOL 00ff6d16603ba4bf42608d55d769048f35c275a8ffa2b6860df6de2571d0481c39019d58d5b843f8a64492a5bf26caf9d841a023826d2fd2771ed8d35447a659 |
| 31 |
DIST varnish-4.0.3.tar.gz 1866760 SHA256 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206 SHA512 db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883 WHIRLPOOL 942456e19be427859283959dabe5522667519d36decbc598c8ee1e949767ea7435469393289d4373db6abac5275e50a95fc3799a837dc17740a490b4912bfe6f |
| 32 |
DIST varnish-4.1.3.tar.gz 2134205 SHA256 9f9469b9fda2a578da2a9d282c71c34eeb5c42eda7f8d8728284d92282108429 SHA512 9ba0b2490bfa6f068d6777b4e8f1afcd823a3d6bf8e18ad0274cc9aff7733cd65df0e2ed9f2c6a3d3261d19438cc3254c89b0e41508d2cac2f17bdfd8119e4f1 WHIRLPOOL 6440932735c66fc8e7c8bf0ca577f84d93ed45a5e3cc09074c8471cdb6937f731219dfdf2eaaa43b32aefda8511aec10289c8f6f0596c4ce0f88829b3240a299 |
| 33 |
|
| 34 |
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 |
| 35 |
deleted file mode 100644 |
| 36 |
index 93f3da3..0000000 |
| 37 |
--- a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,35 +0,0 @@ |
| 40 |
-Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc |
| 41 |
- |
| 42 |
-Because of the difference in how uClibc and glibc stack their header |
| 43 |
-files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h |
| 44 |
-on a uClibc system, whereas it does not on a glibc system. This happens |
| 45 |
-in mgt.h and mgt_main.c. This patch refines the check in those files |
| 46 |
-to take this fact into consideration. |
| 47 |
- |
| 48 |
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294 |
| 49 |
---- |
| 50 |
- |
| 51 |
-diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h |
| 52 |
-index 905fbcc..5d3ab09 100644 |
| 53 |
---- a/bin/varnishd/mgt.h |
| 54 |
-+++ b/bin/varnishd/mgt.h |
| 55 |
-@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path; |
| 56 |
- syslog(pri, fmt, __VA_ARGS__); \ |
| 57 |
- } while (0) |
| 58 |
- |
| 59 |
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT) |
| 60 |
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT) |
| 61 |
- #error "Keep pthreads out of in manager process" |
| 62 |
- #endif |
| 63 |
-diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c |
| 64 |
-index 1b7f1e3..dce42d9 100644 |
| 65 |
---- a/bin/varnishd/varnishd.c |
| 66 |
-+++ b/bin/varnishd/varnishd.c |
| 67 |
-@@ -656,6 +656,6 @@ main(int argc, char * const *argv) |
| 68 |
- exit(exit_status); |
| 69 |
- } |
| 70 |
- |
| 71 |
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT) |
| 72 |
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT) |
| 73 |
- #error "Keep pthreads out of in manager process" |
| 74 |
- #endif |
| 75 |
|
| 76 |
diff --git a/www-servers/varnish/files/varnish-3.0.4-automagic.patch b/www-servers/varnish/files/varnish-3.0.4-automagic.patch |
| 77 |
deleted file mode 100644 |
| 78 |
index 6a517cc..0000000 |
| 79 |
--- a/www-servers/varnish/files/varnish-3.0.4-automagic.patch |
| 80 |
+++ /dev/null |
| 81 |
@@ -1,94 +0,0 @@ |
| 82 |
-diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac |
| 83 |
---- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400 |
| 84 |
-+++ varnish-3.0.4/configure.ac 2013-06-15 23:51:51.000000000 -0400 |
| 85 |
-@@ -87,15 +87,20 @@ |
| 86 |
- |
| 87 |
- save_LIBS="${LIBS}" |
| 88 |
- LIBS="" |
| 89 |
--AC_SEARCH_LIBS(initscr, [curses ncurses], |
| 90 |
-- [have_curses=yes], [have_curses=no]) |
| 91 |
--CURSES_LIBS="${LIBS}" |
| 92 |
--LIBS="${save_LIBS}" |
| 93 |
--AC_SUBST(CURSES_LIBS) |
| 94 |
--if test "$have_curses" = no; then |
| 95 |
-- AC_MSG_WARN([curses not found; some tools will not be built]) |
| 96 |
--fi |
| 97 |
--AC_CHECK_HEADERS([ncurses/curses.h curses.h]) |
| 98 |
-+AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools], |
| 99 |
-+ [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)])) |
| 100 |
-+ |
| 101 |
-+AS_IF([test "x$with_tools" != "xno"], [ |
| 102 |
-+ AC_SEARCH_LIBS(initscr, [curses ncurses], |
| 103 |
-+ [have_curses=yes], [have_curses=no]) |
| 104 |
-+ CURSES_LIBS="${LIBS}" |
| 105 |
-+ LIBS="${save_LIBS}" |
| 106 |
-+ AC_SUBST(CURSES_LIBS) |
| 107 |
-+ if test "$have_curses" = no; then |
| 108 |
-+ AC_MSG_ERROR([curses not found, required to build additional tools]) |
| 109 |
-+ fi |
| 110 |
-+ AC_CHECK_HEADERS([ncurses/curses.h curses.h]) |
| 111 |
-+]) |
| 112 |
- AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes]) |
| 113 |
- |
| 114 |
- save_LIBS="${LIBS}" |
| 115 |
-@@ -266,7 +271,6 @@ |
| 116 |
- CFLAGS="${save_CFLAGS}" |
| 117 |
- |
| 118 |
- # Use jemalloc on Linux |
| 119 |
--JEMALLOC_SUBDIR= |
| 120 |
- JEMALLOC_LDADD= |
| 121 |
- AC_ARG_WITH([jemalloc], |
| 122 |
- [AS_HELP_STRING([--with-jemalloc], |
| 123 |
-@@ -274,18 +278,13 @@ |
| 124 |
- [], |
| 125 |
- [with_jemalloc=check]) |
| 126 |
- |
| 127 |
--case $target in |
| 128 |
-- *-*-linux*) |
| 129 |
-- if test "x$with_jemalloc" != xno; then |
| 130 |
-- AC_CHECK_LIB([jemalloc], [malloc_conf], |
| 131 |
-+if test "x$with_jemalloc" != xno; then |
| 132 |
-+ AC_CHECK_LIB([jemalloc], [malloc_conf], |
| 133 |
-+ [JEMALLOC_LDADD="-ljemalloc"], |
| 134 |
-+ [AC_CHECK_LIB([jemalloc], [jmalloc_conf], |
| 135 |
- [JEMALLOC_LDADD="-ljemalloc"], |
| 136 |
-- [AC_MSG_NOTICE([No system jemalloc found, using bundled version]) |
| 137 |
-- JEMALLOC_SUBDIR=libjemalloc |
| 138 |
-- JEMALLOC_LDADD='$(top_builddir)/lib/libjemalloc/libjemalloc_mt.la']) |
| 139 |
-- fi |
| 140 |
-- ;; |
| 141 |
--esac |
| 142 |
--AC_SUBST(JEMALLOC_SUBDIR) |
| 143 |
-+ [AC_MSG_ERROR([No system jemalloc found])])]) |
| 144 |
-+fi |
| 145 |
- AC_SUBST(JEMALLOC_LDADD) |
| 146 |
- |
| 147 |
- # Userland slab allocator, available only on Solaris |
| 148 |
-@@ -588,7 +587,6 @@ |
| 149 |
- lib/libvcl/Makefile |
| 150 |
- lib/libvgz/Makefile |
| 151 |
- lib/libvmod_std/Makefile |
| 152 |
-- lib/libjemalloc/Makefile |
| 153 |
- man/Makefile |
| 154 |
- redhat/Makefile |
| 155 |
- varnishapi.pc |
| 156 |
---- varnish-3.0.4.orig/lib/Makefile.am 2013-06-14 04:39:32.000000000 -0400 |
| 157 |
-+++ varnish-3.0.4/lib/Makefile.am 2013-06-15 23:51:08.000000000 -0400 |
| 158 |
-@@ -6,14 +6,12 @@ |
| 159 |
- libvarnishapi \ |
| 160 |
- libvcl \ |
| 161 |
- libvgz \ |
| 162 |
-- libvmod_std \ |
| 163 |
-- @JEMALLOC_SUBDIR@ |
| 164 |
-+ libvmod_std |
| 165 |
- |
| 166 |
--DIST_SUBDIRS = \ |
| 167 |
-+DIST_SUBDIRS = \ |
| 168 |
- libvarnishcompat \ |
| 169 |
- libvarnish \ |
| 170 |
- libvarnishapi \ |
| 171 |
- libvcl \ |
| 172 |
- libvgz \ |
| 173 |
-- libvmod_std \ |
| 174 |
-- libjemalloc |
| 175 |
-+ libvmod_std |
| 176 |
|
| 177 |
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 |
| 178 |
deleted file mode 100644 |
| 179 |
index 0034c80..0000000 |
| 180 |
--- a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch |
| 181 |
+++ /dev/null |
| 182 |
@@ -1,12 +0,0 @@ |
| 183 |
-diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac |
| 184 |
---- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400 |
| 185 |
-+++ varnish-3.0.4/configure.ac 2013-06-21 08:48:32.000000000 -0400 |
| 186 |
-@@ -4,7 +4,7 @@ |
| 187 |
- AC_REVISION([$Id: varnish-3.0.4-fix-automake-1.13.patch,v 1.1 2013/06/21 12:51:35 blueness Exp $]) |
| 188 |
- AC_INIT([Varnish], [3.0.4], [varnish-dev@×××××××××××××.org]) |
| 189 |
- AC_CONFIG_SRCDIR(include/varnishapi.h) |
| 190 |
--AM_CONFIG_HEADER(config.h) |
| 191 |
-+AC_CONFIG_HEADERS(config.h) |
| 192 |
- |
| 193 |
- # save command line CFLAGS for use in VCC_CC (to pass through things like -m64) |
| 194 |
- OCFLAGS="$CFLAGS" |
| 195 |
|
| 196 |
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 |
| 197 |
deleted file mode 100644 |
| 198 |
index 4c927e3..0000000 |
| 199 |
--- a/www-servers/varnish/files/varnish-3.0.5-fix-python-path.patch |
| 200 |
+++ /dev/null |
| 201 |
@@ -1,9 +0,0 @@ |
| 202 |
-diff -Naur varnish-3.0.5.orig/lib/libvmod_std/vmod.py varnish-3.0.5/lib/libvmod_std/vmod.py |
| 203 |
---- varnish-3.0.5.orig/lib/libvmod_std/vmod.py 2013-12-02 02:47:57.000000000 -0500 |
| 204 |
-+++ varnish-3.0.5/lib/libvmod_std/vmod.py 2014-01-16 13:21:50.763238020 -0500 |
| 205 |
-@@ -1,4 +1,4 @@ |
| 206 |
--#!/usr/local/bin/python |
| 207 |
-+#!/usr/bin/python |
| 208 |
- #- |
| 209 |
- # Copyright (c) 2010-2011 Varnish Software AS |
| 210 |
- # All rights reserved. |
| 211 |
|
| 212 |
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 |
| 213 |
deleted file mode 100644 |
| 214 |
index 479e007..0000000 |
| 215 |
--- a/www-servers/varnish/files/varnish-3.0.5-path-to-vmod_vcc.patch |
| 216 |
+++ /dev/null |
| 217 |
@@ -1,12 +0,0 @@ |
| 218 |
-diff -Naur varnish-3.0.5.orig/lib/libvmod_std/vmod.py varnish-3.0.5/lib/libvmod_std/vmod.py |
| 219 |
---- varnish-3.0.5.orig/lib/libvmod_std/vmod.py 2014-01-16 13:33:02.983247069 -0500 |
| 220 |
-+++ varnish-3.0.5/lib/libvmod_std/vmod.py 2014-01-16 13:42:36.848254794 -0500 |
| 221 |
-@@ -43,7 +43,7 @@ |
| 222 |
- if len(sys.argv) == 2: |
| 223 |
- specfile = sys.argv[1] |
| 224 |
- else: |
| 225 |
-- specfile = "vmod.vcc" |
| 226 |
-+ specfile = "/etc/varnish/vmod.vcc" |
| 227 |
- |
| 228 |
- ctypes = { |
| 229 |
- 'IP': "struct sockaddr_storage *", |
| 230 |
|
| 231 |
diff --git a/www-servers/varnish/files/varnishd.confd-r2 b/www-servers/varnish/files/varnishd.confd-r2 |
| 232 |
deleted file mode 100644 |
| 233 |
index 699bc8e..0000000 |
| 234 |
--- a/www-servers/varnish/files/varnishd.confd-r2 |
| 235 |
+++ /dev/null |
| 236 |
@@ -1,26 +0,0 @@ |
| 237 |
-# /etc/conf.d/varnishd |
| 238 |
- |
| 239 |
-VARNISHD="/usr/sbin/varnishd" |
| 240 |
-VARNISHADM="/usr/bin/varnishadm" |
| 241 |
-CONFIGFILE="/etc/varnish/default.vcl" |
| 242 |
- |
| 243 |
-# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80 |
| 244 |
-# Ignore the config file, /etc/varnish/default.vcl |
| 245 |
-VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80" |
| 246 |
- |
| 247 |
-# Alternatively, don't listen to a backend and use |
| 248 |
-# the config file |
| 249 |
-#VARNISHD_OPTS="-a 127.0.0.1:8080 -f $CONFIGFILE" |
| 250 |
- |
| 251 |
-# Arguments passed to varnishncsa |
| 252 |
-# Please see varnishncsa(1) for more options |
| 253 |
-VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log" |
| 254 |
- |
| 255 |
-# Arguments passed to varnishncsa -F option |
| 256 |
-# Please see varnishncsa(1) for more options |
| 257 |
-# VARNISHNCSA_LOGFORMAT='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"' |
| 258 |
- |
| 259 |
-# We need to increase the number of open files (-n) |
| 260 |
-# and the maximum amount off locked memory (-l) |
| 261 |
-# See bug #459142 |
| 262 |
-rc_ulimit="-n 32786 -l 82000" |
| 263 |
|
| 264 |
diff --git a/www-servers/varnish/files/varnishd.initd-r2 b/www-servers/varnish/files/varnishd.initd-r2 |
| 265 |
deleted file mode 100644 |
| 266 |
index 7edd50d..0000000 |
| 267 |
--- a/www-servers/varnish/files/varnishd.initd-r2 |
| 268 |
+++ /dev/null |
| 269 |
@@ -1,94 +0,0 @@ |
| 270 |
-#!/sbin/openrc-run |
| 271 |
-# Copyright 1999-2014 Gentoo Foundation |
| 272 |
-# Distributed under the terms of the GNU General Public License v2 |
| 273 |
-# $Id$ |
| 274 |
- |
| 275 |
-extra_commands="configtest" |
| 276 |
-extra_started_commands="reload" |
| 277 |
- |
| 278 |
-description_configtest="Run syntax tests for configuration files." |
| 279 |
-description_reload="Reloads the configuration." |
| 280 |
- |
| 281 |
-depend() { |
| 282 |
- need net |
| 283 |
-} |
| 284 |
- |
| 285 |
-configtest() { |
| 286 |
- ebegin "Checking ${SVCNAME} configuration" |
| 287 |
- checkconfig |
| 288 |
- eend $? |
| 289 |
-} |
| 290 |
- |
| 291 |
-checkconfig() { |
| 292 |
- ${VARNISHD} -C -f ${CONFIGFILE} >/dev/null 2>&1 |
| 293 |
- ret=$? |
| 294 |
- if [ $ret -ne 0 ]; then |
| 295 |
- eerror "${SVCNAME} has detected an error in your setup:" |
| 296 |
- ${VARNISHD} -C -f ${CONFIGFILE} |
| 297 |
- fi |
| 298 |
- |
| 299 |
- return $ret |
| 300 |
-} |
| 301 |
- |
| 302 |
-start() { |
| 303 |
- checkconfig || return 1 |
| 304 |
- |
| 305 |
- ebegin "Starting varnish" |
| 306 |
- start-stop-daemon --quiet --start --pidfile /run/varnishd.pid \ |
| 307 |
- --exec ${VARNISHD} -- \ |
| 308 |
- -P /run/varnishd.pid \ |
| 309 |
- ${VARNISHD_OPTS} &> /dev/null |
| 310 |
- eend $? |
| 311 |
- |
| 312 |
- if [ "${VARNISHNCSA_ARGS}" != "" ]; then |
| 313 |
- ebegin "Starting varnish logging" |
| 314 |
- start-stop-daemon --quiet --start --pidfile /run/varnishncsa.pid \ |
| 315 |
- --exec /usr/bin/varnishncsa -- \ |
| 316 |
- -D -P /run/varnishncsa.pid \ |
| 317 |
- ${VARNISHNCSA_ARGS} \ |
| 318 |
- ${VARNISHNCSA_LOGFORMAT:+-F "${VARNISHNCSA_LOGFORMAT}"} |
| 319 |
- eend $? |
| 320 |
- fi |
| 321 |
-} |
| 322 |
- |
| 323 |
-stop() { |
| 324 |
- ebegin "Stopping varnish" |
| 325 |
- start-stop-daemon --quiet --stop --pidfile /run/varnishd.pid |
| 326 |
- eend $? |
| 327 |
- |
| 328 |
- if [ -e /run/varnishncsa.pid ]; then |
| 329 |
- ebegin "Stopping varnish logging" |
| 330 |
- start-stop-daemon --quiet --stop --pidfile /run/varnishncsa.pid |
| 331 |
- eend $? |
| 332 |
- fi |
| 333 |
-} |
| 334 |
- |
| 335 |
-reload() { |
| 336 |
- checkconfig || return 1 |
| 337 |
- |
| 338 |
- ebegin "Reloading varnish" |
| 339 |
- |
| 340 |
- $VARNISHADM vcl.list >/dev/null 2>&1 |
| 341 |
- ret=$? |
| 342 |
- if [ $ret -ne 0 ]; then |
| 343 |
- eerror "${SVCNAME} cannot list configuration" |
| 344 |
- return 1 |
| 345 |
- fi |
| 346 |
- |
| 347 |
- new_config="reload_$(date +%FT%H:%M:%S)" |
| 348 |
- $VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1 |
| 349 |
- ret=$? |
| 350 |
- if [ $ret -ne 0 ]; then |
| 351 |
- eerror "${SVCNAME} cannot load configuration" |
| 352 |
- return 1 |
| 353 |
- fi |
| 354 |
- |
| 355 |
- $VARNISHADM vcl.use $new_config >/dev/null 2>&1 |
| 356 |
- ret=$? |
| 357 |
- if [ $ret -ne 0 ]; then |
| 358 |
- eerror "${SVCNAME} cannot switch configuration" |
| 359 |
- return 1 |
| 360 |
- fi |
| 361 |
- |
| 362 |
- eend 0 |
| 363 |
-} |
| 364 |
|
| 365 |
diff --git a/www-servers/varnish/files/varnishd.logrotate b/www-servers/varnish/files/varnishd.logrotate |
| 366 |
deleted file mode 100644 |
| 367 |
index 62ee600..0000000 |
| 368 |
--- a/www-servers/varnish/files/varnishd.logrotate |
| 369 |
+++ /dev/null |
| 370 |
@@ -1,9 +0,0 @@ |
| 371 |
-/var/log/varnish/*.log { |
| 372 |
- weekly |
| 373 |
- rotate 10 |
| 374 |
- copytruncate |
| 375 |
- delaycompress |
| 376 |
- compress |
| 377 |
- notifempty |
| 378 |
- missingok |
| 379 |
-} |
| 380 |
|
| 381 |
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml |
| 382 |
index 99c406b..fa6c198 100644 |
| 383 |
--- a/www-servers/varnish/metadata.xml |
| 384 |
+++ b/www-servers/varnish/metadata.xml |
| 385 |
@@ -11,7 +11,6 @@ |
| 386 |
<description>Secondary maintainer</description> |
| 387 |
</maintainer> |
| 388 |
<use> |
| 389 |
- <flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag> |
| 390 |
<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag> |
| 391 |
</use> |
| 392 |
<longdescription lang="en"> |
| 393 |
|
| 394 |
diff --git a/www-servers/varnish/varnish-3.0.7.ebuild b/www-servers/varnish/varnish-3.0.7.ebuild |
| 395 |
deleted file mode 100644 |
| 396 |
index 4c52071..0000000 |
| 397 |
--- a/www-servers/varnish/varnish-3.0.7.ebuild |
| 398 |
+++ /dev/null |
| 399 |
@@ -1,100 +0,0 @@ |
| 400 |
-# Copyright 1999-2016 Gentoo Foundation |
| 401 |
-# Distributed under the terms of the GNU General Public License v2 |
| 402 |
-# $Id$ |
| 403 |
- |
| 404 |
-EAPI="5" |
| 405 |
- |
| 406 |
-PYTHON_COMPAT=( python{2_7,3_3} pypy ) |
| 407 |
- |
| 408 |
-inherit autotools-utils eutils systemd python-single-r1 |
| 409 |
- |
| 410 |
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator" |
| 411 |
-HOMEPAGE="http://www.varnish-cache.org/" |
| 412 |
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz" |
| 413 |
- |
| 414 |
-LICENSE="BSD-2 GPL-2" |
| 415 |
-SLOT="0" |
| 416 |
-KEYWORDS="amd64 ~mips x86" |
| 417 |
-IUSE="doc jemalloc jit static-libs +tools" |
| 418 |
- |
| 419 |
-CDEPEND=" |
| 420 |
- || ( dev-libs/libedit sys-libs/readline ) |
| 421 |
- dev-libs/libpcre[jit?] |
| 422 |
- jemalloc? ( dev-libs/jemalloc ) |
| 423 |
- tools? ( sys-libs/ncurses:= )" |
| 424 |
- |
| 425 |
-#varnish compiles stuff at run time |
| 426 |
-RDEPEND=" |
| 427 |
- ${PYTHON_DEPS} |
| 428 |
- ${CDEPEND} |
| 429 |
- sys-devel/gcc" |
| 430 |
- |
| 431 |
-DEPEND=" |
| 432 |
- ${CDEPEND} |
| 433 |
- virtual/pkgconfig" |
| 434 |
- |
| 435 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 436 |
- |
| 437 |
-RESTRICT="test" #315725 |
| 438 |
- |
| 439 |
-DOCS=( README doc/changes.rst ) |
| 440 |
- |
| 441 |
-PATCHES=( |
| 442 |
- "${FILESDIR}"/${PN}-3.0.4-fix-automake-1.13.patch |
| 443 |
- "${FILESDIR}"/${PN}-3.0.4-automagic.patch |
| 444 |
- "${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch |
| 445 |
- "${FILESDIR}"/${PN}-3.0.5-fix-python-path.patch |
| 446 |
- "${FILESDIR}"/${PN}-3.0.5-path-to-vmod_vcc.patch |
| 447 |
-) |
| 448 |
- |
| 449 |
-AUTOTOOLS_AUTORECONF="yes" |
| 450 |
- |
| 451 |
-pkg_setup() { |
| 452 |
- python-single-r1_pkg_setup |
| 453 |
-} |
| 454 |
- |
| 455 |
-src_prepare() { |
| 456 |
- # Remove bundled libjemalloc. We also fix |
| 457 |
- # automagic dep in our patches, bug #461638 |
| 458 |
- rm -rf lib/libjemalloc |
| 459 |
- |
| 460 |
- autotools-utils_src_prepare |
| 461 |
-} |
| 462 |
- |
| 463 |
-src_configure() { |
| 464 |
- local myeconfargs=( |
| 465 |
- $(use_enable static-libs static) |
| 466 |
- $(use_enable jit pcre-jit ) |
| 467 |
- $(use_with jemalloc) |
| 468 |
- $(use_with tools) |
| 469 |
- --without-rst2man |
| 470 |
- --without-rst2html |
| 471 |
- ) |
| 472 |
- autotools-utils_src_configure |
| 473 |
-} |
| 474 |
- |
| 475 |
-src_install() { |
| 476 |
- autotools-utils_src_install |
| 477 |
- |
| 478 |
- newinitd "${FILESDIR}"/varnishd.initd-r2 varnishd |
| 479 |
- newconfd "${FILESDIR}"/varnishd.confd-r2 varnishd |
| 480 |
- |
| 481 |
- insinto /etc/logrotate.d |
| 482 |
- newins "${FILESDIR}/varnishd.logrotate" varnishd |
| 483 |
- |
| 484 |
- dodir /var/log/varnish |
| 485 |
- |
| 486 |
- use doc && dohtml -r "doc/sphinx/=build/html/" |
| 487 |
- |
| 488 |
- systemd_dounit "${FILESDIR}/${PN}d.service" |
| 489 |
- |
| 490 |
- python_doscript lib/libvmod_std/vmod.py |
| 491 |
- insinto /etc/varnish |
| 492 |
- doins lib/libvmod_std/vmod.vcc |
| 493 |
-} |
| 494 |
- |
| 495 |
-pkg_postinst () { |
| 496 |
- elog "No demo-/sample-configfile is included in the distribution. Please" |
| 497 |
- elog "read the man-page for more info. A sample configuration proxying" |
| 498 |
- elog "localhost:8080 for localhost:80 is given in /etc/conf.d/varnishd." |
| 499 |
-} |
Archives