version bump

Package-Manager: portage-2.1.5_rc10

6 files changed, 245 insertions, 9 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 95560b83c82a..639ac811540e 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.35 2008/04/13 22:02:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.36 2008/05/22 11:43:10 caleb Exp $
+
+*ejabberd-2.0.1 (22 May 2008)
+
+  22 May 2008; Caleb Tennis <caleb@gentoo.org> files/ejabberd-2.0.0.initd,
+  +ejabberd-2.0.1.ebuild:
+  version bump
 
   13 Apr 2008; Caleb Tennis <caleb@gentoo.org> files/self-cert-v2.sh,
   ejabberd-2.0.0-r1.ebuild:
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index fde899529630..688500ffa578 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -9,7 +9,9 @@ AUX ejabberd-1.1.4-erlang-12.patch 3746 RMD160 17e6dc9ded6f598c27cf2cda098d2804e
 AUX ejabberd-1.1.4.confd 736 RMD160 100b2b7957766380b0267d6fc91b3fe8a0f827fc SHA1 7c7283615eddafe24f7d331b76b598ad3f10699c SHA256 8c3f96ebaa0bf200ef145dbc6ebea82451cfaceec9ff7802fdc0ef48bf507715
 AUX ejabberd-1.1.4.initd 1437 RMD160 96d9d35de36585a9e735f124b7be1618949541aa SHA1 623713cfb28a247f16a14f6b2ca6a8555609bd35 SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e
 AUX ejabberd-2.0.0.confd 840 RMD160 64f0956b37a15e19d04c58c5fc99b06c2304782c SHA1 4f48611130aa3eae36f4b2d0ee55fc9a58700672 SHA256 6831964009708caac98b40a508eb37bb89c1a7e11adf973f8391319d2115db57
-AUX ejabberd-2.0.0.initd 1183 RMD160 bd70192726db9078d2c0e160d8d0ffac149363d2 SHA1 2d5e46dbb2aa40d2fa2ba5ff9bf8493dc45ea08a SHA256 2ba35bb8f16293d44e3502e443c2c41a118c935f1ce39cb81f28ab6a4d8d22bc
+AUX ejabberd-2.0.0.initd 1112 RMD160 19de166233e068bda23edc38cc9b2b04242a6316 SHA1 f36116426feaca18621a2152c0c2dd342ac0a324 SHA256 6e48732167bda4edf5af2bb692315d6067aa175cd03bac69cad5992251c7144b
+AUX ejabberd-2.0.1.confd 840 RMD160 c013ebfe1e471916561ba23a0ac83618501ce8cc SHA1 1bf74fa62acfd3edf60633fcdf11aeb2882a150a SHA256 8df6a561feeb84c5117837ef6924fec4aed392accd20fd1b0135a3dc789f1372
+AUX ejabberd-2.0.1.initd 1112 RMD160 ebd29936d0488a0377c338412c7605cb9de22f8b SHA1 45415e656dc133aa82e5a6d2f95df4bd6d754d5f SHA256 298207b067920297eb93be4b4dd0c6e238c8d4f7938425f7f23bcbab74cb725d
 AUX ejabberd-wrapper-2.0.0.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49df48 SHA1 115d10f04dd92ca090e853013dde3e5ffa3d6904 SHA256 1d3abfbb1b4dd79ba9fed74a5c86c97af70dc11927d8fa109a1486999d5f7a96
 AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
 AUX ejabberdctl-wrapper-2.0.0.template 530 RMD160 f39037aac0f7ae65c2ca41bef59aa500553a7077 SHA1 84f340e60ce66b3b01c6e82122783fa590edf282 SHA256 6436820e8d015f7831464e0fb175074397ab9906ee8d552f97292acc3cd9e756
@@ -19,8 +21,10 @@ AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
 DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be SHA1 db6f521d45dece200de4eb6fc967c64728e8f6a3 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
 DIST ejabberd-2.0.0.tar.gz 1387404 RMD160 9e7bb30825f2d480d75516136fcc62a49d871255 SHA1 d70257c1e75f59b7284d52c038431664cfd53e08 SHA256 086e105cb402ef868e3187277db1486807e1b34a2e3e3679f0ee6de1e5fd2e54
