- drop x11-ssh-askpass from the package

- drop old build_6x ifs from spec file
- improve gnome-ssh-askpass so it doesn't reveal number of passphrase
    characters to person looking at the display
- less hackish fix for the __USE_GNU problem

openssh-4.2p1-askpass-progress.patch

@@ -0,0 +1,72 @@
+--- openssh-4.2p1/contrib/gnome-ssh-askpass2.c.progress	2005-11-21 19:24:54.000000000 +0100
++++ openssh-4.2p1/contrib/gnome-ssh-askpass2.c	2005-11-22 17:29:08.000000000 +0100
+@@ -53,6 +53,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <X11/Xlib.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ 
+@@ -83,13 +84,24 @@
+ 	gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ }
+ 
++static void
++move_progress(GtkWidget *entry, gpointer progress)
++{
++	gdouble step;
++	g_return_if_fail(GTK_IS_PROGRESS_BAR(progress));
++	
++	step = g_random_double_range(0.03, 0.1);
++	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(progress), step);
++	gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress));
++}
++
+ static int
+ passphrase_dialog(char *message)
+ {
+ 	const char *failed;
+ 	char *passphrase, *local;
+ 	int result, grab_tries, grab_server, grab_pointer;
+-	GtkWidget *dialog, *entry;
++	GtkWidget *dialog, *entry, *progress, *hbox;
+ 	GdkGrabStatus status;
+ 
+ 	grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
+@@ -102,13 +114,24 @@
+ 					"%s",
+ 					message);
+ 
++	hbox = gtk_hbox_new(FALSE, 0);
++	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE,
++	    FALSE, 4);
++	gtk_widget_show(hbox);
++
+ 	entry = gtk_entry_new();
+-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, FALSE,
+-	    FALSE, 0);
++	gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE,
++	    FALSE, 4);
++	gtk_entry_set_width_chars(GTK_ENTRY(entry), 2);
+ 	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+ 	gtk_widget_grab_focus(entry);
+ 	gtk_widget_show(entry);
+ 
++	progress = gtk_progress_bar_new();
++	gtk_box_pack_start(GTK_BOX(hbox), progress, TRUE,
++	    TRUE, 4);
++	gtk_widget_show(progress);
++
+ 	gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH");
+ 	gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+ 	gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label),
+@@ -118,6 +141,8 @@
+ 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ 	g_signal_connect(G_OBJECT(entry), "activate",
+ 			 G_CALLBACK(ok_dialog), dialog);
++	g_signal_connect(G_OBJECT(entry), "changed",
++			 G_CALLBACK(move_progress), progress);
+ 
+ 	gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
+ 

openssh.spec

@@ -8,12 +8,6 @@
 %define sshd_uid    74
 %define sshd_gid    74
 
-# Version of ssh-askpass
-%define aversion 1.2.4.1
-
-# Do we want to disable building of x11-askpass? (1=yes 0=no)
-%define no_x11_askpass 0
-
 # Do we want to disable building of gnome-askpass? (1=yes 0=no)
 %define no_gnome_askpass 0
 
@@ -26,9 +20,6 @@
 # Use GTK2 instead of GNOME in gnome-ssh-askpass
 %define gtk2 1
 
-# Is this build for RHL 6.x?
-%define build6x 0
-
 # Build position-independent executables (requires toolchain support)?
 %define pie 1
 
@@ -40,7 +31,6 @@
 
 # Reserve options to override askpass settings with:
 # rpm -ba|--rebuild --define 'skip_xxx 1'
-%{?skip_x11_askpass:%define no_x11_askpass 1}
 %{?skip_gnome_askpass:%define no_gnome_askpass 1}
 
 # Add option to build without GTK2 for older platforms with only GTK+.
@@ -48,14 +38,6 @@
 # rpm -ba|--rebuild --define 'no_gtk2 1'
 %{?no_gtk2:%define gtk2 0}
 
-# Is this a build for RHL 6.x or earlier?
-%{?build_6x:%define build6x 1}
-
-# If this is RHL 6.x, the default configuration has sysconfdir in /usr/etc.
-%if %{build6x}
-%define _sysconfdir /etc
-%endif
-
 # Options for static OpenSSL link:
 # rpm -ba|--rebuild --define "static_openssl 1"
 %{?static_openssl:%define static_libcrypto 1}
