Version bump (bug #487994).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4F064CA3

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 348ae05a9ced9cb0748aa2fe067c7ee8e6d31aed..c00da30d829b9df1ea98890c909586bee52e6fe0 100644 (file)
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.127 2015/03/20 21:40:41 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.128 2015/04/12 05:27:09 radhermit Exp $
+
+*ejabberd-15.03 (12 Apr 2015)
+
+  12 Apr 2015; Tim Harder <radhermit@gentoo.org> +ejabberd-15.03.ebuild,
+  +files/ejabberd-15.03-ejabberdctl.patch, metadata.xml:
+  Version bump (bug #487994).
 
   20 Mar 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Drop myself as maintainer.

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 79e9a30e3717eeb9a2ecdbc6e82d099be1f1e5e6..cb3bdbf323cb717ded46149df54eb09b6fd3b27a 100644 (file)
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ejabberd-15.03-ejabberdctl.patch 1582 SHA256 74d699ce3edefa2f883b42b9fa6bc174d30a155d943b4a9fbd1e7dc5f163abf4 SHA512 deea56f547dfa3b8abc3588ffd332b968d7f0b412d0a2af1d301f491d693a435e7d1c7f107e51dff78b5ade93e8b63cfd2c7bed0e03533e7685126a4ccf1a461 WHIRLPOOL d95a7fae42525608a33b1b72702652a20f40fae7acf033d4dadc234e93b87eb84d5acc95b4534da20c4bf0c5e9442bb8696b24e00d873289a6d71c3b20be4358
 AUX ejabberd-3.confd 161 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb WHIRLPOOL 657c44991244d58c10590093a7f58f654cb45cf7e22244b474459c63a449c17d0cf1d6f2d62008ddb34f0022f8fc9e31f22d2010cb3d1070a462bcb22a9a81fc
 AUX ejabberd-3.initd 1025 SHA256 2810ca25fbe9d41a175b15c82d9ea1254fc4c934fd6ec02d9ee10bc34079e168 SHA512 5705074bd564568295d6d098394937ea44f5ea38ebc386fbcc3f8a239734acb77784500e8761e5fb3864fb56f7d136c9ef1f65603810d31b1f9a0ee4005d389a WHIRLPOOL 13718736e2ff08380c8a2df38099f11a0c5257188731fe9830e1ccdbe304b7c9984956ec7b1f9db11f677293a939604db79ac0870c1a74116d1eb70c1c373391
 AUX ejabberd.logrotate 203 SHA256 42f28222c6a5b7c691eb371085cccdef3fcba059a1e89f18744aa9bfc25e6294 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2 WHIRLPOOL ffbdfc1b22e855666aedbf816ec44439addcae21d82509399de046fa6a7c0182c1df756377a9d08d3b1f1d73e1e09ecd85da145357850d8a11d8ddb4b3b29d2a
 AUX ejabberd.service 422 SHA256 a699466dd95b8fb98aca078ca7e57a2d9f0fed13ecdc70d10b96e96df61b64af SHA512 91ba2ca5b0104a7628a63a80efd0ec4aa016f9100b631701e18ab7b524c2e2e9471a6ece4adcc90bbea16af05479dfa5a2414d2f50bdd4b0cd06a1e40539c5e3 WHIRLPOOL eb3b5af56eaf4292cdb67854e46ccc9d0c4f3f8674ad7992fdbfb037c3a441b27c922ac80f2fd8819c84411f045c689e67eeca4e331d088c7749fa4fc74437a3
 AUX ejabberd.tmpfiles.conf 43 SHA256 2ee7fb4fb9c9c931ffa8c1dfa273e6658f3bbd37bb6ae25765b9e4f2a7459506 SHA512 8bdc297d5cb405e82c33627b36730992584d7f8b92d15c47933edd01ba6575983009c1f6607a21eee0280abdf7b51639d99d7836712a8d3629ec1e960b8a02c4 WHIRLPOOL f27e3a9bff1ab941c4a80fc5573d8541e40804f24b2f2e40e0f77c2ea2016e5c0b323e59674ed880df95037d0d82a956bc9ea984b5b371dd16e50858faa7e0d0
+DIST ejabberd-15.03.tar.xz 6274856 SHA256 3a6fd6e94d6f24575dcaff1aa7ca319944eb76970a9d3b6bf5f30819824143fc SHA512 b292b596094aeab576d9d4aadea47042eeda130881de5dd523985dc60cd0644726dae8d525364ec72992c0c45ba9e0673b7a6ffc2bc20613ba0092e2b285e16f WHIRLPOOL 630feba542f5d4bac1e4c17f453b2298a500c0d18159e8f09a4f11e9d372f7ffbf6e2e600c0ee849c689868872644404c03ebfb375d4852f3bbbd966417d951e
 DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
 DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
+EBUILD ejabberd-15.03.ebuild 4384 SHA256 74f96212bf6678dcc4b87c90870a4b32e8b615aef4e95d0a0eeb6676de80af0c SHA512 e982e8dde3ada498ab3bcc611546acbbeadfd2f24a546e7bae227d5af663d4e008b90629b82becb39841f58365546b4337817a40ac4a696e8d16c121c0bc3001 WHIRLPOOL 3089232ddaf338584265f137dd227f5e6693e287e1d53f033c39ddd3957b3cd0518de368885a744d38eaaa12cc1997d892ac7df88444a9abb67fb786dd30a820
 EBUILD ejabberd-2.1.13-r1.ebuild 8274 SHA256 e16a5597895475bd4f189bf507708c63c98774ea93ee4650f5982811db4812c0 SHA512 cae7f9f6b015c97505c713d31732619d1f222a0ce2e35effa36e5f5105f3bed2c080f9180dbc7533b02f403e08ab2dbd5fea99e8e88127ee54b59e30ddcd55f2 WHIRLPOOL 933d1f5f19a8f63faa524dea110ad5658602ae62194169393756c651080240b8373fcc88f1714fda18ac81adddeb90cf1c9330a08c78f41391a04f2e5157036d
-MISC ChangeLog 24091 SHA256 a8c36494566dbd1a7716291be6d9913bb5c2bb99026d2a63838a922364a51401 SHA512 7db824e90a37f1160f0340397c6df69031b7661bb9f9ef3f3d2c7f1a777ef5877e4f50a739738a420f62e5fdc7f89dea2ec8f75ef2b90ae24f4edba7eb9fd4d3 WHIRLPOOL 603e042437622a6298e87387d023e64e54f9670ad735930233d0f9d0db7532b4f0bdec4adafc0ff046406e98cff886635099c7350cd521ef11acbf0cff1a2114
-MISC metadata.xml 822 SHA256 f95e1caa27903d988327380ec3763b1f7464b894d13cb784c8553af85b63980b SHA512 f232f718d96f3cec82db21eba54859d979dff43378f20663c83da50976862c87488e3db341ad8406341d0ab399cb416863b6b8ccea1bd5c9a7a24180e4b61ae4 WHIRLPOOL 355ff977439f17112c224938ac61560161c0ffc4a435ca5d098fd9ef2cb54b6d035af73ac59f782a49c5f70d92f1cf1f11e47459ce51ffb48aec0c6b3a4b35cf
+MISC ChangeLog 24283 SHA256 afbb41cb4599ef3d78f551ad406abe406e5a09e07c3d2ba3b48f3a99afbd3e1d SHA512 9918cbc5f1badf55b61080604b31b819fb9dd6d9dec33d47c2046a69d7d66709ba9b7db08227de2a6da66a560f9d2291f66db8e988cc5222800d89e6130ba3e7 WHIRLPOOL c90a878350b30f14af5b702a979adc0ceb651f34be8b0cf9ce42e14c03c435539e0f5a581e66d458442b56569688475c2c7cb7476eb245d3354958d2dcdbd6a1
+MISC metadata.xml 1132 SHA256 df9b0b2b2ee124482a7202bb7e30386a829db5ed643bf619c4189cfc7516679b SHA512 5269bdbf00d3880901052a61d384fd5d6c1e37201f90a72831140f3aa80653d3d4dc1a873ef06720853d926c91b1f5a8aa5c65e304cc0728cfe8e3e9e8816a4f WHIRLPOOL da64aa8efbe36dcc0a5469bc6ef3d0b7a2f6372a6faedbb45aaf9c6034cebcc5b683c031472cb5a466d5f69025d48b2d05c4cf635ea7551e3a60e1063ad6a608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVDJPrAAoJEEqz6FtPBkyjGPoH/ApNKw3eTlzEfvP5sB8uF1il
-x73Rz7ycYKrJwaDyU0gaTEVdvwh9o0HmKS8z5j4Dos7tlpj0+d2QMGWEDAol/Oqz
-b6essh65WlZprg34CsGYYJbvHBu2Q8nwWU0uv5EiCvyGX2IWZd6DKDB7acXEAGpE
-jHUSmZQSXj7XWNzFnl8o9Uz1cxosh98HZImy8rVbtS+xtBT+QS+Y5tS/weafO5Kl
-xsk2ZAP+rp2yk4p72c1Gzo7pAvOtaCllgC10cHhtWLkUMOlb3ouUYMYjAB6Kqmrx
-hmfxFm3w9m09Mdb7xR95/eCget8RwwAKFbCULexpK3GKXJeRH8x7hHZnFBrw8k4=
-=SaW9
+iQEcBAEBCAAGBQJVKgIrAAoJEEqz6FtPBkyjSpsH/jv2nh5Sgvt9IgimyYhlMRiY
+a7ZcwG+lEJ8DreEwI0UiVsOeHitUT/Bnxy6rsL+UAxpf3aRUkDkQ8K2Ay/kt/Rzv
+j54O2FZ6km/jlseWGwRst+1Bu7OHT38i9ANa9ZFiDlTcRDEvyqTFXSGu8iCL2LZr
+v7pDSKHG9NASdKbT0ipz3hwLW38BSr8z7dV7L75dv+LmFbGZgRgU2sEwOGVjeW4J
+N2uKAgGSqZ4UOK3kuE5xewTPS5AQuu4AZTPjTdVIVN3cbxH6ULyxoXhi19Z49z75
+OEFRsVNza02wu9bNPTWQDcfLusD7Whorn3wuSetTk3LTPFF33/akD5NbI9aQoAE=
+=2WR5
 -----END PGP SIGNATURE-----

diff --git a/net-im/ejabberd/ejabberd-15.03.ebuild b/net-im/ejabberd/ejabberd-15.03.ebuild
new file mode 100644 (file)
index 0000000..2e18b98
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-15.03.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-15.03.ebuild,v 1.1 2015/04/12 05:27:09 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://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
+# upstream tarball missing bundled erlang libs that are fetched via git
+#SRC_URI="https://www.process-one.net/downloads/downloads-action.php?file=/${PN}/${PV}/${P}.tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
+IUSE="captcha debug elixir ldap mysql odbc pam postgres riak redis tools zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+       >=dev-libs/expat-1.95
+       >=dev-libs/libyaml-0.1.4
+       >=dev-lang/erlang-15.2[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-1.2.3 )"
+RDEPEND="${DEPEND}
+       >=sys-apps/shadow-4.1.4.2-r3
+       pam? ( virtual/pam )"
+
+# 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() {
+       epatch "${FILESDIR}"/${P}-ejabberdctl.patch
+
+       # 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|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+               -e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+               -e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+                       -i ejabberdctl.template || die
+
+       # fix up the ssl cert paths in ejabberd.yml to use our cert
+       sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+               -i ejabberd.yml.example || die
+
+       # correct path to captcha script in default ejabberd.yml
+       sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
+                       -i ejabberd.yml.example || die
+
+       # disable mod_irc in ejabberd.yml
+       if ! use mod_irc; then
+               sed -e "s/{mod_irc,/%{mod_irc,/" \
+                       -i ejabberd.yml.example || die
+       fi
+
+       epatch_user
+}
+
+src_configure() {
+       # run configure scripts for all prefetched deps
+       ./rebar get-deps
+
+       econf \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
+               $(use_enable tools) \
+               $(use_enable odbc) \
+               $(use_enable mysql) \
+               $(use_enable postgres pgsql) \
+               $(use_enable pam) \
+               $(use_enable zlib) \
+               $(use_enable riak) \
+               $(use_enable redis) \
+               $(use_enable mod_bosh json) \
+               $(use_enable elixir) \
+               $(use_enable mod_irc iconv) \
+               $(use_enable debug) \
+               --enable-lager \
+               --enable-user=jabber
+}
+
+src_compile() {
+       emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+       default
+
+       # Pam helper module permissions
+       if use pam; then
+               pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+       fi
+
+       newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+       newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+}
+
+pkg_postinst() {
+       if [[ -z ${REPLACING_VERSIONS} ]] ; then
+               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/"
+       else
+               elog "Ejabberd now defaults to using a YAML format for its config file."
+               elog "To convert your old Erlang term file run the following as root:"
+               elog "ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml"
+               echo
+       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"
+}

diff --git a/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch
new file mode 100644 (file)
index 0000000..0d2ccf3
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch
@@ -0,0 +1,49 @@
+Set SHELL since the generic jabber user used on Gentoo for jabber servers
+doesn't have a valid shell set by default and fix EXEC_CMD otherwise it fails
+with "This account is currently not available" again due to jabber not having
+a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when instead
+it defaults to /dev/null on Gentoo.
+
+--- ejabberd-15.03/ejabberdctl.template
++++ ejabberd-15.03/ejabberdctl.template
+@@ -15,6 +15,7 @@
+ IEX={{bindir}}/iex
+ EPMD={{bindir}}/epmd
+ INSTALLUSER={{installuser}}
++SHELL=/bin/sh
+ 
+ # Compatibility in ZSH
+ #setopt shwordsplit 2>/dev/null
+@@ -25,11 +26,11 @@
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+-            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su $INSTALLUSER -p -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -111,6 +112,7 @@
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define erl parameters
+ ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g')
+@@ -167,6 +169,8 @@
+ export ERL_INETRC
+ export ERL_MAX_PORTS
+ export ERL_MAX_ETS_TABLES
++export HOME
++export SHELL
+ 
+ # start server
+ start()

diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 5db3e64fe2c2cb2924327ce8eac66b787bcb2d81..a694512ebbc33663dabf48a57131076d2a7ec8be 100644 (file)
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -7,12 +7,17 @@
                mostly written in Erlang, and works on many platforms.
        </longdescription>
        <use>
+               <flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
+               <flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
+               <flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
+               <flag name='elixir'>Enable Elixir language support (http://elixir-lang.org/)</flag>
+               <flag name='mod_bosh'>Enable support for XMPP over BOSH (XEP-0206)</flag>
                <flag name='mod_irc'>Build irc gateway</flag>
                <flag name='mod_muc'>Build Multi User Chat module</flag>
                <flag name='mod_pubsub'>Build Pubsub module</flag>
+               <flag name='redis'>Enable Redis support</flag>
+               <flag name='riak'>Enable Riak support</flag>
+               <flag name='tools'>Build development tools</flag>
                <flag name='web'>Enable web admin interface</flag>
-               <flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
-               <flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
-               <flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
        </use>
 </pkgmetadata>