Fix -w not being processed correctly

bdrewery · Apr 4, 2007 · 67ad5ce · 67ad5ce
1 parent f7899a6
commit 67ad5ce
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.41 2007/01/22 20:32:24 solar Exp $
 
+  04 Apr 2007; Bryan Drewery <bryan@shatow.net> ChangeLog:
+  Fix -w not being processed correctly
+
   04 Apr 2007; Bryan Drewery <bryan@shatow.net> ChangeLog:
   Added wraith auth support
   default authfile is ~/.wraith/auth with format:

diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
@@ -10,10 +10,10 @@ AUX netkit-telnetd-0.17-gentoo.patch 3155 RMD160 bec68b4e0ebf8a3fc9df1da2a5b5c0e
 MD5 d741260d55b46b1e6ae6cf923b4542e5 files/netkit-telnetd-0.17-gentoo.patch 3155
 RMD160 bec68b4e0ebf8a3fc9df1da2a5b5c0efb9306c9c files/netkit-telnetd-0.17-gentoo.patch 3155
 SHA256 afb71952eb9b02c8abad59c6eb348175d195229c0f91068dd51d95b439429330 files/netkit-telnetd-0.17-gentoo.patch 3155
-AUX netkit-telnetd-0.17-wraith.patch 8852 RMD160 7e6988788fac20665fa4eb86721c2f4286b9260e SHA1 db4ac8ee551b37132f80ae6353661d5e4eef2e07 SHA256 8234ab0929f6011c7a8b710eafd9ae313c7206a88c965ed907765a7dbef31497
-MD5 484117a5b1cc23b607b4502308b6cfeb files/netkit-telnetd-0.17-wraith.patch 8852
-RMD160 7e6988788fac20665fa4eb86721c2f4286b9260e files/netkit-telnetd-0.17-wraith.patch 8852
-SHA256 8234ab0929f6011c7a8b710eafd9ae313c7206a88c965ed907765a7dbef31497 files/netkit-telnetd-0.17-wraith.patch 8852
+AUX netkit-telnetd-0.17-wraith.patch 8854 RMD160 eab4df755940c38d5f2d3bf8277fcc8703f234a0 SHA1 f38e0cbcc77eeee01b9a9e49d8ad0f7677faa555 SHA256 6c7d8eafcadf452981b604885a9f6c25be26fb9dd8e328a2589f385858a62198
+MD5 ef98d7f595401244d0802deccefc0090 files/netkit-telnetd-0.17-wraith.patch 8854
+RMD160 eab4df755940c38d5f2d3bf8277fcc8703f234a0 files/netkit-telnetd-0.17-wraith.patch 8854
+SHA256 6c7d8eafcadf452981b604885a9f6c25be26fb9dd8e328a2589f385858a62198 files/netkit-telnetd-0.17-wraith.patch 8854
 AUX telnetd.xinetd 205 RMD160 5d2260272db800af536e6226aad74a43a6f8d65c SHA1 fb1c5a0dabb658889d1417783f1f5dc3357a97c1 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c
 MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
 RMD160 5d2260272db800af536e6226aad74a43a6f8d65c files/telnetd.xinetd 205
@@ -34,10 +34,10 @@ EBUILD netkit-telnetd-0.17-r8.ebuild 2331 RMD160 57759319cf3019d48968b418b205aab
 MD5 a11390b369cfae6da01854f6a32920ea netkit-telnetd-0.17-r8.ebuild 2331
 RMD160 57759319cf3019d48968b418b205aab3eca11a4f netkit-telnetd-0.17-r8.ebuild 2331
 SHA256 e1a73b7e2b6646ee7379362558a8b8a588f0dd6b9bb2855a300558f0413353b7 netkit-telnetd-0.17-r8.ebuild 2331
-MISC ChangeLog 6032 RMD160 7041fa48e3d6b866c0f198690c8e0a464f4cce1c SHA1 514521edff0da96a0941342af4fded1d5ddbcb35 SHA256 0aec4bbee11e6cad4795f3a14a5d6effc3efe932d9bf78fa996017a442f52026
-MD5 450c21fc31c77789b829fc80c383089b ChangeLog 6032
-RMD160 7041fa48e3d6b866c0f198690c8e0a464f4cce1c ChangeLog 6032
-SHA256 0aec4bbee11e6cad4795f3a14a5d6effc3efe932d9bf78fa996017a442f52026 ChangeLog 6032
+MISC ChangeLog 6131 RMD160 7de902d3c4a74e8f0a25083a2a7deff4b3cde1ea SHA1 45d04e38ca782503d65b1d56c18592532a1f2324 SHA256 2654b3c46b1032d9cd5b4c41588c0a6fc933934392d963b84e21a5d9538771ec
+MD5 07ebd4f5e66a1f292d0195f17d5e6c1b ChangeLog 6131
+RMD160 7de902d3c4a74e8f0a25083a2a7deff4b3cde1ea ChangeLog 6131
+SHA256 2654b3c46b1032d9cd5b4c41588c0a6fc933934392d963b84e21a5d9538771ec ChangeLog 6131
 MISC metadata.xml 408 RMD160 e1306e54465273c34b6c5391cb372c87a558d39d SHA1 43b72522ab58b21db75fe1ded7aa127703430696 SHA256 234ae0cad9fefb970ef112f2e4d05f710990742a6393ffc32ccb2c3338676068
 MD5 18641d94839066e87b8be43bbb27fd47 metadata.xml 408
 RMD160 e1306e54465273c34b6c5391cb372c87a558d39d metadata.xml 408

diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-wraith.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-wraith.patch
@@ -1,6 +1,6 @@
 diff -burN netkit-telnet-0.17.orig/telnet/Makefile netkit-telnet-0.17/telnet/Makefile
