X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=e69325b8c5eaf4174468ce465d5cacd03bb3b9dc;hb=05fbd2e91356f549ed42baa5886ffd24137181a2;hp=f6167f56fbf7f6872c584d2dad8b7cdea86226fe;hpb=8c78f92435ac8cc7e344b444a1fe52cb2c334267;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index f6167f5..e69325b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,16 +1,23 @@
 #
-# Conditional build:	
+# Conditional build:
 # _without_gnome - without gnome-askpass utility
 
 Summary:	OpenSSH free Secure Shell (SSH) implementation
+Summary(de):	OpenSSH - freie Implementation der Secure Shell (SSH)
+Summary(es):	Implementación libre de SSH
+Summary(fr):	Implémentation libre du shell sécurisé OpenSSH (SSH)
+Summary(it):	Implementazione gratuita OpenSSH della Secure Shell
 Summary(pl):	Publicznie dostêpna implementacja bezpiecznego shella (SSH)
+Summary(pt):	Implementação livre OpenSSH do protocolo 'Secure Shell' (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.9.9p2
-Release:	2
+Version:	3.5p1
+Release:	3
+Epoch:		1
 License:	BSD
 Group:		Applications/Networking
-Group(de):	Applikationen/Netzwerkwesen
-Group(pl):	Aplikacje/Sieciowe
 Source0:	ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
 Source1:	%{name}d.conf
 Source2:	%{name}.conf
@@ -18,26 +25,30 @@ Source3:	%{name}d.init
 Source4:	%{name}d.pamd
 Source5:	%{name}.sysconfig
 Source6:	passwd.pamd
-Patch0:		%{name}-libwrap.patch
-Patch1:		%{name}-no_libnsl.patch
-Patch2:		%{name}-no-openssl-ver-check.patch
-Patch3:		%{name}-set_12.patch
+Source7:	%{name}-askpass.sh
+Source8:	%{name}-askpass.csh
+Patch0:		%{name}-no_libnsl.patch
+Patch1:		%{name}-set_12.patch
+Patch2:		%{name}-linux-ipv6.patch
+Patch3:		%{name}-pam_misc.patch
+Patch4:		%{name}-sigpipe.patch
 URL:		http://www.openssh.com/
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{!?_without_gnome:BuildRequires: gnome-libs-devel}
+BuildRequires:	libwrap-devel
 BuildRequires:	openssl-devel >= 0.9.6a
 BuildRequires:	pam-devel
+BuildRequires:	perl
 BuildRequires:	zlib-devel
-BuildRequires:	libwrap-devel
+PreReq:		openssl
+PreReq:		FHS >= 2.1-24
+Obsoletes:	ssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Prereq:		openssl
-Obsoletes:	ssh < %{version}
-Obsoletes:	ssh > %{version}
 
 %define		_sysconfdir	/etc/ssh
 %define		_libexecdir	%{_libdir}/%{name}
+%define		_privsepdir	/usr/share/empty
 
 %description
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -54,22 +65,119 @@ 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 de
+OpenSSH (Secure Shell) stellt den Zugang zu anderen Rechnern her. Es
+ersetzt telnet, rlogin, rexec und rsh und stellt eine sichere,
+verschlüsselte Verbindung zwischen zwei nicht vertrauenswürdigen Hosts
+über eine unsicheres Netzwerk her. X11 Verbindungen und beliebige
+andere TCP/IP Ports können ebenso über den sicheren Channel
+weitergeleitet werden.
+
+%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 fr
+OpenSSH (Secure Shell) fournit un accès à un système distant. Il
+remplace telnet, rlogin, rexec et rsh, tout en assurant des
+communications cryptées securisées entre deux hôtes non fiabilisés sur
+un réseau non sécurisé. Des connexions X11 et des ports TCP/IP
+arbitraires peuvent également être transmis sur le canal sécurisé.
+
+%description -l it
+OpenSSH (Secure Shell) fornisce l'accesso ad un sistema remoto.
+Sostituisce telnet, rlogin, rexec, e rsh, e fornisce comunicazioni
+sicure e crittate tra due host non fidati su una rete non sicura. Le
+connessioni X11 ad una porta TCP/IP arbitraria possono essere
+inoltrate attraverso un canale sicuro.
+
 %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.
 
+Ten pakiet zawiera podstawowe pliki potrzebne zarówno po stronie
+klienta jak i serwera OpenSSH. Aby by³ u¿yteczny, trzeba zainstalowaæ
+co najmniej jeden z pakietów: openssh-clients lub openssh-server.
+
+%description -l pt
+OpenSSH (Secure Shell) fornece acesso a um sistema remoto. Substitui o
+telnet, rlogin, rexec, e o rsh e fornece comunicações seguras e
+cifradas entre duas máquinas sem confiança mútua sobre uma rede
+insegura. Ligações X11 e portos TCP/IP arbitrários também poder ser
+reenviados pelo canal seguro.
+
+%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
-Requires:	openssh
+Summary(pt_BR):	Clientes do OpenSSH
+Summary(ru):	OpenSSH - ËÌÉÅÎÔÙ ÐÒÏÔÏËÏÌÁ Secure Shell
+Summary(uk):	OpenSSH - Ë̦¤ÎÔÉ ÐÒÏÔÏËÏÌÕ Secure Shell
 Group:		Applications/Networking
-Group(de):	Applikationen/Netzwerkwesen
-Group(pl):	Aplikacje/Sieciowe
-Obsoletes:	ssh-clients < %{version}
-Obsoletes:	ssh-clients > %{version}
 Requires:	%{name} = %{version}
+Obsoletes:	ssh-clients
 
 %description clients
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -85,7 +193,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
@@ -93,20 +205,46 @@ 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(de):	OpenSSH Secure Shell Protocol-Server (sshd)
+Summary(es):	Servidor OpenSSH para comunicaciones codificadas
+Summary(fr):	Serveur de protocole du shell sécurisé OpenSSH (sshd)
+Summary(it):	Server OpenSSH per il protocollo Secure Shell (sshd)
 Summary(pl):	Serwer protoko³u Secure Shell (sshd)
-Requires:	openssh
-Requires:	chkconfig >= 0.9
+Summary(pt):	Servidor do protocolo 'Secure Shell' OpenSSH (sshd)
+Summary(pt_BR):	Servidor OpenSSH para comunicações encriptadas
+Summary(ru):	OpenSSH - ÓÅÒ×ÅÒ ÐÒÏÔÏËÏÌÁ Secure Shell (sshd)
+Summary(uk):	OpenSSH - ÓÅÒ×ÅÒ ÐÒÏÔÏËÏÌÕ Secure Shell (sshd)
 Group:		Networking/Daemons
-Group(de):	Netzwerkwesen/Server
-Group(pl):	Sieciowe/Serwery
-Obsoletes:	ssh-server < %{version}, ssh-server > %{version}
+PreReq:		%{name} = %{version}
+PreReq:		rc-scripts >= 0.3.1-3
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
+Requires(post):	/sbin/chkconfig
+Requires(post):	chkconfig >= 0.9
+Requires(postun):	/usr/sbin/userdel
 Requires:	/bin/login
 Requires:	util-linux
-Prereq:		rc-scripts
-Prereq:		/sbin/chkconfig
-Prereq:		%{name} = %{version}
+Obsoletes:	ssh-server
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -123,7 +261,21 @@ 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 de
+Dieses Paket installiert den sshd, den Server-Teil der OpenSSH.
+
+%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 fr
+Ce paquetage installe le 'sshd', partie serveur de OpenSSH.
+
+%description server -l it
+Questo pacchetto installa sshd, il server di OpenSSH.
+
+%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
@@ -132,16 +284,46 @@ pomiedzy dwoma hostami.
 Ten pakiet zawiera serwer sshd (do którego mog± ³±czyæ siê klienci
 ssh).
 
+%description server -l pt
+Este pacote intala o sshd, o servidor do OpenSSH.
+
+%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(de):	OpenSSH GNOME Passwort-Dialog
+Summary(es):	Diálogo para introducción de passphrase para GNOME
+Summary(fr):	Dialogue pass-phrase GNOME d'OpenSSH
+Summary(it):	Finestra di dialogo GNOME per la frase segreta di OpenSSH
 Summary(pl):	Odpytywacz has³a OpenSSH dla GNOME
+Summary(pt):	Diálogo de pedido de senha para GNOME do OpenSSH
+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(de):	Applikationen/Netzwerkwesen
-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
@@ -156,7 +338,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
@@ -164,38 +350,60 @@ 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
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-aclocal
-autoconf
+%{__aclocal}
+%{__autoconf}
+
 %configure \
 	%{!?_without_gnome:--with-gnome-askpass} \
-	--with-tcp-wrappers \
 	--with-pam \
 	--with-mantype=man \
 	--with-md5-passwords \
 	--with-ipaddr-display \
 	--with-4in6 \
 	--disable-suid-ssh \
-	--with-pid-dir=%{_localstatedir}/run
+	--with-tcp-wrappers \
+	--with-privsep-path=%{_privsepdir} \
+	--with-pid-dir=%{_localstatedir}/run \
+	--with-xauth=/usr/X11R6/bin/xauth
 
 echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
 
 %{__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` }
+%{!?_without_gnome:cd contrib && %{__cc} %{rpmcflags} `gnome-config --cflags gnome gnomeui gtk`} \
+%{!?_without_gnome:gnome-ssh-askpass1.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}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,profile.d}}
 
 %{__make} install DESTDIR="$RPM_BUILD_ROOT"
 
@@ -207,17 +415,26 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ssh_config
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sshd_config
 install -d $RPM_BUILD_ROOT%{_libexecdir}/ssh
 %{!?_without_gnome:install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass}
+%{!?_without_gnome:install %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT/etc/profile.d}
 
 rm -f	$RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
-echo ".so man1/ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
-
-gzip -9nf *.RNG TODO README OVERVIEW CREDITS Change*
+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
 
+%pre server
+if [ -n "`id -u sshd 2>/dev/null`" ]; then
+	if [ "`id -u sshd`" != "40" ]; then
+		echo "Error: user sshd doesn't have uid=40. Correct this before installing ssh server." 1>&2
+		exit 1
+	fi
+else
+	/usr/sbin/useradd -u 40 -d %{_privsepdir} -s /bin/false -M -r -c "OpenSSH PrivSep User" -g nobody sshd 1>&2
+fi
+	
 %post server
 /sbin/chkconfig --add sshd
 if [ -f /var/lock/subsys/sshd ]; then
@@ -237,9 +454,14 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del sshd
 fi
 
+%postun server
+if [ "$1" = "0" ]; then
+	/usr/sbin/userdel sshd
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc *.RNG TODO README OVERVIEW CREDITS Change*
 %attr(755,root,root) %{_bindir}/ssh-key*
 %{_mandir}/man1/ssh-key*.1*
 %dir %{_sysconfdir}
@@ -251,14 +473,15 @@ fi
 %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)
@@ -267,6 +490,7 @@ fi
 %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
@@ -278,3 +502,4 @@ fi
 %{!?_without_gnome:%defattr(644,root,root,755)}
 %{!?_without_gnome:%dir %{_libexecdir}/ssh}
 %{!?_without_gnome:%attr(755,root,root) %{_libexecdir}/ssh/ssh-askpass}
+%{!?_without_gnome:%attr(755,root,root) /etc/profile.d/*}