fixing bug 511064 and bug 501996

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

4 files changed, 34 insertions, 22 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 32ea1053ef96..df860f6b5c97 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.63 2015/08/06 03:09:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.64 2015/08/08 05:42:15 prometheanfire Exp $
+
+  08 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> files/iscsid-init.d,
+  open-iscsi-2.0.873.ebuild:
+  fixing bug 511064 and bug 501996
 
   06 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> files/iscsidev.sh,
   open-iscsi-2.0.872-r3.ebuild:
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index e0f6885b3ff2..8e5ab2a13e7f 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX 99-iscsi.rules 81 SHA256 35f1475f02f9447c6d1d9e5249eef2f3e34206356f7f675ebab5f1dc1bf14988 SHA512 ee4cf1776493c27f2222d118606a04021117b6176c6879c0e98626e1edea3b0731bff95ca8fee0f6bc6fe91d0ab0e7648e8014acc84831af2ab932c2a0a00692 WHIRLPOOL 852e2c0dfdcdd593eda9d571a645efd323d0671641279eecfdebd9a6d9715266cd888e8fedca1bb214ab06cd3becba51dd9efdebd18e992c14cb4111714521a7
 AUX initiatorname.iscsi 1282 SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3 SHA512 c37990050123c6f805016f009a3d09452db2a3cfbb359efa50350c7ff4b6adc75bc1f8aba26190829729b75639b8e52c77f31bd719c5f945869941f651121743 WHIRLPOOL 7ff4ef48a7d3decc96160681a8ed82b6848b238ac38f8973d3e5da12e346a0c26f7bee67d7ba81197b9fecb679e9046e6fec85f90d97068aa622aceca875bda0
 AUX iscsid-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf
-AUX iscsid-init.d 2206 SHA256 9462e7018527f6ec26db623694070a6d2e834af8e174439ecb3ee5b5cab6da5d SHA512 bbd3e120a08cbc506ceec9bf2cec0b1ef9a379b9e39339cfedf68bd0f1bff4185877c305a9276eb7a6da3c33e866439c0bc781f1c92411c4173b15704a1fbab6 WHIRLPOOL 8a7e38f380e9b1c3d9993ed6ed06fb1efe1ff740fad264747f8f433842acb318ad63125dd37865018c8d220cc45d76dad51e3fa258fc0c2fd036e4a07fe50f51
+AUX iscsid-init.d 2216 SHA256 0b70fe8e0448293ec750d7d1bd0a91e3612235d9a26f3d89e5e0df4430cd78fb SHA512 4a9cc7d94885b9e334f756fbb70112bda8ba9bb6f9a9fc54e0bf6c4cdb2ff70dd5a2ff997ef1ebc7974d75cee6ade8bb8528147b42a2be0c0e1e21da114d8bd7 WHIRLPOOL 4bf91e6a72b6de8f10d60c849ffb7fa255fd49fa619f88d75038c480d688eeb3d546648211ff552b1224fb6c89a566ad21a4bf39a4ff6131c2b9852808013aa9
 AUX iscsidev.sh 2119 SHA256 1189dc43936fa5e428ad05fe0299d2ffdffe28ccd193396213ac9d59a5c25aaf SHA512 b4ed7fad25e3f000134a77f3aea2702f03ff75e99ecf49e580085127ab58de5a64bea9c4fc2ae5b324deafd0a860494d1a8dc1223db7d3679b960552f0c00813 WHIRLPOOL 28f57226d487fc0843e571c8ceeecf3e2b0eec506efef0b7a54636b1479dfc964d405f2be7f134c0858a24d1d24c67adb6ca9153ed9aaf4955ae403b4500d845
 AUX open-iscsi-2.0.872-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245092583856fd26316674cf4114 SHA512 d197bbe2ce610cc2d4a1269c8d7a067ca5e3b0f3d8bb0804c2c39e0cf512bcbf7b5de45b7d6ffd5cf918dc395c7cf32c40e64b4348d00a4d0223ee44c463709a WHIRLPOOL 19e7dc2d647a271dd67bf2f92e3c866719b1a7c978ecc86395d3586ab0c897e93ab4dce740497a6139f4fae1c5a34c455b806c627c9a9f876133d808890a85bf
 AUX open-iscsi-2.0.872-dont-call-configure.patch 296 SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241 SHA512 513e775695288b747b40cfb9815c9083b61637f0e3ba241f5d5f3363730059ac4a01e55c23ab3ff983da7d3a5b40448447740ac35e0748c4d5e8942946146522 WHIRLPOOL af5c1cae289cf669dcd9cc6ce02e6a7e6603dceb8f3827d79f4d7adeb35aa9c9c6e588e1e915c078c31532a9985f4fb2a74fe7270269c686be4d7f6c2083ae06
