gentoo resync : 19.01.2018

7 files changed, 38 insertions, 10 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 0b420958e55d..56b8c37d40ad 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index c594d32e2773..d2444efcfa9b 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -11,6 +11,6 @@ EBUILD libnfs-1.11.0.ebuild 1076 BLAKE2B 6eef0f8a3dded31ab549e592d922821655f28cc
 EBUILD libnfs-1.9.5.ebuild 1104 BLAKE2B 35d57e11ee8bee13296749d1ffad4538b900c26be337e55ebf7ffdaf8cba6439859d11154c0767c02fe500b4e1ed68eef789a2b24d977c829b2b3ee6f676a620 SHA512 ab70f6ec1e3e80aeaca04a8c01c8a27d01bb2ff3bbfc0f656f4d70a9a7db73ab7c385c8a292aa5cbbc6f4517de9c52f385c66010de1775f28e36af2a69a2fbb6
 EBUILD libnfs-1.9.7.ebuild 1065 BLAKE2B f90f578433b843bdb46fa0620258d5c2e51517838d664fe8168145af224431ff258bf13c784babaacf484bb69b30e2e491b2e5bdb6fa3671ef205c72c16caa9e SHA512 27c789939b00ef3864474fd16ea24e337d53859c35ff0479b302d47ddea6e6e3d9321048be473602df865834248122c4232c72a6996a14a00b16c8bdf8641a60
 EBUILD libnfs-1.9.8.ebuild 1076 BLAKE2B 6eef0f8a3dded31ab549e592d922821655f28ccb19c55b7d832f10f6b10a6b4226d5716b2927fb47fd6d04841c193f8ffe51aa7fe00022b5ee8e63f15ae07bb7 SHA512 a98406e2047ef0f1f841af6874358125f58c12aef62f47d5259c5d38fd842c68807675d93f53a771d4bd11b1fe712df404ee074e64b694015e26b72efb10acf7
-EBUILD libnfs-2.0.0.ebuild 1114 BLAKE2B be13cf89760e8b3c63d95e1e168e2dae1d5f8d60c37382ef1c54dd3fe9f33cac1ec3d618cc6f90f9c5530596ec0c1b876416dbb062a4dcec586fbe76be18c487 SHA512 18132b4ba42d185e1bc40fb88e4a3a209b3cbefbc46de15e628a419712003fc8e88b206fccccae22e01783e72f93878bade4737e45538d0ce33e3b969e5f348a
+EBUILD libnfs-2.0.0.ebuild 1113 BLAKE2B 4a8b0ba0d8a3eeb769ea5cdf53763401cae6469d60b46d291fe9acdbb2b3ef8091de43c03b5547a8ffcea82e5e11d8fd3958ec48a7d38a1cfed66130e41ede81 SHA512 b7c7311ff2e362217c9bf84dcfa7f1f7daf455692f41b018dab6c05856fe42d9397c97f7cacb557f3069280e6676cb74c900d83f08fb6ea4f969b108cb22be00
 EBUILD libnfs-9999.ebuild 1118 BLAKE2B e0921c1767a521d3366ffc7318b4861ea7c1b8186c09e880f7520a1a4bedf705a9eb924e4a874cd33f3738e4f24b8a414459d263c166441447b22f6ed7b292ad SHA512 0bca1722a17557667b9c7c6996fee9fe98ccfeed7d9d74db0af1d265b99cdb2668c3a934398648c9615fd970972bad79234b28580bccee3a38eed934bd5ad7e0
 MISC metadata.xml 337 BLAKE2B 0e7e5918d79634937e9d1ad6289fab93b11ff6330b554c52e76148120974b58cf586669ccfa579daef54d8b8b23a51b623582c50839ca8f6182619c1987ac368 SHA512 aabcd286aba9ba93d7e64759ef0fb49b4d5ac99182453b2bf68727d0f41638640d312355465b8862b4f070f5bd47b1debbca635a07d7e44dde841da99405206d
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index 3b541741c9a8..dcaa7592bb4a 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 9c02ba0f9384..e004361d5763 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,7 +1,7 @@
 AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 BLAKE2B 6f1315a02a6070443fbd8cc943e382a02ac8ee99dbbc78f6b1b6c835548b80a78238ae4f7de18c7f02687df370bc58d628ed2bdbf216a41e80b5b589f1952c3c SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998
 AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97a1a73e7884bea01e0d22d5ec0a88cc4d5c8f152baaeb2b602961232c08330b311f3e98cb79c40b7d700a279842430e484d9 SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a
