diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-11-29 15:50:06 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-11-29 15:50:06 +0000 |
commit | 5018aaadd047e5bdd6053f22fc823a098790b6a9 (patch) | |
tree | 06a935b6d661c164564c7c6ac62cf9feefeba6cf /patches | |
parent | 45a5c106dd3091400d4f5b6b2005c237cecf35e9 (diff) | |
download | ptxdist-5018aaadd047e5bdd6053f22fc823a098790b6a9.tar.gz ptxdist-5018aaadd047e5bdd6053f22fc823a098790b6a9.tar.xz |
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6406 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
14 files changed, 235 insertions, 87 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 index 930b46531..5a25d41b5 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-getgroups-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-getgroups-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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 -@@ -21434,12 +21434,12 @@ fi +@@ -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 @@ -20,7 +31,7 @@ Index: pure-ftpd-1.0.21/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -21478,14 +21478,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -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 @@ -36,7 +47,7 @@ Index: pure-ftpd-1.0.21/configure else echo "$as_me: program exited with status $ac_status" >&5 -@@ -21493,13 +21486,24 @@ echo "$as_me: failed program was:" >&5 +@@ -21511,13 +21504,24 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) 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 index b29c2b1fb..e8f3480d8 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-md5-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-md5-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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 -@@ -21618,12 +21618,12 @@ fi +@@ -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 @@ -20,7 +31,7 @@ Index: pure-ftpd-1.0.21/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -21663,14 +21663,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -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 @@ -36,7 +47,7 @@ Index: pure-ftpd-1.0.21/configure else echo "$as_me: program exited with status $ac_status" >&5 -@@ -21678,13 +21671,24 @@ echo "$as_me: failed program was:" >&5 +@@ -21696,13 +21689,24 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) 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 index b0cf866da..f33de10a3 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-realpath-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-realpath-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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 -@@ -21506,12 +21506,12 @@ fi +@@ -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 @@ -20,7 +31,7 @@ Index: pure-ftpd-1.0.21/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -21584,14 +21584,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -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 @@ -36,7 +47,7 @@ Index: pure-ftpd-1.0.21/configure else echo "$as_me: program exited with status $ac_status" >&5 -@@ -21599,16 +21592,29 @@ echo "$as_me: failed program was:" >&5 +@@ -21617,16 +21610,29 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) 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 index 8d531d7d9..f864bcc67 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-remove-includes.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-remove-includes.diff @@ -1,49 +1,57 @@ +# +# 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,22 +3588,6 @@ fi +@@ -3588,6 +3588,7 @@ fi CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1" --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi -- --if uname | fgrep SunOS > /dev/null 2> /dev/null ; then -- CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__=1 -D_XPG4_2=1" --fi -- ++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 - echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -@@ -22242,10 +22226,6 @@ if test "${with_mysql+set}" = set; then - LD_RUN_PATH="${withval}/lib${LD_RUN_PATH:+:}${LD_RUN_PATH}" +@@ -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 -- 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" + 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 -@@ -22645,10 +22625,6 @@ if test "${with_pgsql+set}" = set; then - LD_RUN_PATH="${withval}/lib${LD_RUN_PATH:+:}${LD_RUN_PATH}" + 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 -- 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" + 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 index 1770a2359..7e399433f 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-sha1-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-sha1-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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 -@@ -21677,7 +21677,6 @@ fi +@@ -21695,7 +21695,6 @@ fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -10,7 +21,7 @@ Index: pure-ftpd-1.0.21/configure 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 -@@ -21692,11 +21691,7 @@ fi +@@ -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 @@ -23,7 +34,7 @@ Index: pure-ftpd-1.0.21/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -21735,14 +21730,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -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 @@ -39,7 +50,7 @@ Index: pure-ftpd-1.0.21/configure else echo "$as_me: program exited with status $ac_status" >&5 -@@ -21750,13 +21738,24 @@ echo "$as_me: failed program was:" >&5 +@@ -21768,13 +21756,24 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) 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 index 463b332ca..58590056f 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-snprintf-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-snprintf-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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 -@@ -21358,12 +21358,12 @@ rm -f conftest.err conftest.$ac_objext c +@@ -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 @@ -20,7 +31,7 @@ Index: pure-ftpd-1.0.21/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -21406,7 +21406,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -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 @@ -29,7 +40,7 @@ Index: pure-ftpd-1.0.21/configure else echo "$as_me: program exited with status $ac_status" >&5 -@@ -21416,15 +21416,17 @@ sed 's/^/| /' conftest.$ac_ext >&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 diff --git a/patches/pure-ftpd-1.0.21/generic/configure-svirtuozzo-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure-svirtuozzo-cacheable.diff index db135612a..c58d3b401 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure-svirtuozzo-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure-svirtuozzo-cacheable.diff @@ -1,3 +1,14 @@ +# +# 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 diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-getgroups-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-getgroups-cacheable.diff index 48123b4b1..d077d42d5 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-getgroups-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-getgroups-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -931,7 +931,9 @@ else +@@ -949,7 +949,9 @@ else fi @@ -13,7 +24,7 @@ Index: pure-ftpd-1.0.21/configure.ac AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #ifdef STDC_HEADERS -@@ -950,11 +952,14 @@ int main(void) +@@ -968,11 +970,14 @@ int main(void) { return getgroups(0, NULL) <= 0; } diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-md5-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-md5-cacheable.diff index d9484d563..a74ba48e5 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-md5-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-md5-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -1028,7 +1028,9 @@ else +@@ -1046,7 +1046,9 @@ else fi @@ -13,7 +24,7 @@ Index: pure-ftpd-1.0.21/configure.ac AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #include <stdio.h> -@@ -1048,12 +1050,15 @@ int main(void) +@@ -1066,12 +1068,15 @@ int main(void) return strcasecmp(b, "098f6bcd4621d373cade4e832627b4f6"); } diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-realpath-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-realpath-cacheable.diff index 41dc9688c..cea8d45d4 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-realpath-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-realpath-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -961,7 +961,9 @@ then +@@ -979,7 +979,9 @@ then AC_DEFINE(SAFE_GETGROUPS_0,,[Define is getgroups(0, NULL) works on your system]) fi @@ -13,7 +24,7 @@ Index: pure-ftpd-1.0.21/configure.ac AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #ifdef STDC_HEADERS -@@ -1014,13 +1016,17 @@ int main(void) +@@ -1032,13 +1034,17 @@ int main(void) return 0; } diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-remove-includes.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-remove-includes.diff index c25bee884..742f4e42e 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-remove-includes.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-remove-includes.diff @@ -1,49 +1,57 @@ +# +# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29 +# +# Error: +# +# inclusion of hosts dirs is not desired if cross compiling +# +# State: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -30,22 +30,6 @@ AC_PATH_PROG(PYTHON,python,/usr/bin/env +@@ -30,6 +30,7 @@ AC_PATH_PROG(PYTHON,python,/usr/bin/env CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1" --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi -- --if uname | fgrep SunOS > /dev/null 2> /dev/null ; then -- CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__=1 -D_XPG4_2=1" --fi -- ++if test "$cross_compiling" != yes; then + if test -d /usr/local/include; then + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + fi +@@ -45,6 +46,7 @@ fi + if uname | fgrep SunOS > /dev/null 2> /dev/null ; then + CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__=1 -D_XPG4_2=1" + fi ++fi + dnl Checks for header files - AC_HEADER_STDC -@@ -1188,10 +1172,6 @@ AC_ARG_WITH(mysql, - LD_RUN_PATH="${withval}/lib${LD_RUN_PATH:+:}${LD_RUN_PATH}" +@@ -1189,10 +1191,12 @@ AC_ARG_WITH(mysql, 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 -- 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" + 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 AC_CHECK_LIB(m, floor) AC_CHECK_LIB(z, gzclose) -@@ -1224,10 +1204,6 @@ AC_ARG_WITH(pgsql, - LD_RUN_PATH="${withval}/lib${LD_RUN_PATH:+:}${LD_RUN_PATH}" + with_mysql="yes" +@@ -1225,10 +1229,12 @@ AC_ARG_WITH(pgsql, 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 -- 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" + 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 AC_CHECK_LIB(m, floor) AC_CHECK_LIB(z, gzclose) + with_pgsql="yes" diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-sha1-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-sha1-cacheable.diff index 4281b4623..6bbfe4737 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-sha1-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-sha1-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -1060,7 +1060,9 @@ then +@@ -1078,7 +1078,9 @@ then MD5 functions]) fi @@ -13,7 +24,7 @@ Index: pure-ftpd-1.0.21/configure.ac AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #include <string.h> -@@ -1079,12 +1081,15 @@ int main(void) +@@ -1097,12 +1099,15 @@ int main(void) return strcasecmp(b, "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3"); } diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-snprintf-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-snprintf-cacheable.diff index a020d2e8a..022741ebc 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-snprintf-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-snprintf-cacheable.diff @@ -1,8 +1,19 @@ +# +# 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: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -896,7 +896,9 @@ for (;;) { +@@ -914,7 +914,9 @@ for (;;) { AC_MSG_RESULT(no) ]) @@ -13,7 +24,7 @@ Index: pure-ftpd-1.0.21/configure.ac AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #ifdef STDC_HEADERS -@@ -919,13 +921,13 @@ int main(void) +@@ -937,13 +939,13 @@ int main(void) (int) snprintf(buf, sizeof buf, "12345678")); return 0; } diff --git a/patches/pure-ftpd-1.0.21/generic/configure_ac-virtuozzo-cacheable.diff b/patches/pure-ftpd-1.0.21/generic/configure_ac-virtuozzo-cacheable.diff index 3e0cf3795..d9da911c0 100644 --- a/patches/pure-ftpd-1.0.21/generic/configure_ac-virtuozzo-cacheable.diff +++ b/patches/pure-ftpd-1.0.21/generic/configure_ac-virtuozzo-cacheable.diff @@ -1,8 +1,19 @@ +# +# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29 +# +# Error: +# +# check for Virtuozzo is not cross aware, make it cacheable and added cross default value +# +# State: +# +# should be commited +# Index: pure-ftpd-1.0.21/configure.ac =================================================================== --- pure-ftpd-1.0.21.orig/configure.ac +++ pure-ftpd-1.0.21/configure.ac -@@ -1091,13 +1091,19 @@ then +@@ -1109,13 +1109,19 @@ then SHA1 functions]) fi |