X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=df3055b10607a05e3a2e1d3f3b7de9644b3e852b;hb=902cef1308d99d848991098c13520e6727524c9a;hp=6674f36d1bca8bf31de9f7538e2ee51a3ae05cdc;hpb=7438e6d60e7dfb3bcefb0ef457e8b8265b0f97f3;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index 6674f36..df3055b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,34 +1,44 @@
+#
+# Conditional build:
+# _without_gnome - without gnome-askpass utility
+
 Summary:	OpenSSH free Secure Shell (SSH) implementation
-Summary(pl):	,,wolna'' implementacja bezpiecznego shella (SSH)
+Summary(es):	Implementación libre de SSH
+Summary(pl):	Publicznie dostêpna implementacja bezpiecznego shella (SSH)
+Summary(pt_BR):	Implementação livre do SSH
+Summary(ru):	OpenSSH - Ó×ÏÂÏÄÎÁÑ ÒÅÁÌÉÚÁÃÉÑ ÐÒÏÔÏËÏÌÁ Secure Shell (SSH)
+Summary(uk):	OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:		openssh
-Version:	2.1.0p2
+Version:	3.3p1
 Release:	1
 License:	BSD
 Group:		Applications/Networking
-Group(pl):	Aplikacje/Sieciowe
-URL:		http://www.openssh.com/
 Source0:	ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-Source1:	opensshd.conf
-Source2:	openssh.conf
-Source3:	opensshd.init
-Source4:	opensshd.pamd
-Source5:	openssh.sysconfig
+Source1:	%{name}d.conf
+Source2:	%{name}.conf
+Source3:	%{name}d.init
+Source4:	%{name}d.pamd
+Source5:	%{name}.sysconfig
 Source6:	passwd.pamd
-Patch0:		openssh-PAM_NEW_AUTHTOK.patch
-Patch1:		openssh-libwrap.patch
-Patch3:		openssh-login.patch
-BuildRequires:	openssl-devel >= 0.9.5a
-BuildRequires:	rpm >= 3.0.4
-BuildRequires:	zlib-devel
-BuildRequires:	pam-devel
+Patch0:		%{name}-no_libnsl.patch
+Patch1:		%{name}-set_12.patch
+Patch2:		%{name}-linux-ipv6.patch
+URL:		http://www.openssh.com/
 BuildRequires:	XFree86-devel
-BuildRequires:	gnome-libs-devel
-BuildRequires:	gtk+-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
+%{!?_without_gnome:BuildRequires: gnome-libs-devel}
+BuildRequires:	openssl-devel >= 0.9.6a
+BuildRequires:	pam-devel
+BuildRequires:	zlib-devel
+BuildRequires:	libwrap-devel
+BuildRequires:	perl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Prereq:		openssl >= 0.9.5a
-Obsoletes:	ssh < %{version}, ssh > %{version}
+Prereq:		openssl
+Obsoletes:	ssh
 
 %define		_sysconfdir	/etc/ssh
+%define		_libexecdir	%{_libdir}/%{name}
 
 %description
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -45,19 +55,86 @@ This package includes the core files necessary for both the OpenSSH
 client and server. To make this package useful, you should also
 install openssh-clients, openssh-server, or both.
 
+%description -l es
+SSH es un programa para accesar y ejecutar órdenes en computadores
+remotos. Sustituye rlogin y rsh, y suministra un canal de comunicación
+seguro entre dos servidores en una red insegura. Conexiones X11 y
+puertas TCP/IP arbitrárias también pueden ser usadas por el canal
+seguro.
+
+OpenSSH es el resultado del trabajo del equipo de OpenBSD para
+continuar la última versión gratuita de SSH, actualizándolo en
+términos de seguridad y recursos,así también eliminando todos los
+algoritmos patentados y colocándolos en bibliotecas separadas
+(OpenSSL).
+
+Este paquete contiene "port" para Linux de OpenSSH. Se debe instalar
+también el paquete openssh-clients u openssh-server o ambos.
+
 %description -l pl
 Ssh (Secure Shell) to program s³u¿±cy do logowania siê na zdaln±
 maszynê i uruchamiania na niej aplikacji. W zamierzeniu openssh ma
 zast±piæ rlogin, rsh i dostarczyæ bezpieczne, szyfrowane po³±czenie
 pomiedzy dwoma hostami.
 
