Version bump, closes bugs #188679, #192012 and #190266.

Package-Manager: portage-2.1.3.9

6 files changed, 242 insertions, 9 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index f5e044110686..92d73610c4e6 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.23 2007/09/01 07:04:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.24 2007/09/14 11:38:28 chainsaw Exp $
+
+*ejabberd-1.1.4 (14 Sep 2007)
+
+  14 Sep 2007; Tony Vroon <chainsaw@gentoo.org> +files/ejabberd-1.1.4.initd,
+  +files/1.1.4-missing-declaration.patch, +ejabberd-1.1.4.ebuild:
+  Version bump, closes bugs #188679, #192012 and #190266.
 
   01 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   ejabberd-1.1.3-r2.ebuild:
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 3e8e22bf81bd..a28ef8a68c32 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -5,6 +5,10 @@ AUX 1.1.3-missing-declaration.patch 334 RMD160 af3e6f2560533ab5fcda7c8ac3d478932
 MD5 c854f25b314977635042247d7b60018b files/1.1.3-missing-declaration.patch 334
 RMD160 af3e6f2560533ab5fcda7c8ac3d4789324ea8023 files/1.1.3-missing-declaration.patch 334
 SHA256 c3ecd6e3b2fc7548eaa151754020ff9d799de7ea0d9efc9afd6db06a84422736 files/1.1.3-missing-declaration.patch 334
+AUX 1.1.4-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
+MD5 b73a7e80517fb5eb96a9f901f5f265b7 files/1.1.4-missing-declaration.patch 411
+RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 files/1.1.4-missing-declaration.patch 411
+SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b files/1.1.4-missing-declaration.patch 411
 AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 MD5 e34f266ad55b2db038375cb6962721cd files/ejabberd 355
 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b files/ejabberd 355
@@ -33,6 +37,10 @@ AUX ejabberd-1.1.3.confd 739 RMD160 b06ee5cf9f6542dd752c44dc0ef21076163811e5 SHA
 MD5 4fc4206ef0962ddaaf8814246795f419 files/ejabberd-1.1.3.confd 739
 RMD160 b06ee5cf9f6542dd752c44dc0ef21076163811e5 files/ejabberd-1.1.3.confd 739
 SHA256 840fbf999509e03917b7281b2893e2609fb2d0dea016e7463590aa13507bb770 files/ejabberd-1.1.3.confd 739
+AUX ejabberd-1.1.4.initd 1437 RMD160 96d9d35de36585a9e735f124b7be1618949541aa SHA1 623713cfb28a247f16a14f6b2ca6a8555609bd35 SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e
+MD5 4184e61309d3ebcd8a416c0ed6b2784e files/ejabberd-1.1.4.initd 1437
+RMD160 96d9d35de36585a9e735f124b7be1618949541aa files/ejabberd-1.1.4.initd 1437
+SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e files/ejabberd-1.1.4.initd 1437
 AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
 MD5 8379adf159d3d5749af973fe74d23367 files/ejabberdctl 199
 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 files/ejabberdctl 199
@@ -57,6 +65,7 @@ DIST ejabberd-0.7.5.tar.gz 410451 RMD160 fa7c558a568ec7fb88c1a8fab20bde61404dca3
 DIST ejabberd-1.1.1.tar.gz 803278 RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 SHA1 4f23d787afe75c7c866decdff6f539195449776e SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082
 DIST ejabberd-1.1.2.tar.gz 836240 RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d SHA1 9e94bdbc10fee5b781405daf43a0b4abc4dee6c1 SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6
 DIST ejabberd-1.1.3.tar.gz 826057 RMD160 99b4c73ae29ef9814f5c572f8e3b3a82d960f5ee SHA1 66b00ca52fa4f4f4e097b0e897c3b5a2e4526603 SHA256 3b8ac67673fa6c08bc25382d3e99171ebc71d4759899eb5a730e65117256e703
+DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be SHA1 db6f521d45dece200de4eb6fc967c64728e8f6a3 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
 DIST ejabberd-patchball-1.1.1-r1.tar.bz2 11826 RMD160 8bee1764940073c807644438914bbbad4548a9a5 SHA1 e3238179c55b77d99b0bbec25787bbc47239feee SHA256 4bf89e6858e455444bc5a29113f19462e856d1399179cb51bb8e404176eee3de
 EBUILD ejabberd-0.7.5.ebuild 2834 RMD160 135faaaef01cb9ed577049b560310e3c200a6f30 SHA1 d4e2aaa04c13a31247f91bfa902b8fadfdd35e08 SHA256 66eb7be35e5fdb19ff862720b5c860732a77cb555087a98c406a1b082d77b2b4
 MD5 ce819cfce8189238dfa88c3f89d06573 ejabberd-0.7.5.ebuild 2834
@@ -86,10 +95,14 @@ EBUILD ejabberd-1.1.3.ebuild 3367 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d596
 MD5 9a0a9f44b9a2b5f6df72c179ee70feff ejabberd-1.1.3.ebuild 3367
 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 ejabberd-1.1.3.ebuild 3367
 SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e ejabberd-1.1.3.ebuild 3367
-MISC ChangeLog 4979 RMD160 ca8a2bc189f0dd34c01388aa305a49b6a617d960 SHA1 61c8dbb503460ea2e719737d6012e0ba0e75bc80 SHA256 d06464ae403b824e69f678f181e9e0ed7a149a90cf90d86bc451fb8f1e0ca5c1
-MD5 4ab4ff6c4de673b5358cead7ec61529d ChangeLog 4979
-RMD160 ca8a2bc189f0dd34c01388aa305a49b6a617d960 ChangeLog 4979
-SHA256 d06464ae403b824e69f678f181e9e0ed7a149a90cf90d86bc451fb8f1e0ca5c1 ChangeLog 4979
+EBUILD ejabberd-1.1.4.ebuild 3398 RMD160 27a04ce2f5b4b1ab0242c31b8e43d05d5fc17993 SHA1 1e06c37bde6bf4cb5cfa0218a14939bb394567cf SHA256 5ed0d6bfc3a034670a5821fbfcaf1e3c0d15ea3b89d888e997602f4dc62c640f
+MD5 d254afd0df6255f5e306406edbb193ae ejabberd-1.1.4.ebuild 3398
+RMD160 27a04ce2f5b4b1ab0242c31b8e43d05d5fc17993 ejabberd-1.1.4.ebuild 3398
+SHA256 5ed0d6bfc3a034670a5821fbfcaf1e3c0d15ea3b89d888e997602f4dc62c640f ejabberd-1.1.4.ebuild 3398
+MISC ChangeLog 5215 RMD160 017c5c19ade5c0813c93c74f02062285e2263d20 SHA1 c6ae38f47cc92df9efdaa79028c1adecb5389fe8 SHA256 9ec3f28c24e73182b567249100c9a5939239052d28ba7b151f30524f6fa3be71
+MD5 6ec496dc9e131e1e77d1480d31028b5e ChangeLog 5215
+RMD160 017c5c19ade5c0813c93c74f02062285e2263d20 ChangeLog 5215
+SHA256 9ec3f28c24e73182b567249100c9a5939239052d28ba7b151f30524f6fa3be71 ChangeLog 5215
 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55
 MD5 2a43b0fd5e7b6404b98548ac55046b3f metadata.xml 383
 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee metadata.xml 383
@@ -115,10 +128,13 @@ SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/di
 MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3-r2 244
 RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3-r2 244
 SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3-r2 244
