diff options
author | 2005-08-13 06:29:14 +0000 | |
---|---|---|
committer | 2005-08-13 06:29:14 +0000 | |
commit | 74f609947e05fcccbd7bccfbb5a04fd1db679ff6 (patch) | |
tree | 92de3e2d41d137dfbfd83a3331cb1035231476e6 /sys-cluster | |
parent | add blockers for >=sylpheed-claws-1.9.13 (diff) | |
download | gentoo-2-74f609947e05fcccbd7bccfbb5a04fd1db679ff6.tar.gz gentoo-2-74f609947e05fcccbd7bccfbb5a04fd1db679ff6.tar.bz2 gentoo-2-74f609947e05fcccbd7bccfbb5a04fd1db679ff6.zip |
Audit ebuild and package build system, fix more DESTDIR cases (bug #101326), and some setXid linking stuff.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/torque/ChangeLog | 10 | ||||
-rw-r--r-- | sys-cluster/torque/Manifest | 26 | ||||
-rw-r--r-- | sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 | 5 | ||||
-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 | 142 |
6 files changed, 204 insertions, 12 deletions
diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog index 4b06ba5439a6..f3865255f85f 100644 --- a/sys-cluster/torque/ChangeLog +++ b/sys-cluster/torque/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-cluster/torque # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.19 2005/08/11 20:51:30 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.20 2005/08/13 06:29:14 robbat2 Exp $ + +*torque-1.2.0_p5-r1 (13 Aug 2005) + + 13 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> + +files/torque-1.2.0_p5-destdir-fixes.patch, + +files/torque-1.2.0_p5-setuid-safety.patch, +torque-1.2.0_p5-r1.ebuild: + Audit ebuild and package build system, fix more DESTDIR cases (bug #101326), + and some setXid linking stuff. *torque-1.2.0_p5 (11 Aug 2005) diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest index 21b2cf7a7dd2..d1f8762d45a8 100644 --- a/sys-cluster/torque/Manifest +++ b/sys-cluster/torque/Manifest @@ -1,17 +1,21 @@ -MD5 199ecd785dc3a12f41d23f5046ef9ba3 ChangeLog 3723 +MD5 456d8534edf6f65a12d5c80ba8638a1c torque-1.2.0_p5-r1.ebuild 4819 +MD5 7dd1a27cf57520610867640d86e91ba3 torque-1.2.0_p1-r1.ebuild 1874 +MD5 c6f3121536e6adce335641c7a3c961ae torque-1.2.0_p1.ebuild 2312 +MD5 f241bd8e1631adacb8f98ea6de70cf99 torque-1.2.0_p1-r3.ebuild 3893 +MD5 38ff4b249a54a78f0a2d720fbf20b534 torque-1.0.1_p6.ebuild 1910 +MD5 5b4eaa908204931a7905e267b4b6a9f8 torque-1.2.0_p5.ebuild 4520 +MD5 d18ea01c292ee1127343a7143f8af6f7 torque-1.2.0_p1-r2.ebuild 2405 +MD5 cc4b7b737b89b65c88edd71b18a01f4f ChangeLog 4044 +MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160 MD5 0358ef5f33cbdf1c0f764f1407677480 files/1.2.0_p1-respect-destdir.patch 21686 -MD5 e26e30bb1e82820df08330a7a9755aae files/1.2.0_p1-respect-ldflags.patch 2709 +MD5 eceaf7e310f5464403b6180dbbf9a892 files/torque-1.2.0_p5-destdir-fixes.patch 447 +MD5 271d60925bb60edca8249e8bc0657fa8 files/torque-1.2.0_p5-setuid-safety.patch 823 +MD5 aa9daa3694ffc472849365fdda73b0f9 files/pbs.rc 2138 MD5 49d4d243a6dd96ba20531b240a7a32b6 files/digest-torque-1.0.1_p6 67 MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1 67 +MD5 fecc46e66800def43afc2718cfc6f428 files/digest-torque-1.2.0_p5 379 +MD5 e26e30bb1e82820df08330a7a9755aae files/1.2.0_p1-respect-ldflags.patch 2709 MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1-r1 67 MD5 640bc8217559fa4bc7086a9eb9045b1e files/digest-torque-1.2.0_p1-r2 67 MD5 92770be41a9332a0c3326cae44d55e93 files/digest-torque-1.2.0_p1-r3 232 -MD5 fecc46e66800def43afc2718cfc6f428 files/digest-torque-1.2.0_p5 379 -MD5 aa9daa3694ffc472849365fdda73b0f9 files/pbs.rc 2138 -MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160 -MD5 38ff4b249a54a78f0a2d720fbf20b534 torque-1.0.1_p6.ebuild 1910 -MD5 7dd1a27cf57520610867640d86e91ba3 torque-1.2.0_p1-r1.ebuild 1874 -MD5 d18ea01c292ee1127343a7143f8af6f7 torque-1.2.0_p1-r2.ebuild 2405 -MD5 f241bd8e1631adacb8f98ea6de70cf99 torque-1.2.0_p1-r3.ebuild 3893 -MD5 c6f3121536e6adce335641c7a3c961ae torque-1.2.0_p1.ebuild 2312 -MD5 5b4eaa908204931a7905e267b4b6a9f8 torque-1.2.0_p5.ebuild 4520 +MD5 fecc46e66800def43afc2718cfc6f428 files/digest-torque-1.2.0_p5-r1 379 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 new file mode 100644 index 000000000000..91c2fc5d0a65 --- /dev/null +++ b/sys-cluster/torque/files/digest-torque-1.2.0_p5-r1 @@ -0,0 +1,5 @@ +MD5 d76042cb056a09fc3e544193b478c825 torque-1.2.0p5.tar.gz 2322590 +MD5 d92cc9e8b1d5af38457abc6137bf1b4d torque-1.2.0_p1-respect-destdir.patch.gz 3456 +MD5 a1b825dcf759b97ca78cd5a00d5ecbf0 torque-1.2.0_p1-respect-ldflags.patch.gz 717 +MD5 e55ec294bb0af1fb9b1f7ebe2571f02d torque-1.2.0p5-jobnanny.patch 8853 +MD5 0f24a10ecabc81d458b0ff82c7e36c52 torque-1.2.0p5-jobdepterm2.patch 1421 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 new file mode 100644 index 000000000000..eaf419dd54d7 --- /dev/null +++ b/sys-cluster/torque/files/torque-1.2.0_p5-destdir-fixes.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..d63417987b97 --- /dev/null +++ b/sys-cluster/torque/files/torque-1.2.0_p5-setuid-safety.patch @@ -0,0 +1,22 @@ +--- 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 new file mode 100644 index 000000000000..3a377378a09e --- /dev/null +++ b/sys-cluster/torque/torque-1.2.0_p5-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2005 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.1 2005/08/13 06:29:14 robbat2 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 scp" +PROVIDE="virtual/pbs" + +# ed is used by makedepend-sh +DEPEND_COMMON="virtual/libc + X? ( virtual/x11 ) + 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 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" +} |