[gentoo-commits] gentoo-x86 commit in net-analyzer/tcpdump/files: tcpdump-4.1.0-without-chroot.patch

[Peter Volkov (pva)]

pva         10/04/02 06:02:17

  Added:                tcpdump-4.1.0-without-chroot.patch
  Log:
  Version bump, bug #312337, thank Richard Hartmann for report. Fixes inability to run tcpdump if built with USE=-chroot, bug 281936, thank Travis Schack for report. Tests are broken in the release.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/tcpdump/files/tcpdump-4.1.0-without-chroot.patch?rev=1.1&content-type=text/plain

Index: tcpdump-4.1.0-without-chroot.patch
===================================================================
commit 7ec07e4815965dd31b85e56ac823249bfb9afc28
Author: Peter Volkov <pva@g.o>
Date:   Fri Apr 2 09:33:30 2010 +0400

    Respect --without-chroot correctly
    
    ./configure --without-chroot will configure tcpdump with "no" as the
    value of chroot directory and cause tcpdump to fail with:
    
    tcpdump: Couldn't chroot/chdir to 'no': No such file or directory
    
    This patch makes ./configure to avoid chroot directory when called with
    --without-chroot.

diff --git a/configure.in b/configure.in
index 1c1b63a..eb3e5e8 100644
--- a/configure.in
+++ b/configure.in
@@ -159,7 +159,7 @@ fi
 
 AC_ARG_WITH(chroot, [  --with-chroot=DIRECTORY when dropping privileges, chroot to DIRECTORY])
 AC_MSG_CHECKING([whether to chroot])
-if test ! -z "$with_chroot" ; then
+if test ! -z "$with_chroot" && test "$with_chroot" != "no" ; then
         AC_DEFINE_UNQUOTED(WITH_CHROOT, "$withval")
        AC_MSG_RESULT(to \"$withval\")
 else