version bump

Package-Manager: portage-2.1.4.4

5 files changed, 205 insertions, 12 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 5649761215ef..b537f3b4073e 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.9 2008/03/08 15:03:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.10 2008/03/18 11:56:45 wschlich Exp $
+
+*jabberd2-2.1.23 (18 Mar 2008)
+
+  18 Mar 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/jabberd2-2.1.23.init, +files/jabberd2-2.1.23.pamd,
+  +jabberd2-2.1.23.ebuild:
+  version bump
 
   08 Mar 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/jabberd2-2.1.19.init, -files/jabberd2-2.1.19.pamd,
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 211bca32ed24..766a2577bf03 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jabberd2-2.1.21.init 1623 RMD160 f1f750a0052d289de23ab82452d2ce85072d7d71 SHA1 0e30e63f40e8bc77a964f0079ef721bb292357f2 SHA256 7ee317c170638ce561c6893dd024aad97d0b87b9f39dd51b216fa71cad234cd8
 AUX jabberd2-2.1.21.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
+AUX jabberd2-2.1.23.init 1623 RMD160 e6f0b39f10bcde7f801c451c5a66ac938156e5f2 SHA1 69a1bd8f8f1c028638c1bb282387281f992a70a5 SHA256 f24009f90912d07c71072f7f91d5a6cb5498a0152499f2f566294bd4ca4e43fe
+AUX jabberd2-2.1.23.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
 DIST jabberd-2.1.21.tar.bz2 643184 RMD160 e691f068563a94579a12974fde65caa207e9728a SHA1 3d206abfa37841387e4cd12b2ad86bd34d4f50a3 SHA256 5122d6b8cdd78a1d940a3d82d7b39f036c4078d24148ef9a0a65824337fe1251
+DIST jabberd-2.1.23.tar.bz2 645473 RMD160 224a0cfd405d30e66a8259b579e94a556ef568b2 SHA1 eb05cc918f035316d47a4b4faae40f3ca976e0d6 SHA256 7e621d56ba5e045862f445e7080ef6c586f9c271989b2fd096397c080d79c69f
 EBUILD jabberd2-2.1.21.ebuild 2835 RMD160 88c2d62f8dafc593c7f8d3f642345c694d56b549 SHA1 6dd709950c49924960b7c74caa2de0412170c7e8 SHA256 2ba12737406f4b9a6151f89d0e059c91e4629f85033695a3261ef159e4396101
-MISC ChangeLog 1730 RMD160 ffe4806448f9ab7245982bbe9bfd27a67d6ddd02 SHA1 f4c8e55275302ccce9ff1d1c008265bfe6c83dc3 SHA256 090c0306d4958c33ac55af9c3cece1223820e113a4ebcd72f6825565baffdaff
+EBUILD jabberd2-2.1.23.ebuild 2913 RMD160 398fa747fa342dd931252375da25f7a595c4a4b4 SHA1 866e20f5f81bde3d1167fe1b74655687c65a2b47 SHA256 3cec148e63e7ccfba7a9f75a3aea56a6ae0f5bce673de3498f705fc113687671
+MISC ChangeLog 1919 RMD160 580ef95f92745837959f8fa9330b1a4e3397c2c4 SHA1 8807c1986d1680318e7dd5dd89e72040caa71127 SHA256 d07a226b280c4ad61061ca5024be4c2b572166751332fc68168dcf4bf006692a
 MISC metadata.xml 433 RMD160 817394c54e448ad628773a5de8edb4c26b9516f7 SHA1 cca8e15fd99f2b05a3efed75d665e9ab0a57ce4d SHA256 245f08f7b8e66f9240eb7ea237661f7b17e667c9500121770c2611e1033f30c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH0qrLgo/w9rxVVVERAukmAJ4oAsqCbb6MpxvP0dyjRkjHpGcaMACdGX1k
-VzWaxBXzfVrthIOcEnhGfHM=
-=N3+t
------END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.1.23.init b/net-im/jabberd2/files/jabberd2-2.1.23.init
new file mode 100644
index 000000000000..6d994be273e9
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.23.init
@@ -0,0 +1,77 @@
+#!/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/jabberd2/files/jabberd2-2.1.23.init,v 1.1 2008/03/18 11:56:46 wschlich 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.23.pamd b/net-im/jabberd2/files/jabberd2-2.1.23.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.23.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.23.ebuild b/net-im/jabberd2/jabberd2-2.1.23.ebuild
new file mode 100644
index 000000000000..0429b50badcc
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.1.23.ebuild
@@ -0,0 +1,109 @@
+# 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.23.ebuild,v 1.1 2008/03/18 11:56:45 wschlich Exp $
+
+inherit db-use eutils flag-o-matic 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="dev-libs/expat
+	dev-libs/openssl
+	>=virtual/gsasl-0.2.14
+	>=net-dns/libidn-0.6
+	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 )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01
+	!net-im/jabberd"
+
+S="${WORKDIR}/jabberd-${PV}"
+
+src_compile() {
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	replace-flags -O* -O2
+
+	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) \
+		$(use_with sasl gsasl) \
+		|| 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
+
+}