Date: Sat, 22 Nov 2025 07:39:57 +0100 From: Daniel Engberg <diizzy@FreeBSD.org> To: =?UTF-8?Q?T=C4=B3l_Coosemans?= <tijl@FreeBSD.org> Cc: Charlie Li <vishwin@freebsd.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 1fafcbf8a507 - main - print/hplip(-plugin): Update to 3.25.8 Message-ID: <e8971096-d4db-4551-9c4d-9b3713d663a4@FreeBSD.org> In-Reply-To: <20251121210522.493e1be3@hal.tijl.coosemans.org> References: <691cbe74.266cf.107db18@gitrepo.freebsd.org> <ec10a1a4-c092-4bc8-af45-47d728666adc@freebsd.org> <20251119112513.3dc20aa5@hal.tijl.coosemans.org> <44265002-300d-418f-82a9-d3589389eece@FreeBSD.org> <20251121210522.493e1be3@hal.tijl.coosemans.org>
index | next in thread | previous in thread | raw e-mail
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 <tijl@FreeBSD.org> >>>>> AuthorDate: 2025-11-18 15:38:23 +0000 >>>>> Commit: Tijl Coosemans <tijl@FreeBSD.org> >>>>> 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, Danielhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e8971096-d4db-4551-9c4d-9b3713d663a4>