Gentoo Archives: gentoo-commits

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