diff options
-rw-r--r-- | sys-cluster/torque/ChangeLog | 13 | ||||
-rw-r--r-- | sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch | 20 | ||||
-rw-r--r-- | sys-cluster/torque/files/2.1.2-skip-dotnames.patch | 15 | ||||
-rw-r--r-- | sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 | 15 | ||||
-rw-r--r-- | sys-cluster/torque/files/digest-torque-1.2.0_p5-r2 | 15 | ||||
-rw-r--r-- | sys-cluster/torque/files/digest-torque-2.1.2-r1 | 3 | ||||
-rw-r--r-- | sys-cluster/torque/files/digest-torque-2.1.2-r2 | 3 | ||||
-rw-r--r-- | sys-cluster/torque/files/pbs.rc | 88 | ||||
-rw-r--r-- | sys-cluster/torque/files/torque-1.2.0_p5-destdir-fixes.patch | 11 | ||||
-rw-r--r-- | sys-cluster/torque/files/torque-1.2.0_p5-setuid-safety.patch | 22 | ||||
-rw-r--r-- | sys-cluster/torque/torque-1.2.0_p5-r1.ebuild | 143 | ||||
-rw-r--r-- | sys-cluster/torque/torque-1.2.0_p5-r2.ebuild | 144 | ||||
-rw-r--r-- | sys-cluster/torque/torque-2.1.2-r1.ebuild | 147 | ||||
-rw-r--r-- | sys-cluster/torque/torque-2.1.2-r2.ebuild | 149 |
14 files changed, 11 insertions, 777 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index 03f5f105580c..f385ce72ae38 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,15 @@ # 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.42 2006/11/24 07:14:56 opfer Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.43 2007/01/28 21:02:17 dberkholz Exp $ + + 28 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; + -files/torque-1.2.0_p5-destdir-fixes.patch, + -files/2.1.2-queue-recov-freemem-fix.patch, + -files/torque-1.2.0_p5-setuid-safety.patch, + -files/2.1.2-skip-dotnames.patch, -files/pbs.rc, + -torque-1.2.0_p5-r1.ebuild, -torque-1.2.0_p5-r2.ebuild, + -torque-2.1.2-r1.ebuild, -torque-2.1.2-r2.ebuild: + (164192) Clean out vulnerable ebuilds. 24 Nov 2006; Christian Faulhammer <opfer@gentoo.org> torque-2.1.6.ebuild: stable x86, security bug #152104 diff --git a/sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch b/sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch deleted file mode 100644 index b4c26938be6c..000000000000 --- a/sys-cluster/torque/files/2.1.2-queue-recov-freemem-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/server/queue_recov.c 2006-07-27 18:53:53.000000000 -0400 -+++ src/server/queue_recov.c 2006-09-27 13:34:33.000000000 -0400 -@@ -257,7 +257,7 @@ - { - log_err(errno,"que_recov","open error"); - -- free((char *)pq); -+ que_free(pq); /* free((char *)pq); */ - - return(NULL); - } -@@ -267,7 +267,7 @@ - if (read(fds, (char *)&pq->qu_qs, sizeof(struct queuefix)) != - sizeof(struct queuefix)) { - log_err(errno, "que_recov", "read error"); -- free((char *)pq); -+ que_free(pq); /* free((char *)pq); */ - (void)close(fds); - return ((pbs_queue *)0); - } diff --git a/sys-cluster/torque/files/2.1.2-skip-dotnames.patch b/sys-cluster/torque/files/2.1.2-skip-dotnames.patch deleted file mode 100644 index f1d391582643..000000000000 --- a/sys-cluster/torque/files/2.1.2-skip-dotnames.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/server/pbsd_init.c (revision 1016) -+++ src/server/pbsd_init.c (working copy) -@@ -1415,6 +1415,11 @@ - { - struct stat sb; - -+ if (*filename == '.') -+ { -+ return(-1); -+ } -+ - if (stat(filename,&sb) == -1) - { - return(errno); - diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 deleted file mode 100644 index 0068b2388775..000000000000 --- a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 +++ /dev/null @@ -1,15 +0,0 @@ -MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456 -RMD160 c9390a8d4d618ed9d64513a2e93335b9e091af64 torque-1.2.0_p1-respect-destdir.patch.gz 3456 -SHA256 10b6e7c6c15d3f925695dc014573f7af3ec9a5c44a05d6f7c7f6bc0a5d70c752 torque-1.2.0_p1-respect-destdir.patch.gz 3456 -MD5 a1b825dcf759b97ca78cd5a00d5ecbf0 torque-1.2.0_p1-respect-ldflags.patch.gz 717 -RMD160 4a1b622178a925ae938394c16f1cd7e8b0c4c372 torque-1.2.0_p1-respect-ldflags.patch.gz 717 -SHA256 922cbe1e693d75c0eaa0278a4462882629587948a4d3cb708404ca71915ebecb torque-1.2.0_p1-respect-ldflags.patch.gz 717 -MD5 0f24a10ecabc81d458b0ff82c7e36c52 torque-1.2.0p5-jobdepterm2.patch 1421 -RMD160 0943489a76e8836c1292cc8f4c723d3e9ba1f7db torque-1.2.0p5-jobdepterm2.patch 1421 -SHA256 7cf91b5c2ef2db737b7cbbdfcf3d2cef25aed40839cb5809173cfa5430ad444c torque-1.2.0p5-jobdepterm2.patch 1421 -MD5 e55ec294bb0af1fb9b1f7ebe2571f02d torque-1.2.0p5-jobnanny.patch 8853 -RMD160 869efc5c67983406c6ae611ad5f083c74beb5858 torque-1.2.0p5-jobnanny.patch 8853 -SHA256 017d20a888e7198542cec28f183c6c0e3b09351d07a0f27ed6836f6840dcaa92 torque-1.2.0p5-jobnanny.patch 8853 -MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590 -RMD160 ac27ad6ca4dff3b10060db6e5599a1403ec28c65 torque-1.2.0p5.tar.gz 2322590 -SHA256 13f416c3d32f0dd679b92bbbd9dbdf2b2567a5c85eb9e5385331d066b091e02d torque-1.2.0p5.tar.gz 2322590 diff --git a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2 b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2 deleted file mode 100644 index 0068b2388775..000000000000 --- a/sys-cluster/torque/files/digest-torque-1.2.0_p5-r2 +++ /dev/null @@ -1,15 +0,0 @@ -MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456 -RMD160 c9390a8d4d618ed9d64513a2e93335b9e091af64 torque-1.2.0_p1-respect-destdir.patch.gz 3456 -SHA256 10b6e7c6c15d3f925695dc014573f7af3ec9a5c44a05d6f7c7f6bc0a5d70c752 torque-1.2.0_p1-respect-destdir.patch.gz 3456 -MD5 a1b825dcf759b97ca78cd5a00d5ecbf0 torque-1.2.0_p1-respect-ldflags.patch.gz 717 -RMD160 4a1b622178a925ae938394c16f1cd7e8b0c4c372 torque-1.2.0_p1-respect-ldflags.patch.gz 717 -SHA256 922cbe1e693d75c0eaa0278a4462882629587948a4d3cb708404ca71915ebecb torque-1.2.0_p1-respect-ldflags.patch.gz 717 -MD5 0f24a10ecabc81d458b0ff82c7e36c52 torque-1.2.0p5-jobdepterm2.patch 1421 -RMD160 0943489a76e8836c1292cc8f4c723d3e9ba1f7db torque-1.2.0p5-jobdepterm2.patch 1421 -SHA256 7cf91b5c2ef2db737b7cbbdfcf3d2cef25aed40839cb5809173cfa5430ad444c torque-1.2.0p5-jobdepterm2.patch 1421 -MD5 e55ec294bb0af1fb9b1f7ebe2571f02d torque-1.2.0p5-jobnanny.patch 8853 -RMD160 869efc5c67983406c6ae611ad5f083c74beb5858 torque-1.2.0p5-jobnanny.patch 8853 -SHA256 017d20a888e7198542cec28f183c6c0e3b09351d07a0f27ed6836f6840dcaa92 torque-1.2.0p5-jobnanny.patch 8853 -MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590 -RMD160 ac27ad6ca4dff3b10060db6e5599a1403ec28c65 torque-1.2.0p5.tar.gz 2322590 -SHA256 13f416c3d32f0dd679b92bbbd9dbdf2b2567a5c85eb9e5385331d066b091e02d torque-1.2.0p5.tar.gz 2322590 diff --git a/sys-cluster/torque/files/digest-torque-2.1.2-r1 b/sys-cluster/torque/files/digest-torque-2.1.2-r1 deleted file mode 100644 index 5bb1ccd8379b..000000000000 --- a/sys-cluster/torque/files/digest-torque-2.1.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f1b37efb5d4770a0105c66294a05d140 torque-2.1.2.tar.gz 2686724 -RMD160 7ba5cf4b4655d6e77c705be30c539380ca5863c1 torque-2.1.2.tar.gz 2686724 -SHA256 c7bade897fc12f27f128e4081c8ed1f3137bf42684ca239c48b18eb01314710a torque-2.1.2.tar.gz 2686724 diff --git a/sys-cluster/torque/files/digest-torque-2.1.2-r2 b/sys-cluster/torque/files/digest-torque-2.1.2-r2 deleted file mode 100644 index 5bb1ccd8379b..000000000000 --- a/sys-cluster/torque/files/digest-torque-2.1.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f1b37efb5d4770a0105c66294a05d140 torque-2.1.2.tar.gz 2686724 -RMD160 7ba5cf4b4655d6e77c705be30c539380ca5863c1 torque-2.1.2.tar.gz 2686724 -SHA256 c7bade897fc12f27f128e4081c8ed1f3137bf42684ca239c48b18eb01314710a torque-2.1.2.tar.gz 2686724 diff --git a/sys-cluster/torque/files/pbs.rc b/sys-cluster/torque/files/pbs.rc deleted file mode 100644 index c98eab6f739f..000000000000 --- a/sys-cluster/torque/files/pbs.rc +++ /dev/null @@ -1,88 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -opts="start stop restart" - -depend() { - need net -} - -checkconfig() { - - HOSTNAME=`hostname` - - if [ ! -e /usr/spool/PBS/server_name ] ; then - eerror "Missing config file /usr/spool/PBS/server_name" - return 1 - else - PBS_SERVER_NAME=`cat /usr/spool/PBS/server_name` - if [ ${HOSTNAME} == ${PBS_SERVER_NAME} ] ; then - PBS_START_SERVER=1; - else - PBS_START_SERVER=0; - fi - fi - - if [ ! -e /usr/spool/PBS/mom_priv/config ] ; then - eerror "Missing config file /usr/spool/PBS/mom_priv/config" - return 1 - else - PBS_START_MOM=1; - fi - - if [ "${PBS_START_SERVER}" -eq 1 ] ; then - if [ ! -e /usr/spool/PBS/server_priv/nodes ] ; then - eerror "The startup script has detected this node is a server" - eerror "from the file /usr/spool/PBS/server_name," - eerror "but the config file /usr/spool/PBS/server_priv/nodes is missing" - return 1 - fi - fi - -} - -start() { - checkconfig || return 1 - - if [ "${PBS_START_MOM}" -gt 0 ] ; then - ebegin "Starting pbs_mom" - start-stop-daemon --start --pidfile /usr/spool/PBS/mom_priv/mom.lock \ - --startas /usr/sbin/pbs_mom - fi - - if [ "${PBS_START_SERVER}" -gt 0 ] ; then - ebegin "Starting pbs_server" - start-stop-daemon --start --quiet --pidfile /usr/spool/PBS/server_priv/server.lock \ - --startas /usr/sbin/pbs_server - ebegin "Starting pbs_sched" - start-stop-daemon --start --quiet --pidfile /usr/run/pbs_sched.pid \ - --startas /usr/sbin/pbs_sched - fi - - eend $? -} - -stop() { - if [ -e /usr/spool/PBS/mom_priv/mom.lock ] ; then - ebegin "Stopping pbs_mom" - start-stop-daemon --stop --pidfile /usr/spool/PBS/mom_priv/mom.lock - rm -f /usr/spool/PBS/mom_priv/mom.lock - fi - - if [ -e /usr/spool/PBS/server_priv/server.lock ] ; then - ebegin "Stopping pbs_server" - qterm -t immediate - rm -f /usr/spool/PBS/server_priv/server.lock - fi - - if [ -e /usr/spool/PBS/sched_priv/sched.lock ] ; then - ebegin "Stopping pbs_sched" - start-stop-daemon --stop --pidfile /usr/spool/PBS/sched_priv/sched.lock - rm -f /usr/spool/PBS/sched_priv/sched.lock - fi - - sleep 3 - - eend $? -} diff --git a/sys-cluster/torque/files/torque-1.2.0_p5-destdir-fixes.patch b/sys-cluster/torque/files/torque-1.2.0_p5-destdir-fixes.patch deleted file mode 100644 index eaf419dd54d7..000000000000 --- a/sys-cluster/torque/files/torque-1.2.0_p5-destdir-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- torque-1.2.0p5.orig/src/gui/Makefile.in 2005-08-12 22:58:34.000000000 -0700 -+++ torque-1.2.0p5/src/gui/Makefile.in 2005-08-12 23:02:43.000000000 -0700 -@@ -360,7 +360,7 @@ - # - @echo Install xpbs - $(INSTALL) -m 755 xpbs $(DESTDIR)$(bindir)/xpbs -- @chmod 755 $(bindir)/xpbs 2> /dev/null -+ chmod 755 $(DESTDIR)$(bindir)/xpbs 2> /dev/null - # - $(INSTALL) -m 755 buildindex $(DESTDIR)$(XPBS_LIB) - $(INSTALL) -m 644 xpbsrc $(DESTDIR)$(XPBS_LIB) diff --git a/sys-cluster/torque/files/torque-1.2.0_p5-setuid-safety.patch b/sys-cluster/torque/files/torque-1.2.0_p5-setuid-safety.patch deleted file mode 100644 index d63417987b97..000000000000 --- a/sys-cluster/torque/files/torque-1.2.0_p5-setuid-safety.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- torque-1.2.0p5.orig/src/mom_rcp/Makefile.in 2005-08-12 23:08:29.000000000 -0700 -+++ torque-1.2.0p5/src/mom_rcp/Makefile.in 2005-08-12 23:12:35.000000000 -0700 -@@ -115,7 +115,7 @@ - $(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir) - - $(TARGET): $(OBJS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -Wl,-z,now -o $@ $(OBJS) $(LIBS) - - - # needed for make depend ---- torque-1.2.0p5.orig/src/iff/Makefile.in 2005-08-12 23:14:23.000000000 -0700 -+++ torque-1.2.0p5/src/iff/Makefile.in 2005-08-12 23:16:58.000000000 -0700 -@@ -114,7 +114,7 @@ - $(INSTALL) -m 4755 $(TARGET) $(DESTDIR)$(sbindir) - - pbs_iff: $(OBJS) $(PBS_LIBS) -- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(PBS_LIBS) $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -Wl,-z,now -o $@ $(OBJS) $(PBS_LIBS) $(LIBS) - - @mk_cleanup@ - @mk_tail@ diff --git a/sys-cluster/torque/torque-1.2.0_p5-r1.ebuild b/sys-cluster/torque/torque-1.2.0_p5-r1.ebuild deleted file mode 100644 index ef0d533027a4..000000000000 --- a/sys-cluster/torque/torque-1.2.0_p5-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# 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-1.2.0_p5-r1.ebuild,v 1.6 2006/09/28 03:13:23 dberkholz Exp $ - -inherit flag-o-matic eutils - -MY_P="${P/_}" -DESCRIPTION="A freely downloadable cluster resource manager and queuing system based on OpenPBS" -HOMEPAGE="http://www.clusterresources.com/products/torque/" -SRC_URI="http://www.clusterresources.com/downloads/torque/${MY_P}.tar.gz - mirror://gentoo/${PN}-1.2.0_p1-respect-destdir.patch.gz - mirror://gentoo/${PN}-1.2.0_p1-respect-ldflags.patch.gz - http://www-rcf.usc.edu/~garrick/torque-1.2.0p5-jobnanny.patch - http://www-rcf.usc.edu/~garrick/torque-1.2.0p5-jobdepterm2.patch" -LICENSE="openpbs" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ppc64 x86" -IUSE="tcltk X crypt" -PROVIDE="virtual/pbs" - -# ed is used by makedepend-sh -DEPEND_COMMON="virtual/libc - X? ( || ( x11-libs/libX11 virtual/x11 ) - dev-lang/tk ) - tcltk? ( dev-lang/tcl ) - !virtual/pbs" -DEPEND="${DEPEND_COMMON} - sys-apps/ed" -RDEPEND="${DEPEND_COMMON} - net-misc/openssh" -PDEPEND=">=sys-cluster/openpbs-common-1.1.0" - -S="${WORKDIR}/${MY_P}" - -SPOOL_LOCATION="/usr/spool" # this needs to move to /var later on -PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/" - -src_unpack() { - unpack ${MY_P}.tar.gz - export EPATCH_OPTS="-p1 -d ${S}" - epatch ${DISTDIR}/${PN}-1.2.0_p1-respect-ldflags.patch.gz || die "Failed to fix ldflags" - epatch ${DISTDIR}/${PN}-1.2.0_p1-respect-destdir.patch.gz || die "Failed to fix Makefiles for DESTDIR" - epatch ${DISTDIR}/${PN}-1.2.0p5-jobnanny.patch || die "Failed to apply job-nanny patch" - epatch ${DISTDIR}/${PN}-1.2.0p5-jobdepterm2.patch || die "Failed to apply job-dep cleanup patch" - epatch ${FILESDIR}/${PN}-1.2.0_p5-destdir-fixes.patch || die "Failed to fix DESTDIR for gui" - epatch ${FILESDIR}/${PN}-1.2.0_p5-setuid-safety.patch || die "Failed to fix setXid linking for pbs_rcp" - - # Tries to use absolute /tmp/ for tempfiles which fails miserably. - sed -i -e "s|/tmp/|\${TMPDIR}/|g" ${S}/buildutils/makedepend-sh || die "Failed TMPDIR change" -} - -src_compile() { -# local myconf -# use X || myconf="--disable-gui" -# use tcltk && myconf="${myconf} --with-tcl" -# use doc && myconf="${myconf} --enable-docs" - append-flags -DJOB_DELETE_NANNY - - ./configure \ - $(use_enable X gui) \ - $(use_with tcltk tcl) \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --libdir="\${exec_prefix}/$(get_libdir)/pbs" \ - --enable-server \ - --enable-mom \ - --enable-clients \ - --enable-shared \ - --enable-depend-cache \ - $(use_with crypt scp) \ - $(use_enable tcltk tcl-qstat) \ - --set-server-home=${PBS_SERVER_HOME} \ - --set-environ=/etc/pbs_environment || die "./configure 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() { - root="$1" - s="${SPOOL_LOCATION}" - h="${PBS_SERVER_HOME}" - sp="${h}/server_priv" - einfo "Building spool directory under ${D}${h}" - 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 - done -} - -src_install() { - # Make directories first - pbs_createspool "${D}" - - einfo "Running make install" - make DESTDIR=${D} install || die - - einfo "Doing docs & lib symlinks" - dodoc INSTALL PBS_License.txt README.torque Release_Notes - # Init scripts come from openpbs-common - #newinitd ${FILESDIR}/pbs-init.d pbs - #newconfd ${FILESDIR}/pbs-conf.d pbs - dosym /usr/$(get_libdir)/pbs/libpbs.a /usr/$(get_libdir)/libpbs.a - - einfo "Handling /etc/pbs_environment and /usr/spool/PBS/server_name" - # 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}/usr/spool/PBS/server_name" ]; then - cp "${ROOT}/usr/spool/PBS/server_name" "${D}/usr/spool/PBS/server_name" - fi -} - -pkg_postinst() { - # make sure the damn directories exist - pbs_createspool "${ROOT}" - [ ! -f "${ROOT}/etc/pbs_environment" ] && touch "${ROOT}/etc/pbs_environment" -} diff --git a/sys-cluster/torque/torque-1.2.0_p5-r2.ebuild b/sys-cluster/torque/torque-1.2.0_p5-r2.ebuild deleted file mode 100644 index a6ef731bc88b..000000000000 --- a/sys-cluster/torque/torque-1.2.0_p5-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# 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-1.2.0_p5-r2.ebuild,v 1.3 2006/09/28 03:13:23 dberkholz Exp $ - -inherit flag-o-matic eutils - -MY_P="${P/_}" -DESCRIPTION="A freely downloadable cluster resource manager and queuing system based on OpenPBS" -HOMEPAGE="http://www.clusterresources.com/products/torque/" -SRC_URI="http://www.clusterresources.com/downloads/torque/${MY_P}.tar.gz - mirror://gentoo/${PN}-1.2.0_p1-respect-destdir.patch.gz - mirror://gentoo/${PN}-1.2.0_p1-respect-ldflags.patch.gz - http://www-rcf.usc.edu/~garrick/torque-1.2.0p5-jobnanny.patch - http://www-rcf.usc.edu/~garrick/torque-1.2.0p5-jobdepterm2.patch" -LICENSE="openpbs" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc tcltk X crypt" -PROVIDE="virtual/pbs" - -# ed is used by makedepend-sh -DEPEND_COMMON="virtual/libc - X? ( || ( x11-libs/libX11 virtual/x11 ) - dev-lang/tk ) - tcltk? ( dev-lang/tcl ) - !virtual/pbs" -DEPEND="${DEPEND_COMMON} - sys-apps/ed" -RDEPEND="${DEPEND_COMMON} - net-misc/openssh" -PDEPEND=">=sys-cluster/openpbs-common-1.1.0" - -S="${WORKDIR}/${MY_P}" - -SPOOL_LOCATION="/usr/spool" # this needs to move to /var later on -PBS_SERVER_HOME="${SPOOL_LOCATION}/PBS/" - -src_unpack() { - unpack ${MY_P}.tar.gz - export EPATCH_OPTS="-p1 -d ${S}" - epatch ${DISTDIR}/${PN}-1.2.0_p1-respect-ldflags.patch.gz || die "Failed to fix ldflags" - epatch ${DISTDIR}/${PN}-1.2.0_p1-respect-destdir.patch.gz || die "Failed to fix Makefiles for DESTDIR" - epatch ${DISTDIR}/${PN}-1.2.0p5-jobnanny.patch || die "Failed to apply job-nanny patch" - epatch ${DISTDIR}/${PN}-1.2.0p5-jobdepterm2.patch || die "Failed to apply job-dep cleanup patch" - epatch ${FILESDIR}/${PN}-1.2.0_p5-destdir-fixes.patch || die "Failed to fix DESTDIR for gui" - epatch ${FILESDIR}/${PN}-1.2.0_p5-setuid-safety.patch || die "Failed to fix setXid linking for pbs_rcp" - - # Tries to use absolute /tmp/ for tempfiles which fails miserably. - sed -i -e "s|/tmp/|\${TMPDIR}/|g" ${S}/buildutils/makedepend-sh || die "Failed TMPDIR change" -} - -src_compile() { -# local myconf -# use X || myconf="--disable-gui" -# use tcltk && myconf="${myconf} --with-tcl" -# use doc && myconf="${myconf} --enable-docs" - append-flags -DJOB_DELETE_NANNY - - ./configure \ - $(use_enable X gui) \ - $(use_with tcltk tcl) \ - $(use_enable doc docs) \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --libdir="\${exec_prefix}/$(get_libdir)/pbs" \ - --enable-server \ - --enable-mom \ - --enable-clients \ - --enable-shared \ - --enable-depend-cache \ - $(use_with crypt scp) \ - $(use_enable tcltk tcl-qstat) \ - --set-server-home=${PBS_SERVER_HOME} \ - --set-environ=/etc/pbs_environment || die "./configure 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() { - root="$1" - s="${SPOOL_LOCATION}" - h="${PBS_SERVER_HOME}" - sp="${h}/server_priv" - einfo "Building spool directory under ${D}${h}" - 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 - done -} - -src_install() { - # Make directories first - pbs_createspool "${D}" - - einfo "Running make install" - make DESTDIR=${D} install || die - - einfo "Doing docs & lib symlinks" - dodoc INSTALL PBS_License.txt README.torque Release_Notes - # Init scripts come from openpbs-common - #newinitd ${FILESDIR}/pbs-init.d pbs - #newconfd ${FILESDIR}/pbs-conf.d pbs - dosym /usr/$(get_libdir)/pbs/libpbs.a /usr/$(get_libdir)/libpbs.a - - einfo "Handling /etc/pbs_environment and /usr/spool/PBS/server_name" - # 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}/usr/spool/PBS/server_name" ]; then - cp "${ROOT}/usr/spool/PBS/server_name" "${D}/usr/spool/PBS/server_name" - fi -} - -pkg_postinst() { - # make sure the damn directories exist - pbs_createspool "${ROOT}" - [ ! -f "${ROOT}/etc/pbs_environment" ] && touch "${ROOT}/etc/pbs_environment" -} diff --git a/sys-cluster/torque/torque-2.1.2-r1.ebuild b/sys-cluster/torque/torque-2.1.2-r1.ebuild deleted file mode 100644 index 1c1ccf7717b2..000000000000 --- a/sys-cluster/torque/torque-2.1.2-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# 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.2-r1.ebuild,v 1.5 2006/09/28 05:48:05 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" -} diff --git a/sys-cluster/torque/torque-2.1.2-r2.ebuild b/sys-cluster/torque/torque-2.1.2-r2.ebuild deleted file mode 100644 index 118808b7e721..000000000000 --- a/sys-cluster/torque/torque-2.1.2-r2.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# 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.2-r2.ebuild,v 1.4 2006/11/15 12:41:33 corsair 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 - epatch ${FILESDIR}/${PV}-skip-dotnames.patch - epatch ${FILESDIR}/${PV}-queue-recov-freemem-fix.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" -} |