Version bump, bug #159994. Fix init.d stop problem, bug #137016.

Package-Manager: portage-2.1.2.1-r1

5 files changed, 183 insertions, 15 deletions

diff --git a/sys-block/vblade/ChangeLog b/sys-block/vblade/ChangeLog
index 350e8e5a0b29..5ad4251fa303 100644
--- a/sys-block/vblade/ChangeLog
+++ b/sys-block/vblade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/vblade
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.12 2007/02/22 01:01:15 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.13 2007/03/07 19:49:54 robbat2 Exp $
+
+*vblade-14 (07 Mar 2007)
+
+  07 Mar 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/init.d-vblade.vblade0-14, +vblade-14.ebuild:
+  Version bump, bug #159994. Fix init.d stop problem, bug #137016.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 9d018f0ea451..b6976c47576a 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conf.d-vblade 929 RMD160 965d193ca4034302083552253b40f81bb46596d9 SHA1 a06f215ff55415995060eb0748f9f651d5aba4d9 SHA256 959b212244647776e04b1f28270b8a7fc2a6717326ee5b28e93af472f25dedcc
 MD5 34e059f8c29888d30558536919443b50 files/conf.d-vblade 929
 RMD160 965d193ca4034302083552253b40f81bb46596d9 files/conf.d-vblade 929
@@ -9,11 +6,16 @@ AUX init.d-vblade.vblade0 2716 RMD160 e4211e81d16b6283d366e3614c46926b3cb05767 S
 MD5 54dce6a59c4eb448e4f027da1b21ea88 files/init.d-vblade.vblade0 2716
 RMD160 e4211e81d16b6283d366e3614c46926b3cb05767 files/init.d-vblade.vblade0 2716
 SHA256 7e65a2fe4d1e3a4abfafb734176ee10664458b4c9871e293bed0bc8c56c301ff files/init.d-vblade.vblade0 2716
+AUX init.d-vblade.vblade0-14 2759 RMD160 846e99af68f55426acd2f269f496af015add9a4d SHA1 66aff27985df8e41e2ebb9e587570f3950e93e97 SHA256 ded292aa38a249cdee8a60366ee494ced0660d007340f97b398f18ba87947346
+MD5 74d800fc1e7e9bdde71cf038cf566997 files/init.d-vblade.vblade0-14 2759
+RMD160 846e99af68f55426acd2f269f496af015add9a4d files/init.d-vblade.vblade0-14 2759
+SHA256 ded292aa38a249cdee8a60366ee494ced0660d007340f97b398f18ba87947346 files/init.d-vblade.vblade0-14 2759
 AUX vbladed 650 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd SHA1 d240e8f607dd7e5eae22ec5ccd00b00b93410e3a SHA256 d6b7ca14e28c18bff20bf6d5fb37320c425b76ae042ae7cfd984e61e887caf41
 MD5 f29d83183c32e85e0579c7325959dbaa files/vbladed 650
 RMD160 559099c8cb727dbd4af8df236022ff4bd112fefd files/vbladed 650
 SHA256 d6b7ca14e28c18bff20bf6d5fb37320c425b76ae042ae7cfd984e61e887caf41 files/vbladed 650
 DIST vblade-10.tar.gz 16689 RMD160 1899c5dc6a86f8d610b91d1e13a55274e9fdc3e6 SHA1 06a0694e0786f91c68a2335a47e8a73e9adb86a3 SHA256 70fc9b0fb6c8be089a8a04e9861b8c496a38b1f66dae2fddb22a7fb312e68521
