Version bump. Thanks to James Spahlinger (eagle-101 on irc) for patches

Package-Manager: portage-2.1.3.19

5 files changed, 284 insertions, 5 deletions

diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog
index 187906c5dead..42a4d1341b9a 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.26 2007/05/21 10:29:30 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.27 2007/12/25 12:30:31 cla Exp $
+
+*ircd-hybrid-7.2.3 (25 Dec 2007)
+
+  25 Dec 2007; Dawid Węgliński <cla@gentoo.org>
+  +files/7.2.3-default-config.patch, +ircd-hybrid-7.2.3.ebuild:
+  Version bump. Thanks to James Spahlinger <intelligent.nerd@gmail.com> for
+  patches.
 
   21 May 2007; Peter Weller <welp@gentoo.org> ircd-hybrid-7.2.2.ebuild:
   multilib-strict fix for amd64 - bug 178519
diff --git a/net-irc/ircd-hybrid/Manifest b/net-irc/ircd-hybrid/Manifest
index b7a37c9dabf6..d4046a95ac58 100644
--- a/net-irc/ircd-hybrid/Manifest
+++ b/net-irc/ircd-hybrid/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 7.2.2-default-config.patch 4137 RMD160 cd46a1d419aff273260ea41af2bd5a1eec33b2bd SHA1 8fa83157b1ee407af9544ea7536d69f6b71e9492 SHA256 2d76d0b6b97850a09b9fedc2f1d674979f2f39c134c6b0bdfa96f5065acfcdd8
 MD5 13bfa5b3b86750e3e16606597f5d104e files/7.2.2-default-config.patch 4137
 RMD160 cd46a1d419aff273260ea41af2bd5a1eec33b2bd files/7.2.2-default-config.patch 4137
 SHA256 2d76d0b6b97850a09b9fedc2f1d674979f2f39c134c6b0bdfa96f5065acfcdd8 files/7.2.2-default-config.patch 4137
+AUX 7.2.3-default-config.patch 3658 RMD160 e70a5f193dbf626b2647062759d11183b43a75ef SHA1 0b5bcee0139f4a4931febc0e87e50e0784980544 SHA256 a245e286575b2cd1b73e7c40294dc68d120882a6bbb9419c98b298971eeba4dd
+MD5 fde7b195710f928391b4933f776dddee files/7.2.3-default-config.patch 3658
+RMD160 e70a5f193dbf626b2647062759d11183b43a75ef files/7.2.3-default-config.patch 3658
+SHA256 a245e286575b2cd1b73e7c40294dc68d120882a6bbb9419c98b298971eeba4dd files/7.2.3-default-config.patch 3658
 AUX conf.d_ircd 410 RMD160 f9f846fb4ca8288154fdf398bd30cfcff6004b03 SHA1 ff67892827909b610b94589c8b6fb6b9f7c37ace SHA256 51774ac286599ff3a6ea4d8cfef7b308681df4f30ba22029684cada79828b2df
 MD5 d7fb2ea1489aabedba9a5ec2f160eb23 files/conf.d_ircd 410
 RMD160 f9f846fb4ca8288154fdf398bd30cfcff6004b03 files/conf.d_ircd 410
@@ -19,14 +26,19 @@ MD5 313433d7409e24138e20e384eb74498f files/init.d_ircd-7.2.1 659
 RMD160 e7e4f0a70b3e5e30f3f9a4d9b8ce99a4253a1c82 files/init.d_ircd-7.2.1 659
 SHA256 40b5a4db885581e3a4feb7eb4bd345fddbf42780cf786dc47f69c554912bfd3c files/init.d_ircd-7.2.1 659
 DIST ircd-hybrid-7.2.2.tgz 1025448 RMD160 b2b88a480ca08c108d967af5ca586bddf36a65ff SHA1 d7c7711be9376ae48704b52d41b0934520192242 SHA256 93edcc39cbaa7ebc0c3b122a2f15cd6a530d5b14d9baaa23ac2980fe966bc4f6
+DIST ircd-hybrid-7.2.3.tgz 1010625 RMD160 58bec65da2492480b9a4e86777c6c19a4b568408 SHA1 f8a61e5500d28a4b4cded5f096c3627c2e5f01a0 SHA256 67f043470abd6e92227244f5d64e53dea987c0151d832ba0d1428ebe41e04870
 EBUILD ircd-hybrid-7.2.2.ebuild 4322 RMD160 975fa4e159f94eff754f1256c8e3e77cdce1f01a SHA1 c693f1ae8d7561d311edae71896c9f35a6ca3e42 SHA256 2a4bd7bdd18fb6c31b41d764d77aba1951371f394bcd14c6d01fd82b2b32ee23
 MD5 af7ece3b05e2004faf6ec542d714c158 ircd-hybrid-7.2.2.ebuild 4322
 RMD160 975fa4e159f94eff754f1256c8e3e77cdce1f01a ircd-hybrid-7.2.2.ebuild 4322
 SHA256 2a4bd7bdd18fb6c31b41d764d77aba1951371f394bcd14c6d01fd82b2b32ee23 ircd-hybrid-7.2.2.ebuild 4322
