- Update to 1.2.4 [1]

This port now also:

- respects NOPORTDOCS
- installs documentation in ${DOCSDIR} instead of ${DOCSDIR}-${PORTVERSION}
- builds on 4.x with an EXTRA_PATCH
- installs startup scripts in ${PREFIX}/etc/rc.d instead of hardcoded
  /usr/loal/etc/rc.d

PR:		93851
Submitted by:	Scott Kleihege <scott-ports@tummy.com> (maintainer) [1]
Security:	VuXML (f6447303-9ec9-11da-b410-000e0c2e438a)
This commit is contained in:
Emanuel Haupt 2006-04-18 21:53:58 +00:00
parent 6c80082325
commit a7d2a9a511
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=159905
10 changed files with 516 additions and 116 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= heartbeat
PORTVERSION= 1.2.3
PORTREVISION= 2
PORTVERSION= 1.2.4
CATEGORIES= sysutils
MASTER_SITES= http://linux-ha.org/download/
@ -15,31 +14,71 @@ MAINTAINER= scott-ports@tummy.com
COMMENT= Subsystem for High-Availability Clustering
BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \
xml2.5:${PORTSDIR}/textproc/libxml2
GNU_CONFIGURE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= glib12
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --disable-fatal-warnings
CONFIGURE_ARGS+= --disable-fatal-warnings \
--with-initdir=${PREFIX}/etc/rc.d
SUB_FILES= pkg-install
PKGDEINSTALL= ${PKGINSTALL}
MAN1= cl_status.1
MAN1= cl_status.1 hb_standby.1 hb_takeover.1
MAN8= apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \
stonith.8 supervise-ldirectord-config.8
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-lib-clplumbing-resource.h
.endif
post-patch:
${REINPLACE_CMD} -e "s#logrotate.d##" ${WRKSRC}/heartbeat/Makefile.in \
@${REINPLACE_CMD} -e "s|logrotate\.d||" \
${WRKSRC}/heartbeat/Makefile.in \
${WRKSRC}/ldirectord/Makefile.in
.if ${OSVERSION} < 500000
@${REINPLACE_CMD} -e 's|<sys/\(resource.h\)>|"\1"|' \
${WRKSRC}/lib/clplumbing/coredumps.c
.endif
.if !defined(NOPORTDOCS)
@${REINPLACE_CMD} -e 's|^\(docdir.*doc/\).*|\1${PORTNAME}|' \
${WRKSRC}/configure.in \
${WRKSRC}/configure \
${WRKSRC}/doc/Makefile.am \
${WRKSRC}/doc/Makefile.in
.else
@${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)doc\(.*\)|\1 \2|' \
${WRKSRC}/Makefile.am \
${WRKSRC}/Makefile.in \
${WRKSRC}/telecom/cms/Makefile.am \
${WRKSRC}/telecom/cms/Makefile.in
.endif
post-deinstall:
@${SH} ${PKGINSTALL} ${PKGNAME} DEINSTALL
post-install:
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
# some subdirs treat man as documentation, therefor we have to install
# those man pages manually if NOPORTDOCS is defined
.if defined(NOPORTDOCS)
.for f in ${MAN1}
${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MANPREFIX}/man/man1
.endfor
.for f in apphbd.8 heartbeat.8
${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MANPREFIX}/man/man8
.endfor
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (heartbeat-1.2.3.tar.gz) = 9fd126e5dff51cc8c1eee223c252a4af
SHA256 (heartbeat-1.2.3.tar.gz) = 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2
SIZE (heartbeat-1.2.3.tar.gz) = 1772513
MD5 (heartbeat-1.2.4.tar.gz) = 7e3f752af06c25f7141c4b67a538e718
SHA256 (heartbeat-1.2.4.tar.gz) = cb2516a965582651859ab48a44dd8764332897ef9a81986a0aa25dc9306378cf
SIZE (heartbeat-1.2.4.tar.gz) = 2102978

View file

