Move modules-update from baselayout to here, fix by Martin Väth for infinite recursion troubles #149426, and make sure /etc/modprobe.d/ files get added to /etc/modprobe.conf #145962 by Greg Kroah-Hartman.

(Portage version: 2.1.2_rc3)
 (Signed Manifest commit)

1 files changed, 30 insertions, 15 deletions

diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index d9580328c470..538ef51cf231 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,14 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766 RMD160 94791043b7cd134118f8ed98b8d38ff0af28d848 SHA1 2d2272fe6b2119a61ab3eb7c7d575c0cc4c79f07 SHA256 a5e082761756645885e7fa43096224304879dbe4cc1abeaa165a6e68ceb2aa46
-MD5 0562a7a338175d0b6100ef7958b0ef5e files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
-RMD160 94791043b7cd134118f8ed98b8d38ff0af28d848 files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
-SHA256 a5e082761756645885e7fa43096224304879dbe4cc1abeaa165a6e68ceb2aa46 files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
-AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 b98df28f310605678af3769f6a3e462c220dee2a SHA1 e989b70e0423115db84187084eafab43f8b04023 SHA256 acfaaad8e1f75124968e69feafe6e0b25d145b074ef07473675e5a0d99545166
-MD5 29011f0616cd17a10a27839141238a98 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
-RMD160 b98df28f310605678af3769f6a3e462c220dee2a files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
-SHA256 acfaaad8e1f75124968e69feafe6e0b25d145b074ef07473675e5a0d99545166 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
+AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674 RMD160 5012db2e672a0944f112c836b7677a54e4d38615 SHA1 f0a8b49215896581ff4cd08e88de4627bdff9491 SHA256 5cbe34244609cc4915c78612388f9fda64dcf9c5b7d6038e620fc42db4a76efd
+MD5 eda95f82096ae4618845f06fdb7f6686 files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674
+RMD160 5012db2e672a0944f112c836b7677a54e4d38615 files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674
+SHA256 5cbe34244609cc4915c78612388f9fda64dcf9c5b7d6038e620fc42db4a76efd files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674
+AUX module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345 RMD160 12e3132824dadbf853228dec146347cf2b87f31c SHA1 b2b16636ae61de179d4674dbe5c48868aa1e2ca0 SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166
+MD5 a978c5b6e86b6de813852f7b3db08b3b files/module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345
+RMD160 12e3132824dadbf853228dec146347cf2b87f31c files/module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345
+SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166 files/module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345
+AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 SHA1 5138c1a5b7ead76d683d5d3f31d7c161b0a4dfb2 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6
+MD5 54fcfc62bd715c9557b321dfb4654044 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
+RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
+SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
+AUX modules-update 11154 RMD160 e85b6a0de10cf482d1da64ccef4a3589275001bf SHA1 d33dc14d702ca80c03040c28f76743a588d0f41b SHA256 d3e9f4853d6d60e7df786d54cd551a8ce3e6590173540582d538b1e87fc859cc
+MD5 bb11561aedf6389b7c590adcd2763a8f files/modules-update 11154
+RMD160 e85b6a0de10cf482d1da64ccef4a3589275001bf files/modules-update 11154
+SHA256 d3e9f4853d6d60e7df786d54cd551a8ce3e6590173540582d538b1e87fc859cc files/modules-update 11154
 AUX modutils-2.4.27-alias.patch 2246 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff SHA1 7d69355210aaccbd2dc6dd8a9b1b736f74dfdd36 SHA256 453e3ab982088e2e85164e63b4944af58cd01c2b2d45d75fdcda6649a339878f
 MD5 5428d53f18b5fac287741b23634d84dc files/modutils-2.4.27-alias.patch 2246
 RMD160 bcf4fffbecae76e5b14b05c9003ba4f0cf2675ff files/modutils-2.4.27-alias.patch 2246
