1 |
patrick 09/02/01 09:47:35 |
2 |
|
3 |
Modified: ChangeLog ejabberd-2.0.2.ebuild |
4 |
Added: ejabberd-2.0.2-r1.ebuild |
5 |
Log: |
6 |
Small fix so that docs are actually installed |
7 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.49 net-im/ejabberd/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.49&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.49&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.48&r2=1.49 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v |
19 |
retrieving revision 1.48 |
20 |
retrieving revision 1.49 |
21 |
diff -u -r1.48 -r1.49 |
22 |
--- ChangeLog 9 Sep 2008 23:36:50 -0000 1.48 |
23 |
+++ ChangeLog 1 Feb 2009 09:47:34 -0000 1.49 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for net-im/ejabberd |
26 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.48 2008/09/09 23:36:50 caleb Exp $ |
28 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.49 2009/02/01 09:47:34 patrick Exp $ |
30 |
+ |
31 |
+*ejabberd-2.0.2-r1 (01 Feb 2009) |
32 |
+ |
33 |
+ 01 Feb 2009; Patrick Lauer <patrick@g.o> ejabberd-2.0.2.ebuild, |
34 |
+ +ejabberd-2.0.2-r1.ebuild: |
35 |
+ Small doc fix, docs are actually installed now |
36 |
|
37 |
*ejabberd-2.0.2 (09 Sep 2008) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.3 net-im/ejabberd/ejabberd-2.0.2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild?rev=1.3&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild?rev=1.3&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild?r1=1.2&r2=1.3 |
47 |
|
48 |
Index: ejabberd-2.0.2.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v |
51 |
retrieving revision 1.2 |
52 |
retrieving revision 1.3 |
53 |
diff -u -r1.2 -r1.3 |
54 |
--- ejabberd-2.0.2.ebuild 10 Sep 2008 14:05:35 -0000 1.2 |
55 |
+++ ejabberd-2.0.2.ebuild 1 Feb 2009 09:47:34 -0000 1.3 |
56 |
@@ -1,6 +1,6 @@ |
57 |
-# Copyright 1999-2008 Gentoo Foundation |
58 |
+# Copyright 1999-2009 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v 1.2 2008/09/10 14:05:35 mr_bones_ Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2.ebuild,v 1.3 2009/02/01 09:47:34 patrick Exp $ |
62 |
|
63 |
inherit eutils multilib |
64 |
|
65 |
@@ -96,7 +96,7 @@ |
66 |
chmod 4750 "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam |
67 |
fi |
68 |
|
69 |
- cd "${WORKDIR}/${MY_P}-beta1/doc" |
70 |
+ cd "${WORKDIR}/${MY_P}/doc" |
71 |
dodoc "release_notes_${MY_PV}.txt" |
72 |
dohtml *.{html,png} |
73 |
|
74 |
|
75 |
|
76 |
|
77 |
1.1 net-im/ejabberd/ejabberd-2.0.2-r1.ebuild |
78 |
|
79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild?rev=1.1&view=markup |
80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild?rev=1.1&content-type=text/plain |
81 |
|
82 |
Index: ejabberd-2.0.2-r1.ebuild |
83 |
=================================================================== |
84 |
# Copyright 1999-2009 Gentoo Foundation |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.2-r1.ebuild,v 1.1 2009/02/01 09:47:34 patrick Exp $ |
87 |
|
88 |
inherit eutils multilib |
89 |
|
90 |
JABBER_ETC="/etc/jabber" |
91 |
JABBER_RUN="/var/run/jabber" |
92 |
JABBER_SPOOL="/var/spool/jabber" |
93 |
JABBER_LOG="/var/log/jabber" |
94 |
|
95 |
MY_PV=${PV} |
96 |
MY_P=${PN}-${MY_PV} |
97 |
|
98 |
DESCRIPTION="The Erlang Jabber Daemon" |
99 |
HOMEPAGE="http://www.ejabberd.im/" |
100 |
SRC_URI="http://www.process-one.net/downloads/ejabberd/${PV}/${MY_P}.tar.gz" |
101 |
LICENSE="GPL-2" |
102 |
SLOT="0" |
103 |
KEYWORDS="~amd64 ~ppc ~x86" |
104 |
IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc pam ssl web zlib" |
105 |
|
106 |
DEPEND=">=net-im/jabber-base-0.01 |
107 |
>=dev-libs/expat-1.95 |
108 |
>=dev-lang/erlang-11.2.5 |
109 |
odbc? ( dev-db/unixODBC ) |
110 |
ldap? ( =net-nds/openldap-2* ) |
111 |
ssl? ( >=dev-libs/openssl-0.9.8e ) |
112 |
zlib? ( sys-libs/zlib )" |
113 |
|
114 |
PROVIDE="virtual/jabber-server" |
115 |
|
116 |
S=${WORKDIR}/${MY_P}/src |
117 |
|
118 |
src_unpack() { |
119 |
unpack ${A} |
120 |
cd "${S}" |
121 |
|
122 |
# Bug #171427 |
123 |
epatch "${FILESDIR}/2.0.0-missing-declaration.patch" |
124 |
|
125 |
# get rid of the prefix |
126 |
sed -i -e "s/\\@prefix\\@//" "${S}/Makefile.in" \ |
127 |
|| die "cannot sed Makefile.in" |
128 |
# we want ejabberdctl in /usr/sbin not /sbin !!! |
129 |
sed -i -e "s/\\/sbin/\\/usr\\/sbin/" "${S}/Makefile.in" \ |
130 |
|| die "cannot sed Makefile.in" |
131 |
} |
132 |
|
133 |
src_compile() { |
134 |
econf --prefix=/ \ |
135 |
$(use_enable mod_irc) \ |
136 |
$(use_enable ldap eldap) \ |
137 |
$(use_enable mod_muc) \ |
138 |
$(use_enable mod_pubsub) \ |
139 |
$(use_enable ssl tls) \ |
140 |
$(use_enable web) \ |
141 |
$(use_enable odbc) \ |
142 |
$(use_enable zlib ejabberd_zlib) \ |
143 |
$(use_enable pam) \ |
144 |
|| die "econf failed" |
145 |
|
146 |
if useq debug; then |
147 |
emake ejabberd_debug=true || die "compiling ejabberd core failed" |
148 |
else |
149 |
emake || die "compiling ejabberd core failed" |
150 |
fi |
151 |
} |
152 |
|
153 |
src_install() { |
154 |
make \ |
155 |
DESTDIR="${D}" \ |
156 |
EJABBERDDIR="${D}/usr/$(get_libdir)/erlang/lib/${P}" \ |
157 |
ETCDIR="${D}${JABBER_ETC}" \ |
158 |
LOGDIR="${D}${JABBER_LOG}" \ |
159 |
install || die "install failed" |
160 |
|
161 |
# remove the default ejabberdctl as we use our own |
162 |
rm "${D}/sbin/ejabberdctl" |
163 |
|
164 |
insinto ${JABBER_ETC} |
165 |
|
166 |
chown -R jabber:jabber "${D}${JABBER_ETC}" |
167 |
chown -R jabber:jabber "${D}${JABBER_LOG}" |
168 |
chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}" |
169 |
|
170 |
if useq ssl ; then |
171 |
doins "${FILESDIR}/ssl.cnf" |
172 |
newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh |
173 |
fi |
174 |
|
175 |
# Pam helper module permissions |
176 |
# http://www.process-one.net/docs/ejabberd/guide_en.html |
177 |
if useq pam; then |
178 |
chown root:jabber "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam |
179 |
chmod 4750 "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam |
180 |
fi |
181 |
|
182 |
cd "${WORKDIR}/${MY_P}/doc" |
183 |
dodoc "release_notes_${MY_PV}.txt" |
184 |
dohtml *.{html,png} |
185 |
|
186 |
# set up /usr/sbin/ejabberd wrapper |
187 |
cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \ |
188 |
| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \ |
189 |
> "${T}/ejabberd" |
190 |
exeinto /usr/sbin |
191 |
doexe "${T}/ejabberd" |
192 |
|
193 |
# set up /usr/sbin/ejabberdctl wrapper |
194 |
cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \ |
195 |
| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \ |
196 |
> "${T}/ejabberdctl" |
197 |
doexe "${T}/ejabberdctl" |
198 |
|
199 |
dodir /var/lib/ejabberd |
200 |
newinitd "${FILESDIR}/${MY_P}.initd" ${PN} |
201 |
newconfd "${FILESDIR}/${MY_P}.confd" ${PN} |
202 |
|
203 |
# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert |
204 |
# that would be generated by /etc/jabber/self-cert.sh |
205 |
sed -i -e "s/\/path\/to\/ssl.pem/\/etc\/jabber\/ssl.pem/g" \ |
206 |
"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg" |
207 |
|
208 |
# if mod_irc is not enabled, comment out the mod_irc in the default |
209 |
# ejabberd.cfg |
210 |
if ! use mod_irc; then |
211 |
sed -i -e "s/{mod_irc,/%{mod_irc,/" \ |
212 |
"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg" |
213 |
fi |
214 |
} |
215 |
|
216 |
pkg_postinst() { |
217 |
elog "For configuration instructions, please see" |
218 |
elog "/usr/share/doc/${PF}/html/guide.html, or the online version at" |
219 |
elog "http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html" |
220 |
if useq ssl ; then |
221 |
if [ ! -e /etc/jabber/ssl.pem ]; then |
222 |
elog "Please edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh" |
223 |
elog "Ejabberd may refuse to start without an SSL certificate" |
224 |
fi |
225 |
fi |
226 |
if ! useq web ; then |
227 |
elog "The web USE flag is off, this has disabled the web admin interface." |
228 |
fi |
229 |
elog "====================================================================" |
230 |
elog 'Quick Start Guide:' |
231 |
elog '1) Add output of `hostname -s` to /etc/jabber/ejabberd.cfg line 89' |
232 |
elog ' {hosts, ["localhost", "thehost"]}.' |
233 |
elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 324' |
234 |
elog ' {acl, admin, {user, "theadmin", "thehost"}}.' |
235 |
elog '3) Start the server' |
236 |
elog ' # /etc/init.d/ejabberd start' |
237 |
elog '4) Register the admin user' |
238 |
elog ' # /usr/sbin/ejabberdctl register theadmin thehost thepassword' |
239 |
elog '5) Log in with your favourite jabber client or using the web admin' |
240 |
} |