Version bump.

Package-Manager: portage-2.1.4_rc14

6 files changed, 225 insertions, 8 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 8f0de90969a3..2d859c75124b 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.7 2008/01/08 10:26:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.8 2008/01/09 07:43:59 nelchael Exp $
+
+*jabberd2-2.1.21 (09 Jan 2008)
+
+  09 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd2-2.1.21.init, +files/jabberd2-2.1.21.pamd,
+  +jabberd2-2.1.21.ebuild:
+  Version bump.
 
   08 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/jabberd2-2.1.20.init, +files/jabberd2-2.1.20.pamd:
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 0611b2d023d4..f4912363d597 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -17,8 +17,17 @@ AUX jabberd2-2.1.20.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA
 MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd2-2.1.20.pamd 158
 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd2-2.1.20.pamd 158
 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd2-2.1.20.pamd 158
+AUX jabberd2-2.1.21.init 1623 RMD160 f1f750a0052d289de23ab82452d2ce85072d7d71 SHA1 0e30e63f40e8bc77a964f0079ef721bb292357f2 SHA256 7ee317c170638ce561c6893dd024aad97d0b87b9f39dd51b216fa71cad234cd8
+MD5 8371da0b93899290b1ab7290a109e81c files/jabberd2-2.1.21.init 1623
+RMD160 f1f750a0052d289de23ab82452d2ce85072d7d71 files/jabberd2-2.1.21.init 1623
+SHA256 7ee317c170638ce561c6893dd024aad97d0b87b9f39dd51b216fa71cad234cd8 files/jabberd2-2.1.21.init 1623
+AUX jabberd2-2.1.21.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
+MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd2-2.1.21.pamd 158
+RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd2-2.1.21.pamd 158
+SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd2-2.1.21.pamd 158
 DIST jabberd-2.1.19.tar.gz 832493 RMD160 9e830094e8c37d2ba3be6ff8a713606c151536ab SHA1 37f617f5c6bd29e7151b21142721ef3470f95af6 SHA256 531ced98332e26928229fe83bed41053a61a7a6d8d5978bb107a7f79b5468904
 DIST jabberd-2.1.20.tar.gz 862426 RMD160 0bbb2b96cd845a7e3ef1342d31487f9677e188b0 SHA1 517cd340b507bb320806fa2d1bd8442b3dc508ff SHA256 20841fd9c48316a5061c0745ef3b0b91d15e9837ee1bf549575b599f136f4bfe
+DIST jabberd-2.1.21.tar.bz2 643184 RMD160 e691f068563a94579a12974fde65caa207e9728a SHA1 3d206abfa37841387e4cd12b2ad86bd34d4f50a3 SHA256 5122d6b8cdd78a1d940a3d82d7b39f036c4078d24148ef9a0a65824337fe1251
 EBUILD jabberd2-2.1.19.ebuild 2946 RMD160 80d61f7d910c9bd61c0f347440ab145a56250817 SHA1 bd6dc3adcfaab47accf9dce3954626baf26b4b30 SHA256 c5fb5a3e6ab6c11d1c2af3b9cee5f49919b614748338b3f94877b272a48eb247
 MD5 b1cba3c602da4e28066c07cfbb8ed1f1 jabberd2-2.1.19.ebuild 2946
 RMD160 80d61f7d910c9bd61c0f347440ab145a56250817 jabberd2-2.1.19.ebuild 2946
@@ -27,10 +36,14 @@ EBUILD jabberd2-2.1.20.ebuild 2828 RMD160 a1a253455bfd8694f4f7196e5accc48d9562be
 MD5 a31e5dbe5109b6f4e6e6cb9172430614 jabberd2-2.1.20.ebuild 2828
 RMD160 a1a253455bfd8694f4f7196e5accc48d9562be9f jabberd2-2.1.20.ebuild 2828
 SHA256 01205e61c924b4369a7e3042b5ab49abdb0eceaa1c1438ae14067c05bc89c597 jabberd2-2.1.20.ebuild 2828
