diff --git a/SOURCES/msvsphere-hplip-3.21.2-gpgdir-rules-gpg-server.patch b/SOURCES/msvsphere-hplip-3.21.2-gpgdir-rules-gpg-server.patch new file mode 100644 index 0000000..a6c4e83 --- /dev/null +++ b/SOURCES/msvsphere-hplip-3.21.2-gpgdir-rules-gpg-server.patch @@ -0,0 +1,25 @@ +diff --git a/base/password.py b/base/password.py +index fc5d2e5..34ba1f7 100644 +--- a/base/password.py ++++ b/base/password.py +@@ -57,6 +57,7 @@ AUTH_TYPES = {'mepis': 'su', + 'boss': 'su', + 'lfs': 'su', + 'manjarolinux': 'sudo', ++ 'msvsphere': 'su', + } + + +diff --git a/base/validation.py b/base/validation.py +index d555f12..26f8aa3 100644 +--- a/base/validation.py ++++ b/base/validation.py +@@ -55,7 +55,7 @@ class GPG_Verification(DigiSign_Verification): + + 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() diff --git a/SPECS/hplip.spec b/SPECS/hplip.spec index a762119..d60c39f 100644 --- a/SPECS/hplip.spec +++ b/SPECS/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.21.2 -Release: 6%{?dist} +Release: 6%{?dist}.inferit 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 @@ -193,6 +193,8 @@ Patch61: hplip-hpsetup-noscanjets.patch Patch1000: hplip-fedora-gui.patch %endif +# MSVSphere +Patch100: msvsphere-hplip-3.21.2-gpgdir-rules-gpg-server.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if 0%{?rhel} <= 8 || 0%{?fedora} @@ -484,6 +486,8 @@ done %patch1000 -p1 -b .fedora-gui %endif +%patch100 -p1 -b .gpgdir-rules-gpg-server + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -826,7 +830,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 3.21.2-6 +* Mon Mar 27 2023 Sergey Cherevko - 3.21.2-6.inferit +- Add MSVSphere support +- Fix permission for custom created gpg dir - Rebuilt for MSVSphere 9.1. * Mon Aug 09 2021 Mohan Boddu - 3.21.2-6