+%description -l pt_BR
+SSH é um programa para acessar e executar comandos em máquinas
+remotas. Ele substitui rlogin e rsh, e provem um canal de comunicação
+seguro entre dois hosts em uma rede insegura. Conexões X11 e portas
+TCP/IP arbitrárias também podem ser usadas pelo canal seguro.
+
+OpenSSH é o resultado do trabalho da equipe do OpenBSD em continuar a
+última versão gratuita do SSH, atualizando-o em termos de segurança e
+recursos, assim como removendo todos os algoritmos patenteados e
+colocando-os em bibliotecas separadas (OpenSSL).
+
+Esse pacote contém o "port" pra Linux do OpenSSH. Você deve instalar
+também ou o pacote openssh-clients, ou o openssh-server, ou ambos.
+
+%description -l ru
+Ssh (Secure Shell) - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÄÌÑ "ÚÁÈÏÄÁ" (login) ÎÁ ÕÄÁÌÅÎÎÕÀ
+ÍÁÛÉÎÕ É ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄ ÎÁ ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÅ. ïÎÁ ÐÒÅÄÎÁÚÎÁÞÅÎÁ
+ÄÌÑ ÚÁÍÅÎÙ rlogin É rsh É ÏÂÅÓÐÅÞÉ×ÁÅÔ ÂÅÚÏÐÁÓÎÕÀ ÛÉÆÒÏ×ÁÎÎÕÀ
+ËÏÍÍÕÎÉËÁÃÉÀ ÍÅÖÄÕ Ä×ÕÍÑ ÈÏÓÔÁÍÉ × ÓÅÔÉ, Ñ×ÌÑÀÝÅÊÓÑ ÎÅÂÅÚÏÐÁÓÎÏÊ.
+óÏÅÄÉÎÅÎÉÑ X11 É ÌÀÂÙÅ ÐÏÒÔÙ TCP/IP ÍÏÇÕÔ ÔÁËÖÅ ÂÙÔØ ÐÒÏ×ÅÄÅÎÙ ÞÅÒÅÚ
+ÂÅÚÏÐÁÓÎÙÊ ËÁÎÁÌ.
+
+OpenSSH - ÜÔÏ ÐÅÒÅÄÅÌËÁ ËÏÍÁÎÄÏÊ ÒÁÚÒÁÂÏÔÞÉËÏ× OpenBSD ÐÏÓÌÅÄÎÅÊ
+Ó×ÏÂÏÄÎÏÊ ×ÅÒÓÉÉ SSH, ÄÏ×ÅÄÅÎÎÁÑ ÄÏ ÓÏ×ÒÅÍÅÎÎÏÇÏ ÓÏÓÔÏÑÎÉÑ × ÔÅÒÍÉÎÁÈ
+ÕÒÏ×ÎÑ ÂÅÚÏÐÁÓÎÏÓÔÉ É ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ. ÷ÓÅ ÐÁÔÅÎÔÏ×ÁÎÎÙÅ
+ÁÌÇÏÒÉÔÍÙ ×ÙÎÅÓÅÎÙ × ÏÔÄÅÌØÎÙÅ ÂÉÂÌÉÏÔÅËÉ (OpenSSL).
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ËÁË ÄÌÑ ËÌÉÅÎÔÁ, ÔÁË É ÄÌÑ
+ÓÅÒ×ÅÒÁ OpenSSH. ÷ÁÍ ÎÕÖÎÏ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÉÔØ ÅÝÅ openssh-clients,
+openssh-server, ÉÌÉ ÏÂÁ ÐÁËÅÔÁ.
+
+%description -l uk
+Ssh (Secure Shell) - ÃÅ ÐÒÏÇÒÁÍÁ ÄÌÑ "ÚÁÈÏÄÕ" (login) ÄÏ ×¦ÄÄÁÌÅÎϧ
+ÍÁÛÉÎÉ ÔÁ ÄÌÑ ×ÉËÏÎÁÎÎÑ ËÏÍÁÎÄ ÎÁ צÄÄÁÌÅÎ¦Ê ÍÁÛÉΦ. ÷ÏÎÁ ÐÒÉÚÎÁÞÅÎÁ
+ÄÌÑ ÚÁͦÎÉ rlogin ÔÁ rsh ¦ ÚÁÂÅÚÐÅÞÕ¤ ÂÅÚÐÅÞÎÕ ÛÉÆÒÏ×ÁÎÕ ËÏÍÕΦËÁæÀ
+Í¦Ö Ä×ÏÍÁ ÈÏÓÔÁÍÉ × ÍÅÒÅÖ¦, ÑËÁ ÎÅ ¤ ÂÅÚÐÅÞÎÏÀ. ú'¤ÄÎÁÎÎÑ X11 ÔÁ
+ÄÏצÌØΦ ÐÏÒÔÉ TCP/IP ÍÏÖÕÔØ ÔÁËÏÖ ÂÕÔÉ ÐÒÏ×ÅÄÅΦ ÞÅÒÅÚ ÂÅÚÐÅÞÎÉÊ
+ËÁÎÁÌ.
+
+OpenSSH - ÃÅ ÐÅÒÅÒÏÂËÁ ËÏÍÁÎÄÏÀ ÒÏÚÒÏÂÎÉË¦× OpenBSD ÏÓÔÁÎÎØϧ צÌØÎϧ
+×ÅÒÓ¦§ SSH, ÄÏ×ÅÄÅÎÁ ÄÏ ÓÕÞÁÓÎÏÇÏ ÓÔÁÎÕ × ÔÅÒͦÎÁÈ Ò¦×ÎÑ ÂÅÚÐÅËÉ ÔÁ
+ЦÄÔÒÉÍÕ×ÁÎÉÈ ÍÏÖÌÉ×ÏÓÔÅÊ. ÷Ó¦ ÐÁÔÅÎÔÏ×ÁΦ ÁÌÇÏÒÉÔÍÉ ×ÉÎÅÓÅΦ ÄÏ
+ÏËÒÅÍÉÈ Â¦Â̦ÏÔÅË (OpenSSL).
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÆÁÊÌÉ, ÎÅÏÂȦÄΦ ÑË ÄÌÑ Ë̦¤ÎÔÁ, ÔÁË ¦ ÄÌÑ ÓÅÒ×ÅÒÁ
+OpenSSH. ÷ÁÍ ÐÏÔÒ¦ÂÎÏ ÂÕÄÅ ÝÅ ×ÓÔÁÎÏ×ÉÔÉ openssh-clients,
+openssh-server, ÞÉ ÏÂÉÄ×Á ÐÁËÅÔÉ.
+
 %package clients
 Summary:	OpenSSH Secure Shell protocol clients
