From 5fcad41bf3622439eafb12b693f365b14619a0d3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 4 Jan 2005 03:21:26 +0000 Subject: Incorporate debian patches and fix usage segfault #71690. --- dev-util/indent/ChangeLog | 11 ++- dev-util/indent/files/2.2.9-deb-gentoo.patch | 130 +++++++++++++++++++++++++++ dev-util/indent/files/digest-indent-2.2.9-r1 | 1 - dev-util/indent/files/digest-indent-2.2.9-r2 | 1 + dev-util/indent/indent-2.2.9-r1.ebuild | 36 -------- dev-util/indent/indent-2.2.9-r2.ebuild | 34 +++++++ 6 files changed, 174 insertions(+), 39 deletions(-) create mode 100644 dev-util/indent/files/2.2.9-deb-gentoo.patch delete mode 100644 dev-util/indent/files/digest-indent-2.2.9-r1 create mode 100644 dev-util/indent/files/digest-indent-2.2.9-r2 delete mode 100644 dev-util/indent/indent-2.2.9-r1.ebuild create mode 100644 dev-util/indent/indent-2.2.9-r2.ebuild 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 + +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; indent-2.2.9-r1.ebuild: added gnuconfig to to pick up canonicalize host names in uclibc environments 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 + #include + #include ++#include + + /* 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 \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 + #include ++#include + #include + #include ++#include + + #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 + #include + #include ++#include + + /* 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-r1 deleted file mode 100644 index 06eb94e283db..000000000000 --- a/dev-util/indent/files/digest-indent-2.2.9-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 dcdbb163bef928306dee2a0cfc581c89 indent-2.2.9.tar.gz 678173 diff --git a/dev-util/indent/files/digest-indent-2.2.9-r2 b/dev-util/indent/files/digest-indent-2.2.9-r2 new file mode 100644 index 000000000000..06eb94e283db --- /dev/null +++ b/dev-util/indent/files/digest-indent-2.2.9-r2 @@ -0,0 +1 @@ +MD5 dcdbb163bef928306dee2a0cfc581c89 indent-2.2.9.tar.gz 678173 diff --git a/dev-util/indent/indent-2.2.9-r1.ebuild b/dev-util/indent/indent-2.2.9-r1.ebuild deleted file mode 100644 index e172818a51e5..000000000000 --- a/dev-util/indent/indent-2.2.9-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2004 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 $ - -inherit gnuconfig - -DESCRIPTION="Indent program source files" -HOMEPAGE="http://www.gnu.org/software/indent/indent.html" -SRC_URI="mirror://gnu/indent/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" -IUSE="nls" - -DEPEND="virtual/libc" - -src_unpack() { - unpack ${A} - gnuconfig_update -} - -src_compile() { - econf \ - --disable-dependency-tracking \ - $(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" -} diff --git a/dev-util/indent/indent-2.2.9-r2.ebuild b/dev-util/indent/indent-2.2.9-r2.ebuild new file mode 100644 index 000000000000..31eef4502514 --- /dev/null +++ b/dev-util/indent/indent-2.2.9-r2.ebuild @@ -0,0 +1,34 @@ +# 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-r2.ebuild,v 1.1 2005/01/04 03:21:26 vapier Exp $ + +inherit eutils + +DESCRIPTION="Indent program source files" +HOMEPAGE="http://www.gnu.org/software/indent/indent.html" +SRC_URI="mirror://gnu/indent/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" +IUSE="nls" + +DEPEND="virtual/libc" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PV}-deb-gentoo.patch +} + +src_compile() { + 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 -r "${D}"/usr/doc +} -- cgit v1.2.3-65-gdbad