Adding metadata

7 files changed, 2 insertions, 327 deletions

diff --git a/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch b/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
deleted file mode 100644
index 219f2ab6cf70..000000000000
--- a/net-proxy/squid/files/squid-4.17-use-system-libltdl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/830099
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,11 +6,8 @@
- ##
- 
- AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
--DIST_SUBDIRS	= compat lib libltdl scripts icons errors contrib doc src test-suite tools
-+DIST_SUBDIRS	= compat lib scripts icons errors contrib doc src test-suite tools
- SUBDIRS		= compat lib
--if ENABLE_LOADABLE_MODULES
--SUBDIRS += libltdl
--endif
- SUBDIRS += scripts icons errors doc src tools test-suite
- 
- DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff --git a/net-proxy/squid/files/squid-6.12-ar.patch b/net-proxy/squid/files/squid-6.12-ar.patch
deleted file mode 100644
index babfae4f4547..000000000000
--- a/net-proxy/squid/files/squid-6.12-ar.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/squid-cache/squid/pull/1920
-
-From e9d43d7612ab7bd2b5d04ce0d24e06a342a506e1 Mon Sep 17 00:00:00 2001
-Message-ID: <e9d43d7612ab7bd2b5d04ce0d24e06a342a506e1.1729501292.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-Date: Mon, 21 Oct 2024 09:56:38 +0100
-Subject: [PATCH] configure.ac: use AC_CHECK_TOOL for ar
-
-Use AC_CHECK_TOOL which checks the environment variable `$AR` as well, which
-is useful for us in Gentoo when cross-compiling.
-
-We could use AC_PROG_AR in newer autoconf or AM_PROG_AR in automake but
-the AR_R use is hardcoded in a bunch of places so not worth it.
-
-Bug: https://bugs.gentoo.org/911945
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,7 +129,7 @@ AS_IF([test "x$ac_cv_path_PERL" = "xnone"],[
- AC_PATH_PROG(POD2MAN, pod2man, $FALSE)
- AM_CONDITIONAL(ENABLE_POD2MAN_DOC, test "x${ac_cv_path_POD2MAN}" != "x$FALSE")
- 
--AC_PATH_PROG(AR, ar, $FALSE)
-+AC_CHECK_TOOL(AR, ar, :)
- AR_R="$AR r"
- AC_SUBST(AR_R)
- 
--- 
-2.47.0
-
diff --git a/net-proxy/squid/files/squid-6.14-cachemgr-dont_show_hostname.patch b/net-proxy/squid/files/squid-6.14-cachemgr-dont_show_hostname.patch
deleted file mode 100644
index 315208646474..000000000000
--- a/net-proxy/squid/files/squid-6.14-cachemgr-dont_show_hostname.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/squid-cache/squid/commit/d94dbed6c700faeded8c4175f2a8d0f71c15755b.patch
-From d94dbed6c700faeded8c4175f2a8d0f71c15755b Mon Sep 17 00:00:00 2001
-From: Amos Jeffries <amosjeffries@squid-cache.org>
-Date: Wed, 5 Nov 2025 10:23:34 +1300
-Subject: [PATCH] Do not show arbitrary hostname in cachemgr.cgi output
-
---- a/tools/cachemgr.cc
-+++ b/tools/cachemgr.cc
-@@ -819,7 +819,7 @@ process_request(cachemgr_request * req)
-     }
- 
-     if (!check_target_acl(req->hostname, req->port)) {
--        snprintf(buf, sizeof(buf), "target %s:%d not allowed in cachemgr.conf\n", req->hostname, req->port);
-+        snprintf(buf, sizeof(buf), "target host not allowed in cachemgr.conf\n");
-         error_html(buf);
-         return 1;
-     }
diff --git a/net-proxy/squid/files/squid-6.14-proxy_auth_data.patch b/net-proxy/squid/files/squid-6.14-proxy_auth_data.patch
deleted file mode 100644
index fa0aaef12e43..000000000000
--- a/net-proxy/squid/files/squid-6.14-proxy_auth_data.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-https://sources.debian.org/patches/squid/6.13-2+deb13u1/CVE-2025-62168.patch/
-From: Amos Jeffries <yadij@users.noreply.github.com>
-Date: Sat, 11 Oct 2025 16:33:02 +1300
-Subject: [PATCH] Bug 3390: Proxy auth data visible to scripts (#2249)
-
-Original changes to redact credentials from error page %R code
-expansion output was incomplete. It missed the parse failure
-case where ErrorState::request_hdrs raw buffer contained
-sensitive information.
-
-Also missed was the %W case where full request message headers
-were generated in a mailto link. This case is especially
-problematic as it may be delivered over insecure SMTP even if
-the error was secured with HTTPS.
-
-After this change:
-* The HttpRequest message packing code for error pages is de-duplicated
-  and elides authentication headers for both %R and %W code outputs.
-* The %R code output includes the CRLF request message terminator.
-* The email_err_data directive causing advanced details to be added to
-  %W mailto links is disabled by default.
-
-Also redact credentials from generated TRACE responses.
-
----------
-
-Co-authored-by: Alex Rousskov <rousskov@measurement-factory.com>
-
-origin: backport, https://github.com/squid-cache/squid/commit/0951a0681011dfca3d78c84fd7f1e19c78a4443f
-bug: https://github.com/squid-cache/squid/security/advisories/GHSA-c8cc-phh7-xmxr
-debian-bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1118341
---- a/src/HttpRequest.cc
-+++ b/src/HttpRequest.cc
-@@ -341,7 +341,7 @@ HttpRequest::swapOut(StoreEntry * e)
- 
- /* packs request-line and headers, appends <crlf> terminator */
- void
--HttpRequest::pack(Packable * p) const
-+HttpRequest::pack(Packable * const p, const bool maskSensitiveInfo) const
- {
-     assert(p);
-     /* pack request-line */
-@@ -349,8 +349,8 @@ HttpRequest::pack(Packable * p) const
-                SQUIDSBUFPRINT(method.image()), SQUIDSBUFPRINT(url.path()),
-                http_ver.major, http_ver.minor);
-     /* headers */
--    header.packInto(p);
--    /* trailer */
-+    header.packInto(p, maskSensitiveInfo);
-+    /* indicate the end of the header section */
-     p->append("\r\n", 2);
- }
- 
---- a/src/HttpRequest.h
-+++ b/src/HttpRequest.h
-@@ -206,7 +206,7 @@ public:
- 
-     void swapOut(StoreEntry * e);
- 
--    void pack(Packable * p) const;
-+    void pack(Packable * p, bool maskSensitiveInfo = false) const;
- 
-     static void httpRequestPack(void *obj, Packable *p);
- 
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -8944,12 +8944,18 @@ NAME: email_err_data
- COMMENT: on|off
- TYPE: onoff
- LOC: Config.onoff.emailErrData
--DEFAULT: on
-+DEFAULT: off
- DOC_START
- 	If enabled, information about the occurred error will be
- 	included in the mailto links of the ERR pages (if %W is set)
- 	so that the email body contains the data.
- 	Syntax is <A HREF="mailto:%w%W">%w</A>
-+
-+	SECURITY WARNING:
-+		Request headers and other included facts may contain
-+		sensitive information about transaction history, the
-+		Squid instance, and its environment which would be
-+		unavailable to error recipients otherwise.
- DOC_END
- 
- NAME: deny_info
---- a/src/client_side_reply.cc
-+++ b/src/client_side_reply.cc
-@@ -94,7 +94,7 @@ clientReplyContext::clientReplyContext(ClientHttpRequest *clientContext) :
- void
- clientReplyContext::setReplyToError(
-     err_type err, Http::StatusCode status, char const *uri,
--    const ConnStateData *conn, HttpRequest *failedrequest, const char *unparsedrequest,
-+    const ConnStateData *conn, HttpRequest *failedrequest, const char *,
- #if USE_AUTH
-     Auth::UserRequest::Pointer auth_user_request
- #else
-@@ -104,9 +104,6 @@ clientReplyContext::setReplyToError(
- {
-     auto errstate = clientBuildError(err, status, uri, conn, failedrequest, http->al);
- 
--    if (unparsedrequest)
--        errstate->request_hdrs = xstrdup(unparsedrequest);
--
- #if USE_AUTH
-     errstate->auth_user_request = auth_user_request;
- #endif
-@@ -995,11 +992,14 @@ clientReplyContext::traceReply()
-     triggerInitialStoreRead();
-     http->storeEntry()->releaseRequest();
-     http->storeEntry()->buffer();
-+    MemBuf content;
-+    content.init();
-+    http->request->pack(&content, true /* hide authorization data */);
-     const HttpReplyPointer rep(new HttpReply);
--    rep->setHeaders(Http::scOkay, nullptr, "text/plain", http->request->prefixLen(), 0, squid_curtime);
-+    rep->setHeaders(Http::scOkay, nullptr, "message/http", content.contentSize(), 0, squid_curtime);
-+    rep->body.set(SBuf(content.buf, content.size));
-     http->storeEntry()->replaceHttpReply(rep);
--    http->request->swapOut(http->storeEntry());
--    http->storeEntry()->complete();
-+    http->storeEntry()->completeSuccessfully("traceReply() stored the entire response");
- }
- 
- #define SENDING_BODY 0
---- a/src/errorpage.cc
-+++ b/src/errorpage.cc
-@@ -792,7 +792,6 @@ ErrorState::~ErrorState()
- {
-     safe_free(redirect_url);
-     safe_free(url);
--    safe_free(request_hdrs);
-     wordlistDestroy(&ftp.server_msg);
-     safe_free(ftp.request);
-     safe_free(ftp.reply);
-@@ -850,7 +849,7 @@ ErrorState::Dump(MemBuf * mb)
-                     SQUIDSBUFPRINT(request->url.path()),
-                     AnyP::ProtocolType_str[request->http_ver.protocol],
-                     request->http_ver.major, request->http_ver.minor);
--        request->header.packInto(&str);
-+        request->header.packInto(&str, true /* hide authorization data */);
-     }
- 
-     str.append("\r\n", 2);
-@@ -1112,18 +1111,10 @@ ErrorState::compileLegacyCode(Build &build)
-                 p = "[no request]";
-             break;
-         }
--        if (request) {
--            mb.appendf(SQUIDSBUFPH " " SQUIDSBUFPH " %s/%d.%d\n",
--                       SQUIDSBUFPRINT(request->method.image()),
--                       SQUIDSBUFPRINT(request->url.path()),
--                       AnyP::ProtocolType_str[request->http_ver.protocol],
--                       request->http_ver.major, request->http_ver.minor);
--            request->header.packInto(&mb, true); //hide authorization data
--        } else if (request_hdrs) {
--            p = request_hdrs;
--        } else {
-+        else if (request)
-+            request->pack(&mb, true /* hide authorization data */);
-+        else
-             p = "[no request]";
--        }
-         break;
- 
-     case 's':
---- a/src/errorpage.h
-+++ b/src/errorpage.h
-@@ -194,7 +194,6 @@ public:
-         MemBuf *listing = nullptr;
-     } ftp;
- 
--    char *request_hdrs = nullptr;
-     char *err_msg = nullptr; /* Preformatted error message from the cache */
- 
-     AccessLogEntryPointer ale; ///< transaction details (or nil)
---- a/src/tests/stub_HttpRequest.cc
-+++ b/src/tests/stub_HttpRequest.cc
-@@ -45,7 +45,7 @@ bool HttpRequest::expectingBody(const HttpRequestMethod &, int64_t &) const STUB
- bool HttpRequest::bodyNibbled() const STUB_RETVAL(false)
- int HttpRequest::prefixLen() const STUB_RETVAL(0)
- void HttpRequest::swapOut(StoreEntry *) STUB
--void HttpRequest::pack(Packable *) const STUB
-+void HttpRequest::pack(Packable *, bool) const STUB
- void HttpRequest::httpRequestPack(void *, Packable *) STUB
- HttpRequest * HttpRequest::FromUrl(const SBuf &, const MasterXaction::Pointer &, const HttpRequestMethod &) STUB_RETVAL(nullptr)
- HttpRequest * HttpRequest::FromUrlXXX(const char *, const MasterXaction::Pointer &, const HttpRequestMethod &) STUB_RETVAL(nullptr)
diff --git a/net-proxy/squid/files/squid-6.2-gentoo.patch b/net-proxy/squid/files/squid-6.2-gentoo.patch
deleted file mode 100644
index 2444c74a71d0..000000000000
--- a/net-proxy/squid/files/squid-6.2-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,9 +33,6 @@ PRESET_CFLAGS="$CFLAGS"
- PRESET_CXXFLAGS="$CXXFLAGS"
- PRESET_LDFLAGS="$LDFLAGS"
- 
--dnl Set default LDFLAGS
--AS_IF([test "x$LDFLAGS" = "x"],[LDFLAGS="-g"])
--
- # check for host OS detail
- AC_CANONICAL_HOST
- AC_MSG_CHECKING([simplified host os])
---- a/src/cf.data.pre
-+++ b/src/cf.data.pre
-@@ -1669,6 +1669,7 @@ acl Safe_ports port 280		# http-mgmt
- acl Safe_ports port 488		# gss-http
- acl Safe_ports port 591		# filemaker
- acl Safe_ports port 777		# multiling http
-+acl Safe_ports port 901		# SWAT
- CONFIG_END
- DOC_END
- 
-@@ -7447,11 +7448,11 @@ COMMENT_END
- 
- NAME: cache_mgr
- TYPE: string
--DEFAULT: webmaster
-+DEFAULT: root
- LOC: Config.adminEmail
- DOC_START
- 	Email-address of local cache manager who will receive
--	mail if the cache dies.  The default is "webmaster".
-+	mail if the cache dies.  The default is "root".
- DOC_END
- 
- NAME: mail_from
---- a/src/debug/debug.cc
-+++ b/src/debug/debug.cc
-@@ -1144,7 +1144,7 @@ Debug::SettleSyslog()
- #if HAVE_SYSLOG && defined(LOG_LOCAL4)
- 
-     if (Debug::log_syslog) {
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility);
-         Module().syslogChannel.markOpened();
-     }
- 
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -1867,7 +1867,7 @@ watch_child(const CommandLine &masterCommand)
- 
-     enter_suid();
- 
--    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+    openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- 
-     if (!opt_foreground)
-         GoIntoBackground();
-@@ -1959,7 +1959,7 @@ watch_child(const CommandLine &masterCommand)
- 
-             if ((pid = fork()) == 0) {
-                 /* child */
--                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+                openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
-                 (void)execvp(masterCommand.arg0(), kidCommand.argv());
-                 int xerrno = errno;
-                 syslog(LOG_ALERT, "execvp failed: %s", xstrerr(xerrno));
-@@ -1971,7 +1971,7 @@ watch_child(const CommandLine &masterCommand)
-         }
- 
-         /* parent */
--        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4);
-+        openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4);
- 
-         // If Squid received a signal while checking for dying kids (below) or
-         // starting new kids (above), then do a fast check for a new dying kid
diff --git a/net-proxy/wireproxy/Manifest b/net-proxy/wireproxy/Manifest
index da35b7de6992..3fe59a52a320 100644
--- a/net-proxy/wireproxy/Manifest
+++ b/net-proxy/wireproxy/Manifest
@@ -1,4 +1,4 @@
-DIST wireproxy-1.0.9-vendor.tar.xz 1162932 BLAKE2B 74a3b3647394c839b11be5aa8dadc7b8147977ac5ff6efdb9218e3dc2565c92d0a26cee97dfb86c7a30a358fbd4a009c023f55fb41c6db9f08aff1f07cd9cd22 SHA512 401b2667ef22c82ef543aa12418b7fc8d4f9a8c696c7b9fb107f0e86fbf6fd117ffdb6e7fe7a2eab3160993014917491a1d409f4a7a17c8a874569be4b5bfb1c
-DIST wireproxy-1.0.9.tar.gz 21752 BLAKE2B a1a421e0dbcc21cb00cfde99f40ad81e69618daf2db65de1316017b46a9f7264f7c1829be16fabe82e2210bb2a79a4e761aee3c94256bccc677f0d5288d918c7 SHA512 92e914b1cc4591990829ff3d7a6bce0a700af909d2bda11044c592c2a38e7f08a1ecb57419c49c8f493340e8757b5440e1635ce4d60eae8544075894dcb96027
 DIST wireproxy-1.1.2-vendor.tar.xz 1193304 BLAKE2B 07fc1283cff8914ba6778eeaef43e0ce782e7ede01b0f99ff1565e55b6d637f09d6877150e4337ab69123dd06827fb61b3811aff5bc32e7de12cfe381198ef6c SHA512 3481b7a733ce47a154b86fc82c84557469215b54619147c780fd981c865215acb74c1028a4aa195366ccf8ead7aa40807f2ee64b7bb0cb086a30945caa1ebf3f
 DIST wireproxy-1.1.2.tar.gz 28489 BLAKE2B 8a21c89d629d228a6d66b3bb457221d59d6a253cdb6ceb898e310d67a66569e67ead0e7892e84a6f24214520434e222d94c2e4b340feaf9f76d85fa1b395d08b SHA512 95e9943522e33bf22cc8db72cedae081113767af0304dc6efbb7a31fb1d23bbd8c4fd1b8199a60665f9381d5620de3a8bf383f4c8ef328c279b2d09573db236f
