[Commits] : Tuxbox-GIT: cdk branch master updated. CVS-Final-4-ge3bdd75

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: cdk":

The branch, master has been updated
       via  e3bdd7530669d4c2dc182a8a41d6c2a190e2c410 (commit)
      from  956158ac5c9eae9f086f39611679d9b3b2a48772 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e3bdd7530669d4c2dc182a8a41d6c2a190e2c410
Author: Christian Schuett <Gau...@ho...>
Date:   Mon Feb 4 18:29:41 2013 +0100

    fix migrate errors
    
    The CVS commit "Remove unused netkit package" from 29 Sep 2011 16:59 GMT
    cannot be found in Git commit history. One change of that commit is
    missing. So let's add it.
    
    Signed-off-by: Christian Schuett <Gau...@ho...>

diff --git a/Patches/netkit-telnet.diff b/Patches/netkit-telnet.diff
deleted file mode 100644
index 77a84a7..0000000
--- a/Patches/netkit-telnet.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur netkit-telnet-0.17/telnet/main.cc netkit-telnet-0.17new/telnet/main.cc
---- netkit-telnet-0.17/telnet/main.cc	2002-11-18 02:12:38.000000000 +0100
-+++ netkit-telnet-0.17new/telnet/main.cc	2002-11-18 02:05:04.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <sys/types.h>
- #include <getopt.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "ring.h"
- #include "externs.h"
-diff -Naur netkit-telnet-0.17/telnet/netlink.cc netkit-telnet-0.17new/telnet/netlink.cc
---- netkit-telnet-0.17/telnet/netlink.cc	2002-11-18 02:12:38.000000000 +0100
-+++ netkit-telnet-0.17new/telnet/netlink.cc	2002-11-18 02:05:04.000000000 +0100
-@@ -8,6 +8,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <netdb.h>
-+#include <string.h>
- #include "netlink.h"
- #include "proto.h"
- #include "ring.h"
-diff -Naur netkit-telnet-0.17/telnet/network.cc netkit-telnet-0.17new/telnet/network.cc
---- netkit-telnet-0.17/telnet/network.cc	2002-11-18 02:12:38.000000000 +0100
-+++ netkit-telnet-0.17new/telnet/network.cc	2002-11-18 02:05:04.000000000 +0100
-@@ -42,6 +42,7 @@
- #include <sys/time.h>
- #include <errno.h>
- #include <arpa/telnet.h>
-+#include <stdlib.h>
- 
- #include "ring.h"
- #include "defines.h"
-diff -Naur netkit-telnet-0.17/telnet/telnet.cc netkit-telnet-0.17new/telnet/telnet.cc
---- netkit-telnet-0.17/telnet/telnet.cc	2002-11-18 02:12:38.000000000 +0100
-+++ netkit-telnet-0.17new/telnet/telnet.cc	2002-11-18 02:08:01.000000000 +0100
-@@ -61,10 +61,10 @@
-  * Due to lossage in some linux distributions/kernel releases/libc versions
-  * this must come *after* termios.h (which is included in externs.h)
-  */
--#include <termcap.h>
- 
-+#define USE_NCURSES
- #ifdef USE_NCURSES
--#include <term.h>
-+#include <ncurses/term.h>
- #endif
- 
- 
-diff -Naur netkit-telnet-0.17/telnet/terminal.cc netkit-telnet-0.17new/telnet/terminal.cc
---- netkit-telnet-0.17/telnet/terminal.cc	2002-11-18 02:12:41.000000000 +0100
-+++ netkit-telnet-0.17new/telnet/terminal.cc	2002-11-18 02:05:04.000000000 +0100
-@@ -45,6 +45,8 @@
- #include <signal.h>
- #include <errno.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "ring.h"
- #include "defines.h"
-diff -Naur netkit-telnet-0.17/telnet/utilities.cc netkit-telnet-0.17new/telnet/utilities.cc
---- netkit-telnet-0.17/telnet/utilities.cc	2002-11-18 02:12:41.000000000 +0100
-+++ netkit-telnet-0.17new/telnet/utilities.cc	2002-11-18 02:05:04.000000000 +0100
-@@ -47,6 +47,8 @@
- #include <sys/socket.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <string.h>
-+#include <stdlib.h>
- 
- #include "ring.h"
- #include "defines.h"
-diff -Naur netkit-telnet-0.17/telnetd/telnetd.c netkit-telnet-0.17new/telnetd/telnetd.c
---- netkit-telnet-0.17/telnetd/telnetd.c	2000-04-12 23:36:12.000000000 +0200
-+++ netkit-telnet-0.17new/telnetd/telnetd.c	2002-11-18 02:12:13.000000000 +0100
-@@ -44,7 +44,7 @@
- #include "../version.h"
- 
- #include <netdb.h>
--#include <termcap.h>
-+#include <ncurses/termcap.h>
- #include <netinet/in.h>
- /* #include <netinet/ip.h> */ /* Don't think this is used at all here */
- #include <arpa/inet.h>

-----------------------------------------------------------------------

Summary of changes:
 Patches/netkit-telnet.diff |   85 --------------------------------------------
 1 files changed, 0 insertions(+), 85 deletions(-)
 delete mode 100644 Patches/netkit-telnet.diff


-- 
Tuxbox-GIT: cdk