From 2b834d90d20cee0f82d25ff9212d8f813b228092 Mon Sep 17 00:00:00 2001 From: fyodor Date: Fri, 22 Jul 2005 10:08:53 +0000 Subject: [PATCH] Have it compiling on Solaris, and soon should have it working. Bwahahahahahahaha --- config.h | 22 ++-- libdnet-stripped/Makefile | 30 ++--- libdnet-stripped/include/Makefile | 30 ++--- libdnet-stripped/include/config.h | 44 +++---- libdnet-stripped/include/dnet/Makefile | 30 ++--- libdnet-stripped/libtool | 161 ++++++++++++------------- libdnet-stripped/src/Makefile | 34 +++--- nmap.cc | 2 + nmap.h | 24 ++-- portlist.cc | 2 + portlist.h | 16 +-- scan_engine.cc | 1 + scan_engine.h | 2 +- service_scan.cc | 4 + service_scan.h | 22 ++-- targets.cc | 1 + tcpip.cc | 37 +++++- tcpip.h | 12 -- 18 files changed, 245 insertions(+), 229 deletions(-) diff --git a/config.h b/config.h index 57dab27030..a2adc67601 100644 --- a/config.h +++ b/config.h @@ -103,7 +103,7 @@ #ifndef CONFIG_H #define CONFIG_H -#define PCAP_TIMEOUT_IGNORED 1 +/* #undef PCAP_TIMEOUT_IGNORED */ #define HAVE_STRUCT_IP 1 @@ -123,7 +123,7 @@ #define HAVE_STRING_H 1 -#define HAVE_GETOPT_H 1 +/* #undef HAVE_GETOPT_H */ #define HAVE_STRINGS_H 1 @@ -131,7 +131,7 @@ /* #undef HAVE_BSTRING_H */ -/* #undef WORDS_BIGENDIAN */ +#define WORDS_BIGENDIAN 1 #define HAVE_MEMORY_H 1 @@ -142,21 +142,21 @@ #define HAVE_SYS_PARAM_H 1 -/* #undef HAVE_SYS_SOCKIO_H */ +#define HAVE_SYS_SOCKIO_H 1 /* #undef HAVE_PCRE_H */ -#define HAVE_PCRE_PCRE_H 1 +/* #undef HAVE_PCRE_PCRE_H */ #define BSD_NETWORKING 1 -#define HAVE_INET_ATON 1 +/* #undef HAVE_INET_ATON */ -#define HAVE_STRCASESTR 1 +/* #undef HAVE_STRCASESTR */ /* #undef HAVE_GETOPT_LONG */ -/* #undef IN_ADDR_DEEPSTRUCT */ +#define IN_ADDR_DEEPSTRUCT 1 /* #undef HAVE_NETINET_IN_SYSTEM_H */ @@ -164,7 +164,7 @@ #define HAVE_NETINET_IF_ETHER_H 1 -#define HAVE_OPENSSL 1 +/* #undef HAVE_OPENSSL */ /* #undef STUPID_SOLARIS_CHECKSUM_BUG */ @@ -191,10 +191,10 @@ extern "C" int gethostname (char *, unsigned int); #endif /* #undef DEC */ -#define LINUX 1 +/* #undef LINUX */ /* #undef FREEBSD */ /* #undef OPENBSD */ -/* #undef SOLARIS */ +#define SOLARIS 1 /* #undef SUNOS */ /* #undef BSDI */ /* #undef IRIX */ diff --git a/libdnet-stripped/Makefile b/libdnet-stripped/Makefile index 8485e7da4d..6e9f5749d5 100644 --- a/libdnet-stripped/Makefile +++ b/libdnet-stripped/Makefile @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/libdnet pkgincludedir = $(includedir)/libdnet top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c +INSTALL = config/install-sh -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -34,8 +34,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = sparc-sun-solaris2.9 +host_triplet = sparc-sun-solaris2.9 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/dnet-config.in \ $(top_srcdir)/Makefile.am.common $(top_srcdir)/configure \ @@ -118,11 +118,11 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LDFLAGS = -LIBOBJS = strlcat$U.o strlcpy$U.o arp-ioctl$U.o eth-linux$U.o fw-ipchains$U.o intf$U.o ip$U.o route-linux$U.o tun-linux$U.o -LIBS = +LIBOBJS = err$U.o strsep$U.o arp-ioctl$U.o eth-dlpi$U.o fw-none$U.o intf$U.o ip-cooked$U.o route-bsd$U.o tun-none$U.o +LIBS = -lsocket -lnsl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s -LTLIBOBJS = strlcat$U.lo strlcpy$U.lo arp-ioctl$U.lo eth-linux$U.lo fw-ipchains$U.lo intf$U.lo ip$U.lo route-linux$U.lo tun-linux$U.lo +LTLIBOBJS = err$U.lo strsep$U.lo arp-ioctl$U.lo eth-dlpi$U.lo fw-none$U.lo intf$U.lo ip-cooked$U.lo route-bsd$U.lo tun-none$U.lo MAINT = # MAINTAINER_MODE_FALSE = MAINTAINER_MODE_TRUE = # @@ -164,18 +164,18 @@ am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = sparc-sun-solaris2.9 build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown +build_cpu = sparc +build_os = solaris2.9 +build_vendor = sun datadir = ${prefix}/share exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = sparc-sun-solaris2.9 host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown +host_cpu = sparc +host_os = solaris2.9 +host_vendor = sun includedir = ${prefix}/include infodir = ${prefix}/info install_sh = /home/fyodor/nmap/libdnet-stripped/config/install-sh @@ -183,7 +183,7 @@ libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var mandir = ${prefix}/man -mkdir_p = mkdir -p -- +mkdir_p = $(mkinstalldirs) oldincludedir = /usr/include prefix = /usr/local program_transform_name = s,x,x, diff --git a/libdnet-stripped/include/Makefile b/libdnet-stripped/include/Makefile index 714696e813..01f7d7e2e1 100644 --- a/libdnet-stripped/include/Makefile +++ b/libdnet-stripped/include/Makefile @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/libdnet pkgincludedir = $(includedir)/libdnet top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c +INSTALL = ../config/install-sh -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -34,8 +34,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = sparc-sun-solaris2.9 +host_triplet = sparc-sun-solaris2.9 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/Makefile.am.common @@ -109,11 +109,11 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LDFLAGS = -LIBOBJS = strlcat$U.o strlcpy$U.o arp-ioctl$U.o eth-linux$U.o fw-ipchains$U.o intf$U.o ip$U.o route-linux$U.o tun-linux$U.o -LIBS = +LIBOBJS = err$U.o strsep$U.o arp-ioctl$U.o eth-dlpi$U.o fw-none$U.o intf$U.o ip-cooked$U.o route-bsd$U.o tun-none$U.o +LIBS = -lsocket -lnsl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s -LTLIBOBJS = strlcat$U.lo strlcpy$U.lo arp-ioctl$U.lo eth-linux$U.lo fw-ipchains$U.lo intf$U.lo ip$U.lo route-linux$U.lo tun-linux$U.lo +LTLIBOBJS = err$U.lo strsep$U.lo arp-ioctl$U.lo eth-dlpi$U.lo fw-none$U.lo intf$U.lo ip-cooked$U.lo route-bsd$U.lo tun-none$U.lo MAINT = # MAINTAINER_MODE_FALSE = MAINTAINER_MODE_TRUE = # @@ -155,18 +155,18 @@ am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = sparc-sun-solaris2.9 build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown +build_cpu = sparc +build_os = solaris2.9 +build_vendor = sun datadir = ${prefix}/share exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = sparc-sun-solaris2.9 host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown +host_cpu = sparc +host_os = solaris2.9 +host_vendor = sun includedir = ${prefix}/include infodir = ${prefix}/info install_sh = /home/fyodor/nmap/libdnet-stripped/config/install-sh @@ -174,7 +174,7 @@ libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var mandir = ${prefix}/man -mkdir_p = mkdir -p -- +mkdir_p = $(mkinstalldirs) oldincludedir = /usr/include prefix = /usr/local program_transform_name = s,x,x, diff --git a/libdnet-stripped/include/config.h b/libdnet-stripped/include/config.h index 0c047e9dd0..c04ef7511e 100644 --- a/libdnet-stripped/include/config.h +++ b/libdnet-stripped/include/config.h @@ -2,7 +2,7 @@ /* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if arpreq struct has arp_dev. */ -#define HAVE_ARPREQ_ARP_DEV 1 +/* #undef HAVE_ARPREQ_ARP_DEV */ /* Define if you have the Berkeley Packet Filter. */ /* #undef HAVE_BSD_BPF */ @@ -11,7 +11,7 @@ #define HAVE_DLFCN_H 1 /* Define if you have the `err' function. */ -#define HAVE_ERR 1 +/* #undef HAVE_ERR */ /* Define if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -44,13 +44,13 @@ /* #undef HAVE_LIBNM */ /* Define if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ +#define HAVE_LIBNSL 1 /* Define if you have the `resolv' library (-lresolv). */ /* #undef HAVE_LIBRESOLV */ /* Define if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ +#define HAVE_LIBSOCKET 1 /* Define if you have the `str' library (-lstr). */ /* #undef HAVE_LIBSTR */ @@ -59,7 +59,7 @@ /* #undef HAVE_LIBWS2_32 */ /* Define if you have the header file. */ -#define HAVE_LINUX_IF_TUN_H 1 +/* #undef HAVE_LINUX_IF_TUN_H */ /* Define if you have the header file. */ /* #undef HAVE_LINUX_IP_FWCHAINS_H */ @@ -69,19 +69,19 @@ /* Define if you have the header file. */ -#define HAVE_LINUX_NETFILTER_IPV4_IPCHAINS_CORE_H 1 +/* #undef HAVE_LINUX_NETFILTER_IPV4_IPCHAINS_CORE_H */ /* Define if you have Linux PF_PACKET sockets. */ -#define HAVE_LINUX_PF_PACKET 1 +/* #undef HAVE_LINUX_PF_PACKET */ /* Define if you have the Linux /proc filesystem. */ -#define HAVE_LINUX_PROCFS 1 +/* #undef HAVE_LINUX_PROCFS */ /* Define if you have the header file. */ #define HAVE_MEMORY_H 1 /* Define if you have the header file. */ -/* #undef HAVE_NETINET_IN_VAR_H */ +#define HAVE_NETINET_IN_VAR_H 1 /* Define if you have the header file. */ /* #undef HAVE_NETINET_IP_COMPAT_H */ @@ -96,13 +96,13 @@ /* #undef HAVE_NETINET_IP_FW_H */ /* Define if you have the header file. */ -/* #undef HAVE_NET_BPF_H */ +#define HAVE_NET_BPF_H 1 /* Define if you have the header file. */ #define HAVE_NET_IF_ARP_H 1 /* Define if you have the header file. */ -/* #undef HAVE_NET_IF_DL_H */ +#define HAVE_NET_IF_DL_H 1 /* Define if you have the header file. */ #define HAVE_NET_IF_H 1 @@ -129,13 +129,13 @@ #define HAVE_NET_ROUTE_H 1 /* Define if you have cooked raw IP sockets. */ -/* #undef HAVE_RAWIP_COOKED */ +#define HAVE_RAWIP_COOKED 1 /* Define if raw IP sockets require host byte ordering for ip_off, ip_len. */ /* #undef HAVE_RAWIP_HOST_OFFLEN */ /* Define if has rt_msghdr struct. */ -/* #undef HAVE_ROUTE_RT_MSGHDR */ +#define HAVE_ROUTE_RT_MSGHDR 1 /* Define if has sockaddr_in6 struct. */ #define HAVE_SOCKADDR_IN6 1 @@ -144,13 +144,13 @@ /* #undef HAVE_SOCKADDR_SA_LEN */ /* Define if you have the header file. */ -#define HAVE_STDINT_H 1 +/* #undef HAVE_STDINT_H */ /* Define if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define if you have SNMP MIB2 STREAMS. */ -/* #undef HAVE_STREAMS_MIB2 */ +#define HAVE_STREAMS_MIB2 1 /* Define if you have route(7) STREAMS. */ /* #undef HAVE_STREAMS_ROUTE */ @@ -162,19 +162,19 @@ #define HAVE_STRING_H 1 /* Define if you have the `strlcat' function. */ -/* #undef HAVE_STRLCAT */ +#define HAVE_STRLCAT 1 /* Define if you have the `strlcpy' function. */ -/* #undef HAVE_STRLCPY */ +#define HAVE_STRLCPY 1 /* Define if you have the header file. */ #define HAVE_STROPTS_H 1 /* Define if you have the `strsep' function. */ -#define HAVE_STRSEP 1 +/* #undef HAVE_STRSEP */ /* Define if you have the header file. */ -/* #undef HAVE_SYS_BUFMOD_H */ +#define HAVE_SYS_BUFMOD_H 1 /* Define if you have the header file. */ /* #undef HAVE_SYS_DLPIHDR_H */ @@ -183,7 +183,7 @@ /* #undef HAVE_SYS_DLPI_EXT_H */ /* Define if you have the header file. */ -/* #undef HAVE_SYS_DLPI_H */ +#define HAVE_SYS_DLPI_H 1 /* Define if you have the header file. */ #define HAVE_SYS_IOCTL_H 1 @@ -198,13 +198,13 @@ #define HAVE_SYS_SOCKET_H 1 /* Define if you have the header file. */ -/* #undef HAVE_SYS_SOCKIO_H */ +#define HAVE_SYS_SOCKIO_H 1 /* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 /* Define if you have the header file. */ -#define HAVE_SYS_SYSCTL_H 1 +/* #undef HAVE_SYS_SYSCTL_H */ /* Define if you have the header file. */ #define HAVE_SYS_TIME_H 1 diff --git a/libdnet-stripped/include/dnet/Makefile b/libdnet-stripped/include/dnet/Makefile index 0c383bd22e..9f69bf2f2b 100644 --- a/libdnet-stripped/include/dnet/Makefile +++ b/libdnet-stripped/include/dnet/Makefile @@ -22,7 +22,7 @@ pkglibdir = $(libdir)/libdnet pkgincludedir = $(includedir)/libdnet top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c +INSTALL = ../../config/install-sh -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -34,8 +34,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = sparc-sun-solaris2.9 +host_triplet = sparc-sun-solaris2.9 DIST_COMMON = $(dnetinclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common subdir = include/dnet @@ -101,11 +101,11 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LDFLAGS = -LIBOBJS = strlcat$U.o strlcpy$U.o arp-ioctl$U.o eth-linux$U.o fw-ipchains$U.o intf$U.o ip$U.o route-linux$U.o tun-linux$U.o -LIBS = +LIBOBJS = err$U.o strsep$U.o arp-ioctl$U.o eth-dlpi$U.o fw-none$U.o intf$U.o ip-cooked$U.o route-bsd$U.o tun-none$U.o +LIBS = -lsocket -lnsl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s -LTLIBOBJS = strlcat$U.lo strlcpy$U.lo arp-ioctl$U.lo eth-linux$U.lo fw-ipchains$U.lo intf$U.lo ip$U.lo route-linux$U.lo tun-linux$U.lo +LTLIBOBJS = err$U.lo strsep$U.lo arp-ioctl$U.lo eth-dlpi$U.lo fw-none$U.lo intf$U.lo ip-cooked$U.lo route-bsd$U.lo tun-none$U.lo MAINT = # MAINTAINER_MODE_FALSE = MAINTAINER_MODE_TRUE = # @@ -147,18 +147,18 @@ am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = sparc-sun-solaris2.9 build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown +build_cpu = sparc +build_os = solaris2.9 +build_vendor = sun datadir = ${prefix}/share exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = sparc-sun-solaris2.9 host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown +host_cpu = sparc +host_os = solaris2.9 +host_vendor = sun includedir = ${prefix}/include infodir = ${prefix}/info install_sh = /home/fyodor/nmap/libdnet-stripped/config/install-sh @@ -166,7 +166,7 @@ libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var mandir = ${prefix}/man -mkdir_p = mkdir -p -- +mkdir_p = $(mkinstalldirs) oldincludedir = /usr/include prefix = /usr/local program_transform_name = s,x,x, diff --git a/libdnet-stripped/libtool b/libdnet-stripped/libtool index 3c471f64a2..7cee377c34 100755 --- a/libdnet-stripped/libtool +++ b/libdnet-stripped/libtool @@ -40,11 +40,11 @@ Xsed="/bin/sed -e s/^X//" if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi # The names of the tagged configurations supported by this script. -available_tags=" CXX F77" +available_tags="available_tags= CXX F77" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host flog.yuma.net: +# Libtool was configured on host ultra: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -56,17 +56,17 @@ build_libtool_libs=yes build_old_libs=yes # Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no +build_libtool_need_lc=yes # Whether or not to disallow shared libs when runtime libs are static allow_libtool_libs_with_static_runtimes=no # Whether or not to optimize for fast installation. -fast_install=yes +fast_install=needless # The host system. host_alias= -host=x86_64-unknown-linux-gnu +host=sparc-sun-solaris2.9 # An echo program that does not interpret backslashes. echo="echo" @@ -88,13 +88,13 @@ with_gcc=yes EGREP="grep -E" # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="/usr/ccs/bin/ld" # Whether we need hard or soft links. LN_S="ln -s" # A BSD-compatible nm program. -NM="/usr/bin/nm -B" +NM="/usr/ccs/bin/nm -p" # A symbol stripping program STRIP="strip" @@ -138,7 +138,7 @@ pic_flag=" -fPIC -DPIC" pic_mode=default # What is the maximum length of a command? -max_cmd_len=32768 +max_cmd_len=262144 # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -168,10 +168,10 @@ link_static_flag="-static" no_builtin_flag=" -fno-builtin" # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" +export_dynamic_flag_spec="" # Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" +whole_archive_flag_spec="-z allextract\$convenience -z defaultextract" # Compiler flag to generate thread-safe objects. thread_safe_flag_spec="" @@ -202,12 +202,10 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ -cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ -\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ - \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" -postinstall_cmds="" +archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" +archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ + \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" +postinstall_cmds="chmod +x \$lib" postuninstall_cmds="" # Commands used to build a loadable module (assumed same as above if empty) @@ -215,8 +213,8 @@ module_cmds="" module_expsym_cmds="" # Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" +old_striplib="" +striplib="" # Dependencies to place before the objects being linked to create a # shared library. @@ -248,16 +246,16 @@ file_magic_cmd="\$MAGIC_CMD" allow_undefined_flag="" # Flag that forces no undefined symbols. -no_undefined_flag="" +no_undefined_flag=" -z text" # Commands used to finish a libtool library installation in a directory. -finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" +finish_cmds="" # Same as above, but a single script fragment to be evaled but not shown. finish_eval="" # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'" +global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'" # Transform the output of nm in a proper C declaration global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" @@ -266,13 +264,13 @@ global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" # This is the shared library runtime path variable. -runpath_var=LD_RUN_PATH +runpath_var= # This is the shared library path variable. shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no +shlibpath_overrides_runpath=yes # How to hardcode a shared library path into an executable. hardcode_action=immediate @@ -282,7 +280,7 @@ hardcode_into_libs=yes # Flag to hardcode $libdir into a binary during linking. # This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir" +hardcode_libdir_flag_spec="-R\$libdir" # If ld is used when linking, flag to hardcode $libdir into # a binary during linking. This must work even if $libdir does @@ -302,7 +300,7 @@ hardcode_minus_L=no # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into # the resulting binary. -hardcode_shlibpath_var=unsupported +hardcode_shlibpath_var=no # Set to yes if building a shared library automatically hardcodes DIR into the library # and all subsequent libraries and executables linked against it. @@ -310,16 +308,16 @@ hardcode_automatic=no # Variables whose values should be saved in libtool wrapper scripts and # restored at relink time. -variables_saved_for_relink="PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +variables_saved_for_relink="PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" # Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown +link_all_deplibs=yes # Compile-time system search path for libraries -sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64" +sys_lib_search_path_spec=" /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/ /usr/lib/gcc/sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../../sparc-sun-solaris2.9/lib/sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../../sparc-sun-solaris2.9/lib/ /usr/ccs/bin/sparc-sun-solaris2.9/3.4.2/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.9/3.4.2/ /usr/ccs/lib/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../ /lib/sparc-sun-solaris2.9/3.4.2/ /lib/ /usr/lib/sparc-sun-solaris2.9/3.4.2/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include ld.so.conf.d/*.conf /usr/X11R6/lib /usr/X11R6/lib64 /usr/lib/mysql /usr/lib64/mysql " +sys_lib_dlsearch_path_spec="/lib /usr/lib" # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -6765,7 +6763,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` # End: # ### BEGIN LIBTOOL TAG CONFIG: CXX -# Libtool was configured on host flog.yuma.net: +# Libtool was configured on host ultra: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -6783,11 +6781,11 @@ build_libtool_need_lc=no allow_libtool_libs_with_static_runtimes=no # Whether or not to optimize for fast installation. -fast_install=yes +fast_install=needless # The host system. host_alias= -host=x86_64-unknown-linux-gnu +host=sparc-sun-solaris2.9 # An echo program that does not interpret backslashes. echo="echo" @@ -6809,13 +6807,13 @@ with_gcc=yes EGREP="grep -E" # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="/usr/ccs/bin/ld" # Whether we need hard or soft links. LN_S="ln -s" # A BSD-compatible nm program. -NM="/usr/bin/nm -B" +NM="/usr/ccs/bin/nm -p" # A symbol stripping program STRIP="strip" @@ -6859,7 +6857,7 @@ pic_flag=" -fPIC -DPIC" pic_mode=default # What is the maximum length of a command? -max_cmd_len=32768 +max_cmd_len=262144 # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -6889,10 +6887,10 @@ link_static_flag="-static" no_builtin_flag=" -fno-builtin" # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" +export_dynamic_flag_spec="" # Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" +whole_archive_flag_spec="" # Compiler flag to generate thread-safe objects. thread_safe_flag_spec="" @@ -6923,9 +6921,10 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" -postinstall_cmds="" +archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib" +archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ + \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp" +postinstall_cmds="chmod +x \$lib" postuninstall_cmds="" # Commands used to build a loadable module (assumed same as above if empty) @@ -6933,16 +6932,16 @@ module_cmds="" module_expsym_cmds="" # Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" +old_striplib="" +striplib="" # Dependencies to place before the objects being linked to create a # shared library. -predep_objects="/usr/lib/gcc/x86_64-redhat-linux/3.4.3/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/3.4.3/crtbeginS.o" +predep_objects="/usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/crti.o /usr/ccs/lib/values-Xa.o /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/crtbegin.o" # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/3.4.3/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/3.4.3/../../../../lib64/crtn.o" +postdep_objects="/usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/crtend.o /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/crtn.o" # Dependencies to place before the objects being linked to create a # shared library. @@ -6950,11 +6949,11 @@ predeps="" # Dependencies to place after the objects being linked to create a # shared library. -postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" +postdeps="-lstdc++ -lm -lgcc_s -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/3.4.3 -L/usr/lib/gcc/x86_64-redhat-linux/3.4.3 -L/usr/lib/gcc/x86_64-redhat-linux/3.4.3/../../../../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/3.4.3/../../.. -L/lib/../lib64 -L/usr/lib/../lib64" +compiler_lib_search_path="-L/usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2 -L/usr/ccs/bin -L/usr/ccs/lib -L/usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../.." # Method to check whether dependent libraries are shared objects. deplibs_check_method="pass_all" @@ -6966,16 +6965,16 @@ file_magic_cmd="\$MAGIC_CMD" allow_undefined_flag="" # Flag that forces no undefined symbols. -no_undefined_flag="" +no_undefined_flag=" \${wl}-z \${wl}defs" # Commands used to finish a libtool library installation in a directory. -finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" +finish_cmds="" # Same as above, but a single script fragment to be evaled but not shown. finish_eval="" # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'" +global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'" # Transform the output of nm in a proper C declaration global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" @@ -6984,13 +6983,13 @@ global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" # This is the shared library runtime path variable. -runpath_var=LD_RUN_PATH +runpath_var= # This is the shared library path variable. shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no +shlibpath_overrides_runpath=yes # How to hardcode a shared library path into an executable. hardcode_action=immediate @@ -7000,7 +6999,7 @@ hardcode_into_libs=yes # Flag to hardcode $libdir into a binary during linking. # This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir" +hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir" # If ld is used when linking, flag to hardcode $libdir into # a binary during linking. This must work even if $libdir does @@ -7028,16 +7027,16 @@ hardcode_automatic=no # Variables whose values should be saved in libtool wrapper scripts and # restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64" +sys_lib_search_path_spec=" /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/ /usr/lib/gcc/sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../../sparc-sun-solaris2.9/lib/sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../../sparc-sun-solaris2.9/lib/ /usr/ccs/bin/sparc-sun-solaris2.9/3.4.2/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.9/3.4.2/ /usr/ccs/lib/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../ /lib/sparc-sun-solaris2.9/3.4.2/ /lib/ /usr/lib/sparc-sun-solaris2.9/3.4.2/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include ld.so.conf.d/*.conf /usr/X11R6/lib /usr/X11R6/lib64 /usr/lib/mysql /usr/lib64/mysql " +sys_lib_dlsearch_path_spec="/lib /usr/lib" # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7061,7 +7060,7 @@ include_expsyms="" # ### BEGIN LIBTOOL TAG CONFIG: F77 -# Libtool was configured on host flog.yuma.net: +# Libtool was configured on host ultra: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7079,11 +7078,11 @@ build_libtool_need_lc=no allow_libtool_libs_with_static_runtimes=no # Whether or not to optimize for fast installation. -fast_install=yes +fast_install=needless # The host system. host_alias= -host=x86_64-unknown-linux-gnu +host=sparc-sun-solaris2.9 # An echo program that does not interpret backslashes. echo="echo" @@ -7105,13 +7104,13 @@ with_gcc=yes EGREP="grep -E" # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="/usr/ccs/bin/ld" # Whether we need hard or soft links. LN_S="ln -s" # A BSD-compatible nm program. -NM="/usr/bin/nm -B" +NM="/usr/ccs/bin/nm -p" # A symbol stripping program STRIP="strip" @@ -7155,7 +7154,7 @@ pic_flag=" -fPIC" pic_mode=default # What is the maximum length of a command? -max_cmd_len=32768 +max_cmd_len=262144 # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -7185,10 +7184,10 @@ link_static_flag="-static" no_builtin_flag="" # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" +export_dynamic_flag_spec="" # Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" +whole_archive_flag_spec="-z allextract\$convenience -z defaultextract" # Compiler flag to generate thread-safe objects. thread_safe_flag_spec="" @@ -7219,12 +7218,10 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ -cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ -\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ - \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" -postinstall_cmds="" +archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags" +archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~ + \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp" +postinstall_cmds="chmod +x \$lib" postuninstall_cmds="" # Commands used to build a loadable module (assumed same as above if empty) @@ -7232,8 +7229,8 @@ module_cmds="" module_expsym_cmds="" # Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" +old_striplib="" +striplib="" # Dependencies to place before the objects being linked to create a # shared library. @@ -7265,16 +7262,16 @@ file_magic_cmd="\$MAGIC_CMD" allow_undefined_flag="" # Flag that forces no undefined symbols. -no_undefined_flag="" +no_undefined_flag=" -z text" # Commands used to finish a libtool library installation in a directory. -finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" +finish_cmds="" # Same as above, but a single script fragment to be evaled but not shown. finish_eval="" # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'" +global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'" # Transform the output of nm in a proper C declaration global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" @@ -7283,13 +7280,13 @@ global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" # This is the shared library runtime path variable. -runpath_var=LD_RUN_PATH +runpath_var= # This is the shared library path variable. shlibpath_var=LD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no +shlibpath_overrides_runpath=yes # How to hardcode a shared library path into an executable. hardcode_action=immediate @@ -7299,7 +7296,7 @@ hardcode_into_libs=yes # Flag to hardcode $libdir into a binary during linking. # This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir" +hardcode_libdir_flag_spec="-R\$libdir" # If ld is used when linking, flag to hardcode $libdir into # a binary during linking. This must work even if $libdir does @@ -7319,7 +7316,7 @@ hardcode_minus_L=no # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into # the resulting binary. -hardcode_shlibpath_var=unsupported +hardcode_shlibpath_var=no # Set to yes if building a shared library automatically hardcodes DIR into the library # and all subsequent libraries and executables linked against it. @@ -7327,16 +7324,16 @@ hardcode_automatic=no # Variables whose values should be saved in libtool wrapper scripts and # restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" # Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown +link_all_deplibs=yes # Compile-time system search path for libraries -sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64" +sys_lib_search_path_spec=" /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/ /usr/lib/gcc/sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../../sparc-sun-solaris2.9/lib/sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../../sparc-sun-solaris2.9/lib/ /usr/ccs/bin/sparc-sun-solaris2.9/3.4.2/ /usr/ccs/bin/ /usr/ccs/lib/sparc-sun-solaris2.9/3.4.2/ /usr/ccs/lib/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../sparc-sun-solaris2.9/3.4.2/ /usr/local/lib/gcc/sparc-sun-solaris2.9/3.4.2/../../../ /lib/sparc-sun-solaris2.9/3.4.2/ /lib/ /usr/lib/sparc-sun-solaris2.9/3.4.2/ /usr/lib/" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include ld.so.conf.d/*.conf /usr/X11R6/lib /usr/X11R6/lib64 /usr/lib/mysql /usr/lib64/mysql " +sys_lib_dlsearch_path_spec="/lib /usr/lib" # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" diff --git a/libdnet-stripped/src/Makefile b/libdnet-stripped/src/Makefile index ed936fe8e2..4e11108d87 100644 --- a/libdnet-stripped/src/Makefile +++ b/libdnet-stripped/src/Makefile @@ -24,7 +24,7 @@ pkglibdir = $(libdir)/libdnet pkgincludedir = $(includedir)/libdnet top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c +INSTALL = ../config/install-sh -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,8 +36,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = sparc-sun-solaris2.9 +host_triplet = sparc-sun-solaris2.9 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common arp-bsd.c arp-ioctl.c \ arp-none.c arp-win32.c err.c eth-bsd.c eth-dlpi.c eth-linux.c \ @@ -65,7 +65,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libdnet_la_DEPENDENCIES = strlcat$U.lo strlcpy$U.lo arp-ioctl$U.lo eth-linux$U.lo fw-ipchains$U.lo intf$U.lo ip$U.lo route-linux$U.lo tun-linux$U.lo +libdnet_la_DEPENDENCIES = err$U.lo strsep$U.lo arp-ioctl$U.lo eth-dlpi$U.lo fw-none$U.lo intf$U.lo ip-cooked$U.lo route-bsd$U.lo tun-none$U.lo am_libdnet_la_OBJECTS = addr-util.lo addr.lo blob.lo ip-util.lo ip6.lo \ rand.lo libdnet_la_OBJECTS = $(am_libdnet_la_OBJECTS) @@ -123,11 +123,11 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s LDFLAGS = -LIBOBJS = strlcat$U.o strlcpy$U.o arp-ioctl$U.o eth-linux$U.o fw-ipchains$U.o intf$U.o ip$U.o route-linux$U.o tun-linux$U.o -LIBS = +LIBOBJS = err$U.o strsep$U.o arp-ioctl$U.o eth-dlpi$U.o fw-none$U.o intf$U.o ip-cooked$U.o route-bsd$U.o tun-none$U.o +LIBS = -lsocket -lnsl LIBTOOL = $(SHELL) $(top_builddir)/libtool LN_S = ln -s -LTLIBOBJS = strlcat$U.lo strlcpy$U.lo arp-ioctl$U.lo eth-linux$U.lo fw-ipchains$U.lo intf$U.lo ip$U.lo route-linux$U.lo tun-linux$U.lo +LTLIBOBJS = err$U.lo strsep$U.lo arp-ioctl$U.lo eth-dlpi$U.lo fw-none$U.lo intf$U.lo ip-cooked$U.lo route-bsd$U.lo tun-none$U.lo MAINT = # MAINTAINER_MODE_FALSE = MAINTAINER_MODE_TRUE = # @@ -169,18 +169,18 @@ am__quote = am__tar = ${AMTAR} chof - "$$tardir" am__untar = ${AMTAR} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = sparc-sun-solaris2.9 build_alias = -build_cpu = x86_64 -build_os = linux-gnu -build_vendor = unknown +build_cpu = sparc +build_os = solaris2.9 +build_vendor = sun datadir = ${prefix}/share exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = sparc-sun-solaris2.9 host_alias = -host_cpu = x86_64 -host_os = linux-gnu -host_vendor = unknown +host_cpu = sparc +host_os = solaris2.9 +host_vendor = sun includedir = ${prefix}/include infodir = ${prefix}/info install_sh = /home/fyodor/nmap/libdnet-stripped/config/install-sh @@ -188,7 +188,7 @@ libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var mandir = ${prefix}/man -mkdir_p = mkdir -p -- +mkdir_p = $(mkinstalldirs) oldincludedir = /usr/include prefix = /usr/local program_transform_name = s,x,x, @@ -202,7 +202,7 @@ DISTCLEANFILES = *~ lib_LTLIBRARIES = libdnet.la libdnet_la_SOURCES = addr-util.c addr.c blob.c ip-util.c ip6.c rand.c EXTRA_libdnet_la_SOURCES = -libdnet_la_LIBADD = strlcat$U.lo strlcpy$U.lo arp-ioctl$U.lo eth-linux$U.lo fw-ipchains$U.lo intf$U.lo ip$U.lo route-linux$U.lo tun-linux$U.lo +libdnet_la_LIBADD = err$U.lo strsep$U.lo arp-ioctl$U.lo eth-dlpi$U.lo fw-none$U.lo intf$U.lo ip-cooked$U.lo route-bsd$U.lo tun-none$U.lo libdnet_la_LDFLAGS = -version-info 1:0:0 all: all-am diff --git a/nmap.cc b/nmap.cc index ee636edbba..36cbbc7c4e 100644 --- a/nmap.cc +++ b/nmap.cc @@ -107,6 +107,8 @@ #include "timing.h" #include "NmapOps.h" +using namespace std; + /* global options */ extern char *optarg; extern int optind; diff --git a/nmap.h b/nmap.h index 5c6678128d..78a065ed44 100644 --- a/nmap.h +++ b/nmap.h @@ -247,18 +247,18 @@ void *realloc(); #endif /*#include *//* defines struct arphdr needed for if_ether.h */ -#if HAVE_NET_IF_H -#ifndef NET_IF_H /* why doesn't OpenBSD do this?! */ -#include -#define NET_IF_H -#endif -#endif -#if HAVE_NETINET_IF_ETHER_H -#ifndef NETINET_IF_ETHER_H -#include -#define NETINET_IF_ETHER_H -#endif /* NETINET_IF_ETHER_H */ -#endif /* HAVE_NETINET_IF_ETHER_H */ +// #if HAVE_NET_IF_H +// #ifndef NET_IF_H /* why doesn't OpenBSD do this?! */ +// #include +// #define NET_IF_H +// #endif +// #endif +// #if HAVE_NETINET_IF_ETHER_H +// #ifndef NETINET_IF_ETHER_H +// #include +// #define NETINET_IF_ETHER_H +// #endif /* NETINET_IF_ETHER_H */ +// #endif /* HAVE_NETINET_IF_ETHER_H */ /******* DEFINES ************/ diff --git a/portlist.cc b/portlist.cc index 98ecdea95a..361327a59e 100644 --- a/portlist.cc +++ b/portlist.cc @@ -105,6 +105,8 @@ #include "nmap.h" #include "NmapOps.h" +using namespace std; + #if HAVE_STRINGS_H #include #endif /* HAVE_STRINGS_H */ diff --git a/portlist.h b/portlist.h index 6114b6e583..145013db36 100644 --- a/portlist.h +++ b/portlist.h @@ -104,8 +104,6 @@ #include #include -using namespace std; - /* port states */ #define PORT_UNKNOWN 0 @@ -249,6 +247,7 @@ class Port { }; + class PortList { public: PortList(); @@ -272,14 +271,11 @@ class PortList { order from lowest to highest, except that if you ask for both TCP & UDP, every TCP port will be returned before we start returning UDP ports */ - Port *nextPort(Port *afterthisport, - u8 allowed_protocol, int allowed_state, - bool allow_portzero); + Port *nextPort(Port *afterthisport, + u8 allowed_protocol, int allowed_state, + bool allow_portzero); Port *lookupPort(u16 portno, u8 protocol); - map < u16, Port* > udp_ports; - map < u16, Port* > tcp_ports; - map < u16, Port* > ip_prots; int state_counts[PORT_HIGHEST_STATE]; /* How many ports in list are in each state */ @@ -288,6 +284,10 @@ class PortList { int state_counts_ip[PORT_HIGHEST_STATE]; int getIgnoredPortState(); /* The state of the port we ignore for output */ int numports; /* Total number of ports in list in ANY state */ + // map foomap; + std::map < u16, Port *> udp_ports; + std::map < u16, Port* > tcp_ports; + std::map < u16, Port* > ip_prots; private: /* A string identifying the system these ports are on. Just used for printing open ports, if it is set with setIdStr() */ diff --git a/scan_engine.cc b/scan_engine.cc index 18f67d3aac..74dc7bfe75 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -107,6 +107,7 @@ #include "NmapOps.h" #include +using namespace std; extern NmapOps o; class UltraScanInfo; diff --git a/scan_engine.h b/scan_engine.h index a373c3350c..bead94cc5b 100644 --- a/scan_engine.h +++ b/scan_engine.h @@ -108,7 +108,7 @@ #include "global_structures.h" /* 3rd generation Nmap scanning function. Handles most Nmap port scan types */ -void ultra_scan(vector &Targets, struct scan_lists *ports, +void ultra_scan(std::vector &Targets, struct scan_lists *ports, stype scantype); /* Handles the "positive-response" scans (where we get a response diff --git a/service_scan.cc b/service_scan.cc index aa4d3332fb..2eafa2331d 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -123,6 +123,10 @@ #include #include +/* Workaround for lack of namespace std on HP-UX 11.00 */ +namespace std {}; +using namespace std; + // Because this file uses assert()s for some security checking, we can't // have anyone turning off debugging. #undef NDEBUG diff --git a/service_scan.h b/service_scan.h index 99783a7d62..7196a41e46 100644 --- a/service_scan.h +++ b/service_scan.h @@ -113,10 +113,6 @@ # include #endif -/* Workaround for lack of namespace std on HP-UX 11.00 */ -namespace std {}; -using namespace std; - /********************** DEFINES/ENUMS ***********************************/ #define DEFAULT_SERVICEWAITMS 5000 #define DEFAULT_CONNECT_TIMEOUT 5000 @@ -291,17 +287,17 @@ class ServiceProbe { const struct MatchDetails *testMatch(const u8 *buf, int buflen); private: - void setPortVector(vector *portv, const char *portstr, + void setPortVector(std::vector *portv, const char *portstr, int lineno); char *probename; u8 *probestring; int probestringlen; - vector probableports; - vector probablesslports; - vector detectedServices; + std::vector probableports; + std::vector probablesslports; + std::vector detectedServices; int probeprotocol; - vector matches; // first-ever use of STL in Nmap! + std::vector matches; // first-ever use of STL in Nmap! }; class AllProbes { @@ -311,7 +307,7 @@ class AllProbes { // Tries to find the probe in this AllProbes class which have the // given name and protocol. It can return the NULL probe. ServiceProbe *getProbeByName(const char *name, int proto); - vector probes; // All the probes except nullProbe + std::vector probes; // All the probes except nullProbe ServiceProbe *nullProbe; // No probe text - just waiting for banner int isExcluded(unsigned short port, int proto); @@ -322,14 +318,10 @@ class AllProbes { /* Execute a service fingerprinting scan against all open ports of the Targets specified. */ -int service_scan(vector &Targets); +int service_scan(std::vector &Targets); // Parses the given nmap-service-probes file into the AP class void parse_nmap_service_probe_file(AllProbes *AP, char *filename); #endif /* SERVICE_SCAN_H */ - - - - diff --git a/targets.cc b/targets.cc index 0be21abd8d..af2cd8c68b 100644 --- a/targets.cc +++ b/targets.cc @@ -109,6 +109,7 @@ #include "Target.h" #include "scan_engine.h" +using namespace std; extern NmapOps o; enum pingstyle { pingstyle_unknown, pingstyle_rawtcp, pingstyle_rawudp, pingstyle_connecttcp, pingstyle_icmp }; diff --git a/tcpip.cc b/tcpip.cc index 73b61f15af..8ad21f259e 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -117,6 +117,20 @@ #include #endif +#if HAVE_NET_IF_H +#ifndef NET_IF_H /* why doesn't OpenBSD do this? */ +#include +#define NET_IF_H +#endif +#endif + +#if HAVE_NETINET_IF_ETHER_H +#ifndef NETINET_IF_ETHER_H +#include +#define NETINET_IF_ETHER_H +#endif /* NETINET_IF_ETHER_H */ +#endif /* HAVE_NETINET_IF_ETHER_H */ + extern NmapOps o; #ifdef __amigaos__ @@ -2147,7 +2161,7 @@ struct interface_info *getinterfaces(int *howmany) { sin = (struct sockaddr_in *) &ifr->ifr_addr; if (sin->sin_family != AF_INET) continue; - memcpy(&(mydevs[numifaces].addr), sin, min(sizeof(mydevs[numifaces].addr), sizeof(sin))); + memcpy(&(mydevs[numifaces].addr), sin, MIN(sizeof(mydevs[numifaces].addr), sizeof(*sin))); Strncpy(mydevs[numifaces].devname, ifr->ifr_name, sizeof(mydevs[numifaces].devname)); /* devname isn't allowed to have alias qualification */ if ((p = strchr(mydevs[numifaces].devname, ':'))) @@ -2155,7 +2169,7 @@ struct interface_info *getinterfaces(int *howmany) { Strncpy(mydevs[numifaces].devfullname, ifr->ifr_name, sizeof(mydevs[numifaces].devfullname)); Strncpy(tmpifr.ifr_name, ifr->ifr_name, sizeof(tmpifr.ifr_name)); - memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(sin))); + memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin))); rc = ioctl(sd, SIOCGIFNETMASK, &tmpifr); if (rc < 0 && errno != EADDRNOTAVAIL) pfatal("Failed to determine the netmask of %s!", tmpifr.ifr_name); @@ -2172,7 +2186,7 @@ struct interface_info *getinterfaces(int *howmany) { is kinda iffy ... may not be portable. */ /* First we get the flags */ Strncpy(tmpifr.ifr_name, ifr->ifr_name, sizeof(tmpifr.ifr_name)); - memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(sin))); + memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin))); rc = ioctl(sd, SIOCGIFFLAGS, &tmpifr); if (rc < 0) fatal("Failed to get IF Flags for device %s", ifr->ifr_name); ifflags = tmpifr.ifr_flags; @@ -2182,13 +2196,28 @@ struct interface_info *getinterfaces(int *howmany) { else if (ifflags & IFF_BROADCAST) { mydevs[numifaces].device_type = devt_ethernet; /* Get the MAC Address ... */ +#ifdef SIOCGIFHWADDR Strncpy(tmpifr.ifr_name, mydevs[numifaces].devname, sizeof(tmpifr.ifr_name)); - memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), MIN(sizeof(tmpifr.ifr_addr), sizeof(sin)))); + memcpy(&(tmpifr.ifr_addr), sin, MIN(sizeof(tmpifr.ifr_addr), MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin)))); rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr); if (rc < 0 && errno != EADDRNOTAVAIL) pfatal("Failed to determine the MAC address of %s!", tmpifr.ifr_name); else if (rc >= 0) memcpy(mydevs[numifaces].mac, &tmpifr.ifr_addr.sa_data, 6); +#else + /* Let's just let libdnet handle it ... */ + eth_t *ethsd = eth_open(mydevs[numifaces].devname); + eth_addr_t ethaddr; + + if (!ethsd) + fatal("%s: Failed to open ethernet interface (%s)", __FUNCTION__, + mydevs[numifaces].devname); + if (eth_get(ethsd, ðaddr) != 0) + fatal("%s: Failed to obtain MAC address for ethernet interface (%s)", + __FUNCTION__, mydevs[numifaces].devname); + memcpy(mydevs[numifaces].mac, ethaddr.data, 6); +#endif /*SIOCGIFHWADDR*/ + } else if (ifflags & IFF_POINTOPOINT) mydevs[numifaces].device_type = devt_p2p; diff --git a/tcpip.h b/tcpip.h index dde2f56abc..96c5a619df 100644 --- a/tcpip.h +++ b/tcpip.h @@ -199,18 +199,6 @@ void *realloc(); #endif #include #include -#if HAVE_NET_IF_H -#ifndef NET_IF_H /* why doesn't OpenBSD do this? */ -#include -#define NET_IF_H -#endif -#endif -#if HAVE_NETINET_IF_ETHER_H -#ifndef NETINET_IF_ETHER_H -#include -#define NETINET_IF_ETHER_H -#endif /* NETINET_IF_ETHER_H */ -#endif /* HAVE_NETINET_IF_ETHER_H */ #if TIME_WITH_SYS_TIME # include