From 49617bda4de696ce127e41ab508618c301393b3a Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 17 Jan 2014 20:55:49 +0100 Subject: [PATCH] correct heimdal config options Package-Manager: portage-2.2.7 RepoMan-Options: --force --- net-fs/nfs-utils/ChangeLog | 3 +++ net-fs/nfs-utils/Manifest | 4 ++-- net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index a3895d4e..cce9e04f 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.215 2013/04/13 20:02:02 vapier Exp $ + 17 Jan 2014; Mario Fetka nfs-utils-1.2.9-r1.ebuild: + correct heimdal config options + *nfs-utils-1.2.9-r1 (17 Jan 2014) 17 Jan 2014; Mario Fetka +files/rpc-statd.service-r1, diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 4592b99c..497c7feb 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -22,6 +22,6 @@ AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de5965 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1 DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119 EBUILD nfs-utils-1.2.8-r2.ebuild 4609 SHA256 1dff97354a8fbc097d27b667dbf33e6743e519a367c3068a6d7f0df4b41263e0 SHA512 4a8eb8bf234ac09f8189b4bf10f4e6331a250876838f99eb718cde79416ff17cb429bcc3193e778123e95bfdaf575a280c5cca963842430f4024957fb6a967b6 WHIRLPOOL 203daea6f3e2dc32c2fa987973187a768d3db99d2a8264cbfc69922a0d32190448d8a20b800bdc4c0538ee7de12d2d5c438a33055fc6375a1de0023f6778172d -EBUILD nfs-utils-1.2.9-r1.ebuild 4104 SHA256 e99dd6c6a6dc1311fecb48685f38d4bc3d2a5f91bec1986dbb576c01f284e6fd SHA512 06cb43961302021050f9061172ab14333b012df71f2af41a0a921d24928924f13503505c68782a8c1a4ffab830bd3f7fffa23fa766452490955e156fc1184e18 WHIRLPOOL b8601ac1677dde59de45722315c7fbc0f2b2e28a7672ec47267ddd166336786d0ea7971bf75d3d8270d30617058a899463cd5baa66569b5336846ab96ad4e637 -MISC ChangeLog 36262 SHA256 e856b0c017e9598576de3cbeb7fe51f1c4b9d090e5b0659698f843dd7fd390bd SHA512 3fafa92bd955b7288f1e4cb937c6c3673eeef897c226bb0d0d81f4ce77360c647ad3712a84df3954bc371b93493aa71c46710878e69822150e49a722ac66118f WHIRLPOOL 9652e8defbf21329cd6d769c65a2ae7aa379742c6e1c31b8643e51336145b44a7257592d5227b71323ea463143c865ba9d523afd251cdc9b196b00424a5baec6 +EBUILD nfs-utils-1.2.9-r1.ebuild 4610 SHA256 e9cb241d9d09daf52d5184876da6fced81f2dc750a120bb3972e71272c0ba388 SHA512 173b23c630729764aaf63ef016d5ec365df7c2ff8654d7841c922227925cb8ee283b895abf92797c6786819d40f58b73d5ba259f4654018302950d30e4a53014 WHIRLPOOL 8e4fcf542190419387032b84f9aae2193cdcff54f3bb5c4da124ddb30bc7a6e25d58465abdd9c104cab17052869c591ad8dc767e3d7033cf5ccf9137f98a1d12 +MISC ChangeLog 36374 SHA256 1955c6b3c7d17befec22ee24649c851e8047861eb9b320459c4c0d33c476d54e SHA512 345d634d853e305532c5c67b75e88ce01033269b7a79a345ab4eb7cf8443f148cf3b1267b813ce3228aa592a24ccd51b11be70df5b1824f696ab8d2cb790e4b4 WHIRLPOOL bce305b088bb39d085fdfd2bd5b59f9617fe86a22c52cc47614315891d5e3b656a0b03d2b1ffb0db4a33baba2ba75a8b5685458b371789e2e9ecba0fa48658e5 MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild index 6b36514e..879092cb 100644 --- a/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.2.9-r1.ebuild @@ -63,7 +63,23 @@ src_prepare() { src_configure() { export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. export ac_cv_header_keyutils_h=$(usex nfsidmap) - econf \ + if has_version app-crypt/heimdal ; then + econf \ + --with-statedir=/var/lib/nfs \ + --enable-tirpc \ + --without-gssglue \ + $(use_enable libmount libmount-mount) \ + $(use_with tcpd tcp-wrappers) \ + $(use_enable nfsdcld nfsdcltrack) \ + $(use_enable nfsv4) \ + $(use_enable nfsv41) \ + $(use_enable ipv6) \ + $(use_enable caps) \ + $(use_enable uuid) \ + $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \ + $(usex nfsv4 "$(use_with kerberos krb5)" "--without-krb5") + else + econf \ --with-statedir=/var/lib/nfs \ --enable-tirpc \ $(use_enable libmount libmount-mount) \ @@ -76,6 +92,7 @@ src_configure() { $(use_enable uuid) \ $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \ $(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue") + fi } src_compile(){