@ -0,0 +1,154 @@
--- lib/clplumbing/resource.h.orig Tue Apr 18 23:30:49 2006
+++ lib/clplumbing/resource.h Tue Apr 18 23:28:06 2006
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 1982, 1986, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)resource.h 8.4 (Berkeley) 1/9/95
+ * $FreeBSD: /tmp/pcvs/ports/sysutils/heartbeat/files/Attic/extrapatch-lib-clplumbing-resource.h,v 1.1 2006-04-18 21:53:58 ehaupt Exp $
+ */
+
+#ifndef _SYS_RESOURCE_H_
+#define _SYS_RESOURCE_H_
+
+/*
+ * Process priority specifications to get/setpriority.
+ */
+#define PRIO_MIN -20
+#define PRIO_MAX 20
+
+#define PRIO_PROCESS 0
+#define PRIO_PGRP 1
+#define PRIO_USER 2
+
+/*
+ * Resource utilization information.
+ */
+
+#define RUSAGE_SELF 0
+#define RUSAGE_CHILDREN -1
+
+#include <sys/time.h>
+
+struct rusage {
+ struct timeval ru_utime; /* user time used */
+ struct timeval ru_stime; /* system time used */
+ long ru_maxrss; /* max resident set size */
+#define ru_first ru_ixrss
+ long ru_ixrss; /* integral shared memory size */
+ long ru_idrss; /* integral unshared data " */
+ long ru_isrss; /* integral unshared stack " */
+ long ru_minflt; /* page reclaims */
+ long ru_majflt; /* page faults */
+ long ru_nswap; /* swaps */
+ long ru_inblock; /* block input operations */
+ long ru_oublock; /* block output operations */
+ long ru_msgsnd; /* messages sent */
+ long ru_msgrcv; /* messages received */
+ long ru_nsignals; /* signals received */
+ long ru_nvcsw; /* voluntary context switches */
+ long ru_nivcsw; /* involuntary " */
+#define ru_last ru_nivcsw
+};
+
+/*
+ * Resource limits
+ */
+#define RLIMIT_CPU 0 /* cpu time in milliseconds */
+#define RLIMIT_FSIZE 1 /* maximum file size */
+#define RLIMIT_DATA 2 /* data size */
+#define RLIMIT_STACK 3 /* stack size */
+#define RLIMIT_CORE 4 /* core file size */
+#define RLIMIT_RSS 5 /* resident set size */
+#define RLIMIT_MEMLOCK 6 /* locked-in-memory address space */
+#define RLIMIT_NPROC 7 /* number of processes */
+#define RLIMIT_NOFILE 8 /* number of open files */
+#define RLIMIT_SBSIZE 9 /* maximum size of all socket buffers */
+#define RLIMIT_VMEM 10 /* virtual process size (inclusive of mmap) */
+
+#define RLIM_NLIMITS 11 /* number of resource limits */
+
+#define RLIM_INFINITY ((rlim_t)(((u_quad_t)1 << 63) - 1))
+
+
+/*
+ * Resource limit string identifiers
+ */
+
+#ifdef _RLIMIT_IDENT
+static char *rlimit_ident[] = {
+ "cpu",
+ "fsize",
+ "data",
+ "stack",
+ "core",
+ "rss",
+ "memlock",
+ "nproc",
+ "nofile",
+ "sbsize",
+ "vmem",
+};
+#endif
+
+struct orlimit {
+ int32_t rlim_cur; /* current (soft) limit */
+ int32_t rlim_max; /* maximum value for rlim_cur */
+};
+
+struct rlimit {
+ rlim_t rlim_cur; /* current (soft) limit */
+ rlim_t rlim_max; /* maximum value for rlim_cur */
+};
+
+/* Load average structure. */
+struct loadavg {
+ fixpt_t ldavg[3];
+ long fscale;
+};
+
+#ifdef _KERNEL
+extern struct loadavg averunnable;
+
+#else
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int getpriority __P((int, int));
+int getrlimit __P((int, struct rlimit *));
+int getrusage __P((int, struct rusage *));
+int setpriority __P((int, int, int));
+int setrlimit __P((int, const struct rlimit *));
+__END_DECLS
+
+#endif /* _KERNEL */
+#endif /* !_SYS_RESOURCE_H_ */

View file

