From nobody Fri Jun 12 21:09:13 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gcXFP4fFSz6h594 for ; Fri, 12 Jun 2026 21:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcXFP2ZRBz3Nvy for ; Fri, 12 Jun 2026 21:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781298553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtK9BZSnAM+wqa3ruMvOziLXCOxByoSxw7t9rbrJ8Hk=; b=AwEiLlP0He3bPXRnzQ2iDx5svGJgTydBRBcW5HWkLlLETeyj6S4c9Jl3mGJ0LKg1XuMJzw 8lPack2rEb/g9V0J+cUrJFNZZDuQpO6lCUDr8TvSZ2caOKzVCS/1NbM+d70MFhLxsocuZO VGAJAWYpinby5C3qfMiv6GmHYmd96tYr8T3mwf3Ca1fy+AEQiEe1x2v6nd/cOoLQTRdn80 AIVUS9sPF9dtLqateh8jaYuT5UukLqTnKlyORjH3tcJVbubli3+HDGqHKuNEP3bokoflDt 5ERkIqaQ6As5T6q8NkE1aVKd9PkwPO1ARLbEPdoq/g8LfUg+ljW+c7AgeRqtFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781298553; a=rsa-sha256; cv=none; b=r97H+uBzN1vID/xr2WVJlL2qVMtRrkm6XGLvK3X7qfobVg9GZ8Cga0iSl2DyGjhkbY5AP+ txb5skERa1Zg81voIHc5Lhip9sgZlK9Y9tZBv86OGwA03mVhwFx8ED/dUteQrb/G2roZ1F xNx60iu3fpuPH676n91M8kR/iCTvFYpYYTiF4NLxh3Sr+r57oGsBZ0FUHjPfJJkzLG/bEN J1vDQhxfBIEWBpDVejQb6kHtD1Bp6B6WavQq9GRYoURfnRk0dCEOe9HUCCjZoGzElOyRcI gfIZ0xM26+EmS0zuZ4L37RSoHah2ZWNF9BFsJHe38i6dYvmnRel6gHvcMXLJqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781298553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtK9BZSnAM+wqa3ruMvOziLXCOxByoSxw7t9rbrJ8Hk=; b=tIouiVSGTftLqsJ67c/7Ai9EOTtV6mrD+kcFgpJ7bjOsdcBR6qFaffcRpxpGMzzaAvFc0b goGGJRxwnTsZW2S53Xpr5yzXuQlk+cMy4F93E23jNKTBa/4B/FkrPL1iyVjNXbsQWIhIvm IvtCcPgJYgO0KPtg9GBRQeAuk1Ojd/yvrA22XtCU47rNamH3GhkXziiJl0uAj07yklFpxd kETtCXNCU5vWUOSgO3VnrwPsQ6WDy9fBA3jz83W91Xzv3GHsTJVxRATRWOLtw2awVIvEOJ WIsPg+kwNNOPKerU+LLX2PxfjzXaRkl9AWpfDXnsebsr4hUigrtDi/kKYXjWyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcXFP28SgztKZ for ; Fri, 12 Jun 2026 21:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 12 Jun 2026 21:09:13 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: fbb6fa8fab9b - main - net/gerbera: Fix URL parsing with libnpupnp List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbb6fa8fab9b5927d4814d2484383e5fac2dcdc3 Auto-Submitted: auto-generated Date: Fri, 12 Jun 2026 21:09:13 +0000 Message-Id: <6a2c7579.264ba.7e235782@gitrepo.freebsd.org> The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbb6fa8fab9b5927d4814d2484383e5fac2dcdc3 commit fbb6fa8fab9b5927d4814d2484383e5fac2dcdc3 Author: Daniel Engberg AuthorDate: 2026-06-07 23:14:33 +0000 Commit: Daniel Engberg CommitDate: 2026-06-12 21:08:50 +0000 net/gerbera: Fix URL parsing with libnpupnp Backport upstream commit 3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f Reference: https://github.com/gerbera/gerbera/pull/3882 PR: 295000 Reported by: Heiko Kirschke --- net/gerbera/Makefile | 1 + ...git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f | 56 ++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile index 083c637c9aa9..02d0532ca927 100644 --- a/net/gerbera/Makefile +++ b/net/gerbera/Makefile @@ -1,6 +1,7 @@ PORTNAME= gerbera DISTVERSIONPREFIX= v DISTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= net multimedia MAINTAINER= diizzy@FreeBSD.org diff --git a/net/gerbera/files/patch-git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f b/net/gerbera/files/patch-git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f new file mode 100644 index 000000000000..4bd2e0d74895 --- /dev/null +++ b/net/gerbera/files/patch-git-01-3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f @@ -0,0 +1,56 @@ +From 3e73aeb54f5f4be70bc4c74f6c7362287bdbb13f Mon Sep 17 00:00:00 2001 +From: Karlchen +Date: Sun, 7 Jun 2026 00:21:04 +0200 +Subject: [PATCH] Handle url decoding correctly + +--- + ChangeLog.md | 1 + + ReleaseNotes.md | 1 + + src/upnp/compat.h | 5 +++++ + src/util/url_utils.cc | 3 ++- + 4 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/upnp/compat.h b/src/upnp/compat.h +index 3470efe1d..cb1d91b15 100644 +--- src/upnp/compat.h ++++ src/upnp/compat.h +@@ -46,6 +46,9 @@ static constexpr grb_read_t GRB_READ_ERROR = -1; + #define GrbUpnpFileInfoSetContentType(i, mt) (i)->content_type = std::move((mt)) + #define GrbUpnpGetHeaders(i) (i)->request_headers + #define GrbUpnpSetHeaders(i, h) std::copy((h).begin(), (h).end(), std::back_inserter((i)->response_headers)) ++// npupnp reencodes the query arguments to build a parsable URL. We need another ++// decoding layer when using it. ++#define GrbUrlUnescape(u) urlUnescape(urlUnescape(u)) + + #define UPNP_NEEDS_LITERAL_HOST_REDIRECT + extern "C" void UpnpSetAllowLiteralHostRedirection(int); +@@ -80,6 +83,8 @@ void UpnpSetHeadersCompat(const UpnpFileInfo* fileInfo, const std::map 170000 and UPNP_VERSION <= 170110) + // new method added + #define UPNP_NEEDS_CORS +diff --git a/src/util/url_utils.cc b/src/util/url_utils.cc +index 884f23667..3a80e9096 100644 +--- src/util/url_utils.cc ++++ src/util/url_utils.cc +@@ -24,6 +24,7 @@ Gerbera - https://gerbera.io/ + #include "url_utils.h" // API + + #include "exceptions.h" ++#include "upnp/compat.h" + + #include + #if FMT_VERSION >= 100202 +@@ -195,7 +196,7 @@ std::map dictDecode(std::string_view url, bool unEscap + auto key = std::string_view(data, eqPos - data); + auto value = std::string_view(eqPos + 1, ampPos - eqPos - 1); + if (unEscape) { +- dict.try_emplace(urlUnescape(key), urlUnescape(value)); ++ dict.try_emplace(GrbUrlUnescape(key), GrbUrlUnescape(value)); + } else { + dict.emplace(key, value); + }