-MISC ChangeLog 4604 RMD160 8fc761b44a276b254dc2ecd7a686f6db8270bc92 SHA1 c23102d6494108d5998e744679fae617ae2165d8 SHA256 8de385da49bab2853691ed038752fdf4d4c9a806b2d0cd1f59e7ba76e76375a0
-MD5 2a7c64e21a39f88b7e2389895a58f2e4 ChangeLog 4604
-RMD160 8fc761b44a276b254dc2ecd7a686f6db8270bc92 ChangeLog 4604
-SHA256 8de385da49bab2853691ed038752fdf4d4c9a806b2d0cd1f59e7ba76e76375a0 ChangeLog 4604
+EBUILD ircd-hybrid-7.2.3.ebuild 4318 RMD160 edc652ebd38a48934f7d0df164a537a114362811 SHA1 6bf825818b70f981eb72004051dd511c23002942 SHA256 097b9c3a7f4905c64f9167fe298629fd8501e7c8a76e6b5b2e8b699baab7c287
+MD5 565933fca7f731df441c3591a42219b8 ircd-hybrid-7.2.3.ebuild 4318
+RMD160 edc652ebd38a48934f7d0df164a537a114362811 ircd-hybrid-7.2.3.ebuild 4318
+SHA256 097b9c3a7f4905c64f9167fe298629fd8501e7c8a76e6b5b2e8b699baab7c287 ircd-hybrid-7.2.3.ebuild 4318
+MISC ChangeLog 4839 RMD160 cc5383f18d736bd4c9f266554a464f639e65df2c SHA1 e8de12ab63e3c64bc72d8906577a3e732c5ddc19 SHA256 7c2a40daffc9c643aa1fe4eb10f8789bab222ea8e859e1b2100de9d49e2b6c25
+MD5 79900439effb3d9dfc353890478cd7f3 ChangeLog 4839
+RMD160 cc5383f18d736bd4c9f266554a464f639e65df2c ChangeLog 4839
+SHA256 7c2a40daffc9c643aa1fe4eb10f8789bab222ea8e859e1b2100de9d49e2b6c25 ChangeLog 4839
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -34,3 +46,13 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 6b0567b4761234499e692aa1033c0cbf files/digest-ircd-hybrid-7.2.2 247
 RMD160 9b71619b4c952a25ccc7eb619d7c05fcb6a9760b files/digest-ircd-hybrid-7.2.2 247
 SHA256 7e5098375e1a58eceddcb1a317e4b1ef96488d49229ded6f011413254d4c98c9 files/digest-ircd-hybrid-7.2.2 247
