Version bump, see bug #198208.

Package-Manager: portage-2.1.3.18

6 files changed, 230 insertions, 8 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 22d1ff42d6ea..4bd762f3f24b 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.2 2007/10/30 14:22:42 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.3 2007/11/06 19:24:44 nelchael Exp $
+
+*jabberd2-2.1.19 (06 Nov 2007)
+
+  06 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd2-2.1.19.init, +files/jabberd2-2.1.19.pamd,
+  +jabberd2-2.1.19.ebuild:
+  Version bump, see bug #198208.
 
   30 Oct 2007; Markus Ullmann <jokey@gentoo.org> jabberd2-2.1.15.ebuild:
   ~sparc per bug #178055
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index cea46fa5fb74..7e50011b911e 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -9,15 +9,28 @@ AUX jabberd2-2.1.15.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA
 MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd2-2.1.15.pamd 158
 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd2-2.1.15.pamd 158
 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd2-2.1.15.pamd 158
+AUX jabberd2-2.1.19.init 1623 RMD160 2f70caa4b9676a9641e866e49db26c2898bcaf39 SHA1 6f31fc8161b067e221961f1533522e0970a2b44f SHA256 6faabae87f2b7fabfc02a7c5d093313ffa9781bd8459f7369e6439ee8f76a3de
+MD5 a520dd136acf411a0befb855a1711940 files/jabberd2-2.1.19.init 1623
+RMD160 2f70caa4b9676a9641e866e49db26c2898bcaf39 files/jabberd2-2.1.19.init 1623
+SHA256 6faabae87f2b7fabfc02a7c5d093313ffa9781bd8459f7369e6439ee8f76a3de files/jabberd2-2.1.19.init 1623
+AUX jabberd2-2.1.19.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
+MD5 ab77cef855566260d6a779d8d77bc78c files/jabberd2-2.1.19.pamd 158
+RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 files/jabberd2-2.1.19.pamd 158
+SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b files/jabberd2-2.1.19.pamd 158
 DIST jabberd-2.1.15.tar.gz 1408858 RMD160 f4f4d3200bf0bd0b5bf9a2a8d9e4d9167c16869c SHA1 849bd29e1aaff2ed362a93f7741ffca20c629357 SHA256 e9c3e03ae407913ddb0ceec827af71f9722da9e03ff6f6f979188c4f6ba6f4c9
+DIST jabberd-2.1.19.tar.gz 832493 RMD160 9e830094e8c37d2ba3be6ff8a713606c151536ab SHA1 37f617f5c6bd29e7151b21142721ef3470f95af6 SHA256 531ced98332e26928229fe83bed41053a61a7a6d8d5978bb107a7f79b5468904
 EBUILD jabberd2-2.1.15.ebuild 2938 RMD160 324be49a780657a1b691a3dc84ad98e7d11c95e9 SHA1 4f6158db06f9b038f6e9d3619750c50c9d9295ed SHA256 fb46321c33eb3519b6eca8c4a46977c8d0edc88580dd63fa5ee4df699e66242e
 MD5 7b4b82b563a30aba0e925e0081bc83a4 jabberd2-2.1.15.ebuild 2938
 RMD160 324be49a780657a1b691a3dc84ad98e7d11c95e9 jabberd2-2.1.15.ebuild 2938
 SHA256 fb46321c33eb3519b6eca8c4a46977c8d0edc88580dd63fa5ee4df699e66242e jabberd2-2.1.15.ebuild 2938
