diff options
Diffstat (limited to 'net-libs/libwww')
| -rw-r--r-- | net-libs/libwww/Manifest | 15 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-asneeded.patch | 131 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff | 33 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-automake-gentoo.diff | 10 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff | 12 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-htbound.patch | 526 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch | 51 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch | 51 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-noexport.patch | 15 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-5.4.0-respectflags.patch | 48 | ||||
| -rw-r--r-- | net-libs/libwww/files/libwww-config-liborder.patch | 11 | ||||
| -rw-r--r-- | net-libs/libwww/libwww-5.4.0-r3.ebuild | 69 | ||||
| -rw-r--r-- | net-libs/libwww/libwww-5.4.0-r4.ebuild | 73 | ||||
| -rw-r--r-- | net-libs/libwww/libwww-5.4.0-r5.ebuild | 79 | ||||
| -rw-r--r-- | net-libs/libwww/libwww-5.4.0-r6.ebuild | 78 |
15 files changed, 0 insertions, 1202 deletions
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest index 3ca1c952b400..3aae7c6916f8 100644 --- a/net-libs/libwww/Manifest +++ b/net-libs/libwww/Manifest @@ -1,20 +1,5 @@ -AUX libwww-5.4.0-asneeded.patch 3069 RMD160 2ad4e69a0fe92ee3aa963ab3f0545352c71efc20 SHA1 43654eeb3229ab112d6cb93bcab8394fb57d3c8f SHA256 392f715f76294b8cf5875ddaa8d224cb5133b5ead2f4063f0ac5234db71dd8d1 -AUX libwww-5.4.0-autoconf-gentoo.diff 1089 RMD160 aadddad4802da1f5b9f212073df90d171f422e52 SHA1 f04b3753a0c351a2634a1039011f8ef7e904b821 SHA256 630617c79601f664b5752f5331a2abb3eaae70ac3365ba84498475067f6dbcfa -AUX libwww-5.4.0-automake-gentoo.diff 346 RMD160 16b6e244bd0d325d00c0ea6f4185552824cc6b60 SHA1 2bf0471eef168db4f5f9a54ab31007767751ba92 SHA256 e9d7489f5ee2226cdd602939f82a559cefdd9a9cb4b3c98c316bae05c989c8d9 -AUX libwww-5.4.0-disable-ndebug-gentoo.diff 370 RMD160 8918de13a34d418cd55cb98930640265c48f6571 SHA1 2d4c29c5d2a06975aff2cd3d1b4ce9f6fed0f8d5 SHA256 39bdcca0efc334c9a86a10090fcb2dbfaf9ca427bfd12ac2486b0533287c45f9 -AUX libwww-5.4.0-htbound.patch 13279 RMD160 77fe8970180e7bcf79b994f78cb986b2f172d2db SHA1 b9c1460f8a34cef355d836b3d6dcb77bcd1fd351 SHA256 22d94546f706e263b28370b00207d6ad09739c98a6463d4341b94991ac981ad7 -AUX libwww-5.4.0-mysql-4.0.patch 1674 RMD160 0f9bdfe400357b947314f50c935bf7fcff5dae88 SHA1 581cb8a719d738499699c76d6a10c2b9cc7a01f1 SHA256 bfbeb72ac10be380febad60c746935a8ce4eb69a73eacf9725d7c51eeca26232 -AUX libwww-5.4.0-mysql-4.1.patch 1674 RMD160 39ca32835af65fa781d3c3465f33fc9743d38c34 SHA1 a54dccfc28a4bf15f1a78aa5a29cdb6314909bb9 SHA256 b99508bf1cccb00ad55538a019d70ff165998701282e00faab2ec1b9df43ed01 -AUX libwww-5.4.0-noexport.patch 402 RMD160 0074a161a985b08fa797dd91decea320a23f1dfd SHA1 30242525c24e97088f3fa122060a1369bebb1877 SHA256 f2fa63b1d94ebdec9b77dd6758222e2e6fb232b467b0c5f3f5efaa8ec2265c55 -AUX libwww-5.4.0-respectflags.patch 1673 RMD160 751551e3d0c104e4b6a6f81fa815100d28200e37 SHA1 d98268d2236bb1c6e57d4e0e60f3d9bf441fd17f SHA256 23e24af3d68ad8c33114440e25c6d0678aa4fec71988280c27a90d166b6f825f -AUX libwww-config-liborder.patch 776 RMD160 c6b2f017f1c2ecb036aca3e6d497a1e2fc2e2d6f SHA1 93c6ff7912aec6ea085cda65447b0aae0156c125 SHA256 01aa28bd0516ccfff053c07e02a0c323e0403a86be1845d6d5671e776a95d6d2 -DIST libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338 RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 SHA1 322f9ee1c55792937c1058b81a0c8980b4b3d95c SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb DIST libwww-5.4.0-patches-1.2.tar.bz2 16146 RMD160 6bf4484c018bf9c21d822bb3b433c8d491026967 SHA1 55c40c74e6e8b4e020a9307ecb09a59906398e98 SHA256 ad3d1c37f1421bd46d283ac30af3df2bd645c7498525578430e26629cfb3cf88 DIST w3c-libwww-5.4.0.tgz 1129121 RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b SHA1 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63 SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef -EBUILD libwww-5.4.0-r3.ebuild 1713 RMD160 6d0c9a00a68eeff98fa216d596a11b9cb7190a2f SHA1 2dbfb05080b109864ed414a62bfaae614c1a020c SHA256 7b0b7348ffbf3337adfc6dbeced44b5c9566147e511c0d7f9a0fd8f7e400dd06 -EBUILD libwww-5.4.0-r4.ebuild 1891 RMD160 303b2fc39ee66ef7b63c84c4ddf8c1797408858f SHA1 9189e6292f6a976d1c7e4f53aed54aae3e607b1f SHA256 b8850c0c97a031806f524727a9ea9b2b83a37f2c969066bc70641ff7a34134a0 -EBUILD libwww-5.4.0-r5.ebuild 2206 RMD160 0a6769c7207d22d3f67266d08013cd3939beef9c SHA1 813e36640a28cc4267640f0db1a6be6894cbda49 SHA256 fa909af4ed147507b125caf56d7fcfbf8a3ed933c7a7debfdb8fee2566f770de -EBUILD libwww-5.4.0-r6.ebuild 2166 RMD160 04b5850ca7f7caa9add3e1070146673bde06b807 SHA1 6845e7e53f39f1a615d1d40b33eac5454e088aea SHA256 35eb8bf151d5afd21b23966e2f72717ac74ff11e69e6b7bbb7f033fb02668810 EBUILD libwww-5.4.0-r7.ebuild 1425 RMD160 01d52ddab2dc75a79d2f75a7d16fb0de3a7f3016 SHA1 f6ea17d42e691367f23d87c45424a8cab07ffc83 SHA256 cc091ac2d76b97ec0ce3be8f65d542ddff9761ff6785834d5f4c2d51054f5998 MISC ChangeLog 11442 RMD160 6503fd1bc51a8f52255ac2953cc436307dd311b7 SHA1 0f43bce902e53238f91f9f903e7e96fbb66568f5 SHA256 a0d56f293bfb53fa38ea7a44c200f443c5bdab61fe9e64026f30e5203e195e06 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f diff --git a/net-libs/libwww/files/libwww-5.4.0-asneeded.patch b/net-libs/libwww/files/libwww-5.4.0-asneeded.patch deleted file mode 100644 index d7fddbc443ac..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-asneeded.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -urN w3c-libwww-5.4.0.orig/Library/src/Makefile.am w3c-libwww-5.4.0/Library/src/Makefile.am ---- w3c-libwww-5.4.0.orig/Library/src/Makefile.am 2002-05-29 18:09:13.000000000 +0200 -+++ w3c-libwww-5.4.0/Library/src/Makefile.am 2006-04-30 22:54:18.000000000 +0200 -@@ -33,7 +33,7 @@ - libwwwdav.la \ - libwwwsql.la - --SUBDIRS = SSL windows vms -+SUBDIRS = . SSL windows vms - - # .h files are distributed but originally are made from the - # self-documenting hypertext files. -@@ -144,6 +144,9 @@ - HTWWWStr.h \ - HTWWWStr.c - -+libwwwcore_la_LIBADD = \ -+ libwwwutils.la -+ - libwwwtrans_la_SOURCES = \ - WWWTrans.h \ - HTANSI.h \ -@@ -181,6 +184,7 @@ - HTTee.c \ - HTXParse.h \ - HTXParse.c -+libwwwstream_la_LIBADD = libwwwfile.la - - libwwwcache_la_SOURCES = \ - WWWCache.h \ -@@ -197,6 +201,9 @@ - HTFile.c \ - HTMulti.h \ - HTMulti.c -+libwwwfile_la_LIBADD = \ -+ libwwwdir.la \ -+ libwwwtrans.la - - libwwwftp_la_SOURCES = \ - WWWFTP.h \ -@@ -225,6 +232,9 @@ - HTMIMImp.h \ - HTMIMImp.c \ - HTMulpar.h -+libwwwmime_la_LIBADD = \ -+ libwwwcache.la \ -+ libwwwstream.la - - libwwwhttp_la_SOURCES = \ - WWWHTTP.h \ -@@ -252,8 +262,9 @@ - HTPEP.h \ - HTPEP.c - --libwwwhttp_la_DEPENDENCIES = \ -- ../../modules/md5/libmd5.la -+libwwwhttp_la_LIBADD = \ -+ ../../modules/md5/libmd5.la \ -+ libwwwmime.la - - libwwwnews_la_SOURCES = \ - WWWNews.h \ -@@ -310,6 +321,8 @@ - HTDescpt.c \ - HTDir.h \ - HTDir.c -+libwwwdir_la_LIBADD = \ -+ libwwwhtml.la - - libwwwapp_la_SOURCES = \ - WWWApp.h \ -@@ -334,6 +347,16 @@ - HTRules.h \ - HTRules.c - -+libwwwapp_la_LIBADD = \ -+ libwwwmime.la \ -+ libwwwhttp.la \ -+ libwwwnews.la \ -+ libwwwftp.la \ -+ libwwwxml.la \ -+ libwwwtelnet.la \ -+ libwwwgopher.la \ -+ libwwwzip.la -+ - libwwwinit_la_SOURCES = \ - WWWInit.h \ - HTProfil.h \ -@@ -362,9 +385,10 @@ - HTXML.h \ - HTXML.c - --libwwwxml_la_DEPENDENCIES = \ -+libwwwxml_la_LIBADD = \ - ../../modules/expat/xmltok/libxmltok.la \ -- ../../modules/expat/xmlparse/libxmlparse.la -+ ../../modules/expat/xmlparse/libxmlparse.la \ -+ libwwwcore.la - - libwwwxml_la_LDFLAGS = -rpath $(libdir) - -diff -urN w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am w3c-libwww-5.4.0/Library/src/SSL/Makefile.am ---- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am 2000-06-20 13:01:34.000000000 +0200 -+++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am 2006-04-30 22:53:39.000000000 +0200 -@@ -39,6 +39,14 @@ - HTSSLhttps.h \ - HTSSLhttps.c - -+libwwwssl_la_LIBADD = \ -+ ../libwwwtrans.la \ -+ ../libwwwhttp.la -+ -+libwwwssl_la_DEPENDENCIES = \ -+ ../libwwwtrans.la \ -+ ../libwwwhttp.la -+ - libwwwssl_la_LDFLAGS = -rpath $(libdir) - - LDADD = \ -diff -urN w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am w3c-libwww-5.4.0/PICS-client/src/Makefile.am ---- w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am 2000-08-04 11:48:37.000000000 +0200 -+++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am 2006-04-30 22:53:39.000000000 +0200 -@@ -29,6 +29,8 @@ - CSLabel.c CSLLOut.c CSLLURLs.c \ - CSMacRed.c CSMem.c CSApp.c \ - CSParse.c CSUsrLst.c CSUser.c -+libpics_la_LIBADD = \ -+ ../../Library/src/libwwwmime.la - - BUILT_SOURCES = \ - CSLApp.h CSLUtils.h \ diff --git a/net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff b/net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff deleted file mode 100644 index 38b08d6a9468..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-autoconf-gentoo.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN w3c-libwww-5.4.0.ORIG/configure.ac w3c-libwww-5.4.0/configure.ac ---- w3c-libwww-5.4.0.ORIG/configure.ac 2004-03-13 00:45:36.985124000 +0900 -+++ w3c-libwww-5.4.0/configure.ac 2004-03-13 00:49:13.225250888 +0900 -@@ -623,19 +623,16 @@ - ssllib="-L/usr/lib -lssl -lcrypto" - fi - dnl find the ssl include dir (empirical) --if test -d '/usr/local/ssl/include'; then -- sslinc="-I/usr/local/ssl/include" --elif test -d '/usr/local/openssl/include'; then -- sslinc="-I/usr/local/openssl/include" --elif test -d '/usr/local/include/openssl'; then -- sslinc="-I/usr/local/include/openssl" --elif test -d '/usr/include/ssl'; then -- sslinc="-I/usr/include/ssl" --elif test -d '/usr/include/openssl'; then -- sslinc="-I/usr/include/openssl" --else -- sslinc="" --fi -+ssldir="" -+for ssldir in /usr/local/ssl/include \ -+ /usr/local/openssl/include \ -+ /usr/local/include/openssl \ -+ /usr/include/ssl \ -+ /usr/include/openssl ; do -+ if test -d $ssldir -a -f $ssldir/ssl.h ; then -+ sslinc="-I$ssldir" -+ fi -+done - WWWSSL="" - SSLINC="" - LIBSSL="" diff --git a/net-libs/libwww/files/libwww-5.4.0-automake-gentoo.diff b/net-libs/libwww/files/libwww-5.4.0-automake-gentoo.diff deleted file mode 100644 index 23fd218cea61..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-automake-gentoo.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig 2004-03-25 06:04:30.714634312 +0900 -+++ Makefile.am 2004-03-25 06:04:30.715634160 +0900 -@@ -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. diff --git a/net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff b/net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff deleted file mode 100644 index eb18186e0bb5..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN Library.ORIG/src/HTUtils.h Library/src/HTUtils.h ---- Library.ORIG/src/HTUtils.h 2002-06-12 18:31:21.000000000 +0900 -+++ Library/src/HTUtils.h 2004-05-10 00:03:01.043447592 +0900 -@@ -56,7 +56,7 @@ - is possible to see parts of the output messages. - */ - --#if defined(NODEBUG) || defined(NDEBUG) || defined(_NDEBUG) -+#if 0 - #undef HTDEBUG - #else - #ifndef HTDEBUG diff --git a/net-libs/libwww/files/libwww-5.4.0-htbound.patch b/net-libs/libwww/files/libwww-5.4.0-htbound.patch deleted file mode 100644 index 111208a276c9..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-htbound.patch +++ /dev/null @@ -1,526 +0,0 @@ -diff -NurdB w3c-libwww-5.4.0/Library/src/HTBound.c w3c-libwww-5.4.0-patched/Library/src/HTBound.c ---- w3c-libwww-5.4.0/Library/src/HTBound.c 1999-02-22 17:10:10.000000000 -0500 -+++ w3c-libwww-5.4.0-patched/Library/src/HTBound.c 2005-10-27 08:23:47.000000000 -0500 -@@ -11,9 +11,12 @@ - ** - ** Authors - ** HF Henrik Frystyk <frystyk@w3.org> -+** SV Sam Varshavchik <mrsam@courier-mta.com> - ** - ** History: - ** Nov 95 Written from scratch -+** SV Jun 05 Rewrote HTBoundary_put_block. Fixed many bugs+segfaults. -+** SV Jul 05 Fix double-counting of processed bytes. - ** - */ - -@@ -23,104 +26,395 @@ - #include "WWWCore.h" - #include "HTMerge.h" - #include "HTReqMan.h" -+#include "HTNetMan.h" -+#include "HTChannl.h" - #include "HTBound.h" /* Implemented here */ - --#define PUTBLOCK(b, l) (*me->target->isa->put_block)(me->target, b, l) -+#define PUTBLOCK(b, l) (me->target ? (*me->target->isa->put_block)(me->target, b, l):HT_OK) -+ - #define PUTDEBUG(b, l) (*me->debug->isa->put_block)(me->debug, b, l) - #define FREE_TARGET (*me->target->isa->_free)(me->target) - - struct _HTStream { - const HTStreamClass * isa; -+ HTNet * net; - HTStream * target; - HTStream * orig_target; - HTFormat format; - HTStream * debug; /* For preamble and epilog */ - HTRequest * request; -- BOOL body; /* Body or preamble|epilog */ -- HTEOLState state; -- int dash; /* Number of dashes */ - char * boundary; -- char * bpos; -+ -+ BOOL keptcrlf; -+ int (*state)(HTStream *, const char *, int); -+ -+ char *boundary_ptr; -+ - }; - -+PRIVATE int HTBoundary_flush (HTStream * me); -+ - /* ------------------------------------------------------------------------- */ - -+PRIVATE int start_of_line (HTStream * me, const char * b, int l); -+PRIVATE int seen_dash (HTStream * me, const char * b, int l); -+PRIVATE int seen_doubledash (HTStream * me, const char * b, int l); -+PRIVATE int seen_delimiter_nonterminal(HTStream * me, const char * b, int l); -+PRIVATE int seen_delimiter_nonterminal_CR(HTStream * me, const char * b, int l); -+PRIVATE int seen_delimiter_dash(HTStream * me, const char * b, int l); -+PRIVATE int seen_delimiter_terminal(HTStream * me, const char * b, int l); -+PRIVATE int seen_delimiter_terminal_CR(HTStream * me, const char * b, int l); -+PRIVATE int not_delimiter(HTStream * me, const char * b, int l, int extra); -+PRIVATE int seen_nothing(HTStream * me, const char * b, int l); -+PRIVATE int seen_cr(HTStream * me, const char * b, int l); -+PRIVATE void process_boundary(HTStream *me, int isterminal); -+ -+#define UNUSED(l) (l=l) /* Shut up about unused variables */ -+ - PRIVATE int HTBoundary_put_block (HTStream * me, const char * b, int l) - { -- const char *start = b; -- const char *end = b; -- while (l-- > 0) { -- if (me->state == EOL_FCR) { -- me->state = (*b == LF) ? EOL_FLF : EOL_BEGIN; -- } else if (me->state == EOL_FLF) { -- if (me->dash == 2) { -- while (l>0 && *me->bpos && *me->bpos==*b) l--, me->bpos++, b++; -- if (!*me->bpos) { -- HTTRACE(STREAM_TRACE, "Boundary.... `%s\' found\n" _ me->boundary); -- me->bpos = me->boundary; -- me->body = YES; -- me->state = EOL_DOT; -- } else if (l>0) { -- me->dash = 0; -- me->bpos = me->boundary; -- me->state = EOL_BEGIN; -- } -- } -- if (*b == '-') { -- me->dash++; -- } else if (*b != CR && *b != LF) { -- me->dash = 0; -- me->state = EOL_BEGIN; -- } -- } else if (me->state == EOL_SLF) { /* Look for closing '--' */ -- if (me->dash == 4) { -- if (end > start) { -- int status = PUTBLOCK(start, end-start); -- if (status != HT_OK) return status; -+ /* -+ ** The HTBoundary object gets attached downstream of HTMime. -+ ** The HTBoundary object creates another HTMime object downstream of -+ ** the HTBoundary object. -+ ** -+ ** When we push data downstream to the second HTBoundary object, it -+ ** updates the bytes read count in the HTNet object. -+ ** -+ ** When we return to the parent HTMime object, itupdates the -+ ** bytes read count in the HTNet object again. Oops. -+ ** -+ ** Same thing happens with the consumed byte count. We can prevent -+ ** the consumed byte counts from being updated by temporary setting -+ ** the input channel stream pointer to NULL, but for the byte counts -+ ** we have to save them and restore them before existing. -+ ** -+ ** This bug was discovered by chance when a multipart/partial response -+ ** was partially received, and as a result of double-counting the -+ ** real response got cut off (because HTMime thought that more bytes -+ ** were processed than actually were, thus it processed only the -+ ** partial count of the remaining bytes in the response). When the -+ ** multipart/partial response was received all at once this bug did -+ ** not get triggered. -+ */ -+ -+ HTHost *host=HTNet_host(me->net); -+ HTChannel *c=HTHost_channel(host); -+ HTInputStream *i=HTChannel_input(c); -+ -+ long saveBytesRead=HTNet_bytesRead(me->net); -+ long saveHeaderBytesRead=HTNet_headerBytesRead(me->net); -+ -+ if (i) -+ HTChannel_setInput(c, NULL); -+ -+ HTTRACE(STREAM_TRACE, "Boundary: processing %d bytes\n" _ l); -+ /* Main loop consumes all input */ -+ -+ while (l) -+ { -+ int n= (*me->state)(me, b, l); -+ -+ if (n == 0) -+ return HT_ERROR; -+ b += n; -+ l -= n; -+ } -+ -+ if (i) -+ HTChannel_setInput(c, i); -+ HTNet_setBytesRead(me->net, saveBytesRead); -+ HTNet_setHeaderBytesRead(me->net, saveHeaderBytesRead); -+ -+ return HT_OK; -+} -+ -+/* -+** Start of line, keptcrlf=YES if we've kept the preceding CRLF from downstream -+** and we'll pass it along if we decide that this is not a boundary delimiter. -+*/ -+ -+PRIVATE int start_of_line (HTStream * me, const char * b, int l) -+{ -+ if (*b != '-') -+ return not_delimiter(me, b, l, 0); -+ -+ HTTRACE(STREAM_TRACE, "Boundary: start of line: input '-'\n"); -+ -+ me->state= seen_dash; -+ -+ return 1; -+} -+ -+/* -+** Line: - -+*/ -+ -+PRIVATE int seen_dash (HTStream * me, const char * b, int l) -+{ -+ if (*b != '-') -+ return not_delimiter(me, b, l, 1); -+ -+ HTTRACE(STREAM_TRACE, "Boundary: start of line: input '--'\n"); -+ -+ me->state= seen_doubledash; -+ me->boundary_ptr=me->boundary; -+ return 1; -+} -+ -+/* -+** Line: -- -+*/ -+ -+PRIVATE int seen_doubledash (HTStream * me, const char * b, int l) -+{ -+ me->state=seen_doubledash; -+ -+ if (*me->boundary_ptr) -+ { -+ if (*b != *me->boundary_ptr) -+ { -+ return not_delimiter(me, b, l, -+ me->boundary_ptr - me->boundary -+ + 2); - } -- HTTRACE(STREAM_TRACE, "Boundary.... Ending\n"); -- start = b; -- me->dash = 0; -- me->state = EOL_BEGIN; -- } -- if (*b == '-') { -- me->dash++; -- } else if (*b != CR && *b != LF) { -- me->dash = 0; -- me->state = EOL_BEGIN; -- } -- me->body = NO; -- } else if (me->state == EOL_DOT) { -- int status; -- if (me->body) { -- if (me->target) FREE_TARGET; -+ ++me->boundary_ptr; -+ return 1; -+ } -+ -+ /* -+ ** Line: --delimiter -+ */ -+ -+ if (*b == '-') -+ { -+ HTTRACE(STREAM_TRACE, -+ "Boundary: start of line: input '--%s-'\n" -+ _ me->boundary); -+ -+ me->state=seen_delimiter_dash; -+ return 1; -+ } -+ -+ HTTRACE(STREAM_TRACE, -+ "Boundary: Found: '--%s'\n" _ me->boundary); -+ -+ return seen_delimiter_nonterminal(me, b, l); -+} -+ -+/* -+** Line: --delimiter -+** -+** Waiting for CRLF. -+*/ -+ -+ -+PRIVATE int seen_delimiter_nonterminal(HTStream * me, const char * b, int l) -+{ -+ UNUSED(l); -+ -+ me->state=seen_delimiter_nonterminal; -+ if (*b == CR) -+ me->state=seen_delimiter_nonterminal_CR; -+ -+ return 1; -+} -+ -+/* -+** Line: --delimiter<CR> -+*/ -+ -+PRIVATE int seen_delimiter_nonterminal_CR(HTStream * me, const char * b, int l) -+{ -+ HTTRACE(STREAM_TRACE, -+ "Boundary: Found: '--%s<CR>'\n" _ me->boundary); -+ -+ if (*b != LF) -+ return seen_delimiter_nonterminal(me, b, l); -+ -+ HTTRACE(STREAM_TRACE, -+ "Boundary: Found: '--%s<CR><LF>'\n" _ me->boundary); -+ -+ process_boundary(me, NO); -+ return 1; -+} -+ -+/* -+** Line: --delimiter- -+*/ -+ -+PRIVATE int seen_delimiter_dash(HTStream * me, const char * b, int l) -+{ -+ if (*b != '-') -+ return seen_delimiter_nonterminal(me, b, l); -+ -+ HTTRACE(STREAM_TRACE, -+ "Boundary: start of line: input '--%s--'\n" -+ _ me->boundary); -+ -+ me->state=seen_delimiter_terminal; -+ return 1; -+} -+ -+/* -+** Line: --delimiter-- -+*/ -+ -+PRIVATE int seen_delimiter_terminal(HTStream * me, const char * b, int l) -+{ -+ UNUSED(l); -+ -+ me->state=seen_delimiter_terminal; -+ -+ if (*b == CR) -+ me->state=seen_delimiter_terminal_CR; -+ return 1; -+} -+/* -+** Line: --delimiter--<CR> -+*/ -+ -+PRIVATE int seen_delimiter_terminal_CR(HTStream * me, const char * b, int l) -+{ -+ HTTRACE(STREAM_TRACE, -+ "Boundary: Found '--%s--<CR>'\n" -+ _ me->boundary); -+ -+ if (*b != LF) -+ return seen_delimiter_terminal(me, b, l); -+ HTTRACE(STREAM_TRACE, -+ "Boundary: Found '--%s--<CR><LF>'\n" -+ _ me->boundary); -+ -+ process_boundary(me, YES); -+ return 1; -+} -+ -+/* -+** Beginning of the line does not contain a delimiter. -+** -+** -+** extra: Count of characters in a partially matched delimiter. Since it's -+** not a delimiter this is content that needs to go downstream. -+*/ -+ -+PRIVATE int not_delimiter(HTStream * me, const char * b, int l, int extra) -+{ -+ HTTRACE(STREAM_TRACE, "Boundary: not a delimiter line\n"); -+ -+ if (me->keptcrlf) -+ { -+ HTTRACE(STREAM_TRACE, "Boundary: Sending previous line's <CR><LF>\n"); -+ /* -+ ** Did not process CRLF from previous line, because prev CRLF -+ ** is considered a part of the delimiter. See MIME RFC. -+ */ -+ -+ me->keptcrlf=NO; -+ if (PUTBLOCK("\r\n", 2) != HT_OK) -+ return 0; -+ } -+ -+ /* -+ ** Potentially matched some of: --DELIMITER -+ */ -+ -+ if (extra) -+ { -+ HTTRACE(STREAM_TRACE, "Boundary: Sending partially-matched %d characters\n" _ extra); -+ -+ if (PUTBLOCK("--", extra > 2 ? 2:extra) != HT_OK) -+ return 0; -+ -+ if (extra > 2) -+ if (PUTBLOCK(me->boundary, extra-2) != HT_OK) -+ return 0; -+ } -+ return seen_nothing(me, b, l); -+} -+ -+/* -+** We're not looking for a delimiter. Look for the next line of input -+** in the data that could potentially be a delimiter. -+*/ -+ -+PRIVATE int seen_nothing(HTStream * me, const char * b, int l) -+{ -+ int i; -+ -+ me->state=seen_nothing; -+ -+ for (i=0; i<l; i++) -+ { -+ if (b[i] != CR) -+ continue; -+ -+ /* -+ ** If we have at least four more characters in unconsumed -+ ** input, and they're not \r\n--, we can safely skip over -+ ** them. -+ */ -+ -+ if (l-i > 4 && -+ strncmp(b+i, "\r\n--", 4)) -+ continue; -+ break; -+ } -+ -+ if (i == 0) -+ { -+ /* Could only be a CR here. */ -+ -+ me->state=seen_cr; -+ return 1; -+ } -+ -+ HTTRACE(STREAM_TRACE, "Boundary: Processed %d (out of %d) bytes\n" -+ _ i _ l); -+ -+ if (PUTBLOCK(b, i) != HT_OK) -+ return 0; -+ -+ return i; -+} -+ -+/* -+** State: seen a CR -+*/ -+ -+PRIVATE int seen_cr(HTStream * me, const char * b, int l) -+{ -+ HTTRACE(STREAM_TRACE, "Boundary: Processed <CR>\n"); -+ -+ if (*b != LF) -+ { -+ HTTRACE(STREAM_TRACE, "Boundary: ... <LF> didn't follow\n"); -+ if (PUTBLOCK("\r", 1) != HT_OK) -+ return 0; -+ return seen_nothing(me, b, l); -+ } -+ -+ HTTRACE(STREAM_TRACE, "Boundary: Processed <CR><LF>\n"); -+ me->state=start_of_line; -+ me->keptcrlf=YES; -+ return 1; -+} -+ -+PRIVATE void process_boundary(HTStream *me, int isterminal) -+{ -+ HTBoundary_flush(me); -+ if (me->target) FREE_TARGET; -+ me->target=NULL; -+ me->state=start_of_line; -+ me->keptcrlf=NO; -+ -+ if (!isterminal) - me->target = HTStreamStack(WWW_MIME,me->format, - HTMerge(me->orig_target, 2), - me->request, YES); -- if (end > start) { -- if ((status = PUTBLOCK(start, end-start)) != HT_OK) -- return status; -- } -- } else { -- if (me->debug) -- if ((status = PUTDEBUG(start, end-start)) != HT_OK) -- return status; -- } -- start = b; -- if (*b == '-') me->dash++; -- me->state = EOL_SLF; -- } else if (*b == CR) { -- me->state = EOL_FCR; -- end = b; -- } else if (*b == LF) { -- if (me->state != EOL_FCR) end = b; -- me->state = EOL_FLF; -- } -- b++; -- } -- return (start<b && me->body) ? PUTBLOCK(start, b-start) : HT_OK; - } - -+ - PRIVATE int HTBoundary_put_string (HTStream * me, const char * s) - { - return HTBoundary_put_block(me, s, (int) strlen(s)); -@@ -133,7 +427,9 @@ - - PRIVATE int HTBoundary_flush (HTStream * me) - { -- return (*me->target->isa->flush)(me->target); -+ if (me->target == NULL) -+ return HT_OK; -+ return (*me->target->isa->flush)(me->target); - } - - PRIVATE int HTBoundary_free (HTStream * me) -@@ -182,18 +478,26 @@ - HTResponse_formatParam(response) : - HTAnchor_formatParam(anchor); - char * boundary = HTAssocList_findObject(type_param, "boundary"); -+ -+ UNUSED(param); -+ UNUSED(input_format); -+ - if (boundary) { - HTStream * me; - if ((me = (HTStream *) HT_CALLOC(1, sizeof(HTStream))) == NULL) - HT_OUTOFMEM("HTBoundary"); - me->isa = &HTBoundaryClass; -- me->request = request; -+ me->net = HTRequest_net(request); -+ me->request = request; - me->format = output_format; - me->orig_target = output_stream; - me->debug = HTRequest_debugStream(request); -- me->state = EOL_FLF; -+ -+ me->state = start_of_line; -+ me->keptcrlf=NO; -+ - StrAllocCopy(me->boundary, boundary); /* Local copy */ -- me->bpos = me->boundary; -+ - HTTRACE(STREAM_TRACE, "Boundary.... Stream created with boundary '%s\'\n" _ me->boundary); - return me; - } else { diff --git a/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch b/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch deleted file mode 100644 index ad7d91676bf6..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- old/Library/src/HTSQL.c 2005-03-18 15:54:48.170275368 +0100 -+++ w3c-libwww-5.4.0/Library/src/HTSQL.c 2005-03-18 17:11:38.895338616 +0100 -@@ -182,11 +182,25 @@ - { - if (me && me->host) { - HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host); -+#if MYSQL_VERSION_ID>=32200 -+ if (!mysql_init(&(me->server))) { -+ return NO; -+ } -+#endif -+ -+#if MYSQL_VERSION_ID>=40027 -+ if ((me->psvr = mysql_real_connect(&(me->server), me->host, -+ me->user ? me->user : "", -+ me->password ? me->password : "", -+ "", 0 , 0 , 0)) == NULL) { -+#else -+ - if ((me->psvr = mysql_connect(&(me->server), me->host, - me->user ? me->user : "", - me->password ? me->password : "")) == NULL) { -- HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ -- mysql_error(&me->server) _ mysql_errno(&me->server)); -+#endif -+ HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ -+ mysql_error(&me->server) _ mysql_errno(&me->server)); - return NO; - } - return YES; -@@ -230,6 +244,7 @@ - PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db) - { - BOOL created = NO; -+ char query[1024]; - if (me && me->psvr && db) { - HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db); - me->db = NULL; -@@ -240,7 +255,12 @@ - - /* If the database couldn't be found then create a new one */ - if (err == 1049) { -+#if MYSQL_VERSION_ID>=40027 -+ sprintf (query, "CREATE DATABASE %s", db); -+ if (mysql_query(me->psvr, query) != 0) { -+#else - if (mysql_create_db(me->psvr, db) < 0) { -+#endif - HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ - mysql_error(me->psvr) _ err); - return NO; diff --git a/net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch b/net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch deleted file mode 100644 index ea1c7d86e786..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- old/Library/src/HTSQL.c 2005-03-18 15:54:48.170275368 +0100 -+++ w3c-libwww-5.4.0/Library/src/HTSQL.c 2005-03-18 17:11:38.895338616 +0100 -@@ -182,11 +182,25 @@ - { - if (me && me->host) { - HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host); -+#if MYSQL_VERSION_ID>=32200 -+ if (!mysql_init(&(me->server))) { -+ return NO; -+ } -+#endif -+ -+#if MYSQL_VERSION_ID>=40103 -+ if ((me->psvr = mysql_real_connect(&(me->server), me->host, -+ me->user ? me->user : "", -+ me->password ? me->password : "", -+ "", 0 , 0 , 0)) == NULL) { -+#else -+ - if ((me->psvr = mysql_connect(&(me->server), me->host, - me->user ? me->user : "", - me->password ? me->password : "")) == NULL) { -- HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ -- mysql_error(&me->server) _ mysql_errno(&me->server)); -+#endif -+ HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ -+ mysql_error(&me->server) _ mysql_errno(&me->server)); - return NO; - } - return YES; -@@ -230,6 +244,7 @@ - PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db) - { - BOOL created = NO; -+ char query[1024]; - if (me && me->psvr && db) { - HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db); - me->db = NULL; -@@ -240,7 +255,12 @@ - - /* If the database couldn't be found then create a new one */ - if (err == 1049) { -+#if MYSQL_VERSION_ID>=40103 -+ sprintf (query, "CREATE DATABASE %s", db); -+ if (mysql_query(me->psvr, query) != 0) { -+#else - if (mysql_create_db(me->psvr, db) < 0) { -+#endif - HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ - mysql_error(me->psvr) _ err); - return NO; diff --git a/net-libs/libwww/files/libwww-5.4.0-noexport.patch b/net-libs/libwww/files/libwww-5.4.0-noexport.patch deleted file mode 100644 index d5cad0ca0e88..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-noexport.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: w3c-libwww-5.4.0/Library/User/Makefile.am -=================================================================== ---- w3c-libwww-5.4.0.orig/Library/User/Makefile.am -+++ w3c-libwww-5.4.0/Library/User/Makefile.am -@@ -11,8 +11,8 @@ EXTRA_DIST = \ - - SUBDIRS = Patch Architecture Using Guide Style Platform - --BUILT_SOURCES = \ -- Extrnals.html -+#BUILT_SOURCES = \ -+# Extrnals.html - - SUFFIXES = .html - diff --git a/net-libs/libwww/files/libwww-5.4.0-respectflags.patch b/net-libs/libwww/files/libwww-5.4.0-respectflags.patch deleted file mode 100644 index 23e003e79917..000000000000 --- a/net-libs/libwww/files/libwww-5.4.0-respectflags.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: w3c-libwww-5.4.0/Library/src/Makefile.am -=================================================================== ---- w3c-libwww-5.4.0.orig/Library/src/Makefile.am -+++ w3c-libwww-5.4.0/Library/src/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with Automake to create Makefile.in. - --LDFLAGS = -version-info "1:0:1" -+LDFLAGS := $(LDFLAGS) -version-info "1:0:1" - - lib_LTLIBRARIES = \ - libwwwutils.la \ -Index: w3c-libwww-5.4.0/Library/src/SSL/Makefile.am -=================================================================== ---- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am -+++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with Automake to create Makefile.in. - --LDFLAGS = -version-info "1:0:1" -+LDFLAGS := $(LDFLAGS) -version-info "1:0:1" - - lib_LTLIBRARIES = @WWWSSL@ - -Index: w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am -=================================================================== ---- w3c-libwww-5.4.0.orig/modules/expat/xmlparse/Makefile.am -+++ w3c-libwww-5.4.0/modules/expat/xmlparse/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with Automake to create Makefile.in. - --LDFLAGS = -version-info "1:0:1" -+LDFLAGS := $(LDFLAGS) -version-info "1:0:1" - - CFLAGS = @CFLAGS@ -DXML_NS - -Index: w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am -=================================================================== ---- w3c-libwww-5.4.0.orig/modules/expat/xmltok/Makefile.am -+++ w3c-libwww-5.4.0/modules/expat/xmltok/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with Automake to create Makefile.in. - --LDFLAGS = -version-info "1:0:1" -+LDFLAGS := $(LDFLAGS) -version-info "1:0:1" - - CFLAGS = @CFLAGS@ -DXML_NS - diff --git a/net-libs/libwww/files/libwww-config-liborder.patch b/net-libs/libwww/files/libwww-config-liborder.patch deleted file mode 100644 index 81bf124666d0..000000000000 --- a/net-libs/libwww/files/libwww-config-liborder.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libwww-config.in.old 2003-10-07 14:49:22.878846832 +0800 -+++ libwww-config.in 2003-10-07 14:51:19.242156920 +0800 -@@ -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@ @LWWWSQL@ -lwwwinit -lwwwapp @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@ - ;; - *) - echo "${usage}" 1>&2 diff --git a/net-libs/libwww/libwww-5.4.0-r3.ebuild b/net-libs/libwww/libwww-5.4.0-r3.ebuild deleted file mode 100644 index 2b361d6f2067..000000000000 --- a/net-libs/libwww/libwww-5.4.0-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r3.ebuild,v 1.8 2006/12/20 01:00:31 nattfodd Exp $ - -WANT_AUTOMAKE="1.4" -WANT_AUTOCONF="latest" - -inherit eutils multilib autotools - -MY_P=w3c-${P} -DESCRIPTION="A general-purpose client side WEB API" -HOMEPAGE="http://www.w3.org/Library/" -SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz - mirror://gentoo/libwww-5.4.0-debian-autoconf-2.5.patch.bz2" - -LICENSE="W3C" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -IUSE="ssl mysql" - -RDEPEND="dev-lang/perl - >=sys-libs/zlib-1.1.4 - mysql? ( virtual/mysql ) - ssl? ( >=dev-libs/openssl-0.9.6 )" -DEPEND=">=sys-devel/autoconf-2.13 - ${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-config-liborder.patch - epatch "${WORKDIR}"/${P}-debian-autoconf-2.5.patch - epatch "${FILESDIR}"/${P}-autoconf-gentoo.diff - epatch "${FILESDIR}"/${P}-automake-gentoo.diff # bug #41959 - epatch "${FILESDIR}"/${P}-disable-ndebug-gentoo.diff # bug #50483 - # http://lists.w3.org/Archives/Public/www-lib/2003OctDec/0015.html - # http://www.mysql.gr.jp/mysqlml/mysql/msg/8118 - epatch "${FILESDIR}"/${P}-mysql-4.1.patch - - eautoreconf -} - -src_compile() { - if use mysql ; then - myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a" - else - myconf="--without-mysql" - fi - - econf \ - --enable-shared \ - --enable-static \ - --with-zlib \ - --with-md5 \ - --with-expat \ - $(use_with ssl) \ - ${myconf} || die - - emake check-am || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc ChangeLog - dohtml -r . -} diff --git a/net-libs/libwww/libwww-5.4.0-r4.ebuild b/net-libs/libwww/libwww-5.4.0-r4.ebuild deleted file mode 100644 index 7e3c2c1d0a39..000000000000 --- a/net-libs/libwww/libwww-5.4.0-r4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r4.ebuild,v 1.21 2007/07/13 07:18:13 mr_bones_ Exp $ - -WANT_AUTOMAKE="1.4" -WANT_AUTOCONF="latest" - -inherit eutils multilib autotools - -MY_P=w3c-${P} -DESCRIPTION="A general-purpose client side WEB API" -HOMEPAGE="http://www.w3.org/Library/" -SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz - mirror://gentoo/libwww-5.4.0-debian-autoconf-2.5.patch.bz2" - -LICENSE="W3C" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="mysql ssl" - -RDEPEND=">=sys-libs/zlib-1.1.4 - mysql? ( virtual/mysql ) - ssl? ( >=dev-libs/openssl-0.9.6 )" - -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.13 - dev-lang/perl" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-config-liborder.patch - epatch "${WORKDIR}"/${P}-debian-autoconf-2.5.patch - epatch "${FILESDIR}"/${P}-autoconf-gentoo.diff - epatch "${FILESDIR}"/${P}-automake-gentoo.diff # bug #41959 - epatch "${FILESDIR}"/${P}-disable-ndebug-gentoo.diff # bug #50483 - # http://lists.w3.org/Archives/Public/www-lib/2003OctDec/0015.html - # http://www.mysql.gr.jp/mysqlml/mysql/msg/8118 - epatch "${FILESDIR}"/${P}-mysql-4.1.patch - # Fix multiple problems, potentially exploitable (bug #109040) - epatch "${FILESDIR}"/${P}-htbound.patch - - eautoreconf -} - -src_compile() { - if use mysql ; then - myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a" - else - myconf="--without-mysql" - fi - - econf \ - --enable-shared \ - --enable-static \ - --with-zlib \ - --with-md5 \ - --with-expat \ - $(use_with ssl) \ - ${myconf} || die "./configure failed" - - emake check-am || die - emake || die "Compilation failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc ChangeLog - dohtml -r . -} diff --git a/net-libs/libwww/libwww-5.4.0-r5.ebuild b/net-libs/libwww/libwww-5.4.0-r5.ebuild deleted file mode 100644 index 0c49611cea58..000000000000 --- a/net-libs/libwww/libwww-5.4.0-r5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r5.ebuild,v 1.11 2007/07/13 07:18:13 mr_bones_ Exp $ - -WANT_AUTOMAKE="1.4" -WANT_AUTOCONF="latest" - -inherit eutils multilib autotools - -MY_P=w3c-${P} -DESCRIPTION="A general-purpose client side WEB API" -HOMEPAGE="http://www.w3.org/Library/" -SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz - mirror://gentoo/libwww-5.4.0-debian-autoconf-2.5.patch.bz2" - -LICENSE="W3C" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="mysql ssl" - -RDEPEND=">=sys-libs/zlib-1.1.4 - mysql? ( virtual/mysql ) - ssl? ( >=dev-libs/openssl-0.9.6 )" - -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.13 - dev-lang/perl" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-config-liborder.patch - epatch "${WORKDIR}"/${P}-debian-autoconf-2.5.patch - epatch "${FILESDIR}"/${P}-autoconf-gentoo.diff - epatch "${FILESDIR}"/${P}-automake-gentoo.diff # bug #41959 - epatch "${FILESDIR}"/${P}-disable-ndebug-gentoo.diff # bug #50483 - # http://lists.w3.org/Archives/Public/www-lib/2003OctDec/0015.html - # http://www.mysql.gr.jp/mysqlml/mysql/msg/8118 - epatch "${FILESDIR}"/${P}-mysql-4.1.patch - # Fix multiple problems, potentially exploitable (bug #109040) - epatch "${FILESDIR}"/${P}-htbound.patch - # Fix linking while using --as-needed - epatch "${FILESDIR}/${P}-asneeded.patch" - # Drop Externls rebuild after automake - epatch "${FILESDIR}/${P}-noexport.patch" - # Respect users LDFLAGS, bug #126863. - epatch "${FILESDIR}/${P}-respectflags.patch" - - eautoreconf || die "autoreconf failed" -} - -src_compile() { - if use mysql ; then - myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a" - else - myconf="--without-mysql" - fi - - export ac_cv_header_appkit_appkit_h=no - econf \ - --enable-shared \ - --enable-static \ - --with-zlib \ - --with-md5 \ - --with-expat \ - $(use_with ssl) \ - ${myconf} || die "./configure failed" - - emake || die "Compilation failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc ChangeLog - dohtml -r . -} diff --git a/net-libs/libwww/libwww-5.4.0-r6.ebuild b/net-libs/libwww/libwww-5.4.0-r6.ebuild deleted file mode 100644 index 4f5381b0e0e5..000000000000 --- a/net-libs/libwww/libwww-5.4.0-r6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r6.ebuild,v 1.14 2007/08/25 14:32:47 vapier Exp $ - -WANT_AUTOMAKE="1.4" -WANT_AUTOCONF="latest" - -inherit eutils multilib autotools - -MY_P=w3c-${P} -DESCRIPTION="A general-purpose client side WEB API" -HOMEPAGE="http://www.w3.org/Library/" -SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz - mirror://gentoo/libwww-5.4.0-debian-autoconf-2.5.patch.bz2" - -LICENSE="W3C" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="mysql ssl" - -RDEPEND=">=sys-libs/zlib-1.1.4 - mysql? ( virtual/mysql ) - ssl? ( >=dev-libs/openssl-0.9.6 )" - -DEPEND="${RDEPEND} - dev-lang/perl" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-config-liborder.patch - epatch "${WORKDIR}"/${P}-debian-autoconf-2.5.patch - epatch "${FILESDIR}"/${P}-autoconf-gentoo.diff - epatch "${FILESDIR}"/${P}-automake-gentoo.diff # bug #41959 - epatch "${FILESDIR}"/${P}-disable-ndebug-gentoo.diff # bug #50483 - # http://lists.w3.org/Archives/Public/www-lib/2003OctDec/0015.html - # http://www.mysql.gr.jp/mysqlml/mysql/msg/8118 - epatch "${FILESDIR}"/${P}-mysql-4.0.patch - # Fix multiple problems, potentially exploitable (bug #109040) - epatch "${FILESDIR}"/${P}-htbound.patch - # Fix linking while using --as-needed - epatch "${FILESDIR}/${P}-asneeded.patch" - # Drop Externls rebuild after automake - epatch "${FILESDIR}/${P}-noexport.patch" - # Respect users LDFLAGS, bug #126863. - epatch "${FILESDIR}/${P}-respectflags.patch" - - eautoreconf || die "autoreconf failed" -} - -src_compile() { - if use mysql ; then - myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a" - else - myconf="--without-mysql" - fi - - export ac_cv_header_appkit_appkit_h=no - econf \ - --enable-shared \ - --enable-static \ - --with-zlib \ - --with-md5 \ - --with-expat \ - $(use_with ssl) \ - ${myconf} || die "./configure failed" - - emake || die "Compilation failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc ChangeLog - dohtml -r . -} |