Stop using "modprobe -l" which went away with sys-apps/kmod wrt #409931

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

4 files changed, 260 insertions, 2 deletions

diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog
index 26738b76d953..6f88800bc394 100644
--- a/sys-block/open-iscsi/ChangeLog
+++ b/sys-block/open-iscsi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/open-iscsi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.49 2013/01/06 11:10:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.50 2013/03/07 10:23:44 ssuominen Exp $
+
+*open-iscsi-2.0.872-r2 (07 Mar 2013)
+
+  07 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +open-iscsi-2.0.872-r2.ebuild, +files/open-iscsi-2.0.872-init.d-r1:
+  Stop using "modprobe -l" which went away with sys-apps/kmod wrt #409931
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> open-iscsi-2.0.872-r1.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index ddc26d9d4d66..ba8d8ae55f93 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX CVE-2009-1297.patch 798 SHA256 b52320fb0e25876d7b9cd7a40e1a01246a9175822c98c3796d6e2822fda39af5 SHA512 d4f2488f643f1e35ec22f2c1e50a5a200afec933cc64b35e939844822ecd004834f107957ddf4f2cc126d3459500ae2ccfbf4c8900704f23211d76e142791256 WHIRLPOOL 8ef48cbe4b57caf070cd408537e40de0d2e038bb06d5653f371ae0041f5559898957d50b0ff10f682de0e919c9fccea5e717907de9eabb19ef292146f05fc819
 AUX initiatorname.iscsi 1282 SHA256 4ae558522881796f67ad5915ecf38d01e64c9d9768469847adb17405404485f3 SHA512 c37990050123c6f805016f009a3d09452db2a3cfbb359efa50350c7ff4b6adc75bc1f8aba26190829729b75639b8e52c77f31bd719c5f945869941f651121743 WHIRLPOOL 7ff4ef48a7d3decc96160681a8ed82b6848b238ac38f8973d3e5da12e346a0c26f7bee67d7ba81197b9fecb679e9046e6fec85f90d97068aa622aceca875bda0
 AUX iscsid-2.0.871-r1.init.d 2974 SHA256 c99b8f85bb319cf1b304ab9322529f63ec213a3b61a53d360990ddc1f8766390 SHA512 f643b4dc391bec476e12586fc3da547514d4afb4441c7a70b67628a40ad7fec043ef50840bbc17a7c06694022524ed2c392f1e4f16675214d927fdaf67638bab WHIRLPOOL b8406191150d941363816bd8b6627b05f1c29ba53e68da744aec3aec97a21bbcdc0f1423f7519f39e1b3a56ccaa9e816c6fcacb331e727d87a24fb35fa28c63e
@@ -9,6 +12,7 @@ AUX open-iscsi-2.0.872-conf.d 422 SHA256 3e2a63143e3167f20844ef94f1383180b69c245
 AUX open-iscsi-2.0.872-dont-call-configure.patch 296 SHA256 92ab247afde924a6d07643abc2cb34598a2fb13f62718684803ab44b9bce7241 SHA512 513e775695288b747b40cfb9815c9083b61637f0e3ba241f5d5f3363730059ac4a01e55c23ab3ff983da7d3a5b40448447740ac35e0748c4d5e8942946146522 WHIRLPOOL af5c1cae289cf669dcd9cc6ce02e6a7e6603dceb8f3827d79f4d7adeb35aa9c9c6e588e1e915c078c31532a9985f4fb2a74fe7270269c686be4d7f6c2083ae06
 AUX open-iscsi-2.0.872-glibc212.patch 266 SHA256 e7b299da12daed432f18a115b7a14eadb61a3db13df89af21a9078357ebf63ca SHA512 8d869642b27dc7d243cf5697858a19127e5e627dd62fd2a8879e4baf84f87aa07e7682faa5f7153ef75e8f9a78ae9b1a84e3260f449fbbb26d848064ec736630 WHIRLPOOL c501c6d8ae334974635f25060b29e326da7a6ef33062c518cd115fa7cae6a63ef3901dc7e1c421a70557b114cead6cc951a09712cf19c83c7f79ec96635fe7e4
 AUX open-iscsi-2.0.872-init.d 2971 SHA256 ff62e08cd55d659ef5df1f477bd835a1d29984fd707801a9ef4d0dfe9c7caf79 SHA512 4ba6f52bd5e2a39fab4c0be81bebbcd18db5af8118f4cfe2f85e2bde75ab4dc7abf131144f3528e7a5e3887a4bd0f7eb44b64b10f392510af985639ec7ebcf09 WHIRLPOOL 79df614d278c92111c0fbab4382400c71033ff1227e81fb28abf1ad6269a7575b6b472b049ec73308509020688ef17246eb06770f05ff5a8e6111d7a6bffdd7e
