[pkgsrc/trunk]: pkgsrc/security/openssh Make openssh build on Interix. Curre...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/openssh Make openssh build on Interix. Curre...
From: minskim <minskim%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:25:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/923ede53d0c8
branches:  trunk
changeset: 479043:923ede53d0c8
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Aug 04 06:43:52 2004 +0000

description:
Make openssh build on Interix.  Currently only the client (ssh) was
tested.  The server (sshd) still needs more patches especially because of
non-zero Administrator uid/gid issues.

diffstat:

 security/openssh/Makefile         |   6 +++-
 security/openssh/distinfo         |  20 ++++++++++++---
 security/openssh/patches/patch-aa |  21 +++++++++++----
 security/openssh/patches/patch-ab |  18 +++++++++----
 security/openssh/patches/patch-ad |  31 +++++++++++++++++++++-
 security/openssh/patches/patch-ae |  21 +++++++++++++++
 security/openssh/patches/patch-af |  17 ++++++++++++
 security/openssh/patches/patch-ag |  14 ++++++++++
 security/openssh/patches/patch-ai |  19 ++++++++++++++
 security/openssh/patches/patch-aj |  42 +++++++++++++++++++++++++++++++
 security/openssh/patches/patch-ak |  36 +++++++++++++++++++++++++++
 security/openssh/patches/patch-al |  19 ++++++++++++++
 security/openssh/patches/patch-am |  13 +++++++++
 security/openssh/patches/patch-an |  52 +++++++++++++++++++++++++++++++++++++++
 security/openssh/patches/patch-ao |  31 +++++++++++++++++++++++
 security/openssh/patches/patch-ap |  18 +++++++++++++
 security/openssh/patches/patch-aq |  13 +++++++++
 17 files changed, 372 insertions(+), 19 deletions(-)

diffs (truncated from 537 to 300 lines):

diff -r bc53044d069d -r 923ede53d0c8 security/openssh/Makefile
--- a/security/openssh/Makefile Wed Aug 04 06:22:39 2004 +0000
+++ b/security/openssh/Makefile Wed Aug 04 06:43:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2004/07/25 12:36:03 grant Exp $
+# $NetBSD: Makefile,v 1.141 2004/08/04 06:43:52 minskim Exp $
 
 DISTNAME=              openssh-3.8.1p1
 PKGNAME=               openssh-3.8.1.1
@@ -73,6 +73,10 @@
 #
 CONFIGURE_ENV+=                LD=${CC:Q}
 
+.if ${OPSYS} == "Interix"
+CONFIGURE_ENV+=                ac_cv_type_struct_timespec=yes
+.endif
+
 # Enable S/Key support on NetBSD, Darwin, and Solaris.
 .if (${OPSYS} == "NetBSD") || (${OPSYS} == "Darwin") || (${OPSYS} == "SunOS")
 .  include "../../security/skey/buildlink3.mk"
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/distinfo
--- a/security/openssh/distinfo Wed Aug 04 06:22:39 2004 +0000
+++ b/security/openssh/distinfo Wed Aug 04 06:43:52 2004 +0000
@@ -1,9 +1,21 @@
-$NetBSD: distinfo,v 1.33 2004/05/10 18:12:23 wiz Exp $
+$NetBSD: distinfo,v 1.34 2004/08/04 06:43:52 minskim Exp $
 
 SHA1 (openssh-3.8.1p1.tar.gz) = 772c3a69014a8a7bf8c1bde8ab6770f9c91049e4
 Size (openssh-3.8.1p1.tar.gz) = 817932 bytes
-SHA1 (patch-aa) = 37c5f14230f97f895fb8ad9de627dca00e39762c
-SHA1 (patch-ab) = e4ee4fa13fee7cf962f6c8d894a417bf2c977faa
+SHA1 (patch-aa) = 171d144d781b28a6665e022ffbb449888f6302e3
+SHA1 (patch-ab) = 8c1b1d92cf45ea921db650e2eb50fcafbdd83407
 SHA1 (patch-ac) = 2652a918c43bb780c8b0e5e3691d2a1ffba74700
