[pkgsrc/trunk]: pkgsrc/security/openssh Update openssh to 4.2p1. This is from...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/openssh Update openssh to 4.2p1. This is from...
From: reed <reed%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:17:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/40faf644d6e9
branches:  trunk
changeset: 499380:40faf644d6e9
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed Sep 21 18:07:09 2005 +0000

description:
Update openssh to 4.2p1. This is from PR #31331. Thank you, Jason.

Some changes different from patches provided in that PR are:

- patch-aj, patch-aq, and patch-as not changed (they appeared to
  be identical to previous patches)

- DragonFly support also added to configure script (patch-aa)
  because compilation failed due to missing crypt

- and install-sysconf target removed from the installation target
  in Makefile.in (patch-ah). Just let the pkgsrc framework install
  this since it now will allow it to be removed correctly on
  deinstall.

- use "pam" instead of "PAM" as option name in the post-install
  target.

This removes patch-ai.

This also now uses openssh-4.2p1-hpn11.diff patch.

I didn't test with kerberos and hpn-patch options. I did test with
PAM on Linux. (The PR reported that kerberos and hpn-patch options
were tested for compiling.) I tested on NetBSD 2.0.2, Linux,
and DragonFly.

This includes two security fixes and several bug fixes and many
improvemens.  The changes are listed at
http://www.mindrot.org/pipermail/openssh-unix-announce/2005-September/000083.html
http://www.mindrot.org/pipermail/openssh-unix-announce/2005-May/000079.html

TODO: get some of these patches committed upstream.

diffstat:

 security/openssh/Makefile         |  10 +++---
 security/openssh/distinfo         |  50 +++++++++++++++++++-------------------
 security/openssh/options.mk       |   4 +-
 security/openssh/patches/patch-aa |  45 ++++++++++++++++++++--------------
 security/openssh/patches/patch-ab |  42 +++++++++++++++++---------------
 security/openssh/patches/patch-ac |  10 +++---
 security/openssh/patches/patch-ad |  38 +++++++++++++++--------------
 security/openssh/patches/patch-ae |   6 ++--
 security/openssh/patches/patch-af |  22 ++++++++--------
 security/openssh/patches/patch-ag |   6 ++--
 security/openssh/patches/patch-ah |  19 ++++++++++----
 security/openssh/patches/patch-ai |  13 ----------
 security/openssh/patches/patch-ak |  10 +++---
 security/openssh/patches/patch-al |  16 ++++++------
 security/openssh/patches/patch-am |  10 +++---
 security/openssh/patches/patch-an |  10 +++---
 security/openssh/patches/patch-ao |  22 ++++++++--------
 security/openssh/patches/patch-ap |   6 ++--
 security/openssh/patches/patch-ar |  15 ++++++-----
 security/openssh/patches/patch-at |   6 ++--
 security/openssh/patches/patch-au |  22 +++++++++-------
 security/openssh/patches/patch-av |  14 +++++-----
 22 files changed, 202 insertions(+), 194 deletions(-)

diffs (truncated from 868 to 300 lines):

diff -r 8f32a2e4aa40 -r 40faf644d6e9 security/openssh/Makefile
--- a/security/openssh/Makefile Wed Sep 21 16:10:49 2005 +0000
+++ b/security/openssh/Makefile Wed Sep 21 18:07:09 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.156 2005/08/23 11:48:51 rillig Exp $
+# $NetBSD: Makefile,v 1.157 2005/09/21 18:07:09 reed Exp $
 
-DISTNAME=              openssh-3.9p1
-PKGNAME=               openssh-3.9.1
-PKGREVISION=           8
+DISTNAME=              openssh-4.2p1
+PKGNAME=               openssh-4.2.1
+PKGREVISION=           
 SVR4_PKGNAME=          ossh
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
@@ -150,7 +150,7 @@
        cd ${WRKSRC}; for file in ${CONFS}; do                          \
                ${INSTALL_DATA} $${file}.out ${EGDIR}/$${file};         \
        done
-.if !empty(PKG_OPTIONS:MPAM) && ${OPSYS} == "Linux"
+.if !empty(PKG_OPTIONS:Mpam) && ${OPSYS} == "Linux"
        ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.generic ${EGDIR}/sshd.pam
 .endif
 
diff -r 8f32a2e4aa40 -r 40faf644d6e9 security/openssh/distinfo
--- a/security/openssh/distinfo Wed Sep 21 16:10:49 2005 +0000
+++ b/security/openssh/distinfo Wed Sep 21 18:07:09 2005 +0000
@@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.40 2005/05/25 23:17:11 reed Exp $
+$NetBSD: distinfo,v 1.41 2005/09/21 18:07:09 reed Exp $
 
-SHA1 (openssh-3.9p1.tar.gz) = 80b19d83a9d4717f5c38b2d950501e1471f60afc
-RMD160 (openssh-3.9p1.tar.gz) = e4abf280a18e3ae046d0dee19dab919bba8e5568
-Size (openssh-3.9p1.tar.gz) = 854027 bytes
-SHA1 (openssh-3.9p1-hpn.diff) = 1821c590b9b5effa3750ebf0166fe3f22d00faad
-Size (openssh-3.9p1-hpn.diff) = 8387 bytes
-SHA1 (patch-aa) = 6bceb5b0480727c6c4e0cf662fa85cffebf91bdb
-SHA1 (patch-ab) = f43a6b627a4f2b8ecd74b016ce29b5f8091d877e
-SHA1 (patch-ac) = d851513c2a115358671bf9efafab1e3ee9166088
-SHA1 (patch-ad) = 2fe2ea9a661a456351012f88d26e4812d096cf23
-SHA1 (patch-ae) = d7bcee7a84457c96951c3da82aa689fa818a07b6
-SHA1 (patch-af) = ec6b439a3a4a0d2e5b13685c4d94deb26bbece45
-SHA1 (patch-ag) = dbdbefa00b2ec7e6ee3cf4441d1fc817ecefc742
-SHA1 (patch-ah) = 85a8f0fa5ddf13f8342faaff6bf81fcd3ad6648a
-SHA1 (patch-ai) = ccc43f0523bf2b0e28d7e169eda59b1ff1a2215b
+SHA1 (openssh-4.2p1.tar.gz) = 5e7231cfa8ec673ea856ce291b78fac8b380eb78
+RMD160 (openssh-4.2p1.tar.gz) = e1f45333e66d0afceb9934ab73401b4ca06f03a6
+Size (openssh-4.2p1.tar.gz) = 914165 bytes
+SHA1 (openssh-4.2p1-hpn11.diff) = 7a8af1ce909bfee6ac9d498834a503fdae928b88
+RMD160 (openssh-4.2p1-hpn11.diff) = c3cd4cbb53094fb1f248a780c3e5a05af2585f88
+Size (openssh-4.2p1-hpn11.diff) = 14765 bytes
+SHA1 (patch-aa) = abedcec1fe1c4461bca2612eb28cc104f836601e
+SHA1 (patch-ab) = 9a42cc9bd5e5425cc8251fed081edfcc910ec037
+SHA1 (patch-ac) = 3f693738d3e02aa6abd0687fbd22465db65abfc0
+SHA1 (patch-ad) = 23f73b7ce008c6ccd431d3d80692e59fcf33aa14
+SHA1 (patch-ae) = 21b58d72f4dbf9affed65857518c26ab9277a0f8
+SHA1 (patch-af) = e6a4c6dcf2f556c6175f1a3b0a010e4dcf34e239
+SHA1 (patch-ag) = e60b35b5d6f7db2bd30ef24f503463145689f1ea
+SHA1 (patch-ah) = 2beb4ff7989d66b20d2f5afb5d773012353e82ea
 SHA1 (patch-aj) = 44f2b11949a4dea6a8760b8397db5360b64bf01f
-SHA1 (patch-ak) = 6140fe665aa84ab8127e0d9ede44945f196392e4
-SHA1 (patch-al) = 3168440d9e584a504b21802edb4dbeb58e87e8d2
-SHA1 (patch-am) = 50e46970b8eff07b931a34313d863e13af838440
-SHA1 (patch-an) = 1ffc3704bf925f87fb787c93f6f10d1b0c06bdd0
-SHA1 (patch-ao) = 0677e5f8a1a9a2f6b600789ff3fea627af472bc0
-SHA1 (patch-ap) = b006a1b49f19ab322fc179a1f2e4238807a64b87
+SHA1 (patch-ak) = 99f789676e606d4a51effc2abc02a50776f4e781
+SHA1 (patch-al) = 2843c7c6e8b3d93a03b2d66d71c894a9e302f987
+SHA1 (patch-am) = c99132cf25317053dcd6fb50ac19d35b12b0b46b
+SHA1 (patch-an) = f32b94365452f8446f0c8872fa244cf1da387570
+SHA1 (patch-ao) = c08515b05456bb2840c2d5ce28622d2f47f12057
+SHA1 (patch-ap) = c9101ae26b01a6b0cb9c9f5b7ddea77f3cf0c4b3
 SHA1 (patch-aq) = 3786a41a974d6583f379350068a762a725b8334d
