Fix uClibc build w/missing libio.h #459200 by Mark Reiche.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 77 insertions, 19 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index d1a5c61c3a17..1ab53088f2fc 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.213 2013/03/24 21:38:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.214 2013/03/24 21:44:02 vapier Exp $
+
+  24 Mar 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.2.7-libio.patch, nfs-utils-1.2.6.ebuild,
+  nfs-utils-1.2.7.ebuild:
+  Fix uClibc build w/missing libio.h #459200 by Mark Reiche.
 
 *nfs-utils-1.2.7 (24 Mar 2013)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 4c3a1ce9e02a..b1c9da0f8d14 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -18,6 +18,7 @@ AUX nfs-utils-1.2.4-no-nfsctl.patch 1043 SHA256 cb2f92895762337e377989835a360f42
 AUX nfs-utils-1.2.6-conditionals.patch 2020 SHA256 3f083ad6efa96110e46df09743a6988a004a73ce6213a954b303f191b9c76582 SHA512 11961b5b77cb9d01e5119c121ce4060ec7c322e97f0beb02f11d2512823f565a3b8ce4cb5db651760f763710a5d26d1bb07e235d4e3648b3b3d6cb92c7b6d1f0 WHIRLPOOL 0cc692c71abd697098927b356e97daf6d189e50c678da950982a4623f1c8a8e2f71e66f4797ca00a0f3fbe5125db8db8bcf4d7bc752f7726cc17a60fb37fa6d8
 AUX nfs-utils-1.2.6-cross-build.patch 1909 SHA256 847f22436f8f389c390beb9bc99195cad182910eff68769317a5dd9902f8c0ab SHA512 ea2fd45ad9f526a72cbc669cb748268aaed5b4e5f01eec8bdeb143226795a09c305732433958261d1b65302eddb68c104eb89d1ad34718038d8b3b06817ae799 WHIRLPOOL 71e398dc619e2971a0f7a3c9c24d9cc2b3a99c4d49568c3a51ac363265e89a13534b73f8e5a744884aff32c8bfebdbfb78b2635dc19caa527bbd3801dc02cac7
 AUX nfs-utils-1.2.6-osd-install.patch 1726 SHA256 04ee2915fcba7c9d459b0f1b701314ad997e61e6898dda03fe670f63113cf155 SHA512 93f4fcb84f17cb7303dc5804d7767947d26aa33f7a8bb55ad4bffd7bc3bb4a11543963062371b25770887195c218727b1b9dbf2a2d9d4ebcd7dbbbc4be3ff879 WHIRLPOOL 032c131226311800eba29c84e3fb392a31dc5171c55a27fcbd4bdc05d69651e56cd2a81922d63a698fd90f987f0e68090676507eccd760e75349b05720b21f9f
+AUX nfs-utils-1.2.7-libio.patch 1601 SHA256 788b6bcca6ec03a8690b5cbabef06ad325211ab79a332b33d17708e8b0b63093 SHA512 a9643fd3689c95bf82c28a6aa5a82540459e0e6eafbb1a774ff74ad69b4f3f28bc0624f84913a78405cbdcb3321a02f912ace2407bb5534c292f5fdd930b68c3 WHIRLPOOL cb382521d1bbfb2ab823d5d44f788f1e9f1a608f7cdd632f84c046787920237569bd57fda8f298ed255254e6bdb56ef8a845cf3013ba1766e9636ce71e63c788
 AUX nfs-utils-1.2.7-nfsiostat-python3.patch 11260 SHA256 c71f3d53c3b076e609ba2de1a1565deacc7a797a2b8c8325341bd6c5b08de6ac SHA512 778640c90ab5a751b9613c02a13a4332e994620c4ff2301bd141edd563bed00ebd1fed7d850adc9d72b3eb3a64d44d7791fef4501fbe0772e7aeb0b14d7d1daa WHIRLPOOL 7c89f6152fe6e1f20c1c57168f98d872cfb55ad34ea8940b5a737c57f21adddf0be5be9a696141e3f45a5848a29c5990a02dba25c804b472848d24b944fc4fc6
 AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
 AUX nfs.initd 4378 SHA256 8df22f253770a24c6a53ce332d821ab680d0ede18d0e968c1c5d8b3796cb74be SHA512 1577a43b47ebf12261504dd1c9ae564e19d80edc424c4b1e308ac46b12907f6684242284f18a6cd2edafec88c815debf895b6c29d13b9bca59d6d7c883bc1f38 WHIRLPOOL da3762c3467af7d46aef1890aa9c95a85e759c6cab09a5590a00c8f6a37b600a6cf3d4c17b1593a3bc7556ad25bfe001ccabcad70bdc1a2848aa9f842e349d48
