Version bump.
authorSven Wegener <swegener@gentoo.org>
Fri, 2 Sep 2005 15:10:50 +0000 (15:10 +0000)
committerSven Wegener <swegener@gentoo.org>
Fri, 2 Sep 2005 15:10:50 +0000 (15:10 +0000)
Package-Manager: portage-2.0.51.22-r2

net-irc/irc-server/ChangeLog
net-irc/irc-server/Manifest
net-irc/irc-server/files/2.10.3_p3-gentoo.patch
net-irc/irc-server/files/2.10.3_p7-gentoo.patch [deleted file]
net-irc/irc-server/files/digest-irc-server-2.10.3_p7 [deleted file]
net-irc/irc-server/files/digest-irc-server-2.11.1_p1 [new file with mode: 0644]
net-irc/irc-server/files/ircd.rc
net-irc/irc-server/irc-server-2.10.3_p3.ebuild
net-irc/irc-server/irc-server-2.10.3_p7.ebuild [deleted file]
net-irc/irc-server/irc-server-2.11.1_p1.ebuild [new file with mode: 0644]

index 4eb5efcd4118a593badd2257e59d3c015d153416..23d582db98b2a81539f4de48cb1cc8bf182a6724 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/irc-server
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.9 2005/04/24 13:12:22 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.10 2005/09/02 15:10:50 swegener Exp $
+
+*irc-server-2.11.1_p1 (02 Sep 2005)
+
+  02 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  -files/2.10.3_p7-gentoo.patch, files/2.10.3_p3-gentoo.patch,
+  files/ircd.rc, irc-server-2.10.3_p3.ebuild, -irc-server-2.10.3_p7.ebuild,
+  +irc-server-2.11.1_p1.ebuild:
+  Version bump.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   irc-server-2.10.3_p3.ebuild:
index ba62d700da474254b7e953af0de64c9d958d8a82..e982055f5431985c12f00090e34b4d7845cf5d01 100644 (file)
@@ -1,9 +1,18 @@
-MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 ef0775b87776a4ceb9c9eeb39d3a33ac ChangeLog 1426
-MD5 85a5244eb18f2b0c3b26f984d1be9dcc irc-server-2.10.3_p7.ebuild 3270
-MD5 0b29cee574f31c31d582e0da4b7c4e1b irc-server-2.10.3_p3.ebuild 3262
-MD5 9cf7fef6a4fd391acb5afcfca3eafafa files/ircd.rc 476
-MD5 bd546d99fc8df46459b15f3b0efc5d3b files/2.10.3_p7-gentoo.patch 521
-MD5 04e939ae7f9a5e836ed87d73fab65d98 files/digest-irc-server-2.10.3_p7 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 726af43dc5bea80777797a7e608571e4 ChangeLog 1704
+MD5 d8e0fcddf6464c4c642ba71a17a38a63 files/2.10.3_p3-gentoo.patch 475
 MD5 11c6c72ebc4796aa655378f37a51cfa6 files/digest-irc-server-2.10.3_p3 60
-MD5 684a6ea4f6ae110ac662766916e8cb50 files/2.10.3_p3-gentoo.patch 521
+MD5 1a0f39bf6f7f28f39ae4100a87ab5214 files/digest-irc-server-2.11.1_p1 60
+MD5 673a6626002a9bbdfc068c055f6a1adb files/ircd.rc 476
+MD5 b5b8033ea9f6fd0085c6537bffe0792e irc-server-2.10.3_p3.ebuild 2541
+MD5 7855e995cde3c8ebeace1a8679415286 irc-server-2.11.1_p1.ebuild 2514
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGGuPI1lqEGTUzyQRApJcAJ9AIHBs1T9PEBJVmQd9gCC1BsUfRwCguETi
+hWaHOW6gAP8Mg8YMByFZ9ks=
+=xonv
+-----END PGP SIGNATURE-----
index f5f18b09e1bed81ed4eaebf2cb6a63d2de3e5d3d..36f558a70470a9401a3864ee0487987db3b1c8e4 100644 (file)
@@ -9,4 +9,3 @@ diff -ur irc2.10.3p3.orig/contrib/tkserv/tkserv.c irc2.10.3p3/contrib/tkserv/tks
      }
  
      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
