1 |
hollow 09/10/08 09:53:44 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: puppet-0.25.0-r1.ebuild |
5 |
Log: |
6 |
add hotfix for 0.24.x CA compatibility. Upstream bug #2617 |
7 |
(Portage version: 2.2_rc40/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.48 app-admin/puppet/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.48&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.48&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.47&r2=1.48 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
19 |
retrieving revision 1.47 |
20 |
retrieving revision 1.48 |
21 |
diff -u -r1.47 -r1.48 |
22 |
--- ChangeLog 6 Sep 2009 23:00:10 -0000 1.47 |
23 |
+++ ChangeLog 8 Oct 2009 09:53:44 -0000 1.48 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for app-admin/puppet |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.47 2009/09/06 23:00:10 matsuu Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.48 2009/10/08 09:53:44 hollow Exp $ |
29 |
+ |
30 |
+*puppet-0.25.0-r1 (08 Oct 2009) |
31 |
+ |
32 |
+ 08 Oct 2009; Benedikt Böhm <hollow@g.o> +puppet-0.25.0-r1.ebuild, |
33 |
+ +files/puppet-0.25.0-cert-names.patch: |
34 |
+ add hotfix for 0.24.x CA compatibility. Upstream bug #2617 |
35 |
|
36 |
*puppet-0.25.0 (06 Sep 2009) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 app-admin/puppet/puppet-0.25.0-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.25.0-r1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/puppet-0.25.0-r1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: puppet-0.25.0-r1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.0-r1.ebuild,v 1.1 2009/10/08 09:53:44 hollow Exp $ |
51 |
|
52 |
EAPI="2" |
53 |
inherit elisp-common eutils ruby |
54 |
|
55 |
MY_P="${P/_}" |
56 |
DESCRIPTION="A system automation and configuration management software" |
57 |
HOMEPAGE="http://reductivelabs.com/projects/puppet" |
58 |
SRC_URI="http://reductivelabs.com/downloads/${PN}/${MY_P}.tar.gz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
IUSE="augeas emacs ldap rrdtool shadow vim-syntax" |
63 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
64 |
|
65 |
DEPEND="dev-lang/ruby[ssl] |
66 |
emacs? ( virtual/emacs ) |
67 |
>=dev-ruby/facter-1.5.0" |
68 |
RDEPEND="${DEPEND} |
69 |
>=app-portage/eix-0.9.4 |
70 |
augeas? ( dev-ruby/ruby-augeas ) |
71 |
ldap? ( dev-ruby/ruby-ldap ) |
72 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
73 |
shadow? ( dev-ruby/ruby-shadow )" |
74 |
# || ( |
75 |
# www-servers/webrick |
76 |
# www-servers/mongrel |
77 |
# ) |
78 |
# dev-ruby/diff-lcs |
79 |
# dev-ruby/rails |
80 |
|
81 |
S="${WORKDIR}/${MY_P}" |
82 |
USE_RUBY="ruby18" |
83 |
|
84 |
SITEFILE="50${PN}-mode-gentoo.el" |
85 |
|
86 |
pkg_setup() { |
87 |
enewgroup puppet |
88 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
89 |
} |
90 |
|
91 |
src_prepare() { |
92 |
epatch "${FILESDIR}/${PN}-0.24.6-eix.patch" |
93 |
epatch "${FILESDIR}/${PN}-0.25.0-cert-names.patch" |
94 |
} |
95 |
|
96 |
src_compile() { |
97 |
if use emacs ; then |
98 |
elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed" |
99 |
fi |
100 |
} |
101 |
|
102 |
src_install() { |
103 |
DESTDIR="${D}" ruby_einstall "$@" || die |
104 |
DESTDIR="${D}" erubydoc |
105 |
|
106 |
# |
107 |
# bug #237071 |
108 |
# |
109 |
#doinitd conf/gentoo/init.d/puppetmaster |
110 |
newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster |
111 |
#doconfd conf/gentoo/conf.d/puppetmaster |
112 |
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
113 |
#doinitd conf/gentoo/init.d/puppet |
114 |
newinitd "${FILESDIR}"/puppet-0.25.init puppet |
115 |
doconfd conf/gentoo/conf.d/puppet |
116 |
|
117 |
# Initial configuration files |
118 |
keepdir /etc/puppet/manifests |
119 |
insinto /etc/puppet |
120 |
doins conf/gentoo/puppet/* |
121 |
|
122 |
# Location of log and data files |
123 |
keepdir /var/run/puppet |
124 |
keepdir /var/log/puppet |
125 |
keepdir /var/lib/puppet/ssl |
126 |
keepdir /var/lib/puppet/files |
127 |
fowners -R puppet:puppet /var/{run,log,lib}/puppet |
128 |
|
129 |
if use emacs ; then |
130 |
elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed" |
131 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
132 |
fi |
133 |
|
134 |
if use ldap ; then |
135 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
136 |
fi |
137 |
|
138 |
if use vim-syntax ; then |
139 |
insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim |
140 |
insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim |
141 |
fi |
142 |
|
143 |
# ext and examples files |
144 |
for f in $(find ext examples -type f) ; do |
145 |
docinto "$(dirname ${f})"; dodoc "${f}" |
146 |
done |
147 |
docinto conf; dodoc conf/namespaceauth.conf |
148 |
} |
149 |
|
150 |
pkg_postinst() { |
151 |
elog |
152 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
153 |
elog "cause puppet to hang while installing packages." |
154 |
elog |
155 |
elog "Puppet uses eix to get information about currently installed packages," |
156 |
elog "so please keep the eix metadata cache updated so puppet is able to properly" |
157 |
elog "handle package installations." |
158 |
elog |
159 |
elog "Currently puppet only supports adding and removing services to the default" |
160 |
elog "runlevel, if you want to add/remove a service from another runlevel you may" |
161 |
elog "do so using symlinking." |
162 |
elog |
163 |
|
164 |
if [ \ |
165 |
-f "${ROOT}/etc/puppet/puppetd.conf" -o \ |
166 |
-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \ |
167 |
-f "${ROOT}/etc/puppet/puppetca.conf" \ |
168 |
] ; then |
169 |
elog |
170 |
elog "Please remove deprecated config files." |
171 |
elog " /etc/puppet/puppetca.conf" |
172 |
elog " /etc/puppet/puppetd.conf" |
173 |
elog " /etc/puppet/puppetmasterd.conf" |
174 |
elog |
175 |
fi |
176 |
use emacs && elisp-site-regen |
177 |
} |
178 |
pkg_postrm() { |
179 |
use emacs && elisp-site-regen |
180 |
} |