Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-libs/talloc/files/, sys-libs/talloc/
Date: Sat, 22 Feb 2014 20:40:37
Message-Id: 1393101682.b1e6c1738a4a75e4fed4cd777a58337b1abdf9da.blueness@gentoo
1 commit: b1e6c1738a4a75e4fed4cd777a58337b1abdf9da
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 22 20:41:22 2014 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 22 20:41:22 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=b1e6c173
7
8 sys-libs/talloc: remove BSD strtoll check
9
10 Package-Manager: portage-2.2.7
11 RepoMan-Options: --force
12
13 ---
14 .../files/talloc-remove-check-bsd-strtoll.patch | 24 ++++++++
15 sys-libs/talloc/metadata.xml | 12 ++++
16 sys-libs/talloc/talloc-2.0.8-r99.ebuild | 67 ++++++++++++++++++++++
17 sys-libs/talloc/talloc-2.1.0-r99.ebuild | 67 ++++++++++++++++++++++
18 4 files changed, 170 insertions(+)
19
20 diff --git a/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch b/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch
21 new file mode 100644
22 index 0000000..f872ef5
23 --- /dev/null
24 +++ b/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch
25 @@ -0,0 +1,24 @@
26 +diff -Naur talloc-2.1.0.orig/lib/replace/wscript talloc-2.1.0/lib/replace/wscript
27 +--- talloc-2.1.0.orig/lib/replace/wscript 2013-09-08 12:24:14.000000000 +0000
28 ++++ talloc-2.1.0/lib/replace/wscript 2014-02-22 19:46:36.033471201 +0000
29 +@@ -272,20 +272,6 @@
30 +
31 + #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
32 + #Let's detect those cases
33 +- if conf.CONFIG_SET('HAVE_STRTOLL'):
34 +- conf.CHECK_CODE('''
35 +- long long nb = strtoll("Text", NULL, 0);
36 +- if (errno == EINVAL) {
37 +- return 0;
38 +- } else {
39 +- return 1;
40 +- }
41 +- ''',
42 +- msg="Checking correct behavior of strtoll",
43 +- headers = 'errno.h',
44 +- execute = True,
45 +- define = 'HAVE_BSD_STRTOLL',
46 +- )
47 + conf.CHECK_FUNCS('if_nametoindex strerror_r')
48 + conf.CHECK_FUNCS('getdirentries getdents syslog')
49 + conf.CHECK_FUNCS('gai_strerror get_current_dir_name')
50
51 diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
52 new file mode 100644
53 index 0000000..be0176a
54 --- /dev/null
55 +++ b/sys-libs/talloc/metadata.xml
56 @@ -0,0 +1,12 @@
57 +<?xml version="1.0" encoding="UTF-8"?>
58 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
59 +<pkgmetadata>
60 + <herd>samba</herd>
61 + <maintainer>
62 + <email>patrick@g.o</email>
63 + <name>Patrick Lauer</name>
64 + </maintainer>
65 + <use>
66 + <flag name="compat">Enable extra compatibility stuff</flag>
67 + </use>
68 +</pkgmetadata>
69
70 diff --git a/sys-libs/talloc/talloc-2.0.8-r99.ebuild b/sys-libs/talloc/talloc-2.0.8-r99.ebuild
71 new file mode 100644
72 index 0000000..cba1d89
73 --- /dev/null
74 +++ b/sys-libs/talloc/talloc-2.0.8-r99.ebuild
75 @@ -0,0 +1,67 @@
76 +# Copyright 1999-2013 Gentoo Foundation
77 +# Distributed under the terms of the GNU General Public License v2
78 +# $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 $
79 +
80 +EAPI=5
81 +
82 +PYTHON_COMPAT=( python{2_6,2_7} )
83 +PYTHON_REQ_USE="threads"
84 +
85 +inherit eutils waf-utils python-single-r1 multilib
86 +
87 +DESCRIPTION="Samba talloc library"
88 +HOMEPAGE="http://talloc.samba.org/"
89 +SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
90 +
91 +LICENSE="GPL-3"
92 +SLOT="0"
93 +KEYWORDS="amd64 arm x86"
94 +IUSE="compat python"
95 +
96 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
97 +
98 +RDEPEND="${PYTHON_DEPS}
99 + !!<sys-libs/talloc-2.0.5"
100 +DEPEND="${RDEPEND}
101 + dev-libs/libxslt
102 + || ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
103 +
104 +WAF_BINARY="${S}/buildtools/bin/waf"
105 +
106 +src_prepare() {
107 + epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
108 +}
109 +
110 +src_configure() {
111 + local extra_opts=""
112 +
113 + use compat && extra_opts+=" --enable-talloc-compat1"
114 + use python || extra_opts+=" --disable-python"
115 + waf-utils_src_configure \
116 + ${extra_opts}
117 +}
118 +
119 +src_install() {
120 + waf-utils_src_install
121 +
122 + # waf is stupid, and no, we can't fix the build-system, since it's provided
123 + # as a brilliant binary blob thats decompressed on the fly
124 + if [[ ${CHOST} == *-darwin* ]] ; then
125 + install_name_tool \
126 + -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
127 + "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
128 + if use python ; then
129 + install_name_tool \
130 + -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
131 + "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
132 + install_name_tool \
133 + -change "${S}/bin/default/libtalloc.dylib" \
134 + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
135 + "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
136 + install_name_tool \
137 + -change "${S}/bin/default/libtalloc.dylib" \
138 + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
139 + "${ED}"$(python_get_sitedir)/talloc.bundle || die
140 + fi
141 + fi
142 +}
143
144 diff --git a/sys-libs/talloc/talloc-2.1.0-r99.ebuild b/sys-libs/talloc/talloc-2.1.0-r99.ebuild
145 new file mode 100644
146 index 0000000..9b9e664
147 --- /dev/null
148 +++ b/sys-libs/talloc/talloc-2.1.0-r99.ebuild
149 @@ -0,0 +1,67 @@
150 +# Copyright 1999-2014 Gentoo Foundation
151 +# Distributed under the terms of the GNU General Public License v2
152 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.4 2014/02/02 17:40:57 vostorga Exp $
153 +
154 +EAPI=5
155 +
156 +PYTHON_COMPAT=( python{2_6,2_7} )
157 +PYTHON_REQ_USE="threads"
158 +
159 +inherit eutils waf-utils python-single-r1 multilib
160 +
161 +DESCRIPTION="Samba talloc library"
162 +HOMEPAGE="http://talloc.samba.org/"
163 +SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
164 +
165 +LICENSE="GPL-3"
166 +SLOT="0"
167 +KEYWORDS="amd64 arm x86"
168 +IUSE="compat +python"
169 +
170 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
171 +
172 +RDEPEND="${PYTHON_DEPS}
173 + !!<sys-libs/talloc-2.0.5"
174 +DEPEND="${RDEPEND}
175 + dev-libs/libxslt
176 + || ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
177 +
178 +WAF_BINARY="${S}/buildtools/bin/waf"
179 +
180 +src_prepare() {
181 + epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
182 +}
183 +
184 +src_configure() {
185 + local extra_opts=""
186 +
187 + use compat && extra_opts+=" --enable-talloc-compat1"
188 + use python || extra_opts+=" --disable-python"
189 + waf-utils_src_configure \
190 + ${extra_opts}
191 +}
192 +
193 +src_install() {
194 + waf-utils_src_install
195 +
196 + # waf is stupid, and no, we can't fix the build-system, since it's provided
197 + # as a brilliant binary blob thats decompressed on the fly
198 + if [[ ${CHOST} == *-darwin* ]] ; then
199 + install_name_tool \
200 + -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
201 + "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
202 + if use python ; then
203 + install_name_tool \
204 + -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
205 + "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
206 + install_name_tool \
207 + -change "${S}/bin/default/libtalloc.dylib" \
208 + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
209 + "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
210 + install_name_tool \
211 + -change "${S}/bin/default/libtalloc.dylib" \
212 + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
213 + "${ED}"$(python_get_sitedir)/talloc.bundle || die
214 + fi
215 + fi
216 +}
Report Message
Find on MARC Find on Google Groups