New revision, with patches for bugs #110467 (fix syslog() calls) and #110135 (fix compilation with freetds-0.63).

Package-Manager: portage-2.0.53_rc6

6 files changed, 171 insertions, 19 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 47c1fa49a696..f3a4b69ef964 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.74 2005/09/11 08:50:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.75 2005/10/26 18:32:37 leonardop Exp $
+
+*libgda-1.2.2-r1 (26 Oct 2005)
+
+  26 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/libgda-1.2.2-freetds_fixes.patch,
+  +files/libgda-1.2-syslog_format_fix.patch, +libgda-1.2.2-r1.ebuild:
+  Added patch to fix problem with syslog() calls (bug #110467). Added patch to
+  fix compilation with freetds-0.63 (bug #110135). Misc. clean-ups.
 
   11 Sep 2005; Aron Griffis <agriffis@gentoo.org> libgda-1.2.2.ebuild:
   Mark 1.2.2 stable on alpha
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 411156b1b54f..34387b4cf9f4 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,23 +1,27 @@
-MD5 f6d0012405583f2078317ce929763064 libgda-1.0.3.ebuild 2753
-MD5 efe942efcc3bbe2a6ae347a7e6808a57 libgda-0.2.96-r2.ebuild 3487
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4f8b7e3db4e4f4a49a74368e14af2ec7 ChangeLog 11285
-MD5 eceac9d80b6e54f4091a9a3026c32fec libgda-1.0.4.ebuild 2939
-MD5 e2ca44a5bc528a55dfdc2947573aa6b1 libgda-1.2.2.ebuild 1992
-MD5 016ec893635c15e43c7159e1f1d92b33 libgda-1.0.2.ebuild 2893
-MD5 42fbab3bc532505fcd7e85aafb9c5a41 files/libgda-1.0.4-freetds-0.6x.patch 482
+MD5 df48f12fb7ec03b2da0bb7f309e3a72e ChangeLog 11634
+MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
+MD5 46b8c0b40219635d47ca4583d42dc814 files/digest-libgda-1.0.2 66
+MD5 907142ea1e11bcf5b01f25dfa2fd2b54 files/digest-libgda-1.0.3 66
+MD5 c15d8674b02051d6c9af76a12258ab8b files/digest-libgda-1.0.4 66
+MD5 ef67c275e1a496a0f75f76369994c248 files/digest-libgda-1.2.2 66
+MD5 ef67c275e1a496a0f75f76369994c248 files/digest-libgda-1.2.2-r1 66
+MD5 552028d2c6006f11a013b81e4e3fc56c files/libgda-0.2.96-gcc3.4.patch 607
 MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
+MD5 3eaa6fbb42af0cd9fc0d38faadda95d2 files/libgda-1.0.2-firebird_fix.patch 757
+MD5 89d5a7588e21826826be8ecb11218b94 files/libgda-1.0.2-freetds_fix.patch 1338
 MD5 adf80d651f1d75c9745c44264f58708e files/libgda-1.0.2-gcc2_fix.patch 641
-MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
-MD5 46b8c0b40219635d47ca4583d42dc814 files/digest-libgda-1.0.2 66
-MD5 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
 MD5 996f4ee4528ea21ad22a1a160ea90b90 files/libgda-1.0.2-gcc3.4_fix.patch 2911
-MD5 89d5a7588e21826826be8ecb11218b94 files/libgda-1.0.2-freetds_fix.patch 1338
-MD5 c15d8674b02051d6c9af76a12258ab8b files/digest-libgda-1.0.4 66
+MD5 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
+MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
 MD5 b87a0e5fdf7e23d29ee4452e694140c4 files/libgda-1.0.4-firebird-provider.patch 1055
-MD5 907142ea1e11bcf5b01f25dfa2fd2b54 files/digest-libgda-1.0.3 66
-MD5 3eaa6fbb42af0cd9fc0d38faadda95d2 files/libgda-1.0.2-firebird_fix.patch 757
-MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
-MD5 552028d2c6006f11a013b81e4e3fc56c files/libgda-0.2.96-gcc3.4.patch 607
+MD5 42fbab3bc532505fcd7e85aafb9c5a41 files/libgda-1.0.4-freetds-0.6x.patch 482
+MD5 b8d3b0cae4aa507dd9c6cecee8d30067 files/libgda-1.2-syslog_format_fix.patch 630
 MD5 b4dee0ec0bc3b4333c572810d035c68f files/libgda-1.2.1-mdb_fix.patch 617
-MD5 ef67c275e1a496a0f75f76369994c248 files/digest-libgda-1.2.2 66
+MD5 c95ffd3e34df767ced0741bb1ba184e2 files/libgda-1.2.2-freetds_fixes.patch 1771
+MD5 efe942efcc3bbe2a6ae347a7e6808a57 libgda-0.2.96-r2.ebuild 3487
+MD5 016ec893635c15e43c7159e1f1d92b33 libgda-1.0.2.ebuild 2893
+MD5 f6d0012405583f2078317ce929763064 libgda-1.0.3.ebuild 2753
+MD5 eceac9d80b6e54f4091a9a3026c32fec libgda-1.0.4.ebuild 2939
+MD5 eb6ea35c8f3161ce65205f75dc1a9bf7 libgda-1.2.2-r1.ebuild 2362
+MD5 e2ca44a5bc528a55dfdc2947573aa6b1 libgda-1.2.2.ebuild 1992
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-extra/libgda/files/digest-libgda-1.2.2-r1 b/gnome-extra/libgda/files/digest-libgda-1.2.2-r1
new file mode 100644
index 000000000000..822ce4798614
--- /dev/null
+++ b/gnome-extra/libgda/files/digest-libgda-1.2.2-r1
@@ -0,0 +1 @@
+MD5 19d5ec3fe7f482fe89bcf6926cfac67e libgda-1.2.2.tar.bz2 1242035
diff --git a/gnome-extra/libgda/files/libgda-1.2-syslog_format_fix.patch b/gnome-extra/libgda/files/libgda-1.2-syslog_format_fix.patch
new file mode 100644
index 000000000000..fd3d7b531b72
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.2-syslog_format_fix.patch
@@ -0,0 +1,21 @@
+diff -NurdB libgda-1.2.2/libgda/gda-log.c libgda-1.2.2-patched/libgda/gda-log.c
+--- libgda-1.2.2/libgda/gda-log.c	2005-10-26 04:08:14.000000000 -0500
++++ libgda-1.2.2-patched/libgda/gda-log.c	2005-10-26 04:07:15.000000000 -0500
+@@ -111,7 +111,7 @@
+ #ifdef LIBGDA_WIN32
+ 	g_log ("Gda", G_LOG_LEVEL_INFO, "%s", msg);
+ #else
+-	syslog (LOG_USER | LOG_INFO, msg);
++	syslog (LOG_USER | LOG_INFO, "%s", msg);
+ #endif
+ 	g_free (msg);
+ }
+@@ -144,7 +144,7 @@
+ #ifdef LIBGDA_WIN32
+ 	g_log ("Gda", G_LOG_LEVEL_ERROR, "%s", msg);
+ #else
+-	syslog (LOG_USER | LOG_ERR, msg);
++	syslog (LOG_USER | LOG_ERR, "%s", msg);
+ #endif
+  	g_free (msg);
+ }
diff --git a/gnome-extra/libgda/files/libgda-1.2.2-freetds_fixes.patch b/gnome-extra/libgda/files/libgda-1.2.2-freetds_fixes.patch
new file mode 100644
index 000000000000..8e332120c329
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.2.2-freetds_fixes.patch
@@ -0,0 +1,36 @@
+diff -NurdB libgda-1.2.2/configure.in libgda-1.2.2-patched/configure.in
+--- libgda-1.2.2/configure.in	2005-04-30 05:22:36.000000000 -0500
++++ libgda-1.2.2-patched/configure.in	2005-10-26 10:15:29.000000000 -0500
+@@ -454,6 +454,13 @@
+ 					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
+ 					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
+ 					;;
++				*v0.6[[3-9]]*) AC_MSG_RESULT($freetdsvercheck - using v0.63 api)
++					AC_DEFINE(HAVE_FREETDS_VER0_63, 1, [Have freetds v0.63 API])
++					AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
++					FREETDS_CFLAGS="-I${freetds_incdir}"
++					FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
++					AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
++					;;
+ 				*v0.6*) AC_MSG_RESULT($freetdsvercheck - using v0.6x api)
+ 					AC_DEFINE(HAVE_FREETDS_VER0_6X, 1, [Have freetds v0.6x API])
+ 					FREETDS_CFLAGS="-I${freetds_incdir}"
+diff -NurdB libgda-1.2.2/providers/freetds/gda-freetds-provider.h libgda-1.2.2-patched/providers/freetds/gda-freetds-provider.h
+--- libgda-1.2.2/providers/freetds/gda-freetds-provider.h	2003-09-17 06:05:03.000000000 -0500
++++ libgda-1.2.2-patched/providers/freetds/gda-freetds-provider.h	2005-10-26 09:42:10.000000000 -0500
+@@ -30,6 +30,15 @@
+ 
+ G_BEGIN_DECLS
+ 
++/* Compatibility macros */
++#ifdef HAVE_FREETDS_VER0_63
++
++#define TDSCONNECTINFO TDSCONNECTION
++#define TDSCOLINFO     TDSCOLUMN
++#define TDSMSGINFO     TDSMESSAGE
++
++#endif  /* HAVE_FREETDS_VER0_63 */
++
+ #define GDA_TYPE_FREETDS_PROVIDER            (gda_freetds_provider_get_type())
+ #define GDA_FREETDS_PROVIDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_FREETDS_PROVIDER, GdaFreeTDSProvider))
+ #define GDA_FREETDS_PROVIDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_FREETDS_PROVIDER, GdaFreeTDSProviderClass))
diff --git a/gnome-extra/libgda/libgda-1.2.2-r1.ebuild b/gnome-extra/libgda/libgda-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..2f06a212dd59
--- /dev/null
+++ b/gnome-extra/libgda/libgda-1.2.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.2.2-r1.ebuild,v 1.1 2005/10/26 18:32:37 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome Database Access Library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2 LGPL-2"
+
+IUSE="berkdb doc firebird freetds ldap mdb mysql oci8 odbc postgres sqlite xbase"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2
+	dev-libs/libxml2
+	>=dev-libs/libxslt-1.0.9
+	dev-libs/popt
+	sys-libs/ncurses
+	sys-libs/readline
+	berkdb? ( sys-libs/db )
+	freetds? ( >=dev-db/freetds-0.62 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	postgres? ( >=dev-db/postgresql-7.2.1 )
+	x86? ( firebird? ( dev-db/firebird ) )
+	sqlite? ( >=dev-db/sqlite-3 )
+	xbase? ( dev-db/xbase )
+	mdb? ( >=app-office/mdbtools-0.5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.30
+	app-text/scrollkeeper
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+# problems with parallel builds
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="$(use_with berkdb bdb /usr)    \
+		$(use_with firebird firebird /usr) \
+		$(use_with freetds tds /usr)       \
+		$(use_with ldap ldap /usr)         \
+		$(use_with mdb mdb /usr)           \
+		$(use_with mysql mysql /usr)       \
+		$(use_with odbc odbc /usr)         \
+		$(use_with postgres postgres /usr) \
+		$(use_with sqlite sqlite /usr)     \
+		$(use_with xbase xbase /usr)"
+
+	use oci8 || G2CONF="${G2CONF} --without-oracle"
+
+	# not in portage
+	G2CONF="${G2CONF} --without-msql --without-sybase --without-ibmdb2"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	gnome2_omf_fix doc/Makefile.in
+
+	# Fix syslog format string attack (bug #110467).
+	epatch ${FILESDIR}/${PN}-1.2-syslog_format_fix.patch
+	# Fix freetds API problems
+	epatch ${FILESDIR}/${PN}-1.0.2-freetds_fix.patch
+	epatch ${FILESDIR}/${PN}-1.2.2-freetds_fixes.patch
+	# Fix compilation of the mdb provider
+	epatch ${FILESDIR}/${PN}-1.2.1-mdb_fix.patch
+
+	export WANT_AUTOMAKE=1.9
+	sed -n -e '/GTK_DOC_CHECK/,/dnl IT_PROG_INTLTOOL/p' aclocal.m4 > gtkdoc.m4
+	aclocal -I . || die "aclocal failed"
+	libtoolize --copy --force
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+}