diff options
7 files changed, 456 insertions, 43 deletions
diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog index e84791341390..4936d1ff5e83 100644 --- a/sys-block/iscsitarget/ChangeLog +++ b/sys-block/iscsitarget/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-block/iscsitarget -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.40 2011/02/16 22:16:27 hwoarang Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.41 2013/01/03 11:09:58 ryao Exp $ + +*iscsitarget-9999 (03 Jan 2013) +*iscsitarget-1.4.20.2_p20130103 (03 Jan 2013) + + 03 Jan 2013; Richard Yao <ryao@gentoo.org> + +files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch, + +files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch, + +iscsitarget-1.4.20.2_p20130103.ebuild, +iscsitarget-9999.ebuild, + metadata.xml: + Change primary maintainer to ryao (as per Chainsaw) and import snapshot of + upstream SVN to add support for Linux 2.6.38 to Linux 3.6 16 Feb 2011; Markos Chandras <hwoarang@gentoo.org> iscsitarget-1.4.20.2.ebuild, +files/iscsitarget-1.4.20.2-respect-flags.patch: @@ -204,4 +215,3 @@ +iscsitarget-0.4.12.ebuild: Initial commit - bug #98781, based on ebuild submitted by Dick Marinus <dm@chello.nl>. - diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest index f0683cfc3b90..5f10f0a96b83 100644 --- a/sys-block/iscsitarget/Manifest +++ b/sys-block/iscsitarget/Manifest @@ -1,39 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX ietd-conf.d 1073 RMD160 ade5301c8e2eb8cbc16dfae4bfa80e22393e2953 SHA1 1bb990e26b847169d4937e5d2fc28a5f86d55003 SHA256 28c4a6ddfe555d9f400513de04e2e44473263c4505434fc6e926d2b2fe89c414 -AUX ietd-init.d-2 2482 RMD160 4cfb3ef4690dc601ddd08578138dd988ab9041be SHA1 3856c74da1d45aefeb1ef0c9617da36e381f85f4 SHA256 299692c81e51fa5c8309b955732d29e3f82a4406e13fe9a826b842ad30f807d9 -AUX iscsitarget-0.4.15-isns-set-scn-flag.patch 507 RMD160 9a3b091eafb3d213a0c830a691684e0dc1f04b9c SHA1 9d80a8d1b5069e6ec5252ed8b1636023288bada2 SHA256 dc99ad8fa1cc10f6c6af4c99374dd0da14d3a56aebee2c48dd02cd8e156f9996 -AUX iscsitarget-0.4.17+linux-2.6.28.patch 2427 RMD160 08b735d3308085895de7134fb1bba16e20b6185f SHA1 672bfccc595d9aa9ffe8fe1601263ea965696bc9 SHA256 277bab00bd30b40ccdc5375bf5c3f0ed949fa756b6300828b052ec269c90ca8e -AUX iscsitarget-0.4.17+linux-2.6.29.patch 1123 RMD160 c4fc845ab893125469e67c839ba17165188a57d3 SHA1 71d410350a57102f42ce37dff0abb07c780f196d SHA256 aa8d8c39d6375b5f5a05e4b5f98c839a2b841fa43d79447055edd57d05f53b37 -AUX iscsitarget-0.4.17+linux-2.6.30.patch 1145 RMD160 12b2488ecbc10c71b3cbd21509758e98814a5f8b SHA1 b274917a11eaf87f3af53c37977e998e03cedde7 SHA256 86699f7bcf7bb6f9bf903f255724d08e1f3020b7854477b46329a3d202f15855 -AUX iscsitarget-0.4.17-build.patch 580 RMD160 a770b10dfc4f7c16daefa3e5e0827d1a2164e470 SHA1 81d46f22fd9ff73dbe7baa1792706c79c5ed7a2a SHA256 f1a29431674e4e185d3565df045ad575800c48f49de3a2a53d5723c7b2b7383d -AUX iscsitarget-1.4.18+linux-2.6.32.patch 1342 RMD160 f03339491c509b2c831012d32b2beed8b0c2d593 SHA1 8e25df9b2778f40eca624142df5db4b7d968a90d SHA256 7ad2db023826e4861d644646d855406c0bbffe007b7a81d1f209948d0d58d336 -AUX iscsitarget-1.4.19+linux-2.6.33.patch 594 RMD160 f28c6741807f9f52558e273d922c9d66e33a8d72 SHA1 fefddb9e4138a1b864e15b9f25076e49f6fd3ac9 SHA256 2e50daac88dff35a268a56950491fc9b7b9533eebd2a690f3c4eb448990f8352 -AUX iscsitarget-1.4.20.2-respect-flags.patch 878 RMD160 1a90627c6e1fbea0a44cf291ba8a40b1a06d332d SHA1 708f6099cc424ccdf43e8a0531d9d841bf2e1ff3 SHA256 4657f3a7739ed5d2a75f8a8a4ca715f3a3098edd717c4acd1070638fcda2d80a -AUX iscsitarget-1.4.20.2_kernel-2.6.36.patch 339 RMD160 0f88eecf46fed45ea9847a5c80943ca975fa53d4 SHA1 2af61df45fdbfeb444aafeef5cd5b3ffff93d856 SHA256 1a2b44da24a89fd2ba204600668351c0130c28eacace1ff0d362ef370cb3aaec -DIST iscsitarget-0.4.17.tar.gz 107884 RMD160 2f0413d8bb242d09593f07eb35846c0f9dd2934c SHA1 9c287b76a5bc50995d86d351968368302e70b224 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778 -DIST iscsitarget-1.4.19.tar.gz 124288 RMD160 60189a94a70eb35c3d9bd995a09ffa6983a1a036 SHA1 96af4ad9343960c700dc46f98a3b9ce2ffbe2231 SHA256 a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a -DIST iscsitarget-1.4.20.2.tar.gz 138464 RMD160 707138c0dd9a440f0d7ae5955d9d7f8bd0303398 SHA1 adfa2ff4defe93df7c26878b554731a268f0ecac SHA256 0f3c8e2c2038fbbd7059d1efdd428260013212daca75c1d56abbeec33cb8d388 -EBUILD iscsitarget-0.4.17.ebuild 1947 RMD160 876c1b3f1216e78b9f46390ba9a18310a18a5743 SHA1 fd29c29f8a31ada3b3afcf5093745f3c70ad2d4f SHA256 b71ae15ee537c66b74becab9d81d5693a28a130fcd66df3a3fb306e05625c5d3 -EBUILD iscsitarget-1.4.19.ebuild 2141 RMD160 377ead0c5fce50b5dd87a7dbb7ae9f8e30ca2c72 SHA1 f3268a81e6859c562ab92d4209e925ffa1088ccb SHA256 1fe32e93dff5504dca70ade38c97d991d17fe8884709c7d6e13c8882cfe94c37 -EBUILD iscsitarget-1.4.20.2.ebuild 1975 RMD160 646e9e529ec039bda27c2cceb3d8cb5a8dfc32d1 SHA1 ff8a6c219e6b933f6970ef130e4f5ef3ab2ee42b SHA256 dddc1b99bef63003a29a715a4cf04d99a27ed1693c559ecc6ae905ab5f04133c -MISC ChangeLog 7440 RMD160 6f39627efafe0018154abb58d1c9ed2d20b8d028 SHA1 27474e939690281763885ce8aec06833c15eb1f4 SHA256 e7a40e69d60f95c1276b00ef639011ef1a89ff420955b7afa7d0b4c81405379d -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJNXEwNAAoJEPqDWhW0r/LCHowQAJCh0FgL2yqmAzCWJ1qRl9Rd -BYEquDFid4RE9SS2mP7EYwRm/mp42ADRwh3ld0XEW5Yk7rQfiYGq+lsYa2qZCw1C -gBAAoZ/2xvqQsdkSxmCd5J4YEzt2pnbX2HYDQedH9u+p5BsEqNa296ekhvQUfYlL -ErXolNUTL086SCbKkdVMMu2UezVJ/ApaIDFsFL3vkPywsmy8fDg63UWAFD3l4f73 -WSP7Y6rwt5Ymu+Sf1yzJzeB+ZDaxKhZzsGPuOQLnOfIJH6POJhljUBzNb0ceSYvB -mmzvPhk2IXWJzmrFvvUESOr27jF5LB96tRQX2VAq8Oe/akxgqq+j/CBQsUtJXGU6 -NsIa/qXdWItn7z2RGB6AF1UkLqDd1QfZoEkEJjhKl0q6rrrnUB0SdorLEjuDowot -KMhFiPt/ovzddn1sqhlYOt7+tpHIT/t/QSmPkATK8EfTqI7rIpKQiPbQ1HxER4Cd -iJXGvo3wBdlNcvJZm82dAXTa5ftA9siEVPfK00TPjDekdr4Vj5Is90ftoGtPvDGw -jWANd4x1hb0zYGskJlTrj4H+6jrq7FvXMN9pwkx+0EdPSnJEchN8Sy4Ou5oikp68 -ZY06rVyz+0dN11SDMJoOXsCDNWm6Dqs+AGNzsiDtDv0d9F+9z99P4mzCGUZtwQ1X -RcWP+7I5rXD0Y8xic4pv -=X7Hx ------END PGP SIGNATURE----- +AUX ietd-conf.d 1073 SHA256 28c4a6ddfe555d9f400513de04e2e44473263c4505434fc6e926d2b2fe89c414 SHA512 6b89c6680ba20a720a5c480c13deb33871836d98684dc122ed9fcafbcfffe0d6294f51eb7a6789562e11fd4025adb8c2ebf41305c914189516588d9ba4e02b8c WHIRLPOOL 9dea1b243a30834b7f1707d7d743073bd301eb8fd71d5c1f0aa602b3e4f27e581a049eb51d16d9a08c3cbcc82c7dbd2d53ec2505a5d5b07d977aadc55aea3db8 +AUX ietd-init.d-2 2482 SHA256 299692c81e51fa5c8309b955732d29e3f82a4406e13fe9a826b842ad30f807d9 SHA512 1c8d441862c1966d1a0f3585c137c3177c2f3c9d080cfea9f7c8cdc95f1c5cff3ee524db54aed7bdd469b858e1e2686b4099fc0398eda80e312ca66dcf82a43a WHIRLPOOL 590f24f01d7553955dce5e4279bab4c006e3673156084744f51e713eb77f2d5bbe4d5ccf23d393d29b1caef1088daa82253ce9c19d595d656710b55c6bd0ad74 +AUX iscsitarget-0.4.15-isns-set-scn-flag.patch 507 SHA256 dc99ad8fa1cc10f6c6af4c99374dd0da14d3a56aebee2c48dd02cd8e156f9996 SHA512 7da5ef15d52121fd81f3f9a6afe97d4c8259f3b255a97d5e1329720c263970fe6a6764fdaf6be4caeeec76d9e87d9be19084504de4a146d5972961e72ecd84fa WHIRLPOOL d6229e41bd09a2ef1b6fec3fcd48304758cec5b7e539749f3b49bee3fed21d1f82f1811ce06980a839dcfe8194eda0b2d002b5079f53b03ab7bf5f71e342e34d +AUX iscsitarget-0.4.17+linux-2.6.28.patch 2427 SHA256 277bab00bd30b40ccdc5375bf5c3f0ed949fa756b6300828b052ec269c90ca8e SHA512 21c57a040f272115c7934ce576c167c29ad822e50a9d6e88146240f8d9704220ae519e7259df1bc1ae26387865e7b23af0f578c23c03d6c320cbbd151c7be909 WHIRLPOOL b8c49a32c5973ec8d0580b7ab3f7566ebf1c4d56ea280212337a3713e13ba2bf6059037b07cd428ac9e130c075cc92dc73704e17e7dda6ab015a529eaac6d162 +AUX iscsitarget-0.4.17+linux-2.6.29.patch 1123 SHA256 aa8d8c39d6375b5f5a05e4b5f98c839a2b841fa43d79447055edd57d05f53b37 SHA512 850d56c3cdac287078f8a06600d426352104ce69d051bb54c1ad4958514ae110557286068bcbb9be19b74ac864479ac8195e05e4ddf0da76a571a6d9f6f8b3a8 WHIRLPOOL c17d83833123bae14ce6c1776c0d6d7486ba002815f4e30eb8caa19e331b0da16d9534e52eeb4c7ca45b9fd1819662fe8e316f477714e924a988c2c1db55277b +AUX iscsitarget-0.4.17+linux-2.6.30.patch 1145 SHA256 86699f7bcf7bb6f9bf903f255724d08e1f3020b7854477b46329a3d202f15855 SHA512 0643c1037fe7aba21f6d6d9b82db19a5a20d57121c51a7b7ee6635a3768f494c3da508cb63e6e519a89d643df40f4342f6e423ee67296b6039d3c7f3b48324c9 WHIRLPOOL 4c8e969b6c3d467aaa86429d7e93d2deaf6f1c4ce5fe3df8fa59f7ea19db049a99195c307748a1850c6da66502ce4210ff630611c9aadeaf43f5c1c8d77cb046 +AUX iscsitarget-0.4.17-build.patch 580 SHA256 f1a29431674e4e185d3565df045ad575800c48f49de3a2a53d5723c7b2b7383d SHA512 1ab4bf0f3cedf3b05178e73d53dcd9738f3a3bdbd3f26b4989ddee8540c418d02d1ca1cedd122475f140004bcb0beba411f0530f7cbf2c2fc46b5640b036bafb WHIRLPOOL 3f8ca7db86a6dadfe712a7ef1be61d97a4a45261f7acd45943b2c502e87b58dc4775bd4e3050f79d510009067cb12d2020f8a9052e035548e2dd756049dd7983 +AUX iscsitarget-1.4.18+linux-2.6.32.patch 1342 SHA256 7ad2db023826e4861d644646d855406c0bbffe007b7a81d1f209948d0d58d336 SHA512 87886af4f2c78918c51fb07537e5098223d579a38cc81254a8d110ca8cfad822a46107179615b43183ef1f86f485051b0596be4e38ad150e718302bfad7dcffc WHIRLPOOL 99f716db1c961d0c90f1fa1475ae5d9c505662c5662d3c7b2dc8605db364d3100acaedc772e5f4c11b296ee7362d57c9c0de2b555bd33460c933c6f4b8f07e78 +AUX iscsitarget-1.4.19+linux-2.6.33.patch 594 SHA256 2e50daac88dff35a268a56950491fc9b7b9533eebd2a690f3c4eb448990f8352 SHA512 8e9193b34ccfff7f187f24312ada685cb75b581ad591d7193276bfce85605eed1639ca797caa23638d7991acab312a404147a5f1a3ada1020ef7350ddf507bff WHIRLPOOL e0d5011f341c61cd1cad3b678d045434f6aa4823a8f64b356f86666ef36e3ec0f5a77a8a0ca5e35e92eb00f3383e43d3da71a3767508bab78f52ecebce6b4337 +AUX iscsitarget-1.4.20.2-respect-flags.patch 878 SHA256 4657f3a7739ed5d2a75f8a8a4ca715f3a3098edd717c4acd1070638fcda2d80a SHA512 132e27f9385b423c0918806cccebd2c5a9072d72348a9bad0886d5c39e6f100db24ae807ba3d04e32c5f9831a79dafcc472c33ebec3a29c830f40b07ddf93807 WHIRLPOOL 048560e0455dff246c30be4db6d9c94e0c91f53d60b13d2afa487f98e9b6d174b0a506893893e96d265caf629cdcf9f1b8fb674bcf17b2201c1ecc288809510c +AUX iscsitarget-1.4.20.2_kernel-2.6.36.patch 339 SHA256 1a2b44da24a89fd2ba204600668351c0130c28eacace1ff0d362ef370cb3aaec SHA512 f83667b85d5a997335775e1c64cb61af6c57262dcffdd8e6c38ced30c3695ed0ab31fcd81c222c89b8200f8c4e9935f4bfeb859748fdf097e4d3f26d0c9c0488 WHIRLPOOL 64ef2b713ed6d5067c70feb36cb02f7d87b5b5f5783d45f19a4192e4d773353d71e4fae66d3a268a6d1808de77bc82ea9e121e21480a9a982f4797cab52ceb40 +AUX iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch 4047 SHA256 d6252cd4ec62d2a398e26a7bd12f793175c892f025be862c2861ebf8a4815816 SHA512 52229dd30ab5c9b8f0f700315560d4d67a7a55641a4612c04728b69ca789b6d7e50e1cd21dd7deaa35edb9f28c83f69b0182414cd96ee0a121c3e58fa7cfcc57 WHIRLPOOL f8b77081360ce1edc6c8d1a97e1c90cf68a6e21b7afd4bd8e2a908255dd105fdc64d8712c77ddb334509ddefe2a9b36ace581c52dc3b3a3e5fa109acb0e3d155 +AUX iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch 2806 SHA256 c16163e852dfd8c56869121ab6def96efaf84812a3140eb569b8fd11a4c14a9c SHA512 d529496bc7dea558856cb5ba6c58695d83001f1ff91a5d9fdb7d23d042512d4ed550f1d78dfaa0bb9c3807532b0802b55e59517c9e028e4066d97aa5ba9f82f8 WHIRLPOOL 22c08af05fa2ec8bf8d623da28e745c623dc6eb2b6ecfd9d3b776510286ff201ccff880e17d283286d1dcf8b2961bbe5d178ee11052492fc37f87cbc3cae010e +DIST iscsitarget-0.4.17.tar.gz 107884 SHA256 bc554508174f2657c93ddb0501adad0256d1c6801a3c1ee54ff721bc92ff8778 +DIST iscsitarget-1.4.19.tar.gz 124288 SHA256 a9fc5e43a2806b8aa95513b2af06d97bb9181ef5fedc906d69144d93a86e664a +DIST iscsitarget-1.4.20.2.tar.gz 138464 SHA256 0f3c8e2c2038fbbd7059d1efdd428260013212daca75c1d56abbeec33cb8d388 +DIST iscsitarget-1.4.20.2_p20130103.tar.gz 147073 SHA256 ff86e0fc18e8a33b299c8438729613345a50b91f988383fc9cad240cd3f7c1c1 SHA512 7ed706c38a63b696ff344725308a5d476f8fc4ebee71456615274470afed4d9cb2985d0960a9e77d185e267771e6c7ece8707232d42affd11f7de76e0eaf7371 WHIRLPOOL d13a869e14d716558bf15b7291b0987c5561067faafc3af5e0fd0db0126add7fbc0621e53394ca912c55fb6a3aa9ff6d402aca52d18d7087b5c3d594e15021f4 +EBUILD iscsitarget-0.4.17.ebuild 1947 SHA256 b71ae15ee537c66b74becab9d81d5693a28a130fcd66df3a3fb306e05625c5d3 SHA512 b269ae2f50898afedac4f464ac53e73bba7cd4af05904909c4c57acbaae6cdad0b6aba4787110bdf335e0e009c1a2b2d13608c53436b50db6640755d0c43ebfd WHIRLPOOL 2840b7d3246aed5e9d59874ad31f4e81996efba1e1973f4951638c62545ce7d84beea7a2a411b0c6c158f2afeb2efcf67d2c3cfef96da6c689d87e776c1b26a9 +EBUILD iscsitarget-1.4.19.ebuild 2141 SHA256 1fe32e93dff5504dca70ade38c97d991d17fe8884709c7d6e13c8882cfe94c37 SHA512 20b6f19b43fb6c0fd25565400c7db5b150126df56875d1064a99ddb65ffe7579f41eb019463de01820ebf01448521e960499c653bc77b66cb35d6c681d24ec03 WHIRLPOOL a5de50867edca934cf39a96ce6e28c7b2b1c6ec80e99e1b0eaa30573631c25c3ec46e6889fbd45e1f6127b4e3f783c86de9160a63c0898e031f5323acc8ed91c +EBUILD iscsitarget-1.4.20.2.ebuild 1975 SHA256 dddc1b99bef63003a29a715a4cf04d99a27ed1693c559ecc6ae905ab5f04133c SHA512 17048b1ab129cc7673ba5050b4f1541e9c975e93cddeb6315c465377de7cd709a7beb14ef53ba2f7231d4be383253728d602f803ce42bb1107ccb7852f7152a1 WHIRLPOOL 2da61db9790c9887748421af71292075ca78ffa10f64d41125be83230fc2d5b51f1bf05d3aef84b20805f01e7c4fc388c353898aeb5751752c2ae48a5e184e5f +EBUILD iscsitarget-1.4.20.2_p20130103.ebuild 2487 SHA256 d6b88c70fb175ee7fdf525b9da8e02a4e7a04ab6d9fe4df479355b94d24f562f SHA512 d5ef1c98250b826b28a5853cba0ae3e377d8dcec01fd03022bbf55016bbaf2a420703b02ed0011f4a5c955d3fa4d35b4f4ab52b93359f0f486e005b2ebe3b112 WHIRLPOOL ada03474207bd4237e31e8441529a3b97b5795c8846cc388214af92a11b6db2ee15e8ba46949a46ea5f6545ef9df39e6e4d01e4a07bd66a6c0f6dfe9e991f451 +EBUILD iscsitarget-9999.ebuild 2473 SHA256 27a39ce464a77eb4292928912f4a42c1a1cde6b4f9adbf61365bcfc9905f37c3 SHA512 725b3a5e8ad8f04056050ea47b0e7d2bad6d89387d71f3f2b7fd33e24e954e8bb15b420179f20e8c5522be195066540a3f0460ec4c809929155023a85917eb77 WHIRLPOOL 54196070247800ccf0dcecaf72b5b47ab0f437849eae8ce235f045e6db605d0896638ad7cd55671137c909a90a18d349cd2954292bd317cda7fcd8cc2f6696f1 +MISC ChangeLog 7920 SHA256 47de63e88f19b5f7882a7d9c45c79e30b868dcd32ca39a9d0d3e0d43be7c43e1 SHA512 af584f2137c377090a8dc691eec6305b4aa57cc3447e704296bc69b36eaf91afacb15d63e851c7bd7224adb1671ff669b8a2af78fbed5478e53b262a24fc0521 WHIRLPOOL 2f9904c913bfcf0e2b91a77975442ddbb0b6a435e366fead9c32acc2af096b66b278b1a828657a13b328cf4566a2150f4e7a9d5016c77ba8ebd75d41ba94c965 +MISC metadata.xml 302 SHA256 16655187811c2589947b4414b5a7a18ac2f0f3544c6ed14f0824424aba4c322c SHA512 d7e16c52ec0e49394724637f3d8af39db207fcdb0fedb0a5cfe6f3a96f8b55c9d6961b27abe55cf32a552b16ee8cb509acbbbf7de31d380dccd6506c567d8dcb WHIRLPOOL 9d2f8dae2e222ce4fe22122421fbf81573206fe15f600531c0adddd3ab11c2a86d57ff0ec6f444e4d761faafa9aaf6135634f71f38521b359341b4807ee9e219 diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch new file mode 100644 index 000000000000..d41751535d31 --- /dev/null +++ b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-fix-3.2-support.patch @@ -0,0 +1,135 @@ +diff --git a/Makefile b/Makefile +index df41642..f2f17c8 100644 +--- a/Makefile ++++ b/Makefile +@@ -46,18 +46,10 @@ kver_lt = $(shell [ $(KMAJ) -lt $(1) -o \ + $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \ + $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -lt $(3) ] && \ + echo 1 || echo 0) +-kver_le = $(shell [ $(KMAJ) -lt $(1) -o \ +- $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \ +- $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -le $(3) ] && \ +- echo 1 || echo 0) +-kver_gt = $(shell [ ( $(KMAJ) -gt $(1) ) -o \ ++kver_gt = $(shell [ $(KMAJ) -gt $(1) -o \ + $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \ + $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -gt $(3) ] && \ + echo 1 || echo 0) +-kver_ge = $(shell [ ( $(KMAJ) -gt $(1) ) -o \ +- $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \ +- $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -ge $(3) ] && \ +- echo 1 || echo 0) + kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0) + + # +@@ -66,85 +58,93 @@ kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0) + # base first the earlier patch sets will not need to be modified. + # + +-ifeq ($(call kver_le,3,5,0),1) ++ifeq ($(call kver_lt,3,6,0),1) + PATCHES := $(PATCHES) compat-3.5.patch + endif + +-ifeq ($(call kver_le,3,4,0),1) ++ifeq ($(call kver_lt,3,5,0),1) + PATCHES := $(PATCHES) compat-3.2-3.4.patch + endif + +-ifeq ($(call kver_le,3,2,0),1) ++ifeq ($(call kver_lt,3,3,0),1) + PATCHES := $(PATCHES) compat-2.6.39-3.2.patch + endif + +-ifeq ($(call kver_le,2,6,38),1) ++ifeq ($(call kver_lt,2,6,39),1) + PATCHES := $(PATCHES) compat-2.6.38.patch + endif + +-ifeq ($(call kver_le,2,6,37),1) ++ifeq ($(call kver_lt,2,6,38),1) + PATCHES := $(PATCHES) compat-2.6.36-2.6.37.patch + endif + + # Compatibility patch for kernels > 2.6.32 <= 2.6.35 +-ifeq ($(call kver_le,2,6,35),1) ++ifeq ($(call kver_lt,2,6,36),1) ++ifeq ($(call kver_gt,2,6,32),1) + PATCHES := $(PATCHES) compat-2.6.33-2.6.35.patch + endif ++endif + + # Compatibility patch for kernels <= 2.6.32 +-ifeq ($(call kver_le,2,6,32),1) ++ifeq ($(call kver_lt,2,6,33),1) + PATCHES := $(PATCHES) compat-2.6.32.patch + endif + + # Compatibility patch for kernels <= 2.6.31 +-ifeq ($(call kver_le,2,6,31),1) ++ifeq ($(call kver_lt,2,6,32),1) + PATCHES := $(PATCHES) compat-2.6.31.patch + endif + + # Compatibility patch for kernels <= 2.6.30 +-ifeq ($(call kver_le,2,6,30),1) ++ifeq ($(call kver_lt,2,6,31),1) + PATCHES := $(PATCHES) compat-2.6.30.patch + endif + + # Compatibility patch for kernels <= 2.6.29 +-ifeq ($(call kver_le,2,6,29),1) ++ifeq ($(call kver_lt,2,6,30),1) + PATCHES := $(PATCHES) compat-2.6.29.patch + endif + + # Compatibility patch for kernels <= 2.6.28 +-ifeq ($(call kver_le,2,6,28),1) ++ifeq ($(call kver_lt,2,6,29),1) + PATCHES := $(PATCHES) compat-2.6.28.patch + endif + + # Compatibility patch for kernels >= 2.6.25 and <= 2.6.27 +-ifeq ($(call kver_le,2,6,27),1) ++ifeq ($(call kver_lt,2,6,28),1) ++ifeq ($(call kver_gt,2,6,24),1) + PATCHES := $(PATCHES) compat-2.6.25-2.6.27.patch + endif ++endif + + # Compatibility patch for kernels <= 2.6.24 +-ifeq ($(call kver_le,2,6,24),1) ++ifeq ($(call kver_lt,2,6,25),1) + PATCHES := $(PATCHES) compat-2.6.24.patch + endif + + # Compatibility patch for kernels <= 2.6.23 +-ifeq ($(call kver_le,2,6,23),1) ++ifeq ($(call kver_lt,2,6,24),1) + PATCHES := $(PATCHES) compat-2.6.23.patch + endif + + # Compatibility patch for kernels <= 2.6.22 +-ifeq ($(call kver_le,2,6,22),1) ++ifeq ($(call kver_lt,2,6,23),1) + PATCHES := $(PATCHES) compat-2.6.22.patch + endif + + # Compatibility patch for kernels >= 2.6.19 and <= 2.6.21 +-ifeq ($(call kver_le,2,6,21),1) ++ifeq ($(call kver_lt,2,6,22),1) ++ifeq ($(call kver_gt,2,6,18),1) + PATCHES := $(PATCHES) compat-2.6.19-2.6.21.patch + endif ++endif + + # Compatibility patch for kernels >= 2.6.14 and <= 2.6.18 +-ifeq ($(call kver_le,2,6,18),1) ++ifeq ($(call kver_lt,2,6,19),1) ++ifeq ($(call kver_gt,2,6,13),1) + PATCHES := $(PATCHES) compat-2.6.14-2.6.18.patch + endif ++endif + + # We don't support kernels < 2.6.14 except for explicit distros + ifeq ($(call kver_lt,2,6,14),1) diff --git a/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch new file mode 100644 index 000000000000..cc6a0b8c7e3c --- /dev/null +++ b/sys-block/iscsitarget/files/iscsitarget-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch @@ -0,0 +1,96 @@ +diff --git a/kernel/iscsi.c b/kernel/iscsi.c +index 9ad3047..37d7753 100644 +--- a/kernel/iscsi.c ++++ b/kernel/iscsi.c +@@ -773,6 +773,7 @@ static void set_offset_and_length(const struct iet_volume *lu, + break; + case READ_16: + case WRITE_16: ++#ifdef WRITE_SAME_16 + case WRITE_SAME_16: + *off = (u64)cmd[2] << 56 | (u64)cmd[3] << 48 | + (u64)cmd[4] << 40 | (u64)cmd[5] << 32 | +@@ -781,6 +782,7 @@ static void set_offset_and_length(const struct iet_volume *lu, + *len = (u32)cmd[10] << 24 | (u32)cmd[11] << 16 | + (u32)cmd[12] << 8 | (u32)cmd[13]; + break; ++#endif + case PERSISTENT_RESERVE_OUT: + { + const struct persistent_reserve_out *pr_out = +@@ -1036,6 +1038,7 @@ static void scsi_cmnd_start(struct iscsi_conn *conn, struct iscsi_cmnd *req) + case WRITE_10: + case WRITE_16: + case WRITE_VERIFY: ++#ifdef WRITE_SAME_16 + case WRITE_SAME_16: + { + struct iscsi_sess_param *param = &conn->session->param; +@@ -1104,6 +1107,7 @@ static void scsi_cmnd_start(struct iscsi_conn *conn, struct iscsi_cmnd *req) + } + break; + } ++#endif + error: + default: + eprintk("Unsupported %x\n", req_hdr->scb[0]); +diff --git a/kernel/iscsi_dbg.h b/kernel/iscsi_dbg.h +index 8c9b928..ad5c6d4 100644 +--- a/kernel/iscsi_dbg.h ++++ b/kernel/iscsi_dbg.h +@@ -12,7 +12,9 @@ + #define D_IOMODE (1UL << 8) + #define D_UAC (1UL << 9) + #define D_PR (1UL << 10) ++#ifdef WRITE_SAME_16 + #define D_VAAI (1UL << 11) ++#endif + + #define D_DATA (D_READ | D_WRITE) + +diff --git a/kernel/target_disk.c b/kernel/target_disk.c +index 6b1de2c..ca28e4e 100644 +--- a/kernel/target_disk.c ++++ b/kernel/target_disk.c +@@ -408,6 +408,7 @@ static void build_write_response(struct iscsi_cmnd *cmnd) + iscsi_cmnd_set_sense(cmnd, MEDIUM_ERROR, 0x03, 0x0); + } + ++#ifdef WRITE_SAME_16 + static void build_write_same_response(struct iscsi_cmnd *cmnd) { + int err; + struct tio *target_tio; +@@ -475,6 +476,7 @@ static void build_write_same_response(struct iscsi_cmnd *cmnd) { + + tio_put(target_tio); + } ++#endif + + static void build_sync_cache_response(struct iscsi_cmnd *cmnd) + { +@@ -618,9 +620,11 @@ static int disk_execute_cmnd(struct iscsi_cmnd *cmnd) + case WRITE_VERIFY: + send_scsi_rsp(cmnd, build_write_response); + break; ++#ifdef WRITE_SAME_16 + case WRITE_SAME_16: + send_scsi_rsp(cmnd, build_write_same_response); + break; ++#endif + case SYNCHRONIZE_CACHE: + send_scsi_rsp(cmnd, build_sync_cache_response); + break; +diff --git a/kernel/volume.c b/kernel/volume.c +index 8beeb1e..6ad2a3d 100644 +--- a/kernel/volume.c ++++ b/kernel/volume.c +@@ -446,7 +446,9 @@ int is_volume_reserved(struct iet_volume *volume, u64 sid, u8 *scb) + case WRITE_10: + case WRITE_12: + case WRITE_16: ++#ifdef WRITE_SAME_16 + case WRITE_SAME_16: ++#endif + case WRITE_VERIFY: + case SYNCHRONIZE_CACHE: + if (write_excl || excl_access) diff --git a/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild b/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild new file mode 100644 index 000000000000..7cd97fc35cdc --- /dev/null +++ b/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-1.4.20.2_p20130103.ebuild,v 1.1 2013/01/03 11:09:58 ryao Exp $ + +EAPI="4" + +inherit linux-mod eutils flag-o-matic + +if [ ${PV} == "9999" ] ; then + inherit subversion + ESVN_REPO_URI="http://iscsitarget.svn.sourceforge.net/svnroot/iscsitarget/trunk" +else + SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DESCRIPTION="Open Source iSCSI target with professional features" +HOMEPAGE="http://iscsitarget.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND="dev-libs/openssl" +RDEPEND="${DEPEND}" + +MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)" + +pkg_setup() { + CONFIG_CHECK="CRYPTO_CRC32C" + ERROR_CFG="iscsitarget needs support for CRC32C in your kernel." + + kernel_is ge 2 6 14 || die "Linux 2.6.14 or newer required" + + [ ${PV} != "9999" ] && \ + { kernel_is le 3 6 || die "Linux 3.6 is the latest supported version."; } + + linux-mod_pkg_setup +} +src_prepare() { + if [ ${PV} != "9999" ] + then + # Fix build system to apply proper patches + epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch" + + # Apply kernel-specific patches + emake KSRC="${KERNEL_DIR}" patch || die + + # Respect LDFLAGS. Bug #365735 + epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch" + + # Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier + epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch" + fi +} + +src_compile() { + emake KSRC="${KERNEL_DIR}" usr || die + + unset ARCH + emake KSRC="${KERNEL_DIR}" kernel || die +} + +src_install() { + einfo "Installing userspace" + + # Install ietd into libexec; we don't need ietd to be in the path + # for ROOT, since it's just a service. + exeinto /usr/libexec + doexe usr/ietd || die + + dosbin usr/ietadm || die + + insinto /etc + doins etc/ietd.conf etc/initiators.allow || die + + # We moved ietd in /usr/libexec, so update the init script accordingly. + sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d + newinitd "${T}"/ietd-init.d ietd || die + newconfd "${FILESDIR}"/ietd-conf.d ietd || die + + # Lock down perms, per bug 198209 + fperms 0640 /etc/ietd.conf /etc/initiators.allow + + doman doc/manpages/*.[1-9] || die + dodoc ChangeLog README RELEASE_NOTES README.initiators README.mcs README.vmware || die + + einfo "Installing kernel module" + unset ARCH + linux-mod_src_install || die +} diff --git a/sys-block/iscsitarget/iscsitarget-9999.ebuild b/sys-block/iscsitarget/iscsitarget-9999.ebuild new file mode 100644 index 000000000000..4b15ff0d35b5 --- /dev/null +++ b/sys-block/iscsitarget/iscsitarget-9999.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-9999.ebuild,v 1.1 2013/01/03 11:09:58 ryao Exp $ + +EAPI="4" + +inherit linux-mod eutils flag-o-matic + +if [ ${PV} == "9999" ] ; then + inherit subversion + ESVN_REPO_URI="http://iscsitarget.svn.sourceforge.net/svnroot/iscsitarget/trunk" +else + SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +DESCRIPTION="Open Source iSCSI target with professional features" +HOMEPAGE="http://iscsitarget.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND="dev-libs/openssl" +RDEPEND="${DEPEND}" + +MODULE_NAMES="iscsi_trgt(misc:${S}/kernel)" + +pkg_setup() { + CONFIG_CHECK="CRYPTO_CRC32C" + ERROR_CFG="iscsitarget needs support for CRC32C in your kernel." + + kernel_is ge 2 6 14 || die "Linux 2.6.14 or newer required" + + [ ${PV} != "9999" ] && \ + { kernel_is le 3 6 || die "Linux 3.6 is the latest supported version."; } + + linux-mod_pkg_setup +} +src_prepare() { + if [ ${PV} != "9999" ] + then + # Fix build system to apply proper patches + epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-fix-3.2-support.patch" + + # Apply kernel-specific patches + emake KSRC="${KERNEL_DIR}" patch || die + + # Respect LDFLAGS. Bug #365735 + epatch "${FILESDIR}/${PN}-1.4.20.2-respect-flags-v2.patch" + + # Avoid use of WRITE_SAME_16 in Linux 2.6.32 and earlier + epatch "${FILESDIR}/${PN}-1.4.20.2_p20130103-restore-linux-2.6.32-support.patch" + fi +} + +src_compile() { + emake KSRC="${KERNEL_DIR}" usr || die + + unset ARCH + emake KSRC="${KERNEL_DIR}" kernel || die +} + +src_install() { + einfo "Installing userspace" + + # Install ietd into libexec; we don't need ietd to be in the path + # for ROOT, since it's just a service. + exeinto /usr/libexec + doexe usr/ietd || die + + dosbin usr/ietadm || die + + insinto /etc + doins etc/ietd.conf etc/initiators.allow || die + + # We moved ietd in /usr/libexec, so update the init script accordingly. + sed -e 's:/usr/sbin/ietd:/usr/libexec/ietd:' "${FILESDIR}"/ietd-init.d-2 > "${T}"/ietd-init.d + newinitd "${T}"/ietd-init.d ietd || die + newconfd "${FILESDIR}"/ietd-conf.d ietd || die + + # Lock down perms, per bug 198209 + fperms 0640 /etc/ietd.conf /etc/initiators.allow + + doman doc/manpages/*.[1-9] || die + dodoc ChangeLog README RELEASE_NOTES README.initiators README.mcs README.vmware || die + + einfo "Installing kernel module" + unset ARCH + linux-mod_src_install || die +} diff --git a/sys-block/iscsitarget/metadata.xml b/sys-block/iscsitarget/metadata.xml index 96a2d586367d..630808c221b3 100644 --- a/sys-block/iscsitarget/metadata.xml +++ b/sys-block/iscsitarget/metadata.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>base-system</herd> + <herd>base-system</herd> + <maintainer> + <email>ryao@gentoo.org</email> + <name>Richard Yao</name> + <description>Primary maintainer</description> + </maintainer> </pkgmetadata> |