Openssh build problem and patch

[Bill Campbell]

While attempting to build openssh-4.5p1-20061108.src.rpm I ran
into a compile failure fixed by the attached patch.

The variables I moved out of the function into the global area are called
later in the source file.  This same problem exists in other openssh‐4.4*
packages I tried building (we’re running mostly Release 2.5 with some from
CURRENT as security issues and such are needed).

Here’s the ‘‘openpkg rpm ‐qi openssh’’ on our development system 
showing
the options we’re using.

Name:     openssh                   Source RPM:   openssh-4.5p1-20061109.src.rpm
Version:  4.5p1                     Signature:    
md5:1ebfdaadd72c335ad117b12b131e1c50
Release:  20061109                  Build Host:   ayn.mi.celestial.com
Group:    SSH                       Build System: amd64-suse10
Class:    CORE                      Build Time:   Thu Nov  9 13:02:40 2006
Distrib:  OpenPKG Community         Install Time: Thu Nov  9 13:03:09 2006
License:  BSD                       Install Size: 8050441 bytes
Packager: OpenPKG Foundation e.V.   Relocations:  /csrel25 
Vendor:   The OpenBSD Project
Summary:  Secure Shell (SSH)
URL:      http://www.openssh.com/
Description:
    Secure Shell (SSH) is a facility for logging into a remote machine
    and for remotely executing commands on a remote machine. It is
    intended to replace rlogin(1) and rsh(1), and provide secure
    encrypted communications between two untrusted hosts over an
    insecure network. X11 connections and arbitrary TCP/IP ports can
    also be forwarded over the secure channel. OpenSSH is OpenBSD's
    rework of the last free version of SSH, bringing it up to date in
    terms of security and features, as well as removing all patented
    algorithms to separate libraries (OpenSSL).
Provides:
    openssh::with_fsl = yes
    openssh::with_connect = no
    openssh::with_alias = no
    openssh::with_chroot = no
    openssh::with_ldap = no
    openssh::with_pam = no
    openssh::with_sftplogging = yes
    openssh::with_skey = no
    openssh::with_watchdog = yes
    openssh::with_wrap = yes
    openssh::with_x11 = yes
    openssh::with_trysetpath = yes
    openssh::with_libedit = no
    openssh::with_hpn = no
    openssh = 4.5p1-20061109

Bill
--
INTERNET:   [EMAIL PROTECTED]  Bill Campbell; Celestial Software LLC
URL: http://www.celestial.com/  PO Box 820; 6641 E. Mercer Way
FAX:            (206) 232-9186  Mercer Island, WA 98040-0820; (206) 236-1676

``The Income Tax has made more Liars out of American people than Golf has.''
    Will Rogers

diff -uNr ../openssh-4.4p1.orig/servconf.c ./servconf.c
--- ../openssh-4.4p1.orig/servconf.c    2006-11-09 12:48:19.109585000 -0800
+++ ./servconf.c        2006-11-09 12:53:01.595239250 -0800
@@ -468,12 +468,13 @@
        return sBadOption;
 }
 
+unsigned int umaskvalue = 0;
+char *umaskptr;
+
 static void
 add_listen_addr(ServerOptions *options, char *addr, u_short port)
 {
        u_int i;
-       unsigned int umaskvalue = 0;
-       char *umaskptr;
 
        if (options->num_ports == 0)
                options->ports[options->num_ports++] = SSH_DEFAULT_PORT;