Sync missing systemd setup, run configure steps in the correct order, make config file conversion directions more specific, and add nls use flag.

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

3 files changed, 47 insertions, 21 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index c00da30d829b..3a784ce90162 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.128 2015/04/12 05:27:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.129 2015/04/14 03:39:56 radhermit Exp $
+
+*ejabberd-15.03-r1 (14 Apr 2015)
+
+  14 Apr 2015; Tim Harder <radhermit@gentoo.org> -ejabberd-15.03.ebuild,
+  +ejabberd-15.03-r1.ebuild:
+  Sync missing systemd setup, run configure steps in the correct order, make
+  config file conversion directions more specific, and add nls use flag.
 
 *ejabberd-15.03 (12 Apr 2015)
 
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index cb3bdbf323cb..f075fe2a67d7 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -10,18 +10,18 @@ AUX ejabberd.tmpfiles.conf 43 SHA256 2ee7fb4fb9c9c931ffa8c1dfa273e6658f3bbd37bb6
 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-15.03-r1.ebuild 5576 SHA256 aa1ba6bd2c92694e9ebee3cf50ca01c9db72b50bf1f8398052a1dd07e7f45b0e SHA512 cdfb3efcfb6e76ec42a186ae168fa9886e78e071a1a34423c3c44e88f4b45ae52bc9d83593af977519486d0262b7641efae6420a2e5bb34ad452ddf7113a6872 WHIRLPOOL fc829c30d32ece05bd04456cf4c41f6c977a00145df618daa45d2171fc22892e183f1beb44620d3305b8e01b498b6098bc07bb16871dd6024aeb16ffed1ffe81
 EBUILD ejabberd-2.1.13-r1.ebuild 8274 SHA256 e16a5597895475bd4f189bf507708c63c98774ea93ee4650f5982811db4812c0 SHA512 cae7f9f6b015c97505c713d31732619d1f222a0ce2e35effa36e5f5105f3bed2c080f9180dbc7533b02f403e08ab2dbd5fea99e8e88127ee54b59e30ddcd55f2 WHIRLPOOL 933d1f5f19a8f63faa524dea110ad5658602ae62194169393756c651080240b8373fcc88f1714fda18ac81adddeb90cf1c9330a08c78f41391a04f2e5157036d
-MISC ChangeLog 24283 SHA256 afbb41cb4599ef3d78f551ad406abe406e5a09e07c3d2ba3b48f3a99afbd3e1d SHA512 9918cbc5f1badf55b61080604b31b819fb9dd6d9dec33d47c2046a69d7d66709ba9b7db08227de2a6da66a560f9d2291f66db8e988cc5222800d89e6130ba3e7 WHIRLPOOL c90a878350b30f14af5b702a979adc0ceb651f34be8b0cf9ce42e14c03c435539e0f5a581e66d458442b56569688475c2c7cb7476eb245d3354958d2dcdbd6a1
+MISC ChangeLog 24570 SHA256 903c4319b93b07658e835d9bb3dbd5c2e29601975254e739762f022e94ff2ced SHA512 8ffa26865338adcb4df52c4afb55b9d85c836e69f9fbb6b5391f4baeff6cd7105315d0b109ce639c00475a29e78f4f6400ae0e32e91a38975f1c1a1cccbdf58e WHIRLPOOL dd9d50e7dab81a693deeb36f5144406dcbaf7de85cdef6442e4078db8a8d82bd234bd76fec375bbbfc1dd13285eec9bb67dcd9fdb07124986d5b467e060ac40d
 MISC metadata.xml 1132 SHA256 df9b0b2b2ee124482a7202bb7e30386a829db5ed643bf619c4189cfc7516679b SHA512 5269bdbf00d3880901052a61d384fd5d6c1e37201f90a72831140f3aa80653d3d4dc1a873ef06720853d926c91b1f5a8aa5c65e304cc0728cfe8e3e9e8816a4f WHIRLPOOL da64aa8efbe36dcc0a5469bc6ef3d0b7a2f6372a6faedbb45aaf9c6034cebcc5b683c031472cb5a466d5f69025d48b2d05c4cf635ea7551e3a60e1063ad6a608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVKgIrAAoJEEqz6FtPBkyjSpsH/jv2nh5Sgvt9IgimyYhlMRiY
