- release 2.

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 58d65c9858b40cd3fa3bba21ebf4585f41a80bdc..4852d7630ea9b8d6b73d675df405964114b4867e 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -27,13 +27,13 @@ Summary(pt_BR):     Implementa
 Summary(ru):   OpenSSH - Ó×ÏÂÏÄÎÁÑ ÒÅÁÌÉÚÁÃÉÑ ÐÒÏÔÏËÏÌÁ Secure Shell (SSH)
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
-Version:       4.3p1
-Release:       3%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
+Version:       4.3p2
+Release:       2%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: eaeb880b1b6c63b9a4d7c5b1e74727c4
+# Source0-md5: 7e9880ac20a9b9db0d3fea30a9ff3d46
 Source1:       %{name}d.conf
 Source2:       %{name}.conf
 Source3:       %{name}d.init
@@ -43,29 +43,31 @@ Source6:    passwd.pamd
 Source7:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source7-md5: 66943d481cc422512b537bcc2c7400d1
 Source9:       http://www.taiyo.co.jp/~gotoh/ssh/connect.c
-# NoSource9-md5:       e1c3cbed88f08ea778d90813d48cd428
+# Source9-md5: b856937f1cdfca7a3ccfb2fac36ef726
 Source10:      http://www.taiyo.co.jp/~gotoh/ssh/connect.html
-# NoSource10-md5:      ec74f3e3b2ea3a7dc84c7988235b6fcf
+# Source10-md5:        bb972b3a9d435c62023b355960d78f78
 Source11:      ssh-agent.sh
 Source12:      ssh-agent.conf
 Patch0:                %{name}-no_libnsl.patch
+Patch1:                %{name}-ac_fix.patch
 Patch2:                %{name}-linux-ipv6.patch
 Patch3:                %{name}-pam_misc.patch
 Patch4:                %{name}-sigpipe.patch
 # http://www.opendarwin.org/projects/openssh-lpk/
-Patch5:                %{name}-lpk-4.1p1-0.3.6.patch
+Patch5:                %{name}-lpk-4.3p1-0.3.7.patch
 Patch6:                %{name}-heimdal.patch
 Patch7:                %{name}-pam-conv.patch
 # http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
 Patch8:                %{name}-chroot.patch
 Patch9:                %{name}-selinux.patch
 Patch10:       %{name}-selinux-pld.patch
+# HPN patches rediffed due sigpipe patch.
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11.diff
-Patch11:       %{name}-4.2p1-hpn11.patch
+Patch11:       %{name}-4.3p1-hpn11.patch
 # Adds HPN (see p11) and an undocumented -z none cipher flag
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11-none.diff
-Patch12:       %{name}-4.2p1-hpn11-none.patch
+Patch12:       %{name}-4.3p1-hpn11-none.patch
 Patch13:       %{name}-include.patch
 URL:           http://www.openssh.com/
 BuildRequires: %{__perl}
@@ -81,7 +83,7 @@ BuildRequires:        libwrap-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
 %{?with_gtk:BuildRequires:     pkgconfig}
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
 Requires:      FHS >= 2.1-24
 Requires:      pam >= 0.79.0
@@ -451,6 +453,7 @@ GNOME.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -485,7 +488,9 @@ cp %{_datadir}/automake/config.sub .
        %{?with_kerberos5:--with-kerberos5} \
        --with-privsep-path=%{_privsepdir} \
        --with-pid-dir=%{_localstatedir}/run \
-       --with-xauth=/usr/bin/xauth
+       --with-xauth=/usr/bin/xauth \
+       --enable-utmpx \
+       --enable-wtmpx
 
 echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
 
@@ -566,11 +571,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post server
 /sbin/chkconfig --add sshd
-if [ -f /var/lock/subsys/sshd ]; then
-       /etc/rc.d/init.d/sshd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/sshd start\" to start openssh daemon."
-fi
+%service sshd reload "openssh daemon"
 if ! grep -qs ssh /etc/security/passwd.conf ; then
        umask 022
        echo "ssh" >> /etc/security/passwd.conf
@@ -578,9 +579,7 @@ fi
 
 %preun server
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/sshd ]; then
-               /etc/rc.d/init.d/sshd stop 1>&2
-       fi
+       %service sshd stop
        /sbin/chkconfig --del sshd
 fi