rpms/htdig/F-9 htdig-3.2.0-allow_numbers.patch, NONE, 1.1 htdig-3.2.0-external_parsers.patch, NONE, 1.1 htdig.spec, 1.42, 1.43

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/htdig/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14855

Modified Files:
	htdig.spec 
Added Files:
	htdig-3.2.0-allow_numbers.patch 
	htdig-3.2.0-external_parsers.patch 
Log Message:
- report proper error message when external parser fails (#435741)
- ignore numbers when using allow_numbers: true and soundex (#435743)
- correct N-V-R


htdig-3.2.0-allow_numbers.patch:

--- NEW FILE htdig-3.2.0-allow_numbers.patch ---
--- htdig-3.2.0b6/htfuzzy/Soundex.cc.keybug	2004-05-28 08:15:20.000000000 -0500
+++ htdig-3.2.0b6/htfuzzy/Soundex.cc	2008-02-27 16:04:51.000000000 -0600
@@ -153,6 +153,9 @@ Soundex::addWord(char *word)
 
     String	key;
     generateKey(word, key);
+    if (key.length() == 0 || mystrcasecmp(word, key.get()) == 0 ||
+				mystrcasecmp("0", key.get()) == 0) 
+	return;
 
     String	*s = (String *) dict->Find(key);
     if (s)

htdig-3.2.0-external_parsers.patch:

--- NEW FILE htdig-3.2.0-external_parsers.patch ---
--- htdig-3.2.0b6/htdig/ExternalParser.cc.orig	2004-05-28 08:15:14.000000000 -0500
+++ htdig-3.0.0b6/htdig/ExternalParser.cc	2005-09-15 11:41:05.000000000 -0500
@@ -227,7 +227,7 @@ ExternalParser::parse(Retriever &retriev
     int		get_file = (convertToType.length() != 0);
     String	newcontent;
 
-    StringList	cpargs(currentParser);
+    StringList	cpargs(currentParser, " \t");
     char   **parsargs = new char * [cpargs.Count() + 5];
     int    argi;
     for (argi = 0; argi < cpargs.Count(); argi++)
@@ -280,7 +280,11 @@ ExternalParser::parse(Retriever &retriev
 	// Call External Parser
 	execv(parsargs[0], parsargs);
 
-	exit(EXIT_FAILURE);
+	perror("execv");
+	write(STDERR_FILENO, "External parser error: Can't execute ", 37);
+	write(STDERR_FILENO, parsargs[0], strlen(parsargs[0]));
+	write(STDERR_FILENO, "\n", 1);
+	_exit(EXIT_FAILURE);
     }
 
     // Parent Process
@@ -424,7 +428,7 @@ ExternalParser::parse(Retriever &retriev
 		  {
 			metadatetags = new StringMatch();
 			metadatetags->IgnoreCase();
-			metadatetags->Pattern("date|dc.date|dc.date.created|dc.data.modified");
+			metadatetags->Pattern("date|dc.date|dc.date.created|dc.date.modified");
 		  }
     
 		  // <URL:http://www.w3.org/MarkUp/html-spec/html-spec_5.html#SEC5.2.5> 


Index: htdig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htdig/F-9/htdig.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- htdig.spec	18 Feb 2008 20:03:18 -0000	1.42
+++ htdig.spec	23 Apr 2008 14:16:02 -0000	1.43
@@ -4,14 +4,14 @@
 
 Summary: ht://Dig - Web search engine
 Name: htdig
-Version: 3.2.0b6
-Release: 16%{?dist}
-Epoch: 3
+Version: 3.2.0
+Release: 0.1.b6%{?dist}
+Epoch: 4
 License: GPLv2
 Group: Applications/Internet
 Url: http://www.htdig.org/
 Prefix: %{_prefix}
-Source: http://www.htdig.org/files/%{name}-%{version}.tar.bz2
+Source: http://www.htdig.org/files/%{name}-%{version}b6.tar.bz2
 Source1: htdig.conf
 Patch: htdig-3.1.5-rh.patch
 Patch1: htdig-3.2.0b3-glibc222.patch
@@ -26,8 +26,10 @@
 Patch11: htdig-3.2.0b6-incremental.patch
 Patch12: htdig-3.2-CVE-2007-6110.patch
 Patch13: htdig-3.2.0b6-htstat-segv.patch
+Patch14: htdig-3.2.0-external_parsers.patch
+Patch15: htdig-3.2.0-allow_numbers.patch
 BuildRequires: flex >= 2.5.4a-13
-BuildRequires: zlib-devel httpd openssl-devel
+BuildRequires: zlib-devel openssl-devel httpd autoconf automake libtool
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package web
@@ -67,7 +69,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}b6
 %patch -p1 -b .rh
 %patch1 -p1 -b .glibc222
 %patch2 -p1 -b .xopen
@@ -81,8 +83,12 @@
 %patch11 -p1 -b .incremental
 %patch12 -p1 -b .CVE-2007-6110
 %patch13 -p1 -b .htstat-segv
+%patch14 -p1 -b .external_parsers
+%patch15 -p1 -b .allow_numbers
 
 %build
+autoreconf -fiv
+
 %configure \
 	--enable-shared \
 	--enable-tests \
@@ -151,6 +157,11 @@
 %endif
 
 %changelog
+* Wed Apr 23 2008 Adam Tkac <atkac redhat com> 4:3.2.0-0.1.b6
+- report proper error message when external parser fails (#435741)
+- ignore numbers when using allow_numbers: true and soundex (#435743)
+- correct N-V-R
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3:3.2.0b6-16
 - Autorebuild for GCC 4.3