+AUX open-iscsi-2.0.872-init.d-r1 2973 SHA256 3295044666e1be799a0311f71e9db43aa050f8a02948af8008a6cd7b8c77357d SHA512 737403d25407e35f85418798838e2fe4ee69da12f110d16757bfd15a84ab894dfbf55ad541af96d80d7860610522af7fda8bbe4e834c7d29eb6c0d381c9be73c WHIRLPOOL de2e95b90823add0fc494cfcd485e8702f9f6d8d195ed4e35d38294b6052a0eab6fb61d5c2622efe8930a4cf6221e4020edb288fac0eef02ee19e2e920b28ee6
 AUX open-iscsi-2.0.872-isns-slp.patch 871 SHA256 d83640c9a7f9d7fed2b502d0164f6f8a91adb87f45e79a793954eae536a22138 SHA512 8aa4e6897c3284b7d914b7805d37a5d21014d66514675a4878c05535c460fc5ffafb43628f4112226f116fb8d941f14fc66246f0d395f0e44c90610494546f73 WHIRLPOOL f98cb605e1311792c6c9e5e03d2508cc05a10a94fc36feeb70c0b558f65861f743bdb1896da971dc93bac67638f69b8ac4a27ff7bfc9ef3c9c735c1f4ded81af
 AUX open-iscsi-2.0.872-ldflags.patch 309 SHA256 b8544087dfbc579209d326f825a251f6fc10898ca29ce46264d4a86ceac95941 SHA512 4204a615e10d52130a2fb39b81d99df45350b7f7431fa4e110e535ece2c1aab2cda0b8e787561a051c232a80f2cd99af007e94c1ca122727aac7854eee478219 WHIRLPOOL c8a6a6fad91680df09227a5ae29b2a9f7c172c0a9326e3d53ec5c16ae63fe733ab392949e777c5ca3a3c01d6a07d925f22a2dc82bbb53c3b76a7ed7b7e5010fd
 AUX open-iscsi-2.0.872-makefile-cleanup-pass2.patch 2134 SHA256 8725f8aba89f86c275f9a53bfb066d392b43e6ba5496c09bc2d9543453f45122 SHA512 ee1700c010578160f2fe3bb2f5a7eca4bde900faa138445eaf6b1875a7ad89d5c13b530d25a0ac5844213fa118b4e5253180414956d4e514dae0ede936dee2c8 WHIRLPOOL ef5377ca5d95e7ce12727dca3a3547e59b37c21772799e24be0cf6725e432502bcfd7156990be98405f0382793247d3edc3cba6e85fc45261ddaa2a797180679
