Reworked freebsd patch to work on FreeBSD-9.0 #417509

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 63 insertions, 27 deletions

diff --git a/net-misc/telnet-bsd/ChangeLog b/net-misc/telnet-bsd/ChangeLog
index d2b06a29bcd1..88b5803694b2 100644
--- a/net-misc/telnet-bsd/ChangeLog
+++ b/net-misc/telnet-bsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/telnet-bsd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/ChangeLog,v 1.45 2012/04/14 18:44:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/ChangeLog,v 1.46 2012/05/29 07:34:33 naota Exp $
+
+  29 May 2012; Naohiro Aota <naota@gentoo.org> files/telnet-bsd-1.2-fbsd.patch:
+  Reworked freebsd patch to work on FreeBSD-9.0 #417509
 
   14 Apr 2012; Zac Medico <zmedico@gentoo.org> telnet-bsd-1.2-r1.ebuild:
   Add ~amd64-linux keyword.
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index ccd31d91415d..5d809478a5b5 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX telnet-bsd-1.2-fbsd.patch 2566 RMD160 0fdd137d6e3052c0ad6d8f347c1cb421e58d1072 SHA1 263fafeb1578eb4d69f78d2878d5a6255748da2e SHA256 fdf4df0063d990519355a51f1ec75c401c71958178e75c9214457a973071923d
+AUX telnet-bsd-1.2-fbsd.patch 2523 RMD160 1b86401654e65a3103cde06d1906e431d43d7f5b SHA1 dbc3fe5f04091e2b64cfdcfdb58520ca86681d5e SHA256 8f8045774c525c978b877dafe3728548b6a5e0105338338b899b560619a0d835
 AUX telnetd.xinetd 205 RMD160 5d2260272db800af536e6226aad74a43a6f8d65c SHA1 fb1c5a0dabb658889d1417783f1f5dc3357a97c1 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c
 DIST telnet-bsd-1.2.tar.bz2 194518 RMD160 3927ce86bbc4024c5a656f5d8f9ee0c8f90de70c SHA1 2f8b8894fa1eefc9929534e703d4eba4bdee1796 SHA256 d6a9d26740ef75565cb1ed8ff11e327d240e6734748b2d1d2e96c126849e4733
 EBUILD telnet-bsd-1.2-r1.ebuild 1232 RMD160 25f39dfdd1d80054e3fdc5197f99665678d83925 SHA1 c17a2b0462f134ffa7bd4a72a764214d5da6a24a SHA256 49b0af87b088fed6404e3b75ac1db7f7f5ffe3957070d169c82b021330bc8f28
-MISC ChangeLog 5442 RMD160 7b54fcdd3bb99c52dbffbbd558764e81832840c6 SHA1 d43482c73037ba0b4d6db9ca651ac0af9bf6f506 SHA256 0a3ffaa724a4d21f975c4bc7ec7bb12101afeed9c1fba79af6066550a71458ff
+MISC ChangeLog 5577 RMD160 540956cdf48fa770bf8df0eb4c293f11992908aa SHA1 05105d1b4ea46506a356207bc4a68d0dac5fb9af SHA256 93aef5b6275a6c103e648f7f9ab2c28e08700d61a8b21908b436dab97870b13a
 MISC metadata.xml 204 RMD160 01d327ac12382b8ce503a8de5acc098679a13652 SHA1 55b38a4be7a77fa21b30e8250f361b5438e3b288 SHA256 be7cda29b8d07ec2c0b4f7afc93a3feadc0b3504f1d46cfb5d73d9f09d870aaa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+JxaYACgkQ/ejvha5XGaMN5ACg6SW4fZdQivczBmJyFAD94bup
-sZoAnR2icJ7YplaXo1+kLawhjizFEV6F
-=Jo23
+iQIcBAEBCAAGBQJPxHwNAAoJEDYO1FT4VRUUWJAQAKKtuBw57JAz5C8DylCQavJM
+2qOkG4lFvScFty8UT3lb+F/Nsaacz7/oXaSidbOZCKU3fuX7QC/2O/UMml64/GPJ
+45G6R5UcWS5YDuZ1xDtz6xSPsIdC/EAm0xAEs8dsHhTiRPTS84G2Z1KywnQiQ7cb
+90RGQzrQ4y4fboldswZ4COnuTbQVvSeWUz8+UgVD7xO98b3FVm9xHUHKxZvyXJb7
+PyBmibc0urLk7autKw6vxcK9BWFFQoErNqANlRsZomEd4oCuBamHt8/WGTZu6RFr
+sKBD+1+jPrKYL4gm/j1j5KUTlFrhZfts+BwbjMoQKwKoPod9w0waqeTu7QJjdMmd
+Hb7hU4LBSG9KYZfWUL5nTtYibNDww3ru/BRuI2sSYnHuYr8PdIb37N3FUa8tcxJE
+bMrpkvgq7PE0+MsYFHM5c5PiY8rH/NSB1o6YC8N0RCdODl45x7Is029ZmhnZBnUE
+r2gaypdnSC7+BSD2fIQSUR9tnj5T1MThnRZZGDJUYSZDsel9TjwxDswjBGg9iV9P
+ocCscjbUkc7iEpzk+pTUeEkIJ7+wVWiFt6MrMlIRFbEzRkZHn77u9aNt0tNcgvl/
+OsIu4MPcbjGr60AyeUax8myFS4l9EjAVsrCUiVHYJBeOSqHvaQhPrpINzP9xxnmS
+pJbcUUoCJdHaDmMLu8mQ
+=y8c5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch
index 8795776bba5f..7c39d6ad81cb 100644
--- a/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch
@@ -1,18 +1,20 @@
-diff -ur telnet-bsd-1.2/configure.in telnet-bsd-1.2-fbsd/configure.in
---- telnet-bsd-1.2/configure.in	2005-06-01 17:33:16.000000000 +0200
-+++ telnet-bsd-1.2-fbsd/configure.in	2005-08-13 12:14:20.000000000 +0200
-@@ -12,6 +12,8 @@
+diff --git a/configure.in b/configure.in
+index 1547e9b..eda5fb1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,8 @@ ALL_LINGUAS="de"
  AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
  
