Revision bump to 6.1.4-r1 to fix buffer overflow, bug 364683

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 112 insertions, 5 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/Manifest b/dev-db/virtuoso-server/Manifest
index 7409e917229d..25f356213db4 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -3,19 +3,21 @@ Hash: SHA1
 
 AUX virtuoso-server-6.1.3-unbundle-minizip.patch 1239 RMD160 d42e80924d643c4dfa08ed6f55aa811d8f8e00a3 SHA1 025c9f8d85ac7616bbab09b62a9bf1f9f3553a14 SHA256 54d628c1d2e4748ec16e1a4e98fb5da4b5257c0dd49bb73621cff80669d02056
 AUX virtuoso-server-6.1.3-unicode.patch 850 RMD160 06b449b58f768be1d11fbf496adef5f40edf277d SHA1 8b9ad92b605a8bfcbd50c8684bde89a6ad22a9ee SHA256 7feea9e5b730dc0716b284fa968ef7121ba5897aafdece16d07ee5e135947d26
+AUX virtuoso-server-6.1.4-strncat-overflow.patch 421 RMD160 cdbca538cba7643f0770e9f54b5ec04935448942 SHA1 5bfd6b7831c38d8b98e0d4806ac8424480827781 SHA256 3edc2cd88cb36e1d338730a392269b00c6f4db136fe146100d269c98328111e7
 AUX virtuoso-server-6.1.4-unbundle-minizip.patch 1399 RMD160 8382d224efc11b35183de8ae2b8fedbc58c80a25 SHA1 390442aa7e99deb7f8d44962039a64275edfac12 SHA256 8f78723b086f0cedf0df274bf4a97b3cf6d177e3c3901ae542961bb6fc1a8c2f
 DIST VOS-genpatches-6.1.3.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
 DIST VOS-genpatches-6.1.4.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
 DIST virtuoso-opensource-6.1.3.tar.gz 75082765 RMD160 eaae429e90c6735e7b6c06b838e56b031802d37f SHA1 27e0b29e690ddf766941067ef861a7bf166aeac5 SHA256 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
 DIST virtuoso-opensource-6.1.4.tar.gz 100595847 RMD160 e62ec1b42be591747bfa04bab7b196afccf5a84a SHA1 39b2ad28e7ee58b5bca1ba8ff8365266dfa55fa7 SHA256 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e
 EBUILD virtuoso-server-6.1.3-r2.ebuild 1999 RMD160 b0865e665b1e5a94875737168691c1f39b9433d5 SHA1 aba795b083c1474f48099acf0cb8d425ad07c4f7 SHA256 ecaa1f911298e558dd0ae5dc17730e543580fd5a7eb56efe28b63861765656df
+EBUILD virtuoso-server-6.1.4-r1.ebuild 2021 RMD160 d239b9056bc3b6b7e392e71e034629db03bec65f SHA1 e3a596600dce190b67a3f63ec0b9e63d02a4da06 SHA256 a6019beab611ff6c74ff0cc52f8126bd5a738e6ce29bf161577396e0dd3c93eb
 EBUILD virtuoso-server-6.1.4.ebuild 1967 RMD160 7c7847f2c2848a1cd1dc6e4293b6d78fe0df7254 SHA1 d774d0de6abe45ae862a7097d6472fa67e223a49 SHA256 218d8b03aa4bdc0d188811ab1ef9203825f8e21be3c770af93c257507c66214d
-MISC ChangeLog 4841 RMD160 84a4337f52cc36d9020536a939054d51d3266105 SHA1 c7076fd992348820a9f0ae0e0403ca5be8bb1364 SHA256 a011c87ab428c0f1099c350cc2dd7c07b2ba39df0f4ab256459a083b4a3afa08
+MISC ChangeLog 5072 RMD160 b3cef9cc6e9b853e2ba14dd65e86f98efe6b615b SHA1 46d7e4dae1238d0add7b7eb53a8bc36954459020 SHA256 7ee729015971e1a2a136f99fb0b7a05ff173bd1ec4a1ee8d8326ac292bd4065e
 MISC metadata.xml 871 RMD160 647d7f2fbcd2057973c2791439d83052decc199e SHA1 32ed8a2ca1013a90d692f1e9c302ba28e3311e7f SHA256 63096d13d0e59b6562cdc369d4eaadba2b6100e9d5a0d2105500af80e86d6fb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+v9/YACgkQ23laikJhg1TAxACfdO5k1zRikQmPRHGdtpeC8aJz
-ojAAnjIKTK93MB2L8Gm0yRlJjqDe0YK1
-=YI/7
+iEYEARECAAYFAk+v//cACgkQ23laikJhg1Qe0ACeOaF8JDjyoPAoIPda+XnGbPub
+g9AAn29bAsuoaSFt8EnquHPm40uf51tL
+=6hLP
 -----END PGP SIGNATURE-----
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
+}