Bump to latest. This includes the security fix mistakenly thought to be included in 2.1.2, as well as a fair number of other fixes.

Package-Manager: portage-2.1.2_rc2

4 files changed, 169 insertions, 5 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index de75d2b7e3c0..a542214d1b8d 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.39 2006/11/15 12:41:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.40 2006/11/23 07:05:57 dberkholz Exp $
+
+*torque-2.1.6 (23 Nov 2006)
+
+  23 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; +torque-2.1.6.ebuild:
+  Bump to latest. This includes the security fix mistakenly thought to be
+  included in 2.1.2, as well as a fair number of other fixes.
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> torque-2.1.2-r2.ebuild:
   Stable on ppc64; bug #152104
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 0b02f1476139..ecf73d2db0ed 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -28,6 +28,7 @@ DIST torque-1.2.0p5-jobdepterm2.patch 1421 RMD160 0943489a76e8836c1292cc8f4c723d
 DIST torque-1.2.0p5-jobnanny.patch 8853 RMD160 869efc5c67983406c6ae611ad5f083c74beb5858 SHA1 074b14a1d139e81d420e9256ca3f4d8f526e76e8 SHA256 017d20a888e7198542cec28f183c6c0e3b09351d07a0f27ed6836f6840dcaa92
 DIST torque-1.2.0p5.tar.gz 2322590 RMD160 ac27ad6ca4dff3b10060db6e5599a1403ec28c65 SHA1 36102d2dbdc671e544c8d23119400a2ae9a188ef SHA256 13f416c3d32f0dd679b92bbbd9dbdf2b2567a5c85eb9e5385331d066b091e02d
 DIST torque-2.1.2.tar.gz 2686724 RMD160 7ba5cf4b4655d6e77c705be30c539380ca5863c1 SHA1 9f8b011e9500bc7a4d90576866939d1f7c3d864d SHA256 c7bade897fc12f27f128e4081c8ed1f3137bf42684ca239c48b18eb01314710a
+DIST torque-2.1.6.tar.gz 2708793 RMD160 6802c2d49a36624d34fce7b96b29551da3ff1106 SHA1 f0437e3f429c5cecb44a7f991f2b7bd58baa7a0a SHA256 e5ac494859df9951ca34149ae56b93fbfc83d7d4ba015bc8b67514b190e51c36
 EBUILD torque-1.2.0_p5-r1.ebuild 4860 RMD160 85624c05b54a745af02c9615cb1a389fae2b6f43 SHA1 ba08ab7abfddbb934cd378d2691b3fb38c9b52f6 SHA256 8ce42f7b709ae88df73608bec2ec6ee6b56bfcdd2901518c58a381051386d90c
 MD5 0c6169a3a4403e5e059934422fc0aa4c torque-1.2.0_p5-r1.ebuild 4860
 RMD160 85624c05b54a745af02c9615cb1a389fae2b6f43 torque-1.2.0_p5-r1.ebuild 4860
@@ -44,10 +45,14 @@ EBUILD torque-2.1.2-r2.ebuild 4108 RMD160 ac64559750e4c5a93221adac3eec7aab7ebe2c
 MD5 64643eda931d31f0d0fcf14fd0228dcc torque-2.1.2-r2.ebuild 4108
 RMD160 ac64559750e4c5a93221adac3eec7aab7ebe2c7b torque-2.1.2-r2.ebuild 4108
 SHA256 0b3f8171fb44910d6ada2934a26803d0f3837e4f662e2436e789dde415b56a85 torque-2.1.2-r2.ebuild 4108
