|
|
@@ -1,46 +1,46 @@
|
|
|
-%define vine4 1
|
|
|
-
|
|
|
-%define date 20030601
|
|
|
%define buildweb 1
|
|
|
%define beta b6
|
|
|
|
|
|
-%if %{vine4}
|
|
|
%define contentdir /var/www
|
|
|
%define apachebin %{_sbindir}/apache2
|
|
|
-%else
|
|
|
-%define contentdir /home/httpd
|
|
|
-%define apachebin %{_sbindir}/httpd
|
|
|
-%endif
|
|
|
|
|
|
-Summary: ht://Dig - Web search engine
|
|
|
Name: htdig
|
|
|
+Summary: ht://Dig - Web search engine
|
|
|
+Summary(ja): ht://Dig Web 検索エンジン
|
|
|
Version: 3.2.0
|
|
|
-#Release: 6.1vl1.%{beta}
|
|
|
-Release: 7.%{beta}%{?_dist_release}
|
|
|
-License: GPL
|
|
|
+Release: 8.%{beta}%{?_dist_release}
|
|
|
+
|
|
|
+License: GPLv2
|
|
|
Group: Applications/Internet
|
|
|
-Url: http://www.htdig.org/
|
|
|
+URL: http://www.htdig.org/
|
|
|
+
|
|
|
Source: http://www.htdig.org/files/%{name}-%{version}%{beta}.tar.bz2
|
|
|
Source1: htdig.conf
|
|
|
-Patch0: htdig-3.1.5-rh.patch
|
|
|
-Patch1: htdig-3.2.0b3-glibc222.patch
|
|
|
+Patch1: htdig-3.1.5-rh.patch
|
|
|
Patch2: htdig-3.2.0b4-xopen.patch
|
|
|
-Patch3: htdig-3.2.0b4-h_hash.patch
|
|
|
Patch4: htdig-3.2.0b5-overflow.patch
|
|
|
-Patch5: htdig-3.2.0b5-expr.patch
|
|
|
-Patch6: htdig-3.2.0b5-destdir.patch
|
|
|
-Patch7: htdig-3.2.0b5-mktemp.patch
|
|
|
-# build for gcc4
|
|
|
-Patch100: htdig-3.2.0b6-gcc4.patch
|
|
|
+Patch5: htdig-3.2.0b6-robots.patch
|
|
|
+Patch6: htdig-3.2.0b6-unescaped_output.patch
|
|
|
+Patch8: htdig-3.2.0b6-compile-fix.patch
|
|
|
+Patch9: htdig-3.2.0b6-opts.patch
|
|
|
+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
|
|
|
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: flex >= 2.5.4a-13
|
|
|
BuildRequires: zlib-devel
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+BuildRequires: openssl-devel
|
|
|
+BuildRequires: apache2
|
|
|
+BuildRequires: autoconf automake libtool
|
|
|
|
|
|
%package web
|
|
|
Summary: Scripts and HTML code needed for using ht://Dig as a web search engine
|
|
|
Group: Applications/Internet
|
|
|
-Requires: %{name} = %{version} webserver
|
|
|
+Requires: %{name} = %{version}
|
|
|
+Requires: webserver
|
|
|
|
|
|
%description
|
|
|
The ht://Dig system is a complete world wide web indexing and searching
|
|
|
@@ -75,42 +75,20 @@ various web servers on the campus network.
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n %{name}-%{version}%{beta}
|
|
|
-%patch -p1 -b .rh
|
|
|
-%patch1 -p1 -b .glibc222
|
|
|
+%patch1 -p1 -b .rh
|
|
|
%patch2 -p1 -b .xopen
|
|
|
-%patch3 -p1 -b .h_hash
|
|
|
%patch4 -p1 -b .overflow
|
|
|
-#patch5 -p1 -b .expr
|
|
|
-#patch6 -p1 -b .destdir
|
|
|
-#patch7 -p1 -b .mktemp
|
|
|
-
|
|
|
-%patch100 -p1 -b .gcc4
|
|
|
-
|
|
|
-# Fix the flex output file for glibc 2.2 compatibility
|
|
|
-cd htcommon
|
|
|
-flex -oconf_lexer.cxx conf_lexer.lxx
|
|
|
-cd ..
|
|
|
-
|
|
|
-cd htlib
|
|
|
-# This is a *VERY* dirty hack, until I figure out what's
|
|
|
-# causing this to break...
|
|
|
-for i in *.cc; do
|
|
|
- mv $i $i.foo
|
|
|
- cat >$i <<EOF
|
|
|
-#include <stdio.h>
|
|
|
-#include <string.h>
|
|
|
-EOF
|
|
|
- cat $i.foo >>$i
|
|
|
- rm -f $i.foo
|
|
|
-done
|
|
|
-for i in clib.h; do
|
|
|
- mv $i $i.foo
|
|
|
- cat >$i <<EOF
|
|
|
-#include "htconfig.h"
|
|
|
-EOF
|
|
|
- cat $i.foo >>$i
|
|
|
- rm -f $i.foo
|
|
|
-done
|
|
|
+%patch5 -p1 -b .robots
|
|
|
+%patch6 -p1 -b .unescaped_output
|
|
|
+%patch8 -p1 -b .compile-fix
|
|
|
+%patch9 -p1 -b .opts
|
|
|
+%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
|
|
|
+
|
|
|
+autoreconf -fiv
|
|
|
|
|
|
%build
|
|
|
%configure \
|
|
|
@@ -126,7 +104,8 @@ done
|
|
|
--with-search-dir=%{contentdir}/html/htdig \
|
|
|
--with-default-config-file=%{_sysconfdir}/htdig/htdig.conf \
|
|
|
--with-apache=%{apachebin} \
|
|
|
- --with-zlib=%{_prefix}
|
|
|
+ --with-zlib=%{_prefix} \
|
|
|
+ --with-ssl
|
|
|
make
|
|
|
|
|
|
%install
|
|
|
@@ -147,6 +126,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
|
|
|
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/htdig.conf
|
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_includedir}
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig/*.a
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig/*.la
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig_db/*.a
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig_db/*.la
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -176,6 +159,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.2.0-8.b6
|
|
|
+- rebuilt with current VineSeed
|
|
|
+- replaced Patch100 to Patch8
|
|
|
+- added --with-ssl option to %%configure
|
|
|
+
|
|
|
* Sat Aug 16 2008 Shu KONNO <owa@bg.wakwak.com> 3.2.0-7.b6vl5
|
|
|
- applied new versioning policy
|
|
|
|
inagaki