diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d512528 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +w3c-libwww-20060206.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 26b8aa2..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -w3c-libwww fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676200 diff --git a/sources b/sources new file mode 100644 index 0000000..96d3af3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +8f90a719402305ad2979372ae91eee3a w3c-libwww-20060206.tar.bz2 diff --git a/w3c-libwww-5.3.2-incdir.patch b/w3c-libwww-5.3.2-incdir.patch new file mode 100644 index 0000000..17e948f --- /dev/null +++ b/w3c-libwww-5.3.2-incdir.patch @@ -0,0 +1,15 @@ +--- w3c-libwww-5.3.2/libwww-config.in.inc Wed Feb 20 11:39:50 2002 ++++ w3c-libwww-5.3.2/libwww-config.in Wed Feb 20 11:42:17 2002 +@@ -45,7 +45,11 @@ + echo @VERSION@ + ;; + --cflags) +- echo -I@includedir@ -I@includedir@/@PACKAGE@ @DEFS@ ++ if [ "@includedir@" != "@prefix@/include" ]; then ++ echo -I@includedir@ -I@includedir@/@PACKAGE@ @DEFS@ ++ else ++ echo -I@includedir@/@PACKAGE@ @DEFS@ ++ fi + ;; + --libs) + echo -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@ diff --git a/w3c-libwww-configure.patch b/w3c-libwww-configure.patch new file mode 100644 index 0000000..5b0ee75 --- /dev/null +++ b/w3c-libwww-configure.patch @@ -0,0 +1,63 @@ +--- Library/src/wwwsys.html.orig 2006-02-08 16:42:09.000000000 +0100 ++++ Library/src/wwwsys.html 2006-02-08 16:42:27.000000000 +0100 +@@ -747,7 +747,7 @@ + + /* stdef.h */ + #ifdef HAVE_STDDEF_H +-#include ++#include <stddef.h> + #endif + + /* types.h */ +--- Makefile.am.orig 2006-02-08 17:42:04.000000000 +0100 ++++ Makefile.am 2006-02-08 17:42:33.000000000 +0100 +@@ -34,7 +34,7 @@ + install-exec-local: + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir) +- $(INSTALL_DATA) $(top_builddir)/$(CONFIG_HEADER) $(DESTDIR)$(includedir)/$(CONFIG_HEADER); ++# $(INSTALL_DATA) $(top_builddir)/$(CONFIG_HEADER) $(DESTDIR)$(includedir)/$(CONFIG_HEADER); + + # This is our install script provided by Soren Sandmann + bin_SCRIPTS = libwww-config +--- configure.ac.orig 2006-02-28 10:12:25.000000000 +0100 ++++ configure.ac 2006-02-28 10:14:41.000000000 +0100 +@@ -28,7 +28,7 @@ + + AM_INIT_AUTOMAKE($PACKAGE, $VERSION) + +-AM_CONFIG_HEADER(wwwconf.h) ++AC_CONFIG_HEADER(wwwconf.h) + + dnl our own functions + +@@ -555,25 +555,24 @@ + AC_MSG_RESULT(yes) + AC_DEFINE(HT_EXPAT, 1, [Define to enable expat XML parser.]) + HTXML="HTXML.lo" +- HTLIBXML='${top_builddir}/modules/expat/libexpat.la' ++ HTLIBXML='-lexpat' + WWWXML="libwwwxml.la" + LWWWXML="-lwwwxml -lexpat" +- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/libexpat.la' ++ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la' + SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)' + ;; + esac ], + AC_MSG_RESULT(yes) + AC_DEFINE(HT_EXPAT) + HTXML="HTXML.lo" +- HTLIBXML='${top_builddir}/modules/expat/libexpat.la' ++ HTLIBXML='-lexpat' + WWWXML="libwwwxml.la" + LWWWXML="-lwwwxml -lexpat" +- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/libexpat.la' ++ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la' + SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)' + ) + + dnl @@ JK: add something like (if test, then do this config) +-AC_CONFIG_SUBDIRS(modules/expat) + AC_SUBST(HTXML) # for old style big library + AC_SUBST(HTLIBXML) # for old style big library + AC_SUBST(WWWXML) diff --git a/w3c-libwww-expat.patch b/w3c-libwww-expat.patch new file mode 100644 index 0000000..0509642 --- /dev/null +++ b/w3c-libwww-expat.patch @@ -0,0 +1,35 @@ +--- Library/src/Makefile.am.orig 2006-02-08 17:02:33.000000000 +0100 ++++ Library/src/Makefile.am 2006-02-08 17:28:14.000000000 +0100 +@@ -362,10 +362,7 @@ + HTXML.h \ + HTXML.c + +-libwwwxml_la_DEPENDENCIES = \ +- ../../modules/expat/libexpat.la +- +-libwwwxml_la_LDFLAGS = -rpath $(libdir) ++libwwwxml_la_LDFLAGS = -lexpat -rpath $(libdir) + + libwwwzip_la_SOURCES = \ + WWWZip.h \ +@@ -386,9 +383,8 @@ + libwwwsql_la_LDFLAGS = -rpath $(libdir) + + INCLUDES = \ +- -I/usr/local/include \ +- -I${top_srcdir}/modules/md5 \ +- -I${top_srcdir}/modules/expat/lib ++ -I$(includedir) \ ++ -I${top_srcdir}/modules/md5 + + BUILT_SOURCES = \ + wwwsys.h \ +--- modules/Makefile.am.orig 2006-02-08 08:51:50.000000000 +0100 ++++ modules/Makefile.am 2006-02-08 08:51:59.000000000 +0100 +@@ -5,5 +5,5 @@ + EXTRA_DIST = \ + $(DOCS) + +-SUBDIRS = expat md5 ++SUBDIRS = md5 + diff --git a/w3c-libwww-md5.patch b/w3c-libwww-md5.patch new file mode 100644 index 0000000..bb40091 --- /dev/null +++ b/w3c-libwww-md5.patch @@ -0,0 +1,11 @@ +--- modules/md5/md5.h.orig 2006-04-22 02:25:32.000000000 +0200 ++++ modules/md5/md5.h 2006-04-22 02:25:54.000000000 +0200 +@@ -42,7 +42,7 @@ + typedef unsigned short int UINT2; + + /* UINT4 defines a four byte word */ +-typedef unsigned long int UINT4; ++typedef unsigned int UINT4; + + /* PROTO_LIST is defined depending on how PROTOTYPES is defined above. + If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it diff --git a/w3c-libwww-ppc64.patch b/w3c-libwww-ppc64.patch new file mode 100644 index 0000000..e89aba8 --- /dev/null +++ b/w3c-libwww-ppc64.patch @@ -0,0 +1,10 @@ +--- w3c-libwww-5.4.0/config/ltconfig.sopwith 2002-06-06 10:59:37.000000000 -0400 ++++ w3c-libwww-5.4.0/config/ltconfig 2003-02-11 13:35:44.000000000 -0500 +@@ -1933,7 +1933,6 @@ + else + # Only the GNU ld.so supports shared libraries on MkLinux. + case "$host_cpu" in +- powerpc*) dynamic_linker=no ;; + *) dynamic_linker='Linux ld.so' ;; + esac + fi diff --git a/w3c-libwww.spec b/w3c-libwww.spec new file mode 100644 index 0000000..02baff9 --- /dev/null +++ b/w3c-libwww.spec @@ -0,0 +1,241 @@ +Name: w3c-libwww +Version: 5.4.1 +Release: 0.4.20060206cvs%{?dist} +Summary: HTTP library of common code + +Group: System Environment/Libraries +License: W3C (see: http://www.w3.org/Consortium/Legal/copyright-software.html) +URL: http://www.w3.org/Library +#cvs -d :pserver:anonymous@dev.w3.org:/sources/public login +#after which you type "anonymous" as password. +#cvs -d :pserver:anonymous@dev.w3.org:/sources/public -z3 checkout libwww +Source: w3c-libwww-20060206.tar.bz2 +Patch0: w3c-libwww-configure.patch +Patch1: w3c-libwww-5.3.2-incdir.patch +Patch2: w3c-libwww-ppc64.patch +Patch3: w3c-libwww-md5.patch +#external expat +Patch100: w3c-libwww-expat.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool autoconf automake zlib-devel openssl-devel expat-devel + +%description +Libwww is a general-purpose Web API written in C for Unix and Windows (Win32). +With a highly extensible and layered API, it can accommodate many different +types of applications including clients, robots, etc. The purpose of libwww +is to provide a highly optimized HTTP sample implementation as well as other +Internet protocols and to serve as a testbed for protocol experiments. + +%package devel +Summary: Header files for programs that use libwww +Group: Development/Libraries +Requires: w3c-libwww = %{version}-%{release} +Requires: zlib-devel expat-devel openssl-devel + +%description devel +Header files for libwww, which are available as public libraries. + +%package apps +Summary: Applications built using Libwww web library +Group: Applications/Internet +Requires: w3c-libwww = %{version}-%{release} + +%description apps + +Web applications built using Libwww: Robot, Command line tool, +line mode browser. The Robot can crawl web sites faster, and +with lower load, than any other web walker that we know of, +due to its extensive pipelining and use of HTTP/1.1. + +The command line tool (w3c) is very useful for manipulation of +Web sites that implement more than just HTTP GET (e.g. PUT, + POST, etc.). + +The line mode browser is a minimal line mode web browser; +often useful to convert to ascii text. + +%prep +%setup -q -n libwww +%patch0 +%patch1 -p1 +%patch2 -p1 -b .ppc64 +%patch3 +%patch100 + +# we don't want the libwww version +rm -fr modules/expat + +#perl config/winConfigure.pl +libtoolize -c -f +aclocal +autoheader +automake --add-missing +autoconf +echo timestamp > stamp-h.in + +%build +%configure --enable-shared --disable-static --with-gnu-ld --with-regex --with-zlib --with-ssl +export tagname=CC +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT + +export tagname=CC +make DESTDIR=$RPM_BUILD_ROOT install + +pushd $RPM_BUILD_ROOT + chmod +x .%{_libdir}/lib{www*,md5}.so.0.* +popd + +install -p -m644 wwwconf.h ${RPM_BUILD_ROOT}/%{_includedir}/w3c-libwww/ + +rm -f ${RPM_BUILD_ROOT}/%{_libdir}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYRIGHT.html LICENSE.html PATCHES.html README.html +%{_libdir}/libwww*.so.* +%{_libdir}/libmd5.so.* +%{_libdir}/libpics.so.* +%{_datadir}/w3c-libwww + +%files apps +%defattr(-,root,root,-) +%{_bindir}/webbot +%{_bindir}/w3c +%{_bindir}/www + +%files devel +%defattr(-,root,root,-) +%{_bindir}/libwww-config +%{_libdir}/lib*.so + +%{_includedir}/w3c-libwww + +%changelog +* Fri Sep 15 2006 Andreas Bierfert +5.4.1-0.4.20060206cvs +- FE6 rebuild + +* Sat Apr 22 2006 Andreas Bierfert +5.4.1-0.3.20060206cvs +- fix md5 (#187895) + +* Tue Feb 28 2006 Andreas Bierfert +5.4.1-0.2.20060206cvs +- readd wwwconfig.h to fix internal header errors + +* Wed Feb 08 2006 Andreas Bierfert +5.4.1-0.1.20060206cvs +- base of cvs snapshot which should have been 5.4.1 + +* Thu Feb 02 2006 Andreas Bierfert +5.4.0-17 +- fixed description... www _is_ included now... + +* Sun Jan 22 2006 Andreas Bierfert +5.4.0-16 +- include suggestions from Patrice Dumas + +* Thu Jan 19 2006 Andreas Bierfert +5.4.0-15 +- revisit for fe inclusion +- include www + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Sep 30 2005 Harald Hoyer - 14 +- fix for libwww's handling of multipart/byteranges content and possible + stack overflow (bug #159597) + +* Thu Mar 03 2005 Harald Hoyer +- rebuilt + +* Thu Feb 24 2005 Harald Hoyer - 5.4.0-12 +- built with ssl + +* Wed Feb 09 2005 Harald Hoyer +- rebuilt + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Jan 29 2004 Harald Hoyer - 5.4.0-8 +- added zlib-devel dependency + +* Thu Aug 7 2003 Elliot Lee 5.4.0-7 +- Fix libtool, auto* + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon Feb 17 2003 Elliot Lee 5.4.0-5 +- ppc64 fixes + +* Wed Jan 29 2003 Harald Hoyer 5.4.0-4 +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Nov 18 2002 Tim Powers +- rebuild on all arches +- lib64'ize +- fix broken %%doc file list + +* Tue Jul 23 2002 Harald Hoyer 5.4.0-1 +- removed prestripping + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Feb 20 2002 Harald Hoyer +- fixed --cflags (#59503) + +* Wed Jan 23 2002 Harald Hoyer 5.3.2-4 +- moved wwwconf.h in w3c-libwww subdir #58060 +- added libpics.so.* #58433 + +* Mon Jan 07 2002 Harald Hoyer 5.3.2-2 +- added wwwconf.h (#58060) + +* Thu Dec 13 2001 Harald Hoyer +- fix for #55526 + +* Tue Jul 10 2001 Tim Powers +- make devel package version dependant + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild for 7.2. + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Matt Wilson +- rebuilt for next release +- added patch to toplevel Makefile.am to honor DESTDIR +- use "make DESTDIR=$RPM_BUILD_ROOT install" + +* Thu Aug 12 1999 Jeff Johnson +- rebuild for 6.1. + +* Mon Apr 12 1999 Jeff Johnson +- repackage for Red Hat 6.0.