Another shapshot

[Pekka Savola]

On Sat, 28 Oct 2000, Damien Miller wrote:
> http://www.mindrot.org/misc/openssh/openssh-SNAP-20001028.tar.gz
> 
> Please test this one extra hard, it is likely to become 2.3.0p1 early
> next week.

---
             Host: mips-sgi-irix6.5
         Compiler: gcc
   Compiler flags: -g -O2 -Wall -I. -I. -I/usr/local/include -I/usr/local/lib/openssl/include
     Linker flags:  -L/usr/local/lib/openssl/lib -L/usr/local/lib/openssl
        Libraries: -lz  -lcrypto 
---

Preliminary (minor) tests show ok.

However, there's an issue with a couple of bsd-*.c.  They seem to use
bcopy, which appears to want <strings.h> in Irix.  Adding that is one
warning less.

Also,
---
           Host: i386-redhat-linux-gnu
         Compiler: gcc
   Compiler flags: -O2 -m486 -fno-strength-reduce -Wall -I. -I. -I/usr/include
     Linker flags:  -L/usr/lib -L/usr
        Libraries: -ldl -lnsl -lz  -lutil -lpam -lcrypto  -lwrap
---

Seems to work ok so far.  There are two issues with .spec file:

1) apparently my earlier patch fell through cracks; gnome-libs-devel
should not be required twice.

2) You need x11-askpass to build (ie. you can't just copy the spec and
.tar.gz to the right place).  It could be conditional.  This is a little
controversial, as .src.rpm's would omit x11-askpass source package but
well.. who'd be building this on after redefining the defaults for
distribution on a system which wouldn't have all the components required
anyway.  For consideration.

-- 
Pekka Savola                 "Tell me of difficulties surmounted, 
Pekka.Savola at netcore.fi      not those you stumble over and fall"
-------------- next part --------------
--- openssh.spec.orig	Mon Oct 16 05:35:19 2000
+++ openssh.spec	Sat Oct 28 17:14:45 2000
@@ -17,14 +17,16 @@
 Packager: Damien Miller <djm at mindrot.org>
 URL: http://www.openssh.com/
 Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{oversion}.tar.gz
+%if ! %{no_x11_askpass}
 Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz 
+%endif
 Copyright: BSD
 Group: Applications/Internet
 BuildRoot: /tmp/openssh-%{version}-buildroot
 Obsoletes: ssh
 PreReq: openssl >= 0.9.5a
 Requires: openssl >= 0.9.5a
-BuildPreReq: perl, openssl-devel, tcp_wrappers, gnome-libs-devel
+BuildPreReq: perl, openssl-devel, tcp_wrappers
 BuildPreReq: /bin/login, /usr/bin/rsh, /usr/include/security/pam_appl.h
 %if ! %{no_gnome_askpass}
 BuildPreReq: gnome-libs-devel
@@ -128,7 +130,11 @@
 
 %prep
 
+%if ! %{no_x11_askpass}
 %setup -q -a 1
+%else
+%setup -q
+%endif
 
 %build