commit telnet

19 May 2006

Hello community,

here is the log from the commit of package telnet
checked in at Fri May 19 16:55:29 CEST 2006.

--------

--- telnet/telnet.changes	2006-01-25 21:42:03.000000000 +0100
+++ telnet/telnet.changes	2006-05-19 13:55:40.000000000 +0200
@@ -1,0 +2,5 @@
+Fri May 19 13:55:02 CEST 2006 - kssingvo@suse.de
+
+- added option -H to suppress hostname (bugzilla#175376)
+
+-------------------------------------------------------------------

New:
----
  telnet-bsd-1.2-suppress_hostname.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ telnet.spec ++++++
--- /var/tmp/diff_new_pack.U5ZTVD/_old	2006-05-19 16:55:24.000000000 +0200
+++ /var/tmp/diff_new_pack.U5ZTVD/_new	2006-05-19 16:55:24.000000000 +0200
@@ -1,11 +1,11 @@
 #
 # spec file for package telnet (Version 1.2)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -16,12 +16,13 @@
 Provides:     nkitb:/usr/bin/telnet
 Autoreqprov:  on
 Version:      1.2
-Release:      2
+Release:        14
 Summary:      A client program for the telnet remote login protocol
 Requires:     netcfg
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Source:       telnet-bsd-%version.tar.bz2
 Source1:      telnet.xinetd
+Patch1:         %{name}-bsd-1.2-suppress_hostname.patch
 
 %description
 Telnet is an old protocol for logging into remote systems.  It is
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q -n telnet-bsd-%version
+%patch1 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie" ./configure
@@ -86,6 +88,8 @@
 %attr(755,root,root) /usr/sbin/in.telnetd
 
 %changelog -n telnet
+* Fri May 19 2006 - kssingvo@suse.de
+- added option -H to suppress hostname (bugzilla#175376)
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Thu Jun 16 2005 - mmj@suse.de

++++++ telnet-bsd-1.2-suppress_hostname.patch ++++++
diff -ru telnet-bsd-1.2/telnetd/global.c telnet-bsd-1.2.devel/telnetd/global.c
--- telnet-bsd-1.2/telnetd/global.c	2004-02-13 17:11:51.000000000 -0500
+++ telnet-bsd-1.2.devel/telnetd/global.c	2006-05-05 13:21:32.000000000 -0400
@@ -38,6 +38,7 @@
 char will_wont_resp[256];
 int linemode;			/* linemode on/off */
 int utmp_len = MAXHOSTNAMELEN;
+int login_suppress_hostname;	/* Pass -H to /bin/login */
 
 #ifdef  LINEMODE
 int uselinemode;		/* what linemode to use (on/off) */
diff -ru telnet-bsd-1.2/telnetd/sys_term.c telnet-bsd-1.2.devel/telnetd/sys_term.c
--- telnet-bsd-1.2/telnetd/sys_term.c	2005-06-01 07:42:23.000000000 -0400
+++ telnet-bsd-1.2.devel/telnetd/sys_term.c	2006-05-05 13:22:12.000000000 -0400
@@ -767,6 +767,10 @@
 	}
     }
   closelog ();
+
+  if (login_suppress_hostname)
+	  addarg(&avs, "-H");
+
   /* execv() should really take char const* const *, but it can't */
   /*argvfoo = argv */ ;
   memcpy (&argvfoo, &avs.argv, sizeof (argvfoo));
diff -ru telnet-bsd-1.2/telnetd/telnetd.c telnet-bsd-1.2.devel/telnetd/telnetd.c
--- telnet-bsd-1.2/telnetd/telnetd.c	2004-02-13 17:14:04.000000000 -0500
+++ telnet-bsd-1.2.devel/telnetd/telnetd.c	2006-05-05 13:21:43.000000000 -0400
@@ -65,7 +65,7 @@
  * that only the actual options that we support will be
  * passed off to getopt().
  */
-char *valid_opts = "d:L:hnS:u:UD:46"
+char *valid_opts = "d:L:hnS:u:UD:46H"
 #ifdef	LINEMODE
 	"kl"
 #endif
@@ -176,6 +176,9 @@
 	case '6':
 	  family = AF_INET6;
 	  break;
+	case 'H':
+	  login_suppress_hostname = 1;
+	  break;
 
 	default:
 	  fprintf(stderr, "telnetd: %c: unknown option\n", ch);
@@ -293,6 +293,7 @@
   syslog(LOG_ERR, "usage: telnetd [-debug]"
 	 " [-D (options|report|exercise|netdata|ptydata)]\n\t"
 	 " [-h]"
+	 " [-H]"
 #if	defined(LINEMODE) && defined(KLUDGELINEMODE)
 	 " [-k]"
 #endif
diff -ru telnet-bsd-1.2/telnetd/ext.h telnet-bsd-1.2.devel/telnetd/ext.h
--- telnet-bsd-1.2/telnetd/ext.h	2004-02-13 17:11:43.000000000 -0500
+++ telnet-bsd-1.2.devel/telnetd/ext.h	2006-05-05 13:24:30.000000000 -0400
@@ -36,6 +36,7 @@
 extern char will_wont_resp[256];
 extern int linemode;	/* linemode on/off */
 extern int utmp_len;
+extern int login_suppress_hostname;
 
 #ifdef LINEMODE
 extern int uselinemode;	/* what linemode to use (on/off) */
diff -ru telnet-bsd-1.2/telnetd/in.telnetd.8 telnet-bsd-1.2.devel/telnetd/in.telnetd.8
--- telnet-bsd-1.2/telnetd/in.telnetd.8	2004-02-13 17:12:00.000000000 -0500
+++ telnet-bsd-1.2.devel/telnetd/in.telnetd.8	2006-05-05 13:33:20.000000000 -0400
@@ -36,7 +36,7 @@
 protocol server
 .Sh SYNOPSIS
 .Nm in.telnetd
-.Op Fl Uhlkn46
+.Op Fl Uhlkn46H
 .Op Fl D Ar debugmode
 .Op Fl I Ns Ar initid
 .Op Fl S Ar tos
@@ -118,6 +118,8 @@
 .It Fl h
 Disables the printing of host-specific information before
 login has been completed.
+.It Fl H
+Instruct the login program to suppress printing the hostname before the prompt.
 .It Fl I Ar initid
 This option is only applicable to
 .Tn UNICOS


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)