gentoo resync : 14.07.2018

7 files changed, 234 insertions, 0 deletions

diff --git a/dev-db/xbsql/Manifest b/dev-db/xbsql/Manifest
new file mode 100644
index 000000000000..205736fe8cb8
--- /dev/null
+++ b/dev-db/xbsql/Manifest
@@ -0,0 +1,7 @@
+AUX xbsql-0.11-autotools.patch 495 BLAKE2B cf8c5a035783f9f742e8b491d1311870eb24f6da82cbafe18ffa1a7809b1f1e54c5330a3dbe09a00c3116c91af66f4d04c4f1038695e844ae44359b6c7e11b5a SHA512 fd5ecfbf5a63393147e305bfa1704848f807f97f0af4c03bdae7ad6be9085a4bd97724fa59aeec903d3020a01f42cd29440b619705d7678d153e8c4a3e59f450
+AUX xbsql-0.11-bfr-overflow.patch 3015 BLAKE2B 936dd846ef6b9781ea29357bc920f9a29e2aeb4aa5e63034d610d41caa1746afda777207f49fd7e8806e8c809a405aa889c07150d278bb3e695548ef073f9c27 SHA512 37d4f541fa7e85a9297e19d3793f97d80acef07a9131e35ed7dfa5e277aa646463aafe731c47885251171318edca141bfc2b8304a971db7804f3f0a1eb66d329
+AUX xbsql-0.11-ncurses64.patch 542 BLAKE2B 9ca86a1e805f0ac001259d738057d90ee4cd7a082577d1581a4668888b75af7db8507d330fd72e8aca062078d2d147a77a586d6b9fa6887d1ef3c2226b8d7f1a SHA512 64148cab80c3d5bc0209e31c0885ea69d3124dc8ad11c57706b71aafe926451928610aeb5dab6639b5a405bcba07d1a3e4588224293d3e4343f76eb194d3aec8
+AUX xbsql-0.11-xbase64.patch 2076 BLAKE2B 011809c0c8594fd49174608fd57709fa1f7bdb98acd4981823683e8d7b6decfa008fe32104fec462c4ebaa884a49ab9727e643031961ec217ef4b74a92c67a06 SHA512 9b1848156f0629a486510a87077c55548b338206331dbf2b7011487ba04bf7986f73b160505defe319b0144cbf617882da760de8f355b81c757166a603931ef3
+DIST xbsql-0.11.tgz 307392 BLAKE2B 1be4352208d95f9f451c59cba6494db2399ed93c937d2494f0877ee6866d1d679732eddd244d467118b70e303380b7eb212bf3fad0a5180e04ab62746d7e4ac3 SHA512 caf8a6d8191f7de860008e5ac2628e388097b05999887ec52b91684f6577dd3152dfa164b71a37d84ef70f43ab868dd02b30bc76c88208d4daa85d8e111ea3a4
+EBUILD xbsql-0.11-r2.ebuild 821 BLAKE2B bedeeb865930696b3b20a88d395ba53bc1afcaf3ebebb541ce2e0f351808979078f097a047343ea6fb46f8a7d1068c69b2fad049b2923394035c92f7b9122db9 SHA512 74b5d612ace30243ab726c2f424d940d4d4e4f00226a0d926aa58e875b2b5fef6bc3a463da6bb3cc2ba61b7398d3507598ad96352e27fb27cb06e70fab92ece1
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/xbsql/files/xbsql-0.11-autotools.patch b/dev-db/xbsql/files/xbsql-0.11-autotools.patch
new file mode 100644
index 000000000000..b1e72562b397
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-autotools.patch
@@ -0,0 +1,18 @@
+ xbsql/Makefile.am |    7 +------
+ 1 files changed, 1 insertions(+), 6 deletions(-)
+
+diff --git a/xbsql/Makefile.am b/xbsql/Makefile.am
+index c281358..5a09198 100644
+--- a/xbsql/Makefile.am
++++ b/xbsql/Makefile.am
+@@ -1,9 +1,4 @@
+-DEBUG			= -g
+-CC			= g++
+-CFLAGS			= -UNO_READLINE -I/usr/local/include $(DEBUG)
+-CXXFLAGS		= -UNO_READLINE -I/usr/local/include $(DEBUG)
+-LDFLAGS			= $(DEBUG)
+-INCLUDE			= -I/usr/local/include
++CC			= $(CXX)
+ 
+ lib_LTLIBRARIES		= libxbsql.la
+ bin_PROGRAMS		= xql
diff --git a/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch b/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch
new file mode 100644
index 000000000000..1615fb4d4389
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch
@@ -0,0 +1,79 @@
+ xbsql/xb_fieldset.cpp |  6 +++---
+ xbsql/xbsql.cpp       | 20 ++++++++++----------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/xbsql/xb_fieldset.cpp b/xbsql/xb_fieldset.cpp
+index ea9e726..f922ed3 100644
+--- a/xbsql/xb_fieldset.cpp
++++ b/xbsql/xb_fieldset.cpp
+@@ -58,10 +58,10 @@ XBSQL::Index
+ 	if ((fldno < 0) || (fldno >= fieldSet.getNumFields()))
+ 		return	XBSQL::IndexNone	;
+ 
+-	char	buff[255]	;
+-	strncpy	(buff, tabname,		    sizeof(buff)) ;
++	char	buff[256]	;
++	strncpy	(buff, tabname,		    sizeof(buff) - 1) ;
+ 	strncat	(buff, "_",		    sizeof(buff)) ;
+-	strncat	(buff, getFieldName(fldno), sizeof(buff)) ;
++	strncat	(buff, getFieldName(fldno), sizeof(buff) - strlen(tabname) - 1) ;
+ 
+ 	const char *path = xbase->getPath (buff, "ndx")	;
+ 	int	fd	 = open (path, O_RDONLY)	;
+diff --git a/xbsql/xbsql.cpp b/xbsql/xbsql.cpp
+index 9d07f88..96304c4 100644
+--- a/xbsql/xbsql.cpp
++++ b/xbsql/xbsql.cpp
+@@ -376,9 +376,9 @@ bool	XBaseSQL::createTable
+ 			char	name	[256]	   ;
+ 			xbNdx 	ndxFile	(&dbfFile) ;
+ 
+-			strncpy	(name, table,			sizeof(name)) ;
++			strncpy	(name, table,			sizeof(name) - 1) ;
+ 			strncat	(name, "_",   			sizeof(name)) ;
+-			strncat	(name, schema[idx].FieldName,	sizeof(name)) ;
++			strncat	(name, schema[idx].FieldName,	sizeof(name) - strlen(table) - 1) ;
+ 
+ 			path	= getPath (name, "ndx") ;
+ 			idxflag	= index[idx] == XBSQL::IndexUnique ?
+@@ -467,9 +467,9 @@ XBSQLTable *XBaseSQL::openTable
+ 	{
+ 		char	name[256]	;
+ 
+-		strncpy	(name, table,			sizeof(name)) ;
++		strncpy	(name, table,			sizeof(name) - 1) ;
+ 		strncat	(name, "_",			sizeof(name)) ;
+-		strncat	(name, fSet.getFieldName (idx),	sizeof(name)) ;
++		strncat	(name, fSet.getFieldName (idx),	sizeof(name) - strlen(table) - 1) ;
+ 
+ 		path	= getPath (name, "ndx") ;
+ #ifndef _WIN32
+@@ -873,12 +873,12 @@ bool	XBaseSQL::renameTable
+ 			char		_newName[256]	;
+ 			const char	*fname	= fSet.getFieldName (idx) ;
+ 
+-			strncpy	(_oldName, oldName, sizeof(_oldName)) ;
++			strncpy	(_oldName, oldName, sizeof(_oldName) - 1) ;
+ 			strncat	(_oldName, "_",     sizeof(_oldName)) ;
+-			strncat	(_oldName, fname,   sizeof(_oldName)) ;
+-			strncpy	(_newName, newName, sizeof(_newName)) ;
++			strncat	(_oldName, fname,   sizeof(_oldName) - strlen(oldName) - 1) ;
++			strncpy	(_newName, newName, sizeof(_newName) - 1) ;
+ 			strncat	(_newName, "_",	    sizeof(_newName)) ;
+-			strncat	(_newName, fname,   sizeof(_newName)) ;
++			strncat	(_newName, fname,   sizeof(_newName) - strlen(newName) - 1) ;
+ 
+ 			oldAnon	= getPath (_oldName, "ndx") ;
+ 			newAnon	= getPath (_newName, "ndx") ;
+@@ -956,9 +956,9 @@ bool	XBaseSQL::dropTable
+ 			char		_idxName[256]	;
+ 			const char	*fname	= fSet.getFieldName (idx) ;
+ 
+-			strncpy	(_idxName, table, sizeof(_idxName)) ;
++			strncpy	(_idxName, table, sizeof(_idxName) - 1) ;
+ 			strncat	(_idxName, "_",   sizeof(_idxName)) ;
+-			strncat	(_idxName, fname, sizeof(_idxName)) ;
++			strncat	(_idxName, fname, sizeof(_idxName) - strlen(table) - 1) ;
+ 
+ 			tabAnon	= getPath (_idxName, "ndx") ;
+ 
diff --git a/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch b/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch
new file mode 100644
index 000000000000..4c04d2736b0b
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch
@@ -0,0 +1,19 @@
+--- xbsql-0.11/configure.BAD	2005-08-18 10:34:49.000000000 -0500
++++ xbsql-0.11/configure	2005-08-18 10:36:22.000000000 -0500
+@@ -6977,10 +6977,15 @@
+ 	if      test -f /usr/lib/libncurses.so
+ 	then
+ 		curses=ncurses
+-
++	elif    test -f /usr/lib64/libncurses.so
++	then
++		curses=ncurses
+ 	elif    test -f /usr/lib/libcurses.so
+ 	then
+ 		curses=curses
++	elif    test -f /usr/lib64/libcurses.so
++	then
++		curses=curses
+ 	else
+ 		{ { echo "$as_me:6985: error: No (n)curses installation" >&5
+ echo "$as_me: error: No (n)curses installation" >&2;}
diff --git a/dev-db/xbsql/files/xbsql-0.11-xbase64.patch b/dev-db/xbsql/files/xbsql-0.11-xbase64.patch
new file mode 100644
index 000000000000..6d51cbaf06fc
--- /dev/null
+++ b/dev-db/xbsql/files/xbsql-0.11-xbase64.patch
@@ -0,0 +1,66 @@
+diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am
+--- xbsql-0.11/xbsql/Makefile.am.BAD	2009-08-19 23:32:27.481185284 -0400
++++ xbsql-0.11/xbsql/Makefile.am	2009-08-19 23:32:47.157206308 -0400
+@@ -17,10 +17,10 @@ libxbsql_la_SOURCES	= xb_value.cpp xb_el
+ 			  xb_assignlist.cpp xb_create.cpp \
+ 			  xbsql.tab.c xb_datetime.cpp
+ 
+-libxbsql_la_LDFLAGS	= -lxbase $(DEBUG)
++libxbsql_la_LIBADD	= -lxbase64
+ 
+ xql_SOURCES		= xql.cpp
+-xql_LDADD		= -lxbase -lreadline -l$(CURSES) ./libxbsql.la
++xql_LDADD		= -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
+ 
+ #
+ #
+diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in
+--- xbsql-0.11/xbsql/Makefile.in.BAD	2009-08-19 23:32:54.384058775 -0400
++++ xbsql-0.11/xbsql/Makefile.in	2009-08-19 23:33:03.928059382 -0400
+@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el
+ 			  xbsql.tab.c xb_datetime.cpp
+ 
+ 
+-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
++libxbsql_la_LIBADD = -lxbase64
+ 
+ xql_SOURCES = xql.cpp
+-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
++xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
+ 
+ 
+ #install-data-hook:
+diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp
+--- xbsql-0.11/xbsql/xbsql.cpp.BAD	2009-08-19 23:34:23.880063863 -0400
++++ xbsql-0.11/xbsql/xbsql.cpp	2009-08-19 23:34:47.393184432 -0400
+@@ -207,7 +207,7 @@ void	XBaseSQL::setError
+ 			break	;
+ 
+ 		default	:
+-			e	= xbStrError (rc) ;
++			e	= GetErrorMessage (rc) ;
+ 			break	;
+ 	}
+ 
+@@ -230,7 +230,7 @@ void	XBaseSQL::setError
+ 	char	t[1024]	;
+ 	va_list	aptr	;
+ 
+-	strcpy	  (t, xbStrError (rc)) ;
++	strcpy	  (t, GetErrorMessage (rc)) ;
+ 	strcat	  (t, ": ") ;
+ 	int	  l = strlen(t) ;
+ 
+diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h
+--- xbsql-0.11/xbsql/xbsql.h.BAD	2009-08-19 23:35:45.087088919 -0400
++++ xbsql-0.11/xbsql/xbsql.h	2009-08-19 23:34:06.949184421 -0400
+@@ -43,8 +43,7 @@ XBSQL_API int	strncasecmp (const char *s
+ 
+ #endif
+ 
+-#include	<xbase/xbase.h>
+-#include	<xbase/xbexcept.h>
++#include	<xbase64/xbase64.h>
+ 
+ class	XBaseSQL	;
+ class	XBSQLTable	;
diff --git a/dev-db/xbsql/metadata.xml b/dev-db/xbsql/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/dev-db/xbsql/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-db/xbsql/xbsql-0.11-r2.ebuild b/dev-db/xbsql/xbsql-0.11-r2.ebuild
new file mode 100644
index 000000000000..53f79773ed13
--- /dev/null
+++ b/dev-db/xbsql/xbsql-0.11-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
+
+DESCRIPTION="An SQL Wrapper for the XBase library"
+HOMEPAGE="http://www.rekallrevealed.org/"
+SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	>=dev-db/xbase-3.1.2
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ncurses64.patch
+	"${FILESDIR}"/${P}-xbase64.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-bfr-overflow.patch
+)
+
+DOCS=( AUTHORS Announce ChangeLog INSTALL README TODO )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dohtml doc/*
+}