1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141
|
Description: Debian changes introduced some time ago
Author: Roberto Lumbreras <rover@debian.org>
Index: proxy-suite-1.9.2.4/Makefile.in
===================================================================
--- proxy-suite-1.9.2.4.orig/Makefile.in 2010-12-26 17:34:42.235169116 +0100
+++ proxy-suite-1.9.2.4/Makefile.in 2010-12-26 17:38:27.000000000 +0100
@@ -44,7 +44,7 @@
@SET_MAKE@
-SUBDIRS= doc common ftp-proxy
+SUBDIRS= common ftp-proxy
DOCS= AUTHORS COPYING CREDITS
Index: proxy-suite-1.9.2.4/configure
===================================================================
--- proxy-suite-1.9.2.4.orig/configure 2010-12-26 17:34:42.243169297 +0100
+++ proxy-suite-1.9.2.4/configure 2010-12-26 22:32:38.719169312 +0100
@@ -5607,6 +5607,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <limits.h>
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -7347,8 +7348,8 @@
*)
echo "$as_me:$LINENO: result: n/a" >&5
echo "${ECHO_T}n/a" >&6
- { { echo "$as_me:$LINENO: error: /proc module not avaliable on $host" >&5
-echo "$as_me: error: /proc module not avaliable on $host" >&2;}
+ { { echo "$as_me:$LINENO: error: /proc module not available on $host" >&5
+echo "$as_me: error: /proc module not available on $host" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
Index: proxy-suite-1.9.2.4/configure.in
===================================================================
--- proxy-suite-1.9.2.4.orig/configure.in 2010-12-26 17:34:42.243169297 +0100
+++ proxy-suite-1.9.2.4/configure.in 2010-12-26 22:32:42.245828567 +0100
@@ -207,7 +207,9 @@
AC_CHECK_HEADERS(netinet/ip.h netinet/ip_fil.h netinet/ip_nat.h)
AC_CHECK_HEADERS(netinet/ip_compat.h netinet/ip_fil_compat.h)
-AC_CHECK_HEADERS(linux/netfilter_ipv4.h)
+AC_CHECK_HEADERS(linux/netfilter_ipv4.h, [], [],
+[#include <limits.h>
+])
AC_HEADER_SYS_WAIT
@@ -270,7 +272,7 @@
;;
*)
AC_MSG_RESULT(n/a)
- AC_MSG_ERROR(/proc module not avaliable on $host)
+ AC_MSG_ERROR(/proc module not available on $host)
;;
esac
else
Index: proxy-suite-1.9.2.4/ftp-proxy/Makefile.in
===================================================================
--- proxy-suite-1.9.2.4.orig/ftp-proxy/Makefile.in 2010-12-26 17:34:42.268979009 +0100
+++ proxy-suite-1.9.2.4/ftp-proxy/Makefile.in 2010-12-26 17:38:27.000000000 +0100
@@ -171,6 +171,7 @@
distclean: clean
rm -f Makefile rc.script
+ rm -f $(FTP_MAN5) $(FTP_MAN8)
realclean: distclean
Index: proxy-suite-1.9.2.4/ftp-proxy/ftp-main.c
===================================================================
--- proxy-suite-1.9.2.4.orig/ftp-proxy/ftp-main.c 2010-12-26 17:34:42.268979009 +0100
+++ proxy-suite-1.9.2.4/ftp-proxy/ftp-main.c 2010-12-26 17:38:27.000000000 +0100
@@ -76,8 +76,8 @@
#define SELECT_TIMEOUT 60 /* Wake up regularly */
-#if defined(COMPILE_DEBUG)
# define DEBUG_FILE "/tmp/ftp-proxy.debug"
+#if defined(COMPILE_DEBUG)
# define OPTS_LIST "cdinf:v:V?"
#else
# define OPTS_LIST "cdinf:V?"
@@ -96,10 +96,12 @@
" -n Do not detach from controlling terminal",
" -f file Name of the configuration file",
" (Default: " DEFAULT_CONFIG ")",
-#if defined(COMPILE_DEBUG)
" -v level Send debuging output to " DEBUG_FILE,
" (Level: 0 = silence, 4 = chatterbox)",
+#if defined(COMPILE_DEBUG)
" !!! DO NOT USE -v FOR PRODUCTION !!!",
+#else
+ " !!! DISABLED AT COMPILE TIME FOR PRODUCTION USE !!!",
#endif
" -V Display program version and exit",
"",
Index: proxy-suite-1.9.2.4/ftp-proxy/ftp-proxy.conf.sample
===================================================================
--- proxy-suite-1.9.2.4.orig/ftp-proxy/ftp-proxy.conf.sample 2010-12-26 17:34:42.271168674 +0100
+++ proxy-suite-1.9.2.4/ftp-proxy/ftp-proxy.conf.sample 2010-12-26 22:29:16.239168781 +0100
@@ -85,6 +85,7 @@
# AllowTransProxy).
#
# DestinationAddress server.domain.tld
+DestinationAddress localhost
#
# (Local) port range for all connections to the server. The
@@ -136,7 +137,7 @@
# If given, change GID to give up root privileges. In POSIX
# environments this changes all group ID's.
#
-# Group nogroup
+Group nogroup
# Group nobody
#
@@ -299,6 +300,7 @@
# Can be given as TCP service name or as a plain number.
#
# Port ftp
+Port 2121
#
# The following flag specifies the action when a PORT command
@@ -378,7 +380,7 @@
# If set, the proxy will use non-privileged ports (>1024) for
# active mode ftp transfers - see also ActiveMin/MaxDataPort.
#
-# User nobody
+User nobody
# User ftpproxy
#
|