htdig i udmsearch oraz wwwoffle

Arkadiusz 'Jo Joro' Sochala jojoro w poczta.onet.pl
Pon, 21 Sty 2002, 12:07:42 CET


21.01.2002 pisze Jakub Bogusz (qboosh w pld.org.pl):
> > make[1]: Opuszczam katalog `/home/users/jojoro/rpm/BUILD/htdig-3.2.0b2/htsearch'
> > make: *** [all-recursive] Błąd 1
> 
> To gdzieś kiedyś widziałem (ale w wersji z floatem).
> DBL_MAX jest definiowana w <float.h> (w prywatnych nagłówkach gcc).
> #include <float.h> powinno wystarczyć.
> 

To pomogło, ale wyskoczył następny problem:

c++ -DHAVE_CONFIG_H -I. -I. -I../include -DDEFAULT_CONFIG_FILE=\"/etc/htdig/htdig.conf\" -I../include -I../htlib -I../htnet -I../htcommon -I../htword -I../db/dist -I../db/dist -I../db/include -I../db/include -I/usr/include -g -O2 -Wall -Wp,-MD,.deps/Connection.pp -c  -fPIC -DPIC Connection.cc -o .libs/Connection.lo
Connection.cc: In method `int Connection::Read_Partial(char *, int)':
Connection.cc:649: `__fd_set' undeclared (first use this function)
Connection.cc:649: (Each undeclared identifier is reported only once
Connection.cc:649: for each function it appears in.)
Connection.cc:649: parse error before `;'
Connection.cc:650: `fds' undeclared (first use this function)
make[1]: *** [Connection.lo] Błąd 1
make[1]: Opuszczam katalog `/home/users/jojoro/rpm/BUILD/htdig-3.2.0b2/htnet'
make: *** [all-recursive] Błąd 1
błąd: Bad exit status from /var/tmp/rpm-tmp.95243 (%build)

Zauważyłem, ze jest on spowodowany łatką:
htdig-glibc22.patch: (oto kawałek tej łatki):

--- htdig-3.2.0b2/htnet/Connection.cc.glibc22   Tue Oct  3 14:08:36 2000
+++ htdig-3.2.0b2/htnet/Connection.cc   Tue Oct  3 14:16:19 2000
@@ -46,9 +46,10 @@

 #include "htconfig.h"

 -extern "C" {
	 -    int rresvport(int *);
	 -}
+#undef GETPEERNAME_LENGTH_T
+#define GETPEERNAME_LENGTH_T socklen_t
+#undef FD_SET_T
+#define FD_SET_T __fd_set
	 
Jak to wywalę to całość się kompiluje.

Spec i łatkę z którymi udało mi się skompilować pakiety podsyłam w
załączniku.

-- 
  -=[  Slrn-pl?  Tak!                                    ]=-
  -=[  Chcesz pomóc w rozwijaniu projektu?  Zapraszamy!  ]=-
  -=[                             http://www.slrn.z.pl/  ]=-
-------------- następna część ---------
--- htdig-3.2.0b2/htsearch/Display.ccold	Mon Jan 21 11:45:32 2002
+++ htdig-3.2.0b2/htsearch/Display.cc	Mon Jan 21 11:45:50 2002
@@ -30,6 +30,7 @@
 #include "HtURLSeedScore.h"
 #include "SplitMatches.h"
 
+#include <float.h>
 #include <fstream.h>
 #include <stdio.h>
 #include <ctype.h>
-------------- następna część ---------
# $Revision: 1.25 $, $Date: 2002/01/18 02:13:17 $
Summary:	A web indexing and searching system for a small domain or intranet
Summary(pl):	System indeksowania i przeszukiwania www dla małych domen i intranetu
Name:		htdig
Version:	3.2.0b2
Release:	2
License:	GPL
Group:		Networking/Utilities
Group(de):	Netzwerkwesen/Werkzeuge
Group(pl):	Sieciowe/Narzędzia
Source0:	http://www.htdig.org/files/%{name}-%{version}.tar.gz
Patch0:		%{name}-glibc22.patch
Patch1:		%{name}-float.patch
URL:		http://www.htdig.org/
PreReq:		webserver
BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)

%description
The ht://Dig system is a complete world wide web indexing and
searching system for a small domain or intranet. This system is not
meant to replace the need for powerful internet-wide search systems
like Lycos, Infoseek, Webcrawler and AltaVista. Instead it is meant to
cover the search needs for a single company, campus, or even a
particular sub section of a web site.

As opposed to some WAIS-based or web-server based search engines,
ht://Dig can span several web servers at a site. The type of these
different web servers doesn't matter as long as they understand the
HTTP 1.0 protocol.

