Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/keepalived: ChangeLog keepalived-1.1.15.ebuild keepalived-1.1.13-r1.ebuild
Date: Sun, 23 Sep 2007 00:48:06
Message-Id: E1IZFVo-0003vb-CL@stork.gentoo.org
1 robbat2 07/09/23 00:39:52
2
3 Modified: ChangeLog keepalived-1.1.15.ebuild
4 keepalived-1.1.13-r1.ebuild
5 Log:
6 Cleanup of the main two ebuilds per dberkholz commit review.
7 (Portage version: 2.1.3.7)
8
9 Revision Changes Path
10 1.47 sys-cluster/keepalived/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/ChangeLog?rev=1.47&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/ChangeLog?rev=1.47&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/ChangeLog?r1=1.46&r2=1.47
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v
19 retrieving revision 1.46
20 retrieving revision 1.47
21 diff -u -r1.46 -r1.47
22 --- ChangeLog 22 Sep 2007 19:12:34 -0000 1.46
23 +++ ChangeLog 23 Sep 2007 00:39:51 -0000 1.47
24 @@ -1,6 +1,10 @@
25 # ChangeLog for sys-cluster/keepalived
26 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.46 2007/09/22 19:12:34 nixnut Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.47 2007/09/23 00:39:51 robbat2 Exp $
29 +
30 + 23 Sep 2007; Robin H. Johnson <robbat2@g.o>
31 + keepalived-1.1.13-r1.ebuild, keepalived-1.1.15.ebuild:
32 + Cleanup of the main two ebuilds per dberkholz commit review.
33
34 22 Sep 2007; nixnut <nixnut@g.o> keepalived-1.1.13-r1.ebuild:
35 Stable on ppc wrt bug 181763
36
37
38
39 1.2 sys-cluster/keepalived/keepalived-1.1.15.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild?r1=1.1&r2=1.2
44
45 Index: keepalived-1.1.15.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- keepalived-1.1.15.ebuild 22 Sep 2007 09:12:36 -0000 1.1
52 +++ keepalived-1.1.15.ebuild 23 Sep 2007 00:39:51 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2007 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild,v 1.1 2007/09/22 09:12:36 robbat2 Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.15.ebuild,v 1.2 2007/09/23 00:39:51 robbat2 Exp $
58
59 inherit flag-o-matic autotools
60
61 @@ -25,17 +25,17 @@
62 # This patch allows us to avoid needing kernel sources for the configure phase
63 EPATCH_OPTS="-p1 -d${S}" epatch \
64 ${FILESDIR}/${PN}-1.1.13-do-not-need-kernel-sources.patch
65 - cd ${S}
66 + cd "${S}"
67 eautoreconf
68
69 # Prepare a suitable copy of the IPVS headers
70 # So that we don't need kernel sources at all!
71 - mkdir -p ${S}/include/net || die "Failed to prepare ipvs header directory"
72 - cp -f ${FILESDIR}/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
73 - ${S}/include/net/ip_vs.h || die "Failed to add ipvs header"
74 + mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
75 + cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
76 + "${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
77
78 # Ensure that keepalived can find the header that we are injecting
79 - append-flags -I${S}/include
80 + append-flags -I"${S}"/include
81 }
82
83 src_compile() {
84 @@ -63,7 +63,7 @@
85 # Not parallel safe
86 emake -j1 install DESTDIR="${D}" || die "emake install failed"
87
88 - newinitd ${FILESDIR}/init-keepalived keepalived
89 + newinitd "${FILESDIR}"/init-keepalived keepalived
90
91 dodoc doc/keepalived.conf.SYNOPSIS
92 dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
93 @@ -74,8 +74,9 @@
94 newdoc INSTALL INSTALL+HOWTO
95
96 # Security risk to bundle SSL certs
97 - rm -f ${D}/etc/keepalived/samples/*.pem
98 - rm -rf ${D}/etc/sysconfig ${D}/etc/rc.d/
99 + rm -f "${D}"/etc/keepalived/samples/*.pem
100 + # Clean up sysvinit files
101 + rm -rf "${D}"/etc/sysconfig "${D}"/etc/rc.d/
102 }
103
104 pkg_postinst() {
105
106
107
108 1.6 sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild
109
110 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild?rev=1.6&view=markup
111 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild?rev=1.6&content-type=text/plain
112 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild?r1=1.5&r2=1.6
113
114 Index: keepalived-1.1.13-r1.ebuild
115 ===================================================================
116 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild,v
117 retrieving revision 1.5
118 retrieving revision 1.6
119 diff -u -r1.5 -r1.6
120 --- keepalived-1.1.13-r1.ebuild 22 Sep 2007 19:12:34 -0000 1.5
121 +++ keepalived-1.1.13-r1.ebuild 23 Sep 2007 00:39:51 -0000 1.6
122 @@ -1,6 +1,6 @@
123 # Copyright 1999-2007 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild,v 1.5 2007/09/22 19:12:34 nixnut Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild,v 1.6 2007/09/23 00:39:51 robbat2 Exp $
127
128 inherit flag-o-matic autotools
129
130 @@ -25,17 +25,17 @@
131 # This patch allows us to avoid needing kernel sources for the configure phase
132 EPATCH_OPTS="-p1 -d${S}" epatch \
133 ${FILESDIR}/${PN}-1.1.13-do-not-need-kernel-sources.patch
134 - cd ${S}
135 + cd "${S}"
136 eautoreconf
137
138 # Prepare a suitable copy of the IPVS headers
139 # So that we don't need kernel sources at all!
140 - mkdir -p ${S}/include/net || die "Failed to prepare ipvs header directory"
141 - cp -f ${FILESDIR}/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
142 - ${S}/include/net/ip_vs.h || die "Failed to add ipvs header"
143 + mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
144 + cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
145 + "${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
146
147 # Ensure that keepalived can find the header that we are injecting
148 - append-flags -I${S}/include
149 + append-flags -I"${S}"/include
150 }
151
152 src_compile() {
153 @@ -63,7 +63,7 @@
154 # Not parallel safe
155 emake -j1 install DESTDIR="${D}" || die "emake install failed"
156
157 - newinitd ${FILESDIR}/init-keepalived keepalived
158 + newinitd "${FILESDIR}"/init-keepalived keepalived
159
160 dodoc doc/keepalived.conf.SYNOPSIS
161 dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
162 @@ -74,7 +74,7 @@
163 newdoc INSTALL INSTALL+HOWTO
164
165 # Security risk to bundle SSL certs
166 - rm -f ${D}/etc/keepalived/samples/*.pem
167 + rm -f "${D}"/etc/keepalived/samples/*.pem
168 }
169
170 pkg_postinst() {
171
172
173
174 --
175 gentoo-commits@g.o mailing list