+DIST vblade-14.tgz 20317 RMD160 ad0fe6f0c4ab40fa31daa68c7b14143ad87f443c SHA1 57bea505f3acb88f03f761954eea0759a0241e3f SHA256 29374180e288293aa0206cbdfd8444fcc69c189946ec380959a85a35a3129253
 DIST vblade-6.tar.gz 42390 RMD160 44c6658e7cb00388c49169048d6ad5b4e2fb5821 SHA1 948886218cd9ee5db4fa0590bc91571673fa4fe2 SHA256 47a3ef812a293a57a25b3afa8d143ee24cbc7bca22f30b08b42b4b37df275f95
 DIST vblade-9.tar.gz 16475 RMD160 927879e477fcd661379885ac484967d4837fc696 SHA1 88d918002b8261ce0eb8a00913a8a30e9b52b1b4 SHA256 730103caf7fd6909684bedcd3f85acf609ce944126659215400848062215c2fe
 EBUILD vblade-10-r1.ebuild 1105 RMD160 b50cb4d4864fc1c0dda6db779c8f7d1cf658ed58 SHA1 e9a9c51c51bceab74e952fd410ae67c6ac470899 SHA256 30af1fd1d50ba7649ee6d72ba2af6489787d7d53931c49034b2196202bbe4458
@@ -28,6 +30,10 @@ EBUILD vblade-10.ebuild 1104 RMD160 e1c8801a6618c6a30a26d38f5055146ec2d7f6a1 SHA
 MD5 e499201cf14186f5a4a1b7a8e553426b vblade-10.ebuild 1104
 RMD160 e1c8801a6618c6a30a26d38f5055146ec2d7f6a1 vblade-10.ebuild 1104
 SHA256 ae1c3da9eba9a9a4301b38a4377b16cfe62dad565effd0dde99f072832d47b99 vblade-10.ebuild 1104
+EBUILD vblade-14.ebuild 1155 RMD160 cb34fe49ead387e7849ed91c63559e0c25c42889 SHA1 dd8b5a0067e4988631f31fd32c1f3c6d3eee68d1 SHA256 3c8545aa8383fcc4e354096815c28db0d9e1908a267b0f879a2191e52e0953f7
+MD5 4ff83febf0c203f53c0d4d2168ae197e vblade-14.ebuild 1155
+RMD160 cb34fe49ead387e7849ed91c63559e0c25c42889 vblade-14.ebuild 1155
+SHA256 3c8545aa8383fcc4e354096815c28db0d9e1908a267b0f879a2191e52e0953f7 vblade-14.ebuild 1155
 EBUILD vblade-6.ebuild 887 RMD160 1ad35bc90db9c3c7eb2fd1aa16f9eb76a0df0e9a SHA1 3b5b7bbf8254f0c8319375cc62be97c600a29b6b SHA256 a4e4d7cb90b4da009a6f6704fb601955530bd21a3886835f94e863c14c32b91a
 MD5 f54f560cb083660797da2e799afe4b90 vblade-6.ebuild 887
 RMD160 1ad35bc90db9c3c7eb2fd1aa16f9eb76a0df0e9a vblade-6.ebuild 887
@@ -36,10 +42,10 @@ EBUILD vblade-9.ebuild 893 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b SHA1
 MD5 9defea83f0fa58c0685f373de90ab120 vblade-9.ebuild 893
 RMD160 d93b7dc3098d9afd4a0577d04366e5072d014c5b vblade-9.ebuild 893
 SHA256 568601165b7728d8fe8bef7fb1ce2aea4cbd704d6c80505c843a25bc442b841c vblade-9.ebuild 893
-MISC ChangeLog 1870 RMD160 db2921841b43049e41bfc98b707e4c256f307734 SHA1 c9f64a7fd7ede643ba8e1c79460fb1a672f2cb0e SHA256 28a93a7195062df9b646dd25e80f400d78ef88293d1e0baed944f49ec7a6f46d
-MD5 d6a87bed271708622fa96786e3896d1b ChangeLog 1870
-RMD160 db2921841b43049e41bfc98b707e4c256f307734 ChangeLog 1870
-SHA256 28a93a7195062df9b646dd25e80f400d78ef88293d1e0baed944f49ec7a6f46d ChangeLog 1870
+MISC ChangeLog 2073 RMD160 b124555488d6b0c5458860339bd8f2e4d31f8c78 SHA1 4af1aee7d9cf3e7e2ba660575afd4eb5d386e536 SHA256 dadbc8c5c625da0c087e0dc411fe1100d4c077dbbd5f3359e093f955f9646031
+MD5 3eb9936a687d163e009846e685f7963e ChangeLog 2073
+RMD160 b124555488d6b0c5458860339bd8f2e4d31f8c78 ChangeLog 2073
+SHA256 dadbc8c5c625da0c087e0dc411fe1100d4c077dbbd5f3359e093f955f9646031 ChangeLog 2073
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
 MD5 c8bc5b7915619c3198683ce72b740321 metadata.xml 202
 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef metadata.xml 202
