From b22fa20a4c5e78f371b76827b2c090cb15d2b9da Mon Sep 17 00:00:00 2001 From: dinoex Date: Fri, 28 Jun 2002 05:28:07 +0000 Subject: Defaults changed: (Gregory Sutter) ChallengeResponseAuthentication no UseLogin no patch for configure, to detect MAP_ANON submitted by: Christophe Labouisse,Michael Handler,Gert Doering,Phil Oleson,Dave Baker fix missing includes for "canohost.h" --- security/hpn-ssh/Makefile | 1 + security/hpn-ssh/files/patch-auth1.c | 16 ++++++++++++---- security/hpn-ssh/files/patch-auth2.c | 16 ++++++++++++---- security/hpn-ssh/files/patch-configure | 11 +++++++++++ security/hpn-ssh/files/patch-sshd_config | 10 ++++++++++ security/hpn-ssh/files/patch-sshpty.c | 12 ++++++++++++ security/openssh-portable/Makefile | 1 + security/openssh-portable/files/patch-auth1.c | 16 ++++++++++++---- security/openssh-portable/files/patch-auth2.c | 16 ++++++++++++---- security/openssh-portable/files/patch-configure | 11 +++++++++++ security/openssh-portable/files/patch-sshd_config | 10 ++++++++++ security/openssh-portable/files/patch-sshpty.c | 12 ++++++++++++ 12 files changed, 116 insertions(+), 16 deletions(-) create mode 100644 security/hpn-ssh/files/patch-configure create mode 100644 security/hpn-ssh/files/patch-sshd_config create mode 100644 security/hpn-ssh/files/patch-sshpty.c create mode 100644 security/openssh-portable/files/patch-configure create mode 100644 security/openssh-portable/files/patch-sshd_config create mode 100644 security/openssh-portable/files/patch-sshpty.c diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile index 18deb825215c..b98cb24a68d2 100644 --- a/security/hpn-ssh/Makefile +++ b/security/hpn-ssh/Makefile @@ -7,6 +7,7 @@ PORTNAME= openssh PORTVERSION= 3.4p1 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/hpn-ssh/files/patch-auth1.c b/security/hpn-ssh/files/patch-auth1.c index 43e0d0d4a29b..e8ecdbef3917 100644 --- a/security/hpn-ssh/files/patch-auth1.c +++ b/security/hpn-ssh/files/patch-auth1.c @@ -1,6 +1,14 @@ ---- auth1.c.orig Thu Feb 14 10:39:50 2002 -+++ auth1.c Sun Mar 17 20:53:15 2002 -@@ -75,6 +75,18 @@ +--- auth1.c.orig Fri Jun 21 08:21:11 2002 ++++ auth1.c Fri Jun 28 06:57:42 2002 +@@ -26,6 +26,7 @@ + #include "session.h" + #include "uidswap.h" + #include "monitor_wrap.h" ++#include "canohost.h" + + /* import */ + extern ServerOptions options; +@@ -75,6 +76,18 @@ u_int ulen; int type = 0; struct passwd *pw = authctxt->pw; @@ -19,7 +27,7 @@ debug("Attempting authentication for %s%.100s.", authctxt->valid ? "" : "illegal user ", authctxt->user); -@@ -297,6 +309,34 @@ +@@ -282,6 +295,34 @@ log("Unknown message during authentication: type %d", type); break; } diff --git a/security/hpn-ssh/files/patch-auth2.c b/security/hpn-ssh/files/patch-auth2.c index 46fa0f40f6e8..8d999bf1bbd9 100644 --- a/security/hpn-ssh/files/patch-auth2.c +++ b/security/hpn-ssh/files/patch-auth2.c @@ -1,6 +1,14 @@ ---- auth2.c.orig Tue Feb 26 19:09:43 2002 -+++ auth2.c Sun Mar 17 20:53:15 2002 -@@ -168,6 +168,15 @@ +--- auth2.c.orig Fri Jun 21 08:21:11 2002 ++++ auth2.c Fri Jun 28 06:57:56 2002 +@@ -35,6 +35,7 @@ + #include "dispatch.h" + #include "pathnames.h" + #include "monitor_wrap.h" ++#include "canohost.h" + + /* import */ + extern ServerOptions options; +@@ -137,6 +138,15 @@ Authmethod *m = NULL; char *user, *service, *method, *style = NULL; int authenticated = 0; @@ -16,7 +24,7 @@ if (authctxt == NULL) fatal("input_userauth_request: no authctxt"); -@@ -208,6 +217,41 @@ +@@ -178,6 +188,41 @@ "(%s,%s) -> (%s,%s)", authctxt->user, authctxt->service, user, service); } diff --git a/security/hpn-ssh/files/patch-configure b/security/hpn-ssh/files/patch-configure new file mode 100644 index 000000000000..3699c2ed52d9 --- /dev/null +++ b/security/hpn-ssh/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.old Wed Jun 26 22:57:33 2002 ++++ configure Wed Jun 26 22:53:31 2002 +@@ -6541,6 +6541,7 @@ + #include "confdefs.h" + + #include ++#include + #include + #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) + #define MAP_ANON MAP_ANONYMOUS + diff --git a/security/hpn-ssh/files/patch-sshd_config b/security/hpn-ssh/files/patch-sshd_config new file mode 100644 index 000000000000..ec7a106916ca --- /dev/null +++ b/security/hpn-ssh/files/patch-sshd_config @@ -0,0 +1,10 @@ +--- sshd_config.orig Fri Jun 21 03:11:36 2002 ++++ sshd_config Fri Jun 28 06:55:46 2002 +@@ -58,6 +58,7 @@ + + # Change to no to disable s/key passwords + #ChallengeResponseAuthentication yes ++ChallengeResponseAuthentication no + + # Kerberos options + #KerberosAuthentication no diff --git a/security/hpn-ssh/files/patch-sshpty.c b/security/hpn-ssh/files/patch-sshpty.c new file mode 100644 index 000000000000..4e31a1a0ed21 --- /dev/null +++ b/security/hpn-ssh/files/patch-sshpty.c @@ -0,0 +1,12 @@ +--- sshpty.c.orig Wed Jun 26 01:21:42 2002 ++++ sshpty.c Fri Jun 28 07:09:38 2002 +@@ -30,6 +30,9 @@ + #ifdef HAVE_PTY_H + # include + #endif ++#ifdef __FreeBSD__ ++#include ++#endif + #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H) + # include + #endif diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 18deb825215c..b98cb24a68d2 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -7,6 +7,7 @@ PORTNAME= openssh PORTVERSION= 3.4p1 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh-portable/files/patch-auth1.c b/security/openssh-portable/files/patch-auth1.c index 43e0d0d4a29b..e8ecdbef3917 100644 --- a/security/openssh-portable/files/patch-auth1.c +++ b/security/openssh-portable/files/patch-auth1.c @@ -1,6 +1,14 @@ ---- auth1.c.orig Thu Feb 14 10:39:50 2002 -+++ auth1.c Sun Mar 17 20:53:15 2002 -@@ -75,6 +75,18 @@ +--- auth1.c.orig Fri Jun 21 08:21:11 2002 ++++ auth1.c Fri Jun 28 06:57:42 2002 +@@ -26,6 +26,7 @@ + #include "session.h" + #include "uidswap.h" + #include "monitor_wrap.h" ++#include "canohost.h" + + /* import */ + extern ServerOptions options; +@@ -75,6 +76,18 @@ u_int ulen; int type = 0; struct passwd *pw = authctxt->pw; @@ -19,7 +27,7 @@ debug("Attempting authentication for %s%.100s.", authctxt->valid ? "" : "illegal user ", authctxt->user); -@@ -297,6 +309,34 @@ +@@ -282,6 +295,34 @@ log("Unknown message during authentication: type %d", type); break; } diff --git a/security/openssh-portable/files/patch-auth2.c b/security/openssh-portable/files/patch-auth2.c index 46fa0f40f6e8..8d999bf1bbd9 100644 --- a/security/openssh-portable/files/patch-auth2.c +++ b/security/openssh-portable/files/patch-auth2.c @@ -1,6 +1,14 @@ ---- auth2.c.orig Tue Feb 26 19:09:43 2002 -+++ auth2.c Sun Mar 17 20:53:15 2002 -@@ -168,6 +168,15 @@ +--- auth2.c.orig Fri Jun 21 08:21:11 2002 ++++ auth2.c Fri Jun 28 06:57:56 2002 +@@ -35,6 +35,7 @@ + #include "dispatch.h" + #include "pathnames.h" + #include "monitor_wrap.h" ++#include "canohost.h" + + /* import */ + extern ServerOptions options; +@@ -137,6 +138,15 @@ Authmethod *m = NULL; char *user, *service, *method, *style = NULL; int authenticated = 0; @@ -16,7 +24,7 @@ if (authctxt == NULL) fatal("input_userauth_request: no authctxt"); -@@ -208,6 +217,41 @@ +@@ -178,6 +188,41 @@ "(%s,%s) -> (%s,%s)", authctxt->user, authctxt->service, user, service); } diff --git a/security/openssh-portable/files/patch-configure b/security/openssh-portable/files/patch-configure new file mode 100644 index 000000000000..3699c2ed52d9 --- /dev/null +++ b/security/openssh-portable/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.old Wed Jun 26 22:57:33 2002 ++++ configure Wed Jun 26 22:53:31 2002 +@@ -6541,6 +6541,7 @@ + #include "confdefs.h" + + #include ++#include + #include + #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) + #define MAP_ANON MAP_ANONYMOUS + diff --git a/security/openssh-portable/files/patch-sshd_config b/security/openssh-portable/files/patch-sshd_config new file mode 100644 index 000000000000..ec7a106916ca --- /dev/null +++ b/security/openssh-portable/files/patch-sshd_config @@ -0,0 +1,10 @@ +--- sshd_config.orig Fri Jun 21 03:11:36 2002 ++++ sshd_config Fri Jun 28 06:55:46 2002 +@@ -58,6 +58,7 @@ + + # Change to no to disable s/key passwords + #ChallengeResponseAuthentication yes ++ChallengeResponseAuthentication no + + # Kerberos options + #KerberosAuthentication no diff --git a/security/openssh-portable/files/patch-sshpty.c b/security/openssh-portable/files/patch-sshpty.c new file mode 100644 index 000000000000..4e31a1a0ed21 --- /dev/null +++ b/security/openssh-portable/files/patch-sshpty.c @@ -0,0 +1,12 @@ +--- sshpty.c.orig Wed Jun 26 01:21:42 2002 ++++ sshpty.c Fri Jun 28 07:09:38 2002 +@@ -30,6 +30,9 @@ + #ifdef HAVE_PTY_H + # include + #endif ++#ifdef __FreeBSD__ ++#include ++#endif + #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H) + # include + #endif -- cgit