Version bump, bug #236710

Package-Manager: portage-2.1.4.4

5 files changed, 209 insertions, 5 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 8a47202572e9..2589466f8847 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.22 2008/08/05 17:11:24 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.23 2008/09/15 01:33:54 gentoofan23 Exp $
+
+*jabberd2-2.2.4 (14 Sep 2008)
+
+  14 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/jabberd2-2.2.4.init, +files/jabberd2-2.2.4.pamd,
+  +jabberd2-2.2.4.ebuild:
+  Version bump, bug #236710
 
   05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Add USE flag description to metadata as per GLEP 56.
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 1461fb879efc..2b7941db9556 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -3,14 +3,18 @@ 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
 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
 EBUILD jabberd2-2.2.1.ebuild 2945 RMD160 bade915a4533fcf738f15960e60a96be90db660e SHA1 ff994b285068dbb3a40ed897842be4e2e8db52fd SHA256 2d1c5f778b2c448ea695bf10f819421b39fe3531de71c91c26b4ecd1d9958894
-MISC ChangeLog 4598 RMD160 9716a544852615b243ca9dd48d1d3f81f5d0bc97 SHA1 d55bcf8e0507a711b6e588a841ba2ecc52b89c76 SHA256 c300db0cec725bc7672522a73718ae4670f11062694d091cfc3aaaaa3a3d0c4d
+EBUILD jabberd2-2.2.4.ebuild 2953 RMD160 fb05322c4549f43a6b2f6d79c6024a8ead466dfc SHA1 f49332f1bce9dca0c4a3f852b959cac82f91c460 SHA256 d5f8586a34f96e76c99c8160a77eab97f12545d26842c8aedf9c3c6ac82ee3c2
+MISC ChangeLog 4798 RMD160 de0e809c3d951fbf4054a9df5a1d06ef51958603 SHA1 f4c4b7d713cb334ec2735a5db419288d08df6915 SHA256 d434f6516cf3c09f1673f3a11797d8659d6671e21f604f26e7981a36252cbb85
 MISC metadata.xml 547 RMD160 b10ea392df22be8c68c7ea37a5fab36c074d4555 SHA1 a026624e0467a020180d223d27abe695e82224e0 SHA256 54d9e0367ea8fd8e2415427458990280fb5a150e17dc3508edce88edeb7676da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiYjVsACgkQF6yMcaBxwHlzawCfX7l5xSowQ9OitXTbYkHfkDot
-rsMAoKy4abltwOgCSMr1VP6mWv13RrQT
-=KA18
+iEYEARECAAYFAkjNv08ACgkQF6yMcaBxwHm2dwCdHjZ4J3vnDDM3pijYogQmeX+V
+HoQAniVPEeRar68grNzQXjOyAGsaYGmQ
+=fjQa
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.2.4.init b/net-im/jabberd2/files/jabberd2-2.2.4.init
new file mode 100644
index 000000000000..8d40b606428b
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.2.4.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.4.init,v 1.1 2008/09/15 01:33:55 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.4.pamd b/net-im/jabberd2/files/jabberd2-2.2.4.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.2.4.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.4.ebuild b/net-im/jabberd2/jabberd2-2.2.4.ebuild
new file mode 100644
index 000000000000..c41e6e34f405
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.2.4.ebuild
@@ -0,0 +1,110 @@
+# 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.2.4.ebuild,v 1.1 2008/09/15 01:33:54 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
+
+}