Version bump, thanks to all contributors in bug #101708.

Package-Manager: portage-2.1.1_pre1-r1

6 files changed, 241 insertions, 18 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 1ee08d5e0d32..75e734f0799a 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.5 2006/05/05 10:42:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.6 2006/06/19 14:07:20 chainsaw Exp $
+
+*ejabberd-1.1.1 (19 Jun 2006)
+
+  19 Jun 2006; Tony Vroon <chainsaw@gentoo.org> +files/ejabberd-1.1.1.confd,
+  +files/ejabberd-1.1.1.initd, +ejabberd-1.1.1.ebuild:
+  Version bump, thanks to all contributors in bug #101708.
 
   05 May 2006; Diego Pettenò <flameeyes@gentoo.org> ejabberd-0.7.5.ebuild:
   Fix enewuser/enewgroup location, bug #130849.
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 6af4a2572e7c..ce7b38308529 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,50 +1,66 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b size 355
+AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 MD5 e34f266ad55b2db038375cb6962721cd files/ejabberd 355
 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b files/ejabberd 355
 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b files/ejabberd 355
-AUX ejabberd-0.7.5.confd 777 RMD160 7c8a17a3e5dd26b4133311c5e875d561f94a4ad4 SHA1 051dbf84c7f7843ff924b35383031984e5dcc2d7 SHA256 f8fb46cb6d48055eab6f95ee487e42b228abe87c2c06a74c08e30872121cc76c size 777
+AUX ejabberd-0.7.5.confd 777 RMD160 7c8a17a3e5dd26b4133311c5e875d561f94a4ad4 SHA1 051dbf84c7f7843ff924b35383031984e5dcc2d7 SHA256 f8fb46cb6d48055eab6f95ee487e42b228abe87c2c06a74c08e30872121cc76c
 MD5 7348d713e30c148b3208edf8e24d6ae5 files/ejabberd-0.7.5.confd 777
 RMD160 7c8a17a3e5dd26b4133311c5e875d561f94a4ad4 files/ejabberd-0.7.5.confd 777
 SHA256 f8fb46cb6d48055eab6f95ee487e42b228abe87c2c06a74c08e30872121cc76c files/ejabberd-0.7.5.confd 777
-AUX ejabberd-0.7.5.initd 1374 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb SHA1 7eb6fef37eefae879cdd3f34a90e9e0c32617fd8 SHA256 ab7301036561238dc6d43bc2cd39609d355cbe617a84c860f68bc5cecfafe036 size 1374
+AUX ejabberd-0.7.5.initd 1374 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb SHA1 7eb6fef37eefae879cdd3f34a90e9e0c32617fd8 SHA256 ab7301036561238dc6d43bc2cd39609d355cbe617a84c860f68bc5cecfafe036
 MD5 fa69896efdf335059d0545edf83cd359 files/ejabberd-0.7.5.initd 1374
 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb files/ejabberd-0.7.5.initd 1374
 SHA256 ab7301036561238dc6d43bc2cd39609d355cbe617a84c860f68bc5cecfafe036 files/ejabberd-0.7.5.initd 1374
-AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0 size 199
+AUX ejabberd-1.1.1.confd 777 RMD160 701d81cbc4e4166f94b74557b4e4f463661c7e9c SHA1 6808e2a92673e0a3d524ba958df537b578ef1838 SHA256 e7c521a12c79d38f1a04415dc7205785e81d02d4f4bf7d999fdff22d456d3bd6
+MD5 be6080d28fad9a23512f93986373a64f files/ejabberd-1.1.1.confd 777
+RMD160 701d81cbc4e4166f94b74557b4e4f463661c7e9c files/ejabberd-1.1.1.confd 777
+SHA256 e7c521a12c79d38f1a04415dc7205785e81d02d4f4bf7d999fdff22d456d3bd6 files/ejabberd-1.1.1.confd 777
+AUX ejabberd-1.1.1.initd 1366 RMD160 ea334629e079583f3e0e47ea63071384e25e3294 SHA1 21f16e82a6694a2ce60d235899c62a5b6a883525 SHA256 8c120fe01d787c3b4bcb21dad29d46339e111db2c507751118e3c8e5d59c78b9
+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 ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
 MD5 8379adf159d3d5749af973fe74d23367 files/ejabberdctl 199
 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 files/ejabberdctl 199
 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0 files/ejabberdctl 199