-MISC ChangeLog 7459 RMD160 f662feb9380a18147dda8c3b4e1de3faa880220e SHA1 020a5c9671259dc23835d4b27b7e724eb6f1f001 SHA256 32da34ab9f9d62e69fd99f7ef624cc5dd526d69ada0850eb835e4c07755d2e79
-MD5 1712018f9fce61e59360695c92ffd132 ChangeLog 7459
-RMD160 f662feb9380a18147dda8c3b4e1de3faa880220e ChangeLog 7459
-SHA256 32da34ab9f9d62e69fd99f7ef624cc5dd526d69ada0850eb835e4c07755d2e79 ChangeLog 7459
+EBUILD torque-2.1.6.ebuild 4007 RMD160 f193120f32ab92f28abf9249f4ed32ff8833e69b SHA1 5adba5af1c7d5b50ad34f8839b1e34930f8ff7df SHA256 40bc8c4daff5ed2a6e3f33c41ee11705f5c1e145f957cb38337f482a6e7f5599
+MD5 59e4679f6690ca39936fc5c7d0d1fb68 torque-2.1.6.ebuild 4007
+RMD160 f193120f32ab92f28abf9249f4ed32ff8833e69b torque-2.1.6.ebuild 4007
+SHA256 40bc8c4daff5ed2a6e3f33c41ee11705f5c1e145f957cb38337f482a6e7f5599 torque-2.1.6.ebuild 4007
+MISC ChangeLog 7704 RMD160 60fb8d41845e703a741c5d6e2e479c615c91fc41 SHA1 c13418d07270aaeeddf8efbddd4fa9414a98f581 SHA256 48bc61642b4f1a79e933e8c69b144d99857d2d568c7baea788f6f487d3220842
+MD5 3eb23ef0dc632012e5dacc77c73a319f ChangeLog 7704
+RMD160 60fb8d41845e703a741c5d6e2e479c615c91fc41 ChangeLog 7704
+SHA256 48bc61642b4f1a79e933e8c69b144d99857d2d568c7baea788f6f487d3220842 ChangeLog 7704
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
@@ -64,3 +69,6 @@ SHA256 6b0a8e9fd78aa9b11935faff694c105b1cd65af0a1aaabf2981d712879d4e060 files/di
 MD5 d53296cdc58c020b280c7c1d41f60b01 files/digest-torque-2.1.2-r2 241
 RMD160 9c81b5aaae697d1e5a7185e75dca97f462a13e6c files/digest-torque-2.1.2-r2 241
 SHA256 6b0a8e9fd78aa9b11935faff694c105b1cd65af0a1aaabf2981d712879d4e060 files/digest-torque-2.1.2-r2 241
