| 1 |
xmerlin 07/09/20 20:59:18 |
| 2 |
|
| 3 |
Modified: csync2-1.32.ebuild ChangeLog csync2-1.34.ebuild |
| 4 |
csync2-1.33.ebuild |
| 5 |
Log: |
| 6 |
Improved ebuild, added quotes on some variables and ROOT support. |
| 7 |
(Portage version: 2.1.2.2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 sys-cluster/csync2/csync2-1.32.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: csync2-1.32.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- csync2-1.32.ebuild 12 Jun 2006 19:05:12 -0000 1.9 |
| 23 |
+++ csync2-1.32.ebuild 20 Sep 2007 20:59:17 -0000 1.10 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2006 Gentoo Foundation |
| 26 |
+# Copyright 1999-2007 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild,v 1.9 2006/06/12 19:05:12 xmerlin Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.32.ebuild,v 1.10 2007/09/20 20:59:17 xmerlin Exp $ |
| 30 |
|
| 31 |
DESCRIPTION="Cluster synchronization tool." |
| 32 |
SRC_URI="http://oss.linbit.com/csync2/${P}.tar.gz" |
| 33 |
@@ -24,14 +24,14 @@ |
| 34 |
econf \ |
| 35 |
--localstatedir=/var \ |
| 36 |
--sysconfdir=/etc/csync2 \ |
| 37 |
- || die |
| 38 |
+ || die "configure problem" |
| 39 |
|
| 40 |
- emake || die |
| 41 |
+ emake || die "compile problem" |
| 42 |
} |
| 43 |
|
| 44 |
-src_install() { |
| 45 |
|
| 46 |
- make DESTDIR=${D} \ |
| 47 |
+src_install() { |
| 48 |
+ emake DESTDIR="${D}" \ |
| 49 |
localstatedir=/var \ |
| 50 |
sysconfdir=/etc/csync2 \ |
| 51 |
install || die "install problem" |
| 52 |
@@ -45,6 +45,7 @@ |
| 53 |
dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO csync2_locheck.sh |
| 54 |
} |
| 55 |
|
| 56 |
+ |
| 57 |
pkg_postinst() { |
| 58 |
echo |
| 59 |
einfo "After you setup your conf file, edit the xinetd" |
| 60 |
@@ -61,31 +62,32 @@ |
| 61 |
echo |
| 62 |
} |
| 63 |
|
| 64 |
+ |
| 65 |
pkg_config() { |
| 66 |
- einfo "Updating /etc/services" |
| 67 |
- { grep -v ^${PN} /etc/services; |
| 68 |
+ einfo "Updating ${ROOT}/etc/services" |
| 69 |
+ { grep -v ^${PN} "${ROOT}"/etc/services; |
| 70 |
echo "csync2 30865/tcp" |
| 71 |
- } > /etc/services.new |
| 72 |
- mv -f /etc/services.new /etc/services |
| 73 |
+ } > "${ROOT}"/etc/services.new |
| 74 |
+ mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services |
| 75 |
|
| 76 |
- if [ ! -f /etc/${PN}/csync2_ssl_key.pem ]; then |
| 77 |
- einfo "Creating default certificate in /etc/${PN}" |
| 78 |
+ if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then |
| 79 |
+ einfo "Creating default certificate in ${ROOT}/etc/${PN}" |
| 80 |
|
| 81 |
- openssl genrsa -out /etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null |
| 82 |
+ openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null |
| 83 |
|
| 84 |
yes '' | \ |
| 85 |
openssl req -new \ |
| 86 |
- -key /etc/${PN}/csync2_ssl_key.pem \ |
| 87 |
- -out /etc/${PN}/csync2_ssl_cert.csr \ |
| 88 |
- &> /dev/null |
| 89 |
+ -key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \ |
| 90 |
+ -out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \ |
| 91 |
+ &> "${ROOT}"/dev/null |
| 92 |
|
| 93 |
openssl x509 -req -days 600 \ |
| 94 |
- -in /etc/${PN}/csync2_ssl_cert.csr \ |
| 95 |
- -signkey /etc/${PN}/csync2_ssl_key.pem \ |
| 96 |
- -out /etc/${PN}/csync2_ssl_cert.pem \ |
| 97 |
- &> /dev/null |
| 98 |
+ -in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \ |
| 99 |
+ -signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \ |
| 100 |
+ -out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \ |
| 101 |
+ &> "${ROOT}"/dev/null |
| 102 |
|
| 103 |
- rm /etc/${PN}/csync2_ssl_cert.csr |
| 104 |
- chmod 400 /etc/${PN}/csync2_ssl_key.pem /etc/${PN}/csync2_ssl_cert.pem |
| 105 |
+ rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr |
| 106 |
+ chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem |
| 107 |
fi |
| 108 |
} |
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
1.23 sys-cluster/csync2/ChangeLog |
| 113 |
|
| 114 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/ChangeLog?rev=1.23&view=markup |
| 115 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/ChangeLog?rev=1.23&content-type=text/plain |
| 116 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/ChangeLog?r1=1.22&r2=1.23 |
| 117 |
|
| 118 |
Index: ChangeLog |
| 119 |
=================================================================== |
| 120 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v |
| 121 |
retrieving revision 1.22 |
| 122 |
retrieving revision 1.23 |
| 123 |
diff -u -r1.22 -r1.23 |
| 124 |
--- ChangeLog 20 Sep 2007 08:49:25 -0000 1.22 |
| 125 |
+++ ChangeLog 20 Sep 2007 20:59:17 -0000 1.23 |
| 126 |
@@ -1,6 +1,11 @@ |
| 127 |
# ChangeLog for sys-cluster/csync2 |
| 128 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 129 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.22 2007/09/20 08:49:25 xmerlin Exp $ |
| 130 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/ChangeLog,v 1.23 2007/09/20 20:59:17 xmerlin Exp $ |
| 131 |
+ |
| 132 |
+ 20 Sep 2007; Christian Zoffoli <xmerlin@g.o> csync2-1.32.ebuild, |
| 133 |
+ csync2-1.33.ebuild, csync2-1.34.ebuild: |
| 134 |
+ Improved ebuild, added quotes on some variables and ROOT support as |
| 135 |
+ suggested by Donnie. |
| 136 |
|
| 137 |
*csync2-1.34 (20 Sep 2007) |
| 138 |
|
| 139 |
|
| 140 |
|
| 141 |
|
| 142 |
1.2 sys-cluster/csync2/csync2-1.34.ebuild |
| 143 |
|
| 144 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild?rev=1.2&view=markup |
| 145 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild?rev=1.2&content-type=text/plain |
| 146 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild?r1=1.1&r2=1.2 |
| 147 |
|
| 148 |
Index: csync2-1.34.ebuild |
| 149 |
=================================================================== |
| 150 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild,v |
| 151 |
retrieving revision 1.1 |
| 152 |
retrieving revision 1.2 |
| 153 |
diff -u -r1.1 -r1.2 |
| 154 |
--- csync2-1.34.ebuild 20 Sep 2007 08:49:25 -0000 1.1 |
| 155 |
+++ csync2-1.34.ebuild 20 Sep 2007 20:59:18 -0000 1.2 |
| 156 |
@@ -1,6 +1,6 @@ |
| 157 |
# Copyright 1999-2007 Gentoo Foundation |
| 158 |
# Distributed under the terms of the GNU General Public License v2 |
| 159 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild,v 1.1 2007/09/20 08:49:25 xmerlin Exp $ |
| 160 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.34.ebuild,v 1.2 2007/09/20 20:59:18 xmerlin Exp $ |
| 161 |
|
| 162 |
DESCRIPTION="Cluster synchronization tool." |
| 163 |
SRC_URI="http://oss.linbit.com/csync2/${P}.tar.gz" |
| 164 |
@@ -24,14 +24,14 @@ |
| 165 |
econf \ |
| 166 |
--localstatedir=/var \ |
| 167 |
--sysconfdir=/etc/csync2 \ |
| 168 |
- || die |
| 169 |
+ || die "configure problem" |
| 170 |
|
| 171 |
- emake || die |
| 172 |
+ emake || die "compile problem" |
| 173 |
} |
| 174 |
|
| 175 |
-src_install() { |
| 176 |
|
| 177 |
- make DESTDIR=${D} \ |
| 178 |
+src_install() { |
| 179 |
+ emake DESTDIR="${D}" \ |
| 180 |
localstatedir=/var \ |
| 181 |
sysconfdir=/etc/csync2 \ |
| 182 |
install || die "install problem" |
| 183 |
@@ -45,6 +45,7 @@ |
| 184 |
dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO csync2_locheck.sh |
| 185 |
} |
| 186 |
|
| 187 |
+ |
| 188 |
pkg_postinst() { |
| 189 |
echo |
| 190 |
einfo "After you setup your conf file, edit the xinetd" |
| 191 |
@@ -61,31 +62,32 @@ |
| 192 |
echo |
| 193 |
} |
| 194 |
|
| 195 |
+ |
| 196 |
pkg_config() { |
| 197 |
- einfo "Updating /etc/services" |
| 198 |
- { grep -v ^${PN} /etc/services; |
| 199 |
+ einfo "Updating ${ROOT}/etc/services" |
| 200 |
+ { grep -v ^${PN} "${ROOT}"/etc/services; |
| 201 |
echo "csync2 30865/tcp" |
| 202 |
- } > /etc/services.new |
| 203 |
- mv -f /etc/services.new /etc/services |
| 204 |
+ } > "${ROOT}"/etc/services.new |
| 205 |
+ mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services |
| 206 |
|
| 207 |
- if [ ! -f /etc/${PN}/csync2_ssl_key.pem ]; then |
| 208 |
- einfo "Creating default certificate in /etc/${PN}" |
| 209 |
+ if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then |
| 210 |
+ einfo "Creating default certificate in ${ROOT}/etc/${PN}" |
| 211 |
|
| 212 |
- openssl genrsa -out /etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null |
| 213 |
+ openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null |
| 214 |
|
| 215 |
yes '' | \ |
| 216 |
openssl req -new \ |
| 217 |
- -key /etc/${PN}/csync2_ssl_key.pem \ |
| 218 |
- -out /etc/${PN}/csync2_ssl_cert.csr \ |
| 219 |
- &> /dev/null |
| 220 |
+ -key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \ |
| 221 |
+ -out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \ |
| 222 |
+ &> "${ROOT}"/dev/null |
| 223 |
|
| 224 |
openssl x509 -req -days 600 \ |
| 225 |
- -in /etc/${PN}/csync2_ssl_cert.csr \ |
| 226 |
- -signkey /etc/${PN}/csync2_ssl_key.pem \ |
| 227 |
- -out /etc/${PN}/csync2_ssl_cert.pem \ |
| 228 |
- &> /dev/null |
| 229 |
+ -in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \ |
| 230 |
+ -signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \ |
| 231 |
+ -out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \ |
| 232 |
+ &> "${ROOT}"/dev/null |
| 233 |
|
| 234 |
- rm /etc/${PN}/csync2_ssl_cert.csr |
| 235 |
- chmod 400 /etc/${PN}/csync2_ssl_key.pem /etc/${PN}/csync2_ssl_cert.pem |
| 236 |
+ rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr |
| 237 |
+ chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem |
| 238 |
fi |
| 239 |
} |
| 240 |
|
| 241 |
|
| 242 |
|
| 243 |
1.3 sys-cluster/csync2/csync2-1.33.ebuild |
| 244 |
|
| 245 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild?rev=1.3&view=markup |
| 246 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild?rev=1.3&content-type=text/plain |
| 247 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild?r1=1.2&r2=1.3 |
| 248 |
|
| 249 |
Index: csync2-1.33.ebuild |
| 250 |
=================================================================== |
| 251 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild,v |
| 252 |
retrieving revision 1.2 |
| 253 |
retrieving revision 1.3 |
| 254 |
diff -u -r1.2 -r1.3 |
| 255 |
--- csync2-1.33.ebuild 15 Oct 2006 14:09:17 -0000 1.2 |
| 256 |
+++ csync2-1.33.ebuild 20 Sep 2007 20:59:18 -0000 1.3 |
| 257 |
@@ -1,6 +1,6 @@ |
| 258 |
-# Copyright 1999-2006 Gentoo Foundation |
| 259 |
+# Copyright 1999-2007 Gentoo Foundation |
| 260 |
# Distributed under the terms of the GNU General Public License v2 |
| 261 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild,v 1.2 2006/10/15 14:09:17 xmerlin Exp $ |
| 262 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/csync2/csync2-1.33.ebuild,v 1.3 2007/09/20 20:59:18 xmerlin Exp $ |
| 263 |
|
| 264 |
DESCRIPTION="Cluster synchronization tool." |
| 265 |
SRC_URI="http://oss.linbit.com/csync2/${P}.tar.gz" |
| 266 |
@@ -24,14 +24,14 @@ |
| 267 |
econf \ |
| 268 |
--localstatedir=/var \ |
| 269 |
--sysconfdir=/etc/csync2 \ |
| 270 |
- || die |
| 271 |
+ || die "configure problem" |
| 272 |
|
| 273 |
- emake || die |
| 274 |
+ emake || die "compile problem" |
| 275 |
} |
| 276 |
|
| 277 |
-src_install() { |
| 278 |
|
| 279 |
- make DESTDIR=${D} \ |
| 280 |
+src_install() { |
| 281 |
+ emake DESTDIR="${D}" \ |
| 282 |
localstatedir=/var \ |
| 283 |
sysconfdir=/etc/csync2 \ |
| 284 |
install || die "install problem" |
| 285 |
@@ -45,6 +45,7 @@ |
| 286 |
dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO csync2_locheck.sh |
| 287 |
} |
| 288 |
|
| 289 |
+ |
| 290 |
pkg_postinst() { |
| 291 |
echo |
| 292 |
einfo "After you setup your conf file, edit the xinetd" |
| 293 |
@@ -61,31 +62,32 @@ |
| 294 |
echo |
| 295 |
} |
| 296 |
|
| 297 |
+ |
| 298 |
pkg_config() { |
| 299 |
- einfo "Updating /etc/services" |
| 300 |
- { grep -v ^${PN} /etc/services; |
| 301 |
+ einfo "Updating ${ROOT}/etc/services" |
| 302 |
+ { grep -v ^${PN} "${ROOT}"/etc/services; |
| 303 |
echo "csync2 30865/tcp" |
| 304 |
- } > /etc/services.new |
| 305 |
- mv -f /etc/services.new /etc/services |
| 306 |
+ } > "${ROOT}"/etc/services.new |
| 307 |
+ mv -f "${ROOT}"/etc/services.new "${ROOT}"/etc/services |
| 308 |
|
| 309 |
- if [ ! -f /etc/${PN}/csync2_ssl_key.pem ]; then |
| 310 |
- einfo "Creating default certificate in /etc/${PN}" |
| 311 |
+ if [ ! -f "${ROOT}"/etc/${PN}/csync2_ssl_key.pem ]; then |
| 312 |
+ einfo "Creating default certificate in ${ROOT}/etc/${PN}" |
| 313 |
|
| 314 |
- openssl genrsa -out /etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null |
| 315 |
+ openssl genrsa -out "${ROOT}"/etc/${PN}/csync2_ssl_key.pem 1024 &> /dev/null |
| 316 |
|
| 317 |
yes '' | \ |
| 318 |
openssl req -new \ |
| 319 |
- -key /etc/${PN}/csync2_ssl_key.pem \ |
| 320 |
- -out /etc/${PN}/csync2_ssl_cert.csr \ |
| 321 |
- &> /dev/null |
| 322 |
+ -key "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \ |
| 323 |
+ -out "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \ |
| 324 |
+ &> "${ROOT}"/dev/null |
| 325 |
|
| 326 |
openssl x509 -req -days 600 \ |
| 327 |
- -in /etc/${PN}/csync2_ssl_cert.csr \ |
| 328 |
- -signkey /etc/${PN}/csync2_ssl_key.pem \ |
| 329 |
- -out /etc/${PN}/csync2_ssl_cert.pem \ |
| 330 |
- &> /dev/null |
| 331 |
+ -in "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr \ |
| 332 |
+ -signkey "${ROOT}"/etc/${PN}/csync2_ssl_key.pem \ |
| 333 |
+ -out "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem \ |
| 334 |
+ &> "${ROOT}"/dev/null |
| 335 |
|
| 336 |
- rm /etc/${PN}/csync2_ssl_cert.csr |
| 337 |
- chmod 400 /etc/${PN}/csync2_ssl_key.pem /etc/${PN}/csync2_ssl_cert.pem |
| 338 |
+ rm "${ROOT}"/etc/${PN}/csync2_ssl_cert.csr |
| 339 |
+ chmod 400 "${ROOT}"/etc/${PN}/csync2_ssl_key.pem "${ROOT}"/etc/${PN}/csync2_ssl_cert.pem |
| 340 |
fi |
| 341 |
} |
| 342 |
|
| 343 |
|
| 344 |
|
| 345 |
-- |
| 346 |
gentoo-commits@g.o mailing list |
Archives