* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/
@ 2016-05-12 8:22 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2016-05-12 8:22 UTC (permalink / raw
To: gentoo-commits
commit: b8c6a40ca62d36b62cbbee5f94b24c8c4d9359c2
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 08:22:49 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/
@ 2016-05-18 6:42 Austin English
0 siblings, 0 replies; 5+ messages in thread
From: Austin English @ 2016-05-18 6:42 UTC (permalink / raw
To: gentoo-commits
commit: e7df50fd22158ce37ecca9a315bea43def5c747f
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:35:26 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:38:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7df50fd
www-servers/varnish: use #!/sbin/openrc-run instead of #!/sbin/runscript
www-servers/varnish/files/varnishd.initd-r2 | 2 +-
www-servers/varnish/files/varnishd.initd-r3 | 2 +-
www-servers/varnish/files/varnishd.initd-r4 | 2 +-
www-servers/varnish/files/varnishlog.initd | 2 +-
www-servers/varnish/files/varnishncsa.initd | 2 +-
www-servers/varnish/files/varnishncsa.initd-r1 | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/www-servers/varnish/files/varnishd.initd-r2 b/www-servers/varnish/files/varnishd.initd-r2
index 055a9ec..7edd50d 100644
--- a/www-servers/varnish/files/varnishd.initd-r2
+++ b/www-servers/varnish/files/varnishd.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-servers/varnish/files/varnishd.initd-r3 b/www-servers/varnish/files/varnishd.initd-r3
index 4a7dcb9..d1a2454 100644
--- a/www-servers/varnish/files/varnishd.initd-r3
+++ b/www-servers/varnish/files/varnishd.initd-r3
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-servers/varnish/files/varnishd.initd-r4 b/www-servers/varnish/files/varnishd.initd-r4
index b0ec918..c60f8be 100644
--- a/www-servers/varnish/files/varnishd.initd-r4
+++ b/www-servers/varnish/files/varnishd.initd-r4
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-servers/varnish/files/varnishlog.initd b/www-servers/varnish/files/varnishlog.initd
index fae8297..f98442a 100644
--- a/www-servers/varnish/files/varnishlog.initd
+++ b/www-servers/varnish/files/varnishlog.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-servers/varnish/files/varnishncsa.initd b/www-servers/varnish/files/varnishncsa.initd
index 7b38397..f17bf3e 100644
--- a/www-servers/varnish/files/varnishncsa.initd
+++ b/www-servers/varnish/files/varnishncsa.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/www-servers/varnish/files/varnishncsa.initd-r1 b/www-servers/varnish/files/varnishncsa.initd-r1
index e06a594..c21d528 100644
--- a/www-servers/varnish/files/varnishncsa.initd-r1
+++ b/www-servers/varnish/files/varnishncsa.initd-r1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/
@ 2017-11-20 22:54 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2017-11-20 22:54 UTC (permalink / raw
To: gentoo-commits
commit: fcc6a1e573ad9f42e1aea8c0c5d802f88d0755a4
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 20 20:58:07 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 22:53:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc6a1e5
www-servers/varnish: remove unused files
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
www-servers/varnish/files/varnishd.confd-r3 | 22 --------
www-servers/varnish/files/varnishd.initd-r3 | 77 --------------------------
www-servers/varnish/files/varnishncsa.initd-r1 | 44 ---------------
3 files changed, 143 deletions(-)
diff --git a/www-servers/varnish/files/varnishd.confd-r3 b/www-servers/varnish/files/varnishd.confd-r3
deleted file mode 100644
index c05b8fb7521..00000000000
--- a/www-servers/varnish/files/varnishd.confd-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-# /etc/conf.d/varnishd
-
-VARNISHD="/usr/sbin/varnishd"
-VARNISHADM="/usr/bin/varnishadm"
-
-#CONFIGFILES="/etc/varnish/${SVCNAME}.vcl"
-CONFIGFILE="/etc/varnish/default.vcl"
-
-# Listen on 127.0.0.1:8080 and connect to backend 127.0.0.1:80
-#VARNISHD_OPTS="-a 127.0.0.1:8080 -a 127.0.0.1:8080"
-
-# Alternatively, don't listen to a backend
-VARNISHD_OPTS="-a 127.0.0.1:8080"
-
-
-# User/Group
-VARNISHD_OPTS="${VARNISHD_OPTS} -u varnish -g varnish"
-
-# You may 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-r3 b/www-servers/varnish/files/varnishd.initd-r3
deleted file mode 100644
index ff8eaf691ea..00000000000
--- a/www-servers/varnish/files/varnishd.initd-r3
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VARNISHD_PID=${VARNISHD_PID:-/run/${SVCNAME}.pid}
-CONFIGFILES="${CONFIGFILE:-/etc/varnish/default.vcl}"
-
-command="${VARNISHD:-/usr/sbin/varnishd}"
-command_args="-P ${VARNISHD_PID} -f ${CONFIGFILE} ${VARNISHD_OPTS}"
-pidfile="${VARNISHD_PID}"
-
-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_pre() {
- checkconfig || return 1
-}
-
-stop_pre() {
- if [ "${RC_CMD}" = "restart" ]; then
- checkconfig || return 1
- 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/varnishncsa.initd-r1 b/www-servers/varnish/files/varnishncsa.initd-r1
deleted file mode 100644
index 8a584decc96..00000000000
--- a/www-servers/varnish/files/varnishncsa.initd-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VARNISHNCSA_PID=${VARNISHNCSA_PID:-/run/${SVCNAME}.pid}
-
-command="${VARNISHNCSA:-/usr/bin/varnishncsa}"
-command_args="-D -P ${VARNISHNCSA_PID} ${VARNISHNCSA_OPTS}"
-pidfile="${VARNISHNCSA_PID}"
-
-extra_started_commands="reload rotate flush"
-
-description_rotate="Rotate the log file"
-description_flush="Flush any outstanding transactions"
-
-# We need to make sure varnishd has started first, bug #524284
-start_pre() {
- TIMEOUT=${TIMEOUT:-5}
-
- local i=0
- while [ $i -lt ${TIMEOUT} ]; do
- echo status | varnishadm 2>/dev/null | grep -q "Child in state running"
- test $? -eq 0 && break
-
- sleep 1 && i=$(expr $i + 1)
- done
-}
-
-rotate() {
- ebegin "Rotating log file"
- start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGHUP
- eend $?
-}
-
-flush() {
- ebegin "Flushing any outstanding transactions"
- start-stop-daemon -p ${VARNISHNCSA_PID} -s SIGUSR1
- eend $?
-}
-
-reload() {
- flush
- rotate
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/
@ 2020-06-25 7:30 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-06-25 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 8dfaa6015869e7f7eb69253cedeedea481a04823
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jun 23 17:46:42 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:30:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfaa601
www-servers/varnish: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/16386
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
www-servers/varnish/files/fix-build-x86.patch | 25 --------
.../varnish/files/varnish-5.2.0-fix-import.patch | 66 ----------------------
2 files changed, 91 deletions(-)
diff --git a/www-servers/varnish/files/fix-build-x86.patch b/www-servers/varnish/files/fix-build-x86.patch
deleted file mode 100644
index acacd3b9d61..00000000000
--- a/www-servers/varnish/files/fix-build-x86.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=620952
-
-From 54b5a09f00c027da280361b30d32a4ff309ba3ab Mon Sep 17 00:00:00 2001
-From: Poul-Henning Kamp <phk@FreeBSD.org>
-Date: Tue, 28 Mar 2017 18:44:12 +0000
-Subject: [PATCH] Try to confuse GCC to not doing FP brain-damage.
-
-Fixes #1875 (maybe)
----
- bin/varnishd/mgt/mgt_param_tweak.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
-index 12a7a52ef..b26581e2e 100644
---- a/bin/varnishd/mgt/mgt_param_tweak.c
-+++ b/bin/varnishd/mgt/mgt_param_tweak.c
-@@ -52,7 +52,7 @@ static int
- tweak_generic_double(struct vsb *vsb, volatile double *dest,
- const char *arg, const char *min, const char *max, const char *fmt)
- {
-- double u, minv = 0, maxv = 0;
-+ volatile double u, minv = 0, maxv = 0;
-
- if (arg != NULL) {
- if (min != NULL) {
diff --git a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch b/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
deleted file mode 100644
index f83385a3f8e..00000000000
--- a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 17c92e43fda114bf5341e51d752e882238b8fe8c Mon Sep 17 00:00:00 2001
-From: Nils Goroll <nils.goroll@uplex.de>
-Date: Thu, 5 Oct 2017 13:39:23 +0200
-Subject: [PATCH] hack up vsctool to work with python 2 and 3
-
-StringIO does not exist any more in python3, yet requiring 2.7 would
-not pave the path forward, so try to be compatible with both.
-
-Works for me on Python 2.7.9 and Python 3.4
-
-I would appreciate if someone more fluent in serpentinous programming
-language reviewed and/or rewrote this.
----
- lib/libvcc/vsctool.py | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
-index 854968e3b..829c6e518 100644
---- a/lib/libvcc/vsctool.py
-+++ b/lib/libvcc/vsctool.py
-@@ -37,7 +37,10 @@
- import json
- import sys
- import gzip
--import StringIO
-+try:
-+ import StringIO
-+except ImportError:
-+ import io
- import collections
- import struct
-
-@@ -54,9 +57,22 @@
- "format": [ "integer", FORMATS],
- }
-
-+# http://python3porting.com/problems.html#bytes-strings-and-unicode
-+if sys.version_info < (3,):
-+ def b(x):
-+ return x
-+else:
-+ import codecs
-+ def b(x):
-+ return codecs.latin_1_encode(x)[0]
-+
- def gzip_str(s):
-- out = StringIO.StringIO()
-- gzip.GzipFile(fileobj=out, mode="w").write(s)
-+ try:
-+ out = StringIO.StringIO()
-+ except NameError:
-+ out = io.BytesIO()
-+
-+ gzip.GzipFile(fileobj=out, mode="w").write(b(s))
- out.seek(4)
- out.write(struct.pack("<L", 0x12bfd58))
- return out.getvalue()
-@@ -285,7 +301,7 @@ class rst_vsc(directive):
- def __init__(self, s):
- super(rst_vsc, self).__init__(s)
-
-- for i,v in PARAMS.iteritems():
-+ for i,v in PARAMS.items():
- if v is not True:
- self.do_default(i, v[0], v[1])
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/
@ 2022-07-27 19:01 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-07-27 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 8eb00664df5c9d0e935f7c6d65db5d91f7b48e7d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jul 27 16:31:02 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 19:00:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb00664
www-servers/varnish: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26625
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/varnish-6.5.1-autoconf-2.70.patch | 50 ----------------------
1 file changed, 50 deletions(-)
diff --git a/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch b/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
deleted file mode 100644
index beb400620fad..000000000000
--- a/www-servers/varnish/files/varnish-6.5.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c6f70f8ca126b34a218248109b78a540d3a4989a Mon Sep 17 00:00:00 2001
-From: Simon Stridsberg <simon@devsn.se>
-Date: Tue, 12 Jan 2021 15:34:33 +0000
-Subject: [PATCH] Fix autoconf error in version 2.70
-
-Fixes #3491
----
- configure.ac | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e44b61fffe..3763b3f34d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,9 +40,9 @@ AC_PROG_INSTALL
- AC_ARG_WITH([rst2man],
- AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
- [RST2MAN="$withval"],
-- AC_CHECK_PROGS(RST2MAN,
-+ [AC_CHECK_PROGS(RST2MAN,
- [rst2man-3.6 rst2man-3 rst2man rst2man.py],
-- [no]))
-+ [no])])
- if test "x$RST2MAN" = "xno"; then
- AC_MSG_ERROR(
- [rst2man is needed to build Varnish, please install python3-docutils.])
-@@ -51,9 +51,9 @@ fi
- AC_ARG_WITH([sphinx-build],
- AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
- [SPHINX="$withval"],
-- AC_CHECK_PROGS(SPHINX,
-+ [AC_CHECK_PROGS(SPHINX,
- [sphinx-build-3.6 sphinx-build-3 sphinx-build],
-- [no]))
-+ [no])])
- if test "x$SPHINX" = "xno"; then
- AC_MSG_ERROR(
- [sphinx-build is needed to build Varnish, please install python3-sphinx.])
-@@ -62,9 +62,9 @@ fi
- AC_ARG_WITH([rst2html],
- AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
- [RST2HTML="$withval"],
-- AC_CHECK_PROGS(RST2HTML,
-+ [AC_CHECK_PROGS(RST2HTML,
- [rst2html-3.6 rst2html-3 rst2html rst2html.py],
-- "no"))
-+ "no")])
-
- if test "x$RST2HTML" = "xno"; then
- AC_MSG_ERROR(
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-27 19:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-27 19:01 [gentoo-commits] repo/gentoo:master commit in: www-servers/varnish/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-06-25 7:30 Conrad Kostecki
2017-11-20 22:54 Anthony G. Basile
2016-05-18 6:42 Austin English
2016-05-12 8:22 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox