Lock down perms on ietd.conf and initiation.allow/deny per security bug #198209.

Package-Manager: portage-2.1.3.16

4 files changed, 85 insertions, 5 deletions

diff --git a/sys-block/iscsitarget/ChangeLog b/sys-block/iscsitarget/ChangeLog
index f21c28848401..2ec67117d146 100644
--- a/sys-block/iscsitarget/ChangeLog
+++ b/sys-block/iscsitarget/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/iscsitarget
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.6 2007/05/28 07:50:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/ChangeLog,v 1.7 2007/11/06 00:42:29 robbat2 Exp $
+
+*iscsitarget-0.4.15-r1 (06 Nov 2007)
+
+  06 Nov 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +iscsitarget-0.4.15-r1.ebuild:
+  Lock down perms on ietd.conf and initiation.allow/deny per security bug
+  #198209.
 
 *iscsitarget-0.4.15 (28 May 2007)
 
diff --git a/sys-block/iscsitarget/Manifest b/sys-block/iscsitarget/Manifest
index 370523f3888b..d57f250bf9a9 100644
--- a/sys-block/iscsitarget/Manifest
+++ b/sys-block/iscsitarget/Manifest
@@ -30,14 +30,18 @@ EBUILD iscsitarget-0.4.14.ebuild 1801 RMD160 f0bfdf308e8d7f138da283ebd7052d66969
 MD5 95bb62858a440f4940ca7569d0be679b iscsitarget-0.4.14.ebuild 1801
 RMD160 f0bfdf308e8d7f138da283ebd7052d6696982ad7 iscsitarget-0.4.14.ebuild 1801
 SHA256 8430be6358ba71b399a4ba54e154ddf3d4d2dd97ae159403e1c5d7dd6cf3b8ef iscsitarget-0.4.14.ebuild 1801
+EBUILD iscsitarget-0.4.15-r1.ebuild 1933 RMD160 2ed73e6eb0e0f8e81c7e9926f5fb68eae3c9760b SHA1 62616c2270b6b777d1cde0cd0cc79a78fdcd86e7 SHA256 012caa667c1a7605ca1eaaf1e04081bfbab6342efabf8bb73ac4b3913080a125
+MD5 6cf737c4c4c2cacd2c5db36ebdf1cbf5 iscsitarget-0.4.15-r1.ebuild 1933
+RMD160 2ed73e6eb0e0f8e81c7e9926f5fb68eae3c9760b iscsitarget-0.4.15-r1.ebuild 1933
+SHA256 012caa667c1a7605ca1eaaf1e04081bfbab6342efabf8bb73ac4b3913080a125 iscsitarget-0.4.15-r1.ebuild 1933
 EBUILD iscsitarget-0.4.15.ebuild 1746 RMD160 89f74d4e956ef1134aa68edb2d896166dac6d981 SHA1 cea69312a860a82e9e36313e864581825cb0dff6 SHA256 68ca87e41c42b0047f9220254066709b53347bc8fa734a7db880fb8bb030eea1
 MD5 d67f4ef09bd2332e31fca9dd99a91d3d iscsitarget-0.4.15.ebuild 1746
 RMD160 89f74d4e956ef1134aa68edb2d896166dac6d981 iscsitarget-0.4.15.ebuild 1746
 SHA256 68ca87e41c42b0047f9220254066709b53347bc8fa734a7db880fb8bb030eea1 iscsitarget-0.4.15.ebuild 1746
-MISC ChangeLog 1339 RMD160 6846eac2282229eeec14d0c26df1df9ce6078cb6 SHA1 24f8679f5f0cce1b46628df3c0aea1d84e870d57 SHA256 33cd3367e2c476a9e75b1bb8f2309e0c89e9817a19943bf46b39c2c11f818096
-MD5 7d86ff9c3ce7f950a609feac694939a8 ChangeLog 1339
-RMD160 6846eac2282229eeec14d0c26df1df9ce6078cb6 ChangeLog 1339
-SHA256 33cd3367e2c476a9e75b1bb8f2309e0c89e9817a19943bf46b39c2c11f818096 ChangeLog 1339
+MISC ChangeLog 1549 RMD160 6cdfd0680b6476fba2d3f63828645964a5d5566c SHA1 b01eb1402427499b01287b7bd4c6aa71ffd1c938 SHA256 facdf9a5b4e5c1871962668e10baad4b5b0a5441bb6186c3878679e2b1708bbe
+MD5 83f6fbef21a1cc9f6ac520752e6e4b87 ChangeLog 1549
+RMD160 6cdfd0680b6476fba2d3f63828645964a5d5566c ChangeLog 1549
+SHA256 facdf9a5b4e5c1871962668e10baad4b5b0a5441bb6186c3878679e2b1708bbe ChangeLog 1549
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
@@ -54,3 +58,6 @@ SHA256 2083bd875ca0c5c1079abde61264663d641b677664366ee5fe60e9aacfc42e6a files/di
 MD5 cf74f2ee91b7ec8d6bcde71bc8f17423 files/digest-iscsitarget-0.4.15 256
 RMD160 9ceff4a4f7b3ce1cf0b1cf87d57c99a6a451d11b files/digest-iscsitarget-0.4.15 256
 SHA256 efe4931031e224fb43af044a9bd7eabd2141a9d7dd34b9f7bad73a4ddbe27a3b files/digest-iscsitarget-0.4.15 256