%description -l pl
ht://Dig jest kompletnym systemem indeksującym i przeszukującym www
dla małych domen oraz intranetu. System nie został opracowany jako
wielki system typu Lycos, Infoseek WebCrawler i AltaVista. Natomiast
nadeje się do zastosowania w pojedyńczej firmie, kampusie lub
jakiejkolwiek stronie www.

W odróżnieniu do innych bazujących na WAIS-sie lub serwerch www
systemach, ht://Dig może łączyć kilka serwerów www w jednym miejscu.
Typ serwera nie ma znaczenia, dopóki pracuje on zgodnie z protokołem
HTTP 1.0

%package devel
Summary:	Include files and libraries for htdig
Summary(pl):	Pliki nagłówkowe dla htdig
Group:		Development/Libraries
Group(de):	Entwicklung/Libraries
Group(fr):	Development/Librairies
Group(pl):	Programowanie/Biblioteki
Requires:	%{name} = %{version}

%description devel
The ht://Dig system is a complete world wide web indexing and
searching system for a small domain or intranet. This system is not
meant to replace the need for powerful internet-wide search systems
like Lycos, Infoseek, Webcrawler and AltaVista. Instead it is meant to
cover the search needs for a single company, campus, or even a
particular sub section of a web site.

As opposed to some WAIS-based or web-server based search engines,
ht://Dig can span several web servers at a site. The type of these
different web servers doesn't matter as long as they understand the
HTTP 1.0 protocol.

This package contains devlopment files.

%package static
Summary:	htdig static libraries
Summary(pl):	Biblioteki statyczne htdig
Group:		Development/Libraries
Group(de):	Entwicklung/Libraries
Group(fr):	Development/Librairies
Group(pl):	Programowanie/Biblioteki
Requires:	%{name}-devel = %{version}

%description static
The ht://Dig system is a complete world wide web indexing and
searching system for a small domain or intranet. This system is not
meant to replace the need for powerful internet-wide search systems
like Lycos, Infoseek, Webcrawler and AltaVista. Instead it is meant to
cover the search needs for a single company, campus, or even a
particular sub section of a web site.

As opposed to some WAIS-based or web-server based search engines,
ht://Dig can span several web servers at a site. The type of these
different web servers doesn't matter as long as they understand the
HTTP 1.0 protocol.

This package contains static libraries of htdig.

%prep
%setup -q
#%patch0 -p1
%patch1 -p1


%build
CFLAGS="%{rpmcflags}"
LDFLAGS="%{rpmldflags}"
export CFLAGS LDFLAGS

./configure %{_target_platform} \
        --prefix=%{_prefix} \
        --exec_prefix=%{_prefix} \
        --libexec=%{_libdir} \
        --libdir=%{_libdir} \
        --mandir=%{_mandir} \
        --sysconfdir=%{_sysconfdir}/%{name} \
        --with-image-dir=/home/httpd/html/%{name} \
        --with-cgi-bin-dir=/home/httpd/cgi-bin \
        --with-search-dir=/home/httpd/html \
        --with-config-dir=%{_sysconfdir}/%{name} \
        --localstatedir=/var/lib

%{__make}

%install
rm -rf $RPM_BUILD_ROOT

%{__make} DESTDIR=$RPM_BUILD_ROOT install-strip

install -d $RPM_BUILD_ROOT/etc/cron.daily
ln -sf ../..%{_bindir}/rundig \
	$RPM_BUILD_ROOT/etc/cron.daily/htdig-dbgen

install -d $RPM_BUILD_ROOT/home/httpd/html/htdig/
ln -sf ../../../..%{_defaultdocdir}/%{name}-%{version} \
        $RPM_BUILD_ROOT/home/httpd/html/htdig/htdoc

install -d $RPM_BUILD_ROOT/var/lib/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
# Only run this if installing for the first time
if [ "$1" = 1 ]; then
	for i in `grep '^ServerName' /etc/httpd/httpd.conf | sort -u | awk '{print $2}'`; do echo -n http://$i/; echo -n " "; done > /tmp/htdig.tmp
	SERVERNAMES="`cat /tmp/htdig.tmp`"
	[ -z "$SERVERNAMES" ] && SERVERNAMES="`hostname -f`"
	[ -z "$SERVERNAMES" ] && SERVERNAMES="localhost"
	SERVERNAME=`grep '^ServerName' /etc/httpd/httpd.conf | uniq -d | awk '{print $2}'`
	grep -v -e local_urls -e local_user_urls -e start_url /etc/htdig/htdig.conf > /tmp/htdig.tmp
	mv -f /tmp/htdig.tmp /etc/htdig/htdig.conf
	echo "start_url:$SERVERNAMES
