Version bump, thanks to Marko Durkovic, who became maintainer for jabberd-2*.

Package-Manager: portage-2.1.2.9

6 files changed, 225 insertions, 21 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 8b8604a2bc68..27963fd278bd 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.97 2007/05/06 11:31:22 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.98 2007/06/07 09:17:37 nelchael Exp $
+
+*jabberd-2.1.6 (07 Jun 2007)
+
+  07 Jun 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd-2.1.6.init, metadata.xml, +jabberd-2.1.6.ebuild:
+  Version bump, thanks to Marko Durkovic, who became maintainer for jabberd-2*.
 
   06 May 2007; Marius Mauch <genone@gentoo.org> jabberd-1.4.4-r3.ebuild:
   Replacing einfo with elog
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 43b6cf56b873..9a57bb1bacb7 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -41,8 +41,13 @@ AUX jabberd-2.0.11.init 1701 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 SHA
 MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.0.11.init 1701
 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.0.11.init 1701
 SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.0.11.init 1701
+AUX jabberd-2.1.6.init 1525 RMD160 a3149ca68f3089ecb2e054756041ad2476947574 SHA1 1d42bcce73d934f61fda10a6dcbbebe6c8a2b297 SHA256 e9898a4a4a452d1d642f59d36a4d22ec4e914207f7f7846e1ed33a589ecd39df
+MD5 54b8406f9b09bc7d8355417e0716edb4 files/jabberd-2.1.6.init 1525
+RMD160 a3149ca68f3089ecb2e054756041ad2476947574 files/jabberd-2.1.6.init 1525
+SHA256 e9898a4a4a452d1d642f59d36a4d22ec4e914207f7f7846e1ed33a589ecd39df files/jabberd-2.1.6.init 1525
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
 DIST jabberd-2.0s11.tar.gz 777466 RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d SHA1 c938d95fc17634b889ba9b1d7d27115593b13e3d SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
+DIST jabberd-2.1.6.tar.gz 1237808 RMD160 fd67cf5aa580ae5bfa969c712e403ba5f9d8899b SHA1 83b923358f02686ec9797bcbfc1892c00dac6d6a SHA256 de525e18028c002e89790f41f79dd46fa08fa07f302b55b72dc151e47e84daff
 EBUILD jabberd-1.4.4-r3.ebuild 3063 RMD160 598e99493ebe47a916c1c6e2fb6e924398b1f7d1 SHA1 322f93309d1778ba731650349dfdcb81283f8082 SHA256 f1074e00c2dfbe9084dfd9842238bafdb168b69bf7c388ff60a45bc4ce3e806b
 MD5 94930c19bae62d8288f984887b4823b2 jabberd-1.4.4-r3.ebuild 3063
 RMD160 598e99493ebe47a916c1c6e2fb6e924398b1f7d1 jabberd-1.4.4-r3.ebuild 3063
@@ -51,24 +56,31 @@ EBUILD jabberd-2.0.11-r1.ebuild 2296 RMD160 65c90c7c98dd4479e41cefd709c8d978d6a9
 MD5 f8f39d1a57b8074a95791b64a1c95b84 jabberd-2.0.11-r1.ebuild 2296
 RMD160 65c90c7c98dd4479e41cefd709c8d978d6a954f1 jabberd-2.0.11-r1.ebuild 2296
 SHA256 cc0f46b870e66636035b0a0b0d8578ffe20bc955bd4a78de67810eca4e24c022 jabberd-2.0.11-r1.ebuild 2296
