fix for #23825

9 files changed, 149 insertions, 15 deletions

diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog
index bdb734a49507..02ed11a86bff 100644
--- a/net-irc/unrealircd/ChangeLog
+++ b/net-irc/unrealircd/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for net-irc/unrealircd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.3 2003/03/25 22:47:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.4 2003/07/02 19:26:51 vapier Exp $
+
+*unrealircd-3.1.6 (02 Jul 2003)
+
+  02 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + patches to fix compat with newer glibc #23825.
 
 *unrealircd-3.1.5.1 (31 Jan 2003)
 
+  02 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patches to fix compat with newer glibc #23825.
+
   25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> unrealircd-3.1.5.1.ebuild:
   openssl USE is actually ssl
 
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index add08be227f1..d60ef575e94f 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,6 +1,11 @@
-MD5 9b671a9386b4aad9dfc1cc7a9f7e9b76 ChangeLog 459
-MD5 496c8e30eb06fa3f01803e91022e4095 unrealircd-3.1.5.1.ebuild 1854
 MD5 4aacbe2a257a52f6adf3628142d5fa22 files/digest-unrealircd-3.1.5.1 71
-MD5 5470c8e18506b99b25d63039b6b37f3a files/unrealircd-3.1.5.1-Config.patch 554
 MD5 2faabd524feebdf184243497848c4da9 files/unrealircd.confd 517
 MD5 9f943e90ba2bb847dd48f53153466eb2 files/unrealircd.rc 523
