From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-db/xbsql/Manifest | 9 +++ dev-db/xbsql/files/xbsql-0.11-autotools.patch | 18 ++++++ dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch | 79 ++++++++++++++++++++++++ dev-db/xbsql/files/xbsql-0.11-ncurses64.patch | 19 ++++++ dev-db/xbsql/files/xbsql-0.11-xbase64.patch | 66 ++++++++++++++++++++ dev-db/xbsql/metadata.xml | 5 ++ dev-db/xbsql/xbsql-0.11-r2.ebuild | 40 ++++++++++++ 7 files changed, 236 insertions(+) create mode 100644 dev-db/xbsql/Manifest create mode 100644 dev-db/xbsql/files/xbsql-0.11-autotools.patch create mode 100644 dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch create mode 100644 dev-db/xbsql/files/xbsql-0.11-ncurses64.patch create mode 100644 dev-db/xbsql/files/xbsql-0.11-xbase64.patch create mode 100644 dev-db/xbsql/metadata.xml create mode 100644 dev-db/xbsql/xbsql-0.11-r2.ebuild (limited to 'dev-db/xbsql') diff --git a/dev-db/xbsql/Manifest b/dev-db/xbsql/Manifest new file mode 100644 index 000000000000..d5f181bb73cf --- /dev/null +++ b/dev-db/xbsql/Manifest @@ -0,0 +1,9 @@ +AUX xbsql-0.11-autotools.patch 495 SHA256 412a86d55b35be897e64443b2d74edecdc453f6d4ce76c933bafc2eda813e583 SHA512 fd5ecfbf5a63393147e305bfa1704848f807f97f0af4c03bdae7ad6be9085a4bd97724fa59aeec903d3020a01f42cd29440b619705d7678d153e8c4a3e59f450 WHIRLPOOL 577b372d279535f9a1d15046321c6ae806bb342e879dd9dfd10b279ae1bc6ea10ec22700504f8a828559e982cd40718c8bd398200bb7a322cfc152e334ab6abe +AUX xbsql-0.11-bfr-overflow.patch 3015 SHA256 f71393da3c7d55eeb524ad0fde6828f1de5677981d34ffb6e3b41a1289092558 SHA512 37d4f541fa7e85a9297e19d3793f97d80acef07a9131e35ed7dfa5e277aa646463aafe731c47885251171318edca141bfc2b8304a971db7804f3f0a1eb66d329 WHIRLPOOL fe76bbecdd7b44ef83af98a560a1e71c934db28b3fb7312c964b11b0b950b6b76c8029770971994f4292d76d2331384c3d04bfb88183565b8b2d32ea7e4a08aa +AUX xbsql-0.11-ncurses64.patch 542 SHA256 405c0b239a8b2c5cea8157b5f1dd050df786d55e14fb7092cda36038efb3aab7 SHA512 64148cab80c3d5bc0209e31c0885ea69d3124dc8ad11c57706b71aafe926451928610aeb5dab6639b5a405bcba07d1a3e4588224293d3e4343f76eb194d3aec8 WHIRLPOOL 0ac35294cae79b3ffc28e2d4d109ee76b84891eafbfb9dfb1a8d55966dfe0d7f0e791b9cb276bdf93304eee7b884902129bf2fdb194b4effdf1e7bc02dc7e9ad +AUX xbsql-0.11-xbase64.patch 2076 SHA256 4da0e870a1ea1f400e752afe4d97a5cb725058244fc197398b0d48c2e08910d6 SHA512 9b1848156f0629a486510a87077c55548b338206331dbf2b7011487ba04bf7986f73b160505defe319b0144cbf617882da760de8f355b81c757166a603931ef3 WHIRLPOOL 4e84bbd9aeab8a7f996a9bc84af05152da300f3de9c00c686b0380799ada190ff0377e7960d92bf00b4b59b2cd20ecc99942c9bafd808e4baeab869d3f7a59c1 +DIST xbsql-0.11.tgz 307392 SHA256 c91836a4c3f138b6e211d4427dce840cd6b30853f0dffaa3bc36d05f8751606a SHA512 caf8a6d8191f7de860008e5ac2628e388097b05999887ec52b91684f6577dd3152dfa164b71a37d84ef70f43ab868dd02b30bc76c88208d4daa85d8e111ea3a4 WHIRLPOOL 0aecbb9725a2bccac9941eebb160d4dc15f8373e22641ed7a6b75c27955cf61b1ec62f59c3c496a3faa3f1ff7887a2658c08149da6cf1cc59214489ed3510919 +EBUILD xbsql-0.11-r2.ebuild 821 SHA256 def91ec2d759827e73fa574aae353ad7998e8a14de5e5a794f2f50ab6f70a82d SHA512 74b5d612ace30243ab726c2f424d940d4d4e4f00226a0d926aa58e875b2b5fef6bc3a463da6bb3cc2ba61b7398d3507598ad96352e27fb27cb06e70fab92ece1 WHIRLPOOL 8d101018465727d99380b899be6ead811ec8198c34e3ce848dff87eff3e95d74ee326242a367e7490e593d35b8049873161476ad0d65d294af21d39fb146a0eb +MISC ChangeLog 2663 SHA256 483ace0d0f7515e7332ec35f31de678bb6a080829b3a165cc69531cf511a7bf8 SHA512 d1ac2f33f761cc75513682a245859adcb08efe93ea3e5af84424c8e908a6067588c06ebff64e993320f4638f8e1a0839dc1aa02b98f9276491b04679166a570e WHIRLPOOL f75a20bddb25c07ac20dce187e6a7ac4cde34ca392253dd77412beaa1024aab1bc776d6dc49d648d01bbcab10212d730727c5dc353a76619eb2c9709713c0e6d +MISC ChangeLog-2015 2000 SHA256 c3b459295a3f4162a9e34ec0ebe12999317dc40e73cbd3211febb3f2b4fcb7e4 SHA512 9c69519928ef103c80abf99431157cba20ccac4f0d1d8e8c00e6e9ea228160e5faee44ff89aa6b6eaecdcce1a5122a2b2760d7ef6134a8fc9f48d10c0e1442d6 WHIRLPOOL 0762e2ee631aa7b43ad9250584d9f63521c27b8f083a0fe7bf1fac4a4dd1c6ee431bdae17f92f26498feaf6623ef812d8bed34d8e54a7070db8c15e0cebd1421 +MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 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 +-#include ++#include + + 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 @@ + + + + + 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/* +} -- cgit v1.2.3