From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 5 Feb 2014 13:09:37 +0000 (+0000)
Subject: - TLDize
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=66a0de148ced92a04286957e368572733c16cb27;p=packages%2Fopenssh.git

- TLDize
---

diff --git a/openssh.spec b/openssh.spec
index efd5688..fcf1931 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -17,11 +17,7 @@
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
 
-%if "%{pld_release}" == "ac"
-%define		pam_ver	0.79.0
-%else
 %define		pam_ver	1:1.1.5-5
-%endif
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Summary(de.UTF-8):	OpenSSH - freie Implementation der Secure Shell (SSH)
 Summary(es.UTF-8):	Implementación libre de SSH
@@ -94,15 +90,10 @@ BuildRequires:	rpmbuild(macros) >= 1.627
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel >= 1.2.3
 Requires:	zlib >= 1.2.3
-%if "%{pld_release}" == "ac"
-Requires:	filesystem >= 2.0-1
-Requires:	pam >= 0.79.0
-%else
 Requires:	filesystem >= 3.0-11
 Requires:	pam >= %{pam_ver}
 Suggests:	openssh-blacklist
 Suggests:	xorg-app-xauth
-%endif
 Obsoletes:	ssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -548,11 +539,6 @@ openldap-a.
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
 
-%if "%{pld_release}" == "ac"
-# fix for missing x11.pc
-%{__sed} -i -e '/pkg-config/s/ x11//' contrib/Makefile
-%endif
-
 # hack since arc4random from openbsd-compat needs symbols from libssh and vice versa
 sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh#g' Makefile*
 
@@ -584,11 +570,7 @@ CPPFLAGS="-DCHROOT"
 	--with-sandbox=seccomp_filter \
 	%{?with_selinux:--with-selinux} \
 	--with-tcp-wrappers \
-%if "%{pld_release}" == "ac"
-	--with-xauth=/usr/X11R6/bin/xauth
-%else
 	--with-xauth=%{_bindir}/xauth
-%endif
 
 echo '#define LOGIN_PROGRAM		   "/bin/login"' >>config.h
 
@@ -620,13 +602,6 @@ bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 cp -p %{SOURCE3} sshd.pam
 install -p %{SOURCE2} sshd.init
 
-%if "%{pld_release}" == "ac"
-# not present in ac, no point searching it
-%{__sed} -i -e '/pam_keyinit.so/d' sshd.pam
-# openssl on ac does not have OPENSSL_HAS_ECC
-%{__sed} -i -e '/ecdsa/d' sshd.init
-%endif
-
 %if %{without audit}
 # remove recording user's login uid to the process attribute
 %{__sed} -i -e '/pam_loginuid.so/d' sshd.pam