@ -1,5 +1,6 @@
#! /bin/sh
BATCH=${BATCH:=no}
base=%%PREFIX%%
ask() {
@ -7,7 +8,7 @@ ask() {
question=$1
default=$2
if [ -z "${PACKAGE_BUILDING}" ]; then
if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
read -p "${question} [${default}]? " answer
fi
if [ x${answer} = x ]; then
@ -133,17 +134,17 @@ EOF
make_account ${user} ${group} "${user} ${group}" "/nonexistent"
echo "Adding empty dirs and pid file."
test -d /var/lib/heartbeat/ckpt || \
install -d -m 755 /var/lib/heartbeat/ckpt
test -d /var/lib/heartbeat/ccm || \
install -d -m 755 /var/lib/heartbeat/ccm
test -d /var/lock/subsys || \
install -d -m 755 /var/lock/subsys
test -d ${base}/var/lib/heartbeat/ckpt || \
install -d -m 755 ${base}/var/lib/heartbeat/ckpt
test -d ${base}/var/lib/heartbeat/ccm || \
install -d -m 755 ${base}/var/lib/heartbeat/ccm
test -d ${base}/var/lock/subsys || \
install -d -m 755 ${base}/var/lock/subsys
test -d ${base}/etc/ha.d/conf || \
install -d -m 755 ${base}/etc/ha.d/conf
test -f /var/run/heartbeat.pid || \
test -f ${base}/var/run/heartbeat.pid || \
install -m 644 -o ${user} -g ${group} /dev/null \
/var/run/heartbeat.pid
${base}/var/run/heartbeat.pid
;;
DEINSTALL)
@ -160,15 +161,14 @@ DEINSTALL)
delete_account hacluster haclient
echo "Removing runtime files"
if [ -d /var/lib/heartbeat ]; then
rm -r /var/lib/heartbeat
if [ -d ${base}/var/lib/heartbeat ]; then
rm -r ${base}/var/lib/heartbeat
fi
if [ -f /var/lock/subsys/heartbeat ]; then
rm /var/lock/subsys/heartbeat
if [ -f ${base}/var/lock/subsys/heartbeat ]; then
rm ${base}/var/lock/subsys/heartbeat
fi
if [ -f /var/run/heartbeat.pid ]; then
rm /var/run/heartbeat.pid
if [ -f ${base}/var/run/heartbeat.pid ]; then
rm ${base}/var/run/heartbeat.pid
fi
;;
esac

View file

