fix FindBin issue

(Portage version: 2.0.51-r14)

5 files changed, 185 insertions, 15 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 739c09da15a3..95057f9d9a83 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.54 2005/05/24 01:20:12 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.55 2005/06/13 15:50:24 wschlich Exp $
+
+*jabberd-2.0.8-r1 (13 Jun 2005)
+
+  13 Jun 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/jabberd-2.0s8-FindBin.patch, +jabberd-2.0.8-r1.ebuild:
+  fix FindBin issue
 
   24 May 2005; Jason Wever <weeve@gentoo.org> jabberd-1.4.3-r5.ebuild:
   Stable on SPARC wrt security bug #91478.
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index d08a9d7d0a4a..2cc8a3bd9da4 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,28 +1,31 @@
-MD5 31f834f22398af321246628577494690 ChangeLog 8741
-MD5 f81b4c2b73367e5bed25722aa45e2533 jabberd-2.0-r2.ebuild 4965
-MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
+MD5 2b51f47fa32eaec521ee40f36bcbf34f ChangeLog 8912
 MD5 1de04ab5d7e18332a5d73790aadf336f jabberd-1.4.3-r4.ebuild 5813
-MD5 786349de4f04c6c1a5a16f2cae544e3b jabberd-2.0_p20050119.ebuild 3525
+MD5 f81b4c2b73367e5bed25722aa45e2533 jabberd-2.0-r2.ebuild 4965
 MD5 d63e76997504582699be99d08abd1fa8 jabberd-2.0.8.ebuild 3551
+MD5 786349de4f04c6c1a5a16f2cae544e3b jabberd-2.0_p20050119.ebuild 3525
+MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
 MD5 dbb285912f47ec8143993f9a79081817 jabberd-1.4.3-r5.ebuild 5813
+MD5 67458f9cd6c11c6831e8d837ffba2629 jabberd-2.0.8-r1.ebuild 3595
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
-MD5 0d59ca6b46e061b4b1d1673fce93487f files/digest-jabberd-2.0-r2 65
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
+MD5 0d59ca6b46e061b4b1d1673fce93487f files/digest-jabberd-2.0-r2 65
+MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8 65
+MD5 241fdbe6af83f9f39f14becf5e051ba2 files/digest-jabberd-2.0_p20050119 74
+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 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 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
-MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
-MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
 MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
-MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
-MD5 241fdbe6af83f9f39f14becf5e051ba2 files/digest-jabberd-2.0_p20050119 74
-MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
-MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
-MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8 65
-MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
 MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
