Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-fs/samba/files/, net-fs/samba/
Date: Sun, 18 Nov 2018 20:23:07
Message-Id: 1542572554.89ad3152c133ea64b34c4e84911ef76f6237d04a.blueness@gentoo
1 commit: 89ad3152c133ea64b34c4e84911ef76f6237d04a
2 Author: xdch47 <xdch47 <AT> posteo <DOT> de>
3 AuthorDate: Sun Nov 18 19:26:24 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 18 20:22:34 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=89ad3152
7
8 net-fs/samba: version bump to 4.9.2-r1
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Manifest-Sign-Key: 0DEDF1A904568BAD1FC45C283DCC44782ED07E1C
12 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
13
14 net-fs/samba/files/samba-4.9.2-timespec.patch | 21 +++++++++++++++++++++
15 .../{samba-4.9.2.ebuild => samba-4.9.2-r1.ebuild} | 9 ++++++---
16 2 files changed, 27 insertions(+), 3 deletions(-)
17
18 diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch b/net-fs/samba/files/samba-4.9.2-timespec.patch
19 new file mode 100644
20 index 0000000..c82f4af
21 --- /dev/null
22 +++ b/net-fs/samba/files/samba-4.9.2-timespec.patch
23 @@ -0,0 +1,21 @@
24 +From 11e8c14b78e2423041f3846882f74cd6490a3e44 Mon Sep 17 00:00:00 2001
25 +From: Joan Karadimov <joan@×××××××××××××.com>
26 +Date: Thu, 18 Oct 2018 18:16:17 +0300
27 +Subject: [PATCH] Fix compatibility issues with the timespec struct
28 +
29 +---
30 + source3/include/libsmbclient.h | 1 +
31 + 1 file changed, 1 insertion(+)
32 +
33 +diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
34 +index 5e4a1715402..6487ea7a8aa 100644
35 +--- a/source3/include/libsmbclient.h
36 ++++ b/source3/include/libsmbclient.h
37 +@@ -78,6 +78,7 @@ extern "C" {
38 + #include <sys/statvfs.h>
39 + #include <stdint.h>
40 + #include <fcntl.h>
41 ++#include <time.h>
42 + #include <utime.h>
43 +
44 + #define SMBC_BASE_FD 10000 /* smallest file descriptor returned */
45
46 diff --git a/net-fs/samba/samba-4.9.2.ebuild b/net-fs/samba/samba-4.9.2-r1.ebuild
47 similarity index 97%
48 rename from net-fs/samba/samba-4.9.2.ebuild
49 rename to net-fs/samba/samba-4.9.2-r1.ebuild
50 index 21c71a2..34d9cd9 100644
51 --- a/net-fs/samba/samba-4.9.2.ebuild
52 +++ b/net-fs/samba/samba-4.9.2-r1.ebuild
53 @@ -15,7 +15,7 @@ SRC_PATH="stable"
54
55 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
56 [[ ${PV} = *_rc* ]] || \
57 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
58 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
59
60 DESCRIPTION="Samba Suite Version 4"
61 HOMEPAGE="https://www.samba.org/"
62 @@ -132,6 +132,7 @@ S="${WORKDIR}/${MY_P}"
63 PATCHES=(
64 "${FILESDIR}/${PN}-4.4.0-pam.patch"
65 "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
66 + "${FILESDIR}/${PN}-4.9.2-timespec.patch"
67 "${FILESDIR}/netdb-defines.patch"
68 )
69
70 @@ -159,7 +160,9 @@ src_prepare() {
71 sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
72
73 # unbundle iso8601 unless tests are enabled
74 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
75 + if ! use test ; then
76 + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
77 + fi
78
79 # ugly hackaround for bug #592502
80 cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
81 @@ -232,7 +235,7 @@ multilib_src_install() {
82 waf-utils_src_install
83
84 # Make all .so files executable
85 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
86 + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
87
88 if multilib_is_native_abi ; then
89 # install ldap schema for server (bug #491002)