Added patch to compile on Gentoo/FreeBSD.

(Portage version: 2.0.51.22)

5 files changed, 136 insertions, 15 deletions

diff --git a/net-misc/telnet-bsd/ChangeLog b/net-misc/telnet-bsd/ChangeLog
index 4639c5a77cbd..eb224f1323a5 100644
--- a/net-misc/telnet-bsd/ChangeLog
+++ b/net-misc/telnet-bsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/telnet-bsd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/ChangeLog,v 1.21 2005/06/29 06:50:16 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/ChangeLog,v 1.22 2005/08/13 10:32:38 flameeyes Exp $
+
+*telnet-bsd-1.2-r1 (13 Aug 2005)
+
+  13 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/telnet-bsd-1.2-fbsd.patch, +telnet-bsd-1.2-r1.ebuild:
+  Added patch to compile on Gentoo/FreeBSD.
 
   29 Jun 2005; Simon Stelling <blubb@gentoo.org> telnet-bsd-1.2.ebuild:
   stable on amd64 wrt bug 96156
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index ae4d1b49e488..0ccc913a7c2c 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b9d51041c0ff0456dd8dd8346159863b telnet-bsd-1.0-r1.ebuild 1070
 MD5 e127f6f488037c96a9193c0b6c6b0a30 ChangeLog 2437
+MD5 b9d51041c0ff0456dd8dd8346159863b telnet-bsd-1.0-r1.ebuild 1070
+MD5 f401d6a0bb38c5f0a1cdf056f3d09b36 telnet-bsd-1.2-r1.ebuild 1014
 MD5 ff7e5662e92ca6feddd895beaac357d5 telnet-bsd-1.2.ebuild 752
-MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
-MD5 06961ee981bc4f8c460b3caaeccc6651 files/digest-telnet-bsd-1.2 67
-MD5 6e9abbecabfaa06ac7bc61e1fc8ce862 files/telnet-bsd_gentoo.diff.gz 689
+MD5 014930be6653650a9a98de5950ddd022 files/telnet-bsd-1.2-fbsd.patch 2566
+MD5 06961ee981bc4f8c460b3caaeccc6651 files/digest-telnet-bsd-1.2-r1 67
 MD5 311eccbf485f973d2274c49343611051 files/digest-telnet-bsd-1.0-r1 67
+MD5 06961ee981bc4f8c460b3caaeccc6651 files/digest-telnet-bsd-1.2 67
 MD5 982c76cd605dc0ce46a43be968ac62ac files/telnet-bsd-1.0-overflow.patch 2362
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCyPGogIKl8Uu19MoRAgiFAJ0UPOmXz+5D6OyGPL93KyiaLcfiYwCdHUW4
-0pV+CF84IfNKq61y5trqI9c=
-=olve
------END PGP SIGNATURE-----
+MD5 6e9abbecabfaa06ac7bc61e1fc8ce862 files/telnet-bsd_gentoo.diff.gz 689
+MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
diff --git a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2-r1 b/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2-r1
new file mode 100644
index 000000000000..6a195add2b7a
--- /dev/null
+++ b/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2-r1
@@ -0,0 +1 @@
+MD5 72d72c65e7796dfec999f347da1c295f telnet-bsd-1.2.tar.bz2 194518
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
new file mode 100644
index 000000000000..8795776bba5f
--- /dev/null
+++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-fbsd.patch
@@ -0,0 +1,82 @@
+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 @@
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ 
++AC_CHECK_HEADERS([pty.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
+@@ -29,11 +29,13 @@
+ 
+ #include "telnet_locl.h"
+ #include <err.h>
++#include <unistd.h>
+ 
+ #if	defined(IPPROTO_IP) && defined(IP_TOS)
+ int tos = -1;
+ #endif /* defined(IPPROTO_IP) && defined(IP_TOS) */
+ 
++extern char **environ;
+ 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
+@@ -29,6 +29,7 @@
+  */
+ 
+ #include <sys/cdefs.h>
++#include <sys/types.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 @@
+ static char **Argv = NULL;		/* pointer to argument vector */
+ static char *LastArgv = NULL;		/* end of argv */
+ static char Argv0[128];			/* program name */
++extern char **environ;
+ 
+ void
+ initsetproctitle(int argc, char **argv, char **envp)
+@@ -86,10 +87,10 @@
+ 
+ 	for (i = 0; envp[i] != NULL; i++)
+ 		continue;
+-	__environ = (char **) malloc(sizeof (char *) * (i + 1));
++	environ = (char **) malloc(sizeof (char *) * (i + 1));
+ 	for (i = 0; envp[i] != NULL; i++)
+-		__environ[i] = strdup(envp[i]);
+-	__environ[i] = NULL;
++		environ[i] = strdup(envp[i]);
++	environ[i] = NULL;
+ 
+ 	/*
+ 	**  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 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <config.h>
++
++#include <sys/types.h>
+ #include <utmp.h>
++#ifdef HAVE_PTY_H
+ #include <pty.h>
++#endif
+ 
+ #include "telnetd.h"
+ #include "pathnames.h"
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
new file mode 100644
index 000000000000..9bb3de948449
--- /dev/null
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild,v 1.1 2005/08/13 10:32:38 flameeyes Exp $
+
+inherit eutils
+
+DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="!net-misc/netkit-telnetd"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fbsd.patch
+}
+
+src_compile() {
+	# FreeBSD doesn't seem to support PIE
+	if use kernel_FreeBSD; then
+		export libc_cv_fpie="no"
+	fi
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/telnetd.xinetd telnetd
+	dodoc README THANKS NEWS AUTHORS ChangeLog INSTALL
+}