| 1 |
naota 12/05/29 07:34:33 |
| 2 |
|
| 3 |
Modified: telnet-bsd-1.2-fbsd.patch |
| 4 |
Log: |
| 5 |
Reworked freebsd patch to work on FreeBSD-9.0 #417509 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: telnet-bsd-1.2-fbsd.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- telnet-bsd-1.2-fbsd.patch 13 Aug 2005 10:32:38 -0000 1.1 |
| 23 |
+++ telnet-bsd-1.2-fbsd.patch 29 May 2012 07:34:33 -0000 1.2 |
| 24 |
@@ -1,18 +1,20 @@ |
| 25 |
-diff -ur telnet-bsd-1.2/configure.in telnet-bsd-1.2-fbsd/configure.in |
| 26 |
---- telnet-bsd-1.2/configure.in 2005-06-01 17:33:16.000000000 +0200 |
| 27 |
-+++ telnet-bsd-1.2-fbsd/configure.in 2005-08-13 12:14:20.000000000 +0200 |
| 28 |
-@@ -12,6 +12,8 @@ |
| 29 |
+diff --git a/configure.in b/configure.in |
| 30 |
+index 1547e9b..eda5fb1 100644 |
| 31 |
+--- a/configure.in |
| 32 |
++++ b/configure.in |
| 33 |
+@@ -12,6 +12,8 @@ ALL_LINGUAS="de" |
| 34 |
AC_SUBST(PACKAGE) |
| 35 |
AC_SUBST(VERSION) |
| 36 |
|
| 37 |
-+AC_CHECK_HEADERS([pty.h]) |
| 38 |
++AC_CHECK_HEADERS([pty.h utmp.h]) |
| 39 |
+ |
| 40 |
if test x"$ac_default_prefix" = x"/usr" |
| 41 |
then |
| 42 |
if test x"${mandir}" = x'${prefix}/man' |
| 43 |
-diff -ur telnet-bsd-1.2/telnet/commands.c telnet-bsd-1.2-fbsd/telnet/commands.c |
| 44 |
---- telnet-bsd-1.2/telnet/commands.c 2005-06-02 10:12:51.000000000 +0200 |
| 45 |
-+++ telnet-bsd-1.2-fbsd/telnet/commands.c 2005-08-13 12:18:14.000000000 +0200 |
| 46 |
+diff --git a/telnet/commands.c b/telnet/commands.c |
| 47 |
+index c0d349c..fa2cf8a 100644 |
| 48 |
+--- a/telnet/commands.c |
| 49 |
++++ b/telnet/commands.c |
| 50 |
@@ -29,11 +29,13 @@ |
| 51 |
|
| 52 |
#include "telnet_locl.h" |
| 53 |
@@ -27,9 +29,10 @@ |
| 54 |
char *hostname; |
| 55 |
|
| 56 |
typedef int (*intrtn_t) __P ((int, char **)); |
| 57 |
-diff -ur telnet-bsd-1.2/telnet/ring.h telnet-bsd-1.2-fbsd/telnet/ring.h |
| 58 |
---- telnet-bsd-1.2/telnet/ring.h 2004-02-13 22:52:55.000000000 +0100 |
| 59 |
-+++ telnet-bsd-1.2-fbsd/telnet/ring.h 2005-08-13 12:10:45.000000000 +0200 |
| 60 |
+diff --git a/telnet/ring.h b/telnet/ring.h |
| 61 |
+index 66f7191..9ef8fb8 100644 |
| 62 |
+--- a/telnet/ring.h |
| 63 |
++++ b/telnet/ring.h |
| 64 |
@@ -29,6 +29,7 @@ |
| 65 |
*/ |
| 66 |
|
| 67 |
@@ -38,10 +41,11 @@ |
| 68 |
#define P __P |
| 69 |
|
| 70 |
/* |
| 71 |
-diff -ur telnet-bsd-1.2/telnetd/setproctitle.c telnet-bsd-1.2-fbsd/telnetd/setproctitle.c |
| 72 |
---- telnet-bsd-1.2/telnetd/setproctitle.c 2004-02-13 23:18:07.000000000 +0100 |
| 73 |
-+++ telnet-bsd-1.2-fbsd/telnetd/setproctitle.c 2005-08-13 12:25:56.000000000 +0200 |
| 74 |
-@@ -72,6 +72,7 @@ |
| 75 |
+diff --git a/telnetd/setproctitle.c b/telnetd/setproctitle.c |
| 76 |
+index f332277..b2adc92 100644 |
| 77 |
+--- a/telnetd/setproctitle.c |
| 78 |
++++ b/telnetd/setproctitle.c |
| 79 |
+@@ -72,6 +72,7 @@ char setproctitle_rcsid[] = |
| 80 |
static char **Argv = NULL; /* pointer to argument vector */ |
| 81 |
static char *LastArgv = NULL; /* end of argv */ |
| 82 |
static char Argv0[128]; /* program name */ |
| 83 |
@@ -49,7 +53,7 @@ |
| 84 |
|
| 85 |
void |
| 86 |
initsetproctitle(int argc, char **argv, char **envp) |
| 87 |
-@@ -86,10 +87,10 @@ |
| 88 |
+@@ -86,10 +87,10 @@ initsetproctitle(int argc, char **argv, char **envp) |
| 89 |
|
| 90 |
for (i = 0; envp[i] != NULL; i++) |
| 91 |
continue; |
| 92 |
@@ -63,20 +67,39 @@ |
| 93 |
|
| 94 |
/* |
| 95 |
** Save start and extent of argv for setproctitle. |
| 96 |
-diff -ur telnet-bsd-1.2/telnetd/sys_term.c telnet-bsd-1.2-fbsd/telnetd/sys_term.c |
| 97 |
---- telnet-bsd-1.2/telnetd/sys_term.c 2005-06-01 13:42:23.000000000 +0200 |
| 98 |
-+++ telnet-bsd-1.2-fbsd/telnetd/sys_term.c 2005-08-13 12:14:30.000000000 +0200 |
| 99 |
-@@ -27,8 +27,13 @@ |
| 100 |
+diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c |
| 101 |
+index 1235428..6fcc601 100644 |
| 102 |
+--- a/telnetd/sys_term.c |
| 103 |
++++ b/telnetd/sys_term.c |
| 104 |
+@@ -27,8 +27,15 @@ |
| 105 |
* SUCH DAMAGE. |
| 106 |
*/ |
| 107 |
|
| 108 |
+#include <config.h> |
| 109 |
+ |
| 110 |
+#include <sys/types.h> |
| 111 |
++#ifdef HAVE_UTMP_H |
| 112 |
#include <utmp.h> |
| 113 |
++#endif |
| 114 |
+#ifdef HAVE_PTY_H |
| 115 |
#include <pty.h> |
| 116 |
+#endif |
| 117 |
|
| 118 |
#include "telnetd.h" |
| 119 |
#include "pathnames.h" |
| 120 |
+@@ -820,6 +827,7 @@ addarg (struct argv_stuff *avs, const char *val) |
| 121 |
+ void |
| 122 |
+ cleanup (int sig) |
| 123 |
+ { |
| 124 |
++#if !defined(__FreeBSD__) || __FreeBSD__ < 9 |
| 125 |
+ sigset_t sigset; |
| 126 |
+ char *p; |
| 127 |
+ (void) sig; |
| 128 |
+@@ -847,6 +855,7 @@ cleanup (int sig) |
| 129 |
+ *p = 'p'; |
| 130 |
+ chmod (line, 0666); |
| 131 |
+ chown (line, 0, 0); |
| 132 |
++#endif |
| 133 |
+ shutdown (net, 2); |
| 134 |
+ exit (1); |
| 135 |
+ } |
Archives