@@ -22,6 +26,18 @@ EBUILD open-iscsi-2.0.871-r1.ebuild 2580 SHA256 c02b63d0e40f1db7fb1034fefcf1884e
 EBUILD open-iscsi-2.0.871.3.ebuild 2564 SHA256 47c655f1da09451d18812965074d8a164dc417064bef584738b964bf88e5ecf7 SHA512 ff233a51d5e04c38c1f4a63d2e44113da92dccb997d3da5cfe53be4b2e64abc10f7b207e2e44d523f6b2963d999163bc5699bf1e8fa200bb8298d320f371df06 WHIRLPOOL 1178e45eea30c98c5a36c665abdec75bc24710ad834df2c24aaa0b33458a45e72d14e23b6178ba7d8cc0cda9fb049aeeb20c2e8cc0d8e8b1cbec0023b28e52d9
 EBUILD open-iscsi-2.0.871.ebuild 3148 SHA256 851f68fa11c0dfd5a12f242825701ad2360e11ae9af02e0da65e453856ad4d03 SHA512 06d75f4ae74c675de7e71d21f15c876b2b8989d69ed8b3d63f58c5e29744a8900955910643c33f591f61f2ca3ae6463aa62d15216ac9a475181574998d22261f WHIRLPOOL c532ed919ca0863d73808648e057d322508cfed91021e22e6b71c33b37a3259576292aab87cfc2f77f8d01a916b3f197cca0a99a0ef4be5cdf1dd38586369484
 EBUILD open-iscsi-2.0.872-r1.ebuild 3132 SHA256 2779357bf561f91467d3d8cb3cfa22bfb89b2c9fbfc1b526b9e72b05f31621d1 SHA512 d15d6ff2f527146d60cef784c085191fc0fad221616e4aa1a79d661029a4f6461f622a7be8940d797d70ea0405c0e8da8a5dc17e4ed7942480c456f41ae9beb9 WHIRLPOOL b5a899f9fd1adbaaa833465492958a28804924ed607e43e98704826377b4fcae8b2cfca5d34710707e0fac3e09a586f29e594c7fce8537909e5b906c46bf11ba
+EBUILD open-iscsi-2.0.872-r2.ebuild 3141 SHA256 e592f528e9a12911246ab1a7b5712ddc5c96a8785bd8e975e74a4272ebeac780 SHA512 2d074b7620a2911eaa7444bdff2c7299816769ca14d3ff628948a971719f9a5a108aad82d0c289db8a37f0b836fc0cf5663a6fb2956b5f207bc01e6d8209dd5f WHIRLPOOL 127bcc4d52b66dfafd6832ce6159798d084c0181d91bb63acedaade7342fa4aa582c5f5ed2d0bb18bd2f278af2701529478cbcc0048925ee2c83a0a2d3d62a5c
 EBUILD open-iscsi-2.0.872.ebuild 3104 SHA256 fef94227d2ea4cfa5590e399cec850c070c82eb80dfa288d42d560ba71804de0 SHA512 4a01583d2f0c20b4b8e5913b35f7f3c3fda4dc9f23b495bab784e628fd6e41f98f4a76fadcb576c5d3dd37038711b1efd8159068977c44b41a794b049f173283 WHIRLPOOL 9ee40a6c8f7d474ea492a02f3357be4589feadb2b0475e5c61f6e705bd2c021a917f60916369ed3eae3f7b88d966674e256d509262d063090d5e5b739d865252