-MISC ChangeLog 15564 RMD160 6bfc6ff343cbe143e7f183829b3fd3299607a8bb SHA1 f04b019669074a2f78a1e621e4ce5ca3dd3343f7 SHA256 09449e7fd137779d7fc1c9fcd96db283b39704332ead6628413f471f1f40d724
-MD5 b3e13eae1661b79512a68e5090df86d3 ChangeLog 15564
-RMD160 6bfc6ff343cbe143e7f183829b3fd3299607a8bb ChangeLog 15564
-SHA256 09449e7fd137779d7fc1c9fcd96db283b39704332ead6628413f471f1f40d724 ChangeLog 15564
-MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
-MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
-RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
-SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
+EBUILD jabberd-2.1.6.ebuild 2614 RMD160 6f87d25c3e7f14779648fcf4cb9a099cc0993d62 SHA1 7be8b6995cbfad8c507388dd2a7302bc1442ec82 SHA256 e0fda024eca9babd5fc75fc84a87fb9f707214c106233aa154e32d4660a9873b
+MD5 7b027a6ecbade89dffb8757efc6f1748 jabberd-2.1.6.ebuild 2614
+RMD160 6f87d25c3e7f14779648fcf4cb9a099cc0993d62 jabberd-2.1.6.ebuild 2614
+SHA256 e0fda024eca9babd5fc75fc84a87fb9f707214c106233aa154e32d4660a9873b jabberd-2.1.6.ebuild 2614
+MISC ChangeLog 15796 RMD160 b96b19d78d967c4b46219cf0e8076231694bf57c SHA1 996f5f4cd943591d6130842e3230becf486ee89f SHA256 c0bf9680b39916da07a611b1f55da96aa5e0e012cf5113b2e63b1617ac39372c
+MD5 5b3aa3683275627d550b10779684e8fa ChangeLog 15796
+RMD160 b96b19d78d967c4b46219cf0e8076231694bf57c ChangeLog 15796
+SHA256 c0bf9680b39916da07a611b1f55da96aa5e0e012cf5113b2e63b1617ac39372c ChangeLog 15796
+MISC metadata.xml 515 RMD160 b5cb7e85c1a974a72a4c8005929ab606ed4c0984 SHA1 909bf6c7c362a30f06c04870454de338f5f070e7 SHA256 5f30ffc2f104453847ccfb8f37f647e5e20a40896620765cf8965ac3a635c9f6
+MD5 cf7552103edb4e062cea986875a624f5 metadata.xml 515
+RMD160 b5cb7e85c1a974a72a4c8005929ab606ed4c0984 metadata.xml 515
+SHA256 5f30ffc2f104453847ccfb8f37f647e5e20a40896620765cf8965ac3a635c9f6 metadata.xml 515
 MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
 RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
 SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
 MD5 3cbebd7d43212be46daad3e042dce34f files/digest-jabberd-2.0.11-r1 244
 RMD160 4638cd85561494bb4ec40e8af80cc145f8156b23 files/digest-jabberd-2.0.11-r1 244
 SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/digest-jabberd-2.0.11-r1 244
