Unstable version bump & mark 1.4.2-r4 stable

5 files changed, 244 insertions, 7 deletions

diff --git a/net-im/jabber-server/ChangeLog b/net-im/jabber-server/ChangeLog
index aea488312df6..1ecefa192d86 100644
--- a/net-im/jabber-server/ChangeLog
+++ b/net-im/jabber-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabber-server
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/ChangeLog,v 1.10 2003/10/11 01:54:13 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/ChangeLog,v 1.11 2003/11/18 20:57:43 luke-jr Exp $
+
+*jabber-server-1.4.3 (18 Nov 2003)
+
+  18 Nov 2003; Luke-Jr <luke-jr@gentoo.org> jabber-server-1.4.2-r4.ebuild,
+  jabber-server-1.4.3.ebuild:
+  Unstable version bump & mark 1.4.2-r4 stable
 
   11 Oct 2003; Luke-Jr <luke-jr@gentoo.org> jabber-server-1.4.2-r4.ebuild,
   files/config-1.4.2-r4.tbz2:
diff --git a/net-im/jabber-server/Manifest b/net-im/jabber-server/Manifest
index dbbbb7d0231e..3e7ce1bc1dc9 100644
--- a/net-im/jabber-server/Manifest
+++ b/net-im/jabber-server/Manifest
@@ -1,10 +1,9 @@
-MD5 26eb61bb95687769c5930f0891d4ca27 ChangeLog 2195
+MD5 322759e821db6da9d3588473998cd486 ChangeLog 2384
 MD5 294f8b0ea0f44ada8012c8dcbc085830 metadata.xml 492
 MD5 b4f693604b2b6a39d6759ce5e89e4db3 jabber-server-1.4.2-r2.ebuild 3881
 MD5 8e3f2c9def6ac70299c29c1f25ed90ef jabber-server-1.4.2-r3.ebuild 7175
-MD5 a14188a36759fd29a4ffd34ccf36c552 jabber-server-1.4.2-r4.ebuild 7344
-MD5 a14188a36759fd29a4ffd34ccf36c552 jabber-server-1.4.3.ebuild~ 7344
-MD5 4f79abd2efc01723fe2a557f46129f1c jabber-server-1.4.3.ebuild 7404
+MD5 051c58bc5fc8f027f524245cec2cd708 jabber-server-1.4.2-r4.ebuild 7343
+MD5 14308a3c3df6b459b8031be8fe50a93e jabber-server-1.4.3.ebuild 7367
 MD5 56c6d30985fe5f4ce2ecbc717f2b0f11 files/config-1.4.2-r1.tbz2 3202
 MD5 b9aed79237eda16bfed03ecd55ab1d84 files/config-1.4.2-r3.tbz2 3341
 MD5 9729606a22930fc068220751ef1a6f89 files/digest-jabber-server-1.4.2-r2 426
diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.3 b/net-im/jabber-server/files/digest-jabber-server-1.4.3
new file mode 100644
index 000000000000..7b5e4119f36a
--- /dev/null
+++ b/net-im/jabber-server/files/digest-jabber-server-1.4.3
@@ -0,0 +1,8 @@
+MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016
+MD5 950e2661ca99e5bcac5930373f0b0fd4 aim-transport-stable-20030314.tar.gz 305569
+MD5 9251a8e86206e5ce3344b3438b187ec0 Install_AIM.exe 2598120
+MD5 7180420f99f81ef24d2667cce72ed14b msn-transport-1.2.8pre5.tar.gz 62502
+MD5 565c259b23ac27ead83a97c3c7daa3b5 yahoo-t-2.1.1.tar.gz 35742
+MD5 ff07f57d1778fe8de28f6e62da423bd7 mu-conference-0.5.1.tar.gz 46838
+MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
+MD5 a057e8dd5966fa0d26ded03697ba395a jud-0.4.tar.gz 3950
diff --git a/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild
index 56332793389f..b9c115679cad 100644
--- a/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild
+++ b/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild,v 1.3 2003/10/11 01:54:13 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild,v 1.4 2003/11/18 20:57:43 luke-jr Exp $
 
 S="${WORKDIR}/jabber-${PV}"
 DESCRIPTION="Open Source Jabber Server & JUD,MUC,AIM,MSN,ICQ and Yahoo transports"