+MD5 39b3dda311a8426d661901b3c22fdbf0 files/jabberd-2.0s8-FindBin.patch 1367
+MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8-r1 65
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.8-r1 b/net-im/jabberd/files/digest-jabberd-2.0.8-r1
new file mode 100644
index 000000000000..f3bef4a18c1c
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0.8-r1
@@ -0,0 +1 @@
+MD5 96753c5e74676ace0841a4cee9f13fdb jabberd-2.0s8.tar.gz 757149
diff --git a/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch b/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch
new file mode 100644
index 000000000000..a4c398d5f118
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch
@@ -0,0 +1,41 @@
+Index: tools/jabberd.in
+===================================================================
+RCS file: /home/cvs/jabberd2/tools/jabberd.in,v
+retrieving revision 1.3.2.1
+diff -u -r1.3.2.1 jabberd.in
+--- tools/jabberd.in	7 Dec 2004 17:08:38 -0000	1.3.2.1
++++ tools/jabberd.in	12 Jun 2005 11:01:11 -0000
+@@ -14,7 +14,7 @@
+ 
+ use strict;
+ use Getopt::Std;
+-use FindBin qw($Bin);
++#use FindBin qw($Bin);
+ use FileHandle;
+ use IPC::Open3;
+ use IO::Select;
+@@ -25,6 +25,7 @@
+ #-----------------------------------------------------------------------------
+ # Define some initial variables and default them as needed.
+ #-----------------------------------------------------------------------------
++my $Bin = "@bindir@";
+ my $VERSION = "@VERSION@";
+ my $config_dir = "@sysconfdir@";
+ my $config = $config_dir."/jabberd.cfg";
+Index: tools/Makefile.am
+===================================================================
+RCS file: /home/cvs/jabberd2/tools/Makefile.am,v
+retrieving revision 1.10.2.2
+diff -u -r1.10.2.2 Makefile.am
+--- tools/Makefile.am	14 Apr 2005 19:48:03 -0000	1.10.2.2
++++ tools/Makefile.am	12 Jun 2005 11:01:11 -0000
+@@ -3,7 +3,8 @@
+ 
+ edit = sed \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@VERSION\@,$(VERSION),g'
++	-e 's,@VERSION\@,$(VERSION),g' \
++	-e 's,@bindir\@,$(bindir),g'
+ 
+ $(bin_SCRIPTS): $(EXTRA_DIST)
+ 	@echo "generating $@ from $@.in"; \
diff --git a/net-im/jabberd/jabberd-2.0.8-r1.ebuild b/net-im/jabberd/jabberd-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..db6749725547
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.0.8-r1.ebuild
@@ -0,0 +1,119 @@
+# 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-2.0.8-r1.ebuild,v 1.1 2005/06/13 15:50:24 wschlich Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd.jabberstudio.org/2/"
+MY_P="${PN}-2.0s8"
+SRC_URI="http://files.jabberstudio.org/jabberd2/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="debug 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 ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${MY_P}-FindBin.patch"
+}
+
+src_compile() {
+	local myopts="--enable-fs"
+	use berkdb >&/dev/null && myopts="${myopts} --enable-db"
+	use mysql >&/dev/null && myopts="${myopts} --enable-mysql" || myopts="${myopts} --disable-mysql"
+	use postgres >&/dev/null && myopts="${myopts} --enable-pgsql"
+	use pam >&/dev/null && myopts="${myopts} --enable-pam"
+	use ldap >&/dev/null && myopts="${myopts} --enable-ldap"
+	use ipv6 >&/dev/null && myopts="${myopts} --enable-ipv6"
+
+	use debug && {
+		append-flags -O -ggdb -DDEBUG
+		RESTRICT="${RESTRICT} nostrip"
+		myopts="${myopts} --enable-debug"
+	}
+
+	econf ${myopts} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+#	DON'T USE EINSTALL HERE! it breaks the Makefile's sysconfdir!
+#	einstall || die "make install failed"
+	make DESTDIR=${D} install || die "make install failed"
+
+	## add user and group
+	enewgroup jabber
+	enewuser jabber -1 /bin/false /var/jabberd jabber
+
+	## set binary permissions
+	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
+
+	## jabberd working directory
+	dodir /var/jabberd{,/{db,log,pid}}
+	fowners jabber:jabber /var/jabberd{,/{db,log,pid}}
+	for i in router resolver sm c2s s2s; do
+		for j in log pid; do
+			touch ${D}/var/jabberd/${j}/${i}.${j}
+			fowners jabber:jabber /var/jabberd/${j}/${i}.${j}
+		done
+	done
+
+	#ä jabberd config & init script
+	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.bundled jabber
+#	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.gentoo jabber
+	exeinto /etc/jabberd; newexe ${FILESDIR}/self-cert.jabberd-2.sh self-cert.sh
+	# directories
+	fowners jabber:jabber /etc/jabberd{,/templates}
+	fperms 770 /etc/jabberd{,/templates}
+	# ssl script
+	fowners jabber:jabber /etc/jabberd/self-cert.sh
+	fperms 770 /etc/jabberd/self-cert.sh
+	# config files
+	for i in jabberd.cfg {router,router-users,resolver,sm,c2s,s2s,templates/roster}.xml; do
+		fowners jabber:jabber /etc/jabberd/${i}{,.dist}
+		fperms 660 /etc/jabberd/${i}{,.dist}
+	done
+
+	## documentation
+	dodoc AUTHORS PROTOCOL README
+	docinto tools
+	for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
+		dodoc tools/${i}
+	done
+}
+
+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"
+	fi
+	einfo
+}