+DIST ejabberd-2.0.1.tar.gz 1022140 RMD160 fb9055e75a37f805e382d7258cfae49428c80033 SHA1 b0754ead04c164a167abbd5c6e4479c5a051c955 SHA256 e0edc1477c08d9e8015cd2300c7a08bd9ae3bcb29ce6d9d2a5f4cb74a6031221
 EBUILD ejabberd-1.1.4-r1.ebuild 3454 RMD160 b6f24b03584ad7ef7ea4e02961acbd29d3064a97 SHA1 38254b06eeb5eb87306718b39cde50e1c7990cca SHA256 4fb8f36dbca8d5f422e7b6a8a049af86c5d1c262f753453eeccd65a178ff109b
 EBUILD ejabberd-1.1.4.ebuild 3395 RMD160 1c283f5b60c0ee8b31d279737769f2d7228469a6 SHA1 847dababa185b3fdc74035ecf24096576b71ba0a SHA256 177ecebf528b074651803eb88655123c4b33d1214179b00daba7a8245a5493a1
 EBUILD ejabberd-2.0.0-r1.ebuild 4781 RMD160 3c3621878d7f888e9eccff0ebc27d442f5aa84b0 SHA1 57dcce862e445b6a6e30c9439988de2b0123ebc5 SHA256 02844709eaeba7a30420e7874864d477b0b9b6b92034d9a1b912e84de78fce27
-MISC ChangeLog 7909 RMD160 5656481b83f2fccde4fd56bf8b4238b6f679c109 SHA1 73aa363e0c4456a2e5338d91d5465d15a363aad5 SHA256 e90d34d939fca99a8ed48b34180fc3cd878cf2dba580691f93fb9545d0dab0c7
+EBUILD ejabberd-2.0.1.ebuild 4744 RMD160 48a83190cab4820f711c2e511a9d41051004a61a SHA1 e718edc1cc8a97f2bf68128c22f7febda76a0de0 SHA256 d4b2d2f63e88eed1849d8aba4ba1b4e6b90d3194221a0fd9a4b4c93507ae3501
+MISC ChangeLog 8057 RMD160 f6a553770a9fdbf6c8de768909ae824423444715 SHA1 b9313768135f1affbb47914ad3a6848a78dae321 SHA256 29196396af4ba60ea40857d2716d5a2bec8f947527208b9500548fe966bc7eef
 MISC metadata.xml 380 RMD160 263fa813b6c2ff8d7c50f08865fe3bdabbcaf013 SHA1 a7ff13422ec7f99adbacfb3e7fc7eb3aca1288e2 SHA256 cb114a6c8c357b6b7bc48bde4c85308a330ab3323239df2bb822269182c71bcd
