[Buildroot] [git commit branch/2024.02.x] package/tinyproxy: bump version to 1.11.2
Peter Korsgaard
peter at korsgaard.com
Sat Jun 8 16:45:52 UTC 2024
commit: https://git.buildroot.net/buildroot/commit/?id=b746f626cbc56b7351c6c5990ffbd7be3ccf71b8
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2024.02.x
Drop now included patch.
Signed-off-by: Alexander Mukhin <alexander.i.mukhin at gmail.com>
[Peter: drop patch from .checkpackageignore]
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
(cherry picked from commit 9fcdc50175b02adce950e90e8d2ae2b7d1396761)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
.checkpackageignore | 1 -
...wing-up-in-error-page-in-invalid-requests.patch | 32 ----------------------
package/tinyproxy/tinyproxy.hash | 4 +--
package/tinyproxy/tinyproxy.mk | 5 +---
4 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/.checkpackageignore b/.checkpackageignore
index 364701fe1a..536788f5ea 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1262,7 +1262,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream
package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream
package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream
package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream
-package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream
package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream
package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream
diff --git a/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch b/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch
deleted file mode 100644
index da9c21a41a..0000000000
--- a/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001
-From: rofl0r <rofl0r at users.noreply.github.com>
-Date: Thu, 8 Sep 2022 15:18:04 +0000
-Subject: [PATCH] prevent junk from showing up in error page in invalid
- requests
-
-fixes #457
-
-[Retrieved from:
-https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
----
- src/reqs.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/reqs.c b/src/reqs.c
-index bce69819..45db118d 100644
---- a/src/reqs.c
-+++ b/src/reqs.c
-@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr,
- goto fail;
- }
-
-+ /* zero-terminate the strings so they don't contain junk in error page */
-+ request->method[0] = url[0] = request->protocol[0] = 0;
-+
- ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]",
- request->method, url, request->protocol);
-+
- if (ret == 2 && !strcasecmp (request->method, "GET")) {
- request->protocol[0] = 0;
-
diff --git a/package/tinyproxy/tinyproxy.hash b/package/tinyproxy/tinyproxy.hash
index 84e98a84ce..8d4bb69537 100644
--- a/package/tinyproxy/tinyproxy.hash
+++ b/package/tinyproxy/tinyproxy.hash
@@ -1,4 +1,4 @@
-# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.1
-sha512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374 tinyproxy-1.11.1.tar.xz
+# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.2
+sha512 008e43b770f946965d5a3fbad1881859e30b66a3a4a97cf9982e63d81139da7a8f23937601b72f32276166cd170008cafec9231b616fc840f05cae3c1329be35 tinyproxy-1.11.2.tar.xz
# locally computed
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/tinyproxy/tinyproxy.mk b/package/tinyproxy/tinyproxy.mk
index e989f70a22..6656a752a6 100644
--- a/package/tinyproxy/tinyproxy.mk
+++ b/package/tinyproxy/tinyproxy.mk
@@ -4,14 +4,11 @@
#
################################################################################
-TINYPROXY_VERSION = 1.11.1
+TINYPROXY_VERSION = 1.11.2
TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION)
TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.xz
TINYPROXY_LICENSE = GPL-2.0+
TINYPROXY_LICENSE_FILES = COPYING
TINYPROXY_CPE_ID_VALID = YES
-# 0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch
-TINYPROXY_IGNORE_CVES += CVE-2022-40468
-
$(eval $(autotools-package))
More information about the buildroot
mailing list