mirror of
https://git.freebsd.org/ports.git
synced 2025-07-08 21:09:17 -04:00
982e968ef6
- 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
17 lines
720 B
Python
17 lines
720 B
Python
--- 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
|
|
|