Backport upstream patch for off-by-one error in tag_to_udev_node function (for upcoming stabilization of 208)

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

3 files changed, 17 insertions, 12 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a49acb30ecd3..b13f00c46053 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.969 2013/10/08 19:32:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.970 2013/10/09 17:30:26 ssuominen Exp $
+
+  09 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> udev-208.ebuild:
+  Backport upstream patch for off-by-one error in tag_to_udev_node function (for
+  upcoming stabilization of 208)
 
   08 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> udev-204.ebuild:
   Force old version of sys-apps/hwids which didn't have 60-keyboard.hwdb file
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c018eace508c..cbc85a312ec6 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -4,10 +4,11 @@ Hash: SHA256
 DIST systemd-204.tar.xz 2186264 SHA256 072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b SHA512 a2fe02f8ab4197bb4ff40c1c3e145370ebc5f3edfe97e6eb179086c42270523f76b49b5dd7dae0c52742a71bfb6a4217ecfa27cc6032faf5d4fe10b1264ed110 WHIRLPOOL 13baafbab202d2b1aa538281261a2bd70faa8634d4dc61f3ade6780f2e27b3e35919b7eb8a9258b66150924c8f2e82aa310a9a952f1f4e8128038b544a5c09df
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
 DIST udev-204-patches-2.tar.xz 1824 SHA256 d693c79b93865dd4f3092f5f9e69221a494d286f15dcc5418de1e09120289404 SHA512 e5004a8bdaca6ead9bd5f345ff86c94b05579cb3aaa032782dc13e1a1d574ef65e294c01b44143f78517db6f64fb630470c082f43b6989134a8e68f48d444e6a WHIRLPOOL ba21f3d8f4964da79476102eb82c1b5ffd7e91b5d60be705cb9784fc2150dba3faf4afe7718e2f9dfc5cc7e79644bf21b8312fec328a733e056eb60dc0269222
+DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
 EBUILD udev-204.ebuild 13245 SHA256 81204279994699b22880c591356b86fe27d54ceb51b7c199a1a254d8f5c97fe0 SHA512 fb1ddeaf73f218960b434a1a608a1e24fd9f3fb46f9322993ac107d9a541c6cd8582dc5c4bcf3428b772263b568c778b1d97cb8835898721138cf510a0607b15 WHIRLPOOL a669e17ca1c15f3d4f5ae0a1fb3a300b353ce52661b3d8a8a5fd7425046f86913e6f8f92aa41e2a30e45bd43794f04c179553a861d8e1961a089db09c65732a3
-EBUILD udev-208.ebuild 15601 SHA256 0fafa0bb43896dc87d070621ee9e55235b72e57ebd193037c0fc911fb7214192 SHA512 0f5719f9027b61934cb0a1a5c4da64a79d74f78c81b77331145fc8d02e2b77abe94409dfbc4714664b48fc2c2711ec5097b2c066f8c8d77d5762feb89ea0cc6a WHIRLPOOL 06ee85d730fd3d52ab442c1cf944af1d4ace4d15ed7f3c59f17791a9d3b030a63ce7915a56797b7a488b4f8bec18c2aefddbf16171fc2087955629326ac2e35e
+EBUILD udev-208.ebuild 15602 SHA256 d79765142e4509af6a27774f6701839da0d4b2c26aea05f86fcfda7d9ed304a4 SHA512 ad5b5051822f02d5e4bef1e59f5ed7f9178c5f9296650c46df2b5f3e8f9c9a2e1f6aa06d5635bcc8fd2764f3f22ac265be3ea22b754a75a10dc4c23428ce7f72 WHIRLPOOL a3712a4e438a19c83419c750fb21727a7678434cc6e0f06c82e7b4cf9602e07f45a1399a99f753dd57c25f5fe8e9611dfce39d6979c828a27087547f7a679ddb
 EBUILD udev-9999.ebuild 15577 SHA256 4bd8d18b4d4b56300d4f33d322b14a01ffe44b5b11ec4ee438f5185482cef981 SHA512 7302e4f4d60686e8c84ae9d7e26b48b4c470c76b97aec482313f347beffc1df174c43cf93569e8c177398682b6b26f9ee9f1b4abb179e56058f808594cac9e10 WHIRLPOOL 44d516b7c43e0508aa04444637b3e8a7c64d2702c39d1d081b9a0dd849504f9baaf7a3a78366ef86782fa862b2cc7af08612961a039e07b91568831189c330f9
