Version bump.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

5 files changed, 206 insertions, 14 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 89407d00efdb..fac2f73f6cbc 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.27 2009/01/24 14:53:23 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.28 2009/05/08 15:24:09 gentoofan23 Exp $
+
+*jabberd2-2.2.8 (08 May 2009)
+
+  08 May 2009; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/jabberd2-2.2.8.init, +files/jabberd2-2.2.8.pamd,
+  +jabberd2-2.2.8.ebuild:
+  Version bump.
 
 *jabberd2-2.2.5 (24 Jan 2009)
 
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index be62e9f05af1..414e992e3bd4 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jabberd2-2.2.1.init 1625 RMD160 eb56ebb821ca11bdd09ddf07ba0899f75273e022 SHA1 d7116a599165535d8adf64da89e31f5342309291 SHA256 23c37f789d84575824a3cd8d009c88e7035ca1222cdb24e0c8437e1a6e55bec1
 AUX jabberd2-2.2.1.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
 AUX jabberd2-2.2.4.init 1625 RMD160 ef5c466dd5976cfa7aac5abb797b103befc52e60 SHA1 5a66d45559bae3d946e92ff517e7a3c0eabb9f11 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7
 AUX jabberd2-2.2.4.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
 AUX jabberd2-2.2.5.init 1622 RMD160 e9caa803b5e4c69e84d3257591c12ab95c0917bd SHA1 05cd2427166a84948bce1a841c2f632b5c4b9bd4 SHA256 0f89246b7240f7f4ce528734a054d32bb63c7195c4a278362265ed818d6049e3
 AUX jabberd2-2.2.5.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
+AUX jabberd2-2.2.8.init 1625 RMD160 6c0f847a6b220f379244e2d47b1c0ae59615803c SHA1 fc1cf432b2a12ef924eb4707d9804c3e1d58d0e7 SHA256 38e08cc155b9a7f7781a3255f7a1bbb885fed9eb22d72a37349b5f7790cf1689
+AUX jabberd2-2.2.8.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
 DIST jabberd-2.2.1.tar.bz2 645496 RMD160 572cd477797e6a75a7e2c6e43e66f280c8fe98d4 SHA1 4316662fb321690584ead8b0a5fbde8c6e177895 SHA256 6790e4f76febc2889bbe463c85879a4cccc9e6d72f98c9d0bb2a6fe0fa848aa6
 DIST jabberd-2.2.4.tar.bz2 649737 RMD160 0931f5fab7a9f330fee5da602500d4466233dd10 SHA1 06ddc870692fd34ef4bf7c2484620f3e8e68cfa2 SHA256 8cb7a69e92b8a7994a42ba28b910bc90e3174a7cc5928f1025bc1e17aee33eec
 DIST jabberd-2.2.5.tar.bz2 649910 RMD160 ed2aa1a97f9cfa1492c57c66c66979cec0006084 SHA1 d4c9e8dcbf482b0320d39e48748524374232d33a SHA256 14c36491f2fe83caacac6bef49b77dc43d56c76bc375fc0cf85e8373010f54e9
+DIST jabberd-2.2.8.tar.bz2 631830 RMD160 ec3b1a03220bb5521b6dce611a8f74f987486123 SHA1 0af7fd0d15bed16acae2b02aed838cfaadb784b6 SHA256 772959b0582fca92168f151252fd6a2286b715d72959ce494ca92935957961a3
 EBUILD jabberd2-2.2.1.ebuild 2945 RMD160 bade915a4533fcf738f15960e60a96be90db660e SHA1 ff994b285068dbb3a40ed897842be4e2e8db52fd SHA256 2d1c5f778b2c448ea695bf10f819421b39fe3531de71c91c26b4ecd1d9958894
 EBUILD jabberd2-2.2.4.ebuild 2946 RMD160 a25d29251885cef219354b0b89a572bfdd937906 SHA1 8336c00a5c7bb106eece147c9bfda54dfee1d6bb SHA256 07ba2261eadf854c03d9ed7772e0ea96f33b83cf688f0fefb0bc51a832903386
 EBUILD jabberd2-2.2.5.ebuild 2950 RMD160 c4bc2bfc580ededbb12ae67b5ec01554b551df25 SHA1 e743561a80e8427d4b5a78b9c325f1706b8377af SHA256 712ee1cb501b3451a9d3f9c99527d12e4a2a8fdc1ef470f6b450793da0201d20
