Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/rgmanager/files/, sys-cluster/rgmanager/, profiles/
Date: Tue, 04 Dec 2018 13:36:27
Message-Id: 1543929807.e4ea13189976bd3e68c247be4b5d4daf4758bd00.mgorny@gentoo
1 commit: e4ea13189976bd3e68c247be4b5d4daf4758bd00
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 4 13:23:27 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 4 13:23:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ea1318
7
8 sys-cluster/rgmanager: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/618050
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sys-cluster/rgmanager/Manifest | 2 -
15 .../files/rgmanager-2.03.09-CVE-2010-3389.patch | 36 -------
16 sys-cluster/rgmanager/files/rgmanager-2.0x.conf | 4 -
17 sys-cluster/rgmanager/files/rgmanager-2.0x.rc | 109 ---------------------
18 .../files/rgmanager-3.1.5-fix_libxml2.patch | 23 -----
19 sys-cluster/rgmanager/files/rgmanager.confd | 7 --
20 sys-cluster/rgmanager/files/rgmanager.initd | 34 -------
21 sys-cluster/rgmanager/metadata.xml | 8 --
22 sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild | 63 ------------
23 sys-cluster/rgmanager/rgmanager-3.1.5.ebuild | 63 ------------
24 11 files changed, 350 deletions(-)
25
26 diff --git a/profiles/package.mask b/profiles/package.mask
27 index 2b567abb6d1..6e30134fc54 100644
28 --- a/profiles/package.mask
29 +++ b/profiles/package.mask
30 @@ -429,7 +429,6 @@ app-admin/syslogread
31 # bug #618050. Removal in a month.
32 sys-cluster/cman
33 sys-cluster/ccs
34 -sys-cluster/rgmanager
35 sys-cluster/libdlm
36 sys-cluster/fence-agents
37 sys-cluster/libccs
38
39 diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
40 deleted file mode 100644
41 index 35bb735b1f5..00000000000
42 --- a/sys-cluster/rgmanager/Manifest
43 +++ /dev/null
44 @@ -1,2 +0,0 @@
45 -DIST cluster-2.03.09.tar.gz 1784357 BLAKE2B bf024c93fd5ccd9b7410abc2a3bd792c55c3937604d750019a20190753d95d19b2232923a7a76463ccff592bde7fed942aa679af9e39158fef6041258eaf6eb7 SHA512 5dbcf978336a6b7998df0d3dfcff037e1e77e9e69b43d78eb573a65432445e572e69d7783e7874e9edf2632627f02426f428103831e10f5d1f338afa91a62c28
46 -DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a
47
48 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
49 deleted file mode 100644
50 index 86e1f138eed..00000000000
51 --- a/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch
52 +++ /dev/null
53 @@ -1,36 +0,0 @@
54 -https://bugs.gentoo.org/show_bug.cgi?id=352213
55 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598549
56 -
57 -Patch by Jari Aalto <jari.aalto@×××××.net>
58 ---- a/rgmanager/src/resources/SAPDatabase
59 -+++ b/rgmanager/src/resources/SAPDatabase
60 -@@ -670,8 +670,11 @@
61 - fi
62 -
63 - # as root user we need the library path to the SAP kernel to be able to call executables
64 --if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
65 -- LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
66 -+if [ "$DIR_EXECUTABLE" ]; then
67 -+ if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
68 -+ LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
69 -+ export LD_LIBRARY_PATH
70 -+ fi
71 - fi
72 - sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
73 -
74 ---- a/rgmanager/src/resources/SAPInstance
75 -+++ b/rgmanager/src/resources/SAPInstance
76 -@@ -382,8 +382,11 @@
77 - fi
78 -
79 - # as root user we need the library path to the SAP kernel to be able to call sapcontrol
80 --if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
81 -- LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
82 -+if [ "$DIR_EXECUTABLE" ]; then
83 -+ if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
84 -+ LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
85 -+ export LD_LIBRARY_PATH
86 -+ fi
87 - fi
88 - sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
89 -
90
91 diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf b/sys-cluster/rgmanager/files/rgmanager-2.0x.conf
92 deleted file mode 100644
93 index ba5587060f7..00000000000
94 --- a/sys-cluster/rgmanager/files/rgmanager-2.0x.conf
95 +++ /dev/null
96 @@ -1,4 +0,0 @@
97 -# Copyright 1999-2005 Gentoo Foundation
98 -# Distributed under the terms of the GNU General Public License v2
99 -
100 -RGMGR_OPTS=""
101
102 diff --git a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc b/sys-cluster/rgmanager/files/rgmanager-2.0x.rc
103 deleted file mode 100644
104 index d7d77d47fbe..00000000000
105 --- a/sys-cluster/rgmanager/files/rgmanager-2.0x.rc
106 +++ /dev/null
107 @@ -1,109 +0,0 @@
108 -#!/sbin/openrc-run
109 -# Copyright 1999-2005 Gentoo Foundation
110 -# Adaption of the original RedHat script
111 -# Original Copyright (C) 2003 Red Hat, Inc.
112 -# Distributed under the terms of the GNU General Public License v2
113 -
114 -depend() {
115 - use net
116 - need cman
117 -}
118 -
119 -# We'd like a reload method as well
120 -opts="${opts} reload"
121 -
122 -ID="Cluster Resource Manager"
123 -RGMGRD=$(which clurgmgrd)
124 -RMTABD=$(which clurmtabd)
125 -CFG_FILE="/etc/cluster/cluster.conf"
126 -
127 -LOG_ERR=3
128 -LOG_WARNING=4
129 -LOG_NOTICE=5
130 -LOG_INFO=6
131 -
132 -#
133 -# If we're not configured, then don't start anything.
134 -#
135 -[ -f "$CFG_FILE" ] || exit 0
136 -
137 -
138 -#
139 -# log_and_print <level> <message>
140 -#
141 -function log_and_print()
142 -{
143 - if [ -z "$1" -o -z "$2" ]; then
144 - return 1;
145 - fi
146 -
147 - clulog -p $$ -n "rgmanager" -s $1 "$2"
148 - echo $2
149 -
150 - return 0;
151 -}
152 -
153 -
154 -#
155 -# Bring down the cluster on a node.
156 -#
157 -function stop_cluster()
158 -{
159 - kill -TERM $(pidof $RGMGRD)
160 -
161 - while [ 0 ]; do
162 - if [ -n "`pidof $RGMGRD`" ]; then
163 - while [ -n "`pidof $RGMGRD`" ]; do
164 - sleep 1
165 - done
166 - einfo "Waiting for $(basename ${RGMGRD})"
167 - else
168 - eend "Services are stopped."
169 - fi
170 -
171 - # Ensure all NFS rmtab daemons are dead.
172 - killall $(basename ${RMTABD}) &> /dev/null
173 -
174 - rm -f /var/run/$(basename ${RGMGRD}).pid
175 -
176 - return 0
177 - done
178 -}
179 -
180 -
181 -
182 -function start() {
183 - ebegin "Starting cluster resource manager"
184 - start-stop-daemon --start --quiet --exec ${RGMGRD} ${RGMGR_OPTS}
185 - ret=$?
186 - if [ $ret -eq 0 ]; then
187 - touch /var/lock/subsys/rgmanager
188 - fi
189 - eend $ret
190 -}
191 -
192 -function restart() {
193 - pidof ${RGMGRD} &> /dev/null
194 - if [ ${?} -ne 1 ]; then
195 - svc_stop
196 - fi
197 - svc_start
198 -}
199 -
200 -function reload() {
201 - clulog -p ${LOG_NOTICE} "Reloading Resource Configuration."
202 - ebegin "Reloading Resource Configuration "
203 - kill -s HUP $(pidof ${RGMGRD} )
204 - rv=${?}
205 - eend
206 - exit ${rv}
207 -}
208 -
209 -function stop() {
210 - ebegin "Shutting down cluster resource manager"
211 - if [ -n "$(pidof ${RGMGRD})" ]; then
212 - stop_cluster
213 - fi
214 - rm -f /var/lock/subsys/rgmanager
215 - eend
216 -}
217
218 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
219 deleted file mode 100644
220 index eff23ef495b..00000000000
221 --- a/sys-cluster/rgmanager/files/rgmanager-3.1.5-fix_libxml2.patch
222 +++ /dev/null
223 @@ -1,23 +0,0 @@
224 -* Use double underline as header-protectors to avoid collision with icu's platform.h
225 -* (pulled in via libxml2 when built with icu support) resulting in int64_t defined twice
226 -* (once in icu's ptypes.h and once in stdint.h)
227 -* patch by Tiziano Mueller <dev-zero@g.o>
228 ---- a/rgmanager/include/platform.h 2011-03-07 19:58:22.000000000 +0100
229 -+++ b/rgmanager/include/platform.h 2011-03-08 15:59:36.773871936 +0100
230 -@@ -1,8 +1,8 @@
231 - /** @file
232 - * Defines for byte-swapping
233 - */
234 --#ifndef _PLATFORM_H
235 --#define _PLATFORM_H
236 -+#ifndef __PLATFORM_H
237 -+#define __PLATFORM_H
238 -
239 - #include <endian.h>
240 - #include <sys/param.h>
241 -@@ -56,4 +56,4 @@
242 - #define PACKED __attribute__((packed))
243 - #endif
244 -
245 --#endif /* _PLATFORM_H */
246 -+#endif /* __PLATFORM_H */
247
248 diff --git a/sys-cluster/rgmanager/files/rgmanager.confd b/sys-cluster/rgmanager/files/rgmanager.confd
249 deleted file mode 100644
250 index fa9f66830bd..00000000000
251 --- a/sys-cluster/rgmanager/files/rgmanager.confd
252 +++ /dev/null
253 @@ -1,7 +0,0 @@
254 -# Copyright 1999-2011 Gentoo Foundation
255 -# Distributed under the terms of the GNU General Public License v2
256 -
257 -PIDFILE="/var/run/rgmanager.pid"
258 -
259 -RGMGR_OPTS=""
260 -
261
262 diff --git a/sys-cluster/rgmanager/files/rgmanager.initd b/sys-cluster/rgmanager/files/rgmanager.initd
263 deleted file mode 100644
264 index caaa86f551e..00000000000
265 --- a/sys-cluster/rgmanager/files/rgmanager.initd
266 +++ /dev/null
267 @@ -1,34 +0,0 @@
268 -#!/sbin/openrc-run
269 -# Copyright 1999-2011 Gentoo Foundation
270 -# Adaption of the original RedHat script
271 -# Original Copyright (C) 2003 Red Hat, Inc.
272 -# Distributed under the terms of the GNU General Public License v2
273 -
274 -depend() {
275 - use net
276 -# need cman
277 -}
278 -
279 -start() {
280 - ebegin "Starting cluster resource manager"
281 -
282 - # recreate run-directory
283 - mkdir -p /var/run/cluster
284 -
285 - start-stop-daemon \
286 - --start \
287 - --quiet \
288 - --exec "/usr/sbin/rgmanager" \
289 - --pidfile "${PIDFILE}" \
290 - -- ${RGMGR_OPTS}
291 - eend $ret
292 -}
293 -
294 -stop() {
295 - ebegin "Shutting down cluster resource manager"
296 - start-stop-daemon \
297 - --stop \
298 - --pidfile "${PIDFILE}" \
299 - --retry 0
300 - eend $?
301 -}
302
303 diff --git a/sys-cluster/rgmanager/metadata.xml b/sys-cluster/rgmanager/metadata.xml
304 deleted file mode 100644
305 index 4a09d7ba8d6..00000000000
306 --- a/sys-cluster/rgmanager/metadata.xml
307 +++ /dev/null
308 @@ -1,8 +0,0 @@
309 -<?xml version="1.0" encoding="UTF-8"?>
310 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
311 -<pkgmetadata>
312 -<maintainer type="project">
313 - <email>cluster@g.o</email>
314 - <name>Gentoo Cluster Project</name>
315 -</maintainer>
316 -</pkgmetadata>
317
318 diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
319 deleted file mode 100644
320 index 916463bc027..00000000000
321 --- a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
322 +++ /dev/null
323 @@ -1,63 +0,0 @@
324 -# Copyright 1999-2011 Gentoo Foundation
325 -# Distributed under the terms of the GNU General Public License v2
326 -
327 -EAPI=2
328 -
329 -inherit eutils multilib versionator
330 -
331 -CLUSTER_RELEASE=${PV}
332 -MY_P=cluster-${CLUSTER_RELEASE}
333 -
334 -MAJ_PV="$(get_major_version)"
335 -MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
336 -
337 -DESCRIPTION="Clustered resource group manager"
338 -HOMEPAGE="https://sourceware.org/cluster/wiki/"
339 -SRC_URI="ftp://sourceware.org/pub/cluster/releases/${MY_P}.tar.gz"
340 -
341 -LICENSE="GPL-2"
342 -SLOT="0"
343 -KEYWORDS="amd64 x86"
344 -IUSE=""
345 -
346 -RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
347 - =sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
348 - =sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
349 -
350 -DEPEND="${RDEPEND}
351 - dev-libs/libxml2[-icu]
352 - =sys-libs/slang-2*"
353 -
354 -S=${WORKDIR}/${MY_P}/${PN}
355 -
356 -src_prepare() {
357 - epatch "${FILESDIR}"/${P}-CVE-2010-3389.patch
358 - sed -i -e 's/-Werror//g' src/{clulib,utils,daemons}/Makefile || die
359 -}
360 -
361 -src_configure() {
362 - (cd "${WORKDIR}"/${MY_P};
363 - ./configure \
364 - --cc="$(tc-getCC)" \
365 - --cflags="-Wall" \
366 - --disable_kernel_check \
367 - --somajor="$MAJ_PV" \
368 - --sominor="$MIN_PV" \
369 - --dlmlibdir=/usr/$(get_libdir) \
370 - --dlmincdir=/usr/include \
371 - --cmanlibdir=/usr/$(get_libdir) \
372 - --cmanincdir=/usr/include \
373 - ) || die "configure problem"
374 -}
375 -
376 -src_compile() {
377 - # There's a problem with -O2 right now, a patch was submitted.
378 - env -u CFLAGS emake -j1 clean all || die
379 -}
380 -
381 -src_install() {
382 - emake DESTDIR="${D}" install || die
383 -
384 - newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
385 - newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
386 -}
387
388 diff --git a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
389 deleted file mode 100644
390 index 14508c6668c..00000000000
391 --- a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
392 +++ /dev/null
393 @@ -1,63 +0,0 @@
394 -# Copyright 1999-2011 Gentoo Foundation
395 -# Distributed under the terms of the GNU General Public License v2
396 -
397 -EAPI=4
398 -
399 -inherit eutils multilib versionator
400 -
401 -CLUSTER_RELEASE="${PV}"
402 -MY_P="cluster-${CLUSTER_RELEASE}"
403 -
404 -MAJ_PV="$(get_major_version)"
405 -MIN_PV="$(get_version_component_range 2-3)"
406 -
407 -DESCRIPTION="Clustered resource group manager"
408 -HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"
409 -SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"
410 -
411 -LICENSE="GPL-2"
412 -SLOT="0"
413 -KEYWORDS="~amd64 ~x86"
414 -IUSE="dbus"
415 -
416 -DEPEND="~sys-cluster/libcman-${PV}
417 - ~sys-cluster/liblogthread-${PV}
418 - ~sys-cluster/libccs-${PV}
419 - ~sys-cluster/libdlm-${PV}
420 - dev-libs/libxml2
421 - =sys-libs/slang-2*
422 - dbus? ( sys-apps/dbus )"
423 -RDEPEND="${DEPEND}
424 - ~sys-cluster/cman-${PV}"
425 -
426 -S=${WORKDIR}/${MY_P}/${PN}
427 -
428 -src_prepare() {
429 - epatch "${FILESDIR}/${P}-fix_libxml2.patch"
430 -}
431 -
432 -src_configure() {
433 - local myopts=""
434 - use dbus || myopts="--disable_dbus"
435 - cd "${WORKDIR}"/${MY_P}
436 - ./configure \
437 - --cc="$(tc-getCC)" \
438 - --cflags="-Wall" \
439 - --libdir=/usr/$(get_libdir) \
440 - --disable_kernel_check \
441 - --somajor="$MAJ_PV" \
442 - --sominor="$MIN_PV" \
443 - --dlmlibdir=/usr/$(get_libdir) \
444 - --dlmincdir=/usr/include \
445 - --cmanlibdir=/usr/$(get_libdir) \
446 - --cmanincdir=/usr/include \
447 - ${myopts} \
448 - || die "configure problem"
449 -}
450 -
451 -src_install() {
452 - default
453 -
454 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
455 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
456 -}
Report Message
Find on MARC Find on Google Groups