+Summary(es):	Clientes de OpenSSH
 Summary(pl):	Klienci protoko³u Secure Shell
+Summary(pt_BR):	Clientes do OpenSSH
+Summary(ru):	OpenSSH - ËÌÉÅÎÔÙ ÐÒÏÔÏËÏÌÁ Secure Shell
+Summary(uk):	OpenSSH - Ë̦¤ÎÔÉ ÐÒÏÔÏËÏÌÕ Secure Shell
 Requires:	openssh
 Group:		Applications/Networking
-Group(pl):	Aplikacje/Sieciowe
-Obsoletes:	ssh-clients < %{version}, ssh-clients > %{version}
+Obsoletes:	ssh-clients
 Requires:	%{name} = %{version}
 
 %description clients
@@ -74,7 +151,11 @@ all patented algorithms to seperate libraries (OpenSSL).
 This package includes the clients necessary to make encrypted
 connections to SSH servers.
 
-%description -l pl clients
+%description clients -l es
+Este paquete incluye los clientes que se necesitan para hacer
+conexiones codificadas con servidores SSH.
+
+%description clients -l pl
 Ssh (Secure Shell) to program s³u¿±cy do logowania siê na zdaln±
 maszynê i uruchamiania na niej aplikacji. W zamierzeniu openssh ma
 zast±piæ rlogin, rsh i dostarczyæ bezpieczne, szyfrowane po³±czenie
@@ -82,17 +163,39 @@ pomiedzy dwoma hostami.
 
 Ten pakiet zawiera klientów s³u¿±cych do ³±czenia siê z serwerami SSH.
 
+%description clients -l pt_BR
+Esse pacote inclui os clientes necessários para fazer conexões
+encriptadas com servidores SSH.
+
+%description clients -l ru
+Ssh (Secure Shell) - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÄÌÑ "ÚÁÈÏÄÁ" (login) ÎÁ ÕÄÁÌÅÎÎÕÀ
+ÍÁÛÉÎÕ É ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄ ÎÁ ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÅ.
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÐÒÏÇÒÁÍÍÙ-ËÌÉÅÎÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÕÓÔÁÎÏ×ÌÅÎÉÑ
+ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÅÄÉÎÅÎÉÊ Ó ÓÅÒ×ÅÒÁÍÉ SSH.
+
+%description clients -l uk
+Ssh (Secure Shell) - ÃÅ ÐÒÏÇÒÁÍÁ ÄÌÑ "ÚÁÈÏÄÕ" (login) ÄÏ ×¦ÄÄÁÌÅÎϧ
+ÍÁÛÉÎÉ ÔÁ ÄÌÑ ×ÉËÏÎÁÎÎÑ ËÏÍÁÎÄ ÎÁ צÄÄÁÌÅÎ¦Ê ÍÁÛÉΦ.
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÐÒÏÇÒÁÍÉ-Ë̦¤ÎÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ
+ÚÁÛÉÆÒÏ×ÁÎÉÈ Ú'¤ÄÎÁÎØ Ú ÓÅÒ×ÅÒÁÍÉ SSH.
+
 %package server
 Summary:	OpenSSH Secure Shell protocol server (sshd)
