Date: Fri, 11 Mar 2022 14:52:40 GMT From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 982e968ef61a - main - print/hplip(-plugin): update to 3.22.2 Message-ID: <202203111452.22BEqeQB048775@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=982e968ef61a94e0de75d733e9036e5c60afca34 commit 982e968ef61a94e0de75d733e9036e5c60afca34 Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2021-08-25 13:29:51 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2022-03-11 14:49:48 +0000 print/hplip(-plugin): update to 3.22.2 - Convert post-patch to real patches because they are easier to maintain. - Fix a NULL dereference in the scanner backend when D-Bus isn't running. - Depend on sysutils/py-distro to make hp-toolbox (Device Manager) work again. - Upstream switched to Avahi for mDNS support. Rename the SNMP option to NETWORK because it's not just SNMP now. - Don't install some programs related to uninstalling and upgrading of HPLIP and the installation of firmware plugins because they circumvent the package system. - Install icons in share/icons so desktops can choose an appropriate resolution. Portions taken from a patch by Oleg Sidorkin <osidorkin@gmail.com>. PR: 255586, 257034, 257512 --- print/hplip-plugin/Makefile | 2 +- print/hplip-plugin/distinfo | 6 +- print/hplip/Makefile | 110 ++++++++--------- print/hplip/distinfo | 6 +- print/hplip/files/patch-FindPPD.cpp | 11 ++ print/hplip/files/patch-Makefile.in | 137 +++++++++++---------- print/hplip/files/patch-base_g.py | 29 +++++ print/hplip/files/patch-base_os__utils.py | 11 ++ print/hplip/files/patch-base_queues.py | 11 ++ print/hplip/files/patch-base_utils.py | 17 +++ print/hplip/files/patch-base_validation.py | 11 ++ print/hplip/files/patch-check.py | 35 ++++++ print/hplip/files/patch-common_utils.c | 11 ++ print/hplip/files/patch-configure | 70 +++++++++++ print/hplip/files/patch-doc_index.html | 11 ++ print/hplip/files/patch-doc_troubleshooting.html | 46 +++++++ print/hplip/files/patch-fax_backend_hpfax.py | 29 +++++ print/hplip/files/patch-fax_filters_pstotiff | 15 +++ print/hplip/files/patch-hp-uiscan.desktop.in | 14 +++ print/hplip/files/patch-hpdio.py | 11 ++ print/hplip/files/patch-hplip-systray.desktop.in | 13 ++ print/hplip/files/patch-hplip.desktop.in | 13 ++ print/hplip/files/patch-installer_core__install.py | 11 ++ print/hplip/files/patch-installer_dcheck.py | 4 +- print/hplip/files/patch-installer_pluginhandler.py | 56 +++++++++ print/hplip/files/patch-io_hpmud_musb.c | 6 +- print/hplip/files/patch-logcapture.py | 31 +++++ print/hplip/files/patch-prnt_backend_hp.c | 11 ++ print/hplip/files/patch-prnt_cups.py | 88 +++++++++++++ print/hplip/files/patch-prnt_filters_hpps | 20 +++ .../files/patch-prnt_hpcups_CommonDefinitions.h | 2 +- .../hplip/files/patch-prnt_hpcups_ErnieFilter.cpp | 2 +- .../hplip/files/patch-prnt_hpcups_HPCupsFilter.cpp | 74 +++-------- .../files/patch-prnt_hpcups_SystemServices.cpp | 11 ++ .../files/patch-prnt_hpcups_genJPEGStrips.cpp | 2 +- print/hplip/files/patch-prnt_hpijs_hpcupsfax.cpp | 20 +++ print/hplip/files/patch-prnt_hpps_hppsfilter.c | 13 +- print/hplip/files/patch-protocol_discovery_mdns.c | 86 ------------- .../files/patch-scan_sane_OrbliteScan_BSDCommon.h | 63 ---------- .../patch-scan_sane_OrbliteScan_LinuxCommon.h | 13 ++ .../files/patch-scan_sane_OrbliteScan_MacCommon.h | 19 ++- print/hplip/files/patch-scan_sane_hpaio.c | 24 ++-- print/hplip/files/patch-scan_sane_io.c | 14 +++ print/hplip/files/patch-scan_sane_orblite.c | 2 +- print/hplip/files/patch-ui5_devmgr5.py | 11 ++ print/hplip/files/patch-ui5_scandialog.py | 23 ++++ print/hplip/pkg-descr | 11 +- print/hplip/pkg-plist | 74 ++++++++--- 48 files changed, 910 insertions(+), 400 deletions(-) diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile index 58b8fa69bb50..4359ace6eb10 100644 --- a/print/hplip-plugin/Makefile +++ b/print/hplip-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: amistry@am-productions.biz PORTNAME= hplip-plugin -PORTVERSION= 3.20.6 +PORTVERSION= 3.22.2 CATEGORIES= print MASTER_SITES= https://developers.hp.com/sites/default/files/ DISTNAME= hplip-${DISTVERSION}-plugin diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo index 09319621790a..e98ba6672e4f 100644 --- a/print/hplip-plugin/distinfo +++ b/print/hplip-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592831579 -SHA256 (hplip-3.20.6-plugin.run) = 9700cb20c259417e7678a1347634d8c3fb2f03d13369ad96e6536a49f0f1e3cf -SIZE (hplip-3.20.6-plugin.run) = 11514108 +TIMESTAMP = 1646597322 +SHA256 (hplip-3.22.2-plugin.run) = ce3ce0f05a6339a17d69af95f0cd552ea3920bdd6bfc05f0ba4ba8b2feb1c2a0 +SIZE (hplip-3.22.2-plugin.run) = 11487296 diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 0dd51f800e33..e15d43882736 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,8 +1,7 @@ # Created by: amistry@am-productions.biz PORTNAME= hplip -PORTVERSION= 3.20.6 -PORTREVISION= 1 +PORTVERSION= 3.22.2 CATEGORIES= print MASTER_SITES= SF @@ -17,15 +16,15 @@ LIB_DEPENDS= libcupsimage.so:print/cups \ libdbus-1.so:devel/dbus RUN_DEPENDS= cups-filters>=0:print/cups-filters \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}distro>=1.0.1:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} -CONFLICTS_INSTALL= hpijs - -INSTALL_TARGET= install-strip -USES= dos2unix jpeg libtool pkgconfig python:3.6+ shebangfix +USES= dos2unix jpeg libtool localbase pkgconfig python:3.6+ \ + shebangfix USE_LDCONFIG= yes + +DOS2UNIX_FILES= scan/sane/OrbliteScan/LinuxCommon.h scan/sane/orblite.c SHEBANG_GLOB= *.py hpps pstotiff -DOS2UNIX_FILES= scan/sane/orblite.c GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ @@ -36,13 +35,18 @@ CONFIGURE_ARGS= --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ --with-docdir=${DOCSDIR} \ --with-htmldir=${DOCSDIR} \ --with-drvdir=${PREFIX}/share/cups/drv \ + --disable-imageProcessor-build \ --disable-qt4 CONFIGURE_ENV+= PYTHONINCLUDEDIR=${PYTHON_INCLUDEDIR} -CPPFLAGS+= -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} -LIBS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${PYTHON_INCLUDEDIR} +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= DOCS FAX SCAN SNMP X11 XSANE -OPTIONS_DEFAULT= SCAN SNMP X11 +DEBUG_FLAGS+= -UNDEBUG -DHP_DEBUG -DHPIP_DEBUG -DHPMUD_DEBUG -DHTTP_DEBUG \ + -DAVAHI_DEBUG -DBB_LEDM_DEBUG -DESCL_DEBUG -DHPAIO_DEBUG \ + -DSCLPML_DEBUG + +OPTIONS_DEFINE= DOCS FAX NETWORK SCAN X11 XSANE +OPTIONS_DEFAULT= NETWORK SCAN X11 OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= doc-build @@ -56,10 +60,11 @@ SCAN_RUN_DEPENDS= ${PY_PILLOW} SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends SCAN_CONFIGURE_ENABLE= scan-build -SNMP_DESC= Network/JetDirect support -SNMP_USES= ssl -SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -SNMP_CONFIGURE_ENABLE= network-build +NETWORK_DESC= Network/JetDirect support +NETWORK_USES= ssl +NETWORK_LIB_DEPENDS= libavahi-client.so:net/avahi-app \ + libnetsnmp.so:net-mgmt/net-snmp +NETWORK_CONFIGURE_ENABLE= network-build X11_DESC= Graphical User Interface (Qt) X11_CONFIGURE_ENABLE= gui-build qt5 @@ -71,64 +76,53 @@ XSANE_IMPLIES= SCAN XSANE_RUN_DEPENDS= xsane:graphics/xsane post-patch: - @${REINPLACE_CMD} -e 's|-ldld||g;' \ - -e 's|-ldl||g' \ - -e 's,-lusb-1.0,-lusb,g' \ - -e 's,libusb-1.0/libusb.h,libusb.h,g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \ - -e '/[[:space:]]install-dist_rulessystemDATA/ s,install-dist_rulessystemDATA,,' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \ - -e 's,/etc/cups,${LOCALBASE}&,g' \ - -e 's,/etc/init.d,${LOCALBASE}/etc/rc.d,g' \ - -e 's,/etc/sane.d,${LOCALBASE}&,g' \ - -e 's,/usr/share,${LOCALBASE}/share,g' \ - -e 's,/usr/include,${LOCALBASE}/include,g' \ - ${WRKSRC}/Makefile.in \ - ${WRKSRC}/base/codes.py \ + @${REINPLACE_CMD} \ + -e 's,/usr/local,${PREFIX},g' \ ${WRKSRC}/base/g.py \ - ${WRKSRC}/base/password.py \ - ${WRKSRC}/base/pkit.py \ - ${WRKSRC}/base/queues.py \ - ${WRKSRC}/base/services.py \ ${WRKSRC}/base/utils.py \ + ${WRKSRC}/base/queues.py \ ${WRKSRC}/check.py \ + ${WRKSRC}/common/utils.c \ + ${WRKSRC}/doc/troubleshooting.html \ ${WRKSRC}/fax/backend/hpfax.py \ - ${WRKSRC}/fax/coverpages.py \ ${WRKSRC}/fax/filters/pstotiff \ - ${WRKSRC}/hplip.list.in \ + ${WRKSRC}/FindPPD.cpp \ ${WRKSRC}/installer/core_install.py \ - ${WRKSRC}/installer/dcheck.py \ ${WRKSRC}/installer/pluginhandler.py \ ${WRKSRC}/logcapture.py \ + ${WRKSRC}/prnt/hpps/hppsfilter.c \ ${WRKSRC}/prnt/cups.py \ - ${WRKSRC}/prnt/filters/hpps \ - ${WRKSRC}/prnt/hpcups/HPCupsFilter.cpp \ - ${WRKSRC}/prnt/hpijs/globals.cpp \ ${WRKSRC}/prnt/hpijs/hpcupsfax.cpp \ - ${WRKSRC}/prnt/hpijs/hpijs.cpp \ - ${WRKSRC}/ui/devmgr4.py \ - ${WRKSRC}/ui4/devmgr5.py \ - ${WRKSRC}/ui5/devmgr5.py - @${REINPLACE_CMD} -e 's/umask(0)/umask(0o022)/' \ - -e 's/umask(0o111)/umask(0o133)/' \ - ${WRKSRC}/base/os_utils.py \ - ${WRKSRC}/base/validation.py \ - ${WRKSRC}/fax/backend/hpfax.py \ - ${WRKSRC}/hpdio.py \ - ${WRKSRC}/installer/pluginhandler.py + ${WRKSRC}/prnt/hpijs/globals.cpp \ + ${WRKSRC}/prnt/hpijs/foomatic-rip-hplip \ + ${WRKSRC}/prnt/filters/hpps \ + ${WRKSRC}/ui5/scandialog.py \ + ${WRKSRC}/ui5/devmgr5.py \ post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/hp-pkservice \ + ${STAGEDIR}${PREFIX}/bin/hp-uninstall \ + ${STAGEDIR}${PREFIX}/bin/hp-upgrade \ + ${STAGEDIR}${DOCSDIR}/uninstalling.html \ + ${STAGEDIR}${DOCSDIR}/upgrading.html \ + ${STAGEDIR}${DATADIR}/dat2drv \ + ${STAGEDIR}${DATADIR}/locatedriver \ + ${STAGEDIR}${DATADIR}/pkservice.py \ + ${STAGEDIR}${DATADIR}/uninstall.py \ + ${STAGEDIR}${DATADIR}/upgrade.py ${MV} ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf \ ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample - ${MKDIR} ${STAGEDIR}${DATADIR}/ui4/plugins ${MKDIR} ${STAGEDIR}/var/lib/hp -post-install-SCAN-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d - ${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \ - ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio +post-install-X11-on: +.for s in 16 32 64 128 256 + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps + ${LN} ${STAGEDIR}${DATADIR}/data/images/${s}x${s}/hp_logo.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps +.endfor + +post-install-X11-off: + ${RMDIR} ${STAGEDIR}${DATADIR}/data/images/* \ + ${STAGEDIR}${DATADIR}/data/images .include <bsd.port.mk> diff --git a/print/hplip/distinfo b/print/hplip/distinfo index 319876960bc7..fe33caaebb44 100644 --- a/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592831566 -SHA256 (hplip-3.20.6.tar.gz) = c64b2d334348010a9911f4feb075b2aa669047e7adb86c72d4a6ee7d392a7c20 -SIZE (hplip-3.20.6.tar.gz) = 25908476 +TIMESTAMP = 1646238885 +SHA256 (hplip-3.22.2.tar.gz) = 13c29020be3ab096ee7dfbe6cf569b9b96a4ab6f725d9c0d5d0e8c2b2ac28958 +SIZE (hplip-3.22.2.tar.gz) = 27341972 diff --git a/print/hplip/files/patch-FindPPD.cpp b/print/hplip/files/patch-FindPPD.cpp new file mode 100644 index 000000000000..a29981028c6c --- /dev/null +++ b/print/hplip/files/patch-FindPPD.cpp @@ -0,0 +1,11 @@ +--- FindPPD.cpp.orig 2022-02-23 07:41:04 UTC ++++ FindPPD.cpp +@@ -15,7 +15,7 @@ unsigned char CreateModelDict(MODEL_DICT_MAP &model_d + + unsigned char family_ppd = 0; + fstream file_pointer; +- file_pointer.open("/usr/share/hplip/data/models/models.dat", fstream::in); ++ file_pointer.open("/usr/local/share/hplip/data/models/models.dat", fstream::in); + + if(!file_pointer) + { diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in index 14e83588d86e..0cb028e2d783 100644 --- a/print/hplip/files/patch-Makefile.in +++ b/print/hplip/files/patch-Makefile.in @@ -1,78 +1,81 @@ ---- Makefile.in.orig 2019-10-22 06:32:27 UTC +--- Makefile.in.orig 2022-02-23 07:42:31 UTC +++ Makefile.in -@@ -103,7 +103,7 @@ DIST_COMMON = $(am__configure_deps) \ +@@ -96,8 +96,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 - # ip library - @HPLIP_BUILD_TRUE@am__append_12 = libhpip.la --@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so -+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_14 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \ - @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ installer/text_install.py \ -@@ -377,6 +377,7 @@ am__libsane_hpaio_la_SOURCES_DIST = scan/sane/hpaio.c - scan/sane/sclpml.h common/utils.c common/utils.h \ - scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c \ - scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \ -+ scan/sane/OrbliteScan/BSDCommon.h \ - scan/sane/OrbliteScan/LinuxCommon.h \ - scan/sane/OrbliteScan/MacCommon.h - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@am_libsane_hpaio_la_OBJECTS = libsane_hpaio_la-hpaio.lo \ -@@ -500,8 +501,7 @@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp - prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \ - prnt/hpcups/genPCLm.h common/utils.c common/utils.h \ - prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \ -- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \ -- prnt/hpcups/ImageProcessor.h -+ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp - @HPCUPS_INSTALL_TRUE@am_hpcups_OBJECTS = \ - @HPCUPS_INSTALL_TRUE@ hpcups-HPCupsFilter.$(OBJEXT) \ - @HPCUPS_INSTALL_TRUE@ hpcups-dbuscomm.$(OBJEXT) \ -@@ -728,8 +728,6 @@ am__dist_locatedriver_DATA_DIST = locatedriver - am__dist_models_DATA_DIST = data/models/models.dat - am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \ - prnt/drv/hpcups.drv.in.template \ -- prnt/hpcups/libImageProcessor-x86_64.so \ -- prnt/hpcups/libImageProcessor-x86_32.so scan/sane/hpaio.desc \ - installer/text_install.py data/localization/hplip_de.ts \ - data/localization/hplip_es.ts data/localization/hplip_fr.ts \ - data/localization/hplip_it.ts data/localization/hplip_pt.ts \ -@@ -4407,7 +4405,7 @@ dist_unrel_DATA = - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/bb_ledm.c scan/sane/http.h scan/sane/http.c scan/sane/sclpml.c scan/sane/sclpml.h common/utils.c common/utils.h \ - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/escl.h scan/sane/escli.h scan/sane/escl.c \ - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \ --@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h -+@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ scan/sane/OrbliteScan/BSDCommon.h scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h +@@ -125,7 +124,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@@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 \ +@@ -4645,7 +4643,7 @@ dist_unrel_DATA = + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@ $(am__append_2) + #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) ++@HPLIP_BUILD_TRUE@@NETWORK_BUILD_TRUE@libhpdiscovery_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" $(DBUS_CFLAGS) + @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) - @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 - @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0 -@@ -4802,11 +4800,10 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij - @HPCUPS_INSTALL_TRUE@ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \ - @HPCUPS_INSTALL_TRUE@ prnt/hpcups/genPCLm.h \ - @HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \ --@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \ --@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h -+@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp +@@ -4705,7 +4703,7 @@ dist_unrel_DATA = + @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi + + # hplip.conf +-@HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp ++@HPLIP_BUILD_TRUE@hplip_confdir = $(sysconfdir)/hp + @HPLIP_BUILD_TRUE@hplip_conf_DATA = hplip.conf + + #pstotiff filter +@@ -5027,7 +5025,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) -@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 -ldl -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 -@@ -9577,16 +9574,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \ - - - install-data-hook: --@HPLIP_BUILD_TRUE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ --@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ --@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ --@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ --@HPLIP_BUILD_TRUE@ fi; \ --@HPLIP_BUILD_TRUE@ if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ --@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ --@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ --@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ --@HPLIP_BUILD_TRUE@ fi +@@ -9562,7 +9560,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 \ +- install-dist_finSCRIPTS install-dist_halpreDATA \ ++ install-dist_finSCRIPTS \ + install-dist_homeDATA install-dist_hpcupsfaxppdDATA \ + install-dist_hpfaxSCRIPTS install-dist_hpijsfaxppdDATA \ + install-dist_hplipSCRIPTS install-dist_hplip_stateDATA \ +@@ -9580,7 +9578,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 \ + install-dist_unrelDATA install-dist_www0DATA \ +@@ -9814,14 +9811,8 @@ install-data-hook: + @HPLIP_BUILD_TRUE@ fi # If scanner build, add hpaio entry to sane dll.conf. @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \ - @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ touch $(DESTDIR)/etc/sane.d/dll.conf; \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ fi; \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ +-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ fi; \ ++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/sane.d/dll.d; \ ++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ echo hpaio > $(DESTDIR)$(sysconfdir)/sane.d/dll.d/hpaio ; \ + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/x86_64-linux-gnu/sane" \) ]; then \ + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ ln -sf $(libdir)/sane/libsane-hpaio.so $(libdir)/x86_64-linux-gnu/sane/ ; \ + @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(libdir)/x86_64-linux-gnu/sane/ ; \ diff --git a/print/hplip/files/patch-base_g.py b/print/hplip/files/patch-base_g.py new file mode 100644 index 000000000000..5a7147a8f2de --- /dev/null +++ b/print/hplip/files/patch-base_g.py @@ -0,0 +1,29 @@ +--- base/g.py.orig 2022-02-23 07:41:04 UTC ++++ base/g.py +@@ -143,7 +143,7 @@ class ConfigBase(object): + def write(self): + if self.filename is not None: + filename = self.filename +- if filename.startswith("/root/") or filename.startswith("/etc/"): ++ if filename.startswith("/root/") or filename.startswith("/etc/") or filename.startswith("/usr/local/etc/"): + # Don't try writing a file in root's home directory or + # the system-wide config file. + # See bug #479178. +@@ -182,7 +182,7 @@ class ConfigBase(object): + + class SysConfig(ConfigBase): + def __init__(self): +- ConfigBase.__init__(self, '/etc/hp/hplip.conf') ++ ConfigBase.__init__(self, '/usr/local/etc/hp/hplip.conf') + + + class State(ConfigBase): +@@ -343,7 +343,7 @@ def check_extension_module_env(ext_mod): + else : + python_ver = 2 + +- for dirpath, dirname, filenames in os.walk('/usr/lib/'): #find the .so path ++ for dirpath, dirname, filenames in os.walk('/usr/local/lib/'): #find the .so path + if ext_mod_so in filenames: + ext_path = dirpath + flag = 1 diff --git a/print/hplip/files/patch-base_os__utils.py b/print/hplip/files/patch-base_os__utils.py new file mode 100644 index 000000000000..40ac18487b2e --- /dev/null +++ b/print/hplip/files/patch-base_os__utils.py @@ -0,0 +1,11 @@ +--- base/os_utils.py.orig 2022-02-23 07:41:04 UTC ++++ base/os_utils.py +@@ -53,7 +53,7 @@ def getHPLIPDir(): + status = 0 + if not os.path.exists(hplipdir): + try: +- os.umask(0) ++ os.umask(0o022) + s = os.stat(homedir) + os.mkdir(hplipdir, 0o755) + os.chown(hplipdir, s[stat.ST_UID], s[stat.ST_GID]) diff --git a/print/hplip/files/patch-base_queues.py b/print/hplip/files/patch-base_queues.py new file mode 100644 index 000000000000..59707a80cad2 --- /dev/null +++ b/print/hplip/files/patch-base_queues.py @@ -0,0 +1,11 @@ +--- base/queues.py.orig 2022-02-23 07:41:04 UTC ++++ base/queues.py +@@ -128,7 +128,7 @@ def parseQueues(mode): + is_hp = True + + log.debug("Device URI: %s" % device_uri) +- ppd_file = os.path.join('/etc/cups/ppd', printer_name + '.ppd') ++ ppd_file = os.path.join('/usr/local/etc/cups/ppd', printer_name + '.ppd') + ppd_fileType = None + PPDFileError = False + if not os.path.exists(ppd_file): diff --git a/print/hplip/files/patch-base_utils.py b/print/hplip/files/patch-base_utils.py new file mode 100644 index 000000000000..77d3682094c1 --- /dev/null +++ b/print/hplip/files/patch-base_utils.py @@ -0,0 +1,17 @@ +--- base/utils.py.orig 2022-02-23 07:41:04 UTC ++++ base/utils.py +@@ -139,11 +139,11 @@ for s in EXPECT_WORD_LIST: + def get_cups_systemgroup_list(): + lis = [] + try: +- fp=open('/etc/cups/cupsd.conf') ++ fp=open('/usr/local/etc/cups/cupsd.conf') + except IOError: + try: +- if "root" != grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid).gr_name: +- return [grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid).gr_name] ++ if "root" != grp.getgrgid(os.stat('/usr/local/etc/cups/cupsd.conf').st_gid).gr_name: ++ return [grp.getgrgid(os.stat('/usr/local/etc/cups/cupsd.conf').st_gid).gr_name] + except OSError: + return lis + diff --git a/print/hplip/files/patch-base_validation.py b/print/hplip/files/patch-base_validation.py new file mode 100644 index 000000000000..3e25a59f4837 --- /dev/null +++ b/print/hplip/files/patch-base_validation.py @@ -0,0 +1,11 @@ +--- base/validation.py.orig 2022-02-23 07:41:04 UTC ++++ base/validation.py +@@ -61,7 +61,7 @@ class GPG_Verification(DigiSign_Verification): + self.__change_owner() + def __change_owner(self, Recursive = False): + try: +- os.umask(0) ++ os.umask(0o022) + s = os.stat(self.__hplipdir) + os_utils.changeOwner(self.__gpg_dir, s[stat.ST_UID], s[stat.ST_GID], Recursive) + diff --git a/print/hplip/files/patch-check.py b/print/hplip/files/patch-check.py new file mode 100644 index 000000000000..378e5f4cb7ef --- /dev/null +++ b/print/hplip/files/patch-check.py @@ -0,0 +1,35 @@ +--- check.py.orig 2022-02-23 07:41:04 UTC ++++ check.py +@@ -139,9 +139,9 @@ def get_comment(package, Inst_status, installed_ver): + comment = "Python Programming is not supported if version is lessthan 2.2" + elif package == 'hpaio': + if Inst_status == 'OK': +- comment = "'hpaio found in /etc/sane.d/dll.conf'" ++ comment = "'hpaio found in /usr/local/etc/sane.d/dll.d/hpaio'" + else: +- comment = "'hpaio not found in /etc/sane.d/dll.conf. hpaio needs to be added in this file.'" ++ comment = "'hpaio not found in /usr/local/etc/sane.d/dll.d/hpaio. hpaio needs to be added in this file.'" + elif package == 'cupsext' or package == 'pcardext' or package == 'hpmudext': + if Inst_status != 'OK': + comment = "'Not Found or Failed to load, Please reinstall HPLIP'" +@@ -326,9 +326,9 @@ class DependenciesCheck(object): + log.warn("HPLIP-Installation: Auto installation is not supported for %s distro %s version " %(self.core.distro, self.core.distro_version)) + + log.info() +- log.info(log.bold("Current contents of '/etc/hp/hplip.conf' file:")) ++ log.info(log.bold("Current contents of '/usr/local/etc/hp/hplip.conf' file:")) + try: +- output = open('/etc/hp/hplip.conf', 'r').read() ++ output = open('/usr/local/etc/hp/hplip.conf', 'r').read() + except (IOError, OSError) as e: + log.error("Could not access file: %s. Check HPLIP installation." % e.strerror) + self.num_errors += 1 +@@ -502,7 +502,7 @@ class DependenciesCheck(object): + #log.info("Installed in HPLIP?: %s" % x) + log.info("Device URI: %s" % device_uri) + +- ppd = os.path.join('/etc/cups/ppd', printer_name + '.ppd') ++ ppd = os.path.join('/usr/local/etc/cups/ppd', printer_name + '.ppd') + + if os.path.exists(ppd): + log.info("PPD: %s" % ppd) diff --git a/print/hplip/files/patch-common_utils.c b/print/hplip/files/patch-common_utils.c new file mode 100644 index 000000000000..35e42aeaa075 --- /dev/null +++ b/print/hplip/files/patch-common_utils.c @@ -0,0 +1,11 @@ +--- common/utils.c.orig 2022-02-23 07:41:04 UTC ++++ common/utils.c +@@ -311,7 +311,7 @@ int getHPLogLevel() + char *p; + int iLogLevel = 0; + +- fp = fopen ("/etc/cups/cupsd.conf", "r"); ++ fp = fopen ("/usr/local/etc/cups/cupsd.conf", "r"); + if (fp == NULL) + return 0; + while (!feof (fp)) diff --git a/print/hplip/files/patch-configure b/print/hplip/files/patch-configure new file mode 100644 index 000000000000..01cb7d2cdb6b --- /dev/null +++ b/print/hplip/files/patch-configure @@ -0,0 +1,70 @@ +--- configure.orig 2022-02-23 07:41:20 UTC ++++ configure +@@ -16074,11 +16074,9 @@ $as_echo "yes" >&6; } + epm_scan=\# + epm_class_driver= + epm_class_install=yes +- test `sh ./createPPD.sh -f` == 0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- test `sh ./createPPD.sh -q` == 0 + fi + if test x$class_driver = xyes; then + HPLIP_CLASS_DRIVER_TRUE= +@@ -17178,13 +17176,13 @@ fi + done + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5 +-$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb" >&5 ++$as_echo_n "checking for libusb_init in -lusb... " >&6; } + if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lusb-1.0 $LIBS" ++LIBS="-lusb $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17220,9 +17218,9 @@ else + as_fn_error 2 "cannot find libusb 1.0 support" "$LINENO" 5 + fi + +- for ac_header in libusb-1.0/libusb.h ++ for ac_header in libusb.h + do : +- ac_fn_c_check_header_mongrel "$LINENO" "libusb-1.0/libusb.h" "ac_cv_header_libusb_1_0_libusb_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "libusb.h" "ac_cv_header_libusb_1_0_libusb_h" "$ac_includes_default" + if test "x$ac_cv_header_libusb_1_0_libusb_h" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBUSB_1_0_LIBUSB_H 1 +@@ -17237,18 +17235,6 @@ done + fi + fi + +-SAVE_CPPFLAGS="$CPPFLAGS" +-CFLAGS=`python-config --includes` +-if $? -eq 0 +-then +- echo $FLAGS +-else +-CFLAGS=`python3-config --includes` +- if $? -eq 0 +- then +- echo $FLAGS +- fi +-fi + + #CFLAGS=`(python-config --includes)` + if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then +@@ -17565,7 +17551,6 @@ done + as_fn_error 6 "cannot find python-devel support" "$LINENO" 5 + fi + fi +-CFLAGS="$save_CFLAGS" + + if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sane_open in -lsane" >&5 diff --git a/print/hplip/files/patch-doc_index.html b/print/hplip/files/patch-doc_index.html new file mode 100644 index 000000000000..492e55c78fce --- /dev/null +++ b/print/hplip/files/patch-doc_index.html @@ -0,0 +1,11 @@ +--- doc/index.html.orig 2022-02-23 07:41:04 UTC ++++ doc/index.html +@@ -32,8 +32,6 @@ + <a href="commandline.html"><li>Using command line tools</li></a><br><br> + <a href="plugins.html"><li>About plugins</li></a><br><br> + <a href="systray.html"><li>About HP Status Service "system tray" icon (hp-systray)</li></a><br><br> +-<a href="uninstalling.html"><li>Uninstalling HPLIP</li></a><br><br> +-<a href="upgrading.html"><li>Upgrading HPLIP</li></a><br><br> + <a href="gettinghelp.html"><li>Getting help</li></a><br><br> + <a href="http://www.hplip.net"><li>HPLIP Website</li></a><br></ul><hr class="hide"> + </div> diff --git a/print/hplip/files/patch-doc_troubleshooting.html b/print/hplip/files/patch-doc_troubleshooting.html new file mode 100644 index 000000000000..5792f3213b2b --- /dev/null +++ b/print/hplip/files/patch-doc_troubleshooting.html @@ -0,0 +1,46 @@ +--- doc/troubleshooting.html.orig 2022-02-23 07:41:04 UTC ++++ doc/troubleshooting.html +@@ -25,7 +25,7 @@ section describes what is currently enabled or disable + example if you are having a problem setting up your parallel printer + check to be sure that pp-build=yes--if it does not you'll need to + reinstall hplip and enable parallel support.<span style="font-style: italic;"><span style="font-style: italic;"><span style="font-style: italic;"><span style="font-style: italic;"></span></span></span><br></span><h3 class="showhide_heading" id="System_Defaults">I/O Problems (Printer is not detected)</h3> +-<p>If the printer is not being detected by hp-setup check the following items:</p><p style="font-style: italic;">Is the printer supported by HPLIP?</p><p style="font-style: italic;">Is the printer powered on?</p><p style="font-style: italic;">Is the printer connected correctly with the proper type of cable?</p><p style="font-style: italic;">Is the printer in an error state? (i.e. out of paper, out of ink, etc.)</p><p style="font-style: italic;">Is the cable (usb/parallel/ethernet) in good working condition?</p><p><span style="font-weight: bold;">USB</span></p><p>If you run "/usr/lib/cups/backend/hp" you should get output similar to the following:</p><span style="font-style: italic;"> ++<p>If the printer is not being detected by hp-setup check the following items:</p><p style="font-style: italic;">Is the printer supported by HPLIP?</p><p style="font-style: italic;">Is the printer powered on?</p><p style="font-style: italic;">Is the printer connected correctly with the proper type of cable?</p><p style="font-style: italic;">Is the printer in an error state? (i.e. out of paper, out of ink, etc.)</p><p style="font-style: italic;">Is the cable (usb/parallel/ethernet) in good working condition?</p><p><span style="font-weight: bold;">USB</span></p><p>If you run "/usr/local/libexec/cups/backend/hp" you should get output similar to the following:</p><span style="font-style: italic;"> + direct + hp:/usb/HP_Color_LaserJet_CP1515n?serial=00XXXXXXXXXX "HP Color + LaserJet CP1515n" "HP Color LaserJet CP1515n USB +@@ -42,28 +42,28 @@ enterprises.11.2.3.9.1.1.7.0 + LaserJet + + 3380;CLS:PRINTER;DES:Hewlett-Packard LaserJet +-3380;MEM:23MB;COMMENT:RES=1200x1;" </span><br><br>If it does not there may be an snmp problem on your system and/or network.<br><br><span style="font-weight: bold;">Parallel<br><br></span>Was HPLIP installed with parallel support? Run hp-check -t and look in the for the following output:<br><br><span style="font-style: italic;"> # Following values are determined at configure time and cannot be changed.<br> [configure]<br> network-build=yes<br> pp-build=no<br> gui-build=yes<br> scanner-build=yes<br> fax-build=yes<br> dbus-build=yes<br> cups11-build=no<br> doc-build=yes<br> shadow-build=no<br> foomatic-drv-install=yes<br> foomatic-ppd-install=no<br> foomatic-rip-hplip-install=yes<br> internal-tag=2.8.5.23<br></sp an><span style="font-style: italic;"></span><br>Find the section:<br><br><span style="font-style: italic;"> pp-build=no<br><br><span style="font-style: italic;"></span></span>This should be "<span style="font-style: italic;">pp-build=yes</span>".<br><br>Is the ppdev module loaded?<br><br>Look for the output results from the hp-check -t for the following:<br><br><span style="font-style: italic;"> Checking for dependency: ppdev - Parallel port support kernel module....</span><br style="font-style: italic;"><span style="font-style: italic;"> OK, found.</span><br><span style="font-weight: bold;"><span style="font-weight: bold;"><br></span></span>If you are missing the ppdev module you can try running:<br><br> <span style="font-style: italic;">modprobe ppdev</span><br><br>Is your parallel port set to ECP mode in the BIOS?<br><br>If you run /usr/lib/cups/backend/hp do you should get an output similar to the following: <br><br><span style="font-style: italic;">&n! bsp; ++3380;MEM:23MB;COMMENT:RES=1200x1;" </span><br><br>If it does not there may be an snmp problem on your system and/or network.<br><br><span style="font-weight: bold;">Parallel<br><br></span>Was HPLIP installed with parallel support? Run hp-check -t and look in the for the following output:<br><br><span style="font-style: italic;"> # Following values are determined at configure time and cannot be changed.<br> [configure]<br> network-build=yes<br> pp-build=no<br> gui-build=yes<br> scanner-build=yes<br> fax-build=yes<br> dbus-build=yes<br> cups11-build=no<br> doc-build=yes<br> shadow-build=no<br> foomatic-drv-install=yes<br> foomatic-ppd-install=no<br> foomatic-rip-hplip-install=yes<br> internal-tag=2.8.5.23<br></sp an><span style="font-style: italic;"></span><br>Find the section:<br><br><span style="font-style: italic;"> pp-build=no<br><br><span style="font-style: italic;"></span></span>This should be "<span style="font-style: italic;">pp-build=yes</span>".<br><br>Is the ppdev module loaded?<br><br>Look for the output results from the hp-check -t for the following:<br><br><span style="font-style: italic;"> Checking for dependency: ppdev - Parallel port support kernel module....</span><br style="font-style: italic;"><span style="font-style: italic;"> OK, found.</span><br><span style="font-weight: bold;"><span style="font-weight: bold;"><br></span></span>If you are missing the ppdev module you can try running:<br><br> <span style="font-style: italic;">modprobe ppdev</span><br><br>Is your parallel port set to ECP mode in the BIOS?<br><br>If you run /usr/local/libexec/cups/backend/hp do you should get an output similar to the following:<br><br><span style="font-style: i! talic;"> + direct + hp:/par/HP_LaserJet?serial=00XXXXXXXXXX "HP + LaserJet" "HP LaserJet PAR 00XXXXXXXXXX HPLIP" + "MFG:HP;MDL:HP + +-LaserJet ;CLS:PRINTER;DES:HP LaserJet ;SN:00XXXXXXXXXX;"</span><br><br>If the /usr/lib/cups/backend/hp does not detect the printer, HPLIP will not function.<h3 class="showhide_heading" id="Add_ons">Functionality Problems (print, scan, fax)</h3> +-<p style="font-weight: bold;">Print</p><p>Is the printer on-line and not in an error state?</p><p>If you run hp-check -t, are there any problems reported?</p><p>In the "hp-check -t", verify that the printer is configured:</p><p>Verify in the section DISCOVERED USB DEVICES that the printer is displayed.</p><p>Verify in the section INSTALLED CUPS PRINTER QUEUES that the printer queue is displayed.</p><p>Verify on the line PPD: that the ppd file matches the printer model.</p>Example:<br><br style="font-style: italic;"><span style="font-style: italic;"> --------------------------</span><br style="font-style: italic;"><span style="font-style: italic;"> | DISCOVERED USB DEVICES |</span><br style="font-style: italic;"><span style="font-style: italic;"> --------------------------</span><br style="font-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> No devices found.</span><br style="f ont-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> ---------------------------------</span><br style="font-style: italic;"><span style="font-style: italic;"> | INSTALLED CUPS PRINTER QUEUES |</span><br style="font-style: italic;"><span style="font-style: italic;"> ---------------------------------</span><br style="font-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> Photosmart_3300</span><br style="font-style: italic;"><span style="font-style: italic;"> ---------------</span><br style="font-style: italic;"><span style="font-style: italic;"> Type: Printer</span><br style="font-style: italic;"><span style="font-style: italic;"> Installed in HPLIP?: Yes, using the hp: CUPS backend.</span><br style="font-style: italic;"><span style="font-style: italic;"> Device URI: hp:/net/P hotosmart_3300_series?ip=15.252.39.136</span! ><br style="font-style: italic;"><span style="font-style: italic;"> PPD: /etc/cups/ppd/Photosmart_3300.ppd</span><br style="font-style: italic;"><span style="font-style: italic;"> PPD Description: HP PhotoSmart 3300 Foomatic/hpijs, hpijs 2.8.2.10 - HPLIP 2.8.2</span><br style="font-style: italic;"><span style="font-style: italic;"> Printer status: printer Photosmart_3300 is idle. enabled since Tue 27 May 2008 01:58:02 PM PDT</span><br style="font-style: italic;"><span style="font-style: italic;"> Communication status: Good</span><br><br>Are you able to print from any application?<br><br>View the syslog and try to print do you see any errors?<br><br> Run:<br> <span style="font-style: italic;"> tail -f /var/log/messages</span><p>The ++LaserJet ;CLS:PRINTER;DES:HP LaserJet ;SN:00XXXXXXXXXX;"</span><br><br>If the /usr/local/libexec/cups/backend/hp does not detect the printer, HPLIP will not function.<h3 class="showhide_heading" id="Add_ons">Functionality Problems (print, scan, fax)</h3> ++<p style="font-weight: bold;">Print</p><p>Is the printer on-line and not in an error state?</p><p>If you run hp-check -t, are there any problems reported?</p><p>In the "hp-check -t", verify that the printer is configured:</p><p>Verify in the section DISCOVERED USB DEVICES that the printer is displayed.</p><p>Verify in the section INSTALLED CUPS PRINTER QUEUES that the printer queue is displayed.</p><p>Verify on the line PPD: that the ppd file matches the printer model.</p>Example:<br><br style="font-style: italic;"><span style="font-style: italic;"> --------------------------</span><br style="font-style: italic;"><span style="font-style: italic;"> | DISCOVERED USB DEVICES |</span><br style="font-style: italic;"><span style="font-style: italic;"> --------------------------</span><br style="font-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> No devices found.</span><br style="f ont-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> ---------------------------------</span><br style="font-style: italic;"><span style="font-style: italic;"> | INSTALLED CUPS PRINTER QUEUES |</span><br style="font-style: italic;"><span style="font-style: italic;"> ---------------------------------</span><br style="font-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> Photosmart_3300</span><br style="font-style: italic;"><span style="font-style: italic;"> ---------------</span><br style="font-style: italic;"><span style="font-style: italic;"> Type: Printer</span><br style="font-style: italic;"><span style="font-style: italic;"> Installed in HPLIP?: Yes, using the hp: CUPS backend.</span><br style="font-style: italic;"><span style="font-style: italic;"> Device URI: hp:/net/P hotosmart_3300_series?ip=15.252.39.136</span! ><br style="font-style: italic;"><span style="font-style: italic;"> PPD: /usr/local/etc/cups/ppd/Photosmart_3300.ppd</span><br style="font-style: italic;"><span style="font-style: italic;"> PPD Description: HP PhotoSmart 3300 Foomatic/hpijs, hpijs 2.8.2.10 - HPLIP 2.8.2</span><br style="font-style: italic;"><span style="font-style: italic;"> Printer status: printer Photosmart_3300 is idle. enabled since Tue 27 May 2008 01:58:02 PM PDT</span><br style="font-style: italic;"><span style="font-style: italic;"> Communication status: Good</span><br><br>Are you able to print from any application?<br><br>View the syslog and try to print do you see any errors?<br><br> Run:<br> <span style="font-style: italic;"> tail -f /var/log/messages</span><p>The + possible errors presented in the "messages" log can be varied. + You may need to reference your Linux distribution documentation + for more information.</p><p>View the cups log and try to print do you see any errors?</p><p>To view the cups log:<br> <span style="font-style: italic;">Edit +-the file /etc/cups/cupsd.conf to change the loglevel to debug, then ++the file /usr/local/etc/cups/cupsd.conf to change the loglevel to debug, then + restart cups /etc/init.d/cups restart (or the command may be /etc/init.d/cupsys + restart depending on your system configuration).</span></p><p style="font-weight: bold;">Scan</p>Is the printer on-line and not in an error state?<br><br>If you run hp-check -t are there any problems?<br><br>Within + the "hp-check -t" output, verify that the sane is configured correctly + in the SANE CONFIGURATION section. Here is an example of what you +-should see after running hp-check -t:<br><br><span style="font-style: italic;"> 'hpaio' in '/etc/sane.d/dll.conf'...</span><br style="font-style: italic;"><span style="font-style: italic;"> OK, found. SANE backend 'hpaio' is properly set up.</span><br style="font-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> Checking output of 'scanimage -L'...</span><br style="font-style: italic;"><span style="font-style: italic;"> </span><br style="font-style: italic;"><span style="font-style: italic;"> No scanners were identified. If you were expecting something different,</span><br style="font-style: italic;"><span style="font-style: italic;"> check that the scanner is plugged in, turned on and detected by the</span><br style="font-style: italic;"><span style="font-style: italic;"> sane-find-scanner tool (if appropriate). Please read the documenta tion</span><br style="font-style: italic;"><span style="font-style: italic;"> which came with this software (README, FAQ, manpages).</span><br><br>If ++should see after running hp-check -t:<br><br><span style="font-style: italic;"> 'hpaio' in '/usr/local/etc/sane.d/dll.d/hpaio'...</span><br style="font-style: italic;"><span style="font-style: italic;"> OK, found. SANE backend 'hpaio' is properly set up.</span><br style="font-style: italic;"><br style="font-style: italic;"><span style="font-style: italic;"> Checking output of 'scanimage -L'...</span><br style="font-style: italic;"><span style="font-style: italic;"> </span><br style="font-style: italic;"><span style="font-style: italic;"> No scanners were identified. If you were expecting something different,</span><br style="font-style: italic;"><span style="font-style: italic;"> check that the scanner is plugged in, turned on and detected by the</span><br style="font-style: italic;"><span style="font-style: italic;"> sane-find-scanner tool (if appropriate). Please read the documentation</span><br style="font-style: italic;"><span style="font-style: italic;"> which came with this software (README, FAQ, manpages).</span><br><br>If + you do not see this or get an error, edit the dll.conf file and add + hpaio. If the scanner is not detect using the scanimage be + sure that the printer is supported and working correctly.<br><p style="font-weight: bold;">Fax </p>Is the printer powered on and not in an error state?<br><br>If you run hp-check -t are there any problems?<br><br>If + you run hp-check -t is there a fax queue installed? You should +-see output similar to the following after running hp-check -t:<br><br><span style="font-style: italic;"> Photosmart_3300_fax</span><br style="font-style: italic;"><span style="font-style: italic;"> -------------------</span><br style="font-style: italic;"><span style="font-style: italic;"> Type: Fax</span><br style="font-style: italic;"><span style="font-style: italic;"> Installed in HPLIP?: Yes, using the hpfax: CUPS backend.</span><br style="font-style: italic;"><span style="font-style: italic;"> Device URI: hpfax:/net/Photosmart_3300_series?ip=15.252.39.136</span><br style="font-style: italic;"><span style="font-style: italic;"> PPD: /etc/cups/ppd/Photosmart_3300_fax.ppd</span><br style="font-style: italic;"><span style="font-style: italic;"> PPD Description: HP Fax</span><br style="font-style: italic;"><span style="font-style: italic;"> Printer status: printer Photosmart_3300_fax is idle. enabled since Thu 22 May 2008 01:32:01 PM PDT</span><br style="font-style: italic;"><span style="font-style: italic;"> Communication status: Good</span><br><br>Is the phone line connected to the multifunction printer?<br><br>Can you fax a different document? (i.e. ensure that this is not a document-specific problem)<br><br>Is the receiving fax machine or device on-line and able to accept faxes?<br><h3 class="showhide_heading" id="Add_ons"><br></h3> ++see output similar to the following after running hp-check -t:<br><br><span style="font-style: italic;"> Photosmart_3300_fax</span><br style="font-style: italic;"><span style="font-style: italic;"> -------------------</span><br style="font-style: italic;"><span style="font-style: italic;"> Type: Fax</span><br style="font-style: italic;"><span style="font-style: italic;"> Installed in HPLIP?: Yes, using the hpfax: CUPS backend.</span><br style="font-style: italic;"><span style="font-style: italic;"> Device URI: hpfax:/net/Photosmart_3300_series?ip=15.252.39.136</span><br style="font-style: italic;"><span style="font-style: italic;"> PPD: /usr/local/etc/cups/ppd/Photosmart_3300_fax.ppd</span><br style="font-style: italic;"><span style="font-style: italic;"> PPD Description: HP Fax</span><br style="font-style: italic;"><span style="font-style: italic;"> &n bsp; Printer status: printer Photosmart_3300_fax is idle. enabled since Thu 22 May 2008 01:32:01 PM PDT</span><br style="font-style: italic;"><span style="font-style: italic;"> Communication status: Good</span><br><br>Is the phone line connected to the multifunction printer?<br><br>Can you fax a different document? (i.e. ensure that this is not a document-specific problem)<br><br>Is the receiving fax machine or device on-line and able to accept faxes?<br><h3 class="showhide_heading" id="Add_ons"><br></h3> + <p> + </p> + diff --git a/print/hplip/files/patch-fax_backend_hpfax.py b/print/hplip/files/patch-fax_backend_hpfax.py new file mode 100644 index 000000000000..f5ce3d12ba4f --- /dev/null +++ b/print/hplip/files/patch-fax_backend_hpfax.py @@ -0,0 +1,29 @@ +--- fax/backend/hpfax.py.orig 2022-02-23 07:41:04 UTC ++++ fax/backend/hpfax.py +@@ -49,7 +49,7 @@ PIPE_BUF = 4096 + + job_id = 0 + pid = os.getpid() +-config_file = '/etc/hp/hplip.conf' ++config_file = '/usr/local/etc/hp/hplip.conf' + home_dir = '' + + +@@ -68,7 +68,7 @@ if os.path.exists(config_file): + bug("Error setting home directory: home= under [dirs] not found.") + sys.exit(1) + else: +- bug("Error setting home directory: /etc/hp/hplip.conf not found") ++ bug("Error setting home directory: /usr/local/etc/hp/hplip.conf not found") + 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-fax_filters_pstotiff b/print/hplip/files/patch-fax_filters_pstotiff new file mode 100644 index 000000000000..02453c368912 --- /dev/null +++ b/print/hplip/files/patch-fax_filters_pstotiff @@ -0,0 +1,15 @@ +--- fax/filters/pstotiff.orig 2022-02-23 07:41:04 UTC ++++ fax/filters/pstotiff +@@ -18,10 +18,10 @@ if (len(sys.argv) > 6): + + temp_out_handle, temp_out_fname = tempfile.mkstemp() + +-font = "-I/usr/share/cups/fonts" ++font = "-I/usr/local/share/cups/fonts" + device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file + +-gs_command = "/usr/bin/gs" + " " + font + " " + device ++gs_command = "/usr/local/bin/gs" + " " + font + " " + device + + exit_code = os.system(gs_command) + diff --git a/print/hplip/files/patch-hp-uiscan.desktop.in b/print/hplip/files/patch-hp-uiscan.desktop.in new file mode 100644 index 000000000000..9888c15ec35a --- /dev/null +++ b/print/hplip/files/patch-hp-uiscan.desktop.in @@ -0,0 +1,14 @@ +--- hp-uiscan.desktop.in.orig 2022-02-23 07:41:04 UTC ++++ hp-uiscan.desktop.in +@@ -1,8 +1,8 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] + Version=1.0 + Type=Application + Terminal=false + Name=hp-uiscan +-Exec=/usr/bin/hp-uiscan +-Icon=/usr/share/icons/Humanity/devices/48/printer.svg ++Exec=hp-uiscan ++Icon=hp_logo ++Categories=Utility; diff --git a/print/hplip/files/patch-hpdio.py b/print/hplip/files/patch-hpdio.py new file mode 100644 index 000000000000..e56b5ac5bf8e --- /dev/null +++ b/print/hplip/files/patch-hpdio.py @@ -0,0 +1,11 @@ +--- hpdio.py.orig 2022-02-23 07:41:04 UTC ++++ hpdio.py +@@ -67,7 +67,7 @@ def run(read_pipe2=None, # pipe from hpssd + + global r2, w3 + # tmp_dir = '/tmp' +- os.umask(0o111) ++ os.umask(0o133) + + try: + log.set_module("hp-systray(hpdio)") diff --git a/print/hplip/files/patch-hplip-systray.desktop.in b/print/hplip/files/patch-hplip-systray.desktop.in new file mode 100644 index 000000000000..4c4f458e871d --- /dev/null +++ b/print/hplip/files/patch-hplip-systray.desktop.in @@ -0,0 +1,13 @@ +--- hplip-systray.desktop.in.orig 2022-02-23 07:41:04 UTC ++++ hplip-systray.desktop.in +@@ -5,8 +5,7 @@ Name=HP System Tray Service + GenericName=Printer Status Applet + Comment=HP System Tray Service + Exec=hp-systray -x +-Icon=@abs_datadir@/hplip/data/images/128x128/hp_logo.png ++Icon=hp_logo + Terminal=false +-Categories=Application;Utility; +-X-KDE-StartupNotify=false ++Categories=Utility; + StartupNotify=false diff --git a/print/hplip/files/patch-hplip.desktop.in b/print/hplip/files/patch-hplip.desktop.in new file mode 100644 index 000000000000..e0902bda925a --- /dev/null +++ b/print/hplip/files/patch-hplip.desktop.in @@ -0,0 +1,13 @@ +--- hplip.desktop.in.orig 2022-02-23 07:41:04 UTC ++++ hplip.desktop.in +@@ -5,8 +5,7 @@ Name=HP Device Manager + GenericName=Printer Management Application + Comment=View device status, ink levels and perform maintenance. + Exec=hp-toolbox +-Icon=@abs_datadir@/hplip/data/images/128x128/hp_logo.png ++Icon=hp_logo + Terminal=false +-Categories=Application;Utility; +-X-KDE-StartupNotify=false ++Categories=Utility; + StartupNotify=false diff --git a/print/hplip/files/patch-installer_core__install.py b/print/hplip/files/patch-installer_core__install.py new file mode 100644 index 000000000000..091f71aba863 --- /dev/null +++ b/print/hplip/files/patch-installer_core__install.py @@ -0,0 +1,11 @@ +--- installer/core_install.py.orig 2022-02-23 07:41:04 UTC ++++ installer/core_install.py +@@ -1358,7 +1358,7 @@ class CoreInstall(object): + + if not found: + st = os.stat('/etc/sane.d/dll.conf') +- cmd = self.passwordObj.getAuthCmd() % 'chmod 777 /etc/sane.d/dll.conf' ++ cmd = self.passwordObj.getAuthCmd() % 'chmod 644 /etc/sane.d/dll.conf' + log.debug("cmd=%s" % cmd) + utils.run(cmd, self.passwordObj) + try: diff --git a/print/hplip/files/patch-installer_dcheck.py b/print/hplip/files/patch-installer_dcheck.py index 9b5354766374..ae43661df942 100644 --- a/print/hplip/files/patch-installer_dcheck.py +++ b/print/hplip/files/patch-installer_dcheck.py @@ -1,4 +1,4 @@ ---- installer/dcheck.py.orig 2019-11-03 15:17:23 UTC +--- installer/dcheck.py.orig 2022-02-23 07:41:04 UTC +++ installer/dcheck.py @@ -48,7 +48,11 @@ mod_output = '' def update_ld_output(): @@ -13,7 +13,7 @@ if status != 0: log.debug("ldconfig failed.") -@@ -378,6 +385,8 @@ def get_libpthread_version(): +@@ -380,6 +384,8 @@ def get_libpthread_version(): except ImportError: return '-' else: diff --git a/print/hplip/files/patch-installer_pluginhandler.py b/print/hplip/files/patch-installer_pluginhandler.py new file mode 100644 index 000000000000..caac54b0c645 --- /dev/null +++ b/print/hplip/files/patch-installer_pluginhandler.py @@ -0,0 +1,56 @@ +--- installer/pluginhandler.py.orig 2022-02-23 07:41:04 UTC ++++ installer/pluginhandler.py +@@ -80,7 +80,7 @@ class PluginHandle(object): + DOCDIR = sys_conf.get('dirs', 'doc') + CUPSBACKENDDIR = sys_conf.get('dirs', 'cupsbackend') + CUPSFILTERDIR = sys_conf.get('dirs', 'cupsfilter') +- RULESDIR = '/etc/udev/rules.d' ++ RULESDIR = '/usr/local/etc/udev/rules.d' + BIN = sys_conf.get('dirs', 'bin') + + # Copying plugin.spec file to home dir. +@@ -97,11 +97,11 @@ class PluginHandle(object): + ARCH = 'x86_%d' % BITNESS + + if BITNESS == 64: +- SANELIBDIR = '/usr/lib64/sane' +- LIBDIR = '/usr/lib64' ++ SANELIBDIR = '/usr/local/lib/sane' ++ LIBDIR = '/usr/local/lib' + else: +- SANELIBDIR = '/usr/lib/sane' +- LIBDIR = '/usr/lib' ++ SANELIBDIR = '/usr/local/lib/sane' ++ LIBDIR = '/usr/local/lib' + + copies = [] + +@@ -239,8 +239,8 @@ class PluginHandle(object): + def __setPluginConfFile(self): + home = sys_conf.get('dirs', 'home') + +- if os.path.exists('/etc/hp/plugin.conf'): +- self.__plugin_conf_file = "file:///etc/hp/plugin.conf" ++ if os.path.exists('/usr/local/etc/hp/plugin.conf'): ++ self.__plugin_conf_file = "file:///usr/local/etc/hp/plugin.conf" + + elif os.path.exists(os.path.join(home, 'plugin.conf')): + self.__plugin_conf_file = "file://" + os.path.join(home, 'plugin.conf') +@@ -268,7 +268,7 @@ class PluginHandle(object): + log.debug("Downloading %s plug-in file from '%s' to '%s'..." % (self.__required_version, src, self.__plugin_path)) + plugin_file = os.path.join(self.__plugin_path, self.__plugin_name) + try: +- os.umask(0) ++ os.umask(0o022) + if not os.path.exists(self.__plugin_path): + os.makedirs(self.__plugin_path, 0o755) *** 1025 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203111452.22BEqeQB048775>