From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 716AB138253 for ; Thu, 12 May 2016 08:22:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02EFDE07DB; Thu, 12 May 2016 08:22:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61FF9E07DB for ; Thu, 12 May 2016 08:22:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBB7734076D for ; Thu, 12 May 2016 08:22:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25AF386E for ; Thu, 12 May 2016 08:22:10 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1463041387.b8c6a40ca62d36b62cbbee5f94b24c8c4d9359c2.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/varnish/files/varnish-4.0.0-fix-man-Makefile_am.patch www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch www-servers/varnish/files/varnish-4.0.1-fix-warning.patch www-servers/varnish/files/varnishd.confd-r1 www-servers/varnish/files/varnishd.initd-r1 X-VCS-Directories: www-servers/varnish/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b8c6a40ca62d36b62cbbee5f94b24c8c4d9359c2 X-VCS-Branch: master Date: Thu, 12 May 2016 08:22:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 05003dad-63ba-4a78-a3ee-39ed85e1b967 X-Archives-Hash: 34bae9a989a8673dabc77c57a9634778 commit: b8c6a40ca62d36b62cbbee5f94b24c8c4d9359c2 Author: Anthony G. Basile gentoo org> AuthorDate: Thu May 12 08:22:49 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu May 12 08:23:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c6a40c www-servers/varnish: clean out older patches and conf.d files Package-Manager: portage-2.2.26 .../files/varnish-4.0.0-fix-man-Makefile_am.patch | 14 ---- .../files/varnish-4.0.1-fix-doc-Makefile_am.patch | 14 ---- .../files/varnish-4.0.1-fix-man-Makefile_am.patch | 19 ----- .../varnish/files/varnish-4.0.1-fix-warning.patch | 12 --- www-servers/varnish/files/varnishd.confd-r1 | 22 ------ www-servers/varnish/files/varnishd.initd-r1 | 87 ---------------------- 6 files changed, 168 deletions(-) diff --git a/www-servers/varnish/files/varnish-4.0.0-fix-man-Makefile_am.patch b/www-servers/varnish/files/varnish-4.0.0-fix-man-Makefile_am.patch deleted file mode 100644 index 311f0fd..0000000 --- a/www-servers/varnish/files/varnish-4.0.0-fix-man-Makefile_am.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur varnish-4.0.0.orig/man/Makefile.am varnish-4.0.0/man/Makefile.am ---- varnish-4.0.0.orig/man/Makefile.am 2014-04-12 18:25:35.435043191 -0400 -+++ varnish-4.0.0/man/Makefile.am 2014-04-12 18:25:58.579043997 -0400 -@@ -84,8 +84,8 @@ - $(top_srcdir)/doc/sphinx/include/varnishhist_synopsis.rst - ${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@ - --vmod_std.3: $(top_srcdir)/lib/libvmod_std/vmod_std.man.rst -+vmod_std.3: $(top_builddir)/lib/libvmod_std/vmod_std.man.rst - ${RST2MAN} $? $@ - --vmod_directors.3: $(top_srcdir)/lib/libvmod_directors/vmod_directors.man.rst -+vmod_directors.3: $(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst - ${RST2MAN} $? $@ diff --git a/www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch b/www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch deleted file mode 100644 index 57885c6..0000000 --- a/www-servers/varnish/files/varnish-4.0.1-fix-doc-Makefile_am.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur varnish-4.0.1.orig/man/Makefile.am varnish-4.0.1/man/Makefile.am ---- varnish-4.0.1.orig/man/Makefile.am 2014-06-23 09:43:06.000000000 -0400 -+++ varnish-4.0.1/man/Makefile.am 2014-06-25 08:40:43.498765372 -0400 -@@ -86,8 +86,8 @@ - $(top_srcdir)/doc/sphinx/include/varnishhist_synopsis.rst - ${RST2MAN} $(RST2ANY_FLAGS) $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@ - --vmod_std.3: $(top_srcdir)/lib/libvmod_std/vmod_std.man.rst -+vmod_std.3: $(top_builddir)/lib/libvmod_std/vmod_std.man.rst - ${RST2MAN} $(RST2ANY_FLAGS) $? $@ - --vmod_directors.3: $(top_srcdir)/lib/libvmod_directors/vmod_directors.man.rst -+vmod_directors.3: $(top_builddir)/lib/libvmod_directors/vmod_directors.man.rst - ${RST2MAN} $(RST2ANY_FLAGS) $? $@ diff --git a/www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch b/www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch deleted file mode 100644 index c65fba2..0000000 --- a/www-servers/varnish/files/varnish-4.0.1-fix-man-Makefile_am.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur varnish-4.0.1.orig/doc/sphinx/Makefile.am varnish-4.0.1/doc/sphinx/Makefile.am ---- varnish-4.0.1.orig/doc/sphinx/Makefile.am 2014-06-23 09:43:06.000000000 -0400 -+++ varnish-4.0.1/doc/sphinx/Makefile.am 2014-06-25 08:35:11.887750279 -0400 -@@ -144,11 +144,13 @@ - BUILT_SOURCES += include/varnishhist_options.rst \ - include/varnishhist_synopsis.rst - --reference/vmod_std.generated.rst: $(top_srcdir)/lib/libvmod_std/vmod_std.rst -+reference/vmod_std.generated.rst: $(top_builddir)/lib/libvmod_std/vmod_std.rst -+ mkdir -p reference - cp $? $@ - BUILT_SOURCES += reference/vmod_std.generated.rst - --reference/vmod_directors.generated.rst: $(top_srcdir)/lib/libvmod_directors/vmod_directors.rst -+reference/vmod_directors.generated.rst: $(top_builddir)/lib/libvmod_directors/vmod_directors.rst -+ mkdir -p reference - cp $? $@ - BUILT_SOURCES += reference/vmod_directors.generated.rst - diff --git a/www-servers/varnish/files/varnish-4.0.1-fix-warning.patch b/www-servers/varnish/files/varnish-4.0.1-fix-warning.patch deleted file mode 100644 index ae32729..0000000 --- a/www-servers/varnish/files/varnish-4.0.1-fix-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur /root/varnish-4.0.1/lib/libvcc/vcc_expr.c varnish-4.0.1/lib/libvcc/vcc_expr.c ---- /root/varnish-4.0.1/lib/libvcc/vcc_expr.c 2014-06-25 07:06:42.550508615 -0400 -+++ varnish-4.0.1/lib/libvcc/vcc_expr.c 2014-06-23 09:43:06.000000000 -0400 -@@ -670,7 +670,7 @@ - struct expr *e1, *e2; - const char *ip; - const struct symbol *sym; -- double d; -+ double d = 0.0; - - *e = NULL; - if (tl->t->tok == '(') { diff --git a/www-servers/varnish/files/varnishd.confd-r1 b/www-servers/varnish/files/varnishd.confd-r1 deleted file mode 100644 index 472b26f..0000000 --- a/www-servers/varnish/files/varnishd.confd-r1 +++ /dev/null @@ -1,22 +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 the varnishncsa man page for more options -VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log" - -# 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-r1 b/www-servers/varnish/files/varnishd.initd-r1 deleted file mode 100644 index 54487ca..0000000 --- a/www-servers/varnish/files/varnishd.initd-r1 +++ /dev/null @@ -1,87 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 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 /var/run/varnishd.pid --exec ${VARNISHD} -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null - eend $? - - if [ "${VARNISHNCSA_ARGS}" != "" ]; then - ebegin "Starting varnish logging" - start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS} - eend $? - fi -} - -stop() { - ebegin "Stopping varnish" - start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid - eend $? - - if [ -e /var/run/varnishncsa.pid ]; then - ebegin "Stopping varnish logging" - start-stop-daemon --quiet --stop --pidfile /var/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 -}