summaryrefslogtreecommitdiff
path: root/print/hplip/files/patch-base_utils.py
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2021-08-25 15:29:51 +0200
committerTijl Coosemans <tijl@FreeBSD.org>2022-03-11 15:49:48 +0100
commit982e968ef61a94e0de75d733e9036e5c60afca34 (patch)
tree6beacb77eeac3d323af5c7e168890caa5c1fa2c8 /print/hplip/files/patch-base_utils.py
parentdeskutils/virt-manager: update to 4.0.0 (diff)
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
Diffstat (limited to 'print/hplip/files/patch-base_utils.py')
-rw-r--r--print/hplip/files/patch-base_utils.py17
1 files changed, 17 insertions, 0 deletions
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
+