change patches to cope with mysql-4.0

(Portage version: 2.1.1_pre1-r1)

4 files changed, 145 insertions, 1 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 1cdaaa80265b..b72e53a2c96b 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.55 2006/05/14 08:29:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.56 2006/06/25 14:08:10 vivo Exp $
+
+*libwww-5.4.0-r6 (25 Jun 2006)
+
+  25 Jun 2006; Francesco Riosa <vivo@gentoo.org>
+  +files/libwww-5.4.0-mysql-4.0.patch, +libwww-5.4.0-r6.ebuild:
+  Updated patch to apply also in MySQL 4.0.27, thanks to Dan Christensen, for
+  reporting it, bug #56328
 
   14 May 2006; Fabian Groffen <grobian@gentoo.org> libwww-5.4.0-r5.ebuild:
   Removed ppc-macos, it doesn't eautoreconf (bug #117919)
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r6 b/net-libs/libwww/files/digest-libwww-5.4.0-r6
new file mode 100644
index 000000000000..7a45b56e4053
--- /dev/null
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r6
@@ -0,0 +1,6 @@
+MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
+RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b w3c-libwww-5.4.0.tgz 1129121
+SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef w3c-libwww-5.4.0.tgz 1129121
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
new file mode 100644
index 000000000000..ad7d91676bf6
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-mysql-4.0.patch
@@ -0,0 +1,51 @@
+--- 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/libwww-5.4.0-r6.ebuild b/net-libs/libwww/libwww-5.4.0-r6.ebuild
new file mode 100644
index 000000000000..e7ddfc09415c
--- /dev/null
+++ b/net-libs/libwww/libwww-5.4.0-r6.ebuild
@@ -0,0 +1,80 @@
+# 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-r6.ebuild,v 1.1 2006/06/25 14:08:10 vivo Exp $
+
+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? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+DEPEND="${RDEPEND}
+	!dev-libs/9libs
+	>=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.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"
+	# Mac OS X has no automake 1.4, only 1.6.3
+	epatch "${FILESDIR}/${P}-automake-macos.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 .
+}