-MISC ChangeLog 10186 SHA256 a3992e827fb10b72c2ebf079dce707c20a0624af158487e8a54415d3d935bd67 SHA512 817d0782426e8ab2b1f8d630f53a488f88c7fae29a5996e8b43eb4c8de9b1f808da8178d21378328ca4de62cba560aedd1fc46c00e4cfc85baa8ade120d2e9c0 WHIRLPOOL 860b085ed5ada83c2005df7682d26f0f1bbf7ba8e33ce7956fea5322bee3fb753ef8a2f46ef32ce16cc7e13a62581743d9530a296490342b9b5fbd777a88ca5a
+MISC ChangeLog 10429 SHA256 1f9ee9b2cbb32d5e316e96d92437ce0a11734ef619064e4e9d8ac4436072b99b SHA512 e60a94b17c0460bea6b18bd3696550254e75118bb03e38497a773a3ab511234cbefdf7ad00ff8a65acd8a347ae57dd2621afa885cfe8ea01e58f45f44b113a49 WHIRLPOOL 2d42cbfb67d62867f562bdcb06c6647c593ba1d8417fb7fd2ab967ba8f0de7970fc3cea3ecc90c66dae1c9618573f83953d9d3ff62d2b99a9e09cd13900a5595
 MISC metadata.xml 302 SHA256 d518f6f4112e36f35164044266791dc4a7ef4a96750ed385d00094132ce3f741 SHA512 6b2081139fb894a7ca47f0e4f6aac5da71c31ec2e2b33cb7257e470cd576e13c770684ce71fe1584dfe460c252e90fb6159b245c82a3f9a2ebc47dad060375d7 WHIRLPOOL a2a2bd2d586aa3c10ba22b36ff958c8995f3ac2c6be1012aae194d0188b34be7257903626917acc20d68668fc13e9ef462ccb80141c53272f692ec2e92d321ae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJROGpEAAoJEEdUh39IaPFNNvEH/2eEnL4NAYUmixii0cHSfntZ
