summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-10-17 14:19:39 +0200
committerMichał Górny <mgorny@gentoo.org>2019-10-17 14:19:39 +0200
commit5d48891182a4a200293d5b8affec8922aa85f187 (patch)
tree87b2db2119e1533c284620bb95de3b86ce10d1f8 /dev-db
parentdev-db/xbase: Remove last-rited pkg (diff)
downloadgentoo-5d48891182a4a200293d5b8affec8922aa85f187.tar.gz
gentoo-5d48891182a4a200293d5b8affec8922aa85f187.tar.bz2
gentoo-5d48891182a4a200293d5b8affec8922aa85f187.zip
dev-db/xbsql: Remove last-rited pkg
Closes: https://bugs.gentoo.org/694602 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/xbsql/Manifest1
-rw-r--r--dev-db/xbsql/files/xbsql-0.11-autotools.patch18
-rw-r--r--dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch79
-rw-r--r--dev-db/xbsql/files/xbsql-0.11-ncurses64.patch19
-rw-r--r--dev-db/xbsql/files/xbsql-0.11-xbase64.patch66
-rw-r--r--dev-db/xbsql/metadata.xml5
-rw-r--r--dev-db/xbsql/xbsql-0.11-r2.ebuild40
7 files changed, 0 insertions, 228 deletions
diff --git a/dev-db/xbsql/Manifest b/dev-db/xbsql/Manifest
deleted file mode 100644
index 34e35c8b662b..000000000000
--- a/dev-db/xbsql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xbsql-0.11.tgz 307392 BLAKE2B 1be4352208d95f9f451c59cba6494db2399ed93c937d2494f0877ee6866d1d679732eddd244d467118b70e303380b7eb212bf3fad0a5180e04ab62746d7e4ac3 SHA512 caf8a6d8191f7de860008e5ac2628e388097b05999887ec52b91684f6577dd3152dfa164b71a37d84ef70f43ab868dd02b30bc76c88208d4daa85d8e111ea3a4
diff --git a/dev-db/xbsql/files/xbsql-0.11-autotools.patch b/dev-db/xbsql/files/xbsql-0.11-autotools.patch
deleted file mode 100644
index b1e72562b397..000000000000
--- a/dev-db/xbsql/files/xbsql-0.11-autotools.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- 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
deleted file mode 100644
index 1615fb4d4389..000000000000
--- a/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch
+++ /dev/null
@@ -1,79 +0,0 @@
- 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
deleted file mode 100644
index 4c04d2736b0b..000000000000
--- a/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index 6d51cbaf06fc..000000000000
--- a/dev-db/xbsql/files/xbsql-0.11-xbase64.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/xbsql/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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
deleted file mode 100644
index 53f79773ed13..000000000000
--- a/dev-db/xbsql/xbsql-0.11-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/*
-}