[dev-db/virtuoso-server] Add to overlay for testing, version bump to 6.1.5

(Portage version: 2.2.0_alpha116/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 157 insertions, 0 deletions

diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
new file mode 100644
index 00000000000..c15b68b9194
--- /dev/null
+++ b/dev-db/virtuoso-server/Manifest
@@ -0,0 +1,2 @@
+DIST VOS-genpatches-6.1.5.tar.bz2 1224 SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a SHA512 f99429da6fd4c92252d183b6d1b8caae4910ac93d775c120d67c12925a0eb6ef2ce13a77b27944a2203047965431682a392a2731fc1690cb3f223a65823471c5 WHIRLPOOL 985ad05b55c7ebd1859e1233cb0546247b2ceca0f85b0ffc9212cc8393fbdd4c94af05b521beae08f3c11a838f64bc5b802c5f46dade8568de651929595cdf21
+DIST virtuoso-opensource-6.1.5.tar.gz 112834237 SHA256 fa0af9ee0d16bd80ca1ac30202d6fd67311843269bea70a92eca87e2cce94a09 SHA512 957fa2bdd570e47999887475bcea3c97940d3ae986500c098e14582469dcce6ee6d8031f5fd9e6f4ca1e9b32e28a6015d1a3247144a2b28ae3845336248e32c5 WHIRLPOOL 3d7f8bce88a81dba3b0c305074e47067a5d076f42c7d7f38712642d362bb74884556184d5f82231543c30dcd1f4019bdbb816dc4560541a55a9c382cacdd865f
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 00000000000..43248217128
--- /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/files/virtuoso-server-6.1.4-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch
new file mode 100644
index 00000000000..143c35905b2
--- /dev/null
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch
@@ -0,0 +1,36 @@
+diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in
+--- virtuoso-opensource-6.1.4.orig/configure.in	2011-11-20 03:38:18.000000000 +0400
++++ virtuoso-opensource-6.1.4/configure.in	2011-11-20 03:42:44.000000000 +0400
+@@ -1550,14 +1550,15 @@
+ then
+     AC_CHECK_HEADER(zlib.h)
+     AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal])
++    AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal])
+ fi
+ if test "x$with_zlib" = "xinternal"
+ then
+     ZLIB_INC='-I$(top_srcdir)/libsrc/zlib'
+     ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la'
+ else
+-    ZLIB_INC=""
+-    ZLIB_LIB="-lz"
++    ZLIB_INC=`pkg-config --cflags zlib minizip`
++    ZLIB_LIB=`pkg-config --libs zlib minizip`
+ fi
+ AC_SUBST(ZLIB_INC)
+ AC_SUBST(ZLIB_LIB)
+diff -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c
+--- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c	2011-10-26 17:54:19.000000000 +0400
++++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c	2011-11-20 03:44:36.000000000 +0400
+@@ -6167,10 +6167,7 @@
+ #define fopen64  fopen
+ #endif
+ 
+-#include "zlib/contrib/minizip/unzip.h"
+-#include "zlib/contrib/minizip/ioapi.h"
+-#include "zlib/contrib/minizip/ioapi.c"
+-#include "zlib/contrib/minizip/unzip.c"
++#include "unzip.h"
+ 
+ static caddr_t
+ bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
diff --git a/dev-db/virtuoso-server/metadata.xml b/dev-db/virtuoso-server/metadata.xml
new file mode 100644
index 00000000000..13eb31da2e3
--- /dev/null
+++ b/dev-db/virtuoso-server/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<maintainer>
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer>
+		<email>creffett@gentoo.org</email>
+		<name>Chris Reffett</name>
+	</maintainer>
+	<longdescription>
+OpenLink Virtuoso Open-Source Edition is a new generation of hybrid data server
+product called a "Universal Server". It implements a wide range of industry
+standard APIs and protocols, covering a broad range of functionality realms
+that include: Object-Relational Data Managemtent, Virtualization of
+Heterogeneous Data Sources (SQL, XML, RDF), Document Web Server (WebDAV/HTTP),
+Data Web Server (RDF Linked Data Deployment), Web Services Platform, Discussion
+Server, and many more.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild
new file mode 100644
index 00000000000..8e2263f5262
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit virtuoso
+
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~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
+	virtual/pkgconfig
+"
+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
+		--program-transform-name="s/isql/isql-v/"
+	"
+
+	virtuoso_src_configure
+}
+
+src_install() {
+	virtuoso_src_install
+
+	keepdir /var/lib/virtuoso/db
+}