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

[Anthony G. Basile]

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

sys-libs/tevent: remove BSD strtoll check

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

---
 sys-libs/tevent/files/add-py-file-0.9.14.patch     | 32 ++++++++++++++++
 sys-libs/tevent/files/add-py-file.patch            | 32 ++++++++++++++++
 .../files/tevent-remove-check-bsd-strtoll.patch    | 24 ++++++++++++
 sys-libs/tevent/files/tevent-version.patch         | 27 +++++++++++++
 sys-libs/tevent/metadata.xml                       |  9 +++++
 sys-libs/tevent/tevent-0.9.19-r99.ebuild           | 44 ++++++++++++++++++++++
 sys-libs/tevent/tevent-0.9.20-r99.ebuild           | 44 ++++++++++++++++++++++
 sys-libs/tevent/tevent-0.9.21-r99.ebuild           | 44 ++++++++++++++++++++++
 8 files changed, 256 insertions(+)

diff --git a/sys-libs/tevent/files/add-py-file-0.9.14.patch b/sys-libs/tevent/files/add-py-file-0.9.14.patch
new file mode 100644
index 0000000..3270816
--- /dev/null
+++ b/sys-libs/tevent/files/add-py-file-0.9.14.patch
@@ -0,0 +1,32 @@
+--- /dev/null
++++ /tevent.py
+@@ -0,0 +1,29 @@
++#!/usr/bin/python
++#
++#   Python integration for tevent
++#
++#   Copyright (C) Jelmer Vernooij 2011
++#
++#     ** NOTE! The following LGPL license applies to the tevent
++#     ** library. This does NOT imply that all of Samba is released
++#     ** under the LGPL
++#
++#   This library is free software; you can redistribute it and/or
++#   modify it under the terms of the GNU Lesser General Public
++#   License as published by the Free Software Foundation; either
++#   version 3 of the License, or (at your option) any later version.
++#
++#   This library is distributed in the hope that it will be useful,
++#   but WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#   Lesser General Public License for more details.
++#
++#   You should have received a copy of the GNU Lesser General Public
++#   License along with this library; if not, see <http://www.gnu.org/licenses/>.
++
++from _tevent import (
++    __version__,
++    backend_list,
++    Context,
++    Signal,
++    )

diff --git a/sys-libs/tevent/files/add-py-file.patch b/sys-libs/tevent/files/add-py-file.patch
new file mode 100644
index 0000000..cd91983
--- /dev/null
+++ b/sys-libs/tevent/files/add-py-file.patch
@@ -0,0 +1,32 @@
+--- /dev/null
++++ b/tevent.py
+@@ -0,0 +1,29 @@
++#!/usr/bin/python
++#
++#   Python integration for tevent
++#
++#   Copyright (C) Jelmer Vernooij 2011
++#
++#     ** NOTE! The following LGPL license applies to the tevent
++#     ** library. This does NOT imply that all of Samba is released
++#     ** under the LGPL
++#
++#   This library is free software; you can redistribute it and/or
++#   modify it under the terms of the GNU Lesser General Public
++#   License as published by the Free Software Foundation; either
++#   version 3 of the License, or (at your option) any later version.
++#
++#   This library is distributed in the hope that it will be useful,
++#   but WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#   Lesser General Public License for more details.
++#
++#   You should have received a copy of the GNU Lesser General Public
++#   License along with this library; if not, see <http://www.gnu.org/licenses/>.
++
++from _tevent import (
++    __version__,
++    backend_list,
++    Context,
++    Signal,
++    )

diff --git a/sys-libs/tevent/files/tevent-remove-check-bsd-strtoll.patch b/sys-libs/tevent/files/tevent-remove-check-bsd-strtoll.patch
new file mode 100644
index 0000000..481f0d4
--- /dev/null
+++ b/sys-libs/tevent/files/tevent-remove-check-bsd-strtoll.patch
@@ -0,0 +1,24 @@
+diff -Naur tevent-0.9.19.orig/lib/replace/wscript tevent-0.9.19/lib/replace/wscript
+--- tevent-0.9.19.orig/lib/replace/wscript	2013-06-04 14:21:30.000000000 +0000
++++ tevent-0.9.19/lib/replace/wscript	2014-02-23 12:01:19.733793736 +0000
+@@ -272,20 +272,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 = '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/tevent/files/tevent-version.patch b/sys-libs/tevent/files/tevent-version.patch
new file mode 100644
index 0000000..2042ec5
--- /dev/null
+++ b/sys-libs/tevent/files/tevent-version.patch
@@ -0,0 +1,27 @@
+--- a/pytevent.c
++++ b/pytevent.c
+@@ -761,4 +761,6 @@ void init_tevent(void)
+ 
+ 	Py_INCREF(&TeventFd_Type);
+ 	PyModule_AddObject(m, "Fd", (PyObject *)&TeventFd_Type);
++
++	PyModule_AddObject(m, "__version__", PyString_FromString(PACKAGE_VERSION));
+ }
+--- a/wscript
++++ b/wscript
+@@ -92,7 +92,14 @@
+                      'pytevent.c',
+                      deps='tevent',
+                      enabled=True,
+-                     realname='_tevent.so')
++                     realname='_tevent.so',
++                     cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
++    # install out various python scripts for use by make test
++    bld.SAMBA_SCRIPT('tevent_python',
++                 pattern='tevent.py',
++                 installdir='python')
++
++    bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False)
+ 
+ 
+ def test(ctx):

diff --git a/sys-libs/tevent/metadata.xml b/sys-libs/tevent/metadata.xml
new file mode 100644
index 0000000..e06ba37
--- /dev/null
+++ b/sys-libs/tevent/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>

diff --git a/sys-libs/tevent/tevent-0.9.19-r99.ebuild b/sys-libs/tevent/tevent-0.9.19-r99.ebuild
new file mode 100644
index 0000000..259a50b
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.19-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/tevent/tevent-0.9.19.ebuild,v 1.15 2013/09/06 20:08:35 maekke Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit waf-utils python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="http://tevent.samba.org/"
+SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/talloc-2.0.8[python]
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_install() {
+	waf-utils_src_install
+	python_export PYTHON_SITEDIR
+	insinto "${PYTHON_SITEDIR#${EPREFIX}}"
+	doins tevent.py
+	python_optimize
+}

diff --git a/sys-libs/tevent/tevent-0.9.20-r99.ebuild b/sys-libs/tevent/tevent-0.9.20-r99.ebuild
new file mode 100644
index 0000000..8b1a9c5
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.20-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/tevent/tevent-0.9.20.ebuild,v 1.2 2013/12/16 08:53:50 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit waf-utils python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="http://tevent.samba.org/"
+SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/talloc-2.1.0[python]
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_install() {
+	waf-utils_src_install
+	python_export PYTHON_SITEDIR
+	insinto "${PYTHON_SITEDIR#${EPREFIX}}"
+	doins tevent.py
+	python_optimize
+}

diff --git a/sys-libs/tevent/tevent-0.9.21-r99.ebuild b/sys-libs/tevent/tevent-0.9.21-r99.ebuild
new file mode 100644
index 0000000..89f9e79
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.21-r99.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.21.ebuild,v 1.1 2014/01/18 23:19:27 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit waf-utils python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="http://tevent.samba.org/"
+SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/talloc-2.1.0[python]
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_install() {
+	waf-utils_src_install
+	python_export PYTHON_SITEDIR
+	insinto "${PYTHON_SITEDIR#${EPREFIX}}"
+	doins tevent.py
+	python_optimize
+}