@@ -19,22 +19,22 @@ DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c
 DIST open-iscsi-2.0-873.tar.gz 667069 SHA256 7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b WHIRLPOOL 05af106f11da9f9f02c10edd5412d0f99816349e06e192059700eb1ae24a36027c3f0d7ed423aa7bb1c0b9d8b3aa1b6aa72a2aadb00f27762edf16b7f7d08c09
 EBUILD open-iscsi-2.0.872-r2.ebuild 3127 SHA256 792752be418e9b259f368e0e67938e707a65d705604eeaaabcc952f34ce3b6f5 SHA512 b242ee8c03b862766964b9fd75dd7ead40ab8dfae929613b9c3de7c22036279b5851143af076a3ca9b8d669bc509f75553723265470786a01deb5cd657ef63c9 WHIRLPOOL 20317bcb477a2e858e583ffa537d26ca9ade7e4251d8d635a1ec45cf6aeafb88fedd0890d285f50b74e5527f243fce60a80ab59765c0e6b69947458209bef734
 EBUILD open-iscsi-2.0.872-r3.ebuild 3314 SHA256 6eda8ff3b46ee2c59972988f15b292410f0544bd916bc49daf27bd45b8c08075 SHA512 1da23a61c245aa02bfbff9e790d175bda8c08939c67b58d911e941f848ed1d5bd44d47e2290ed6b171c45b2f40fea494c339ea173a49204a814fd238c8e8c012 WHIRLPOOL 9b2941534c162da128f98aa5a0832fdd225fd04012203b712d8c25f096c633f6354d48c5b2113361c5d7fe21681e1c18d7a2846a59bc18ef67a94c2c543510e7
-EBUILD open-iscsi-2.0.873.ebuild 2330 SHA256 56d4a4f7539ce5918fadc442ef6d789a1e10c680e1e81382b945eb41099a5cb8 SHA512 01277dff372ccf2b700ffbfd7fac54a10d7aeab82ea373246e55e6a9d29dae50e2db5200bd6c8e143d96980669c6b5c3c82528794c6f680d533b9da0fb4832c9 WHIRLPOOL 635efd978b29bbdbdc222bfdd1fb17d4a9d836a95897260bbb100b28af1147c476d6c9f8f0998653b2436ccfaa5576a84c67a58f9d34413724b4736ae887cd16
-MISC ChangeLog 12631 SHA256 ef9cfdfa2d00fd1722c8025eb05d30e190250ce37a7cc9506d2bd29d13dfe4ab SHA512 a838b8d5ff0fe13263ee6168ed0e7bff976241fb60dfff6a59533e2d8234e9fb91fa74943a3bc0b5ca36dbc0d001174f89d6df9ac8631fd3ecdd0aacd5c23b1f WHIRLPOOL aa788ddb0b6c5ad54b335837e5c1cb5e5b8344b5826e17d667f03aa1753adf51b3a00668f05fc03042eeef414cd8c591ed0de7adfc9f85228931a579f94e3310
+EBUILD open-iscsi-2.0.873.ebuild 2526 SHA256 6deeb613dae087fafc9d09d510369b06b75cf36c4ee9a30a31d6caa3180876bb SHA512 e572feef11f96be78b5b9e51fbaddc84be3962cabaf3b0be8602591b2b26c43a22b02cea6d058a964d4dd968c48e4379248bf41ee7c413a2f2bae27b2becb9ce WHIRLPOOL 67e14f20bfe808e02fa72d3fb82e8ac9a17afe99132dbd06311101937dc497198304176061d621b2fadbb9cad59dd5e88237c10c3e3dc00518754c08e11dc4ae
+MISC ChangeLog 12774 SHA256 9b9181930bb9ff4372f3be4dba556ea5bd21a5ac8b0c7477f04bc487013005a2 SHA512 68fe6c69d7a6bb1ae5f130ce454428d9eef12985e9a9a92bb8231eb667dbf2b0da9dd32aa949cdaeaa1aa5c8f8eea498c47f101206b383e141f97dc7d14fd6f6 WHIRLPOOL 74d28df5ad38713c3f3b1e2dd50d95175d5580a4c95703bc4c904069a895c1c3d62f7045b4c6e3e73fea08549bc0be1b54a34a9e412705e4c0dace8bce2f31e6
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVwtA1AAoJEGSje+quGaTobl4P/3y7K19UTsKL+a/I96CZvgQo
-0mdakx1zhafrOYsc06VuO1Sc/4YyLcERt6sawZXpkEbd5plGun8p7OKZ9yP/7lX7
-Adge1pvlp4wqJfIGPqOzkn7Tc4GW/+Me5iTCwrO7Nur9NJ70qSdxtyTVBIv9zYVi
-AMMXF9oLwdv1sRPP0DXeMK18Qn+6jZPCE8fQnI7kIG68S9sg1ExDOaq1dwzKLFUi
-kAKvwwubo6i+wKRGaAcjf9HKsowIqrnV3iFzAygUvSeJCIZrjSuRb303DAozRtwi
-xIaZhVwLQ5Seh1SrDgNcITTUgfMamO1I0XD0HUeBhEc9hecNGMqXSmFRSoeVFNH4
-PgEKKUkQB6dsQYjslSMdUxb7m3kOD5/0W5OK+NHnyWduWL5EFCui1VDNYxDnF5kF
-JlrjAFSJjg2ue56EwOxRsz6Fjrj6z7LKocEh3yJwXFDlite4xJGHIYqrGiLs1/GF
-OJ52VDOUiMadZcoFv+i9bVtT3oevVKS8zXHWCn1pHRjigl6FHRDxEpmyADrNwrqY
-U5c18KsKtWefcA0EXv55Pt4rYGCtyjfwUAREodGiZmxCDvGIEJTdhvs+nzRQQxc/
-OindTP39Z9OFD60m+vFD7DnmEgVhrp8rxLvRqB5Af6k7vo77vjOTamSWRqoKXSyz
-C8JSR45gOP0FWGQ03fkb
-=hW84
+iQIcBAEBCAAGBQJVxZcFAAoJEGSje+quGaToWRcQAJwO7eqewddLxwKWB2fa3sFQ
+iHiUpWSOn9UdwSknfn7Y4De3vLw0W9DH8F4bkOuZyDrRh2yXBxg38vWOqQYfJWtT
+1UtN8i6iugt9bJTM/HhiusjEu0p/oHbUl3uPri+XStssFHpB/eF777HbgrSOTTvt
+8xS19xmutdOOHK7tGkbov3usLTtcYpBubMRFwOiM0Bpy+stSz+AjXJcjwyiuflgs
+BKa/lwWlW6l8tz0cQ8QpAIJxY0ilQuBc0bDfK4dG2VL+IoajCqqUr5upjRD9xJI9
+VT/Ta5MwNc9hCbLuKK4UbC+hWmjLZXPfitO+4x3blEC6I/aqoRPb6CXbkY8UODRF
+jQdrmrbKw1pvvRybJJJkwT66y8yahdpg+GK5AxM5w0xCCjX3uCqJVBvcOOwX3Dme
+6hytGl43X3NMf+EVpXhU+wTeTxT03GR6NPaTzbUupPTP1WEbP4FUwALiwfdPEpWE
+s4ewOTLyvDsiIdagfV5kKbKQmz5VyxAcpg8ul/b1cSCN/Kq0T8/p1s0p0Vr2RJGY
+/2hvdsbIrdblzdqiY3stGd+UuhEFecppshO/UYqICRR4M6SlQ2j1uizwuLQsNfMT
+L+dxqYzup3hTn3sZJYBi1wYfSG9PoibMpMvW8Fzrxu2DO5yzkYR3g8Yjzlo6C9YY
+2GxfpviAJDhPwAtNjTXt
+=ahqh
 -----END PGP SIGNATURE-----