+MD5 3c33bcf081b50bf7efa5dd992d1b947c files/digest-torque-2.1.6 241
+RMD160 0db8600cc3dbef7d823a6c0540c398708c020d25 files/digest-torque-2.1.6 241
+SHA256 7d85354409634f1309ef89efd5812168bf83c7e3308a5de2fbc8a498677708f3 files/digest-torque-2.1.6 241
diff --git a/sys-cluster/torque/files/digest-torque-2.1.6 b/sys-cluster/torque/files/digest-torque-2.1.6
new file mode 100644
index 000000000000..4669bcaaf668
--- /dev/null
+++ b/sys-cluster/torque/files/digest-torque-2.1.6
@@ -0,0 +1,3 @@
+MD5 abfeb1a3a5aa53f725f975c2b5d98e1e torque-2.1.6.tar.gz 2708793
+RMD160 6802c2d49a36624d34fce7b96b29551da3ff1106 torque-2.1.6.tar.gz 2708793
+SHA256 e5ac494859df9951ca34149ae56b93fbfc83d7d4ba015bc8b67514b190e51c36 torque-2.1.6.tar.gz 2708793
diff --git a/sys-cluster/torque/torque-2.1.6.ebuild b/sys-cluster/torque/torque-2.1.6.ebuild
new file mode 100644
index 000000000000..aa9b25b3dc05
--- /dev/null
+++ b/sys-cluster/torque/torque-2.1.6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-2.1.6.ebuild,v 1.1 2006/11/23 07:05:57 dberkholz Exp $
+
+
+inherit autotools flag-o-matic eutils
+
+MY_P="${P/_}"
+DESCRIPTION="Resource manager and queuing system based on OpenPBS"
+HOMEPAGE="http://www.clusterresources.com/products/torque/"
+SRC_URI="http://www.clusterresources.com/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="openpbs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="tk crypt server"
+PROVIDE="virtual/pbs"
+
+# ed is used by makedepend-sh
+DEPEND_COMMON="virtual/libc
+	sys-libs/ncurses
+	sys-libs/readline
+	tk? ( dev-lang/tk )
+	!virtual/pbs"
+
+DEPEND="${DEPEND_COMMON}
+	sys-apps/ed"
+
+RDEPEND="${DEPEND_COMMON}
+	crypt? ( net-misc/openssh )
+	!crypt? ( net-misc/netkit-rsh )"
+
+PDEPEND=">=sys-cluster/openpbs-common-1.1.1"
+
+S="${WORKDIR}/${MY_P}"
+
+SPOOL_LOCATION="/var/spool" # this needs to move to /var later on
+PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/"
+
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch ${FILESDIR}/${PN}-setuid-safety.patch
+}
+
+
+
+src_compile() {
+
+	local myconf
+	if use server; then
+		myconf="--enable-server  --with-default-server=$(hostname)"
+	elif [[ -n ${PBS_SERVER_NAME} ]]; then
+		myconf="--disable-server --with-default-server=${PBS_SERVER_NAME}"
+	else
+		myconf="--disable-server --with-default-server=$(hostname)"
+	fi
+
+	if use crypt; then
+		myconf="${myconf} --with-rcp=scp"
+	else
+		myconf="${myconf} --with-rcp=mom_rcp"
+	fi
+
+	econf \
+		$(use_enable tk gui) \
+		--libdir="\${exec_prefix}/$(get_libdir)/pbs/lib" \
+		--with-server-home=${PBS_SERVER_HOME} \
+		--with-environ=/etc/pbs_environment \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+# WARNING
+# OpenPBS is extremely stubborn about directory permissions. Sometimes it will
+# just fall over with the error message, but in some spots it will just ignore
+# you and fail strangely. Likewise it also barfs on our .keep files!
+pbs_createspool() {
+	local root="$1"
+	local s="${SPOOL_LOCATION}"
+	local h="${PBS_SERVER_HOME}"
+	local sp="${h}/server_priv"
+	einfo "Building spool directory under ${D}${h}"
+	local a d m
+	for a in \
+			0755:${s} 0755:${h} 0755:${h}/aux 0700:${h}/checkpoint \
+			0755:${h}/mom_logs 0751:${h}/mom_priv 0751:${h}/mom_priv/jobs \
+			0755:${h}/sched_logs 0750:${h}/sched_priv \
+			0755:${h}/server_logs \
+			0750:${h}/server_priv 0755:${h}/server_priv/accounting \
+			0750:${h}/server_priv/acl_groups 0750:${h}/server_priv/acl_hosts \
+			0750:${h}/server_priv/acl_svr 0750:${h}/server_priv/acl_users \
+			0750:${h}/server_priv/jobs 0750:${h}/server_priv/queues \
+			1777:${h}/spool 1777:${h}/undelivered ;
+	do
+		d="${a/*:}"
+		m="${a/:*}"
+		if [[ ! -d "${root}${d}" ]]; then
+			install -d -m${m} "${root}${d}"
+		else
+			chmod ${m} "${root}${d}"
+		fi
+		# (#149226) If we're running in src_*, then keepdir
+		if [[ ${root} = ${D} ]]; then
+			keepdir ${d}
+		fi
+	done
+}
+
+src_install() {
+	# Make directories first
+	pbs_createspool "${D}"
+
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc CHANGELOG DEVELOPMENT README.* Release_Notes doc/admin_guide.ps
+
+	# this file MUST exist for PBS/Torque to work
+	# but try to preserve any customatizations that the user has made
+	dodir /etc
+	if [[ -f "${ROOT}etc/pbs_environment" ]]; then
+		cp "${ROOT}etc/pbs_environment" "${D}"/etc/pbs_environment
+	else
+		touch "${D}"/etc/pbs_environment
+	fi
+
+	if [ -f "${ROOT}var/spool/PBS/server_name" ]; then
+		cp "${ROOT}var/spool/PBS/server_name" "${D}/var/spool/PBS/server_name"
+	fi
+
+	# The build script isn't alternative install location friendly,
+	# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
+	for file in `find "${D}" -iname tclIndex`; do
+		sed -e "s/${D//\// }/ /" "${file}" > "${file}.new"
+		mv "${file}.new" "${file}"
+	done
+}
+
+pkg_postinst() {
+	# make sure the directories exist
+	pbs_createspool "${ROOT}"
+	[ ! -f "${ROOT}etc/pbs_environment" ] && \
+		touch "${ROOT}etc/pbs_environment"
+}