Changes - j0ke.net Open Build Service

Changes of Revision 11

[-] [+]	Added	heartbeat.spec
@@ -0,0 +1,1408 @@ +%define ENABLE_SNMP_SUBAGENT 0 +%define ENABLE_MGMT 1 +%define uid 24 +%define gname haclient +%define uname hacluster +Summary: Heartbeat subsystem for High-Availability Linux +Name: heartbeat +Version: 2.1.2 +Release: 2%{?dist} +License: GPLv2 and LGPLv2+ +URL: http://linux-ha.org/ +Group: System Environment/Daemons +Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz +Patch0: heartbeat-fedora-pam.patch +Patch1: heartbeat-fedora-chkconfig.patch +Patch2: heartbeat-2.1.2-open.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: glib2-devel +BuildRequires: iputils +BuildRequires: libnet-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: net-snmp-devel >= 5.4 +BuildRequires: bzip2-devel +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: gettext +%if %{ENABLE_MGMT} +BuildRequires: gnutls-devel +BuildRequires: pam-devel +BuildRequires: python-devel +BuildRequires: swig +%endif +Requires: ldirectord = %{version}-%{release} +Requires: pygtk2 >= 2.4 +Requires(pre): fedora-usermgmt +Requires(postun): fedora-usermgmt +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +%if %{ENABLE_MGMT} +Requires: gettext +%endif + +%description +heartbeat is a basic high-availability subsystem for Linux-HA. +It will run scripts at initialization, and when machines go up or down. +This version will also perform IP address takeover using gratuitous ARPs. +It supports "n-node" clusters with significant capabilities for managing +resources and dependencies. + +In addition it continues to support the older release 1 style of +2-node clustering. + +It implements the following kinds of heartbeats: + - Serial ports + - UDP/IP multicast (ethernet, etc) + - UDP/IP broadcast (ethernet, etc) + - UDP/IP heartbeats + - "ping" heartbeats (for routers, switches, etc.) + (to be used for breaking ties in 2-node systems) + +%package -n ldirectord +Summary: Monitor daemon for maintaining high availability resources +Group: System Environment/Daemons +Requires: ipvsadm +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig + +%description -n ldirectord +ldirectord is a stand-alone daemon to monitor services of real +for virtual services provided by The Linux Virtual Server +(http://www.linuxvirtualserver.org/). It is simple to install +and works with the heartbeat code (http://www.linux-ha.org/). + +%package -n stonith +Requires: net-snmp-libs +Summary: Provides an interface to Shoot The Other Node In The Head +Group: System Environment/Daemons + +%description -n stonith +The STONITH module (a.k.a. STONITH) provides an extensible interface +for remotely powering down a node in the cluster. The idea is quite simple: +When the software running on one machine wants to make sure another +machine in the cluster is not using a resource, pull the plug on the other +machine. It's simple and reliable, albeit admittedly brutal. + +%package -n pils +Summary: Provides a general plugin and interface loading library +Group: System Environment/Daemons + +%description -n pils +PILS is an generalized and portable open source Plugin and Interface Loading +System. PILS was developed as part of the Open Cluster Framework reference +implementation, and is designed to be directly usable by a wide variety of +other applications. +PILS manages both plugins (loadable objects), and the interfaces these plugins +implement. PILS is designed to support any number of plugins implementing any +number of interfaces. + +%package devel +Summary: Heartbeat development package +Group: System Environment/Daemons +Requires: heartbeat = %{version}-%{release} + +%description devel +Heartbeat development package + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +# disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness' +CFLAGS=${RPM_OPT_FLAGS} \ +%configure \ + --with-ocf-root=%{_datadir}/ocf \ + --disable-fatal-warnings \ + --disable-static \ +%if %{ENABLE_MGMT} + --enable-mgmt +%else + --disable-mgmt +%endif + +# get rid of rpath +sed -i 's\|^hardcode_libdir_flag_spec=.\|hardcode_libdir_flag_spec=""\|g' libtool +sed -i 's\|^runpath_var=LD_RUN_PATH\|runpath_var=DIE_RPATH_DIE\|g' libtool + +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +( + cd $RPM_BUILD_ROOT/etc/ha.d/resource.d + ln -s /usr/sbin/ldirectord ldirectord +) + +# cleanup +[ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man +[ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool +find $RPM_BUILD_ROOT -type f -name .la -exec rm -f {} ';' + +sed -i -e '1i# --Shell-script--' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs +sed -i -e '1i# --Shell-script--' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs +chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs +chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs +chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat-gui/pymgmt.py + +# fix some wrong line endings issues +sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPDatabase +sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPInstance + +%find_lang haclient + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +/usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null \|\| : +/usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \ + -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null \|\| : + +%post +/sbin/ldconfig +/sbin/chkconfig --add heartbeat + +%postun -p /sbin/ldconfig + +%preun +if [ $1 = 0 ] ; then + /sbin/service heartbeat stop + /sbin/chkconfig --del heartbeat +fi + +/sbin/ldconfig +test "$1" != 0 \|\| /usr/sbin/fedora-userdel %{uname} &>/dev/null \|\| : +test "$1" != 0 \|\| /usr/sbin/fedora-groupdel %{gname} &>/dev/null \|\| : + +%post -n ldirectord +/sbin/chkconfig --add ldirectord + +%postun -n ldirectord -p /sbin/ldconfig + +%preun -n ldirectord +/sbin/chkconfig --del ldirectord + +%post -n stonith -p /sbin/ldconfig + +%postun -n stonith -p /sbin/ldconfig + +%post -n pils -p /sbin/ldconfig + +%postun -n pils -p /sbin/ldconfig +
[-] [+]	Added	heartbeat-2.1.2-open.patch ^
@@ -0,0 +1,24 @@ +diff -Nur heartbeat-2.1.2.orig/heartbeat/heartbeat.c heartbeat-2.1.2/heartbeat/heartbeat.c +--- heartbeat-2.1.2.orig/heartbeat/heartbeat.c 2007-08-01 20:06:54.000000000 -0600 ++++ heartbeat-2.1.2/heartbeat/heartbeat.c 2007-08-14 22:21:46.000000000 -0600 +@@ -862,7 +862,7 @@ + + ourproc = procinfo->nprocs; + +- if (mp->vf->open(mp) != HA_OK){ ++ if ((mp->vf->open)(mp) != HA_OK){ + cl_log(LOG_ERR, "cannot open %s %s", + mp->type, + mp->name); +diff -Nur heartbeat-2.1.2.orig/lib/clplumbing/cl_msg.c heartbeat-2.1.2/lib/clplumbing/cl_msg.c +--- heartbeat-2.1.2.orig/lib/clplumbing/cl_msg.c 2007-08-01 20:06:54.000000000 -0600 ++++ heartbeat-2.1.2/lib/clplumbing/cl_msg.c 2007-08-14 21:36:14.000000000 -0600 +@@ -145,7 +145,7 @@ + return -1; + } + +- return open(filename, O_WRONLY\|O_CREAT\|O_APPEND); ++ return open(filename, O_WRONLY\|O_CREAT\|O_APPEND, 0755); + + } +
[-] [+]	Added	heartbeat-fedora-chkconfig.patch ^
@@ -0,0 +1,63 @@ +diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in +--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in 2006-04-14 21:25:33.000000000 +0200 ++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in 2006-04-27 20:32:29.000000000 +0200 +@@ -13,7 +13,7 @@ + # We don't hate anyone, and like for everyone to use + # our software, no matter what OS or distribution you're using. + # +-# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ ++# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ + # description: Startup script high-availability services. + # processname: heartbeat + # pidfile: @localstatedir@/run/heartbeat.pid +@@ -391,12 +391,7 @@ + StartHA + RC=$? + Echo +- if +- [ $RC -eq 0 ] +- then +- [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR +- touch $LOCKDIR/$SUBSYS +- fi ++ [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat + RunStartStop post-start $RC + ;; + +@@ -413,11 +408,7 @@ + StopHA + RC=$? + Echo +- if +- [ $RC -eq 0 ] +- then +- rm -f $LOCKDIR/$SUBSYS +- fi ++ [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat + RunStartStop post-stop $RC + StopLogd + ;; +diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord +--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 ++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord 2006-04-27 20:33:35.000000000 +0200 +@@ -2,7 +2,7 @@ + # + # ldirectord Linux Director Daemon + # +-# chkconfig: 2345 92 40 ++# chkconfig: - 92 40 + # description: Start and stop ldirectord on non-heartbeat systems + # Using the config file /etc/ha.d/ldirectord.cf + # +@@ -59,9 +59,11 @@ + case "$1" in + start) + action "Starting ldirectord" $DAEMON start ++ touch /var/lock/subsys/ldirectord + ;; + stop) + action "Stopping ldirectord" $DAEMON stop ++ rm -f /var/lock/subsys/ldirectord + ;; + restart) + action "Restarting ldirectord" $DAEMON restart
[-] [+]	Added	heartbeat-fedora-pam.patch ^
@@ -0,0 +1,15 @@ +diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam +--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 ++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam 2006-04-27 20:36:29.000000000 +0200 +@@ -1,3 +1,8 @@ +-auth required pam_unix.so +-account required pam_unix.so +- ++#%PAM-1.0 ++auth sufficient pam_rootok.so ++auth sufficient pam_timestamp.so ++auth required pam_stack.so service=system-auth ++session required pam_permit.so ++session optional pam_xauth.so ++session optional pam_timestamp.so ++account required pam_permit.so
	Added	heartbeat-2.1.2-2.fc8.src.rpm ^
	Added	heartbeat-2.1.2.tar.gz ^