diff --git a/sys-block/open-iscsi/files/iscsid-init.d b/sys-block/open-iscsi/files/iscsid-init.d
index b42deba5ddfc..a1503394a677 100644
--- a/sys-block/open-iscsi/files/iscsid-init.d
+++ b/sys-block/open-iscsi/files/iscsid-init.d
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation, Inc.
+# Copyright 1999-2015 Gentoo Foundation, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-init.d,v 1.8 2013/10/20 20:19:52 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-init.d,v 1.9 2015/08/08 05:42:15 prometheanfire Exp $
 
 command="/usr/sbin/iscsid"
 command_args="${OPTS}"
-start_stop_daemon_args="-w 10" # iscsid might fail e.g. when the iSCSI kernel modules aren't available
+start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available
 pidfile=${PIDFILE:-/var/run/${SVCNAME}.pid}
 
 extra_started_commands="starttargets stoptargets"
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 4d96259e0017..bb2af2c36b5c 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild,v 1.1 2013/10/11 20:08:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild,v 1.2 2015/08/08 05:42:15 prometheanfire Exp $
 
 EAPI=5
 
@@ -19,6 +19,8 @@ IUSE="debug slp"
 
 DEPEND="slp? ( net-libs/openslp )"
 RDEPEND="${DEPEND}
+	virtual/udev
+	sys-fs/lsscsi
 	sys-apps/util-linux"
 
 S="${WORKDIR}/${MY_PV}"
@@ -75,7 +77,13 @@ src_install() {
 	docinto test/
 	dodoc test/*
 
+	insinto /etc/iscsi
 	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
+	# udev pieces
+	insinto /etc/udev/scripts
+	doins "${FILESDIR}"/iscsidev.sh
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/99-iscsi.rules
 
 	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
 	newinitd "${FILESDIR}"/iscsid-init.d iscsid