commit:     51c693cb95d3dcde67b32a3a39944e0759d1c2a3
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 15:49:04 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 15:49:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c693cb

net-fs/samba: Fixed build with rpc-less glibc.

Closes: https://bugs.gentoo.org/606542
Closes: https://bugs.gentoo.org/637320
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 net-fs/samba/files/samba-glibc-2.26-no_rpc.patch | 14 ++++++++++++++
 net-fs/samba/samba-4.6.9.ebuild                  |  1 +
 net-fs/samba/samba-4.7.1.ebuild                  |  1 +
 3 files changed, 16 insertions(+)

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
new file mode 100644
index 00000000000..e66446845f2
--- /dev/null
+++ b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
@@ -0,0 +1,14 @@
+https://attachments.samba.org/attachment.cgi?id=13172
+https://bugs.gentoo.org/637320
+
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -71,7 +71,7 @@
+     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h 
sys/sysmacros.h')
+     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+ 
+-    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', 
define='HAVE_RPCSVC_YP_PROT_H')
++    conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', 
define='HAVE_RPCSVC_YP_PROT_H')
+ 
+     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')

diff --git a/net-fs/samba/samba-4.6.9.ebuild b/net-fs/samba/samba-4.6.9.ebuild
index 43d075a4a99..3f12fb2f123 100644
--- a/net-fs/samba/samba-4.6.9.ebuild
+++ b/net-fs/samba/samba-4.6.9.ebuild
@@ -119,6 +119,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
        "${FILESDIR}/${PN}-4.4.0-pam.patch"
        "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"

diff --git a/net-fs/samba/samba-4.7.1.ebuild b/net-fs/samba/samba-4.7.1.ebuild
index 8e9afc791ab..e04ebce2c5b 100644
--- a/net-fs/samba/samba-4.7.1.ebuild
+++ b/net-fs/samba/samba-4.7.1.ebuild
@@ -118,6 +118,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-4.4.0-pam.patch"
        "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
        "${FILESDIR}"/talloc-disable-python.patch
+       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"

Reply via email to