Add patch to bncsetup, thanks to redeeman and GurliGebis.

5 files changed, 93 insertions, 4 deletions

diff --git a/net-irc/bnc/ChangeLog b/net-irc/bnc/ChangeLog
index e08bd19b9917..bebf35aac9da 100644
--- a/net-irc/bnc/ChangeLog
+++ b/net-irc/bnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/bnc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/ChangeLog,v 1.7 2004/06/21 21:56:34 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/ChangeLog,v 1.8 2004/06/21 22:52:56 kloeri Exp $
+
+  22 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +bnc-2.8.6-r1.ebuild files/bncsetup.patch:
+  Add patch to bncsetup, thanks to redeeman and GurliGebis.
 
   21 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
   +files/bnc-2.8.6-gotofail-labelfix.patch, bnc-2.8.6.ebuild:
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
index 9400bb7884be..71b6281df99d 100644
--- a/net-irc/bnc/Manifest
+++ b/net-irc/bnc/Manifest
@@ -1,7 +1,10 @@
-MD5 20d4df3e7a1038d81a99f853defd9045 bnc-2.6.4.ebuild 911
-MD5 b548677db8b820721075cb8c151fe399 metadata.xml 250
+MD5 4fd817a1c57ed86eaa1bd758736b1f82 bnc-2.8.6-r1.ebuild 1060
 MD5 1c272033ebb22fe4329f8d35e9402bcb bnc-2.8.6.ebuild 1020
+MD5 2c4fdb759c0b2c50f6d93b6946ded966 bnc-2.6.4.ebuild 910
 MD5 206a1d97b58e6fb6c3bdb28eb5e5ff46 ChangeLog 1212
+MD5 b548677db8b820721075cb8c151fe399 metadata.xml 250
+MD5 b9427cecfd47491ea920651f047adb36 files/digest-bnc-2.8.6-r1 59
+MD5 6befce77dfbc40849385319dae3c3120 files/bnc-2.8.6-gotofail-labelfix.patch 701
 MD5 3aecb068876402e1030f940f6caa829a files/digest-bnc-2.6.4 59
 MD5 b9427cecfd47491ea920651f047adb36 files/digest-bnc-2.8.6 59
-MD5 6befce77dfbc40849385319dae3c3120 files/bnc-2.8.6-gotofail-labelfix.patch 701
+MD5 e8809f89a22004c0092dcb8502e17bfa files/bncsetup.patch 1212
diff --git a/net-irc/bnc/bnc-2.8.6-r1.ebuild b/net-irc/bnc/bnc-2.8.6-r1.ebuild
new file mode 100644
index 000000000000..165d003a067c
--- /dev/null
+++ b/net-irc/bnc/bnc-2.8.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bnc/bnc-2.8.6-r1.ebuild,v 1.1 2004/06/21 22:52:56 kloeri Exp $
+
+inherit eutils
+
+MY_P=${P/-/}
+DESCRIPTION="BNC (BouNCe) is used as a gateway to an IRC Server"
+HOMEPAGE="http://gotbnc.com/"
+SRC_URI="http://gotbnc.com/files/${MY_P}.tar.gz
+	http://bnc.ircadmin.net/${MY_P}.tar.gz
+	ftp://ftp.ircadmin.net/bnc/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm"
+IUSE=""
+
+DEPEND="virtual/glibc"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	# fix gcc-3.4 compilation, bug #54689.
+	epatch ${FILESDIR}/bnc-2.8.6-gotofail-labelfix.patch
+	epatch ${FILESDIR}/bncsetup.patch
+	econf || die
+	emake || die
+	mv mkpasswd bncmkpasswd
+}
+
+src_install() {
+	dodoc CHANGES README
+	dobin bnc bncchk bncsetup bncmkpasswd || die
+	insinto /usr/share/${MY_P}
+	doins example.conf motd
+}
+
+pkg_postinst() {
+	einfo "You can find an example motd/conf file here:"
+	einfo " /usr/share/${MY_P}/{example.conf,motd}"
+}
diff --git a/net-irc/bnc/files/bncsetup.patch b/net-irc/bnc/files/bncsetup.patch
new file mode 100644
index 000000000000..75e7b5d8d682
--- /dev/null
+++ b/net-irc/bnc/files/bncsetup.patch
@@ -0,0 +1,40 @@
+diff -Naur bnc2.8.6.org/bncsetup bnc2.8.6/bncsetup
+--- bnc2.8.6.org/bncsetup	2000-12-31 09:19:39.000000000 +0100
++++ bnc2.8.6/bncsetup	2004-06-22 00:31:00.242167464 +0200
+@@ -63,15 +63,15 @@
+ 
+ }
+ 
+-if ! [ -e ./mkpasswd ]
++if ! [ -e /usr/bin/bncmkpasswd ]
+ then
+   echo "You need to Make the package before you can use this script"
+-  echo "(required ./mkpasswd)"
++  echo "(required /usr/bin/bncmkpasswd)"
+   bsclean 0
+ fi
+ 
+ echo "BAD\$" > $TMPFILE
+-echo "Test" | ./mkpasswd -s >> $TMPFILE
++echo "Test" | /usr/bin/bncmkpasswd -s >> $TMPFILE
+ CRCYS=$(cat $TMPFILE | grep '\$' | tail -1 )
+ 
+ 
+@@ -201,13 +201,13 @@
+ 
+ if [ x$ERRORLEVEL = x0 ]
+ then 
+-  if [ -x ./mkpasswd ]
++  if [ -x /usr/bin/bncmkpasswd ]
+   then
+-    SUPERPASS="+"$(echo "$SUPERPASS" | ./mkpasswd -s)
+-    BNCPASS="+"$(echo "$BNCPASS" | ./mkpasswd -s)
++    SUPERPASS="+"$(echo "$SUPERPASS" | /usr/bin/bncmkpasswd -s)
++    BNCPASS="+"$(echo "$BNCPASS" | /usr/bin/bncmkpasswd -s)
+   else
+     clear
+-    echo "You have not did ./configure and make so there is no ./mkpasswd"
++    echo "You have not did ./configure and make so there is no /usr/bin/bncmkpasswd"
+     echo "This program is required to produce the encryption"
+     bsclean 0
+   fi
diff --git a/net-irc/bnc/files/digest-bnc-2.8.6-r1 b/net-irc/bnc/files/digest-bnc-2.8.6-r1
new file mode 100644
index 000000000000..28c8124ff678
--- /dev/null
+++ b/net-irc/bnc/files/digest-bnc-2.8.6-r1
@@ -0,0 +1 @@
+MD5 c3800ec09f62abf9881b84770fa79362 bnc2.8.6.tar.gz 52569