+++ /dev/null
---- w3c-libwww-5.3.2/acinclude.m4~ Sat Mar 2 06:30:37 2002
-+++ w3c-libwww-5.3.2/acinclude.m4 Sat Mar 2 06:30:37 2002
-@@ -1,4 +1,4 @@
--AC_DEFUN(AC_SYS_AFS_SYSNAME, [
-+AC_DEFUN([AC_SYS_AFS_SYSNAME], [
- AC_CHECK_PROG(ac_afsws_fs_found, fs, yes)
- AC_MSG_CHECKING(AFS system name)
- AC_CACHE_VAL(ac_cv_sys_afs_sysname, [
-@@ -28,7 +28,7 @@
- dnl ])
-
- dnl AC_PATH_WAIS(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
--AC_DEFUN(AC_PATH_WAIS, [
-+AC_DEFUN([AC_PATH_WAIS], [
- AC_MSG_CHECKING(for WAIS)
- AC_CACHE_VAL(ac_cv_path_wais,
- [
-@@ -53,7 +53,7 @@
- ])
-
- dnl AC_PATH_TCL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
--AC_DEFUN(AC_PATH_TCL, [
-+AC_DEFUN([AC_PATH_TCL], [
- AC_MSG_CHECKING(for TCL)
- AC_CACHE_VAL(ac_cv_path_tcl,
- [
-@@ -79,7 +79,7 @@
- ])
-
- dnl AC_PATH_SOCKS(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
--AC_DEFUN(AC_PATH_SOCKS, [
-+AC_DEFUN([AC_PATH_SOCKS], [
- AC_MSG_CHECKING(for SOCKS)
- AC_CACHE_VAL(ac_cv_path_socks,
- [
-@@ -109,7 +109,7 @@
- ])
-
- dnl AC_PROG_CC_STATIC
--AC_DEFUN(AC_PROG_CC_STATIC,
-+AC_DEFUN([AC_PROG_CC_STATIC],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_MSG_CHECKING(if the C compiler accepts -static)
- AC_CACHE_VAL(ac_cv_prog_cc_static,
-@@ -126,7 +126,7 @@
- ])
-
- dnl AC_PROG_CC_DEBUG
--AC_DEFUN(AC_PROG_CC_DEBUG,
-+AC_DEFUN([AC_PROG_CC_DEBUG],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_MSG_CHECKING(if the C compiler accepts -g)
- AC_CACHE_VAL(ac_cv_prog_cc_debug,
-@@ -143,7 +143,7 @@
- ])
-
- dnl AC_TYPE_FD_SET
--AC_DEFUN(AC_TYPE_FD_SET,
-+AC_DEFUN([AC_TYPE_FD_SET],
- [AC_MSG_CHECKING(for fd_set)
- AC_CACHE_VAL(ac_cv_type_fd_set,
- [ AC_HEADER_INCLUDE(tmp_inc_select, sys/select.h select.h)
-@@ -160,7 +160,7 @@
- ])
-
- dnl AC_C_EXTERN_TYPEDEF_FUNC
--AC_DEFUN(AC_C_EXTERN_TYPEDEF_FUNC,
-+AC_DEFUN([AC_C_EXTERN_TYPEDEF_FUNC],
- [AC_MSG_CHECKING(if an extern declaration of a typedefed function may precede its definition)
- AC_CACHE_VAL(ac_cv_c_extern_typedef_func,
- [AC_TRY_COMPILE([
-@@ -175,7 +175,7 @@
- ])
-
- dnl AC_C_PTR_UNDEF_STRUCT
--AC_DEFUN(AC_C_PTR_UNDEF_STRUCT,
-+AC_DEFUN([AC_C_PTR_UNDEF_STRUCT],
- [AC_MSG_CHECKING(if pointers to undefined structures are allowed)
- AC_CACHE_VAL(ac_cv_c_ptr_undef_struct,
- [AC_TRY_COMPILE([typedef struct _foo foo; extern foo *bar();], bar();,
-@@ -188,7 +188,7 @@
-
- dnl AC_PROG_TELNET_L
- dnl Ok, it's a hack of a method. Got anything better?
--AC_DEFUN(AC_PROG_TELNET_L,
-+AC_DEFUN([AC_PROG_TELNET_L],
- [ AC_MSG_CHECKING(if telnet accepts the -l flag)
- AC_CACHE_VAL(ac_cv_prog_telnet_l,
- [ if test -r `which telnet` \
-@@ -205,7 +205,7 @@
-
- dnl AC_FILE_RESOLV_CONF
- dnl Yeah, it should be very general. So sue me.
--AC_DEFUN(AC_FILE_RESOLV_CONF,
-+AC_DEFUN([AC_FILE_RESOLV_CONF],
- [ AC_MSG_CHECKING(for resolver configuration file)
- AC_CACHE_VAL(ac_cv_file_resolv_conf,
- [ if test -f /etc/resolv.conf; then
-@@ -218,7 +218,7 @@
- ])
-
- dnl AC_CHECK_EXTERN(EXTERN, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
--AC_DEFUN(AC_CHECK_EXTERN,
-+AC_DEFUN([AC_CHECK_EXTERN],
- [ AC_MSG_CHECKING([for $1])
- AC_CACHE_VAL(ac_cv_extern_$1,
- [ AC_TRY_LINK(ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-@@ -240,7 +240,7 @@
- ])
-
- dnl AC_CHECK_EXTERNS(EXTERN... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--AC_DEFUN(AC_CHECK_EXTERNS,
-+AC_DEFUN([AC_CHECK_EXTERNS],
- [for ac_exter in $1
- do
- AC_CHECK_EXTERN($ac_exter,
-@@ -252,7 +252,7 @@
- ])
-
- dnl AC_C_VOLATILE
--AC_DEFUN(AC_C_VOLATILE,
-+AC_DEFUN([AC_C_VOLATILE],
- [ AC_MSG_CHECKING([for working volatile])
- AC_CACHE_VAL(ac_cv_c_volatile,
- [ AC_TRY_COMPILE(,[
-@@ -265,7 +265,7 @@
- ])
-
- dnl AC_C_NOSHARE
--AC_DEFUN(AC_C_NOSHARE,
-+AC_DEFUN([AC_C_NOSHARE],
- [ AC_MSG_CHECKING([for working noshare])
- AC_CACHE_VAL(ac_cv_c_noshare,
- [ AC_TRY_COMPILE(,[
-@@ -278,7 +278,7 @@
- ])
-
- dnl AC_HEADER_INCLUDE(VARIABLE, INCLUDES)
--AC_DEFUN(AC_HEADER_INCLUDE,
-+AC_DEFUN([AC_HEADER_INCLUDE],
- [ $1=""
- for ac_hdr in $2; do
- AC_TRY_CPP([#include <$ac_hdr>], [ $1="[#]include <$ac_hdr>"
-@@ -309,7 +309,7 @@
- dnl strictly my (<roeber@cern.ch>) fault.
- dnl
-
--AC_DEFUN(AC_WEIRD_ACCEPT,
-+AC_DEFUN([AC_WEIRD_ACCEPT],
- [ AC_MSG_CHECKING(for unusual accept call)
- AC_CACHE_VAL(ac_cv_weird_accept,
- [ AC_HEADER_INCLUDE(tmp_inc_types, sys/types.h types.h)
-@@ -404,7 +404,7 @@
- ])
-
- dnl AC_HEADER_TIOCGWINSZ
--AC_DEFUN(AC_HEADER_TIOCGWINSZ,
-+AC_DEFUN([AC_HEADER_TIOCGWINSZ],
- [ AC_MSG_CHECKING([for TIOCGWINSZ get-window-size capability])
- AC_CACHE_VAL(ac_cv_header_tiocgwinsz,
- [ AC_HEADER_INCLUDE(tmp_inc_termios, sys/termios.h termios.h)
-@@ -422,7 +422,7 @@
-
- dnl AC_SYS_NEED_SIGNAL_RESET
- dnl If signal handlers need to be reset, define NEED_SIGNAL_RESET
--AC_DEFUN(AC_SYS_NEED_SIGNAL_RESET,
-+AC_DEFUN([AC_SYS_NEED_SIGNAL_RESET],
- [ AC_MSG_CHECKING(if signal handlers need to be reset)
- AC_CACHE_VAL(ac_cv_sys_need_signal_reset,
- [ AC_TRY_RUN(
-@@ -440,7 +440,7 @@
-
- dnl AC_TYPE_STATUS_T
- dnl Define status_t to be whatever wait/wait3/waitpid want.
--AC_DEFUN(AC_TYPE_STATUS_T,
-+AC_DEFUN([AC_TYPE_STATUS_T],
- [ AC_MSG_CHECKING(for what the wait calls want)
- AC_CACHE_VAL(ac_cv_type_status_t,
- [ AC_TRY_COMPILE([#include <sys/types.h>
-@@ -456,7 +456,7 @@
- dnl if timezone and/or altzone exist, define HAVE_TIMEZONE and/or
- dnl HAVE_ALTZONE respectively. Finally, if the timezone value is
- dnl backwards, define NEGATIVE_TIMEZONE.
--AC_DEFUN(AC_STRUCT_GMTOFF,
-+AC_DEFUN([AC_STRUCT_GMTOFF],
- [ AC_REQUIRE([AC_STRUCT_TM])dnl
- AC_MSG_CHECKING([for tm_gmtoff in struct tm])
- AC_CACHE_VAL(ac_cv_struct_gmtoff,
-@@ -617,7 +617,7 @@
- ])
-
- dnl AC_STRUCT_DIRENT_INO
--AC_DEFUN(AC_STRUCT_DIRENT_INO,
-+AC_DEFUN([AC_STRUCT_DIRENT_INO],
- [ AC_REQUIRE([AC_HEADER_DIRENT])
- AC_MSG_CHECKING(if directory entries have inodes)
- AC_CACHE_VAL(ac_cv_struct_dirent_ino,
-@@ -644,7 +644,7 @@
- ])
-
- dnl AC_STRUCT_WINSIZE
--AC_DEFUN(AC_STRUCT_WINSIZE,
-+AC_DEFUN([AC_STRUCT_WINSIZE],
- [ AC_CACHE_CHECK(for winsize structure, ac_cv_struct_winsize,
- [ AC_TRY_COMPILE([
- #ifdef HAVE_TERMIOS_H
-@@ -661,7 +661,7 @@
- ])
-
- dnl AC_CHECK_SIZEOF_TYPE_T
--AC_DEFUN(AC_CHECK_SIZEOF_TIME_T,
-+AC_DEFUN([AC_CHECK_SIZEOF_TIME_T],
- [AC_CACHE_CHECK(for whether time_t is long, ac_cv_c_long_time_t,
- [AC_TRY_RUN([
- #include <time.h>
-@@ -674,7 +674,7 @@
- ])
-
- dnl AC_CHECK_SIZEOF_SIZE_T
--AC_DEFUN(AC_CHECK_SIZEOF_SIZE_T,
-+AC_DEFUN([AC_CHECK_SIZEOF_SIZE_T],
- [AC_CACHE_CHECK(for whether size_t is long, ac_cv_c_long_size_t,
- [AC_TRY_RUN([
- #include <stddef.h>
-@@ -687,7 +687,7 @@
- ])
-
- dnl AC_ADDLIB
--AC_DEFUN(AC_ADDLIB,
-+AC_DEFUN([AC_ADDLIB],
- [ AC_MSG_CHECKING([for $1])
- LP=`dirname $1`
- LN=`basename $1 | sed 's/lib\(.*\)\.a/\1/g'`
-@@ -700,7 +700,7 @@
- dnl but don't declare them. SunOS, for instance.
- dnl This isn't a perfect test, but we can combine it with HAVE_STRERROR,
- dnl HAVE_SYS_ERRLIST and HAVE_SYS_NERR.
--AC_DEFUN(AC_DECL_NEED_SYS_ERR,
-+AC_DEFUN([AC_DECL_NEED_SYS_ERR],
- [ AC_MSG_CHECKING(if sys_errlist must be declared)
- AC_CACHE_VAL(ac_cv_decl_need_sys_errlist,
- [ AC_HEADER_INCLUDE(tmp_inc_errno, errno.h sys/errno.h)
---- w3c-libwww-5.3.2/configure.in~ Sat Mar 2 06:46:58 2002
-+++ w3c-libwww-5.3.2/configure.in Sat Mar 2 06:46:58 2002
-@@ -986,7 +986,8 @@
- ;;
- *)
- AC_MSG_RESULT(yes)
-- AC_DEFINE(_POSIX_SOURCE) [CFLAGS="$CFLAGS -D_POSIX_SOURCE"]
-+ AC_DEFINE(_POSIX_SOURCE,,[Define if you need to in order for stat and other things to work.])
-+ [CFLAGS="$CFLAGS -D_POSIX_SOURCE"]
- ;;
- esac ],
- AC_MSG_RESULT(no)
---- w3c-libwww-5.3.2/Library/src/Makefile.am~ Sat Mar 2 06:40:12 2002
-+++ w3c-libwww-5.3.2/Library/src/Makefile.am Sat Mar 2 06:40:12 2002
-@@ -47,8 +47,7 @@
- perl $(top_srcdir)/config/winConfigure.pl $(srcdir)
- endif
-
--icondir = @icondir@
--CPPFLAGS := $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\"
-+CPPFLAGS = @CPPFLAGS@ -DW3C_ICONS=\"$(icondir)\"
-
- inc: $(BUILT_SOURCES)
- @echo Generated built sources
-@@ -539,7 +539,7 @@
-
- pkginclude_HEADERS = $(BUILT_SOURCES)
-
--DOCS := $(wildcard *.html)
-+DOCS = $(wildcard *.html)
-
- EXTRA_DIST = \
- $(BUILT_SOURCES) \
---- w3c-libwww-5.4.0/Makefile.am.orig 2002-06-12 11:32:59.000000000 +0200
-+++ w3c-libwww-5.4.0/Makefile.am 2003-10-23 00:32:42.756648688 +0200
-@@ -42,7 +42,6 @@
- chmod -R a+r $(distdir)
- zip -rq $(distdir).zip $(distdir)
- $(TAR) chofz $(distdir).tgz $(distdir)
-- # gzip -f $(distdir).tar
-
- # Tag before making distribution. Also, don't make a distribution if
- # checks fail.
--- w3c-libwww-5.4.0/Library/User/Makefile.am.orig 2002-06-06 16:59:37.000000000 +0200
+++ w3c-libwww-5.4.0/Library/User/Makefile.am 2003-10-23 00:57:54.843776504 +0200
@@ -11,9 +11,6 @@
---- w3c-libwww-5.4.0/Library/src/Makefile.am.orig 2010-11-09 16:19:08.655724837 +0100
-+++ w3c-libwww-5.4.0/Library/src/Makefile.am 2010-11-09 16:35:05.816043461 +0100
+Add inter-library linking.
+HTBind.* moved from libwwwfile to libwwwdir in order to break circular dependencies.
+
+--- w3c-libwww-5.4.2/Library/src/Makefile.am.orig 2018-02-17 23:07:29.681038241 +0100
++++ w3c-libwww-5.4.2/Library/src/Makefile.am 2018-02-17 23:08:36.487704147 +0100
@@ -6,23 +6,23 @@
libwwwutils.la \
libwwwcore.la \
- libwwwcache.la \
+ libwwwhtml.la \
libwwwdir.la \
- libwwwfile.la \
+ libwwwstream.la \
+ libwwwfile.la \
+ libwwwcache.la \
libwwwftp.la \
libwwwgopher.la \
libwwwnews.la \
libwwwtelnet.la \
- libwwwhtml.la \
-- libwwwapp.la \
-- libwwwinit.la \
++ @WWWXML@ \
++ @WWWZIP@ \
+ libwwwapp.la \
+ libwwwinit.la \
libwwwmux.la \
@WWWDAV@ \
- @WWWXML@ \
- @WWWZIP@ \
-+ libwwwapp.la \
-+ libwwwinit.la \
+- @WWWXML@ \
+- @WWWZIP@ \
@WWWWAIS@ \
@WWWSQL@
# .h files are distributed but originally are made from the
# self-documenting hypertext files.
-@@ -143,6 +143,9 @@
+@@ -144,6 +144,8 @@
HTWWWStr.h \
HTWWWStr.c
-+libwwwcore_la_LIBADD = \
-+ libwwwutils.la
++libwwwcore_la_LIBADD = libwwwutils.la
+
libwwwtrans_la_SOURCES = \
WWWTrans.h \
HTANSI.h \
-@@ -158,6 +161,8 @@
+@@ -159,6 +161,8 @@
HTWriter.h \
HTWriter.c
libwwwstream_la_SOURCES = \
WWWStream.h \
HTConLen.h \
-@@ -181,11 +186,15 @@
+@@ -182,22 +186,26 @@
HTXParse.h \
HTXParse.c
-+libwwwstream_la_LIBADD = libwwwfile.la libwwwutils.la libwwwcore.la
++libwwwstream_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
+
libwwwcache_la_SOURCES = \
WWWCache.h \
HTCache.h \
HTCache.c
-+libwwwcache_la_LIBADD = libwwwutils.la libwwwcore.la libwwwtrans.la
++libwwwcache_la_LIBADD = libwwwfile.la libwwwtrans.la libwwwcore.la libwwwutils.la
+
libwwwfile_la_SOURCES = \
WWWFile.h \
HTBInit.h \
-@@ -197,6 +206,8 @@
+ HTBInit.c \
+- HTBind.h \
+- HTBind.c \
+ HTFile.h \
+ HTFile.c \
HTMulti.h \
HTMulti.c
-+libwwwfile_la_LIBADD = libwwwtrans.la libwwwdir.la libwwwutils.la libwwwcore.la
++libwwwfile_la_LIBADD = libwwwdir.la libwwwtrans.la libwwwhtml.la libwwwcore.la libwwwutils.la
+
libwwwftp_la_SOURCES = \
WWWFTP.h \
HTFTP.h \
-@@ -204,11 +215,15 @@
+@@ -205,11 +213,15 @@
HTFTPDir.h \
HTFTPDir.c
-+libwwwftp_la_LIBADD = libwwwutils.la libwwwcore.la libwwwdir.la libwwwfile.la
++libwwwftp_la_LIBADD = libwwwdir.la libwwwcore.la libwwwutils.la
+
libwwwgopher_la_SOURCES = \
WWWGophe.h \
HTGopher.h \
HTGopher.c
-+libwwwgopher_la_LIBADD = libwwwutils.la libwwwcore.la libwwwhtml.la libwwwdir.la
++libwwwgopher_la_LIBADD = libwwwhtml.la libwwwdir.la libwwwcore.la libwwwutils.la
+
libwwwmime_la_SOURCES = \
WWWMIME.h \
HTBound.h \
-@@ -225,6 +240,8 @@
+@@ -226,6 +238,8 @@
HTMIMImp.c \
HTMulpar.h
-+libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwutils.la libwwwcore.la
++libwwwmime_la_LIBADD = libwwwcache.la libwwwstream.la libwwwcore.la libwwwutils.la
+
libwwwhttp_la_SOURCES = \
WWWHTTP.h \
HTTPUtil.h \
-@@ -265,11 +285,15 @@
+@@ -252,7 +266,7 @@
+ HTPEP.h \
+ HTPEP.c
+
+-libwwwhttp_la_DEPENDENCIES = \
++libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \
+ ../../modules/md5/libmd5.la
+
+ libwwwhttp_la_CPPFLAGS = \
+@@ -270,11 +284,15 @@
HTNewsRq.h \
HTNewsRq.c
-+libwwwnews_la_LIBADD = libwwwstream.la libwwwutils.la libwwwcore.la libwwwmime.la
++libwwwnews_la_LIBADD = libwwwmime.la libwwwstream.la libwwwhtml.la libwwwcore.la libwwwutils.la
+
libwwwtelnet_la_SOURCES = \
WWWTelnt.h \
HTTelnet.h \
HTTelnet.c
-+libwwwtelnet_la_LIBADD = libwwwutils.la libwwwcore.la
++libwwwtelnet_la_LIBADD = libwwwcore.la libwwwutils.la
+
libwwwwais_la_SOURCES = \
WWWWAIS.h \
HTWAIS.h \
-@@ -301,6 +325,8 @@
+@@ -283,6 +301,7 @@
+ HTWSRC.c
+
+ libwwwwais_la_LDFLAGS = -rpath $(libdir)
++libwwwwais_la_LIBADD =
+
+ libwwwhtml_la_SOURCES = \
+ WWWHTML.h \
+@@ -306,15 +325,21 @@
HTStyle.h \
HTStyle.c
-+libwwwhtml_la_LIBADD = libwwwutils.la libwwwcore.la
++libwwwhtml_la_LIBADD = libwwwcore.la libwwwutils.la
+
libwwwdir_la_SOURCES = \
WWWDir.h \
HTIcons.h \
-@@ -310,6 +336,9 @@
+ HTIcons.c \
+ HTDescpt.h \
+ HTDescpt.c \
++ HTBind.h \
++ HTBind.c \
HTDir.h \
HTDir.c
-+libwwwdir_la_LIBADD = \
-+ libwwwhtml.la libwwwutils.la libwwwcore.la HTBind.lo
++libwwwdir_la_LIBADD = libwwwhtml.la libwwwcore.la libwwwutils.la
+
libwwwapp_la_SOURCES = \
WWWApp.h \
HTAccess.h \
-@@ -333,11 +362,18 @@
+@@ -338,11 +363,20 @@
HTRules.h \
HTRules.c
+libwwwapp_la_LIBADD = \
-+ libwwwmime.la libwwwdir.la libwwwhttp.la libwwwnews.la libwwwftp.la libwwwxml.la libwwwzip.la \
-+ libwwwgopher.la libwwwtelnet.la libwwwstream.la
++ libwwwftp.la libwwwgopher.la libwwwhttp.la libwwwnews.la libwwwtelnet.la \
++ libwwwcache.la libwwwfile.la libwwwdir.la \
++ libwwwhtml.la libwwwxml.la libwwwzip.la libwwwmime.la \
++ libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
+
libwwwinit_la_SOURCES = \
WWWInit.h \
HTProfil.c
+libwwwinit_la_LIBADD = \
-+ libwwwfile.la libwwwhtml.la libwwwapp.la
++ libwwwapp.la libwwwhtml.la libwwwcache.la libwwwdir.la libwwwcore.la libwwwutils.la
+
libwwwmux_la_SOURCES = \
WWWMux.h \
HTDemux.h \
-@@ -348,12 +384,16 @@
+@@ -353,11 +387,14 @@
HTMuxTx.h \
HTMuxTx.c
-+libwwwmux_la_LIBADD = libwwwutils.la libwwwstream.la libwwwcore.la
++libwwwmux_la_LIBADD = libwwwstream.la libwwwtrans.la libwwwcore.la libwwwutils.la
+
libwwwdav_la_SOURCES = \
HTDAV.h \
HTDAV.c
libwwwdav_la_LDFLAGS = -rpath $(libdir)
++libwwwdav_la_LIBADD = libwwwapp.la libwwwcore.la libwwwutils.la
-+libwwwdav_la_LIBADD = libwwwcore.la libwwwapp.la
-+
libwwwxml_la_SOURCES = \
WWWXML.h \
- HTRDF.h \
-@@ -363,7 +403,7 @@
+@@ -366,9 +403,8 @@
+ HTXML.h \
+ HTXML.c
- libwwwxml_la_LDFLAGS = -rpath $(libdir)
-
--libwwwxml_la_LIBADD = -lexpat
-+libwwwxml_la_LIBADD = -lexpat libwwwcore.la
+-libwwwxml_la_DEPENDENCIES =
+-
+ libwwwxml_la_LDFLAGS = -rpath $(libdir) $(EXPAT_LIBS)
++libwwwxml_la_LIBADD = libwwwcore.la libwwwutils.la -lexpat
libwwwzip_la_SOURCES = \
WWWZip.h \
-@@ -371,6 +411,8 @@
- HTZip.h \
+@@ -377,6 +413,7 @@
HTZip.c
-+libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la
-+
libwwwzip_la_LDFLAGS = -rpath $(libdir)
++libwwwzip_la_LIBADD = libwwwutils.la libwwwcore.la
libwwwsql_la_SOURCES = \
---- w3c-libwww-5.4.0/Library/src/SSL/Makefile.am.orig 2010-11-09 16:38:48.992046302 +0100
-+++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am 2010-11-09 16:44:35.662364395 +0100
-@@ -39,7 +39,8 @@
+ WWWSQL.h \
+@@ -386,7 +423,8 @@
+ HTSQLLog.h \
+ HTSQLLog.c
+
+-libwwwsql_la_LDFLAGS = -rpath $(libdir) $(MYSQL_LIBS)
++libwwwsql_la_LDFLAGS = -rpath $(libdir)
++libwwwsql_la_LIBADD = libwwwcore.la libwwwutils.la $(MYSQL_LIBS)
+
+ libwwwsql_la_CPPFLAGS = \
+ -I/usr/local/include \
+--- w3c-libwww-5.4.2/Library/src/SSL/Makefile.am.orig 2017-06-24 07:51:38.000000000 +0200
++++ w3c-libwww-5.4.2/Library/src/SSL/Makefile.am 2018-02-18 11:29:09.440530134 +0100
+@@ -39,7 +39,10 @@
HTSSLhttps.h \
HTSSLhttps.c
--libwwwssl_la_LDFLAGS = -rpath $(libdir)
-+libwwwssl_la_LDFLAGS = -rpath $(libdir) \
-+ ../libwwwcore.la ../libwwwapp.la ../libwwwhttp.la
+ libwwwssl_la_LDFLAGS = -rpath $(libdir)
++libwwwssl_la_LIBADD = \
++ $(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
++ $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
LDADD = \
libwwwssl.la
---- w3c-libwww-5.4.0/PICS-client/src/Makefile.am.orig 2010-11-09 16:45:44.105885672 +0100
-+++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am 2010-11-09 16:47:56.818021370 +0100
-@@ -30,6 +30,9 @@
+--- w3c-libwww-5.4.2/PICS-client/src/Makefile.am.orig 2017-06-24 07:51:38.000000000 +0200
++++ w3c-libwww-5.4.2/PICS-client/src/Makefile.am 2018-02-18 11:32:54.180527570 +0100
+@@ -30,6 +30,10 @@
CSMacRed.c CSMem.c CSApp.c \
CSParse.c CSUsrLst.c CSUser.c
+libpics_la_LIBADD = \
-+ ../../Library/src/libwwwcore.la ../../Library/src/libwwwapp.la
++ $(top_builddir)/Library/src/libwwwapp.la $(top_builddir)/Library/src/libwwwhttp.la \
++ $(top_builddir)/Library/src/libwwwdir.la $(top_builddir)/Library/src/libwwwcore.la $(top_builddir)/Library/src/libwwwutils.la
+
BUILT_SOURCES = \
CSLApp.h CSLUtils.h \
---- w3c-libwww-5.4.0/libwww-config.in.orig 1999-06-23 20:05:01.000000000 +0200
-+++ w3c-libwww-5.4.0/libwww-config.in 2008-09-19 14:59:04.000000000 +0200
+--- w3c-libwww-5.4.2/libwww-config.in.orig 2018-02-17 09:40:57.951590790 +0100
++++ w3c-libwww-5.4.2/libwww-config.in 2018-02-17 09:45:11.698254561 +0100
@@ -48,7 +48,7 @@
echo -I@includedir@ -I@includedir@/@PACKAGE@ @DEFS@
;;
--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@
-+ echo -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ @LWWWSSL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@
+- echo -L@libdir@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp @LWWWXML@ -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LWWWSSL@ @LIBS@
++ echo @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp @LWWWXML@ -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LWWWSSL@ @LIBS@
;;
*)
echo "${usage}" 1>&2
---- w3c-libwww-5.4.0/configure.in~ 2015-10-22 09:41:53.000000000 +0200
-+++ w3c-libwww-5.4.0/configure.in 2015-10-22 09:44:07.731840971 +0200
+--- w3c-libwww-5.4.0/configure.ac~ 2015-10-22 09:41:53.000000000 +0200
++++ w3c-libwww-5.4.0/configure.ac 2015-10-22 09:44:07.731840971 +0200
@@ -612,11 +612,7 @@
dnl Checks for libwww and OpenSSL:
AC_MSG_CHECKING(whether we can find OpenSSL)
+++ /dev/null
---- w3c-libwww-5.3.2/modules/Makefile.am.orig Mon Feb 22 00:56:18 1999
-+++ w3c-libwww-5.3.2/modules/Makefile.am Sat Jan 25 13:51:39 2003
-@@ -5,5 +5,5 @@
- EXTRA_DIST = \
- $(DOCS)
-
--SUBDIRS = expat md5
-+SUBDIRS = md5
-
---- w3c-libwww-5.3.2/ComLine/src/Makefile.am.orig Fri Aug 4 11:48:37 2000
-+++ w3c-libwww-5.3.2/ComLine/src/Makefile.am Sat Jan 25 14:19:18 2003
-@@ -25,8 +25,7 @@
- SUBDIRS = windows
-
- INCLUDES = \
-- -I$(srcdir)/../../Library/src \
-- -I$(top_srcdir)/modules/expat/xmlparse
-+ -I$(srcdir)/../../Library/src
-
- # .h files are distributed but originally are made from the
- # self-documenting hypertext files.
-@@ -64,7 +63,7 @@
- -rm purify; \
- purify -cache-dir=$(PURIFY_CACHE) \
- $(CC) $(LDFLAGS) -o purify $(w3c_OBJECTS) \
-- -lm \
-+ -lm -lexpat \
- ../../Library/src/.libs/libwwwinit.a \
- ../../Library/src/.libs/libwwwapp.a \
- ../../Library/src/.libs/libwwwxml.a \
-@@ -85,7 +84,5 @@
- ../../Library/src/.libs/libwwwutils.a \
- ../../Library/src/.libs/libwwwzip.a \
- ../../modules/md5/.libs/libmd5.a \
-- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
-- ../../modules/expat/xmltok/.libs/libxmltok.a \
- $(LIBS)
-
---- w3c-libwww-5.3.2/Robot/src/Makefile.am.orig Fri Aug 4 11:48:37 2000
-+++ w3c-libwww-5.3.2/Robot/src/Makefile.am Sat Jan 25 14:20:08 2003
-@@ -25,8 +25,7 @@
- SUBDIRS = windows
-
- INCLUDES = \
-- -I$(srcdir)/../../Library/src \
-- -I$(top_srcdir)/modules/expat/xmlparse
-+ -I$(srcdir)/../../Library/src
-
- # .h files are distributed but originally are made from the
- # self-documenting hypertext files.
-@@ -65,11 +64,9 @@
- -rm purify; \
- purify -cache-dir=$(PURIFY_CACHE) \
- $(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \
-- -lm \
-+ -lm -lexpat \
- ../../Library/src/.libs/libwww.a \
- ../../modules/md5/.libs/libmd5.a \
-- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
-- ../../modules/expat/xmltok/.libs/libxmltok.a \
- $(LIBS)
-
-
---- w3c-libwww-5.3.2/LineMode/src/Makefile.am.orig Fri Aug 4 11:48:37 2000
-+++ w3c-libwww-5.3.2/LineMode/src/Makefile.am Sat Jan 25 14:21:47 2003
-@@ -27,7 +27,6 @@
-
- INCLUDES = \
- -I$(srcdir)/../../Library/src \
-- -I$(top_srcdir)/modules/expat/xmlparse \
- -I$(srcdir)/../../PICS-client/src
-
- # .h files are distributed but originally are made from the
---- w3c-libwww-5.3.2/Library/src/Makefile.am.orig Sat Jan 25 13:50:01 2003
-+++ w3c-libwww-5.3.2/Library/src/Makefile.am Sat Jan 25 14:23:51 2003
-@@ -353,12 +353,10 @@
- HTXML.h \
- HTXML.c
-
--libwwwxml_la_DEPENDENCIES = \
-- ../../modules/expat/xmltok/libxmltok.la \
-- ../../modules/expat/xmlparse/libxmlparse.la
--
- libwwwxml_la_LDFLAGS = -rpath $(libdir)
-
-+libwwwxml_la_LIBADD = -lexpat
-+
- libwwwzip_la_SOURCES = \
- WWWZip.h \
- HTZip.h \
-@@ -379,8 +377,7 @@
-
- INCLUDES = \
- -I/usr/local/include \
-- -I${top_srcdir}/modules/md5 \
-- -I${top_srcdir}/modules/expat/xmlparse
-+ -I${top_srcdir}/modules/md5
-
- BUILT_SOURCES = \
- wwwsys.h \
---- w3c-libwww-5.3.2/Library/src/SSL/Makefile.am.orig Tue Jun 20 13:01:34 2000
-+++ w3c-libwww-5.3.2/Library/src/SSL/Makefile.am Sat Jan 25 14:24:36 2003
-@@ -47,7 +47,6 @@
- INCLUDES = \
- -I/usr/local/include \
- -I${top_srcdir}/modules/md5 \
-- -I${top_srcdir}/modules/expat/xmlparse \
- -I$(top_srcdir)/Library/src \
- @SSLINC@
-
---- w3c-libwww-5.3.2/Library/Examples/Makefile.am.orig Thu Aug 17 21:36:57 2000
-+++ w3c-libwww-5.3.2/Library/Examples/Makefile.am Sat Jan 25 14:22:21 2003
-@@ -31,7 +31,6 @@
-
- INCLUDES = \
- -I$(srcdir)/../src \
-- -I$(top_srcdir)/modules/expat/xmlparse \
- -I$(srcdir)/../src/SSL
-
- DOCS := $(wildcard *.html)
-@@ -45,7 +44,7 @@
- -rm purify; \
- purify -cache-dir=$(PURIFY_CACHE) \
- $(CC) $(LDFLAGS) -o purify $(mget_OBJECTS) \
-- -lm \
-+ -lm -lexpat \
- ../src/.libs/libwwwinit.a \
- ../src/.libs/libwwwapp.a \
- ../src/.libs/libwwwxml.a \
-@@ -66,8 +65,6 @@
- ../src/.libs/libwwwutils.a \
- ../src/.libs/libwwwzip.a \
- ../../modules/md5/.libs/libmd5.a \
-- ../../modules/expat/xmlparse/.libs/libxmlparse.a \
-- ../../modules/expat/xmltok/.libs/libxmltok.a \
- $(LIBS)
-
-
---- w3c-libwww-5.4.0/configure.in.orig 2002-06-12 11:26:46.000000000 +0200
-+++ w3c-libwww-5.4.0/configure.in 2003-10-23 00:25:01.459776472 +0200
-@@ -497,24 +497,24 @@
- AC_MSG_RESULT(yes)
- AC_DEFINE(HT_EXPAT)
- HTXML="HTXML.lo"
-- HTLIBXML='${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
-- XMLTOK="libxmltok.la"
-- XMLPARSE="libxmlparse.la"
-+ HTLIBXML='-lexpat'
-+ XMLTOK=""
-+ XMLPARSE=""
- WWWXML="libwwwxml.la"
-- LWWWXML="-lwwwxml -lxmltok -lxmlparse"
-- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
-+ LWWWXML="-lwwwxml -lexpat"
-+ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la -lexpat'
- 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/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
-- XMLTOK="libxmltok.la"
-- XMLPARSE="libxmlparse.la"
-+ HTLIBXML='-lexpat'
-+ XMLTOK=""
-+ XMLPARSE=""
- WWWXML="libwwwxml.la"
-- LWWWXML="-lwwwxml -lxmltok -lxmlparse"
-- LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
-+ LWWWXML="-lwwwxml -lexpat"
-+ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la -lexpat'
- SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)'
- )
- AC_SUBST(HTXML) # for old style big library
---- w3c-libwww-5.3.2/Library/src/HTXML.h.orig Wed Dec 20 12:00:07 2000
-+++ w3c-libwww-5.3.2/Library/src/HTXML.h Sat Jan 25 14:33:46 2003
-@@ -19,11 +19,7 @@
- of the W3C Sample Code Library.
-
- We use James Clark's expat
--XML parser which is very neat indeed. As the code doesn't come as a separate
--library, I included it in the libwww CVS code base where I compile is as
--two libraries: libxmltok.a and libxmlparse.a. See
--the external modules that libwww works with for
--details. Thanks so much to John Punin for writing this code!
-+XML parser which is very neat indeed.
- */
-
- #ifndef HTXML_H
-@@ -36,7 +36,7 @@
- #include "SGML.h"
- #endif /* HT_STRUCT_XML_STREAM */
-
--#include <xmlparse.h>
-+#include <expat.h>
-
- /*
- .
---- w3c-libwww-5.4.0/configure.in.orig 2008-09-17 13:29:33.000000000 +0200
-+++ w3c-libwww-5.4.0/configure.in 2008-09-17 13:47:03.000000000 +0200
+--- w3c-libwww-5.4.2/configure.ac.orig 2008-09-17 13:29:33.000000000 +0200
++++ w3c-libwww-5.4.2/configure.ac 2008-09-17 13:47:03.000000000 +0200
@@ -541,14 +541,14 @@
AC_DEFINE(HT_MD5)
WWWMD5="libmd5.la"
LWWWMD5="-lmd5"
- LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
-+ LIBWWWMD5='-lmd5'
++ LIBWWWMD5='-lcrypto'
;;
esac ],
AC_MSG_RESULT(yes)
WWWMD5="libmd5.la"
LWWWMD5="-lmd5"
- LIBWWWMD5='${top_builddir}/modules/md5/libmd5.la'
-+ LIBWWWMD5='-lmd5'
++ LIBWWWMD5='-lcrypto'
)
AC_SUBST(WWWMD5)
AC_SUBST(LWWWMD5)
---- w3c-libwww-5.4.0/Robot/src/Makefile.am.orig 2008-09-17 13:29:33.000000000 +0200
-+++ w3c-libwww-5.4.0/Robot/src/Makefile.am 2008-09-17 14:05:35.000000000 +0200
-@@ -20,7 +20,7 @@
- $(top_builddir)/Library/src/libwwwtrans.la \
+--- w3c-libwww-5.4.2/Robot/src/Makefile.am.orig 2018-02-16 22:55:46.492032806 +0100
++++ w3c-libwww-5.4.2/Robot/src/Makefile.am 2018-02-17 09:24:56.628268433 +0100
+@@ -21,7 +21,7 @@
$(top_builddir)/Library/src/libwwwcore.la \
$(top_builddir)/Library/src/libwwwutils.la \
-- -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@
-+ -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@
+ -lm @LIBWWWXML@ @LIBWWWZIP@ @LIBWWWWAIS@ \
+- @LIBWWWSQL@ @LIBWWWMD5@ @LIBWWWSSL@ \
++ @LIBWWWSQL@ @LIBWWWSSL@ \
+ $(MYSQL_LIBS)
SUBDIRS = windows
-
-@@ -66,7 +66,6 @@
+@@ -71,8 +71,6 @@
$(CC) $(LDFLAGS) -o purify $(webbot_OBJECTS) \
- -lm -lexpat \
+ -lm \
../../Library/src/.libs/libwww.a \
- ../../modules/md5/.libs/libmd5.a \
+- ../../modules/expat/.libs/libexpat.a
$(LIBS)
---- w3c-libwww-5.4.0/Library/Examples/Makefile.am.orig 2008-09-17 13:29:33.000000000 +0200
-+++ w3c-libwww-5.4.0/Library/Examples/Makefile.am 2008-09-17 14:06:04.000000000 +0200
+--- w3c-libwww-5.4.2/Library/Examples/Makefile.am.orig 2017-06-24 07:51:37.000000000 +0200
++++ w3c-libwww-5.4.2/Library/Examples/Makefile.am 2018-02-17 09:25:25.091601441 +0100
@@ -28,7 +28,7 @@
../src/libwwwutils.la \
@LIBWWWDAV@ \
- -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@ @LIBWWWMD5@
+ -lm @LIBWWWZIP@ @LIBWWWWAIS@ @LIBWWWSQL@
- INCLUDES = \
+ AM_CPPFLAGS = \
-I$(srcdir)/../src \
-@@ -66,7 +66,6 @@
+@@ -67,8 +67,6 @@
../src/.libs/libwwwutils.a \
../src/.libs/libwwwdav.a \
../src/.libs/libwwwzip.a \
- ../../modules/md5/.libs/libmd5.a \
+- ../../modules/expat/.libs/libexpat.a
$(LIBS)
--- w3c-libwww-5.4.0/Library/src/HTDigest.h.orig 2002-06-12 11:31:20.000000000 +0200
+++ w3c-libwww-5.4.0/Library/src/HTDigest.h 2008-09-17 13:42:22.000000000 +0200
+@@ -39,7 +39,7 @@
+ /* Library include files */
+ #include "WWWLib.h"
+ /* add the MD algorithm header files here below */
+-#include "md5.h"
++#include <openssl/md5.h>
+
+ #ifdef __cplusplus
+ extern "C" {
@@ -60,7 +60,7 @@
typedef struct _HTDigestContext {
int algorithm;
union {
- MD5_CTX md5;
-+ md5_state_t md5;
++ MD5_CTX md5;
} context;
} HTDigestContext;
switch (digesttype) {
case HTDaMD5:
- MD5Init (&context->context.md5);
-+ md5_init (&context->context.md5);
++ MD5_Init (&context->context.md5);
break;
default:
return NO;
switch (context->algorithm) {
case HTDaMD5:
- MD5Update (&context->context.md5, (unsigned char *) input,
-+ md5_append (&context->context.md5, (unsigned char *) input,
++ MD5_Update (&context->context.md5, (unsigned char *) input,
inputLen);
break;
default:
switch (context->algorithm) {
case HTDaMD5:
- MD5Final (digest, &context->context.md5);
-+ md5_finish (&context->context.md5, digest);
++ MD5_Final (&context->context.md5, digest);
break;
default:
return NO;
-SUBDIRS = md5
---- w3c-libwww-5.4.0/Library/src/Makefile.am.orig 2010-11-09 17:07:12.876029313 +0100
-+++ w3c-libwww-5.4.0/Library/src/Makefile.am 2010-11-09 17:09:21.308695152 +0100
-@@ -269,8 +269,11 @@
+--- w3c-libwww-5.4.2/Library/src/Makefile.am.orig 2018-02-17 22:22:57.834402083 +0100
++++ w3c-libwww-5.4.2/Library/src/Makefile.am 2018-02-17 22:24:20.137734478 +0100
+@@ -267,11 +267,7 @@
HTPEP.c
- libwwwhttp_la_DEPENDENCIES = \
+ libwwwhttp_la_LIBADD = libwwwmime.la libwwwstream.la libwwwcore.la libwwwutils.la \
- ../../modules/md5/libmd5.la
-+ libwwwmime.la libwwwutils.la libwwwcore.la
+-
+-libwwwhttp_la_CPPFLAGS = \
+- -I/usr/local/include \
+- -I${top_srcdir}/modules/md5
++ @LIBWWWMD5@
-+libwwwhttp_la_LIBADD = \
-+ @LIBWWWMD5@ libwwwmime.la libwwwutils.la libwwwcore.la
-+
libwwwnews_la_SOURCES = \
WWWNews.h \
- HTNDir.h \
-@@ -422,10 +425,6 @@
+@@ -422,8 +418,6 @@
+ libwwwsql_la_LIBADD = $(MYSQL_LIBS)
- libwwwsql_la_LDFLAGS = -rpath $(libdir)
-
--INCLUDES = \
+ libwwwsql_la_CPPFLAGS = \
- -I/usr/local/include \
-- -I${top_srcdir}/modules/md5
--
+- -I${top_srcdir}/modules/md5 \
+ $(MYSQL_CFLAGS)
+
BUILT_SOURCES = \
- wwwsys.h \
- HTAABrow.h \
+#
+# Conditional build:
+%bcond_without mysql # MySQL based SQL library
+
Summary: HTTP library of common code
Summary(pl.UTF-8): Biblioteka wspólnego kodu HTTP
Summary(pt_BR.UTF-8): Biblioteca HTTP de uso geral
Summary(ru.UTF-8): HTTP-библиотека общеупотребительного кода
Summary(uk.UTF-8): HTTP-бібліотека загальновживаного коду
Name: w3c-libwww
-Version: 5.4.0
-Release: 21
+Version: 5.4.2
+Release: 1
License: W3C (see: http://www.w3.org/Consortium/Legal/copyright-software.html)
Group: Libraries
Source0: http://www.w3.org/Library/Distribution/%{name}-%{version}.tgz
-# Source0-md5: c3734ca6caa405707e134cc8c6d7e422
-Patch0: %{name}-ac25x.patch
-Patch1: %{name}-system-expat.patch
-Patch2: %{name}-amfix.patch
-Patch3: %{name}-link.patch
-Patch4: %{name}-system-libmd5.patch
-Patch5: %{name}-ssl.patch
-Patch6: %{name}-nooldssl.patch
+# Source0-md5: 98d4b7a331996dbe114119d9c06d5f3d
+Patch0: %{name}-amfix.patch
+Patch1: %{name}-link.patch
+Patch2: %{name}-system-libmd5.patch
+Patch3: %{name}-ssl.patch
+Patch4: %{name}-nooldssl.patch
URL: http://www.w3.org/Library/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.69
BuildRequires: automake
-BuildRequires: expat-devel
-BuildRequires: libtool
-BuildRequires: libmd5-devel >= 20020413-2
+BuildRequires: expat-devel >= 2.2.0
+BuildRequires: libtool >= 1.4
+%{?with_mysql:BuildRequires: mysql-devel}
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Summary(uk.UTF-8): Бібліотеки та хедери для програм, що використовують libwww
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: expat-devel
+Requires: expat-devel >= 2.2.0
+%{?with_mysql:Requires: mysql-devel}
Requires: openssl-devel >= 0.9.7c
Requires: zlib-devel
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I config/m4
%{__autoconf}
%{__automake}
%configure \
--with-dav \
--with-gnu-ld \
--with-md5 \
+ %{?with_mysql:--with-mysql=/usr} \
--with-regex \
--with-ssl \
--with-zlib
%files
%defattr(644,root,root,755)
-%doc COPYRIGHT.html ChangeLog LICENSE.html
-%attr(755,root,root) %{_libdir}/libwww*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwww*.so.0
+%doc COPYRIGHT.html ChangeLog LICENSE.html README.html
%attr(755,root,root) %{_libdir}/libpics.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libpics.so.0
+%attr(755,root,root) %{_libdir}/libwwwapp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwapp.so.0
+%attr(755,root,root) %{_libdir}/libwwwcache.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwcache.so.0
+%attr(755,root,root) %{_libdir}/libwwwcore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwcore.so.0
+%attr(755,root,root) %{_libdir}/libwwwdav.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwdav.so.0
+%attr(755,root,root) %{_libdir}/libwwwdir.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwdir.so.0
+%attr(755,root,root) %{_libdir}/libwwwfile.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwfile.so.0
+%attr(755,root,root) %{_libdir}/libwwwftp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwftp.so.0
+%attr(755,root,root) %{_libdir}/libwwwgopher.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwgopher.so.0
+%attr(755,root,root) %{_libdir}/libwwwhtml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwhtml.so.0
+%attr(755,root,root) %{_libdir}/libwwwhttp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwhttp.so.0
+%attr(755,root,root) %{_libdir}/libwwwinit.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwinit.so.0
+%attr(755,root,root) %{_libdir}/libwwwmime.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwmime.so.0
+%attr(755,root,root) %{_libdir}/libwwwmux.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwmux.so.0
+%attr(755,root,root) %{_libdir}/libwwwnews.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwnews.so.0
+%if %{with mysql}
+%attr(755,root,root) %{_libdir}/libwwwsql.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwsql.so.0
+%endif
+%attr(755,root,root) %{_libdir}/libwwwssl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwssl.so.0
+%attr(755,root,root) %{_libdir}/libwwwstream.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwstream.so.0
+%attr(755,root,root) %{_libdir}/libwwwtelnet.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwtelnet.so.0
+%attr(755,root,root) %{_libdir}/libwwwtrans.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwtrans.so.0
+%attr(755,root,root) %{_libdir}/libwwwutils.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwutils.so.0
+%attr(755,root,root) %{_libdir}/libwwwxml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwxml.so.0
+%attr(755,root,root) %{_libdir}/libwwwzip.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwwwzip.so.0
%{_datadir}/w3c-libwww
-%files apps
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/webbot
-%attr(755,root,root) %{_bindir}/w3c
-%attr(755,root,root) %{_bindir}/www
-
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/libwww-config
-%attr(755,root,root) %{_libdir}/libwww*.so
%attr(755,root,root) %{_libdir}/libpics.so
-%{_libdir}/libwww*.la
+%attr(755,root,root) %{_libdir}/libwwwapp.so
+%attr(755,root,root) %{_libdir}/libwwwcache.so
+%attr(755,root,root) %{_libdir}/libwwwcore.so
+%attr(755,root,root) %{_libdir}/libwwwdav.so
+%attr(755,root,root) %{_libdir}/libwwwdir.so
+%attr(755,root,root) %{_libdir}/libwwwfile.so
+%attr(755,root,root) %{_libdir}/libwwwftp.so
+%attr(755,root,root) %{_libdir}/libwwwgopher.so
+%attr(755,root,root) %{_libdir}/libwwwhtml.so
+%attr(755,root,root) %{_libdir}/libwwwhttp.so
+%attr(755,root,root) %{_libdir}/libwwwinit.so
+%attr(755,root,root) %{_libdir}/libwwwmime.so
+%attr(755,root,root) %{_libdir}/libwwwmux.so
+%attr(755,root,root) %{_libdir}/libwwwnews.so
+%if %{with mysql}
+%attr(755,root,root) %{_libdir}/libwwwsql.so
+%endif
+%attr(755,root,root) %{_libdir}/libwwwssl.so
+%attr(755,root,root) %{_libdir}/libwwwstream.so
+%attr(755,root,root) %{_libdir}/libwwwtelnet.so
+%attr(755,root,root) %{_libdir}/libwwwtrans.so
+%attr(755,root,root) %{_libdir}/libwwwutils.so
+%attr(755,root,root) %{_libdir}/libwwwxml.so
+%attr(755,root,root) %{_libdir}/libwwwzip.so
%{_libdir}/libpics.la
+%{_libdir}/libwwwapp.la
+%{_libdir}/libwwwcache.la
+%{_libdir}/libwwwcore.la
+%{_libdir}/libwwwdav.la
+%{_libdir}/libwwwdir.la
+%{_libdir}/libwwwfile.la
+%{_libdir}/libwwwftp.la
+%{_libdir}/libwwwgopher.la
+%{_libdir}/libwwwhtml.la
+%{_libdir}/libwwwhttp.la
+%{_libdir}/libwwwinit.la
+%{_libdir}/libwwwmime.la
+%{_libdir}/libwwwmux.la
+%{_libdir}/libwwwnews.la
+%if %{with mysql}
+%{_libdir}/libwwwsql.la
+%endif
+%{_libdir}/libwwwssl.la
+%{_libdir}/libwwwstream.la
+%{_libdir}/libwwwtelnet.la
+%{_libdir}/libwwwtrans.la
+%{_libdir}/libwwwutils.la
+%{_libdir}/libwwwxml.la
+%{_libdir}/libwwwzip.la
%{_includedir}/wwwconf.h
%{_includedir}/w3c-libwww
%files static
%defattr(644,root,root,755)
-%{_libdir}/libwww*.a
%{_libdir}/libpics.a
+%{_libdir}/libwwwapp.a
+%{_libdir}/libwwwcache.a
+%{_libdir}/libwwwcore.a
+%{_libdir}/libwwwdav.a
+%{_libdir}/libwwwdir.a
+%{_libdir}/libwwwfile.a
+%{_libdir}/libwwwftp.a
+%{_libdir}/libwwwgopher.a
+%{_libdir}/libwwwhtml.a
+%{_libdir}/libwwwhttp.a
+%{_libdir}/libwwwinit.a
+%{_libdir}/libwwwmime.a
+%{_libdir}/libwwwmux.a
+%{_libdir}/libwwwnews.a
+%if %{with mysql}
+%{_libdir}/libwwwsql.a
+%endif
+%{_libdir}/libwwwssl.a
+%{_libdir}/libwwwstream.a
+%{_libdir}/libwwwtelnet.a
+%{_libdir}/libwwwtrans.a
+%{_libdir}/libwwwutils.a
+%{_libdir}/libwwwxml.a
+%{_libdir}/libwwwzip.a
+
+%files apps
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/webbot
+%attr(755,root,root) %{_bindir}/w3c
+%attr(755,root,root) %{_bindir}/www
projects / packages / w3c-libwww.git / commitdiff