@ -14,6 +14,7 @@ etc/ha.d/resource.d/IPaddr
etc/ha.d/resource.d/IPaddr2
etc/ha.d/resource.d/IPsrcaddr
etc/ha.d/resource.d/LVM
etc/ha.d/resource.d/LVSSyncDaemonSwap
etc/ha.d/resource.d/LinuxSCSI
etc/ha.d/resource.d/MailTo
etc/ha.d/resource.d/OCF
@ -35,8 +36,10 @@ include/clplumbing/apphb_cs.h
include/clplumbing/base64.h
include/clplumbing/cl_log.h
include/clplumbing/cl_malloc.h
include/clplumbing/cl_misc.h
include/clplumbing/cl_poll.h
include/clplumbing/cl_signal.h
include/clplumbing/coredumps.h
include/clplumbing/cpulimits.h
include/clplumbing/ipc.h
include/clplumbing/loggingdaemon.h
@ -82,8 +85,6 @@ lib/heartbeat/apphbd
lib/heartbeat/apphbtest
lib/heartbeat/ccm
lib/heartbeat/ccm_testclient
lib/heartbeat/checkpointd
lib/heartbeat/ckpttest
lib/heartbeat/clmtest
lib/heartbeat/cts/CM_fs.py
lib/heartbeat/cts/CM_hb.py
@ -146,10 +147,6 @@ lib/libccmclient.a
lib/libccmclient.la
lib/libccmclient.so
lib/libccmclient.so.0
lib/libckpt.a
lib/libckpt.la
lib/libckpt.so
lib/libckpt.so.0
lib/libclm.a
lib/libclm.la
lib/libclm.so
@ -186,6 +183,9 @@ lib/stonith/plugins/stonith/apcsmart.so
lib/stonith/plugins/stonith/baytech.a
lib/stonith/plugins/stonith/baytech.la
lib/stonith/plugins/stonith/baytech.so
lib/stonith/plugins/stonith/cyclades.a
lib/stonith/plugins/stonith/cyclades.la
lib/stonith/plugins/stonith/cyclades.so
lib/stonith/plugins/stonith/external.a
lib/stonith/plugins/stonith/external.la
lib/stonith/plugins/stonith/external.so
@ -204,6 +204,10 @@ lib/stonith/plugins/stonith/nw_rpc100s.so
lib/stonith/plugins/stonith/rcd_serial.a
lib/stonith/plugins/stonith/rcd_serial.la
lib/stonith/plugins/stonith/rcd_serial.so
lib/stonith/plugins/stonith/ribcl.py
lib/stonith/plugins/stonith/riloe.a
lib/stonith/plugins/stonith/riloe.la
lib/stonith/plugins/stonith/riloe.so
lib/stonith/plugins/stonith/rps10.a
lib/stonith/plugins/stonith/rps10.la
lib/stonith/plugins/stonith/rps10.so
@ -213,33 +217,36 @@ lib/stonith/plugins/stonith/ssh.so
lib/stonith/plugins/stonith/wti_nps.a
lib/stonith/plugins/stonith/wti_nps.la
lib/stonith/plugins/stonith/wti_nps.so
lib/stonith/plugins/stonith/drac3.so
lib/stonith/plugins/stonith/drac3.la
lib/stonith/plugins/stonith/drac3.a
sbin/ldirectord
sbin/meatclient
sbin/stonith
sbin/supervise-ldirectord-config
share/doc/heartbeat-1.2.3/AUTHORS
share/doc/heartbeat-1.2.3/COPYING
share/doc/heartbeat-1.2.3/ChangeLog
share/doc/heartbeat-1.2.3/DirectoryMap.txt
share/doc/heartbeat-1.2.3/GettingStarted.html
share/doc/heartbeat-1.2.3/GettingStarted.txt
share/doc/heartbeat-1.2.3/HardwareGuide.html
share/doc/heartbeat-1.2.3/HardwareGuide.txt
share/doc/heartbeat-1.2.3/README
share/doc/heartbeat-1.2.3/Requirements.html
share/doc/heartbeat-1.2.3/Requirements.txt
share/doc/heartbeat-1.2.3/apphbd.cf
share/doc/heartbeat-1.2.3/authkeys
share/doc/heartbeat-1.2.3/faqntips.html
share/doc/heartbeat-1.2.3/faqntips.txt
share/doc/heartbeat-1.2.3/ha.cf
share/doc/heartbeat-1.2.3/haresources
share/doc/heartbeat-1.2.3/heartbeat_api.html
share/doc/heartbeat-1.2.3/heartbeat_api.txt
share/doc/heartbeat-1.2.3/rsync.html
share/doc/heartbeat-1.2.3/rsync.txt
share/doc/heartbeat-1.2.3/startstop
@dirrm share/doc/heartbeat-1.2.3
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/DirectoryMap.txt
%%PORTDOCS%%%%DOCSDIR%%/GettingStarted.html
%%PORTDOCS%%%%DOCSDIR%%/GettingStarted.txt
%%PORTDOCS%%%%DOCSDIR%%/HardwareGuide.html
%%PORTDOCS%%%%DOCSDIR%%/HardwareGuide.txt
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/Requirements.html
%%PORTDOCS%%%%DOCSDIR%%/Requirements.txt
%%PORTDOCS%%%%DOCSDIR%%/apphbd.cf
%%PORTDOCS%%%%DOCSDIR%%/authkeys
%%PORTDOCS%%%%DOCSDIR%%/faqntips.html
%%PORTDOCS%%%%DOCSDIR%%/faqntips.txt
%%PORTDOCS%%%%DOCSDIR%%/ha.cf
%%PORTDOCS%%%%DOCSDIR%%/haresources
%%PORTDOCS%%%%DOCSDIR%%/heartbeat_api.html
%%PORTDOCS%%%%DOCSDIR%%/heartbeat_api.txt
%%PORTDOCS%%%%DOCSDIR%%/rsync.html
%%PORTDOCS%%%%DOCSDIR%%/rsync.txt
%%PORTDOCS%%%%DOCSDIR%%/startstop
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/stonith/plugins/stonith
@dirrm lib/stonith/plugins
@dirrm lib/stonith