@@ -49,24 +50,24 @@ EBUILD nfs-utils-1.2.3-r1.ebuild 3243 SHA256 5660e204ebd82df18a3ea663115dd821bc7
 EBUILD nfs-utils-1.2.3.ebuild 3150 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba SHA512 2d580cfd94cdf1f49f3cd1a23f87c94ff6be6ee833d41c478ae0bcd6c35d9bc23db04299a99c237c174b623006f0fa0a337b913f1587824fd295c3f1dcac97ae WHIRLPOOL dd8b739e382284b5af862ecf2a7c5baebe8633574e0b4deb44dd24b329b806a38643ce4d71604a690b7526aff93d9f20c8a19e03069066f89d33f3f92f09e8ba
 EBUILD nfs-utils-1.2.4.ebuild 3737 SHA256 13042431e301d9181e6d8d54fa207a2581f675c3a2cb766c47b7fb6037ca088e SHA512 e0fe6e9ef9441311688e88310194c5cb0bf5ae6053d590eab07ca7469413d4183256d4806dc99d0f512eb4d32ab4736a5b8c60a2dff51a925d50134f14e659bc WHIRLPOOL fdb0e2e9e2648c20f8ca89b8d28dcad0646939640a88a2e900bd3601e374f31c157d1cf33de35c67600fb1773406ce0e722ff6b6bb34f5b4c0694f46b2668553
 EBUILD nfs-utils-1.2.5.ebuild 3515 SHA256 f666cf561ecbfe6e4a5c1eed271957ba296c5b90a1bfefbfc741f033661d952c SHA512 0e944552e2e1f8b74d3f571df541f6577aedcac21ee88c9fb6db88e4fd7cb1455939037322c2633830582a228307fc3835afd74afc59121d2babe23da5c29d92 WHIRLPOOL e4bd59dee38ff4e2b735c9711973bd92fc9a180858d22396f5e1b7af8b3891d6ccec3deab4305d7244cdbf7ca8f97166fcb8462919e500cf0ad8e0f9b542d24a
