From nobody Thu Jun 13 16:46:21 2024 X-Original-To: dev-commits-ports-all@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 4W0SwZ0Hrsz5Nxht; Thu, 13 Jun 2024 16:46:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W0SwY6Vxsz4VGT; Thu, 13 Jun 2024 16:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718297181; 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=CdkRgbD5S2EN9mbrfXtZVP928ewwbvll28RNnb070EU=; b=dMjya9bwr6dzAB8dPgSeh6/1qUU2b/GYdMvrJ/15tZbfXqLXRjCwHAflkRY9xKeX8X0UOL aagdO0y0iGJVfpxP6PUMZRHy4oYmXtc7/59EOTF9lBSa5ftODSgH7w8foEPUDIHoTRboEG 2bm0iXsBwz3JI+xP2lR04n8PSJU2dx4LZ1bD7OVBWAlv3M0i5uyLYEpI7FPcUC+wy+VTXw wBceSyLbhWD9fZghKgoOJyXBjb5oRfhGtYbRV36j8JTNKB66cJta8new1es39QkJhULNQv 55aoebJMY0YjFIgloY7HXKA0P7QRVBCX3LQw7ggjhDAr0svfWsyWffEZlZmkPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718297181; a=rsa-sha256; cv=none; b=JZb21ajowvqhmjpw0MB3B+PGa77SMDNfqwu12kF6x+7mMl5QtL2hylfUfcHqCDeyltaV0p nmMpRYVyMFtFbxc7jpRKC/bOvIPeSpQ87Mlnpa7td28zvEJngtqmTopEDWzHL1/QT/HpV4 nDOCoXbqLfrcnw7f6IFXrnUgfTUvlBbrhtLO2XBZXOsx3dvAIm5oDgITDt8193Id4QuFdc 0aDVnxFIx/dYnCfF8XAsrQMLEJhgImMwFkBtnEJ0InZTWzFPmetY7Dv1Ef+uondEsW/i67 h0ZAzZJ/Hx4Mf1LrMuX8dQ/KorGaH0cbsn73kLDqTgaA4SASw9OariYMoju8JA== 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=1718297181; 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=CdkRgbD5S2EN9mbrfXtZVP928ewwbvll28RNnb070EU=; b=M28+DKHQTln9ESG/Cdtz7wAi6o3ji6qKofryTtozdW0s1n6drdMDB88cjjmGtVmoRIAM9o U6AimQqdt3kguLqAynWNrwNvEYNT2UeVd6oXgwQ7xEB1G89rWqDpGNc4893VI9bwrAbmHi iL4PQPwrQSxKA/lNfRvcv4X9bIxsh9J5/z8wkRptKfqIVTh3iDYIqnQn+tdyDVsqG/Utvn To7FTcL53sleHI4uUjK4IPIq1oqw67gqjSHlRDCphs8F26zWDM5XOEcHAz1e0PqrjGItqn ythvammRhtz4PH6HuxNNznvcWRd7DUcAoypikPY8DC2i7xxThn0ntitab3ymog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W0SwY5pbvzl3N; Thu, 13 Jun 2024 16:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45DGkLLN085650; Thu, 13 Jun 2024 16:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DGkLrL085647; Thu, 13 Jun 2024 16:46:21 GMT (envelope-from git) Date: Thu, 13 Jun 2024 16:46:21 GMT Message-Id: <202406131646.45DGkLrL085647@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Torsten Zuehlsdorff Subject: git: 68436150c0bb - main - databases/pguri: Unbreak for PostgreSQL 16 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68436150c0bbed44dec6393a310a9695cb869b89 Auto-Submitted: auto-generated The branch main has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=68436150c0bbed44dec6393a310a9695cb869b89 commit 68436150c0bbed44dec6393a310a9695cb869b89 Author: Torsten Zuehlsdorff AuthorDate: 2024-06-13 16:42:21 +0000 Commit: Torsten Zuehlsdorff CommitDate: 2024-06-13 16:46:03 +0000 databases/pguri: Unbreak for PostgreSQL 16 The changes for the patch were taken from here: https://github.com/petere/pguri/issues/16#issuecomment-1816077925 PR: 279190 --- databases/pguri/Makefile | 2 +- databases/pguri/files/patch-uri.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/databases/pguri/Makefile b/databases/pguri/Makefile index 7ea44d541924..555425b8f11e 100644 --- a/databases/pguri/Makefile +++ b/databases/pguri/Makefile @@ -1,6 +1,6 @@ PORTNAME= pguri PORTVERSION= 1.20151224 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MAINTAINER= tz@FreeBSD.org diff --git a/databases/pguri/files/patch-uri.c b/databases/pguri/files/patch-uri.c new file mode 100644 index 000000000000..10a95328056d --- /dev/null +++ b/databases/pguri/files/patch-uri.c @@ -0,0 +1,29 @@ +--- uri.c.orig 2024-06-13 16:34:21 UTC ++++ uri.c +@@ -149,7 +149,7 @@ uri_host_inet(PG_FUNCTION_ARGS) + char *tmp = palloc(16); + snprintf(tmp, 16, "%u.%u.%u.%u", data[0], data[1], data[2], data[3]); + uriFreeUriMembersA(&uri); +- PG_RETURN_INET_P(DirectFunctionCall1(inet_in, CStringGetDatum(tmp))); ++ PG_RETURN_INET_P((inet *) (DirectFunctionCall1(inet_in, CStringGetDatum(tmp)))); + } + else if (uri.hostData.ip6) + { +@@ -161,7 +161,7 @@ uri_host_inet(PG_FUNCTION_ARGS) + data[8], data[9], data[10], data[11], + data[12], data[13], data[14], data[15]); + uriFreeUriMembersA(&uri); +- PG_RETURN_INET_P(DirectFunctionCall1(inet_in, CStringGetDatum(tmp))); ++ PG_RETURN_INET_P((inet *) (DirectFunctionCall1(inet_in, CStringGetDatum(tmp)))); + } + else + { +@@ -299,7 +299,7 @@ uri_path_array(PG_FUNCTION_ARGS) + uriFreeUriMembersA(&uri); + + if (astate) +- PG_RETURN_ARRAYTYPE_P(makeArrayResult(astate, CurrentMemoryContext)); ++ PG_RETURN_ARRAYTYPE_P((Pointer)(makeArrayResult(astate, CurrentMemoryContext))); + else + PG_RETURN_ARRAYTYPE_P(construct_empty_array(TEXTOID)); + }