--- nmap-6.00.orig/configure.ac +++ nmap-6.00/configure.ac @@ -398,22 +398,6 @@ CXXFLAGS="-no-cpp-precomp $CXXFLAGS" fi -if test $have_libpcap = yes; then - if test "${LIBPCAP_INC+set}" = "set"; then - _cflags=$CXXFLAGS - _ldflags=$LDFLAGS - - CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" - LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS" - fi - - # link with -lpcap for the purposes of this test - LIBS_OLD="$LIBS" - LIBS="$LIBS -lpcap" - PCAP_IS_SUITABLE([have_libpcap=yes], [have_libpcap=no], [have_libpcap=yes]) - LIBS="$LIBS_OLD" -fi - if test $have_libpcap != yes; then AC_CONFIG_SUBDIRS(libpcap) if test "${LIBPCAP_INC+set}" = "set"; then --- nmap-6.00.orig/configure +++ nmap-6.00/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1243,8 +1263,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1521,9 +1539,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1637,7 +1655,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1853,52 +1871,6 @@ } # ac_fn_c_check_header_compile -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_decl - # ac_fn_cxx_try_run LINENO # ------------------------ # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -2012,7 +1984,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2533,7 +2505,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2573,7 +2545,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2626,7 +2598,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2667,7 +2639,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2725,7 +2697,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2769,7 +2741,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3215,8 +3187,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3367,7 +3338,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3407,7 +3378,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3460,7 +3431,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3501,7 +3472,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3559,7 +3530,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3603,7 +3574,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3799,8 +3770,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3913,7 +3883,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3957,7 +3927,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4159,7 +4129,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4199,7 +4169,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4271,7 +4241,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4418,7 +4388,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4461,7 +4431,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_STRIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4984,7 +4954,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5050,7 +5020,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5518,7 +5488,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5784,7 +5754,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6272,128 +6242,6 @@ CXXFLAGS="-no-cpp-precomp $CXXFLAGS" fi -if test $have_libpcap = yes; then - if test "${LIBPCAP_INC+set}" = "set"; then - _cflags=$CXXFLAGS - _ldflags=$LDFLAGS - - CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" - LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS" - fi - - # link with -lpcap for the purposes of this test - LIBS_OLD="$LIBS" - LIBS="$LIBS -lpcap" - - for ac_header in sys/ioccom.h sys/time.h net/bpf.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpcap is suitable" >&5 -$as_echo_n "checking if libpcap is suitable... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling -- assuming yes" >&5 -$as_echo "cross-compiling -- assuming yes" >&6; }; have_libpcap=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -extern char pcap_version[]; -int main() { - int major, minor1, minor2; - sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2); - if (major > 0) - exit(0); - if (minor1 < 9) - exit(1); - if (minor2 < 4) - exit(1); - exit(0); -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#ifdef HAVE_SYS_IOCCOM_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_NET_BPF_H -#include -#endif -extern char pcap_version[]; -int main() { - int major, minor; - sscanf(pcap_version,"%d.%d", &major, &minor); - if ((major == 1 && minor >= 1) || major > 1) - return 0; -#ifdef BIOCSRTIMEOUT -#ifdef IOCPARM_LEN - if (IOCPARM_LEN(BIOCSRTIMEOUT) != sizeof(struct timeval)) - return 1; -#endif -#endif - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - - ac_fn_c_check_decl "$LINENO" "pcap_get_selectable_fd" "ac_cv_have_decl_pcap_get_selectable_fd" "#include -" -if test "x$ac_cv_have_decl_pcap_get_selectable_fd" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; have_libpcap=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- pcap_get_selectable_fd not declared" >&5 -$as_echo "no -- pcap_get_selectable_fd not declared" >&6; }; have_libpcap=no -fi - - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- BPF_TIMEOUT BIOCSRTIMEOUT bug (64-bit OS X)" >&5 -$as_echo "no -- BPF_TIMEOUT BIOCSRTIMEOUT bug (64-bit OS X)" >&6; }; have_libpcap=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; have_libpcap=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - - LIBS="$LIBS_OLD" -fi - if test $have_libpcap != yes; then subdirs="$subdirs libpcap" @@ -8303,16 +8151,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -8372,28 +8220,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -8415,7 +8251,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8477,10 +8313,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8569,7 +8405,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' --- nmap-6.00.orig/libdnet-stripped/src/addr.c +++ nmap-6.00/libdnet-stripped/src/addr.c @@ -318,6 +318,7 @@ #endif case AF_UNSPEC: case ARP_HRD_ETH: /* XXX- Linux arp(7) */ + case ARP_HRD_IEEE80211_RADIOTAP: /* IEEE 802.11 + radiotap header */ a->addr_type = ADDR_TYPE_ETH; a->addr_bits = ETH_ADDR_BITS; memcpy(&a->addr_eth, sa->sa_data, ETH_ADDR_LEN); --- nmap-6.00.orig/libdnet-stripped/include/dnet/arp.h +++ nmap-6.00/libdnet-stripped/include/dnet/arp.h @@ -39,6 +39,8 @@ #define ARP_HRD_ETH 0x0001 /* ethernet hardware */ #define ARP_HRD_IEEE802 0x0006 /* IEEE 802 hardware */ +#define ARP_HRD_IEEE80211_RADIOTAP 0x0323 /* IEEE 802.11 + radiotap header */ + /* * Protocol address format */ --- nmap-6.00.orig/libnetutil/makefile.dep +++ nmap-6.00/libnetutil/makefile.dep @@ -0,0 +1 @@ +npacket.o: npacket.cc --- nmap-6.00.orig/nping/configure.ac +++ nmap-6.00/nping/configure.ac @@ -229,22 +229,6 @@ CXXFLAGS="-no-cpp-precomp $CXXFLAGS" fi -if test $have_libpcap = yes; then - if test "${LIBPCAP_INC+set}" = "set"; then - _cflags=$CXXFLAGS - _ldflags=$LDFLAGS - - CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" - LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS" - fi - - # link with -lpcap for the purposes of this test - LIBS_OLD="$LIBS" - LIBS="$LIBS -lpcap" - PCAP_IS_SUITABLE([have_libpcap=yes], [have_libpcap=no], [have_libpcap=yes]) - LIBS="$LIBS_OLD" -fi - if test $have_libpcap != yes; then if test "${LIBPCAP_INC+set}" = "set"; then LDFLAGS="-L$libpcapdir $_ldflags" --- nmap-6.00.orig/nping/configure +++ nmap-6.00/nping/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1158,8 +1178,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1404,9 +1422,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1717,7 +1735,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1802,58 +1820,12 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func - -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_decl cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2359,7 +2331,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2399,7 +2371,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2452,7 +2424,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2493,7 +2465,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2551,7 +2523,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2595,7 +2567,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3041,8 +3013,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3193,7 +3164,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3233,7 +3204,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3286,7 +3257,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3327,7 +3298,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3385,7 +3356,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3429,7 +3400,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3625,8 +3596,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3739,7 +3709,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3783,7 +3753,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4005,7 +3975,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4180,7 +4150,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4223,7 +4193,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_STRIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4416,7 +4386,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4482,7 +4452,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5192,128 +5162,6 @@ CXXFLAGS="-no-cpp-precomp $CXXFLAGS" fi -if test $have_libpcap = yes; then - if test "${LIBPCAP_INC+set}" = "set"; then - _cflags=$CXXFLAGS - _ldflags=$LDFLAGS - - CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" - LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS" - fi - - # link with -lpcap for the purposes of this test - LIBS_OLD="$LIBS" - LIBS="$LIBS -lpcap" - - for ac_header in sys/ioccom.h sys/time.h net/bpf.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpcap is suitable" >&5 -$as_echo_n "checking if libpcap is suitable... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling -- assuming yes" >&5 -$as_echo "cross-compiling -- assuming yes" >&6; }; have_libpcap=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -extern char pcap_version[]; -int main() { - int major, minor1, minor2; - sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2); - if (major > 0) - exit(0); - if (minor1 < 9) - exit(1); - if (minor2 < 4) - exit(1); - exit(0); -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#ifdef HAVE_SYS_IOCCOM_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_NET_BPF_H -#include -#endif -extern char pcap_version[]; -int main() { - int major, minor; - sscanf(pcap_version,"%d.%d", &major, &minor); - if ((major == 1 && minor >= 1) || major > 1) - return 0; -#ifdef BIOCSRTIMEOUT -#ifdef IOCPARM_LEN - if (IOCPARM_LEN(BIOCSRTIMEOUT) != sizeof(struct timeval)) - return 1; -#endif -#endif - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - - ac_fn_c_check_decl "$LINENO" "pcap_get_selectable_fd" "ac_cv_have_decl_pcap_get_selectable_fd" "#include -" -if test "x$ac_cv_have_decl_pcap_get_selectable_fd" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; have_libpcap=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- pcap_get_selectable_fd not declared" >&5 -$as_echo "no -- pcap_get_selectable_fd not declared" >&6; }; have_libpcap=no -fi - - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- BPF_TIMEOUT BIOCSRTIMEOUT bug (64-bit OS X)" >&5 -$as_echo "no -- BPF_TIMEOUT BIOCSRTIMEOUT bug (64-bit OS X)" >&6; }; have_libpcap=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; have_libpcap=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - - LIBS="$LIBS_OLD" -fi - if test $have_libpcap != yes; then if test "${LIBPCAP_INC+set}" = "set"; then LDFLAGS="-L$libpcapdir $_ldflags" @@ -6641,16 +6489,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -6710,28 +6558,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -6753,7 +6589,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6815,10 +6651,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6907,7 +6743,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' --- nmap-6.00.orig/debian/watch +++ nmap-6.00/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://nmap.org/dist/nmap-((?:\d+\.)+\d+)\.tgz --- nmap-6.00.orig/debian/zenmap.xpm +++ nmap-6.00/debian/zenmap.xpm @@ -0,0 +1,66 @@ +/* XPM */ +static char *nmap-1[] = { +/* columns rows colors chars-per-pixel */ +"32 32 28 1", +" c #040404", +". c #330000", +"X c #333300", +"o c #333366", +"O c #663300", +"+ c #663366", +"@ c gray30", +"# c gray40", +"$ c #800000", +"% c #993300", +"& c #993366", +"* c #996600", +"= c #996666", +"- c #CC6666", +"; c #FF6666", +": c #996699", +"> c #CC6699", +", c #FF6699", +"< c #CC9966", +"1 c #FF9966", +"2 c #868686", +"3 c #A0A0A4", +"4 c #CC9999", +"5 c #FF9999", +"6 c #CCCC99", +"7 c #FFCC99", +"8 c #FFCCFF", +"9 c #FFFBF0", +/* pixels */ +"99977777777777797979799989998632", +"4746666666666646466467647676763=", +"=4=============:==-4->4<4<4544=#", +"-==+O++O+O@O+O+OO++===------1-=#", +"==#O@OOXOOOXOOXX+OOO+#*=---,--=#", +"==+XOXO.X.X.oX+XXO+OO$+===:-->=#", +"==OOXOXOX+XO.OX+XOXOOO@O+#==4-=#", +"==++O+O++O+O@OOXOXOOXoOOOO@====#", +">==O+O+OOO+%+O+O+@OoXOXoXOOO+&+O", +"===O&O+++O+O&O+=O&O++OOOOoXXOO@@", +">==+O+%O%+%+O+%O===*=+O+OOOOoOXO", +"===O%+O++O+%+%+O&O+O+O+O+O+OXO.X", +"-:=O+%+OO+$OO@OO@OO+O$O$+OO+O+OO", +"=-=&O+O+OOX+OOoXO@@O++OOO@O+%O@O", +">=-O&O+OXOOXoXXoXX@@+O@@OO$O++$O", +"4===O+OO$+OXX.X=#@==#@XO@+O++OO@", +"<4-==O+O+OO@OXX@+@9946-OXOO+O&@$", +"4;---==OO+O#@@#@O479989=O+OO+OO@", +"44=-=-=+$O+=#@+#>987878=+O+&O+$O", +"<4-----=O++O#==679787974#O=*=&O@", +"41=--=--==%+OO#=68989847-O===O+O", +"44-------====+O@O@==-=-===-1-==+", +"14;>---=-----===O&O++==--=-:-=+O", +"444-->----=-------=-=-=-:-----=+", +"41-5;1,4;------------=-=-=>=--=+", +"45<-4-1-5>1>----->->-=>=-3-->==+", +"<4,5;54515-5;5,5>14<-5<5-->---=+", +"45<-4<51455<5<5<15155<,------==O", +"4--=---=-==>=>=-:=:=-:========#O", +"-=@@@@@+@#@@#@@@#@+@@O@@#@@@+OOo", +"O@XOXOOX+XOXOXOOXOXOO+XOXOXOXoXX", +"OXXoXo oXXoXoXo oXoXoXXo o o X " +}; --- nmap-6.00.orig/debian/compat +++ nmap-6.00/debian/compat @@ -0,0 +1 @@ +5 --- nmap-6.00.orig/debian/changelog +++ nmap-6.00/debian/changelog @@ -0,0 +1,721 @@ +nmap (6.00-0.3) unstable; urgency=low + + * Non-maintainer upload. + * Apply upstream fix for interfaces in monitor mode (Closes: #696446). + + -- Hilko Bengen Sat, 29 Dec 2012 18:43:12 +0100 + +nmap (6.00-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Enable xz compression for all binaries to save some space on CD + images (Closes: #688708). + + -- Cyril Brulebois Tue, 25 Sep 2012 00:35:36 +0200 + +nmap (6.00-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version (Closes: #674573) + * set CFLAGS etc. via dpkg-buildflags. This enables building with + hardening flags + * Do not use included liblinear + + -- Hilko Bengen Tue, 19 Jun 2012 23:40:43 +0200 + +nmap (5.51.6-0.3) unstable; urgency=low + + * Non-maintainer upload + * Disable pcap compatibility check, second take. (Closes: #671064) + + -- Hilko Bengen Wed, 30 May 2012 20:51:53 +0200 + +nmap (5.51.6-0.2) unstable; urgency=low + + * Non-maintainer upload + * use DESTDIR instead of prefix for make install. This fixes the zenmap + sys.path issue (#663217) as well as the path in the .desktop files. + Closes: #542958 + * revert change to zenmap setup.py script + * Got rid of country-specific part in the directory + * Disable pcap compatibility check that caused the internal libpcap copy + to be used on kfreebsd-* (Closes: #671064). + + -- Hilko Bengen Sat, 26 May 2012 13:31:37 +0200 + +nmap (5.51.6-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version (Closes: #630144) + * Added watch file + * Simplified debian/*.files, added translated manpages (Closes: #358336) + * Added Python dependency for ndiff to nmap package + * Removed empty postinst, prerm scripts + * No longer append the build directory to zenmap's sys.path (Closes: #663217) + * Use dh_python2 instead of dh_pycentral. Thanks to Arthur de Jong for + the patch. Closes: #616917 + + -- Hilko Bengen Wed, 18 Apr 2012 21:54:53 +0200 + +nmap (5.21-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Apply patch from Ubuntu to fix FTBFS with openssl 1.0 by dropping md2 + support (closes: #621938). Thanks, Dave Walker! + + -- Julien Cristau Sat, 02 Jul 2011 12:29:49 +0200 + +nmap (5.21-1) unstable; urgency=low + + [Jonathan Davies] + + * Deliver the rest of the nmap files. + + [LaMont Jones] + + * force ncat to use nmap copy of config.guess/sub + * New upstream version. Closes: #569894, #546564, #510158, #507867, #539244 + * Fixed packaging. Closes: #584253 + * minor lintian fixes. + + -- LaMont Jones Wed, 11 Aug 2010 11:17:24 -0600 + +nmap (5.21-1~0) unstable; urgency=low + + * new upstream + + -- LaMont Jones Wed, 03 Feb 2010 18:26:28 -0700 + +nmap (5.20-0) unstable; urgency=low + + * new upstream release + + -- LaMont Jones Fri, 22 Jan 2010 08:45:09 -0700 + +nmap (5.00-3) unstable; urgency=low + + [Petr Salinger] + + * fix FTBFS on GNU/kFreeBSD. Closes: #542388 + + [LaMont Jones] + + * Provide and Replace: ndiff + + -- LaMont Jones Fri, 28 Aug 2009 13:02:24 -0600 + +nmap (5.00-2) unstable; urgency=low + + * rules: fix dependencies for -j. Closes: #541984 + * Conflicts: ndiff. Different enough to not warrant Replaces. + Closes: #542054 + * new config.guess, updated rules for same. Closes: #542079 + + -- LaMont Jones Tue, 18 Aug 2009 06:48:52 -0600 + +nmap (5.00-1) unstable; urgency=low + + * new upstream + + -- LaMont Jones Sun, 16 Aug 2009 20:22:25 -0600 + +nmap (4.76-0ubuntu4) jaunty; urgency=low + + * No-change rebuild to fix lpia shared library dependencies. + + -- Colin Watson Thu, 19 Mar 2009 13:35:25 +0000 + +nmap (4.76-0ubuntu3) jaunty; urgency=low + + * debian/{rules,zenmap.dirs}: install zenmap.xpm into the correct directory, + fixes broken icon in the menu (LP: #335169) + * debian/zenmap.files: the zenmap/pixmaps/radialnet/ directory was not + installed, fixes crash due to missing pixmap (LP: #335166) + * Makefile.in: added --install-layout=deb to setup.py install, fixes FTBFS + + -- Adrien Cunin Sun, 15 Mar 2009 02:02:17 +0100 + +nmap (4.76-0ubuntu2) jaunty; urgency=low + + * debian/nmap.files: Included missing 'UPnP-info.nse' file needed to fix + script scan (LP: #319656). + + -- Jonathan Davies Fri, 30 Jan 2009 10:03:03 +0000 + +nmap (4.76-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #268996) + * Edit broken links in debian/nmap.files, debian/zenmap.dirs, debian/zenmap.files + * Edit path to pixmaps in debian/rules + + -- Petr E. Antonov Mon, 19 Jan 2009 10:24:39 +0100 + +nmap (4.62-1ubuntu1) intrepid; urgency=low + + * Drop liblua5.1-dev build dependency, it's in universe. + + -- Martin Pitt Mon, 11 Aug 2008 22:02:35 +0200 + +nmap (4.62-1) unstable; urgency=low + + [fyodor] + + * new upstream release + + [Davide] + + * create an desktop file for zenmap. Closes: #457799 + * remove useless file /usr/bin/uninstall_zenmap. Closes: #474511 + + -- LaMont Jones Sat, 31 May 2008 22:55:14 -0600 + +nmap (4.60-1) unstable; urgency=low + + [bmenrigh] + + * Tandberg MXP Video Conference appliance telnetd. Thanks to Tom Sellers + * Dropping stray '*' on previous Tandberg MXP match line. + + [doug] + + * New match line for another version of VxWorks FTPd + * AXIS webcam ftpd standardisation. Thanks to Lionel Cons + * vsftpd 00PS->OOPS patch from Kris + + [david] + + * Fix a typo in MACLookup.cc: corolation -> correlation. + + -- LaMont Jones Fri, 04 Apr 2008 00:40:50 -0600 + +nmap (4.60-0) unstable; urgency=low + + * New upstream release. Upstream URL changes to http://nmap.org/ + + -- LaMont Jones Fri, 04 Apr 2008 00:40:50 -0600 + +nmap (4.53-3) unstable; urgency=low + + * zenmap: python 2.5 has python-pysqlite2 + + -- LaMont Jones Thu, 03 Apr 2008 22:16:11 -0600 + +nmap (4.53-2) unstable; urgency=low + + * zenmap: Depends: python-{gtk2,gobject}. Closes: #466595 + + -- LaMont Jones Tue, 19 Feb 2008 21:23:46 -0700 + +nmap (4.53-1) unstable; urgency=low + + [LaMont Jones] + * Package New upstream release. + * Cherry pick post-4.53 patches from [fyodor]. Closes: #459884 + - remove instances of .nse to prevent the docbook man page translation + from wrongly including that string at the beginning of lines, which causes + errors because nroff confuses it with the .ns nroff no-space mode command + - regenerate man page -- remove instances of .nse to prevent the + docbook man page translation from wrongly including that string at the + beginning of lines, which causes errors because nroff confuses it with + the .ns nroff no-space mode command + + [stoiko] + + * if nse's connect is issued on an open socket, close the old + connection before + * move the check, wheter a socket is open, before connecting it again to + l_nsock_queued() - otherwise there are problems with the returned values.. + + [fyodor] + + * qualify fingerprint name + * spell-check, add 4.50 release announcement + * improve a mysql signature (suggested by Lionel Cons) + * sorting change, I think + * remove a duplicate for rpc number 536870916, userd or vtsk. I kept vksd + though without much research. I'm open to comments from people who think + we should keep userd instead. + * Added rpcinfo.nse script, which contacts a listening RPC portmapper + * improve nginx detection. patch from Sven Klemm. + See http://seclists.org/nmap-dev/2007/q4/0682.html + * remove claim that using -v more than twice has no extra effect + * o Fix a bunch of warning/error messages which contained an extra + * o Fixed our Winpcap installer so that it waits for a Winpcap uninstall + * o Fixed Winpcap installer to install the right version of Packet.dll + * Update changelog and version numbers in preparation for 4.51BETA release + * fix version number + * update some links + * update copyright line at the top of files from 1996-2006 to 1996-2008 + * remove duplicate crediting in an entry + * o Fixed Nmap Winpcap installer to use CurrentVersion registry key on + * add _ to the allowed workgroup name regex for netbios-ssn matchlines. + Thanks to Bill Jaeger for the suggestion and partial patch + * Update changelog, version numbers in prep for Nmap 4.52 release + * trivial CHANGELOG adjustment + * applied an nginx http proxy signature patch from Sven Klemm + * Fix a problem which prevented proper port number matching in + port_or_service() because the port variable passed to portnumber is + shadowed by the variable passed during portrule check. Report and + patch are from Sven Klemm + * o Improved rpcinfo.nse to better sort and display available RPC + * Remove own ntohl() and use packet.u32() instead. Patch from Sven Klemm + * o Added UPnP-info NSE script by Thomas Buchanan. It gathers + * o Impoved Windows executable installer by making uninstall work better + * update version number and changelog in prep for upcoming 4.53 release + + [kris] + + * recommitting my r6499: "fix robots.nse output: remove robots.txt + comments on disallowed entry lines" + * Adding my strftime()-like conversion extensions to the logging functions + (-oA, -oX, etc). This contains a CHANGELOG entry and refguide changes + which (hopefully) sum it up pretty well. + * okay, a change to r6530: the current %R and %T are being removed as + colons are invalid chracters in Windows and Mac OS X filenames (thanks to + jah for pointing out the problem on Windows). What was %r and %t are now + the new %R and %T. All this means is that %r and %t are gone, and %R/%T + are the same as with strftime() but without colons + * adding CHANGELOG entry for r6529 (robots.nse output fix) + * Add CHANGELOG entry for r6558: "Fix Zenmap crash when selecting Help from + the Compare Results window. Path wasn't imported" + * Adding new MySQLinfo NSE script for printing MySQL server information + * Upgrading libpcre from version 7.2 to 7.4. Tested on Linux and Windows + * Fixing build problem on Mac OS X; my mistake (typo) + * adding nmap.fetchfile() function so scripts can find the nmap-* data files + * updating rpcinfo.nse to use nmap.fetchfile() instead of having the huge + RPC table + * o Fixed multiple NSE scripts that weren't always properly closing their + + [ejlbell] + + * Traceroute bugfix for when the first hop of the first host in a + tracegroup (reference trace) times out. The previous patch did not + completely solve the issue due to an erronous check on the ttl, now we + use a dedicated boolean flag. Thanks to Sebastián García for the bug + report and testing. + + [david] + + * Document Zenmap r6535 in CHANGELOG. + * Escape OS fingerprints when writing them to an XML log. OS fingerprint don't + * Consider Windows paths starting with \ absolute when used with the + --script option. + * Document Zenmap r6539 in CHANGELOG. + * Give credit for some recent CHANGELOG entries. + * Use just PAGE_READWRITE, not PAGE_READONLY | PAGE_READWRITE in the call to + * Fix the message printed when a host is skipped, for example on Windows when + * Use the filename tag for file name extensions in zenmap.xml. + * Fixed an error that showed itself on Windows when attempting to scan + + [doug] + + * Small bug in Polycom ViewStation match line + * Changed some protocol names to remove trailing + * Updated the IRC server info script to handle services + * s modifiers added to many match lines. + * I've seen "OpenBSD identd" on a linux box so I + * Renamed irc-serv protocols to irc and added a couple + * Moved BIND match line above a "catch all" line. + * NSE --host-timeout support + * NSE run-time interaction support + * New OfficeScan probe from Tom Sellers + + -- LaMont Jones Sun, 13 Jan 2008 02:07:40 -0700 + +nmap (4.50-4) unstable; urgency=low + + * control: zenmap Depends: python-pysqlite2. Closes: #457694 + + -- LaMont Jones Tue, 25 Dec 2007 09:06:55 -0700 + +nmap (4.50-3) unstable; urgency=low + + * use global copyright file for zenmap + + -- LaMont Jones Sat, 22 Dec 2007 11:14:17 -0700 + +nmap (4.50-2) unstable; urgency=low + + * copyright: incorporate remaining copyright info from upstream + + -- LaMont Jones Sat, 22 Dec 2007 09:37:25 -0700 + +nmap (4.50-1) unstable; urgency=low + + [Fyodor] + + * New upstream release. Many changes. Closes: #456232 + + [LaMont Jones] + + * debian/rules: nmapfe migration + * build: properly target install + * build: finish cleaning up the build process, I hope. + * meta: drop usr/share/pixmaps/ubuntu.svg, collides with gnome-screensaver + * meta: zenmap Conflicts/Replaces/Provides nmapfe + * rules: sed hack: remove build directory from python code + + -- LaMont Jones Thu, 13 Dec 2007 13:39:44 -0700 + +nmap (4.49~rc7-1) experimental; urgency=low + + * New upstream + + -- LaMont Jones Tue, 11 Dec 2007 07:25:17 -0700 + +nmap (4.49~rc6-1) experimental; urgency=low + + * New upstream release + + -- LaMont Jones Tue, 27 Nov 2007 06:07:37 -0700 + +nmap (4.20-3) unstable; urgency=low + + * build: make clean target really clean things. Closes: #442687 + * debian/rules: remove bashisms + + -- LaMont Jones Thu, 08 Nov 2007 21:16:35 -0700 + +nmap (4.20-2) unstable; urgency=low + + * nmapfe: desktop file cleanup, validation, deliver icon. Closes: #421347 + * metadata: document git repository + + -- LaMont Jones Tue, 11 Sep 2007 12:57:51 -0600 + +nmap (4.20-1) unstable; urgency=low + + * New upstream version + + -- LaMont Jones Tue, 12 Dec 2006 23:54:39 -0700 + +nmap (4.11-2) unstable; urgency=low + + * cleanup warnings + + -- LaMont Jones Tue, 1 Aug 2006 14:17:54 -0600 + +nmap (4.11-1) unstable; urgency=low + + * New upstream version + + -- LaMont Jones Tue, 1 Aug 2006 07:57:34 -0600 + +nmap (4.10-1) unstable; urgency=low + + * New upsteam version + + -- LaMont Jones Tue, 13 Jun 2006 22:41:11 -0600 + +nmap (4.03-3) unstable; urgency=low + + * Add missing Replaces. Closes: #365378 + + -- LaMont Jones Sat, 29 Apr 2006 22:09:02 -0600 + +nmap (4.03-2) unstable; urgency=low + + * deliver nmapfe.desktop as part of the nmapfe package. Closes: #306373 + * don't strip nmap in Makefile, let dh_strip do that in debian/rules. + Closes: #304202 + + -- LaMont Jones Wed, 26 Apr 2006 14:56:48 -0600 + +nmap (4.03-1) unstable; urgency=low + + * New upstream. + + -- LaMont Jones Wed, 26 Apr 2006 14:18:25 -0600 + +nmap (4.00-2) unstable; urgency=low + + * uh... lets try "unstable" + + -- LaMont Jones Wed, 1 Feb 2006 12:32:06 -0700 + +nmap (4.00-1) experimental; urgency=low + + * New upstream release + + -- LaMont Jones Wed, 1 Feb 2006 06:19:59 -0700 + +nmap (3.9999-0) experimental; urgency=low + + * New upstream version + + -- LaMont Jones Sat, 28 Jan 2006 12:35:14 -0700 + +nmap (3.95-2) unstable; urgency=low + + * Use libpcap0.8-dev + + -- LaMont Jones Thu, 19 Jan 2006 11:49:52 -0700 + +nmap (3.95-1) unstable; urgency=low + + * New upstream + + -- LaMont Jones Fri, 9 Dec 2005 13:50:57 -0700 + +nmap (3.93-1) unstable; urgency=low + + * New upstream + + -- LaMont Jones Mon, 12 Sep 2005 23:34:04 -0600 + +nmap (3.90-1) unstable; urgency=low + + * New upstream release. + + -- LaMont Jones Thu, 8 Sep 2005 10:39:09 -0600 + +nmap (3.81-2) unstable; urgency=low + + * Fix FTBFS when DEB_BUILD_OPTIONS specified. Closes: #308583 + Thanks Tollef Fog Heen. + + -- LaMont Jones Wed, 11 May 2005 22:34:05 -0600 + +nmap (3.81-1) unstable; urgency=low + + * New upstream version. + + -- LaMont Jones Mon, 7 Mar 2005 19:32:55 -0700 + +nmap (3.75-1) unstable; urgency=low + + * New upstream version. Closes: #277924 + + -- LaMont Jones Sun, 24 Oct 2004 17:43:06 -0600 + +nmap (3.70-1) unstable; urgency=low + + * New upstream version. Closes: #270697 + Fixes build-detection for k*bsd-gnu. Closes: #266901 + Updated copyright. Closes: #266205 + * Update package description + + -- LaMont Jones Thu, 9 Sep 2004 10:49:20 -0600 + +nmap (3.55-1) unstable; urgency=low + + * New upstream. Closes: #258757 + + -- LaMont Jones Sun, 11 Jul 2004 18:57:47 -0600 + +nmap (3.50-1) unstable; urgency=low + + * New upstream version. Closes: #229275 + + -- LaMont Jones Fri, 23 Jan 2004 20:08:35 -0700 + +nmap (3.48-2) unstable; urgency=low + + * Add missing build-depends. + + -- LaMont Jones Sat, 22 Nov 2003 19:39:17 -0700 + +nmap (3.48-1) unstable; urgency=low + + * New upstream version. Closes: #217501 + + -- LaMont Jones Sat, 25 Oct 2003 14:15:36 -0600 + +nmap (3.45-1) unstable; urgency=low + + * New upstream release. Closes: #201777, #196418, #195463, #165621 + + -- LaMont Jones Mon, 15 Sep 2003 18:47:48 -0600 + +nmap (3.27-1) unstable; urgency=low + + * New upstream version. Closes: #193909, #149393, #146581 + * Fix CXXFLAGS. Closes: #189021 + * Change man page from \' to ' for quotes. Closes: #143975 + + -- LaMont Jones Mon, 19 May 2003 18:13:23 -0600 + +nmap (3.20-1) unstable; urgency=low + + * New upstream version. Closes: #184414, #188468, #172618, #144089, #164211 + + -- LaMont Jones Thu, 10 Apr 2003 23:12:25 -0600 + +nmap (3.10.ALPHA4-1) unstable; urgency=low + + * New upstream version + * Deliver upstream changelog. Closes: #155836 + + -- LaMont Jones Sun, 24 Nov 2002 13:26:43 -0700 + +nmap (3.00-0.1) unstable; urgency=low + + * New upstream version. Use an NMU version number just for elmo. + Closes: #152907, #155598, #151375 + + -- LaMont Jones Tue, 6 Aug 2002 13:59:51 -0600 + +nmap (2.54.33.BETA-1) unstable; urgency=low + + * New upstream version. Lots of OS fingerprint updates. Closes: #145031 + + -- LaMont Jones Sun, 5 May 2002 11:17:05 -0600 + +nmap (2.54.32.BETA-1) unstable; urgency=low + + * New upstream version. + + -- LaMont Jones Sat, 20 Apr 2002 12:07:12 -0600 + +nmap (2.54.31.BETA-1) unstable; urgency=low + + * New upstream version. Closes: #117675, #132907. + * Remove /usr/share/doc/nmap/html. Closes: #107358. + + -- LaMont Jones Wed, 20 Mar 2002 10:49:25 -0700 + +nmap (2.54.30.BETA-1) unstable; urgency=low + + * New upstream version. Closes: #115797 + + -- LaMont Jones Wed, 17 Oct 2001 12:33:45 -0600 + +nmap (2.54.28.BETA-1) unstable; urgency=low + + * New upstream version. Closes: #102920 + * Roll to current standards-version. + * Remove -g from options unless DEB_BUILD_OPTIONS includes 'debug'. + + -- LaMont Jones Sat, 28 Jul 2001 23:27:48 -0600 + +nmap (2.54.27.BETA-1) unstable; urgency=low + + * New upstream version. + + -- LaMont Jones Thu, 19 Jul 2001 19:42:36 -0600 + +nmap (2.54.25.BETA-1) unstable; urgency=low + * New upstream version. + + -- LaMont Jones Mon, 11 Jun 2001 22:26:34 -0600 + +nmap (2.54.22.BETA-2) unstable; urgency=low + * PARISC support. New config.guess, config.sub, and printf fixes + for gcc 3.0. + + -- LaMont Jones Tue, 8 May 2001 09:13:24 -0600 + +nmap (2.54.22.BETA-1) unstable; urgency=low + * New upstream beta. Closes: #90553. + * Add Build-Depends: header. + + -- LaMont Jones Wed, 21 Mar 2001 07:59:59 -0700 + +nmap (2.54-0.beta7.1) unstable; urgency=low + * New upstream version (beta). Closes: #71642. + * Correct reference to X Window System. Closes: #76076. + * Appears to fix segfault in nmapfe (unable to reproduce). + Closes: #76019. + + -- LaMont Jones Thu, 30 Nov 2000 06:57:14 -0700 + +nmap (2.53-5) unstable; urgency=low + * Fix xnmap man page. Closes: #65016 + + -- LaMont Jones Thu, 8 Jun 2000 18:50:58 -0600 + +nmap (2.53-3) unstable; urgency=low + * Link with libgtk1.2 (not libgtk1). Closes: #64705, #64709 + + -- LaMont Jones Fri, 26 May 2000 07:19:25 -0600 + +nmap (2.53-2) unstable; urgency=low + * Fix xnmap man page. Closes: #64689. + + -- LaMont Jones Thu, 25 May 2000 21:01:53 -0600 + +nmap (2.53-1) unstable; urgency=low + * New upstream beta release, closes: #61350, #59955, #61043, #60588, #63709 + * man pages for xnmap and nmapfe, closes: #62858 + * 2.12-5 didn't make it into frozen. closes: #59955 + * switch from dh_dhelp to doc-base; makefile cleanup + + -- LaMont Jones Thu, 25 May 2000 09:15:49 -0600 + +nmap (2.3BETA14-0) unstable; urgency=low + * New upstream beta release, closes: #60344 + + -- LaMont Jones Wed, 15 Mar 2000 11:27:13 -0600 + +nmap (2.12-5) frozen; urgency=low + * Don't deliver man pages into /usr/man. Closes: #59955 + + -- LaMont Jones Wed, 15 Mar 2000 09:21:38 -0600 + +nmap (2.12-4) frozen; urgency=low + * New nmap-os-fingerprints and nmap-services files. Closes #54143. + + -- LaMont Jones Sun, 20 Feb 2000 12:23:50 -0600 + +nmap (2.12-3) unstable; urgency=low + * bad configure command for libpcap-possiblymodified (Bug#38739) + + -- LaMont Jones Sat, 24 Jul 1999 09:21:04 -0600 + +nmap (2.12-2) unstable; urgency=low + * Add dhelp support: fixes 31162 + + -- LaMont Jones Wed, 12 May 1999 17:15:23 -0600 + +nmap (2.12-1) unstable; urgency=low + + * new maintainer, many thanks to Bdale for packaging the previous versions. + * new upstream version, corrects 34039. + * Correct copyright file (closes 35848). + + -- LaMont Jones Mon, 26 Apr 1999 20:59:57 -0600 + +nmap (2.02-1) unstable; urgency=low + + * new upstream version + * merge README.debian into copyright file, update to reflect current source + location + + -- Bdale Garbee Thu, 7 Jan 1999 00:19:31 -0700 + +nmap (1.51-2) unstable; urgency=low + + * fixed file overlap created by new upstream source, closes 25347 + + -- Bdale Garbee Mon, 3 Aug 1998 22:22:24 -0600 + +nmap (1.51-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee Sat, 1 Aug 1998 22:49:04 -0600 + +nmap (1.49-1) frozen unstable; urgency=low + + * new upstream source, includes fix that closes 17115 + * use existing libpcap shared lib instead of static linking a local copy + * fix dependency specification + + -- Bdale Garbee Fri, 10 Apr 1998 01:28:36 -0600 + +nmap (1.36-1) frozen unstable; urgency=low + + * new upstream source, mostly bug fixes and cleanups + * fix typos in control file, closes 18950 + + -- Bdale Garbee Tue, 31 Mar 1998 23:09:19 -0700 + +nmap (1.30-1) unstable; urgency=low + + * initial release + + -- Bdale Garbee Tue, 16 Dec 1997 00:40:01 -0700 + +Local variables: +mode: debian-changelog +End: --- nmap-6.00.orig/debian/copyright +++ nmap-6.00/debian/copyright @@ -0,0 +1,214 @@ +This is the Debian GNU/Linux package of NMAP -- The Network Mapper, +by Fyodor . Please see http://nmap.org/. + +This package was crafted by LaMont Jones using: + + http://nmap.org/ + +NMAP is copyright 1997-2003 by Fyodor and others, +and distributed under the terms of the GNU General Public License, Version 2. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The actual Nmap license (minus the copy of GPL-2 mentioned above): + + The main Nmap code is covered under the Nmap license, which is the GPL + with a few clarifications/exceptions. A copy of that can be found at + http://insecure.org/nmap/data/COPYING . + + The Nmap Security Scanner also uses 3rd party open source libraries + for various functions. Some or all of these may be necessary or + desirable to distribute Nmap. All use BSD-style licenses. If they + are included, their license must be followed. This document briefly + describes how and when each library is used, and details the license + terms. The six libraries are the the LibPcap raw packet capture + library, WinPcap Windows Packet Capture Library, Libdnet raw + networking library, LibPCRE perl-compatable regular expression + library, Lua programming language, and the OpenSSL SSL encryption + library. + + ==LibPcap Raw Packet Capture Library== + + LibPcap is used by Nmap on UNIX for raw packet reading during host + discovery, port scanning, and OS detection. It is available from + http://www.tcpdump.org. It is bundled with the Nmap Security Scanner + in the libpcap-possiblymodified subdirectory. The BSD-style license + for version 0.8.3 follows: + + License: BSD + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The names of the authors may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + ==WinPcap Windows Packet Library== + + WinPcap is used by Nmap on Windows for raw packet reading during host + discovery, port scanning, and OS detection. It is available from + http://winpcap.polito.it/. It is a derivative of LibPcap, so that + license (above) must be followed as well. The BSD-style license terms + for WinPcap 3.1 follow: + + Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy). + Copyright (c) 2005 CACE Technologies, Davis (California). + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + 3. Neither the name of the Politecnico di Torino, CACE Technologies + nor the names of its contributors may be used to endorse or + promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This product includes software developed by the University of + California, Lawrence Berkeley Laboratory and its contributors. + + ==Libdnet raw networking library== + + Libdnet (http://libdnet.sourceforge.net/) is bundled with Nmap and is + required on all platforms for low-level tasks such as sending raw + Ethernet frames. Version 1.10 is distributed under the following + BSD-style license: + + Copyright (c) 2000-2004 Dug Song + All rights reserved, all wrongs reversed. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The names of the authors and copyright holders may not be used to + endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + OF THE POSSIBILITY OF SUCH DAMAGE. + + ==LibPCRE Perl-compatable Regular Expression Library== + + LibPCRE is used as part of Nmap version detection. It is licensed + under a BSD license. It is bundled with Nmap in the libpcre + subdirectory. The license terms for LibPCRE 7.0 follows: + + Written by: Philip Hazel + Copyright (c) 1997-2005 University of Cambridge + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of the University of Cambridge nor the name of + Google Inc. nor the names of their contributors may be used to + endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + ==Lua programming language== + + The LUA programming language may optionally be embedded into Nmap as + part of the Nmap Scripting Engine functionality. LUA will not be + included if the –without-liblua configuration option is given. If Lua + is included, Nmap also includes some LUA modules which also fall under + the free LUA license. The LUA license is as follows: + + Copyright 1994-2007 Lua.org, PUC-Rio. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + ==OpenSSL SSL encryption library== + + OpenSSL can optionally be used by Nmap Service Detection to + communicate with SSL-enabled protocols such as https, pop3-s, imaps, + etc. Its BSD-style license is too long to include here, but available + from http://www.openssl.org/ . OpenSSL is not bundled with Nmap. --- nmap-6.00.orig/debian/rules +++ nmap-6.00/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f +# Debian rules file for nmap, requires the debhelper package. +# Crafted by Bdale Garbee, bdale@gag.com, 8 December 1997. +# Modified and maintained by LaMont Jones, lamont@debian.org. + +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + +PYVERS:=$(shell pyversions -r) + +CONFIGURE_FLAGS=--prefix=/usr \ + --mandir='$${prefix}/share/man' \ + --enable-ipv6 \ + --libexec='$${prefix}/lib' \ + --with-liblua \ + --with-liblinear + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +configure: configure-stamp +configure-stamp: + dh_testdir + cd libpcap && ln -sf ../config.sub ../config.guess . + cd nbase && ln -sf ../config.sub ../config.guess . + cd ncat && ln -sf ../config.sub ../config.guess . + cd nsock/src && ln -sf ../../config.sub ../../config.guess . + LDFLAGS="$(LDFLAGS)" CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_FLAGS) + touch configure-stamp + +build: configure build-stamp +build-stamp: configure-stamp + make + touch build-stamp + +CLEANLIST=libdent-stripped libdnet-stripped/srv libpcap nbase ncat nsock/src +clean: configure + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + -for dir in ${CLEANLIST}; do ( cd $$dir && make -i distclean ) ;done + for dir in ${CLEANLIST}; do ( cd $$dir && rm -f config.guess config.sub *.o *.la *.lo ); done + -make -i distclean + find zenmap -name '*.pyc' | xargs rm -f + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR=`pwd`/debian/tmp install + find debian/tmp/usr/lib/python* -type f | xargs sed -i "s:`pwd`/debian/tmp::g" + rm debian/tmp/usr/bin/uninstall_zenmap + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdirs + dh_installman + mv debian/tmp/usr/lib/python* debian/zenmap/usr/lib/ + cp debian/zenmap.desktop debian/zenmap/usr/share/applications + cp debian/zenmap-root.desktop debian/zenmap/usr/share/applications + cp debian/zenmap.xpm debian/zenmap/usr/share/zenmap/pixmaps + dh_installdocs docs/*.txt + dh_installchangelogs CHANGELOG + dh_movefiles + mv debian/nmap/usr/share/man/pt_PT debian/nmap/usr/share/man/pt + dh_undocumented + dh_desktop + dh_python2 + [ -n "$(STRIP)" ] || dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb -- -Zxz + + +# Build architecture independant packages using the common target. +binary-indep: build install +# (Uncomment this next line if you have such packages.) +# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch + +binary: binary-indep binary-arch +.PHONY: build clean install binary-common binary-indep binary-arch binary + --- nmap-6.00.orig/debian/zenmap.files +++ nmap-6.00/debian/zenmap.files @@ -0,0 +1,7 @@ +usr/bin/nmapfe +usr/bin/xnmap +usr/bin/zenmap +usr/share/applications/zenmap.desktop +usr/share/applications/zenmap-root.desktop +usr/share/man/man1/zenmap.1 +usr/share/zenmap --- nmap-6.00.orig/debian/control +++ nmap-6.00/debian/control @@ -0,0 +1,38 @@ +Source: nmap +Section: net +Priority: extra +Maintainer: LaMont Jones +Build-Depends: debhelper (>=5), libgtk2.0-dev, autoconf, flex, bison, libssl-dev, libpcap0.8-dev, libpcre3-dev, binutils-dev, liblinear-dev, python (>=2.3.5-7), python-all-dev, liblua5.1-dev +Standards-Version: 3.7.2.2 +XS-Python-Version: all +XS-Vcs-Browser: http://git.debian.org/?p=users/lamont/nmap.git +XS-Vcs-Git: git://git.debian.org/~lamont/nmap.git + +Package: nmap +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Conflicts: ndiff +Provides: ${python:Provides}, ndiff +Replaces: ndiff +Description: The Network Mapper + Nmap is a utility for network exploration or security auditing. It + supports ping scanning (determine which hosts are up), many port + scanning techniques, version detection (determine service protocols + and application versions listening behind ports), and TCP/IP + fingerprinting (remote host OS or device identification). Nmap also + offers flexible target and port specification, decoy/stealth scanning, + sunRPC scanning, and more. Most Unix and Windows platforms are + supported in both GUI and commandline modes. Several popular handheld + devices are also supported, including the Sharp Zaurus and the iPAQ. + +Package: zenmap +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, nmap, python (>= 2.5) | python-pysqlite2, python-gtk2, python-gobject +Provides: ${python:Provides}, nmapfe +Conflicts: nmapfe +Replaces: nmapfe +Recommends: gksu +Description: The Network Mapper Front End + Zenmap is an Nmap frontend. It is meant to be useful for advanced users + and to make Nmap easy to use by beginners. It was originally derived + from Umit, an Nmap GUI created as part of the Google Summer of Code. --- nmap-6.00.orig/debian/zenmap.dirs +++ nmap-6.00/debian/zenmap.dirs @@ -0,0 +1,6 @@ +usr/bin +usr/lib +usr/share/man/man1 +usr/share/applications +usr/share/pixmaps +usr/share/zenmap/pixmaps --- nmap-6.00.orig/debian/nmap.files +++ nmap-6.00/debian/nmap.files @@ -0,0 +1,24 @@ +usr/bin/ncat +usr/bin/ndiff +usr/bin/nmap +usr/bin/nping +usr/share/man/man1/ncat.1 +usr/share/man/man1/ndiff.1 +usr/share/man/man1/nmap.1 +usr/share/man/man1/nping.1 +usr/share/man/de +usr/share/man/es +usr/share/man/fr +usr/share/man/hr +usr/share/man/hu +usr/share/man/it +usr/share/man/jp +usr/share/man/pl +usr/share/man/pt_BR +usr/share/man/pt_PT +usr/share/man/ro +usr/share/man/ru +usr/share/man/sk +usr/share/man/zh +usr/share/ncat +usr/share/nmap --- nmap-6.00.orig/debian/zenmap-root.desktop +++ nmap-6.00/debian/zenmap-root.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +# The format of this file is specified at +# http://freedesktop.org/Standards/desktop-entry-spec/ +# The entries are in the order they are listed in version 0.9.4 +Type=Application +Version=1.0 +Encoding=UTF-8 +Name=Zenmap (as root) +GenericName=The Network Mapper Front End +GenericName[en_GB]=The Network Mapper Front End +GenericName[it]=Interfaccia per il Network Mapper +Comment=Network Mapper frontend +Icon=zenmap.xpm +TryExec=su-to-root +Exec=su-to-root -X -c /usr/bin/zenmap +Path= +Terminal=false +MimeType= +Categories=GNOME;Application;Network; --- nmap-6.00.orig/debian/pycompat +++ nmap-6.00/debian/pycompat @@ -0,0 +1 @@ +2 --- nmap-6.00.orig/debian/zenmap.manpages +++ nmap-6.00/debian/zenmap.manpages @@ -0,0 +1 @@ +docs/zenmap.1 --- nmap-6.00.orig/debian/nmap.dirs +++ nmap-6.00/debian/nmap.dirs @@ -0,0 +1,7 @@ +usr/bin +usr/share/man/man1 +usr/share/doc/nmap +usr/share/nmap +usr/share/nmap/nselib +usr/share/nmap/scripts +usr/lib/nmap/nselib-bin --- nmap-6.00.orig/debian/zenmap.postinst +++ nmap-6.00/debian/zenmap.postinst @@ -0,0 +1,21 @@ +#!/bin/sh -e + +# Debian nmapfe postinst +# LaMont Jones + +#DEBHELPER# + +case "$1" in + configure) + # see below + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + exit 0 + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac --- nmap-6.00.orig/debian/zenmap.desktop +++ nmap-6.00/debian/zenmap.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +# The format of this file is specified at +# http://freedesktop.org/Standards/desktop-entry-spec/ +# The entries are in the order they are listed in version 0.9.4 +Type=Application +Version=1.0 +Encoding=UTF-8 +Name=Zenmap +GenericName=The Network Mapper Front End +GenericName[en_GB]=The Network Mapper Front End +GenericName[it]=Interfaccia per il Network Mapper +Comment=Network Mapper frontend +Icon=zenmap.xpm +TryExec=zenmap +Exec=zenmap +Path= +Terminal=false +MimeType= +Categories=GNOME;Application;Network; --- nmap-6.00.orig/debian/zenmap.prerm +++ nmap-6.00/debian/zenmap.prerm @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# Debian nmapfe prerm +# LaMont Jones + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac +#DEBHELPER# +exit 0 --- nmap-6.00.orig/debian/source/format +++ nmap-6.00/debian/source/format @@ -0,0 +1 @@ +1.0 --- nmap-6.00.orig/nbase/configure +++ nmap-6.00/nbase/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1131,8 +1151,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1375,9 +1393,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1648,7 +1666,8 @@ main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1664,7 +1683,8 @@ { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1721,7 +1741,8 @@ main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1777,7 +1798,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1867,7 +1888,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2266,7 +2287,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2306,7 +2327,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2359,7 +2380,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2400,7 +2421,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2458,7 +2479,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2502,7 +2523,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2948,8 +2969,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3055,7 +3075,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3095,7 +3115,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3442,7 +3462,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3508,7 +3528,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5569,16 +5589,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -5638,28 +5658,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -5681,7 +5689,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5743,10 +5751,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5834,7 +5842,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' --- nmap-6.00.orig/nsock/include/nsock_config.h +++ nmap-6.00/nsock/include/nsock_config.h @@ -0,0 +1,82 @@ +/* ../include/nsock_config.h. Generated from nsock_config.h.in by configure. */ +/*************************************************************************** + * nsock_config.h.in -- Autoconf uses this template, combined with the * + * configure script knowledge about system capabilities, to build the * + * nsock_config.h include file that lets nsock better understand system * + * particulars. * + * * + ***********************IMPORTANT NSOCK LICENSE TERMS*********************** + * * + * The nsock parallel socket event library is (C) 1999-2012 Insecure.Com * + * LLC This library is free software; you may redistribute and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; Version 2. This guarantees * + * your right to use, modify, and redistribute this software under certain * + * conditions. If this license is unacceptable to you, Insecure.Com LLC * + * may be willing to sell alternative licenses (contact * + * sales@insecure.com ). * + * * + * As a special exception to the GPL terms, Insecure.Com LLC grants * + * permission to link the code of this program with any version of the * + * OpenSSL library which is distributed under a license identical to that * + * listed in the included docs/licenses/OpenSSL.txt file, and distribute * + * linked combinations including the two. You must obey the GNU GPL in all * + * respects for all of the code used other than OpenSSL. If you modify * + * this file, you may extend this exception to your version of the file, * + * but you are not obligated to do so. * + * * + * If you received these files with a written license agreement stating * + * terms other than the (GPL) terms above, then that alternative license * + * agreement takes precedence over this comment. * + * * + * Source is provided to this software because we believe users have a * + * right to know exactly what a program is going to do before they run it. * + * This also allows you to audit the software for security holes (none * + * have been found so far). * + * * + * Source code also allows you to port Nmap to new platforms, fix bugs, * + * and add new features. You are highly encouraged to send your changes * + * to nmap-dev@insecure.org for possible incorporation into the main * + * distribution. By sending these changes to Fyodor or one of the * + * Insecure.Org development mailing lists, it is assumed that you are * + * offering the Nmap Project (Insecure.Com LLC) the unlimited, * + * non-exclusive right to reuse, modify, and relicense the code. Nmap * + * will always be available Open Source, but this is important because the * + * inability to relicense code has caused devastating problems for other * + * Free Software projects (such as KDE and NASM). We also occasionally * + * relicense the code to third parties as discussed above. If you wish to * + * specify special license conditions of your contributions, just say so * + * when you send them. * + * * + * This program is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License v2.0 for more details * + * (http://www.gnu.org/licenses/gpl-2.0.html). * + * * + ***************************************************************************/ + +/* $Id: nsock_config.h.in 28415 2012-04-07 08:16:08Z david $ */ + +#define HAVE_PCAP 1 +/* #undef DEC */ +#define LINUX 1 +/* #undef FREEBSD */ +/* #undef OPENBSD */ +/* #undef SOLARIS */ +/* #undef SUNOS */ +/* #undef BSDI */ +/* #undef IRIX */ +/* #undef HPUX */ +/* #undef NETBSD */ +/* #undef MACOSX */ + +/* #undef SOLARIS_BPF_PCAP_CAPTURE */ + +/* #undef HAVE_NET_BPF_H */ +#define HAVE_SYS_IOCTL_H 1 + +#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1 + +#define HAVE_EPOLL 1 +