Incorporate debian patches and fix usage segfault #71690.

5 files changed, 161 insertions, 15 deletions

diff --git a/dev-util/indent/ChangeLog b/dev-util/indent/ChangeLog
index fb6e3f4dc18e..231d0c482dd3 100644
--- a/dev-util/indent/ChangeLog
+++ b/dev-util/indent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/indent
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.20 2004/09/26 21:08:38 solar Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/ChangeLog,v 1.21 2005/01/04 03:21:26 vapier Exp $
+
+*indent-2.2.9-r2 (03 Jan 2005)
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.2.9-deb-gentoo.patch, -indent-2.2.9-r1.ebuild,
+  +indent-2.2.9-r2.ebuild:
+  Incorporate debian patches and fix usage segfault #71690.
 
   26 Sep 2004; <solar@gentoo.org> indent-2.2.9-r1.ebuild:
   added gnuconfig to to pick up canonicalize host names in uclibc environments
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index d6173fda5d71..306b820ed8ce 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,3 +1,14 @@
-MD5 67d108312af773ed221610b349b39ffe ChangeLog 2576
-MD5 e5cd89626e2df76b3e90b458946dc2d1 indent-2.2.9-r1.ebuild 840
-MD5 0301409622291766d3a875aebcfed9b5 files/digest-indent-2.2.9-r1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ca76268e7eb064d9d090a071a66307e7 ChangeLog 2805
+MD5 8d2247ced3cfef0042042187da7dbe6a indent-2.2.9-r2.ebuild 832
+MD5 b75866afae311e7ce3bfe6de9062e310 files/2.2.9-deb-gentoo.patch 3128
+MD5 0301409622291766d3a875aebcfed9b5 files/digest-indent-2.2.9-r2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD4DBQFB2gvOroRuSHgZdywRApT6AJdA3qhvBeb9575hvYlpj5+SyXH8AJ4qWr0Q
+5Fr67Z+tJZlk5LTvFO8zww==
+=mGmi
+-----END PGP SIGNATURE-----
diff --git a/dev-util/indent/files/2.2.9-deb-gentoo.patch b/dev-util/indent/files/2.2.9-deb-gentoo.patch
new file mode 100644
index 000000000000..fb5eb46eb1b4
--- /dev/null
+++ b/dev-util/indent/files/2.2.9-deb-gentoo.patch
@@ -0,0 +1,130 @@
+This patch is mostly from the debian indent_2.2.9-6.diff.
+
+Also added a patch to check usage of `texinfo2man`.
+http://bugs.gentoo.org/show_bug.cgi?id=71690
+
+--- indent-2.2.9.orig/man/texinfo2man.c
++++ indent-2.2.9/man/texinfo2man.c
+@@ -2,6 +2,7 @@
+ #include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ /* texinfo2man.
+  * Convert a texinfo document to man format.
+@@ -162,7 +163,7 @@
+ 
+ static char value_updated[64], value_edition[64], value_version[64];
+ 
+-process_texi (FILE * in)
++void process_texi (FILE * in)
+ {
+   char buf[1024];
+   int in_block = 0;
+@@ -252,6 +254,12 @@
+     char buf[1024];
+     int line_no = 0;
+ 
++	if (argc != 3) {
++		fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++		fprintf(stderr, "  The man page will be written to stdout.\n");
++		return -1;
++	}
++
+     texinfoname = argv[2];
+ 
+     in = fopen (argv[2], "r");
+--- indent-2.2.9.orig/src/output.c
++++ indent-2.2.9/src/output.c
+@@ -13,8 +13,10 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <time.h>
+ #include <utime.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
+ 
+ #include "indent.h"
+ #include "sys.h"
+@@ -1206,7 +1208,7 @@
+     }
+ }
+ 
+-extern inhibit_indenting(
++extern void inhibit_indenting(
+     BOOLEAN flag)
+ {
+     inhibited = flag;
+--- indent-2.2.9.orig/src/indent.h
++++ indent-2.2.9/src/indent.h
+@@ -96,8 +96,6 @@
+ /* Size of the input program, not including the ' \n\0' we add at the end */
+ extern unsigned long in_prog_size;
+ 
+-/* The output file. */
+-extern FILE *output;
+ 
+ 
+ 
+--- indent-2.2.9.orig/src/indent.c
++++ indent-2.2.9/src/indent.c
+@@ -875,6 +875,7 @@
+                                                  * imply we are in a stmt */
+         for (t_ptr = s_code; *t_ptr; ++t_ptr)
+         {
++            check_lab_size();
+             *e_lab++ = *t_ptr;  /* turn everything so far into a label */
+         }
+                 
+@@ -3062,8 +3063,8 @@
+     BOOLEAN using_stdin = false;
+     exit_values_ty exit_status;
+ 
+-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+-    setlocale (LC_MESSAGES, "");
++#if defined (HAVE_SETLOCALE)
++    setlocale (LC_ALL, "");
+ #endif
+     bindtextdomain (PACKAGE, LOCALEDIR);
+     textdomain (PACKAGE);
+--- indent-2.2.9.orig/src/comments.c
++++ indent-2.2.9/src/comments.c
+@@ -20,6 +20,7 @@
+ #include "comments.h"
+ #include "globs.h"
+ #include "parse.h"
++#include "output.h"
+ 
+ RCSTAG_CC ("$Id: 2.2.9-deb-gentoo.patch,v 1.1 2005/01/04 03:21:26 vapier Exp $");
+ 
+--- indent-2.2.9.orig/src/output.h
++++ indent-2.2.9/src/output.h
+@@ -47,7 +47,7 @@
+     struct stat * file_stats,
+      const char  * filename);
+ 
+-extern inhibit_indenting(
++extern void inhibit_indenting(
+     BOOLEAN flag);
+ 
+ 
+--- texinfo2man.c.orig	2002-01-17 14:28:51.000000000 -0500
++++ texinfo2man.c	2005-01-03 22:16:21.510887200 -0500
+@@ -2,6 +2,7 @@
+ #include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ /* texinfo2man.
+  * Convert a texinfo document to man format.
+@@ -162,6 +163,7 @@
+ 
+ static char value_updated[64], value_edition[64], value_version[64];
+ 
++void
+ process_texi (FILE * in)
+ {
+   char buf[1024];
diff --git a/dev-util/indent/files/digest-indent-2.2.9-r1 b/dev-util/indent/files/digest-indent-2.2.9-r2
index 06eb94e283db..06eb94e283db 100644
--- a/dev-util/indent/files/digest-indent-2.2.9-r1
+++ b/dev-util/indent/files/digest-indent-2.2.9-r2
diff --git a/dev-util/indent/indent-2.2.9-r1.ebuild b/dev-util/indent/indent-2.2.9-r2.ebuild
index e172818a51e5..31eef4502514 100644
--- a/dev-util/indent/indent-2.2.9-r1.ebuild
+++ b/dev-util/indent/indent-2.2.9-r2.ebuild
@@ -1,8 +1,8 @@
-# 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/dev-util/indent/indent-2.2.9-r1.ebuild,v 1.4 2004/10/27 16:26:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/indent/indent-2.2.9-r2.ebuild,v 1.1 2005/01/04 03:21:26 vapier Exp $
 
-inherit gnuconfig
+inherit eutils
 
 DESCRIPTION="Indent program source files"
 HOMEPAGE="http://www.gnu.org/software/indent/indent.html"
@@ -17,20 +17,18 @@ DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	gnuconfig_update
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-deb-gentoo.patch
 }
 
 src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		|| die
+	econf $(use_enable nls) || die
 	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS NEWS README*
-	dohtml "${D}/usr/doc/indent/"*
-	rm -rf "${D}/usr/doc"
+	dohtml "${D}"/usr/doc/indent/*
+	rm -r "${D}"/usr/doc
 }