+DIST wireproxy-1.1.3-vendor.tar.xz 1222444 BLAKE2B 82f8fcd0b603cfb9ae084927c515cba29a69a5d8ebe3856bb38143371d0fb944caf7097ead73c922fe934c5a324a857bedac39cc2b7f6316ec8ab3637ff77d98 SHA512 d213011479d8b2606b9e579b78fd5135af12fbf3cdeb47e7c8942b53c2e96ce51a1f003ba2b0ff589ccecca04f8af51b7fe8f4dff6550c7ac91a9e70529cc523
+DIST wireproxy-1.1.3.tar.gz 48239 BLAKE2B 7be7ccba5c4ff1ba1a3fe1b860c20b69c794b39b2f6da1e4b78046c5ab978b4068d0c7b5a1b60ea298b613e17b4fb1c273f60bc21f8e2f74fd7ae75fc030d0ef SHA512 7d445370cb014472c32db8f1cfcb4c127eaaed83c3da6b8e358a0da14dc5bd05ac474f88bbe430d0026601e57ec690e3ae48cd56a6989edb764f13286e6f6968
diff --git a/net-proxy/wireproxy/wireproxy-1.0.9.ebuild b/net-proxy/wireproxy/wireproxy-1.1.3.ebuild
index 17416e21df76..17416e21df76 100644
--- a/net-proxy/wireproxy/wireproxy-1.0.9.ebuild
+++ b/net-proxy/wireproxy/wireproxy-1.1.3.ebuild