- add /etc/profile.d/ssh-agent.sh (in bcond, default turn off for now).

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 3f4920c99dc1282fa5f0d0e2d6282f50598fe77d..0b3bf7995c4cfbd5cf01e8284844b14d5d352065 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -5,6 +5,7 @@
 %bcond_with    ldap            # with ldap support
 %bcond_without kerberos5       # without kerberos5 support
 %bcond_without chroot          # without chrooted user environment support
+%bcond_with    sshagentsh      # with system-wide script for starting ssh-agent
 #
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
@@ -19,25 +20,27 @@ Summary(pt_BR):     Implementa
 Summary(ru):   OpenSSH - Ó×ÏÂÏÄÎÁÑ ÒÅÁÌÉÚÁÃÉÑ ÐÒÏÔÏËÏÌÁ Secure Shell (SSH)
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
-Version:       3.8p1
-Release:       0.2
+Version:       3.8.1p1
+Release:       2
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 7861a4c0841ab69a6eec5c747daff6fb
+# Source0-md5: 1dbfd40ae683f822ae917eebf171ca42
 Source1:       %{name}d.conf
 Source2:       %{name}.conf
 Source3:       %{name}d.init
 Source4:       %{name}d.pamd
 Source5:       %{name}.sysconfig
 Source6:       passwd.pamd
-Source7:       %{name}-askpass.sh
-Source8:       %{name}-askpass.csh
+Source7:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/openssh-non-english-man-pages.tar.bz2
+# Source7-md5: 66943d481cc422512b537bcc2c7400d1
 Source9:       http://www.imasy.or.jp/~gotoh/ssh/connect.c
 # NoSource9-md5:       c78de727e1208799072be78c05d64398
 Source10:      http://www.imasy.or.jp/~gotoh/ssh/connect.html
 # NoSource10-md5:      f14cb61fafd067a3f5ce4eaa9643bf05
+Source11:      ssh-agent.sh
+Source12:      ssh-agent.conf
 Patch0:                %{name}-no_libnsl.patch
 Patch2:                %{name}-linux-ipv6.patch
 Patch3:                %{name}-pam_misc.patch
@@ -59,13 +62,14 @@ BuildRequires:      automake
 BuildRequires: libselinux-devel
 BuildRequires: libwrap-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
-BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
 BuildRequires: %{__perl}
 %{?with_gtk:BuildRequires:     pkgconfig}
 BuildRequires: zlib-devel
 PreReq:                FHS >= 2.1-24
-PreReq:                openssl >= 0.9.7c
+PreReq:                openssl >= 0.9.7d
+%{?with_sshagentsh:Requires:   xinitrc}
 Obsoletes:     ssh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -401,14 +405,14 @@ GNOME.
 %patch3 -p1
 %patch4 -p1
 %{?with_ldap:%patch5 -p1}
-#%{?with_kerberos5:%patch6 -p1}
+%{?with_kerberos5:%patch6 -p1}
 #%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 
 %build
-cp /usr/share/automake/config.sub .
+cp %{_datadir}/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{?with_chroot:CPPFLAGS="-DCHROOT"}
@@ -449,8 +453,9 @@ cd contrib
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,profile.d}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security}} \
        $RPM_BUILD_ROOT%{_libexecdir}/ssh
+%{?with_sshagentsh:install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -462,15 +467,21 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/sshd
 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
+%if %{with sshagentsh}
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/profile.d/
+ln -sf /etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh
+install %{SOURCE12} $RPM_BUILD_ROOT/etc/ssh/
+%endif
+
+bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %if %{with gnome}
 install contrib/gnome-ssh-askpass1 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
+ln -s %{_libexecdir}/ssh/ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh-askpass
 %endif
 %if %{with gtk}
 install contrib/gnome-ssh-askpass2 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
-%endif
-%if %{with gnome} || %{with gtk}
-install %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT/etc/profile.d
+ln -s %{_libexecdir}/ssh/ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh-askpass
 %endif
 
 rm -f  $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
@@ -534,6 +545,11 @@ fi
 %attr(0755,root,root) %{_bindir}/ssh-add
 %attr(0755,root,root) %{_bindir}/scp
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssh_config
+%if %{with sshagentsh}
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ssh-agent.conf
+%attr(0755,root,root) /etc/profile.d/ssh-agent.sh
+%attr(0755,root,root) /etc/X11/xinit/xinitrc.d/ssh-agent.sh
+%endif
 %{_mandir}/man1/scp.1*
 %{_mandir}/man1/ssh.1*
 %{_mandir}/man1/slogin.1*
@@ -541,6 +557,10 @@ fi
 %{_mandir}/man1/ssh-agent.1*
 %{_mandir}/man1/ssh-add.1*
 %{_mandir}/man5/ssh_config.5*
+%lang(it) %{_mandir}/it/man1/ssh.1*
+%lang(it) %{_mandir}/it/man5/ssh_config.5*
+%lang(pl) %{_mandir}/pl/man1/scp.1*
+%lang(zh_CN) %{_mandir}/zh_CN/man1/scp.1*
 
 # for host-based auth (suid required for accessing private host key)
 #%attr(4755,root,root) %{_libexecdir}/ssh-keysign
@@ -568,5 +588,5 @@ fi
 %defattr(644,root,root,755)
 %dir %{_libexecdir}/ssh
 %attr(755,root,root) %{_libexecdir}/ssh/ssh-askpass
-%attr(755,root,root) /etc/profile.d/*
+%attr(755,root,root) %{_libexecdir}/ssh-askpass
 %endif