-EBUILD nfs-utils-1.2.6.ebuild 3742 SHA256 9d6cfdc5e1a9831ac9ebfc87c19ad5000147868559ef299317a7277201f2354c SHA512 7fc9de43f5bf50ef86b79b82d97a55a3d1c816d77649323b27d18a2d9ca7e13b449283d4713fdb07ac99d5c034fc901b8960bf93a8c0e40590ad78160a16b6c1 WHIRLPOOL 5d7e398abc5c9665ac94206e78d4acebde52bee2ddb83a8ed5d44b76957643788be48ed488f18a213f327756901e21cebbcd256450ee345f9e0de8a943c5b129
-EBUILD nfs-utils-1.2.7.ebuild 3641 SHA256 9edcf95d76d1054800f19b449cb9b047c912e5c68d4012e0bebc2cf6ed598f1a SHA512 2fe18b3578fc388ef1f1dc2fdcbdbe27f6d70e59fec32c686ff261e2ca95cde622f380e5a3b036fe1a65c9e15e632a614fb2938902bbd4eb1f7d5bf977b095e5 WHIRLPOOL 7b0dfa954e05e94c4bd2ee48c5f598b90947779a680385da66bdce7126f498137913babb438ee3d806bca3e1a23d4269b7d05f9e11f1d5ccb77537cbedea74da
-MISC ChangeLog 33530 SHA256 b8a6df23b7f9c9bb0705262255c62122b83de88f61c451be792246610d98c97a SHA512 e2f3737665857500d8316af910402590e147f2f38729866169c453dd6bae76e04c01ac1b0c0c56e246681828fef10e4c78ccdb61416147caddc72a99a9a6bc43 WHIRLPOOL 0a084fb5d6afedf250723e61e0ad5d4f9124f3c8340a514c5b3ad20e47b8009e4d812ea05f3dda57b238c315035c7882b3f461b631c02b2dad8d648d707559c1
+EBUILD nfs-utils-1.2.6.ebuild 3796 SHA256 5a444b08fac9e5b40b8e09605f339f2bdd13c137dd5183276ddb18ca4a68a635 SHA512 db1ec731c8a187be6b0793a446704500e6c9bd314026ec862251a0a9ec4ae21f666655fcbb2b5c7df848d38c6cf69ec8c67d6c634821e03b099a378351cf5f43 WHIRLPOOL 9aefd631a5a79f73d86fa2b3f3c25c6c3017a97a39fb4d6d1dbd54f1555867088f8c23b6ee36939214120d00177836083533342a24f68e54b17be06f92da0218
+EBUILD nfs-utils-1.2.7.ebuild 3695 SHA256 f3ae7c21f22283e2cf96bc8df992564bbd7254449abb3593f2607eb2b25b8014 SHA512 f36ca3d6f0a9ac66e49c6b24ef2749165e9e495297a1b247e772216dd056338a371973e3c96532a46e07bd000d81b3170c366ceae0f87d30ad33e09fde63d279 WHIRLPOOL 23a4621601fec84e32cbcc09d8f50a76a8d8b3072793836a197cd264649b850148f6f13821681b289e2d50a5353c9a4c4ec67bdf95652c2c31020352f762be37
+MISC ChangeLog 33730 SHA256 b919857347ea40ba6918c097d0bd2f70672b1db381597ca809e49de58e4aa510 SHA512 40f6f3ccaaf83439acbafe6e7403d39482099b3bc83138a35dae4142802f4b2c2e1e2817a9bae9ac01d7fe94bcc974f9a504fd8e004e2e5852bed98091c37b7e WHIRLPOOL f79cb265bf0cf52681e3a903afb73863e5cff689f7d230d3c51a3ecd1f1ae583c22ba3e1c6172bbaf7772428a92d3d87e76a73461d798da24bdee27af92f1c55
 MISC metadata.xml 668 SHA256 d9ecc29c31ebf779ec222513db190cc0e9d0737f806aea26913d097b09bbfa47 SHA512 2b269153829d1d8df6e97871814479af8fbe18a48cf0b6a33947212264875a4002feda4163b465b4a67e253e5f27e47badc53d414ebb9f3281253f813fa1dacd WHIRLPOOL a53c14f8e6f7cce4f75a7fda60d8b9f96a57eb3a877470906fa1c40befcd9791411934e7ab610ce612f6d42d4d953e0a2a78ffc9e21e9b98328a395c4de7daa8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRT3NGAAoJELEHsLL7fEFWAJwQAKe/SRemfdfdX66PhKn+XQIt