View file

@ -6,8 +6,7 @@
#
PORTNAME= heartbeat
PORTVERSION= 1.2.3
PORTREVISION= 2
PORTVERSION= 1.2.4
CATEGORIES= sysutils
MASTER_SITES= http://linux-ha.org/download/
@ -15,31 +14,71 @@ MAINTAINER= scott-ports@tummy.com
COMMENT= Subsystem for High-Availability Clustering
BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \
xml2.5:${PORTSDIR}/textproc/libxml2
GNU_CONFIGURE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= glib12
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --disable-fatal-warnings
CONFIGURE_ARGS+= --disable-fatal-warnings \
--with-initdir=${PREFIX}/etc/rc.d
SUB_FILES= pkg-install
PKGDEINSTALL= ${PKGINSTALL}
MAN1= cl_status.1
MAN1= cl_status.1 hb_standby.1 hb_takeover.1
MAN8= apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \
stonith.8 supervise-ldirectord-config.8
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-lib-clplumbing-resource.h
.endif
post-patch:
${REINPLACE_CMD} -e "s#logrotate.d##" ${WRKSRC}/heartbeat/Makefile.in \
@${REINPLACE_CMD} -e "s|logrotate\.d||" \
${WRKSRC}/heartbeat/Makefile.in \
${WRKSRC}/ldirectord/Makefile.in
.if ${OSVERSION} < 500000
@${REINPLACE_CMD} -e 's|<sys/\(resource.h\)>|"\1"|' \
${WRKSRC}/lib/clplumbing/coredumps.c
.endif
.if !defined(NOPORTDOCS)
@${REINPLACE_CMD} -e 's|^\(docdir.*doc/\).*|\1${PORTNAME}|' \
${WRKSRC}/configure.in \
${WRKSRC}/configure \
${WRKSRC}/doc/Makefile.am \
${WRKSRC}/doc/Makefile.in
.else
@${REINPLACE_CMD} -e 's|^\(SUBDIRS.*\)doc\(.*\)|\1 \2|' \
${WRKSRC}/Makefile.am \
${WRKSRC}/Makefile.in \
${WRKSRC}/telecom/cms/Makefile.am \
${WRKSRC}/telecom/cms/Makefile.in
.endif
post-deinstall:
@${SH} ${PKGINSTALL} ${PKGNAME} DEINSTALL
post-install:
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
# some subdirs treat man as documentation, therefor we have to install
# those man pages manually if NOPORTDOCS is defined
.if defined(NOPORTDOCS)
.for f in ${MAN1}
${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MANPREFIX}/man/man1
.endfor
.for f in apphbd.8 heartbeat.8
${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MANPREFIX}/man/man8
.endfor
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (heartbeat-1.2.3.tar.gz) = 9fd126e5dff51cc8c1eee223c252a4af
SHA256 (heartbeat-1.2.3.tar.gz) = 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2
SIZE (heartbeat-1.2.3.tar.gz) = 1772513
MD5 (heartbeat-1.2.4.tar.gz) = 7e3f752af06c25f7141c4b67a538e718
SHA256 (heartbeat-1.2.4.tar.gz) = cb2516a965582651859ab48a44dd8764332897ef9a81986a0aa25dc9306378cf
SIZE (heartbeat-1.2.4.tar.gz) = 2102978

View file

