Date: Sat, 13 May 2000 21:18:35 +0200 From: Udo Schweigert <ust@cert.siemens.de> To: Brian Feldman <green@FreeBSD.ORG> Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: ports/security/openssh Makefile ports/security/openssh/files sshd.sh md5 pam_ssh.c distfiles ignorefiles ports/security/openssh/patches patch-ac patch-ad patch-ag patch-am patch-an patch-ap Message-ID: <20000513211834.A26174@alaska.cert.siemens.de> In-Reply-To: <200005131711.KAA73213@freefall.freebsd.org>; from green@FreeBSD.ORG on Sat, May 13, 2000 at 10:11:02AM -0700 References: <200005131711.KAA73213@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, May 13, 2000 at 10:11:02 -0700, Brian Feldman wrote:
> green 2000/05/13 10:11:02 PDT
>
> Modified files:
> security/openssh Makefile
> security/openssh/files md5 pam_ssh.c
> security/openssh/patches patch-ac patch-ad patch-ag patch-am
> patch-an patch-ap
> Added files:
> security/openssh/files sshd.sh
> Removed files:
> security/openssh/files distfiles ignorefiles
> Log:
> Update to OpenSSH 2.1.0. They _FINALLY_ have distfiles, so now the CVS is
> not needed for the port.
>
This has a little problem with patch-av. Here is my solution.
By the way: due to it`s dependency on openssl version 0.9.5a this port
won't compile under 4.0-RELEASE and 4.0-STABLE since they have openssl 0.9.4
in their base system and thus the openssl port refuses to compile.
Does anybody know whether MFC for openssl is planned? (I know it: the best
is to wait for it and an MFC of openssh 2.1.0 ;-)
Regards
--
Udo Schweigert, Siemens AG | Voice : +49 89 636 42170
ZT IK 3, Siemens CERT | Fax : +49 89 636 41166
D-81730 Muenchen / Germany | email : ust@cert.siemens.de
PGP-2/5 fingerprint | D8 A5 DF 34 EC 87 E8 C6 E2 26 C4 D0 EE 80 36 B2
diff -ru /usr/ports/security/openssh/patches/patch-av openssh/patches/patch-av
--- /usr/ports/security/openssh/patches/patch-av Fri Apr 21 00:24:19 2000
+++ openssh/patches/patch-av Sat May 13 20:57:11 2000
@@ -1,14 +1,6 @@
---- auth.c.orif Thu Apr 20 17:21:58 2000
-+++ auth.c Thu Apr 20 17:50:06 2000
-@@ -26,7 +26,6 @@
- #include "session.h"
- #include "dispatch.h"
-
--
- /* import */
- extern ServerOptions options;
- extern char *forced_command;
-@@ -106,6 +105,16 @@
+--- auth.c.orig Wed Apr 26 23:28:31 2000
++++ auth.c Sat May 13 20:37:45 2000
+@@ -106,6 +106,16 @@
return 0;
}
}
@@ -25,7 +17,9 @@
/* We found no reason not to let this user try to log on... */
return 1;
}
-@@ -523,6 +532,11 @@
+--- auth1.c.orig Sat Apr 29 20:11:52 2000
++++ auth1.c Sat May 13 20:43:55 2000
+@@ -431,6 +431,11 @@
pwcopy.pw_gid = pw->pw_gid;
pwcopy.pw_dir = xstrdup(pw->pw_dir);
pwcopy.pw_shell = xstrdup(pw->pw_shell);
@@ -37,3 +31,17 @@
pw = &pwcopy;
/*
+--- auth2.c.orig Mon May 8 19:42:24 2000
++++ auth2.c Sat May 13 20:44:11 2000
+@@ -357,6 +357,11 @@
+ copy->pw_gid = pw->pw_gid;
+ copy->pw_dir = xstrdup(pw->pw_dir);
+ copy->pw_shell = xstrdup(pw->pw_shell);
++#ifdef __FreeBSD__
++ copy->pw_class = xstrdup(pw->pw_class);
++ copy->pw_expire = pw->pw_expire;
++ copy->pw_change = pw->pw_change;
++#endif /* __FreeBSD__ */
+ authctxt->valid = 1;
+ } else {
+ if (strcmp(u, authctxt->user) != 0 ||
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000513211834.A26174>