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