Fix typo that could break uclibc

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 55 insertions, 7 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 44886e65168e..9b96012b13ef 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.18 2013/01/24 20:22:57 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.19 2013/01/24 23:56:00 blueness Exp $
+
+*eudev-1_beta2-r1 (24 Jan 2013)
+
+  24 Jan 2013; Anthony G. Basile <blueness@gentoo.org> +eudev-1_beta2-r1.ebuild,
+  +files/eudev-fix-typo-util.c.patch, -eudev-1_beta2.ebuild:
+  Fix typo that could break uclibc
 
   24 Jan 2013; Ian Stakenvicius <axs@gentoo.org> eudev-1_beta2.ebuild,
   eudev-9999.ebuild:
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 1adf74da5d67..e819568fc73a 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -2,15 +2,26 @@
 Hash: SHA256
 
 AUX 40-gentoo.rules 349 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea SHA512 b8d90037c08f30c9fb9e22a43c59a3627c218313b0421d4b70feba1731cda76ddc4ee6bdb99dca8df61e11f8d656a8769e172f0a584d7620213973dacfbbb4aa WHIRLPOOL a4086cd5f0e8849369389aa29ec42f5d906b00e3d650724d38ff8b4df4e36de7d3a37393b14f2f30a7102d6f2859b6847b5f4b7813be12d945ce1515494ce120
+AUX eudev-fix-typo-util.c.patch 889 SHA256 9c9811d8a71939a69ce94e9cff2989326458c7715da4fe0baebfb8f90dab915c SHA512 67ac0fe35dc0c8064c62ab2bcc5db3fe06fb5cff58d4716b5e36a595958fe4c599bb7fe66cf54696eb096ace5f24c97d11f4a179674e0b55d60c32d06f6905d2 WHIRLPOOL c923be2ab69119a5496938efab16f8960d82699aa1ecd6963d56aaa80c755aad3eff668cbf7d7912d87989ef596a52a17ee58a2b84a62c3d890549ca0ed05610
 DIST eudev-1_beta2.tar.gz 1671231 SHA256 359ed1a6d8e48599c1337f54a5c796fe3195f210f89ff22b352f622afe112fd6 SHA512 7a63d411221f4e267de95f500d1f4c69017abd26af212dbaf0af770346ad3942bd1af125a525fe1a57185f085710495369dd1495ee2df714f7dbbdca12fa4717 WHIRLPOOL a43777891fe303d68ba59f221c1698e450ab346392a157e82f750e0a7698c35a31801d4f0876b546b4c486b548eb10394e0c5a517af28762edaf2df09745aa32
-EBUILD eudev-1_beta2.ebuild 5881 SHA256 97b1da85718da0065761584efea1e2caea2524b738f3930f72d5d11d123af056 SHA512 957d73ec22482629e16fa94280305b1224b86bb41873b8d176611dcfe1c6234b316c4e268cd7d8c61ba3306eff988fddc3f5ad7c5c1c2d41f07ad5dbb6346812 WHIRLPOOL 5bd3aaeaeb0d99e00c10b8219995588e6bcc9f5ce93cd9d1f277beb79acde403a3d4e9ae2f4da63ea911515c160775bdab17ff6c34abd41eb3935a16d1ee7058
+EBUILD eudev-1_beta2-r1.ebuild 5989 SHA256 05b87879fd2e38365c98fec80a1379f47a4357ff9f8a04772ffb937e5c495b66 SHA512 a5361fdde4b9ea003dd631ebb4fc2ecd898c636d53104800cd6cdde514815c4a3fc75504edfc36855aba7b0aa629dfa7f5606d11ee44a4c11d6f3a203bb0e314 WHIRLPOOL 1e1f16b7b0a7fcc5c47c26c779c2398ef1aa4a2e618dd1fec0d26046837f9caa78985cd5fe618a13be90239bc02e3188747551efe9aac697766c2a90931f12ff
 EBUILD eudev-9999.ebuild 5879 SHA256 26b39f3319934c8bd73e731f866c979892f54d023f7fe86757d9a7204e9d14d5 SHA512 e448e763009d407113d6d5edde2f8a3c269e4e0a678cff19da414071d85e079026150d5027b69e1a76501ec1c152f7272b0d5c6f478ac7ae7ee7bf7803a5f328 WHIRLPOOL 60f6694cfce1c9c29a21e6cd7d0f3daa7e986950b9e8f382684a9ccc5812afef9fb5e031879faa4090d77b911a7d0e58bc9304274520595f64fb844c07173933
