1 |
mschiff 14/11/30 10:36:40 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cfengine-3.6.2.ebuild |
5 |
Log: |
6 |
Bump version. Fixes #525914. Thanks to freak132 for the ifconfig patch. |
7 |
|
8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134) |
9 |
|
10 |
Revision Changes Path |
11 |
1.171 net-misc/cfengine/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.171&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.171&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.170&r2=1.171 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v |
20 |
retrieving revision 1.170 |
21 |
retrieving revision 1.171 |
22 |
diff -u -r1.170 -r1.171 |
23 |
--- ChangeLog 26 Nov 2014 10:40:44 -0000 1.170 |
24 |
+++ ChangeLog 30 Nov 2014 10:36:40 -0000 1.171 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-misc/cfengine |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.170 2014/11/26 10:40:44 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.171 2014/11/30 10:36:40 mschiff Exp $ |
30 |
+ |
31 |
+*cfengine-3.6.2 (30 Nov 2014) |
32 |
+ |
33 |
+ 30 Nov 2014; Marc Schiffbauer <mschiff@g.o> +cfengine-3.6.2.ebuild, |
34 |
+ +files/cfengine-3.6.2-ifconfig.patch: |
35 |
+ Bump version. Fixes #525914. Thanks to freak132 for the ifconfig patch. |
36 |
|
37 |
26 Nov 2014; Agostino Sarubbo <ago@g.o> cfengine-3.3.9.ebuild: |
38 |
Stable for amd64, wrt bug #529726 |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-misc/cfengine/cfengine-3.6.2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.6.2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.6.2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: cfengine-3.6.2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.6.2.ebuild,v 1.1 2014/11/30 10:36:40 mschiff Exp $ |
52 |
|
53 |
EAPI="5" |
54 |
|
55 |
inherit eutils autotools flag-o-matic |
56 |
|
57 |
MY_PV="${PV//_beta/b}" |
58 |
MY_PV="${MY_PV/_p/p}" |
59 |
MY_P="${PN}-${MY_PV}" |
60 |
|
61 |
DESCRIPTION="An automated suite of programs for configuring and maintaining |
62 |
Unix-like computers" |
63 |
HOMEPAGE="http://www.cfengine.org/" |
64 |
SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz" |
65 |
|
66 |
LICENSE="GPL-3" |
67 |
SLOT="3" |
68 |
KEYWORDS="~amd64 ~x86" |
69 |
|
70 |
IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml" |
71 |
|
72 |
DEPEND="acl? ( virtual/acl ) |
73 |
mysql? ( virtual/mysql ) |
74 |
postgres? ( virtual/postgresql ) |
75 |
selinux? ( sys-libs/libselinux ) |
76 |
tokyocabinet? ( dev-db/tokyocabinet ) |
77 |
qdbm? ( dev-db/qdbm ) |
78 |
libvirt? ( app-emulation/libvirt ) |
79 |
xml? ( dev-libs/libxml2:2 ) \ |
80 |
dev-libs/openssl |
81 |
dev-libs/libpcre" |
82 |
RDEPEND="${DEPEND}" |
83 |
PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" |
84 |
|
85 |
REQUIRED_USE="qdbm? ( !tokyocabinet ) |
86 |
tokyocabinet? ( !qdbm ) |
87 |
!tokyocabinet? ( qdbm ) |
88 |
!qdbm? ( tokyocabinet )" |
89 |
|
90 |
S="${WORKDIR}/${MY_P}" |
91 |
|
92 |
src_prepare() { |
93 |
default |
94 |
epatch "${FILESDIR}/${P}-ifconfig.patch" |
95 |
eautoreconf |
96 |
} |
97 |
|
98 |
src_configure() { |
99 |
# Enforce /var/cfengine for historical compatibility |
100 |
|
101 |
econf \ |
102 |
--enable-fhs \ |
103 |
--docdir=/usr/share/doc/${PF} \ |
104 |
--with-workdir=/var/cfengine \ |
105 |
--with-pcre \ |
106 |
$(use_with acl libacl) \ |
107 |
$(use_with qdbm) \ |
108 |
$(use_with tokyocabinet) \ |
109 |
$(use_with postgres postgresql) \ |
110 |
$(use_with mysql mysql check) \ |
111 |
$(use_with libvirt) \ |
112 |
$(use_enable selinux) |
113 |
|
114 |
# Fix Makefile to skip inputs, see below "examples" |
115 |
#sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die |
116 |
|
117 |
# We install the documentation through portage |
118 |
sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die |
119 |
} |
120 |
|
121 |
src_install() { |
122 |
newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die |
123 |
newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die |
124 |
newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die |
125 |
|
126 |
emake DESTDIR="${D}" install || die |
127 |
|
128 |
# fix ifconfig path in provided promises |
129 |
find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g" |
130 |
|
131 |
# Evil workaround for now.. |
132 |
mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF} |
133 |
|
134 |
dodoc AUTHORS |
135 |
|
136 |
if ! use examples; then |
137 |
rm -rf "${D}"/usr/share/doc/${PF}/example* |
138 |
fi |
139 |
|
140 |
# Create cfengine working directory |
141 |
dodir /var/cfengine/bin |
142 |
fperms 700 /var/cfengine |
143 |
|
144 |
# Copy cfagent into the cfengine tree otherwise cfexecd won't |
145 |
# find it. Most hosts cache their copy of the cfengine |
146 |
# binaries here. This is the default search location for the |
147 |
# binaries. |
148 |
for bin in promises agent monitord serverd execd runagent key; do |
149 |
dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die |
150 |
done |
151 |
} |
152 |
|
153 |
pkg_postinst() { |
154 |
echo |
155 |
elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0" |
156 |
echo |
157 |
einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." |
158 |
einfo |
159 |
einfo "To run cfengine out of cron every half hour modify your crontab:" |
160 |
einfo "0,30 * * * * /usr/sbin/cf-execd -F" |
161 |
echo |
162 |
|
163 |
elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:" |
164 |
elog "emerge --config ${CATEGORY}/${PN}" |
165 |
|
166 |
# Fix old cf-servd, remove it after some releases. |
167 |
local found=0 |
168 |
for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do |
169 |
found=1 |
170 |
rm $fname |
171 |
ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:') |
172 |
done |
173 |
|
174 |
if [ "${found}" -eq 1 ]; then |
175 |
echo |
176 |
elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd" |
177 |
fi |
178 |
} |
179 |
|
180 |
pkg_config() { |
181 |
if [ "${ROOT}" == "/" ]; then |
182 |
if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then |
183 |
einfo "Generating keys for localhost." |
184 |
/usr/sbin/cf-key |
185 |
fi |
186 |
else |
187 |
die "cfengine cfkey does not support any value of ROOT other than /." |
188 |
fi |
189 |
} |