package/netkittelnet/netkittelnet.patch

   1 --- netkit-telnet-0.17/configure        Thu Apr 11 10:40:58 2002
   2 +++ FIXEDnetkittelnet/configure Thu Apr 11 10:39:59 2002
   3 @@ -78,7 +78,6 @@
   4      for TRY in egcs gcc g++ CC c++ cc; do
   5         (
   6             $TRY __conftest.c -o __conftest || exit 1;
   7 -           ./__conftest || exit 1;
   8         ) >/dev/null 2>&1 || continue;
   9         CC=$TRY
  10         break;
  11 @@ -94,7 +93,6 @@
  12      echo -n 'Checking if C compiler works... '
  13      if (
  14            $CC __conftest.c -o __conftest || exit 1
  15 -          ./__conftest || exit 1
  16         ) >/dev/null 2>&1; then
  17           echo 'yes'
  18       else
  19 @@ -125,7 +123,6 @@
  20      for TRY in egcs gcc g++ CC c++ cc; do
  21         (
  22             $TRY __conftest.cc -o __conftest || exit 1;
  23 -           ./__conftest || exit 1;
  24         ) >/dev/null 2>&1 || continue;
  25         CXX=$TRY
  26         break;
  27 @@ -141,7 +138,6 @@
  28      echo -n 'Checking if C++ compiler works... '
  29      if (
  30            $CXX __conftest.cc -o __conftest || exit 1
  31 -          ./__conftest || exit 1
  32         ) >/dev/null 2>&1; then
  33           echo 'yes'
  34       else
  35 @@ -278,13 +274,11 @@
  36  EOF
  37  if (
  38        $CXX $CXXFLAGS  __conftest.cc  -o __conftest || exit 1
  39 -      ./__conftest || exit 1
  40     ) >/dev/null 2>&1; then
  41      echo 'yes'
  42  else
  43      if (
  44            $CXX $CXXFLAGS -D__USE_BSD_SIGNAL __conftest.cc  -o __conftest || exit 1
  45 -          ./__conftest || exit 1
  46         ) >/dev/null 2>&1; then
  47          echo '-D__USE_BSD_SIGNAL'
  48          CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
  49 @@ -292,6 +286,7 @@
  50      else
  51          echo 'no'
  52          echo 'This package needs BSD signal semantics to run.'
  53 +               echo "$CXX $CXXFLAGS  -D__USE_BSD_SIGNAL __conftest.cc  -o __conftest failed"
  54          rm -f __conftest*
  55          exit
  56      fi
  57 @@ -330,31 +325,6 @@
  58          echo 'no'
  59      fi
  60  fi
  61 -
  62 -if [ x$NCURSES != x ]; then
  63 -    LIBTERMCAP=-lncurses
  64 -else
  65 -    echo -n 'Checking for traditional termcap... '
  66 -cat <<EOF >__conftest.cc
  67 -#include <stdio.h>
  68 -#include <termcap.h>
  69 -int main(void) {
  70 -    tgetent(NULL, NULL); return 0;
  71 -}
  72 -
  73 -EOF
  74 -    if (
  75 -          $CXX $CXXFLAGS  __conftest.cc -ltermcap -o __conftest || exit 1
  76 -       ) >/dev/null 2>&1; then
  77 -        echo '-ltermcap'
  78 -        LIBTERMCAP=-ltermcap
  79 -    else
  80 -        echo 'not found'
  81 -        echo 'This package needs termcap to run.'
  82 -        rm -f __conftest*
  83 -        exit
  84 -    fi
  85 -fi
  86  rm -f __conftest*
  87
  88  ##################################################
  89 @@ -468,7 +438,6 @@
  90  else
  91      if (
  92            $CXX $CXXFLAGS -D_GNU_SOURCE __conftest.cc  -o __conftest || exit 1
  93 -          ./__conftest || exit 1
  94         ) >/dev/null 2>&1; then
  95          echo '-D_GNU_SOURCE'
  96          CFLAGS="$CFLAGS -D_GNU_SOURCE"
  97 @@ -501,20 +470,17 @@
  98  EOF
  99  if (
 100        $CXX $CXXFLAGS  __conftest.cc $LIBBSD -o __conftest || exit 1
 101 -      ./__conftest || exit 1
 102     ) >/dev/null 2>&1; then
 103      echo 'ok'
 104  else
 105      if (
 106            $CXX $CXXFLAGS  __conftest.cc -lsnprintf $LIBBSD -o __conftest || exit 1
 107 -          ./__conftest || exit 1
 108         ) >/dev/null 2>&1; then
 109          echo '-lsnprintf'
 110          LIBS="$LIBS -lsnprintf"
 111      else
 112          if (
 113                $CXX $CXXFLAGS  __conftest.cc -ldb $LIBBSD -o __conftest || exit 1
 114 -              ./__conftest || exit 1
 115             ) >/dev/null 2>&1; then
 116              echo '-ldb'
 117              LIBS="$LIBS -ldb"
 118 diff -urN netkit-telnet-0.17/telnetd/state.c netkit-telnet-0.17-dm/telnetd/state.c
 119 --- netkit-telnet-0.17/telnetd/state.c  1999-12-12 11:41:44.000000000 -0800
 120 +++ netkit-telnet-0.17-dm/telnetd/state.c       2003-07-23 19:20:38.000000000 -0700
 121 @@ -43,10 +43,10 @@
 122
 123  static int envvarok(char *varp);
 124
 125 -static unsigned char doopt[] = { IAC, DO, '%', 'c', 0 };
 126 -static unsigned char dont[] = { IAC, DONT, '%', 'c', 0 };
 127 -unsigned char  will[] = { IAC, WILL, '%', 'c', 0 };
 128 -unsigned char  wont[] = { IAC, WONT, '%', 'c', 0 };
 129 +//static unsigned char doopt[] = { IAC, DO, '%', 'c', 0 };
 130 +//static unsigned char dont[] = { IAC, DONT, '%', 'c', 0 };
 131 +//unsigned char        will[] = { IAC, WILL, '%', 'c', 0 };
 132 +//unsigned char        wont[] = { IAC, WONT, '%', 'c', 0 };
 133
 134  /*
 135   * Buffer for sub-options, and macros
 136 @@ -422,7 +422,7 @@
 137             set_his_want_state_will(option);
 138         do_dont_resp[option]++;
 139      }
 140 -    netoprintf((char *)doopt, option);
 141 +    netoprintf( "%c%c%c", IAC, DO, option );
 142
 143      DIAG(TD_OPTIONS, printoption("td: send do", option));
 144  }
 145 @@ -632,7 +632,7 @@
 146         set_his_want_state_wont(option);
 147         do_dont_resp[option]++;
 148      }
 149 -    netoprintf((char *) dont, option);
 150 +    netoprintf ( "%c%c%c", IAC, DONT, option );
 151
 152      DIAG(TD_OPTIONS, printoption("td: send dont", option));
 153  }
 154 @@ -769,7 +769,7 @@
 155         set_my_want_state_will(option);
 156         will_wont_resp[option]++;
 157      }
 158 -    netoprintf((char *) will, option);
 159 +    netoprintf( "%c%c%c", IAC, WILL, option);
 160
 161      DIAG(TD_OPTIONS, printoption("td: send will", option));
 162  }
 163 @@ -917,7 +917,7 @@
 164         set_my_want_state_wont(option);
 165         will_wont_resp[option]++;
 166      }
 167 -    netoprintf((char *)wont, option);
 168 +    netoprintf( "%c%c%c", IAC, WONT, option);
 169
 170      DIAG(TD_OPTIONS, printoption("td: send wont", option));
 171  }