update to s3

4 files changed, 196 insertions, 11 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 9e8ed5d92a4e..7b6bc1c54360 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.35 2004/07/08 01:29:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.36 2004/08/11 23:58:51 humpback Exp $
+
+*jabberd-2.0-r1 (12 Aug 2004)
+
+  12 Aug 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +jabberd-2.0-r1.ebuild:
+  Updated to s3, I still need reports on how this works with the older
+  transports, please report back at bug #39395
 
   08 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber.rc6-r7,
   jabberd-1.4.3-r3.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 2c5dbc240799..2518d706a85f 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,17 +1,19 @@
-MD5 3722bebc05427c4b5f7df97ffc8b1563 jabberd-2.0.ebuild 4914
 MD5 c03d0c711fcdf4883316d011be0d8031 ChangeLog 5479
-MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
+MD5 190f938e70d012d6a780fbb003d3bfd3 jabberd-2.0-r1.ebuild 4914
 MD5 609148cca96d0710152b6b09cb438184 jabberd-1.4.3-r3.ebuild 5389
+MD5 3722bebc05427c4b5f7df97ffc8b1563 jabberd-2.0.ebuild 4914
+MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
+MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
+MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129
-MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
-MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
-MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
-MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 d07e9280a9fed9f133b6900d542a81df files/digest-jabberd-2.0 65
-MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
 MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
-MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
-MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
 MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
 MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
-MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
+MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
+MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
+MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
+MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
+MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
+MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
+MD5 feebb4b71e7f3e5a30adf1234cd9b1d4 files/digest-jabberd-2.0-r1 65
diff --git a/net-im/jabberd/files/digest-jabberd-2.0-r1 b/net-im/jabberd/files/digest-jabberd-2.0-r1
new file mode 100644
index 000000000000..171fd457b407
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0-r1
@@ -0,0 +1 @@
+MD5 c15f8f07cb2ee499cd21c0b883b9f353 jabberd-2.0s3.tar.gz 705819
diff --git a/net-im/jabberd/jabberd-2.0-r1.ebuild b/net-im/jabberd/jabberd-2.0-r1.ebuild
new file mode 100644
index 000000000000..c916d89f6384
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.0-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0-r1.ebuild,v 1.1 2004/08/11 23:58:51 humpback Exp $
+
+inherit eutils
+
+MY_PV="2.0s3"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://www.jabberstudio.org/files/jabberd2/${PN}-${MY_PV}.tar.gz"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="ldap ipv6 mysql postgres pam berkdb ssl"
+
+DEPEND="!net-im/jabber-server
+	>=dev-libs/openssl-0.9.6i
+	>=net-dns/libidn-0.3.5
+	ldap? ( >=net-nds/openldap-2.1 )
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )"
+
+pkg_setup() {
+	if ! use postgres && ! use mysql && ! use berkdb;  then
+		eerror
+		eerror "For this version of jabberd you must have"
+		eerror "at least one of 'mysql', 'postgres' and/or 'berkdb'"
+		eerror "in the USE variable in /etc/make.conf."
+		eerror
+		die "Look at the error message above."
+	fi
+}
+
+src_unpack() {
+	unpack ${PN}-${MY_PV}.tar.gz
+}
+
+src_compile() {
+	storage="fs"
+	authreg="anon"
+
+	if use berkdb; then
+		storage="${storage} db"
+		authreg="${authreg} db"
+	fi
+	if use mysql; then
+		storage="${storage} mysql"
+		authreg="${authreg} mysql"
+	fi
+	if use postgres; then
+		storage="${myconf} pgsql"
+		authreg="${authreg} pgsql"
+	fi
+	if use pam; then
+		authreg="${authreg} pam"
+	fi
+	if use ldap; then
+		authreg="${authreg} ldap"
+	fi
+
+	if use ipv6; then
+		enables="${enables} --enable-ipv6"
+	fi
+
+	cd ${S}
+
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--enable-debug \
+		--enable-storage="${storage}" \
+		--enable-authreg="${authreg}" \
+		${enables} || die
+	make || die
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	exeinto /etc/jabberd
+	dodir /var/jabberd
+	dodir /var/jabberd/pid
+	dodir /var/jabberd/log
+	dodir /var/jabberd/db
+	touch ${D}/var/jabberd/log/c2s.log
+	touch ${D}/var/jabberd/log/resolver.log
+	touch ${D}/var/jabberd/log/router.log
+	touch ${D}/var/jabberd/log/s2s.log
+	touch ${D}/var/jabberd/log/sm.log
+	doexe ${FILESDIR}/self-cert.sh
+	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r7 jabber
+
+	dodoc AUTHORS PROTOCOL README
+
+	docinto tools ; dodoc tools/db-setup.mysql tools/db-setup.pgsql tools/migrate.pl tools/pipe-auth.pl
+
+	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
+
+	fowners jabber:jabber /etc/jabberd
+	fowners jabber:jabber /etc/jabberd/c2s.xml
+	fowners jabber:jabber /etc/jabberd/c2s.xml.dist
+	fowners jabber:jabber /etc/jabberd/jabberd.cfg
+	fowners jabber:jabber /etc/jabberd/jabberd.cfg.dist
+	fowners jabber:jabber /etc/jabberd/resolver.xml
+	fowners jabber:jabber /etc/jabberd/resolver.xml.dist
+	fowners jabber:jabber /etc/jabberd/router-users.xml
+	fowners jabber:jabber /etc/jabberd/router-users.xml.dist
+	fowners jabber:jabber /etc/jabberd/router.xml
+	fowners jabber:jabber /etc/jabberd/router.xml.dist
+	fowners jabber:jabber /etc/jabberd/s2s.xml
+	fowners jabber:jabber /etc/jabberd/s2s.xml.dist
+	fowners jabber:jabber /etc/jabberd/self-cert.sh
+	fowners jabber:jabber /etc/jabberd/sm.xml
+	fowners jabber:jabber /etc/jabberd/sm.xml.dist
+	fowners jabber:jabber /etc/jabberd/templates
+
+	fowners jabber:jabber /var/jabberd
+	fowners jabber:jabber /var/jabberd/db
+	fowners jabber:jabber /var/jabberd/log
+	fowners jabber:jabber /var/jabberd/pid
+	fowners jabber:jabber /var/jabberd/log/c2s.log
+	fowners jabber:jabber /var/jabberd/log/resolver.log
+	fowners jabber:jabber /var/jabberd/log/router.log
+	fowners jabber:jabber /var/jabberd/log/s2s.log
+	fowners jabber:jabber /var/jabberd/log/sm.log
+	fperms 660 /etc/jabberd/c2s.xml
+	fperms 660 /etc/jabberd/c2s.xml.dist
+	fperms 660 /etc/jabberd/jabberd.cfg
+	fperms 660 /etc/jabberd/jabberd.cfg.dist
+	fperms 660 /etc/jabberd/resolver.xml
+	fperms 660 /etc/jabberd/resolver.xml.dist
+	fperms 660 /etc/jabberd/router-users.xml
+	fperms 660 /etc/jabberd/router-users.xml.dist
+	fperms 660 /etc/jabberd/router.xml
+	fperms 660 /etc/jabberd/router.xml.dist
+	fperms 660 /etc/jabberd/s2s.xml
+	fperms 660 /etc/jabberd/s2s.xml.dist
+	fperms 760 /etc/jabberd/self-cert.sh
+	fperms 660 /etc/jabberd/sm.xml
+	fperms 660 /etc/jabberd/sm.xml.dist
+	fperms 660 /etc/jabberd/templates
+	fperms o-rwx /usr/bin/jabberd
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Change 'localhost' to your server's domainname in the"
+	einfo "/etc/jabberd/*.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/jabberd/self-cert.sh"
+		einfo
+	fi
+}