Gentoo Archives: gentoo-commits

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