- Version: 2.0.1

Changed files:
    corosync-install.patch -> 1.1
    corosync-lib_deps.patch -> 1.1
    corosync.spec -> 1.19

diff --git a/corosync-install.patch b/corosync-install.patch
new file mode 100644 (file)
index 0000000..fd722b7
--- /dev/null
+++ b/corosync-install.patch
@@ -0,0 +1,26 @@
+--- corosync-2.0.1.orig/configure.ac   2012-05-22 08:52:01.000000000 +0200
++++ corosync-2.0.1/configure.ac        2012-07-01 11:05:47.160318795 +0200
+@@ -601,8 +601,8 @@
+ 
+ AC_SUBST([OS_LDL])
+ AM_CONDITIONAL(INSTALL_TESTAGENTS, test -n "${enable_testagents}")
+ AM_CONDITIONAL(INSTALL_MIB, test "${enable_snmp}" = "1")
+-AM_CONDITIONAL(INSTALL_DBUSCONF, test "${enable_dbus}" = "1")
++AM_CONDITIONAL(INSTALL_DBUSCONF, test "${enable_dbus}" = "yes")
+ AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
+ AC_SUBST([NSS_LDFLAGS])
+ 
+--- corosync-2.0.1.orig/init/Makefile.am       2012-05-22 08:52:01.000000000 +0200
++++ corosync-2.0.1/init/Makefile.am    2012-07-01 11:11:22.512547818 +0200
+@@ -39,10 +39,8 @@
+ if INSTALL_SYSTEMD
+ systemdconfdir           = $(SYSTEMDDIR)
+ systemdconf_DATA   = corosync.service corosync-notifyd.service
+-initscriptdir    = $(INITWRAPPERSDIR)
+-else
+-initscriptdir    = $(INITDDIR)
+ endif
++initscriptdir    = $(INITDDIR)
+ initscript_SCRIPTS  = corosync corosync-notifyd
+ 
+ %: %.in Makefile

diff --git a/corosync-lib_deps.patch b/corosync-lib_deps.patch
new file mode 100644 (file)
index 0000000..0bdaef5
--- /dev/null
+++ b/corosync-lib_deps.patch
@@ -0,0 +1,24 @@
+diff -dur -x '*~' corosync-2.0.1.orig/exec/Makefile.am corosync-2.0.1/exec/Makefile.am
+--- corosync-2.0.1.orig/exec/Makefile.am       2012-07-01 10:53:36.000000000 +0200
++++ corosync-2.0.1/exec/Makefile.am    2012-07-01 10:55:31.786194954 +0200
+@@ -86,7 +86,7 @@
+ libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
+       $(CC) -shared -o $@ \
+               -Wl,-soname=libtotem_pg.so.$(SOMAJOR) \
+-              $(LDFLAGS) $^ $(nss_LIBS) $(rdmacm_LIBS) $(ibverbs_LIBS) -lpthread $(LIBS)
++              $(LDFLAGS) $^ $(nss_LIBS) $(rdmacm_LIBS) $(ibverbs_LIBS) $(LIBQB_LIBS) -lpthread $(LIBS)
+       ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
+       ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
+ 
+diff -dur -x '*~' corosync-2.0.1.orig/lib/Makefile.am corosync-2.0.1/lib/Makefile.am
+--- corosync-2.0.1.orig/lib/Makefile.am        2012-05-22 08:51:00.000000000 +0200
++++ corosync-2.0.1/lib/Makefile.am     2012-07-01 10:56:17.943172941 +0200
+@@ -55,7 +55,7 @@
+ libquorum_a_SOURCES   = quorum.c
+ libvotequorum_a_SOURCES       = votequorum.c
+ libcmap_a_SOURCES     = cmap.c
+-SAM_LINKER_ADD                = -L. -lquorum -lcmap
++SAM_LINKER_ADD                = -L. -lquorum -lcmap $(LIBQB_LIBS)
+ libsam_a_SOURCES      = sam.c
+ 
+ noinst_HEADERS                = util.h \

