[gentoo-commits] proj/hardened-dev:musl commit in: sys-libs/tdb/, sys-libs/tdb/files/

[Anthony G. Basile]

commit:     5f568f2293c42f0a021508fa8b2bfc67392d63cd
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 12:46:49 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 12:46:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=5f568f22

sys-libs/tdb: remove BSD strtoll check

Package-Manager: portage-2.2.7
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA

---
 .../tdb/files/tdb-remove-check-bsd-strtoll.patch   | 25 ++++++++++++
 sys-libs/tdb/metadata.xml                          | 13 ++++++
 sys-libs/tdb/tdb-1.2.11-r99.ebuild                 | 46 ++++++++++++++++++++++
 sys-libs/tdb/tdb-1.2.12-r99.ebuild                 | 44 +++++++++++++++++++++
 4 files changed, 128 insertions(+)

diff --git a/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch b/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch
new file mode 100644
index 0000000..8108209
--- /dev/null
+++ b/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch
@@ -0,0 +1,25 @@
+diff -Naur tdb-1.2.11.orig/lib/replace/wscript tdb-1.2.11/lib/replace/wscript
+--- tdb-1.2.11.orig/lib/replace/wscript	2012-11-30 08:51:31.000000000 +0000
++++ tdb-1.2.11/lib/replace/wscript	2014-02-23 12:37:58.921617847 +0000
+@@ -215,21 +215,6 @@
+ 
+     #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
+     #Let's detect those cases
+-    if conf.CONFIG_SET('HAVE_STRTOLL'):
+-        conf.CHECK_CODE('''
+-                        long long nb = strtoll("Text", NULL, 0);
+-                        if (errno == EINVAL) {
+-                            return 0;
+-                        } else {
+-                            return 1;
+-                        }
+-                        ''',
+-                        msg="Checking correct behavior of strtoll",
+-                        headers = 'errno.h',
+-                        execute = True,
+-                        define_ret = True,
+-                        define = 'HAVE_BSD_STRTOLL',
+-                        )
+     conf.CHECK_FUNCS('if_nametoindex strerror_r')
+     conf.CHECK_FUNCS('getdirentries getdents syslog')
+     conf.CHECK_FUNCS('gai_strerror get_current_dir_name')

diff --git a/sys-libs/tdb/metadata.xml b/sys-libs/tdb/metadata.xml
new file mode 100644
index 0000000..742098c
--- /dev/null
+++ b/sys-libs/tdb/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>samba</herd>
+  <maintainer>
+    <email>patrick@g.o</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <use>
+    <flag name="tools">Install extra tools</flag>
+    <flag name="tdbtest">Install tdbtest app</flag>
+  </use>
+</pkgmetadata>

diff --git a/sys-libs/tdb/tdb-1.2.11-r99.ebuild b/sys-libs/tdb/tdb-1.2.11-r99.ebuild
new file mode 100644
index 0000000..d8b5af9
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.2.11-r99.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.11.ebuild,v 1.8 2013/09/06 16:04:59 ago Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit waf-utils python
+
+DESCRIPTION="A simple database API"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="python"
+
+RDEPEND=""
+DEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_configure() {
+	local extra_opts=""
+	use python || extra_opts+=" --disable-python"
+	waf-utils_src_configure \
+	${extra_opts}
+}
+
+src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check || die "emake check failed"
+}

diff --git a/sys-libs/tdb/tdb-1.2.12-r99.ebuild b/sys-libs/tdb/tdb-1.2.12-r99.ebuild
new file mode 100644
index 0000000..450fde3
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.2.12-r99.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.12-r1.ebuild,v 1.1 2013/06/30 16:33:13 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit waf-utils python-single-r1
+
+DESCRIPTION="A simple database API"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="
+	${RDEPEND}
+	app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_configure() {
+	local extra_opts=""
+	use python || extra_opts+=" --disable-python"
+	waf-utils_src_configure \
+	${extra_opts}
+}
+
+src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}