Revision bump, closes bugs #161252, #171427 and #171551.

Package-Manager: portage-2.1.2.3

6 files changed, 222 insertions, 5 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 8684e4982382..dc3f0ce6fe5f 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.17 2007/03/11 19:04:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.18 2007/04/11 14:42:45 chainsaw Exp $
+
+*ejabberd-1.1.3-r1 (11 Apr 2007)
+
+  11 Apr 2007; Tony Vroon <chainsaw@gentoo.org> +files/ejabberd-1.1.3.confd,
+  +files/1.1.3-missing-declaration.patch, +ejabberd-1.1.3-r1.ebuild:
+  Revision bump, closes bugs #161252, #171427 and #171551.
 
   11 Mar 2007; Markus Rothe <corsair@gentoo.org> ejabberd-1.1.3.ebuild:
   Adding ~amd64 to 1.1.3, too.
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 7bf0c32b851d..c9bf5b9c0847 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1.3-missing-declaration.patch 334 RMD160 af3e6f2560533ab5fcda7c8ac3d4789324ea8023 SHA1 a04bbfaa748ec3d45f0c3bb5fbc50d2d8b520d9f SHA256 c3ecd6e3b2fc7548eaa151754020ff9d799de7ea0d9efc9afd6db06a84422736
+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 ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 MD5 e34f266ad55b2db038375cb6962721cd files/ejabberd 355
 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b files/ejabberd 355
@@ -22,6 +29,10 @@ AUX ejabberd-1.1.1.initd 1366 RMD160 ea334629e079583f3e0e47ea63071384e25e3294 SH
 MD5 eb78d1f0fbd08fbaaa60adbcd4fe8bf8 files/ejabberd-1.1.1.initd 1366
 RMD160 ea334629e079583f3e0e47ea63071384e25e3294 files/ejabberd-1.1.1.initd 1366
 SHA256 8c120fe01d787c3b4bcb21dad29d46339e111db2c507751118e3c8e5d59c78b9 files/ejabberd-1.1.1.initd 1366
+AUX ejabberd-1.1.3.confd 739 RMD160 b06ee5cf9f6542dd752c44dc0ef21076163811e5 SHA1 9bd467e571f70482750db0108775273da93de772 SHA256 840fbf999509e03917b7281b2893e2609fb2d0dea016e7463590aa13507bb770
+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 ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
 MD5 8379adf159d3d5749af973fe74d23367 files/ejabberdctl 199
 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 files/ejabberdctl 199
@@ -63,14 +74,18 @@ EBUILD ejabberd-1.1.2-r1.ebuild 3610 RMD160 136efbfcb89f168683de32dea733b59c37ba
 MD5 4fff96033600b58c1fb5681c1c0746bb ejabberd-1.1.2-r1.ebuild 3610
 RMD160 136efbfcb89f168683de32dea733b59c37baea7f ejabberd-1.1.2-r1.ebuild 3610
 SHA256 45c87afb65aacbe07e1791c038b181b611b967fc5323234b2eb9849b22155a19 ejabberd-1.1.2-r1.ebuild 3610
+EBUILD ejabberd-1.1.3-r1.ebuild 3945 RMD160 7a513028284e746b61599132a696bef3cdb9f5cb SHA1 285238a0a201b15887c091e897f29488ddda7756 SHA256 21d6c50e18f8251e21714e3f67e6819f33b2c28fa862434332123978baef50c3
+MD5 91a5381f3488c3247505631875be4731 ejabberd-1.1.3-r1.ebuild 3945
+RMD160 7a513028284e746b61599132a696bef3cdb9f5cb ejabberd-1.1.3-r1.ebuild 3945
+SHA256 21d6c50e18f8251e21714e3f67e6819f33b2c28fa862434332123978baef50c3 ejabberd-1.1.3-r1.ebuild 3945
 EBUILD ejabberd-1.1.3.ebuild 3367 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 SHA1 065ff0d1095e5b53f4c7b93e0fca58583249e05c SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e
 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 3254 RMD160 e741495a249648d6babc7c8d7a90b9052c11f871 SHA1 97faf77a2c1d0280109a4f353bdf6a041514082e SHA256 0345a53a7dd0ad652624ec92290f7ff475bbc07b0cbd893b8187bf7e95a3ba8d
-MD5 3dab8e4d18491d3fdb833a04b9c7e02a ChangeLog 3254
-RMD160 e741495a249648d6babc7c8d7a90b9052c11f871 ChangeLog 3254
-SHA256 0345a53a7dd0ad652624ec92290f7ff475bbc07b0cbd893b8187bf7e95a3ba8d ChangeLog 3254
+MISC ChangeLog 3495 RMD160 e52e4f5a331f1d69ea5df6018e008416fb5e8565 SHA1 247d60f3fc095b495366369665424260128f6836 SHA256 fbb2e92edb8edd36567ba8e2878e82f43364788bebac898e39d3e0c2e7622e66
+MD5 b485284f2573b473a8ce10e8415c30e5 ChangeLog 3495
+RMD160 e52e4f5a331f1d69ea5df6018e008416fb5e8565 ChangeLog 3495
+SHA256 fbb2e92edb8edd36567ba8e2878e82f43364788bebac898e39d3e0c2e7622e66 ChangeLog 3495
 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55
 MD5 2a43b0fd5e7b6404b98548ac55046b3f metadata.xml 383
 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee metadata.xml 383