@@ -39,10 +47,14 @@ EBUILD module-init-tools-3.2.2-r1.ebuild 4976 RMD160 8e5d8f740ea7e527ecc61b84aa4
 MD5 f5339686e5d2953429797a691fa19057 module-init-tools-3.2.2-r1.ebuild 4976
 RMD160 8e5d8f740ea7e527ecc61b84aa45c16deff5265e module-init-tools-3.2.2-r1.ebuild 4976
 SHA256 031c4734d87ddaa7b7109840b8c2b29321c11818d060701640e197e54b21cd83 module-init-tools-3.2.2-r1.ebuild 4976
-MISC ChangeLog 20776 RMD160 3a5e66e5f662d6e0462f5e578a853a118e88054f SHA1 42d7445298bef978b146516214b256ebedf8e5da SHA256 06896e919a521b133e686e26159ceb53a2636f3096832b4fb8aafbd1761f0985
-MD5 251bc08f88e2edda31d1d32efda5a878 ChangeLog 20776
-RMD160 3a5e66e5f662d6e0462f5e578a853a118e88054f ChangeLog 20776
-SHA256 06896e919a521b133e686e26159ceb53a2636f3096832b4fb8aafbd1761f0985 ChangeLog 20776
+EBUILD module-init-tools-3.2.2-r2.ebuild 5131 RMD160 5b39df254ef589fb44746e0c29f9f9c8df6f41e7 SHA1 aa9ccf9ab4b62ee59df6e4cc5cf7991c32665539 SHA256 f63e4944698fcd0b082d04ff86e4013f2c2d699e1cdfaebd2ac19617fd082f3a
+MD5 4215cbe8e2f079c4e0aed10c4c9c8739 module-init-tools-3.2.2-r2.ebuild 5131
+RMD160 5b39df254ef589fb44746e0c29f9f9c8df6f41e7 module-init-tools-3.2.2-r2.ebuild 5131
+SHA256 f63e4944698fcd0b082d04ff86e4013f2c2d699e1cdfaebd2ac19617fd082f3a module-init-tools-3.2.2-r2.ebuild 5131
+MISC ChangeLog 21207 RMD160 8aadd80bcd7cba7315c671dc06323b49caac2d0a SHA1 126e41a686ab2fdcff5c08e6156800725aa0d265 SHA256 0b6dbbeaa9cbab1e9156bbf6db4509973dffcfd848733f95349199f556474442
+MD5 4066b60c1aaa0449300de9e39e39bebf ChangeLog 21207
+RMD160 8aadd80bcd7cba7315c671dc06323b49caac2d0a ChangeLog 21207
+SHA256 0b6dbbeaa9cbab1e9156bbf6db4509973dffcfd848733f95349199f556474442 ChangeLog 21207
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -50,10 +62,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 de56fee3dadb3285694b097dfa7848a0 files/digest-module-init-tools-3.2.2-r1 524
 RMD160 dfc478dc854fdd48bb3526ef421d560becb4a37e files/digest-module-init-tools-3.2.2-r1 524
 SHA256 a0137b244c6cab76e8a2cb31e651484992231b823af1d8d4fc2e1a5db10fe5f6 files/digest-module-init-tools-3.2.2-r1 524
+MD5 de56fee3dadb3285694b097dfa7848a0 files/digest-module-init-tools-3.2.2-r2 524
+RMD160 dfc478dc854fdd48bb3526ef421d560becb4a37e files/digest-module-init-tools-3.2.2-r2 524
+SHA256 a0137b244c6cab76e8a2cb31e651484992231b823af1d8d4fc2e1a5db10fe5f6 files/digest-module-init-tools-3.2.2-r2 524
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFT6VKamhnQswr0vIRAmoSAKCvczhtM7CdVA2J3sfIZgvO3TRuqACglT6M
-liwrdbapaZPDDozisG0eJL4=
-=EG0D
+iD8DBQFFgLnpamhnQswr0vIRAkC0AJ9dvoC9lIKxvoY9QhaD2DOUgZUKDwCfRvpj
+CtGSTo4qdnRnS6JZ0pRaPms=
+=hsFi
 -----END PGP SIGNATURE-----