---- netkit-telnet-0.17.orig/telnet/Makefile	2007-04-03 18:16:30.000000000 -0700
-+++ netkit-telnet-0.17/telnet/Makefile	2007-04-03 18:16:45.000000000 -0700
+--- netkit-telnet-0.17.orig/telnet/Makefile	2007-04-03 20:05:08.000000000 -0700
++++ netkit-telnet-0.17/telnet/Makefile	2007-04-03 20:05:42.000000000 -0700
 @@ -7,10 +7,10 @@
 
  # -DAUTHENTICATE
@@ -15,8 +15,8 @@ diff -burN netkit-telnet-0.17.orig/telnet/Makefile netkit-telnet-0.17/telnet/Mak
  OBJS = $(patsubst %.cc, %.o, $(SRCS))
 
 diff -burN netkit-telnet-0.17.orig/telnet/externs.h netkit-telnet-0.17/telnet/externs.h
---- netkit-telnet-0.17.orig/telnet/externs.h	2007-04-03 18:16:30.000000000 -0700
-+++ netkit-telnet-0.17/telnet/externs.h	2007-04-03 18:16:45.000000000 -0700
+--- netkit-telnet-0.17.orig/telnet/externs.h	2007-04-03 20:05:08.000000000 -0700
++++ netkit-telnet-0.17/telnet/externs.h	2007-04-03 20:05:42.000000000 -0700
 @@ -56,6 +56,8 @@
 
  #define	SUBBUFSIZE	256
@@ -37,8 +37,8 @@ diff -burN netkit-telnet-0.17.orig/telnet/externs.h netkit-telnet-0.17/telnet/ex
   * We keep track of each side of the option negotiation.
   */
 diff -burN netkit-telnet-0.17.orig/telnet/main.cc netkit-telnet-0.17/telnet/main.cc
---- netkit-telnet-0.17.orig/telnet/main.cc	2007-04-03 18:16:30.000000000 -0700
-+++ netkit-telnet-0.17/telnet/main.cc	2007-04-03 18:16:45.000000000 -0700
+--- netkit-telnet-0.17.orig/telnet/main.cc	2007-04-03 20:05:08.000000000 -0700
++++ netkit-telnet-0.17/telnet/main.cc	2007-04-03 20:05:55.000000000 -0700
 @@ -69,6 +69,7 @@
 
      init_sys();
@@ -63,7 +63,7 @@ diff -burN netkit-telnet-0.17.orig/telnet/main.cc netkit-telnet-0.17/telnet/main
 
  	while ((ch = getopt(argc, argv,
 -			    "4678EKLS:X:ab:de:k:l:n:rt:x")) != EOF) {
-+			    "4678EKLS:X:ab:de:k:l:n:p:rt:x")) != EOF) {
++			    "4678EKLS:X:ab:de:k:l:n:p:rt:w:x")) != EOF) {
  		switch(ch) {
  		case '4':
  			family = AF_INET;
@@ -88,8 +88,8 @@ diff -burN netkit-telnet-0.17.orig/telnet/main.cc netkit-telnet-0.17/telnet/main
  			fprintf(stderr,
  				"%s: -x ignored, no encryption support.\n",
 diff -burN netkit-telnet-0.17.orig/telnet/proto.h netkit-telnet-0.17/telnet/proto.h
---- netkit-telnet-0.17.orig/telnet/proto.h	2007-04-03 18:16:30.000000000 -0700
-+++ netkit-telnet-0.17/telnet/proto.h	2007-04-03 18:16:45.000000000 -0700
+--- netkit-telnet-0.17.orig/telnet/proto.h	2007-04-03 20:05:08.000000000 -0700
++++ netkit-telnet-0.17/telnet/proto.h	2007-04-03 20:05:42.000000000 -0700
 @@ -39,3 +39,10 @@
 
  /* commands.c */
@@ -102,8 +102,8 @@ diff -burN netkit-telnet-0.17.orig/telnet/proto.h netkit-telnet-0.17/telnet/prot
 +const char* wraith_get_auth(const char*);
 +void init_wraith(void);
 diff -burN netkit-telnet-0.17.orig/telnet/terminal.cc netkit-telnet-0.17/telnet/terminal.cc
---- netkit-telnet-0.17.orig/telnet/terminal.cc	2007-04-03 18:16:30.000000000 -0700
-+++ netkit-telnet-0.17/telnet/terminal.cc	2007-04-03 18:16:45.000000000 -0700
+--- netkit-telnet-0.17.orig/telnet/terminal.cc	2007-04-03 20:05:08.000000000 -0700
++++ netkit-telnet-0.17/telnet/terminal.cc	2007-04-03 20:05:42.000000000 -0700
 @@ -285,6 +285,17 @@
 
  static int TerminalWrite(const char *buf, int n) {
@@ -124,7 +124,7 @@ diff -burN netkit-telnet-0.17.orig/telnet/terminal.cc netkit-telnet-0.17/telnet/
      } while (r<0 && errno==EINTR);
 diff -burN netkit-telnet-0.17.orig/telnet/wraith.c netkit-telnet-0.17/telnet/wraith.c
 --- netkit-telnet-0.17.orig/telnet/wraith.c	1969-12-31 16:00:00.000000000 -0800
-+++ netkit-telnet-0.17/telnet/wraith.c	2007-04-03 18:17:40.000000000 -0700
++++ netkit-telnet-0.17/telnet/wraith.c	2007-04-03 20:05:42.000000000 -0700
 @@ -0,0 +1,193 @@
 +/* wraith.c
 + * Copyright (C) Bryan Drewery