+MD5 92b31f0aafe81593bb14967ca77be310 files/digest-jabberd-2.1.6 244
+RMD160 e9cf0bd58cb97447620f66dcf71c11577a68787d files/digest-jabberd-2.1.6 244
+SHA256 b2e949a7fe6c42414776cb76d0e8c8d38ad4e8788eaf91adefc6639f930a1a91 files/digest-jabberd-2.1.6 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGPbvS6J2i8a8J4okRAsN6AKCX3VAq/UCJsZHetEf4ujKYXpHFSACguFUV
-mnuqMX+KB4RiA01bHzZuUZU=
-=yMlf
+iD8DBQFGZ802go/w9rxVVVERAmlEAKCsEti8qw5CV0dkS+LIxajy+mjSnACfQQg6
++I2vnn6r2ww6iHxP66fltLE=
+=1THI
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/digest-jabberd-2.1.6 b/net-im/jabberd/files/digest-jabberd-2.1.6
new file mode 100644
index 000000000000..654aa790f287
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.1.6
@@ -0,0 +1,3 @@
+MD5 c0843d23f75b255815dea378947a8ccc jabberd-2.1.6.tar.gz 1237808
+RMD160 fd67cf5aa580ae5bfa969c712e403ba5f9d8899b jabberd-2.1.6.tar.gz 1237808
+SHA256 de525e18028c002e89790f41f79dd46fa08fa07f302b55b72dc151e47e84daff jabberd-2.1.6.tar.gz 1237808
diff --git a/net-im/jabberd/files/jabberd-2.1.6.init b/net-im/jabberd/files/jabberd-2.1.6.init
new file mode 100644
index 000000000000..48486eb12f65
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-2.1.6.init
@@ -0,0 +1,75 @@
+#!/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/jabberd/files/jabberd-2.1.6.init,v 1.1 2007/06/07 09:17:37 nelchael Exp $
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+function stopJabberServices() {
+
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [[ -f "${pidfile}" ]]; then
+			service=$(basename ${pidfile/.pid/})
+			ebegin "Stopping ${service}"
+			start-stop-daemon \
+				--stop \
+				--pidfile ${pidfile}
+			eend $?
+		fi
+	done
+	eoutdent
+
+}
+
+start() {
+
+	einfo "Starting Jabber Server ..."
+	local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+	eindent
+	for service in ${services}; do
+
+		cfgfile=${service/*:/}
+		service=${service/:*/}
+		if [[ ! -f "${cfgfile}" ]]; then
+			if [[ -f "/etc/jabber/${service}.xml" ]]; then
+				cfgfile="/etc/jabber/${service}.xml"
+			else
+				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
+				stopJabberServices
+				return 1
+			fi
+		fi
+
+		executable=/usr/bin/${service}
+
+		if [[ ! -f "${executable}" ]]; then
+			eerror "Can't find executable: ${executable}"
+			stopJabberServices
+			return 1
+		fi
+
+		ebegin "Starting ${service} (${cfgfile})"
+		start-stop-daemon \
+			--background \
+			--start  \
+			--chuid jabber:jabber \
+			--exec /usr/bin/${service} \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd/jabberd-2.1.6.ebuild b/net-im/jabberd/jabberd-2.1.6.ebuild
new file mode 100644
index 000000000000..f3315b09ee68
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.1.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.1.6.ebuild,v 1.1 2007/06/07 09:17:37 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.xiaoka.com/"
+SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite"
+
+DEPEND=">=net-im/jabber-base-0.01
+	dev-libs/expat
+	dev-libs/openssl
+	dev-libs/cyrus-sasl
+	net-dns/libidn
+	ldap? ( net-nds/openldap )
+	>=sys-libs/db-4.1.24
+	pam? ( sys-libs/pam )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3 )
+	!<net-im/jabberd-2.0"
+
+
+src_compile() {
+
+	local localconf=
+
+	# Note: no gsasl support for now, since
+	#		gsasl-0.2.14 not in portage tree.
+	#
+	#if use !gsasl; then
+	#	localconf="${localconf} --disable-gsasl --enable-cyrus"
+	#fi
+	localconf="${localconf} --disable-gsasl --enable-cyrus"
+
+	if use debug; then
+		localconf="${localconf} --enable-debug"
+		use memdebug && localconf="${localconf} --enable-nad-debug --enable-pool-debug"
+	else
+		if use memdebug; then
+			ewarn
+			ewarn '"memdebug" requires "debug" enabled.'
+			ewarn
+		fi
+	fi
+
+	# Fix missing header in subst/strndup.c in order to make emerge
+	# happy and avoid QA notice. Should this be moved to a external
+	# patch file?
+	sed -i "/stddef.h/ a #include <string.h>" subst/strndup.c
+
+	econf \
+		--sysconfdir=/etc/jabber \
+		--enable-db \
+		${localconf} \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable mysql) \
+		$(use_enable pam) \
+		$(use_enable pipe) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		|| die "econf failed"
+	emake || die "make failed"
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+	fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+
+	newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
+
+	dodoc AUTHORS BUGS PROTOCOL README UPGRADE
+	docinto tools
+	for i in db-setup.{mysql,pgsql,sqlite} migrate.pl pipe-auth.pl; do
+		dodoc tools/${i}
+	done
+
+	cd "${D}/etc/jabber/"
+	sed -i \
+		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
+		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
+		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
+		*.xml *.xml.dist || die "sed failed"
+	sed -i \
+		-e 's,<module>mysql</module>,<module>db</module>,' \
+		c2s.xml*
+	sed -i \
+		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
+		sm.xml*
+
+}
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index bd66f19a782e..ab685c13109a 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>nelchael@gentoo.org</email>
-  </maintainer>
-  <herd>net-im</herd>
-  <longdescription>
-    This is the original implementation of jabberd server.
-    This serves as the basis for running a jabber server in Gentoo.
-  </longdescription>
+	<maintainer>
+		<email>nelchael@gentoo.org</email>
+		<name>Krzysiek Pawlik</name>
+		<description>Takes care of jabberd-1*</description>
+	</maintainer>
+	<maintainer>
+		<email>marko.durkovic@gmail.com</email>
+		<name>Marko Durkovic</name>
+		<description>
+			Maintainer by proxy, through nelchael. Takes care of
+			jabberd-2*
+		</description>
+	</maintainer>
+	<herd>net-im</herd>
 </pkgmetadata>