[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/

[Lars Wendler]

commit:     56f4cf1b65b83ac2e625b7c4a7f058bfe05a42b0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May  8 11:28:53 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May  8 11:29:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f4cf1b

sys-apps/diffutils: Removed old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/diffutils/Manifest                        |   1 -
 sys-apps/diffutils/diffutils-3.4-r1.ebuild         |  49 --------
 .../files/diffutils-3.4-diff3_fix_leaks.patch      | 123 ---------------------
 .../files/diffutils-3.4-diff3_use_after_free.patch |  26 -----
 .../diffutils-3.4-no_color_on_dumb_terms.patch     |  49 --------
 5 files changed, 248 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 92e1c60bba5..6a6a1963700 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,2 @@
 DIST diffutils-3.3.tar.xz 1197832 SHA256 a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83 WHIRLPOOL 8fd3b179afdc3fd127cee8829535b0fc6d949443645e8df80fa45c2fa44a732ea652259b644d81a9be14d4c7f7c3b5bad7b8861934a6bc691cd02a34c0200ed3
-DIST diffutils-3.4.tar.xz 1358392 SHA256 db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 SHA512 0fc273007e35e67e217116e776956c6a24421f298d3e6fe60aa1d4250938a65bb8e685cd815517317b5637f5c412c1550d7c1994a9e0283ebbcae9bde24a260d WHIRLPOOL cd9460385d618b169b343e5f197937a4abfbf3d64076c609a0cde78372d08225fc2078fa7c028a80963f08f3eadfc2ee8074b03b83730745842da44f7483113f
 DIST diffutils-3.5.tar.xz 1360996 SHA256 dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b WHIRLPOOL 2f367fc10679bfc1377612bfdc693792f5afdc0969c06d7607370bb626d8eb63868b71d2342133fea6210291f34ad3f53b4af34d457a13fc675fc7dc5f6c2f6e

diff --git a/sys-apps/diffutils/diffutils-3.4-r1.ebuild b/sys-apps/diffutils/diffutils-3.4-r1.ebuild
deleted file mode 100644
index 339b0e97416..00000000000
--- a/sys-apps/diffutils/diffutils-3.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-no_color_on_dumb_terms.patch"
-	"${FILESDIR}/${P}-diff3_use_after_free.patch"
-	"${FILESDIR}/${P}-diff3_fix_leaks.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		$(use_enable nls)
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}

diff --git a/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch b/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch
deleted file mode 100644
index fda8319c73c..00000000000
--- a/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From edd942ca27d570a33d612b12eecaa33a76640e46 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××.com>
-Date: Fri, 12 Aug 2016 21:40:29 -0700
-Subject: diff3: fix leaks, for real
-
-* src/diff3.c (struct diff_block)[lint]: Add member, n2.
-(free_diff_block, next_to_n2): New functions.
----
-
-diff --git a/src/diff3.c b/src/diff3.c
-index 0eb643e..b80aeb3 100644
---- a/src/diff3.c
-+++ b/src/diff3.c
-@@ -78,6 +78,9 @@ struct diff_block {
-   char **lines[2];		/* The actual lines (may contain nulls) */
-   size_t *lengths[2];		/* Line lengths (including newlines, if any) */
-   struct diff_block *next;
-+#ifdef lint
-+  struct diff_block *n2;	/* Used only when freeing.  */
-+#endif
- };
- 
- /* Three way diff */
-@@ -176,7 +179,7 @@ static struct diff3_block *create_diff3_block (lin, lin, lin, lin, lin, lin);
- static struct diff3_block *make_3way_diff (struct diff_block *, struct diff_block *);
- static struct diff3_block *reverse_diff3_blocklist (struct diff3_block *);
- static struct diff3_block *using_to_diff3_block (struct diff_block *[2], struct diff_block *[2], int, int, struct diff3_block const *);
--static struct diff_block *process_diff (char const *, char const *, struct diff_block **);
-+static struct diff_block *process_diff (char const *, char const *, struct diff_block **, char **);
- static void check_stdout (void);
- static void fatal (char const *) __attribute__((noreturn));
- static void output_diff3 (FILE *, struct diff3_block *, int const[3], int const[3]);
-@@ -212,6 +215,38 @@ static struct option const longopts[] =
-   {0, 0, 0, 0}
- };
- 
-+static void
-+free_diff_block (struct diff_block *p)
-+{
-+#ifndef lint
-+  (void)p;
-+#else
-+  while (p)
-+    {
-+      free (p->lines[0]);
-+      free (p->lines[1]);
-+      free (p->lengths[0]);
-+      free (p->lengths[1]);
-+      struct diff_block *next = p->n2;
-+      free (p);
-+      p = next;
-+    }
-+#endif
-+}
-+
-+/* Copy each next pointer to n2, since make_3way_diff would clobber the former,
-+   yet we will still need something to free these buffers.  */
-+static void
-+next_to_n2 (struct diff_block *p)
-+{
-+#ifndef lint
-+  (void)p;
-+#else
-+  while (p)
-+    p = p->n2 = p->next;
-+#endif
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -377,10 +412,19 @@ main (int argc, char **argv)
-   /* Invoke diff twice on two pairs of input files, combine the two
-      diffs, and output them.  */
- 
-+  char *b0, *b1;
-   commonname = file[rev_mapping[FILEC]];
--  thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block);
--  thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block);
-+  thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block, &b1);
-+  thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block, &b0);
-+
-+  next_to_n2 (thread0);
-+  next_to_n2 (thread1);
-+
-   diff3 = make_3way_diff (thread0, thread1);
-+
-+  free_diff_block (thread0);
-+  free_diff_block (thread1);
-+
-   if (edscript)
-     conflicts_found
-       = output_diff3_edscript (stdout, diff3, mapping, rev_mapping,
-@@ -400,6 +444,8 @@ main (int argc, char **argv)
-       conflicts_found = false;
-     }
- 
-+  free (b0);
-+  free (b1);
-   check_stdout ();
-   exit (conflicts_found);
- }
-@@ -938,7 +984,8 @@ compare_line_list (char * const list1[], size_t const lengths1[],
- static struct diff_block *
- process_diff (char const *filea,
- 	      char const *fileb,
--	      struct diff_block **last_block)
-+	      struct diff_block **last_block,
-+	      char **buf_to_free)
- {
-   char *diff_contents;
-   char *diff_limit;
-@@ -953,6 +1000,7 @@ process_diff (char const *filea,
- 				  sizeof *bptr->lengths[1]));
- 
-   diff_limit = read_diff (filea, fileb, &diff_contents);
-+  *buf_to_free = diff_contents;
-   scan_diff = diff_contents;
- 
-   while (scan_diff < diff_limit)
--- 
-cgit v1.0
-

