Date: Fri, 9 Feb 2001 11:21:54 -0800 From: Alfred Perlstein <bright@wintelcom.net> To: green@freebsd.org Cc: ports@freebsd.org Subject: remove openshh dependancy on poll() Message-ID: <20010209112154.L26076@fw.wintelcom.net> In-Reply-To: <20010209111133.J26076@fw.wintelcom.net>; from bright@wintelcom.net on Fri, Feb 09, 2001 at 11:11:33AM -0800 References: <20010209111133.J26076@fw.wintelcom.net>
next in thread | previous in thread | raw e-mail | index | archive | help
the openssh port applies patches to include poll.h, openssh doesn't
use poll anymore and this hinders compiling it on 2.2.x
thanks,
Index: files/patch-an
===================================================================
RCS file: /home/ncvs/ports/security/openssh/files/patch-an,v
retrieving revision 1.11
diff -u -u -r1.11 patch-an
--- files/patch-an 2000/11/04 23:04:25 1.11
+++ files/patch-an 2001/02/09 19:23:13
@@ -1,12 +1,11 @@
---- sshd.c.orig Wed May 3 19:21:49 2000
-+++ sshd.c Fri May 12 07:11:43 2000
-@@ -49,6 +49,13 @@
+--- /home/bright/ssh/ssh/sshd.c Thu Aug 17 13:06:34 2000
++++ sshd.c Fri Feb 9 11:19:08 2001
+@@ -49,6 +49,12 @@
int deny_severity = LOG_WARNING;
#endif /* LIBWRAP */
+#ifdef __FreeBSD__
+#include <libutil.h>
-+#include <poll.h>
+#include <syslog.h>
+#include <time.h>
+#endif /* __FreeBSD__ */
Index: files/patch-au
===================================================================
RCS file: /home/ncvs/ports/security/openssh/files/patch-au,v
retrieving revision 1.6
diff -u -u -r1.6 patch-au
--- files/patch-au 2000/11/04 23:04:25 1.6
+++ files/patch-au 2001/02/09 19:23:41
@@ -1,12 +1,11 @@
---- session.c.orig Sun Aug 27 23:50:54 2000
-+++ session.c Sat Nov 4 17:39:43 2000
-@@ -28,6 +28,13 @@
+--- /home/bright/ssh/ssh/session.c Sun Aug 27 20:50:54 2000
++++ session.c Fri Feb 9 11:19:14 2001
+@@ -28,6 +28,12 @@
#include "auth.h"
#include "auth-options.h"
+#ifdef __FreeBSD__
+#include <libutil.h>
-+#include <poll.h>
+#include <syslog.h>
+#include <time.h>
+#endif /* __FreeBSD__ */
@@ -14,7 +13,7 @@
#ifdef HAVE_LOGIN_CAP
#include <login_cap.h>
#endif
-@@ -413,6 +420,13 @@
+@@ -413,6 +419,13 @@
log_init(__progname, options.log_level, options.log_facility, log_stderr);
/*
@@ -28,7 +27,7 @@
* Create a new session and process group since the 4.4BSD
* setlogin() affects the entire process group.
*/
-@@ -516,6 +530,13 @@
+@@ -516,6 +529,13 @@
/* Child. Reinitialize the log because the pid has changed. */
log_init(__progname, options.log_level, options.log_facility, log_stderr);
@@ -42,7 +41,7 @@
/* Close the master side of the pseudo tty. */
close(ptyfd);
-@@ -602,6 +623,7 @@
+@@ -602,6 +622,7 @@
time_t last_login_time;
struct passwd * pw = s->pw;
pid_t pid = getpid();
@@ -50,7 +49,7 @@
/*
* Get IP address of client. If the connection is not a socket, let
-@@ -644,6 +666,20 @@
+@@ -644,6 +665,20 @@
else
printf("Last login: %s from %s\r\n", time_string, buf);
}
@@ -71,7 +70,7 @@
if (options.print_motd) {
#ifdef HAVE_LOGIN_CAP
f = fopen(login_getcapstr(lc, "welcome", "/etc/motd",
-@@ -949,7 +985,7 @@
+@@ -949,7 +984,7 @@
* initgroups, because at least on Solaris 2.3 it leaves file
* descriptors open.
*/
@@ -80,7 +79,7 @@
close(i);
/* Change current directory to the user\'s home directory. */
-@@ -973,7 +1009,27 @@
+@@ -973,7 +1008,27 @@
* in this order).
*/
if (!options.use_login) {
--
-Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org]
"I have the heart of a child; I keep it in a jar on my desk."
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010209112154.L26076>