-AUX nfs-utils-2.3.1-svcgssd_undefined_reference.patch 290 BLAKE2B 0ab5b3eb09582a05345dcd946a017e993b4b0afd22d00b38caf2ee052b659d441b72d3b81485fe14477ce47d330b687a12330913e6559c5da3ac289ccdaa0ade SHA512 c8e8a953097d593d29f451d249736aabc83459359883143103530d12821adfc3676fa15e168dc7751be9d82306d42c9791d288c149d2a41077cbd066113add0d
+AUX nfs-utils-2.3.1-svcgssd_undefined_reference.patch 1055 BLAKE2B a2f045f7886eb0772ad9b30ddc1c98294039e32f92eb811dcccde8926eda7d33c42b34e07912fcb536ed96a2f0b2114eb293689380751f3c786bdea6a6923ba7 SHA512 21361593415c497fa5a0bbd547b2cb0e0512ad8b3deb2397aba6a453cce840876d607015e46d8c3a367cd478395420d8b24e2f3a7f73d0e75d5a2445e4e46ef2
 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
 AUX nfs.initd 4244 BLAKE2B 0df8f270cf38b16efb331202d300d0bd648ee90c9dc44704e4db6f6aaad53e1c16059e94e14278923db59ce17752e4f034ad948ed53d6f2aefe8ecd6faf808c9 SHA512 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
index 2134cedaea49..77c902f2727b 100644
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch
@@ -1,13 +1,40 @@
-https://bugs.gentoo.org/641912
+From 1451d7585bf1c622658ccc04abac7e79ffe40263 Mon Sep 17 00:00:00 2001
+From: Justin Mitchell <jumitche@redhat.com>
+Date: Mon, 8 Jan 2018 09:14:11 -0500
+Subject: [PATCH] svcgssd: Update svcgssd so that it builds
 
---- nfs-utils-2.3.1/utils/gssd/svcgssd.c
-+++ nfs-utils-2.3.1/utils/gssd/svcgssd.c
-@@ -101,7 +101,7 @@
+Since a15bd948 the --enable-svcgss option no longer builds
+as svcgssd references functions which were changed at that time.
+Fix those, and other function changes since then.
+
+Signed-off-by: Justin Mitchell <jumitche@redhat.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/gssd/svcgssd.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
+index 3514ae1..23f0c0b 100644
+--- a/utils/gssd/svcgssd.c
++++ b/utils/gssd/svcgssd.c
+@@ -63,6 +63,8 @@
+ #include "err_util.h"
+ #include "conffile.h"
+ 
++struct state_paths etab;
++
+ void
+ sig_die(int signal)
+ {
+@@ -101,7 +103,7 @@ main(int argc, char *argv[])
  	char *principal = NULL;
  	char *s;
  
 -	conf_init(NFS_CONFFILE); 
-+	conf_init_file(NFS_CONFFILE); 
++	conf_init_file(NFS_CONFFILE);
  
  	s = conf_get_str("svcgssd", "principal");
  	if (!s)
+-- 
+1.8.3.1
+
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 8a4dfd526187..17d902b69549 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -30,7 +30,7 @@ DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e
 EBUILD samba-4.5.10-r1.ebuild 7815 BLAKE2B 2384b9e62e8a876cf208cae2f6245c00a92c8e04dfdd25652e8de706c8d08282505d3d3b84aaa2a594bc25b6420333b605387223c25d5356fa8709806f8f92db SHA512 d0c613f8de60ab50b3d48626ec00f57e28265d385e157bb54845f5e77304dde1ba6384446a8415884b263715991c44ba7c6ec059dd5863b6acc70e97ed25b79e
-EBUILD samba-4.5.15.ebuild 7820 BLAKE2B 35c262ef23f55909c57d9b1a2cf0ad8a10c6c5cb80628db44f05663139dd69e33e2d5eb3a97f803d03bea6fe52baa4824559541df33ce5d95a3b4d96a5e43701 SHA512 2e45b6e31c1cbe2769fe9f95e51b319bf1ebca4ca108393f8a1e3687ec7218e2c5c99eb25f73d6cc5e166522f156f697036925f2dde1acdea183302552fce2af
+EBUILD samba-4.5.15.ebuild 7872 BLAKE2B faa2930eeba57e377f9141d7673cb8ae5af5a04565004239c530347558dc308797e8e2e2a95ff95e18c6bd9a64514360b002e0d3c6a2d3d00bcbd53532ad83c3 SHA512 911eca475b841445608c70acb325005d0490993810df4c00209231032cee32a41992778cd4a5fc7e03f5f57463c1b4a0beffcca53b6c11ed9fcd265aea276964
 EBUILD samba-4.6.11.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.7.3.ebuild 8492 BLAKE2B 4a8d81457333d6057633946ac5c50a309c0ff3f0ffe60b6d6706d614dc9c1a72de07ec2006e2a5363cc01f9a73ab776121eb568c0f8e442344f274dc28007b60 SHA512 2b6c5bdd753f9f941ef38a59540f13881bd209337eca6bc84d9d8e7053f2a6d68229a47f3866cb934eeaa235596f14634a0d10709782126183dc4563c4a0a30f
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index 968e06d54fb8..228698438157 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
@@ -103,6 +103,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)"