diff mbox series

[1/1] package/tinyproxy: bump version to 1.11.2

Message ID 20240524125448.3566-1-alexander.i.mukhin@gmail.com
State Accepted
Headers show
Series [1/1] package/tinyproxy: bump version to 1.11.2 | expand

Commit Message

Alexander Mukhin May 24, 2024, 12:54 p.m. UTC 
Signed-off-by: Alexander Mukhin <alexander.i.mukhin@gmail.com>
---
 ...up-in-error-page-in-invalid-requests.patch | 32 -------------------
 package/tinyproxy/tinyproxy.hash              |  4 +--
 package/tinyproxy/tinyproxy.mk                |  5 +--
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch

Comments

Peter Korsgaard May 27, 2024, 2:38 p.m. UTC | #1 
>>>>> "Alexander" == Alexander Mukhin <alexander.i.mukhin@gmail.com> writes:

 > Signed-off-by: Alexander Mukhin <alexander.i.mukhin@gmail.com>
 > ---
 >  ...up-in-error-page-in-invalid-requests.patch | 32 -------------------
 >  package/tinyproxy/tinyproxy.hash              |  4 +--
 >  package/tinyproxy/tinyproxy.mk                |  5 +--

You forgot to remove the reference to the patch in
.checkpackageignore. Committed with that fixed, thanks.
Peter Korsgaard June 8, 2024, 4:47 p.m. UTC | #2 
>>>>> "Alexander" == Alexander Mukhin <alexander.i.mukhin@gmail.com> writes:

 > Signed-off-by: Alexander Mukhin <alexander.i.mukhin@gmail.com>

Committed to 2024.02.x, thanks.
diff mbox series

Patch

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 da9c21a4..00000000
--- 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@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@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 84e98a84..8d4bb695 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 e989f70a..6656a752 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))