+MD5 cf74f2ee91b7ec8d6bcde71bc8f17423 files/digest-iscsitarget-0.4.15-r1 256
+RMD160 9ceff4a4f7b3ce1cf0b1cf87d57c99a6a451d11b files/digest-iscsitarget-0.4.15-r1 256
+SHA256 efe4931031e224fb43af044a9bd7eabd2141a9d7dd34b9f7bad73a4ddbe27a3b files/digest-iscsitarget-0.4.15-r1 256
diff --git a/sys-block/iscsitarget/files/digest-iscsitarget-0.4.15-r1 b/sys-block/iscsitarget/files/digest-iscsitarget-0.4.15-r1
new file mode 100644
index 000000000000..43fcafc237a8
--- /dev/null
+++ b/sys-block/iscsitarget/files/digest-iscsitarget-0.4.15-r1
@@ -0,0 +1,3 @@
+MD5 81390e388d87e3cc17383ef5f4322c28 iscsitarget-0.4.15.tar.gz 102922
+RMD160 d7d787f1fcbdb124d17eaaa62eaa47c21b6e5dd2 iscsitarget-0.4.15.tar.gz 102922
+SHA256 da8eb570f9abb6e50c515321747407e9945f5a83bab774c42ed41809234505cb iscsitarget-0.4.15.tar.gz 102922
diff --git a/sys-block/iscsitarget/iscsitarget-0.4.15-r1.ebuild b/sys-block/iscsitarget/iscsitarget-0.4.15-r1.ebuild
new file mode 100644
index 000000000000..e24d76bb5197
--- /dev/null
+++ b/sys-block/iscsitarget/iscsitarget-0.4.15-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsitarget/iscsitarget-0.4.15-r1.ebuild,v 1.1 2007/11/06 00:42:29 robbat2 Exp $
+
+inherit linux-mod eutils
+
+DESCRIPTION="Open Source iSCSI target with professional features"
+HOMEPAGE="http://iscsitarget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}
+		virtual/linux-sources"
+MODULE_NAMES="iscsi_trgt(kernel/iscsi:${S}/kernel)"
+CONFIG_CHECK="CRYPTO_CRC32C"
+ERROR_CFG="iscsitarget needs support for CRC32C in your kernel."
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S} -p0" \
+	epatch ${FILESDIR}/${PN}-0.4.13-usrbuildfix.patch
+	convert_to_m ${S}/Makefile
+}
+
+src_compile() {
+	einfo "Building userspace"
+	CFLAGS="" emake usr OPTFLAGS="${CFLAGS}" || die "failed to build userspace"
+
+	einfo "Building kernel modules"
+	unset ARCH
+	emake KSRC="${KERNEL_DIR}" kernel || die "failed to build module"
+}
+
+src_install() {
+	einfo "Installing userspace"
+	dosbin usr/ietd usr/ietadm || die "dosbin failed"
+	insinto /etc
+	doins etc/ietd.conf etc/initiators.{allow,deny} || die "doins failed"
+	# Upstream's provided Gentoo init script is out of date compared to
+	# their Debian init script. And isn't that nice.
+	#newinitd etc/initd/initd.gentoo ietd || die
+	newinitd ${FILESDIR}/ietd-init.d ietd || die "newinitd failed"
+	newconfd ${FILESDIR}/ietd-conf.d ietd || die "newconfd failed"
+	
+	# Lock down perms, per bug 198209
+	fperms 0640 /etc/ietd.conf /etc/initiators.{allow,deny}
+
+	doman doc/manpages/*.[1-9] || die "manpages failed"
+	dodoc ChangeLog README || die "docs failed"
+
+	einfo "Installing kernel module"
+	unset ARCH
+	linux-mod_src_install || die "modules failed"
+}
+
+pkg_postinst() {
+	chmod 0640 ${ROOT}/etc/ietd.conf ${ROOT}/etc/initiators.{allow,deny}
+}