-SHA1 (patch-ar) = 90f2534c0fb01f7909ee88c7849092a9e7882a7d
+SHA1 (patch-ar) = 66812bf062e8318fcae1535b086fce0068d46a63
 SHA1 (patch-as) = ecb23bc4c07d8ac7599b6f6576ad39bb4dcedbab
-SHA1 (patch-at) = c6b85eb24279f18a430b86aeda3f8d2fa1c8d018
-SHA1 (patch-au) = 2a8926edfb65a8ecf7786411cee3d1723247764b
-SHA1 (patch-av) = ef8fca98fad60cad4ba4197e8579544f37a4fcee
+SHA1 (patch-at) = 2468567cc0e91ea375f43c9ebae57644f50a5f27
+SHA1 (patch-au) = 052b0b6d8869ad09144e4fc9e1b3c5e03c669c44
+SHA1 (patch-av) = 5efc471716cecfaa7317c05771ee6d6293ecd1e3
diff -r 8f32a2e4aa40 -r 40faf644d6e9 security/openssh/options.mk
--- a/security/openssh/options.mk       Wed Sep 21 16:10:49 2005 +0000
+++ b/security/openssh/options.mk       Wed Sep 21 18:07:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/07/28 17:54:57 reed Exp $
+# $NetBSD: options.mk,v 1.6 2005/09/21 18:07:09 reed Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -17,7 +17,7 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mhpn-patch)
-PATCHFILES=            openssh-3.9p1-hpn.diff
+PATCHFILES=            openssh-4.2p1-hpn11.diff
 PATCH_SITES=           http://www.psc.edu/networking/projects/hpn-ssh/
 PATCH_DIST_STRIP=      -p1
 .endif
diff -r 8f32a2e4aa40 -r 40faf644d6e9 security/openssh/patches/patch-aa
--- a/security/openssh/patches/patch-aa Wed Sep 21 16:10:49 2005 +0000
+++ b/security/openssh/patches/patch-aa Wed Sep 21 18:07:09 2005 +0000
@@ -1,46 +1,53 @@
-$NetBSD: patch-aa,v 1.37 2005/03/07 23:29:49 tv Exp $
-
---- configure.orig     2004-08-17 08:54:53.000000000 -0400
-+++ configure
-@@ -6101,8 +6101,46 @@ _ACEOF
+--- configure.orig     2005-09-01 02:15:24.000000000 -0700
++++ configure  2005-09-21 09:49:24.000000000 -0700
+@@ -5706,7 +5706,7 @@
+               need_dash_r=1
+       fi
+       ;;
+-*-*-freebsd*)
++*-*-freebsd*|*-*-dragonfly*)
+       check_for_libcrypt_later=1
+       ;;
+ *-*-bsdi*)
+@@ -6552,8 +6552,46 @@
  _ACEOF
  
-       ;;
-+
+         ;;
++ 
 +*-*-interix3)
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define HAVE_INTERIX 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define DISABLE_FD_PASSING 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define DISABLE_SHADOW 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define IP_TOS_IS_BROKEN 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define MISSING_HOWMANY 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define NO_IPPORT_RESERVED_CONCEPT 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define SETGROUPS_NOOP 1
 +_ACEOF
 +
-+      cat >>confdefs.h <<\_ACEOF
++        cat >>confdefs.h <<\_ACEOF
 +#define USE_PIPES 1
 +_ACEOF
 +
-+      ;;
++       ;;
  esac
  
 +# pkgsrc handles any rpath settings this package needs
@@ -49,7 +56,7 @@
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -23790,12 +23828,19 @@ fi
+@@ -25360,12 +25398,19 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_utmpx_location"; then
        if test x"$system_utmpx_path" = x"no" ; then
@@ -72,7 +79,7 @@
        cat >>confdefs.h <<_ACEOF
  #define CONF_UTMPX_FILE "$conf_utmpx_location"
  _ACEOF
-@@ -23864,12 +23909,20 @@ fi
+@@ -25434,12 +25479,20 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  if test -z "$conf_wtmpx_location"; then
        if test x"$system_wtmpx_path" = x"no" ; then
@@ -95,7 +102,7 @@
        cat >>confdefs.h <<_ACEOF
  #define CONF_WTMPX_FILE "$conf_wtmpx_location"
  _ACEOF
-@@ -25091,7 +25144,7 @@ echo "OpenSSH has been configured with t
+@@ -26665,7 +26718,7 @@
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff -r 8f32a2e4aa40 -r 40faf644d6e9 security/openssh/patches/patch-ab
--- a/security/openssh/patches/patch-ab Wed Sep 21 16:10:49 2005 +0000
+++ b/security/openssh/patches/patch-ab Wed Sep 21 18:07:09 2005 +0000
@@ -1,22 +1,24 @@
-$NetBSD: patch-ab,v 1.20 2005/03/07 23:29:49 tv Exp $
+$NetBSD: patch-ab,v 1.21 2005/09/21 18:07:09 reed Exp $
 
