From 57d2d9cd5740730d0d29694b74e71e93ddc0221b Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Thu, 16 Mar 2006 01:21:45 +0000 Subject: davfs2-0.2.7: reactivate removed patch and move patches to the relevant version --- packages/davfs2/davfs2-0.2.7/no-func-checks.patch | 32 ++++++++++++++++++++++ .../davfs2/davfs2-0.2.7/no-neon-version-test.patch | 10 +++++++ packages/davfs2/davfs2_0.2.7.bb | 1 + packages/davfs2/files/no-func-checks.patch | 32 ---------------------- 4 files changed, 43 insertions(+), 32 deletions(-) create mode 100644 packages/davfs2/davfs2-0.2.7/no-func-checks.patch create mode 100644 packages/davfs2/davfs2-0.2.7/no-neon-version-test.patch delete mode 100644 packages/davfs2/files/no-func-checks.patch diff --git a/packages/davfs2/davfs2-0.2.7/no-func-checks.patch b/packages/davfs2/davfs2-0.2.7/no-func-checks.patch new file mode 100644 index 0000000000..46ca24398e --- /dev/null +++ b/packages/davfs2/davfs2-0.2.7/no-func-checks.patch @@ -0,0 +1,32 @@ +--- neon-0.24.7/macros/neon.m4.old 2005-02-24 16:28:01 +00:00 ++++ neon-0.24.7/macros/neon.m4 2005-02-24 16:40:17 +00:00 +@@ -508,26 +508,9 @@ + # Enable getaddrinfo() support only if all the necessary functions + # are found. + ne_enable_gai=yes +-NE_CHECK_FUNCS(getaddrinfo gai_strerror inet_ntop,,[ne_enable_gai=no; break]) +-if test $ne_enable_gai = yes; then +- AC_DEFINE(USE_GETADDRINFO, 1, [Define if getaddrinfo() should be used]) +- AC_CACHE_CHECK([for working AI_ADDRCONFIG], [ne_cv_gai_addrconfig], [ +- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], +-[struct addrinfo hints = {0}, *result; +-hints.ai_flags = AI_ADDRCONFIG; +-if (getaddrinfo("localhost", NULL, &hints, &result) != 0) return 1;])], +- ne_cv_gai_addrconfig=yes, ne_cv_gai_addrconfig=no)]) +- if test $ne_cv_gai_addrconfig = yes; then +- AC_DEFINE(USE_GAI_ADDRCONFIG, 1, [Define if getaddrinfo supports AI_ADDRCONFIG]) +- fi +-else +- # Checks for non-getaddrinfo() based resolver interfaces. +- NE_SEARCH_LIBS(hstrerror, resolv,,[:]) +- NE_CHECK_FUNCS(hstrerror) +- # Older Unixes don't declare h_errno. +- AC_CHECK_DECL(h_errno,,,[#define _XOPEN_SOURCE_EXTENDED 1 +-#include ]) +-fi ++ne_cv_gai_addrconfig=yes ++AC_DEFINE(USE_GETADDRINFO, 1, [Define if getaddrinfo() should be used]) ++AC_DEFINE(USE_GAI_ADDRCONFIG, 1, [Define if getaddrinfo supports AI_ADDRCONFIG]) + + AC_CHECK_MEMBERS(struct tm.tm_gmtoff,, + AC_MSG_WARN([no timezone handling in date parsing on this platform]), diff --git a/packages/davfs2/davfs2-0.2.7/no-neon-version-test.patch b/packages/davfs2/davfs2-0.2.7/no-neon-version-test.patch new file mode 100644 index 0000000000..67b2055584 --- /dev/null +++ b/packages/davfs2/davfs2-0.2.7/no-neon-version-test.patch @@ -0,0 +1,10 @@ +--- davfs2-0.2.7/configure.in.orig 2006-02-11 15:19:21.000000000 +0100 ++++ davfs2-0.2.7/configure.in 2006-02-11 15:19:34.000000000 +0100 +@@ -20,7 +20,6 @@ + top_builddir=`pwd` + AC_SUBST(top_builddir) + +-NEON_REQUIRE(0,24) + NEON_WITHOUT_ZLIB + NEON_WITHOUT_ACL + NEON_TEST diff --git a/packages/davfs2/davfs2_0.2.7.bb b/packages/davfs2/davfs2_0.2.7.bb index 0527576274..509671a229 100644 --- a/packages/davfs2/davfs2_0.2.7.bb +++ b/packages/davfs2/davfs2_0.2.7.bb @@ -11,6 +11,7 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \ file://no-func-checks.patch;patch=1 \ + file://no-neon-version-test.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ file://volatiles" diff --git a/packages/davfs2/files/no-func-checks.patch b/packages/davfs2/files/no-func-checks.patch deleted file mode 100644 index 46ca24398e..0000000000 --- a/packages/davfs2/files/no-func-checks.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- neon-0.24.7/macros/neon.m4.old 2005-02-24 16:28:01 +00:00 -+++ neon-0.24.7/macros/neon.m4 2005-02-24 16:40:17 +00:00 -@@ -508,26 +508,9 @@ - # Enable getaddrinfo() support only if all the necessary functions - # are found. - ne_enable_gai=yes --NE_CHECK_FUNCS(getaddrinfo gai_strerror inet_ntop,,[ne_enable_gai=no; break]) --if test $ne_enable_gai = yes; then -- AC_DEFINE(USE_GETADDRINFO, 1, [Define if getaddrinfo() should be used]) -- AC_CACHE_CHECK([for working AI_ADDRCONFIG], [ne_cv_gai_addrconfig], [ -- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], --[struct addrinfo hints = {0}, *result; --hints.ai_flags = AI_ADDRCONFIG; --if (getaddrinfo("localhost", NULL, &hints, &result) != 0) return 1;])], -- ne_cv_gai_addrconfig=yes, ne_cv_gai_addrconfig=no)]) -- if test $ne_cv_gai_addrconfig = yes; then -- AC_DEFINE(USE_GAI_ADDRCONFIG, 1, [Define if getaddrinfo supports AI_ADDRCONFIG]) -- fi --else -- # Checks for non-getaddrinfo() based resolver interfaces. -- NE_SEARCH_LIBS(hstrerror, resolv,,[:]) -- NE_CHECK_FUNCS(hstrerror) -- # Older Unixes don't declare h_errno. -- AC_CHECK_DECL(h_errno,,,[#define _XOPEN_SOURCE_EXTENDED 1 --#include ]) --fi -+ne_cv_gai_addrconfig=yes -+AC_DEFINE(USE_GETADDRINFO, 1, [Define if getaddrinfo() should be used]) -+AC_DEFINE(USE_GAI_ADDRCONFIG, 1, [Define if getaddrinfo supports AI_ADDRCONFIG]) - - AC_CHECK_MEMBERS(struct tm.tm_gmtoff,, - AC_MSG_WARN([no timezone handling in date parsing on this platform]), -- cgit v1.2.3