-MISC ChangeLog 1267 RMD160 060a56937f379aacda9fab0761d3f33b75447b42 SHA1 037521551a9b965042415992e24431f071865073 SHA256 1bbf86cef904ea1d695da2f8984e309bf221d23a2c8b3158e325cf6a19f5524c
-MD5 54404f213d6e0be27655131726669153 ChangeLog 1267
-RMD160 060a56937f379aacda9fab0761d3f33b75447b42 ChangeLog 1267
-SHA256 1bbf86cef904ea1d695da2f8984e309bf221d23a2c8b3158e325cf6a19f5524c ChangeLog 1267
+EBUILD jabberd2-2.1.21.ebuild 2829 RMD160 0cdb857e2450ac761293e9aa53a5016efb788079 SHA1 d35472c587233c371d8c5958f72362127d1e0605 SHA256 c2f6c6bf7445ffdabfef4f74cc3cc2b082d0cfc260f791583ab5a48cc8335fc2
+MD5 5308fec59403e9826f5304aded1c2db9 jabberd2-2.1.21.ebuild 2829
+RMD160 0cdb857e2450ac761293e9aa53a5016efb788079 jabberd2-2.1.21.ebuild 2829
+SHA256 c2f6c6bf7445ffdabfef4f74cc3cc2b082d0cfc260f791583ab5a48cc8335fc2 jabberd2-2.1.21.ebuild 2829
+MISC ChangeLog 1456 RMD160 f98801c23ef044334e5643091571626ced606f2e SHA1 6eb4be024e440cb0eb8c6e681f482114c27d7f42 SHA256 1c008308d2d04c7f98e660cf08a9e20c862951ae1b10145f2d37ebc02ae63a52
+MD5 bcd4dceca3cd58af30e5300a03d7b79f ChangeLog 1456
+RMD160 f98801c23ef044334e5643091571626ced606f2e ChangeLog 1456
+SHA256 1c008308d2d04c7f98e660cf08a9e20c862951ae1b10145f2d37ebc02ae63a52 ChangeLog 1456
 MISC metadata.xml 433 RMD160 817394c54e448ad628773a5de8edb4c26b9516f7 SHA1 cca8e15fd99f2b05a3efed75d665e9ab0a57ce4d SHA256 245f08f7b8e66f9240eb7ea237661f7b17e667c9500121770c2611e1033f30c4
 MD5 d299ac2c0ade4fad26820d81e81e1882 metadata.xml 433
 RMD160 817394c54e448ad628773a5de8edb4c26b9516f7 metadata.xml 433
@@ -41,10 +54,13 @@ SHA256 33562ba67b26d4d3e0c8771d7c3a73b691d80940daf3ec02e165df2d375b5c71 files/di
 MD5 7a903d580324262ca778e2f1e71e31e9 files/digest-jabberd2-2.1.20 244
 RMD160 1439a0456206a9608d4000ccac9cc8dbed0d6f2b files/digest-jabberd2-2.1.20 244
 SHA256 115e3799639cff8e2e166f041d0025d0e77ee25fd374350ee152827b13e50fd7 files/digest-jabberd2-2.1.20 244
