summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/virtuoso-server')
-rw-r--r--dev-db/virtuoso-server/ChangeLog8
-rw-r--r--dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch11
-rw-r--r--dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild88
3 files changed, 106 insertions, 1 deletions
diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index 41cb36ca8e0e..510320c7f82d 100644
--- a/dev-db/virtuoso-server/ChangeLog
+++ b/dev-db/virtuoso-server/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/virtuoso-server
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.31 2012/05/13 18:01:23 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.32 2012/05/13 18:39:59 creffett Exp $
+
+*virtuoso-server-6.1.4-r1 (13 May 2012)
+
+ 13 May 2012; <creffett@gentoo.org> +virtuoso-server-6.1.4-r1.ebuild,
+ +files/virtuoso-server-6.1.4-strncat-overflow.patch:
+ Revision bump to 6.1.4-r1 to fix buffer overflow, bug 364683
13 May 2012; <creffett@gentoo.org> metadata.xml:
Added myself as co-maintainer to metadata.xml
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch
new file mode 100644
index 000000000000..432482171289
--- /dev/null
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch
@@ -0,0 +1,11 @@
+--- virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c
++++ virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c
+@@ -423,7 +423,7 @@
+ socksreq[8] = 0; /* no name */
+ if (name)
+ {
+- strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8);
++ strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 9);
+ socksreq[sizeof (socksreq) - 1] = 0;
+ packetsize = 9 + strlen ((char *) socksreq + 8);
+ }
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
new file mode 100644
index 000000000000..ad50f52343cc
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild,v 1.1 2012/05/13 18:39:59 creffett Exp $
+
+EAPI=4
+
+inherit virtuoso
+
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="kerberos ldap readline"
+
+# Bug 305077
+#RESTRICT="test"
+
+# zeroconf support looks like broken - disabling - last checked around 5.0.12
+# mono support fetches mono source and compiles it manually - disabling for now
+# mono? ( dev-lang/mono )
+COMMON_DEPEND="
+ dev-libs/libxml2:2
+ >=dev-libs/openssl-0.9.7i:0
+ >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+ kerberos? ( app-crypt/mit-krb5 )
+ ldap? ( net-nds/openldap )
+ readline? ( sys-libs/readline:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-apps/gawk
+ >=sys-devel/bison-2.3
+ >=sys-devel/flex-2.5.33
+"
+RDEPEND="${COMMON_DEPEND}
+ ~dev-db/virtuoso-odbc-${PV}:${SLOT}
+"
+
+VOS_EXTRACT="
+ libsrc/Dk
+ libsrc/Thread
+ libsrc/Tidy
+ libsrc/Wi
+ libsrc/Xml.new
+ libsrc/langfunc
+ libsrc/odbcsdk
+ libsrc/plugin
+ libsrc/util
+ binsrc/virtuoso
+ binsrc/tests
+"
+
+DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
+ "${FILESDIR}/${PN}-6.1.4-strncat-overflow.patch"
+
+)
+
+src_prepare() {
+ sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+ || die "failed to disable installation of static lib"
+
+ virtuoso_src_prepare
+}
+
+src_configure() {
+ myconf+="
+ $(use_enable kerberos krb)
+ $(use_enable ldap openldap)
+ $(use_with readline)
+ --disable-static
+ --disable-hslookup
+ --disable-rendezvous
+ --without-iodbc
+ "
+
+ virtuoso_src_configure
+}
+
+src_install() {
+ virtuoso_src_install
+
+ # Rename isql executables (conflicts with unixODBC)
+ mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
+ mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
+
+ keepdir /var/lib/virtuoso/db
+}