diff --git a/telnet-0.17-env-5x.patch b/telnet-0.17-env-5x.patch deleted file mode 100644 index 446e676..0000000 --- a/telnet-0.17-env-5x.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- 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); diff --git a/telnet-0.17-linemode.patch b/telnet-0.17-linemode.patch deleted file mode 100644 index 62b7208..0000000 --- a/telnet-0.17-linemode.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- netkit-telnet-0.17/telnetd/ext.h.linemode 2005-04-19 15:48:42.000000000 +0200 -+++ netkit-telnet-0.17/telnetd/ext.h 2005-04-19 15:48:42.000000000 +0200 -@@ -96,9 +96,9 @@ - extern int SYNCHing; /* we are in TELNET SYNCH mode */ - - void _termstat(void); --void add_slc(int, int, int); -+void add_slc(char func, char flag, cc_t val); - void check_slc(void); --void change_slc(int, int, int); -+void change_slc(char func, char flag, cc_t val); - void cleanup(int); - void clientstat(int, int, int); - void copy_termbuf(char *, int); ---- netkit-telnet-0.17/telnetd/telnetd.c.linemode 2005-04-19 15:48:42.000000000 +0200 -+++ netkit-telnet-0.17/telnetd/telnetd.c 2005-04-19 15:48:42.000000000 +0200 -@@ -1024,7 +1024,7 @@ - if (pcc <= 0) - break; - pty_read_ok = 1; /* mark connection up for read */ --#ifdef LINEMODE -+#if (defined LINEMODE) && (defined TIOCPKT_IOCTL) - /* - * If ioctl from pty, pass it through net - */ ---- netkit-telnet-0.17/telnetd/defs.h.linemode 2005-04-19 16:04:39.000000000 +0200 -+++ netkit-telnet-0.17/telnetd/defs.h 2005-04-19 16:06:23.000000000 +0200 -@@ -214,3 +214,11 @@ - - #define his_will_wont_is_changing my_do_dont_is_changing - #define his_do_dont_is_changing my_will_wont_is_changing -+ -+#ifndef EXTPROC -+#define EXTPROC 0200000 -+#endif -+ -+#ifndef TIOCPKT_IOCTL -+#define TIOCPKT_IOCTL 64 -+#endif ---- netkit-telnet-0.17/telnetd/state.c.linemode 2005-04-19 15:48:42.000000000 +0200 -+++ netkit-telnet-0.17/telnetd/state.c 2005-04-19 15:48:42.000000000 +0200 -@@ -119,8 +119,8 @@ - * if CRMOD is set, which it normally is). - */ - if ((c == '\r') && his_state_is_wont(TELOPT_BINARY)) { --#if defined(ENCRYPT) - int nc = *netip; -+#if defined(ENCRYPT) - if (decrypt_input) { - nc = (*decrypt_input)(nc & 0xff); - } ---- netkit-telnet-0.17/telnetd/Makefile.linemode 1999-12-14 01:43:30.000000000 +0100 -+++ netkit-telnet-0.17/telnetd/Makefile 2005-04-19 15:48:44.000000000 +0200 -@@ -9,7 +9,7 @@ - # take out -DPARANOID_TTYS. - - CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \ -- -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS -+ -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS -DLINEMODE - # LIBS += $(LIBTERMCAP) - - OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \ -@@ -27,7 +27,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 diff --git a/telnet.spec b/telnet.spec index e14e99a..d607ee4 100644 --- a/telnet.spec +++ b/telnet.spec @@ -1,7 +1,7 @@ -Summary: The client program for the telnet remote login protocol. +Summary: The client program for the Telnet remote login protocol Name: telnet Version: 0.17 -Release: 45%{?dist} +Release: 46%{?dist} Epoch: 1 License: BSD Group: Applications/Internet @@ -14,7 +14,6 @@ Patch5: telnetd-0.17.diff Patch6: telnet-0.17-env.patch Patch7: telnet-0.17-issue.patch Patch8: telnet-0.17-sa-01-49.patch -Patch9: telnet-0.17-env-5x.patch Patch10: telnet-0.17-pek.patch Patch11: telnet-0.17-8bit.patch Patch12: telnet-0.17-argv.patch @@ -22,31 +21,29 @@ Patch13: telnet-0.17-conf.patch Patch14: telnet-0.17-cleanup_race.patch Patch15: telnetd-0.17-pty_read.patch Patch16: telnet-0.17-CAN-2005-468_469.patch -Patch17: telnet-0.17-linemode.patch Patch18: telnet-gethostbyname.patch Patch19: netkit-telnet-0.17-ipv6.diff Patch20: netkit-telnet-0.17-nodns.patch Patch21: telnet-0.17-errno_test_sys_bsd.patch Patch22: netkit-telnet-0.17-reallynodns.patch -BuildPreReq: ncurses-devel -Buildroot: %{_tmppath}/%{name}-root +BuildRequires: ncurses-devel +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Telnet is a popular protocol for logging into remote systems over the -Internet. The telnet package provides a command line telnet client. +Internet. The package provides a command line Telnet client %package server Requires: xinetd Group: System Environment/Daemons -Summary: The server program for the telnet remote login protocol. +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 includes a telnet daemon that -supports remote logins into the host machine. The telnet daemon is -disabled by default. You may enable the telnet daemon by editing -/etc/xinetd.d/telnet. +Internet. The package includes a daemon that supports Telnet remote +logins into the host machine. The daemon is disabled by default. +You may enable the daemon by editing /etc/xinetd.d/telnet %prep %setup -q -n netkit-telnet-%{version} @@ -74,20 +71,13 @@ mv telnet telnet-NETKIT %patch22 -p1 -b .reallynodns %build -export OPT_FLAGS="$RPM_OPT_FLAGS -g" -export LD_FLAGS="$OPT_FLAGS" -export CC_FLAGS="$CC_FLAGS" -if echo 'int main () { return 0; }' | gcc -pie -fPIE -O2 -xc - -o pietest 2>/dev/null; then - if ./pietest; then -%ifarch s390 s390x ia64 - export CC_FLAGS="$OPT_FLAGS -fPIE" +%ifarch s390 s390x + export CC_FLAGS="$RPM_OPT_FLAGS -fPIE" %else - export CC_FLAGS="$OPT_FLAGS -fpie" + export CC_FLAGS="$RPM_OPT_FLAGS -fpie" %endif - export LD_FLAGS="$OPT_FLAGS -pie" - fi - rm -f pietest -fi + +export LD_FLAGS="$LD_FLAGS -pie" sh configure --with-c-compiler=gcc perl -pi -e ' @@ -100,10 +90,10 @@ perl -pi -e ' # remove stripping perl -pi -e 's|install[ ]+-s|install|g' \ - ./telnet/GNUmakefile \ - ./telnetd/Makefile \ - ./telnetlogin/Makefile \ - ./telnet-NETKIT/Makefile + ./telnet/GNUmakefile \ + ./telnetd/Makefile \ + ./telnetlogin/Makefile \ + ./telnet-NETKIT/Makefile make %{?_smp_mflags} @@ -117,19 +107,19 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 make INSTALLROOT=${RPM_BUILD_ROOT} install -mkdir -p ${RPM_BUILD_ROOT}/etc/xinetd.d -install -m644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/xinetd.d/telnet +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d +install -p -m644 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/telnet %clean rm -rf ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/telnet %{_mandir}/man1/telnet.1* %files server -%defattr(-,root,root) +%defattr(-,root,root,-) %config(noreplace) /etc/xinetd.d/telnet %{_sbindir}/in.telnetd %{_mandir}/man5/issue.net.5* @@ -137,6 +127,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/telnetd.8* %changelog +* Fri Nov 27 2009 Adam Tkac 1:0.17-46 +- changes related package review (#226484) +- remove unused patches + - telnet-0.17-linemode.patch + - telnet-0.17-env-5x.patch + * Wed Sep 02 2009 Adam Tkac 1:0.17-45 - add new option -N to disable DNS lookups (#490242) @@ -342,7 +338,7 @@ rm -rf ${RPM_BUILD_ROOT} * Thu May 27 1999 Antti Andreimann - fixed the problem with escape character (it could not be disabled) -- changed the spec file to use %setup macro for unpacking telnet-client +- changed the spec file to use %%setup macro for unpacking telnet-client * Thu Apr 15 1999 Jeff Johnson - use glibc utmp routines.