local_urls:		$SERVERNAMES
local_user_urls:	http://$SERVERNAME/=/home/,/public_html/" >> /etc/htdig/htdig.conf

fi

%files
%defattr(644,root,root,755)
%doc COPYING README htdoc
%dir /var/lib/%{name}
%attr (755,nobody,nobody) /home/httpd/cgi-bin/*
%attr (755,root,root) %{_bindir}/*
%attr (755,root,root) %{_libdir}/%{name}/*so
%attr (755,root,root) %{_libdir}/%{name}/*la
/home/httpd/html/%{name}/*
%{_datadir}/%{name}/*
%config(noreplace) %{_sysconfdir}/htdig/*
%config(missingok noreplace) %verify(not size mtime md5) /home/httpd/html/search.html
%config(missingok) %{_sysconfdir}/cron.daily/htdig-dbgen

%files devel
%defattr(644,root,root,755)
%{_includedir}/%{name}/*

%files static
%defattr(644,root,root,755)
%{_libdir}/%{name}/*.a

%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback w pld.org.pl>
All persons listed below can be reached at <cvs_login>@pld.org.pl

$Log: htdig.spec,v $
Revision 1.25  2002/01/18 02:13:17  kloczek
perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"

Revision 1.24  2001/10/03 16:43:20  filon
- fixed requires in static subpkg
- release 2

Revision 1.23  2001/05/02 16:29:06  qboosh
- adapterized and made spec %%debug ready or added using %%rpm*flags macros

Revision 1.22  2000/11/23 15:59:25  pascalek
- updated to 3.2.0b2
- devel and static packages created
- htdig files moved from /usr/local/htdig to proper(?) locations

Revision 1.21  2000/06/09 07:54:42  kloczek
- more %%{__make} macros.

Revision 1.20  2000/06/09 07:22:59  kloczek
- added using %%{__make} macro.

Revision 1.19  2000/05/21 15:02:32  kloczek
- spec adapterized.

Revision 1.18  2000/04/01 11:14:43  zagrodzki
- changed all BuildRoot definitons
- removed all applnkdir defs
- changed some prereqs/requires
- removed duplicate empty lines

Revision 1.17  2000/03/28 16:54:32  baggins
- translated kloczkish into english

Revision 1.16  2000/03/13 10:27:00  leafnode
- Bugfix in post-install script

Revision 1.15  2000/03/07 21:18:39  leafnode

- updated to 3.1.5
- fixed configuration script

Revision 1.14  1999/07/24 01:20:49  pius
- removed htdig-parser.patch (already applied).

Revision 1.13  1999/07/23 01:09:02  pius
- fixed files location,
- added more macros,
- typos corrected.

Revision 1.12  1999/07/12 23:05:58  kloczek

- added using CVS keywords in %changelog (for automating them).

* Thu Mar 11 1999 Tomasz Kłoczko <kloczek w rudy.mif.pg.gda.pl>
  [3.1.1-2]
- added "Prereq: webserwer",
- added -q %setup parameter,
- added noreplace to %config for /home/httpd/html/search.html.

* Thu Mar 11 1999 Konrad Stępień <konrad w interdata.com.pl>
- added pl translation
- added full %attr macros
- fix problem witch /home/httpd/html/htdig/htdoc dir

* Wed Feb 17 1999 Gilles Detillieux <grdetil w scrc.umanitoba.ca>
  - updated to version 3.1.1 final release
  - updated to release 1, included patch for htsearch parser bug

* Thu Feb  4 1999 Gilles Detillieux <grdetil w scrc.umanitoba.ca>
  - put web stuff back in /home/httpd/html & /home/httpd/cgi-bin, so it can
	go over a standard Apache installation on Red Hat
  - cleaned up %install to make use of new features

* Thu Feb 4 1999 Ric Klaren <klaren w telin.nl>
  - changed buildroot stuff
  - minor spec file fixes
  - install web stuff in /home/httpd/htdig
  - made rundig config file

* Tue Sep 22 1998 Gilles Detillieux <grdetil w scrc.umanitoba.ca>
  - Added local_urls stuff to generated htdig.conf file

* Fri Sep 18 1998 Gilles Detillieux <grdetil w scrc.umanitoba.ca>
  - Built the rpm from latest htdig source (3.1.0b1), using earlier
    versions of rpms by Mihai Ibanescu <misa w dntis.ro> and Elliot Lee
    <sopwith w cuc.edu> as a model, incorporating ideas from both.  I've
    made the install locations as FSSTND compliant as I can think of.


Więcej informacji o liście dyskusyjnej pld-devel-pl