@@ -53,16 +59,12 @@ SHA256 ecb7b201fc5bef650a35fbd4c2579d6477840d15fada2d6149bad914d3e32aef files/di
 MD5 35cd2f92f8a6185c06f69a9ffc7cfcf2 files/digest-vblade-10-r2 226
 RMD160 ff7ab0686963fff9e78062967bfcd50810f46a46 files/digest-vblade-10-r2 226
 SHA256 ecb7b201fc5bef650a35fbd4c2579d6477840d15fada2d6149bad914d3e32aef files/digest-vblade-10-r2 226
+MD5 e87f84d1278b1cf41a9821731b047484 files/digest-vblade-14 217
+RMD160 4821f954f937ae47bba24036dea925bf763028b5 files/digest-vblade-14 217
+SHA256 08dbc2591bbd1baa7f242f04225d4c2cec2bc570e35f62c4e0ff0be6beb50464 files/digest-vblade-14 217
 MD5 b452d0c080298e9760c1eb20d10356cb files/digest-vblade-6 223
 RMD160 15fadb793c1c14bfce56ae5accd914c5e0586fa7 files/digest-vblade-6 223
 SHA256 35c36d74d13822dc05eefa73fd9e83ae89b55810b246ea9e8a93443668700e30 files/digest-vblade-6 223
 MD5 48d960dac31f023e65f6e7548dd70987 files/digest-vblade-9 223
 RMD160 50dd3272d4d91511049aa073a00dafcf06a79344 files/digest-vblade-9 223
 SHA256 63dcc1caa86cf668a0c4a801b194e7e596d47324426b36da16b37bfde33f60f0 files/digest-vblade-9 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3Orzz974XjDVpbkRAi8bAJ9y4FuSoDPUEd8Y+UdDRMaRXhoRHgCeIq0l
