diff options
author | Emanuele Giaquinta <exg@gentoo.org> | 2006-10-14 22:38:47 +0000 |
---|---|---|
committer | Emanuele Giaquinta <exg@gentoo.org> | 2006-10-14 22:38:47 +0000 |
commit | 7bb4dddd30bb56d0728b909321c79d9c417360a7 (patch) | |
tree | 46ce26db7bdec5f52b0b2fc842fcc0260739bdb3 /net-misc/telnet-bsd/files | |
parent | Cleanup. (diff) | |
download | historical-7bb4dddd30bb56d0728b909321c79d9c417360a7.tar.gz historical-7bb4dddd30bb56d0728b909321c79d9c417360a7.tar.bz2 historical-7bb4dddd30bb56d0728b909321c79d9c417360a7.zip |
Cleanup.
Package-Manager: portage-2.1.2_pre3-r1
Diffstat (limited to 'net-misc/telnet-bsd/files')
4 files changed, 0 insertions, 166 deletions
diff --git a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.0-r1 b/net-misc/telnet-bsd/files/digest-telnet-bsd-1.0-r1 deleted file mode 100644 index e0eca2eb3163..000000000000 --- a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.0-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bf0cecc0c72a0e919cd02915d02d02bb telnet-bsd-1.0.tar.bz2 173813 -RMD160 0b7d29035fda7ae5168601daeb1f01b4e73bd244 telnet-bsd-1.0.tar.bz2 173813 -SHA256 8c2acadcba24ad5429567f79bab9797fb980d94471868266337f6cb5c44997b9 telnet-bsd-1.0.tar.bz2 173813 diff --git a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2 b/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2 deleted file mode 100644 index 868e4f35af56..000000000000 --- a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 72d72c65e7796dfec999f347da1c295f telnet-bsd-1.2.tar.bz2 194518 -RMD160 3927ce86bbc4024c5a656f5d8f9ee0c8f90de70c telnet-bsd-1.2.tar.bz2 194518 -SHA256 d6a9d26740ef75565cb1ed8ff11e327d240e6734748b2d1d2e96c126849e4733 telnet-bsd-1.2.tar.bz2 194518 diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.0-overflow.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.0-overflow.patch deleted file mode 100644 index 8f2042e11f6f..000000000000 --- a/net-misc/telnet-bsd/files/telnet-bsd-1.0-overflow.patch +++ /dev/null @@ -1,92 +0,0 @@ -Patch adopted from upstream FreeBSD changes to fix client buffer overflows. - -http://bugs.gentoo.org/show_bug.cgi?id=87019 - ---- telnet/telnet.c -+++ telnet/telnet.c -@@ -1131,6 +1131,7 @@ - - - unsigned char slc_reply[128]; -+unsigned char const * const slc_reply_eom = &slc_reply[sizeof(slc_reply)]; - unsigned char *slc_replyp; - - void -@@ -1146,6 +1147,14 @@ - void - slc_add_reply(unsigned char func, unsigned char flags, cc_t value) - { -+ /* A sequence of up to 6 bytes my be written for this member of the SLC -+ * suboption list by this function. The end of negotiation command, -+ * which is written by slc_end_reply(), will require 2 additional -+ * bytes. Do not proceed unless there is sufficient space for these -+ * items. -+ */ -+ if (&slc_replyp[6+2] > slc_reply_eom) -+ return; - if ((*slc_replyp++ = func) == IAC) - *slc_replyp++ = IAC; - if ((*slc_replyp++ = flags) == IAC) -@@ -1159,6 +1168,10 @@ - { - int len; - -+ /* The end of negotiation command requires 2 bytes. */ -+ if (&slc_replyp[2] > slc_reply_eom) -+ return; -+ - *slc_replyp++ = IAC; - *slc_replyp++ = SE; - len = slc_replyp - slc_reply; -@@ -1236,8 +1249,8 @@ - } - } - --#define OPT_REPLY_SIZE 256 --unsigned char *opt_reply; -+#define OPT_REPLY_SIZE (2 * SUBBUFSIZE) -+unsigned char *opt_reply = NULL; - unsigned char *opt_replyp; - unsigned char *opt_replyend; - -@@ -1298,8 +1311,8 @@ - return; - } - vp = env_getvalue(ep); -- if (opt_replyp + (vp ? strlen((char *)vp) : 0) + -- strlen((char *)ep) + 6 > opt_replyend) -+ if (opt_replyp + (vp ? 2 * strlen((char *)vp) : 0) + -+ 2 * strlen((char *)ep) + 6 > opt_replyend) - { - int len; - unsigned char *p; -@@ -1323,6 +1336,8 @@ - *opt_replyp++ = ENV_USERVAR; - for (;;) { - while ((c = *ep++)) { -+ if (opt_replyp + (2 + 2) > opt_replyend) -+ return; - switch(c&0xff) { - case IAC: - *opt_replyp++ = IAC; -@@ -1337,6 +1352,8 @@ - *opt_replyp++ = c; - } - if ((ep = vp)) { -+ if (opt_replyp + (1 + 2 + 2) > opt_replyend) -+ return; - *opt_replyp++ = ENV_VALUE; - vp = NULL; - } else -@@ -1361,7 +1378,10 @@ - { - int len; - -- len = opt_replyp - opt_reply + 2; -+ if (opt_replyp + 2 > opt_replyend) -+ return; -+ len = opt_replyp + 2 - opt_reply; -+ - if (emptyok || len > 6) { - *opt_replyp++ = IAC; - *opt_replyp++ = SE; diff --git a/net-misc/telnet-bsd/files/telnet-bsd_gentoo.diff b/net-misc/telnet-bsd/files/telnet-bsd_gentoo.diff deleted file mode 100644 index e59a5caaf033..000000000000 --- a/net-misc/telnet-bsd/files/telnet-bsd_gentoo.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- telnet-bsd-1.0/po/Makefile.in.in.old Sat Apr 17 12:11:08 1999 -+++ telnet-bsd-1.0/po/Makefile.in.in Tue Dec 3 11:32:42 2002 -@@ -111,9 +111,9 @@ - install-data-no: all - install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(datadir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ -@@ -125,27 +125,27 @@ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $$dir; \ -+ $(MKINSTALLDIRS) $(DESTDIR)$$dir; \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \ - fi; \ - if test -r $$cat; then \ -- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ -- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ -+ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ -+ echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ - else \ -- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ -+ $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ - echo "installing $(srcdir)/$$cat as" \ -- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ -+ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ -- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ -- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ -+ $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ -+ echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ -- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ -+ $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ -- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ -+ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ -@@ -153,12 +153,12 @@ - done - if test "$(PACKAGE)" = "gettext"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ -- $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ -- $(gettextsrcdir)/Makefile.in.in; \ -+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi |