PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Remove nmap-update

Browse Source 
This feature was never publicly released, and has not been distributed
in our binary builds for a couple versions now. It needed to be removed
in order to reduce the number of places Nmap looks for data files. See #2051
This commit is contained in:
dmiller
2020-08-27 19:13:31 +00:00
parent 2520edd8fe
commit 210adf941e
32 changed files with 18 additions and 8411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -29,7 +29,6 @@ stamp-h1
/nsock/include/nsock_config.h
/zenmap/build/
/zenmap/INSTALLED_FILES
/nmap-update/nmap-update
TAGS
autom4te.cache/
/libpcap/*.3pcap

17
Makefile.in
View File

@@ -1,6 +1,5 @@
# Extract the version string from nmap.h.
export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
export NMAP_UPDATE_CHANNEL := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_UPDATE_CHANNEL' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
NMAP_PLATFORM=@host@
datarootdir = @datarootdir@
prefix = @prefix@
@@ -124,7 +123,7 @@ OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLooku
# large for field of 2 bytes". Disable debugging for this one file.
FPModel.o: CXXFLAGS += -g0
all: $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING) $(BUILDNCAT) @NMAP_UPDATE_BUILD@
all: $(TARGET) $(BUILDZENMAP) $(BUILDNDIFF) $(BUILDNPING) $(BUILDNCAT)
$(TARGET): build-netutil @LIBLINEAR_BUILD@ @PCAP_BUILD@ @LIBSSH2_BUILD@ @ZLIB_BUILD@ @PCRE_BUILD@ @NSOCK_BUILD@ @NBASE_BUILD@ @DNET_BUILD@ @LUA_BUILD@ \
$(OBJS) main.o
@@ -170,8 +169,6 @@ build-liblinear: $(LIBLINEARDIR)/Makefile
# -Wno-uninitialized avoids the warning "'Gnorm1_init' may be used uninitialized in this function"
@echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) -Wno-uninitialized"
build-nmap-update: nmap-update/default_channel.h
# This is the last one to ensure specific build targets are preferred
build-%: %/Makefile
cd $* && $(MAKE)
@@ -202,7 +199,7 @@ web:
clean: @LUA_CLEAN@ @LIBLINEAR_CLEAN@ @PCAP_CLEAN@ @PCRE_CLEAN@ @DNET_CLEAN@ @LIBSSH2_CLEAN@ @ZLIB_CLEAN@\
clean-nsock clean-nbase clean-netutil @NPING_CLEAN@ @ZENMAP_CLEAN@ \
@NCAT_CLEAN@ @NMAP_UPDATE_CLEAN@ @NDIFF_CLEAN@ clean-tests
@NCAT_CLEAN@ @NDIFF_CLEAN@ clean-tests
rm -f $(OBJS) main.o $(TARGET)
# Who generates dependencies.mk? If it is generated by ./configure and
# not by make it should be moved to distclean
@@ -213,7 +210,7 @@ debugclean:
distclean: @LUA_DIST_CLEAN@ @LIBLINEAR_DIST_CLEAN@ @PCAP_DIST_CLEAN@ @LIBSSH2_DIST_CLEAN@\
@ZLIB_DIST_CLEAN@ @PCRE_DIST_CLEAN@ @DNET_DIST_CLEAN@ @NPING_DIST_CLEAN@ @ZENMAP_DIST_CLEAN@ \
@NCAT_DIST_CLEAN@ @NMAP_UPDATE_DIST_CLEAN@ distclean-netutil \
@NCAT_DIST_CLEAN@ distclean-netutil \
distclean-nsock distclean-nbase @NDIFF_DIST_CLEAN@ clean debugclean
rm -f Makefile Makefile.bak makefile.dep nmap_config.h stamp-h \
stamp-h.in config.cache config.log config.status
@@ -354,10 +351,6 @@ $(NPINGDIR)/nping.h: nmap.h
$(ZENMAPDIR)/zenmapCore/Version.py $(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py "$(NMAP_VERSION)"
nmap-update/default_channel.h: nmap.h
sed -e 's/^#[ \t]*define[ \t]\+DEFAULT_CHANNEL[ \t]\+\(".*"\)/#define DEFAULT_CHANNEL "$(NMAP_UPDATE_CHANNEL)"/' $@ > $@.tmp
mv -f $@.tmp $@
tests/check_dns: $(OBJS)
$(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) tests/nmap_dns_test.cc
@@ -422,10 +415,10 @@ install-%: build-% %/Makefile
uninstall-%: %/Makefile
cd $* && $(MAKE) uninstall
install: install-nmap $(INSTALLNSE) $(INSTALLZENMAP) @NCAT_INSTALL@ @NMAP_UPDATE_INSTALL@ $(INSTALLNDIFF) $(INSTALLNPING)
install: install-nmap $(INSTALLNSE) $(INSTALLZENMAP) @NCAT_INSTALL@ $(INSTALLNDIFF) $(INSTALLNPING)
@echo "NMAP SUCCESSFULLY INSTALLED"
uninstall: uninstall-nmap $(UNINSTALLZENMAP) @NCAT_UNINSTALL@ @NMAP_UPDATE_UNINSTALL@ $(UNINSTALLNDIFF) $(UNINSTALLNPING)
uninstall: uninstall-nmap $(UNINSTALLZENMAP) @NCAT_UNINSTALL@ $(UNINSTALLNDIFF) $(UNINSTALLNPING)
uninstall-nmap:
rm -f $(DESTDIR)$(bindir)/$(TARGET)

203
acinclude.m4
View File

@@ -106,209 +106,6 @@ AC_DEFUN([CHECK_IPV6_IPPROTO_RAW],
esac
])
dnl -------------------------------------------------------- -*- autoconf -*-
dnl Licensed to the Apache Software Foundation (ASF) under one or more
dnl contributor license agreements. See the NOTICE file distributed with
dnl this work for additional information regarding copyright ownership.
dnl The ASF licenses this file to You under the Apache License, Version 2.0
dnl (the "License"); you may not use this file except in compliance with
dnl the License. You may obtain a copy of the License at
dnl
dnl http://www.apache.org/licenses/LICENSE-2.0
dnl
dnl Unless required by applicable law or agreed to in writing, software
dnl distributed under the License is distributed on an "AS IS" BASIS,
dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
dnl See the License for the specific language governing permissions and
dnl limitations under the License.
dnl
dnl find_apr.m4 : locate the APR include files and libraries
dnl
dnl This macro file can be used by applications to find and use the APR
dnl library. It provides a standardized mechanism for using APR. It supports
dnl embedding APR into the application source, or locating an installed
dnl copy of APR.
dnl
dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
dnl detailed-check)
dnl
dnl where srcdir is the location of the bundled APR source directory, or
dnl empty if source is not bundled.
dnl
dnl where builddir is the location where the bundled APR will will be built,
dnl or empty if the build will occur in the srcdir.
dnl
dnl where implicit-install-check set to 1 indicates if there is no
dnl --with-apr option specified, we will look for installed copies.
dnl
dnl where acceptable-majors is a space separated list of acceptable major
dnl version numbers. Often only a single major version will be acceptable.
dnl If multiple versions are specified, and --with-apr=PREFIX or the
dnl implicit installed search are used, then the first (leftmost) version
dnl in the list that is found will be used. Currently defaults to [0 1].
dnl
dnl where detailed-check is an M4 macro which sets the apr_acceptable to
dnl either "yes" or "no". The macro will be invoked for each installed
dnl copy of APR found, with the apr_config variable set appropriately.
dnl Only installed copies of APR which are considered acceptable by
dnl this macro will be considered found. If no installed copies are
dnl considered acceptable by this macro, apr_found will be set to either
dnl either "no" or "reconfig".
dnl
dnl Sets the following variables on exit:
dnl
dnl apr_found : "yes", "no", "reconfig"
dnl
dnl apr_config : If the apr-config tool exists, this refers to it. If
dnl apr_found is "reconfig", then the bundled directory
dnl should be reconfigured *before* using apr_config.
dnl
dnl Note: this macro file assumes that apr-config has been installed; it
dnl is normally considered a required part of an APR installation.
dnl
dnl If a bundled source directory is available and needs to be (re)configured,
dnl then apr_found is set to "reconfig". The caller should reconfigure the
dnl (passed-in) source directory, placing the result in the build directory,
dnl as appropriate.
dnl
dnl If apr_found is "yes" or "reconfig", then the caller should use the
dnl value of apr_config to fetch any necessary build/link information.
dnl
AC_DEFUN([APR_FIND_APR], [
apr_found="no"
if test "$target_os" = "os2-emx"; then
# Scripts don't pass test -x on OS/2
TEST_X="test -f"
else
TEST_X="test -x"
fi
ifelse([$4], [], [
ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x]))
acceptable_majors="0 1"],
[acceptable_majors="$4"])
apr_temp_acceptable_apr_config=""
for apr_temp_major in $acceptable_majors
do
case $apr_temp_major in
0)
apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config"
;;
*)
apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config"
;;
esac
done
AC_MSG_CHECKING(for APR)
AC_ARG_WITH(apr,
[ --with-apr=PATH prefix for installed APR or the full path to
apr-config],
[
if test "$withval" = "no" || test "$withval" = "yes"; then
AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
fi
for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
do
for lookdir in "$withval/bin" "$withval"
do
if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
apr_config="$lookdir/$apr_temp_apr_config_file"
ifelse([$5], [], [], [
apr_acceptable="yes"
$5
if test "$apr_acceptable" != "yes"; then
AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
continue
fi])
apr_found="yes"
break 2
fi
done
done
if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
apr_config="$withval"
ifelse([$5], [], [apr_found="yes"], [
apr_acceptable="yes"
$5
if test "$apr_acceptable" = "yes"; then
apr_found="yes"
fi])
fi
dnl if --with-apr is used, it is a fatal error for its argument
dnl to be invalid
if test "$apr_found" != "yes"; then
AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])
fi
],[
dnl If we allow installed copies, check those before using bundled copy.
if test -n "$3" && test "$3" = "1"; then
for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
do
if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
apr_config="$apr_temp_apr_config_file"
ifelse([$5], [], [], [
apr_acceptable="yes"
$5
if test "$apr_acceptable" != "yes"; then
AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
continue
fi])
apr_found="yes"
break
else
dnl look in some standard places
for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
apr_config="$lookdir/bin/$apr_temp_apr_config_file"
ifelse([$5], [], [], [
apr_acceptable="yes"
$5
if test "$apr_acceptable" != "yes"; then
AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
continue
fi])
apr_found="yes"
break 2
fi
done
fi
done
fi
dnl if we have not found anything yet and have bundled source, use that
if test "$apr_found" = "no" && test -d "$1"; then
apr_temp_abs_srcdir="`cd \"$1\" && pwd`"
apr_found="reconfig"
apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"
case $apr_bundled_major in
"")
AC_MSG_ERROR([failed to find major version of bundled APR])
;;
0)
apr_temp_apr_config_file="apr-config"
;;
*)
apr_temp_apr_config_file="apr-$apr_bundled_major-config"
;;
esac
if test -n "$2"; then
apr_config="$2/$apr_temp_apr_config_file"
else
apr_config="$1/$apr_temp_apr_config_file"
fi
fi
])
AC_MSG_RESULT($apr_found)
])
AC_DEFUN([LARGE_FILES_IF_NOT_BROKEN],
[
AC_LANG_PUSH(C++)

262
configure vendored
View File

@@ -622,11 +622,6 @@ ac_includes_default="\
enable_option_checking=no
ac_subst_vars='LTLIBOBJS
LIBOBJS
NMAP_UPDATE_DIST_CLEAN
NMAP_UPDATE_CLEAN
NMAP_UPDATE_UNINSTALL
NMAP_UPDATE_INSTALL
NMAP_UPDATE_BUILD
NCAT_DIST_CLEAN
NCAT_CLEAN
NCAT_UNINSTALL
@@ -798,9 +793,6 @@ with_liblinear
with_libnbase
with_libnsock
with_ncat
with_nmap_update
with_apr
with_subversion
'
ac_precious_vars='build_alias
host_alias
@@ -823,8 +815,7 @@ libssh2
libdnet-stripped
nbase
nsock/src
ncat
nmap-update'
ncat'
# Initialize some variables set by options.
ac_init_help=
@@ -1486,10 +1477,6 @@ Optional Packages:
--with-libnbase=DIR Look for nbase include/libs in DIR
--with-libnsock=DIR Compile and link to libnsock in DIR
--without-ncat Skip build and installation of Ncat
--without-nmap-update Skip build and installation of nmap-update
--with-apr=PATH prefix for installed APR or the full path to
apr-config
--with-subversion=DIR Look for libsvn1 in DIR/include and DIR/libs.
Some influential environment variables:
CC C compiler command
@@ -7915,253 +7902,6 @@ fi
# Check whether --with-nmap-update was given.
if test "${with_nmap_update+set}" = set; then :
withval=$with_nmap_update;
else
with_nmap_update=check
fi
apr_found="no"
if test "$target_os" = "os2-emx"; then
# Scripts don't pass test -x on OS/2
TEST_X="test -f"
else
TEST_X="test -x"
fi
acceptable_majors="1"
apr_temp_acceptable_apr_config=""
for apr_temp_major in $acceptable_majors
do
case $apr_temp_major in
0)
apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config"
;;
*)
apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config"
;;
esac
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5
$as_echo_n "checking for APR... " >&6; }
# Check whether --with-apr was given.
if test "${with_apr+set}" = set; then :
withval=$with_apr;
if test "$withval" = "no" || test "$withval" = "yes"; then
as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5
fi
for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
do
for lookdir in "$withval/bin" "$withval"
do
if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
apr_config="$lookdir/$apr_temp_apr_config_file"
apr_found="yes"
break 2
fi
done
done
if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
apr_config="$withval"
apr_found="yes"
fi
if test "$apr_found" != "yes"; then
as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5
fi
else
if test -n "1" && test "1" = "1"; then
for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
do
if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
apr_config="$apr_temp_apr_config_file"
apr_found="yes"
break
else
for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
apr_config="$lookdir/bin/$apr_temp_apr_config_file"
apr_found="yes"
break 2
fi
done
fi
done
fi
if test "$apr_found" = "no" && test -d ""; then
apr_temp_abs_srcdir="`cd \"\" && pwd`"
apr_found="reconfig"
apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`"
case $apr_bundled_major in
"")
as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5
;;
0)
apr_temp_apr_config_file="apr-config"
;;
*)
apr_temp_apr_config_file="apr-$apr_bundled_major-config"
;;
esac
if test -n ""; then
apr_config="/$apr_temp_apr_config_file"
else
apr_config="/$apr_temp_apr_config_file"
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5
$as_echo "$apr_found" >&6; }
if test "$apr_found" = "no"; then
with_nmap_update=no
fi
# Check whether --with-subversion was given.
if test "${with_subversion+set}" = set; then :
withval=$with_subversion;
case "$with_subversion" in
yes)
;;
no)
with_nmap_update=no
;;
*)
CPPFLAGS="-I$with_subversion/include $CPPFLAGS"
LDFLAGS="-L$with_subversion/lib $LDFLAGS"
;;
esac
fi
if test "$with_nmap_update" != "no"; then
have_libsvn=yes
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
ac_fn_c_check_header_mongrel "$LINENO" "svn_client.h" "ac_cv_header_svn_client_h" "$ac_includes_default"
if test "x$ac_cv_header_svn_client_h" = xyes; then :
else
ac_fn_c_check_header_mongrel "$LINENO" "subversion-1/svn_client.h" "ac_cv_header_subversion_1_svn_client_h" "$ac_includes_default"
if test "x$ac_cv_header_subversion_1_svn_client_h" = xyes; then :
else
have_libsvn=no
fi
fi
CPPFLAGS="$old_CPPFLAGS"
if test "$have_libsvn" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for svn_client_create_context in -lsvn_client-1" >&5
$as_echo_n "checking for svn_client_create_context in -lsvn_client-1... " >&6; }
if ${ac_cv_lib_svn_client_1_svn_client_create_context+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvn_client-1 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char svn_client_create_context ();
int
main ()
{
return svn_client_create_context ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_svn_client_1_svn_client_create_context=yes
else
ac_cv_lib_svn_client_1_svn_client_create_context=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svn_client_1_svn_client_create_context" >&5
$as_echo "$ac_cv_lib_svn_client_1_svn_client_create_context" >&6; }
if test "x$ac_cv_lib_svn_client_1_svn_client_create_context" = xyes; then :
have_libsvn=yes
else
have_libsvn=no
fi
fi
if test "$have_libsvn" != "yes"; then
if test "$with_nmap_update" = "check"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building nmap-update because libsvn1 was not found" >&5
$as_echo "$as_me: WARNING: Not building nmap-update because libsvn1 was not found" >&2;}
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "--with-nmap-update requires libsvn1
See \`config.log' for more details" "$LINENO" 5; }
fi
with_nmap_update=no
else
with_nmap_update=yes
fi
fi
if test "$with_nmap_update" = "no"; then
trace_no_use="$trace_no_use nmap-update"
NMAP_UPDATE_BUILD=""
NMAP_UPDATE_INSTALL=""
NMAP_UPDATE_UNINSTALL=""
NMAP_UPDATE_CLEAN=""
NMAP_UPDATE_DIST_CLEAN=""
else
trace_use="$trace_use nmap-update"
subdirs="$subdirs nmap-update"
NMAP_UPDATE_BUILD="build-nmap-update"
NMAP_UPDATE_INSTALL="install-nmap-update"
NMAP_UPDATE_UNINSTALL="uninstall-nmap-update"
NMAP_UPDATE_CLEAN="clean-nmap-update"
NMAP_UPDATE_DIST_CLEAN="distclean-nmap-update"
fi
ac_config_files="$ac_config_files Makefile libnetutil/Makefile"
cat >confcache <<\_ACEOF

73
configure.ac
View File

@@ -1097,79 +1097,6 @@ AC_SUBST(NCAT_UNINSTALL)
AC_SUBST(NCAT_CLEAN)
AC_SUBST(NCAT_DIST_CLEAN)
AC_ARG_WITH([nmap-update],
AC_HELP_STRING([--without-nmap-update], [Skip build and installation of nmap-update]), [], [with_nmap_update=check])
APR_FIND_APR(, , 1, 1)
if test "$apr_found" = "no"; then
with_nmap_update=no
fi
AC_ARG_WITH(subversion,
AC_HELP_STRING([--with-subversion=DIR], [Look for libsvn1 in DIR/include and DIR/libs.]),
[
case "$with_subversion" in
yes)
;;
no)
with_nmap_update=no
;;
*)
CPPFLAGS="-I$with_subversion/include $CPPFLAGS"
LDFLAGS="-L$with_subversion/lib $LDFLAGS"
;;
esac
])
if test "$with_nmap_update" != "no"; then
have_libsvn=yes
old_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
AC_CHECK_HEADER([svn_client.h], [], [
AC_CHECK_HEADER([subversion-1/svn_client.h], [], [have_libsvn=no])
])
CPPFLAGS="$old_CPPFLAGS"
if test "$have_libsvn" = "yes"; then
dnl Avoid appending to LIBS here by providing non-default action-if-found
AC_CHECK_LIB([svn_client-1], [svn_client_create_context], [have_libsvn=yes], [have_libsvn=no])
fi
if test "$have_libsvn" != "yes"; then
if test "$with_nmap_update" = "check"; then
AC_MSG_WARN([Not building nmap-update because libsvn1 was not found])
else
AC_MSG_FAILURE([--with-nmap-update requires libsvn1])
fi
with_nmap_update=no
else
with_nmap_update=yes
fi
fi
if test "$with_nmap_update" = "no"; then
trace_no_use="$trace_no_use nmap-update"
NMAP_UPDATE_BUILD=""
NMAP_UPDATE_INSTALL=""
NMAP_UPDATE_UNINSTALL=""
NMAP_UPDATE_CLEAN=""
NMAP_UPDATE_DIST_CLEAN=""
else
trace_use="$trace_use nmap-update"
AC_CONFIG_SUBDIRS(nmap-update)
NMAP_UPDATE_BUILD="build-nmap-update"
NMAP_UPDATE_INSTALL="install-nmap-update"
NMAP_UPDATE_UNINSTALL="uninstall-nmap-update"
NMAP_UPDATE_CLEAN="clean-nmap-update"
NMAP_UPDATE_DIST_CLEAN="distclean-nmap-update"
fi
AC_SUBST(NMAP_UPDATE_BUILD)
AC_SUBST(NMAP_UPDATE_INSTALL)
AC_SUBST(NMAP_UPDATE_UNINSTALL)
AC_SUBST(NMAP_UPDATE_CLEAN)
AC_SUBST(NMAP_UPDATE_DIST_CLEAN)
AC_OUTPUT(Makefile libnetutil/Makefile)
# Krad ASCII ART#!#@$!@#$

270
docs/3rd-party-licenses.txt
View File

@@ -32,9 +32,6 @@ On all platforms, Nmap is normally linked with:
http://www.openssl.org/
o LIBLINEAR. Used for IPv6 OS classifiction.
http://www.csie.ntu.edu.tw/~cjlin/liblinear/
o libsvn. The Subversion library, used by the updater program
nmap-update. http://subversion.apache.org/
o APR (Apache Portable Runtime). Used by libsvn. http://apr.apache.org/
On Windows only, Nmap uses:
o WinPcap: libpcap for Windows. The libpcap license applies to WinPcap,
@@ -371,273 +368,6 @@ License of OpenSSL
========
License of libsvn and APR.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SUBVERSION SUBCOMPONENTS:
Subversion includes a number of subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
For portions of the Python bindings test suite at
subversion/bindings/swig/python/tests/trac/:
I. Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
II. Copyright (C) 2003, 2004, 2005 Edgewall Software
Copyright (C) 2003, 2004, 2005 Jonas Borgström <jonas@edgewall.com>
Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de>
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
the documentation and/or other materials provided with the
distribution.
3. The name of the author may not be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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.
========
License of WinPcap
Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy).

45
docs/3rd-party.xml
View File

@@ -2,7 +2,6 @@
<!-- Info regarding third-party open source software included in Nmap. -->
<!-- TODO:
* Software and versions used in Zenmap on OS X
* Software and versions used in nmap-update
-->
<!DOCTYPE licenses [
<!ENTITY nmap_version "7.25SVN">
@@ -38,7 +37,6 @@
<!ENTITY license_mpl_11 SYSTEM "licenses/MPL-1.1">
<!ENTITY license_openssl SYSTEM "licenses/OpenSSL">
<!ENTITY license_python SYSTEM "https://docs.python.org/2.7/license.html">
<!ENTITY license_apache2 SYSTEM "https://www.apache.org/licenses/LICENSE-2.0">
]>
<licenses>
@@ -191,29 +189,6 @@
python="&python_version;"
</file>
</package>
<package>
<name>nmap-update</name>
<version>&nmap_version;</version>
<url>https://nmap.org/</url>
<license>&nmap_license;</license>
<file name="nmap-&nmap_version;.tar.bz2">
<alt name="nmap-&nmap_version;.tgz" />
<alt name="nmap-&nmap_version;-1.src.rpm" />
</file>
<file name="nmap-&nmap_version;-setup.exe">
openssl="&openssl_version;" subversion apr aprutil sqlite zlib serf
</file>
<file name="nmap-&nmap_version;-win32.zip">
openssl="&openssl_version;" subversion apr aprutil sqlite zlib serf
</file>
<file name="nmap-update-&nmap_version;-1.x86_64.rpm">
<alt name="nmap-update-&nmap_version;-1.i686.rpm" />
openssl="&openssl_version;" subversion apr aprutil sqlite zlib serf
</file>
<file name="nmap-&nmap_version;.dmg">
openssl="&openssl_version;" subversion apr aprutil sqlite zlib serf
</file>
</package>
</submodules>
<thirdparty>
<package id="slaxml">
@@ -295,24 +270,6 @@
<copyright>Roy Hills</copyright>
<license>&license_bsd_simplified;</license>
</package>
<package id="subversion">
<name>Apache Subversion</name>
<url>https://subversion.apache.org/</url>
<copyright>Apache Software Foundation</copyright>
<license>&license_apache2;</license>
</package>
<package id="apr">
<name>Apache Portable Runtime</name>
<url>https://apr.apache.org/</url>
<copyright>Apache Software Foundation</copyright>
<license>&license_apache2;</license>
</package>
<package id="aprutil">
<name>Apache Portable Runtime Utility</name>
<url>https://apr.apache.org/</url>
<copyright>Apache Software Foundation</copyright>
<license>&license_apache2;</license>
</package>
<package id="sqlite">
<name>SQLite</name>
<url>https://sqlite.org/</url>
@@ -320,7 +277,5 @@
</package>
<package id="zlib">
</package>
<package id="serf">
</package>
</thirdparty>
</licenses>

99
docs/nmap-update.1
View File

@@ -1,99 +0,0 @@
'\" t
.\" Title: nmap-update
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 08/12/2019
.\" Manual: nmap-update Reference Guide
.\" Source: nmap-update
.\" Language: English
.\"
.TH "NMAP\-UPDATE" "1" "08/12/2019" "nmap\-update" "nmap\-update Reference Guide"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
nmap-update \- Updater for Nmap\*(Aqs architecture\-independent files
.SH "SYNOPSIS"
.HP \w'\fBnmap\-update\fR\ 'u
\fBnmap\-update\fR [\fIoptions\fR] [\fIchannel\fR]
.SH "DESCRIPTION"
.PP
nmap\-update is an updater for Nmap\*(Aqs architecture\-independent files\&. It is used to keep up to date with changes and new scripts for the Nmap Scripting Engine\&.
.PP
Updates are distributed in the form of
\(lqchannels\(rq, which are named directories that usually correspond to Nmap version numbers\&. When nmap\-update is installed, it will pull from the channel corresponding to the version of Nmap it was installed with, until Nmap and nmap\-update are upgraded as a whole\&.
.PP
The program works by updating from a remote Subversion repository\&. To supply authentication credentials, create a configuration file:
.RS 4 /home/\fIuser\fR/\&.nmap/nmap\-config\&.conf on non\-Windows systems, or .RE .RS 4 C:\eUsers\e\fIuser\fR\eAppData\eRoaming\enmap\enmap\-config\&.conf on Windows\&. .RE
The contents of the file should be:
.sp
.if n \{\
.RS 4
.\}
.nf
username = \fIusername\fR
password = \fIpassword\fR
.fi
.if n \{\
.RE
.\}
.sp
Alternatively, you can cache your credentials more securely if you have the
\fBsvn\fR
command\-line program installed\&. Run the command
\fBsvn ls https://svn\&.nmap\&.org/updates\fR, enter your credentials, and agree to cache them when asked\&.
.SH "OPTIONS SUMMARY"
.PP
\fB\-d \fR\fB\fIdirectory\fR\fR
.RS 4
Install to
\fIdirectory\fR\&. Normally installation goes to a suitable place under your home directory:
\&.nmap/updates/\fIchannel\fR
on Unix and
AppData\eRoaming\enmap\eupdates\e\fIchannel\fR
on Windows\&. This option can be used by root to install updates system\-wide\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
Show a help message and exit\&.
.RE
.PP
\fB\-r\fR, \fB\-\-repo\fR \fIrepository\fR
.RS 4
Use the given repository and path rather than the default\&. For example,
\fB\-\-repo https://svn\&.example\&.com/updates\fR\&.
.RE
.PP
\fB\-\-username\fR \fIusername\fR
.RS 4
Authenticate with the given username\&.
.RE
.PP
\fB\-\-password\fR \fIpassword\fR
.RS 4
Authenticate with the given password\&.
.RE
.PP
\fB\-v\fR, \fB\-\-verbose\fR
.RS 4
Be more verbose\&. Show the used channel and repository\&.
.RE
.PP
Any other arguments are taken to be the names of channels to load from\&. The channels are tried in order until one is successful\&.

125
docs/nmap-update.xml
View File

@@ -1,125 +0,0 @@
<refentry id='man-nmap-update'>
<refmeta>
<refentrytitle>nmap-update</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="source">nmap-update</refmiscinfo>
<refmiscinfo class="manual">nmap-update Reference Guide</refmiscinfo>
</refmeta>
<refnamediv id='man-name'>
<refname>nmap-update</refname>
<refpurpose>Updater for Nmap's architecture-independent files</refpurpose>
</refnamediv>
<refsynopsisdiv id='man-synopsis'>
<cmdsynopsis>
<command>nmap-update</command>
<arg choice='opt'>
<replaceable>options</replaceable>
</arg>
<arg choice='opt' repeat='rep'>
<replaceable>channel</replaceable>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1 id='man-description'>
<title>Description</title>
<para>
nmap-update is an updater for Nmap's architecture-independent files. It is
used to keep up to date with changes and new scripts for the Nmap Scripting
Engine.
</para>
<para>
Updates are distributed in the form of <quote>channels</quote>, which are
named directories that usually correspond to Nmap version numbers. When
nmap-update is installed, it will pull from the channel corresponding to the
version of Nmap it was installed with, until Nmap and nmap-update are
upgraded as a whole.
</para>
<para>
The program works by updating from a remote Subversion repository. To supply
authentication credentials, create a configuration file:
<simplelist>
<member><filename>/home/<replaceable>user</replaceable>/.nmap/nmap-config.conf</filename>
on non-Windows systems, or</member>
<member><filename>C:\Users\<replaceable>user</replaceable>\AppData\Roaming\nmap\nmap-config.conf</filename>
on Windows.</member>
</simplelist>
The contents of the file should be:
<programlisting>
username = <replaceable>username</replaceable>
password = <replaceable>password</replaceable>
</programlisting>
Alternatively, you can cache your credentials more securely if you have the
<command>svn</command> command-line program installed. Run the command
<command>svn ls https://svn.nmap.org/updates</command>, enter your
credentials, and agree to cache them when asked.
</para>
</refsect1>
<refsect1 id='man-briefoptions'>
<title>Options Summary</title>
<variablelist>
<varlistentry>
<term><option>-d <replaceable>directory</replaceable></option></term>
<listitem>
<para>
Install to <filename><replaceable>directory</replaceable></filename>.
Normally installation goes to a suitable place under your home
directory:
<filename>.nmap/updates/<replaceable>channel</replaceable></filename>
on Unix and
<filename>AppData\Roaming\nmap\updates\<replaceable>channel</replaceable></filename>
on Windows. This option can be used by root to install updates
system-wide.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-h</option></term>
<term><option>--help</option></term>
<listitem>
<para>Show a help message and exit.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-r</option></term>
<term><option>--repo</option> <replaceable>repository</replaceable></term>
<listitem>
<para>Use the given repository and path rather than the default.
For example, <option>--repo https://svn.example.com/updates</option>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--username</option> <replaceable>username</replaceable></term>
<listitem>
<para>Authenticate with the given username.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--password</option> <replaceable>password</replaceable></term>
<listitem>
<para>Authenticate with the given password.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-v</option></term>
<term><option>--verbose</option></term>
<listitem>
<para>Be more verbose. Show the used channel and repository.</para>
</listitem>
</varlistentry>
</variablelist>
<para>
Any other arguments are taken to be the names of channels to load from. The
channels are tried in order until one is successful.
</para>
</refsect1>
<!--
<refsect1 id='man-legal'>
&legal-notices;
</refsect1>
-->
</refentry>

19
macosx/BUNDLING.md
View File

@@ -112,24 +112,7 @@ $ make install
#### Prerequisite:
—`openssl.modules`:
This is a jhbuild moduleset that can be used to build/update openssl, libapr and libsvn.
First, locate this part in your Jhbuild `~/.jhbuildrc` configuration file:
~~~~
if not _host_tiger:
skip.append('make')
skip.append('subversion')
~~~~
And comment this line with a #:
~~~~
if not _host_tiger:
skip.append('make')
# skip.append('subversion')
~~~~
This will **stop Jhbuild from ignoring subversion**, which was in the ignore list.
This is a jhbuild moduleset that can be used to build/update openssl.
#### Usage:

41
macosx/Makefile
View File

@@ -27,9 +27,6 @@ NDIFF_STAGING_DIR = ndiff-root
NPING_BUILD_DIR = nping-build
NPING_STAGING_DIR = nping-root
NMAP_UPDATE_BUILD_DIR = nmap-update-build
NMAP_UPDATE_STAGING_DIR = nmap-update-root
JHBUILD_PREFIX=$(HOME)/gtk/inst
JHBUILD_SOURCE=$(HOME)/gtk/source
PREFIX = /usr/local
@@ -70,35 +67,10 @@ CFLAGS += $(UNIVERSAL_CFLAGS)
CXXFLAGS += $(UNIVERSAL_CXXFLAGS)
LDFLAGS += $(UNIVERSAL_LDFLAGS)
# Mac OS options for libraries used by nmap-update
MAC_FLAGS = -lsasl2 -liconv -framework CoreFoundation -framework Security
# Jhbuild static libraries
PYTHON = $(JHBUILD_PREFIX)/bin/python2.7
OPENSSL_STATIC = $(JHBUILD_PREFIX)/lib/libssl.a $(JHBUILD_PREFIX)/lib/libcrypto.a
LIBZ_STATIC = $(JHBUILD_PREFIX)/lib/libz.a
SVN_STATIC = $(JHBUILD_PREFIX)/lib/libsvn_client-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_wc-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_diff-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_delta-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_subr-1.a \
$(JHBUILD_PREFIX)/lib/libexpat.a \
$(JHBUILD_PREFIX)/lib/libsvn_ra-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_ra_svn-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_ra_local-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_fs-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_repos-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_fs_util-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_fs_fs-1.a \
$(JHBUILD_PREFIX)/lib/libsvn_fs_x-1.a \
$(JHBUILD_PREFIX)/lib/libintl.a \
$(JHBUILD_PREFIX)/lib/libsvn_ra_serf-1.a \
$(JHBUILD_PREFIX)/lib/libserf-1.a \
$(JHBUILD_PREFIX)/lib/libz.a \
$(JHBUILD_PREFIX)/lib/libsqlite3.a
APR_STATIC = $(JHBUILD_PREFIX)/lib/libapr-1.a \
$(JHBUILD_PREFIX)/lib/libaprutil-1.a \
$(JHBUILD_PREFIX)/lib/libapriconv-1.a
# These are the positions used by the createdmg.sh and check_test.sh scripts
export ICON_SIZE=88
@@ -128,7 +100,7 @@ tool-checks: have-$(CC) have-jhbuild have-gtk-mac-bundler
have-%:
which $*
#$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping check-nmap-update COPYING.formatted
#$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping COPYING.formatted
$(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap check-nping COPYING.formatted
rm -rf $(IMAGE_STAGING_DIR)
mkdir -p $(IMAGE_STAGING_DIR)
@@ -138,7 +110,6 @@ $(IMAGE_STAGING_DIR)/$(PKG_NAME): check-nmap check-ncat check-ndiff check-zenmap
pkgbuild --root $(NCAT_STAGING_DIR) --identifier org.insecure.nmap.ncat --version $(NMAP_VERSION) --install-location /usr/local ncat.pkg
pkgbuild --root $(NDIFF_STAGING_DIR)/usr/local --identifier org.insecure.nmap.ndiff --version $(NMAP_VERSION) --install-location /usr/local ndiff.pkg
pkgbuild --root $(NPING_STAGING_DIR) --identifier org.insecure.nmap.nping --version $(NMAP_VERSION) --install-location /usr/local nping.pkg
#pkgbuild --root $(NMAP_UPDATE_STAGING_DIR) --identifier org.insecure.nmap.nmap-update --version $(NMAP_VERSION) --install-location /usr/local nmap-update.pkg
pkgbuild --root $(ZENMAP_STAGING_DIR) --identifier org.insecure.nmap.zenmap --version $(NMAP_VERSION) --install-location /Applications zenmap.pkg
# Produce a .xml with packages information
@@ -176,12 +147,6 @@ export-tarball:
tar czf nmap-$(NMAP_VERSION).tar.gz nmap-$(NMAP_VERSION)
cp nmap-$(NMAP_VERSION).tar.gz $(JHBUILD_SOURCE)/pkgs/
stage-nmap-update: export-$(NMAP_UPDATE_BUILD_DIR)
cd $(NMAP_UPDATE_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --with-nmap-update --with-apr=$(JHBUILD_PREFIX) --with-subversion=$(JHBUILD_PREFIX) --with-serf=$(JHBUILD_PREFIX) --with-openssl=$(JHBUILD_PREFIX) $(CONFIGURE_ARGS)
make -C $(NMAP_UPDATE_BUILD_DIR) build-nmap-update APR_LIBS="$(APR_STATIC)" SVN_LIBS="$(SVN_STATIC)" OPENSSL_LIBS="$(OPENSSL_STATIC)" MAC_FLAGS="$(MAC_FLAGS)"
rm -rf $(NMAP_UPDATE_STAGING_DIR)
make -C $(NMAP_UPDATE_BUILD_DIR) install-nmap-update DESTDIR="`pwd`/$(NMAP_UPDATE_STAGING_DIR)" APR_LIBS="$(APR_STATIC)" SVN_LIBS="$(SVN_STATIC)" OPENSSL_LIBS="$(OPENSSL_STATIC)" MAC_FLAGS="$(MAC_FLAGS)"
stage-%: export-tarball
jhbuild -m "file://`pwd`/openssl.modules" build $*
rm -rf $*-root
@@ -216,10 +181,8 @@ clean:
rm -rf $(NDIFF_STAGING_DIR)
rm -rf $(NPING_BUILD_DIR)
rm -rf $(NPING_STAGING_DIR)
rm -rf $(NMAP_UPDATE_BUILD_DIR)
rm -rf $(NMAP_UPDATE_STAGING_DIR)
rm -f COPYING.formatted
rm -f $(IMAGE_NAME)
rm -rf distribution.xml finalDist.xml nmap.pkg ncat.pkg ndiff.pkg nping.pkg nmap-update.pkg zenmap.pkg
rm -rf distribution.xml finalDist.xml nmap.pkg ncat.pkg ndiff.pkg nping.pkg zenmap.pkg
.PHONY: clean export-% stage-%

2
macosx/README.md
View File

@@ -48,7 +48,7 @@ For far more in-depth compilation, installation, and removal notes, read the **N
## <a name="files"></a>Files in this directory
* [openssl.modules](openssl.modules): This is a Jhbuild moduleset that can be used to build dependencies (openssl, libsvn and libapr) as required for building Nmap, Ncat, Nping and nmap-update. Use it like this:
* [openssl.modules](openssl.modules): This is a Jhbuild moduleset that can be used to build dependencies (openssl) as required for building Nmap, Ncat, and Nping. Use it like this:
~~~~
$ jhbuild -m openssl.modules build nmap-deps

3
macosx/nmap.pmdoc/06nmap-update-contents.xml
View File

@@ -1,3 +0,0 @@
<pkg-contents spec="1.12">
<f n="nmap-update" pt="nmap-update" m="false" t="file"/>
</pkg-contents>

25
macosx/nmap.pmdoc/06nmap-update.xml
View File

@@ -1,25 +0,0 @@
<pkgref spec="1.12" uuid="A488395A-3951-449A-B3F6-A74D5E926D69">
<config>
<identifier>org.insecure.nmap.nmap-update.pkg</identifier>
<version>1</version>
<description />
<post-install type="none" />
<requireAuthorization />
<installFrom relative="true" includeRoot="false">nmap-update</installFrom>
<installTo>/</installTo>
<flags>
<followSymbolicLinks />
</flags>
<packageStore type="internal" />
<mod>parent</mod>
<mod>installFrom.isRelativeType</mod>
</config>
<contents>
<file-list>06nmap-update-contents.xml</file-list>
<filter>/CVS$</filter>
<filter>/\.svn$</filter>
<filter>/\.cvsignore$</filter>
<filter>/\.cvspass$</filter>
<filter>/\.DS_Store$</filter>
</contents>
</pkgref>

6
macosx/nmap.pmdoc/index.xml
View File

@@ -36,11 +36,6 @@
starts_enabled="true" starts_hidden="false">
<pkgref id="org.insecure.nmap.Nping.pkg" />
</choice>
<choice title="nmap-update" id="choice97" starts_selected="true"
description="nmap-update updater for architecture-independent files."
starts_enabled="true" starts_hidden="false">
<pkgref id="org.insecure.nmap.nmap-update.pkg" />
</choice>
</contents>
<resources bg-scale="none" bg-align="topleft">
<locale lang="en">
@@ -54,7 +49,6 @@
<item type="file">03ncat.xml</item>
<item type="file">04ndiff.xml</item>
<item type="file">05nping.xml</item>
<item type="file">06nmap-update.xml</item>
<mod>properties.customizeOption</mod>
<mod>properties.title</mod>
<mod>properties.anywhereDomain</mod>

60
macosx/openssl.modules
View File

@@ -9,9 +9,7 @@
<!-- REPOSITORIES -->
<repository type="tarball" name="sourceforge" href="http://prdownloads.sourceforge.net/"/>
<repository type="tarball" name="openssl" href="http://www.openssl.org/source/"/>
<repository type="tarball" name="apache" href="http://archive.apache.org/dist/"/>
<repository type="tarball" name="nmap-local" href="http://localhost:8000/"/>
<!-- MODULES -->
@@ -26,61 +24,9 @@
<branch repo="openssl" version="1.0.2s" module="openssl-1.0.2s.tar.gz"/>
</autotools>
<distutils id="scons">
<branch repo="sourceforge" module="scons/scons-2.5.0.tar.gz" version="2.5.0"/>
</distutils>
<autotools id="serf" autogen-sh=""
supports-non-srcdir-builds="no"
autogen-template="scons CFLAGS='-arch i386'
APR=${PREFIX}
APU=${PREFIX}
OPENSSL=${PREFIX}
ZLIB=${PREFIX}
LINKFLAGS='-arch i386'
APR_STATIC=true
PREFIX=%(prefix)s install"
makeargs="-v" skip-install="true" check-target="false">
<branch repo="apache" module="serf/serf-1.3.8.tar.bz2" version="1.3.8"/>
<dependencies>
<dep package="scons"/>
<dep package="apr"/>
<dep package="aprutil"/>
<dep package="openssl"/>
<dep package="sqlite"/>
<dep package="zlib"/>
</dependencies>
</autotools>
<autotools id="apr" autogen-sh="configure">
<branch repo="apache" module="apr/apr-1.5.2.tar.gz" version="1.5.2"/>
</autotools>
<autotools id="aprutil" autogen-sh="configure"
autogenargs="--with-apr=${PREFIX}">
<branch repo="apache" module="apr/apr-util-1.5.4.tar.gz" version="1.5.4"/>
<dependencies>
<dep package="apr"/>
</dependencies>
</autotools>
<autotools id="subversion" supports-non-srcdir-builds="no"
autogen-sh="configure" autogenargs="--with-apr=${PREFIX}
--with-apr-util=${PREFIX}
--with-serf=${PREFIX}
--without-apxs --with-ssl">
<branch repo="apache" module="subversion/subversion-1.9.4.tar.gz" version="1.9.4"/>
<dependencies>
<dep package="apr"/>
<dep package="aprutil"/>
<dep package="openssl"/>
<dep package="serf"/>
</dependencies>
</autotools>
<autotools id="nmap" supports-non-srcdir-builds="no"
autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
--without-zenmap --without-ncat --without-ndiff --without-nping --without-nmap-update"
--without-zenmap --without-ncat --without-ndiff --without-nping"
makeargs='OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" LIBSSL="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a" LIBZ="${JHBUILD_LIBDIR}/libz.a"'
makeinstallargs='install OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a" ZLIB_LIBS="${JHBUILD_LIBDIR}/libz.a"'
>
@@ -92,7 +38,7 @@
<autotools id="ncat" supports-non-srcdir-builds="no"
autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
--without-zenmap --without-ndiff --without-nping --without-nmap-update"
--without-zenmap --without-ndiff --without-nping"
makeargs='build-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
makeinstallargs='install-ncat OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
>
@@ -104,7 +50,7 @@
<autotools id="nping" supports-non-srcdir-builds="no"
autogen-sh="configure" autogenargs="--with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
--without-zenmap --without-ncat --without-ndiff --without-nmap-update"
--without-zenmap --without-ncat --without-ndiff"
makeargs='build-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
makeinstallargs='install-nping OPENSSL_LIBS="${JHBUILD_LIBDIR}/libssl.a ${JHBUILD_LIBDIR}/libcrypto.a"'
>

2
mswin32/Makefile
View File

@@ -30,7 +30,6 @@ bundle-nmap: bundle-zip bundle-nsis
build-nmap: nmap.sln nmap.rc
"$(VCEXPRESS)" nmap.sln /build "$(VCCONFIG)|$(PLATFORM)" /out $(LOGLOC)
#"$(VCEXPRESS)" nmap.sln /build release /project nmap-update /out $(LOGLOC)
stage-nmap: build-nmap LICENSE
rm -rf nmap-$(NMAP_VERSION)
@@ -59,7 +58,6 @@ stage-nmap: build-nmap LICENSE
cp ../ncat/$(BASE_CONFIG)/ncat.exe nmap-$(NMAP_VERSION)
cp ../ncat/$(BASE_CONFIG)/ca-bundle.crt nmap-$(NMAP_VERSION)
cp ../nping/$(BASE_CONFIG)/nping.exe nmap-$(NMAP_VERSION)
#cp ../nmap-update/Release/nmap-update.exe nmap-$(NMAP_VERSION)
# Install the ndiff batch file wrapper in the zip distribution.
cp ../ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py
cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat

14
mswin32/nmap.sln
View File

@@ -27,8 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinear", "..\liblinear\liblinear.vcxproj", "{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap-update", "..\nmap-update\nmap-update.vcxproj", "{BBF27339-C7B6-4F52-B742-897796C1F13B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "..\libz\contrib\vstudio\vc12\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\libssh2\win32\libssh2.vcxproj", "{ED957342-E43B-496E-92D9-4C76B525BDF5}"
@@ -193,18 +191,6 @@ Global
{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.ActiveCfg = Debug|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|x64.ActiveCfg = Debug|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.Build.0 = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|x64.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|x64.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseOEM|Win32.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseOEM|x64.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
{BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = DebugWithoutAsm|Win32
{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = DebugWithoutAsm|Win32
{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64

14
mswin32/nsis/Nmap.nsi.in
View File

@@ -11,7 +11,6 @@
;; /NCAT=NO don't install Ncat
;; /NDIFF=NO don't install Ndiff
;; /NPING=NO don't install Nping
;; /NMAPUPDATE=NO don't install nmap-update
;; /D=C:\dir\... install to C:\dir\... (overrides InstallDir)
;;
;;/D is a built-in NSIS option and has these restrictions:
@@ -333,14 +332,6 @@ Section "Nping (Packet generator)" SecNping
Call create_uninstaller
SectionEnd
#Section "nmap-update (updater for architecture-independent files)" SecNmapUpdate
# SetOutPath "$INSTDIR"
# SetOverwrite on
# File ${STAGE_DIR}\nmap-update.exe
# Call vcredist2013installer
# Call create_uninstaller
#SectionEnd
#
Function vcredist2013installer
StrCmp $vcredist2013set "" 0 vcredist_done
StrCpy $vcredist2013set "true"
@@ -478,7 +469,6 @@ Function .onInit
!insertmacro OptionDisableSection $0 "/NCAT=" ${SecNcat}
!insertmacro OptionDisableSection $0 "/NDIFF=" ${SecNdiff}
!insertmacro OptionDisableSection $0 "/NPING=" ${SecNping}
#!insertmacro OptionDisableSection $0 "/NMAPUPDATE=" ${SecNmapUpdate}
FunctionEnd
;--------------------------------
@@ -493,7 +483,6 @@ FunctionEnd
LangString DESC_SecNcat ${LANG_ENGLISH} "Installs Ncat, Nmap's Netcat replacement."
LangString DESC_SecNdiff ${LANG_ENGLISH} "Installs Ndiff, a tool for comparing Nmap XML files."
LangString DESC_SecNping ${LANG_ENGLISH} "Installs Nping, a packet generation tool."
#LangString DESC_SecNmapUpdate ${LANG_ENGLISH} "Installs nmap-update, an updater for architecture-independent files."
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -505,7 +494,6 @@ FunctionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecNcat} $(DESC_SecNcat)
!insertmacro MUI_DESCRIPTION_TEXT ${SecNdiff} $(DESC_SecNdiff)
!insertmacro MUI_DESCRIPTION_TEXT ${SecNping} $(DESC_SecNping)
#!insertmacro MUI_DESCRIPTION_TEXT ${SecNmapUpdate} $(DESC_SecNmapUpdate)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
@@ -539,7 +527,6 @@ Section "Uninstall"
IfFileExists $INSTDIR\ncat.exe nmap_installed
IfFileExists $INSTDIR\nping.exe nmap_installed
IfFileExists $INSTDIR\ndiff.exe nmap_installed
#IfFileExists $INSTDIR\nmap-update.exe nmap_installed
MessageBox MB_YESNO "It does not appear that ${NMAP_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES nmap_installed
Abort "Uninstall aborted by user"
@@ -577,7 +564,6 @@ Section "Uninstall"
Delete "$INSTDIR\COPYING_HIGWIDGETS"
Delete "$INSTDIR\ncat.exe"
Delete "$INSTDIR\nping.exe"
#Delete "$INSTDIR\nmap-update.exe"
Delete "$INSTDIR\ca-bundle.crt"
;Delete specific subfolders (NB: custom scripts in scripts folder will be lost)
RMDir /r "$INSTDIR\nselib"

64
nmap-update/Makefile.in
View File

@@ -1,64 +0,0 @@
top_srcdir = @top_srcdir@
srcdir = @srcdir@
prefix = @prefix@
datarootdir = @datarootdir@
exec_prefix = @exec_prefix@
bindir = @bindir@
mandir = @mandir@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS)
DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
APR_LIBS = @APR_LIBS@
SVN_LIBS = @SVN_LIBS@
INSTALL = @INSTALL@
STRIP = @STRIP@
SHTOOL = ../shtool
DESTDIR =
SOURCES = nmap-update svn_auth
C_FILES = $(addsuffix .c,$(SOURCES))
O_FILES = $(addsuffix .o,$(SOURCES))
NBASEDIR = ../nbase
NBASELIB = $(NBASEDIR)/libnbase.a
all: nmap-update
nmap-update: $(O_FILES) $(NBASELIB)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(SVN_LIBS) $(APR_LIBS) $(OPENSSL_LIBS) $(LIBS)
%.o: %.c
$(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
$(NBASELIB):
cd $(NBASEDIR) && $(MAKE)
install: nmap-update
$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
$(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir)
$(STRIP) -x $(DESTDIR)$(bindir)/nmap-update
$(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/
uninstall:
$(RM) -f $(DESTDIR)$(bindir)/nmap-update
clean:
rm -f nmap-update *.o
distclean: clean
rm -f Makefile makefile.dep
Makefile: Makefile.in
./config.status
makefile.dep:
$(CC) -MM $(CPPFLAGS) $(C_FILES) > $@
-include makefile.dep
.PHONY: all clean

64
nmap-update/config.h.in
View File

@@ -1,64 +0,0 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `apr-1' library (-lapr-1). */
#undef HAVE_LIBAPR_1
/* Define to 1 if you have the `svn_client-1' library (-lsvn_client-1). */
#undef HAVE_LIBSVN_CLIENT_1
/* Define to 1 if you have the `svn_subr-1' library (-lsvn_subr-1). */
#undef HAVE_LIBSVN_SUBR_1
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <subversion-1/svn_client.h> header file. */
#undef HAVE_SUBVERSION_1_SVN_CLIENT_H
/* Define to 1 if you have the <svn_client.h> header file. */
#undef HAVE_SVN_CLIENT_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

5028
nmap-update/configure vendored
View File

File diff suppressed because it is too large Load Diff

74
nmap-update/configure.ac
View File

@@ -1,74 +0,0 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
AC_INIT([nmap-update.c])
AC_CONFIG_HEADERS([config.h])
m4_include([../acinclude.m4])
# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PATH_TOOL([STRIP], [strip], [/bin/true])
# GCC-specific flags
if test -n "$GCC"; then
# -Wno-deprecated-declarations is because we use an older version of the
# Subversion API for compatibility.
CFLAGS="$CFLAGS -Wall -Wno-deprecated-declarations"
fi
APR_FIND_APR(, , 1, 1)
if test "$apr_found" = "no"; then
AC_MSG_ERROR([libapr is required to build nmap-update.])
fi
CPPFLAGS="$CPPFLAGS $($apr_config --cppflags --includes)"
APR_LIBS="$($apr_config --link-ld)"
AC_SUBST(APR_LIBS)
AC_ARG_WITH(subversion,
AC_HELP_STRING([--with-subversion=DIR], [Look for libsvn1 in DIR/include and DIR/libs.]),
[
case "$with_subversion" in
yes)
;;
no)
AC_MSG_ERROR([Subversion and libsvn1 are required to build nmap-update.])
;;
*)
CPPFLAGS="-I$with_subversion/include $CPPFLAGS"
LDFLAGS="-L$with_subversion/lib $LDFLAGS"
;;
esac
])
# Checks for libraries.
SVN_LIBS=""
AC_CHECK_LIB([svn_client-1], [svn_client_create_context],
[ SVN_LIBS="$SVN_LIBS -lsvn_client-1"],
[
AC_MSG_ERROR([Could not find required libsvn_client-1])
])
AC_CHECK_LIB([svn_subr-1], [svn_handle_error2],
[ SVN_LIBS="$SVN_LIBS -lsvn_subr-1"],
[
AC_MSG_ERROR([Could not find required libsvn_subr-1])
])
AC_CHECK_LIB([apr-1], [apr_pool_destroy],
[ SVN_LIBS="$SVN_LIBS -lapr-1"],
[
AC_MSG_ERROR([Could not find required libapr-1])
])
AC_SUBST(SVN_LIBS)
# Checks for header files.
AC_CHECK_HEADERS([svn_client.h subversion-1/svn_client.h])
# Checks for typedefs, structures, and compiler characteristics.
# AC_TYPE_SIZE_T
# Checks for library functions.
# AC_CHECK_FUNCS([mkdir strerror strtoul])
AC_OUTPUT(Makefile)

1
nmap-update/default_channel.h
View File

@@ -1 +0,0 @@
#define DEFAULT_CHANNEL "7.40"

1327
nmap-update/nmap-update.c
View File

File diff suppressed because it is too large Load Diff

98
nmap-update/nmap-update.vcxproj
View File

@@ -1,98 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="nmap-update.c" />
<ClCompile Include="svn_auth.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\nbase\nbase.vcxproj">
<Project>{b630c8f7-3138-43e8-89ed-78742fa2ac5f}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BBF27339-C7B6-4F52-B742-897796C1F13B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>nmapupdate</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>.\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\nbase;..\..\nmap-mswin32-aux\libsvn\include\apr;..\..\nmap-mswin32-aux\libsvn\include\subversion</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\nmap-mswin32-aux\libsvn\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>version.lib;secur32.lib;crypt32.lib;mswsock.lib;rpcrt4.lib;ws2_32.lib;nbase.lib;apr-1.lib;apriconv-1.lib;aprutil-1.lib;serf-1.lib;libsvn_fs_fs-1.lib;libsvn_fs_util-1.lib;libsvn_ra_local-1.lib;libsvn_ra_serf-1.lib;libsvn_ra_svn-1.lib;libsvn_client-1.lib;libsvn_delta-1.lib;libsvn_diff-1.lib;libsvn_fs-1.lib;libsvn_ra-1.lib;libsvn_repos-1.lib;libsvn_subr-1.lib;libsvn_wc-1.lib;libeay32.lib;ssleay32.lib;xml.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;API_DECLARE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\nbase;..\..\nmap-mswin32-aux\libsvn\include\apr;..\..\nmap-mswin32-aux\libsvn\include\subversion</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;..\..\nmap-mswin32-aux\libsvn\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>version.lib;secur32.lib;crypt32.lib;mswsock.lib;rpcrt4.lib;ws2_32.lib;nbase.lib;apr-1.lib;apriconv-1.lib;aprutil-1.lib;serf-1.lib;libsvn_fs_fs-1.lib;libsvn_fs_util-1.lib;libsvn_ra_local-1.lib;libsvn_ra_serf-1.lib;libsvn_ra_svn-1.lib;libsvn_client-1.lib;libsvn_delta-1.lib;libsvn_diff-1.lib;libsvn_fs-1.lib;libsvn_ra-1.lib;libsvn_repos-1.lib;libsvn_subr-1.lib;libsvn_wc-1.lib;libeay32.lib;ssleay32.lib;xml.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

384
nmap-update/svn_auth.c
View File

@@ -1,384 +0,0 @@
/* The functions in this file have been copied from
subversion-1.5.x/subversion/libsvn_subr/cmdline.c
subversion-1.5.x/subversion/libsvn_subr/simple_providers.c
The point of copying these functions is to disable automatic username
guessing based on UID, and always prompt for a username unless it is already
defined in the auth cache or in a configuration file. libsvn_cmdline doesn't
support disabling this while still calling svn_cmdline_create_auth_baton,
which otherwise does a lot of useful things. This is an attempt to copy the
minimum amount of code to disable username guessing.
These changes have been made (set off with #if 0):
* Disabled username guessing in prompt_for_simple_creds.
* Made svn_auth_get_simple_prompt_provider have static scope.
* Put an "nmap_update_" prefix on svn_auth_get_simple_prompt_provider and
svn_cmdline_setup_auth_baton. */
/*
* ====================================================================
* Copyright (c) 2003-2006, 2008 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://subversion.tigris.org/license-1.html.
* If newer versions of this license are posted there, you may use a
* newer version instead, at your option.
*
* This software consists of voluntary contributions made by many
* individuals. For exact contribution history, see the revision
* history and logs, available at http://subversion.tigris.org/.
* ====================================================================
*/
#ifndef WIN32
#include "config.h"
#else
#include "win_config.h"
#endif
#if HAVE_SUBVERSION_1_SVN_CLIENT_H
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_opt.h>
#include <subversion-1/svn_pools.h>
#include <subversion-1/svn_types.h>
#else
#include <svn_client.h>
#include <svn_cmdline.h>
#include <svn_opt.h>
#include <svn_pools.h>
#include <svn_types.h>
#endif
/*-----------------------------------------------------------------------*/
/* File provider */
/*-----------------------------------------------------------------------*/
/* The keys that will be stored on disk */
#define SVN_AUTH__AUTHFILE_USERNAME_KEY "username"
#define SVN_AUTH__AUTHFILE_PASSWORD_KEY "password"
#define SVN_AUTH__AUTHFILE_PASSTYPE_KEY "passtype"
#define SVN_AUTH__SIMPLE_PASSWORD_TYPE "simple"
#define SVN_AUTH__WINCRYPT_PASSWORD_TYPE "wincrypt"
#define SVN_AUTH__KEYCHAIN_PASSWORD_TYPE "keychain"
/*-----------------------------------------------------------------------*/
/* Prompt provider */
/*-----------------------------------------------------------------------*/
/* Baton type for username/password prompting. */
typedef struct
{
svn_auth_simple_prompt_func_t prompt_func;
void *prompt_baton;
/* how many times to re-prompt after the first one fails */
int retry_limit;
} simple_prompt_provider_baton_t;
/* Iteration baton type for username/password prompting. */
typedef struct
{
/* how many times we've reprompted */
int retries;
} simple_prompt_iter_baton_t;
/*** Helper Functions ***/
static svn_error_t *
prompt_for_simple_creds(svn_auth_cred_simple_t **cred_p,
simple_prompt_provider_baton_t *pb,
apr_hash_t *parameters,
const char *realmstring,
svn_boolean_t first_time,
svn_boolean_t may_save,
apr_pool_t *pool)
{
const char *def_username = NULL, *def_password = NULL;
*cred_p = NULL;
/* If we're allowed to check for default usernames and passwords, do
so. */
if (first_time)
{
def_username = apr_hash_get(parameters,
SVN_AUTH_PARAM_DEFAULT_USERNAME,
APR_HASH_KEY_STRING);
/* No default username? Try the auth cache. */
if (! def_username)
{
const char *config_dir = apr_hash_get(parameters,
SVN_AUTH_PARAM_CONFIG_DIR,
APR_HASH_KEY_STRING);
apr_hash_t *creds_hash = NULL;
svn_string_t *str;
svn_error_t *err;
err = svn_config_read_auth_data(&creds_hash, SVN_AUTH_CRED_SIMPLE,
realmstring, config_dir, pool);
svn_error_clear(err);
if (! err && creds_hash)
{
str = apr_hash_get(creds_hash,
SVN_AUTH__AUTHFILE_USERNAME_KEY,
APR_HASH_KEY_STRING);
if (str && str->data)
def_username = str->data;
}
}
#if 0
/* Still no default username? Try the UID. */
if (! def_username)
def_username = svn_user_get_name(pool);
#endif
def_password = apr_hash_get(parameters,
SVN_AUTH_PARAM_DEFAULT_PASSWORD,
APR_HASH_KEY_STRING);
}
/* If we have defaults, just build the cred here and return it.
*
* ### I do wonder why this is here instead of in a separate
* ### 'defaults' provider that would run before the prompt
* ### provider... Hmmm.
*/
if (def_username && def_password)
{
*cred_p = apr_palloc(pool, sizeof(**cred_p));
(*cred_p)->username = apr_pstrdup(pool, def_username);
(*cred_p)->password = apr_pstrdup(pool, def_password);
(*cred_p)->may_save = TRUE;
}
else
{
SVN_ERR(pb->prompt_func(cred_p, pb->prompt_baton, realmstring,
def_username, may_save, pool));
}
return SVN_NO_ERROR;
}
/* Our first attempt will use any default username/password passed
in, and prompt for the remaining stuff. */
static svn_error_t *
simple_prompt_first_creds(void **credentials_p,
void **iter_baton,
void *provider_baton,
apr_hash_t *parameters,
const char *realmstring,
apr_pool_t *pool)
{
simple_prompt_provider_baton_t *pb = provider_baton;
simple_prompt_iter_baton_t *ibaton = apr_pcalloc(pool, sizeof(*ibaton));
const char *no_auth_cache = apr_hash_get(parameters,
SVN_AUTH_PARAM_NO_AUTH_CACHE,
APR_HASH_KEY_STRING);
SVN_ERR(prompt_for_simple_creds((svn_auth_cred_simple_t **) credentials_p,
pb, parameters, realmstring, TRUE,
! no_auth_cache, pool));
ibaton->retries = 0;
*iter_baton = ibaton;
return SVN_NO_ERROR;
}
/* Subsequent attempts to fetch will ignore the default values, and
simply re-prompt for both, up to a maximum of ib->pb->retry_limit. */
static svn_error_t *
simple_prompt_next_creds(void **credentials_p,
void *iter_baton,
void *provider_baton,
apr_hash_t *parameters,
const char *realmstring,
apr_pool_t *pool)
{
simple_prompt_iter_baton_t *ib = iter_baton;
simple_prompt_provider_baton_t *pb = provider_baton;
const char *no_auth_cache = apr_hash_get(parameters,
SVN_AUTH_PARAM_NO_AUTH_CACHE,
APR_HASH_KEY_STRING);
if (ib->retries >= pb->retry_limit)
{
/* give up, go on to next provider. */
*credentials_p = NULL;
return SVN_NO_ERROR;
}
ib->retries++;
SVN_ERR(prompt_for_simple_creds((svn_auth_cred_simple_t **) credentials_p,
pb, parameters, realmstring, FALSE,
! no_auth_cache, pool));
return SVN_NO_ERROR;
}
static const svn_auth_provider_t simple_prompt_provider = {
SVN_AUTH_CRED_SIMPLE,
simple_prompt_first_creds,
simple_prompt_next_creds,
NULL,
};
/* Public API */
static void
nmap_update_svn_auth_get_simple_prompt_provider
(svn_auth_provider_object_t **provider,
svn_auth_simple_prompt_func_t prompt_func,
void *prompt_baton,
int retry_limit,
apr_pool_t *pool)
{
svn_auth_provider_object_t *po = apr_pcalloc(pool, sizeof(*po));
simple_prompt_provider_baton_t *pb = apr_pcalloc(pool, sizeof(*pb));
pb->prompt_func = prompt_func;
pb->prompt_baton = prompt_baton;
pb->retry_limit = retry_limit;
po->vtable = &simple_prompt_provider;
po->provider_baton = pb;
*provider = po;
}
svn_error_t *
nmap_update_svn_cmdline_setup_auth_baton(svn_auth_baton_t **ab,
svn_boolean_t non_interactive,
const char *auth_username,
const char *auth_password,
const char *config_dir,
svn_boolean_t no_auth_cache,
svn_config_t *cfg,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool)
{
svn_boolean_t store_password_val = TRUE;
svn_auth_provider_object_t *provider;
/* The whole list of registered providers */
apr_array_header_t *providers
= apr_array_make(pool, 12, sizeof(svn_auth_provider_object_t *));
/* The main disk-caching auth providers, for both
'username/password' creds and 'username' creds. */
#if defined(WIN32) && !defined(__MINGW32__)
svn_auth_get_windows_simple_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
#endif
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
svn_auth_get_keychain_simple_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
#endif
svn_auth_get_simple_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_username_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
/* The server-cert, client-cert, and client-cert-password providers. */
#if defined(WIN32) && !defined(__MINGW32__)
svn_auth_get_windows_ssl_server_trust_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
#endif
svn_auth_get_ssl_server_trust_file_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_ssl_client_cert_pw_file_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
if (non_interactive == FALSE)
{
svn_cmdline_prompt_baton_t *pb = NULL;
if (cancel_func)
{
pb = apr_palloc(pool, sizeof(*pb));
pb->cancel_func = cancel_func;
pb->cancel_baton = cancel_baton;
}
/* Two basic prompt providers: username/password, and just username. */
nmap_update_svn_auth_get_simple_prompt_provider(&provider,
svn_cmdline_auth_simple_prompt,
pb,
2, /* retry limit */
pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_username_prompt_provider
(&provider, svn_cmdline_auth_username_prompt, pb,
2, /* retry limit */ pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
/* Three ssl prompt providers, for server-certs, client-certs,
and client-cert-passphrases. */
svn_auth_get_ssl_server_trust_prompt_provider
(&provider, svn_cmdline_auth_ssl_server_trust_prompt, pb, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_ssl_client_cert_prompt_provider
(&provider, svn_cmdline_auth_ssl_client_cert_prompt, pb, 2, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_ssl_client_cert_pw_prompt_provider
(&provider, svn_cmdline_auth_ssl_client_cert_pw_prompt, pb, 2, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
}
/* Build an authentication baton to give to libsvn_client. */
svn_auth_open(ab, providers, pool);
/* Place any default --username or --password credentials into the
auth_baton's run-time parameter hash. */
if (auth_username)
svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
auth_username);
if (auth_password)
svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
auth_password);
/* Same with the --non-interactive option. */
if (non_interactive)
svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_NON_INTERACTIVE, "");
if (config_dir)
svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_CONFIG_DIR,
config_dir);
SVN_ERR(svn_config_get_bool(cfg, &store_password_val,
SVN_CONFIG_SECTION_AUTH,
SVN_CONFIG_OPTION_STORE_PASSWORDS,
TRUE));
if (! store_password_val)
svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, "");
/* There are two different ways the user can disable disk caching
of credentials: either via --no-auth-cache, or in the config
file ('store-auth-creds = no'). */
SVN_ERR(svn_config_get_bool(cfg, &store_password_val,
SVN_CONFIG_SECTION_AUTH,
SVN_CONFIG_OPTION_STORE_AUTH_CREDS,
TRUE));
if (no_auth_cache || ! store_password_val)
svn_auth_set_parameter(*ab, SVN_AUTH_PARAM_NO_AUTH_CACHE, "");
return SVN_NO_ERROR;
}

64
nmap-update/win_config.h
View File

@@ -1,64 +0,0 @@
/* win_config.h. */
/* Define to 1 if you have the <inttypes.h> header file. */
/* #undef HAVE_INTTYPES_H */
/* Define to 1 if you have the `apr-1' library (-lapr-1). */
#define HAVE_LIBAPR_1 1
/* Define to 1 if you have the `svn_client-1' library (-lsvn_client-1). */
#define HAVE_LIBSVN_CLIENT_1 1
/* Define to 1 if you have the `svn_subr-1' library (-lsvn_subr-1). */
#define HAVE_LIBSVN_SUBR_1 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <subversion-1/svn_client.h> header file. */
/* #undef HAVE_SUBVERSION_1_SVN_CLIENT_H */
/* Define to 1 if you have the <svn_client.h> header file. */
#define HAVE_SVN_CLIENT_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1

11
nmap.cc
View File

@@ -2556,9 +2556,7 @@ static int nmap_fetchfile_sub(char *filename_returned, int bufferlen, const char
individual data files. If any of these were used those locations are checked
first, and no other locations are checked.
After that, the following directories are searched in order. First an
NMAP_UPDATE_CHANNEL subdirectory is checked in all of them, then they are all
tried again directly.
After that, the following directories are searched in order:
* --datadir
* $NMAPDIR
* [Non-Windows only] ~/.nmap
@@ -2568,7 +2566,6 @@ static int nmap_fetchfile_sub(char *filename_returned, int bufferlen, const char
"/../share/nmap"
* NMAPDATADIR */
int nmap_fetchfile(char *filename_returned, int bufferlen, const char *file) {
const char *UPDATES_PREFIX = "updates/" NMAP_UPDATE_CHANNEL "/";
std::map<std::string, std::string>::iterator iter;
char buf[BUFSIZ];
int res;
@@ -2585,12 +2582,6 @@ int nmap_fetchfile(char *filename_returned, int bufferlen, const char *file) {
return res != 0 ? res : 1;
}
/* Try updates directory first. */
Strncpy(buf, UPDATES_PREFIX, sizeof(buf));
Strncpy(buf + strlen(UPDATES_PREFIX), file, sizeof(buf) - strlen(UPDATES_PREFIX));
res = nmap_fetchfile_sub(filename_returned, bufferlen, buf);
if (!res)
res = nmap_fetchfile_sub(filename_returned, bufferlen, file);
return res;

4
nmap.h
View File

@@ -192,10 +192,6 @@
#define NMAP_VERSION "7.80SVN"
#define NMAP_NUM_VERSION "7.0.80.100"
#endif
/* The version number of updates retrieved by the nmap-update
program. It can be different (but should always be the same or
earlier) than NMAP_VERSION. */
#define NMAP_UPDATE_CHANNEL "7.80"
#define NMAP_XMLOUTPUTVERSION "1.04"

20
nmap.spec.in
View File

@@ -61,7 +61,7 @@ both console and graphical versions are available.
%build
%configure --with-openssl=%{openssl} --without-zenmap --with-ndiff --with-nmap-update --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included --with-libz=included
%configure --with-openssl=%{openssl} --without-zenmap --with-ndiff --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included --with-libz=included
%if "%{buildncat}" == "0"
%configure --without-ncat
%endif
@@ -147,24 +147,6 @@ Service attacks, route tracing, etc.
%endif
# nmap-update subpackage
%package -n nmap-update
Summary: Nmap's updater
Group: Applications/System
Requires: subversion
BuildRequires: subversion-devel
%description -n nmap-update
nmap-update gets the latest versions of architecture-independent
files, such as scripts and databases, for the installed version
of Nmap.
%files -n nmap-update
%defattr(-,root,root)
%doc %{_prefix}/share/man/man1/nmap-update.1.gz
%{_bindir}/nmap-update
%changelog
* Sat Jun 06 2009 Fyodor (fyodor(a)insecure.org)

3
todo/nmap.txt
View File

@@ -4,9 +4,6 @@ o Deal with our out-of-date CA root certificate bundle by either using
OS-specific mechanisms and/or updating the latest from Mozilla or
another source. See http://seclists.org/nmap-dev/2014/q4/200
o Figure out what nmap-update is doing for SSL certificate
verification (it uses libsvn to our SSL svn server).
o Audit ncat's ssl algorithm and ciphersuite choices
==Items we need to finish before next big release go above this line==