Re: git: bb2e093ec793 - main - print/hplip(-plugin): Update to 3.26.6
Date: Thu, 17 Sep 2026 13:20:01 UTC
Hello!
Can't fetch plugins:
fetch:
https://developers.hp.com/sites/default/files/2026-09/hplip-3.26.6-plugin.run:
Transient resolver failure
fetch:
https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.26.6-plugin.run:
Not Found
On freefall:
fetch:
https://developers.hp.com/sites/default/files/2026-09/hplip-3.26.6-plugin.run:
Forbidden
17.09.2026 13:00, Tijl Coosemans пишет:
> The branch main has been updated by tijl:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=bb2e093ec79301462631ce237c513e68fc73a14d
>
> commit bb2e093ec79301462631ce237c513e68fc73a14d
> Author: Tijl Coosemans <tijl@FreeBSD.org>
> AuthorDate: 2026-09-17 09:56:48 +0000
> Commit: Tijl Coosemans <tijl@FreeBSD.org>
> CommitDate: 2026-09-17 09:59:27 +0000
>
> print/hplip(-plugin): Update to 3.26.6
> ---
> print/hplip-plugin/Makefile | 4 +-
> print/hplip-plugin/distinfo | 6 +-
> print/hplip/Makefile | 2 +-
> print/hplip/distinfo | 6 +-
> print/hplip/files/patch-Makefile.in | 67 +++++++++++-----------
> print/hplip/files/patch-fax_backend_hpfax.py | 9 ---
> print/hplip/files/patch-installer_pluginhandler.py | 9 ---
> print/hplip/pkg-plist | 7 ++-
> 8 files changed, 50 insertions(+), 60 deletions(-)
>
> diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile
> index 4ace3fdf7855..0ec3b09477f2 100644
> --- a/print/hplip-plugin/Makefile
> +++ b/print/hplip-plugin/Makefile
> @@ -1,7 +1,7 @@
> PORTNAME= hplip-plugin
> -PORTVERSION= 3.26.4
> +PORTVERSION= 3.26.6
> CATEGORIES= print
> -MASTER_SITES= https://developers.hp.com/sites/default/files/2026-05/ \
> +MASTER_SITES= https://developers.hp.com/sites/default/files/2026-09/ \
> https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/
> DISTNAME= hplip-${DISTVERSION}-plugin
> EXTRACT_SUFX= .run
> diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo
> index 35289714ddcc..804e2c4404a0 100644
> --- a/print/hplip-plugin/distinfo
> +++ b/print/hplip-plugin/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1783500656
> -SHA256 (hplip-3.26.4-plugin.run) = 199f78f8af7f36894d7180e9090963ce2550a75ec701f8a4ba37665a9746fdf0
> -SIZE (hplip-3.26.4-plugin.run) = 11493127
> +TIMESTAMP = 1789624130
> +SHA256 (hplip-3.26.6-plugin.run) = bb830712bfacc4567e8714522f1359a749df344786256c8513ededf3e9455325
> +SIZE (hplip-3.26.6-plugin.run) = 11490672
> diff --git a/print/hplip/Makefile b/print/hplip/Makefile
> index 0e1b7e007562..47283b9e1fc6 100644
> --- a/print/hplip/Makefile
> +++ b/print/hplip/Makefile
> @@ -1,5 +1,5 @@
> PORTNAME= hplip
> -PORTVERSION= 3.26.4
> +PORTVERSION= 3.26.6
> CATEGORIES= print
> MASTER_SITES= SF
>
> diff --git a/print/hplip/distinfo b/print/hplip/distinfo
> index bc7cf2cfa1c8..3cb5bb7ecde7 100644
> --- a/print/hplip/distinfo
> +++ b/print/hplip/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1783499366
> -SHA256 (hplip-3.26.4.tar.gz) = b9c61252754f35b4a237396ca8961e7b3e0c56db76d66a6712b7bf3e30e69463
> -SIZE (hplip-3.26.4.tar.gz) = 30963728
> +TIMESTAMP = 1789624008
> +SHA256 (hplip-3.26.6.tar.gz) = 5fb2235a9cb6ec07cb4786c4066b151359c301324d54aaabf69ae7eef35606b3
> +SIZE (hplip-3.26.6.tar.gz) = 31085544
> diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in
> index 801378813757..b627bd0d3c71 100644
> --- a/print/hplip/files/patch-Makefile.in
> +++ b/print/hplip/files/patch-Makefile.in
> @@ -1,24 +1,24 @@
> ---- Makefile.in.orig 2025-11-13 11:37:11 UTC
> +--- Makefile.in.orig 2026-09-11 11:22:29 UTC
> +++ Makefile.in
> @@ -113,8 +113,7 @@ DIST_COMMON = $(am__configure_deps) \
> - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_TRUE@am__append_5 = io/hpmud/musb_libusb01.c
> - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_TRUE@am__append_6 = -lusb
> - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_7 = io/hpmud/musb.c
> --@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_8 = -I/usr/include/libusb-1.0
> --@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_9 = -lusb-1.0
> -+@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_9 = -lusb
> - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_10 = -Iprotocol/discovery
> - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_11 = -l$(SNMPLIB) -lcrypto
> + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_TRUE@am__append_9 = io/hpmud/musb_libusb01.c
> + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_TRUE@am__append_10 = -lusb
> + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_11 = io/hpmud/musb.c
> +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_12 = -I/usr/include/libusb-1.0
> +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_13 = -lusb-1.0
> ++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_13 = -lusb
> + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_14 = -Iprotocol/discovery
> + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_15 = -l$(SNMPLIB) -lcrypto
>
> @@ -142,7 +141,6 @@ DIST_COMMON = $(am__configure_deps) \
> - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_17 = libhpipp.la
> - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_18 = libhpdiscovery.la
> - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_19 = -Iprotocol/discovery
> --@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_20 = -I/usr/include/libusb-1.0
> - @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_21 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
> + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_21 = libhpipp.la
> + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_22 = libhpdiscovery.la
> + @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@NETWORK_BUILD_TRUE@am__append_23 = -Iprotocol/discovery
> +-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@LIBUSB01_BUILD_FALSE@am__append_24 = -I/usr/include/libusb-1.0
> + @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_25 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
> @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \
> @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@ ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \
> -@@ -453,7 +451,6 @@ scanext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAG
> +@@ -452,7 +450,6 @@ scanext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAG
> @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@am_scanext_la_rpath = -rpath \
> @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(scanextdir)
> @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__EXEEXT_1 = ptest$(EXEEXT)
> @@ -26,8 +26,8 @@
> PROGRAMS = $(bin_PROGRAMS) $(dat2drv_PROGRAMS) $(hp_PROGRAMS) \
> $(hpcdmfax_PROGRAMS) $(hpcups_PROGRAMS) $(hpcupsfax_PROGRAMS) \
> $(hpps_PROGRAMS) $(locatedriver_PROGRAMS) $(noinst_PROGRAMS)
> -@@ -4956,7 +4953,7 @@ dist_unrel_DATA =
> - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_2)
> +@@ -5003,7 +5000,7 @@ dist_unrel_DATA =
> + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_6)
> #libhpdiscovery_la_SOURCES = protocol/discovery/mdns.c protocol/discovery/mdns.h
> @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_SOURCES = protocol/discovery/avahiDiscovery.c protocol/discovery/avahiDiscovery.h
> -@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -I/usr/include/avahi-client -I/usr/include/avahi-core -I/usr/include/avahi-common $(DBUS_CFLAGS)
> @@ -35,7 +35,7 @@
> @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_LDFLAGS = -version-info 0:1:0 -L$(libdir)
> @HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_LIBADD = -l$(SNMPLIB) -lcrypto -lavahi-client -lavahi-core -lavahi-common $(DBUS_LIBS)
>
> -@@ -5016,7 +5013,7 @@ dist_unrel_DATA =
> +@@ -5063,7 +5060,7 @@ dist_unrel_DATA =
> @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
>
> # hplip.conf
> @@ -44,7 +44,7 @@
> @HPLIP_BUILD_TRUE@hplip_conf_DATA = hplip.conf
>
> #pstotiff filter
> -@@ -5245,7 +5242,6 @@ dist_unrel_DATA =
> +@@ -5285,7 +5282,6 @@ dist_unrel_DATA =
> @RIP_INSTALL_TRUE@dist_rip_SCRIPTS = prnt/hpijs/foomatic-rip-hplip
>
> # apdk
> @@ -52,16 +52,16 @@
> libapdk_la_SOURCES = prnt/hpijs/models.cpp prnt/hpijs/breaks_open.cpp \
> prnt/hpijs/dj9xxvip.cpp prnt/hpijs/dj9xx.cpp prnt/hpijs/capture.cpp prnt/hpijs/colormatch.cpp prnt/hpijs/colormatcher_open.cpp \
> prnt/hpijs/compression.cpp prnt/hpijs/context2.cpp prnt/hpijs/create_so.cpp prnt/hpijs/creator.cpp \
> -@@ -5336,7 +5332,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
> - @HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
> -
> - @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
> +@@ -5378,7 +5374,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
> + @HPCUPS_INSTALL_TRUE@hpcups_CPPFLAGS = -I$(srcdir)/prnt/hpcups -I$(srcdir)/prnt -I$(srcdir)/common -D_GNU_SOURCE
> + @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) $(AM_CXXFLAGS)
> + @HPCUPS_INSTALL_TRUE@hpcups_LDFLAGS = $(AM_LDFLAGS)
> -@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
> +@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -lcups -lcupsimage -lz $(DBUS_LIBS)
> #else
> #hpcupsdir = $(cupsfilterdir)
> #hpcups_PROGRAMS = hpcups
> -@@ -10068,7 +10064,7 @@ install-data-am: install-apparmor_abstractionDATA \
> +@@ -10064,7 +10060,7 @@ install-data-am: install-apparmor_abstractionDATA \
> install-dist_basepexpectDATA install-dist_cmdSCRIPTS \
> install-dist_copierDATA install-dist_faxDATA \
> install-dist_fax_filtersDATA install-dist_filterDATA \
> @@ -70,15 +70,18 @@
> install-dist_homeDATA install-dist_hpcupsfaxppdDATA \
> install-dist_hpfaxSCRIPTS install-dist_hpijsfaxppdDATA \
> install-dist_hplipSCRIPTS install-dist_hplip_stateDATA \
> -@@ -10086,7 +10082,6 @@ install-data-am: install-apparmor_abstractionDATA \
> - install-dist_policykit_policyDATA install-dist_postscriptDATA \
> - install-dist_ppdDATA install-dist_printpluginsDATA \
> - install-dist_prntDATA install-dist_ripSCRIPTS \
> -- install-dist_rulesDATA install-dist_rulessystemDATA \
> - install-dist_scanDATA install-dist_selinuxDATA \
> - install-dist_ui4DATA install-dist_ui5DATA install-dist_uiDATA \
> +@@ -10079,8 +10075,8 @@ install-data-am: install-apparmor_abstractionDATA \
> + install-dist_plugins5SCRIPTS install-dist_pluginsDATA \
> + install-dist_postscriptDATA install-dist_ppdDATA \
> + install-dist_printpluginsDATA install-dist_prntDATA \
> +- install-dist_ripSCRIPTS install-dist_rulesDATA \
> +- install-dist_rulessystemDATA install-dist_scanDATA \
> ++ install-dist_ripSCRIPTS \
> ++ install-dist_scanDATA \
> + install-dist_selinuxDATA install-dist_ui4DATA \
> + install-dist_ui5DATA install-dist_uiDATA \
> install-dist_unrelDATA install-dist_www0DATA \
> -@@ -10308,40 +10303,12 @@ install-data-hook:
> +@@ -10292,40 +10288,12 @@ install-data-hook:
>
>
> install-data-hook:
> diff --git a/print/hplip/files/patch-fax_backend_hpfax.py b/print/hplip/files/patch-fax_backend_hpfax.py
> index f5ce3d12ba4f..e6818056d62f 100644
> --- a/print/hplip/files/patch-fax_backend_hpfax.py
> +++ b/print/hplip/files/patch-fax_backend_hpfax.py
> @@ -18,12 +18,3 @@
> sys.exit(1)
>
> if not home_dir or not os.path.exists(home_dir):
> -@@ -255,7 +255,7 @@ else:
> -
> - # Create the named pipe. Make sure it exists before sending
> - # message to hppsd.
> -- os.umask(0o111)
> -+ os.umask(0o133)
> - try:
> - os.mkfifo(pipe_name)
> - except OSError:
> diff --git a/print/hplip/files/patch-installer_pluginhandler.py b/print/hplip/files/patch-installer_pluginhandler.py
> index caac54b0c645..a2cee6a787a7 100644
> --- a/print/hplip/files/patch-installer_pluginhandler.py
> +++ b/print/hplip/files/patch-installer_pluginhandler.py
> @@ -45,12 +45,3 @@
> if not os.path.exists(self.__plugin_path):
> os.makedirs(self.__plugin_path, 0o755)
> if os.path.exists(plugin_file):
> -@@ -373,7 +373,7 @@ class PluginHandle(object):
> - def copyFiles(self, src_dir):
> -
> - copies = self.__getPluginFilesList(src_dir)
> -- os.umask(0)
> -+ os.umask(0o022)
> -
> - for src, trg, link in copies:
> -
> diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
> index ca79191d4f7f..6a9fdd0ff6a1 100644
> --- a/print/hplip/pkg-plist
> +++ b/print/hplip/pkg-plist
> @@ -122,7 +122,6 @@ share/cups/drv/hpcups.drv
> %%DATADIR%%/base/os_utils.py
> %%DATADIR%%/base/password.py
> %%DATADIR%%/base/pexpect/__init__.py
> -%%DATADIR%%/base/pkit.py
> %%DATADIR%%/base/pml.py
> %%DATADIR%%/base/queues.py
> %%DATADIR%%/base/services.py
> @@ -1546,6 +1545,9 @@ share/ppd/HP/hp-laserjet_pro_4001-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_4002-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_4003-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_4004-ps.ppd.gz
> +share/ppd/HP/hp-laserjet_pro_4006-ps.ppd.gz
> +share/ppd/HP/hp-laserjet_pro_4007-ps.ppd.gz
> +share/ppd/HP/hp-laserjet_pro_4008-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_m118-m119-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_m148-m149-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_m148f-m149f-ps.ppd.gz
> @@ -1567,6 +1569,9 @@ share/ppd/HP/hp-laserjet_pro_mfp_4101-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_mfp_4102-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_mfp_4103-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_mfp_4104-ps.ppd.gz
> +share/ppd/HP/hp-laserjet_pro_mfp_4112-ps.ppd.gz
> +share/ppd/HP/hp-laserjet_pro_mfp_4113-ps.ppd.gz
> +share/ppd/HP/hp-laserjet_pro_mfp_4114-ps.ppd.gz
> share/ppd/HP/hp-laserjet_pro_mfp_m125a.ppd.gz
> share/ppd/HP/hp-laserjet_pro_mfp_m125nr.ppd.gz
> share/ppd/HP/hp-laserjet_pro_mfp_m125nw.ppd.gz
--
Best regards,
Vladimir Druzenko