-AUX inetrc 36 RMD160 4b79020864689ede547969610fde18fe490f5810 SHA1 1e0bae0f7251e2ae3b62ba9d3e5cc86bb5dd271e SHA256 0f383befc4c46134d88ce14d3bd06c404ef6575391f4ac0b5e8c28ba383b28fc size 36
+AUX inetrc 36 RMD160 4b79020864689ede547969610fde18fe490f5810 SHA1 1e0bae0f7251e2ae3b62ba9d3e5cc86bb5dd271e SHA256 0f383befc4c46134d88ce14d3bd06c404ef6575391f4ac0b5e8c28ba383b28fc
 MD5 e088cd52d4316efddc54195dc939cd24 files/inetrc 36
 RMD160 4b79020864689ede547969610fde18fe490f5810 files/inetrc 36
 SHA256 0f383befc4c46134d88ce14d3bd06c404ef6575391f4ac0b5e8c28ba383b28fc files/inetrc 36
-AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8b79141ec1bc846e8ede6fa19a07210c619 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb size 491
+AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8b79141ec1bc846e8ede6fa19a07210c619 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb
 MD5 369bff16ecff4a042143b458597bf957 files/self-cert.sh 491
 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b files/self-cert.sh 491
 SHA256 6a0c53a8573411c18ed6f5dd79ce4807b72fb10bc5eb3a3a7f4641c57e4ddceb files/self-cert.sh 491
-DIST ejabberd-0.7.5.tar.gz 410451 size 410451
-EBUILD ejabberd-0.7.5.ebuild 2873 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 SHA1 eb6632ef55de2350987d33a5c255431753dcd4a2 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2 size 2873
+DIST ejabberd-0.7.5.tar.gz 410451
+DIST ejabberd-1.1.1.tar.gz 803278 RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 SHA1 4f23d787afe75c7c866decdff6f539195449776e SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082
+EBUILD ejabberd-0.7.5.ebuild 2873 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 SHA1 eb6632ef55de2350987d33a5c255431753dcd4a2 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2
 MD5 0299ef0b946b6cbac7a91bbcd186ee9d ejabberd-0.7.5.ebuild 2873
 RMD160 c472f73e3fc5b8793ae7846605cbe9b1b7c17d88 ejabberd-0.7.5.ebuild 2873
 SHA256 fb7ddb32a459431fa03701edc546448c189c0c87c4c3bdb2b2404759a10f7cd2 ejabberd-0.7.5.ebuild 2873
-MISC ChangeLog 1066 RMD160 69835f6dbc102f40c8ce33589f438fe836e83fb7 SHA1 1f0b5e3c2b4171cf9230d42f1e44d61993448a86 SHA256 3da04d618c082edd1a1fa7b4e6965db266cabdc6071ead7d2afb024ef29ddf7b size 1066
-MD5 4de6aca344cbce85041e5cc267788116 ChangeLog 1066
-RMD160 69835f6dbc102f40c8ce33589f438fe836e83fb7 ChangeLog 1066
-SHA256 3da04d618c082edd1a1fa7b4e6965db266cabdc6071ead7d2afb024ef29ddf7b ChangeLog 1066
-MISC metadata.xml 383 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb SHA1 619e611cec685394a089bfc5f9af061e8f33b2b2 SHA256 b200df29d7cec9556f72f2915e771251dff35c4d69c30eb15bf187865df51d7a size 383
+EBUILD ejabberd-1.1.1.ebuild 3324 RMD160 8426aea8e324bf6a8f4406cfa03b9cabaea2acfa SHA1 c763edc42344fe925130ba9463cf2d76f225b9d6 SHA256 007c3a9ad829851f0e9d571db18c0854c0b90675877595762c6fe789247dcaba
+MD5 56f67b4716c4aa689175b3cc766592b8 ejabberd-1.1.1.ebuild 3324
+RMD160 8426aea8e324bf6a8f4406cfa03b9cabaea2acfa ejabberd-1.1.1.ebuild 3324
+SHA256 007c3a9ad829851f0e9d571db18c0854c0b90675877595762c6fe789247dcaba ejabberd-1.1.1.ebuild 3324
+MISC ChangeLog 1288 RMD160 124bcbd14ee51a0ce11e43a0f968510d0972e9fa SHA1 d47ed07d08d0c0db86c086731729068a0f89fef8 SHA256 0d437fc562dba00187039931829f23e52b87819df3bb32ecf9ffe058e57a2fa4
+MD5 1876fe36747b05efad7045de47ff1954 ChangeLog 1288
+RMD160 124bcbd14ee51a0ce11e43a0f968510d0972e9fa ChangeLog 1288
+SHA256 0d437fc562dba00187039931829f23e52b87819df3bb32ecf9ffe058e57a2fa4 ChangeLog 1288
+MISC metadata.xml 383 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb SHA1 619e611cec685394a089bfc5f9af061e8f33b2b2 SHA256 b200df29d7cec9556f72f2915e771251dff35c4d69c30eb15bf187865df51d7a
 MD5 4d142ea790d97a89bdcc4325d5e3b301 metadata.xml 383
 RMD160 aceb05ede401881022e8465895f6f9c33c332eeb metadata.xml 383
 SHA256 b200df29d7cec9556f72f2915e771251dff35c4d69c30eb15bf187865df51d7a metadata.xml 383
 MD5 ca45e90d16657bc09537ea6653f30678 files/digest-ejabberd-0.7.5 66
 RMD160 54faf453f26cf477b93dac9d75fe36f9362ff836 files/digest-ejabberd-0.7.5 66
 SHA256 62769c251ad5d7522c7efa0e231f8b22dbd42924cd8491a913fd933951938c92 files/digest-ejabberd-0.7.5 66
