1 |
opfer 08/01/11 11:43:34 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ejabberd-1.1.4-r1.ebuild |
5 |
Log: |
6 |
make ejabberd compile with Erlang 12B, patch take from Debian, reported in bug 202114 by Conrad Kostecki <ConiKost AT gmx DOT de>, thanks to Anton Romanov <theli AT ukr DOT net> |
7 |
(Portage version: 2.1.3.19) |
8 |
|
9 |
Revision Changes Path |
10 |
1.27 net-im/ejabberd/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.27&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.27&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.26&r2=1.27 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v |
19 |
retrieving revision 1.26 |
20 |
retrieving revision 1.27 |
21 |
diff -u -r1.26 -r1.27 |
22 |
--- ChangeLog 8 Dec 2007 16:49:47 -0000 1.26 |
23 |
+++ ChangeLog 11 Jan 2008 11:43:33 -0000 1.27 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for net-im/ejabberd |
26 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.26 2007/12/08 16:49:47 ulm Exp $ |
28 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.27 2008/01/11 11:43:33 opfer Exp $ |
30 |
+ |
31 |
+*ejabberd-1.1.4-r1 (11 Jan 2008) |
32 |
+ |
33 |
+ 11 Jan 2008; Christian Faulhammer <opfer@g.o> |
34 |
+ +files/ejabberd-1.1.4-erlang-12.patch, +ejabberd-1.1.4-r1.ebuild: |
35 |
+ make ejabberd compile with Erlang 12B, patch take from Debian, reported in |
36 |
+ bug 202114 by Conrad Kostecki <ConiKost AT gmx DOT de>, thanks to Anton |
37 |
+ Romanov <theli AT ukr DOT net> |
38 |
|
39 |
08 Dec 2007; Ulrich Mueller <ulm@g.o> |
40 |
+files/ejabberd-1.1.1-r1.initd, +files/ejabberd-1.1.1.confd: |
41 |
|
42 |
|
43 |
|
44 |
1.1 net-im/ejabberd/ejabberd-1.1.4-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: ejabberd-1.1.4-r1.ebuild |
50 |
=================================================================== |
51 |
x# Copyright 1999-2007 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild,v 1.1 2008/01/11 11:43:33 opfer Exp $ |
54 |
|
55 |
inherit eutils multilib |
56 |
|
57 |
JABBER_ETC="/etc/jabber" |
58 |
JABBER_RUN="/var/run/jabber" |
59 |
JABBER_SPOOL="/var/spool/jabber" |
60 |
JABBER_LOG="/var/log/jabber" |
61 |
|
62 |
DESCRIPTION="The Erlang Jabber Daemon" |
63 |
HOMEPAGE="http://ejabberd.jabber.ru/" |
64 |
SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz" |
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~amd64 ~x86" |
68 |
IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web zlib" |
69 |
|
70 |
DEPEND=">=net-im/jabber-base-0.01 |
71 |
>=dev-libs/expat-1.95 |
72 |
>=dev-lang/erlang-10.2.0 |
73 |
odbc? ( dev-db/unixODBC ) |
74 |
ldap? ( =net-nds/openldap-2* ) |
75 |
ssl? ( >=dev-libs/openssl-0.9.8e ) |
76 |
zlib? ( sys-libs/zlib )" |
77 |
|
78 |
PROVIDE="virtual/jabber-server" |
79 |
S=${WORKDIR}/${P}/src |
80 |
|
81 |
src_unpack() { |
82 |
unpack ${A} |
83 |
cd "${S}" |
84 |
|
85 |
# Bug #171427 |
86 |
epatch "${FILESDIR}/${PV}-missing-declaration.patch" |
87 |
# Bug 202114 |
88 |
epatch "${FILESDIR}/${P}-erlang-12.patch" |
89 |
} |
90 |
|
91 |
src_compile() { |
92 |
econf \ |
93 |
$(use_enable mod_irc) \ |
94 |
$(use_enable ldap eldap) \ |
95 |
$(use_enable mod_muc) \ |
96 |
$(use_enable mod_pubsub) \ |
97 |
$(use_enable ssl tls) \ |
98 |
$(use_enable web) \ |
99 |
$(use_enable odbc) \ |
100 |
$(use_enable zlib ejabberd_zlib) \ |
101 |
|| die "econf failed" |
102 |
|
103 |
if useq debug; then |
104 |
emake ejabberd_debug=true || die "compiling ejabberd core failed" |
105 |
else |
106 |
emake || die "compiling ejabberd core failed" |
107 |
fi |
108 |
} |
109 |
|
110 |
src_install() { |
111 |
make \ |
112 |
DESTDIR="${D}" \ |
113 |
EJABBERDDIR="${D}/usr/$(get_libdir)/erlang/lib/${P}" \ |
114 |
ETCDIR="${D}${JABBER_ETC}" \ |
115 |
LOGDIR="${D}${JABBER_LOG}" \ |
116 |
install \ |
117 |
|| die "install failed" |
118 |
|
119 |
chown -R jabber:jabber "${D}${JABBER_ETC}" |
120 |
chown -R jabber:jabber "${D}${JABBER_LOG}" |
121 |
chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}" |
122 |
|
123 |
insinto /usr/share/doc/${PF} |
124 |
dohtml doc/*.{html,png} |
125 |
|
126 |
# |
127 |
# Create /usr/bin/ejabberd |
128 |
# |
129 |
cat <<EOF > "${T}/ejabberd" |
130 |
#!/bin/bash |
131 |
|
132 |
erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ |
133 |
${pa} \\ |
134 |
-sname ejabberd \\ |
135 |
-s ejabberd \\ |
136 |
-ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\ |
137 |
log_path \"${JABBER_LOG}/ejabberd.log\" \\ |
138 |
-kernel inetrc \"${JABBER_ETC}/inetrc\" \\ |
139 |
-sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\ |
140 |
-mnesia dir \"${JABBER_SPOOL}\" \\ |
141 |
\$@ |
142 |
EOF |
143 |
|
144 |
# |
145 |
# Create /usr/bin/ejabberdctl |
146 |
# |
147 |
cat <<EOF > "${T}/ejabberdctl" |
148 |
#!/bin/sh |
149 |
|
150 |
exec env HOME=${JABBER_RUN} \\ |
151 |
erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ |
152 |
${pa} \\ |
153 |
-noinput \\ |
154 |
-sname ejabberdctl \\ |
155 |
-s ejabberd_ctl \\ |
156 |
-extra \$@ |
157 |
EOF |
158 |
|
159 |
dobin "${T}/ejabberdctl" |
160 |
dobin "${T}/ejabberd" |
161 |
|
162 |
newinitd "${FILESDIR}/${P}.initd" ${PN} |
163 |
newconfd "${FILESDIR}/ejabberd-1.1.3.confd" ${PN} |
164 |
|
165 |
insinto ${JABBER_ETC} |
166 |
doins "${FILESDIR}/inetrc" |
167 |
if useq ssl ; then |
168 |
doins "${FILESDIR}/ssl.cnf" |
169 |
newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh |
170 |
fi |
171 |
} |
172 |
|
173 |
pkg_postinst() { |
174 |
elog "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html" |
175 |
elog "or the online version at http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html" |
176 |
echo |
177 |
if useq ssl ; then |
178 |
if [ ! -e /etc/jabber/ssl.pem ]; then |
179 |
elog "Please edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh" |
180 |
elog "Ejabberd may refuse to start without an SSL certificate" |
181 |
fi |
182 |
fi |
183 |
if ! useq web ; then |
184 |
elog "The web USE flag is off, this has disabled the web admin interface." |
185 |
fi |
186 |
} |
187 |
|
188 |
|
189 |
|
190 |
-- |
191 |
gentoo-commits@l.g.o mailing list |