Version bump wrt bug #143809, thanks to Polarina for providing needed patches

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 285 insertions, 15 deletions

diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog
index bf4e1ae22320..34d2a7b2c220 100644
--- a/net-irc/ircd-hybrid/ChangeLog
+++ b/net-irc/ircd-hybrid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/ircd-hybrid
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.20 2006/06/30 14:54:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.21 2006/09/02 18:37:55 jokey Exp $
+
+*ircd-hybrid-7.2.2 (02 Sep 2006)
+
+  02 Sep 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/7.2.2-default-config.patch, +ircd-hybrid-7.2.2.ebuild:
+  Version bump wrt bug #143809, thanks to Polarina for providing needed patches
 
   30 Jun 2006; Markus Ullmann <jokey@gentoo.org>
   +files/7.2.1-amd64-multilib.patch, ircd-hybrid-7.2.1.ebuild:
diff --git a/net-irc/ircd-hybrid/Manifest b/net-irc/ircd-hybrid/Manifest
index 507393078d14..00d4ea441d06 100644
--- a/net-irc/ircd-hybrid/Manifest
+++ b/net-irc/ircd-hybrid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 7.1.0-default-config.patch 1230 RMD160 a1a878bfc66babf0fd0ebd483068831de6e3cdd2 SHA1 4957595817bfa286589d2943397c77c16025faff SHA256 661e766f926eee089a3b003b2c6842f822737ee6697f8f0c710a2222b11307fb
 MD5 2cc5330c07947c6e3ac113d1e1e8bc6b files/7.1.0-default-config.patch 1230
 RMD160 a1a878bfc66babf0fd0ebd483068831de6e3cdd2 files/7.1.0-default-config.patch 1230
@@ -13,6 +10,10 @@ AUX 7.2.1-default-config.patch 4085 RMD160 a800997efc5e06f4381a170bf716fc61a67e4
 MD5 9dcacf1baaf5ac029a47629a8b837899 files/7.2.1-default-config.patch 4085
 RMD160 a800997efc5e06f4381a170bf716fc61a67e42f2 files/7.2.1-default-config.patch 4085
 SHA256 f03aae716c3759be4acb06b68faf7994a52b7e34e626f3b6c60aef274a797082 files/7.2.1-default-config.patch 4085
+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 conf.d_ircd 410 RMD160 f9f846fb4ca8288154fdf398bd30cfcff6004b03 SHA1 ff67892827909b610b94589c8b6fb6b9f7c37ace SHA256 51774ac286599ff3a6ea4d8cfef7b308681df4f30ba22029684cada79828b2df
 MD5 d7fb2ea1489aabedba9a5ec2f160eb23 files/conf.d_ircd 410
 RMD160 f9f846fb4ca8288154fdf398bd30cfcff6004b03 files/conf.d_ircd 410
@@ -45,6 +46,7 @@ DIST ircd-hybrid-7.0.3.tgz 1147557
 DIST ircd-hybrid-7.1.0.tgz 1218466
 DIST ircd-hybrid-7.1.1.tgz 1190396
 DIST ircd-hybrid-7.2.1.tgz 1013005 RMD160 c8f859f7e6e956c6d738641b1993423212fbd377 SHA1 c5683c1fac984d210a79a8742e9c2ef31a249db8 SHA256 66479aa1aaf6fbca79c90789e8dae1b04ffe66dbd2aba72e9906deebbb4e7938
+DIST ircd-hybrid-7.2.2.tgz 1025448 RMD160 b2b88a480ca08c108d967af5ca586bddf36a65ff SHA1 d7c7711be9376ae48704b52d41b0934520192242 SHA256 93edcc39cbaa7ebc0c3b122a2f15cd6a530d5b14d9baaa23ac2980fe966bc4f6
 EBUILD ircd-hybrid-7.0.3.ebuild 10100 RMD160 f00a415cd22162c4431725b8b68b78c0fa8cb890 SHA1 420e06c1b0143d5b3b8fe84285355b70a697a2d9 SHA256 33f8c8ba9b87b37b1eed9f38e5ca2d82cc9892562226aae49c1b428afd80915b
 MD5 94af7d9c90fe5412cbbaf172a628a565 ircd-hybrid-7.0.3.ebuild 10100
 RMD160 f00a415cd22162c4431725b8b68b78c0fa8cb890 ircd-hybrid-7.0.3.ebuild 10100
@@ -61,10 +63,14 @@ EBUILD ircd-hybrid-7.2.1.ebuild 4330 RMD160 9038e8a41cd45629a338f4e82732e49af697
 MD5 6bf7cc308249e7652cbb77a23a795c6a ircd-hybrid-7.2.1.ebuild 4330
 RMD160 9038e8a41cd45629a338f4e82732e49af6973336 ircd-hybrid-7.2.1.ebuild 4330
 SHA256 b05a7d560a90aa54670c243484ebfb5ebbaa84743d5d55ee127cd08a1bbf71dd ircd-hybrid-7.2.1.ebuild 4330