-SHA1 (patch-ad) = 644e2fe1f2967fe97c51a7cc61cad557bc42ed6a
+SHA1 (patch-ad) = 15627b65ea3607bf5a66d0def463b05f57ed303d
+SHA1 (patch-ae) = fece020b1c2432f4ac5b62104be808aa3f70ea22
+SHA1 (patch-af) = 444fadaafdb45adc1008cbf106cd28c075700616
+SHA1 (patch-ag) = 873d2b8c3293a3a9c4da7581da574e22bddca15e
 SHA1 (patch-ah) = 8f1fa190e4fb115bb5311b4ccd839a649e1b09e5
+SHA1 (patch-ai) = da31e53b3ccbef24abc6418ee466f1e43fdd7447
+SHA1 (patch-aj) = 677e614947c884c4208a6ca76fc9c6237d7aa6f7
+SHA1 (patch-ak) = 97bc28537830eaa889bd807cd9b3f2c20dc938a2
+SHA1 (patch-al) = 958c5516996e4040ac779bf1f53c486253c40cfb
+SHA1 (patch-am) = a88eb34b83789453b8e212b14f33d8e98d153667
+SHA1 (patch-an) = e92a4e3b3bc07eda155a17009743c110d88c8c22
+SHA1 (patch-ao) = 00750c5f80bced34c54558cbd5ad3b96384e0d00
+SHA1 (patch-ap) = c2182328f9f108df14ce379c8dfa50fd53815a4a
+SHA1 (patch-aq) = 009f4696f32f0addde1c953aaab759f920816692
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-aa
--- a/security/openssh/patches/patch-aa Wed Aug 04 06:22:39 2004 +0000
+++ b/security/openssh/patches/patch-aa Wed Aug 04 06:43:52 2004 +0000
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.34 2004/05/10 18:12:24 wiz Exp $
+$NetBSD: patch-aa,v 1.35 2004/08/04 06:43:52 minskim Exp $
 
---- configure.orig     2004-04-18 14:51:57.000000000 +0200
+--- configure.orig     Sun Apr 18 07:51:57 2004
 +++ configure
-@@ -4816,6 +4816,9 @@ EOF
+@@ -4814,8 +4814,18 @@ EOF
+ EOF
+ 
        ;;
++
++*-*-interix3)
++      cat >>confdefs.h <<\EOF
++#define MISSING_HOWMANY 1
++EOF
++
++      ;;
  esac
  
 +# pkgsrc handles any rpath settings this package needs
@@ -12,7 +21,7 @@
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -17263,12 +17266,20 @@ fi
+@@ -17263,12 +17273,20 @@ fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_utmpx_location"; then
        if test x"$system_utmpx_path" = x"no" ; then
@@ -35,7 +44,7 @@
        cat >>confdefs.h <<EOF
  #define CONF_UTMPX_FILE "$conf_utmpx_location"
  EOF
-@@ -17323,12 +17334,20 @@ fi
+@@ -17323,12 +17341,20 @@ fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_wtmpx_location"; then
        if test x"$system_wtmpx_path" = x"no" ; then
@@ -58,7 +67,7 @@
        cat >>confdefs.h <<EOF
  #define CONF_WTMPX_FILE "$conf_wtmpx_location"
  EOF
-@@ -18237,7 +18256,7 @@ echo "OpenSSH has been configured with t
+@@ -18237,7 +18263,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-ab
--- a/security/openssh/patches/patch-ab Wed Aug 04 06:22:39 2004 +0000
+++ b/security/openssh/patches/patch-ab Wed Aug 04 06:43:52 2004 +0000
@@ -1,9 +1,15 @@
-$NetBSD: patch-ab,v 1.17 2004/05/10 18:12:24 wiz Exp $
+$NetBSD: patch-ab,v 1.18 2004/08/04 06:43:52 minskim Exp $
 
