automatic import of openssh

1 files changed, 15 insertions, 21 deletions

diff --git a/openssh9.4p1_for_openEuler.spec b/openssh9.4p1_for_openEuler.spec
index 660dbe9..2d56745 100644
--- a/openssh9.4p1_for_openEuler.spec
+++ b/openssh9.4p1_for_openEuler.spec
@@ -95,18 +95,12 @@ Obsoletes: ssh
 %else
 Requires: initscripts >= 5.20
 %endif
-#BuildRequires: perl rpm-build gcc gcc-c++ glibc glibc-devel openssl-devel openssl pcre-devel zlib zlib-devel make krb5-devel pam-devel libX11-devel xmkmf libXt-devel initscripts libXt-devel imake gtk2-devel krb5-devel cpan
 BuildRequires:  gtk2-devel libX11-devel openldap-devel autoconf automake perl-interpreter perl-generators
 BuildRequires:  zlib-devel audit-libs-devel >= 2.0.5 util-linux groff pam-devel
 BuildRequires:  openssl-devel >= 0.9.8j perl-podlators systemd-devel gcc p11-kit-devel krb5-devel
 BuildRequires:  libedit-devel ncurses-devel libselinux-devel >= 2.3-5 audit-libs >= 1.0.8 xauth gnupg2
-%if %{compat_openssl}
-BuildRequires: compat-openssl10-devel
-%else
-BuildRequires: openssl-devel >= 1.0.1
-##BuildRequires: openssl-devel < 1.1
-%endif
-BuildRequires: /bin/login
+Recommends:     p11-kit
+BuildRequires: /sbin/nologin
 %if ! %{build6x}
 BuildRequires: glibc-devel, pam
 %else
@@ -209,20 +203,20 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
 %endif
 
 %configure \
-	--sysconfdir=%{_sysconfdir}/ssh \
-	--libexecdir=%{_libexecdir}/openssh \
-	--datadir=%{_datadir}/openssh \
-	--with-default-path=/usr/local/bin:/bin:/usr/bin \
-	--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
-	--with-privsep-path=%{_var}/empty/sshd \
-    --with-openssl-includes=/usr/openssl/include/openssl \
-    --with-ssl-dir=/usr/openssl \
-	--mandir=%{_mandir} \
-	--with-mantype=man \
-	--disable-strip \
-%if %{scard}
-	--with-smartcard \
+    --sysconfdir=%{_sysconfdir}/ssh --libexecdir=%{_libexecdir}/openssh \
+    --datadir=%{_datadir}/openssh --with-default-path=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin \
+    --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin \
+    --with-privsep-path=%{_var}/empty/sshd --disable-strip \
+    --without-zlib-version-check --with-ssl-engine --with-ipaddr-display \
+    --with-pie=no --without-hardening --with-systemd --with-default-pkcs11-provider=yes \
+    --with-pam --with-selinux --with-audit=linux --with-security-key-buildin=yes \
+%ifnarch riscv64 loongarch64 sw_64
+     --with-sandbox=seccomp_filter \
 %endif
+    --with-kerberos5${krb5_prefix:+=${krb5_prefix}} --with-libedit
+
+
+
 %if %{rescue}
 	--without-pam \
 %else