Create /etc/udev/rules.d/80-net-setup-link.rules if user has empty /etc/udev/rules.d/80-net-name-slot.rules or it's a symlink to /dev/null wrt #503140 by Jorge Manuel B. S. Vicetto

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 75 insertions, 13 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index b5f3f6accdec..66f028f37f68 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1001 2014/03/01 09:27:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1002 2014/03/02 14:04:51 ssuominen Exp $
+
+  02 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> udev-210.ebuild,
+  udev-9999.ebuild:
+  Create /etc/udev/rules.d/80-net-setup-link.rules if user has empty
+  /etc/udev/rules.d/80-net-name-slot.rules or it's a symlink to /dev/null wrt
+  #503140 by Jorge Manuel B. S. Vicetto
 
   01 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> udev-210.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b33ddbd5440c..51d480fbcbef 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,22 +5,24 @@ DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b
 DIST systemd-210.tar.xz 2620924 SHA256 e2b3ddf9bf82f05cc3079650e86ae05b558381fd034cf1b03a592bcadd1610c4 SHA512 4aa5da0585dc5439591b82f0f67b58e806a795011c4d19c84cb2bfa7c27b3c995957e33b4f24b4c6e9f012a55cb092d2445e6f3b27b020d1c789c757230fcbcc WHIRLPOOL 546aa684f3f56fd9cbb2c6b8332bd74314e1a39521b4e33ab9eccef7f87b885a9c96842ca440a0a4f0b4200de7bbc9475687dc2e295420679b1dfb906496f273
 DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
 EBUILD udev-208.ebuild 15594 SHA256 d255ba9f5dd97a5c689687361592dca5438750e4a175a9a966b20d09b8195f19 SHA512 855ab8c83cde57239db0e812f64c72dd1b047671c36c5c50f1ee467735b9ecd98edc9d3742355aa111cc063276357911d3e40e474544f4866d33e24ecac327f4 WHIRLPOOL 51c5ea9c10efd85752b6c88dcf60dd938c34ed5d841d0dcab87d03b4a71764b9bcbc246d9e7bbca7791a87be4082290cf3ee8dc7ccf77d6715ef05a15246e092
-EBUILD udev-210.ebuild 14675 SHA256 6841689866537d43720ba99ef310e3264c3a202f4ff41d3d387b05b8a2b0a423 SHA512 44f5f86df315799c78f033c82ca9d419a576a69e31837222655e98aaf3dd216f7ca7981376c281ce38c853b64f2568ffe0e90941b117d38b5c9ce5d4b71ed876 WHIRLPOOL db72ae6d58f53063d963ed9cc415f9fecc2632adfa2b5cb809b5bb1993e74755c7815c552c3852e7cdea05033671cfadd0cf16a2d97e85776ac55021566bb86d
-EBUILD udev-9999.ebuild 14731 SHA256 5ba3d8fdc575971b40868634dc97f5e2dc8b531d638a67c54ad06b2c1c463cf1 SHA512 f8f51b3414544cfde6a7fdbf6b40fbc1e3553d60e72ab21e3b8e721c07cf0c53c523498a150f7577904d44a25b96e6b7dd41a78e3ce5968a3987c7d90df114d4 WHIRLPOOL fdef7be3c0ffbc15cad9248938e847b72915e6befa800a84e43879acd831a54c4eb4704019895612e0e101ec458f13b86e05f24bd2e16a4e4230dcafd56eea67
-MISC ChangeLog 41790 SHA256 5b00be58ff801785fe115ac6cdb206f8cac8759a8ea51e93ef9acfc311621a21 SHA512 2bdc236a3f6667e4d86802aef04ccd00bf31d6a390e46387509369d7df8d579ac6e64efed87042b0d08fe224e3425bce43072620a69c9d459baed37ad942c03e WHIRLPOOL f531fbcddff09a6fc1995b61427652769247795edd23eb472016181e3bbe1bde54b7a4b9977adfc5585ef42fdf4d0f416317bae61c87ad80c9c114975b393321
+EBUILD udev-210.ebuild 15641 SHA256 ef5b5e2e4d894d0542c6c5b95c591b55a36a628f71c2800e40b5751ee98151b9 SHA512 3d9c6b336dff868adb8dda8383716f3795db47a26f443ebc3622b1db21bdb134fe66f54e5377846afbc33833820718697a43fd832762460470ae2f47e57bc3ca WHIRLPOOL df3cd9af6eb6e54d2e9b4570ba74753fd5dba4e8b996ebd205fc57cde41a3f437a0a61e132d49f1c1fb9c2e2bc12875c5c79638ab2154efa03baf909034b1cad
+EBUILD udev-9999.ebuild 15697 SHA256 d7a52429a5ab36016286d4348773bf76a85d527bf93493d47c780a2b53bc6487 SHA512 094498e1adde4271f18dffcb75439be0487f5cdf4d6f49875ae82a897666e9444ca2da4a15f25be21b93221c24a011293afe98ae8134fb15b546e297f8e20b33 WHIRLPOOL d0d3245bfd6959bf8bbf774f9d3e63ad8c246b91316cbe6eabc0cf9e07f8d96f50ef76ad977a4001b28da63afb3dff931c7a52bfcf936dd45b2507977f208cb2
+MISC ChangeLog 42069 SHA256 88afba0eb4414affba07dcb5ab564e6fc93761bba7156e948bf8e26a6eb65fab SHA512 9c1a0a8264df2a36324e9c65bd23be3e18fc65d17b1247800ac1f64423d9f85559e0b90a86fdd89caf5cb4f7a27557b86d72e117d13d42d31ac11d0a69cc8910 WHIRLPOOL f8e2c59e5acec240ba5ea99afcda1e75486e2e6c45de15814438010621d2f532423c6177d097b72b29cea848d971b79888a4c2b05a48590fa22f0f1ab7b5239e
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
 MISC ChangeLog-2012 23242 SHA256 5466af35dd494cc2a4d0bc9cc0f4ff03e0d3d7ac7ec595a70b2b15896f33658f SHA512 8488fe00da8ba8b3db5d72c35ee3ed5b372a673a09eb0422102583a76d6671ffded8d0086362fddb2bb056a9b9a1f7c3139dfbb48d0bcd12a53ac07ad9473e68 WHIRLPOOL 0352206d82c41cbf3ac0fcbf3392e8e7ae94e8bcf35d8cb8a99c48bf790aa94b9f90a627deb155ab41d8c2f028658720f55347a6e1048e5c798060cc579d2c49
 MISC metadata.xml 671 SHA256 a08866f15d60a320bc7685fa43c319a48bfb1d68a439a08a7738f78120d23d70 SHA512 17cafcf7c767c3ebb0a2371678af48c00b5ebed999c00f20f99863297bda1edcfc9f6c95a17831ca59fd09ac030d6731d047dae270203b78b20e80e5dc124e22 WHIRLPOOL 32ff8aad6fb4f6cee9854ed2c1981d62f44f1a783ed69b36177dd14d607b4e5be57995a79b5d2dc593b86bc3769eb9c8b9eddc7411de5951b7fba2ac78b8ddcf
