* [gentoo-commits] proj/hardened-dev:musl commit in: sys-libs/talloc/files/, sys-libs/talloc/
@ 2014-02-22 20:40 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2014-02-22 20:40 UTC (permalink / raw
To: gentoo-commits
commit: b1e6c1738a4a75e4fed4cd777a58337b1abdf9da
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 20:41:22 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 20:41:22 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=b1e6c173
sys-libs/talloc: remove BSD strtoll check
Package-Manager: portage-2.2.7
RepoMan-Options: --force
---
.../files/talloc-remove-check-bsd-strtoll.patch | 24 ++++++++
sys-libs/talloc/metadata.xml | 12 ++++
sys-libs/talloc/talloc-2.0.8-r99.ebuild | 67 ++++++++++++++++++++++
sys-libs/talloc/talloc-2.1.0-r99.ebuild | 67 ++++++++++++++++++++++
4 files changed, 170 insertions(+)
diff --git a/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch b/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch
new file mode 100644
index 0000000..f872ef5
--- /dev/null
+++ b/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch
@@ -0,0 +1,24 @@
+diff -Naur talloc-2.1.0.orig/lib/replace/wscript talloc-2.1.0/lib/replace/wscript
+--- talloc-2.1.0.orig/lib/replace/wscript 2013-09-08 12:24:14.000000000 +0000
++++ talloc-2.1.0/lib/replace/wscript 2014-02-22 19:46:36.033471201 +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/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
new file mode 100644
index 0000000..be0176a
--- /dev/null
+++ b/sys-libs/talloc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>samba</herd>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <use>
+ <flag name="compat">Enable extra compatibility stuff</flag>
+ </use>
+</pkgmetadata>
diff --git a/sys-libs/talloc/talloc-2.0.8-r99.ebuild b/sys-libs/talloc/talloc-2.0.8-r99.ebuild
new file mode 100644
index 0000000..cba1d89
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.0.8-r99.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.8-r1.ebuild,v 1.3 2013/08/25 20:01:47 maekke Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit eutils waf-utils python-single-r1 multilib
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="http://talloc.samba.org/"
+SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="compat python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !!<sys-libs/talloc-2.0.5"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ || ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_configure() {
+ local extra_opts=""
+
+ use compat && extra_opts+=" --enable-talloc-compat1"
+ use python || extra_opts+=" --disable-python"
+ waf-utils_src_configure \
+ ${extra_opts}
+}
+
+src_install() {
+ waf-utils_src_install
+
+ # waf is stupid, and no, we can't fix the build-system, since it's provided
+ # as a brilliant binary blob thats decompressed on the fly
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+ if use python ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+ install_name_tool \
+ -change "${S}/bin/default/libtalloc.dylib" \
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+ install_name_tool \
+ -change "${S}/bin/default/libtalloc.dylib" \
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"$(python_get_sitedir)/talloc.bundle || die
+ fi
+ fi
+}
diff --git a/sys-libs/talloc/talloc-2.1.0-r99.ebuild b/sys-libs/talloc/talloc-2.1.0-r99.ebuild
new file mode 100644
index 0000000..9b9e664
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.1.0-r99.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.4 2014/02/02 17:40:57 vostorga Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit eutils waf-utils python-single-r1 multilib
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="http://talloc.samba.org/"
+SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !!<sys-libs/talloc-2.0.5"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ || ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
+}
+
+src_configure() {
+ local extra_opts=""
+
+ use compat && extra_opts+=" --enable-talloc-compat1"
+ use python || extra_opts+=" --disable-python"
+ waf-utils_src_configure \
+ ${extra_opts}
+}
+
+src_install() {
+ waf-utils_src_install
+
+ # waf is stupid, and no, we can't fix the build-system, since it's provided
+ # as a brilliant binary blob thats decompressed on the fly
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+ if use python ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+ install_name_tool \
+ -change "${S}/bin/default/libtalloc.dylib" \
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+ install_name_tool \
+ -change "${S}/bin/default/libtalloc.dylib" \
+ "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+ "${ED}"$(python_get_sitedir)/talloc.bundle || die
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-02-22 20:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-22 20:40 [gentoo-commits] proj/hardened-dev:musl commit in: sys-libs/talloc/files/, sys-libs/talloc/ Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox