diff options
author | Tim Harder <radhermit@gentoo.org> | 2013-04-05 09:03:39 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2013-04-05 09:03:39 +0000 |
commit | 22f1396a96389b81655d8e3c6fd74290ca53752b (patch) | |
tree | 5b1c709968283faa6021ac927216d2dd90d06108 /net-im/ejabberd | |
parent | Version bump, fixes bug #456652, #430550, #452860, #462924, and #436500 (diff) | |
download | historical-22f1396a96389b81655d8e3c6fd74290ca53752b.tar.gz historical-22f1396a96389b81655d8e3c6fd74290ca53752b.tar.bz2 historical-22f1396a96389b81655d8e3c6fd74290ca53752b.zip |
Version bump. Fix variable name in init script (bug #443890) and add myself as a maintainer.
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'net-im/ejabberd')
-rw-r--r-- | net-im/ejabberd/ChangeLog | 9 | ||||
-rw-r--r-- | net-im/ejabberd/Manifest | 23 | ||||
-rw-r--r-- | net-im/ejabberd/ejabberd-2.1.12.ebuild | 214 | ||||
-rw-r--r-- | net-im/ejabberd/files/ejabberd-3.initd | 6 | ||||
-rw-r--r-- | net-im/ejabberd/metadata.xml | 4 |
5 files changed, 242 insertions, 14 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index b2d0361031e0..deaa3873642b 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/ejabberd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.114 2013/01/31 00:42:15 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.115 2013/04/05 09:03:34 radhermit Exp $ + +*ejabberd-2.1.12 (05 Apr 2013) + + 05 Apr 2013; Tim Harder <radhermit@gentoo.org> +ejabberd-2.1.12.ebuild, + files/ejabberd-3.initd, metadata.xml: + Version bump. Fix variable name in init script (bug #443890) and add myself + as a maintainer. 31 Jan 2013; Tim Harder <radhermit@gentoo.org> metadata.xml: Another metadata whitespace fix. diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index c72692770960..58db06b74813 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -2,20 +2,23 @@ Hash: SHA256 AUX ejabberd-3.confd 161 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb WHIRLPOOL 657c44991244d58c10590093a7f58f654cb45cf7e22244b474459c63a449c17d0cf1d6f2d62008ddb34f0022f8fc9e31f22d2010cb3d1070a462bcb22a9a81fc -AUX ejabberd-3.initd 1018 SHA256 1c07fa02152b42bee44a8d1cd3f031596aeee37276ec4a36d765e3c54aa23075 SHA512 1142b4f1ca240f20603ca9a64819780ff4a1d9fbde2940fd1dab6cbca1d2de5108cf35aa00ff1c037dc72a778c6502521e3908c6cde5a39c4bb3c9fc1c70aceb WHIRLPOOL 59c15d4e7225c927768123cd93ebb0d1479c1ef500c179a8811eaa0db1d0d4562d7e3134fd02ffdeb866ca05e19e13570df419c6d51a7a7314cde4ef858c796e +AUX ejabberd-3.initd 1025 SHA256 2810ca25fbe9d41a175b15c82d9ea1254fc4c934fd6ec02d9ee10bc34079e168 SHA512 5705074bd564568295d6d098394937ea44f5ea38ebc386fbcc3f8a239734acb77784500e8761e5fb3864fb56f7d136c9ef1f65603810d31b1f9a0ee4005d389a WHIRLPOOL 13718736e2ff08380c8a2df38099f11a0c5257188731fe9830e1ccdbe304b7c9984956ec7b1f9db11f677293a939604db79ac0870c1a74116d1eb70c1c373391 DIST ejabberd-2.1.11.tgz 2014232 SHA256 91d5c10e64f9faa60c345c68304746f493d71f82723302955d40d6619e3d87de SHA512 6f09c80b03a84595294c679d49b5991985707f6c9e8c2f9fad94618224666e05b4325a5bef840d2ccf0c803038fc11b49b168716a3e258312216e201bdd4bb88 WHIRLPOOL 2ab09c84619173090acabf19cde10f14e3240fa6b89fb7d963bd79aca960b11a6f869f691d219c55b1b0a664c676afc800599671dfc923a0302d2075eec0e224 +DIST ejabberd-2.1.12.tgz 1999224 SHA256 38f0825346773c00c85a66b33586c75f2d191d1eb0ed8ae09fa17368d6ddfd19 SHA512 725ab9563a6c73e85b5115f66bac157cf9b1170913c1bfed7cf066408c6b3ac5b4bdba22c6c3ed1505391a7048a86ce3b59484f78264ab023612c539422278db WHIRLPOOL 3de3b103f69b8ead3d68cb70f3073808c40cd9541f0fd97aff7173f3ecabf6755295e1c30de83e67c844dc6886a5c2cb55a26980f4275cb32008e922591ae35a DIST ejabberd-mod_statsdx-1080.patch.gz 14024 SHA256 0f3a3a991c14d797e795ef4fffcf19aa9a54608f5053b759187ec7d3696b9edb SHA512 cdec93504501f60d01defe8634d2fe1ee900d78bd8d4568313b581d0e306144df50d3a8d2b724091bdb7c4a7f65c6bb4ebc4bd053ffdda7acb6512b92d1249cf WHIRLPOOL 881b776b6476319c81ae9bfea286baff1020f0b1acdc8437cf38105678f141eb5bd1cbb615326886cc0937db8039901c6ab5747b63b7934fca8356e96454a290 +DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702 EBUILD ejabberd-2.1.11.ebuild 7940 SHA256 343b0ff68bcf8d6d4379628b3dfee5ed5bf4565caf981e4113edcb87d260f2fa SHA512 9782f0993dc5734b3b57e50020f7952c706b97f518040934737364edfcca78597cf39152cd8c9f4e86063168abf4975cf6f3d78f9f4e6426db59adf04ec9f04d WHIRLPOOL b375b28cafdfb6ba7e5f46ec0dd844a80477bf82c37a690a5e2a7d27dcfb54f60abdee1922d2098313cf9b701ecef46638341792a0ef2b98d97bda7c1ed1e0a3 -MISC ChangeLog 22305 SHA256 af96b9136fb0f557e951eee7d1c2ce2d095518a8672e02a5c5bdbc5a7ccfdcfc SHA512 04db344d8bc0b6e9694714413ed772b35601cb70b6457f5a4fa4a6bdbc8624516cbdfdbdaf585bb311766a1e4a77433ab33deb1db70755087fbbec031427d18c WHIRLPOOL eeddb1d99b48b2db51fc30b1072371b29dbd3a59484b0400db85cad66e06a40f891498a1f7d7680350e61ad89e4074d234ff39b4f8711a5fbfbb1d1d555f3c71 -MISC metadata.xml 822 SHA256 f95e1caa27903d988327380ec3763b1f7464b894d13cb784c8553af85b63980b SHA512 f232f718d96f3cec82db21eba54859d979dff43378f20663c83da50976862c87488e3db341ad8406341d0ab399cb416863b6b8ccea1bd5c9a7a24180e4b61ae4 WHIRLPOOL 355ff977439f17112c224938ac61560161c0ffc4a435ca5d098fd9ef2cb54b6d035af73ac59f782a49c5f70d92f1cf1f11e47459ce51ffb48aec0c6b3a4b35cf +EBUILD ejabberd-2.1.12.ebuild 7976 SHA256 d78c25fc70ac367ec5981c58abf48d21005a948b3c64ce860a418061d43f7c4e SHA512 59ac4d5950a35935d771d796c243c15949ece5da7f02741568d8b9354f30c29c9ca0d50ceee5b880ddc48f64e0e74a3f17aa05a0b54b664f3d3ebf95fe850822 WHIRLPOOL 5cae756e43c552cb4fc089836afb31fd83cbf5eb4bdf2a701f2219d6a40c65aa81d85c1eead0eca0d1f0ad49bc5c8596fdffb2c166e7d9c4b6ae4c2912df04cc +MISC ChangeLog 22549 SHA256 e587158f01082a364a52cb6bd3ac9db417bd5b9a917b28ef1637e27916046b37 SHA512 310de2006a6dd6cd8b131caff1f6bf2423e4fb16464ece6184886486aa23a95165c335a32c445acaac37bf33236c3e7b989724b0c9d22eb94dce8437289e18e2 WHIRLPOOL f52a2018381f179c7d8005f143916b6f0f1174e01cdc912ff8e50ec8c4ebed9fc5b7af1cc92bf042094b39f858d9fd6151763107eac03bc7a714cd55d872d9af +MISC metadata.xml 915 SHA256 9c1956a6be7e957bf41c3ac9b5b176a9edd963fc5c8055609461689e09e0cbc6 SHA512 7ce2467693ba5db6397e28fe71a5add944c005aadfe83d21ced82a830c26971a4e94b1273239e1c0a729f2bf8b2e46a603a65109b93d7f2695e764dddbb114b8 WHIRLPOOL 19ef3e6c81ccfe6aa11b8e796956a19cdc80e56645dea70b28e1a67db211b88f36893e196f243a839d40613c6ff8b421c73f0d72ffea925fe13dbdf484b59804 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRCb3oAAoJEEqz6FtPBkyjLg8H/jf2m7v8nB/Gvegwl7AQI0j5 -gqheAPVqw3RUL/parjAMjR8Jz+YVU5/jzUIaLXFx8HLpLZ8NvXl6AWgUE7srolbR -p/9boJZIEgdJ4vgisDHnenHOvqCrnYXWINx1/LKPHlr3QcI46gRCwITSQP5vTLoC -IrgjimuKWRbpTwtcuoo2oJHYYC4MYqyl9WxZmhIsBgAplyYHxYGctkUyLFisrPJi -mMTdZO+S4RKI02IZFox26OntjuTFxgOGhkOBb/ycxPj9Rl9FSmmROFNPEmix0oag -C6cP4JdEEIBaDEDPPqaHRR3HM2DMW9x5XwE2oIlOWNvYAOh4xtmxuZkABCqHAts= -=nIJh +iQEcBAEBCAAGBQJRXpNqAAoJEEqz6FtPBkyjceQH/1DqJMhENRB6XS+ED2iThI7R +UBhHI6oKTFCeA7d18AulGBqrkcLW26DqP7KYj/avNG41ageSUQmLRZr+9yy4Tm5O +HimYuiZfrADRgr5wtGDgVW0OYf8ATnRMhI89uv3LmwYVDf5i5hrQMKgm0k7xtkbP +q0hlBH2OcJ6NQz0jGgciPMkIazYzU0lfF40OjqtQZygWaJTV3ECWeDoWopZ8Ew3h +DS5ztnqlVeJznVcX3pxQjvU6nGld3RXPIxKnyIvN14K8VhBxadM02C2GPN8pNuaw +HKbjNS6KDkQIj3GVjiDZquL52iSaYR1ZKcOuauums2hSgTA2MH7oIcU2aPlgKBU= +=H6lM -----END PGP SIGNATURE----- diff --git a/net-im/ejabberd/ejabberd-2.1.12.ebuild b/net-im/ejabberd/ejabberd-2.1.12.ebuild new file mode 100644 index 000000000000..f8414a26fd2b --- /dev/null +++ b/net-im/ejabberd/ejabberd-2.1.12.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.12.ebuild,v 1.1 2013/04/05 09:03:34 radhermit Exp $ + +EAPI=5 + +inherit eutils multilib pam ssl-cert + +DESCRIPTION="The Erlang Jabber Daemon" +HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/" +SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz + mod_statsdx? ( http://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx" +IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}" + +DEPEND=">=net-im/jabber-base-0.01 + >=dev-libs/expat-1.95 + >=dev-lang/erlang-12.2.5[ssl] + odbc? ( dev-db/unixODBC ) + ldap? ( =net-nds/openldap-2* ) + >=dev-libs/openssl-0.9.8e + captcha? ( media-gfx/imagemagick[truetype,png] ) + zlib? ( sys-libs/zlib )" +#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable. +RDEPEND="${DEPEND} + >=sys-apps/shadow-4.1.4.2-r3 + pam? ( virtual/pam )" + +S=${WORKDIR}/${P}/src + +# paths in net-im/jabber-base +JABBER_ETC="${EPREFIX}/etc/jabber" +#JABBER_RUN="/var/run/jabber" +JABBER_SPOOL="${EPREFIX}/var/spool/jabber" +JABBER_LOG="${EPREFIX}/var/log/jabber" +JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}" + +src_prepare() { + if use mod_statsdx; then + ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module" + ewarn "taken from here: http://www.ejabberd.im/mod_stats2file" + EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch + fi + + # don't install release notes (we'll do this manually) + sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die + # Set correct paths + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \ + -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ + -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ + -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ + -i Makefile.in || die + sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \ + -e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \ + -e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \ + -e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \ + -i ejabberdctl.template || die + + # Set shell, so it'll work even in case jabber user have no shell + # This is gentoo specific I guess since other distributions may have + # ejabberd user with reall shell, while we share this user among different + # jabberd implementations. + sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die + sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die + + #sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl + + # fix up the ssl cert paths in ejabberd.cfg to use our cert + sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \ + -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" + + # correct path to captcha script in default ejabberd.cfg + sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \ + -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" + + # disable mod_irc in ejabberd.cfg + if ! use mod_irc; then + sed -i -e "s/{mod_irc,/%{mod_irc,/" \ + -i ejabberd.cfg.example || die "Failed to disable mod_irc" + fi + +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \ + $(use_enable mod_irc) \ + $(use_enable ldap eldap) \ + $(use_enable mod_muc) \ + $(use_enable mod_proxy65) \ + $(use_enable mod_pubsub) \ + $(use_enable web) \ + $(use_enable odbc) \ + $(use_enable zlib ejabberd_zlib) \ + $(use_enable pam) \ + --enable-user=jabber +} + +src_compile() { + emake $(use debug && echo debug=true ejabberd_debug=true) +} + +src_install() { + default + + # Pam helper module permissions + # http://www.process-one.net/docs/ejabberd/guide_en.html + if use pam; then + pamd_mimic_system xmpp auth account || die "Cannot create pam.d file" + fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" + fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" + fi + + cd "${WORKDIR}/${P}/doc" + dodoc "release_notes_${PV%%_rc*}.txt" + + #dodir /var/lib/ejabberd + newinitd "${FILESDIR}/${PN}-3.initd" ${PN} + newconfd "${FILESDIR}/${PN}-3.confd" ${PN} +} + +pkg_postinst() { + elog "For configuration instructions, please see" + elog "/usr/share/doc/${PF}/html/guide.html, or the online version at" + elog "http://www.process-one.net/en/ejabberd/docs/guide_en/" + + if ! use web ; then + ewarn + ewarn "The web USE flag is off, this has disabled the web admin interface." + ewarn + fi + + elog + elog '====================================================================' + elog 'Quick Start Guide:' + elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91' + elog ' {hosts, ["localhost", "thehost"]}.' + elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360' + elog ' {acl, admin, {user, "theadmin", "thehost"}}.' + elog '3) Start the server' + elog ' # /etc/init.d/ejabberd start' + elog '4) Register the admin user' + elog ' # /usr/sbin/ejabberdctl register theadmin thehost thepassword' + elog '5) Log in with your favourite jabber client or using the web admin' + + # Upgrading from ejabberd-2.0.x: + if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then + source "${EROOT}/etc/conf.d/ejabberd" + ewarn + ewarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!" + ewarn "Starting with 2.1.x some paths and configuration files were" + ewarn "changed to reflect upstream intentions better. Notable changes are:" + ewarn + ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script." + ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg" + ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE" + ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start." + ewarn + ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides" + ewarn "at standard location: /etc/ssl/ejabberd/server.pem." + ewarn + ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie" + ewarn + ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log" + ewarn + ewarn "5. Crash dumps (if any) will be located at /var/log/jabber" + + local i ctlcfg new_ctlcfg + i=0 + ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg + while :; do + new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i}) + [[ ! -e ${new_ctlcfg} ]] && break + ctlcfg=${new_ctlcfg} + ((i++)) + done + + ewarn + ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})" + sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die + + if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then + ewarn "Moving .erlang.cookie..." + if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then + mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak} + fi + mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie + fi + ewarn + ewarn "We'll try to handle upgrade automagically but, please, do your" + ewarn "own checks and do not forget to run 'etc-update'!" + ewarn "PLEASE! Run 'etc-update' now!" + fi + + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}" + install_cert /etc/ssl/ejabberd/server + # Fix ssl cert permissions bug #369809 + chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem" + chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem" + if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then + ewarn + ewarn "The location of SSL certificates has changed. If you are" + ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier you might" + ewarn "want to move your old certificates from /etc/jabber into" + ewarn "/etc/ssl/ejabberd/, update config files and" + ewarn "rm /etc/jabber/ssl.pem to avoid this message." + ewarn + fi +} diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd index 2d6d44d3c317..00a28aa49298 100644 --- a/net-im/ejabberd/files/ejabberd-3.initd +++ b/net-im/ejabberd/files/ejabberd-3.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.3 2010/06/02 07:12:27 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.4 2013/04/05 09:03:34 radhermit Exp $ depend() { use dns @@ -15,7 +15,7 @@ start() { return 0 fi ebegin "Starting ejabberd" - /usr/sbin/ejabberdctl ${EJABBERDCTL_OPT} start + /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start eend $? } diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml index 5db3e64fe2c2..0dd5b42ea3ab 100644 --- a/net-im/ejabberd/metadata.xml +++ b/net-im/ejabberd/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>net-im</herd> + <maintainer> + <email>radhermit@gentoo.org</email> + <name>Tim Harder</name> + </maintainer> <longdescription> Free and Open Source distributed fault-tolerant Jabber server. It's mostly written in Erlang, and works on many platforms. |