+MD5 87c80474a3cbcdf51830a748a411f0f4 files/digest-ejabberd-1.1.1 244
+RMD160 bdb61a1e0dd65fa91775a5f3b7c7516dc65bd8ff files/digest-ejabberd-1.1.1 244
+SHA256 d3659c3dbc43cf807fb7309da84ba62393e9257a7a16a3305621ee60f97378a6 files/digest-ejabberd-1.1.1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEWyw1AiZjviIA2XgRAj28AKDcR8xR5mpK/JU686i8aHCqT0uqZQCg2DJ1
-CMQsGDH18bFUgIsAhPegqcs=
-=by6J
+iD8DBQFElq+Wp5vW4rUFj5oRAqUeAJ0ZWFkxLjklRtqauOmQ2oc+4ilLBgCfUMWD
+uC1rxMNu6nGw2N2xl2tvQc4=
+=ym+F
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-1.1.1.ebuild b/net-im/ejabberd/ejabberd-1.1.1.ebuild
new file mode 100644
index 000000000000..4acbac277a8f
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-1.1.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1.ebuild,v 1.1 2006/06/19 14:07:20 chainsaw Exp $
+
+inherit eutils multilib ssl-cert 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="~x86"
+IUSE="mod_irc mod_muc mod_pubsub ldap odbc 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* )"
+
+PROVIDE="virtual/jabber-server"
+S=${WORKDIR}/${P}/src
+
+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"
+
+	insinto /usr/share/doc/${PF}
+	cd ${S}/..
+	dodoc doc/release_notes_${PV}.txt
+	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}/${P}.confd ${PN}
+
+	insinto ${JABBER_ETC}
+	if use ssl; then
+		docert ssl
+		rm -f ${D}${JABBER_ETC}/ssl.{crt,csr,key}
+		fowners jabber:jabber ${JABBER_ETC}/ssl.pem
+	fi
+	doins ${FILESDIR}/inetrc
+}
+
+pkg_postinst() {
+	if [ ! -e ${JABBER_ETC}/ejabberd.cfg ]
+	then
+		einfo "Configuration file has been installed in ${JABBER_ETC}/ejabberd.cfg."
+		einfo "Edit it according to your needs. For configuration instructions,"
+		einfo "please see /usr/share/doc/${PF}/html/guide.html"
+	fi
+	if use ssl ; then
+		einfo "A script to generate a ssl key has been installed in"
+		einfo "${JABBER_ETC}/self-cert.sh . Use it and change the config file to"
+		einfo "point to the full path"
+	fi
+	if ! use web ; then
+		einfo "The web USE flag is off, this will disable the web admin interface,"
+		einfo "if this was not the intention then add web to your USE flags."
+	fi
+}
diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.1 b/net-im/ejabberd/files/digest-ejabberd-1.1.1
new file mode 100644
index 000000000000..fdeac3237a4f
--- /dev/null
+++ b/net-im/ejabberd/files/digest-ejabberd-1.1.1
@@ -0,0 +1,3 @@
+MD5 ef6fae4a3f9c7f807f21e9cd3dae195b ejabberd-1.1.1.tar.gz 803278
+RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 ejabberd-1.1.1.tar.gz 803278
+SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082 ejabberd-1.1.1.tar.gz 803278
diff --git a/net-im/ejabberd/files/ejabberd-1.1.1.confd b/net-im/ejabberd/files/ejabberd-1.1.1.confd
new file mode 100644
index 000000000000..5a8eaf538d9c
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.1.confd
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 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.1.confd,v 1.1 2006/06/19 14:07:20 chainsaw Exp $
+
+# Name of your ejabberd node. Used by ejabberdctl to determine which
+# node to communicate with. Default is "ejabberd@`hostname -s`".
+#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
diff --git a/net-im/ejabberd/files/ejabberd-1.1.1.initd b/net-im/ejabberd/files/ejabberd-1.1.1.initd
new file mode 100644
index 000000000000..096630e547a6
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.1.initd
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2005 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.1.initd,v 1.1 2006/06/19 14:07:20 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 $?
+}
+
+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 $?
+}