diff --git a/sys-apps/diffutils/files/diffutils-3.4-diff3_use_after_free.patch b/sys-apps/diffutils/files/diffutils-3.4-diff3_use_after_free.patch
deleted file mode 100644
index 41a4b278d08..00000000000
--- a/sys-apps/diffutils/files/diffutils-3.4-diff3_use_after_free.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1a0df4396ebe3b9a58b882bb976cfce3f50d3cac Mon Sep 17 00:00:00 2001
-From: Bastian Beischer <bastian.beischer@×××××××××××.de>
-Date: Sat, 13 Aug 2016 18:53:36 -0700
-Subject: diff3: fix heap use-after-free; add minimal diff3 test coverage
-
-Commit v3.3-42-g3b74a90, "FIXME: src/diff3: plug a leak" added an
-invalid use of free, leading to use-after-free in nearly any invocation
-of diff3.  Revert that commit.
-Reported by Bastian Beischer in http://bugs.gnu.org/24210
----
-
-diff --git a/src/diff3.c b/src/diff3.c
-index 6ef90f4..0eb643e 100644
---- a/src/diff3.c
-+++ b/src/diff3.c
-@@ -1039,7 +1039,6 @@ process_diff (char const *filea,
- 
-   *block_list_end = NULL;
-   *last_block = bptr;
--  free (diff_contents);
-   return block_list;
- }
- 
---
-cgit v1.0
-

diff --git a/sys-apps/diffutils/files/diffutils-3.4-no_color_on_dumb_terms.patch b/sys-apps/diffutils/files/diffutils-3.4-no_color_on_dumb_terms.patch
deleted file mode 100644
index 33f81e4fa2a..00000000000
--- a/sys-apps/diffutils/files/diffutils-3.4-no_color_on_dumb_terms.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 697c1f4fa93ac971c487725e9e53fc211cd3c670 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@××.com>
-Date: Mon, 8 Aug 2016 18:50:15 -0700
-Subject: diff: disable colorization for TERM=dumb
-
-* src/diff.c (main): With --color or --color=auto, when TERM is
-"dumb", disable colorization.  Suggested by Daniel Colascione.
-* NEWS (Bug fixes): Mention it.
-* tests/colors: Add a test that would fail without this change,
-yet passes with it.
----
-
-diff --git a/src/diff.c b/src/diff.c
-index 9bc1d96..686945e 100644
---- a/src/diff.c
-+++ b/src/diff.c
-@@ -656,6 +656,13 @@ main (int argc, char **argv)
-       prev = c;
-     }
- 
-+  if (colors_style == AUTO)
-+    {
-+      char const *t = getenv ("TERM");
-+      if (t && STREQ (t, "dumb"))
-+        colors_style = NEVER;
-+    }
-+
-   if (output_style == OUTPUT_UNSPECIFIED)
-     {
-       if (show_c_function)
-diff --git a/tests/colors b/tests/colors
-index 3ad2206..8651a5b 100755
---- a/tests/colors
-+++ b/tests/colors
-@@ -86,6 +86,11 @@ test $? = 1 || fail=1
- gen_exp_default > exp || framework_failure_
- compare exp out || fail=1
- 
-+TERM=dumb diff ---presume-output-tty --color=auto a b > out
-+test $? = 1 || fail=1
-+gen_exp_default > exp || framework_failure_
-+compare exp out || fail=1
-+
- diff --color=never a b > out
- test $? = 1 || fail=1
- gen_exp_default > exp || framework_failure_
--- 
-cgit v1.0
-