From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A296013835A for ; Thu, 25 Jun 2020 07:31:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90487E09BC; Thu, 25 Jun 2020 07:31:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2544AE09B5 for ; Thu, 25 Jun 2020 07:31:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A51B34F0DC for ; Thu, 25 Jun 2020 07:31:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A50F2B8 for ; Thu, 25 Jun 2020 07:30:53 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1593070239.8dfaa6015869e7f7eb69253cedeedea481a04823.conikost@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/fix-build-x86.patch www-servers/varnish/files/varnish-5.2.0-fix-import.patch X-VCS-Directories: www-servers/varnish/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 8dfaa6015869e7f7eb69253cedeedea481a04823 X-VCS-Branch: master Date: Thu, 25 Jun 2020 07:30:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 691b8cc1-2dfd-41cb-a28e-a2d0e45d4ad4 X-Archives-Hash: 50db143eb1f6f99c91fc45730ca65510 commit: 8dfaa6015869e7f7eb69253cedeedea481a04823 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Jun 23 17:46:42 2020 +0000 Commit: Conrad Kostecki gentoo 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 gmail.com> Signed-off-by: Conrad Kostecki 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 -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 -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("