condor bump

7 files changed, 296 insertions, 7 deletions

diff --git a/sys-cluster/condor/ChangeLog b/sys-cluster/condor/ChangeLog
index 053ebe863..1e9d9a827 100644
--- a/sys-cluster/condor/ChangeLog
+++ b/sys-cluster/condor/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sys-cluster/condor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*condor-7.4.1 (12 Feb 2010)
+
+  12 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> +condor-7.4.1.ebuild,
+  +files/condor-7.4.1-config_generic.patch, files/condor.confd,
+  files/condor.initd, files/condor_config.local:
+  Version bump. libvirt added as dependency, still need to check whether
+  absolutely necessary
+
 *condor-7.2.4 (17 Nov 2009)
 
   17 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> +condor-7.2.4.ebuild,
diff --git a/sys-cluster/condor/Manifest b/sys-cluster/condor/Manifest
index 202a116b3..f7f7c6f66 100644
--- a/sys-cluster/condor/Manifest
+++ b/sys-cluster/condor/Manifest
@@ -1,13 +1,16 @@
 AUX chkconfig_off.patch 527 RMD160 b6c9642ae765278fdd914645029a6704dd1e8192 SHA1 c7e2e3ca6142c533ee1a75d0746780e43f4554bc SHA256 91b11b7014bca63f49b4957b1bb5e6a6ac8d7287239e751c7267e514e1aefc9c
-AUX condor.confd 59 RMD160 b482fdcea52fecee4981da4471ea06f9a07d8f88 SHA1 7204559d1e3500a46ab29c762b250b424a30cd0e SHA256 6640576c5c0a0df4e34f03e21fe5b306a665f8fe1534aed6391038f83e238f9b
-AUX condor.initd 810 RMD160 e1670354dd5a4e3172a7647228b6ad85ae3fa269 SHA1 9f6882834f63b110b6131f18d5de118e11854429 SHA256 617b9811c9e869e6ba20d07e45d2deafeb94c0f007c72714b13211f11d84da7a
+AUX condor-7.4.1-config_generic.patch 5701 RMD160 1e84317614c08355c0abbf759e45c66b004b5d38 SHA1 cc43b2898f657c13db875cce286b4233be915a49 SHA256 2f6f6eeb6fe978522de78fc2051608a40143c379ce2f82e697d7567964d45948
+AUX condor.confd 60 RMD160 1eb8bb1baf2cf1aeee84e2e72fa3b067209bbcd8 SHA1 bfae712f55508aa05dafda8a84f1ccf6eb055872 SHA256 405b80eaf67c2c805b6308309f84a5183778565fa07321c668b56dd2d2c2b75d
+AUX condor.initd 860 RMD160 d6bb8130385ab573822a9e96e21818692a0097cc SHA1 541230aabfba254568d9ce29cb4118f31d3743dd SHA256 7ea89428455d143c792383dc7746f30ab436f6d7abb55c8f7813c859b54e1a03
 AUX condor_config.generic.patch 5718 RMD160 aad9328cb4bb70a4023552c1c791e7f92f0f6482 SHA1 51ab65af484af77c233cbc6da7b83b50b3b0ab19 SHA256 04a36f903747c49706bba0989042ceb8d97433a2390a7c63d83e7140df8ba4d8