diff --git a/corosync.spec b/corosync.spec
index 014b8dbdbfa018e3fded545009028040021e9e56..701ce8f267e74a2ce35c9662761fa9584e6a6fd5 100644 (file)
--- a/corosync.spec
+++ b/corosync.spec
@@ -4,26 +4,34 @@
 %bcond_without dbus            # DBus events
 %bcond_without rdma            # RDMA support
 %bcond_without snmp            # SNMP protocol support
+%bcond_with testagents
+%bcond_with watchdog
+%bcond_with monitoring
+%bcond_with xmlconf
 #
 Summary:       Corosync - OSI Certified implementation of a complete cluster engine
 Summary(pl.UTF-8):     Corosync - implementacja silnika klastrowego certyfikowana przez OSI
 Name:          corosync
-Version:       1.4.2
-Release:       1
+Version:       2.0.1
+Release:       0.1
 License:       BSD
 Group:         Base
-Source0:       ftp://ftp:downloads@corosync.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 061ee5522097fee69475b38a66bf1d6a
+Source0:       ftp://ftp:downloads@corosync.org/downloads/%{name}-%{version}/corosync-%{version}.tar.gz
+# Source0-md5: 9e23f3f5594676455ff39ff363658155
 Patch0:                %{name}-makefile.patch
+Patch1:                %{name}-lib_deps.patch
+Patch2:                %{name}-install.patch
 URL:           http://www.corosync.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
 %{?with_dbus:BuildRequires:    dbus-devel}
 %{?with_apidocs:BuildRequires: doxygen}
+BuildRequires: libqb-devel
 %if %{with rdma}
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
 %endif
+%{?with_xmlconf:BuildRequires: libxslt}
 %{?with_snmp:BuildRequires:    net-snmp-devel}
 BuildRequires: nss-devel
 BuildRequires: pkgconfig
@@ -93,23 +101,36 @@ Corosync SNMP MIB data.
 %description -n mibs-corosync -l pl.UTF-8
 Dane SNMP MIB dla Corosync.
 
+%package -n corosync-testagents
+Summary:       The Corosync Cluster Engine Test Agents
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description -n corosync-testagents
+This package contains corosync test agents.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-# options not yet supported: monitoring, watchdog, augeas
 %configure \
+       %{?with_testagents:--enable-testagents} \
+       %{?with_watchdog:--enable-watchdog} \
+       %{?with_monitoring:--enable-monitoring} \
+       %{?with_xmlconf:--enable-xmlconf} \
        %{?with_dbus:--enable-dbus} \
-       --enable-nss \
        %{?with_rdma:--enable-rdma} \
        %{?with_snmp:--enable-snmp} \
-       --with-initddir=/etc/rc.d/init.d \
-       --with-lcrso-dir=%{_libdir}/lcrso
+       --enable-systemd \
+       --with-systemddir=%{systemdunitdir} \
+       --with-initddir=/etc/rc.d/init.d
 
 %{__make}
 
@@ -132,77 +153,95 @@ sed -e 's/^/#/' $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add corosync
+%service corosync restart "Corosync Cluster Engine"
+
+%systemd_post corosync.service
+
+%preun
+if [ "$1" = "0" ]; then
+        %service corosync stop
+        /sbin/chkconfig --del corosync
+fi
+%systemd_preun corosync.service
+
+%postun
+%systemd_reload
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE README.devmap README.recovery SECURITY TODO conf/corosync.conf.example*
+%doc AUTHORS ChangeLog LICENSE README.recovery SECURITY TODO conf/corosync.conf.example*
+%if %{with xmlconf}
+%doc conf/corosync.xml.example*
+%endif
 %attr(754,root,root) /etc/rc.d/init.d/corosync
 %attr(754,root,root) /etc/rc.d/init.d/corosync-notifyd
 %dir %{_sysconfdir}/corosync