-flQ6fwCPoFAib3/ENANqeLhb1aJp+WBXDshXMfSZ74WApP+jL524y70sx5Hwx4qK
-/mwmkrcEl9eA+lm6tKJMwH7rMuh2rhp9c9remw+adbCqRDyodQCimd6L40T5UnLK
-dWcjVFo9qBUjx3J/P+7aNBjT3NUqLbzCh4xflv/oCWqCtu5Io6cLOW68TWOVgi1d
-tHsieCYRyXaH5N8HvPZUWD2Hc8L9nd20uwYQ02W1TIvRJ3psxIKo9UUtg6vzGNx4
-ienDXb8cWAzzEGNjovhHxKMVCDCriajiFh/jwUnTOjdFfVx1nE43001S92QkeNPf
-vvEhk8ql9cVAQYdBcuh/VKNIblwAle42TXMB9ov7rFsYlGLJ61rYtjV+badjH/CA
-HPKbnjUh0D5hYcWTPPUqiP8ex3o10nsgnhxP7jJh0YhJ8l8W45DY2jBCDWoGd36w
-pypJFh+qIcWHVyFpi75BvNOQoiCMw2frninMPcyCGYQRPTIZJzwicJPbRphw5zPd
-8HsKpq1rTMMDCXVqJVHpNkhyiCW+59OF+3Fq77T9Gw7SMo0MpFONxN6Q1cu/+ZMC
-rh1ly95TLa/Dtj9z6ftXt48hbi4AHyTFCCwUgie8MgNJVRipBuMP0aR4A0q6fzan
-sRTwuoauRLtSk2DCl1VP
-=E1JO
+iQIcBAEBCAAGBQJRT3SlAAoJELEHsLL7fEFWX7cP/2uK+6IE5uFGMhJ2Jz7eKmnF
+NphPT+WZZF62dmXnRYmNW7gUCc55PaXuRjwbI4sK6vZWoBlcFCCR27vCoZJfGDjv
+0eQHhvY3lCE9r9pXZ7qvGLAqu3vNjZHf8uwayNsW7WUQhP8MBZQjYla05H/P/2A1
+/3gme+bkB24Iw30Y0hw8CfNGrSqsAyLGg+dMlBbD4kcbmoQiF+RVHWc/25RZKIRK
+R4ke6vSErLE0lPX77KuJwkQN1ngD9cNAJjaeRJB1c/3jjCelQAY5vBY0tocb8C+W
+wfMfzq4WgSVWSaBHHki+8ocKlHF4cUSDWIT+ThNXzoe5lr1B6ho0E0ss8HrHiVmN
+VIRK3xn+8ZQ5hHknZSW8tLEg5+94dwyH5lOWb7wNc8iFBBdxB7IeoBcwQFfDNI7H
+QM2PNzDbIVkClHhPzCYuZ/Hi+w3+B41nEkLE41QJ9/9FVGfFaCWGf2WObFqtFXy5
+5WFR4fa7UHnaBZuzhtRR/R4UERYVd15LLJpqS1gYewqwiuv/yp/xHAqEom/CDIFE
+NRZqMSOxeYX4ht9XLfCKw2uiApS/2SvcieawOrW9RCrs99JNt2dQ4Nyo2dSrDV7+
+Pw2Zfw9cgOzwcia7uZutn3XN5MjxTxBzPrO8VMlwP+fFCX6vD0WWQH8F6G3yX5us
+wnYjcgXVB5PVxkbLKgZp
+=xgG8
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch
new file mode 100644
index 000000000000..056ae7db97b0
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.7-libio.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/459200
+
+From 2d9fb08c588970b842ce2a609088079181e6aafb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 24 Mar 2013 17:41:19 -0400
+Subject: [PATCH [nfs-utils]] check for libio.h availability
+
+On some systems (like uClibc), there isn't a libio.h header.  But it
+isn't also needed on them.  So check for the header first.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac               | 2 +-
+ support/include/sockaddr.h | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f461219..cc7f3b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -358,7 +358,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
+                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
+                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
+                  syslog.h unistd.h com_err.h et/com_err.h \
+-                 ifaddrs.h nfs-plugin.h])
++                 ifaddrs.h nfs-plugin.h libio.h])
+ 
+ dnl *************************************************************
+ dnl Checks for typedefs, structures, and compiler characteristics
+diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
+index 72766db..a1c30f9 100644
+--- a/support/include/sockaddr.h
++++ b/support/include/sockaddr.h
+@@ -20,7 +20,13 @@
+ #ifndef NFS_UTILS_SOCKADDR_H
+ #define NFS_UTILS_SOCKADDR_H
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_LIBIO_H
+ #include <libio.h>
++#endif
+ #include <stdbool.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+-- 
+1.8.1.2
+
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
index a3cddcc87c15..d17a028ba33e 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.14 2013/03/24 20:29:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.15 2013/03/24 21:44:02 vapier Exp $
 
 EAPI="4"
 
@@ -59,6 +59,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.2.6-osd-install.patch
 	epatch "${FILESDIR}"/${PN}-1.2.6-conditionals.patch
 	epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
+	epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
 	eautoreconf
 }
 
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.7.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.7.ebuild
index 2ba39c4f4a27..19379d36a5ca 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.7.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.7.ebuild,v 1.1 2013/03/24 21:38:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.7.ebuild,v 1.2 2013/03/24 21:44:02 vapier Exp $
 
 EAPI="4"
 
@@ -56,6 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
 	epatch "${FILESDIR}"/${PN}-1.2.7-nfsiostat-python3.patch #458934
+	epatch "${FILESDIR}"/${PN}-1.2.7-libio.patch #459200
 	eautoreconf
 }