@@ -90,3 +105,13 @@ SHA256 e1ff34ed81425e1b009e60d29d7f6b9bdeff7cdba4407372cfdb8e40ca00efcb files/di
 MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3 244
 RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3 244
 SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3 244
+MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3-r1 244
+RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3-r1 244
+SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGHPN2p5vW4rUFj5oRArFXAJ90JzwS95ZrkOeonfVtMjh0lf+fmgCdFVCM
+GRE9c7114bOV4iGeZV7Aouw=
+=tFRd
+-----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..4444d8a726d7
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-1.1.3-r1.ebuild
@@ -0,0 +1,155 @@
+# 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.3-r1.ebuild,v 1.1 2007/04/11 14:42:45 chainsaw Exp $
+
+inherit eutils multilib versionator
+
+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="mod_irc mod_muc mod_pubsub ldap odbc sname ssl web"
+
+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 )"
+
+PROVIDE="virtual/jabber-server"
+S=${WORKDIR}/${P}/src
+
+src_unpack() {
+	# Bug #171551
+	if useq ssl && built_with_use dev-libs/openssl zlib ; then
+		die "Openssl must be built without the zlib USE flag to avoid triggering ejabberd SSL/TLS instability"
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	# Bug #171427
+	epatch ${FILESDIR}/${PV}-missing-declaration.patch
+}
+
+src_compile() {
+	econf ${myconf}							\
+		$(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)					\
+		|| die "econf failed"
+
+	emake || die "compiling ejabberd core failed"
+}
+
+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}
+
+	# Bug #161252
+	if useq sname; then
+		CHECK_CONF=""
+		EJD_LINE="-sname ejabberd"
+		EJCTL_LINE="-sname ejabberdctl"
+	else
+		CHECK_CONF=". /etc/conf.d/ejabberd"
+		EJD_LINE="-name \$EJABBERD_NODE"
+		EJCTL_LINE="-name \$EJABBERCTL_NODE"
+	fi
+
+	#
+	# Create /usr/bin/ejabberd
+	#
+	cat <<EOF > ${T}/ejabberd
+#!/bin/bash
+
+${CHECK_CONF}
+
+erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+	${pa} \\
+	${EJD_LINE} \\
+	-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
+
+${CHECK_CONF}
+
+exec env HOME=${JABBER_RUN} \\
+	erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\
+		${pa} \\
+		-noinput \\
+		${EJCTL_LINE} \\
+		-s ejabberd_ctl \\
+		-extra \$@
+EOF
+
+	dobin ${T}/ejabberdctl
+	dobin ${T}/ejabberd
+
+	newinitd ${FILESDIR}/ejabberd-1.1.1-r1.initd ${PN}
+	newconfd ${FILESDIR}/${P}.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
+			ebegin "Creating SSL key"
+			sh ${JABBER_ETC}/self-cert.sh &> /dev/null
+			eend $?
+		fi
+		chown jabber:jabber ${JABBER_ETC}/ssl.pem
+		elog "Please be sure that your ${JABBER_ETC}/ejabber.cfg points to ${JABBER_ETC}/ssl.pem"
+		elog "You may want to edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh again"
+	fi
+	if ! useq web ; then
+		elog "The web USE flag is off, this has disabled the web admin interface."
+	fi
+	if useq odbc ; then
+		elog "Please add a column askmessage to the rosterusers table if migrating from 1.1.1"
+	fi
+}
diff --git a/net-im/ejabberd/files/1.1.3-missing-declaration.patch b/net-im/ejabberd/files/1.1.3-missing-declaration.patch
new file mode 100644
index 000000000000..a9ece714782a
--- /dev/null
+++ b/net-im/ejabberd/files/1.1.3-missing-declaration.patch
@@ -0,0 +1,11 @@
+--- ejabberd-1.1.3/src/expat_erl.c.orig	2007-04-11 15:24:05.000000000 +0100
++++ ejabberd-1.1.3/src/expat_erl.c	2007-04-11 15:25:25.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.3-r1 b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r1
new file mode 100644
index 000000000000..72f1fd1a1f21
--- /dev/null
+++ b/net-im/ejabberd/files/digest-ejabberd-1.1.3-r1
@@ -0,0 +1,3 @@
+MD5 bdb39965a147506fc194d5a28117172a ejabberd-1.1.3.tar.gz 826057
+RMD160 99b4c73ae29ef9814f5c572f8e3b3a82d960f5ee ejabberd-1.1.3.tar.gz 826057
+SHA256 3b8ac67673fa6c08bc25382d3e99171ebc71d4759899eb5a730e65117256e703 ejabberd-1.1.3.tar.gz 826057
diff --git a/net-im/ejabberd/files/ejabberd-1.1.3.confd b/net-im/ejabberd/files/ejabberd-1.1.3.confd
new file mode 100644
index 000000000000..2a6dc053c8fc
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.3.confd
@@ -0,0 +1,17 @@
+# 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.3.confd,v 1.1 2007/04/11 14:42:45 chainsaw Exp $
+
+# Name of your ejabberd node. Used by ejabberdctl to determine which
+# node to communicate with.
+EJABBERD_NODE="ejabberd@`hostname -s`"
+
+# Max number of open network connections. Default is 1024. Increasing
+# this will slightly increase memory usage.
+#ERL_MAX_PORTS=1024
+
+# Return memory to the system after using it, instead of keeping it
+# allocated for future use. Decreases the memory required by ejabberd,
+# but makes it run slower.  Default is unset, set to any value to
+# activate.
+#ERL_FULLSWEEP_AFTER=0