-+AC_CHECK_HEADERS([pty.h])
++AC_CHECK_HEADERS([pty.h utmp.h])
 +
  if test x"$ac_default_prefix" = x"/usr"
  then
  	if test x"${mandir}" = x'${prefix}/man'
-diff -ur telnet-bsd-1.2/telnet/commands.c telnet-bsd-1.2-fbsd/telnet/commands.c
---- telnet-bsd-1.2/telnet/commands.c	2005-06-02 10:12:51.000000000 +0200
-+++ telnet-bsd-1.2-fbsd/telnet/commands.c	2005-08-13 12:18:14.000000000 +0200
+diff --git a/telnet/commands.c b/telnet/commands.c
+index c0d349c..fa2cf8a 100644
+--- a/telnet/commands.c
++++ b/telnet/commands.c
 @@ -29,11 +29,13 @@
  
  #include "telnet_locl.h"
@@ -27,9 +29,10 @@ diff -ur telnet-bsd-1.2/telnet/commands.c telnet-bsd-1.2-fbsd/telnet/commands.c
  char *hostname;
  
  typedef int (*intrtn_t) __P ((int, char **));
-diff -ur telnet-bsd-1.2/telnet/ring.h telnet-bsd-1.2-fbsd/telnet/ring.h
---- telnet-bsd-1.2/telnet/ring.h	2004-02-13 22:52:55.000000000 +0100
-+++ telnet-bsd-1.2-fbsd/telnet/ring.h	2005-08-13 12:10:45.000000000 +0200
+diff --git a/telnet/ring.h b/telnet/ring.h
+index 66f7191..9ef8fb8 100644
+--- a/telnet/ring.h
++++ b/telnet/ring.h
 @@ -29,6 +29,7 @@
   */
  
@@ -38,10 +41,11 @@ diff -ur telnet-bsd-1.2/telnet/ring.h telnet-bsd-1.2-fbsd/telnet/ring.h
  #define P __P
  
  /*
-diff -ur telnet-bsd-1.2/telnetd/setproctitle.c telnet-bsd-1.2-fbsd/telnetd/setproctitle.c
---- telnet-bsd-1.2/telnetd/setproctitle.c	2004-02-13 23:18:07.000000000 +0100
-+++ telnet-bsd-1.2-fbsd/telnetd/setproctitle.c	2005-08-13 12:25:56.000000000 +0200
-@@ -72,6 +72,7 @@
+diff --git a/telnetd/setproctitle.c b/telnetd/setproctitle.c
+index f332277..b2adc92 100644
+--- a/telnetd/setproctitle.c
++++ b/telnetd/setproctitle.c
+@@ -72,6 +72,7 @@ char setproctitle_rcsid[] =
  static char **Argv = NULL;		/* pointer to argument vector */
  static char *LastArgv = NULL;		/* end of argv */
  static char Argv0[128];			/* program name */
@@ -49,7 +53,7 @@ diff -ur telnet-bsd-1.2/telnetd/setproctitle.c telnet-bsd-1.2-fbsd/telnetd/setpr
  
  void
  initsetproctitle(int argc, char **argv, char **envp)
-@@ -86,10 +87,10 @@
+@@ -86,10 +87,10 @@ initsetproctitle(int argc, char **argv, char **envp)
  
  	for (i = 0; envp[i] != NULL; i++)
  		continue;
@@ -63,20 +67,39 @@ diff -ur telnet-bsd-1.2/telnetd/setproctitle.c telnet-bsd-1.2-fbsd/telnetd/setpr
  
  	/*
  	**  Save start and extent of argv for setproctitle.
-diff -ur telnet-bsd-1.2/telnetd/sys_term.c telnet-bsd-1.2-fbsd/telnetd/sys_term.c
---- telnet-bsd-1.2/telnetd/sys_term.c	2005-06-01 13:42:23.000000000 +0200
-+++ telnet-bsd-1.2-fbsd/telnetd/sys_term.c	2005-08-13 12:14:30.000000000 +0200
-@@ -27,8 +27,13 @@
+diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c
+index 1235428..6fcc601 100644
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
+@@ -27,8 +27,15 @@
   * SUCH DAMAGE.
   */
  
 +#include <config.h>
 +
 +#include <sys/types.h>
++#ifdef HAVE_UTMP_H 
  #include <utmp.h>
++#endif
 +#ifdef HAVE_PTY_H
  #include <pty.h>
 +#endif
  
  #include "telnetd.h"
  #include "pathnames.h"
+@@ -820,6 +827,7 @@ addarg (struct argv_stuff *avs, const char *val)
+ void
+ cleanup (int sig)
+ {
++#if !defined(__FreeBSD__) || __FreeBSD__ < 9
+   sigset_t sigset;
+   char *p;
+   (void) sig;
+@@ -847,6 +855,7 @@ cleanup (int sig)
+   *p = 'p';
+   chmod (line, 0666);
+   chown (line, 0, 0);
++#endif
+   shutdown (net, 2);
+   exit (1);
+ }