From 14d7b86a508f981410ad7c8413606c338cc5424d Mon Sep 17 00:00:00 2001
From: Luca BRUNO <lucab@lucabruno.net>
Date: Aug 01 2022 15:15:08 +0000
Subject: openssh: use allocated static GID for 'ssh_keys' group (rhbz#2104595)


This uses the static GID 101 allocated for group `ssh_keys`.
See FPC ticket for discussion/approval.

Ref: https://pagure.io/packaging-committee/issue/1188
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2104595

---

diff --git a/openssh.spec b/openssh.spec
index 9ec0b0c..3130e5d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -51,14 +51,14 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %global openssh_ver 8.8p1
-%global openssh_rel 2
+%global openssh_rel 3
 %global pam_ssh_agent_ver 0.10.4
 %global pam_ssh_agent_rel 5
 
 Summary: An open source implementation of SSH protocol version 2
 Name: openssh
 Version: %{openssh_ver}
-Release: %{openssh_rel}%{?dist}.1
+Release: %{openssh_rel}%{?dist}
 URL: http://www.openssh.com/portable.html
 #URL1: https://github.com/jbeverly/pam_ssh_agent_auth/
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -268,7 +268,7 @@ Requires: openssh = %{version}-%{release}
 %package -n pam_ssh_agent_auth
 Summary: PAM module for authentication with ssh-agent
 Version: %{pam_ssh_agent_ver}
-Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}.1
+Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}
 License: BSD
 
 %description
@@ -549,8 +549,9 @@ pushd pam_ssh_agent_auth-pam_ssh_agent_auth-%{pam_ssh_agent_ver}
 %make_install
 popd
 %endif
+
 %pre
-getent group ssh_keys >/dev/null || groupadd -r ssh_keys || :
+getent group ssh_keys >/dev/null || groupadd -r -g 101 ssh_keys || :
 
 %pre server
 getent group sshd >/dev/null || groupadd -g %{sshd_uid} -r sshd || :
@@ -660,6 +661,9 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Mon Aug 01 2022 Luca BRUNO <lucab@lucabruno.net> - 8.8p1-3
+- Use allocated static GID for 'ssh_keys' group (rhbz#2104595)
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.8p1-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild