tftp-hpa-0.29-http-1.diff

SIP（Session Initiation Protocol）是由IETF定义

diff -Nru ../tftp-hpa-0.29/INSTALL.http ./INSTALL.http
--- ../tftp-hpa-0.29/INSTALL.http	Wed Dec 31 16:00:00 1969
+++ ./INSTALL.http	Tue Oct  8 13:36:49 2002
@@ -0,0 +1,26 @@
+This version of tftpd allows you to specify an additional option, -h,
+to proxy tftp RRQ requests into HTTP GET requests.  The -h options
+allows you to get the files from a web server instead of the local
+file system.  If you specify "-h http://foo.com/bar/" then a user tries
+to tftp the file hi/there, the tftpd server will fetch the web
+resource http://foo.com/bar/hi/there and send it as the contents of
+hi/there .
+
+An example config section for xinetd is 
+
+service tftp
+{
+       socket_type             = dgram
+       protocol                = udp
+       wait                    = yes
+       user                    = root
+       server                  = /usr/sbin/in.tftpd
+       server_args             = -h http://localhost/files/ -u cullen -s /
+       disable                 = no
+       flags                   = NOLIBWRAP
+        passenv                = 
+       log_type                = SYSLOG daemon info
+       log_on_failure          = HOST EXIT 
+       log_on_success          = HOST EXIT
+}
+
diff -Nru ../tftp-hpa-0.29/INSTALL.tftp ./INSTALL.tftp
--- ../tftp-hpa-0.29/INSTALL.tftp	Mon Nov 12 15:44:05 2001
+++ ./INSTALL.tftp	Tue Oct  8 13:36:51 2002
@@ -21,6 +21,12 @@
 	Disables the use of the readline command-line editing library
 	in the tftp client.
 
+  --without-nanohttp
+	Disables the ability to proxy tftp requests into http requests
+	using the nanohttp part of the libxml2 library.  Please see 
+	INSTALL.http for details of how to use the tftp to http proxy
+	support.
+
 The default prefix for the tftp-hpa package is /usr, with the tftp
 client installing as /usr/bin/tftp and the tftpd server installing as
 /usr/sbin/in.tftpd on most systems.  This can be overridden by setting
diff -Nru ../tftp-hpa-0.29/acconfig.h.in ./acconfig.h.in
--- ../tftp-hpa-0.29/acconfig.h.in	Thu Mar  7 20:09:15 2002
+++ ./acconfig.h.in	Thu Aug  8 20:17:45 2002
@@ -1,48 +1,48 @@
 /* acconfig.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if you have the <arpa/inet.h> header file. */
+/* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
-/* Define if you have the `dup2' function. */
+/* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
-/* Define if you have the `fcntl' function. */
+/* Define to 1 if you have the `fcntl' function. */
 #undef HAVE_FCNTL
 
-/* Define if you have the <fcntl.h> header file. */
+/* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define if you have the `ftruncate' function. */
+/* Define to 1 if you have the `ftruncate' function. */
 #undef HAVE_FTRUNCATE
 
-/* Define if you have the <grp.h> header file. */
+/* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
-/* Define if you have the `initgroups' function. */
+/* Define to 1 if you have the `initgroups' function. */
 #undef HAVE_INITGROUPS
 
-/* Define if the system has the type `intmax_t'. */
+/* Define to 1 if the system has the type `intmax_t'. */
 #undef HAVE_INTMAX_T
 
-/* Define if you have the <inttypes.h> header file. */
+/* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
 /* Define if netinet/in.h defines IPPORT_TFTP */
 #undef HAVE_IPPORT_TFTP_DEFINITION
 
-/* Define if you have the <libgen.h> header file. */
+/* Define to 1 if you have the <libgen.h> header file. */
 #undef HAVE_LIBGEN_H
 
-/* Define if you have the `wrap' library (-lwrap). */
+/* Define to 1 if you have the `wrap' library (-lwrap). */
 #undef HAVE_LIBWRAP
 
-/* Define if the system has the type `long long'. */
+/* Define to 1 if the system has the type `long long'. */
 #undef HAVE_LONG_LONG
 
-/* Define if you have the <machine/param.h> header file. */
+/* Define to 1 if you have the <machine/param.h> header file. */
 #undef HAVE_MACHINE_PARAM_H
 
-/* Define if you have the <memory.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define if struct msghdr has the msg_control field. */
@@ -57,106 +57,124 @@
 /* Define if fcntl.h defines O_TEXT */
 #undef HAVE_O_TEXT_DEFINITION
 
-/* Define if you have the <readline/history.h> header file. */
+/* Define to 1 if you have the <readline/history.h> header file. */
 #undef HAVE_READLINE_HISTORY_H
 
-/* Define if you have the `recvmsg' function. */
+/* Define to 1 if you have the `recvmsg' function. */
 #undef HAVE_RECVMSG
 
