summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-06-23 19:46:42 +0200
committerConrad Kostecki <conikost@gentoo.org>2020-06-25 09:30:39 +0200
commit8dfaa6015869e7f7eb69253cedeedea481a04823 (patch)
treed9c6316c4d510f059168e4cf02933cc5b2794314 /www-servers/varnish/files
parentwww-client/elinks: remove unused patches (diff)
downloadgentoo-8dfaa6015869e7f7eb69253cedeedea481a04823.tar.gz
gentoo-8dfaa6015869e7f7eb69253cedeedea481a04823.tar.bz2
gentoo-8dfaa6015869e7f7eb69253cedeedea481a04823.zip
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@gmail.com> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'www-servers/varnish/files')
-rw-r--r--www-servers/varnish/files/fix-build-x86.patch25
-rw-r--r--www-servers/varnish/files/varnish-5.2.0-fix-import.patch66
2 files changed, 0 insertions, 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 acacd3b9d610..000000000000
--- 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 f83385a3f8e7..000000000000
--- 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])
-