commit: e4ea13189976bd3e68c247be4b5d4daf4758bd00 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Dec 4 13:23:27 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Dec 4 13:23:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ea1318
sys-cluster/rgmanager: Remove last-rited pkg Closes: https://bugs.gentoo.org/618050 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 1 - sys-cluster/rgmanager/Manifest | 2 - .../files/rgmanager-2.03.09-CVE-2010-3389.patch | 36 ------- sys-cluster/rgmanager/files/rgmanager-2.0x.conf | 4 - sys-cluster/rgmanager/files/rgmanager-2.0x.rc | 109 --------------------- .../files/rgmanager-3.1.5-fix_libxml2.patch | 23 ----- sys-cluster/rgmanager/files/rgmanager.confd | 7 -- sys-cluster/rgmanager/files/rgmanager.initd | 34 ------- sys-cluster/rgmanager/metadata.xml | 8 -- sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild | 63 ------------ sys-cluster/rgmanager/rgmanager-3.1.5.ebuild | 63 ------------ 11 files changed, 350 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 2b567abb6d1..6e30134fc54 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -429,7 +429,6 @@ app-admin/syslogread # bug #618050. Removal in a month. sys-cluster/cman sys-cluster/ccs -sys-cluster/rgmanager sys-cluster/libdlm sys-cluster/fence-agents sys-cluster/libccs diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest deleted file mode 100644 index 35bb735b1f5..00000000000 --- a/sys-cluster/rgmanager/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28 -DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a 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 deleted file mode 100644 index 86e1f138eed..00000000000 --- a/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=352213 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598549 - -Patch by Jari Aalto <[email protected]> ---- 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 deleted file mode 100644 index ba5587060f7..00000000000 --- a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -RGMGR_OPTS="" diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc b/sys-cluster/rgmanager/files/rgmanager-2.0x.rc deleted file mode 100644 index d7d77d47fbe..00000000000 --- a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc +++ /dev/null @@ -1,109 +0,0 @@ -#!/sbin/openrc-run -# 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 - -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 deleted file mode 100644 index eff23ef495b..00000000000 --- a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch +++ /dev/null @@ -1,23 +0,0 @@ -* 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 <[email protected]> ---- 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 deleted file mode 100644 index fa9f66830bd..00000000000 --- a/sys-cluster/rgmanager/files/rgmanager.confd +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -PIDFILE="/var/run/rgmanager.pid" - -RGMGR_OPTS="" - diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd deleted file mode 100644 index caaa86f551e..00000000000 --- a/sys-cluster/rgmanager/files/rgmanager.initd +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/openrc-run -# 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 - -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 deleted file mode 100644 index 4a09d7ba8d6..00000000000 --- a/sys-cluster/rgmanager/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Cluster Project</name> -</maintainer> -</pkgmetadata> diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild deleted file mode 100644 index 916463bc027..00000000000 --- a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="https://sourceware.org/cluster/wiki/"; -SRC_URI="ftp://sourceware.org/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-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild deleted file mode 100644 index 14508c6668c..00000000000 --- a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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} -}
