summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-irc/irc-server/ChangeLog10
-rw-r--r--net-irc/irc-server/Manifest7
-rw-r--r--net-irc/irc-server/files/2.10.3_p3-gentoo.patch12
-rw-r--r--net-irc/irc-server/files/2.10.3_p7-gentoo.patch12
-rw-r--r--net-irc/irc-server/files/digest-irc-server-2.10.3_p71
-rw-r--r--net-irc/irc-server/irc-server-2.10.3_p3.ebuild17
-rw-r--r--net-irc/irc-server/irc-server-2.10.3_p7.ebuild131
7 files changed, 183 insertions, 7 deletions
diff --git a/net-irc/irc-server/ChangeLog b/net-irc/irc-server/ChangeLog
index c8914c4a1bc2..f49d4148b13e 100644
--- a/net-irc/irc-server/ChangeLog
+++ b/net-irc/irc-server/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-irc/irc-server
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.3 2004/05/29 16:16:27 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.4 2004/06/08 07:10:19 mkennedy Exp $
+
+*irc-server-2.10.3_p7 (08 Jun 2004)
+
+ 08 Jun 2004; <mkennedy@gentoo.org> +files/2.10.3_p3-gentoo.patch,
+ +files/2.10.3_p7-gentoo.patch, irc-server-2.10.3_p3.ebuild,
+ +irc-server-2.10.3_p7.ebuild:
+ New upstream version; GCC 3.4 fixes for 2.10.3_p7 and 2.10.3_p3;
+ Dont hardcode version numbers in ebuilds.
29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
irc-server-2.10.3_p3.ebuild:
diff --git a/net-irc/irc-server/Manifest b/net-irc/irc-server/Manifest
index 6b92d2a7758f..2dd673221e23 100644
--- a/net-irc/irc-server/Manifest
+++ b/net-irc/irc-server/Manifest
@@ -1,4 +1,9 @@
+MD5 039b6e17f07b2eb095d5f0cffecf72d9 irc-server-2.10.3_p3.ebuild 3353
+MD5 da9fccc356b2ad94f52be8acca51ca7d irc-server-2.10.3_p7.ebuild 3354
MD5 e8c4b41ec883a16b0925c7527e2ad290 ChangeLog 634
-MD5 377a8e79b77c59b133f4bab7e0598ddf irc-server-2.10.3_p3.ebuild 3264
+MD5 377a8e79b77c59b133f4bab7e0598ddf irc-server-2.10.3_p3.ebuild.~1.3.~ 3264
+MD5 04e939ae7f9a5e836ed87d73fab65d98 files/digest-irc-server-2.10.3_p7 60
+MD5 684a6ea4f6ae110ac662766916e8cb50 files/2.10.3_p3-gentoo.patch 521
MD5 11c6c72ebc4796aa655378f37a51cfa6 files/digest-irc-server-2.10.3_p3 60
+MD5 684a6ea4f6ae110ac662766916e8cb50 files/2.10.3_p7-gentoo.patch 521
MD5 6e86745a672407755d050a20b426dc8e files/ircd.rc 261
diff --git a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
new file mode 100644
index 000000000000..f5f18b09e1be
--- /dev/null
+++ b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ur irc2.10.3p3.orig/contrib/tkserv/tkserv.c irc2.10.3p3/contrib/tkserv/tkserv.c
+--- irc2.10.3p3.orig/contrib/tkserv/tkserv.c 2001-03-09 07:55:38.000000000 -0600
++++ irc2.10.3p3/contrib/tkserv/tkserv.c 2004-06-08 00:14:33.648900488 -0500
+@@ -549,6 +549,7 @@
+ case -1:
+ sendto_user("You are not allowed to tkline \"%s\".", host); break;
+ default:
++ break;
+ }
+
+ retv = retv < 0 ? 0 : retv; /* errors do not allow authorization */
+Only in irc2.10.3p3/contrib/tkserv: tkserv.c~
diff --git a/net-irc/irc-server/files/2.10.3_p7-gentoo.patch b/net-irc/irc-server/files/2.10.3_p7-gentoo.patch
new file mode 100644
index 000000000000..42ad3b89406d
--- /dev/null
+++ b/net-irc/irc-server/files/2.10.3_p7-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ur irc2.10.3p7.orig/contrib/tkserv/tkserv.c irc2.10.3p7/contrib/tkserv/tkserv.c
+--- irc2.10.3p7.orig/contrib/tkserv/tkserv.c 2001-03-09 07:55:38.000000000 -0600
++++ irc2.10.3p7/contrib/tkserv/tkserv.c 2004-06-08 00:14:33.648900488 -0500
+@@ -549,6 +549,7 @@
+ case -1:
+ sendto_user("You are not allowed to tkline \"%s\".", host); break;
+ default:
++ break;
+ }
+
+ retv = retv < 0 ? 0 : retv; /* errors do not allow authorization */
+Only in irc2.10.3p7/contrib/tkserv: tkserv.c~
diff --git a/net-irc/irc-server/files/digest-irc-server-2.10.3_p7 b/net-irc/irc-server/files/digest-irc-server-2.10.3_p7
new file mode 100644
index 000000000000..8b2d20b39ce8
--- /dev/null
+++ b/net-irc/irc-server/files/digest-irc-server-2.10.3_p7
@@ -0,0 +1 @@
+MD5 47fbf2856fa058686dfaa5f446154296 irc2.10.3p7.tgz 678412
diff --git a/net-irc/irc-server/irc-server-2.10.3_p3.ebuild b/net-irc/irc-server/irc-server-2.10.3_p3.ebuild
index 00a52d948739..8e992d1213b7 100644
--- a/net-irc/irc-server/irc-server-2.10.3_p3.ebuild
+++ b/net-irc/irc-server/irc-server-2.10.3_p3.ebuild
@@ -1,11 +1,13 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.10.3_p3.ebuild,v 1.3 2004/05/29 16:16:27 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.10.3_p3.ebuild,v 1.4 2004/06/08 07:10:19 mkennedy Exp $
+
+MY_PV=irc${PV:0:6}${PV:7:2}
DESCRIPTION="RFC compliant IRC server"
HOMEPAGE="http://www.irc.org"
-SRC_URI="ftp://ftp.irc.org/irc/server/irc2.10.3p3.tgz
- ftp://ftp.funet.fi/pub/unix/irc/server/irc2.10.3p3.tgz"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_PV}.tgz
+ ftp://ftp.funet.fi/pub/unix/irc/server/${MY_PV}.tgz"
LICENSE="GPL-1"
SLOT="0"
@@ -21,7 +23,12 @@ RDEPEND="sys-apps/sed
sys-apps/grep
sys-apps/textutils"
-S=${WORKDIR}/irc2.10.3p3
+S=${WORKDIR}/${MY_PV}
+
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/${PV}-gentoo.patch || die
+}
src_compile () {
@@ -85,7 +92,7 @@ src_compile () {
$myconf || die
cd `support/config.guess`
- emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die
+ emake LDFLAGS=-lm ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die
}
src_install() {
diff --git a/net-irc/irc-server/irc-server-2.10.3_p7.ebuild b/net-irc/irc-server/irc-server-2.10.3_p7.ebuild
new file mode 100644
index 000000000000..ff7bc940bf3d
--- /dev/null
+++ b/net-irc/irc-server/irc-server-2.10.3_p7.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.10.3_p7.ebuild,v 1.1 2004/06/08 07:10:19 mkennedy Exp $
+
+MY_PV=irc${PV:0:6}${PV:7:2}
+
+DESCRIPTION="RFC compliant IRC server"
+HOMEPAGE="http://www.irc.org"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_PV}.tgz
+ ftp://ftp.funet.fi/pub/unix/irc/server/${MY_PV}.tgz"
+LICENSE="GPL-1"
+SLOT="0"
+
+# The only architecture I can test
+KEYWORDS="~x86 ~ppc"
+IUSE="zlib ipv6"
+
+DEPEND="sys-libs/glibc
+ sys-libs/ncurses
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="sys-apps/sed
+ sys-apps/grep
+ sys-apps/textutils"
+
+S=${WORKDIR}/${MY_PV}
+
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/${PV}-gentoo.patch || die
+}
+
+src_compile () {
+
+ IRCUID=`grep ^ircd: /etc/passwd | cut -d : -f 3`
+ IRCGID=`grep ^ircd: /etc/group | cut -d : -f 3`
+ if [ -z "$IRCGID" ]
+ then
+ IRCGID=`grep ^ircd: /etc/passwd | cut -d : -f 4`
+ fi
+
+ if [ -z "$IRCUID" ]
+ then
+ IRCUID=0
+ until [ -z "`cut -d : -f 3 /etc/passwd | grep $IRCUID`" ]
+ do
+ IRCUID=$RANDOM
+ done
+ fi
+
+ if [ -z "$IRCGID" ]
+ then
+ IRCGID=0
+ until [ -z "`cut -d : -f 3 /etc/group | grep $IRCGID`" ]
+ do
+ IRCGID=$RANDOM
+ done
+ fi
+
+ echo -n "$IRCUID" > ${T}/user
+ echo -n "$IRCGID" > ${T}/group
+
+ cd ${S}/support
+ sed \
+ -e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
+ -e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
+ -e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \
+ -e "s/^#undef\tR_LINES$/#define\tR_LINES/" \
+ -e "s/^#undef\tCRYPT_OPER_PASSWORD$/#define\tCRYPT_OPER_PASSWORD/" \
+ -e "s/^#undef\tCRYPT_LINK_PASSWORD$/#define\tCRYPT_LINK_PASSWORD/" \
+ -e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \
+ -e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \
+ -e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \
+ config.h.dist > config.h.dist~
+ mv -f config.h.dist~ config.h.dist
+
+ use zlib && sed -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" config.h.dist > config.h.dist~
+ mv -f config.h.dist~ config.h.dist
+
+ cd ..
+
+ use zlib && myconf="--with-zlib" || myconf="--without-zlib"
+ use ipv6 && myconf="$myconf --with-ip6" || myconf="$myconf --without-ip6"
+
+ ./configure \
+ --prefix=/usr \
+ --host=i686-pc-linux-gnu \
+ '--mandir=${prefix}/share/man' \
+ --sysconfdir=/etc/ircd \
+ --localstatedir=/var/run/ircd \
+ --logdir=/var/log \
+ $myconf || die
+
+ cd `support/config.guess`
+ emake LDFLAGS=-lm ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die
+}
+
+src_install() {
+
+ cd `support/config.guess`
+ make \
+ prefix=${D}/usr \
+ ircd_conf_dir=${D}/etc/ircd \
+ ircd_var_dir=${D}/var/run/ircd \
+ ircd_log_dir=${D}/var/log \
+ install-server install-tkserv || die
+
+ fowners `cat ${T}/user`:`cat ${T}/group` /var/run/ircd
+
+ cd ../doc
+ dodoc *-New alt-irc-faq Authors BUGS ChangeLog Etiquette example.conf \
+ iauth-internals.txt INSTALL.appendix INSTALL.* LICENSE \
+ m4macros README RELEASE* rfc* SERVICE*
+ docinto Juped
+ dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL
+ docinto Juped/US-Admin
+ dodoc Juped/US-Admin/Networking
+ docinto Nets
+ dodoc Nets/IRCNet
+ docinto Nets/Europe
+ dodoc Nets/Europe/*
+
+ exeinto /etc/init.d
+ newexe ${FILESDIR}/ircd.rc ircd
+
+}
+
+pkg_postinst() {
+ groupadd -g `cat ${T}/group` -o ircd
+ useradd -c "IRCd server user" -d /etc/ircd -g `cat ${T}/group` -o -s /bin/false -u `cat ${T}/user` ircd
+}