-MISC ChangeLog 527 RMD160 827261741455f3d88a6ad9571a1654a936f9025a SHA1 7697d27c467708d680ab78e366a5c0ddb68fe436 SHA256 f689ffa07d800bd998f231cd7d8bbdb3c1aa5765f1404bff0e55ccb1a3fba806
-MD5 d5cd58d03b52a12a1d4cbeab37970541 ChangeLog 527
-RMD160 827261741455f3d88a6ad9571a1654a936f9025a ChangeLog 527
-SHA256 f689ffa07d800bd998f231cd7d8bbdb3c1aa5765f1404bff0e55ccb1a3fba806 ChangeLog 527
+EBUILD jabberd2-2.1.19.ebuild 2941 RMD160 b5fb312151a3f0f845d7d56a91e269fae5c9b118 SHA1 7a25aa47fcbaf5682336df5213f5432bc0542f09 SHA256 44c4e0cc6c73ca449c9dcd41a22465a913032ea3e5a7c72c39f242e849b4e306
+MD5 7d66434fe7e12a8b34f3cd1cdd77f11a jabberd2-2.1.19.ebuild 2941
+RMD160 b5fb312151a3f0f845d7d56a91e269fae5c9b118 jabberd2-2.1.19.ebuild 2941
+SHA256 44c4e0cc6c73ca449c9dcd41a22465a913032ea3e5a7c72c39f242e849b4e306 jabberd2-2.1.19.ebuild 2941
+MISC ChangeLog 736 RMD160 e3089783f105d2ea1740d812705848378bb290de SHA1 b2d442a117a0b7d05149ef5d46c96f23f2e68ec1 SHA256 fbcd34d925c11f5bb2252f71dc6cd988fb588fb7cbefa386af6a52aa7c4a4194
+MD5 845370def7a3fff3fe39c39e49eccc5a ChangeLog 736
+RMD160 e3089783f105d2ea1740d812705848378bb290de ChangeLog 736
+SHA256 fbcd34d925c11f5bb2252f71dc6cd988fb588fb7cbefa386af6a52aa7c4a4194 ChangeLog 736
 MISC metadata.xml 433 RMD160 817394c54e448ad628773a5de8edb4c26b9516f7 SHA1 cca8e15fd99f2b05a3efed75d665e9ab0a57ce4d SHA256 245f08f7b8e66f9240eb7ea237661f7b17e667c9500121770c2611e1033f30c4
 MD5 d299ac2c0ade4fad26820d81e81e1882 metadata.xml 433
 RMD160 817394c54e448ad628773a5de8edb4c26b9516f7 metadata.xml 433
@@ -25,10 +38,13 @@ SHA256 245f08f7b8e66f9240eb7ea237661f7b17e667c9500121770c2611e1033f30c4 metadata
 MD5 87dfc8794cea2add2d01a61aae4ad974 files/digest-jabberd2-2.1.15 247
 RMD160 506991480f1b2a2fda31fcce75fdc818054db387 files/digest-jabberd2-2.1.15 247
 SHA256 e25ee417a30027dc8fc31c4a645d621783b7ea96b349373823582edbc2922ffb files/digest-jabberd2-2.1.15 247
+MD5 bc2e400de28d9bd848fff283f03c3349 files/digest-jabberd2-2.1.19 244
+RMD160 0c8cc6044de65255345f9a8c6aedc93b9ff794bc files/digest-jabberd2-2.1.19 244
+SHA256 33562ba67b26d4d3e0c8771d7c3a73b691d80940daf3ec02e165df2d375b5c71 files/digest-jabberd2-2.1.19 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHJz49z974XjDVpbkRAnCJAJ9uCdVPxYmCE3p4C1h79BnZp4hbNwCg4ETP
-cDAUi+Y2QGIb8R/b9Zu5Y+U=
-=yr8y
+iD8DBQFHML+Cgo/w9rxVVVERAiosAJ9GOwzXbgFIrvspmicrAR91qNhNugCgwaG9
+rh+hS+H8LGmUxTA+e21dxFI=
+=6ux9
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/digest-jabberd2-2.1.19 b/net-im/jabberd2/files/digest-jabberd2-2.1.19
new file mode 100644
index 000000000000..d93480931c5c
--- /dev/null
+++ b/net-im/jabberd2/files/digest-jabberd2-2.1.19
@@ -0,0 +1,3 @@
+MD5 cb3edee535ec9817f2c3b948152c3133 jabberd-2.1.19.tar.gz 832493
+RMD160 9e830094e8c37d2ba3be6ff8a713606c151536ab jabberd-2.1.19.tar.gz 832493
+SHA256 531ced98332e26928229fe83bed41053a61a7a6d8d5978bb107a7f79b5468904 jabberd-2.1.19.tar.gz 832493
diff --git a/net-im/jabberd2/files/jabberd2-2.1.19.init b/net-im/jabberd2/files/jabberd2-2.1.19.init
new file mode 100644
index 000000000000..701fea590b72
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.19.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.19.init,v 1.1 2007/11/06 19:24:44 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.19.pamd b/net-im/jabberd2/files/jabberd2-2.1.19.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.1.19.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.19.ebuild b/net-im/jabberd2/jabberd2-2.1.19.ebuild
new file mode 100644
index 000000000000..6c051a0e9af5
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.1.19.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.1.19.ebuild,v 1.1 2007/11/06 19:24:44 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.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~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? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3 )
+	!net-im/jabberd"
+
+S="${WORKDIR}/jabberd-${PV}"
+
+src_compile() {
+
+	local localconf="--enable-sasl=cyrus"
+
+	# Note: no gsasl support for now, since
+	#		gsasl-0.2.14 not in portage tree.
+	#
+	#if use !gsasl; 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
+
+}