1 |
idl0r 10/11/24 16:56:35 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cfengine-3.1.1.ebuild |
5 |
Removed: cfengine-3.1.0-r1.ebuild |
6 |
cfengine-3.0.5_p1-r3.ebuild |
7 |
Log: |
8 |
Version bump to 3.1.1. Cleanup. |
9 |
|
10 |
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.118 net-misc/cfengine/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.118&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.118&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.117&r2=1.118 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v |
22 |
retrieving revision 1.117 |
23 |
retrieving revision 1.118 |
24 |
diff -u -r1.117 -r1.118 |
25 |
--- ChangeLog 21 Nov 2010 12:43:55 -0000 1.117 |
26 |
+++ ChangeLog 24 Nov 2010 16:56:35 -0000 1.118 |
27 |
@@ -1,6 +1,15 @@ |
28 |
# ChangeLog for net-misc/cfengine |
29 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.117 2010/11/21 12:43:55 armin76 Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.118 2010/11/24 16:56:35 idl0r Exp $ |
32 |
+ |
33 |
+*cfengine-3.1.1 (24 Nov 2010) |
34 |
+ |
35 |
+ 24 Nov 2010; Christian Ruppert <idl0r@g.o> |
36 |
+ -cfengine-3.0.5_p1-r3.ebuild, -files/cfengine-3.0.5_p1-Makefile.am.patch, |
37 |
+ -files/cfengine-3.0.5_p1-configure.ac.patch, |
38 |
+ -files/cfengine-3.0.5_p1-regex.c.patch, -cfengine-3.1.0-r1.ebuild, |
39 |
+ -files/cfengine-3.1.0-configure.ac.patch, +cfengine-3.1.1.ebuild: |
40 |
+ Version bump to 3.1.1. Cleanup. |
41 |
|
42 |
21 Nov 2010; Raúl Porcel <armin76@g.o> cfengine-2.2.10-r3.ebuild: |
43 |
arm/sparc stable wrt #344841 |
44 |
|
45 |
|
46 |
|
47 |
1.1 net-misc/cfengine/cfengine-3.1.1.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.1.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.1.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: cfengine-3.1.1.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.1.ebuild,v 1.1 2010/11/24 16:56:35 idl0r Exp $ |
57 |
|
58 |
EAPI="3" |
59 |
|
60 |
inherit eutils |
61 |
|
62 |
MY_PV="${PV//_beta/b}" |
63 |
MY_PV="${MY_PV/_p/p}" |
64 |
MY_P="${PN}-${MY_PV}" |
65 |
|
66 |
DESCRIPTION="An automated suite of programs for configuring and maintaining |
67 |
Unix-like computers" |
68 |
HOMEPAGE="http://www.cfengine.org/" |
69 |
SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz" |
70 |
|
71 |
LICENSE="GPL-3" |
72 |
SLOT="3" |
73 |
KEYWORDS="~amd64 ~arm ~s390 ~sparc ~x86" |
74 |
|
75 |
IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax" |
76 |
|
77 |
DEPEND=">=sys-libs/db-4 |
78 |
gd? ( media-libs/gd ) |
79 |
graphviz? ( media-gfx/graphviz ) |
80 |
ldap? ( net-nds/openldap ) |
81 |
libvirt? ( app-emulation/libvirt ) |
82 |
mysql? ( virtual/mysql ) |
83 |
pcre? ( dev-libs/libpcre ) |
84 |
postgres? ( dev-db/postgresql-base ) |
85 |
selinux? ( sys-libs/libselinux ) |
86 |
tokyocabinet? ( dev-db/tokyocabinet ) |
87 |
qdbm? ( dev-db/qdbm ) |
88 |
!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) ) |
89 |
>=dev-libs/openssl-0.9.7" |
90 |
RDEPEND="${DEPEND}" |
91 |
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" |
92 |
|
93 |
S="${WORKDIR}/${MY_P}" |
94 |
|
95 |
src_prepare() { |
96 |
# https://cfengine.com/bugtracker/view.php?id=390 |
97 |
epatch "${FILESDIR}/${PN}-3.1.0-cf-key.patch" |
98 |
} |
99 |
|
100 |
src_configure() { |
101 |
local myconf |
102 |
|
103 |
if use mysql || use postgres ; then |
104 |
myconf="--with-sql" |
105 |
else |
106 |
myconf="--without-sql" |
107 |
fi |
108 |
|
109 |
if ! use qdbm && ! use tokyocabinet; then |
110 |
myconf="${myconf} --with-berkeleydb=/usr" |
111 |
fi |
112 |
|
113 |
# Enforce /var/cfengine for historical compatibility |
114 |
econf \ |
115 |
--docdir=/usr/share/doc/"${PF}" \ |
116 |
--with-workdir=/var/cfengine \ |
117 |
${myconf} \ |
118 |
$(use_with gd) \ |
119 |
$(use_with graphviz) \ |
120 |
$(use_with ldap) \ |
121 |
$(use_with libvirt) \ |
122 |
$(use_with pcre) \ |
123 |
$(use_with qdbm) \ |
124 |
$(use_enable selinux) \ |
125 |
$(use_with tokyocabinet) |
126 |
|
127 |
# Fix Makefile to skip inputs, see below "examples" |
128 |
sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die |
129 |
|
130 |
# We install documentation through portage |
131 |
sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die |
132 |
|
133 |
if use tests; then |
134 |
# Fix Makefiles to install tests in correct directory |
135 |
for i in file_masters file_operands units ; do |
136 |
sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \ |
137 |
tests/${i}/Makefile || die |
138 |
done |
139 |
else |
140 |
sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die |
141 |
fi |
142 |
} |
143 |
|
144 |
src_install() { |
145 |
newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die |
146 |
newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die |
147 |
newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die |
148 |
|
149 |
emake DESTDIR="${D}" install || die |
150 |
dodoc AUTHORS ChangeLog NEWS README TODO INSTALL |
151 |
|
152 |
if use examples; then |
153 |
docinto examples |
154 |
dodoc inputs/*.cf || die |
155 |
fi |
156 |
|
157 |
# Create cfengine working directory |
158 |
dodir /var/cfengine/bin |
159 |
fperms 700 /var/cfengine |
160 |
|
161 |
# Copy cfagent into the cfengine tree otherwise cfexecd won't |
162 |
# find it. Most hosts cache their copy of the cfengine |
163 |
# binaries here. This is the default search location for the |
164 |
# binaries. |
165 |
for bin in know promises agent monitord serverd execd runagent key report; do |
166 |
dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die |
167 |
done |
168 |
|
169 |
if use html; then |
170 |
docinto html |
171 |
dohtml -r docs/ || die |
172 |
fi |
173 |
} |
174 |
|
175 |
pkg_postinst() { |
176 |
echo |
177 |
einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." |
178 |
einfo |
179 |
einfo "To run cfengine out of cron every half hour modify your crontab:" |
180 |
einfo "0,30 * * * * /usr/sbin/cf-execd -F" |
181 |
echo |
182 |
|
183 |
elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:" |
184 |
elog "emerge --config ${CATEGORY}/${PN}" |
185 |
|
186 |
# Fix old cf-servd, remove it after some releases. |
187 |
local found=0 |
188 |
for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do |
189 |
found=1 |
190 |
rm $fname |
191 |
ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:') |
192 |
done |
193 |
|
194 |
if [ "${found}" -eq 1 ]; then |
195 |
echo |
196 |
elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd" |
197 |
fi |
198 |
} |
199 |
|
200 |
pkg_config() { |
201 |
if [ "${ROOT}" == "/" ]; then |
202 |
if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then |
203 |
einfo "Generating keys for localhost." |
204 |
/usr/sbin/cf-key |
205 |
fi |
206 |
else |
207 |
die "cfengine cfkey does not support any value of ROOT other than /." |
208 |
fi |
209 |
} |