-MISC ChangeLog 3430 SHA256 553e23b56ad85ed9f86570491940244a7f89e800872b0c575a7fec479cb563a7 SHA512 afd32ef7b14c049c288a38ada930385e771d639ccfa201f96955b823337089640f100010bb60285a409fc1ec48d2f673717478f199f70067fb8867c85f02f321 WHIRLPOOL 944b7bed0e33ba09e21b1336ecf87db3b95e4d40c2a6f94f511e2d7b34e90c6335587615d40435d737ce52384a6d4b8fc00d6c67759d9ab5768d75179f3f00ad
+MISC ChangeLog 3646 SHA256 ed9ac6282006751ee8db61c10dec69c8cfb2801d7513ca53f2cab44634faaedf SHA512 27873e778092139f1fa4a01a8b7c7ec5448dae87606707242b2ec21458e76a9bb93b71d2fc9bfa5ae93a68d190958da5c6d11a33e48f1cddf698af2494515274 WHIRLPOOL 44acb4f1fc5a733b4d2f4c035c474e9014749a77898f8bffab7e451d3245b65e981718c2cf1ed8e594373244666f8de3483c08f442ca879fcd5f958abb0a2407
 MISC metadata.xml 1437 SHA256 746c57ca543652d7d4bf03da9ad30b43ee4dae3389935224d7d95fabca73b06f SHA512 dd410f423a9273c0b9ec9468be19c4e659cdbf9e968aaba1ef184933e2cc91ee57d2484ad3b9b6919a8173f88aa8aba8f2ca48888070495beeec5ecb80537b88 WHIRLPOOL f16ea7d0535586cb97a932159596fa222f703c38ec23f43acbc6625e72f22fce705fd0d57e25a88634f745fee70df60cbc2a7d0799b1c83e548a9e22bf33c741
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEBmDQACgkQ2ugaI38ACPDRtQEAmnjPwUm4so7DN+k3Z3ljUVAV
-rckBVYBhjvIUodC576EA/239iMVkPxGhOvLEhMndWmiC2L1VlCE71SWF3Vb2/Udm
-=55+1
+iQIcBAEBCAAGBQJRAcoOAAoJEJOE+m71LUu6X5QP/0Jr0/tmOVYYIXeR0dzDMDRf
+hJw11+JcCZYvt/MPCG4t1CxIrndxEhMl3FqMmV8klK8UqlNgV71GyLcrFT++dtIM
+IwiujKNRgD/yBRnmNVtk5cj61GcD63YUG6/oz2RlYk70U7M8nMxTXcmDV7EHX/xU
+FSZZyGOhLNHEbaCgXqgGr0WljHPwUF7UzPSSQiRsf3bhEe7jeilP8DLBCN85B/+M
+u3n9QrjsdxA72B8auPk/wRQ37SA/U/N/VSH9TGm3s/+9EQ23Sipy9eW6qR7gbyS4
+mhRCo1vyS1lY7AjX24mj0sIj/lNTnz7HaUepn2a6xkleVo+hsnTZvZThj8RN+lDm
+UTclNAVPee67SoiWmVR8ThHqXb9HxOCjpSwd59kUyjtIqNs8L09rYRcAEl5CpuGO
+gz/7UVV8o1sXN7gbDD7SKesMsyap3zNwagvIxKnoXtVxHFIr66vJiNGtydBCzfv6
+R3AsoJ1rGpRlc7S8wkNo/8FcmABtroIKQo0lR+Hfcnoxpvsy/lblwLAocLC7iF5I
+MzYo3qPy+IXVcYoIlc6YCV+B/XxOErwTQ0JeNFbu8lcD6+a2jKiKmzs+kLrlE1il
+48Onj5UxHAFWwzk+XnvOXpM5JPwXvkhvG92SYGIGbxIDWTVQnGWtaBWVrUF9kHa+
+vnH8MVDhiqBcGg0C5GhM
+=tMLF
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-1_beta2.ebuild b/sys-fs/eudev/eudev-1_beta2-r1.ebuild
index 77882571e8e0..5e66e4c700d6 100644
--- a/sys-fs/eudev/eudev-1_beta2.ebuild
+++ b/sys-fs/eudev/eudev-1_beta2-r1.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/sys-fs/eudev/eudev-1_beta2.ebuild,v 1.5 2013/01/24 20:22:57 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1_beta2-r1.ebuild,v 1.1 2013/01/24 23:56:00 blueness Exp $
 
 EAPI=4
 
@@ -113,6 +113,9 @@ src_prepare()
 		-i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	# Fix a typo found after 1_beta2 was rolled out
+	epatch "${FILESDIR}/${PN}-fix-typo-util.c.patch"
+
 	epatch_user
 
 	if [[ ! -e configure ]]
diff --git a/sys-fs/eudev/files/eudev-fix-typo-util.c.patch b/sys-fs/eudev/files/eudev-fix-typo-util.c.patch
new file mode 100644
index 000000000000..371471e17733
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-fix-typo-util.c.patch
@@ -0,0 +1,28 @@
+From 82f60023e3d4b33624c85a149915b411b504e426 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Wed, 23 Jan 2013 20:16:57 -0500
+Subject: [PATCH] src/libudev/util.c: fix typo introduce at commit 1ebf647
+
+The first argument of fcntl should be 'fd', the file descriptor.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ src/libudev/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libudev/util.c b/src/libudev/util.c
+index 1d57a01..d3982b9 100644
+--- a/src/libudev/util.c
++++ b/src/libudev/util.c
+@@ -4586,7 +4586,7 @@ int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
+         fd = mkostemp(t, O_WRONLY|O_CLOEXEC);
+ #else
+         fd = mkstemp(t);
+-        fcntl(t, F_SETFD, FD_CLOEXEC);
++        fcntl(fd, F_SETFD, FD_CLOEXEC);
+ #endif
+         if (fd < 0) {
+                 free(t);
+-- 
+1.7.12.4
+