-MISC ChangeLog 3595 RMD160 0293f224ebb2b725c43b954d80be77e705fa0754 SHA1 30a5f64a74d8b6267e75c1adf781f58af3bdc927 SHA256 4aa1d75f53037adfcb920f943d7418c781d51e42f57a490dc13d35424e30adb8
-MD5 1b2c6c219f87836e2e2e94204b880967 ChangeLog 3595
-RMD160 0293f224ebb2b725c43b954d80be77e705fa0754 ChangeLog 3595
-SHA256 4aa1d75f53037adfcb920f943d7418c781d51e42f57a490dc13d35424e30adb8 ChangeLog 3595
+EBUILD ircd-hybrid-7.2.2.ebuild 4281 RMD160 a611c77be8fde58123712a4bf470a0f61bab253f SHA1 8b862da92ea2dda96bcc52507aa8d7b1dcfc135a SHA256 87ed2c8db77aaca1fda9b32bd6c1cebe9d2a03bfdb45a7f1ff96676c4ec1edbf
+MD5 b8822cf555825efe5e5d4211e1af1589 ircd-hybrid-7.2.2.ebuild 4281
+RMD160 a611c77be8fde58123712a4bf470a0f61bab253f ircd-hybrid-7.2.2.ebuild 4281
+SHA256 87ed2c8db77aaca1fda9b32bd6c1cebe9d2a03bfdb45a7f1ff96676c4ec1edbf ircd-hybrid-7.2.2.ebuild 4281
+MISC ChangeLog 3823 RMD160 cf2a67c942b90bf09aba853d0dadd81e6e63d895 SHA1 98f290ff69ed50218e0a0e85edc45f05f4553cce SHA256 cacb7695c6bdf714f4f07ab32eef2db7fe6352ed171a5f10be51de40a364170f
+MD5 eb2878be23d72f5c641ac632fcb5413b ChangeLog 3823
+RMD160 cf2a67c942b90bf09aba853d0dadd81e6e63d895 ChangeLog 3823
+SHA256 cacb7695c6bdf714f4f07ab32eef2db7fe6352ed171a5f10be51de40a364170f ChangeLog 3823
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -81,10 +87,6 @@ SHA256 f48a02cd4b321295c8ad8daa145fef7a5137f2761d974b7b775353e6d6f8e462 files/di
 MD5 5ff254cea2c069a8dc2460725f8714b6 files/digest-ircd-hybrid-7.2.1 247
 RMD160 0dae654f897e9b4d7905f73484a868254a476333 files/digest-ircd-hybrid-7.2.1 247
 SHA256 6118a5504ddcda69e0c112f12398bc43cc38febe3c2351818658a4e598e42c7b files/digest-ircd-hybrid-7.2.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEpTuuz974XjDVpbkRAv+zAJ9fWFsl6K1Tip3cMhNHmVtnbLWpnACgnzNJ
-VdDQ+LJ5Fm6XmegIEko4vAc=
-=qJSa
------END PGP SIGNATURE-----
+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
diff --git a/net-irc/ircd-hybrid/files/7.2.2-default-config.patch b/net-irc/ircd-hybrid/files/7.2.2-default-config.patch
new file mode 100644
index 000000000000..f8d128b1ec6f
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/7.2.2-default-config.patch
@@ -0,0 +1,101 @@
+diff -urN ircd-hybrid-7.2.2-orig/contrib/Makefile.in ircd-hybrid-7.2.2/contrib/Makefile.in
+--- ircd-hybrid-7.2.2-orig/contrib/Makefile.in	2006-07-17 06:31:27.000000000 +0000
++++ ircd-hybrid-7.2.2/contrib/Makefile.in	2006-09-02 16:29:11.000000000 +0000
+@@ -17,7 +17,7 @@
+ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+-prefix		= $(DESTDIR)@prefix@
++prefix		= $(DESTDIR)@prefix@/lib/ircd-hybrid-7
+ datarootdir	= $(DESTDIR)@datarootdir@
+ 
+ AUTOMODULEDIR	= ${prefix}/modules
+diff -urN ircd-hybrid-7.2.2-orig/contrib/help/Makefile.in ircd-hybrid-7.2.2/contrib/help/Makefile.in
+--- ircd-hybrid-7.2.2-orig/contrib/help/Makefile.in	2006-07-17 06:31:27.000000000 +0000
++++ ircd-hybrid-7.2.2/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.2-orig/help/Makefile.in ircd-hybrid-7.2.2/help/Makefile.in
+--- ircd-hybrid-7.2.2-orig/help/Makefile.in	2006-07-17 06:31:26.000000000 +0000
++++ ircd-hybrid-7.2.2/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.2-orig/include/defaults.h ircd-hybrid-7.2.2/include/defaults.h
+--- ircd-hybrid-7.2.2-orig/include/defaults.h	2006-07-17 06:31:22.000000000 +0000
++++ ircd-hybrid-7.2.2/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.2-orig/modules/m_help.c ircd-hybrid-7.2.2/modules/m_help.c
+--- ircd-hybrid-7.2.2-orig/modules/m_help.c	2006-07-17 06:31:35.000000000 +0000
++++ ircd-hybrid-7.2.2/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.2 b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.2.2
new file mode 100644
index 000000000000..9bc096ff0fed
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.2.2
@@ -0,0 +1,3 @@
+MD5 af807de25996a7d368b98ccc97614fc7 ircd-hybrid-7.2.2.tgz 1025448
+RMD160 b2b88a480ca08c108d967af5ca586bddf36a65ff ircd-hybrid-7.2.2.tgz 1025448
+SHA256 93edcc39cbaa7ebc0c3b122a2f15cd6a530d5b14d9baaa23ac2980fe966bc4f6 ircd-hybrid-7.2.2.tgz 1025448
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild
new file mode 100644
index 000000000000..40588e374ce7
--- /dev/null
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 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.2.ebuild,v 1.1 2006/09/02 18:37:55 jokey Exp $
+
+inherit eutils 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="~x86 ~alpha ~amd64"
+
+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.2-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/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/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
+		einfo "To create an RSA keypair for crypted links execute:"
+		einfo "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."
+}