From nobody Sat Sep 2 17:52:06 2023 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 4RdMsz1r5Hz4rGsC; Sat, 2 Sep 2023 17:52:07 +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 4RdMsz1Nf7z3GBs; Sat, 2 Sep 2023 17:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693677127; 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=GhT9ZNJKGM9WlM73SwNfsYt5T8OMsowaMZpbGHEmQYY=; b=OEGXRsNAWrNnti2Tx3aJz5x3O25y/+ie+D6dHZrV/QgxgOM6kJfpaIdu+Ie6Y7MDgrzQ0Q Pbf3wDdEszOWPAdhoWy8b5OjW5FWYOie+KhUsgEmswqrzzlVq8J0blcRhLrjVpEEHYMskr ULRoETAKS585gDCM1wn3xZ1BrGnispBHiPclD2Sd2v3FOSVj6a4iA2svTWbApRhqLuKtwE soagdQFUona8iHh9vQ81jM1g7fVUV8thtCiWM8idCgAbB17AcrqXPaJtMOT73jrlvvaZJY q86BzUaXsVdg1PlTKYhCwXuK1bLrbYdXfHjzXCW0geZPwgHUXRrKNmk3ch3CxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693677127; a=rsa-sha256; cv=none; b=yqyy7lrDhEVKuf+9RkSPajlET2K/nVD2ONXkK/HgGWfIb+57B+80dGxx52HoOZR9dHaTxM RWKWtMwc3IeuyLkQ228M/0xGW7ZYk8pHqVg7vY1nj3buErmiehyKD5SLDxUhfVneBaNUIU ORajsGEX3VdGj0MsQSbZTYpVhvgbLJsyvL1DQ313xGyvoS5lOaWgZErtISDOGaiIZCAaDA +yP7Q/W3PsWg1e9/QovQhoTamceGvvgYOd1+2sI34Q+o8aAL1wXf2pkdJoq/9VUxmkRcy+ bQehKU/Tp/EcBpGmDQlBRdAayKWJoZHiQBxu+lDsBaQHtcmq2aVaGTXoAt+sIg== 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=1693677127; 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=GhT9ZNJKGM9WlM73SwNfsYt5T8OMsowaMZpbGHEmQYY=; b=PBjToEci4NcQ8Cen0bgcIVmsnsiBJtps47vcsdvH3EDokdTj/14uVGn54EP0uIe6gkS7tD DXMaqXa1wHrmn7huodJt4KlXrJUzL6+fkWULjM4Ay403dJGIzBOs6PeNsKAE+P7ysqd2t8 acb9HQSJg2IDxm0yn+XzzbgZfmXAJDS2MrdDLNwlVK3kaLXPXEzgP/HAJGZgLEYeiCCjUp PPp0zEK3d3C5aBlLMFWN22sjNdNHRk0RPqfkilYG9kvjV2qcOkHUB4xXpBsnTNanp+wuFb OnQT+LB/GMI+jqjmGw1CE14xFGdpmBTjlO6hRSdN7kpQ9UUqgTUcvyla3t/dlQ== 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 4RdMsz0RG4zsbt; Sat, 2 Sep 2023 17:52:07 +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 382Hq6Yo058748; Sat, 2 Sep 2023 17:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 382Hq622058745; Sat, 2 Sep 2023 17:52:06 GMT (envelope-from git) Date: Sat, 2 Sep 2023 17:52:06 GMT Message-Id: <202309021752.382Hq622058745@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4a1614a51de9 - main - devel/pkgconf: fix regression introduced by last minute patch 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a1614a51de9e7b4dcd58d102abefde1187c80a8 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a1614a51de9e7b4dcd58d102abefde1187c80a8 commit 4a1614a51de9e7b4dcd58d102abefde1187c80a8 Author: Baptiste Daroussin AuthorDate: 2023-09-02 17:49:35 +0000 Commit: Baptiste Daroussin CommitDate: 2023-09-02 17:51:53 +0000 devel/pkgconf: fix regression introduced by last minute patch the last minute patch was intended to fix a bug in pkgconf which broke the expected behaviour of cabal (haskell) $ pkgconf --modversion atf-c atf-c++ 0.21 0.21 0.21 due to bad pattern matching, the fix was a bit too harsh and broke the version comparison $ pkgconf --modversion "gtk+-2.0 >= 2.0.0" Reported by: cmt --- devel/pkgconf/Makefile | 1 + devel/pkgconf/files/patch-modversion-comparison | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/devel/pkgconf/Makefile b/devel/pkgconf/Makefile index e0b94fef0171..08e260c626e1 100644 --- a/devel/pkgconf/Makefile +++ b/devel/pkgconf/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkgconf PORTVERSION= 2.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://distfiles.ariadne.space/${PORTNAME}/ diff --git a/devel/pkgconf/files/patch-modversion-comparison b/devel/pkgconf/files/patch-modversion-comparison index a8d4c26e6c0a..dcab7c93146b 100644 --- a/devel/pkgconf/files/patch-modversion-comparison +++ b/devel/pkgconf/files/patch-modversion-comparison @@ -1,13 +1,19 @@ diff --git cli/main.c cli/main.c -index 25ff5ca..d75bbb7 100644 +index 25ff5ca..055b05a 100644 --- cli/main.c +++ cli/main.c -@@ -306,7 +306,7 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int +@@ -305,10 +305,13 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int + { pkgconf_dependency_t *dep = world_iter->data; pkgconf_pkg_t *pkg = dep->match; ++ size_t len = strlen(pkg->id); - if (strncmp(pkg->id, queue_node->package, strlen(pkg->id))) -+ if (strcmp(pkg->id, queue_node->package)) ++ if (strncmp(pkg->id, queue_node->package, len)) continue; ++ if (!isspace(queue_node->package[len]) && queue_node->package[len] != '\0') ++ continue; if (pkg->version != NULL) { + if (verbosity) + printf("%s: ", pkg->id);