Gentoo Archives: gentoo-commits

From: "Christian Zoffoli (xmerlin)" <xmerlin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/cman: ChangeLog cman-2.03.09.ebuild cman-2.03.09-r1.ebuild
Date: Sat, 22 Nov 2008 13:47:06
Message-Id: E1L3spC-0002cQ-HF@stork.gentoo.org
1 xmerlin 08/11/22 13:47:02
2
3 Modified: ChangeLog cman-2.03.09.ebuild
4 Added: cman-2.03.09-r1.ebuild
5 Log:
6 Renamed patches, added some fixes in r1.
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.44 sys-cluster/cman/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/ChangeLog?rev=1.44&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/ChangeLog?rev=1.44&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/ChangeLog?r1=1.43&r2=1.44
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v
19 retrieving revision 1.43
20 retrieving revision 1.44
21 diff -u -r1.43 -r1.44
22 --- ChangeLog 22 Nov 2008 00:36:09 -0000 1.43
23 +++ ChangeLog 22 Nov 2008 13:47:02 -0000 1.44
24 @@ -1,6 +1,19 @@
25 # ChangeLog for sys-cluster/cman
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.43 2008/11/22 00:36:09 xmerlin Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.44 2008/11/22 13:47:02 xmerlin Exp $
29 +
30 +*cman-2.03.09-r1 (22 Nov 2008)
31 +
32 + 22 Nov 2008; Christian Zoffoli <xmerlin@g.o>
33 + -files/cman-2.02.39-RH_bug_457107.patch,
34 + -files/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch,
35 + +files/cman-2.03.09-RH_bug_457107.patch,
36 + +files/cman-2.03.09-add_votes_to_transition_message.patch,
37 + +files/cman-2.03.09-fix_signatures_of_cman_get_privdata_and_cman_set_privd
38 + ata.patch,
39 + +files/cman-2.03.09-qdisk-fix-block-size-check-RH_bug_470533.patch,
40 + cman-2.03.09.ebuild, +cman-2.03.09-r1.ebuild:
41 + Renamed patches, added some fixes in r1.
42
43 22 Nov 2008; Christian Zoffoli <xmerlin@g.o>
44 +files/cman-2.02.39-RH_bug_457107.patch,
45
46
47
48 1.4 sys-cluster/cman/cman-2.03.09.ebuild
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild?rev=1.4&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild?rev=1.4&content-type=text/plain
52 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild?r1=1.3&r2=1.4
53
54 Index: cman-2.03.09.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v
57 retrieving revision 1.3
58 retrieving revision 1.4
59 diff -u -r1.3 -r1.4
60 --- cman-2.03.09.ebuild 22 Nov 2008 00:36:09 -0000 1.3
61 +++ cman-2.03.09.ebuild 22 Nov 2008 13:47:02 -0000 1.4
62 @@ -1,6 +1,6 @@
63 # Copyright 1999-2008 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.3 2008/11/22 00:36:09 xmerlin Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.4 2008/11/22 13:47:02 xmerlin Exp $
67
68 inherit eutils versionator
69
70 @@ -41,8 +41,8 @@
71 unpack ${A}
72 cd "${S}"
73
74 - epatch "${FILESDIR}"/cman-2.02.39-RH_bug_457107.patch || die
75 - epatch "${FILESDIR}"/cman-2.02.39-qdisk-fix-block-size-check-RH_bug_470533.patch || die
76 + epatch "${FILESDIR}"/${P}-RH_bug_457107.patch || die
77 + epatch "${FILESDIR}"/${P}-qdisk-fix-block-size-check-RH_bug_470533.patch || die
78
79 # fix the manual pages have executable bit
80 sed -i -e '
81
82
83
84 1.1 sys-cluster/cman/cman-2.03.09-r1.ebuild
85
86 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/cman-2.03.09-r1.ebuild?rev=1.1&view=markup
87 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/cman/cman-2.03.09-r1.ebuild?rev=1.1&content-type=text/plain
88
89 Index: cman-2.03.09-r1.ebuild
90 ===================================================================
91 # Copyright 1999-2008 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09-r1.ebuild,v 1.1 2008/11/22 13:47:02 xmerlin Exp $
94
95 inherit eutils versionator
96
97 CLUSTER_RELEASE="${PV}"
98 MY_P="cluster-${CLUSTER_RELEASE}"
99
100 MAJ_PV="$(get_major_version)"
101 MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
102
103 DESCRIPTION="general-purpose symmetric cluster manager"
104 HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
105 SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
106
107 LICENSE="GPL-2"
108 SLOT="0"
109 KEYWORDS="~amd64 ~x86"
110 IUSE=""
111
112 DEPEND=">=sys-kernel/linux-headers-2.6.23
113 =sys-cluster/openais-0.80.3*
114 =sys-cluster/ccs-${CLUSTER_RELEASE}*
115 =sys-cluster/cman-lib-${CLUSTER_RELEASE}*
116 !sys-cluster/cman-headers
117 !sys-cluster/cman-kernel
118 !sys-cluster/dlm-headers
119 !sys-cluster/magma
120 !sys-cluster/magma-plugins
121 "
122
123 RDEPEND="${DEPEND}"
124
125 PDEPEND="=sys-cluster/dlm-${CLUSTER_RELEASE}*
126 =sys-cluster/fence-${CLUSTER_RELEASE}*"
127
128 S="${WORKDIR}/${MY_P}/${PN}"
129
130 src_unpack() {
131 unpack ${A}
132 cd "${S}"
133
134 epatch "${FILESDIR}"/${P}-RH_bug_457107.patch || die
135 epatch "${FILESDIR}"/${P}-qdisk-fix-block-size-check-RH_bug_470533.patch || die
136
137 epatch "${FILESDIR}"/${P}-add_votes_to_transition_message.patch || die
138 epatch "${FILESDIR}"/${P}-fix_signatures_of_cman_get_privdata_and_cman_set_privdata.patch || die
139
140 # fix the manual pages have executable bit
141 sed -i -e '
142 /\tinstall -d/s/install/& -m 0755/; t
143 /\tinstall/s/install/& -m 0644/' \
144 man/Makefile || die "failed patching man pages permission"
145
146 }
147
148 src_compile() {
149 (cd "${WORKDIR}"/${MY_P};
150 ./configure \
151 --cc=$(tc-getCC) \
152 --cflags="-Wall" \
153 --disable_kernel_check \
154 --somajor="$MAJ_PV" \
155 --sominor="$MIN_PV" \
156 --cmanlibdir=/usr/lib \
157 --cmanincdir=/usr/include \
158 ) || die "configure problem"
159
160 emake clean
161 emake -C cman_tool || die "compile problem"
162 emake -C daemon || die "compile problem"
163 env -u CFLAGS emake -C qdisk || die "compile problem"
164 emake -C init.d || die "compile problem"
165 emake -C man || die "compile problem"
166 }
167
168 src_install() {
169 emake DESTDIR="${D}" install || die "install problem"
170
171 # These were installed by cman-lib.
172 rm "${D}"/usr/lib/libcman.so.${PV} \
173 "${D}"/usr/lib/libcman.a \
174 "${D}"/usr/include/libcman.h \
175 "${D}"/usr/lib/libcman.so.2 \
176 "${D}"/usr/lib/libcman.so \
177 || die "failed to cleanup extra files"
178
179 newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
180 newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
181 newinitd "${FILESDIR}"/qdiskd-2.0x.rc qdiskd || die
182
183 keepdir /etc/cluster || die
184 }
185
186 pkg_postinst() {
187 einfo ""
188 einfo "Please add a cluster.conf in /etc/cluster/"
189 einfo ""
190 }