-MISC ChangeLog 5316 RMD160 3f6235cef61eefc8073953f4005a4a96476944b9 SHA1 c76ffd16a57640e9afa10e5dd073c5b12295b517 SHA256 755e2fd92fa0efa17c8005772b7e2fba94f59df09004cc716ce60034f76cf679
+EBUILD jabberd2-2.2.8.ebuild 2953 RMD160 049f97138fd1740bd91451a48b4e1131d5e2beb9 SHA1 54976656407ba05fe8f87bfda8157d6cf0d45e25 SHA256 3fc5885b9d8cf74199b2263156ad9634b8cdec9222ff2f65e3cebe4158089257
+MISC ChangeLog 5507 RMD160 24b4a04214d2db21a3145b2ea8f144665aa60792 SHA1 f166dd90bf6f0215bb67164f6bc4b7a116ee9344 SHA256 0e93b10f507b70c72aa16db7052d42257c918b2a26556e4add3258bee20b2f00
 MISC metadata.xml 547 RMD160 b10ea392df22be8c68c7ea37a5fab36c074d4555 SHA1 a026624e0467a020180d223d27abe695e82224e0 SHA256 54d9e0367ea8fd8e2415427458990280fb5a150e17dc3508edce88edeb7676da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iJwEAQECAAYFAkl7K2kACgkQgGui5Bn0rgX+XwP/bLndUDVGASqHF3SbhG4iq8Pv
-b3FWeJnWSnlHA6mkA3s8WTN4JmhFqiJ3/cUzdJkUYY7620xVrmRlcyFRsrOec/b1
-+kDBa7orh5fHwO/WC9XEqhyIw740wp/6PEjg3LoBnN6e78+luwJw1pueLtz3cK47
-Bs02Zs7efYhuGOuaLhc=
-=o1s3
------END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.2.8.init b/net-im/jabberd2/files/jabberd2-2.2.8.init
new file mode 100644
index 000000000000..0c64021a449a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.2.8.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.2.8.init,v 1.1 2009/05/08 15:24:09 gentoofan23 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.2.8.pamd b/net-im/jabberd2/files/jabberd2-2.2.8.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.2.8.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.2.8.ebuild b/net-im/jabberd2/jabberd2-2.2.8.ebuild
new file mode 100644
index 000000000000..14873ee64752
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.2.8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.8.ebuild,v 1.1 2009/05/08 15:24:09 gentoofan23 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="berkdb debug memdebug mysql ldap pam postgres sqlite ssl zlib"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	>=net-dns/libidn-0.3
+	>=virtual/gsasl-0.2.27
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	mysql? ( virtual/mysql )
+	ldap? ( >=net-nds/openldap-2.1.0 )
+	pam? ( virtual/pam )
+	postgres? ( virtual/postgresql-base )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	sqlite? ( >=dev-db/sqlite-3 )
+	zlib? ( sys-libs/zlib )"
+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[3s] -O2
+
+	use berkdb && myconf="${myconf} --with-extra-include-path=$(db_includedir)"
+
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+		# --enable-pool-debug is currently broken
+		use memdebug && myconf="${myconf} --enable-nad-debug"
+	else
+		if use memdebug; then
+			ewarn
+			ewarn '"memdebug" requires "debug" enabled.'
+			ewarn
+		fi
+	fi
+
+	econf \
+		--sysconfdir=/etc/jabber \
+		--enable-fs --enable-pipe --enable-anon \
+		${myconf} \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable mysql) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable ssl) \
+		$(use_with zlib)
+	emake || die "make failed"
+
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
+	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"
+
+	dodoc AUTHORS README UPGRADE
+	docinto tools
+	dodoc tools/db-setup{.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
+
+}