Re: [htdig-dev] Re: Clobbering CVS mainline

[Gilles D. <gr...@sc...>]

According to Geoff Hutchison:
> As has been discussed a few times, I'm going to kill the current
> (broken) mainline and import the htdig-3-2-x branch in its place. This is
> a first step towards merging the new mifluz code and getting 3.2
> development moving again.
> 
> I'll make another announcement when this is done, as people may wish to
> switch their CVS trees.

Great.  I saved a copy of php-wrapper from the mainline, which is probably
the only thing worth salvaging, so I say clobber away.

I'll probably wait until the mifluz merge is done, and the htsearch
reorganization and parser rewrite are done, before I take time to port
3.1.6 enhancements and doc fixes over to 3.2.  (That'll give me time
for some other pressing matters here.)

Just to add some more stuff to the 3.2 to-do list, I thought I'd pass on
some patches that I found in the htdig-3.2.0-2.011302.src.rpm from Red Hat
rawhide distribution.  I left out the patches to rundig and htdig.conf,
which I think are rather assinine, but the other patches are noteworthy.
The %changelog in the .spec file says this:

* Wed Jan 30 2002 Phil Knirsch <pkn...@re...>
- Fixed newer autconf and gcc problems.
- Fixed a few compilations bugs.
- Disabled optimization as the new gcc still seems to have problems with it.

... so I thought it might be relevant to our efforts at gcc 3 compliance.

Of course, if we add includes for values.h and such, we should probably
test for them in ./configure.  I think we should also be consistent with
the whole string.h vs. strings.h issue and test for both.  I'm not sure
how to deal with the patch to configure, as the patched code is probably
something internal to autoconf.  Maybe an autoconf expert can assist
with that, or maybe a newer autoconf version addresses this issue.

::::::::::::::
htdig-3.2.0b3-glibc222.patch
::::::::::::::
--- htdig-3.2.0b3/htsearch/Display.cc.glibc222	Mon Mar  5 11:38:31 2001
+++ htdig-3.2.0b3/htsearch/Display.cc	Mon Mar  5 11:38:57 2001
@@ -36,6 +36,7 @@
 #include <locale.h>
 #include <math.h>
 #include <float.h>
+#include <values.h>
 
 #if !defined(DBL_MAX) && defined(MAXFLOAT)
 # define DBL_MAX MAXFLOAT
::::::::::::::
htdig-3.2.0b4-011302-configure.patch
::::::::::::::
--- htdig-3.2.0b4-011302/configure.configure	Sun Jan 13 09:13:22 2002
+++ htdig-3.2.0b4-011302/configure	Wed Jan 30 20:34:58 2002
@@ -3202,7 +3202,7 @@
 #include "confdefs.h"
 #include <zlib.h>
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp -w conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:3207: \"$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
@@ -3505,7 +3505,7 @@
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp -w conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:3510: \"$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
@@ -3583,7 +3583,7 @@
 #include "confdefs.h"
 #include <fstream.h>
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp -w conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:3588: \"$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
::::::::::::::
htdig-3.2.0b4-011302-md5.patch
::::::::::::::
--- htdig-3.2.0b4-011302/htlib/md5.cc.md5	Wed Jan 30 19:26:23 2002
+++ htdig-3.2.0b4-011302/htlib/md5.cc	Wed Jan 30 19:26:08 2002
@@ -1,4 +1,6 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 extern "C" {
 #include "mhash_md5.h"
::::::::::::::
htdig-3.2.0b4-h_hash.patch
::::::::::::::
--- htdig-3.2.0b4-011302/db/hash.c.h_hash	Tue Oct 10 05:15:27 2000
+++ htdig-3.2.0b4-011302/db/hash.c	Fri Jan 25 15:56:09 2002
@@ -245,6 +245,11 @@
 		need_sync = 1;
 	}
 
+        /* Make sure we always have a valid hashp->h_hash function. */
+	if (hashp->h_hash == NULL)
+		hashp->h_hash = hcp->hdr->dbmeta.version < 5
+		? CDB___ham_func4 : CDB___ham_func5;
+
 err2:	/* Release the meta data page */
 	if ((t_ret = CDB___ham_release_meta(dbc)) != 0 && ret == 0)
 		ret = t_ret;
::::::::::::::
htdig-3.2.0b4-xopen.patch
::::::::::::::
--- htdig-3.2.0b4-011302/db/os_rw.c.xopen	Tue Oct 10 05:15:29 2000
+++ htdig-3.2.0b4-011302/db/os_rw.c	Fri Jan 25 14:30:45 2002
@@ -5,6 +5,14 @@
  *	Sleepycat Software.  All rights reserved.
  */
 
+
+#define _XOPEN_SOURCE 500
+#include <sys/types.h>
+#include <unistd.h>
+#ifndef u_long
+typedef __u_long u_long;
+#endif
+
 #include "db_config.h"
 
 #ifndef lint

-- 
Gilles R. Detillieux              E-mail: <gr...@sc...>
Spinal Cord Research Centre       WWW:    http://www.scrc.umanitoba.ca/~grdetil
Dept. Physiology, U. of Manitoba  Phone:  (204)789-3766
Winnipeg, MB  R3E 3J7  (Canada)   Fax:    (204)789-3930