- enhanced openssh-chroot.patch with UseChroot configuration option

- changed the way this patch is applied and used (now applied by default)

Changed files:
    openssh.spec -> 1.184

diff --git a/openssh.spec b/openssh.spec
index 445c289cdc8217db08d7ac3bd46ba0ec17e9ec6a..d9f39b449d3a7ab089010a47f5a25b4739fa8ce7 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -4,7 +4,7 @@
 %bcond_without gtk             # without gtk (2.x)
 %bcond_with    ldap            # with ldap support
 %bcond_without kerberos5       # without kerberos5 support
-%bcond_with    chroot          # with user chrooted env support
+%bcond_without chroot          # without chrooted user environment support
 
 # default to gtk2-based gnome-askpass
 %{?with_gtk:%define _without_gnome 1}
@@ -20,7 +20,7 @@ Summary(ru):  OpenSSH - 
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
 Version:       3.7.1p2
-Release:       3.1
+Release:       3.2
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -400,12 +400,12 @@ GNOME.
 %{?with_ldap:%patch5 -p1}
 %{?with_kerberos5:%patch6 -p1}
 %patch7 -p1
-%{?with_chroot:%patch8 -p1}
+%patch8 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
-
+%{?with_chroot:CPPFLAGS="-DCHROOT"}
 %configure \
        PERL=%{__perl} \
        --with-dns \