glibc patch #65344

6 files changed, 34 insertions, 33 deletions

diff --git a/www-servers/tux/ChangeLog b/www-servers/tux/ChangeLog
index 8019ad2ad002..363ca790c9c6 100644
--- a/www-servers/tux/ChangeLog
+++ b/www-servers/tux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tux
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tux/ChangeLog,v 1.5 2004/09/05 09:52:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tux/ChangeLog,v 1.6 2004/09/26 06:28:19 vapier Exp $
+
+*tux-3.2.16-r1 (26 Sep 2004)
+
+  26 Sep 2004; Mike Frysinger <vapier@gentoo.org> +files/3.2.16-glibc.patch,
+  +tux-3.2.16-r1.ebuild:
+  Add patch to work with newer glibcs #65344 by Canal Vorfeed.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> tux-2.2.7.ebuild:
   Fixed ChangeLog header. Added missing IUSE.
diff --git a/www-servers/tux/files/3.2.16-glibc.patch b/www-servers/tux/files/3.2.16-glibc.patch
new file mode 100644
index 000000000000..ad9d31a405fd
--- /dev/null
+++ b/www-servers/tux/files/3.2.16-glibc.patch
@@ -0,0 +1,23 @@
+diff -uNr tux-3.2.14/tuxstat.c tux-3.2.14-tuxstatfix/tuxstat.c
+--- tux-3.2.14/tuxstat.c	2001-12-02 14:53:26 +0300
++++ tux-3.2.14-tuxstatfix/tuxstat.c	2004-05-16 21:54:20 +0400
+@@ -65,6 +65,7 @@
+ 	if (len != BLOCK)
+ 		return -1;
+ 	tmp = buf;
++	file_len=0;
+ 	sscanf(tmp, "%i %08x %i %s %s %s %i %i %d:%d.%d.%d.%d:%d %i %i%n", &proto, &req, &atom_idx, atom0, atom1, state_bits, &error, &status, &d1, &d2,&d3,&d4,&d5, &d6, &file_len, &file_pos,&parsed_chars);
+ 	tmp += parsed_chars;
+ 	if (proto == 1) {
+@@ -73,9 +74,11 @@
+ 	}
+ 	sscanf(tmp, "%08x/%08x %08x/%08x %n", &sock_ptr, &sk_ptr, &data_sock_ptr, &data_sk_ptr, &parsed_chars);
+ 	tmp += parsed_chars;
++	header_len=0;
+ 	sscanf(tmp, "%i\n%i%n", &parsed_len, &header_len, &parsed_chars);
+ 	tmp += parsed_chars;
+ 	tmp += header_len;
++	objectname_len=0;
+ 	sscanf(tmp, "%i\n%n", &objectname_len, &parsed_chars);
+ 	tmp += parsed_chars;
+ 	if (objectname_len) {
diff --git a/www-servers/tux/files/digest-tux-2.2.7 b/www-servers/tux/files/digest-tux-2.2.7
deleted file mode 100644
index 9d9b100f83ee..000000000000
--- a/www-servers/tux/files/digest-tux-2.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 275eb94b7fa7b0c0b2ce7dbdfe760b2b tux-2.2.7.tar.gz 60407
diff --git a/www-servers/tux/files/digest-tux-3.2.16 b/www-servers/tux/files/digest-tux-3.2.16-r1
index e9b2d30fb1a0..e9b2d30fb1a0 100644
--- a/www-servers/tux/files/digest-tux-3.2.16
+++ b/www-servers/tux/files/digest-tux-3.2.16-r1
diff --git a/www-servers/tux/tux-2.2.7.ebuild b/www-servers/tux/tux-2.2.7.ebuild
deleted file mode 100644
index 359e688931c7..000000000000
--- a/www-servers/tux/tux-2.2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tux/tux-2.2.7.ebuild,v 1.2 2004/09/05 09:52:51 swegener Exp $
-
-DESCRIPTION="kernel level httpd"
-HOMEPAGE="http://people.redhat.com/mingo/TUX-patches/"
-SRC_URI="http://people.redhat.com/mingo/TUX-patches/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="dev-libs/glib
-	dev-libs/popt"
-
-src_compile() {
-	emake tux tux2w3c tuxstat TMPDIR=${T} || die
-}
-
-src_install() {
-	make install TOPDIR=${D} || die
-	rm -rf ${D}/etc/{rc.d,sysconfig} ${D}/var/tux
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tux.init.d tux
-	insinto /etc/conf.d ; newins ${FILESDIR}/tux.conf.d tux
-
-	dodoc NEWS SUCCESS tux.README docs/*.txt
-	docinto samples
-	dodoc samples/* demo*.c
-}
diff --git a/www-servers/tux/tux-3.2.16.ebuild b/www-servers/tux/tux-3.2.16-r1.ebuild
index 7f90a807f642..061e9e67e7af 100644
--- a/www-servers/tux/tux-3.2.16.ebuild
+++ b/www-servers/tux/tux-3.2.16-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tux/tux-3.2.16.ebuild,v 1.4 2004/09/03 15:58:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tux/tux-3.2.16-r1.ebuild,v 1.1 2004/09/26 06:28:19 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="kernel level httpd"
 HOMEPAGE="http://people.redhat.com/mingo/TUX-patches/"
@@ -22,6 +24,7 @@ src_unpack() {
 	sed -i "s:-g -fomit-frame-pointer -O2:${CFLAGS}:" Makefile
 	use doc || echo "all:" > docs/Makefile
 	epatch ${FILESDIR}/${PV}-gcc34.patch
+	epatch ${FILESDIR}/${PV}-glibc.patch
 }
 
 src_compile() {