+MD5 77ab7ab7a3acee10a7ad96b594a96a0b files/digest-ejabberd-1.1.4 244
+RMD160 c4236c87a7e5a96c87b37ecf516008f60614f4c2 files/digest-ejabberd-1.1.4 244
+SHA256 aa9a0367dae2f4b694e73892e917dc58d8fca9e7c4029b855b34e487482b1835 files/digest-ejabberd-1.1.4 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG2Q7qNQqtfCuFneMRAlVcAJ9tpjHZb/TcFf93DPyQg9T5ulSQCgCfXist
-Io6cGfMCupGwL6T9CFB1SWc=
-=ZrCy
+iD8DBQFG6nLNp5vW4rUFj5oRAoXDAKCM+en/34h6Q0KVBSN6TY6Jw4CNmwCfU7ZN
+fktQQoR4KI2N3nqaNcrUa1E=
+=BNdp
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-1.1.4.ebuild b/net-im/ejabberd/ejabberd-1.1.4.ebuild
new file mode 100644
index 000000000000..eb7025f67ca4
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-1.1.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4.ebuild,v 1.1 2007/09/14 11:38:28 chainsaw Exp $
+
+inherit eutils multilib
+
+JABBER_ETC="/etc/jabber"
+JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+JABBER_LOG="/var/log/jabber"
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://ejabberd.jabber.ru/"
+SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web zlib"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-lang/erlang-10.2.0
+	odbc? ( dev-db/unixODBC )
+	ldap? ( =net-nds/openldap-2* )
+	ssl? ( >=dev-libs/openssl-0.9.8e )
+	zlib? ( sys-libs/zlib )"
+
+PROVIDE="virtual/jabber-server"
+S=${WORKDIR}/${P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #171427
+	epatch "${FILESDIR}/${PV}-missing-declaration.patch"
+}
+
+src_compile() {
+	econf								\
+		$(use_enable mod_irc)					\
+		$(use_enable ldap eldap)				\
+		$(use_enable mod_muc)					\
+		$(use_enable mod_pubsub)				\
+		$(use_enable ssl tls)					\
+		$(use_enable web)					\
+		$(use_enable odbc)					\
+		$(use_enable zlib ejabberd_zlib)			\
+		|| die "econf failed"
+
+	if useq debug; then
+		emake ejabberd_debug=true || die "compiling ejabberd core failed"
+	else
+		emake || die "compiling ejabberd core failed"
+	fi
+}
+
+src_install() {
+	make								\
+		DESTDIR="${D}"						\
+		EJABBERDDIR="${D}/usr/$(get_libdir)/erlang/lib/${P}"	\
+		ETCDIR="${D}${JABBER_ETC}"				\
+		LOGDIR="${D}${JABBER_LOG}"				\
+		install							\
+		|| die "install failed"
+
+	chown -R jabber:jabber "${D}${JABBER_ETC}"
+	chown -R jabber:jabber "${D}${JABBER_LOG}"
+	chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}"
+
+	insinto /usr/share/doc/${PF}
+	dohtml doc/*.{html,png}
+
+	#
+	# Create /usr/bin/ejabberd
+	#
+	cat <<EOF > "${T}/ejabberd"
+#!/bin/bash
+
+erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+	${pa} \\
+	-sname ejabberd \\
+	-s ejabberd \\
+	-ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\
+	log_path \"${JABBER_LOG}/ejabberd.log\" \\
+	-kernel inetrc \"${JABBER_ETC}/inetrc\" \\
+	-sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\
+	-mnesia dir \"${JABBER_SPOOL}\" \\
+	\$@
+EOF
+
+	#
+	# Create /usr/bin/ejabberdctl
+	#
+	cat <<EOF > "${T}/ejabberdctl"
+#!/bin/sh
+
+exec env HOME=${JABBER_RUN} \\
+	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+		${pa} \\
+		-noinput \\
+		-sname ejabberdctl \\
+		-s ejabberd_ctl \\
+		-extra \$@
+EOF
+
+	dobin "${T}/ejabberdctl"
+	dobin "${T}/ejabberd"
+
+	newinitd "${FILESDIR}/${P}.initd" ${PN}
+	newconfd "${FILESDIR}/ejabberd-1.1.3.confd" ${PN}
+
+	insinto ${JABBER_ETC}
+	doins "${FILESDIR}/inetrc"
+	if useq ssl ; then
+		doins "${FILESDIR}/ssl.cnf"
+		newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
+	fi
+}
+
+pkg_postinst() {
+	elog "For configuration instructions, please see /usr/share/doc/${PF}/html/guide.html"
+	elog "or the online version at http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
+	echo
+	if useq ssl ; then
+		if [ ! -e /etc/jabber/ssl.pem ]; then
+			elog "Please edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh"
+			elog "Ejabberd may refuse to start without an SSL certificate"
+		fi
+	fi
+	if ! useq web ; then
+		elog "The web USE flag is off, this has disabled the web admin interface."
+	fi
+}
diff --git a/net-im/ejabberd/files/1.1.4-missing-declaration.patch b/net-im/ejabberd/files/1.1.4-missing-declaration.patch
new file mode 100644
index 000000000000..72c56cbcef97
--- /dev/null
+++ b/net-im/ejabberd/files/1.1.4-missing-declaration.patch
@@ -0,0 +1,12 @@
+diff -uNr ejabberd-1.1.4.ORIG/src/expat_erl.c ejabberd-1.1.4/src/expat_erl.c
+--- ejabberd-1.1.4.ORIG/src/expat_erl.c	2007-09-14 12:07:56.000000000 +0100
++++ ejabberd-1.1.4/src/expat_erl.c	2007-09-14 12:08:56.000000000 +0100
+@@ -14,6 +14,8 @@
+  * Workaround for EI encode_string bug
+  */
+ 
++int x_fix_buff(ei_x_buff* x, int szneeded);
++
+ #define put8(s,n) do { \
+   (s)[0] = (char)((n) & 0xff); \
+   (s) += 1; \
diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.4 b/net-im/ejabberd/files/digest-ejabberd-1.1.4
new file mode 100644
index 000000000000..630fbfdaaade
--- /dev/null
+++ b/net-im/ejabberd/files/digest-ejabberd-1.1.4
@@ -0,0 +1,3 @@
+MD5 65e9cd346f11a28afbacfe1d7be3a33b ejabberd-1.1.4.tar.gz 846059
+RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be ejabberd-1.1.4.tar.gz 846059
+SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6 ejabberd-1.1.4.tar.gz 846059
diff --git a/net-im/ejabberd/files/ejabberd-1.1.4.initd b/net-im/ejabberd/files/ejabberd-1.1.4.initd
new file mode 100644
index 000000000000..1f37df66a5c4
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.4.initd
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.4.initd,v 1.1 2007/09/14 11:38:29 chainsaw Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use dns
+	need net
+	provide jabber-server
+}
+
+checkconfig() {
+	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
+		eerror "You need an /etc/jabber/ejabberd.cfg file to run ejabberd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting eJabberd"
+	start-stop-daemon --start --quiet --chuid jabber:jabber \
+		--exec /usr/bin/env HOME=/var/run/jabber /usr/bin/ejabberd -- -noshell -detached
+	eend $?
+	# For bug #190266
+	chown jabber:jabber /var/run/jabber/.erlang.cookie
+}
+
+stop() {
+	ebegin "Stopping eJabberd"
+	if [ -z "$EJABBERD_NODE" ];
+	then
+		EJABBERD_NODE="ejabberd@`hostname -s`"
+	fi
+	/usr/bin/ejabberdctl $EJABBERD_NODE stop
+	eend $?
+}
+
+# Work around a bug in /sbin/runscript.sh - it won't run our custom
+# restart() unless it finds these two strings in the file.
+# svc_start svc_stop
+restart() {
+	ebegin "Restarting eJabberd"
+	if [ -z "$EJABBERD_NODE" ];
+	then
+		EJABBERD_NODE="ejabberd@`hostname -s`"
+	fi
+	/usr/bin/ejabberdctl $EJABBERD_NODE restart
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading eJabberd"
+	if [ -z "$EJABBERD_NODE" ];
+	then
+		EJABBERD_NODE="ejabberd@`hostname -s`"
+	fi
+	/usr/bin/ejabberdctl $EJABBERD_NODE reopen-log
+	eend $?
+}