---- configure.ac.orig  2004-04-17 05:03:07.000000000 +0200
+--- configure.ac.orig  Fri Apr 16 22:03:07 2004
 +++ configure.ac
-@@ -456,6 +456,9 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -454,8 +454,15 @@ mips-sony-bsd|mips-sony-newsos4)
+       AC_DEFINE(MISSING_HOWMANY)
+       AC_DEFINE(MISSING_FD_MASK)
        ;;
++
++*-*-interix3)
++      AC_DEFINE(MISSING_HOWMANY)
++      ;;
  esac
  
 +# pkgsrc handles any rpath settings this package needs
@@ -12,7 +18,7 @@
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
        [  --with-cflags           Specify additional flags to pass to compiler],
-@@ -2824,9 +2827,17 @@ AC_TRY_COMPILE([
+@@ -2824,9 +2831,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_utmpx_location"; then
        if test x"$system_utmpx_path" = x"no" ; then
@@ -32,7 +38,7 @@
        AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location")
  fi    
  
-@@ -2849,9 +2860,17 @@ AC_TRY_COMPILE([
+@@ -2849,9 +2864,17 @@ AC_TRY_COMPILE([
  )
  if test -z "$conf_wtmpx_location"; then
        if test x"$system_wtmpx_path" = x"no" ; then
@@ -52,7 +58,7 @@
        AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location")
  fi    
  
-@@ -2892,7 +2911,7 @@ echo "OpenSSH has been configured with t
+@@ -2892,7 +2915,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-ad
--- a/security/openssh/patches/patch-ad Wed Aug 04 06:22:39 2004 +0000
+++ b/security/openssh/patches/patch-ad Wed Aug 04 06:43:52 2004 +0000
@@ -1,7 +1,25 @@
-$NetBSD: patch-ad,v 1.6 2004/04/27 12:30:23 markd Exp $
+$NetBSD: patch-ad,v 1.7 2004/08/04 06:43:52 minskim Exp $
 
---- loginrec.c.orig    2004-02-10 18:49:35.000000000 +1300
+--- loginrec.c.orig    Thu Apr  8 01:16:06 2004
 +++ loginrec.c
+@@ -415,7 +415,7 @@ login_write (struct logininfo *li)
+ 
+       /* set the timestamp */
+       login_set_current_time(li);
+-#ifdef USE_LOGIN
++#if defined(USE_LOGIN) && (HAVE_UMTP_H)
+       syslogin_write_entry(li);
+ #endif
+ #ifdef USE_LASTLOG
+@@ -584,7 +584,7 @@ line_abbrevname(char *dst, const char *s
+  ** into account.
+  **/
+ 
+-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
++#if defined(USE_UTMP) || defined (USE_WTMP) || (defined (USE_LOGIN) && defined (HAVE_UTMP_H))
+ 
+ /* build the utmp structure */
+ void
 @@ -720,8 +720,6 @@ construct_utmpx(struct logininfo *li, st
        line_stripname(utx->ut_line, li->line, sizeof(utx->ut_line));
        set_utmpx_time(li, utx);
@@ -20,3 +38,12 @@
  # ifdef HAVE_HOST_IN_UTMPX
        strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
  # endif
+@@ -1333,7 +1333,7 @@ wtmpx_get_entry(struct logininfo *li)
+  ** Low-level libutil login() functions
+  **/
+ 
+-#ifdef USE_LOGIN
++#if defined(USE_LOGIN) && defined(HAVE_UTMP_H)
+ static int
+ syslogin_perform_login(struct logininfo *li)
+ {
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh/patches/patch-ae Wed Aug 04 06:43:52 2004 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.8 2004/08/04 06:43:52 minskim Exp $
+
+--- openbsd-compat/getrrsetbyname.h.orig       Mon Jan 26 23:40:35 2004
++++ openbsd-compat/getrrsetbyname.h
+@@ -50,7 +50,7 @@
+ 
+ #include "includes.h"
+ 
+-#ifndef HAVE_GETRRSETBYNAME
++#if !defined(HAVE_GETRRSETBYNAME) && !defined(__INTERIX)
+ 
+ #include <sys/types.h>
+ #include <netinet/in.h>
+@@ -105,6 +105,6 @@ struct rrsetinfo {
+ int           getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
+ void          freerrset(struct rrsetinfo *);
+ 
+-#endif /* !defined(HAVE_GETRRSETBYNAME) */
++#endif /* !defined(HAVE_GETRRSETBYNAME) && !defined(__INTERIX) */
+ 
+ #endif /* _GETRRSETBYNAME_H */
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh/patches/patch-af Wed Aug 04 06:43:52 2004 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.6 2004/08/04 06:43:52 minskim Exp $
+
+--- dns.c.orig Fri Nov 21 06:48:55 2003
++++ dns.c
+@@ -28,6 +28,7 @@
+ 
+ #include "includes.h"
+ 
++#ifndef __INTERIX
+ #include <openssl/bn.h>
+ #ifdef LWRES
+ #include <lwres/netdb.h>
+@@ -273,3 +274,4 @@ export_dns_rr(const char *hostname, cons
+ 
+       return success;
+ }
++#endif /* __INTERIX */
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh/patches/patch-ag Wed Aug 04 06:43:52 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.4 2004/08/04 06:43:52 minskim Exp $
+
+--- readconf.c.orig    Mon Mar  8 06:12:36 2004
++++ readconf.c
+@@ -186,7 +186,9 @@ static struct {
+ #endif
+       { "clearallforwardings", oClearAllForwardings },
+       { "enablesshkeysign", oEnableSSHKeysign },
++#ifndef __INTERIX
+       { "verifyhostkeydns", oVerifyHostKeyDNS },
++#endif /* __INTERIX */
+       { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
+       { "rekeylimit", oRekeyLimit },
+       { "connecttimeout", oConnectTimeout },
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh/patches/patch-ai Wed Aug 04 06:43:52 2004 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.6 2004/08/04 06:43:52 minskim Exp $
+
+--- dns.h.orig Mon Nov 17 04:19:29 2003
++++ dns.h
+@@ -31,6 +31,7 @@
+ #ifndef DNS_H
+ #define DNS_H
+ 
++#ifndef __INTERIX
+ enum sshfp_types {
+       SSHFP_KEY_RESERVED,
+       SSHFP_KEY_RSA,
+@@ -52,5 +53,6 @@ enum sshfp_hashes {
+ 
+ int   verify_host_key_dns(const char *, struct sockaddr *, const Key *, int *);
+ int   export_dns_rr(const char *, const Key *, FILE *, int);
++#endif /* __INTERIX */
+ 
+ #endif /* DNS_H */
diff -r bc53044d069d -r 923ede53d0c8 security/openssh/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh/patches/patch-aj Wed Aug 04 06:43:52 2004 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-aj,v 1.4 2004/08/04 06:43:52 minskim Exp $
+
+--- ssh-keygen.c.orig  Tue Dec 30 18:34:52 2003
++++ ssh-keygen.c
+@@ -623,6 +623,7 @@ do_change_passphrase(struct passwd *pw)
+       exit(0);
+ }
+ 
++#ifndef __INTERIX
+ /*
+  * Print the SSHFP RR.
+  */
+@@ -652,6 +653,7 @@ do_print_resource_record(struct passwd *
+       printf("failed to read v2 public key from %s.\n", identity_file);
+       exit(1);
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk Do not run xargs if its input is an empty string; x...
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/icu Add a IBM http download site for ICU and ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk Do not run xargs if its input is an empty string; x...
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/icu Add a IBM http download site for ICU and ...
Indexes:
Home | Main Index | Thread Index | Old Index