-+M1v2jycCK+UfPYUK3R45iY=
-=ENXs
------END PGP SIGNATURE-----
diff --git a/sys-block/vblade/files/digest-vblade-14 b/sys-block/vblade/files/digest-vblade-14
new file mode 100644
index 000000000000..1d306fb9616b
--- /dev/null
+++ b/sys-block/vblade/files/digest-vblade-14
@@ -0,0 +1,3 @@
+MD5 c5c7ed7b859d6d74575dd9facd82e2a1 vblade-14.tgz 20317
+RMD160 ad0fe6f0c4ab40fa31daa68c7b14143ad87f443c vblade-14.tgz 20317
+SHA256 29374180e288293aa0206cbdfd8444fcc69c189946ec380959a85a35a3129253 vblade-14.tgz 20317
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0-14 b/sys-block/vblade/files/init.d-vblade.vblade0-14
new file mode 100644
index 000000000000..dc22c9f17463
--- /dev/null
+++ b/sys-block/vblade/files/init.d-vblade.vblade0-14
@@ -0,0 +1,114 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0-14,v 1.1 2007/03/07 19:49:54 robbat2 Exp $
+
+opts="${opts} checkconfig"
+
+depend() {
+	need net
+}
+
+conf="$(add_suffix /etc/conf.d/vblade)"
+[[ -e "${conf}" ]] && source "${conf}"
+vblade_name="${myservice#*.}"
+vblade_conf_variable="config_${vblade_name}"
+vblade_conf="${!vblade_conf_variable}"
+pidfile="/var/run/vblade-${vblade_name}.pid"
+srvname="vblade.${vblade_name}"
+
+getconfig() {
+	tmp="${vblade_conf}"
+	shelf="${tmp/ *}"
+	tmp="${tmp#* }"
+	slot="${tmp/ *}"
+	tmp="${tmp#* }"
+	netif="${tmp/ *}"
+	tmp="${tmp#* }"
+	src="${tmp}"
+	export shelf slot netif src
+}
+
+
+checkconfig() {
+	if [ -z "${vblade_conf}" ]; then
+		eerror "vblade configuration not specified for ${vblade_name}"
+		return 1
+	fi
+	getconfig
+	
+	is_valid_numeric "${shelf}" 0
+	if [[ $? -ne 0 ]]; then
+		eerror "Shelf '${shelf}' is non-numeric or less than zero."
+		return 1
+	fi
+	is_valid_numeric "${slot}" 0 15
+	if [[ $? -ne 0 ]]; then
+		eerror "Slot '${slot}' is outside the valid range [0..15]."
+		return 1
+	fi
+
+	sysfs_base="/sys/class/net/"
+	procfs_base="/proc/sys/net/ipv4/conf/"
+	if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
+		eerror "Network interface '${netif}' does not exist"
+		return 1
+	fi
+	
+	if test ! \( -f "${src}" -o -b "${src}" \) ; then
+		eerror "Source '${src}' must be a file or block device"
+		return 1
+	fi
+	
+	if test ! \( -e "${src}" -a -r "${src}" \) ; then
+		eerror "Source '${src}' is not readable."
+		return 1
+	fi
+
+	return 0
+}
+
+is_valid_numeric() {
+	num="${1}"
+	min="${2}"
+	max="${3}"
+	# non-numeric
+	test "$num" -ge "0" 2>/dev/null
+	rc=$?
+	test "$rc" -eq 2 && return 2
+	# check for min
+	test -z "$min" && return 0
+	test "$num" -lt "$min" && return 1
+	# check for max
+	test -z "$max" && return 0
+	test "$num" -gt "$max" && return 1
+	# done
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+	getconfig
+	ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
+	export LOGTAG="${srvname}"
+	start-stop-daemon --start --quiet \
+	--pidfile ${pidfile} --background \
+	--make-pidfile --exec /usr/sbin/vbladed -- \
+	${shelf} ${slot} ${netif} "${src}" 
+	eend $?
+	
+	#${shelf} ${slot} ${netif} "${src}" 2>&1 | logger -t ${srvname} &
+}
+
+stop() {
+	ebegin "Stopping ${srvname}"
+	#start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	getconfig
+	ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vblade ${shelf} ${slot} ${netif} ${src}" | awk '{print $1}' | xargs kill
+	eend $?
+	
+	#start-stop-daemon --stop --quiet --exec /usr/sbin/vblade
+}
+
+# vim: ft=gentoo-init-d syntax=gentoo-init-d :
+# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/vblade-14.ebuild b/sys-block/vblade/vblade-14.ebuild
new file mode 100644
index 000000000000..592e3edf4e90
--- /dev/null
+++ b/sys-block/vblade/vblade-14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/vblade-14.ebuild,v 1.1 2007/03/07 19:49:54 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="vblade exports a block device using AoE"
+HOMEPAGE="http://sf.net/projects/aoetools/"
+#SRC_URI="mirror://sourceforge/aoetools/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+		sys-apps/util-linux"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# messy tarball
+	make clean  || die "Failed to clean up source"
+	sed -i 's,^CFLAGS.*,CFLAGS += -Wall,' makefile || die "Failed to clean up makefile"
+}
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	into /usr
+	doman vblade.8
+	dodoc HACKING NEWS README
+	dosbin vblade
+	dosbin ${FILESDIR}/vbladed
+	newconfd ${FILESDIR}/conf.d-vblade vblade
+	newinitd ${FILESDIR}/init.d-vblade.vblade0-14 vblade.vblade0
+}
+
+pkg_postinst() {
+	einfo "We do now include an init.d script, please look in your init.d and"
+	einfo "conf.d directories for it."
+}