-/* Define if you have the `setgroups' function. */
+/* Define to 1 if you have the `setgroups' function. */
 #undef HAVE_SETGROUPS
 
-/* Define if you have the <setjmp.h> header file. */
+/* Define to 1 if you have the <setjmp.h> header file. */
 #undef HAVE_SETJMP_H
 
-/* Define if you have the `setregid' function. */
+/* Define to 1 if you have the `setregid' function. */
 #undef HAVE_SETREGID
 
-/* Define if you have the `setreuid' function. */
+/* Define to 1 if you have the `setreuid' function. */
 #undef HAVE_SETREUID
 
-/* Define if you have the `setsid' function. */
+/* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
 /* Define if we have sigsetjmp, siglongjmp and sigjmp_buf. */
 #undef HAVE_SIGSETJMP
 
-/* Define if you have the <stddef.h> header file. */
+/* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
-/* Define if you have the <stdint.h> header file. */
+/* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define if you have the <stdlib.h> header file. */
+/* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define if you have the <strings.h> header file. */
+/* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define if you have the `strtoull' function. */
+/* Define to 1 if you have the `strtoull' function. */
 #undef HAVE_STRTOULL
 
-/* Define if you have the `strtoumax' function. */
+/* Define to 1 if you have the `strtoumax' function. */
 #undef HAVE_STRTOUMAX
 
 /* Define if struct in_pktinfo is defined. */
 #undef HAVE_STRUCT_IN_PKTINFO
 
-/* Define if you have the <sysexits.h> header file. */
+/* Define to 1 if you have the <sysexits.h> header file. */
 #undef HAVE_SYSEXITS_H
 
-/* Define if you have the <sys/filio.h> header file. */
+/* Define to 1 if you have the <sys/filio.h> header file. */
 #undef HAVE_SYS_FILIO_H
 
-/* Define if you have the <sys/stat.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
-/* Define if you have the <sys/types.h> header file. */
+/* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
 /* Define if we have tcpwrappers (-lwrap) and <tcpd.h>. */
 #undef HAVE_TCPWRAPPERS
 
-/* Define if you have the <time.h> header file. */
+/* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define if the system has the type `uint16_t'. */
+/* Define to 1 if the system has the type `uint16_t'. */
 #undef HAVE_UINT16_T
 
-/* Define if the system has the type `uint32_t'. */
+/* Define to 1 if the system has the type `uint32_t'. */
 #undef HAVE_UINT32_T
 
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if the system has the type `u_long'. */
+/* Define to 1 if the system has the type `u_long'. */
 #undef HAVE_U_LONG
 
-/* Define if the system has the type `u_short'. */
+/* Define to 1 if the system has the type `u_short'. */
 #undef HAVE_U_SHORT
 
 /* Define if the macros in <inttypes.h> are usable */
 #undef INTTYPES_H_IS_SANE
 
-/* Define if you have the ANSI C header files. */
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
+/* Define if we are compiling with nanohttp filename support. */
+#undef WITH_NANOHTTP
+
 /* Define if we are compiling with readline command-line editing. */
 #undef WITH_READLINE
 
 /* Define if we are compiling with regex filename remapping. */
 #undef WITH_REGEX
 
-/* Define if on AIX 3.
+/* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
@@ -169,14 +187,14 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define if on MINIX. */
+/* Define to 1 if on MINIX. */
 #undef _MINIX
 
-/* Define if the system does not provide POSIX.1 features except with this
-   defined. */
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
 #undef _POSIX_1_SOURCE
 
-/* Define if you need to in order for `stat' and other things to work. */
+/* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
 /* Define to empty if `const' does not conform to ANSI C. */
diff -Nru ../tftp-hpa-0.29/configure ./configure
--- ../tftp-hpa-0.29/configure	Thu Mar  7 20:09:14 2002
+++ ./configure	Thu Aug  8 20:16:57 2002
@@ -1,25 +1,19 @@
 #! /bin/sh
 # From configure.in Id: configure.in,v 1.36 2001/11/29 22:02:52 hpa Exp .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52d.
+# Generated by GNU Autoconf 2.53.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 ## --------------------- ##
 ## M4sh Initialization.  ##
@@ -33,8 +27,165 @@
   set -o posix
 fi
 
+# NLS nuisances.
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+    { $as_unset LANG || test "${LANG+set}" != set; } ||
+      { LANG=C; export LANG; }
+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+      { LC_ALL=C; export LC_ALL; }
+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+      { LC_TIME=C; export LC_TIME; }
+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+      { LC_CTYPE=C; export LC_CTYPE; }
+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+      { LANGUAGE=C; export LANGUAGE; }
+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+      { LC_COLLATE=C; export LC_COLLATE; }
+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+      { LC_NUMERIC=C; export LC_NUMERIC; }
+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+      { LC_MESSAGES=C; export LC_MESSAGES; }
+
+
 # Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
+as_me=`(basename "$0") 2>/dev/null ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`