+Summary(es):	Servidor OpenSSH para comunicaciones codificadas
 Summary(pl):	Serwer protoko³u Secure Shell (sshd)
-Requires:	openssh chkconfig >= 0.9
+Summary(pt_BR):	Servidor OpenSSH para comunicações encriptadas
+Summary(ru):	OpenSSH - ÓÅÒ×ÅÒ ÐÒÏÔÏËÏÌÁ Secure Shell (sshd)
+Summary(uk):	OpenSSH - ÓÅÒ×ÅÒ ÐÒÏÔÏËÏÌÕ Secure Shell (sshd)
+Requires:	openssh
+Requires:	chkconfig >= 0.9
 Group:		Networking/Daemons
-Group(pl):	Sieciowe/Serwery
-Obsoletes:	ssh-server < %{version}, ssh-server > %{version}
-Requires:	rc-scripts
+Obsoletes:	ssh-server
 Requires:	/bin/login
 Requires:	util-linux
-Prereq:		pam
+Prereq:		rc-scripts
+Prereq:		/sbin/chkconfig
 Prereq:		%{name} = %{version}
 
 %description server
@@ -110,7 +213,12 @@ This package contains the secure shell daemon. The sshd is the server
 part of the secure shell protocol and allows ssh clients to connect to
 your host.
 
-%description -l pl server
+%description server -l es
+Este paquete contiene el servidor SSH. sshd es la parte servidor del
+protocolo secure shell y permite que clientes ssh se conecten a su
+servidor.
+
+%description server -l pl
 Ssh (Secure Shell) to program s³u¿±cy do logowania siê na zdaln±
 maszynê i uruchamiania na niej aplikacji. W zamierzeniu openssh ma
 zast±piæ rlogin, rsh i dostarczyæ bezpieczne, szyfrowane po³±czenie
@@ -119,15 +227,39 @@ pomiedzy dwoma hostami.
 Ten pakiet zawiera serwer sshd (do którego mog± ³±czyæ siê klienci
 ssh).
 
+%description server -l pt_BR
+Esse pacote contém o servidor SSH. O sshd é a parte servidor do
+protocolo secure shell e permite que clientes ssh se conectem ao seu
+host.
+
+%description server -l ru
+Ssh (Secure Shell) - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÄÌÑ "ÚÁÈÏÄÁ" (login) ÎÁ ÕÄÁÌÅÎÎÕÀ
+ÍÁÛÉÎÕ É ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄ ÎÁ ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÅ.
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ sshd - "ÄÅÍÏÎ" Secure Shell. sshd - ÜÔÏ ÓÅÒ×ÅÒÎÁÑ
+ÞÁÓÔØ ÐÒÏÔÏËÏÌÁ Secure Shell, ÐÏÚ×ÏÌÑÀÝÁÑ ËÌÉÅÎÔÁÍ ssh ÓÏÅÄÉÎÑÔØÓÑ Ó
+×ÁÛÉÍ ÈÏÓÔÏÍ.
+
+%description server -l uk
+Ssh (Secure Shell) - ÃÅ ÐÒÏÇÒÁÍÁ ÄÌÑ "ÚÁÈÏÄÕ" (login) ÄÏ ×¦ÄÄÁÌÅÎϧ
+ÍÁÛÉÎÉ ÔÁ ÄÌÑ ×ÉËÏÎÁÎÎÑ ËÏÍÁÎÄ ÎÁ צÄÄÁÌÅÎ¦Ê ÍÁÛÉΦ.
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ sshd - "ÄÅÍÏÎ" Secure Shell. sshd - ÃÅ ÓÅÒ×ÅÒÎÁ
+ÞÁÓÔÉÎÁ ÐÒÏÔÏËÏÌÕ Secure Shell, ÑËÁ ÄÏÚ×ÏÌѤ Ë̦¤ÎÔÁÍ ssh Ú×'ÑÚÕ×ÁÔÉÓØ
+Ú ×ÁÛÉÍ ÈÏÓÔÏÍ.
+
 %package gnome-askpass
 Summary:	OpenSSH GNOME passphrase dialog
+Summary(es):	Diálogo para introducción de passphrase para GNOME
 Summary(pl):	Odpytywacz has³a OpenSSH dla GNOME
+Summary(pt_BR):	Diálogo para entrada de passphrase para GNOME
+Summary(ru):	OpenSSH - ÄÉÁÌÏÇ ××ÏÄÁ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ (passphrase) ÄÌÑ GNOME
+Summary(uk):	OpenSSH - ĦÁÌÏÇ ××ÏÄÕ ËÌÀÞÏ×ϧ ÆÒÁÚÉ (passphrase) ÄÌÑ GNOME
 Group:		Applications/Networking
-Group(pl):	Aplikacje/Sieciowe
 Requires:	%{name} = %{version}
-Obsoletes:	ssh-extras < %{version}, ssh-extras > %{version}
-Obsoletes:	ssh-askpass < %{version}, ssh-askpass > %{version}
-Obsoletes:	openssh-askpass < %{version}, openssh-askpass > %{version}
+Obsoletes:	ssh-extras
+Obsoletes:	ssh-askpass
+Obsoletes:	openssh-askpass
 
 %description gnome-askpass
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -142,7 +274,11 @@ all patented algorithms to seperate libraries (OpenSSL).
 
 This package contains the GNOME passphrase dialog.
 
-%description -l pl gnome-askpass
+%description gnome-askpass -l es
+Este paquete contiene un programa que abre una caja de diálogo para
+entrada de passphrase en GNOME.
+
+%description gnome-askpass -l pl
 Ssh (Secure Shell) to program s³u¿±cy do logowania siê na zdaln±
 maszynê i uruchamiania na niej aplikacji. W zamierzeniu openssh ma
 zast±piæ rlogin, rsh i dostarczyæ bezpieczne, szyfrowane po³±czenie
@@ -150,36 +286,58 @@ pomiedzy dwoma hostami.
 
 Ten pakiet zawiera ,,odpytywacz has³a'' dla GNOME.
 
+%description gnome-askpass -l pt_BR
+Esse pacote contém um programa que abre uma caixa de diálogo para
+entrada de passphrase no GNOME.
+
+%description gnome-askpass -l ru
+Ssh (Secure Shell) - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÄÌÑ "ÚÁÈÏÄÁ" (login) ÎÁ ÕÄÁÌÅÎÎÕÀ
+ÍÁÛÉÎÕ É ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄ ÎÁ ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÅ.
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÄÉÁÌÏÇ ××ÏÄÁ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÐÏÄ
+GNOME.
+
+%description gnome-askpass -l uk
+Ssh (Secure Shell) - ÃÅ ÐÒÏÇÒÁÍÁ ÄÌÑ "ÚÁÈÏÄÕ" (login) ÄÏ ×¦ÄÄÁÌÅÎϧ
+ÍÁÛÉÎÉ ÔÁ ÄÌÑ ×ÉËÏÎÁÎÎÑ ËÏÍÁÎÄ ÎÁ צÄÄÁÌÅÎ¦Ê ÍÁÛÉΦ.
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ Ä¦ÁÌÏÇ ××ÏÄÕ ËÌÀÞÏ×ϧ ÆÒÁÚÉ ÄÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ Ð¦Ä
+GNOME.
+
 %prep
 %setup  -q
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
+%patch2 -p1
 
 %build
-autoconf
+aclocal
+%{__autoconf}
+
 %configure \
-	--with-gnome-askpass \
-	--with-tcp-wrappers \
+	%{!?_without_gnome:--with-gnome-askpass} \
+	--with-pam \
+	--with-mantype=man \
 	--with-md5-passwords \
 	--with-ipaddr-display \
-	--enable-ipv6 \
 	--with-4in6 \
-	--enable-log-auth 
+	--disable-suid-ssh \
+	--with-tcp-wrappers \
+	--with-pid-dir=%{_localstatedir}/run
 
 echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
 
