OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jun-2006 22:46:30
Branch: HEAD Handle: 2006061721462900
Modified files:
openpkg-src/htdig htdig.patch htdig.spec
Log:
fix building under new GCC 4.1 C++ world order
Summary:
Revision Changes Path
1.9 +43 -28 openpkg-src/htdig/htdig.patch
1.52 +1 -1 openpkg-src/htdig/htdig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/htdig/htdig.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 htdig.patch
--- openpkg-src/htdig/htdig.patch 24 Mar 2006 19:21:33 -0000 1.8
+++ openpkg-src/htdig/htdig.patch 17 Jun 2006 20:46:29 -0000 1.9
@@ -1,6 +1,6 @@
Index: htdig/ExternalParser.cc
--- htdig/ExternalParser.cc.orig 2004-05-28 15:15:14 +0200
-+++ htdig/ExternalParser.cc 2006-03-23 19:47:16 +0100
++++ htdig/ExternalParser.cc 2006-06-17 22:25:21 +0200
@@ -227,7 +227,7 @@
int get_file = (convertToType.length() != 0);
String newcontent;
@@ -21,7 +21,7 @@
//
<URL:http://www.w3.org/MarkUp/html-spec/html-spec_5.html#SEC5.2.5>
Index: htnet/HtHTTP.cc
--- htnet/HtHTTP.cc.orig 2004-05-28 15:15:23 +0200
-+++ htnet/HtHTTP.cc 2006-03-23 19:46:42 +0100
++++ htnet/HtHTTP.cc 2006-06-17 22:25:21 +0200
@@ -643,6 +643,8 @@
String line = 0;
int inHeader = 1;
@@ -81,7 +81,7 @@
Index: htnet/HtHTTP.h
--- htnet/HtHTTP.h.orig 2004-05-28 15:15:23 +0200
-+++ htnet/HtHTTP.h 2006-03-23 19:46:42 +0100
++++ htnet/HtHTTP.h 2006-06-17 22:25:21 +0200
@@ -316,6 +316,7 @@
int _bytes_read; // Bytes read
URL _url; // URL to retrieve
@@ -92,7 +92,7 @@
Index: htnet/SSLConnection.cc
--- htnet/SSLConnection.cc.orig 2004-05-28 15:15:23 +0200
-+++ htnet/SSLConnection.cc 2006-03-23 19:46:42 +0100
++++ htnet/SSLConnection.cc 2006-06-17 22:25:21 +0200
@@ -131,6 +131,7 @@
{
errno = 0;
@@ -109,9 +109,24 @@
if (!need_io_stop)
count = SSL_read(ssl, buffer, maxlength);
+Index: htsearch/Collection.h
+--- htsearch/Collection.h.orig 2004-05-28 15:15:24 +0200
++++ htsearch/Collection.h 2006-06-17 22:28:24 +0200
+@@ -36,9 +36,9 @@
+ const char *docExcerpt);
+ ~Collection();
+
+- void Collection::Open();
++ void Open();
+
+- void Collection::Close();
++ void Close();
+
+ char *getWordFile() { return wordFile.get(); }
+ DocumentRef *getDocumentRef(int id);
Index: htsearch/Display.cc
--- htsearch/Display.cc.orig 2004-05-28 15:15:24 +0200
-+++ htsearch/Display.cc 2006-03-23 19:46:37 +0100
++++ htsearch/Display.cc 2006-06-17 22:25:21 +0200
@@ -362,7 +362,7 @@
if (maxScore != 0 && maxScore != minScore)
@@ -174,7 +189,7 @@
{
Index: httools/htmerge.cc
--- httools/htmerge.cc.orig 2004-05-28 15:15:25 +0200
-+++ httools/htmerge.cc 2006-03-23 19:46:37 +0100
++++ httools/htmerge.cc 2006-06-17 22:25:21 +0200
@@ -191,6 +191,64 @@
return 0;
}
@@ -295,9 +310,30 @@
// Cleanup--just close the two word databases
mergeWordDB.Close();
wordDB.Close();
+Index: installdir/htdig.conf
+--- installdir/htdig.conf.orig 2004-02-08 11:19:33 +0100
++++ installdir/htdig.conf 2006-06-17 22:25:21 +0200
+@@ -47,7 +47,7 @@
+ # long list of URLs, it may be wise to replace it with something like
+ # http://www. or comment this out and use the compiled-in default.
+ #
+-common_url_parts: ${limit_urls_to} .html .htm .shtml
++common_url_parts: ${limit_urls_to} .html .htm .shtml .php
+
+ #
+ # If there are particular pages that you definitely do NOT want to index,
you
+@@ -70,7 +70,7 @@
+ # actual strings.
+ #
+ bad_extensions: .wav .gz .z .sit .au .zip .tar .hqx .exe .com
.gif \
+- .jpg .jpeg .aiff .class .map .ram .tgz .bin .rpm .mpg .mov .avi .css
++ .jpg .jpeg .aiff .class .map .ram .tgz .bin .rpm .mpg .mov .avi .css
.js .png .ico
+
+ #
+ # The string htdig will send in every request to identify the robot. Change
Index: installdir/rundig
--- installdir/rundig.orig 2003-12-29 09:49:05 +0100
-+++ installdir/rundig 2006-03-23 19:46:37 +0100
++++ installdir/rundig 2006-06-17 22:25:21 +0200
@@ -30,7 +30,6 @@
done
@@ -318,24 +354,3 @@
else
echo "Config file $conffile cannot be found"
exit 1
-Index: installdir/htdig.conf
---- installdir/htdig.conf.orig 2004-02-08 11:19:33 +0100
-+++ installdir/htdig.conf 2006-03-24 10:30:15 +0100
-@@ -47,7 +47,7 @@
- # long list of URLs, it may be wise to replace it with something like
- # http://www. or comment this out and use the compiled-in default.
- #
--common_url_parts: ${limit_urls_to} .html .htm .shtml
-+common_url_parts: ${limit_urls_to} .html .htm .shtml .php
-
- #
- # If there are particular pages that you definitely do NOT want to index,
you
-@@ -70,7 +70,7 @@
- # actual strings.
- #
- bad_extensions: .wav .gz .z .sit .au .zip .tar .hqx .exe .com
.gif \
-- .jpg .jpeg .aiff .class .map .ram .tgz .bin .rpm .mpg .mov .avi .css
-+ .jpg .jpeg .aiff .class .map .ram .tgz .bin .rpm .mpg .mov .avi .css
.js .png .ico
-
- #
- # The string htdig will send in every request to identify the robot. Change
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/htdig/htdig.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 htdig.spec
--- openpkg-src/htdig/htdig.spec 24 Mar 2006 09:32:31 -0000 1.51
+++ openpkg-src/htdig/htdig.spec 17 Jun 2006 20:46:29 -0000 1.52
@@ -33,7 +33,7 @@
Group: Web
License: GPL
Version: 3.2.0b6
-Release: 20060324
+Release: 20060617
# list of sources
Source0: http://www.htdig.org/files/htdig-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