+MD5 da2d61953d85b224f6b6faabf7f97aea files/digest-jabberd2-2.1.21 247
+RMD160 caea680b34d2ef35d0c9f79dc1dfd4485b35afaf files/digest-jabberd2-2.1.21 247
+SHA256 0da691d95c94366e8417950f7a4736c016660d7beaa12f20a9ff0394798e7490 files/digest-jabberd2-2.1.21 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeDT8QACgkQgo/w9rxVVVGxLACglcermdlm11vPli8dCo1yoWLv
-5h4An16w4PKCPtFIIekCvd9/KSaPCpNa
-=Y5GP
+iEYEARECAAYFAkeEe0UACgkQgo/w9rxVVVHtRwCfcxANnbVatnXEFA9dZ92wXhgQ
+TmsAnRMV/uq3xCoZ1VdE2mn1G+K+YI5l
+=/jCQ
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/digest-jabberd2-2.1.21 b/net-im/jabberd2/files/digest-jabberd2-2.1.21
new file mode 100644
index 000000000000..149579c80afa
--- /dev/null
+++ b/net-im/jabberd2/files/digest-jabberd2-2.1.21
@@ -0,0 +1,3 @@
+MD5 fdbdee3823d1ea6b4ee5d118d7f4b24e jabberd-2.1.21.tar.bz2 643184
+RMD160 e691f068563a94579a12974fde65caa207e9728a jabberd-2.1.21.tar.bz2 643184
+SHA256 5122d6b8cdd78a1d940a3d82d7b39f036c4078d24148ef9a0a65824337fe1251 jabberd-2.1.21.tar.bz2 643184
diff --git a/net-im/jabberd2/files/jabberd2-2.1.21.init b/net-im/jabberd2/files/jabberd2-2.1.21.init
new file mode 100644
index 000000000000..2774aadeadbc
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.21.init
@@ -0,0 +1,77 @@
+#!/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/jabberd2/files/jabberd2-2.1.21.init,v 1.1 2008/01/09 07:44:00 nelchael Exp $
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+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
+	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+	eindent
+	for service in ${services}; do
+
+		cfgfile=$(echo ${service} | cut -d ':' -f 2)
+		service=$(echo ${service} | cut -d ':' -f 1)
+		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} \
+			--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.1.21.pamd b/net-im/jabberd2/files/jabberd2-2.1.21.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.21.pamd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth       required     pam_nologin.so
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
diff --git a/net-im/jabberd2/jabberd2-2.1.21.ebuild b/net-im/jabberd2/jabberd2-2.1.21.ebuild
new file mode 100644
index 000000000000..34f381040793
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.1.21.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.21.ebuild,v 1.1 2008/01/09 07:43:59 nelchael Exp $
+
+inherit db-use eutils pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.xiaoka.com/"
+SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug memdebug ipv6 ldap mysql pam pipe sasl postgres sqlite"
+
+DEPEND=">=net-im/jabber-base-0.01
+	dev-libs/expat
+	dev-libs/openssl
+	>=net-misc/gsasl-0.2.14
+	net-dns/libidn
+	ldap? ( net-nds/openldap )
+	>=sys-libs/db-4.1.24
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3 )
+	!net-im/jabberd"
+
+S="${WORKDIR}/jabberd-${PV}"
+
+src_compile() {
+
+	if use sasl; then
+		localconf="--enable-sasl=gsasl"
+	fi
+
+	if use debug; then
+		localconf="${localconf} --enable-debug"
+		# --enable-pool-debug is currently broken
+		use memdebug && localconf="${localconf} --enable-nad-debug"
+	else
+		if use memdebug; then
+			ewarn
+			ewarn '"memdebug" requires "debug" enabled.'
+			ewarn
+		fi
+	fi
+
+	econf \
+		--sysconfdir=/etc/jabber \
+		--enable-db \
+		--with-extra-include-path=$(db_includedir) \
+		${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}/jabberd2-${PV}.init" jabberd || die "newinitd failed"
+	newpamd "${FILESDIR}/jabberd2-${PV}.pamd" jabberd || die "newpamd failed"
+
+	dodoc AUTHORS BUGS PROTOCOL README UPGRADE
+	docinto tools
+	dodoc tools/db-setup{.mysql,-status.mysql,.pgsql,.sqlite}
+	dodoc tools/{migrate.pl,pipe-auth.pl}
+
+	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* || die "sed failed"
+	sed -i \
+		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
+		sm.xml* || die "sed failed"
+
+}
+
+pkg_postinst() {
+
+	if use pam; then
+		echo
+		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+		ewarn 'is likely to change in future versions of jabberd-2. It may'
+		ewarn 'be advisable to avoid PAM authentication for the time being.'
+		echo
+		ebeep
+	fi
+
+}