diff --git a/net-im/ejabberd/ejabberd-2.0.1.ebuild b/net-im/ejabberd/ejabberd-2.0.1.ebuild
new file mode 100644
index 000000000000..1df3bbfe2c05
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild,v 1.1 2008/05/22 11:43:10 caleb Exp $
+
+inherit eutils multilib
+
+JABBER_ETC="/etc/jabber"
+JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+JABBER_LOG="/var/log/jabber"
+
+MY_PV=${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/"
+SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV/_/-}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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-11.2.5
+	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}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #171427
+	epatch "${FILESDIR}/2.0.0-missing-declaration.patch"
+	# Bug #215853
+	#epatch "${FILESDIR}/${MY_PV}-erlang12-s2s-in.patch"
+	# patch for mod_proxy65 using erlang12
+	# http://support.process-one.net/browse/EJAB-542
+	#epatch "${FILESDIR}/${MY_PV}-ejab-542-mod_proxy65.patch"
+
+	# get rid of the prefix
+	sed -i -e "s/\\@prefix\\@//" "${S}/Makefile.in" \
+		|| die "cannot sed Makefile.in"
+	# we want ejabberdctl in /usr/sbin not /sbin !!!
+	sed -i -e "s/\\/sbin/\\/usr\\/sbin/" "${S}/Makefile.in" \
+		|| die "cannot sed Makefile.in"
+}
+
+src_compile() {
+		econf --prefix=/ \
+		$(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"
+
+	# remove the default ejabberdctl as we use our own
+	rm "${D}/usr/sbin/ejabberdctl"
+
+	insinto ${JABBER_ETC}
+
+	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}"
+
+	if useq ssl ; then
+		doins "${FILESDIR}/ssl.cnf"
+		newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
+	fi
+
+	cd "${WORKDIR}/${MY_P}/doc"
+	dodoc "release_notes_${PV}.txt"
+	dohtml *.{html,png}
+
+	# set up /usr/sbin/ejabberd wrapper
+	cat "${FILESDIR}/ejabberd-wrapper-2.0.0.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberd"
+	exeinto /usr/sbin
+	doexe "${T}/ejabberd"
+
+	# set up /usr/sbin/ejabberdctl wrapper
+	cat "${FILESDIR}/ejabberdctl-wrapper-2.0.0.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberdctl"
+	doexe "${T}/ejabberdctl"
+
+	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
+	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+
+	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
+	# that would be generated by /etc/jabber/self-cert.sh
+	sed -i -e "s/\/path\/to\/ssl.pem/\/etc\/jabber\/ssl.pem/g" \
+		"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+
+	# if mod_irc is not enabled, comment out the mod_irc in the default
+	# ejabberd.cfg
+	if ! use mod_irc; then
+		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+			"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+	fi
+}
+
+pkg_postinst() {
+	elog "For configuration instructions, please see"
+	elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+	elog "http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
+	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
+	elog "===================================================================="
+	elog 'Quick Start Guide:'
+	elog '1) Add output of `hostname -s` to /etc/jabber/ejabberd.cfg line 89'
+	elog '   {hosts, ["localhost", "thehost"]}.'
+	elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 324'
+	elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
+	elog '3) Start the server'
+	elog '   # /etc/init.d/ejabberd start'
+	elog '4) Register the admin user'
+	elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
+	elog '5) Log in with your favourite jabber client or using the web admin'
+}
diff --git a/net-im/ejabberd/files/ejabberd-2.0.0.initd b/net-im/ejabberd/files/ejabberd-2.0.0.initd
index 1b351c464241..ed5a19ba0b7f 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.0.initd
+++ b/net-im/ejabberd/files/ejabberd-2.0.0.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd,v 1.2 2008/04/13 12:27:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd,v 1.3 2008/05/22 11:43:11 caleb Exp $
 
 opts="${opts} reload"
 
@@ -20,7 +20,7 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting eJabberd"
+	ebegin "Starting ejabberd"
 	# the process name of beam is different depending whether smp is used.
 	# set it explicitly so start-stop-daemon works
 	case "$HAVE_SMP" in
@@ -37,18 +37,16 @@ start() {
 		--name $BEAMNAME \
 		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
 	eend $?
-	# For bug #190266
-	chown jabber:jabber /var/run/jabber/.erlang.cookie
 }
 
 stop() {
-	ebegin "Stopping eJabberd"
+	ebegin "Stopping ejabberd"
 	/usr/sbin/ejabberdctl stop
 	eend $?
 }
 
 reload() {
-	ebegin "Reloading eJabberd"
+	ebegin "Reloading ejabberd"
 	/usr/sbin/ejabberdctl reopen-log
 	eend $?
 }
diff --git a/net-im/ejabberd/files/ejabberd-2.0.1.confd b/net-im/ejabberd/files/ejabberd-2.0.1.confd
new file mode 100644
index 000000000000..792bf6894fbd
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-2.0.1.confd
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.confd,v 1.1 2008/05/22 11:43:11 caleb 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
+
+# set to 1, "true" or "yes" if you have a symmetric-multi-processor
+# default is non smp
+#HAVE_SMP=0
+
+
diff --git a/net-im/ejabberd/files/ejabberd-2.0.1.initd b/net-im/ejabberd/files/ejabberd-2.0.1.initd
new file mode 100644
index 000000000000..5f57318ce93e
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-2.0.1.initd
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.1.initd,v 1.1 2008/05/22 11:43:11 caleb Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use dns
+	need net
+	provide jabber-server
+}
+
+checkconfig() {
+	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
+		eerror "You need a /etc/jabber/ejabberd.cfg file to run ejabberd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ejabberd"
+	# the process name of beam is different depending whether smp is used.
+	# set it explicitly so start-stop-daemon works
+	case "$HAVE_SMP" in
+		"1"|"true"|"yes")
+			BEAMNAME="beam.smp"
+			SMPOPT="enable"
+		;;
+		*)
+			BEAMNAME="beam"
+			SMPOPT="disable"
+		;;
+	esac
+	start-stop-daemon --start --quiet --chuid jabber:jabber \
+		--name $BEAMNAME \
+		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ejabberd"
+	/usr/sbin/ejabberdctl stop
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ejabberd"
+	/usr/sbin/ejabberdctl reopen-log
+	eend $?
+}
+