From 95fb07577f7cddc1686d7277f78da6222a596369 Mon Sep 17 00:00:00 2001 From: Vladimir Sorokin Date: Tue, 3 Aug 2010 12:15:42 +0400 Subject: corosync: new version 1.2.7 * bugfix release, considered as safe upgrade Signed-off-by: Vladimir Sorokin Signed-off-by: Roman I Khimov --- recipes/corosync/corosync_1.2.6.bb | 40 --------------------- recipes/corosync/corosync_1.2.7.bb | 41 ++++++++++++++++++++++ .../corosync/files/fix-define-semun-union.patch | 22 ++++++++++++ 3 files changed, 63 insertions(+), 40 deletions(-) delete mode 100644 recipes/corosync/corosync_1.2.6.bb create mode 100644 recipes/corosync/corosync_1.2.7.bb create mode 100644 recipes/corosync/files/fix-define-semun-union.patch diff --git a/recipes/corosync/corosync_1.2.6.bb b/recipes/corosync/corosync_1.2.6.bb deleted file mode 100644 index 41287a0c02..0000000000 --- a/recipes/corosync/corosync_1.2.6.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "OSI Certified implementation of a complete cluster engine" -LICENSE = "BSD" - -PR = "r1" - -SRC_URI = " \ - ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \ - file://fix-lcrso-linkage.patch \ - file://init \ - file://corosync.conf \ - file://volatiles \ - " -SRC_URI[md5sum] = "82d91373585f0d48cb98a8599a237e48" -SRC_URI[sha256sum] = "ad41e3133659a5fb32e878aa85199aba6cc84aa5e0e913b4f6e31c4a4805f9d9" - - -inherit autotools_stage update-rc.d - -INITSCRIPT_NAME = "corosync-daemon" - -EXTRA_OECONF = "--disable-nss" - -FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default/volatiles - # Original init script is too bashy - rm -f ${D}/${sysconfdir}/init.d/corosync - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/corosync-daemon - install -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/05_corosync -} - -pkg_postinst_${PN} () { - set -e - grep haclient /etc/group || addgroup haclient - grep hacluster /etc/passwd || adduser --disabled-password --home=/var/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster - /etc/init.d/populate-volatile.sh update -} diff --git a/recipes/corosync/corosync_1.2.7.bb b/recipes/corosync/corosync_1.2.7.bb new file mode 100644 index 0000000000..c77054be66 --- /dev/null +++ b/recipes/corosync/corosync_1.2.7.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "OSI Certified implementation of a complete cluster engine" +LICENSE = "BSD" + +PR = "r0" + +SRC_URI = " \ + ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \ + file://fix-lcrso-linkage.patch \ + file://init \ + file://corosync.conf \ + file://volatiles \ + file://fix-define-semun-union.patch \ + " +SRC_URI[md5sum] = "a1f5b03512977d495819e2ed05ba645b" +SRC_URI[sha256sum] = "0f774cee5d9f5d3e20b146c8719115c029815015952b48de1b99b61b462367d1" + + +inherit autotools_stage update-rc.d + +INITSCRIPT_NAME = "corosync-daemon" + +EXTRA_OECONF = "--disable-nss" + +FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default/volatiles + # Original init script is too bashy + rm -f ${D}/${sysconfdir}/init.d/corosync + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/corosync-daemon + install -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/05_corosync +} + +pkg_postinst_${PN} () { + set -e + grep haclient /etc/group || addgroup haclient + grep hacluster /etc/passwd || adduser --disabled-password --home=/var/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster + /etc/init.d/populate-volatile.sh update +} diff --git a/recipes/corosync/files/fix-define-semun-union.patch b/recipes/corosync/files/fix-define-semun-union.patch new file mode 100644 index 0000000000..7ce5ab6733 --- /dev/null +++ b/recipes/corosync/files/fix-define-semun-union.patch @@ -0,0 +1,22 @@ +diff -rupN corosync-1.2.7/lib/coroipcc.c corosync-1.2.7.new/lib/coroipcc.c +--- corosync-1.2.7/lib/coroipcc.c 2010-07-22 03:13:42.000000000 +0400 ++++ corosync-1.2.7.new/lib/coroipcc.c 2010-08-03 12:06:36.000000000 +0400 +@@ -68,6 +68,18 @@ + #include + #else + #include ++ ++#if _SEM_SEMUN_UNDEFINED ++ union semun ++ { ++ int val; // value for SETVAL ++ struct semid_ds *buf; // buffer for IPC_STAT & IPC_SET ++ unsigned short int *array; // array for GETALL & SETALL ++ struct seminfo *__buf; // buffer for IPC_INFO ++ }; ++ ++#endif ++ + #endif + + #include "util.h" -- cgit 1.2.3-korg