AlmaLinux changes

This commit is contained in:
Andrew Lukoshko 2021-09-15 09:28:39 +00:00
parent a3f182da69
commit 4b2a9aa41d
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,32 @@
diff -uprN a/base/password.py b/base/password.py
--- a/base/password.py 2021-07-16 11:19:07.363594142 +0300
+++ b/base/password.py 2021-07-16 11:19:52.441320237 +0300
@@ -56,6 +56,7 @@ AUTH_TYPES = {'mepis': 'su',
'boss': 'su',
'lfs': 'su',
'manjarolinux': 'sudo',
+ 'almalinux': 'su',
}
diff -uprN a/base/validation.py b/base/validation.py
--- a/base/validation.py 2021-07-16 11:19:07.364594092 +0300
+++ b/base/validation.py 2021-07-16 11:22:50.609324314 +0300
@@ -42,7 +42,7 @@ class DigiSign_Verification(object):
class GPG_Verification(DigiSign_Verification):
- def __init__(self, pgp_site = 'pool.sks-keyservers.net', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
+ def __init__(self, pgp_site = 'pgp.mit.edu', key = 0x4ABA2F66DBD5A95894910E0673D770CDA59047B9):
self.__pgp_site = pgp_site
self.__key = key
self.__gpg = utils.which('gpg',True)
@@ -55,7 +55,7 @@ class GPG_Verification(DigiSign_Verifica
if not os.path.exists(self.__gpg_dir):
try:
- os.mkdir(self.__gpg_dir, 0o755)
+ os.mkdir(self.__gpg_dir, 0o700)
except OSError:
log.error("Failed to create %s" % self.__gpg_dir)
self.__change_owner()

View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.18.4 Version: 3.18.4
Release: 9%{?dist} Release: 9%{?dist}.alma
License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC
Url: https://developers.hp.com/hp-linux-imaging-and-printing Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -46,6 +46,9 @@ Patch30: hplip-typo.patch
Patch31: hplip-keyserver.patch Patch31: hplip-keyserver.patch
Patch32: hplip-covscan.patch Patch32: hplip-covscan.patch
# AlmaLinux
Patch100: hplip-3.18.4-gpgdir-rules-gpg-server.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow Requires: python3-pillow
Requires: cups Requires: cups
@ -254,6 +257,8 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
# 1602547 - Please review important issues found by covscan in "hplip-3.18.4-2.el8+7" package # 1602547 - Please review important issues found by covscan in "hplip-3.18.4-2.el8+7" package
%patch32 -p1 -b .covscan %patch32 -p1 -b .covscan
%patch100 -p1 -b .gpgdir-rules-gpg-server
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -538,6 +543,11 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog %changelog
* Fri Jul 16 2021 Sergey Fokin <sfokin@cloudlinux.com> - 3.18.4-9.alma
- add AlmaLinux support
- fix permission for custom created gpg dir
- change gpg server to pgp.mit.edu
* Fri Jun 14 2019 Tomas Korbar <tkorbar@redhat.com> - 3.18.4-9 * Fri Jun 14 2019 Tomas Korbar <tkorbar@redhat.com> - 3.18.4-9
- update patch for covscan bug rhbz#1602547 - update patch for covscan bug rhbz#1602547