fixes

Changed files:
    openssh-libwrap.patch -> 1.9
    openssh.spec -> 1.27

diff --git a/openssh-libwrap.patch b/openssh-libwrap.patch
index b013ea0b1460184adb3cf0fd0dd53a36f119e4ea..1fd959073b275f0fa5213eb8f468000442c5e8fb 100644 (file)
--- a/openssh-libwrap.patch
+++ b/openssh-libwrap.patch
@@ -20,16 +20,33 @@ diff -bruN openssh-2.1.0/Makefile.in openssh-2.1.0.new/Makefile.in
        $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 diff -bruN openssh-2.1.0/configure.in openssh-2.1.0.new/configure.in
 --- openssh-2.1.0/configure.in Mon May  8 12:49:37 2000
-+++ openssh-2.1.0.new/configure.in     Wed May 10 20:29:00 2000
-@@ -757,7 +757,10 @@
++++ openssh-2.1.0.new/configure.in     Wed May 10 20:44:06 2000
+@@ -756,8 +756,11 @@
+       [  --with-tcp-wrappers     Enable tcpwrappers support],
        [
                if test "x$withval" != "xno" ; then
++                      # we need to add -lwrap to LIBS only for configure
++                      # testing, and then remove
                        saved_LIBS="$LIBS"
 -                      LIBS="$LIBS -lwrap"
 +                      LIBWRAP="-lwrap"
-+                      AC_SUBST(LIBWRAP)
-+                      AC_DEFINE(LIBWRAP)
-+                      LIBS="$saved_LIBS"
++                      LIBS="$LIBS $LIBWRAP"
                        AC_MSG_CHECKING(for libwrap)
                        AC_TRY_LINK(
                                [
+@@ -768,6 +771,7 @@
+                               [
+                                       AC_MSG_RESULT(yes)
+                                       AC_DEFINE(LIBWRAP)
++                                      AC_SUBST(LIBWRAP)
+                               ],
+                               [
+                                       AC_MSG_RESULT(no)
+@@ -775,6 +779,7 @@
+                                       LIBS="$saved_LIBS"
+                               ]
+                       )
++                      LIBS="$saved_LIBS"
+               fi
+       ]
+ )

diff --git a/openssh.spec b/openssh.spec
index ac67a6562503f714a792ac3d9bab9284e3ea7593..f6048c7f56328599e65c240fe0bf4c8be7842cb5 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -20,6 +20,7 @@ BuildRequires:        zlib-devel
 BuildRequires: pam-devel
 BuildRequires: XFree86-devel
 BuildRequires: gnome-libs-devel
+BuildRequires:  gtk+-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Prereq:                openssl >= 0.9.4-2
 Obsoletes:     ssh < %{version}, ssh > %{version}
@@ -135,6 +136,9 @@ autoconf
 echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h
 
 make
+cd contrib && gcc `gnome-config --cflags gnome gnomeui` \
+     gnome-ssh-askpass.c -o gnome-ssh-askpass \
+     `gnome-config --libs gnome gnomeui`
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -150,7 +154,7 @@ 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 ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
+install contrib/ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
 
 gzip -9fn ChangeLog OVERVIEW COPYING.Ylonen README README.Ylonen UPGRADING \
        $RPM_BUILD_ROOT/%{_mandir}/man*/*