@ -0,0 +1,154 @@
--- lib/clplumbing/resource.h.orig Tue Apr 18 23:30:49 2006
+++ lib/clplumbing/resource.h Tue Apr 18 23:28:06 2006
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 1982, 1986, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)resource.h 8.4 (Berkeley) 1/9/95
+ * $FreeBSD: /tmp/pcvs/ports/sysutils/heartbeat2/files/Attic/extrapatch-lib-clplumbing-resource.h,v 1.1 2006-04-18 21:53:58 ehaupt Exp $
+ */
+
+#ifndef _SYS_RESOURCE_H_
+#define _SYS_RESOURCE_H_
+
+/*
+ * Process priority specifications to get/setpriority.
+ */
+#define PRIO_MIN -20
+#define PRIO_MAX 20
+
+#define PRIO_PROCESS 0
+#define PRIO_PGRP 1
+#define PRIO_USER 2
+
+/*
+ * Resource utilization information.
+ */
+
+#define RUSAGE_SELF 0
+#define RUSAGE_CHILDREN -1
+
+#include <sys/time.h>
+
+struct rusage {
+ struct timeval ru_utime; /* user time used */
+ struct timeval ru_stime; /* system time used */
+ long ru_maxrss; /* max resident set size */
+#define ru_first ru_ixrss
+ long ru_ixrss; /* integral shared memory size */
+ long ru_idrss; /* integral unshared data " */
+ long ru_isrss; /* integral unshared stack " */
+ long ru_minflt; /* page reclaims */
+ long ru_majflt; /* page faults */
+ long ru_nswap; /* swaps */
+ long ru_inblock; /* block input operations */
+ long ru_oublock; /* block output operations */
+ long ru_msgsnd; /* messages sent */
+ long ru_msgrcv; /* messages received */
+ long ru_nsignals; /* signals received */
+ long ru_nvcsw; /* voluntary context switches */
+ long ru_nivcsw; /* involuntary " */
+#define ru_last ru_nivcsw
+};
+
+/*
+ * Resource limits
+ */
+#define RLIMIT_CPU 0 /* cpu time in milliseconds */
+#define RLIMIT_FSIZE 1 /* maximum file size */
+#define RLIMIT_DATA 2 /* data size */
+#define RLIMIT_STACK 3 /* stack size */
+#define RLIMIT_CORE 4 /* core file size */
+#define RLIMIT_RSS 5 /* resident set size */
+#define RLIMIT_MEMLOCK 6 /* locked-in-memory address space */
+#define RLIMIT_NPROC 7 /* number of processes */
+#define RLIMIT_NOFILE 8 /* number of open files */
+#define RLIMIT_SBSIZE 9 /* maximum size of all socket buffers */
+#define RLIMIT_VMEM 10 /* virtual process size (inclusive of mmap) */
+
+#define RLIM_NLIMITS 11 /* number of resource limits */
+
+#define RLIM_INFINITY ((rlim_t)(((u_quad_t)1 << 63) - 1))
+
+
+/*
+ * Resource limit string identifiers
+ */
+
+#ifdef _RLIMIT_IDENT
+static char *rlimit_ident[] = {
+ "cpu",
+ "fsize",
+ "data",
+ "stack",
+ "core",
+ "rss",
+ "memlock",
+ "nproc",
+ "nofile",
+ "sbsize",
+ "vmem",
+};
+#endif
+
+struct orlimit {
+ int32_t rlim_cur; /* current (soft) limit */
+ int32_t rlim_max; /* maximum value for rlim_cur */
+};
+
+struct rlimit {
+ rlim_t rlim_cur; /* current (soft) limit */
+ rlim_t rlim_max; /* maximum value for rlim_cur */
+};
+
+/* Load average structure. */
+struct loadavg {
+ fixpt_t ldavg[3];
+ long fscale;
+};
+
+#ifdef _KERNEL
+extern struct loadavg averunnable;
+
+#else
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int getpriority __P((int, int));
+int getrlimit __P((int, struct rlimit *));
+int getrusage __P((int, struct rusage *));
+int setpriority __P((int, int, int));
+int setrlimit __P((int, const struct rlimit *));
+__END_DECLS
+
+#endif /* _KERNEL */
+#endif /* !_SYS_RESOURCE_H_ */

View file

