From 1b35577035dc442713f1a7a5a392b5ed5c655a0e Mon Sep 17 00:00:00 2001 From: Jingwiw Date: Fri, 22 May 2026 19:48:25 +0800 Subject: [PATCH 1/4] SPECS: openssh: Use autochangelog Signed-off-by: Jingwiw --- SPECS/openssh/openssh.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/openssh/openssh.spec b/SPECS/openssh/openssh.spec index d0edcab2d7..65cd25ecfb 100644 --- a/SPECS/openssh/openssh.spec +++ b/SPECS/openssh/openssh.spec @@ -313,4 +313,4 @@ popd %attr(0644,root,root) %{_sysusersdir}/openssh-server.conf %changelog -%{?autochangelog} +%autochangelog From d9f63fd6335287409b91b065a5d0df4241786e1b Mon Sep 17 00:00:00 2001 From: Jingwiw Date: Fri, 22 May 2026 19:48:46 +0800 Subject: [PATCH 2/4] SPECS: openssh: Align optional build dependencies Signed-off-by: Jingwiw --- SPECS/openssh/openssh.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SPECS/openssh/openssh.spec b/SPECS/openssh/openssh.spec index 65cd25ecfb..3ca488d37e 100644 --- a/SPECS/openssh/openssh.spec +++ b/SPECS/openssh/openssh.spec @@ -60,12 +60,16 @@ BuildOption(conf): --with-kerberos5${krb5_prefix:+=${krb5_prefix}} %else BuildOption(conf): --without-kerberos5 %endif +%if %{with fido2} +BuildOption(conf): --with-security-key-builtin +%else +BuildOption(conf): --without-security-key-builtin +%endif BuildOption(conf): --with-libedit BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig(zlib) -BuildRequires: pkgconfig(audit) BuildRequires: util-linux BuildRequires: groff BuildRequires: pkgconfig(pam) @@ -78,12 +82,13 @@ BuildRequires: make BuildRequires: pkgconfig(libfido2) %endif BuildRequires: pkgconfig(libxcrypt) -%if %{with kerberos} +%if %{with kerberos5} BuildRequires: pkgconfig(krb5) %endif BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(ncurses) %if %{with selinux} +BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libselinux) %endif %if %{with xorg} From ed0a1ea7608d748562e2badf472353dd6a0016d4 Mon Sep 17 00:00:00 2001 From: Jingwiw Date: Fri, 22 May 2026 20:53:40 +0800 Subject: [PATCH 3/4] SPECS: openssh: Drop devel audit runtime dependency Signed-off-by: Jingwiw --- SPECS/openssh/openssh.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/SPECS/openssh/openssh.spec b/SPECS/openssh/openssh.spec index 3ca488d37e..c19342c5ed 100644 --- a/SPECS/openssh/openssh.spec +++ b/SPECS/openssh/openssh.spec @@ -101,7 +101,6 @@ Recommends: p11-kit Requires: openssl %if %{with selinux} Requires: libselinux -Requires: pkgconfig(audit) %endif %description From 2df689e1f2bf06ac388185f87e2acb3ee9f59961 Mon Sep 17 00:00:00 2001 From: Jingwiw Date: Fri, 22 May 2026 22:04:58 +0800 Subject: [PATCH 4/4] SPECS: openssh: Drop unused systemd configure dependency Signed-off-by: Jingwiw --- SPECS/openssh/openssh.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/SPECS/openssh/openssh.spec b/SPECS/openssh/openssh.spec index c19342c5ed..fa2290b743 100644 --- a/SPECS/openssh/openssh.spec +++ b/SPECS/openssh/openssh.spec @@ -48,7 +48,6 @@ BuildOption(conf): --without-zlib-version-check BuildOption(conf): --without-ipaddr-display BuildOption(conf): --with-pie=no BuildOption(conf): --without-hardening -BuildOption(conf): --with-systemd BuildOption(conf): --with-pam %if %{with selinux} BuildOption(conf): --with-selinux @@ -74,7 +73,6 @@ BuildRequires: util-linux BuildRequires: groff BuildRequires: pkgconfig(pam) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(systemd) BuildRequires: systemd-rpm-macros BuildRequires: make #BuildRequires: pkgconfig(p11-kit-1)