new revision due to sec bug

(Portage version: 2.0.51.22)

5 files changed, 251 insertions, 16 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index c455ad565ac4..abfedf17d820 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.51 2005/04/28 21:29:12 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.52 2005/05/21 18:35:51 humpback Exp $
+
+*jabberd-1.4.3-r5 (21 May 2005)
+
+  21 May 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/jabber.rc6-r8, +jabberd-1.4.3-r5.ebuild:
+  New revision to help solve a small sec problem.
 
 *jabberd-2.0.8 (28 Apr 2005)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index e7c98bc480a4..3cf66483f22c 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,25 +1,28 @@
+MD5 bb011dec8656ef1e7cf288c8aafa7884 ChangeLog 8327
 MD5 1de04ab5d7e18332a5d73790aadf336f jabberd-1.4.3-r4.ebuild 5813
-MD5 d63e76997504582699be99d08abd1fa8 jabberd-2.0.8.ebuild 3551
+MD5 42131ffb047d9b5549f06adf56c0361b jabberd-1.4.3-r5.ebuild 5815
 MD5 f81b4c2b73367e5bed25722aa45e2533 jabberd-2.0-r2.ebuild 4965
-MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
-MD5 bb011dec8656ef1e7cf288c8aafa7884 ChangeLog 8327
+MD5 d63e76997504582699be99d08abd1fa8 jabberd-2.0.8.ebuild 3551
 MD5 786349de4f04c6c1a5a16f2cae544e3b jabberd-2.0_p20050119.ebuild 3525
-MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
+MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
+MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
+MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
+MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
 MD5 0d59ca6b46e061b4b1d1673fce93487f files/digest-jabberd-2.0-r2 65
-MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
-MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
-MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
-MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
+MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8 65
 MD5 241fdbe6af83f9f39f14becf5e051ba2 files/digest-jabberd-2.0_p20050119 74
-MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
-MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
-MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
+MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
 MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
+MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
+MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
+MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
 MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
-MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
+MD5 df2769a5827567130bac352fe53f8df4 files/jabber.rc6-r8 806
+MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
 MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
+MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
 MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
+MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
+MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
+MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
-MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8 65
-MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
-MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.3-r5 b/net-im/jabberd/files/digest-jabberd-1.4.3-r5
new file mode 100644
index 000000000000..2348a4a5114e
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-1.4.3-r5
@@ -0,0 +1,3 @@
+MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016
+MD5 293c77245963b21e73f17fbde4aec200 jabberd-1.4.3-extexpat.diff 309514
+MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
diff --git a/net-im/jabberd/files/jabber.rc6-r8 b/net-im/jabberd/files/jabber.rc6-r8
new file mode 100644
index 000000000000..da2e281c52b4
--- /dev/null
+++ b/net-im/jabberd/files/jabber.rc6-r8
@@ -0,0 +1,34 @@
+#!/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/jabberd/files/jabber.rc6-r8,v 1.1 2005/05/21 18:35:51 humpback Exp $
+
+depend() {
+	need net
+	provide jabber-server
+}
+
+start() {
+	ebegin "Starting Jabber Server"
+	if [ -f ${JPIDFILE} ]; then
+		if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ]
+		then
+			rm -f ${JPIDFILE}
+		fi
+	fi
+	start-stop-daemon --start  -c jabber:jabber \
+		-x /usr/sbin/jabberd -- -B -c /etc/jabber/multiple.xml 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Jabber Server"
+	start-stop-daemon --stop  -x /usr/sbin/jabberd
+	kill `cat ${JPIDFILE}`
+	sleep 2
+	if [ -f ${JPIDFILE} ]; then
+		kill -9 `cat ${JPIDFILE}`
+		rm -f ${JPIDFILE}
+	fi												 
+	eend $?
+}
diff --git a/net-im/jabberd/jabberd-1.4.3-r5.ebuild b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
new file mode 100644
index 000000000000..5c1b27654e95
--- /dev/null
+++ b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.1 2005/05/21 18:35:51 humpback Exp $
+
+inherit eutils
+
+S="${WORKDIR}/jabberd-${PV}"
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
+	http://www.gentoo-pt.org/~humpback/jabberd-1.4.3-extexpat.diff
+	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~hppa ~sparc ~amd64 ~alpha"
+IUSE="ssl ldap ipv6 msn oscar yahoo icq"
+
+DEPEND="!net-im/jabber-server
+	>=dev-libs/pth-1.4.0
+	dev-libs/expat
+	ssl? ( >=dev-libs/openssl-0.9.6i )
+	ldap? ( =net-nds/openldap-2* )"
+
+PDEPEND="msn? ( net-im/msn-transport )
+		 oscar? ( net-im/aim-transport )
+		 yahoo? ( net-im/yahoo-transport )
+		 icq? ( net-im/jit )"
+
+pkg_setup() {
+
+	if use ipv6 ; then
+		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
+		ewarn "do control-c now and emerge with \"USE=-ipv6\" "
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack jabberd-${PV}.tar.gz
+	cd ${S}
+	use ldap	&& unpack xdb_ldap-1.0.tar.gz
+	epatch ${FILESDIR}/multiple-xml-patch-00
+	epatch ${FILESDIR}/multiple-xml-patch-01
+	#Patch for extexpat DoS http://www.jabber.org/pipermail/jadmin/2004-September/018046.html
+	epatch ${DISTDIR}/jabberd-1.4.3-extexpat.diff
+	mv jabber.xml multiple.xml
+}
+
+src_compile() {
+	# These can cause problems with certain configure scripts used...
+	unset LC_ALL LC_CTYPE
+
+
+	local myconf
+	cd ${S}
+	use ssl && myconf="--enable-ssl"
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	mv jabberd/jabberd.c jabberd/jabberd.c.orig
+	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
+	rm -f jabberd/jabberd.c.orig
+	./configure ${myconf} || die
+	make || die
+
+	if use ldap; then
+		cd ${S}/xdb_ldap/src
+		make all || die
+	fi
+}
+
+src_install() {
+	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r8 jabber
+	dodir /usr/sbin /etc/jabber /usr/lib/jabberd /var/log/jabber /usr/include/jabberd
+	touch ${D}/var/log/jabber/error.log
+	touch ${D}/var/log/jabber/record.log
+	dodir /var/spool/jabber
+	keepdir /var/spool/jabber/
+	keepdir /var/log/jabber/
+	dodir /var/run
+
+	exeinto /usr/sbin
+	doexe jabberd/jabberd
+	insinto /usr/lib/jabberd
+	doins platform-settings
+	doins jsm/jsm.so
+	doins xdb_file/xdb_file.so
+	doins pthsock/pthsock_client.so
+	doins dnsrv/dnsrv.so
+	doins dialback/dialback.so
+	if use ldap; then
+		insinto /etc/jabber
+		doins xdb_ldap/jabber.schema
+		doins xdb_ldap/slapd.conf
+		doins config/xdb-ldap.xml
+		insinto /usr/lib/jabberd
+		doins xdb_ldap/src/xdb_ldap.so
+	fi
+	insinto /etc/jabber
+	doins multiple.xml
+	exeinto /etc/jabber
+	doexe ${FILESDIR}/self-cert.sh
+
+	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
+	if [ -z $test_group ]
+	then
+		enewgroup jabber
+	fi
+
+	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
+	if [ -z $test_user ]
+	then
+		enewuser jabber -1 /bin/false /var/spool/jabber jabber
+	fi
+
+	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
+
+	fowners jabber:jabber /etc/jabber
+	fowners jabber:jabber /usr/sbin/jabberd
+	fowners jabber:jabber /var/log/jabber
+	fowners jabber:jabber /var/log/jabber/error.log
+	fowners jabber:jabber /var/log/jabber/record.log
+	fowners jabber:jabber /var/spool/jabber
+
+	fperms o-rwx /etc/jabber
+	fperms o-rwx /usr/sbin/jabberd
+	fperms o-rwx /var/log/jabber
+	fperms o-rwx /var/log/jabber/error.log
+	fperms o-rwx /var/log/jabber/record.log
+	fperms o-rwx /var/spool/jabber
+	fperms u+rwx /usr/sbin/jabberd
+
+	fperms g-x /etc/jabber
+	fperms g-x /usr/sbin/jabberd
+	fperms g-x /var/log/jabber
+	fperms g-x /var/log/jabber/error.log
+	fperms g-x /var/log/jabber/record.log
+	fperms g-x /var/spool/jabber
+
+	fperms g+rw /etc/jabber
+	fperms g+rw /usr/sbin/jabberd
+	fperms g+rw /var/log/jabber
+	fperms g+rw /var/log/jabber/error.log
+	fperms g+rw /var/log/jabber/record.log
+	fperms g+rw /var/spool/jabber
+	fperms u+xs /usr/sbin/jabberd
+
+	#Install header files for transports to use
+	cd ${S}/jabberd
+	tar cf - `find . -name \*.h` | (cd ${D}/usr/include/jabberd ; tar xvf -)
+	assert "Failed to install header files to /usr/include/jabberd"
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Change 'localhost' to your server's domainname in the"
+	einfo "/etc/jabber/*.xml configs first"
+	einfo "Server admins should be added to the "jabber" group"
+	if use ssl; then
+		einfo
+		einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
+	fi
+	if use ldap; then
+		einfo
+		einfo "In order to use the ldap backend, you need to copy"
+		einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
+		einfo "directory on your ldap server. You will also need to"
+		einfo "include the schema in your slapd.conf file and retsart openldap."
+		einfo "An example slapd.conf file is included in /etc/jabber."
+		einfo "The xdb_ldap backend expects your ldap server to handle"
+		einfo "StartTLS or run in ldaps mode."
+	fi
+	einfo
+	einfo "The various IM transports for jabber are now separate packages,"
+	einfo "which you will need to install separately if you want them:"
+	einfo "net-im/jit - ICQ transport (You can use aim-transport for icq but JIT is better)"
+	einfo "net-im/msn-transport - MSN transport (USE=msn)"
+	einfo "net-im/jud - Jabber User Directory"
+	einfo "net-im/yahoo-transport - Yahoo IM system (USE=yahoo)"
+	einfo "net-im/aim-transport - AOL transport (USE=oscar)"
+	einfo "net-im/mu-conference - Jabber multi user conference"
+	einfo
+	einfo "Please read /usr/share/doc/${PF}/README.Gentoo.gz"
+	einfo
+	ewarn "If upgrading from older version please stop jabberd BEFORE updating the init.d"
+	ewarn "script, or you will end with a \"dead\" server."
+}