From bce177e356f674b293152e7fb799b73f457c24b1 Mon Sep 17 00:00:00 2001 From: fredb Date: Sat, 9 Mar 2002 21:48:11 +0000 Subject: Update htdig to 3.1.6. Many bug fixes, including one security-related fix. The following is from the web page: Release notes for htdig-3.1.6 1 Feb 2002 As with previous releases, this version cleans up some remaining bugs and adds a few heavily-requested features. As the latest stable release, it is recommended for all production servers. * Fixed another nasty security hole in htsearch, which would allow a denial of service attack or forcing htsearch to read in config files outside of the configuration directory. * Fixed some problems with htmerge, including problems with words beginning with special characters and merging multiple databases. * Fixed a bug in handling hopcounts. * Fixed problems in handling non-standard relative HTTP redirects. * Fixed bugs in external parsers support including being confused by charset information in the Content-Type header and handling binary output from external converters. * Fixed bugs in the default English endings database. (Under ispell, it wasn't quite intended for the accuracy needed for our usage.) * Fixed additional bugs in the endings fuzzy algorithm. * Fixed bugs with compiling with gcc-3.0 and later. * Fixed bugs compiling and running on Mac OS X. * Fixed problems with servers not returning a Last-Modified date--now assums indexing time as modification time. * Fixed a variety of bugs in the HTML parser to more flexibly handle non-standard HTML. * Fixed problems in the TCP connection code and will more reliably timeout when a connection hangs and will retry bad connections several times before giving up. * Added the -m "minimal" flag to htdig for only indexing a set list of URLs and made the -l (log) flag the default behavior so that htdig will stop and restart automatically. * Added htdump and htload programs for dumping ASCII representations of the databases and reloading the same. * Added support for htnotify to collect multiple URLs and allow easy customization of notification messages, including the new attributes htnotify_replyto, htnotify_webmaster, htnotify_prefix_file, and htnotify_suffix_file. * Added a new "accents" fuzzy algorithm to morph accents, including the new accents_db attribute. * Added a 'list all' feature to htsearch with a query of '*' or the current prefix_match_character. * Added date restricted searching to htsearch including relative dates. * Added documentation on running ht://Dig and the rundig script. * Added METADESCRIPTION and NSTARS variables to the htsearch templates as well as support for $=(var) template variable references. * Added new config attributes to htsearch for restrict and exclude which work like the normal htsearch form variables if the form variables are not set. * Added many new attributes, including ignore_dead_servers description_meta_tag_names, max_keywords, translate_latin1, url_rewrite_rules, search_rewrite_rules, anchor_target, ignore_alt_text, search_results_contenttype, boolean_keywords, boolean_syntax_errors, multimatch_method, maximum_page_buttons, max_excerpts, plural_suffix, any_keywords and use_doc_date. * Extended the build_select_lists attribute to support select multiple, radio boxes and checkboxes. * Revised the documentation to make it clearer in parts, including the url_part_aliases attribute. * Updated various contributed utilities including doc2html, xmlsearch, rundig.sh, htparsedoc, acroconv.pl, multidig, etc. * A variety of other bug fixes, and many documentation updates. See the ChangeLog for details. --- www/htdig/Makefile | 25 ++- www/htdig/PLIST | 13 +- www/htdig/distinfo | 13 +- www/htdig/patches/patch-aa | 31 --- www/htdig/patches/patch-ab | 14 +- www/htdig/patches/patch-ad | 9 +- www/htdig/patches/patch-ae | 532 +++------------------------------------------ 7 files changed, 69 insertions(+), 568 deletions(-) delete mode 100644 www/htdig/patches/patch-aa diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 78b6384bf31..e84fc230fa2 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,10 +1,16 @@ -# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:55 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/03/09 21:48:11 fredb Exp $ # -DISTNAME= htdig-3.1.5 +DISTNAME= htdig-3.1.6 CATEGORIES= www databases MASTER_SITES= http://www.htdig.org/files/ \ - ftp://ftp.htdig.org/ + ftp://ftp.htdig.org/ \ + ${MASTER_SITE_SOURCEFORGE:=files/} \ + ${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/htdig/} \ + http://htdig.europeanservers.net/files/ \ + http://www.it.htdig.org/files/ \ + ftp://www.it.htdig.org/pub/htdig/ \ + http://www.opdenbrouw.nl/htdig/maindocs/files/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://htdig.sourceforge.net/ @@ -14,13 +20,22 @@ DEPENDS+= db-2.7.7:../../databases/db GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ + --with-common-dir=${PREFIX}/share/htdig/common \ + --with-config-dir=${PKG_SYSCONFDIR}/htdig/ \ + --with-database-dir=/var/db/htdig \ --with-image-dir=${PREFIX}/share/examples/htdig \ --with-search-dir=${PREFIX}/share/examples/htdig CPPFLAGS+= -I${PREFIX}/include/db2 +PLIST_SUBST= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} + +post-patch: + ${TOUCH} ${WRKSRC}/configure post-install: - if [ ! -f ${PREFIX}/etc/htdig/htdig.conf ]; then \ - ${CP} ${PREFIX}/share/examples/htdig/htdig.conf ${PREFIX}/etc/htdig/; \ + ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/htdig + if [ ! -f ${PKG_SYSCONFDIR}/htdig/htdig.conf ]; then \ + ${CP} ${PREFIX}/share/examples/htdig/htdig.conf \ + ${PKG_SYSCONFDIR}/htdig/; \ fi ${PREFIX}/bin/htfuzzy -v synonyms ${PREFIX}/bin/htfuzzy -v endings diff --git a/www/htdig/PLIST b/www/htdig/PLIST index 843b488fc47..e022a308f07 100644 --- a/www/htdig/PLIST +++ b/www/htdig/PLIST @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:55 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/09 21:48:11 fredb Exp $ bin/htfuzzy bin/htdig +bin/htdump +bin/htload bin/htmerge bin/htnotify bin/rundig +libexec/cgi-bin/htsearch share/examples/htdig/htdig.conf share/examples/htdig/search.html share/examples/htdig/button1.gif @@ -50,9 +53,11 @@ share/htdig/common/synonyms share/htdig/common/synonyms.db share/htdig/common/root2word.db share/htdig/common/word2root.db -etc/htdig/htdig.conf -libexec/cgi-bin/htsearch +@exec mkdir -p ${PKG_SYSCONFDIR}/htdig +@exec if [ ! -f ${PKG_SYSCONFDIR}/htdig/htdig.conf ]; then cp %D/share/examples/htdig/htdig.conf ${PKG_SYSCONFDIR}/htdig/htdig.conf; fi +@exec mkdir -p /var/db/htdig +@unexec rmdir ${PKG_SYSCONFDIR}/htdig 2>/dev/null || true +@unexec rmdir /var/db/htdig 2>/dev/null || true @dirrm share/htdig/common @dirrm share/htdig @dirrm share/examples/htdig -@dirrm etc/htdig diff --git a/www/htdig/distinfo b/www/htdig/distinfo index d824c1a8758..d47743ad13d 100644 --- a/www/htdig/distinfo +++ b/www/htdig/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:36 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/03/09 21:48:11 fredb Exp $ -SHA1 (htdig-3.1.5.tar.gz) = 44f3a8ec59d9eb8c2e9b9ebd551dbdfe7c34081f -Size (htdig-3.1.5.tar.gz) = 1960580 bytes -SHA1 (patch-aa) = ff2c8933c3068db9f09f3df972cb54ba8db2b9d6 -SHA1 (patch-ab) = e441ae14f7b44904503c6497f611565351480833 +SHA1 (htdig-3.1.6.tar.gz) = 603fc244ba59ee1efcbe8f2ba087567cb14468d0 +Size (htdig-3.1.6.tar.gz) = 2068675 bytes +SHA1 (patch-ab) = 504136ce6ac0a2beed574c88ee6d9b8ef90d6564 SHA1 (patch-ac) = d1f6ef3c4c7a2995217f391a4bf9d544e10f5a00 -SHA1 (patch-ad) = d0a3711328da1a263d8dc0120550c8b3e706cd38 -SHA1 (patch-ae) = 4a9b224604dab8ae489af764cf0ec84cebfa90e7 +SHA1 (patch-ad) = a727a2c3afdd697f0e2e46355f1e89bc70775bbf +SHA1 (patch-ae) = 1be8e82b97bb9b16dcc301f3f02e642a41945878 diff --git a/www/htdig/patches/patch-aa b/www/htdig/patches/patch-aa deleted file mode 100644 index b1345a9489c..00000000000 --- a/www/htdig/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/09/23 01:33:30 fredb Exp $ - ---- CONFIG.in.orig Wed Apr 21 21:47:53 1999 -+++ CONFIG.in Wed Sep 22 11:40:27 1999 -@@ -23,7 +23,7 @@ - # - # This specifies the root of the directory tree to be used by ht://Dig - # --DEST= $(prefix) -+DEST= $(prefix)/share/htdig - - # - # BIN_DIR -@@ -35,7 +35,7 @@ - # CONFIG_DIR - # This is the directory that contains ht://Dig configuration files - # --CONFIG_DIR= $(DEST)/conf -+CONFIG_DIR= $(prefix)/etc/htdig - - # - # COMMON_DIR -@@ -48,7 +48,7 @@ - # DATABASE_DIR - # The default directory where the search databases will reside. - # --DATABASE_DIR= $(DEST)/db -+DATABASE_DIR= /var/db/htdig - - # - # DEFAULT_CONFIG_FILE diff --git a/www/htdig/patches/patch-ab b/www/htdig/patches/patch-ab index 0ec1b03d017..b871778e45b 100644 --- a/www/htdig/patches/patch-ab +++ b/www/htdig/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1 1999/09/23 01:33:30 fredb Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/09 21:48:12 fredb Exp $ ---- Makefile.in.orig Wed Apr 21 21:47:53 1999 -+++ Makefile.in Wed Sep 22 15:01:33 1999 +--- Makefile.in.orig Thu Jan 31 17:47:14 2002 ++++ Makefile.in @@ -26,8 +26,7 @@ top_builddir= . include Makefile.config @@ -16,8 +16,8 @@ $NetBSD: patch-ab,v 1.1 1999/09/23 01:33:30 fredb Exp $ done && test -z "$$fail" @echo "" @echo "Installing default configuration files..." -- @if [ ! -f $(INSTALL_ROOT)$(CONFIG_DIR)/htdig.conf ]; then sed -e s%@DATABASE_DIR@%$(DATABASE_DIR)% -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(CONFIG_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(CONFIG_DIR)/htdig.conf;fi -+ @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%@DATABASE_DIR@%$(DATABASE_DIR)% -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf;fi - @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM);fi +- @if [ ! -f $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE) ]; then sed -e s%\@DATABASE_DIR\@%$(DATABASE_DIR)% -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE); echo $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE);fi ++ @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%\@DATABASE_DIR\@%$(DATABASE_DIR)% -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE);fi + @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM);fi @for i in $(COMMONHTML); do \ - if [ ! -f $(INSTALL_ROOT)$(COMMON_DIR)/$$i ]; then sed -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/$$i >$(INSTALL_ROOT)$(COMMON_DIR)/$$i; echo $(INSTALL_ROOT)$(COMMON_DIR)/$$i;fi; \ + if [ ! -f $(INSTALL_ROOT)$(COMMON_DIR)/$$i ]; then sed -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/$$i >$(INSTALL_ROOT)$(COMMON_DIR)/$$i; echo $(INSTALL_ROOT)$(COMMON_DIR)/$$i;fi; \ diff --git a/www/htdig/patches/patch-ad b/www/htdig/patches/patch-ad index d0bbc289a88..4460913f04b 100644 --- a/www/htdig/patches/patch-ad +++ b/www/htdig/patches/patch-ad @@ -1,16 +1,11 @@ -$NetBSD: patch-ad,v 1.2 1999/10/05 19:25:55 fredb Exp $ +$NetBSD: patch-ad,v 1.3 2002/03/09 21:48:12 fredb Exp $ Note to Porters =============== This patch isn't actually used by the package, rather it's included for the convenience of the packagers. If the subsequent patch to configure -fails, the patched configure.in can be used to regenerate configure... - - (cd work && tar xzvf /usr/pkgsrc/distfiles/htdig-* htdig-*/db) - make do-configure; cd work/htdig-*; gmake configure - -and the new configure can be used to reconstruct the patch. +fails, the patched configure.in can be used to regenerate configure. --- configure.in.orig Wed Apr 21 21:47:53 1999 +++ configure.in Tue Sep 21 15:43:57 1999 diff --git a/www/htdig/patches/patch-ae b/www/htdig/patches/patch-ae index d3dede2ab11..1453bfad23e 100644 --- a/www/htdig/patches/patch-ae +++ b/www/htdig/patches/patch-ae @@ -1,18 +1,13 @@ -$NetBSD: patch-ae,v 1.2 1999/10/05 19:25:55 fredb Exp $ +$NetBSD: patch-ae,v 1.3 2002/03/09 21:48:12 fredb Exp $ -Note to Porters -=============== - -This file is generated from patch-ad. See the notes in that file. - ---- configure.orig Wed Sep 22 11:18:09 1999 -+++ configure Tue Oct 5 11:40:03 1999 -@@ -1675,8 +1675,55 @@ +--- configure.orig Thu Jan 31 17:47:14 2002 ++++ configure +@@ -1761,6 +1761,53 @@ +echo $ac_n "checking for db_appinit in -ldb2""... $ac_c" 1>&6 -+echo "configure:1680: checking for db_appinit in -ldb2" >&5 ++echo "configure:1766: checking for db_appinit in -ldb2" >&5 +ac_lib_var=`echo db2'_'db_appinit | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -20,7 +15,7 @@ This file is generated from patch-ad. See the notes in that file. + ac_save_LIBS="$LIBS" +LIBS="-ldb2 $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1785: \"$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 @@ -59,515 +54,38 @@ This file is generated from patch-ad. See the notes in that file. +fi + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:1680: checking for socket in -lsocket" >&5 -+echo "configure:1727: checking for socket in -lsocket" >&5 + echo "configure:1766: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1684,7 +1731,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1746: \"$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 -@@ -1723,7 +1770,7 @@ - fi - - echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6 --echo "configure:1727: checking for t_accept in -lnsl" >&5 -+echo "configure:1774: checking for t_accept in -lnsl" >&5 - ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1731,7 +1778,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1793: \"$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 -@@ -1771,7 +1818,7 @@ - - if test $WITH_ZLIB = yes; then - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 --echo "configure:1775: checking for deflate in -lz" >&5 -+echo "configure:1822: 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 -@@ -1779,7 +1826,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lz $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1841: \"$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 -@@ -1821,12 +1868,12 @@ - - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1825: checking for ANSI C header files" >&5 -+echo "configure:1872: 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 -@@ -1834,7 +1881,7 @@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1885: \"$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* -@@ -1851,7 +1898,7 @@ - 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 -@@ -1869,7 +1916,7 @@ - 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 -@@ -1890,7 +1937,7 @@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1901,7 +1948,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1925,12 +1972,12 @@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:1929: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:1976: 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 -@@ -1939,7 +1986,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:1943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -1968,7 +2015,7 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:1972: checking how to run the C++ preprocessor" >&5 -+echo "configure:2019: checking how to run the C++ preprocessor" >&5 - if test -z "$CXXCPP"; then - if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1981,12 +2028,12 @@ - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2037: \"$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 - : -@@ -2014,17 +2061,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2018: checking for $ac_hdr" >&5 -+echo "configure:2065: 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:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2075: \"$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* -@@ -2052,17 +2099,17 @@ - - ac_safe=`echo "fstream.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for fstream.h""... $ac_c" 1>&6 --echo "configure:2056: checking for fstream.h" >&5 -+echo "configure:2103: checking for fstream.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:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2113: \"$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* -@@ -2096,12 +2143,12 @@ +@@ -2633,10 +2680,10 @@ cross_compiling=$ac_cv_prog_cc_cross - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:2100: checking for working const" >&5 -+echo "configure:2147: 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:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -2171,12 +2218,12 @@ - fi - - echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:2175: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:2222: 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 -@@ -2184,7 +2231,7 @@ - struct tm *tp; tp->tm_sec; - ; return 0; } - EOF --if { (eval echo configure:2188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm=time.h - else -@@ -2208,12 +2255,12 @@ - for ac_func in strdup strerror strstr - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2212: checking for $ac_func" >&5 -+echo "configure:2259: 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:2287: \"$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 -@@ -2263,12 +2310,12 @@ - for ac_func in localtime_r - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2267: checking for $ac_func" >&5 -+echo "configure:2314: 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:2342: \"$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 -@@ -2318,12 +2365,12 @@ - for ac_func in timegm - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2322: checking for $ac_func" >&5 -+echo "configure:2369: 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:2397: \"$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 -@@ -2379,9 +2426,9 @@ - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we need gethostname() prototype?""... $ac_c" 1>&6 --echo "configure:2383: checking whether we need gethostname() prototype?" >&5 -+echo "configure:2430: checking whether we need gethostname() prototype?" >&5 - cat > conftest.$ac_ext < - #include -@@ -2399,7 +2446,7 @@ - gethostname("sdsu.edu", (int) 8); - ; return 0; } - EOF --if { (eval echo configure:2403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF - #define NEED_PROTO_GETHOSTNAME 1 -@@ -2421,11 +2468,11 @@ - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking how to call getpeername?""... $ac_c" 1>&6 --echo "configure:2425: checking how to call getpeername?" >&5 -+echo "configure:2472: checking how to call getpeername?" >&5 - for sock_t in 'struct sockaddr' 'void'; do - for getpeername_length_t in 'size_t' 'int' 'unsigned int' 'long unsigned int' 'socklen_t'; do - cat > conftest.$ac_ext < - #include -@@ -2433,7 +2480,7 @@ - extern getpeername(int, $sock_t *, $getpeername_length_t *) - ; return 0; } - EOF --if { (eval echo configure:2437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_found=yes ; break 2 - else -@@ -2470,8 +2517,6 @@ - if test ! -d "./db"; then - mkdir db - fi +-if test ! -d "./db"; then +- mkdir db +-fi -subdirs="db/dist" -- ++#if test ! -d "./db"; then ++# mkdir db ++#fi ++#subdirs="db/dist" + trap '' 1 2 15 - cat > confcache <<\EOF -@@ -2634,7 +2679,6 @@ - s%@SENDMAIL@%$SENDMAIL%g +@@ -2807,7 +2854,7 @@ s%@CPP@%$CPP%g s%@CXXCPP@%$CXXCPP%g + s%@LIBOBJS@%$LIBOBJS%g -s%@subdirs@%$subdirs%g ++#s%@subdirs@%$subdirs%g CEOF EOF -@@ -2853,103 +2897,6 @@ - chmod +x $CONFIG_STATUS +@@ -3027,7 +3074,7 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -- --if test "$no_recursion" != yes; then -- -- # Remove --cache-file and --srcdir arguments so they do not pile up. -- ac_sub_configure_args= -- ac_prev= -- for ac_arg in $ac_configure_args; do -- if test -n "$ac_prev"; then -- ac_prev= -- continue -- fi -- case "$ac_arg" in -- -cache-file | --cache-file | --cache-fil | --cache-fi \ -- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -- ac_prev=cache_file ;; -- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -- ;; -- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -- ac_prev=srcdir ;; -- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- ;; -- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; -- esac -- done -- -- for ac_config_dir in db/dist; do -- -- # Do not complain, so a configure script can configure whichever -- # parts of a large source tree are present. -- if test ! -d $srcdir/$ac_config_dir; then -- continue -- fi -- -- echo configuring in $ac_config_dir -- -- case "$srcdir" in -- .) ;; -- *) -- if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; -- else -- { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } -- fi -- ;; -- esac -- -- ac_popdir=`pwd` -- cd $ac_config_dir -- -- # A "../" for each directory in /$ac_config_dir. -- ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` -- -- case "$srcdir" in -- .) # No --srcdir option. We are building in place. -- ac_sub_srcdir=$srcdir ;; -- /*) # Absolute path. -- ac_sub_srcdir=$srcdir/$ac_config_dir ;; -- *) # Relative path. -- ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; -- esac -- -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_sub_srcdir/configure; then -- ac_sub_configure=$ac_sub_srcdir/configure -- elif test -f $ac_sub_srcdir/configure.in; then -- ac_sub_configure=$ac_configure -- else -- echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 -- ac_sub_configure= -- fi -- -- # The recursion is here. -- if test -n "$ac_sub_configure"; then -- -- # Make the cache file name correct relative to the subdirectory. -- case "$cache_file" in -- /*) ac_sub_cache_file=$cache_file ;; -- *) # Relative path. -- ac_sub_cache_file="$ac_dots$cache_file" ;; -- esac -- case "$ac_given_INSTALL" in -- [/$]*) INSTALL="$ac_given_INSTALL" ;; -- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -- esac -- -- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" -- # The eval makes quoting arguments work. -- if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir -- then : -- else -- { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } -- fi -- fi -- -- cd $ac_popdir -- done --fi +-if test "$no_recursion" != yes; then ++if false; then - echo "" + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= -- cgit v1.2.3