-MISC ChangeLog 36214 SHA256 5aa9c4024bca0c784e3d722da18f4011e0b46f14fc51e09e39caa226caef539a SHA512 8e482532da0ad9e3bc6b6bcc9a9f060dd42d5f7fac2f0dc22acf2a5b6010e075f0dd9f8f8b4140fbdf8be62b48cf1876ccedbf7c818a8b150bcb527d361486e4 WHIRLPOOL d843b544f7d8cc45b5e162f23d6bba467a943eb183c1b51a017becf33d3f6b4e9f475b175b252a3fa12ac56a238425a01dc4f77d83dc97daa622d3a019583f5c
+MISC ChangeLog 36400 SHA256 c5dc2f14b540136c3f597104497314c771872ff5a189a2f9572fe98396a53685 SHA512 6568a3e4cb8c2f440ed4bca7f0af4228e33c66f26d9974bfc2caa0630b1873ae587c7c60a5504c3e40b2f56aad093a16a201efff6a919dd73ccb9d3463380f11 WHIRLPOOL fae581c7672eb90e28611c3a63ec6f6eae6eb6f8bade47aee6340601d782e8b130de98dbf9ecad7d4671cb44a73a3cc9c1d96633df9e422ba27d6d7bba2149af
 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
@@ -16,11 +17,11 @@ MISC metadata.xml 804 SHA256 2489d91db9d09f0d411b17dff6c8a595fb48ca65e8b6abcbdf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSVF0tAAoJEEdUh39IaPFN4lwIAJtacSSPzLrdf1h63FFr0qwQ
-lltOaZoQcKFctftBTATejezAAS403e4Xh1PGrLBsiQDeKHF5P/ZBpNB6AO7wt30+
-opa83Yvir+nnyheLDipQ/8clOop2Ozm+KQhsTuzG7vJm/NSPvZbvnrcBWW7qcrR8
-Chw5gmumHHJT1W9W3cSNswN9UsfbCQ/NqsSvlYETGm/XqENcZxIDwIV63HGr/uYf
-zj4xFDZeg4hTszJw5Dz8YGozsZebgIL0+CwyY+/Xn2BVqQGKXMrhQ5avWMKhix/X
-OXUFw6xAzEeJ4tjnniGx1aGsty79lGVkyjwV6tmsC6yb0QU1wdTKV4xw8TZ3qc4=
-=6BpL
+iQEcBAEBCAAGBQJSVZIjAAoJEEdUh39IaPFNt+wH/3rhrOFTWKDizcPY4oxUwZfx
+TFMdDArb5tFWSBgtT1mHL5+pm5CgCANBM3yTsbgWFeqL9Jmg0zRKeW+PopByZ3o7
+QWrOnwhFbAKJ4Z1Y8HBwdw9ZDsOi5jYZzjJFb1iwgD/OgHFFwHpvzvocrpuyc2GE
+SQhtgoFRX2nc0UcxrcPd4p/kq+eS0AimqesuVAOCqptrK5OYREdiKg2vVYxIzgd9
+G+FE4Zr8EtvXTd4AYT8seG/Yi9uhdjnbCk35aXY4TQW8zaENndSmbdpRDjQ4murX
+ya0C6VHdza9s2TRHjLlFVkhzpEmQE8J0Rr6llCTbLgNjqHr6lMl5TWQv/IxX1pE=
+=iFOu
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-208.ebuild b/sys-fs/udev/udev-208.ebuild
index b5c4ad0055d1..e5877447a451 100644
--- a/sys-fs/udev/udev-208.ebuild
+++ b/sys-fs/udev/udev-208.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/udev/udev-208.ebuild,v 1.2 2013/10/02 12:49:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-208.ebuild,v 1.3 2013/10/09 17:30:26 ssuominen Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
 	inherit git-2
 else
-	patchset=
+	patchset=1
 	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz -> systemd-${PV}-r1.tar.xz"
 	if [[ -n "${patchset}" ]]; then
 				SRC_URI="${SRC_URI}