+MD5 5470c8e18506b99b25d63039b6b37f3a files/3.1.5.1-Config.patch 554
+MD5 f394cab9d31907d8982fdcff5a92e729 files/3.1.5.1-new-glibc-res.patch 390
+MD5 5470c8e18506b99b25d63039b6b37f3a files/3.1.6-Config.patch 554
+MD5 29231f1bfc54e22046be6bcf12585d2d files/3.1.6-new-glibc-res.patch 386
+MD5 0e5e4e0c025911074b2673b9a040aa57 files/digest-unrealircd-3.1.6 68
+MD5 cea557d10e093b026cf1f15993ef6ba1 unrealircd-3.1.5.1.ebuild 1939
+MD5 7ca55407412c27d84e7017e2c923455f ChangeLog 710
+MD5 31454723914770a2870116f373e96de8 unrealircd-3.1.6.ebuild 1943
diff --git a/net-irc/unrealircd/files/unrealircd-3.1.5.1-Config.patch b/net-irc/unrealircd/files/3.1.5.1-Config.patch
index 1b4cfce018c6..1b4cfce018c6 100644
--- a/net-irc/unrealircd/files/unrealircd-3.1.5.1-Config.patch
+++ b/net-irc/unrealircd/files/3.1.5.1-Config.patch
diff --git a/net-irc/unrealircd/files/3.1.5.1-new-glibc-res.patch b/net-irc/unrealircd/files/3.1.5.1-new-glibc-res.patch
new file mode 100644
index 000000000000..50f4e105534c
--- /dev/null
+++ b/net-irc/unrealircd/files/3.1.5.1-new-glibc-res.patch
@@ -0,0 +1,11 @@
+--- src/res_mkquery.c.orig	2003-07-02 15:20:31.000000000 -0400
++++ src/res_mkquery.c	2003-07-02 15:20:38.000000000 -0400
+@@ -32,7 +32,7 @@
+ #include "resolv.h"
+ #include "common.h"
+ 
+-ID_CVS("$Id: 3.1.5.1-new-glibc-res.patch,v 1.1 2003/07/02 19:26:51 vapier Exp $");
++//ID_CVS("$Id: 3.1.5.1-new-glibc-res.patch,v 1.1 2003/07/02 19:26:51 vapier Exp $");
+ 
+ /*
+  * Form all types of queries.
diff --git a/net-irc/unrealircd/files/3.1.6-Config.patch b/net-irc/unrealircd/files/3.1.6-Config.patch
new file mode 100644
index 000000000000..1b4cfce018c6
--- /dev/null
+++ b/net-irc/unrealircd/files/3.1.6-Config.patch
@@ -0,0 +1,29 @@
+--- Config.orig	2003-01-31 22:32:22.000000000 -0500
++++ Config	2003-01-31 22:32:54.000000000 -0500
+@@ -21,7 +21,7 @@
+ SETUP=include/setup.h
+ OPTIONS_H=include/settings.h
+ OPTIONS=Settings
+-AUTO_CONFIG=""
++AUTO_CONFIG="-n"
+ #
+ STDLIBH=undef
+ STDDEFH=undef
+@@ -64,7 +64,7 @@
+ #
+ # Some reasonable defaults
+ #
+-DEFOPT="-O -g"
++DEFOPT="GENTOO_CFLAGS"
+ DEFCFLAGS="$DEFOPT"
+ DEFLIBS="none"
+ MKPASSWDLIBS="-lcrypt"
+@@ -73,7 +73,7 @@
+ IRCNET=""
+ NOSPOOF="1"
+ KLINE_ADDRESS=""
+-DPATH="$DIR"
++DPATH="/etc/unrealircd/"
+ SPATH="$DIR/src/ircd"
+ MODE_X=""
+ TRUEHUB=""
diff --git a/net-irc/unrealircd/files/3.1.6-new-glibc-res.patch b/net-irc/unrealircd/files/3.1.6-new-glibc-res.patch
new file mode 100644
index 000000000000..51749adb785c
--- /dev/null
+++ b/net-irc/unrealircd/files/3.1.6-new-glibc-res.patch
@@ -0,0 +1,11 @@
+--- src/res_mkquery.c.orig	2003-07-02 14:33:28.000000000 -0400
++++ src/res_mkquery.c	2003-07-02 14:33:19.000000000 -0400
+@@ -32,7 +32,7 @@
+ #include "resolv.h"
+ #include "common.h"
+ 
+-ID_CVS("$Id: 3.1.6-new-glibc-res.patch,v 1.1 2003/07/02 19:26:51 vapier Exp $");
++//ID_CVS("$Id: 3.1.6-new-glibc-res.patch,v 1.1 2003/07/02 19:26:51 vapier Exp $");
+ 
+ /*
+  * Form all types of queries.
diff --git a/net-irc/unrealircd/files/digest-unrealircd-3.1.6 b/net-irc/unrealircd/files/digest-unrealircd-3.1.6
new file mode 100644
index 000000000000..1686c59f8ba7
--- /dev/null
+++ b/net-irc/unrealircd/files/digest-unrealircd-3.1.6
@@ -0,0 +1 @@
+MD5 2b6043b8c16a61ac2f4c5b04dc68b87d Unreal3.1.6-Noon.tar.gz 693401
diff --git a/net-irc/unrealircd/unrealircd-3.1.5.1.ebuild b/net-irc/unrealircd/unrealircd-3.1.5.1.ebuild
index ee16f757bcd1..3599643b36bc 100644
--- a/net-irc/unrealircd/unrealircd-3.1.5.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.1.5.1.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.1.5.1.ebuild,v 1.3 2003/03/25 22:47:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.1.5.1.ebuild,v 1.4 2003/07/02 19:26:51 vapier Exp $
 
-IUSE="ssl"
-
-MY_P="Unreal${PV}"
-
-S=${WORKDIR}/${MY_P}
+MY_P=Unreal${PV}-Valek
 DESCRIPTION="aimed to be an advanced, not an easy IRCd"
 HOMEPAGE="http://www.unrealircd.com/"
-SRC_URI="http://www.gower.net/unrealircd/${MY_P}-Valek.tar.gz
-	ftp://unreal.secure-tech.net/${MY_P}-Valek.tar.gz"
+SRC_URI="http://www.gower.net/unrealircd/${MY_P}.tar.gz
+	ftp://unreal.secure-tech.net/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 
+S=${WORKDIR}/Unreal${PV}
 
 src_unpack() {
 	unpack ${A} && cd ${S}
 	rm -f .CHANGES.NEW .RELEASE.NOTES
-	epatch ${FILESDIR}/${P}-Config.patch
+	epatch ${FILESDIR}/${PV}-Config.patch
+	epatch ${FILESDIR}/${PV}-new-glibc-res.patch
 
 	cp Config{,.orig}
 	sed -e "s:GENTOO_CFLAGS:${CFLAGS}:" \
@@ -31,7 +30,8 @@ src_unpack() {
 
 src_compile() {
 	./Config || die "configure failed"
-	make || die "compiling failed"
+	make RES="res_init.o res_comp.o res_mkquery.o" \
+		|| die "compiling failed"
 }
 
 src_install() {
diff --git a/net-irc/unrealircd/unrealircd-3.1.6.ebuild b/net-irc/unrealircd/unrealircd-3.1.6.ebuild
new file mode 100644
index 000000000000..828bdb72d00e
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-3.1.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.1.6.ebuild,v 1.1 2003/07/02 19:26:51 vapier Exp $
+
+MY_P=Unreal${PV}-Noon
+DESCRIPTION="aimed to be an advanced (not easy) IRCd"
+HOMEPAGE="http://www.unrealircd.com/"
+SRC_URI="http://www.gower.net/unrealircd/${MY_P}.tar.gz
+	ftp://unreal.secure-tech.net/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	rm -f .CHANGES.NEW .RELEASE.NOTES
+	epatch ${FILESDIR}/${PV}-Config.patch
+	epatch ${FILESDIR}/${PV}-new-glibc-res.patch
+
+	cp Config{,.orig}
+	sed -e "s:GENTOO_CFLAGS:${CFLAGS}:" \
+		Config.orig > Config
+}
+
+src_compile() {
+	./Config || die "configure failed"
+	make RES="res_init.o res_comp.o res_mkquery.o" \
+		|| die "compiling failed"
+}
+
+src_install() {
+	newbin src/ircd unrealircd || die
+	newbin makeconf unrealircd-makeconf || die
+	newbin src/chkconf unrealircd-chkconf || die
+
+	insinto /etc/unrealircd
+	doins badwords.*.conf
+	insinto /etc/unrealircd/networks
+	doins networks/{template.network,unrealircd.conf}
+
+	dodoc doc/* Changes Donation Unreal.nfo dynconf ircdcron/*
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/unrealircd.rc unrealircd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/unrealircd.confd unrealircd
+}
+
+pkg_postinst() {
+	einfo "UnrealIRCD will not run until you do a few things ..."
+	echo
+	einfo "Setup /etc/unrealircd/unrealircd.conf"
+	einfo "      see /etc/unrealircd/template.network for more info"
+	einfo "Setup /etc/unrealircd/ircd.conf"
+	einfo "      see /usr/share/doc/${PF}/example.conf.gz for more info"
+	echo
+	einfo "You can find example cron scripts here:"
+	einfo "   /usr/share/doc/${PF}/ircd.cron"
+	einfo "   /usr/share/doc/${PF}/ircdchk"
+	echo
+	einfo "You can also use /etc/init.d/unrealircd to start at boot"
+	echo
+}