net-im/jabberd2: version bump to 2.3.3

Gentoo-Bug: 539534

2 files changed, 158 insertions, 0 deletions

diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 9e461eda2d33..176fa40c09fb 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,2 +1,3 @@
 DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
 DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
+DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463
diff --git a/net-im/jabberd2/jabberd2-2.3.3.ebuild b/net-im/jabberd2/jabberd2-2.3.3.ebuild
new file mode 100644
index 000000000000..af82c89460b0
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25:* )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1:0 )
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+	fi
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}