|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: MCONFIG.in
|
|
|
|
|
--- MCONFIG.in.orig 2009-02-16 23:51:22 +0100
|
|
|
|
|
+++ MCONFIG.in 2009-02-18 10:19:59 +0100
|
|
|
|
|
--- MCONFIG.in.orig 2011-06-23 01:32:56.000000000 +0200
|
|
|
|
|
+++ MCONFIG.in 2011-06-24 20:54:05.000000000 +0200
|
|
|
|
|
@@ -21,6 +21,7 @@
|
|
|
|
|
# Prefixes
|
|
|
|
|
prefix = @prefix@
|
|
|
|
|
@ -10,8 +10,8 @@ Index: MCONFIG.in
|
|
|
|
|
# Directory for user binaries
|
|
|
|
|
BINDIR = @bindir@
|
|
|
|
|
Index: Makefile
|
|
|
|
|
--- Makefile.orig 2009-02-16 23:51:22 +0100
|
|
|
|
|
+++ Makefile 2009-02-18 10:19:59 +0100
|
|
|
|
|
--- Makefile.orig 2011-06-23 01:32:56.000000000 +0200
|
|
|
|
|
+++ Makefile 2011-06-24 20:54:05.000000000 +0200
|
|
|
|
|
@@ -59,9 +59,9 @@
|
|
|
|
|
# Adding "configure" to the dependencies serializes this with running
|
|
|
|
|
# autoconf, because there are apparently race conditions between
|
|
|
|
|
@ -25,23 +25,10 @@ Index: Makefile
|
|
|
|
|
|
|
|
|
|
configure: configure.in aclocal.m4
|
|
|
|
|
rm -rf MCONFIG configure config.log aconfig.h *.cache
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2009-02-16 23:51:35 +0100
|
|
|
|
|
+++ configure 2009-02-18 10:19:59 +0100
|
|
|
|
|
@@ -9852,6 +9852,9 @@
|
|
|
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
|
|
/* end confdefs.h. */
|
|
|
|
|
$ac_includes_default
|
|
|
|
|
+#if HAVE_SYS_SOCKET_H
|
|
|
|
|
+# include <sys/socket.h>
|
|
|
|
|
+#endif
|
|
|
|
|
int
|
|
|
|
|
main ()
|
|
|
|
|
{
|
|
|
|
|
Index: tftpd/tftpd.c
|
|
|
|
|
--- tftpd/tftpd.c.orig 2009-02-16 23:51:22 +0100
|
|
|
|
|
+++ tftpd/tftpd.c 2009-02-18 10:20:18 +0100
|
|
|
|
|
@@ -31,6 +31,9 @@
|
|
|
|
|
--- tftpd/tftpd.c.orig 2011-06-23 01:32:56.000000000 +0200
|
|
|
|
|
+++ tftpd/tftpd.c 2011-06-24 20:54:05.000000000 +0200
|
|
|
|
|
@@ -33,6 +33,9 @@
|
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
@ -51,7 +38,7 @@ Index: tftpd/tftpd.c
|
|
|
|
|
#include "config.h" /* Must be included first */
|
|
|
|
|
#include "tftpd.h"
|
|
|
|
|
|
|
|
|
|
@@ -716,6 +719,22 @@
|
|
|
|
|
@@ -767,6 +770,22 @@
|
|
|
|
|
#ifndef __CYGWIN__
|
|
|
|
|
set_socket_nonblock(fd, 1);
|
|
|
|
|
#endif
|
|
|
|
|
|