* pure-ftpd: fix autotool rerun

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6907 33e552b5-05e3-0310-8538-816dae2090ed

10 files changed, 1 insertions, 519 deletions

diff --git a/patches/pure-ftpd-1.0.21/generic/configure-getgroups-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-getgroups-cacheable.diff
deleted file mode 100644
index 5a25d41b5..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-getgroups-cacheable.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# check for getgroups is not cross aware, make it cacheable and added cross default value
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -21452,12 +21452,12 @@ fi
- 
- echo "$as_me:$LINENO: checking whether getgroups 0 is sane" >&5
- echo $ECHO_N "checking whether getgroups 0 is sane... $ECHO_C" >&6
-+if test "${ac_cv_safe_getgroups_0+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  ac_cv_safe_getgroups_0=yes
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21496,14 +21496,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--cat >>confdefs.h <<\_ACEOF
--#define SAFE_GETGROUPS_0
--_ACEOF
--
-+  ac_cv_safe_getgroups_0=yes
- 
- else
-   echo "$as_me: program exited with status $ac_status" >&5
-@@ -21511,13 +21504,24 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ac_cv_safe_getgroups_0=no
- 
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_safe_getgroups_0" >&5
-+echo "${ECHO_T}$ac_cv_safe_getgroups_0" >&6
-+if test "x$ac_cv_safe_getgroups_0" = "xyes"
-+then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define SAFE_GETGROUPS_0
-+_ACEOF
-+
-+fi
-+
- echo "$as_me:$LINENO: checking whether realpath likes unreadable directories" >&5
- echo $ECHO_N "checking whether realpath likes unreadable directories... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
diff --git a/patches/pure-ftpd-1.0.21/generic/configure-md5-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-md5-cacheable.diff
deleted file mode 100644
index e8f3480d8..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-md5-cacheable.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# check for MD5 is not cross aware, make it cacheable and added cross default value
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -21636,12 +21636,12 @@ fi
- 
- echo "$as_me:$LINENO: checking whether you already have a standard MD5 implementation" >&5
- echo $ECHO_N "checking whether you already have a standard MD5 implementation... $ECHO_C" >&6
-+if test "${ac_cv_use_system_crypt_md5+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  ac_cv_use_system_crypt_md5="no (cross compiling)"
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21681,14 +21681,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--cat >>confdefs.h <<\_ACEOF
--#define USE_SYSTEM_CRYPT_MD5
--_ACEOF
--
-+  ac_cv_use_system_crypt_md5=yes
- 
- else
-   echo "$as_me: program exited with status $ac_status" >&5
-@@ -21696,13 +21689,24 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ac_cv_use_system_crypt_md5=no
- 
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_use_system_crypt_md5" >&5
-+echo "${ECHO_T}$ac_cv_use_system_crypt_md5" >&6
-+if test "x$ac_cv_use_system_crypt_md5" = xyes
-+then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_SYSTEM_CRYPT_MD5
-+_ACEOF
-+
-+fi
-+
- echo "$as_me:$LINENO: checking whether you already have a standard SHA1 implementation" >&5
- echo $ECHO_N "checking whether you already have a standard SHA1 implementation... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
diff --git a/patches/pure-ftpd-1.0.21/generic/configure-realpath-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-realpath-cacheable.diff
deleted file mode 100644
index f33de10a3..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-realpath-cacheable.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# check for realpath is not cross aware, make it cacheable and added cross default value
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -21524,12 +21524,12 @@ fi
- 
- echo "$as_me:$LINENO: checking whether realpath likes unreadable directories" >&5
- echo $ECHO_N "checking whether realpath likes unreadable directories... $ECHO_C" >&6
-+if test "${ac_cv_realpath_works_with_unreadable_directories+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  ac_cv_realpath_works_with_unreadable_directories=yes
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21602,14 +21602,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--cat >>confdefs.h <<\_ACEOF
--#define REALPATH_WORKS_WITH_UNREADABLE_DIRECTORIES
--_ACEOF
--
-+  ac_cv_realpath_works_with_unreadable_directories=yes
- 
- else
-   echo "$as_me: program exited with status $ac_status" >&5
-@@ -21617,16 +21610,29 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ac_cv_realpath_works_with_unreadable_directories=no
-+
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_realpath_works_with_unreadable_directories" >&5
-+echo "${ECHO_T}$ac_cv_realpath_works_with_unreadable_directories" >&6
-+if test "x$ac_cv_realpath_works_with_unreadable_directories" = "xyes"
-+then
-+
- cat >>confdefs.h <<\_ACEOF
--#define USE_BUILTIN_REALPATH 1
-+#define REALPATH_WORKS_WITH_UNREADABLE_DIRECTORIES
- _ACEOF
- 
-+else
-+  cat >>confdefs.h <<\_ACEOF
-+#define USE_BUILTIN_REALPATH 1
-+_ACEOF
- 
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+
- 
- echo "$as_me:$LINENO: checking whether you already have a standard MD5 implementation" >&5
- echo $ECHO_N "checking whether you already have a standard MD5 implementation... $ECHO_C" >&6
diff --git a/patches/pure-ftpd-1.0.21/generic/configure-remove-includes.diff b/patches/pure-ftpd-1.0.21/generic/configure-remove-includes.diff
deleted file mode 100644
index f864bcc67..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-remove-includes.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# inclusion of hosts dirs is not desired if cross compiling
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -3588,6 +3588,7 @@ fi
- 
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1"
- 
-+if test "$cross_compiling" != yes; then
- if test -d /usr/local/include; then
-   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- fi
-@@ -3603,6 +3604,7 @@ fi
- if uname | fgrep SunOS > /dev/null 2> /dev/null ; then
-   CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__=1 -D_XPG4_2=1"
- fi
-+fi
- 
- 
- echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-@@ -22243,10 +22245,12 @@ if test "${with_mysql+set}" = set; then
-       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib"
-       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include"
-     else
-+    if test "$cross_compiling" != yes; then
-       LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:/usr/lib/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-       LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
-       CPPFLAGS="$CPPFLAGS -I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql"
-     fi
-+    fi
- 
- echo "$as_me:$LINENO: checking for floor in -lm" >&5
- echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
-@@ -22646,10 +22650,12 @@ if test "${with_pgsql+set}" = set; then
-       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/pgsql -L${withval}/lib/postgresql -L${withval}/pgsql/lib -L${withval}/postgresql/lib"
-       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/pgsql -I${withval}/include/postgresql -I${withval}/pgsql/include -I${withval}/postgresql/include"
-     else
-+    if test "$cross_compiling" != yes; then
-       LD_RUN_PATH="/usr/local/pgsql/lib:/usr/local/pgsql/lib/pgsql:/usr/lib/pgsql:/usr/pgsql/lib:/usr/pgsql/lib/pgsql:/usr/local/lib/pgsql:/usr/local/postgresql/lib:/usr/local/postgresql/lib/postgresql:/usr/lib/postgresql:/usr/postgresql/lib:/usr/postgresql/lib/postgresql:/usr/local/lib/postgresql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-       LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib -L/usr/lib/pgsql -L/usr/pgsql/lib -L/usr/local/lib/pgsql -L/usr/local/pgsql/lib/pgsql -L/usr/pgsql/lib/pgsql -L/usr/local/postgresql/lib -L/usr/lib/postgresql -L/usr/postgresql/lib -L/usr/local/lib/postgresql -L/usr/local/postgresql/lib/postgresql -L/usr/postgresql/lib/postgresql"
-       CPPFLAGS="$CPPFLAGS -I/usr/local/pgsql/include -I/usr/include/pgsql -I/usr/pgsql/include -I/usr/local/include/pgsql -I/usr/local/pgsql/include/pgsql -I/usr/pgsql/include/pgsql -I/usr/local/postgresql/include -I/usr/include/postgresql -I/usr/postgresql/include -I/usr/local/include/postgresql -I/usr/local/postgresql/include/postgresql -I/usr/postgresql/include/postgresql"
-     fi
-+    fi
- 
- echo "$as_me:$LINENO: checking for floor in -lm" >&5
- echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
diff --git a/patches/pure-ftpd-1.0.21/generic/configure-sha1-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-sha1-cacheable.diff
deleted file mode 100644
index 7e399433f..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-sha1-cacheable.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# check for SHA1 is not cross aware, make it cacheable and added cross default value
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -21695,7 +21695,6 @@ fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
--fi
- echo "$as_me:$LINENO: result: $ac_cv_use_system_crypt_md5" >&5
- echo "${ECHO_T}$ac_cv_use_system_crypt_md5" >&6
- if test "x$ac_cv_use_system_crypt_md5" = xyes
-@@ -21710,11 +21709,7 @@ fi
- echo "$as_me:$LINENO: checking whether you already have a standard SHA1 implementation" >&5
- echo $ECHO_N "checking whether you already have a standard SHA1 implementation... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  ac_cv_use_system_crypt_sha1="no (cross compiling)"
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21753,14 +21748,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--
--cat >>confdefs.h <<\_ACEOF
--#define USE_SYSTEM_CRYPT_SHA1
--_ACEOF
--
-+  ac_cv_use_system_crypt_sha1=yes
- 
- else
-   echo "$as_me: program exited with status $ac_status" >&5
-@@ -21768,13 +21756,24 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ac_cv_use_system_crypt_sha1=no
- 
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_use_system_crypt_sha1" >&5
-+echo "${ECHO_T}$ac_cv_use_system_crypt_sha1" >&6
-+if test "x$ac_cv_use_system_crypt_sha1" = "xyes"
-+then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_SYSTEM_CRYPT_SHA1
-+_ACEOF
-+
-+fi
-+
- echo "$as_me:$LINENO: checking whether we are inside a Virtuozzo virtual host" >&5
- echo $ECHO_N "checking whether we are inside a Virtuozzo virtual host... $ECHO_C" >&6
- if test -d /proc/vz; then
diff --git a/patches/pure-ftpd-1.0.21/generic/configure-snprintf-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-snprintf-cacheable.diff
deleted file mode 100644
index 58590056f..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-snprintf-cacheable.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# check for snprintf is not cross aware, make it cacheable and added cross default value
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -21376,12 +21376,12 @@ rm -f conftest.err conftest.$ac_objext c
- 
- echo "$as_me:$LINENO: checking whether snprintf is C99 conformant" >&5
- echo $ECHO_N "checking whether snprintf is C99 conformant... $ECHO_C" >&6
-+if test "${ac_cv_conf_snprintf_type+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  ac_cv_conf_snprintf_type=8
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21424,7 +21424,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  CONF_SNPRINTF_TYPE=`cat conftestval`
-+  ac_cv_conf_snprintf_type=`cat conftestval`
- 
- else
-   echo "$as_me: program exited with status $ac_status" >&5
-@@ -21434,15 +21434,17 @@ sed 's/^/| /' conftest.$ac_ext >&5
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: done" >&5
--echo "${ECHO_T}done" >&6
--if test "x$CONF_SNPRINTF_TYPE" = "x" ; then
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_conf_snprintf_type" >&5
-+echo "${ECHO_T}$ac_cv_conf_snprintf_type" >&6
-+if test "x$ac_cv_conf_snprintf_type" = "x" ; then
-   { echo "$as_me:$LINENO: WARNING: your operating system doesn't implement snprintf" >&5
- echo "$as_me: WARNING: your operating system doesn't implement snprintf" >&2;}
- else
- 
- cat >>confdefs.h <<_ACEOF
--#define CONF_SNPRINTF_TYPE $CONF_SNPRINTF_TYPE
-+#define CONF_SNPRINTF_TYPE $ac_cv_conf_snprintf_type
- _ACEOF
- 
- fi
diff --git a/patches/pure-ftpd-1.0.21/generic/configure-virtuozzo-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-virtuozzo-cacheable.diff
deleted file mode 100644
index 3edd7bd11..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure-virtuozzo-cacheable.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# check for virtuozzo is not cross aware, make it cacheable
-#
-# State:
-#
-# do not commit, this fixes a generated file
-#
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -21776,17 +21776,26 @@ fi
- 
- echo "$as_me:$LINENO: checking whether we are inside a Virtuozzo virtual host" >&5
- echo $ECHO_N "checking whether we are inside a Virtuozzo virtual host... $ECHO_C" >&6
-+if test "${ac_cv_virtuozzo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
- if test -d /proc/vz; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  ac_cv_virtuozzo=yes
-+else
-+  ac_cv_virtuozzo=no
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_virtuozzo" >&5
-+echo "${ECHO_T}$ac_cv_virtuozzo" >&6
-+if test "x$ac_cv_virtuozzo" = xyes
-+then
- 
- cat >>confdefs.h <<\_ACEOF
- #define VIRTUOZZO
- _ACEOF
- 
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
- fi
- 
- echo "$as_me:$LINENO: checking default TCP send buffer size" >&5
diff --git a/patches/pure-ftpd-1.0.21/generic/configure_remove-fssa.diff b/patches/pure-ftpd-1.0.21/generic/configure_remove-fssa.diff
deleted file mode 100644
index 03990eff0..000000000
--- a/patches/pure-ftpd-1.0.21/generic/configure_remove-fssa.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Submitted:
-#
-# Sascha Hauer <s.hauer@pengutronix.de>, 2005-08-31
-#
-# This patch sets some defaults for cross compiling and
-# removes the -fssa switch from CFLAGS, because man gcc says
-# that this option is not ready for production use and it
-# produces internal compiler errrors here
-#
-# unknown
-# 
-Index: pure-ftpd-1.0.21/configure
-===================================================================
---- pure-ftpd-1.0.21.orig/configure
-+++ pure-ftpd-1.0.21/configure
-@@ -12803,7 +12803,7 @@ _ACEOF
- #define BORING_MODE 1
- _ACEOF
- 
--    CFLAGS="$CFLAGS -Os -ftracer -fomit-frame-pointer -fssa -fgcse -falign-functions=2 -falign-jumps=2 -fno-unroll-loops "
-+    CFLAGS="$CFLAGS -Os -ftracer -fomit-frame-pointer -fgcse -falign-functions=2 -falign-jumps=2 -fno-unroll-loops "
-     LDFLAGS="$LDFLAGS -s "
-   fi
- fi;
diff --git a/patches/pure-ftpd-1.0.21/generic/pure-ftpd-1.0.21-autogen.diff.bz2 b/patches/pure-ftpd-1.0.21/generic/pure-ftpd-1.0.21-autogen.diff.bz2
new file mode 100644
index 000000000..c9a013e52
--- /dev/null
+++ b/patches/pure-ftpd-1.0.21/generic/pure-ftpd-1.0.21-autogen.diff.bz2
diff --git a/patches/pure-ftpd-1.0.21/generic/series b/patches/pure-ftpd-1.0.21/generic/series
index 3d53f40b8..0b4e5b616 100644
--- a/patches/pure-ftpd-1.0.21/generic/series
+++ b/patches/pure-ftpd-1.0.21/generic/series
@@ -1,19 +1,9 @@
 configure_ac_remove-fssa.diff
-configure_remove-fssa.diff
 configure_ac-remove-includes.diff
-configure-remove-includes.diff
-
-
 configure_ac-snprintf-cacheable.diff
-configure-snprintf-cacheable.diff
-
 configure_ac-getgroups-cacheable.diff
-configure-getgroups-cacheable.diff
 configure_ac-realpath-cacheable.diff
-configure-realpath-cacheable.diff
 configure_ac-md5-cacheable.diff
-configure-md5-cacheable.diff
 configure_ac-sha1-cacheable.diff
-configure-sha1-cacheable.diff
 configure_ac-virtuozzo-cacheable.diff
-configure-virtuozzo-cacheable.diff
+pure-ftpd-1.0.21-autogen.diff.bz2