-a7ZcwG+lEJ8DreEwI0UiVsOeHitUT/Bnxy6rsL+UAxpf3aRUkDkQ8K2Ay/kt/Rzv
-j54O2FZ6km/jlseWGwRst+1Bu7OHT38i9ANa9ZFiDlTcRDEvyqTFXSGu8iCL2LZr
-v7pDSKHG9NASdKbT0ipz3hwLW38BSr8z7dV7L75dv+LmFbGZgRgU2sEwOGVjeW4J
-N2uKAgGSqZ4UOK3kuE5xewTPS5AQuu4AZTPjTdVIVN3cbxH6ULyxoXhi19Z49z75
-OEFRsVNza02wu9bNPTWQDcfLusD7Whorn3wuSetTk3LTPFF33/akD5NbI9aQoAE=
-=2WR5
+iQEcBAEBCAAGBQJVLIwKAAoJEEqz6FtPBkyjxRQH/14M9q0VudW2duEt2rfQOY2D
+zfrGN1thyK010b/zbgAXIdUUgaYIVKUrzAzH8CCzFE00SRUvUREyNk0iPiQW8k4V
+GoOfxjL+kHxV4VQmMKUiGM3pcqpBA8RvOUC0qTnjigbRx14P6DrRWKn5PgXLJfc7
+xK05TuDVraT9Z85ogRfmZVqURVqZOx2Jh44wuiwlfsBmjMYpChwJv1yYLorrnO4j
+1Vm8zdH2kDZhKYiJbKRihrWeLvMMBV5vIExVzYpm277mVdfb3os3wE43gVQ/1fAu
+8n07YscpRS0lh3A3jJ29vLNHi3a8D8plx27olpMDjfP5HCiguN89E2KoIqYvfKU=
+=q/D1
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-15.03.ebuild b/net-im/ejabberd/ejabberd-15.03-r1.ebuild
index 2e18b98a1dcd..2b8c79f16ddf 100644
--- a/net-im/ejabberd/ejabberd-15.03.ebuild
+++ b/net-im/ejabberd/ejabberd-15.03-r1.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-15.03-r1.ebuild,v 1.1 2015/04/14 03:39:56 radhermit Exp $
 
 EAPI=5
 
-inherit eutils multilib pam ssl-cert
+inherit eutils multilib pam ssl-cert systemd
 
 DESCRIPTION="The Erlang Jabber Daemon"
 HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
@@ -16,7 +16,7 @@ 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}"
+IUSE="captcha debug elixir ldap mysql nls odbc pam postgres riak redis tools zlib ${EJABBERD_MODULES}"
 
 DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/expat-1.95
@@ -55,13 +55,15 @@ src_prepare() {
 		-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
+	# fix up the ssl cert paths in ejabberd.yml to use our cert and
+	# also use the correct pam service name
 	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+		-e "s:pamservicename:xmpp:" \
 		-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
+		-i ejabberd.yml.example || die
 
 	# disable mod_irc in ejabberd.yml
 	if ! use mod_irc; then
@@ -73,9 +75,6 @@ src_prepare() {
 }
 
 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/" \
@@ -88,11 +87,14 @@ src_configure() {
 		$(use_enable riak) \
 		$(use_enable redis) \
 		$(use_enable mod_bosh json) \
+		$(use_enable nls iconv) \
 		$(use_enable elixir) \
-		$(use_enable mod_irc iconv) \
 		$(use_enable debug) \
 		--enable-lager \
 		--enable-user=jabber
+
+	# run configure scripts for all prefetched deps
+	./rebar get-deps || die
 }
 
 src_compile() {
@@ -103,12 +105,20 @@ src_install() {
 	default
 
 	# Pam helper module permissions
+	# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
 	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
 
 	newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
 }
 
 pkg_postinst() {
@@ -118,8 +128,17 @@ pkg_postinst() {
 		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"
+		elog "The old ejabberd.cfg file can be converted using the following instructions:"
+		echo
+		elog "1. Make sure all processes related to the previous version of ejabberd aren't running."
+		elog "   Usually this just means the ejabberd daemon and possibly the pam-related processes"
+		elog "   (epmd and epam) if pam support is enabled."
+		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can fail to"
+		elog "   start ejabberd properly for various reasons. Check ejabberd's main log file"
+		elog "   at /var/log/jabber/ejabberd.log to confirm it started successfully."
+		elog "3. Run \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config file."
 		echo
 	fi