From nobody Sat Nov 22 06:39:57 2025 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 4dD2Wj0Xsmz6JT8p; Sat, 22 Nov 2025 06:40:01 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dD2Wh6hL0z3rXW; Sat, 22 Nov 2025 06:40:00 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763793601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r+7MdV5o4WrTQ0pKAarr+c0ntM3+YMpE4SINvx4rdjA=; b=g1gwt2fX2leOhh24k3LMxlzFayJGFByQ/Da0f04QSbKjk+Qv35AFfpgA/5JhK0KJFTfzOL NoOmdk/Rn7zT6VE42YoQBLai6zwy9OXPgfZT91sNdefXJlHl+QfMr3bIU7yAFzUEqtxUFk vR77eFT9ePeBO0wzTf10DSiHHTinqD6Y9Ks4iD6Ayx/jqUqIyo1HKX9GS1nzcKIJu6miNL mUbeXRvJBdH6TKyp5aOBC/+Wquq7YDYri/XcfWhx2wAoL52qws0q7wQNEuSJbi0l7kcNAw WWw5T57V/53yiMGp6b8Zprar7M6G7QjEX5ESzq9GV3s6SD1y6PRHSnmx5J7ULQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763793601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r+7MdV5o4WrTQ0pKAarr+c0ntM3+YMpE4SINvx4rdjA=; b=ATKMT7FQJePlc50lP1OtjxBCmEdB7zalpxGwRFrTCLXpN/eMZo4EK4+TpTFtWU++wW19uK 7RcVkbc+71O84R4tGAsCgAPcb9P/2/vvQbLISYy2ylroAxzW19fsIFHiLWIEX/4XcxdSSf yIJ7hBQjK2Izk+WfHq1WBghDb7nlF2S26gNh+LG86ikDSM84zZzEayeb+7qjWYTlPHIFHl tDG81ZF6Xhan2RnQn75HbD3xBiCWksfyOAa5RnrZxD2pLUWYVw0YGxSBScjCx6ops9lnqc NDtH6bu4dHgWRqc3/OwRECBV/pz8iBsl2ID8fK14jJMYz2ymmxFm/vnWBXFZmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763793601; a=rsa-sha256; cv=none; b=ni8hXEgBG4V6oT1XdfcqUkgpbwjXqaUbT0G8XSC96vRbHw8UAXLcr/laKzkZ8YEfcYeKUN BohAOijszugSZwgn2hw5kM792uAqnPWPZ7HAg74++jevoxueLWE06rqvGiTsWaA3v+82EY aJGVDTHFm/hpsW9WxaIia4ER8+WDhQOzCw+HuSriOpfslfydHkX6I9VgPRWg6Egt7C21Ny jYqh+pn5n3oDQgcaBVhKZH2ZaM+LOEy/Sl+WCEWrMhDWXGQRRTgk7ESx7w6MS3etmacqcm 2mwOoJCQDGkGfYfld8IwjH/7H6wu6oIDdf/ZZpy5RLVw3CJyAh6TJk8RyNQhXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.1.16] (217-209-194-237-no600.tbcn.telia.com [217.209.194.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: diizzy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dD2Wh0ld7zN96; Sat, 22 Nov 2025 06:39:59 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Message-ID: Date: Sat, 22 Nov 2025 07:39:57 +0100 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 MIME-Version: 1.0 User-Agent: Betterbird (Windows) Subject: Re: git: 1fafcbf8a507 - main - print/hplip(-plugin): Update to 3.25.8 To: =?UTF-8?Q?T=C4=B3l_Coosemans?= Cc: Charlie Li , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <691cbe74.266cf.107db18@gitrepo.freebsd.org> <20251119112513.3dc20aa5@hal.tijl.coosemans.org> <44265002-300d-418f-82a9-d3589389eece@FreeBSD.org> <20251121210522.493e1be3@hal.tijl.coosemans.org> Content-Language: en-US From: Daniel Engberg In-Reply-To: <20251121210522.493e1be3@hal.tijl.coosemans.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-11-21 21:05, Tijl Coosemans wrote: > On Fri, 21 Nov 2025 20:16:49 +0100 Daniel Engberg wrote: >> On 2025-11-19 11:25, Tijl Coosemans wrote: >>> On Tue, 18 Nov 2025 16:33:10 -0500 Charlie Li wrote: >>>> Tijl Coosemans wrote: >>>>> The branch main has been updated by tijl: >>>>> >>>>> URL: https://cgit.FreeBSD.org/ports/commit/?id=1fafcbf8a507f0d81b9c4671fc399e92ccacc305 >>>>> >>>>> commit 1fafcbf8a507f0d81b9c4671fc399e92ccacc305 >>>>> Author: Tijl Coosemans >>>>> AuthorDate: 2025-11-18 15:38:23 +0000 >>>>> Commit: Tijl Coosemans >>>>> CommitDate: 2025-11-18 18:44:00 +0000 >>>>> >>>>> print/hplip(-plugin): Update to 3.25.8 >>>>> --- >>>>> print/hplip-plugin/Makefile | 10 ++++-- >>>>> print/hplip-plugin/distinfo | 6 ++-- >>>>> print/hplip/Makefile | 4 +-- >>>>> print/hplip/distinfo | 6 ++-- >>>>> print/hplip/files/patch-Makefile.in | 52 +++++++++++++++++++++++------- >>>>> print/hplip/files/patch-prnt_cups.py | 42 ++++++++++++------------ >>>>> print/hplip/files/patch-ui5_setupdialog.py | 20 ++++++++++++ >>>>> print/hplip/pkg-plist | 36 +++++++++++++++++++++ >>>>> 8 files changed, 131 insertions(+), 45 deletions(-) >>>>> >>>>> diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile >>>>> index f3663d7d4ee1..34c4d305fa75 100644 >>>>> --- a/print/hplip-plugin/Makefile >>>>> +++ b/print/hplip-plugin/Makefile >>>>> @@ -1,8 +1,7 @@ >>>>> PORTNAME= hplip-plugin >>>>> -PORTVERSION= 3.24.4 >>>>> -PORTREVISION= 1 >>>>> +PORTVERSION= 3.25.8 >>>>> CATEGORIES= print >>>>> -MASTER_SITES= https://developers.hp.com/sites/default/files/ \ >>>>> +MASTER_SITES= https://developers.hp.com/sites/default/files/2025-11/ \ >>>>> https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/ >>>>> DISTNAME= hplip-${DISTVERSION}-plugin >>>>> EXTRACT_SUFX= .run >>>>> @@ -43,6 +42,11 @@ LINARCH= x86_64 >>>>> LINARCH= x86_32 >>>>> .endif >>>>> >>>>> +do-fetch: >>>>> + @for s in ${MASTER_SITES}; do ${SETENV} ${FETCH_ENV} ${FETCH_CMD} \ >>>>> + --user-agent="Mozilla/5.0 (FreeBSD x86_64) Firefox/145.0" \ >>>>> + -o ${DISTDIR} $${s}${DISTNAME}${EXTRACT_SUFX} && break; done >>>>> + >>>> For some reason the HP site still errors at least in poudriere, so I'm >>>> still having to manually fetch, with User-Agent. This do-fetch override >>>> now unconditionally attempts to fetch, ignoring any existing checksummed >>>> copy. >>> Should be fixed in b5a68c4da678. >> Why not use FETCH_BEFORE_ARGS? >> https://cgit.freebsd.org/ports/tree/Mk/bsd.port.mk#n667 > > I couldn't find a way to escape the spaces and parentheses in the user > agent string. I think Mk/Scripts/do-fetch.sh line 152 is missing "eval" > or maybe there's something wrong with the way FETCH_(BEFORE_)ARGS is > passed to that script. > Ahh yes, that does indeed seem to be messy atm :/ Best regards, Daniel