+J2gDMdNWzbO/xg/REO0dUW0CLM7zC2AMmLdfKATU2CbVuV5BcDv8bMIjGbEmggl/
++dEknHW3SguPW+GuDYvEQmrBBiLflEC7z05kOnxnb4qC7DJjSFbV0rbSUE9Wkzh/
+NBFLRcupYHB9kxoLB3yE/byie0ts1Ray31ctPdM2e65pNjSEHR8Y3zNZ1auyty6I
+Oeh3Zm8g+m+3UvyG8q5QNHK4B8d1vfBTgppWOQiChJsEgZoqF7qLsAjErmJ2koAZ
+tYv3rcQc2i7iE43O94ubleDzLsId2I3SayN3REFYiKHYzCqbVkv4Cg/JpC5J72Q=
+=qJmu
+-----END PGP SIGNATURE-----
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1 b/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1
new file mode 100644
index 000000000000..ec991687b59e
--- /dev/null
+++ b/sys-block/open-iscsi/files/open-iscsi-2.0.872-init.d-r1
@@ -0,0 +1,131 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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/open-iscsi-2.0.872-init.d-r1,v 1.1 2013/03/07 10:23:45 ssuominen Exp $
+
+opts="${opts} starttargets stoptargets restarttargets"
+
+depend() {
+	after modules
+	use net
+}
+
+PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid}
+BINARY="/usr/sbin/iscsid"
+
+checkconfig() {
+	if [ ! -e /etc/conf.d/${SVCNAME} ]; then
+		eerror "Config file /etc/conf.d/${SVCNAME} does not exist!"
+		return 1
+	fi
+	if [ ! -e "${CONFIG_FILE}" ]; then
+		eerror "Config file ${CONFIG_FILE} does not exist!"
+		return 1
+	fi
+	if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then
+		ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name."
+		IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi
+		IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g')
+		ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}"
+		echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}"
+		eend $?
+	fi
+}
+
+do_modules() {
+	msg="$1"
+	shift
+	modules="${1}"
+	shift
+	modopts="$@"
+	for m in ${modules}
+	do
+		if modprobe --show --quiet "${m}"
+		then
+			ebegin "${msg} ${m}"
+			modprobe ${modopts} ${m}
+			ret=$?
+			eend ${ret}
+			if [ ${ret} -ne 0 ]; then
+				return ${ret}
+			fi
+		else
+			ebegin "${msg} ${m}: not found"
+			return 1
+		fi
+	done
+	return 0
+}
+
+start() {
+	ebegin "Checking open-iSCSI configuration"
+	checkconfig
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eend 1
+		return 1
+	fi
+	ebegin "Loading iSCSI modules"
+	do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp'
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eend 1
+		return 1
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS}
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eend $?
+		return $?
+	fi
+
+	# Start automatic targets when iscsid is started
+	if [ "${AUTOSTARTTARGETS}" = "yes" ]; then
+		starttargets
+		ret=$?
+		if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then
+			stop
+			return $ret
+		fi
+	fi
+	return 0
+}
+	
+stop() {
+	stoptargets
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE}
+	eend $?
+
+	do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
+	eend $?
+}
+
+starttargets() {
+        ebegin "Setting up iSCSI targets"
+        /usr/sbin/iscsiadm -m node --loginall=automatic
+	ret=$?
+        eend $ret
+	return $ret
+}
+
+stoptargets() {
+        ebegin "Disconnecting iSCSI targets"
+        sync
+        /usr/sbin/iscsiadm -m node --logoutall=all
+	ret=$?
+        eend $ret
+	return $ret
+}
+
+restarttargets() {
+        stoptargets
+        starttargets
+}
+
+status() {
+	ebegin "Showing current active iSCSI sessions"
+	/usr/sbin/iscsiadm -m session
+}
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
new file mode 100644
index 000000000000..d8d12d7c10ee
--- /dev/null
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 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.872-r2.ebuild,v 1.1 2013/03/07 10:23:44 ssuominen Exp $
+
+EAPI=2
+inherit versionator linux-info eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+HOMEPAGE="http://www.open-iscsi.org/"
+MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
+SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug slp"
+DEPEND="slp? ( net-libs/openslp )"
+RDEPEND="${DEPEND}
+	sys-apps/util-linux"
+
+S="${WORKDIR}/${MY_PV}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is -lt 2 6 16; then
+		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
+	fi
+
+	# Needs to be done, as iscsid currently only starts, when having the iSCSI
+	# support loaded as module. Kernel builtion options don't work. See this for
+	# more information:
+	# http://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
+	# If there's a new release, check whether this is still valid!
+	CONFIG_CHECK_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+	fi
+}
+
+src_prepare() {
+	export EPATCH_OPTS="-d${S}"
+	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup.patch
+	epatch "${FILESDIR}"/${P}-glibc212.patch
+	epatch "${FILESDIR}"/${P}-dont-call-configure.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-isns-slp.patch
+	epatch "${FILESDIR}"/${PN}-2.0.872-makefile-cleanup-pass2.patch
+}
+
+src_configure() {
+	cd utils/open-isns || die
+	econf $(use_with slp)
+}
+
+src_compile() {
+	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
+
+	einfo "Building userspace"
+	local SLP_LIBS
+	use slp && SLP_LIBS="-lslp"
+	cd "${S}" && \
+	KSRC="${KV_DIR}" CFLAGS="" \
+	emake \
+		OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" \
+		AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		user \
+		|| die "emake failed"
+}
+
+src_install() {
+	einfo "Installing userspace"
+	dosbin usr/iscsid usr/iscsiadm usr/iscsistart || die
+
+	einfo "Installing utilities"
+	dosbin utils/iscsi-iname utils/iscsi_discovery || die
+
+	einfo "Installing docs"
+	doman doc/*[1-8] || die
+	dodoc README THANKS || die
+	docinto test || die
+	dodoc test/* || die
+
+	einfo "Installing configuration"
+	insinto /etc/iscsi
+	doins etc/iscsid.conf || die
+	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example || die
+	insinto /etc/iscsi/ifaces
+	doins etc/iface.example || die
+
+	newconfd "${FILESDIR}"/${P}-conf.d iscsid || die
+	newinitd "${FILESDIR}"/${P}-init.d-r1 iscsid || die
+
+	keepdir /var/db/iscsi
+	fperms 700 /var/db/iscsi || die
+	fperms 600 /etc/iscsi/iscsid.conf || die
+}
+
+pkg_postinst() {
+	in='/etc/iscsi/initiatorname.iscsi'
+	if [ ! -f "${ROOT}${in}" -a -f "${ROOT}${in}.example" ]; then
+		cp -f "${ROOT}${in}.example" "${ROOT}${in}"
+	fi
+}