+MISC udev-210.ebuild.orig 14675 SHA256 6841689866537d43720ba99ef310e3264c3a202f4ff41d3d387b05b8a2b0a423 SHA512 44f5f86df315799c78f033c82ca9d419a576a69e31837222655e98aaf3dd216f7ca7981376c281ce38c853b64f2568ffe0e90941b117d38b5c9ce5d4b71ed876 WHIRLPOOL db72ae6d58f53063d963ed9cc415f9fecc2632adfa2b5cb809b5bb1993e74755c7815c552c3852e7cdea05033671cfadd0cf16a2d97e85776ac55021566bb86d
+MISC udev-9999.ebuild.orig 14731 SHA256 5ba3d8fdc575971b40868634dc97f5e2dc8b531d638a67c54ad06b2c1c463cf1 SHA512 f8f51b3414544cfde6a7fdbf6b40fbc1e3553d60e72ab21e3b8e721c07cf0c53c523498a150f7577904d44a25b96e6b7dd41a78e3ce5968a3987c7d90df114d4 WHIRLPOOL fdef7be3c0ffbc15cad9248938e847b72915e6befa800a84e43879acd831a54c4eb4704019895612e0e101ec458f13b86e05f24bd2e16a4e4230dcafd56eea67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTEadkAAoJEEdUh39IaPFNnjsH/R98PvzSWbYPh8QXrBcoAhf7
-HwNPVIuTr4Hb4/co4IJjZNvvR2JXUtr0D5QxXDg+Wy1WTJgBFADrXx0vvKiG5DAK
-UVgAeShn7z6XaY2jxmdskrpaX7xyUn73SDDpOqyRAfbaAoMx3eDcqfAOdM3khfAG
-0cGpsikdSaB1ZjLFFKmmuXPCcd5zSB2DwY1FiCjSbm6mLi2FoADtb+3NCQZHPVFx
-JzxmqPWaykJRHGKbp0sZTEuHk0IX8zNrHRPyiDVgD4z8mmxKOH7cvolbhcQC6xQq
-pIinUzqZ8tlRWdU0h+Y9dwgORQuECauIhmNdX/yGfZT0bfw6rYR7tAdY06u6gbs=
-=jVHi
+iQEcBAEBCAAGBQJTEznYAAoJEEdUh39IaPFNbkwIAJuk19iM8efIrU1w6H8ZJWND
+g0Cgs5zKatw6UdY9u3h5RpRzvc6ymarvvjzW1EbOivwAhtrHkUn6Ou2Nqe0F6Vk6
+yzM2P3hpGGHUo8YrdHQvlMbJQayQoL/M+dm7w8LymH4on6DVzmcAiehRREHs7i34
+1hJUJnY0xPpQ4N6Umn8gcGzzhfzugh1MgR6sj5OtXV1GdOb1ze7uEWvrtQyqBU9J
+8avBF57RCQ9Lo5Abe33djygdNKR/epMmz5Iyy4JJZ/35W/X6WGPcI1pp+VTL77Wm
+KKsLKgk4/0VZUXLIC9OF4goU7FFIVYtd83kE2S2H78IVgPgohjLezgZAkBp/eXM=
+=cPHS
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-210.ebuild b/sys-fs/udev/udev-210.ebuild
index 4ec44fc9aec6..17a0c9e337ef 100644
--- a/sys-fs/udev/udev-210.ebuild
+++ b/sys-fs/udev/udev-210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.6 2014/03/01 09:27:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-210.ebuild,v 1.7 2014/03/02 14:04:51 ssuominen Exp $
 
 EAPI=5
 
@@ -470,6 +470,33 @@ pkg_postinst() {
 	elog "http://wiki.gentoo.org/wiki/Udev"
 	elog "http://wiki.gentoo.org/wiki/Udev/upgrade"
 
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	else
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Because empty ${net_name_slot} was detected, we're adding ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 8e92dd3f5e44..7ec0c50ac98f 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.275 2014/03/01 09:27:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.276 2014/03/02 14:04:51 ssuominen Exp $
 
 EAPI=5
 
@@ -471,6 +471,33 @@ pkg_postinst() {
 	elog "http://wiki.gentoo.org/wiki/Udev"
 	elog "http://wiki.gentoo.org/wiki/Udev/upgrade"
 
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	else
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Because empty ${net_name_slot} was detected, we're adding ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"