Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/
Date: Mon, 13 Nov 2017 15:49:40
Message-Id: 1510588169.51c693cb95d3dcde67b32a3a39944e0759d1c2a3.polynomial-c@gentoo
1 commit: 51c693cb95d3dcde67b32a3a39944e0759d1c2a3
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 13 15:49:04 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 13 15:49:29 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c693cb
7
8 net-fs/samba: Fixed build with rpc-less glibc.
9
10 Closes: https://bugs.gentoo.org/606542
11 Closes: https://bugs.gentoo.org/637320
12 Package-Manager: Portage-2.3.13, Repoman-2.3.4
13
14 net-fs/samba/files/samba-glibc-2.26-no_rpc.patch | 14 ++++++++++++++
15 net-fs/samba/samba-4.6.9.ebuild | 1 +
16 net-fs/samba/samba-4.7.1.ebuild | 1 +
17 3 files changed, 16 insertions(+)
18
19 diff --git a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
20 new file mode 100644
21 index 00000000000..e66446845f2
22 --- /dev/null
23 +++ b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
24 @@ -0,0 +1,14 @@
25 +https://attachments.samba.org/attachment.cgi?id=13172
26 +https://bugs.gentoo.org/637320
27 +
28 +--- a/lib/replace/wscript
29 ++++ b/lib/replace/wscript
30 +@@ -71,7 +71,7 @@
31 + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
32 + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
33 +
34 +- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
35 ++ conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
36 +
37 + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
38 + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
39
40 diff --git a/net-fs/samba/samba-4.6.9.ebuild b/net-fs/samba/samba-4.6.9.ebuild
41 index 43d075a4a99..3f12fb2f123 100644
42 --- a/net-fs/samba/samba-4.6.9.ebuild
43 +++ b/net-fs/samba/samba-4.6.9.ebuild
44 @@ -119,6 +119,7 @@ S="${WORKDIR}/${MY_P}"
45 PATCHES=(
46 "${FILESDIR}/${PN}-4.4.0-pam.patch"
47 "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
48 + "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
49 )
50
51 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
52
53 diff --git a/net-fs/samba/samba-4.7.1.ebuild b/net-fs/samba/samba-4.7.1.ebuild
54 index 8e9afc791ab..e04ebce2c5b 100644
55 --- a/net-fs/samba/samba-4.7.1.ebuild
56 +++ b/net-fs/samba/samba-4.7.1.ebuild
57 @@ -118,6 +118,7 @@ PATCHES=(
58 "${FILESDIR}/${PN}-4.4.0-pam.patch"
59 "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
60 "${FILESDIR}"/talloc-disable-python.patch
61 + "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
62 )
63
64 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"