diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-cluster/rgmanager | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-cluster/rgmanager')
-rw-r--r-- | sys-cluster/rgmanager/Manifest | 2 | ||||
-rw-r--r-- | sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch | 36 | ||||
-rw-r--r-- | sys-cluster/rgmanager/files/rgmanager-2.0x.conf | 5 | ||||
-rwxr-xr-x | sys-cluster/rgmanager/files/rgmanager-2.0x.rc | 110 | ||||
-rw-r--r-- | sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch | 23 | ||||
-rw-r--r-- | sys-cluster/rgmanager/files/rgmanager.confd | 8 | ||||
-rw-r--r-- | sys-cluster/rgmanager/files/rgmanager.initd | 35 | ||||
-rw-r--r-- | sys-cluster/rgmanager/metadata.xml | 5 | ||||
-rw-r--r-- | sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild | 64 | ||||
-rw-r--r-- | sys-cluster/rgmanager/rgmanager-2.03.09.ebuild | 63 | ||||
-rw-r--r-- | sys-cluster/rgmanager/rgmanager-3.1.5.ebuild | 64 |
11 files changed, 415 insertions, 0 deletions
diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest new file mode 100644 index 000000000000..dc2410e45044 --- /dev/null +++ b/sys-cluster/rgmanager/Manifest @@ -0,0 +1,2 @@ +DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f +DIST cluster-3.1.5.tar.gz 651449 RMD160 c12dbf38c3e24cbdac23dbfdce6cb96da5c722ff SHA1 884d153ad9545d8abd225744dff5a905e19a6702 SHA256 95be1b484f9c58af3c47a9d46dc2802d37f1b2b9028053f243a2c8bd1f07623e diff --git a/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch b/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch new file mode 100644 index 000000000000..86e1f138eed1 --- /dev/null +++ b/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/show_bug.cgi?id=352213 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598549 + +Patch by Jari Aalto <jari.aalto@cante.net> +--- a/rgmanager/src/resources/SAPDatabase ++++ b/rgmanager/src/resources/SAPDatabase +@@ -670,8 +670,11 @@ + fi + + # as root user we need the library path to the SAP kernel to be able to call executables +-if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then +- LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH ++if [ "$DIR_EXECUTABLE" ]; then ++ if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then ++ LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++ export LD_LIBRARY_PATH ++ fi + fi + sidadm="`echo $SID | tr [:upper:] [:lower:]`adm" + +--- a/rgmanager/src/resources/SAPInstance ++++ b/rgmanager/src/resources/SAPInstance +@@ -382,8 +382,11 @@ + fi + + # as root user we need the library path to the SAP kernel to be able to call sapcontrol +-if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then +- LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH ++if [ "$DIR_EXECUTABLE" ]; then ++ if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then ++ LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++ export LD_LIBRARY_PATH ++ fi + fi + sidadm="`echo $SID | tr [:upper:] [:lower:]`adm" + diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf b/sys-cluster/rgmanager/files/rgmanager-2.0x.conf new file mode 100644 index 000000000000..8732427c1182 --- /dev/null +++ b/sys-cluster/rgmanager/files/rgmanager-2.0x.conf @@ -0,0 +1,5 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +RGMGR_OPTS="" diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc b/sys-cluster/rgmanager/files/rgmanager-2.0x.rc new file mode 100755 index 000000000000..16b3a7e3f0f1 --- /dev/null +++ b/sys-cluster/rgmanager/files/rgmanager-2.0x.rc @@ -0,0 +1,110 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Adaption of the original RedHat script +# Original Copyright (C) 2003 Red Hat, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + use net + need cman +} + +# We'd like a reload method as well +opts="${opts} reload" + +ID="Cluster Resource Manager" +RGMGRD=$(which clurgmgrd) +RMTABD=$(which clurmtabd) +CFG_FILE="/etc/cluster/cluster.conf" + +LOG_ERR=3 +LOG_WARNING=4 +LOG_NOTICE=5 +LOG_INFO=6 + +# +# If we're not configured, then don't start anything. +# +[ -f "$CFG_FILE" ] || exit 0 + + +# +# log_and_print <level> <message> +# +function log_and_print() +{ + if [ -z "$1" -o -z "$2" ]; then + return 1; + fi + + clulog -p $$ -n "rgmanager" -s $1 "$2" + echo $2 + + return 0; +} + + +# +# Bring down the cluster on a node. +# +function stop_cluster() +{ + kill -TERM $(pidof $RGMGRD) + + while [ 0 ]; do + if [ -n "`pidof $RGMGRD`" ]; then + while [ -n "`pidof $RGMGRD`" ]; do + sleep 1 + done + einfo "Waiting for $(basename ${RGMGRD})" + else + eend "Services are stopped." + fi + + # Ensure all NFS rmtab daemons are dead. + killall $(basename ${RMTABD}) &> /dev/null + + rm -f /var/run/$(basename ${RGMGRD}).pid + + return 0 + done +} + + + +function start() { + ebegin "Starting cluster resource manager" + start-stop-daemon --start --quiet --exec ${RGMGRD} ${RGMGR_OPTS} + ret=$? + if [ $ret -eq 0 ]; then + touch /var/lock/subsys/rgmanager + fi + eend $ret +} + +function restart() { + pidof ${RGMGRD} &> /dev/null + if [ ${?} -ne 1 ]; then + svc_stop + fi + svc_start +} + +function reload() { + clulog -p ${LOG_NOTICE} "Reloading Resource Configuration." + ebegin "Reloading Resource Configuration " + kill -s HUP $(pidof ${RGMGRD} ) + rv=${?} + eend + exit ${rv} +} + +function stop() { + ebegin "Shutting down cluster resource manager" + if [ -n "$(pidof ${RGMGRD})" ]; then + stop_cluster + fi + rm -f /var/lock/subsys/rgmanager + eend +} diff --git a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch new file mode 100644 index 000000000000..eff23ef495bc --- /dev/null +++ b/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch @@ -0,0 +1,23 @@ +* Use double underline as header-protectors to avoid collision with icu's platform.h +* (pulled in via libxml2 when built with icu support) resulting in int64_t defined twice +* (once in icu's ptypes.h and once in stdint.h) +* patch by Tiziano Mueller <dev-zero@gentoo.org> +--- a/rgmanager/include/platform.h 2011-03-07 19:58:22.000000000 +0100 ++++ b/rgmanager/include/platform.h 2011-03-08 15:59:36.773871936 +0100 +@@ -1,8 +1,8 @@ + /** @file + * Defines for byte-swapping + */ +-#ifndef _PLATFORM_H +-#define _PLATFORM_H ++#ifndef __PLATFORM_H ++#define __PLATFORM_H + + #include <endian.h> + #include <sys/param.h> +@@ -56,4 +56,4 @@ + #define PACKED __attribute__((packed)) + #endif + +-#endif /* _PLATFORM_H */ ++#endif /* __PLATFORM_H */ diff --git a/sys-cluster/rgmanager/files/rgmanager.confd b/sys-cluster/rgmanager/files/rgmanager.confd new file mode 100644 index 000000000000..7635a1b9e000 --- /dev/null +++ b/sys-cluster/rgmanager/files/rgmanager.confd @@ -0,0 +1,8 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +PIDFILE="/var/run/rgmanager.pid" + +RGMGR_OPTS="" + diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd new file mode 100644 index 000000000000..e6d8cddddda1 --- /dev/null +++ b/sys-cluster/rgmanager/files/rgmanager.initd @@ -0,0 +1,35 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Adaption of the original RedHat script +# Original Copyright (C) 2003 Red Hat, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + use net +# need cman +} + +start() { + ebegin "Starting cluster resource manager" + + # recreate run-directory + mkdir -p /var/run/cluster + + start-stop-daemon \ + --start \ + --quiet \ + --exec "/usr/sbin/rgmanager" \ + --pidfile "${PIDFILE}" \ + -- ${RGMGR_OPTS} + eend $ret +} + +stop() { + ebegin "Shutting down cluster resource manager" + start-stop-daemon \ + --stop \ + --pidfile "${PIDFILE}" \ + --retry 0 + eend $? +} diff --git a/sys-cluster/rgmanager/metadata.xml b/sys-cluster/rgmanager/metadata.xml new file mode 100644 index 000000000000..348e6c4de815 --- /dev/null +++ b/sys-cluster/rgmanager/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>cluster</herd> +</pkgmetadata> diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild new file mode 100644 index 000000000000..230c940427d4 --- /dev/null +++ b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 + +inherit eutils multilib versionator + +CLUSTER_RELEASE=${PV} +MY_P=cluster-${CLUSTER_RELEASE} + +MAJ_PV="$(get_major_version)" +MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" + +DESCRIPTION="Clustered resource group manager" +HOMEPAGE="http://sources.redhat.com/cluster/wiki/" +SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* + =sys-cluster/dlm-lib-${CLUSTER_RELEASE}* + =sys-cluster/cman-lib-${CLUSTER_RELEASE}*" + +DEPEND="${RDEPEND} + dev-libs/libxml2[-icu] + =sys-libs/slang-2*" + +S=${WORKDIR}/${MY_P}/${PN} + +src_prepare() { + epatch "${FILESDIR}"/${P}-CVE-2010-3389.patch + sed -i -e 's/-Werror//g' src/{clulib,utils,daemons}/Makefile || die +} + +src_configure() { + (cd "${WORKDIR}"/${MY_P}; + ./configure \ + --cc="$(tc-getCC)" \ + --cflags="-Wall" \ + --disable_kernel_check \ + --somajor="$MAJ_PV" \ + --sominor="$MIN_PV" \ + --dlmlibdir=/usr/$(get_libdir) \ + --dlmincdir=/usr/include \ + --cmanlibdir=/usr/$(get_libdir) \ + --cmanincdir=/usr/include \ + ) || die "configure problem" +} + +src_compile() { + # There's a problem with -O2 right now, a patch was submitted. + env -u CFLAGS emake -j1 clean all || die +} + +src_install() { + emake DESTDIR="${D}" install || die + + newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die + newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die +} diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild new file mode 100644 index 000000000000..694065b728c9 --- /dev/null +++ b/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit eutils versionator + +CLUSTER_RELEASE="${PV}" +MY_P="cluster-${CLUSTER_RELEASE}" + +MAJ_PV="$(get_major_version)" +MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" + +DESCRIPTION="Clustered resource group manager" +HOMEPAGE="http://sources.redhat.com/cluster/wiki/" +SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* + =sys-cluster/dlm-lib-${CLUSTER_RELEASE}* + =sys-cluster/cman-lib-${CLUSTER_RELEASE}* + " + +DEPEND="${RDEPEND} + dev-libs/libxml2 + =sys-libs/slang-2* + " + +S="${WORKDIR}/${MY_P}/${PN}" + +src_compile() { + (cd "${WORKDIR}"/${MY_P}; + ./configure \ + --cc=$(tc-getCC) \ + --cflags="-Wall" \ + --disable_kernel_check \ + --somajor="$MAJ_PV" \ + --sominor="$MIN_PV" \ + --dlmlibdir=/usr/lib \ + --dlmincdir=/usr/include \ + --cmanlibdir=/usr/lib \ + --cmanincdir=/usr/include \ + ) || die "configure problem" + + # fix the manual pages have executable bit + sed -i -e ' + /\tinstall -d/s/install/& -m 0755/; t + /\tinstall/s/install/& -m 0644/' \ + man/Makefile + + # There's a problem with -O2 right now, a patch was submitted. + env -u CFLAGS emake -j1 clean all || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install || die "install problem" + + newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die + newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die +} diff --git a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild new file mode 100644 index 000000000000..5e79c692a609 --- /dev/null +++ b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit eutils multilib versionator + +CLUSTER_RELEASE="${PV}" +MY_P="cluster-${CLUSTER_RELEASE}" + +MAJ_PV="$(get_major_version)" +MIN_PV="$(get_version_component_range 2-3)" + +DESCRIPTION="Clustered resource group manager" +HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage" +SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus" + +DEPEND="~sys-cluster/libcman-${PV} + ~sys-cluster/liblogthread-${PV} + ~sys-cluster/libccs-${PV} + ~sys-cluster/libdlm-${PV} + dev-libs/libxml2 + =sys-libs/slang-2* + dbus? ( sys-apps/dbus )" +RDEPEND="${DEPEND} + ~sys-cluster/cman-${PV}" + +S=${WORKDIR}/${MY_P}/${PN} + +src_prepare() { + epatch "${FILESDIR}/${P}-fix_libxml2.patch" +} + +src_configure() { + local myopts="" + use dbus || myopts="--disable_dbus" + cd "${WORKDIR}"/${MY_P} + ./configure \ + --cc="$(tc-getCC)" \ + --cflags="-Wall" \ + --libdir=/usr/$(get_libdir) \ + --disable_kernel_check \ + --somajor="$MAJ_PV" \ + --sominor="$MIN_PV" \ + --dlmlibdir=/usr/$(get_libdir) \ + --dlmincdir=/usr/include \ + --cmanlibdir=/usr/$(get_libdir) \ + --cmanincdir=/usr/include \ + ${myopts} \ + || die "configure problem" +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} |