From 68e683f6f5ca22a0ba3e8a15ece0477dd4a3e2ec Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Mon, 18 Dec 2023 13:46:46 +0300
Subject: [PATCH] Added MSVSphere support

---
 SOURCES/0001-Added-MSVSphere-support.patch | 38 ++++++++++++++++++++++
 SPECS/hplip.spec                           | 10 ++++--
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/0001-Added-MSVSphere-support.patch

diff --git a/SOURCES/0001-Added-MSVSphere-support.patch b/SOURCES/0001-Added-MSVSphere-support.patch
new file mode 100644
index 0000000..a7353ee
--- /dev/null
+++ b/SOURCES/0001-Added-MSVSphere-support.patch
@@ -0,0 +1,38 @@
+From 12cb35c470ba0c6dd4c7857fa63c3ea8a228d1e7 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <sergey.cherevko@softline.com>
+Date: Mon, 18 Dec 2023 13:39:23 +0300
+Subject: [PATCH] Added MSVSphere support
+
+---
+ base/password.py   | 1 +
+ base/validation.py | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/base/password.py b/base/password.py
+index 42c42f8..e1abd39 100644
+--- a/base/password.py
++++ b/base/password.py
+@@ -39,6 +39,7 @@ AUTH_TYPES = {'mepis': 'su',
+               'fedora': 'su',
+               'redhat': 'su',
+               'rhel': 'su',
++              'msvsphere': 'su',
+               'slackware': 'su',
+               'gentoo': 'su',
+               'redflag': '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()
+-- 
+2.39.3
+
diff --git a/SPECS/hplip.spec b/SPECS/hplip.spec
index c334859..57ebaa6 100644
--- a/SPECS/hplip.spec
+++ b/SPECS/hplip.spec
@@ -7,7 +7,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.18.4
-Release: 9%{?dist}
+Release: 9%{?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
@@ -46,6 +46,9 @@ Patch30: hplip-typo.patch
 Patch31: hplip-keyserver.patch
 Patch32: hplip-covscan.patch
 
+# MSVSphere
+Patch100: 0001-Added-MSVSphere-support.patch
+
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: python3-pillow
 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
 %patch32 -p1 -b .covscan
 
+%patch100 -p1
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -538,7 +543,8 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
-* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.18.4-9
+* Mon Dec 18 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.18.4-9.inferit
+- Added MSVSphere support
 - Rebuilt for MSVSphere 8.8
 
 * Fri Jun 14 2019 Tomas Korbar <tkorbar@redhat.com> - 3.18.4-9