@@ -76,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.2p1
-%define rel 8
+%define rel 9
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -89,9 +71,6 @@ URL: http://www.openssh.com/portable.html
 # removes the ACSS cipher.
 Source0: openssh-%{version}-noacss.tar.bz2
 Source1: openssh-nukeacss.sh
-Source2: http://www.pobox.com/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
-Source3: x11-ssh-askpass.sh
-Source4: x11-ssh-askpass.csh
 Patch0: openssh-4.0p1-redhat.patch
 Patch2: openssh-3.8.1p1-skip-initial.patch
 Patch3: openssh-3.8.1p1-krb5-config.patch
@@ -111,6 +90,8 @@ Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
 Patch32: openssh-4.2p1-pam-auth-fail-info.patch
 Patch33: openssh-4.2p1-scp-no-system.patch
+Patch34: openssh-4.2p1-gnu-source.patch
+Patch35: openssh-4.2p1-askpass-progress.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -119,15 +100,12 @@ Obsoletes: ssh
 Requires: /sbin/nologin
 %endif
 
-%if %{build6x}
-PreReq: initscripts >= 5.00
-%else
 PreReq: initscripts >= 5.20
-%endif
 
 %if ! %{no_gnome_askpass}
 %if %{gtk2}
 BuildPreReq: gtk2-devel
+BuildPreReq: libX11-devel
 %else
 BuildPreReq: gnome-libs-devel
 %endif
@@ -138,18 +116,9 @@ BuildPreReq: sharutils
 %endif
 BuildPreReq: autoconf, automake, openssl-devel, perl, tcp_wrappers, zlib-devel
 BuildPreReq: audit-libs-devel
-BuildPreReq: imake
 BuildPreReq: util-linux, groff, man
 
-%if %{build6x}
-BuildPreReq: glibc-devel, pam-devel
-%else
 BuildPreReq: pam-devel
-%endif
-
-%if ! %{no_x11_askpass}
-BuildPreReq: libXt-devel
-%endif
 
 %if %{kerberos5}
 BuildPreReq: krb5-devel
@@ -176,22 +145,14 @@ Summary: The OpenSSH server daemon.
 Group: System Environment/Daemons
 Obsoletes: ssh-server
 PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9, /usr/sbin/useradd
-%if ! %{build6x}
 Requires: /etc/pam.d/system-auth, /%{_lib}/security/pam_loginuid.so
-%endif
 BuildRequires: xorg-x11-xauth
 
 %package askpass
 Summary: A passphrase dialog for OpenSSH and X.
 Group: Applications/Internet
 Requires: openssh = %{version}-%{release}
-Obsoletes: ssh-extras
+Obsoletes: ssh-extras, openssh-askpass-gnome
-
-%package askpass-gnome
-Summary: A passphrase dialog for OpenSSH, X, and GNOME.
-Group: Applications/Internet
-Requires: openssh = %{version}-%{release}
-Obsoletes: ssh-extras
 
 %description
 SSH (Secure SHell) is a program for logging into and executing
@@ -226,19 +187,9 @@ OpenSSH is a free version of SSH (Secure SHell), a program for logging
 into and executing commands on a remote machine. This package contains
 an X11 passphrase dialog for OpenSSH.
 
-%description askpass-gnome
-OpenSSH is a free version of SSH (Secure SHell), a program for logging
-into and executing commands on a remote machine. This package contains
-an X11 passphrase dialog for OpenSSH and the GNOME GUI desktop
-environment.
-
 %prep
 
-%if ! %{no_x11_askpass}
-%setup -q -a 2
-%else
 %setup -q
-%endif
 %patch0 -p1 -b .redhat
 %patch2 -p1 -b .skip-initial
 %patch3 -p1 -b .krb5-config
@@ -266,18 +217,17 @@ environment.
 %patch31 -p1 -b .skip-used
 %patch32 -p0 -b .auth-fail-info
 %patch33 -p1 -b .no-system
-
+%patch34 -p1 -b .gnu-source
-echo 'makedepend "$@"' > x11-ssh-askpass-%{aversion}/gccmakedep
+%patch35 -p1 -b .progress
-chmod +x x11-ssh-askpass-%{aversion}/gccmakedep
 
 autoreconf
 
 %build
-#CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 # Ugly hack to workaround openssh defining __USE_GNU which is 
 # not allowed and causes problems according to Ulrich Drepper
 # fix this the correct way after FC5test1
-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"; export CFLAGS
+#CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"; export CFLAGS
 %if %{rescue}
 CFLAGS="$CFLAGS -Os"
 %endif
@@ -290,9 +240,6 @@ CFLAGS="$CFLAGS -fpie"
 export CFLAGS
 LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
 %endif
-%if %{build6x}
-export CFLAGS="$CFLAGS -D__func__=__FUNCTION__"
-%endif
 %if %{kerberos5}
 krb5_prefix=`krb5-config --prefix`
 if test "$krb5_prefix" != "%{_prefix}" ; then
@@ -321,9 +268,6 @@ fi
 %if %{scard}
 	--with-smartcard \
 %endif
-%if %{build6x}
-	--with-ipv4-default \
-%endif
 %if %{rescue}
 	--without-pam \
 %else
@@ -347,16 +291,6 @@ perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile
 
 make
 
-%if ! %{no_x11_askpass}
-pushd x11-ssh-askpass-%{aversion}
-# This configure can't handle platform strings.
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libexecdir}/openssh
-PATH="$PATH:`pwd`" \
-xmkmf -a
-make
-popd
-%endif
-
 # Define a variable to toggle gnome1/gtk2 building.  This is necessary
 # because RPM doesn't handle nested %if statements.
 %if %{gtk2}
@@ -387,24 +321,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/pam.d/
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh
-%if %{build6x}
-install -m644 contrib/redhat/sshd.pam.old  $RPM_BUILD_ROOT/etc/pam.d/sshd
-install -m755 contrib/redhat/sshd.init.old $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
-%else
 install -m644 contrib/redhat/sshd.pam      $RPM_BUILD_ROOT/etc/pam.d/sshd
 install -m755 contrib/redhat/sshd.init     $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
-%endif
 install -m755 contrib/ssh-copy-id $RPM_BUILD_ROOT%{_bindir}/
 install contrib/ssh-copy-id.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
-%if ! %{no_x11_askpass}
-install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/x11-ssh-askpass
-ln -s x11-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
-install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-%endif
-
 %if ! %{no_gnome_askpass}
 install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome-ssh-askpass
 %endif
@@ -414,6 +335,7 @@ install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/gnome
 %endif
 
 %if ! %{no_gnome_askpass}
+ln -s gnome-ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/openssh/ssh-askpass
 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
 install -m 755 contrib/redhat/gnome-ssh-askpass.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
 install -m 755 contrib/redhat/gnome-ssh-askpass.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -533,25 +455,22 @@ fi
 %attr(0755,root,root) %config /etc/rc.d/init.d/sshd
 %endif
 
-%if ! %{no_x11_askpass}
-%files askpass
-%defattr(-,root,root)
-%doc x11-ssh-askpass-%{aversion}/README
-%doc x11-ssh-askpass-%{aversion}/ChangeLog
-%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad
-%attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass
-%attr(0755,root,root) %{_libexecdir}/openssh/x11-ssh-askpass
-%attr(0755,root,root) %config %{_sysconfdir}/profile.d/x11-ssh-askpass.*
-%endif
-
 %if ! %{no_gnome_askpass}
-%files askpass-gnome
+%files askpass
 %defattr(-,root,root)
 %attr(0755,root,root) %config %{_sysconfdir}/profile.d/gnome-ssh-askpass.*
 %attr(0755,root,root) %{_libexecdir}/openssh/gnome-ssh-askpass
+%attr(0755,root,root) %{_libexecdir}/openssh/ssh-askpass
 %endif
 
 %changelog
+* Tue Nov 22 2005 Tomas Mraz <tmraz@redhat.com> - 4.2p1-9
+- drop x11-ssh-askpass from the package
+- drop old build_6x ifs from spec file
+- improve gnome-ssh-askpass so it doesn't reveal number of passphrase 
+  characters to person looking at the display
+- less hackish fix for the __USE_GNU problem
+
 * Fri Nov 18 2005 Nalin Dahyabhai <nalin@redhat.com> - 4.2p1-8
 - work around missing gccmakedep by wrapping makedepend in a local script
 - remove now-obsolete build dependency on "xauth"