From 3d3e591d57b2762c47885e4cf3f6980cb371ebff Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 18 May 2022 13:33:04 +0300
Subject: [PATCH] AlmaLinux changes

---
 ...hplip-3.21.2-gpgdir-rules-gpg-server.patch | 24 +++++++++++++++++++
 SPECS/hplip.spec                              | 11 ++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/hplip-3.21.2-gpgdir-rules-gpg-server.patch

diff --git a/SOURCES/hplip-3.21.2-gpgdir-rules-gpg-server.patch b/SOURCES/hplip-3.21.2-gpgdir-rules-gpg-server.patch
new file mode 100644
index 0000000..ac82cbb
--- /dev/null
+++ b/SOURCES/hplip-3.21.2-gpgdir-rules-gpg-server.patch
@@ -0,0 +1,24 @@
+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
+@@ -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()
+
diff --git a/SPECS/hplip.spec b/SPECS/hplip.spec
index f1ecedf..499437e 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}.alma
 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,9 @@ Patch61: hplip-hpsetup-noscanjets.patch
 Patch1000: hplip-fedora-gui.patch
 %endif
 
+# AlmaLinux
+Patch100: hplip-3.21.2-gpgdir-rules-gpg-server.patch
+
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %if 0%{?rhel} <= 8 || 0%{?fedora}
@@ -484,6 +487,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,6 +831,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Wed May 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 3.21.2-6.alma
+- add AlmaLinux support
+- fix permission for custom created gpg dir
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.21.2-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688