rpms/telnet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import telnet-0.17-7 from telnet-0.17-7.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 13:08:52 +00:00
parent 38a378e9c2
commit b431f48e75
5 changed files with 353 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -0,0 +1,2 @@
netkit-telnet-0.17-pre20000412.tar.gz
telnet-client.tar.gz

2
sources
View File

@ -0,0 +1,2 @@
e2d1af881cd1527dd30f4d4551000cf6 netkit-telnet-0.17-pre20000412.tar.gz
d74983062470c5a3e7ae14f34c489e00 telnet-client.tar.gz

156
telnet-0.17-env.patch Normal file
View File

@ -0,0 +1,156 @@
--- netkit-telnet-0.17-pre-20000204/telnet/commands.c.env Thu Apr 8 19:30:20 1999
+++ netkit-telnet-0.17-pre-20000204/telnet/commands.c Tue May 16 17:19:47 2000
@@ -1815,11 +1815,11 @@
}
unsigned char *
-env_getvalue(unsigned char *var)
+env_getvalue(unsigned char *var, int exported_only)
{
- struct env_lst *ep;
+ struct env_lst *ep = env_find(var);
- if ((ep = env_find(var)))
+ if (ep && (!exported_only || ep->export))
return(ep->value);
return(NULL);
}
--- netkit-telnet-0.17-pre-20000204/telnet/telnet.c.env Tue May 16 17:19:47 2000
+++ netkit-telnet-0.17-pre-20000204/telnet/telnet.c Tue May 16 17:19:47 2000
@@ -438,7 +438,7 @@
#endif
case TELOPT_XDISPLOC: /* X Display location */
- if (env_getvalue((unsigned char *)"DISPLAY"))
+ if (env_getvalue((unsigned char *)"DISPLAY", 0))
new_state_ok = 1;
break;
@@ -693,7 +693,7 @@
resettermname = 0;
if (tnamep && tnamep != unknown)
free(tnamep);
- if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) &&
+ if ((tname = (char *)env_getvalue((unsigned char *)"TERM", 0)) &&
(telnet_setupterm(tname, 1, &err) == 0)) {
tnamep = mklist(termbuf, tname);
} else {
@@ -870,7 +870,7 @@
unsigned char temp[50], *dp;
int len;
- if ((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) {
+ if ((dp = env_getvalue((unsigned char *)"DISPLAY", 0)) == NULL) {
/*
* Something happened, we no longer have a DISPLAY
* variable. So, turn off the option.
@@ -1527,7 +1527,7 @@
env_opt_add(ep);
return;
}
- vp = env_getvalue(ep);
+ vp = env_getvalue(ep, 1);
if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
strlen((char *)ep) + 6 > opt_replyend)
{
@@ -2170,7 +2170,7 @@
send_will(TELOPT_LINEMODE, 1);
send_will(TELOPT_NEW_ENVIRON, 1);
send_do(TELOPT_STATUS, 1);
- if (env_getvalue((unsigned char *)"DISPLAY"))
+ if (env_getvalue((unsigned char *)"DISPLAY", 0))
send_will(TELOPT_XDISPLOC, 1);
if (binary)
tel_enter_binary(binary);
--- netkit-telnet-0.17-pre-20000204/telnet/externs.h.env Mon Feb 8 15:56:11 1999
+++ netkit-telnet-0.17-pre-20000204/telnet/externs.h Tue May 16 17:19:47 2000
@@ -203,7 +203,7 @@
void env_send (unsigned char *);
void env_list (void);
unsigned char * env_default(int init, int welldefined);
-unsigned char * env_getvalue(unsigned char *var);
+unsigned char * env_getvalue(unsigned char *var, int exported_only);
void set_escape_char(char *s);
unsigned long sourceroute(char *arg, char **cpp, int *lenp);
@@ -335,7 +335,7 @@
void env_opt_end (int);
unsigned char *env_default (int, int);
-unsigned char *env_getvalue (unsigned char *);
+unsigned char *env_getvalue (unsigned char *, int);
int get_status (void);
int dosynch (void);
--- netkit-telnet-0.17-pre-20000204/telnet-NETKIT/telnet.cc.env Thu Aug 19 05:34:15 1999
+++ netkit-telnet-0.17-pre-20000204/telnet-NETKIT/telnet.cc Tue May 16 17:22:40 2000
@@ -456,7 +456,7 @@
break;
case TELOPT_XDISPLOC: /* X Display location */
- if (env_getvalue("DISPLAY"))
+ if (env_getvalue("DISPLAY", 0))
new_state_ok = 1;
break;
@@ -636,7 +636,7 @@
if (resettermname) {
resettermname = 0;
- tname = env_getvalue("TERM");
+ tname = env_getvalue("TERM", 0);
if (!tname || my_setupterm(tname, 1, &err)) {
termbuf[0] = 0;
tname = "UNKNOWN";
@@ -769,7 +769,7 @@
if (SB_EOF())
return;
if (SB_GET() == TELQUAL_SEND) {
- const char *dp = env_getvalue("DISPLAY");
+ const char *dp = env_getvalue("DISPLAY", 0);
if (dp == NULL) {
/*
* Something happened, we no longer have a DISPLAY
@@ -1182,7 +1182,7 @@
for (ep = env_next(&i,1); ep; ep = env_next(&i,1)) env_opt_add(ep);
return;
}
- vp = env_getvalue(ep);
+ vp = env_getvalue(ep, 1);
if (opt_replyp + (vp ? strlen(vp) : 0) + strlen(ep) + 6 > opt_replyend)
{
register int len;
@@ -1736,7 +1736,7 @@
send_will(TELOPT_LINEMODE, 1);
send_will(TELOPT_ENVIRON, 1);
send_do(TELOPT_STATUS, 1);
- if (env_getvalue("DISPLAY"))
+ if (env_getvalue("DISPLAY", 0))
send_will(TELOPT_XDISPLOC, 1);
if (eight)
tel_enter_binary(eight);
--- netkit-telnet-0.17-pre-20000204/telnet-NETKIT/environ.cc.env Thu Aug 19 05:34:15 1999
+++ netkit-telnet-0.17-pre-20000204/telnet-NETKIT/environ.cc Tue May 16 17:19:47 2000
@@ -193,8 +193,9 @@
return NULL;
}
-const char *env_getvalue(const char *var) {
+const char *env_getvalue(const char *var, int exported_only) {
enviro *ep = env_find(var);
- if (ep) return ep->getval();
+ if (ep && (!exported_only || ep->getexport()))
+ return ep->getval();
return NULL;
}
--- netkit-telnet-0.17-pre-20000204/telnet-NETKIT/environ.h.env Tue Aug 13 20:48:59 1996
+++ netkit-telnet-0.17-pre-20000204/telnet-NETKIT/environ.h Tue May 16 17:19:47 2000
@@ -4,7 +4,7 @@
void env_unexport(const char *);
void env_send(const char *);
void env_list(void);
-const char *env_getvalue(const char *);
+const char *env_getvalue(const char *, int exported_only);
void env_iterate(int *, int exported_only);
const char *env_next(int *, int exported_only);

13
telnet-xinetd Normal file
View File

@ -0,0 +1,13 @@
# default: on
# description: The telnet server serves telnet sessions; it uses \
# unencrypted username/password pairs for authentication.
service telnet
{
flags = REUSE
socket_type = stream
wait = no
user = root
server = /usr/sbin/in.telnetd
log_on_failure += USERID
}

216
telnet.spec
View File

@ -1,55 +1,199 @@
Summary: telnet
%define _snapshot -pre20000412
Summary: The client program for the telnet remote login protocol.
Name: telnet
Group: test/test
Version: 0.0.0.1
Release: 1
License: GPL
ExclusiveArch: %{ix86}
Version: 0.17
Release: 7
Copyright: BSD
Group: Applications/Internet
Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-telnet-%{version}%{_snapshot}.tar.gz
Source2: telnet-client.tar.gz
Source3: telnet-xinetd
Patch4: telnet-0.10-escapechar.patch
Patch6: telnet-0.17-env.patch
Buildroot: %{_tmppath}/%{name}-root
%description
test
Telnet is a popular protocol for logging into remote systems over the
Internet. The telnet package provides a command line telnet client.
Install the telnet package if you want to telnet to remote machines.
%package server
Requires: xinetd
Group: System Environment/Daemons
Summary: The server program for the telnet remote login protocol.
%description server
Telnet is a popular protocol for logging into remote systems over the
Internet. The telnet-server package a telnet daemon, which will
support remote logins into the host machine. The telnet daemon is
enabled by default. You may disable the telnet daemon by editing
/etc/xinet.d/telnet
Install the telnet-server package if you want to support remote logins
to your own machine.
%prep
cat > conftest.c <<EOF
#include <unistd.h>
#include <stdio.h>
#include <signal.h>
volatile int count=0;
void handle(int foo) { count++; }
int main() {
int pid=getpid();
int tcount;
signal(SIGINT, handle);
kill(pid,SIGINT);
kill(pid,SIGINT);
kill(pid,SIGINT);
tcount = count;
if (tcount!=3) {
fprintf(stderr, "count = %d\n", tcount);
sleep(1);
if(count != 3) {
fprintf(stderr, "count = %d\n", count);
return 1;
}
}
return 0;
}
EOF
%setup -q -n netkit-telnet-%{version}%{_snapshot}
mv telnet telnet-NETKIT
%setup -T -D -q -a 2 -n netkit-telnet-%{version}%{_snapshot}
%patch4 -p1 -b .escapechar
%patch6 -p1 -b .env
%build
gcc $RPM_OPT_FLAGS -g -o conftest conftest.c
sh configure
perl -pi -e '
s,^CC=.*$,CC=cc,;
s,-O2,\$(RPM_OPT_FLAGS),;
s,^BINDIR=.*$,BINDIR=%{_bindir},;
s,^MANDIR=.*$,MANDIR=%{_mandir},;
s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
' MCONFIG
# XXX hack around gcc-2.96 problem
%ifarch i386
export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e s/-O2/-O0/`"
%endif
make
%install
./conftest || exit 10
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
make INSTALLROOT=${RPM_BUILD_ROOT} install
mkdir -p ${RPM_BUILD_ROOT}/etc/X11/applnk/Internet
cat > ${RPM_BUILD_ROOT}/etc/X11/applnk/Internet/telnet.desktop <<EOF
[Desktop Entry]
Name=Telnet
Type=Application
Comment=client to connect to remote machines via a text interface
Exec=telnet
Icon=telnet.xpm
Terminal=true
EOF
mkdir -p ${RPM_BUILD_ROOT}/etc/xinetd.d
install -m644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/xinetd.d/telnet
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
%config(missingok) /etc/X11/applnk/Internet/telnet.desktop
%{_bindir}/telnet
%{_mandir}/man1/telnet.1*
%files server
%defattr(-,root,root)
%config /etc/xinetd.d/telnet
%{_sbindir}/in.telnetd
%{_mandir}/man5/issue.net.5*
%{_mandir}/man8/in.telnetd.8*
%{_mandir}/man8/telnetd.8*
%changelog
* Tue Jun 29 2004 Harald Hoyer <harald@redhat.com> - 1-1
- test script for strange signal behaviour
* Tue Jul 18 2000 Bill Nottingham <notting@redhat.com>
- add description & default to xinetd file
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild
* Mon Jun 19 2000 Jeff Johnson <jbj@redhat.com>
- FHS packaging.
- update to 0.17-pre20000412.
* Tue May 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
- moved the xinet entry to the server
* Mon May 22 2000 Trond Eivind Glomsrød <teg@redhat.com>
- add an entry to /etc/xinetd.d
* Tue May 16 2000 Jeff Johnson <jbj@redhat.com>
- permit telnet queries only for exported variables.
* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.17
* Tue Mar 7 2000 Jeff Johnson <jbj@redhat.com>
- rebuild for sparc baud rates > 38400.
* Fri Feb 11 2000 Bill Nottingham <notting@redhat.com>
- fix description
* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com>
- wmconfig gone
* Wed Feb 02 2000 Cristian Gafton <gafton@redhat.com>
- man pages are compressed
- fix description
* Tue Jan 4 2000 Bill Nottingham <notting@redhat.com>
- split client and server
* Tue Dec 21 1999 Jeff Johnson <jbj@redhat.com>
- update to 0.16.
* Sun Oct 10 1999 Matt Wilson <msw@redhat.com>
- corrected the Terminal setting of the .desktop (needs to be 'true' not '1')
* Sat Sep 24 1999 Preston Brown <pbrown@redhat.com>
- red hat .desktop entry
* Sat Aug 21 1999 Jeff Johnson <jbj@redhat.com>
- rebuild for 6.1.
* Wed Aug 18 1999 Bill Nottingham <notting@redhat.com>
- don't trust random TERM variables in telnetd (#4560)
* Wed Jun 2 1999 Jeff Johnson <jbj@redhat.com>
- fix (#3098).
* Thu May 27 1999 Antti Andreimann <Antti.Andreimann@mail.ee>
- fixed the problem with escape character (it could not be disabled)
- changed the spec file to use %setup macro for unpacking telnet-client
* Thu Apr 15 1999 Jeff Johnson <jbj@redhat.com>
- use glibc utmp routines.
* Thu Apr 8 1999 Jeff Johnson <jbj@redhat.com>
- fix the fix (wrong way memcpy).
* Wed Apr 7 1999 Jeff Johnson <jbj@redhat.com>
- fix "telnet localhost" bus error on sparc64 (alpha?).
* Tue Apr 6 1999 Jeff Johnson <jbj@redhat.com>
- use OpenBSD telnet client (and fix minor core dump with .telnetrc #247)
* Thu Mar 25 1999 Erik Troan <ewt@redhat.com>
- use openpty in telnetd
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 22)
* Mon Mar 15 1999 Jeff Johnson <jbj@redhat.com>
- compile for 6.0.
* Fri Apr 24 1998 Prospector System <bugs@redhat.com>
- translations modified for de, fr, tr
* Fri Apr 24 1998 Cristian Gafton <gafton@redhat.com>
- compile C++ code using egcs
* Tue Apr 14 1998 Erik Troan <ewt@redhat.com>
- built against new ncurses
* Wed Oct 29 1997 Donnie Barnes <djb@redhat.com>
- added wmconfig entry
* Tue Jul 15 1997 Erik Troan <ewt@redhat.com>
- initial build