Version bump, bug #98493.

(Portage version: 2.0.51.22-r2)

8 files changed, 274 insertions, 27 deletions

diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog
index 961c7d2f0e84..c0e1a85d606d 100644
--- a/net-irc/ircd-hybrid/ChangeLog
+++ b/net-irc/ircd-hybrid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/ircd-hybrid
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.13 2004/10/17 01:18:07 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.14 2005/07/20 19:11:02 swegener Exp $
+
+*ircd-hybrid-7.1.0 (20 Jul 2005)
+
+  20 Jul 2005; Sven Wegener <swegener@gentoo.org> +files/init.d_ircd-7.1.0,
+  +files/7.1.0-default-config.patch, files/conf.d_ircd, files/init.d_ircd,
+  +ircd-hybrid-7.1.0.ebuild:
+  Version bump, bug #98493.
 
   17 Oct 2004; Sven Wegener <swegener@gentoo.org> -files/config-ipv4.diff,
   -files/config-ipv6.diff, -files/ircd-hybrid-7.0.diff,
diff --git a/net-irc/ircd-hybrid/Manifest b/net-irc/ircd-hybrid/Manifest
index dafbc3c9aa35..1f3718ff9735 100644
--- a/net-irc/ircd-hybrid/Manifest
+++ b/net-irc/ircd-hybrid/Manifest
@@ -1,19 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 f54547aaa9e353a6c6a0ee5ebd235666 ircd-hybrid-7.0.3.ebuild 10127
 MD5 27c92b58384cd92f3f61d955c50de839 ChangeLog 2384
-MD5 bbff507a3a8a5c62db2a709a5efdc659 files/conf.d_ircd 410
-MD5 3f12014580f2adb00660a1e7d9c25189 files/init.d_ircd 1399
+MD5 60d1f5ef097d143945e05a11dd805d2b files/7.1.0-default-config.patch 733
+MD5 82fb09b5c31f9bb9a6ef21cffd9d97e4 files/conf.d_ircd 410
 MD5 3fa170737a52ed587dfede306e503dcd files/config-ipv4-7.0.3.diff 4227
 MD5 a60d0a00176f6ce75b380697db667e95 files/config-ipv6-7.0.3.diff 4227
 MD5 12b134810a484d2ec3480bd5cdf8be76 files/digest-ircd-hybrid-7.0.3 67
+MD5 be5e20539ebf85497a86bff5595ea2f6 files/digest-ircd-hybrid-7.1.0 67
+MD5 ab8bc9dd5321a10e1342b455acaa35b1 files/init.d_ircd 1439
+MD5 2ff99d88497ef44ac3d4e9fff8d3c46f files/init.d_ircd-7.1.0 667
 MD5 8281bd4963f1a3b0168065602952946f files/ircd-hybrid-7.0.3.diff 2606
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBcchZI1lqEGTUzyQRAkR5AJ9ofaoC+D9vJyoTIBmHGWns2QyRdwCfZgJF
-E+r4+JopShUPmOFF+g7iKsA=
-=Xn+5
------END PGP SIGNATURE-----
+MD5 f54547aaa9e353a6c6a0ee5ebd235666 ircd-hybrid-7.0.3.ebuild 10127
+MD5 d95140f4635be723f9eaf62826ff93bf ircd-hybrid-7.1.0.ebuild 5033
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
diff --git a/net-irc/ircd-hybrid/files/7.1.0-default-config.patch b/net-irc/ircd-hybrid/files/7.1.0-default-config.patch
new file mode 100644
index 000000000000..ffa8ce950660
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/7.1.0-default-config.patch
@@ -0,0 +1,29 @@
+--- include/defaults.h.orig	2005-07-20 16:37:34.918105546 +0000
++++ include/defaults.h	2005-07-20 16:38:51.034577293 +0000
+@@ -46,12 +46,12 @@
+  */
+ 
+ /* dirs */
+-#define DPATH   IRCD_PREFIX                                                     
++#define DPATH   IRCD_PREFIX
+ #define BINPATH IRCD_PREFIX "/bin/"
+-#define MSGPATH IRCD_PREFIX "/messages/"
+-#define ETCPATH IRCD_PREFIX "/etc"
+-#define LOGPATH IRCD_PREFIX "/logs"
+-#define MODPATH IRCD_PREFIX "/modules/"
++#define MSGPATH IRCD_PREFIX "/share/ircd-hybrid-7/messages/"
++#define ETCPATH "/etc/ircd"
++#define LOGPATH "/var/log/ircd"
++#define MODPATH IRCD_PREFIX "/lib/ircd-hybrid-7/modules/"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
+@@ -65,7 +65,7 @@
+ #define XPATH   ETCPATH "/xline.conf"           /* xline file */
+ #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
+ #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
+-#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
++#define PPATH   "/var/run/ircd/ircd.pid"             /* pid file */
+ #define OPATH   ETCPATH "/opers.motd"           /* oper MOTD file */
+ #define LIPATH  ETCPATH "/links.txt"            /* cached links file */
+ 
diff --git a/net-irc/ircd-hybrid/files/conf.d_ircd b/net-irc/ircd-hybrid/files/conf.d_ircd
index a9098271ec8e..6f700ac108dd 100644
--- a/net-irc/ircd-hybrid/files/conf.d_ircd
+++ b/net-irc/ircd-hybrid/files/conf.d_ircd
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/conf.d_ircd,v 1.3 2004/07/14 23:47:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/conf.d_ircd,v 1.4 2005/07/20 19:11:02 swegener Exp $
 
 # Config file for /etc/init.d/ircd
 
diff --git a/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.1.0 b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.1.0
new file mode 100644
index 000000000000..ee7b92a579fb
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.1.0
@@ -0,0 +1 @@
+MD5 87a6f28706584cebdd4e5ed2c315c9dc ircd-hybrid-7.1.0.tgz 1218466
diff --git a/net-irc/ircd-hybrid/files/init.d_ircd b/net-irc/ircd-hybrid/files/init.d_ircd
index 99e6f48f9ee6..d793add87f18 100644
--- a/net-irc/ircd-hybrid/files/init.d_ircd
+++ b/net-irc/ircd-hybrid/files/init.d_ircd
@@ -1,19 +1,18 @@
 #!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd,v 1.3 2004/09/27 00:35:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd,v 1.4 2005/07/20 19:11:02 swegener Exp $
 
 opts="${opts} rehash"
 
 ipv4pid="/var/run/ircd/ircd-ipv4.pid"
 ipv6pid="/var/run/ircd/ircd-ipv6.pid"
 
-depend()
-{
+depend() {
 	need net
 }
 
-start()
-{
+start() {
 	if [ "${IPV4_OPTS}" != "no" ]
 	then
 		ebegin "Starting IRCd-Hybrid7 IPv4 daemon"
@@ -31,8 +30,7 @@ start()
 	fi
 }
 
-stop()
-{
+stop() {
 	if [ -r "${ipv4pid}" ]
 	then
 		ebegin "Stopping IRCd-Hybrid7 IPv4 daemon"
@@ -50,8 +48,7 @@ stop()
 	fi
 }
 
-rehash()
-{
+rehash() {
 	if [ -r "${ipv4pid}" ]
 	then
 		ebegin "Rehashing IRCd-Hybrid7 IPv4 daemon"
diff --git a/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0 b/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
new file mode 100644
index 000000000000..57bbcae9965a
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0,v 1.1 2005/07/20 19:11:02 swegener Exp $
+
+opts="${opts} rehash"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting IRCd-Hybrid7 daemon"
+	start-stop-daemon --start --quiet --chuid hybrid --exec /usr/bin/ircd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IRCd-Hybrid7 daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ircd.pid
+	eend $?
+}
+
+rehash() {
+	ebegin "Rehashing IRCd-Hybrid7 IPv4 daemon"
+	kill -s SIGHUP $(</var/run/ircd/ircd.pid)
+	eend $?
+}
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild
new file mode 100644
index 000000000000..634640b2b3c1
--- /dev/null
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.1.0.ebuild,v 1.1 2005/07/20 19:11:02 swegener Exp $
+
+inherit eutils toolchain-funcs
+
+# Additional configuration options
+MAX_NICK_LENGTH=30
+MAX_CLIENTS=512
+MAX_TOPIC_LENGTH=512
+ENABLE_SMALL_NETWORK=1
+ENABLE_POLL=1
+ENABLE_SELECT=0
+ENABLE_EFNET=0
+ENABLE_RTSIGIO=0
+ENABLE_SHARED=1
+ENABLE_DEVPOLL=0
+ENABLE_KQUEUE=0
+
+IUSE="debug ipv6 ssl static zlib"
+
+DESCRIPTION="IRCD-Hybrid - High Performance Internet Relay Chat"
+HOMEPAGE="http://ircd-hybrid.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ppc"
+
+RDEPEND="zlib? ( >=sys-libs/zlib-1.1.4-r2 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.4a-r5
+	>=sys-devel/bison-1.875
+	>=sys-devel/gettext-0.12.1"
+
+pkg_setup() {
+	enewgroup hybrid
+	enewuser hybrid -1 -1 -1 hybrid
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/7.1.0-default-config.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	ewarn
+	ewarn "Server administrators are encouraged to customize some variables in"
+	ewarn "the ebuild if actually deploying hybrid in an IRC network."
+	ewarn "The values below reflect a usable configuration but may not be"
+	ewarn "suitable for large networks in production environments."
+	ewarn
+	ewarn "If you require more than 1024 clients per ircd enable poll() support"
+	ewarn "or hybrid will not compile due to hard max file descriptor limits"
+	ewarn "To change the default settings below you must edit the ebuild."
+	ewarn
+	ewarn "Maximum nick length       = ${MAX_NICK_LENGTH}"
+	ewarn "        topic length      = ${MAX_TOPIC_LENGTH}"
+	ewarn "        number of clients = ${MAX_CLIENTS}"
+	ewarn
+
+	if [ ${ENABLE_SMALL_NETWORK} -eq 1 ]
+	then
+		einfo "Configuring for small networks."
+		myconf="${myconf} --enable-small-net"
+	else
+		myconf="${myconf} --disable-small-net"
+	fi
+	if [ ${ENABLE_POLL} -eq 1 ]
+	then
+		einfo "Configuring with poll() enabled."
+		myconf="${myconf} --enable-poll"
+	else
+		myconf="${myconf} --disable-poll"
+	fi
+	if [ ${ENABLE_SELECT} -eq 1 ]
+	then
+		einfo "Configuring with select() enabled."
+		myconf="${myconf} --enable-select"
+	else
+		myconf="${myconf} --disable-select"
+	fi
+	if [ ${ENABLE_EFNET} -eq 1 ]
+	then
+		einfo "Configuring for Efnet."
+		myconf="${myconf} --enable-efnet"
+	else
+		myconf="${myconf} --disable-efnet"
+	fi
+	if [ ${ENABLE_RTSIGIO} -eq 1 ]
+	then
+		einfo "Configuring with Superior RTSIGIO."
+		myconf="${myconf} --enable-rtsigio"
+	else
+		myconf="${myconf} --disable-rtsigio"
+	fi
+	if [ ${ENABLE_SHARED} -eq 1 ]
+	then
+		einfo "Configuring with shared modules."
+		myconf="${myconf} --enable-shared"
+	else
+		myconf="${myconf} --disable-shared"
+	fi
+	if [ ${ENABLE_KQUEUE} -eq 1 ]
+	then
+		einfo "Configuring for Kqueue."
+		myconf="${myconf} --enable-kqueue"
+	else
+		myconf="${myconf} --disable-kqueue"
+	fi
+
+	epause 5
+
+	econf \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sysconfdir=/etc/ircd \
+		--includedir=/usr/include \
+		--with-nicklen=${MAX_NICK_LENGTH} \
+		--with-topiclen=${MAX_TOPIC_LENGTH} \
+		--with-maxconn=${MAX_CLIENTS} \
+		$(use_enable ipv6) \
+		$(use_enable zlib) \
+		$(use_enable ssl openssl) \
+		$(use_enable !static shared-modules) \
+		$(use_enable debug assert) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+
+	# Build respond binary for using rsa keys instead of plain text oper passwords.
+	use ssl && $(tc-getCC) ${CFLAGS} -o respond tools/rsa_respond/respond.c -lcrypto
+}
+
+src_install() {
+	dodir /usr/lib/ircd-hybrid-7
+	keepdir /var/run/ircd /var/log/ircd
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /usr/share/ircd-hybrid-7/messages
+	doins messages/*.lang || die "doins failed"
+
+	mv "${D}"/usr/{modules,lib/ircd-hybrid-7}
+	mv "${D}"/usr/bin/{,ircd-}mkpasswd
+	mv "${D}"/etc/ircd/{example,ircd}.conf
+
+	sed -i \
+		-e s:/usr/local/ircd/modules:/usr/lib/ircd-hybrid-7/modules: \
+		"${D}"/etc/ircd/ircd.conf
+
+	use ssl && dosbin "${S}"/respond
+
+	dodoc BUGS ChangeLog Hybrid-team RELNOTES TODO
+	docinto doc
+	dodoc doc/*.txt doc/Tao-of-IRC.940110 doc/server-version-info
+	docinto doc/technical
+	dodoc doc/technical/*
+
+	newinitd "${FILESDIR}"/init.d_ircd-7.1.0 ircd
+}
+
+pkg_postinst() {
+	chown -R hybrid:hybrid "${ROOT}"/etc/ircd "${ROOT}"/var/{log,run}/ircd
+	chmod 700 "${ROOT}"/etc/ircd "${ROOT}"/var/log/ircd
+
+	if use ssl
+	then
+		einfo "To create an RSA keypair for crypted links execute:"
+		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	fi
+}
+
+pkg_config() {
+	einfo "Generating 2048 bit RSA keypair /etc/ircd/ircd.rsa."
+	einfo "The public key is stored in /etc/ircd/ircd.pub."
+
+	openssl genrsa -rand "${ROOT}"/var/run/random-seed -out "${ROOT}"/etc/ircd/ircd.rsa 2048
+	openssl rsa -in "${ROOT}"/etc/ircd/ircd.rsa -pubout -out "${ROOT}"/etc/ircd/ircd.pub
+
+	chown hybrid:hybrid "${ROOT}"/etc/ircd/ircd.rsa "${ROOT}"/etc/ircd/ircd.pub
+	chmod 600 "${ROOT}"/etc/ircd/ircd.rsa
+	chmod 644 "${ROOT}"/etc/ircd/ircd.pub
+
+	einfo "Update the RSA keypair in /etc/ircd/ircd.conf and /REHASH."
+}