Version bump, ebuild by Thomas Anderson <gentoofan23@gmail.com>, see bug #200616.

(Portage version: 2.1.5.4)

7 files changed, 189 insertions, 3 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index d7584510a2f3..eb6fff1ada3c 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.103 2008/05/21 18:55:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.104 2008/06/09 20:22:03 nelchael Exp $
+
+*jabberd-1.6.1.1 (09 Jun 2008)
+
+  09 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd-1.6.1.1-gnutls2.2.patch,
+  +files/jabberd-1.6.1.1-parallel-make.patch,
+  +files/jabberd-1.6.1.1-sandbox.patch, metadata.xml,
+  jabberd-1.4.4-r3.ebuild, +jabberd-1.6.1.1.ebuild:
+  Version bump, ebuild by Thomas Anderson <gentoofan23@gmail.com>, see bug
+  #200616.
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   jabberd-1.4.4-r3.ebuild:
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch b/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch
new file mode 100644
index 000000000000..ebf9eaa6a6c5
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch
@@ -0,0 +1,45 @@
+--- jabberd/mio_tls.cc.orig	2008-03-06 10:21:01.669677189 +0100
++++ jabberd/mio_tls.cc	2008-03-06 10:35:04.744064592 +0100
+@@ -612,7 +612,7 @@
+ 	    }
+ 
+ 	    // load OpenPGP key/certificate
+-	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile);
++	    ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64);
+ 	    if (ret < 0) {
+ 		log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
+ 		continue;
+@@ -631,7 +631,7 @@
+ 	    }
+ 
+ 	    // load the OpenPGP keyring
+-	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file);
++	    ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64);
+ 	    if (ret < 0) {
+ 		log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
+ 		continue;
+@@ -640,23 +640,6 @@
+ 	    continue;
+ 	}
+ 
+-	// load GnuPG trustdb
+-	if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) {
+-	    char const *const file = xmlnode_get_data(cur);
+-
+-	    if (file == NULL) {
+-		log_warn(NULL, "Initializing TLS subsystem: <trustdb/> element inside the TLS configuration, that does not contain a file-name.");
+-		continue;
+-	    }
+-
+-	    // load the GnuPG trustdb
+-	    ret = gnutls_certificate_set_openpgp_trustdb(current_credentials, file);
+-	    if (ret < 0) {
+-		log_error(NULL, "Error loading GnuPG trustdb %s: %s", file, gnutls_strerror(ret));
+-		continue;
+-	    }
+-	}
+-
+ 	// setup protocols to use
+ 	if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
+ 	    char const *const protocols_data = xmlnode_get_data(cur);
+
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-parallel-make.patch b/net-im/jabberd/files/jabberd-1.6.1.1-parallel-make.patch
new file mode 100644
index 000000000000..36f9d3476717
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-parallel-make.patch
@@ -0,0 +1,11 @@
+diff -aur jabberd14-1.6.1.1-orig/jabberd/Makefile.am jabberd14-1.6.1.1/jabberd/Makefile.am
+--- jabberd14-1.6.1.1-orig/jabberd/Makefile.am	2007-04-07 15:43:18.000000000 -0400
++++ jabberd14-1.6.1.1/jabberd/Makefile.am	2008-06-02 10:39:18.000000000 -0400
+@@ -6,7 +6,7 @@
+ jabberd_SOURCES = jabberd.cc
+ 
+ jabberd_LDADD = $(top_builddir)/jabberd/base/libjabberdbase.la \
+-		$(top_builddir)/jabberd/libjabberd.la \
++		libjabberd.la \
+ 		-lpopt
+ jabberd_LDFLAGS = @LDFLAGS@ -export-dynamic
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch b/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch
new file mode 100644
index 000000000000..57440180b3c1
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch
@@ -0,0 +1,14 @@
+diff -ur jabberd14-1.6.1.1.orig/po/Makefile.in jabberd14-1.6.1.1.patched/po/Makefile.in
+--- jabberd14-1.6.1.1.orig/po/Makefile.in	2007-07-19 04:24:44.000000000 +0600
++++ jabberd14-1.6.1.1.patched/po/Makefile.in	2008-01-11 18:05:36.000000000 +0500
+@@ -335,8 +335,8 @@
+ 
+ install-data-hook:
+ 	-for f in $(LANGS); do \
+-	    test -z "$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(localedir)/$${f%.po}/LC_MESSAGES"; \
+-	     msgfmt -o "$(localedir)/$${f%.po}/LC_MESSAGES/jabberd14.mo" $$f; \
++	    test -z "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES"; \
++	     msgfmt -o "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES/jabberd14.mo" $$f; \
+ 	     done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
index 9b3409383548..5808fe6f621b 100644
--- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.17 2008/05/21 18:55:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.18 2008/06/09 20:22:03 nelchael Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ pkg_setup() {
 
 src_unpack() {
 
-	unpack "${A}"
+	unpack ${A}
 
 	cd "${S}"
 
diff --git a/net-im/jabberd/jabberd-1.6.1.1.ebuild b/net-im/jabberd/jabberd-1.6.1.1.ebuild
new file mode 100644
index 000000000000..0caa9a7cdf92
--- /dev/null
+++ b/net-im/jabberd/jabberd-1.6.1.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1.ebuild,v 1.1 2008/06/09 20:22:03 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Open-source Jabber server"
+HOMEPAGE="http://www.jabber.org"
+SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="debug ipv6 mysql postgres ssl"
+
+RDEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/pth-1.4.0
+	dev-libs/expat
+	net-dns/libidn
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-server )
+	ssl? ( net-libs/gnutls )
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!net-im/jabberd2"
+
+S=${WORKDIR}/jabberd14-${PV}
+
+pkg_setup() {
+	if use ipv6; then
+		ewarn "Without full ipv6 support, jabberd will show the error:"
+		ewarn '   "mio unable to listen"'
+		ewarn "To fix this, emerge jabberd without the ipv6 USE flag."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gnutls2.2.patch"
+	epatch "${FILESDIR}/${P}-sandbox.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+}
+
+src_compile() {
+	unset LC_ALL LC_CTYPE
+
+	# Broken configure script - can't use "use_enable"
+	local myconf=
+	use debug && myconf="${myconf} --enable-debug --enable-pool-debug"
+	use ipv6  && myconf="${myconf} --enable-ipv6"
+	use ssl   && myconf="${myconf} --enable-ssl"
+
+	econf \
+		--sysconfdir=/etc/jabber \
+		${myconf} \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
+
+	# net-im/jabber-base provides needed directories
+	rm -rf "${D}/var"
+	mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
+	mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
+
+	sed -i \
+		-e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
+		-e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
+		-e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
+		-e 's,jabber.pid,jabberd14.pid,g' \
+		"${D}"/etc/jabber/jabberd.xml{,.dist} \
+		|| die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	elog 'The various IM transports for jabber are now separate packages,'
+	elog 'which you will need to install separately if you want them:'
+	elog '   net-im/jit - ICQ transport'
+	elog '   net-im/pymsn-t - MSN transport'
+	elog '   net-im/jud - Jabber User Directory'
+	elog '   net-im/yahoo-transport - Yahoo IM system'
+	elog '   net-im/mu-conference - Jabber multi user conference'
+	echo
+	ewarn 'If upgrading from an older version, please stop jabberd BEFORE'
+	ewarn 'updating the init.d script, or you will end with a "dead" server.'
+	ewarn
+	ewarn 'The configuration filename has changed:'
+	ewarn '   Configure your server in /etc/jabber/jabberd.xml'
+	echo
+	ebeep
+}
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index ec8856b87718..eeae55170460 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -5,5 +5,9 @@
 		<email>nelchael@gentoo.org</email>
 		<name>Krzysiek Pawlik</name>
 	</maintainer>
+	<maintainer>
+		<email>gentoofan23@gmail.com</email>
+		<name>Thomas Anderson</name>
+	</maintainer>
 	<herd>net-im</herd>
 </pkgmetadata>