@ -1,5 +1,6 @@
#! /bin/sh
BATCH=${BATCH:=no}
base=%%PREFIX%%
ask() {
@ -7,7 +8,7 @@ ask() {
question=$1
default=$2
if [ -z "${PACKAGE_BUILDING}" ]; then
if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
read -p "${question} [${default}]? " answer
fi
if [ x${answer} = x ]; then
@ -133,17 +134,17 @@ EOF
make_account ${user} ${group} "${user} ${group}" "/nonexistent"
echo "Adding empty dirs and pid file."
test -d /var/lib/heartbeat/ckpt || \
install -d -m 755 /var/lib/heartbeat/ckpt
test -d /var/lib/heartbeat/ccm || \
install -d -m 755 /var/lib/heartbeat/ccm
test -d /var/lock/subsys || \
install -d -m 755 /var/lock/subsys
test -d ${base}/var/lib/heartbeat/ckpt || \
install -d -m 755 ${base}/var/lib/heartbeat/ckpt
test -d ${base}/var/lib/heartbeat/ccm || \
install -d -m 755 ${base}/var/lib/heartbeat/ccm
test -d ${base}/var/lock/subsys || \
install -d -m 755 ${base}/var/lock/subsys
test -d ${base}/etc/ha.d/conf || \
install -d -m 755 ${base}/etc/ha.d/conf
test -f /var/run/heartbeat.pid || \
test -f ${base}/var/run/heartbeat.pid || \
install -m 644 -o ${user} -g ${group} /dev/null \
/var/run/heartbeat.pid
${base}/var/run/heartbeat.pid
;;
DEINSTALL)
@ -160,15 +161,14 @@ DEINSTALL)
delete_account hacluster haclient
echo "Removing runtime files"
if [ -d /var/lib/heartbeat ]; then
rm -r /var/lib/heartbeat
if [ -d ${base}/var/lib/heartbeat ]; then
rm -r ${base}/var/lib/heartbeat
fi
if [ -f /var/lock/subsys/heartbeat ]; then
rm /var/lock/subsys/heartbeat
if [ -f ${base}/var/lock/subsys/heartbeat ]; then
rm ${base}/var/lock/subsys/heartbeat
fi
if [ -f /var/run/heartbeat.pid ]; then
rm /var/run/heartbeat.pid
if [ -f ${base}/var/run/heartbeat.pid ]; then
rm ${base}/var/run/heartbeat.pid
fi
;;
esac

View file