+MD5 55aac42e29b3cfcdc05365aae34c225e files/digest-ircd-hybrid-7.2.3 247
+RMD160 25fd52a24f3c22fccd782ef52d7309a69984d0fc files/digest-ircd-hybrid-7.2.3 247
+SHA256 392807d3c5643531d200ad3523f641cad513f6b6074da13c37b7ba30756f10c7 files/digest-ircd-hybrid-7.2.3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHcPfrUPEOwClectkRAkhcAJ9r3cC3oGSIA83tJChwW/wjC/1gtACfV6Ip
+oj5f3XffxX0kQPviL0z3LOQ=
+=LaWS
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ircd-hybrid/files/7.2.3-default-config.patch b/net-irc/ircd-hybrid/files/7.2.3-default-config.patch
new file mode 100644
index 000000000000..877e75c214c3
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/7.2.3-default-config.patch
@@ -0,0 +1,89 @@
+diff -urN ircd-hybrid-7.2.3-orig/contrib/help/Makefile.in ircd-hybrid-7.2.3/contrib/help/Makefile.in
+--- ircd-hybrid-7.2.3-orig/contrib/help/Makefile.in	2006-07-17 06:31:27.000000000 +0000
++++ ircd-hybrid-7.2.3/contrib/help/Makefile.in	2006-09-02 16:30:28.000000000 +0000
+@@ -5,7 +5,7 @@
+ INSTALL_DATA=	@INSTALL_DATA@
+ RM=		@RM@
+ 
+-prefix=		@prefix@
++prefix=		${DESTDIR}/usr/share/ircd-hybrid-7
+ exec_prefix=	@execprefix@
+ datarootdir	= $(DESTDIR)@datarootdir@
+ uhelpdir=	${prefix}/help/users
+diff -urN ircd-hybrid-7.2.3-orig/help/Makefile.in ircd-hybrid-7.2.3/help/Makefile.in
+--- ircd-hybrid-7.2.3-orig/help/Makefile.in	2006-07-17 06:31:26.000000000 +0000
++++ ircd-hybrid-7.2.3/help/Makefile.in	2006-09-02 16:32:19.000000000 +0000
+@@ -5,7 +5,7 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ RM		= @RM@
+ 
+-prefix		= @prefix@
++prefix		= ${DESTDIR}/usr/share/ircd-hybrid-7
+ exec_prefix	= @execprefix@
+ datarootdir	= $(DESTDIR)@datarootdir@
+ uhelpdir	= ${prefix}/help/users
+@@ -23,12 +23,12 @@
+ install: 
+ 	@echo installing help files...
+ 	-@if test ! -d $(prefix)/help; then \
+-		echo "mkdir $(prefix)/help"; \
+-		mkdir $(prefix)/help; \
+-		echo "mkdir $(prefix)/help/users"; \
+-		mkdir $(prefix)/help/users; \
+-		echo "mkdir $(prefix)/help/opers"; \
+-		mkdir $(prefix)/help/opers; \
++		echo "mkdir -p $(prefix)/help"; \
++		mkdir -p $(prefix)/help; \
++		echo "mkdir -p $(prefix)/help/users"; \
++		mkdir -p $(prefix)/help/users; \
++		echo "mkdir -p $(prefix)/help/opers"; \
++		mkdir -p $(prefix)/help/opers; \
+ 	fi
+ 	@for help in opers/*; do \
+ 	if [ -f $$help ]; then \
+diff -urN ircd-hybrid-7.2.3-orig/include/defaults.h ircd-hybrid-7.2.3/include/defaults.h
+--- ircd-hybrid-7.2.3-orig/include/defaults.h	2006-07-17 06:31:22.000000000 +0000
++++ ircd-hybrid-7.2.3/include/defaults.h	2006-09-02 16:37:04.000000000 +0000
+@@ -48,13 +48,13 @@
+  */
+ 
+ /* 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 AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
++#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/"
++#define AUTOMODPATH IRCD_PREFIX "/lib/ircd-hybrid-7/modules/autoload"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
+@@ -70,7 +70,7 @@
+ #define RKPATH  ETCPATH "/rkline.conf"
+ #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 -urN ircd-hybrid-7.2.3-orig/modules/m_help.c ircd-hybrid-7.2.3/modules/m_help.c
+--- ircd-hybrid-7.2.3-orig/modules/m_help.c	2006-07-17 06:31:35.000000000 +0000
++++ ircd-hybrid-7.2.3/modules/m_help.c	2006-09-02 16:38:31.000000000 +0000
+@@ -36,8 +36,8 @@
+ #include "modules.h"
+ #include "irc_string.h"
+ 
+-#define HPATH  IRCD_PREFIX "/help/opers"
+-#define UHPATH IRCD_PREFIX "/help/users"
++#define HPATH  IRCD_PREFIX "/share/ircd-hybrid-7/help/opers"
++#define UHPATH IRCD_PREFIX "/share/ircd-hybrid-7/help/users"
+ #define HELPLEN 400
+ 
+ static void m_help(struct Client *, struct Client *, int, char *[]);
diff --git a/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.2.3 b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.2.3
new file mode 100644
index 000000000000..061876a74852
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.2.3
@@ -0,0 +1,3 @@
+MD5 683fe6e06635d870cfc211f360772f67 ircd-hybrid-7.2.3.tgz 1010625
+RMD160 58bec65da2492480b9a4e86777c6c19a4b568408 ircd-hybrid-7.2.3.tgz 1010625
+SHA256 67f043470abd6e92227244f5d64e53dea987c0151d832ba0d1428ebe41e04870 ircd-hybrid-7.2.3.tgz 1010625
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild
new file mode 100644
index 000000000000..6c6f5d7fbb0d
--- /dev/null
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2007 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.2.3.ebuild,v 1.1 2007/12/25 12:30:31 cla Exp $
+
+inherit eutils multilib toolchain-funcs
+
+# Additional configuration options
+MAX_NICK_LENGTH=30
+MAX_CLIENTS=512
+MAX_TOPIC_LENGTH=390
+ENABLE_SMALL_NETWORK=0
+ENABLE_EFNET=0
+
+IUSE="debug ssl static zlib contrib"
+
+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="~alpha ~ppc ~x86"
+
+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}
+	epatch "${FILESDIR}"/7.2.3-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 "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_EFNET} -eq 1 ]
+	then
+		einfo "Configuring for Efnet."
+		myconf="${myconf} --enable-efnet"
+	else
+		myconf="${myconf} --disable-efnet"
+	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 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
+
+	# Build contrib Modules if requested by useflag contrib
+	if use contrib; then
+		cd "${S}"/contrib
+		make || dir "make in contrib failed"
+	fi
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)/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,$(get_libdir)/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/$(get_libdir)/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/server-version-info
+	docinto doc/technical
+	dodoc doc/technical/*
+
+	newinitd "${FILESDIR}"/init.d_ircd-7.2.1 ircd
+
+	# Install contrib Modules if requested by useflag contrib
+	if use contrib; then
+		cd "${S}"/contrib
+		make DESTDIR="${D}" install || die "make install contrib failed"
+	fi
+}
+
+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
+		elog "To create an RSA keypair for crypted links execute:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	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."
+}