-AUX condor_config.local 232 RMD160 7398f9630bd8e0a1389abf24ff25a9b0a48531ee SHA1 0cf3b3c33cc59a6959eac4c231b5c45ed17fc671 SHA256 3a920abf199c243d3da7dc3588eeb4035fbfd366f61081e400ec15ee216814a2
+AUX condor_config.local 273 RMD160 5aa8e9b62d57059667aac9f2c583cf3f2490b603 SHA1 d53d14ce4fb79510ae267ad6070f0bf6e42e0db1 SHA256 849985bc53bb39c464c55e30a8ae5b7d33e90b2ccee8337452b17bf87edc0b1f
 AUX log_lock_run.patch 1452 RMD160 21cc74a277b2ea4f56ff99e65fcba608245f8d67 SHA1 14066e1971e9db156c3cfe9bdb47d8473499d032 SHA256 82015f3dae3b766d4dced60f1b9c59508ae9600e633f006ec49d4a094945c097
 AUX no_basename.patch 1858 RMD160 0ea720d262e372c02f9610b2bbc7d80836f2945f SHA1 74f4123b4728c318f71c4288653b1d4b89d942a0 SHA256 52f675b584da24dee871611327757c33c020ba57b490d41d4bc2351ccb3729c8
 AUX no_rpmdb_query.patch 461 RMD160 65685df95ce1b359c76801d4dfcfafcaacc414d0 SHA1 2782c4da98717d1ce255897d95e7c9aca09ac662 SHA256 233c1c6c2a7395fca5d1f5286f4f6d211b2a1e82b8e9c1421484f0facfcf0391
 AUX stdsoap2.h.patch.patch 472 RMD160 51e951674d7e9ddfe78a3173033a0351121f788e SHA1 55b682271c31fbfb3d3f6aa892b38572e0b8f666 SHA256 8ab2d171b1a645f1dcccd1285763ed7115376bf2007a716ef89a3af488d19aaf
 DIST condor_src-7.2.4-all-all.tar.gz 22126988 RMD160 e497f42553cbf40097a968bd17ea3f35fbbebe7b SHA1 00d9a05cbc1a8f46ce9a61e5ae1393ae6c20e1ad SHA256 fecd8278bd820510be6e6ae5b4302d0f061a09133f4aa2c7e8e14ccf024fcf38
+DIST condor_src-7.4.1-all-all.tar.gz 21841893 RMD160 e3d8cf257e92eddd0bf19dae706f55055b10b6c8 SHA1 54832c7679f4c17790e40aeaf005856153f5878f SHA256 4236b3b7796d280a7989dabc69d5a20d88d6ac0b01c124aa7a2cad4f69e877da
 EBUILD condor-7.2.4.ebuild 3108 RMD160 6f446d0d6a364b4b0afe169056eb9670896439a7 SHA1 882f986bc096958ad657c696815733cee6c7b1de SHA256 358e82b111b2eeb0420f8ef91c5d7f5d2836722c436a138632528f80433e9bd5
-MISC ChangeLog 513 RMD160 5459fc21deb1eb96bb1c31608f07a898ba8bb72f SHA1 a9fd6fe69275136e5680dc11d9e97e99a1746774 SHA256 ec564b90695768aa48022276d60d15c3eee7e6a36fd07063e1a7066cf7149c6f
+EBUILD condor-7.4.1.ebuild 3129 RMD160 e88fadecf29b0f278ff613d27a62cbb618c6eba2 SHA1 8fe3f6fe0f82ec47cf0f25cbccd5cd8f05b19771 SHA256 e89d2902e89787012152d48923c8a4fd3644b2a564a3fbc17cdeb4a574e04836
+MISC ChangeLog 829 RMD160 9221024e544eee9ad07d77eb664e1b8b6098de25 SHA1 b666aacd60eef8c3deb302256a8b48c199d2718e SHA256 dbcad5b135b455ad9a96352136a668167f1859eefa356ed316dbacec6b603c70
 MISC metadata.xml 1247 RMD160 bcc91575dc0a5cc4ac255d5c0c415d0ade7c96c4 SHA1 a9a3ca65688dc4f32a01df1a5c329065fc7b37bf SHA256 87fdc2d2b126339048785a67fa126a184ffdf08a6bf6e6e29e78c62581ca1f0f
diff --git a/sys-cluster/condor/condor-7.4.1.ebuild b/sys-cluster/condor/condor-7.4.1.ebuild
new file mode 100644
index 000000000..f1d0c029f
--- /dev/null
+++ b/sys-cluster/condor/condor-7.4.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Workload management system for compute-intensive jobs"
+HOMEPAGE="http://www.cs.wisc.edu/condor/"
+SRC_URI="mirror://gentoo/${PN}_src-${PV}-all-all.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="classads drmaa examples gcb kbdd kerberos oracle
+	postgres soap ssl static"
+
+# is libvirt really necessary?
+CDEPEND="sys-libs/zlib
+	app-emulation/libvirt
+	dev-libs/libpcre
+	classads? ( sys-cluster/classads[pcre] )
+	gcb? ( net-firewall/gcb )
+	kerberos? ( app-crypt/mit-krb5 )
+	kbdd? ( x11-libs/libX11 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( virtual/postgresql-base )
+	soap? ( net-libs/gsoap )
+	ssl? ( dev-libs/openssl )"
+
+RDEPEND="${CDEPEND}
+	mail-client/mailx"
+
+DEPEND="${CDEPEND}
+	x11-misc/imake"
+
+RESTRICT=fetch
+
+pkg_setup() {
+	enewgroup condor
+	enewuser condor -1 "${ROOT}"bin/bash "${ROOT}var/lib/condor" condor
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-config_generic.patch
+}
+
+src_configure() {
+	# set USE_OLD_IMAKE to anything so condor_imake will use the system
+	# installed imake instead of building its own
+	export USE_OLD_IMAKE=YES
+	cd src
+	econf \
+		--with-buildid=Gentoo-${P} \
+		--enable-proper \
+		--disable-full-port \
+		--disable-gcc-version-check \
+		--disable-glibc-version-check \
+		--disable-rpm \
+		--without-zlib \
+		$(use_enable kbdd) \
+		$(use_enable postgres quill) \
+		$(use_enable static) \
+		$(use_with classads) \
+		$(use_with drmaa) \
+		$(use_with gcb) \
+		$(use_with kerberos krb5) \
+		$(use_with oracle oci) \
+		$(use_with postgres postgresql) \
+		$(use_with soap) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	cd src
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	cd src
+	emake release manpages || die "emake release failed"
+	if use static; then
+		emake static || die "emake static failed"
+	fi
+	cd release_dir
+	# binaries
+	dosbin sbin/* || die
+	dobin bin/* || die
+	# headers
+	insinto /usr
+	doins -r include || die
+	# libs
+	dolib.so lib/*so || die
+	use static && dolib.a lib/*a
+	insinto /usr/libexec/condor
+	doins -r libexec/* || die
+
+	# config files
+	insinto /etc/condor
+	cp etc/examples/condor_config.generic etc/condor_config
+	doins -r etc/* || die
+
+	# data files
+	insinto /usr/share/${PN}
+	doins lib/*.jar lib/*.class lib/*.pm || die
+	use postgres && doins -r sql
+
+	# doc and examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r etc/examples || die
+	fi
+
+	dodir /var/lib/condor
+	dodir /var/log/condor
+	dodir /var/run/condor
+	dodir /var/lock/condor
+
+	fperms 750 /var/lib/condor /var/log/condor
+	fperms 755 /var/run/condor
+	fperms 0775 /var/lock/condor
+	fowners condor:condor /var/lib/condor /var/log/condor /var/run/condor
+
+	insinto /var/lib/condor
+	doins "${FILESDIR}"/condor_config.local || die
+
+	newconfd "${FILESDIR}"/condor.confd condor || die
+	newinitd "${FILESDIR}"/condor.initd condor || die
+}
+
+pkg_postinst() {
+	elog "The condor ebuild is still under development."
+	elog "Help us improve the ebuild in:"
+	elog "http://bugs.gentoo.org/show_bug.cgi?id=60281"
+}
diff --git a/sys-cluster/condor/files/condor-7.4.1-config_generic.patch b/sys-cluster/condor/files/condor-7.4.1-config_generic.patch
new file mode 100644
index 000000000..d0d4f111d
--- /dev/null
+++ b/sys-cluster/condor/files/condor-7.4.1-config_generic.patch
@@ -0,0 +1,133 @@
+diff -Nur condor-7.4.1.orig/src/condor_examples/condor_config.generic condor-7.4.1/src/condor_examples/condor_config.generic
+--- condor-7.4.1.orig/src/condor_examples/condor_config.generic	2010-02-03 15:30:43.000000000 -0800
++++ condor-7.4.1/src/condor_examples/condor_config.generic	2010-02-03 15:35:30.000000000 -0800
+@@ -1,15 +1,35 @@
+ ######################################################################
++######################################################################
++##                                                                  ##
++##  N O T I C E:                                                    ##
++##                                                                  ##
++##       Customization of this file should be done via the          ##
++##       LOCAL_CONFIG_FILE.                                         ##
++##                                                                  ##
++######################################################################
++######################################################################
++
++
++######################################################################
+ ##
+ ##  condor_config
+ ##
+ ##  This is the global configuration file for condor.  Any settings
+-##  made here may potentially be overridden in the local configuration
+-##  file.  KEEP THAT IN MIND!  To double-check that a variable is
+-##  getting set from the configuration file that you expect, use
+-##  condor_config_val -v <variable name>
++##  found here * * s h o u l d   b e   c u s t o m i z e d   i n
++##  t h e   l o c a l   c o n f i g u r a t i o n   f i l e. * *
++##
++##  The local configuration file is specified by LOCAL_CONFIG_FILE
++##  below.
++##
++##  For a basic configuration, you may only want to start by
++##  customizing CONDOR_ADMIN.
++##
++##  Note: To double-check where a configuration variable is set from
++##  you can use condor_config_val -v <variable name>,
++##  e.g. condor_config_val -v CONDOR_ADMIN.
+ ##
+ ##  The file is divided into four main parts:
+-##  Part 1:  Settings you MUST customize 
++##  Part 1:  Settings you likely want to customize 
+ ##  Part 2:  Settings you may want to customize
+ ##  Part 3:  Settings that control the policy of when condor will
+ ##           start and stop jobs on your machines
+@@ -42,18 +62,15 @@
+ ##  #        #    #  #   #      #              #
+ ##  #        #    #  #    #     #            #####
+ ##
+-##  Part 1:  Settings you must customize:
++##  Part 1:  Settings you likely want to customize:
+ ######################################################################
+ ######################################################################
+ 
+-##  What machine is your central manager?
+-CONDOR_HOST	= central-manager-hostname.your.domain
+-
+ ##--------------------------------------------------------------------
+ ##  Pathnames:
+ ##--------------------------------------------------------------------
+ ##  Where have you installed the bin, sbin and lib condor directories?   
+-RELEASE_DIR		= /usr/local/condor
++RELEASE_DIR		= /usr
+ 
+ ##  Where is the local condor directory for each host?  
+ ##  This is where the local config file(s), logs and
+@@ -79,7 +96,7 @@
+ 
+ ##  Full path to a mail delivery program that understands that "-s"
+ ##  means you want to specify a subject:
+-MAIL			= /usr/bin/mail
++MAIL			= /bin/mail
+ 
+ ##--------------------------------------------------------------------
+ ##  Network domain parameters:
+@@ -88,13 +105,13 @@
+ ##  machines don't share a common UID space, set it to 
+ ##  UID_DOMAIN = $(FULL_HOSTNAME)
+ ##  to specify that each machine has its own UID space.
+-UID_DOMAIN		= your.domain
++UID_DOMAIN		= $(FULL_HOSTNAME)
+ 
+ ##  Internet domain of machines sharing a common file system.
+ ##  If your machines don't use a network file system, set it to
+ ##  FILESYSTEM_DOMAIN = $(FULL_HOSTNAME)
+ ##  to specify that each machine has its own file system. 
+-FILESYSTEM_DOMAIN	= your.domain
++FILESYSTEM_DOMAIN	= $(FULL_HOSTNAME)
+ 
+ ##  This macro is used to specify a short description of your pool. 
+ ##  It should be about 20 characters long. For example, the name of 
+@@ -214,7 +231,7 @@
+ ##  but note that this will allow anyone to submit jobs or add
+ ##  machines to your pool and is a serious security risk.
+ 
+-ALLOW_WRITE = YOU_MUST_CHANGE_THIS_INVALID_CONDOR_CONFIGURATION_VALUE
++ALLOW_WRITE = $(FULL_HOSTNAME)
+ #ALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
+ #DENY_WRITE = bad-machine.your.domain
+ 
+@@ -911,9 +928,10 @@
+ EXECUTE		= $(LOCAL_DIR)/execute
+ BIN		= $(RELEASE_DIR)/bin
+ LIB		= $(RELEASE_DIR)/lib
+-INCLUDE		= $(RELEASE_DIR)/include
++INCLUDE		= $(RELEASE_DIR)/include/condor
+ SBIN		= $(RELEASE_DIR)/sbin
+-LIBEXEC		= $(RELEASE_DIR)/libexec
++LIBEXEC		= $(RELEASE_DIR)/libexec/condor
++SHARE		= $(RELEASE_DIR)/share/condor
+ 
+ ## If you leave HISTORY undefined (comment it out), no history file
+ ## will be created. 
+@@ -1699,7 +1717,7 @@
+ ## them here.  However, do not remove the existing entries, as Condor
+ ## needs them.
+ 
+-JAVA_CLASSPATH_DEFAULT = $(LIB) $(LIB)/scimark2lib.jar .
++JAVA_CLASSPATH_DEFAULT = $(SHARE) $(SHARE)/scimark2lib.jar .
+ 
+ ##  JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
+ ##  used to introduce a new classpath:
+diff -Nur condor-7.4.1.orig/src/condor_examples/customize condor-7.4.1/src/condor_examples/customize
+--- condor-7.4.1.orig/src/condor_examples/customize	2010-02-03 15:30:43.000000000 -0800
++++ condor-7.4.1/src/condor_examples/customize	2010-02-03 15:31:23.000000000 -0800
+@@ -52,7 +52,7 @@
+     $_ = $os;
+   SWITCH: {
+       if(/^Linux/) { 
+-	  $mail_path="/usr/bin/mail";
++	  $mail_path="/bin/mail";
+ 	  $ps_path="/bin/ps auwx";
+ 	  $console_devs="mouse, console";
+ 	  last SWITCH;
diff --git a/sys-cluster/condor/files/condor.confd b/sys-cluster/condor/files/condor.confd
index 16b46f179..50dd11611 100644
--- a/sys-cluster/condor/files/condor.confd
+++ b/sys-cluster/condor/files/condor.confd
@@ -1,2 +1,2 @@
 CONDOR_CENTRAL_MANAGER=canfarpool.canfar.vpn
-CONDOR_OPT=""
+CONDOR_OPTS=""
diff --git a/sys-cluster/condor/files/condor.initd b/sys-cluster/condor/files/condor.initd
index d3cf8a542..479b68fe2 100644
--- a/sys-cluster/condor/files/condor.initd
+++ b/sys-cluster/condor/files/condor.initd
@@ -5,6 +5,13 @@
 
 CONDOR_USER=condor
 
+node_configure() {
+    condor_configure \
+	--type=execute \
+	--central-manager=${CONDOR_CENTRAL_MANAGER} \
+	--owner=${CONDOR_USER}
+}
+
 depend() {
     need net
     use logger
@@ -12,7 +19,7 @@ depend() {
 
 start() {
     ebegin "Starting condor"
-    condor_configure --type=execute --central-manager=${CONDOR_CENTRAL_MANAGER} --owner ${CONDOR_USER}
+    node_configure
     pid=$(start-stop-daemon --start --quiet --user ${CONDOR_USER} \
 	--pidfile /var/run/condor.pid \
 	--exec /usr/sbin/condor_master -- ${CONDOR_OPTS})
diff --git a/sys-cluster/condor/files/condor_config.local b/sys-cluster/condor/files/condor_config.local
index 8979b6e1c..cada046bd 100644
--- a/sys-cluster/condor/files/condor_config.local
+++ b/sys-cluster/condor/files/condor_config.local
@@ -3,7 +3,9 @@ CONDOR_HOST = $(FULL_HOSTNAME)
 COLLECTOR_NAME = Personal Condor
 START = TRUE
 SUSPEND = FALSE
+CONTINUE =  TRUE
 PREEMPT = FALSE
 KILL = FALSE
 DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
 NEGOTIATOR_INTERVAL = 20
+TRUST_UID_DOMAIN = TRUE