diff --git a/security/nessus/Makefile b/security/nessus/Makefile index e1b31c1a397..9178f90d5c4 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.26 2002/04/19 14:43:36 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.27 2002/05/25 10:38:58 reinhard Exp $ COMMENT= "network security scanner" PKGNAME= nessus-${VERS} CATEGORIES= security -NEED_VERSION= 1.405 +NEED_VERSION= 1.527 -VERS= 1.0.7a +VERS= 1.2.0 DIST_SUBDIR= nessus @@ -30,7 +30,7 @@ MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${VERS}/src/ \ ftp://ftp.stuff.ca/pub/nessus/nessus-${VERS}/src/src/ \ ftp://ftp.at.nessus.org/pub/nessus/nessus-${VERS}/src/ \ ftp://ftp.linux.org.tr/pub/nessus/nessus-${VERS}/src/ \ - ftp://cvs.nessus.org/pub/nessus/nessus-${VERS}/src/ + ftp://cvs.nessus.org/pub/nessus/nessus-${VERS}/src/ MAINTAINER= Reinhard J. Sammer @@ -41,17 +41,17 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -FLAVORS=no_x11 experimental +USE_LIBTOOL= Yes + +FLAVORS=no_x11 FLAVOR?= # Can't do CONFIGURE_STYLE=autoconf because of configure wrapper # that builds each tarball in succession. CONFIGURE_STYLE=gnu -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/nessus-core ${WRKSRC}/nessus-plugins ${WRKSRC}/libnasl ${WRKSRC}/nessus-libraries/libpcap-nessus ${WRKSRC}/nessus-libraries/libpeks/gmp3 ${WRKSRC}/nessus-libraries/libpeks ${WRKSRC}/nessus-libraries -CONFIGURE_ARGS+=--localstatedir=/var --enable-gmp=${LOCALBASE} \ - --disable-nessuspcap - -LIB_DEPENDS= gmp.4.1::devel/gmp +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/nessus-core \ + ${WRKSRC}/nessus-plugins ${WRKSRC}/libnasl ${WRKSRC}/nessus-libraries +CONFIGURE_ARGS+=--localstatedir=/var --disable-nessuspcap --sharedstatedir=/var .if empty(FLAVOR:L:Mno_x11) LIB_DEPENDS+= gtk.1.2,gdk.1.2::x11/gtk+ @@ -59,10 +59,6 @@ LIB_DEPENDS+= gtk.1.2,gdk.1.2::x11/gtk+ CONFIGURE_ARGS+=--disable-gtk .endif -.if ${FLAVOR:L:Mexperimental} -CONFIGURE_ARGS+=--enable-save-sessions --enable-save-kb -.endif - post-extract: @sed 's%@@NESSUS_DIRS@@%${NESSUS_DIRS}%g' \ ${FILESDIR}/Makefile > ${WRKSRC}Makefile @@ -74,22 +70,20 @@ post-extract: ${FILESDIR}/nessus-config > ${WRKSRC}nessus-config @sed 's%@@WRKSRC@@%${WRKSRC}%g' \ ${FILESDIR}/nasl-config > ${WRKSRC}nasl-config - @chmod 755 ${WRKSRC}* + @${CHMOD} 755 ${WRKSRC}* @(cd ${WRKSRC}nessus-libraries/include ; ln -s . nessus) - @(cd ${WRKSRC}nessus-libraries/libpeks ; ln -s . peks) - @(cd ${WRKSRC}nessus-libraries/libpcap-nessus ; ln -s . nessus) @(cd ${WRKSRC}libnasl/include ; ln -s . nessus) # Convince nmap_wrapper.nes to build regardless of nmap's presence. post-configure: - @cp ${FILESDIR}/nmap.h ${WRKSRC}nessus-plugins/plugins/nmap_wrapper/ + @sed 's%@@PREFIX@@%${TRUEPREFIX}%g' ${FILESDIR}/nmap.h \ + >${WRKSRC}nessus-plugins/plugins/nmap_wrapper/nmap.h @touch ${WRKSRC}nessus-plugins/plugins/nmap_wrapper/nmap_installed pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/nessus post-install: - @strip ${PREFIX}/bin/{nasl,nessus} ${PREFIX}/sbin/nessusd + @${STRIP} ${PREFIX}/bin/{nasl,nessus,nessus-mkrand} ${PREFIX}/sbin/nessusd .include - diff --git a/security/nessus/files/Makefile b/security/nessus/files/Makefile index fa990e65358..596d643c0d3 100644 --- a/security/nessus/files/Makefile +++ b/security/nessus/files/Makefile @@ -1,4 +1,6 @@ # +# $OpenBSD: Makefile,v 1.6 2002/05/25 10:38:58 reinhard Exp $ +# # Makefile wrapper for nessus # # Original by dug song @@ -16,8 +18,9 @@ install: echo ">> Installing $$dir" ; \ (cd $$dir ; \ make prefix=${PREFIX} \ - localstatedir=${WRKINST}/var/nessus \ - sysconfdir=${PREFIX}/share/examples/nessus \ + localstatedir=${DESTDIR}/var/nessus \ + sysconfdir=${PREFIX}/share/examples \ + sharedstatedir=${PREFIX}/var/nessus \ $@) ; \ done diff --git a/security/nessus/files/configure b/security/nessus/files/configure index 5d9aedf084e..3f3db50ce67 100755 --- a/security/nessus/files/configure +++ b/security/nessus/files/configure @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: configure,v 1.6 2002/05/25 10:38:58 reinhard Exp $ # # configure wrapper script for nessus # diff --git a/security/nessus/files/nasl-config b/security/nessus/files/nasl-config index 157feec8157..b814a184131 100755 --- a/security/nessus/files/nasl-config +++ b/security/nessus/files/nasl-config @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: nasl-config,v 1.4 2002/05/25 10:38:58 reinhard Exp $ # # NASL configuration script # diff --git a/security/nessus/files/nessus-config b/security/nessus/files/nessus-config index 4df5094269d..36ce6b9e1b9 100755 --- a/security/nessus/files/nessus-config +++ b/security/nessus/files/nessus-config @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: nessus-config,v 1.5 2002/05/25 10:38:58 reinhard Exp $ # # Nessus libraries configuration script # @@ -6,16 +7,20 @@ # Enhanced by Matt Behrens # + VERSION=@@VERS@@ LIBDIR=@@WRKSRC@@/nessus-libraries COREDIR=@@WRKSRC@@/nessus-core -CIPHER="-L$LIBDIR/libpeks/.libs -L@@PREFIX@@/lib -lpeks -lgmp -lz" -CIPHER_CFLAGS="-DENABLE_CRYPTO_LAYER -I$LIBDIR/libpeks" -EXTRA="-lresolv " +DEFS="-DSYSTEM_PCAP" +CIPHER_CFLAGS="-DNESSUS_ON_SSL" +SSL_CFLAGS="-DHAVE_SSL -I/usr/include/openssl" +EXTRA="-lutil -lresolv -L/usr/lib -lssl -lcrypto " +EGDPATH="" + usage() { - echo "Usage : nessus-config [ --cflags | --libs | --version ]" + echo "Usage : nessus-config [ --cflags | --libs | --version | --egd ]" exit $1 } @@ -37,10 +42,14 @@ while test $# -gt 0; do exit 0 ;; --libs) - echo $Xn "-L$LIBDIR/libnessus/.libs -lnessus -L$LIBDIR/libhosts_gatherer/.libs -lhosts_gatherer -lpcap $CIPHER $EXTRA $Xc" + + echo $Xn "-lc -L$LIBDIR/libnessus/.libs -lnessus -L$LIBDIR/libhosts_gatherer/.libs -lhosts_gatherer -lpcap $EXTRA $Xc" ;; --cflags) - echo $Xn "-I$COREDIR/include -I$LIBDIR/include $CIPHER_CFLAGS $Xc" + echo $Xn "-I$COREDIR/include -I$LIBDIR/include $DEFS $CIPHER_CFLAGS $SSL_CFLAGS $Xc" + ;; + --egd) + echo $Xn "$EGDPATH" $Xc ;; --help | -h) usage 0 @@ -53,3 +62,4 @@ while test $# -gt 0; do done echo + diff --git a/security/nessus/files/nmap.h b/security/nessus/files/nmap.h index 32974aa8e41..06c17295c42 100644 --- a/security/nessus/files/nmap.h +++ b/security/nessus/files/nmap.h @@ -1,4 +1,5 @@ -/* +/* $OpenBSD: nmap.h,v 1.3 2002/05/25 10:38:58 reinhard Exp $ + * * Replace the configure-generated nmap.h so that we can convince * nmap_wrapper.nes to build regardless of nmap's presence. * @@ -8,10 +9,10 @@ #ifndef NMAP_H__ #define NMAP_H__ -#define NMAP "/usr/local/bin/nmap" +#define NMAP "@@PREFIX@@/bin/nmap" #define NMAP_VERSION "2.3" #define NMAP_MAJOR 2 #define NMAP_MINOR 3 -#define NMAP_BETA +#define NMAP_BETA #endif diff --git a/security/nessus/patches/patch-libnasl_Makefile b/security/nessus/patches/patch-libnasl_Makefile index 8297bd07849..7b7d53e764b 100644 --- a/security/nessus/patches/patch-libnasl_Makefile +++ b/security/nessus/patches/patch-libnasl_Makefile @@ -1,10 +1,10 @@ -$OpenBSD: patch-libnasl_Makefile,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/Makefile.orig Fri Mar 10 08:32:45 2000 -+++ libnasl/Makefile Tue Sep 26 13:48:04 2000 +$OpenBSD: patch-libnasl_Makefile,v 1.2 2002/05/25 10:38:58 reinhard Exp $ +--- libnasl/Makefile.orig Tue Oct 16 11:54:04 2001 ++++ libnasl/Makefile Tue Apr 30 13:42:13 2002 @@ -8,7 +8,7 @@ nasl.tmpl: nasl.tmpl.in configure touch $@ - install : + install :: - cd nasl && ${MAKE} install + cd nasl && ${MAKE} prefix=${prefix} install test -d ${includedir}/nessus || $(INSTALL_DIR) -m 755 ${includedir}/nessus diff --git a/security/nessus/patches/patch-libnasl_configure b/security/nessus/patches/patch-libnasl_configure new file mode 100644 index 00000000000..e5f935191e7 --- /dev/null +++ b/security/nessus/patches/patch-libnasl_configure @@ -0,0 +1,11 @@ +--- libnasl/configure.orig Sun May 5 16:52:40 2002 ++++ libnasl/configure Sun May 5 16:53:10 2002 +@@ -5340,7 +5340,7 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(LOCALBASE)/bin/libtool' + + # Prevent multiple expansion + diff --git a/security/nessus/patches/patch-libnasl_ltconfig b/security/nessus/patches/patch-libnasl_ltconfig deleted file mode 100644 index a66bfa9d013..00000000000 --- a/security/nessus/patches/patch-libnasl_ltconfig +++ /dev/null @@ -1,53 +0,0 @@ -$OpenBSD: patch-libnasl_ltconfig,v 1.3 2001/02/20 20:52:21 danh Exp $ ---- libnasl/ltconfig.orig Mon Apr 3 11:13:02 2000 -+++ libnasl/ltconfig Tue Feb 20 15:48:49 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1396,10 +1399,21 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1997,13 +2011,10 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ finish_cmds= - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/security/nessus/patches/patch-libnasl_ltmain_sh b/security/nessus/patches/patch-libnasl_ltmain_sh deleted file mode 100644 index c1fd97d5d64..00000000000 --- a/security/nessus/patches/patch-libnasl_ltmain_sh +++ /dev/null @@ -1,84 +0,0 @@ -$OpenBSD: patch-libnasl_ltmain_sh,v 1.2 2001/02/20 20:52:22 danh Exp $ ---- libnasl/ltmain.sh.orig Fri Jul 7 20:16:21 2000 -+++ libnasl/ltmain.sh Tue Feb 20 15:49:49 2001 -@@ -1079,7 +1079,18 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ continue -+ ;; - esac -+ elif test "$arg" = "-lc_r"; then -+ case "$host" in -+ *-*-openbsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac - elif test "$arg" = "-lm"; then - case "$host" in - *-*-cygwin* | *-*-beos*) -@@ -1091,6 +1102,10 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ - -module) - module=yes - continue -@@ -1795,6 +1810,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3537,40 +3555,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/security/nessus/patches/patch-libnasl_nasl_init_c b/security/nessus/patches/patch-libnasl_nasl_init_c deleted file mode 100644 index e111f39f58f..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_init_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_init_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/init.c.orig Wed Jul 26 07:37:14 2000 -+++ libnasl/nasl/init.c Tue Sep 26 13:48:04 2000 -@@ -19,7 +19,7 @@ - */ - #include - #include --#include -+#include - #include - #include "ip.h" - #include "udp.h" diff --git a/security/nessus/patches/patch-libnasl_nasl_nasl_c b/security/nessus/patches/patch-libnasl_nasl_nasl_c deleted file mode 100644 index d94d6e2287e..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_nasl_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_nasl_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/nasl.c.orig Sat Jul 1 11:40:54 2000 -+++ libnasl/nasl/nasl.c Tue Sep 26 13:48:04 2000 -@@ -18,7 +18,7 @@ - * - */ - #include --#include -+#include - #include "init.h" - #include "pkt_utils.h" - #include "parser.h" diff --git a/security/nessus/patches/patch-libnasl_nasl_nessus_extensions_c b/security/nessus/patches/patch-libnasl_nasl_nessus_extensions_c deleted file mode 100644 index 38fd36fb115..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_nessus_extensions_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_nessus_extensions_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/nessus_extensions.c.orig Sat Sep 16 17:01:21 2000 -+++ libnasl/nasl/nessus_extensions.c Tue Sep 26 13:48:04 2000 -@@ -19,7 +19,7 @@ - */ - #include - #include --#include -+#include - #include "strutils.h" - #include "nasl_inet.h" - #include "defines.h" diff --git a/security/nessus/patches/patch-libnasl_nasl_pcap_c b/security/nessus/patches/patch-libnasl_nasl_pcap_c deleted file mode 100644 index 66da8fa21ad..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_pcap_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_pcap_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/pcap.c.orig Tue Aug 1 11:52:14 2000 -+++ libnasl/nasl/pcap.c Tue Sep 26 13:48:04 2000 -@@ -21,7 +21,7 @@ - #include - #include - #include --#include -+#include - #include "nasl_memory.h" - - #ifdef PCAP_RESTART diff --git a/security/nessus/patches/patch-libnasl_nasl_pcap_next_c b/security/nessus/patches/patch-libnasl_nasl_pcap_next_c deleted file mode 100644 index 4a426d97253..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_pcap_next_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_pcap_next_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/pcap_next.c.orig Sat Sep 16 17:16:06 2000 -+++ libnasl/nasl/pcap_next.c Tue Sep 26 13:48:04 2000 -@@ -18,7 +18,7 @@ - * - */ - #include --#include -+#include - #include - #include "sanitize.h" - #include "defines.h" diff --git a/security/nessus/patches/patch-libnasl_nasl_pkt_utils_c b/security/nessus/patches/patch-libnasl_nasl_pkt_utils_c deleted file mode 100644 index 9d91049315c..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_pkt_utils_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_pkt_utils_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/pkt_utils.c.orig Sat Sep 16 17:01:21 2000 -+++ libnasl/nasl/pkt_utils.c Tue Sep 26 13:48:04 2000 -@@ -18,7 +18,7 @@ - * - */ - #include --#include -+#include - #include - #include "strutils.h" - #include "nasl_inet.h" diff --git a/security/nessus/patches/patch-libnasl_nasl_send_packet_c b/security/nessus/patches/patch-libnasl_nasl_send_packet_c deleted file mode 100644 index 7a1dd7f3cb6..00000000000 --- a/security/nessus/patches/patch-libnasl_nasl_send_packet_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libnasl_nasl_send_packet_c,v 1.1 2000/10/01 00:35:52 matt Exp $ ---- libnasl/nasl/send_packet.c.orig Wed May 24 11:19:48 2000 -+++ libnasl/nasl/send_packet.c Tue Sep 26 13:48:04 2000 -@@ -19,7 +19,7 @@ - */ - #include - #include --#include -+#include - #include "pkt_pcap.h" - #include "sanitize.h" - #include "nasl_memory.h" diff --git a/security/nessus/patches/patch-nessus-core_nessus_tmpl_in b/security/nessus/patches/patch-nessus-core_nessus_tmpl_in index 6dfda952457..939f256a926 100644 --- a/security/nessus/patches/patch-nessus-core_nessus_tmpl_in +++ b/security/nessus/patches/patch-nessus-core_nessus_tmpl_in @@ -1,16 +1,15 @@ -$OpenBSD: patch-nessus-core_nessus_tmpl_in,v 1.2 2001/02/13 03:00:12 matt Exp $ ---- nessus-core/nessus.tmpl.in.orig Fri Nov 17 11:58:30 2000 -+++ nessus-core/nessus.tmpl.in Sat Feb 10 19:53:05 2001 -@@ -37,7 +37,7 @@ srcdir=${rootdir}/src +--- nessus-core/nessus.tmpl.in.orig Sun May 5 17:23:52 2002 ++++ nessus-core/nessus.tmpl.in Sun May 5 17:24:55 2002 +@@ -37,7 +37,7 @@ make_bindir=${rootdir}/bin libsdir=${rootdir}/libs top_builddir = @PWDD@ -include= -I. -I$(rootdir)/include -I@includedir@ -I$(rootdir)/src/libpcap -+include= -I. -I$(rootdir)/include -I$(rootdir)/src/libpcap ++include= -I. -I$(rootdir)/include INSTALL=@INSTALL@ INSTALL_DIR=@INSTALL_DIR@ installuser=@installuser@ -@@ -137,7 +137,7 @@ MAN_NESSUSD_8=@man_nessusd_8@ +@@ -139,7 +139,7 @@ # C compiler options NESSCFLAGS=@NESSCFLAGS@ NASLCFLAGS=@NASLCFLAGS@ diff --git a/security/nessus/patches/patch-nessus-libraries_Makefile b/security/nessus/patches/patch-nessus-libraries_Makefile index a69b4e75f87..2bb5b33fe36 100644 --- a/security/nessus/patches/patch-nessus-libraries_Makefile +++ b/security/nessus/patches/patch-nessus-libraries_Makefile @@ -1,64 +1,14 @@ -$OpenBSD: patch-nessus-libraries_Makefile,v 1.2 2001/02/13 03:00:12 matt Exp $ ---- nessus-libraries/Makefile.orig Tue Dec 26 11:20:05 2000 -+++ nessus-libraries/Makefile Sun Feb 11 15:31:53 2001 -@@ -3,7 +3,6 @@ include nessus.tmpl - ALLDEPS = nessus.tmpl nessus-config - - all: $(ALLDEPS) $(CIPHER_MAKE) -- cd libpcap-nessus && ${MAKE} - cd libnessus && ${MAKE} - cd libhosts_gatherer && ${MAKE} - -@@ -22,7 +21,6 @@ nessus.tmpl: nessus.tmpl.in configure VE - touch $@ - - win32: -- -cd libpcap-nessus && ${MAKE} distclean - -cd libhosts_gatherer && ${MAKE} distclean - cd $(CIPHER_SUBDIR) && ${MAKE} win32-prep - @echo -@@ -37,14 +35,13 @@ cipher-make : - cd $(CIPHER_SUBDIR) && ${MAKE} - - cipher-install : -- cd $(CIPHER_SUBDIR) && ${MAKE} install -+ cd $(CIPHER_SUBDIR) && ${MAKE} prefix=${prefix} install - - install : $(CIPHER_INSTALL) +$OpenBSD: patch-nessus-libraries_Makefile,v 1.3 2002/05/25 10:38:58 reinhard Exp $ +--- nessus-libraries/Makefile.orig Fri Oct 26 00:54:10 2001 ++++ nessus-libraries/Makefile Tue Apr 30 13:16:23 2002 +@@ -47,8 +47,8 @@ pcap-distclean: + install : $(PCAP_INSTALL) test -d ${prefix} || ${INSTALL_DIR} -m 755 ${prefix} test -d ${includedir}/nessus || ${INSTALL_DIR} -m 755 ${includedir}/nessus - cd libnessus && ${MAKE} install - cd libhosts_gatherer && ${MAKE} install -- cd libpcap-nessus && ${MAKE} install + cd libnessus && ${MAKE} prefix=${prefix} install + cd libhosts_gatherer && ${MAKE} prefix=${prefix} install + $(INSTALL) -m 0444 include/includes.h ${includedir}/nessus - $(INSTALL) -m 0444 include/libnessus.h ${includedir}/nessus -@@ -69,7 +66,6 @@ install : $(CIPHER_INSTALL) - clean : - -cd libnessus && ${MAKE} clean - -cd libhosts_gatherer && ${MAKE} clean -- -cd libpcap-nessus && ${MAKE} clean - [ ! -d "$(CIPHER_SUBDIR)" ] || (cd $(CIPHER_SUBDIR) && [ ! -f Makefile ] || ${MAKE} $@) - - distclean : clean -@@ -77,7 +73,6 @@ distclean : clean - config.status config.log ${rootdir}/include/libvers.h - -cd libnessus && ${MAKE} distclean - -cd libhosts_gatherer && ${MAKE} distclean -- -cd libpcap-nessus && ${MAKE} distclean - [ ! -d "$(CIPHER_SUBDIR)" ] || (cd $(CIPHER_SUBDIR) && [ ! -f Makefile ] || ${MAKE} $@) - rm -f nessus.tmpl nessus-config nessus-config.pre uninstall-nessus - -@@ -100,10 +95,5 @@ distcheck: - -e '/config\.log$$/d' \ - -e '/config\.status$$/d' \ - -e '/^include\/config\.h$$/d' \ -- -e '/^libpcap-nessus\/scanner\.c$$/d' \ -- -e '/^libpcap-nessus\/tokdefs\.h$$/d' \ -- -e '/^libpcap-nessus\/version\.c$$/d' \ -- -e '/^libpcap-nessus\/grammar\.c$$/d' \ -- -e '/^libpcap-nessus\/Makefile$$/d' \ - -e '/\.libs\//d' -e '/\.la$$/d' \ - | sort | diff -cb - MANIFEST diff --git a/security/nessus/patches/patch-nessus-libraries_configure b/security/nessus/patches/patch-nessus-libraries_configure deleted file mode 100644 index e293f283f43..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_configure +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-nessus-libraries_configure,v 1.3 2001/02/13 03:00:13 matt Exp $ ---- nessus-libraries/configure.orig Sat Nov 25 16:38:52 2000 -+++ nessus-libraries/configure Sat Feb 10 19:53:05 2001 -@@ -4044,7 +4044,7 @@ INSTALL_DIR="$INSTALL -d" - - EXTRA=$LIBS - --subdirs="libpcap-nessus $cipher_subdir" -+subdirs="$cipher_subdir" - - - -@@ -4488,7 +4488,7 @@ if test "$no_recursion" != yes; then - esac - done - -- for ac_config_dir in libpcap-nessus $cipher_subdir; do -+ for ac_config_dir in $cipher_subdir; do - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. diff --git a/security/nessus/patches/patch-nessus-libraries_libpeks_configure b/security/nessus/patches/patch-nessus-libraries_libpeks_configure deleted file mode 100644 index 27cbcbd802d..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_libpeks_configure +++ /dev/null @@ -1,1648 +0,0 @@ -$OpenBSD: patch-nessus-libraries_libpeks_configure,v 1.3 2001/05/06 14:38:34 matt Exp $ ---- nessus-libraries/libpeks/configure.orig Sat Dec 23 12:15:12 2000 -+++ nessus-libraries/libpeks/configure Mon Apr 23 18:19:24 2001 -@@ -1521,6 +1521,86 @@ else - fi - fi - -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:1526: checking how to run the C preprocessor" >&5 -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. -+ cat > conftest.$ac_ext < -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext < -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext < -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" -+fi -+ CPP="$ac_cv_prog_CPP" -+else -+ ac_cv_prog_CPP="$CPP" -+fi -+echo "$ac_t""$CPP" 1>&6 -+ - - # general options - # --------------- -@@ -1597,9 +1677,14 @@ fi - - # can we use gmp as provided by the os ? - unset gmplink --case $enable_gmp in ''|yes) -+case $enable_gmp in ''|yes|/*) -+ case $enable_gmp in /*) -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -L$enable_gmp/lib" -+ ;; -+ esac - echo $ac_n "checking for mp_set_memory_functions in -lgmp""... $ac_c" 1>&6 --echo "configure:1603: checking for mp_set_memory_functions in -lgmp" >&5 -+echo "configure:1688: checking for mp_set_memory_functions in -lgmp" >&5 - ac_lib_var=`echo gmp'_'mp_set_memory_functions | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1607,7 +1692,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1639,7 +1724,7 @@ else - fi - - echo $ac_n "checking for mp_set_memory_functions in -lgmp2""... $ac_c" 1>&6 --echo "configure:1643: checking for mp_set_memory_functions in -lgmp2" >&5 -+echo "configure:1728: checking for mp_set_memory_functions in -lgmp2" >&5 - ac_lib_var=`echo gmp2'_'mp_set_memory_functions | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1647,7 +1732,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp2 $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1679,7 +1764,7 @@ else - fi - - echo $ac_n "checking for mp_set_memory_functions in -lgmp3""... $ac_c" 1>&6 --echo "configure:1683: checking for mp_set_memory_functions in -lgmp3" >&5 -+echo "configure:1768: checking for mp_set_memory_functions in -lgmp3" >&5 - ac_lib_var=`echo gmp3'_'mp_set_memory_functions | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1687,7 +1772,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp3 $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1721,7 +1806,7 @@ fi - test -z "$gmplink" && { - # some functions have this entry replaced - echo $ac_n "checking for __gmp_set_memory_functions in -lgmp""... $ac_c" 1>&6 --echo "configure:1725: checking for __gmp_set_memory_functions in -lgmp" >&5 -+echo "configure:1810: checking for __gmp_set_memory_functions in -lgmp" >&5 - ac_lib_var=`echo gmp'_'__gmp_set_memory_functions | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1729,7 +1814,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1761,7 +1846,7 @@ else - fi - - echo $ac_n "checking for __gmp_set_memory_functions in -lgmp2""... $ac_c" 1>&6 --echo "configure:1765: checking for __gmp_set_memory_functions in -lgmp2" >&5 -+echo "configure:1850: checking for __gmp_set_memory_functions in -lgmp2" >&5 - ac_lib_var=`echo gmp2'_'__gmp_set_memory_functions | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1769,7 +1854,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp2 $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1801,7 +1886,7 @@ else - fi - - echo $ac_n "checking for __gmp_set_memory_functions in -lgmp3""... $ac_c" 1>&6 --echo "configure:1805: checking for __gmp_set_memory_functions in -lgmp3" >&5 -+echo "configure:1890: checking for __gmp_set_memory_functions in -lgmp3" >&5 - ac_lib_var=`echo gmp3'_'__gmp_set_memory_functions | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1809,7 +1894,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp3 $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1841,108 +1926,42 @@ else - fi - - } -+ test -z "$gmplink" && { -+ case $enable_gmp in /*) -+ CFLAGS="$save_CFLAGS" -+ gmplink="-L$enable_gmp/lib $gmplink" -+ ;; -+ esac -+ } - if test -n "$gmplink" ; then -- # do we use gmp as provided by the os ? -- unset gmpinc -- test -d /usr/include/gmp3 && gmpinc="$gmpinc -I/usr/include/gmp3" -- test -d /usr/include/gmp2 && gmpinc="$gmpinc -I/usr/include/gmp2" -- test -d /usr/include/gmp && gmpinc="$gmpinc -I/usr/include/gmp" -+ case $enable_gmp in ''|yes) -+ # do we use gmp as provided by the os ? -+ unset gmpinc -+ test -d /usr/include/gmp3 && gmpinc="$gmpinc -I/usr/include/gmp3" -+ test -d /usr/include/gmp2 && gmpinc="$gmpinc -I/usr/include/gmp2" -+ test -d /usr/include/gmp && gmpinc="$gmpinc -I/usr/include/gmp" -+ ;; -+ /*) -+ # try to make --enable-gmp work as documented... -+ test -d $enable_gmp/include && gmpinc="-I$enable_gmp/include" -+ ;; -+ esac - fi -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $gmpinc" -- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1855: checking how to run the C preprocessor" >&5 --# On Suns, sometimes $CPP names a directory. --if test -n "$CPP" && test -d "$CPP"; then -- CPP= --fi --if test -z "$CPP"; then --if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- # This must be in double quotes, not single quotes, because CPP may get -- # substituted into the Makefile and "${CC-cc}" will confuse make. -- CPP="${CC-cc} -E" -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. -- cat > conftest.$ac_ext < --Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP="${CC-cc} -E -traditional-cpp" -- cat > conftest.$ac_ext < --Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP="${CC-cc} -nologo -E" -- cat > conftest.$ac_ext < --Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP=/lib/cpp --fi --rm -f conftest* --fi --rm -f conftest* --fi --rm -f conftest* -- ac_cv_prog_CPP="$CPP" --fi -- CPP="$ac_cv_prog_CPP" --else -- ac_cv_prog_CPP="$CPP" --fi --echo "$ac_t""$CPP" 1>&6 -- --ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` -+ ac_cpp_SAVE="$ac_cpp" -+ ac_cpp="$ac_cpp $gmpinc" -+ ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 --echo "configure:1936: checking for gmp.h" >&5 -+echo "configure:1955: checking for gmp.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1964,7 +1983,7 @@ else - unset have_gmp_h - fi - -- CFLAGS="$save_CFLAGS" -+ ac_cpp="$ac_cpp_SAVE" - esac - - # config options consistency checks -@@ -1988,7 +2007,7 @@ case $enable_gmp in - esac - - echo $ac_n "checking which gmp package/version to use""... $ac_c" 1>&6 --echo "configure:1992: checking which gmp package/version to use" >&5 -+echo "configure:2011: checking which gmp package/version to use" >&5 - if test -n "$gmplink" -a -n "$have_gmp_h"; then - unset gmpsub libgmp_lo gmpsplittrg gmptrg gmpsrc - echo "$ac_t""`expr $gmplink : '-l\(.*\)'` (operating system) " 1>&6 -@@ -2002,7 +2021,7 @@ else - gmpldflags="-L$gmpsrc -L$gmpsrc/lib" - # just find the lib, so we use "main", here - echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6 --echo "configure:2006: checking for main in -lgmp" >&5 -+echo "configure:2025: checking for main in -lgmp" >&5 - ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2010,14 +2029,14 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2038,7 +2057,7 @@ else - fi - - echo $ac_n "checking for main in -lgmp2""... $ac_c" 1>&6 --echo "configure:2042: checking for main in -lgmp2" >&5 -+echo "configure:2061: checking for main in -lgmp2" >&5 - ac_lib_var=`echo gmp2'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2046,14 +2065,14 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp2 $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2074,7 +2093,7 @@ else - fi - - echo $ac_n "checking for main in -lgmp3""... $ac_c" 1>&6 --echo "configure:2078: checking for main in -lgmp3" >&5 -+echo "configure:2097: checking for main in -lgmp3" >&5 - ac_lib_var=`echo gmp3'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2082,14 +2101,14 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp3 $gmpldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2122,17 +2141,17 @@ fi - CFLAGS="$CFLAGS $gmpinc" - ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 --echo "configure:2126: checking for gmp.h" >&5 -+echo "configure:2145: checking for gmp.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2172,7 +2191,7 @@ fi - gmpsub=$gmpsrc - - echo $ac_n "checking whether the gmp package goes separately""... $ac_c" 1>&6 --echo "configure:2176: checking whether the gmp package goes separately" >&5 -+echo "configure:2195: checking whether the gmp package goes separately" >&5 - if test x$enable_splitgmp = xyes ; then - echo "$ac_t""building extra library instance" 1>&6 - gmpsplit=libgmp_la=${libpeks}mp.la -@@ -2213,7 +2232,7 @@ fi - unset zliblink - case $enable_zlib in ''|yes) - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 --echo "configure:2217: checking for deflate in -lz" >&5 -+echo "configure:2236: checking for deflate in -lz" >&5 - ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2221,7 +2240,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lz $zlibldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2267,7 +2286,7 @@ esac - - - echo $ac_n "checking which zlib package/version to use""... $ac_c" 1>&6 --echo "configure:2271: checking which zlib package/version to use" >&5 -+echo "configure:2290: checking which zlib package/version to use" >&5 - if test -n "$zliblink" ; then - # do we use it as provided by the os ? - zlibldflags="-L$zlibsrc -L$zlibsrc/lib" -@@ -2292,7 +2311,7 @@ else - - zlibldflags="-L$zlibsrc -L$zlibsrc/lib" - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 --echo "configure:2296: checking for deflate in -lz" >&5 -+echo "configure:2315: checking for deflate in -lz" >&5 - ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2300,7 +2319,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lz $zlibldflags $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2415,17 +2434,17 @@ fi - CC_NOPIPE="$CC" - if test -z "$GCC_NO_PIPE" -a -n "$GCC"; then - echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6 --echo "configure:2419: checking if the compiler understands -pipe" >&5 -+echo "configure:2438: checking if the compiler understands -pipe" >&5 - CC="$CC -pipe" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - else -@@ -2438,7 +2457,7 @@ rm -f conftest* - fi - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:2442: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:2461: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2469,7 +2488,7 @@ do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2473: checking for $ac_word" >&5 -+echo "configure:2492: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2501,7 +2520,7 @@ done - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2505: checking for $ac_word" >&5 -+echo "configure:2524: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2531,7 +2550,7 @@ fi - - PWDD=`pwd` - echo $ac_n "checking for long file names""... $ac_c" 1>&6 --echo "configure:2535: checking for long file names" >&5 -+echo "configure:2554: checking for long file names" >&5 - if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2576,12 +2595,12 @@ fi - - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:2580: checking for ANSI C header files" >&5 -+echo "configure:2599: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2589,7 +2608,7 @@ else - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2606,7 +2625,7 @@ rm -f conftest* - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -2624,7 +2643,7 @@ fi - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext < - EOF -@@ -2645,7 +2664,7 @@ if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -2656,7 +2675,7 @@ if (XOR (islower (i), ISLOWER (i)) || to - exit (0); } - - EOF --if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -2680,12 +2699,12 @@ EOF - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:2684: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:2703: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -2694,7 +2713,7 @@ int main() { - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:2698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -2718,17 +2737,17 @@ for ac_hdr in fcntl.h limits.h strings.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2722: checking for $ac_hdr" >&5 -+echo "configure:2741: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2758,17 +2777,17 @@ for ac_hdr in alloca.h arpa/inet.h asser - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2762: checking for $ac_hdr" >&5 -+echo "configure:2781: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2798,17 +2817,17 @@ for ac_hdr in netdb.h netinet/in.h pthre - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2802: checking for $ac_hdr" >&5 -+echo "configure:2821: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2838,17 +2857,17 @@ for ac_hdr in sys/stat.h stat.h stdio.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2842: checking for $ac_hdr" >&5 -+echo "configure:2861: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2878,17 +2897,17 @@ for ac_hdr in sys/types.h ctype.h memory - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2882: checking for $ac_hdr" >&5 -+echo "configure:2901: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2928,17 +2947,17 @@ EOF - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2932: checking for $ac_hdr" >&5 -+echo "configure:2951: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2969,18 +2988,18 @@ esac - - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:2973: checking for working const" >&5 -+echo "configure:2992: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -3044,21 +3063,21 @@ EOF - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:3048: checking for inline" >&5 -+echo "configure:3067: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -3084,12 +3103,12 @@ EOF - esac - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:3088: checking for pid_t" >&5 -+echo "configure:3107: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -3117,12 +3136,12 @@ EOF - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:3121: checking for size_t" >&5 -+echo "configure:3140: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -3150,12 +3169,12 @@ EOF - fi - - echo $ac_n "checking for time_t""... $ac_c" 1>&6 --echo "configure:3154: checking for time_t" >&5 -+echo "configure:3173: checking for time_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -3183,12 +3202,12 @@ EOF - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:3187: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:3206: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -3197,7 +3216,7 @@ int main() { - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -3218,12 +3237,12 @@ EOF - fi - - echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:3222: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:3241: checking whether struct tm is in sys/time.h or time.h" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -3231,7 +3250,7 @@ int main() { - struct tm *tp; tp->tm_sec; - ; return 0; } - EOF --if { (eval echo configure:3235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm=time.h - else -@@ -3252,16 +3271,16 @@ EOF - fi - - echo $ac_n "checking whether we have the type unsigned long long""... $ac_c" 1>&6 --echo "configure:3256: checking whether we have the type unsigned long long" >&5 -+echo "configure:3275: checking whether we have the type unsigned long long" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - have_longlong=yes - else -@@ -3276,19 +3295,19 @@ echo "$ac_t""$have_longlong" 1>&6 - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:3280: checking for working alloca.h" >&5 -+echo "configure:3299: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { --void *p = alloca(2 * sizeof(int)); -+char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -3309,12 +3328,12 @@ EOF - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:3313: checking for alloca" >&5 -+echo "configure:3332: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -3374,12 +3393,12 @@ EOF - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:3378: checking whether alloca needs Cray hooks" >&5 -+echo "configure:3397: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3408: checking for $ac_func" >&5 -+echo "configure:3427: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3459,7 +3478,7 @@ done - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:3463: checking stack direction for C alloca" >&5 -+echo "configure:3482: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3467,7 +3486,7 @@ else - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -3508,7 +3527,7 @@ EOF - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:3512: checking for 8-bit clean memcmp" >&5 -+echo "configure:3531: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3516,7 +3535,7 @@ else - ac_cv_func_memcmp_clean=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_memcmp_clean=yes - else -@@ -3544,12 +3563,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1 - test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:3548: checking return type of signal handlers" >&5 -+echo "configure:3567: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -3566,7 +3585,7 @@ int main() { - int i; - ; return 0; } - EOF --if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -3587,12 +3606,12 @@ EOF - for ac_func in gethostname select socket strerror strtol strcasecmp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3591: checking for $ac_func" >&5 -+echo "configure:3610: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3643,19 +3662,19 @@ done - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:3647: checking for working alloca.h" >&5 -+echo "configure:3666: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { --void *p = alloca(2 * sizeof(int)); -+char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -3676,12 +3695,12 @@ EOF - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:3680: checking for alloca" >&5 -+echo "configure:3699: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -3741,12 +3760,12 @@ EOF - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:3745: checking whether alloca needs Cray hooks" >&5 -+echo "configure:3764: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&6 - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3775: checking for $ac_func" >&5 -+echo "configure:3794: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3826,7 +3845,7 @@ done - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:3830: checking stack direction for C alloca" >&5 -+echo "configure:3849: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3834,7 +3853,7 @@ else - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -3877,12 +3896,12 @@ fi - for ac_func in lstat memmove gettimeofday rand strchr memcpy - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3881: checking for $ac_func" >&5 -+echo "configure:3900: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3932,12 +3951,12 @@ done - for ac_func in bzero bcopy select poll flock - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3936: checking for $ac_func" >&5 -+echo "configure:3955: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3987,12 +4006,12 @@ done - for ac_func in inet_aton inet_ntoa - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3991: checking for $ac_func" >&5 -+echo "configure:4010: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -4041,7 +4060,7 @@ done - - - echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 --echo "configure:4045: checking size of unsigned int" >&5 -+echo "configure:4064: checking size of unsigned int" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4049,7 +4068,7 @@ else - ac_cv_sizeof_unsigned_int=2 - else - cat > conftest.$ac_ext < - main() -@@ -4060,7 +4079,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_unsigned_int=`cat conftestval` - else -@@ -4080,7 +4099,7 @@ EOF - - - echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 --echo "configure:4084: checking size of unsigned long" >&5 -+echo "configure:4103: checking size of unsigned long" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4088,7 +4107,7 @@ else - ac_cv_sizeof_unsigned_long=4 - else - cat > conftest.$ac_ext < - main() -@@ -4099,7 +4118,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_unsigned_long=`cat conftestval` - else -@@ -4120,7 +4139,7 @@ EOF - - if test $have_longlong - then echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 --echo "configure:4124: checking size of unsigned long long" >&5 -+echo "configure:4143: checking size of unsigned long long" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4128,7 +4147,7 @@ else - ac_cv_sizeof_unsigned_long_long=8 - else - cat > conftest.$ac_ext < - main() -@@ -4139,7 +4158,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:4143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_unsigned_long_long=`cat conftestval` - else -@@ -4160,14 +4179,14 @@ EOF - - fi - echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:4164: checking whether byte ordering is bigendian" >&5 -+echo "configure:4183: checking whether byte ordering is bigendian" >&5 - if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_bigendian=unknown - # See if sys/param.h defines the BYTE_ORDER macro. - cat > conftest.$ac_ext < - #include -@@ -4178,11 +4197,11 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:4182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. - cat > conftest.$ac_ext < - #include -@@ -4193,7 +4212,7 @@ int main() { - #endif - ; return 0; } - EOF --if { (eval echo configure:4197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_bigendian=yes - else -@@ -4213,7 +4232,7 @@ if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_bigendian=no - else -@@ -4257,17 +4276,17 @@ fi - cflags=$CFLAGS; unset CFLAGS - - echo $ac_n "checking whether we can align $LONGLONG on an 8 byte boundary""... $ac_c" 1>&6 --echo "configure:4261: checking whether we can align $LONGLONG on an 8 byte boundary" >&5 -+echo "configure:4280: checking whether we can align $LONGLONG on an 8 byte boundary" >&5 - if test "$cross_compiling" = yes; then - can64align=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - can64align=yes - else -@@ -4282,17 +4301,17 @@ fi - echo "$ac_t""$can64align" 1>&6 - - echo $ac_n "checking whether we can align $LONGLONG on a 4 byte boundary""... $ac_c" 1>&6 --echo "configure:4286: checking whether we can align $LONGLONG on a 4 byte boundary" >&5 -+echo "configure:4305: checking whether we can align $LONGLONG on a 4 byte boundary" >&5 - if test "$cross_compiling" = yes; then - can32align=no - else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - can32align=yes - else -@@ -4319,7 +4338,7 @@ EOF - fi - - echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6 --echo "configure:4323: checking for /dev/urandom" >&5 -+echo "configure:4342: checking for /dev/urandom" >&5 - case $devrandom in - no) echo "$ac_t""disabled" 1>&6 - unset devrandom -@@ -4348,9 +4367,9 @@ EOF - } - - echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 --echo "configure:4352: checking for struct timeval" >&5 -+echo "configure:4371: checking for struct timeval" >&5 - cat > conftest.$ac_ext < -@@ -4366,7 +4385,7 @@ int main() { - static struct timeval x; x.tv_sec = x.tv_usec; - ; return 0; } - EOF --if { (eval echo configure:4370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - HAVE_TIMEVAL=yes -@@ -4385,9 +4404,9 @@ rm -f conftest* - - if test "x$HAVE_TIMEVAL" = xyes; then - echo $ac_n "checking whether gettimeofday can't accept two arguments""... $ac_c" 1>&6 --echo "configure:4389: checking whether gettimeofday can't accept two arguments" >&5 -+echo "configure:4408: checking whether gettimeofday can't accept two arguments" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 - else -@@ -4427,9 +4446,9 @@ fi - - if test -n "$enable_pthreads" ; then - echo $ac_n "checking whether pthread_mutexattr_default exists in threads.h""... $ac_c" 1>&6 --echo "configure:4431: checking whether pthread_mutexattr_default exists in threads.h" >&5 -+echo "configure:4450: checking whether pthread_mutexattr_default exists in threads.h" >&5 - cat > conftest.$ac_ext < -@@ -4441,7 +4460,7 @@ pthread_mutex_t mutex ; - - ; return 0; } - EOF --if { (eval echo configure:4445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF diff --git a/security/nessus/patches/patch-nessus-libraries_libpeks_configure_in b/security/nessus/patches/patch-nessus-libraries_libpeks_configure_in deleted file mode 100644 index cdbc70c98f3..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_libpeks_configure_in +++ /dev/null @@ -1,65 +0,0 @@ -$OpenBSD: patch-nessus-libraries_libpeks_configure_in,v 1.3 2001/05/06 14:38:34 matt Exp $ ---- nessus-libraries/libpeks/configure.in.orig Sat Dec 23 12:14:48 2000 -+++ nessus-libraries/libpeks/configure.in Mon Apr 23 18:18:45 2001 -@@ -39,6 +39,7 @@ AC_LANG_C - dnl Check for several programs - AM_PROG_LIBTOOL - AC_PROG_CC -+AC_PROG_CPP - - # general options - # --------------- -@@ -88,7 +89,12 @@ AC_ARG_ENABLE(gmp,[ --enable-gmp[=/path - - # can we use gmp as provided by the os ? - unset gmplink --case $enable_gmp in ''|yes) -+case $enable_gmp in ''|yes|/*) -+ case $enable_gmp in /*) -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -L$enable_gmp/lib" -+ ;; -+ esac - AC_CHECK_LIB(gmp,mp_set_memory_functions,gmplink=-lgmp,,$gmpldflags) - AC_CHECK_LIB(gmp2,mp_set_memory_functions,gmplink=-lgmp2,,$gmpldflags) - AC_CHECK_LIB(gmp3,mp_set_memory_functions,gmplink=-lgmp3,,$gmpldflags) -@@ -98,17 +104,31 @@ case $enable_gmp in ''|yes) - AC_CHECK_LIB(gmp2,__gmp_set_memory_functions,gmplink=-lgmp2,,$gmpldflags) - AC_CHECK_LIB(gmp3,__gmp_set_memory_functions,gmplink=-lgmp3,,$gmpldflags) - } -+ test -z "$gmplink" && { -+ case $enable_gmp in /*) -+ CFLAGS="$save_CFLAGS" -+ gmplink="-L$enable_gmp/lib $gmplink" -+ ;; -+ esac -+ } - if test -n "$gmplink" ; then -- # do we use gmp as provided by the os ? -- unset gmpinc -- test -d /usr/include/gmp3 && gmpinc="$gmpinc -I/usr/include/gmp3" -- test -d /usr/include/gmp2 && gmpinc="$gmpinc -I/usr/include/gmp2" -- test -d /usr/include/gmp && gmpinc="$gmpinc -I/usr/include/gmp" -+ case $enable_gmp in ''|yes) -+ # do we use gmp as provided by the os ? -+ unset gmpinc -+ test -d /usr/include/gmp3 && gmpinc="$gmpinc -I/usr/include/gmp3" -+ test -d /usr/include/gmp2 && gmpinc="$gmpinc -I/usr/include/gmp2" -+ test -d /usr/include/gmp && gmpinc="$gmpinc -I/usr/include/gmp" -+ ;; -+ /*) -+ # try to make --enable-gmp work as documented... -+ test -d $enable_gmp/include && gmpinc="-I$enable_gmp/include" -+ ;; -+ esac - fi -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $gmpinc" -+ ac_cpp_SAVE="$ac_cpp" -+ ac_cpp="$ac_cpp $gmpinc" - AC_CHECK_HEADER(gmp.h,have_gmp_h=yes,unset have_gmp_h) -- CFLAGS="$save_CFLAGS" -+ ac_cpp="$ac_cpp_SAVE" - esac - - # config options consistency checks diff --git a/security/nessus/patches/patch-nessus-libraries_libpeks_ltconfig b/security/nessus/patches/patch-nessus-libraries_libpeks_ltconfig deleted file mode 100644 index 424472b69a9..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_libpeks_ltconfig +++ /dev/null @@ -1,40 +0,0 @@ -$OpenBSD: patch-nessus-libraries_libpeks_ltconfig,v 1.2 2000/12/28 16:07:06 matt Exp $ ---- nessus-libraries/libpeks/ltconfig.orig Sat Apr 29 13:11:56 2000 -+++ nessus-libraries/libpeks/ltconfig Sat Nov 25 19:35:21 2000 -@@ -1396,10 +1396,18 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd2.[01234567]) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac - ;; - - os2*) -@@ -1997,13 +2005,10 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ finish_cmds= - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/security/nessus/patches/patch-nessus-libraries_libpeks_ltmain_sh b/security/nessus/patches/patch-nessus-libraries_libpeks_ltmain_sh deleted file mode 100644 index 3407b96ba8b..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_libpeks_ltmain_sh +++ /dev/null @@ -1,54 +0,0 @@ -$OpenBSD: patch-nessus-libraries_libpeks_ltmain_sh,v 1.1 2000/12/28 16:07:06 matt Exp $ ---- nessus-libraries/libpeks/ltmain.sh.orig Sat Apr 29 13:11:57 2000 -+++ nessus-libraries/libpeks/ltmain.sh Sat Dec 16 14:48:51 2000 -@@ -1795,6 +1795,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3555,40 +3558,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/security/nessus/patches/patch-nessus-libraries_ltconfig b/security/nessus/patches/patch-nessus-libraries_ltconfig deleted file mode 100644 index 82fa3897d8e..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_ltconfig +++ /dev/null @@ -1,40 +0,0 @@ -$OpenBSD: patch-nessus-libraries_ltconfig,v 1.2 2000/12/28 16:07:06 matt Exp $ ---- nessus-libraries/ltconfig.orig Mon Apr 3 11:12:48 2000 -+++ nessus-libraries/ltconfig Sat Nov 25 19:35:03 2000 -@@ -1396,10 +1396,18 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd2.[01234567]) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac - ;; - - os2*) -@@ -1997,13 +2005,10 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ finish_cmds= - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/security/nessus/patches/patch-nessus-libraries_ltmain_sh b/security/nessus/patches/patch-nessus-libraries_ltmain_sh deleted file mode 100644 index f5cf835c391..00000000000 --- a/security/nessus/patches/patch-nessus-libraries_ltmain_sh +++ /dev/null @@ -1,54 +0,0 @@ -$OpenBSD: patch-nessus-libraries_ltmain_sh,v 1.1 2000/12/28 16:07:06 matt Exp $ ---- nessus-libraries/ltmain.sh.orig Fri Jul 7 20:17:07 2000 -+++ nessus-libraries/ltmain.sh Sat Dec 16 14:48:50 2000 -@@ -1795,6 +1795,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3537,40 +3540,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/security/nessus/patches/patch-nessus-plugins_Makefile b/security/nessus/patches/patch-nessus-plugins_Makefile deleted file mode 100644 index 48137ece005..00000000000 --- a/security/nessus/patches/patch-nessus-plugins_Makefile +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-nessus-plugins_Makefile,v 1.3 2001/02/13 03:00:13 matt Exp $ ---- nessus-plugins/Makefile.orig Thu Nov 16 11:34:02 2000 -+++ nessus-plugins/Makefile Sun Feb 11 15:34:25 2001 -@@ -23,7 +23,7 @@ install : all $(INSTALL_UPDATER) - $(INSTALL) -o $(installuser) -m 444 $$scripts ${libdir}/nessus/plugins; \ - done - -- for plugins in bin/*.nes; do \ -+ -for plugins in bin/*.nes; do \ - $(INSTALL) -o $(installuser) -m 555 $$plugins ${libdir}/nessus/plugins; \ - done - diff --git a/security/nessus/patches/patch-nessus-plugins_ltconfig b/security/nessus/patches/patch-nessus-plugins_ltconfig deleted file mode 100644 index b45e236a232..00000000000 --- a/security/nessus/patches/patch-nessus-plugins_ltconfig +++ /dev/null @@ -1,53 +0,0 @@ -$OpenBSD: patch-nessus-plugins_ltconfig,v 1.2 2001/02/20 20:52:22 danh Exp $ ---- nessus-plugins/ltconfig.orig Mon Apr 3 11:13:19 2000 -+++ nessus-plugins/ltconfig Tue Feb 20 15:51:51 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1396,10 +1399,21 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1997,13 +2011,10 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ finish_cmds= - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/security/nessus/patches/patch-nessus-plugins_ltmain_sh b/security/nessus/patches/patch-nessus-plugins_ltmain_sh deleted file mode 100644 index 8ad655d9df0..00000000000 --- a/security/nessus/patches/patch-nessus-plugins_ltmain_sh +++ /dev/null @@ -1,84 +0,0 @@ -$OpenBSD: patch-nessus-plugins_ltmain_sh,v 1.2 2001/02/20 20:52:22 danh Exp $ ---- nessus-plugins/ltmain.sh.orig Fri Jul 7 20:16:48 2000 -+++ nessus-plugins/ltmain.sh Tue Feb 20 15:50:53 2001 -@@ -1079,7 +1079,18 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ continue -+ ;; - esac -+ elif test "$arg" = "-lc_r"; then -+ case "$host" in -+ *-*-openbsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac - elif test "$arg" = "-lm"; then - case "$host" in - *-*-cygwin* | *-*-beos*) -@@ -1091,6 +1102,10 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ - -module) - module=yes - continue -@@ -1795,6 +1810,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3537,40 +3555,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/security/nessus/pkg/DEINSTALL b/security/nessus/pkg/DEINSTALL index 13b28cbe15a..c89d989ed14 100644 --- a/security/nessus/pkg/DEINSTALL +++ b/security/nessus/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: DEINSTALL,v 1.1 2000/07/27 00:23:34 matt Exp $ +# $OpenBSD: DEINSTALL,v 1.2 2002/05/25 10:38:58 reinhard Exp $ # # Nessus de-installation @@ -12,6 +12,9 @@ cat <