deleted file mode 100644 (file)
index 42ad3b8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644 (file)
index 8b2d20b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47fbf2856fa058686dfaa5f446154296 irc2.10.3p7.tgz 678412
diff --git a/net-irc/irc-server/files/digest-irc-server-2.11.1_p1 b/net-irc/irc-server/files/digest-irc-server-2.11.1_p1
new file mode 100644 (file)
index 0000000..dd328ba
--- /dev/null
@@ -0,0 +1 @@
+MD5 c5a2b3097a5fbeb91b39412730b02ab5 irc2.11.1p1.tgz 770458
index a96e4d2ed1a79f6aa4c3dac4c97d363261507cc5..0ed3fbc920666df7810ed26c74d9c61616a29747 100644 (file)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/irc-server/files/ircd.rc,v 1.3 2004/10/09 20:37:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/files/ircd.rc,v 1.4 2005/09/02 15:10:50 swegener Exp $
 
 depend() {
        use net
index 0d9528cfb5d439b54b1c13fca1711d9b65378aff..feb9dd45b5b1ec191b1d7546f17e1f24d25b3605 100644 (file)
@@ -1,22 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # 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.9 2005/04/24 13:12:22 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.10.3_p3.ebuild,v 1.10 2005/09/02 15:10:50 swegener Exp $
 
-inherit eutils
+inherit eutils versionator flag-o-matic
 
 MY_P=irc${PV/_/}
 
 DESCRIPTION="RFC compliant IRC server"
 HOMEPAGE="http://www.irc.org/"
-SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
+       ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
 IUSE="zlib ipv6"
 
-RDEPEND="virtual/libc
-       sys-libs/ncurses
+RDEPEND="sys-libs/ncurses
        zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
        sys-apps/sed
@@ -24,42 +24,22 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+       enewgroup ircd
+       enewuser ircd -1 -1 -1 ircd
+}
+
 src_unpack() {
        unpack ${A}
-       epatch ${FILESDIR}/${PV}-gentoo.patch || die
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${PV}-gentoo.patch
 }
 
-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 \
+src_compile () {
+       append-ldflags -lm
+
+       sed -i \
                -e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
                -e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
                -e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \
@@ -69,59 +49,54 @@ src_compile() {
                -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
+               "${S}"/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
+       use zlib && sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" ${S}/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' \
+       econf \
                --sysconfdir=/etc/ircd \
                --localstatedir=/var/run/ircd \
                --logdir=/var/log \
-               $myconf || die
+               --mandir='${prefix}/share/man' \
+               $(use_with zlib) \
+               $(use_with ipv6 ip6) \
+               || die "econf failed"
 
-       cd `support/config.guess`
-       emake LDFLAGS=-lm ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die
+       cd $(support/config.guess)
+       emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die "emake failed"
 }
 
 src_install() {
-       cd `support/config.guess`
+       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
+               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 "make install failed"
 
-       fowners `cat ${T}/user`:`cat ${T}/group` /var/run/ircd
+       fowners ircd:ircd /var/run/ircd
 
        cd ../doc
-       dodoc *-New alt-irc-faq Authors BUGS ChangeLog Etiquette example.conf \
+       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
+       newinitd "${FILESDIR}"/ircd.rc ircd
 }
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
deleted file mode 100644 (file)
index 52b726b..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.5 2004/07/12 23:04:08 swegener Exp $
-
-inherit eutils
-
-MY_P=irc${PV/_/}
-
-DESCRIPTION="RFC compliant IRC server"
-HOMEPAGE="http://www.irc.org/"
-SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="zlib ipv6"
-
-RDEPEND="virtual/libc
-       sys-libs/ncurses
-       zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-       sys-apps/sed
-       sys-apps/grep"
-
-S=${WORKDIR}/${MY_P}
-
-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
-}
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1.ebuild
new file mode 100644 (file)
index 0000000..5ebb0fd
--- /dev/null
@@ -0,0 +1,101 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.11.1_p1.ebuild,v 1.1 2005/09/02 15:10:50 swegener Exp $
+
+inherit eutils versionator flag-o-matic
+
+MY_P=irc${PV/_/}
+
+DESCRIPTION="RFC compliant IRC server"
+HOMEPAGE="http://www.irc.org/"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
+       ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="zlib ipv6"
+
+RDEPEND="sys-libs/ncurses
+       zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+       sys-apps/sed
+       sys-apps/grep"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       enewgroup ircd
+       enewuser ircd -1 -1 -1 ircd
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/2.10.3_p3-gentoo.patch
+}
+
+src_compile () {
+       append-ldflags -lm
+
+       sed -i \
+               -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/" \
+               "${S}"/config.h.dist
+
+       use zlib && sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" ${S}/config.h.dist
+
+       econf \
+               --sysconfdir=/etc/ircd \
+               --localstatedir=/var/run/ircd \
+               --mandir='${prefix}/share/man' \
+               $(use_with zlib) \
+               $(use_with ipv6 ip6) \
+               || die "econf failed"
+
+       cd $(support/config.guess)
+       emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv || die "emake failed"
+}
+
+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 "make install failed"
+
+       fowners ircd:ircd /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/*
+
+       newinitd "${FILESDIR}"/ircd.rc ircd
+}