@ -14,6 +14,7 @@ etc/ha.d/resource.d/IPaddr
etc/ha.d/resource.d/IPaddr2
etc/ha.d/resource.d/IPsrcaddr
etc/ha.d/resource.d/LVM
etc/ha.d/resource.d/LVSSyncDaemonSwap
etc/ha.d/resource.d/LinuxSCSI
etc/ha.d/resource.d/MailTo
etc/ha.d/resource.d/OCF
@ -35,8 +36,10 @@ include/clplumbing/apphb_cs.h
include/clplumbing/base64.h
include/clplumbing/cl_log.h
include/clplumbing/cl_malloc.h
include/clplumbing/cl_misc.h
include/clplumbing/cl_poll.h
include/clplumbing/cl_signal.h
include/clplumbing/coredumps.h
include/clplumbing/cpulimits.h
include/clplumbing/ipc.h
include/clplumbing/loggingdaemon.h
@ -82,8 +85,6 @@ lib/heartbeat/apphbd
lib/heartbeat/apphbtest
lib/heartbeat/ccm
lib/heartbeat/ccm_testclient
lib/heartbeat/checkpointd
lib/heartbeat/ckpttest
lib/heartbeat/clmtest
lib/heartbeat/cts/CM_fs.py
lib/heartbeat/cts/CM_hb.py
@ -146,10 +147,6 @@ lib/libccmclient.a
lib/libccmclient.la
lib/libccmclient.so
lib/libccmclient.so.0
lib/libckpt.a
lib/libckpt.la
lib/libckpt.so
lib/libckpt.so.0
lib/libclm.a
lib/libclm.la
lib/libclm.so
@ -186,6 +183,9 @@ lib/stonith/plugins/stonith/apcsmart.so
lib/stonith/plugins/stonith/baytech.a
lib/stonith/plugins/stonith/baytech.la
lib/stonith/plugins/stonith/baytech.so
lib/stonith/plugins/stonith/cyclades.a
lib/stonith/plugins/stonith/cyclades.la
lib/stonith/plugins/stonith/cyclades.so
lib/stonith/plugins/stonith/external.a
lib/stonith/plugins/stonith/external.la
lib/stonith/plugins/stonith/external.so
@ -204,6 +204,10 @@ lib/stonith/plugins/stonith/nw_rpc100s.so
lib/stonith/plugins/stonith/rcd_serial.a
lib/stonith/plugins/stonith/rcd_serial.la
lib/stonith/plugins/stonith/rcd_serial.so
lib/stonith/plugins/stonith/ribcl.py
lib/stonith/plugins/stonith/riloe.a
lib/stonith/plugins/stonith/riloe.la
lib/stonith/plugins/stonith/riloe.so
lib/stonith/plugins/stonith/rps10.a
lib/stonith/plugins/stonith/rps10.la
lib/stonith/plugins/stonith/rps10.so
@ -213,33 +217,36 @@ lib/stonith/plugins/stonith/ssh.so
lib/stonith/plugins/stonith/wti_nps.a
lib/stonith/plugins/stonith/wti_nps.la
lib/stonith/plugins/stonith/wti_nps.so
lib/stonith/plugins/stonith/drac3.so
lib/stonith/plugins/stonith/drac3.la
lib/stonith/plugins/stonith/drac3.a
sbin/ldirectord
sbin/meatclient
sbin/stonith
sbin/supervise-ldirectord-config
share/doc/heartbeat-1.2.3/AUTHORS
share/doc/heartbeat-1.2.3/COPYING
share/doc/heartbeat-1.2.3/ChangeLog
share/doc/heartbeat-1.2.3/DirectoryMap.txt
share/doc/heartbeat-1.2.3/GettingStarted.html
share/doc/heartbeat-1.2.3/GettingStarted.txt
share/doc/heartbeat-1.2.3/HardwareGuide.html
share/doc/heartbeat-1.2.3/HardwareGuide.txt
share/doc/heartbeat-1.2.3/README
share/doc/heartbeat-1.2.3/Requirements.html
share/doc/heartbeat-1.2.3/Requirements.txt
share/doc/heartbeat-1.2.3/apphbd.cf
share/doc/heartbeat-1.2.3/authkeys
share/doc/heartbeat-1.2.3/faqntips.html
share/doc/heartbeat-1.2.3/faqntips.txt
share/doc/heartbeat-1.2.3/ha.cf
share/doc/heartbeat-1.2.3/haresources
share/doc/heartbeat-1.2.3/heartbeat_api.html
share/doc/heartbeat-1.2.3/heartbeat_api.txt
share/doc/heartbeat-1.2.3/rsync.html
share/doc/heartbeat-1.2.3/rsync.txt
share/doc/heartbeat-1.2.3/startstop
@dirrm share/doc/heartbeat-1.2.3
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/DirectoryMap.txt
%%PORTDOCS%%%%DOCSDIR%%/GettingStarted.html
%%PORTDOCS%%%%DOCSDIR%%/GettingStarted.txt
%%PORTDOCS%%%%DOCSDIR%%/HardwareGuide.html
%%PORTDOCS%%%%DOCSDIR%%/HardwareGuide.txt
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/Requirements.html
%%PORTDOCS%%%%DOCSDIR%%/Requirements.txt
%%PORTDOCS%%%%DOCSDIR%%/apphbd.cf
%%PORTDOCS%%%%DOCSDIR%%/authkeys
%%PORTDOCS%%%%DOCSDIR%%/faqntips.html
%%PORTDOCS%%%%DOCSDIR%%/faqntips.txt
%%PORTDOCS%%%%DOCSDIR%%/ha.cf
%%PORTDOCS%%%%DOCSDIR%%/haresources
%%PORTDOCS%%%%DOCSDIR%%/heartbeat_api.html
%%PORTDOCS%%%%DOCSDIR%%/heartbeat_api.txt
%%PORTDOCS%%%%DOCSDIR%%/rsync.html
%%PORTDOCS%%%%DOCSDIR%%/rsync.txt
%%PORTDOCS%%%%DOCSDIR%%/startstop
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/stonith/plugins/stonith
@dirrm lib/stonith/plugins
@dirrm lib/stonith