diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2021-08-25 15:29:51 +0200 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2022-03-11 15:49:48 +0100 |
| commit | 982e968ef61a94e0de75d733e9036e5c60afca34 (patch) | |
| tree | 6beacb77eeac3d323af5c7e168890caa5c1fa2c8 /print/hplip/files/patch-logcapture.py | |
| parent | deskutils/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-logcapture.py')
| -rw-r--r-- | print/hplip/files/patch-logcapture.py | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/print/hplip/files/patch-logcapture.py b/print/hplip/files/patch-logcapture.py new file mode 100644 index 000000000000..03c07863a6b9 --- /dev/null +++ b/print/hplip/files/patch-logcapture.py @@ -0,0 +1,31 @@ +--- logcapture.py.orig 2022-02-23 07:41:04 UTC ++++ logcapture.py +@@ -37,8 +37,8 @@ from base.sixext import to_string_utf8 + from subprocess import Popen, PIPE + from installer.core_install import * + +-CUPS_FILE='/etc/cups/cupsd.conf' +-CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_orginal' ++CUPS_FILE='/usr/local/etc/cups/cupsd.conf' ++CUPS_BACKUP_FILE='/usr/local/etc/cups/cupsd.conf_orginal' + LOG_FOLDER_PATH='./' + LOG_FOLDER_NAME='hplip_troubleshoot_logs' + LOG_FILES=LOG_FOLDER_PATH + LOG_FOLDER_NAME +@@ -332,7 +332,7 @@ for u in USERS: + sts,out = utils.run('mv -f ./hp-check.log %s'%LOG_FILES) + if sts != 0: + log.error("Failed to capture %s log files."%("./hp-check.log")) +-cmd = 'chmod 666 %s/*.log' % LOG_FILES ++cmd = 'chmod 644 %s/*.log' % LOG_FILES + sts = os_utils.execute(cmd) + if sts != 0: + log.error("Failed to change permissions for %s."%(LOG_FILES)) +@@ -346,7 +346,7 @@ if sts_compress != 0: + log.error("Failed to compress %s folder."%(LOG_FILES)) + else: + log.debug("Changing Permissions of ./%s.tar.gz "%LOG_FOLDER_NAME) +- sts,out = utils.run('chmod 666 -R ./%s.tar.gz'%(LOG_FOLDER_NAME)) ++ sts,out = utils.run('chmod 644 -R ./%s.tar.gz'%(LOG_FOLDER_NAME)) + if sts != 0: + log.error("Failed to change permissions for %s.tar.gz."%(LOG_FILES)) + log.debug("Removing Temporary log files..") |