3 files changed, 77 deletions(-) debian/patches/chown-check-2.patch | 51 ------------------------------------ debian/patches/ipv6-check.patch | 24 ---------------- debian/patches/series/2.1.2-1 | 2 -
# HG changeset patch # User Andrew Beekhof <[EMAIL PROTECTED]> # Date 1226405909 -3600 # Branch stable-1.0 # Node ID 53704f80e9c9be3ec7fafc9056a983fc28e46ea6 # Parent 21556fcee3241da70173722bf16683fd8214d21a Low: Build: Remove irrlevant patches diff --git a/debian/patches/chown-check-2.patch b/debian/patches/chown-check-2.patch deleted file mode 100644 --- a/debian/patches/chown-check-2.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/configure.in 2005-09-15 15:36:30.000000000 +0900 -+++ b/configure.in 2005-09-15 16:34:07.000000000 +0900 -@@ -316,11 +316,6 @@ - dnl ************************************************************************ - AC_PATH_PROGS(MKTEMP, mktemp) - --if test -n "$WHOAMI"; then -- IAM=`$WHOAMI` --fi --AC_MSG_CHECKING(if chown works for non-root) -- - dnl Prefer "mktemp" command. But some OSes lack it; they can "touch". - if test -n "$MKTEMP"; then - F=`$MKTEMP "./.chown-testXXXXX"` -@@ -329,17 +324,33 @@ - touch $F - fi - --if -+AC_MSG_CHECKING(if chown works for non-root) -+if test -n "$WHOAMI" ; then -+ IAM=`$WHOAMI` -+fi -+# In the case of Debian, chown to root does not work as non-root -+# And to futher complicate things, the package is often -+# built with fakeroot, which looks like root, but isn't, -+# causing the test to stall waiting for nobody's password -+# Resolve this by checking if fakeroot is in operation, -+# and if it is assuming the system is Debian and failing -+# the test -+nonroot_chown=no -+if -+ test "X$FAKED_MODE" = "X" && - case "$IAM" in - root) chown nobody $F; -- su nobody -c "chown root $F";; -+ su nobody -c "chown root $F";; - *) chown root $F - esac >/dev/null 2>&1 - then - nonroot_chown=yes -+fi -+if -+ test "$nonroot_chown" = yes -+then - AC_MSG_RESULT(yes) - else -- nonroot_chown=no - AC_MSG_RESULT(no) - fi - rm -f $F diff --git a/debian/patches/ipv6-check.patch b/debian/patches/ipv6-check.patch deleted file mode 100644 --- a/debian/patches/ipv6-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User Alan Robertson <[EMAIL PROTECTED]> -# Date 1185658580 21600 -# Node ID 3ad95813d17f3d1adf0c38713ee09dca5e45cd5d -# Parent f5f06cad7734ccfaef80ee98068fef7230879372 -Patch to revert configure.in check from Tuomo Soini - LF bug 1660 - ---- -31st July 2007: Reverse this patch as it breaks the build for ia64 Debian. - Horms - - -diff -r f5f06cad7734 -r 3ad95813d17f configure.in ---- a/configure.in Fri Jul 27 10:16:24 2007 -0600 -+++ b/configure.in Sat Jul 28 15:36:20 2007 -0600 -@@ -1032,7 +1032,7 @@ CPPFLAGS="$CPPFLAGS $XML2HEAD" - - dnl ************************************************************************ - dnl * Check for linux/icmpv6.h to make enable the IPv6addr resource agent --AC_CHECK_HEADERS(linux/icmpv6.h,[],[],[#include <asm/types.h>]) -+AC_CHECK_HEADERS(linux/icmpv6.h,[],[],[#include <sys/types.h>]) - AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_linux_icmpv6_h" = yes -a $new_libnet = yes ) - AC_CHECK_HEADERS(libxml/xpath.h) - diff --git a/debian/patches/series/2.1.2-1 b/debian/patches/series/2.1.2-1 deleted file mode 100644 --- a/debian/patches/series/2.1.2-1 +++ /dev/null @@ -1,2 +0,0 @@ -+ chown-check-2.patch -+ ipv6-check.patch
_______________________________________________ Pacemaker mailing list [email protected] http://list.clusterlabs.org/mailman/listinfo/pacemaker