-make
-cd contrib && gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \
-	gnome-ssh-askpass.c -o gnome-ssh-askpass \
-	`gnome-config --libs gnome gnomeui`
+%{__make}
+
+%{!?_without_gnome:cd contrib && %{__cc} %{rpmcflags} `gnome-config --cflags gnome gnomeui gtk` } \
+%{!?_without_gnome:gnome-ssh-askpass.c -o gnome-ssh-askpass } \
+%{!?_without_gnome:`gnome-config --libs gnome gnomeui gtk` }
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security}}
 
-make install DESTDIR="$RPM_BUILD_ROOT"
+%{__make} install DESTDIR="$RPM_BUILD_ROOT"
 
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/sshd
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/passwdssh
@@ -188,25 +346,18 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ssh_config
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sshd_config
 install -d $RPM_BUILD_ROOT%{_libexecdir}/ssh
-install -s contrib/gnome-ssh-askpass \
-	$RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
+%{!?_without_gnome:install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass}
 
-gzip -9nf ChangeLog OVERVIEW COPYING.Ylonen README README.Ylonen UPGRADING \
-	$RPM_BUILD_ROOT/%{_mandir}/man*/*
+rm -f	$RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
+echo ".so ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd
-	
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post server
 /sbin/chkconfig --add sshd
-if [ ! -f %{_sysconfdir}/ssh_host_key -o ! -s %{_sysconfdir}/ssh_host_key ]; then
-	%{_bindir}/ssh-keygen -b 1024 -f %{_sysconfdir}/ssh_host_key -N '' 1>&2
-fi
-if [ ! -f %{_sysconfdir}/ssh_host_dsa_key -o ! -s %{_sysconfdir}/ssh_host_dsa_key ]; then
-        %{_bindir}/ssh-keygen -d -f %{_sysconfdir}/ssh_host_dsa_key -N '' 1>&2
-fi
 if [ -f /var/lock/subsys/sshd ]; then
 	/etc/rc.d/init.d/sshd restart 1>&2
 else
@@ -217,7 +368,7 @@ if ! grep ssh /etc/security/passwd.conf >/dev/null 2>&1 ; then
 fi
 
 %preun server
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
 	if [ -f /var/lock/subsys/sshd ]; then
 		/etc/rc.d/init.d/sshd stop 1>&2
 	fi
@@ -226,34 +377,44 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc {ChangeLog,OVERVIEW,COPYING.Ylonen,README,README.Ylonen,UPGRADING}.gz
-%attr(755,root,root) %{_bindir}/ssh-keygen
-%{_mandir}/man1/ssh-keygen.1*
+%doc *.RNG TODO README OVERVIEW CREDITS Change*
+%attr(755,root,root) %{_bindir}/ssh-key*
+%{_mandir}/man1/ssh-key*.1*
 %dir %{_sysconfdir}
 
 %files clients
 %defattr(644,root,root,755)
 %attr(0755,root,root) %{_bindir}/ssh
+%attr(0755,root,root) %{_bindir}/slogin
+%attr(0755,root,root) %{_bindir}/sftp
 %attr(0755,root,root) %{_bindir}/ssh-agent
 %attr(0755,root,root) %{_bindir}/ssh-add
-%attr(755,root,root) %{_bindir}/scp
+%attr(0755,root,root) %{_bindir}/scp
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssh_config
 %{_mandir}/man1/scp.1*
 %{_mandir}/man1/ssh.1*
+%{_mandir}/man1/slogin.1*
+%{_mandir}/man1/sftp.1*
 %{_mandir}/man1/ssh-agent.1*
 %{_mandir}/man1/ssh-add.1*
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssh_config
+%{_mandir}/man5/ssh_config.5*
 
 %files server
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/sshd
+%attr(755,root,root) %{_libexecdir}/sftp-server
+%dir %{_libexecdir}
 %{_mandir}/man8/sshd.8*
+%{_mandir}/man8/sftp-server.8*
+%{_mandir}/man5/sshd_config.5*
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sshd_config
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/sshd
+%attr(640,root,root) %{_sysconfdir}/moduli
 %attr(754,root,root) /etc/rc.d/init.d/sshd
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/sshd
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.sshd
 
-%files gnome-askpass
-%defattr(644,root,root,755)
-%dir %{_libexecdir}/ssh
-%attr(755,root,root) %{_libexecdir}/ssh/ssh-askpass
+%{!?_without_gnome:%files gnome-askpass}
+%{!?_without_gnome:%defattr(644,root,root,755)}
+%{!?_without_gnome:%dir %{_libexecdir}/ssh}
+%{!?_without_gnome:%attr(755,root,root) %{_libexecdir}/ssh/ssh-askpass}