+%{systemdunitdir}/corosync.service
+%{systemdunitdir}/corosync-notifyd.service
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/corosync/corosync.conf
 %attr(755,root,root) %{_bindir}/corosync-blackbox
 %attr(755,root,root) %{_sbindir}/corosync
 %attr(755,root,root) %{_sbindir}/corosync-cfgtool
+%attr(755,root,root) %{_sbindir}/corosync-cmapctl
 %attr(755,root,root) %{_sbindir}/corosync-cpgtool
 %attr(755,root,root) %{_sbindir}/corosync-fplay
 %attr(755,root,root) %{_sbindir}/corosync-keygen
 %attr(755,root,root) %{_sbindir}/corosync-notifyd
-%attr(755,root,root) %{_sbindir}/corosync-objctl
-%attr(755,root,root) %{_sbindir}/corosync-pload
 %attr(755,root,root) %{_sbindir}/corosync-quorumtool
-%attr(755,root,root) %{_libdir}/lcrso/*.lcrso
 %{_mandir}/man5/corosync.conf.5*
 %{_mandir}/man8/corosync.8*
 %{_mandir}/man8/corosync-blackbox.8*
+%{_mandir}/man8/corosync-cmapctl.8*
 %{_mandir}/man8/corosync-cfgtool.8*
 %{_mandir}/man8/corosync-cpgtool.8*
 %{_mandir}/man8/corosync-fplay.8*
 %{_mandir}/man8/corosync-keygen.8*
 %{_mandir}/man8/corosync-notifyd.8*
-%{_mandir}/man8/corosync-objctl.8*
-%{_mandir}/man8/corosync-pload.8*
 %{_mandir}/man8/corosync-quorumtool.8*
+%if %{with xmlconf}
+%attr(755,root,root) %{_bindir}/corosync-xmlproc
+%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
+%dir %{_datadir}/corosync
+%dir %{_datadir}/corosync/xml2conf.xsl
+%{_datadir}/corosync/corosync
+%{_datadir}/corosync/corosync-notifyd
+%{_mandir}/man8/corosync-xmlproc.8*
+%{_mandir}/man5/corosync.xml.5*
+%endif
+%if %{with dbus}
+/etc/dbus-1/system.d/corosync-signals.conf
+%endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcfg.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcfg.so.4
-%attr(755,root,root) %{_libdir}/libconfdb.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libconfdb.so.4
-%attr(755,root,root) %{_libdir}/libcoroipcc.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcoroipcc.so.4
-%attr(755,root,root) %{_libdir}/libcoroipcs.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcoroipcs.so.4
+%attr(755,root,root) %{_libdir}/libcfg.so.6.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcfg.so.6
+%attr(755,root,root) %{_libdir}/libcmap.so.4.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcmap.so.4
+%attr(755,root,root) %{_libdir}/libcorosync_common.so.4.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcorosync_common.so.4
 %attr(755,root,root) %{_libdir}/libcpg.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcpg.so.4
-%attr(755,root,root) %{_libdir}/libevs.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libevs.so.4
-%attr(755,root,root) %{_libdir}/liblogsys.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblogsys.so.4
-%attr(755,root,root) %{_libdir}/libpload.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpload.so.4
 %attr(755,root,root) %{_libdir}/libsam.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsam.so.4
-%attr(755,root,root) %{_libdir}/libquorum.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libquorum.so.4
-%attr(755,root,root) %{_libdir}/libtotem_pg.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtotem_pg.so.4
-%attr(755,root,root) %{_libdir}/libvotequorum.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvotequorum.so.4
-%dir %{_libdir}/lcrso
+%attr(755,root,root) %{_libdir}/libquorum.so.5.*.*
+%attr(755,root,root) %ghost %{_libdir}/libquorum.so.5
+%attr(755,root,root) %{_libdir}/libtotem_pg.so.5.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtotem_pg.so.5
+%attr(755,root,root) %{_libdir}/libvotequorum.so.5.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvotequorum.so.5
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcfg.so
-%attr(755,root,root) %{_libdir}/libconfdb.so
-%attr(755,root,root) %{_libdir}/libcoroipcc.so
-%attr(755,root,root) %{_libdir}/libcoroipcs.so
+%attr(755,root,root) %{_libdir}/libcmap.so
+%attr(755,root,root) %{_libdir}/libcorosync_common.so
 %attr(755,root,root) %{_libdir}/libcpg.so
-%attr(755,root,root) %{_libdir}/libevs.so
-%attr(755,root,root) %{_libdir}/liblogsys.so
-%attr(755,root,root) %{_libdir}/libpload.so
 %attr(755,root,root) %{_libdir}/libsam.so
 %attr(755,root,root) %{_libdir}/libquorum.so
 %attr(755,root,root) %{_libdir}/libtotem_pg.so
@@ -210,43 +249,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/corosync
 %{_pkgconfigdir}/corosync.pc
 %{_pkgconfigdir}/libcfg.pc
-%{_pkgconfigdir}/libconfdb.pc
-%{_pkgconfigdir}/libcoroipcc.pc
-%{_pkgconfigdir}/libcoroipcs.pc
+%{_pkgconfigdir}/libcmap.pc
+%{_pkgconfigdir}/libcorosync_common.pc
 %{_pkgconfigdir}/libcpg.pc
-%{_pkgconfigdir}/libevs.pc
-%{_pkgconfigdir}/liblogsys.pc
-%{_pkgconfigdir}/libpload.pc
 %{_pkgconfigdir}/libquorum.pc
 %{_pkgconfigdir}/libsam.pc
 %{_pkgconfigdir}/libtotem_pg.pc
 %{_pkgconfigdir}/libvotequorum.pc
-%{_mandir}/man3/confdb_*.3*
+%{_mandir}/man3/cmap_*.3*
 %{_mandir}/man3/cpg_*.3*
-%{_mandir}/man3/evs_*.3*
+%{_mandir}/man3/quorum_*.3*
 %{_mandir}/man3/sam_*.3*
 %{_mandir}/man3/votequorum_*.3*
+%{_mandir}/man5/votequorum.5*
 # should be man7...
-%{_mandir}/man8/confdb_overview.8*
-%{_mandir}/man8/coroipc_overview.8*
+%{_mandir}/man8/cmap_keys.8*
+%{_mandir}/man8/cmap_overview.8*
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/cpg_overview.8*
-%{_mandir}/man8/evs_overview.8*
-%{_mandir}/man8/logsys_overview.8*
 %{_mandir}/man8/sam_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
-
+%{_mandir}/man8/quorum_overview.8*
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcfg.a
-%{_libdir}/libconfdb.a
-%{_libdir}/libcoroipcc.a
-%{_libdir}/libcoroipcs.a
+%{_libdir}/libcmap.a
+%{_libdir}/libcorosync_common.a
 %{_libdir}/libcpg.a
-%{_libdir}/libevs.a
-%{_libdir}/liblcr.a
-%{_libdir}/liblogsys.a
-%{_libdir}/libpload.a
 %{_libdir}/libsam.a
 %{_libdir}/libquorum.a
 %{_libdir}/libtotem_pg.a
@@ -257,3 +286,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/snmp/mibs/COROSYNC-MIB.txt
 %endif
+
+%if %{with testagents}
+%files -n corosync-testagents
+%defattr(644,root,root,755)
+%{_datadir}/corosync/tests/mem_leak_test.sh
+%{_datadir}/corosync/tests/net_breaker.sh
+%{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh
+%{_datadir}/corosync/tests/shm_leak_audit.sh
+%attr(755,root,root) %{_bindir}/cpg_test_agent
+%attr(755,root,root) %{_bindir}/sam_test_agent
+%attr(755,root,root) %{_bindir}/votequorum_test_agent
+%endif