---- configure.ac.orig  2004-08-16 09:12:06.000000000 -0400
+--- configure.ac.orig  2005-08-31 11:59:49.000000000 -0500
 +++ configure.ac
-@@ -469,8 +469,22 @@ mips-sony-bsd|mips-sony-newsos4)
-       AC_DEFINE(MISSING_HOWMANY)
-       AC_DEFINE(MISSING_FD_MASK)
-       ;;
+@@ -570,8 +570,24 @@
+         AC_DEFINE(MISSING_HOWMANY)
+         AC_DEFINE(BROKEN_SETVBUF, 1, [LynxOS has broken setvbuf() implementation])
+         ;;
++
 +
 +*-*-interix3*)
-+      AC_DEFINE(HAVE_INTERIX)
-+      AC_DEFINE(DISABLE_FD_PASSING)
-+      AC_DEFINE(DISABLE_SHADOW)
-+      AC_DEFINE(IP_TOS_IS_BROKEN)
-+      AC_DEFINE(MISSING_HOWMANY)
-+      AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
-+      AC_DEFINE(SETGROUPS_NOOP)
-+      AC_DEFINE(USE_PIPES)
-+      ;;
++        AC_DEFINE(HAVE_INTERIX)
++        AC_DEFINE(DISABLE_FD_PASSING)
++        AC_DEFINE(DISABLE_SHADOW)
++        AC_DEFINE(IP_TOS_IS_BROKEN)
++        AC_DEFINE(MISSING_HOWMANY)
++        AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
++        AC_DEFINE(SETGROUPS_NOOP)
++        AC_DEFINE(USE_PIPES)
++        ;;
++
  esac
  
 +# pkgsrc handles any rpath settings this package needs
@@ -25,7 +27,7 @@
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
        [  --with-cflags           Specify additional flags to pass to compiler],
-@@ -2885,9 +2899,17 @@ AC_TRY_COMPILE([
+@@ -3358,9 +3374,17 @@
  )
  if test -z "$conf_utmpx_location"; then
        if test x"$system_utmpx_path" = x"no" ; then
@@ -43,9 +45,9 @@
 +fi
 +if test -n "$conf_utmpx_location"; then
        AC_DEFINE_UNQUOTED(CONF_UTMPX_FILE, "$conf_utmpx_location")
- fi    
+ fi
  
-@@ -2910,9 +2932,17 @@ AC_TRY_COMPILE([
+@@ -3383,9 +3407,17 @@
  )
  if test -z "$conf_wtmpx_location"; then
        if test x"$system_wtmpx_path" = x"no" ; then
@@ -63,9 +65,9 @@
 +fi
 +if test -n "$conf_wtmpx_location"; then
        AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location")
- fi    
+ fi
  
-@@ -2953,7 +2983,7 @@ echo "OpenSSH has been configured with t
+@@ -3431,7 +3463,7 @@
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff -r 8f32a2e4aa40 -r 40faf644d6e9 security/openssh/patches/patch-ac
--- a/security/openssh/patches/patch-ac Wed Sep 21 16:10:49 2005 +0000
+++ b/security/openssh/patches/patch-ac Wed Sep 21 18:07:09 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.12 2005/03/07 23:29:49 tv Exp $
+$NetBSD: patch-ac,v 1.13 2005/09/21 18:07:09 reed Exp $
 
---- defines.h.orig     2004-06-21 23:27:16.000000000 -0400
+--- defines.h.orig     2005-08-31 11:59:49.000000000 -0500
 +++ defines.h
 @@ -30,6 +30,15 @@
  
@@ -18,7 +18,7 @@
  #ifndef SHUT_RDWR
  enum
  {
-@@ -424,8 +433,8 @@ struct winsize {
+@@ -442,8 +451,8 @@
  # define __attribute__(x)
  #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
  
@@ -28,8 +28,8 @@
 +# define __noreturn __attribute__((noreturn))
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/squid Update squid package to squid-2.5.10nb5.
Next by Date: [pkgsrc/trunk]: pkgsrc/mk Bump LIBTOOL_REQD to 1.5.18nb5. This pulls in the ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/squid Update squid package to squid-2.5.10nb5.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk Bump LIBTOOL_REQD to 1.5.18nb5. This pulls in the ...
Indexes:
Home | Main Index | Thread Index | Old Index