tags 912132 patch user debian-rele...@lists.debian.org usertags 912132 + bsp-2019-02-de-bonn thanks
Dear maintainer,
find attached the fix for netkit-telnet-ssl.
This goes beyond the usual scope of an NMU but it seemed wise to brush
up the entire build system so it is robust for any forseeable changes
to the Debian toolchain.
For a full explanation, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911154#44
Upload to DELAYED+3 will follow in a few hours, I'd like to give
myself a moment to settle down, then ultimately revisit the
changes done. Feel free to tell me if I should wait a little longer.
Packaging could still take a lot of love.
Small changes in /usr/share/doc/
- BUGS is no longer installed
- The two README files were renamed during installation, this was
not recreated
It might be an idea to drop netkit-telnet in favour of
netkit-telnet-ssl, however netkit-telnet has that might be worth
preserving.
Regards,
Christoph
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/changelog
netkit-telnet-ssl-0.17.41+0.2/debian/changelog
--- netkit-telnet-ssl-0.17.41+0.2/debian/changelog 2018-07-28
16:14:32.000000000 +0200
+++ netkit-telnet-ssl-0.17.41+0.2/debian/changelog 2019-02-24
14:38:52.000000000 +0100
@@ -1,3 +1,10 @@
+netkit-telnet-ssl (0.17.41+0.2-3.2) unstable; urgency=high
+
+ * Non-maintainer upload
+ * Use cmake to build the package. Closes: #912132
+
+ -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Sun, 24 Feb 2019
14:38:52 +0100
+
netkit-telnet-ssl (0.17.41+0.2-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/compat
netkit-telnet-ssl-0.17.41+0.2/debian/compat
--- netkit-telnet-ssl-0.17.41+0.2/debian/compat 2017-01-10 23:04:09.000000000
+0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/compat 2019-02-24 14:38:52.000000000
+0100
@@ -1 +1 @@
-9
+10
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/control
netkit-telnet-ssl-0.17.41+0.2/debian/control
--- netkit-telnet-ssl-0.17.41+0.2/debian/control 2017-01-16
23:16:04.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/control 2019-02-24
14:38:52.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: Mats Erik Andersson <mats.anders...@gisladisker.se>
Uploaders: Alberto Gonzalez Iniesta <a...@inittab.org>
Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), libncurses-dev, libssl-dev | libssl1.0-dev
+Build-Depends: debhelper (>= 10~), libncurses-dev, libssl-dev | libssl1.0-dev,
cmake
Package: telnet-ssl
Architecture: any
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/dirs
netkit-telnet-ssl-0.17.41+0.2/debian/dirs
--- netkit-telnet-ssl-0.17.41+0.2/debian/dirs 2017-01-10 23:04:10.000000000
+0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/doc/telnet-ssl
-usr/share/man/man1
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/docs
netkit-telnet-ssl-0.17.41+0.2/debian/docs
--- netkit-telnet-ssl-0.17.41+0.2/debian/docs 2017-01-10 23:04:09.000000000
+0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/docs 1970-01-01 01:00:00.000000000
+0100
@@ -1,4 +0,0 @@
-BUGS
-README
-README.SSL
-VERSION
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/menu
netkit-telnet-ssl-0.17.41+0.2/debian/menu
--- netkit-telnet-ssl-0.17.41+0.2/debian/menu 2017-01-10 23:04:10.000000000
+0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/menu 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-?package(telnet-ssl): \
- needs="text" section="Applications/Network/Communication" \
- title="Telnet-SSL" command="/usr/bin/telnet-ssl" hints="Terminal"
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/patches/010-full_set_in_18.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/010-full_set_in_18.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/010-full_set_in_18.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/010-full_set_in_18.diff
2019-02-24 14:38:52.000000000 +0100
@@ -21,42 +21,8 @@
Forwarded: no
Last-Update: 2015-01-26
---- netkit-telnet-0.17.orig/Makefile
-+++ netkit-telnet-0.17/Makefile
-@@ -1,8 +1,7 @@
- # You can do "make SUB=blah" to make only a few, or edit here, or both
- # You can also run make directly in the subdirs you want.
-
--SUB = telnet telnetd
--# not yet: telnetlogin
-+SUB = telnet telnetd telnetlogin
-
- %.build:
- (cd $(patsubst %.build, %, $@) && $(MAKE))
---- netkit-telnet-0.17.orig/configure
-+++ netkit-telnet-0.17/configure
-@@ -117,7 +117,7 @@
-
- cat << EOF > __conftest.cc
- template <class T> class fnord { public: T x; fnord(T y) { x=y; }};
-- int main() { fnord<int> a(0); return a.x; }
-+ int main() { fnord<int> *a = new fnord<int>(0); return a->x; }
- EOF
-
- if [ x"$CXX" = x ]; then
---- netkit-telnet-0.17.orig/telnet/Makefile
-+++ netkit-telnet-0.17/telnet/Makefile
-@@ -7,7 +7,7 @@
-
- # -DAUTHENTICATE
- CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE
--LIBS += $(LIBTERMCAP)
-+LIBS = $(LIBTERMCAP)
-
- SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \
- terminal.cc tn3270.cc utilities.cc genget.cc environ.cc netlink.cc
---- netkit-telnet-0.17.orig/telnet/commands.cc
-+++ netkit-telnet-0.17/telnet/commands.cc
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
@@ -86,10 +86,6 @@
#define HELPINDENT ((int) sizeof ("connect"))
@@ -374,8 +340,8 @@
#if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
/*
---- netkit-telnet-0.17.orig/telnet/main.cc
-+++ netkit-telnet-0.17/telnet/main.cc
+--- a/telnet/main.cc
++++ b/telnet/main.cc
@@ -45,7 +45,10 @@
#include <sys/types.h>
@@ -477,8 +443,8 @@
*argp++ = argv[0]; /* host */
if (argc > 1)
*argp++ = argv[1]; /* port */
---- netkit-telnet-0.17.orig/telnet/netlink.cc
-+++ netkit-telnet-0.17/telnet/netlink.cc
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
@@ -81,20 +81,23 @@
::close(net);
}
@@ -545,8 +511,8 @@
}
return 2;
}
---- netkit-telnet-0.17.orig/telnet/netlink.h
-+++ netkit-telnet-0.17/telnet/netlink.h
+--- a/telnet/netlink.h
++++ b/telnet/netlink.h
@@ -6,8 +6,7 @@
netlink();
~netlink();
@@ -557,8 +523,8 @@
char *srcroute, int srlen,
int tos);
void close(int doshutdown);
---- netkit-telnet-0.17.orig/telnet/network.cc
-+++ netkit-telnet-0.17/telnet/network.cc
+--- a/telnet/network.cc
++++ b/telnet/network.cc
@@ -40,6 +40,7 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -567,8 +533,8 @@
#include <errno.h>
#include <arpa/telnet.h>
---- netkit-telnet-0.17.orig/telnet/ring.cc
-+++ netkit-telnet-0.17/telnet/ring.cc
+--- a/telnet/ring.cc
++++ b/telnet/ring.cc
@@ -165,7 +165,7 @@
/////////////////////////////////////////////////// supply //////////////
@@ -578,8 +544,8 @@
char xbuf[256];
va_list ap;
va_start(ap, format);
---- netkit-telnet-0.17.orig/telnet/ring.h
-+++ netkit-telnet-0.17/telnet/ring.h
+--- a/telnet/ring.h
++++ b/telnet/ring.h
@@ -83,7 +83,7 @@
// manual supply
void putch(char c) { write(&c, 1); }
@@ -589,8 +555,8 @@
int empty_count() { return size - count; }
// automatic supply
---- netkit-telnet-0.17.orig/telnet/sys_bsd.cc
-+++ netkit-telnet-0.17/telnet/sys_bsd.cc
+--- a/telnet/sys_bsd.cc
++++ b/telnet/sys_bsd.cc
@@ -189,18 +189,25 @@
* Various signal handling routines.
*/
@@ -636,8 +602,8 @@
#ifdef SIGWINCH
signal(SIGWINCH, sendwin);
#endif
---- netkit-telnet-0.17.orig/telnet/telnet.1
-+++ netkit-telnet-0.17/telnet/telnet.1
+--- a/telnet/telnet.1
++++ b/telnet/telnet.1
@@ -42,7 +42,7 @@
protocol
.Sh SYNOPSIS
@@ -706,8 +672,8 @@
.It Pa ~/.telnetrc
user customized telnet startup values
.El
---- netkit-telnet-0.17.orig/telnet/telnet.cc
-+++ netkit-telnet-0.17/telnet/telnet.cc
+--- a/telnet/telnet.cc
++++ b/telnet/telnet.cc
@@ -646,7 +646,7 @@
mklist(termbuf, tname, termtypes);
next = 0;
@@ -785,7 +751,7 @@
LM_SLC, 0, SLC_VARIABLE, 0, IAC, SE);
}
}
-@@ -1142,6 +1151,7 @@
+@@ -1142,6 +1142,7 @@
}
}
@@ -793,7 +759,7 @@
#define OPT_REPLY_SIZE 256
unsigned char *opt_reply;
unsigned char *opt_replyp;
-@@ -1173,6 +1183,7 @@
+@@ -1173,6 +1174,7 @@
void env_opt_add(const char *ep) {
const char *vp;
@@ -801,7 +767,7 @@
unsigned char c;
if (opt_reply == NULL) /*XXX*/
-@@ -1185,11 +1196,12 @@
+@@ -1185,11 +1187,12 @@
return;
}
vp = env_getvalue(ep, 1);
@@ -817,8 +783,8 @@
opt_reply = (unsigned char *)realloc(opt_reply, len);
if (opt_reply == NULL) {
/*@*/ printf("env_opt_add: realloc() failed!!!\n");
---- netkit-telnet-0.17.orig/telnet/terminal.cc
-+++ netkit-telnet-0.17/telnet/terminal.cc
+--- a/telnet/terminal.cc
++++ b/telnet/terminal.cc
@@ -45,6 +45,8 @@
#include <signal.h>
#include <errno.h>
@@ -828,8 +794,8 @@
#include "ring.h"
#include "defines.h"
---- netkit-telnet-0.17.orig/telnet/utilities.cc
-+++ netkit-telnet-0.17/telnet/utilities.cc
+--- a/telnet/utilities.cc
++++ b/telnet/utilities.cc
@@ -47,6 +47,8 @@
#include <sys/socket.h>
#include <unistd.h>
@@ -839,20 +805,8 @@
#include "ring.h"
#include "defines.h"
---- netkit-telnet-0.17.orig/telnetd/Makefile
-+++ netkit-telnet-0.17/telnetd/Makefile
-@@ -9,7 +9,8 @@
- # take out -DPARANOID_TTYS.
-
- CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \
-- -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS
-+ -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \
-+ -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\"
- # LIBS += $(LIBTERMCAP)
-
- OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
---- netkit-telnet-0.17.orig/telnetd/authenc.c
-+++ netkit-telnet-0.17/telnetd/authenc.c
+--- a/telnetd/authenc.c
++++ b/telnetd/authenc.c
@@ -42,18 +42,6 @@
return(0);
}
@@ -872,8 +826,8 @@
int
telnet_spin()
{
---- netkit-telnet-0.17.orig/telnetd/defs.h
-+++ netkit-telnet-0.17/telnetd/defs.h
+--- a/telnetd/defs.h
++++ b/telnetd/defs.h
@@ -55,10 +55,11 @@
#include <fcntl.h>
#include <sys/file.h>
@@ -887,8 +841,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
---- netkit-telnet-0.17.orig/telnetd/ext.h
-+++ netkit-telnet-0.17/telnetd/ext.h
+--- a/telnetd/ext.h
++++ b/telnetd/ext.h
@@ -81,12 +81,11 @@
*/
extern char ptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
@@ -947,8 +901,8 @@
extern int (*decrypt_input)(int);
extern char *nclearto;
#endif
---- netkit-telnet-0.17.orig/telnetd/global.c
-+++ netkit-telnet-0.17/telnetd/global.c
+--- a/telnetd/global.c
++++ b/telnetd/global.c
@@ -87,11 +87,10 @@
char netibuf[BUFSIZ], *netip;
@@ -963,16 +917,16 @@
int pty, net;
int SYNCHing; /* we are in TELNET SYNCH mode */
---- netkit-telnet-0.17.orig/telnetd/issue.net.5
-+++ netkit-telnet-0.17/telnetd/issue.net.5
+--- a/telnetd/issue.net.5
++++ b/telnetd/issue.net.5
@@ -40,4 +40,4 @@
.Sh FILES
.Pa /etc/issue.net
.Sh "SEE ALSO"
-.Xr telnetd 8
+.Xr in.telnetd 8
---- netkit-telnet-0.17.orig/telnetd/setproctitle.c
-+++ netkit-telnet-0.17/telnetd/setproctitle.c
+--- a/telnetd/setproctitle.c
++++ b/telnetd/setproctitle.c
@@ -139,7 +139,7 @@
(void) strcpy(Argv[0], buf);
p = &Argv[0][i];
@@ -982,8 +936,8 @@
Argv[1] = NULL;
}
---- netkit-telnet-0.17.orig/telnetd/state.c
-+++ netkit-telnet-0.17/telnetd/state.c
+--- a/telnetd/state.c
++++ b/telnetd/state.c
@@ -179,6 +179,7 @@
*/
case AO:
@@ -1003,8 +957,8 @@
DIAG(TD_OPTIONS, printoption("td: send IAC", DM));
break;
}
---- netkit-telnet-0.17.orig/telnetd/sys_term.c
-+++ netkit-telnet-0.17/telnetd/sys_term.c
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
@@ -41,8 +41,6 @@
#include "telnetd.h"
@@ -1024,8 +978,8 @@
fatalperror(net, loginprg);
}
---- netkit-telnet-0.17.orig/telnetd/telnetd.8
-+++ netkit-telnet-0.17/telnetd/telnetd.8
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
@@ -161,7 +161,7 @@
.It Fl L Ar loginprg
This option may be used to specify a different login program.
@@ -1051,8 +1005,8 @@
.Sh BUGS
Some
.Tn TELNET
---- netkit-telnet-0.17.orig/telnetd/telnetd.c
-+++ netkit-telnet-0.17/telnetd/telnetd.c
+--- a/telnetd/telnetd.c
++++ b/telnetd/telnetd.c
@@ -43,12 +43,16 @@
#include "../version.h"
@@ -1457,8 +1411,8 @@
netflush();
if (ncc > 0)
telrcv();
---- netkit-telnet-0.17.orig/telnetd/utility.c
-+++ netkit-telnet-0.17/telnetd/utility.c
+--- a/telnetd/utility.c
++++ b/telnetd/utility.c
@@ -41,6 +41,7 @@
#include <stdarg.h>
@@ -2072,8 +2026,8 @@
+ }
+ return listlen != 1 ? listlen : tail->len - skip;
+}
---- netkit-telnet-0.17.orig/telnetlogin/telnetlogin.8
-+++ netkit-telnet-0.17/telnetlogin/telnetlogin.8
+--- a/telnetlogin/telnetlogin.8
++++ b/telnetlogin/telnetlogin.8
@@ -40,6 +40,7 @@
.Nm telnetlogin
.Op Fl h Ar host
@@ -2103,8 +2057,8 @@
work with telnetds that perform authentication via Kerberos or SSL.
.Pp
THIS IS PRESENTLY EXPERIMENTAL CODE; USE WITH CAUTION.
---- netkit-telnet-0.17.orig/telnetlogin/telnetlogin.c
-+++ netkit-telnet-0.17/telnetlogin/telnetlogin.c
+--- a/telnetlogin/telnetlogin.c
++++ b/telnetlogin/telnetlogin.c
@@ -51,20 +51,24 @@
#include <string.h>
#include <stdarg.h>
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/patches/020-from_18_to_24.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/020-from_18_to_24.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/020-from_18_to_24.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/020-from_18_to_24.diff
2019-02-24 14:38:52.000000000 +0100
@@ -51,21 +51,8 @@
Forwarded: no
Last-Update: 2015-01-27
-diff -u netkit-telnet-0.17/configure netkit-telnet-0.17/configure
---- netkit-telnet-0.17/configure
-+++ netkit-telnet-0.17/configure
-@@ -67,7 +67,7 @@
-
- ##################################################
-
--WARNINGS='-Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -Winline '
-+WARNINGS='-Wall -Wno-trigraphs '
-
- cat << EOF > __conftest.c
- int main() { int class=0; return class; }
-diff -u netkit-telnet-0.17/telnet/commands.cc
netkit-telnet-0.17/telnet/commands.cc
---- netkit-telnet-0.17/telnet/commands.cc
-+++ netkit-telnet-0.17/telnet/commands.cc
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
@@ -476,6 +476,7 @@
int send_tncmd(int (*func)(int, int), const char *cmd, const char *name) {
char **cpp;
@@ -218,9 +205,8 @@
}
#if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
-diff -u netkit-telnet-0.17/telnet/main.cc netkit-telnet-0.17/telnet/main.cc
---- netkit-telnet-0.17/telnet/main.cc
-+++ netkit-telnet-0.17/telnet/main.cc
+--- a/telnet/main.cc
++++ b/telnet/main.cc
@@ -84,7 +84,7 @@
fprintf(stderr, "Usage: %s %s%s%s%s\n",
prompt,
@@ -307,9 +293,8 @@
if (family) {
*argp++ = family == AF_INET ? "-4" : "-6";
}
-diff -u netkit-telnet-0.17/telnet/netlink.cc
netkit-telnet-0.17/telnet/netlink.cc
---- netkit-telnet-0.17/telnet/netlink.cc
-+++ netkit-telnet-0.17/telnet/netlink.cc
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
@@ -79,20 +79,56 @@
shutdown(net, 2);
}
@@ -374,9 +359,8 @@
#if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)
if (srcroute) {
-diff -u netkit-telnet-0.17/telnet/netlink.h netkit-telnet-0.17/telnet/netlink.h
---- netkit-telnet-0.17/telnet/netlink.h
-+++ netkit-telnet-0.17/telnet/netlink.h
+--- a/telnet/netlink.h
++++ b/telnet/netlink.h
@@ -1,11 +1,15 @@
class netlink {
@@ -393,9 +377,8 @@
int connect(int debug, struct addrinfo *hostaddr,
char *srcroute, int srlen,
int tos);
-diff -u netkit-telnet-0.17/telnet/telnet.1 netkit-telnet-0.17/telnet/telnet.1
---- netkit-telnet-0.17/telnet/telnet.1
-+++ netkit-telnet-0.17/telnet/telnet.1
+--- a/telnet/telnet.1
++++ b/telnet/telnet.1
@@ -44,6 +44,7 @@
.Nm telnet
.Op Fl 468ELadr
@@ -430,9 +413,8 @@
commands associated with that host are executed.
.It Ic quit
Close any open session and exit
-diff -u netkit-telnet-0.17/telnet/telnet.cc netkit-telnet-0.17/telnet/telnet.cc
---- netkit-telnet-0.17/telnet/telnet.cc
-+++ netkit-telnet-0.17/telnet/telnet.cc
+--- a/telnet/telnet.cc
++++ b/telnet/telnet.cc
@@ -88,7 +88,8 @@
char will_wont_resp[256];
@@ -443,7 +425,7 @@
autologin = 0, /* Autologin anyone? */
skiprc = 0,
connected,
-@@ -1743,8 +1754,8 @@
+@@ -1743,8 +1744,8 @@
send_do(TELOPT_STATUS, 1);
if (env_getvalue("DISPLAY", 0))
send_will(TELOPT_XDISPLOC, 1);
@@ -454,9 +436,8 @@
}
#endif /* !defined(TN3270) */
-diff -u netkit-telnet-0.17/telnet/terminal.cc
netkit-telnet-0.17/telnet/terminal.cc
---- netkit-telnet-0.17/telnet/terminal.cc
-+++ netkit-telnet-0.17/telnet/terminal.cc
+--- a/telnet/terminal.cc
++++ b/telnet/terminal.cc
@@ -157,9 +157,11 @@
if (localflow)
mode |= MODE_FLOW;
@@ -504,9 +485,8 @@
#ifdef SIGTSTP
signal(SIGTSTP, SIG_DFL);
-diff -u netkit-telnet-0.17/telnetd/ext.h netkit-telnet-0.17/telnetd/ext.h
---- netkit-telnet-0.17/telnetd/ext.h
-+++ netkit-telnet-0.17/telnetd/ext.h
+--- a/telnetd/ext.h
++++ b/telnetd/ext.h
@@ -88,7 +88,7 @@
#define netoprintf(fmt, ...) fprintf(netfile, fmt, ## __VA_ARGS__)
@@ -516,9 +496,8 @@
extern int SYNCHing; /* we are in TELNET SYNCH mode */
void _termstat(void);
-diff -u netkit-telnet-0.17/telnetd/sys_term.c
netkit-telnet-0.17/telnetd/sys_term.c
---- netkit-telnet-0.17/telnetd/sys_term.c
-+++ netkit-telnet-0.17/telnetd/sys_term.c
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
@@ -204,17 +204,17 @@
*
* Returns the file descriptor of the opened pty.
@@ -567,9 +546,8 @@
shutdown(net, 2);
exit(0);
}
-diff -u netkit-telnet-0.17/telnetd/telnetd.8
netkit-telnet-0.17/telnetd/telnetd.8
---- netkit-telnet-0.17/telnetd/telnetd.8
-+++ netkit-telnet-0.17/telnetd/telnetd.8
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
@@ -161,7 +161,7 @@
.It Fl L Ar loginprg
This option may be used to specify a different login program.
@@ -579,20 +557,16 @@
is used.
.It Fl n
Disable
-only in patch2:
-unchanged:
---- netkit-telnet-0.17.orig/telnet/defines.h
-+++ netkit-telnet-0.17/telnet/defines.h
+--- a/telnet/defines.h
++++ b/telnet/defines.h
@@ -50,3 +50,5 @@
#define MODE_COMMAND_LINE(m) ((m)==-1)
#define CONTROL(x) ((x)&0x1f) /* CTRL(x) is not
portable */
+
+#define MODE_OUT8 0x8000 /* binary mode sans -opost */
-only in patch2:
-unchanged:
---- netkit-telnet-0.17.orig/telnet/proto.h
-+++ netkit-telnet-0.17/telnet/proto.h
+--- a/telnet/proto.h
++++ b/telnet/proto.h
@@ -13,7 +13,7 @@
void auth_encrypt_user(char *);
void auth_name(unsigned char *, int);
@@ -602,10 +576,8 @@
void env_init(void);
int getconnmode(void);
void init_network(void);
-only in patch2:
-unchanged:
---- netkit-telnet-0.17.orig/telnet/externs.h
-+++ netkit-telnet-0.17/telnet/externs.h
+--- a/telnet/externs.h
++++ b/telnet/externs.h
@@ -48,9 +48,7 @@
typedef unsigned char cc_t;
#endif
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/patches/150-cross_configure.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/150-cross_configure.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/150-cross_configure.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/150-cross_configure.diff
1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-Description: Do not run built programs during configure.
- When cross compiling the source, the host-specific programs
- built during the configuration phase are irrelevant for execution.
- Avoid running those executables. The compile test is still there,
- but the runtime test value should have been well accomplished after
- all these years!
-Author: Helmut Grohne <hel...@subdivi.de>
-Bug-Debian: http://bugs.debian.org/835977
-Forwarded: no
-Last Update: 2016-08-29
-
-Index: netkit-telnet-0.17/configure
-===================================================================
---- netkit-telnet-0.17.orig/configure
-+++ netkit-telnet-0.17/configure
-@@ -94,7 +94,6 @@
- echo -n 'Checking if C compiler works... '
- if (
- $CC __conftest.c -o __conftest || exit 1
-- ./__conftest || exit 1
- ) >/dev/null 2>&1; then
- echo 'yes'
- else
-@@ -141,7 +140,6 @@
- echo -n 'Checking if C++ compiler works... '
- if (
- $CXX __conftest.cc -o __conftest || exit 1
-- ./__conftest || exit 1
- ) >/dev/null 2>&1; then
- echo 'yes'
- else
-@@ -427,7 +425,6 @@
- else
- if (
- $CXX $CXXFLAGS -D_GNU_SOURCE __conftest.cc -o __conftest || exit 1
-- ./__conftest || exit 1
- ) >/dev/null 2>&1; then
- echo '-D_GNU_SOURCE'
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -460,20 +457,17 @@
- EOF
- if (
- $CXX $CXXFLAGS __conftest.cc $LIBBSD -o __conftest || exit 1
-- ./__conftest || exit 1
- ) >/dev/null 2>&1; then
- echo 'ok'
- else
- if (
- $CXX $CXXFLAGS __conftest.cc -lsnprintf $LIBBSD -o __conftest ||
exit 1
-- ./__conftest || exit 1
- ) >/dev/null 2>&1; then
- echo '-lsnprintf'
- LIBS="$LIBS -lsnprintf"
- else
- if (
- $CXX $CXXFLAGS __conftest.cc -ldb $LIBBSD -o __conftest ||
exit 1
-- ./__conftest || exit 1
- ) >/dev/null 2>&1; then
- echo '-ldb'
- LIBS="$LIBS -ldb"
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/patches/500-implement_ssl.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/500-implement_ssl.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/500-implement_ssl.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/500-implement_ssl.diff
2019-02-24 14:38:52.000000000 +0100
@@ -12,9 +12,8 @@
Forwarded: no
Last-Update: 2015-01-28
-diff -Naur netkit-telnet-0.17/__conftest.cc
netkit-telnet-ssl-0.17.24+0.1.orig/__conftest.cc
---- netkit-telnet-0.17/__conftest.cc 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/__conftest.cc 2004-05-27
11:47:02.000000000 +0200
+--- /dev/null
++++ b/__conftest.cc
@@ -0,0 +1,7 @@
+#include <stdio.h>
+int main() {
@@ -23,9 +22,8 @@
+ return 0;
+}
+
-diff -Naur netkit-telnet-0.17/libtelnet/arpa/telnet.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/arpa/telnet.h
---- netkit-telnet-0.17/libtelnet/arpa/telnet.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/arpa/telnet.h 2004-05-27
11:47:25.000000000 +0200
+--- /dev/null
++++ b/libtelnet/arpa/telnet.h
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 1983, 1993
@@ -359,9 +357,8 @@
+#define ENCTYPE_NAME(x) enctype_names[x]
+
+#endif /* !_TELNET_H_ */
-diff -Naur netkit-telnet-0.17/libtelnet/auth.c
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth.c
---- netkit-telnet-0.17/libtelnet/auth.c 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth.c 2004-05-27
11:47:25.000000000 +0200
+--- /dev/null
++++ b/libtelnet/auth.c
@@ -0,0 +1,631 @@
+/*
+ * 30-Jun-95 tjh applied the security patch from the CERT advisory
@@ -994,9 +991,8 @@
+ *buf = '\0';
+}
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/authenc.c
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/authenc.c
---- netkit-telnet-0.17/libtelnet/authenc.c 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/authenc.c 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/authenc.c
@@ -0,0 +1,116 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1114,9 +1110,8 @@
+ return(res);
+}
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/auth.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth.h
---- netkit-telnet-0.17/libtelnet/auth.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/auth.h
@@ -0,0 +1,96 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1214,9 +1209,8 @@
+#endif
+
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/auth-proto.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth-proto.h
---- netkit-telnet-0.17/libtelnet/auth-proto.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth-proto.h 2004-05-27
11:47:25.000000000 +0200
+--- /dev/null
++++ b/libtelnet/auth-proto.h
@@ -0,0 +1,130 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1348,9 +1342,8 @@
+#ifdef __cplusplus
+}
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/enc-proto.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/enc-proto.h
---- netkit-telnet-0.17/libtelnet/enc-proto.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/enc-proto.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/enc-proto.h
@@ -0,0 +1,111 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1463,9 +1456,8 @@
+void ofb64_printsub P((unsigned char *, int, unsigned char *, int));
+
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/encrypt.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/encrypt.h
---- netkit-telnet-0.17/libtelnet/encrypt.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/encrypt.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/encrypt.h
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1573,32 +1565,8 @@
+extern int (*decrypt_input) P((int));
+extern void (*encrypt_output) P((unsigned char *, int));
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/Makefile
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/Makefile
---- netkit-telnet-0.17/libtelnet/Makefile 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/Makefile 2004-05-27
11:47:25.000000000 +0200
-@@ -0,0 +1,19 @@
-+include ../MCONFIG
-+include ../MRULES
-+
-+LIB= telnet
-+
-+OBJS= auth.o misc.o ssl.o sslapp.o
-+
-+CFLAGS += -DAUTHENTICATE -DUSE_SSL -I/usr/include/openssl -I.
-+
-+lib${LIB}.a: ${OBJS}
-+ echo building standard ${LIB} library
-+ rm -f lib${LIB}.a
-+ ar cq lib${LIB}.a ${OBJS}; \
-+ if [ -f /usr/bin/ranlib ]; then \
-+ ranlib lib${LIB}.a; \
-+ fi;
-+
-+clean:
-+ rm -f *.o lib${LIB}.a
-diff -Naur netkit-telnet-0.17/libtelnet/misc.c
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc.c
---- netkit-telnet-0.17/libtelnet/misc.c 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc.c 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/misc.c
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1713,9 +1681,8 @@
+ ++data;
+ }
+}
-diff -Naur netkit-telnet-0.17/libtelnet/misc.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc.h
---- netkit-telnet-0.17/libtelnet/misc.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/misc.h
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1759,9 +1726,8 @@
+extern int ReservedPort;
+
+#include "misc-proto.h"
-diff -Naur netkit-telnet-0.17/libtelnet/misc-proto.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc-proto.h
---- netkit-telnet-0.17/libtelnet/misc-proto.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc-proto.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/misc-proto.h
@@ -0,0 +1,89 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
@@ -1852,9 +1818,8 @@
+#endif
+
+#endif
-diff -Naur netkit-telnet-0.17/libtelnet/sslapp.c
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/sslapp.c
---- netkit-telnet-0.17/libtelnet/sslapp.c 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/sslapp.c 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/sslapp.c
@@ -0,0 +1,196 @@
+/* sslapp.c - ssl application code */
+
@@ -2052,9 +2017,8 @@
+
+#endif /* USE_SSL */
+
-diff -Naur netkit-telnet-0.17/libtelnet/sslapp.h
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/sslapp.h
---- netkit-telnet-0.17/libtelnet/sslapp.h 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/sslapp.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/sslapp.h
@@ -0,0 +1,85 @@
+/* sslapp.h - ssl application code */
+
@@ -2141,9 +2105,8 @@
+#endif /* USE_SSL */
+
+
-diff -Naur netkit-telnet-0.17/libtelnet/ssl.c
netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/ssl.c
---- netkit-telnet-0.17/libtelnet/ssl.c 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/ssl.c 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/libtelnet/ssl.c
@@ -0,0 +1,831 @@
+#ifdef USE_SSL
+/*
@@ -2976,9 +2939,8 @@
+#endif /* USE_SSL */
+
+
-diff -Naur netkit-telnet-0.17/README.SSL
netkit-telnet-ssl-0.17.24+0.1.orig/README.SSL
---- netkit-telnet-0.17/README.SSL 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/README.SSL 2004-05-27
11:47:25.000000000 +0200
+--- /dev/null
++++ b/README.SSL
@@ -0,0 +1,77 @@
+This is the telnet(d)-ssl package with encryption support.
+
@@ -3057,9 +3019,8 @@
+Email to ssl...@cryptsoft.com will get both Eric Young and Tim Hudson
+if you are not sure which one of us a problem should be directed to.
+
-diff -Naur netkit-telnet-0.17/telnet/commands.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/commands.cc
---- netkit-telnet-0.17/telnet/commands.cc 2015-01-27 23:31:10.449546453
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/commands.cc 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
@@ -73,6 +73,11 @@
#include "ptrarray.h"
#include "netlink.h"
@@ -3220,9 +3181,8 @@
// BIND("encrypt", encrypthelp, encrypt_cmd);
BIND("z", zhelp, suspend);
-diff -Naur netkit-telnet-0.17/telnet/externs.h
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/externs.h
---- netkit-telnet-0.17/telnet/externs.h 2015-01-27 23:31:10.461546453
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/externs.h 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/externs.h
++++ b/telnet/externs.h
@@ -364,3 +364,8 @@
void inputAvailable(void);
@@ -3232,9 +3192,8 @@
+#include <libtelnet/sslapp.h>
+#endif /* USE_SSL */
+
-diff -Naur netkit-telnet-0.17/telnet/glue2.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue2.cc
---- netkit-telnet-0.17/telnet/glue2.cc 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue2.cc 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/telnet/glue2.cc
@@ -0,0 +1,13 @@
+#include "ring.h"
+#include "glue.h"
@@ -3249,9 +3208,8 @@
+ printsub(direction, pointer, length);
+}
+
-diff -Naur netkit-telnet-0.17/telnet/glue.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue.cc
---- netkit-telnet-0.17/telnet/glue.cc 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue.cc 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/telnet/glue.cc
@@ -0,0 +1,20 @@
+#include "ring.h"
+#include "glue.h"
@@ -3273,15 +3231,13 @@
+extern "C" int telnet_spin() {
+ return(-1);
+}
-diff -Naur netkit-telnet-0.17/telnet/glue.h
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue.h
---- netkit-telnet-0.17/telnet/glue.h 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue.h 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/telnet/glue.h
@@ -0,0 +1,2 @@
+void printsub_h(int direction, unsigned char *pointer, int length);
+int netflush_h(void);
-diff -Naur netkit-telnet-0.17/telnet/main.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/main.cc
---- netkit-telnet-0.17/telnet/main.cc 2015-01-27 23:31:10.449546453 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/main.cc 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/main.cc
++++ b/telnet/main.cc
@@ -55,6 +55,11 @@
#include "defines.h"
#include "proto.h"
@@ -3346,23 +3302,8 @@
if (argc > 1)
*argp++ = argv[1]; /* port */
*argp = 0;
-diff -Naur netkit-telnet-0.17/telnet/Makefile
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/Makefile
---- netkit-telnet-0.17/telnet/Makefile 2015-01-27 23:31:03.913546617 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/Makefile 2004-05-27
11:47:26.000000000 +0200
-@@ -22,8 +22,8 @@
- $(CXX) $(CXXFLAGS) -MM $(SRCS) >depend.mk
-
- install: telnet
-- install -s -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR)
-- install -m$(MANMODE) telnet.1 $(INSTALLROOT)$(MANDIR)/man1
-+ install -s -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR)/telnet-ssl
-+ install -m$(MANMODE) telnet.1 $(INSTALLROOT)$(MANDIR)/man1/telnet-ssl.1
-
- clean:
- rm -f *.o telnet
-diff -Naur netkit-telnet-0.17/telnet/netlink.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/netlink.cc
---- netkit-telnet-0.17/telnet/netlink.cc 2015-01-27 23:31:10.449546453
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/netlink.cc 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
@@ -11,6 +11,7 @@
#include "netlink.h"
#include "proto.h"
@@ -3463,9 +3404,8 @@
}
int netlink::getfd() {
-diff -Naur netkit-telnet-0.17/telnet/README.SSL
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/README.SSL
---- netkit-telnet-0.17/telnet/README.SSL 1970-01-01 01:00:00.000000000
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/README.SSL 2004-05-27
11:47:26.000000000 +0200
+--- /dev/null
++++ b/telnet/README.SSL
@@ -0,0 +1,26 @@
+/*
+ * The modifications to support SSLeay were done by Tim Hudson
@@ -3493,9 +3433,8 @@
+ AUTHENTICATE is defined). It has four sub-commands,
+ "status", "debug", "disable", "enable" and "help".
+
-diff -Naur netkit-telnet-0.17/telnet/sys_bsd.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/sys_bsd.cc
---- netkit-telnet-0.17/telnet/sys_bsd.cc 2015-01-27 23:31:03.925546616
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/sys_bsd.cc 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/sys_bsd.cc
++++ b/telnet/sys_bsd.cc
@@ -173,8 +173,10 @@
}
@@ -3538,9 +3477,8 @@
/* hacks for systems without SO_OOBINLINE removed */
FD_CLR(net, &ibits);
-diff -Naur netkit-telnet-0.17/telnet/telnet.1
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/telnet.1
---- netkit-telnet-0.17/telnet/telnet.1 2015-01-27 23:31:10.449546453 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/telnet.1 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/telnet.1
++++ b/telnet/telnet.1
@@ -81,10 +81,16 @@
.It Fl E
Disables the escape character functionality; that is, sets the escape
@@ -3613,9 +3551,8 @@
.It Ar host
Specifies a host to contact over the network.
.It Ar port
-diff -Naur netkit-telnet-0.17/telnet/telnet.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/telnet.cc
---- netkit-telnet-0.17/telnet/telnet.cc 2015-01-27 23:31:10.457546453
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/telnet.cc 2004-05-27
11:47:26.000000000 +0200
+--- a/telnet/telnet.cc
++++ b/telnet/telnet.cc
@@ -1,4 +1,16 @@
/*
+ * The modifications to support SSLeay were done by Tim Hudson
@@ -3790,9 +3727,8 @@
send_do(TELOPT_SGA, 1);
send_will(TELOPT_TTYPE, 1);
send_will(TELOPT_NAWS, 1);
-diff -Naur netkit-telnet-0.17/telnet/utilities.cc
netkit-telnet-ssl-0.17.24+0.1.orig/telnet/utilities.cc
---- netkit-telnet-0.17/telnet/utilities.cc 2015-01-27 23:31:03.929546616
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnet/utilities.cc 2004-05-27
11:47:27.000000000 +0200
+--- a/telnet/utilities.cc
++++ b/telnet/utilities.cc
@@ -56,6 +56,10 @@
#include "proto.h"
#include "terminal.h"
@@ -3887,9 +3823,8 @@
case TELOPT_LINEMODE:
fprintf(NetTrace, "LINEMODE ");
if (length < 2) {
-diff -Naur netkit-telnet-0.17/telnetd/ext.h
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/ext.h
---- netkit-telnet-0.17/telnetd/ext.h 2015-01-27 23:31:10.457546453 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/ext.h 2004-05-27
11:47:27.000000000 +0200
+--- a/telnetd/ext.h
++++ b/telnetd/ext.h
@@ -212,3 +212,12 @@
} clocks;
@@ -3903,21 +3838,8 @@
+extern int debug;
+
+#endif /* USE_SSL */
-diff -Naur netkit-telnet-0.17/telnetd/Makefile
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/Makefile
---- netkit-telnet-0.17/telnetd/Makefile 2015-01-27 23:31:03.929546616
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/Makefile 2004-05-27
11:47:27.000000000 +0200
-@@ -21,7 +21,7 @@
- # logout.o logwtmp.o (now from -lutil)
-
-
--telnetd: $(OBJS)
-+telnetd: $(OBJS) $(LIBTELNET)
- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
-
- $(OBJS): defs.h ext.h pathnames.h telnetd.h logwtmp.h logout.h setproctitle.h
-diff -Naur netkit-telnet-0.17/telnetd/state.c
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/state.c
---- netkit-telnet-0.17/telnetd/state.c 2015-01-27 23:31:03.929546616 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/state.c 2004-05-27
11:47:27.000000000 +0200
+--- a/telnetd/state.c
++++ b/telnetd/state.c
@@ -38,6 +38,9 @@
"$Id: state.c,v 1.12 1999/12/12 19:41:44 dholland Exp $";
@@ -3928,9 +3850,8 @@
int not42 = 1;
-diff -Naur netkit-telnet-0.17/telnetd/sys_term.c
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/sys_term.c
---- netkit-telnet-0.17/telnetd/sys_term.c 2015-01-27 23:31:10.461546453
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/sys_term.c 2004-05-27
11:47:27.000000000 +0200
+--- a/telnetd/sys_term.c
++++ b/telnetd/sys_term.c
@@ -58,6 +58,19 @@
static struct termios termbuf, termbuf2; /* pty control structure */
@@ -3951,9 +3872,8 @@
/*static int cleanopen(char *line);*/
/*
-diff -Naur netkit-telnet-0.17/telnetd/telnetd.8
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.8
---- netkit-telnet-0.17/telnetd/telnetd.8 2015-01-27 23:31:10.461546453
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.8 2004-05-27
11:47:27.000000000 +0200
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
@@ -207,6 +207,52 @@
can be used to temporarily disable
a specific authentication type without having to recompile
@@ -4007,9 +3927,8 @@
.El
.Pp
If the file
-diff -Naur netkit-telnet-0.17/telnetd/telnetd.c
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.c
---- netkit-telnet-0.17/telnetd/telnetd.c 2015-01-27 23:31:03.929546616
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.c 2004-05-27
11:47:27.000000000 +0200
+--- a/telnetd/telnetd.c
++++ b/telnetd/telnetd.c
@@ -75,6 +75,10 @@
static void doit(struct sockaddr *who, socklen_t who_len);
static int terminaltypeok(const char *s);
@@ -4325,9 +4244,8 @@
ncc = read(net, netibuf, sizeof (netibuf));
#endif /* !defined(SO_OOBINLINE)) */
if (ncc < 0 && errno == EWOULDBLOCK)
-diff -Naur netkit-telnet-0.17/telnetd/utility.c
netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/utility.c
---- netkit-telnet-0.17/telnetd/utility.c 2015-01-27 23:31:03.941546616
+0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/utility.c 2004-05-27
11:47:27.000000000 +0200
+--- a/telnetd/utility.c
++++ b/telnetd/utility.c
@@ -63,6 +63,13 @@
static int doclear;
static struct buflist *urg;
@@ -4379,9 +4297,8 @@
case 'h':
if (editedhost) {
putstr(editedhost);
-diff -Naur netkit-telnet-0.17/VERSION
netkit-telnet-ssl-0.17.24+0.1.orig/VERSION
---- netkit-telnet-0.17/VERSION 1970-01-01 01:00:00.000000000 +0100
-+++ netkit-telnet-ssl-0.17.24+0.1.orig/VERSION 2004-05-27 11:47:25.000000000
+0200
+--- /dev/null
++++ b/VERSION
@@ -0,0 +1,118 @@
+Version 0.13 16-Sep-1997 tjh (t...@cryptsoft.com)
+ - CRLF on messages in sslapp.c
diff -Nru
netkit-telnet-ssl-0.17.41+0.2/debian/patches/514-mixed_up_to_24_7_1.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/514-mixed_up_to_24_7_1.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/514-mixed_up_to_24_7_1.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/514-mixed_up_to_24_7_1.diff
2019-02-24 14:38:52.000000000 +0100
@@ -41,19 +41,8 @@
Forwarded: no
Last-Update: 2004-12-05
---- netkit-telnet-ssl-0.17.24+0.1.orig/Makefile
-+++ netkit-telnet-ssl-0.17.24+0.1/Makefile
-@@ -1,7 +1,7 @@
- # You can do "make SUB=blah" to make only a few, or edit here, or both
- # You can also run make directly in the subdirs you want.
-
--SUB = telnet telnetd telnetlogin
-+SUB = libtelnet telnet telnetd telnetlogin
-
- %.build:
- (cd $(patsubst %.build, %, $@) && $(MAKE))
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetlogin/telnetlogin.8
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetlogin/telnetlogin.8
+--- a/telnetlogin/telnetlogin.8
++++ b/telnetlogin/telnetlogin.8
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
@@ -83,8 +72,8 @@
.Pp
THIS IS PRESENTLY EXPERIMENTAL CODE; USE WITH CAUTION.
.Sh HISTORY
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetlogin/telnetlogin.c
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetlogin/telnetlogin.c
+--- a/telnetlogin/telnetlogin.c
++++ b/telnetlogin/telnetlogin.c
@@ -35,7 +35,7 @@
"All rights reserved.\n";
@@ -125,8 +114,8 @@
if (argn < argc && argv[argn][0] != '-') {
argn++;
}
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth-proto.h
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/auth-proto.h
+--- a/libtelnet/auth-proto.h
++++ b/libtelnet/auth-proto.h
@@ -123,7 +123,9 @@
int auth_ssl_status P((Authenticator *, char *, int));
void auth_ssl_printsub P((unsigned char *, int, unsigned char *, int));
@@ -138,8 +127,8 @@
#endif
#ifdef __cplusplus
}
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth.c
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/auth.c
+--- a/libtelnet/auth.c
++++ b/libtelnet/auth.c
@@ -37,6 +37,9 @@
*/
@@ -206,8 +195,8 @@
static void
auth_intr(sig)
int sig;
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc.c
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/misc.c
+--- a/libtelnet/misc.c
++++ b/libtelnet/misc.c
@@ -32,6 +32,9 @@
*/
@@ -231,8 +220,8 @@
char *RemoteHostName;
char *LocalHostName;
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/ssl.c
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/ssl.c
+--- a/libtelnet/ssl.c
++++ b/libtelnet/ssl.c
@@ -47,6 +47,9 @@
#include <string.h>
#endif
@@ -543,8 +532,8 @@
return ok;
}
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/sslapp.h
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/sslapp.h
+--- a/libtelnet/sslapp.h
++++ b/libtelnet/sslapp.h
@@ -45,6 +45,7 @@
#include "x509.h"
#include "ssl.h"
diff -Nru
netkit-telnet-ssl-0.17.41+0.2/debian/patches/516-telnet_up_to_24_7_1.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/516-telnet_up_to_24_7_1.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/516-telnet_up_to_24_7_1.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/516-telnet_up_to_24_7_1.diff
2019-02-24 14:38:52.000000000 +0100
@@ -48,42 +48,8 @@
Forwarded: no
Last-Update: 2005-03-31
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/Makefile
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/Makefile
-@@ -6,15 +6,18 @@
- #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS))
-
- # -DAUTHENTICATE
--CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE
--LIBS = $(LIBTERMCAP)
-+CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -DAUTHENTICATE -DUSE_SSL \
-+ -I/usr/include/openssl -I../
-+LIBTELNET = ../libtelnet/libtelnet.a
-+LIBS += $(LIBTERMCAP) $(LIBTELNET) -lssl -lcrypto
-
- SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \
-- terminal.cc tn3270.cc utilities.cc genget.cc environ.cc netlink.cc
-+ terminal.cc tn3270.cc utilities.cc genget.cc environ.cc netlink.cc \
-+ glue.cc glue2.cc
-
- OBJS = $(patsubst %.cc, %.o, $(SRCS))
-
--telnet: $(OBJS)
-+telnet: $(OBJS) $(LIBTELNET)
- $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
-
- include depend.mk
-@@ -22,7 +25,7 @@
- $(CXX) $(CXXFLAGS) -MM $(SRCS) >depend.mk
-
- install: telnet
-- install -s -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR)/telnet-ssl
-+ install -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR)/telnet-ssl
- install -m$(MANMODE) telnet.1 $(INSTALLROOT)$(MANDIR)/man1/telnet-ssl.1
-
- clean:
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/commands.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/commands.cc
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
@@ -35,7 +35,7 @@
* From: @(#)commands.c 5.5 (Berkeley) 3/22/91
*/
@@ -193,8 +159,8 @@
cmdrc(hostp, hostname, portp);
freeaddrinfo(hostaddr);
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/externs.h
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/externs.h
+--- a/telnet/externs.h
++++ b/telnet/externs.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
@@ -212,8 +178,8 @@
extern int skiprc; /* Don't process the ~/.telnetrc file */
extern int eight; /* use eight bit mode (binary in and/or out) */
extern int binary; /* use binary option (in and/or out) */
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/main.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/main.cc
+--- a/telnet/main.cc
++++ b/telnet/main.cc
@@ -39,7 +39,7 @@
* From: @(#)main.c 5.4 (Berkeley) 3/22/91
*/
@@ -366,8 +332,8 @@
if (argc > 1)
*argp++ = argv[1]; /* port */
*argp = 0;
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/netlink.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/netlink.cc
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
@@ -12,6 +12,7 @@
#include "proto.h"
#include "ring.h"
@@ -412,8 +378,8 @@
ERR_print_errors_fp(stderr);
perror("SSL_connect");
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/proto.h
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/proto.h
+--- a/telnet/proto.h
++++ b/telnet/proto.h
@@ -10,9 +10,11 @@
int TerminalSpecialChars(int);
void TerminalSpeeds(long *ispeed, long *ospeed);
@@ -426,8 +392,8 @@
void cmdrc(const char *, const char *, const char *);
void env_init(void);
int getconnmode(void);
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/telnet.1
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/telnet.1
+--- a/telnet/telnet.1
++++ b/telnet/telnet.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
@@ -687,8 +653,8 @@
.It Ic \&?
Displays the legal
.Ic toggle
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/telnet.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/telnet.cc
+--- a/telnet/telnet.cc
++++ b/telnet/telnet.cc
@@ -47,7 +47,7 @@
* From: @(#)telnet.c 5.53 (Berkeley) 3/22/91
*/
@@ -788,8 +754,8 @@
send_do(TELOPT_STATUS, 1);
if (env_getvalue("DISPLAY", 0))
send_will(TELOPT_XDISPLOC, 1);
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/glue.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/glue.cc
+--- a/telnet/glue.cc
++++ b/telnet/glue.cc
@@ -11,8 +11,9 @@
printsub_h(direction, pointer, length);
}
diff -Nru
netkit-telnet-ssl-0.17.41+0.2/debian/patches/518-telnetd_up_to_24_7_1.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/518-telnetd_up_to_24_7_1.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/518-telnetd_up_to_24_7_1.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/518-telnetd_up_to_24_7_1.diff
2019-02-24 14:38:52.000000000 +0100
@@ -38,34 +38,8 @@
Forwarded: no
Last-Update: 2005-03-31
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/Makefile
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/Makefile
-@@ -9,9 +9,11 @@
- # take out -DPARANOID_TTYS.
-
- CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \
-- -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \
-- -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\"
--# LIBS += $(LIBTERMCAP)
-+ -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS -DAUTHENTICATE \
-+ -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\" \
-+ -DUSE_SSL -I/usr/include/openssl -I..
-+LIBTELNET = ../libtelnet/libtelnet.a
-+LIBS += $(LIBTERMCAP) $(LIBTELNET) -lssl -lcrypto
-
- OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
- global.o setproctitle.o
-@@ -28,7 +30,7 @@
- telnetd.o: ../version.h
-
- install: telnetd
-- install -s -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd
-+ install -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd
- install -m$(MANMODE) issue.net.5 $(INSTALLROOT)$(MANDIR)/man5/
- install -m$(MANMODE) telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/in.telnetd.8
- ln -sf in.telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/telnetd.8
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/ext.h
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/ext.h
+--- a/telnetd/ext.h
++++ b/telnetd/ext.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
@@ -94,8 +68,8 @@
void netopen(void);
#if defined(ENCRYPT)
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/issue.net.5
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/issue.net.5
+--- a/telnetd/issue.net.5
++++ b/telnetd/issue.net.5
@@ -15,7 +15,7 @@
.Pa /etc/issue.net
is a text file which contains a message or system identification to be
@@ -105,8 +79,8 @@
.Ic telnetd :
.Bl -tag -offset indent -compact -width "abcde"
.It %t
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/state.c
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/state.c
+--- a/telnetd/state.c
++++ b/telnetd/state.c
@@ -35,11 +35,12 @@
* From: @(#)state.c 5.10 (Berkeley) 3/22/91
*/
@@ -192,8 +166,8 @@
}
break;
} /* end of case TELOPT_ENVIRON */
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.8
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/telnetd.8
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
@@ -230,8 +204,8 @@
.El
.Sh FILES
.Pa /etc/services ,
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.c
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/telnetd.c
+--- a/telnetd/telnetd.c
++++ b/telnetd/telnetd.c
@@ -39,7 +39,7 @@
* From: @(#)telnetd.c 5.48 (Berkeley) 3/1/91
*/
@@ -250,7 +224,7 @@
/* in secure mode we *must* switch on the base level
* verify checking otherwise we cannot abort connections
* at the right place!
-@@ -571,6 +576,11 @@
+@@ -576,6 +576,11 @@
#ifdef AUTHENTICATE
fprintf(stderr, " [-X auth-type]");
#endif
@@ -262,7 +236,7 @@
fprintf(stderr, "\n");
exit(1);
}
-@@ -596,6 +606,18 @@
+@@ -601,6 +606,18 @@
/*
* Handle the Authentication option before we do anything else.
*/
@@ -281,7 +255,7 @@
send_do(TELOPT_AUTHENTICATION, 1);
while (his_will_wont_is_changing(TELOPT_AUTHENTICATION))
ttloop();
-@@ -654,7 +676,6 @@
+@@ -659,7 +676,6 @@
send_do(TELOPT_TTYPE, 1);
send_do(TELOPT_TSPEED, 1);
send_do(TELOPT_XDISPLOC, 1);
@@ -289,7 +263,7 @@
while (
#if defined(ENCRYPT)
his_do_dont_is_changing(TELOPT_ENCRYPT) ||
-@@ -698,10 +719,6 @@
+@@ -703,10 +719,6 @@
while (sequenceIs(xdisplocsubopt, baseline))
ttloop();
}
@@ -300,7 +274,7 @@
if (his_state_is_will(TELOPT_TTYPE)) {
char first[256], last[256];
-@@ -852,7 +869,7 @@
+@@ -857,7 +869,7 @@
static void
doit(struct sockaddr *who, socklen_t who_len)
{
@@ -309,8 +283,8 @@
int level;
char user_name[256];
int i;
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/utility.c
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/utility.c
+--- a/telnetd/utility.c
++++ b/telnetd/utility.c
@@ -35,7 +35,7 @@
* From: @(#)utility.c 5.8 (Berkeley) 3/22/91
*/
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/patches/530-from_14_to_21.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/530-from_14_to_21.diff
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/530-from_14_to_21.diff
2017-01-10 23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/530-from_14_to_21.diff
2019-02-24 14:38:52.000000000 +0100
@@ -19,38 +19,8 @@
Forwarded: no
Last-Update: 2007-10-04
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/Makefile
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/Makefile
-@@ -3,12 +3,15 @@
- include ../MCONFIG
- include ../MRULES
-
-+# ignore imported LIBS value, drags in too much
-+LIBS=
-+
- #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS))
-
- # -DAUTHENTICATE
- CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -DAUTHENTICATE -DUSE_SSL \
- -I/usr/include/openssl -I../
--LIBTELNET = ../libtelnet/libtelnet.a
-+LIBTELNET = ../libtelnet/libtelnet.a
- LIBS += $(LIBTERMCAP) $(LIBTELNET) -lssl -lcrypto
-
- SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \
-@@ -16,9 +19,8 @@
- glue.cc glue2.cc
-
- OBJS = $(patsubst %.cc, %.o, $(SRCS))
--
- telnet: $(OBJS) $(LIBTELNET)
-- $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
-+ $(CXX) -static-libgcc $(LDFLAGS) $^ $(LIBS) -o $@
-
- include depend.mk
- depend:
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/commands.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/commands.cc
+--- a/telnet/commands.cc
++++ b/telnet/commands.cc
@@ -35,7 +35,7 @@
* From: @(#)commands.c 5.5 (Berkeley) 3/22/91
*/
@@ -75,8 +45,8 @@
};
static int auth_help (const char *, const char *);
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnet/netlink.cc
-+++ netkit-telnet-ssl-0.17.24+0.1/telnet/netlink.cc
+--- a/telnet/netlink.cc
++++ b/telnet/netlink.cc
@@ -19,6 +19,20 @@
#define HAS_IPPROTO_IP
#endif
@@ -136,19 +106,8 @@
if (!local_host[0]) {
gethostname(local_host, len); /* WAS &len!!! */
local_host[sizeof(local_host)-1] = 0;
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/Makefile
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/Makefile
-@@ -13,7 +13,7 @@
- -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\" \
- -DUSE_SSL -I/usr/include/openssl -I..
- LIBTELNET = ../libtelnet/libtelnet.a
--LIBS += $(LIBTERMCAP) $(LIBTELNET) -lssl -lcrypto
-+LIBS += $(LIBTELNET) -lssl -lcrypto
-
- OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
- global.o setproctitle.o
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetd/telnetd.8
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetd/telnetd.8
+--- a/telnetd/telnetd.8
++++ b/telnetd/telnetd.8
@@ -315,7 +315,7 @@
.Ed
.Pp
@@ -158,8 +117,8 @@
.Dv XTABS
.Dv CRMOD
enabled (see
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth-proto.h
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/auth-proto.h
+--- a/libtelnet/auth-proto.h
++++ b/libtelnet/auth-proto.h
@@ -68,7 +68,7 @@
#if defined(AUTHENTICATE)
Authenticator *findauthenticator P((int, int));
@@ -169,8 +128,8 @@
int auth_cmd P((int, char **));
void auth_request P((void));
void auth_send P((unsigned char *, int));
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/auth.c
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/auth.c
+--- a/libtelnet/auth.c
++++ b/libtelnet/auth.c
@@ -90,7 +90,7 @@
@@ -189,8 +148,8 @@
int server;
{
Authenticator *ap = authenticators;
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc.c
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/misc.c
+--- a/libtelnet/misc.c
++++ b/libtelnet/misc.c
@@ -73,7 +73,7 @@
auth_encrypt_init(local, remote, name, server)
char *local;
@@ -200,20 +159,8 @@
int server;
{
RemoteHostName = remote;
---- netkit-telnet-ssl-0.17.24+0.1.orig/telnetlogin/Makefile
-+++ netkit-telnet-ssl-0.17.24+0.1/telnetlogin/Makefile
-@@ -3,6 +3,9 @@
- include ../MCONFIG
- include ../MRULES
-
-+# ignore imported LIBS value, drags in too much
-+LIBS=
-+
- OBJS = telnetlogin.o
-
- telnetlogin: $(OBJS)
---- netkit-telnet-ssl-0.17.24+0.1.orig/libtelnet/misc-proto.h
-+++ netkit-telnet-ssl-0.17.24+0.1/libtelnet/misc-proto.h
+--- a/libtelnet/misc-proto.h
++++ b/libtelnet/misc-proto.h
@@ -68,7 +68,7 @@
extern "C" {
#endif
diff -Nru
netkit-telnet-ssl-0.17.41+0.2/debian/patches/620-do_not_strip_telnetlogin.diff
netkit-telnet-ssl-0.17.41+0.2/debian/patches/620-do_not_strip_telnetlogin.diff
---
netkit-telnet-ssl-0.17.41+0.2/debian/patches/620-do_not_strip_telnetlogin.diff
2017-01-10 23:04:09.000000000 +0100
+++
netkit-telnet-ssl-0.17.41+0.2/debian/patches/620-do_not_strip_telnetlogin.diff
1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-Description: Do not strip during install.
- Any stription must be left to package building tools. Only telnetlogin
- was left unattended, since telnet and telnetd ware fixed before package
- 0.17.24+0.1-7.1.
-
-Author: Mats Erik Andersson <deb...@gisladisker.se>
-Forwarded: no
-Last-Update: 2015-03-07
-
---- netkit-telnet-ssl-0.17.24+0.2/telnetlogin/Makefile.orig
-+++ netkit-telnet-ssl-0.17.24+0.2/telnetlogin/Makefile
-@@ -14,7 +14,7 @@
- $(OBJS): ../version.h
-
- install: telnetlogin
-- install -s -m4750 -oroot -gtelnetd telnetlogin $(INSTALLROOT)$(SBINDIR)
-+ install -m4750 -oroot -gtelnetd telnetlogin $(INSTALLROOT)$(SBINDIR)
- install -m$(MANMODE) telnetlogin.8 $(INSTALLROOT)$(MANDIR)/man8
-
- clean:
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/patches/series
netkit-telnet-ssl-0.17.41+0.2/debian/patches/series
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/series 2017-01-17
00:00:11.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/series 2019-02-24
14:38:52.000000000 +0100
@@ -47,11 +47,9 @@
130-drain_input_from_child.diff
600-better_diagnostic.diff
610-support_uservar.diff
-620-do_not_strip_telnetlogin.diff
### Now at source equivalent to netkit-telnet_0.17-39!
-150-cross_configure.diff
### Now at source equivalent to netkit-telnet_0.17-41!
@@ -61,3 +59,6 @@
# Begin expanding on abilities not present in legacy SSL code.
#
650-improve_abilities.diff
+
+use-cmake-as-buildsystem.patch
+use-cmake-as-buildsystem-debian-extras.patch
diff -Nru
netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
---
netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
1970-01-01 01:00:00.000000000 +0100
+++
netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem-debian-extras.patch
2019-02-24 14:38:52.000000000 +0100
@@ -0,0 +1,38 @@
+Description: Debian-specific changes to the cmake build system
+Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
+Forwarded: not-needed
+Last-Update: 2019-02-24
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,14 +10,18 @@
+ set(
+ CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+ -D_GNU_SOURCE \
++ -Ddebian \
+ -DACCEPT_USERVAR \
++ -DSSL_LOG_FILE='\"/var/tmp/telnetd.log\"' \
+ -Wall \
+ -Wno-trigraphs \
+ ")
+ set(
+ CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
+ -D_GNU_SOURCE \
++ -Ddebian \
+ -DACCEPT_USERVAR \
++ -DSSL_LOG_FILE='\"/var/tmp/telnetd.log\"' \
+ -Wall \
+ -Wno-trigraphs \
+ ")
+--- a/telnetd/CMakeLists.txt
++++ b/telnetd/CMakeLists.txt
+@@ -52,9 +52,3 @@
+ DESTINATION ${MAN_DIR}/man8/
+ RENAME in.telnetd.8
+ )
+-install(
+- CODE "execute_process( \
+- COMMAND ${CMAKE_COMMAND} -E create_symlink \
+- in.telnetd.8 \$ENV{DESTDIR}${MAN_DIR}/man8/telnetd.8 \
+- )"
+-)
diff -Nru
netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem.patch
netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem.patch
--- netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem.patch
1970-01-01 01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/patches/use-cmake-as-buildsystem.patch
2019-02-24 14:38:52.000000000 +0100
@@ -0,0 +1,195 @@
+Description: Use cmake as build system
+Author: Christoph Biedl <debian.a...@manchmal.in-ulm.de>
+Bug-Debian: https://bugs.debian.org/912132
+Last-Update: 2019-02-24
+
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,30 @@
++cmake_minimum_required(VERSION 3.7)
++project(netkit-telnet-ssl)
++
++set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
++set(SBIN_DIR "${CMAKE_INSTALL_PREFIX}/sbin")
++set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man")
++
++set(USE_GLIBC 1)
++
++set(
++ CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
++ -D_GNU_SOURCE \
++ -DACCEPT_USERVAR \
++ -Wall \
++ -Wno-trigraphs \
++")
++set(
++ CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
++ -D_GNU_SOURCE \
++ -DACCEPT_USERVAR \
++ -Wall \
++ -Wno-trigraphs \
++")
++
++find_library(USE_TERMCAP lncurses REQUIRED)
++
++add_subdirectory(telnet)
++add_subdirectory(telnetd)
++add_subdirectory(telnetlogin)
++add_subdirectory(libtelnet)
+--- /dev/null
++++ b/telnet/CMakeLists.txt
+@@ -0,0 +1,49 @@
++
++include_directories(
++ BEFORE
++ /usr/include/openssl
++ ..
++)
++
++set(
++ CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
++ -DUSE_TERMIO \
++ -DKLUDGELINEMODE \
++ -DAUTHENTICATE \
++ -DUSE_SSL \
++")
++
++add_executable(
++ telnet-ssl
++ commands.cc
++ environ.cc
++ genget.cc
++ main.cc
++ netlink.cc
++ network.cc
++ ring.cc
++ sys_bsd.cc
++ telnet.cc
++ terminal.cc
++ tn3270.cc
++ utilities.cc
++ glue.cc
++ glue2.cc
++)
++target_link_libraries(
++ telnet-ssl
++ crypto
++ curses
++ ssl
++ libtelnet
++)
++install(
++ TARGETS telnet-ssl
++ DESTINATION ${BIN_DIR}
++)
++
++install(
++ FILES telnet.1
++ DESTINATION ${MAN_DIR}/man1/
++ RENAME telnet-ssl.1
++)
+--- /dev/null
++++ b/telnetd/CMakeLists.txt
+@@ -0,0 +1,60 @@
++
++include_directories(
++ BEFORE
++ /usr/include/openssl
++ ..
++)
++
++set(CMAKE_C_FLAGS "\
++ ${CMAKE_C_FLAGS} \
++ -DISSUE_FILE='\"/etc/issue.net\"' \
++ -DPARANOID_TTYS \
++ -DNO_REVOKE \
++ -DKLUDGELINEMODE \
++ -DDIAGNOSTICS \
++ -DAUTHENTICATE \
++ -DLOGIN_WRAPPER='\"/usr/lib/telnetlogin\"' \
++ -DUSE_SSL \
++")
++
++add_executable(
++ in.telnetd
++ global.c
++ setproctitle.c
++ slc.c
++ state.c
++ sys_term.c
++ telnetd.c
++ termstat.c
++ utility.c
++)
++target_link_libraries(
++ in.telnetd
++ ncurses
++ util
++ ssl
++ crypto
++ crypt
++ libtelnet
++)
++install(
++ TARGETS in.telnetd
++ DESTINATION ${SBIN_DIR}
++)
++
++install(
++ FILES issue.net.5
++ DESTINATION ${MAN_DIR}/man5/
++)
++
++install(
++ FILES telnetd.8
++ DESTINATION ${MAN_DIR}/man8/
++ RENAME in.telnetd.8
++)
++install(
++ CODE "execute_process( \
++ COMMAND ${CMAKE_COMMAND} -E create_symlink \
++ in.telnetd.8 \$ENV{DESTDIR}${MAN_DIR}/man8/telnetd.8 \
++ )"
++)
+--- /dev/null
++++ b/telnetlogin/CMakeLists.txt
+@@ -0,0 +1,14 @@
++
++add_executable(
++ telnetlogin
++ telnetlogin.c
++)
++install(
++ TARGETS telnetlogin
++ DESTINATION ${BIN_DIR}
++)
++
++install(
++ FILES telnetlogin.8
++ DESTINATION ${MAN_DIR}/man8/
++)
+--- /dev/null
++++ b/libtelnet/CMakeLists.txt
+@@ -0,0 +1,22 @@
++
++include_directories(
++ BEFORE
++ /usr/include/openssl
++ .
++)
++
++set(
++ CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
++ -DUSE_TERMIO \
++ -DKLUDGELINEMODE \
++ -DAUTHENTICATE \
++ -DUSE_SSL \
++")
++
++add_library(
++ libtelnet
++ auth.c
++ misc.c
++ ssl.c
++ sslapp.c
++)
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/postinst
netkit-telnet-ssl-0.17.41+0.2/debian/postinst
--- netkit-telnet-ssl-0.17.41+0.2/debian/postinst 2017-01-10
23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/postinst 1970-01-01
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install /usr/bin/telnet telnet /usr/bin/telnet-ssl 110 \
- --slave /usr/share/man/man1/telnet.1.gz telnet.1.gz \
- /usr/share/man/man1/telnet-ssl.1.gz
-
-#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/preinst
netkit-telnet-ssl-0.17.41+0.2/debian/preinst
--- netkit-telnet-ssl-0.17.41+0.2/debian/preinst 2017-01-10
23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/preinst 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dpkg-divert --quiet --package ssltelnet --remove --rename \
- --divert /usr/bin/telnet.nossl /usr/bin/telnet
-dpkg-divert --quiet --package ssltelnet --remove --rename \
- --divert /usr/man/man1/telnet.nossl.1.gz
/usr/man/man1/telnet.1.gz
-
-#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/prerm
netkit-telnet-ssl-0.17.41+0.2/debian/prerm
--- netkit-telnet-ssl-0.17.41+0.2/debian/prerm 2017-01-10 23:04:09.000000000
+0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/prerm 1970-01-01 01:00:00.000000000
+0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
- update-alternatives --remove telnet /usr/bin/telnet-ssl
-fi
-
-#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/rules
netkit-telnet-ssl-0.17.41+0.2/debian/rules
--- netkit-telnet-ssl-0.17.41+0.2/debian/rules 2017-01-21 23:04:52.000000000
+0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/rules 2019-02-24 14:38:52.000000000
+0100
@@ -1,107 +1,7 @@
#!/usr/bin/make -f
-# $Id: rules,v 1.6 2007-08-06 16:30:01 ianb Exp $
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --buildsystem=cmake
-LDDEFS := -Wl,-z,defs -Wl,--as-needed
-
-CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -fPIE -pie
-CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS) -fPIE -pie
-CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
-DSSL_LOG_FILE=\\"/var/tmp/telnetd.log\\"
-LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,now
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifeq ($(origin CC),default)
- CC = $(DEB_HOST_GNU_TYPE)-gcc
-endif
-export CC
-ifeq ($(origin CXX),default)
- CXX = $(DEB_HOST_GNU_TYPE)-g++
-endif
-export CXX
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CONFIGUREARGS=--with-debug
-else
- CONFIGUREARGS=
-endif
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- dh_testdir
-
- if [ ! -f MCONFIG ]; then \
- ./configure $(CONFIGUREARGS); \
- sed -e 's;^CFLAGS=\(.*\)$$;CFLAGS= -Ddebian -D_GNU_SOURCE
-DACCEPT_USERVAR -g $(CFLAGS) $(CPPFLAGS) \1;' \
- -e 's;^CXXFLAGS=\(.*\)$$;CXXFLAGS= -Ddebian -D_GNU_SOURCE
-DACCEPT_USERVAR -g $(CXXFLAGS) $(CPPFLAGS) \1;' \
- -e 's;^LDFLAGS=\(.*\)$$;& $(LDDEFS) $(LDFLAGS);' \
- MCONFIG > MCONFIG.new; \
- mv MCONFIG.new MCONFIG; \
- fi
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
- [ ! -f MCONFIG ] || $(MAKE) distclean
- rm -f debian/telnetd-ssl.dirs debian/telnetd-ssl.postinst
debian/telnetd-ssl.postrm debian/telnetd-ssl.prerm
-
- dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
- cp debian/telnetd.dirs debian/telnetd-ssl.dirs
- cp debian/telnetd.postinst debian/telnetd-ssl.postinst
- cp debian/telnetd.postrm debian/telnetd-ssl.postrm
- cp debian/telnetd.prerm debian/telnetd-ssl.prerm
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) -C telnet INSTALLROOT=$(CURDIR)/debian/telnet-ssl
MANDIR=/usr/share/man \
- install
-# mv debian/tmp/usr/bin/telnet debian/tmp/usr/bin/telnet.netkit
-# mv debian/tmp/usr/share/man/man1/telnet.1 \
-# debian/tmp/usr/share/man/man1/telnet.netkit.1
- cp telnet/README
debian/telnet-ssl/usr/share/doc/telnet-ssl/README.telnet
- cp telnet/README.old
debian/telnet-ssl/usr/share/doc/telnet-ssl/README.telnet.old
- $(MAKE) -C telnetd INSTALLROOT=$(CURDIR)/debian/telnetd-ssl \
- MANDIR=/usr/share/man install
- cp telnetlogin/telnetlogin.8 debian/telnetd-ssl/usr/share/man/man8
- cp telnetlogin/telnetlogin debian/telnetd-ssl/usr/lib
- cp debian/openssl.cnf debian/telnetd-ssl/etc/telnetd-ssl
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installmenu
- dh_installchangelogs ChangeLog
- dh_lintian
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_missing:
+ dh_missing --fail-missing
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.docs
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.docs
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.docs 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.docs 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,5 @@
+
+README.SSL
+VERSION
+telnet/README
+telnet/README.old
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.install
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.install
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.install 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.install 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,2 @@
+
+usr/bin/telnet-ssl
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.manpages
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.manpages
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.manpages 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.manpages 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/man/man1/telnet-ssl.1
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.menu
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.menu
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.menu 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.menu 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,3 @@
+?package(telnet-ssl): \
+ needs="text" section="Applications/Network/Communication" \
+ title="Telnet-SSL" command="/usr/bin/telnet-ssl" hints="Terminal"
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.postinst
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.postinst
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.postinst 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.postinst 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/bin/telnet telnet /usr/bin/telnet-ssl 110 \
+ --slave /usr/share/man/man1/telnet.1.gz telnet.1.gz \
+ /usr/share/man/man1/telnet-ssl.1.gz
+
+#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.preinst
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.preinst
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.preinst 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.preinst 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+dpkg-divert --quiet --package ssltelnet --remove --rename \
+ --divert /usr/bin/telnet.nossl /usr/bin/telnet
+dpkg-divert --quiet --package ssltelnet --remove --rename \
+ --divert /usr/man/man1/telnet.nossl.1.gz
/usr/man/man1/telnet.1.gz
+
+#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.prerm
netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.prerm
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.prerm 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnet-ssl.prerm 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
+ update-alternatives --remove telnet /usr/bin/telnet-ssl
+fi
+
+#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.docs
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.docs
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.docs 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.docs 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1 @@
+README
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.install
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.install
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.install 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.install 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,5 @@
+
+usr/sbin/in.telnetd
+usr/bin/telnetlogin usr/lib/
+
+debian/openssl.cnf etc/telnetd-ssl/
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.manpages
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.manpages
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.manpages 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.manpages 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,4 @@
+
+debian/tmp/usr/share/man/man5/issue.net.5
+debian/tmp/usr/share/man/man8/in.telnetd.8
+debian/tmp/usr/share/man/man8/telnetlogin.8
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postinst
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postinst
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postinst 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postinst 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,136 @@
+#!/bin/sh
+
+set -e
+
+update_inetd_entry() {
+ if [ "$2" = "yes" ]; then
+ entry="$telnetdsslent"
+ else
+ entry="$rootent"
+ fi
+ args="`grep '^#<off>#.*/usr/sbin/in.telnetd' /etc/inetd.conf
2>/dev/null|sed 's/.*\/usr\/sbin\/in.telnetd\(.*\)/\1/'`"
+ if [ -n "$args" ]; then
+ entry="$entry$args"
+ fi
+ update-inetd --remove ".*telnet"
+ update-inetd --group STANDARD --add "$entry"
+}
+
+
+if ! id -u telnetd-ssl >/dev/null 2>&1 ; then
+ # rename telnetd user to telnetd-ssl
+ if id -u telnetd >/dev/null 2>&1; then
+ home=~telnetd
+ set +e
+ userdel telnetd
+ err=$?
+ set -e
+ case $err in
+ 0)
+ if [ "$home" = /usr/lib/telnetd ]; then
+ rmdir --ignore-fail-on-non-empty /usr/lib/telnetd ||
true
+ fi
+ ;;
+ 6)
+ ;;
+ *)
+ exit $err
+ ;;
+ esac
+ fi
+ if getent group telnetd > /dev/null ; then
+ groupdel telnetd
+ fi
+ if getent group telnetd-ssl > /dev/null ; then
+ adduser --quiet --no-create-home --disabled-password --system --ingroup
telnetd-ssl --home /nonexistent telnetd-ssl
+ else
+ adduser --quiet --no-create-home --disabled-password --system --group
--home /nonexistent telnetd-ssl
+ fi
+fi
+
+adduser --quiet telnetd-ssl utmp
+
+if [ -z "$(dpkg-statoverride --list /usr/lib/telnetlogin)" ]; then
+ chown root:telnetd-ssl /usr/lib/telnetlogin
+ chmod 4754 /usr/lib/telnetlogin
+fi
+
+rootent="telnet stream tcp nowait root /usr/sbin/tcpd
/usr/sbin/in.telnetd"
+#telnetdent="telnet stream tcp nowait telnetd.telnetd
/usr/sbin/tcpd /usr/sbin/in.telnetd"
+telnetdsslent="telnet stream tcp nowait telnetd-ssl
/usr/sbin/tcpd /usr/sbin/in.telnetd"
+
+if egrep -q "^(devpts /dev/pts|devfs /dev) " /proc/mounts; then
+ devpts=yes
+else
+ devpts=
+fi
+
+case "$1" in
+abort-upgrade | abort-deconfigure | abort-remove)
+ if test -x /usr/sbin/inetd ; then
+ update-inetd --enable telnet
+ fi
+ ;;
+configure)
+ if test -x /usr/sbin/update-inetd ; then
+ if [ -z "$2" ] ||
+ dpkg --compare-versions "$2" lt 0.17.24+0.1-14 ||
+ ( test -f /etc/inetd.conf &&
+ grep -q '[ ]telnetd[ ]' /etc/inetd.conf )
+ then
+ update_inetd_entry "$2" $devpts
+ else
+ update-inetd --enable telnet
+ fi
+ fi
+ ;;
+*)
+ printf "$0: incorrect arguments: $*\n" >&2
+ exit 1
+ ;;
+esac
+
+PATH=$PATH:/usr/bin/ssl
+if [ -f /etc/ssl/certs/telnetd.pem ]
+then
+ echo "Moving telnetd.pem to /etc/telnetd-ssl"
+ mv /etc/ssl/certs/telnetd.pem /etc/telnetd-ssl
+ # remove old cert hash - don't care if it fails
+ rm -f `openssl x509 -noout -hash < /etc/telnetd-ssl/telnetd.pem`.0 ||
true
+elif [ -f /etc/telnetd-ssl/telnetd.pem ]
+then
+ echo "You already have /etc/telnetd-ssl/telnetd.pem"
+else
+ cd /etc/telnetd-ssl
+
+ # Implement removal of any newly created seed file.
+ # 'openssl req' regularly creates RANDFILE or '~/.rnd'.
+ MYRANDFILE=${RANDFILE:-~/.rnd}
+ NEW__RND=
+ test -f "$MYRANDFILE" || NEW__RND=yes
+
+ HSTNAME=`hostname -s`
+ DOMAINNAME=`hostname -d`
+ openssl req -config /etc/telnetd-ssl/openssl.cnf -new -x509 -nodes -out
telnetd.pem -keyout telnetd.pem > /dev/null 2>&1 <<+
+.
+.
+.
+$DOMAINNAME
+$HSTNAME telnetd
+$HSTNAME${DOMAINNAME:+.$DOMAINNAME}
+root@$HSTNAME${DOMAINNAME:+.$DOMAINNAME}
++
+# req -new -x509 -nodes -out telnetd.pem -keyout telnetd.pem
+# ln -sf telnetd.pem `openssl x509 -noout -hash < telnetd.pem`.0
+# chmod 644 telnetd.pem
+
+ if test x$NEW__RND = xyes && test -f "$MYRANDFILE"
+ then
+ rm "$MYRANDFILE"
+ fi
+fi
+
+chown root:telnetd-ssl /etc/telnetd-ssl/telnetd.pem
+chmod 0640 /etc/telnetd-ssl/telnetd.pem
+
+#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postrm
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postrm
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postrm 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.postrm 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,69 @@
+#!/bin/sh -e
+# $Id: telnetd.postrm,v 1.7 2006-06-16 18:43:11 ianb Exp $
+
+case "$1" in
+abort-install | abort-upgrade | upgrade | failed-upgrade)
+ ;;
+remove | disappear)
+ # telnetd user evidently once had a home, telnetd-ssl user never did.
+ home=~telnetd
+ set +e
+ userdel telnetd >/dev/null 2>&1
+ err=$?
+ set -e
+ case $err in
+ 0)
+ if [ "$home" = /usr/lib/telnetd ]; then
+ rmdir --ignore-fail-on-non-empty /usr/lib/telnetd ||
true
+ fi
+ ;;
+ 6)
+ ;;
+ *)
+ exit $err
+ ;;
+ esac
+
+ set +e
+ userdel telnetd-ssl >/dev/null 2>&1
+ err=$?
+ set -e
+ case $err in
+ 0 | 6)
+ ;;
+ *)
+ exit $err
+ ;;
+ esac
+
+ set +e
+ groupdel telnetd >/dev/null 2>&1
+ err=$?
+ set -e
+ case $err in
+ 0 | 6)
+ ;;
+ *)
+ exit $err
+ ;;
+ esac
+ ;;
+purge)
+ # If update-inetd is not installed, then we don't need to do the remove.
+ if test -x /usr/sbin/update-inetd; then
+ update-inetd --remove "#<off># telnet"
+ fi
+ cd /etc/telnetd-ssl
+ PATH=$PATH:/usr/bin/ssl
+# rm -f `openssl x509 -noout -hash < telnetd.pem`.0
+ rm -f telnetd.pem
+ ;;
+*)
+ echo "$0: incorrect arguments: $*" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.prerm
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.prerm
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.prerm 1970-01-01
01:00:00.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd-ssl.prerm 2019-02-24
14:38:52.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if test -x /usr/sbin/update-inetd ; then
+ update-inetd --disable telnet
+fi
+
+
+#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.dirs
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.dirs
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.dirs 2017-01-10
23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.dirs 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/lib
-usr/share/man/man5
-usr/share/man/man8
-usr/sbin
-/etc/telnetd-ssl
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.docs
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.docs
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.docs 2017-01-10
23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.docs 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-BUGS
-README
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postinst
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postinst
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postinst 2018-07-28
16:14:32.000000000 +0200
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postinst 1970-01-01
01:00:00.000000000 +0100
@@ -1,136 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update_inetd_entry() {
- if [ "$2" = "yes" ]; then
- entry="$telnetdsslent"
- else
- entry="$rootent"
- fi
- args="`grep '^#<off>#.*/usr/sbin/in.telnetd' /etc/inetd.conf
2>/dev/null|sed 's/.*\/usr\/sbin\/in.telnetd\(.*\)/\1/'`"
- if [ -n "$args" ]; then
- entry="$entry$args"
- fi
- update-inetd --remove ".*telnet"
- update-inetd --group STANDARD --add "$entry"
-}
-
-
-if ! id -u telnetd-ssl >/dev/null 2>&1 ; then
- # rename telnetd user to telnetd-ssl
- if id -u telnetd >/dev/null 2>&1; then
- home=~telnetd
- set +e
- userdel telnetd
- err=$?
- set -e
- case $err in
- 0)
- if [ "$home" = /usr/lib/telnetd ]; then
- rmdir --ignore-fail-on-non-empty /usr/lib/telnetd ||
true
- fi
- ;;
- 6)
- ;;
- *)
- exit $err
- ;;
- esac
- fi
- if getent group telnetd > /dev/null ; then
- groupdel telnetd
- fi
- if getent group telnetd-ssl > /dev/null ; then
- adduser --quiet --no-create-home --disabled-password --system --ingroup
telnetd-ssl --home /nonexistent telnetd-ssl
- else
- adduser --quiet --no-create-home --disabled-password --system --group
--home /nonexistent telnetd-ssl
- fi
-fi
-
-adduser --quiet telnetd-ssl utmp
-
-if [ -z "$(dpkg-statoverride --list /usr/lib/telnetlogin)" ]; then
- chown root:telnetd-ssl /usr/lib/telnetlogin
- chmod 4754 /usr/lib/telnetlogin
-fi
-
-rootent="telnet stream tcp nowait root /usr/sbin/tcpd
/usr/sbin/in.telnetd"
-#telnetdent="telnet stream tcp nowait telnetd.telnetd
/usr/sbin/tcpd /usr/sbin/in.telnetd"
-telnetdsslent="telnet stream tcp nowait telnetd-ssl
/usr/sbin/tcpd /usr/sbin/in.telnetd"
-
-if egrep -q "^(devpts /dev/pts|devfs /dev) " /proc/mounts; then
- devpts=yes
-else
- devpts=
-fi
-
-case "$1" in
-abort-upgrade | abort-deconfigure | abort-remove)
- if test -x /usr/sbin/inetd ; then
- update-inetd --enable telnet
- fi
- ;;
-configure)
- if test -x /usr/sbin/update-inetd ; then
- if [ -z "$2" ] ||
- dpkg --compare-versions "$2" lt 0.17.24+0.1-14 ||
- ( test -f /etc/inetd.conf &&
- grep -q '[ ]telnetd[ ]' /etc/inetd.conf )
- then
- update_inetd_entry "$2" $devpts
- else
- update-inetd --enable telnet
- fi
- fi
- ;;
-*)
- printf "$0: incorrect arguments: $*\n" >&2
- exit 1
- ;;
-esac
-
-PATH=$PATH:/usr/bin/ssl
-if [ -f /etc/ssl/certs/telnetd.pem ]
-then
- echo "Moving telnetd.pem to /etc/telnetd-ssl"
- mv /etc/ssl/certs/telnetd.pem /etc/telnetd-ssl
- # remove old cert hash - don't care if it fails
- rm -f `openssl x509 -noout -hash < /etc/telnetd-ssl/telnetd.pem`.0 ||
true
-elif [ -f /etc/telnetd-ssl/telnetd.pem ]
-then
- echo "You already have /etc/telnetd-ssl/telnetd.pem"
-else
- cd /etc/telnetd-ssl
-
- # Implement removal of any newly created seed file.
- # 'openssl req' regularly creates RANDFILE or '~/.rnd'.
- MYRANDFILE=${RANDFILE:-~/.rnd}
- NEW__RND=
- test -f "$MYRANDFILE" || NEW__RND=yes
-
- HSTNAME=`hostname -s`
- DOMAINNAME=`hostname -d`
- openssl req -config /etc/telnetd-ssl/openssl.cnf -new -x509 -nodes -out
telnetd.pem -keyout telnetd.pem > /dev/null 2>&1 <<+
-.
-.
-.
-$DOMAINNAME
-$HSTNAME telnetd
-$HSTNAME${DOMAINNAME:+.$DOMAINNAME}
-root@$HSTNAME${DOMAINNAME:+.$DOMAINNAME}
-+
-# req -new -x509 -nodes -out telnetd.pem -keyout telnetd.pem
-# ln -sf telnetd.pem `openssl x509 -noout -hash < telnetd.pem`.0
-# chmod 644 telnetd.pem
-
- if test x$NEW__RND = xyes && test -f "$MYRANDFILE"
- then
- rm "$MYRANDFILE"
- fi
-fi
-
-chown root:telnetd-ssl /etc/telnetd-ssl/telnetd.pem
-chmod 0640 /etc/telnetd-ssl/telnetd.pem
-
-#DEBHELPER#
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postrm
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postrm
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postrm 2017-01-10
23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.postrm 1970-01-01
01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-#!/bin/sh -e
-# $Id: telnetd.postrm,v 1.7 2006-06-16 18:43:11 ianb Exp $
-
-case "$1" in
-abort-install | abort-upgrade | upgrade | failed-upgrade)
- ;;
-remove | disappear)
- # telnetd user evidently once had a home, telnetd-ssl user never did.
- home=~telnetd
- set +e
- userdel telnetd >/dev/null 2>&1
- err=$?
- set -e
- case $err in
- 0)
- if [ "$home" = /usr/lib/telnetd ]; then
- rmdir --ignore-fail-on-non-empty /usr/lib/telnetd ||
true
- fi
- ;;
- 6)
- ;;
- *)
- exit $err
- ;;
- esac
-
- set +e
- userdel telnetd-ssl >/dev/null 2>&1
- err=$?
- set -e
- case $err in
- 0 | 6)
- ;;
- *)
- exit $err
- ;;
- esac
-
- set +e
- groupdel telnetd >/dev/null 2>&1
- err=$?
- set -e
- case $err in
- 0 | 6)
- ;;
- *)
- exit $err
- ;;
- esac
- ;;
-purge)
- # If update-inetd is not installed, then we don't need to do the remove.
- if test -x /usr/sbin/update-inetd; then
- update-inetd --remove "#<off># telnet"
- fi
- cd /etc/telnetd-ssl
- PATH=$PATH:/usr/bin/ssl
-# rm -f `openssl x509 -noout -hash < telnetd.pem`.0
- rm -f telnetd.pem
- ;;
-*)
- echo "$0: incorrect arguments: $*" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Nru netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.prerm
netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.prerm
--- netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.prerm 2017-01-10
23:04:09.000000000 +0100
+++ netkit-telnet-ssl-0.17.41+0.2/debian/telnetd.prerm 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if test -x /usr/sbin/update-inetd ; then
- update-inetd --disable telnet
-fi
-
-
-#DEBHELPER#
signature.asc
Description: PGP signature