@@ -17,7 +17,7 @@ SRC_URI="http://jabberd.jabberstudio.org/downloads/jabber-${PV}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="ssl ldap"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} j-nomsn j-noaim j-noyahoo j-nomuconf j-nojud"
diff --git a/net-im/jabber-server/jabber-server-1.4.3.ebuild b/net-im/jabber-server/jabber-server-1.4.3.ebuild
new file mode 100644
index 000000000000..24376a3a064b
--- /dev/null
+++ b/net-im/jabber-server/jabber-server-1.4.3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.3.ebuild,v 1.1 2003/11/18 20:57:43 luke-jr Exp $
+
+S="${WORKDIR}/jabberd-${PV}"
+DESCRIPTION="Open Source Jabber Server & JUD,MUC,AIM,MSN,ICQ and Yahoo transports"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
+	!j-noaim? ( mirror://gentoo/aim-transport-stable-20030314.tar.gz
+	http://ftp.newaol.com/aim/win95/Install_AIM.exe )
+	!j-nomsn? ( http://msn-transport.jabberstudio.org/msn-transport-1.2.8pre5.tar.gz )
+	!j-noyahoo? (http://yahoo-transport.jabberstudio.org/yahoo-t-2.1.1.tar.gz )
+	!j-nomuconf? ( http://www.jabberstudio.org/files/mu-conference/mu-conference-0.5.1.tar.gz )
+	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )
+	!j-nojud? ( http://download.jabber.org/dists/1.4/final/jud-0.4.tar.gz )"
+#mirror://gentoo/Install_AIM_3.5.1670.exe
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="ssl ldap ipv6"
+# Internal USE flags that I do not really want to advertise ...
+IUSE="${IUSE} j-nomsn j-noaim j-noyahoo j-nomuconf j-nojud"
+
+DEPEND="=dev-libs/pth-1.4.0
+	!j-noyahoo? ( =dev-libs/glib-1.2* !=sys-libs/glibc-2.3.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6i )
+	ldap? ( =net-nds/openldap-2* )
+	!j-nomsn? ( !=sys-libs/glibc-2.3.1 net-ftp/curl )
+	!j-noaim? ( !=sys-libs/glibc-2.3.1 )
+	!j-nomuconf ? ( !=sys-libs/glibc-2.3.1 )
+	!j-nojud ? ( !=sys-libs/glibc-2.3.1 )"
+
+src_unpack() {
+	unpack jabberd-${PV}.tar.gz
+	cd ${S}
+	if ! use j-nomsn; then
+		unpack msn-transport-1.2.8pre5.tar.gz
+		cd msn-transport*
+		epatch ${FILESDIR}/msn-configure-patch-00
+		cd ..
+	fi
+	use j-noyahoo	|| unpack yahoo-t-2.1.1.tar.gz
+	use j-nojud	|| unpack jud-0.4.tar.gz
+	use ldap	&& unpack xdb_ldap-1.0.tar.gz
+	if ! use j-nomuconf; then
+		unpack mu-conference-0.5.1.tar.gz
+		mv ${S}/mu-conference-0.5.1 ${S}/mu-conference
+	fi
+	if ! use j-noaim; then
+		unpack aim-transport-stable-20030314.tar.gz
+		mv ${S}/aim-transport-stable-20030314 ${S}/aim-transport
+		cd ${S}/aim-transport
+		cp ${DISTDIR}/Install_AIM.exe .
+	fi
+
+	mkdir ${S}/config -p
+	cd ${S}/config
+	tar -xjf ${FILESDIR}/config-1.4.2-r4.tbz2
+}
+
+src_compile() {
+	# These can cause problems with certain configure scripts used...
+	unset LC_ALL LC_CTYPE
+
+
+	local myconf=""
+	cd ${S}
+	use ssl && myconf="$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 j-noaim; then
+	        cd ${S}/aim-transport
+		./configure || die
+	        make || die
+		make install
+	fi
+
+	if ! use j-nomsn; then
+		cd ${S}/msn-transport*
+		./configure --with-jabberd=${S}/jabberd || die
+		make || die
+	fi
+
+	if ! use j-nomuconf; then
+		cd ${S}/mu-conference
+		make || die
+	fi
+
+	if ! use j-nojud; then
+		cd ${S}/jud-0.4
+		make || die
+	fi
+
+	if ! use j-noyahoo; then
+		cd ${S}/yahoo-transport-2
+		make || die
+	fi
+
+	if use ldap; then
+		cd ${S}/xdb_ldap/src
+		make all || die
+	fi
+}
+
+src_install() {
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r3 jabber
+	dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
+	touch ${D}/var/log/jabber/error.log
+	touch ${D}/var/log/jabber/record.log
+	dodir /var/spool/jabber
+	touch ${D}/var/spool/jabber/.keep
+	dodir /var/run
+
+	cp ${S}/jabberd/jabberd ${D}/usr/sbin/
+	if ! use j-noaim; then
+		cp ${S}/aim-transport/src/aimtrans.so ${D}/usr/lib/jabber/
+		cp ${S}/aim-transport/Install_AIM.exe ${D}/usr/lib/jabber/
+		cp ${S}/config/aimtrans.xml ${D}/etc/jabber/
+		cp ${S}/config/icqtrans.xml ${D}/etc/jabber/
+	fi
+	if ! use j-nomsn; then
+		cp ${S}/msn-transport*/src/msntrans.so ${D}/usr/lib/jabber/
+		cp ${S}/config/msntrans.xml ${D}/etc/jabber/
+	fi
+	if ! use j-nomuconf; then
+		cp ${S}/mu-conference/src/mu-conference.so ${D}/usr/lib/jabber/
+		cp ${S}/config/muctrans.xml ${D}/etc/jabber/
+	fi
+	if ! use j-nojud; then
+		cp ${S}/jud-0.4/jud.so ${D}/usr/lib/jabber/
+		cp ${S}/jud-0.4/README ${D}/etc/jabber/jud.README
+	fi
+	if ! use j-noyahoo; then
+		cp ${S}/yahoo-transport-2/yahoo-transport.so ${D}/usr/lib/jabber/
+		cp ${S}/config/yahootrans.xml ${D}/etc/jabber/
+	fi
+	cp ${S}/jsm/jsm.so ${D}/usr/lib/jabber/
+	cp ${S}/xdb_file/xdb_file.so ${D}/usr/lib/jabber/
+	cp ${S}/pthsock/pthsock_client.so ${D}/usr/lib/jabber/
+	cp ${S}/dnsrv/dnsrv.so ${D}/usr/lib/jabber/
+	cp ${S}/dialback/dialback.so ${D}/usr/lib/jabber/
+	if use ldap; then
+		cp ${S}/xdb_ldap/jabber.schema ${D}/etc/jabber/
+		cp ${S}/xdb_ldap/slapd.conf ${D}/etc/jabber/
+		cp ${S}/xdb_ldap/src/xdb_ldap.so ${D}/usr/lib/jabber/
+		cp ${S}/config/xdb-ldap.xml ${D}/etc/jabber/
+	fi
+	if use j-noaim; then
+		grep -v 'aim data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
+		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
+	fi; if use j-nomsn; then
+		grep -v 'msn data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
+		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
+	fi; if use j-noyahoo; then
+		grep -v 'yahoo data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
+		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
+	fi; if use j-nomuconf; then
+		grep -v 'muconf data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
+		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
+	fi; if use j-nojud; then
+		grep -v 'jud data' ${S}/config/multiple.xml > ${S}/config/multiple.xml
+		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
+	fi
+	cp ${S}/config/multiple.xml ${D}/etc/jabber/
+}
+
+pkg_postinst() {
+	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
+	if [ -z $test_group ]
+	then
+		groupadd jabber
+	fi
+
+	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
+	if [ -z $test_user ]
+	then
+		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
+	fi
+
+	chown jabber.jabber /etc/jabber
+	chown jabber.jabber /usr/sbin/jabberd
+	chown jabber.jabber /var/log/jabber -R
+	chown jabber.jabber /var/spool/jabber -R
+	chmod o-rwx /etc/jabber
+	chmod o-rwx /usr/sbin/jabberd
+	chmod o-rwx /var/log/jabber -R
+	chmod o-rwx /var/spool/jabber -R
+	chmod u+rwx /usr/sbin/jabberd
+	chmod g-x /etc/jabber
+	chmod g-x /usr/sbin/jabberd
+	chmod g-x /var/log/jabber -R
+	chmod g-x /var/spool/jabber -R
+	chmod g+rw /etc/jabber
+	chmod g+rw /usr/sbin/jabberd
+	chmod g+rw /var/spool/jabber -R
+	chmod g+rw /var/log/jabber -R
+	chmod u+xs /usr/sbin/jabberd
+
+	einfo "Change 'localhost' to your server's domainname in the"
+	einfo "/etc/jabber/*.xml configs first"
+	if use ssl >/dev/null; then
+		einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
+	fi
+	einfo "Server admins should be added to the "jabber" group"
+	if use ldap >/dev/null; then
+		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
+	if ! use j-nojud >/dev/null; then
+		einfo "To complete JUD configuration, read /etc/jabber/jud.README"
+	fi
+}