public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/
@ 2017-05-08 11:29 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2017-05-08 11:29 UTC (permalink / raw
  To: gentoo-commits

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@fb.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@rwth-aachen.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@fb.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
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/
@ 2017-05-08 11:29 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2017-05-08 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6777c2a8d02373238566c8268c3d3acc5904837b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May  8 11:28:01 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May  8 11:29:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6777c2a8

sys-apps/diffutils: Added gcc-7 build fix (bug #617538).

Thanks to lekto for providing a patch in GH PR #4553.

Closes: https://github.com/gentoo/gentoo/pull/4553
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/diffutils/diffutils-3.5.ebuild               | 18 ++++++++++++++----
 .../diffutils/files/diffutils-3.5-fix_macros.patch    | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index da215965bb0..426af27f7e9 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -20,17 +20,27 @@ DEPEND="app-arch/xz-utils
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix_macros.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/" \
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
 		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {

diff --git a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
new file mode 100644
index 00000000000..ae820fc372c
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
@@ -0,0 +1,19 @@
+http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/intprops.h?id=175b4e22f99e00996b72f822f5ae54dca8243d19
+
+--- diffutils-3.5/lib/intprops.h
++++ diffutils-3.5/lib/intprops.h
+@@ -230,11 +230,11 @@
+    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+    that the result (e.g., A + B) has that type.  */
+ #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
++# define _GL_ADD_OVERFLOW(a, b, min, max) \
+    __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
+    __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
+    __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)                                \


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/
@ 2022-04-26  4:03 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-04-26  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3a193fa7dd4c98a4004a87aac61ce46414efa237
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 02:57:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 04:03:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a193fa7

sys-apps/diffutils: avoid invoking autoconf

Normally we'd just eautoreconf, but this is base-system and we cannot
depend on autoconf, so we have to patch the generated files ourselves.
This can go away once the loong fix patch is no longer necessary.

Fixes: 1bff2846eaa ("sys-apps/diffutils: fix build on loong")
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild        | 10 ++++++++++
 sys-apps/diffutils/files/loong-fix-build.patch | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
index 53a9433ee899..fe16ee36331a 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -28,6 +28,16 @@ PATCHES=(
 	"${FILESDIR}/loong-fix-build.patch"
 )
 
+src_prepare() {
+	default
+
+	# touch generated files after patching m4, to avoid activating maintainer
+	# mode
+	# remove when loong-fix-build.patch is no longer necessary
+	touch ./aclocal.m4 lib/config.hin ./configure || die
+	find . -name Makefile.in -exec touch {} + || die
+}
+
 src_configure() {
 	use static && append-ldflags -static
 

diff --git a/sys-apps/diffutils/files/loong-fix-build.patch b/sys-apps/diffutils/files/loong-fix-build.patch
index cd06fa8df5e4..2b16b47b7ee7 100644
--- a/sys-apps/diffutils/files/loong-fix-build.patch
+++ b/sys-apps/diffutils/files/loong-fix-build.patch
@@ -1,16 +1,10 @@
-From 34add045fd2ec3f1031dee961c4d9cc4285486a7 Mon Sep 17 00:00:00 2001
+[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with change to generated file added as well.]
 From: Sun Haiyong <youbest@sina.com>
 Date: Tue, 31 Aug 2021 11:11:52 +0800
 Subject: [PATCH] stack-direction: Add support for loongarch CPU
 
 * m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
 set "sv_cv_stack_direction" to "-1" .
----
- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 93287254b..e6c3284ce 100644
 --- a/m4/stack-direction.m4
 +++ b/m4/stack-direction.m4
 @@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
@@ -21,6 +15,16 @@ index 93287254b..e6c3284ce 100644
        m32r | \
        m68* | \
        m88k | \
+--- a/configure
++++ b/configure
+@@ -34088,6 +34088,7 @@ else $as_nop
+       i?86 | x86_64 | \
+       i860 | \
+       ia64 | \
++      loongarch* | \
+       m32r | \
+       m68* | \
+       m88k | \
 -- 
 2.17.2
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/
@ 2023-12-28  4:04 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-12-28  4:04 UTC (permalink / raw
  To: gentoo-commits

commit:     fc55f9cb332fe733d08aebd431e8bbb88763b48b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 04:02:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 04:02:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc55f9cb

sys-apps/diffutils: drop 3.8, 3.9, 3.9-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/diffutils/Manifest                        |  4 --
 sys-apps/diffutils/diffutils-3.8.ebuild            | 57 --------------------
 sys-apps/diffutils/diffutils-3.9-r1.ebuild         | 63 ----------------------
 sys-apps/diffutils/diffutils-3.9.ebuild            | 57 --------------------
 .../diffutils-3.9-diff-D-option-regression.patch   | 27 ----------
 .../files/diffutils-3.9-make-4.4-test-color.patch  | 30 -----------
 sys-apps/diffutils/files/loong-fix-build.patch     | 30 -----------
 sys-apps/diffutils/files/ppc-musl.patch            | 19 -------
 8 files changed, 287 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index ac73eb757f6a..cae233d525be 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,6 +1,2 @@
 DIST diffutils-3.10.tar.xz 1624240 BLAKE2B 24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6 SHA512 219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb
 DIST diffutils-3.10.tar.xz.sig 833 BLAKE2B 06650838d6a3327fda6b2ab09693170ec18b730b1f5981c8f3e2180b2c8a553307ae93199e4be0532a534a8a3f95e4a7b4fccbbd9e5f8d1b1cedd0816b0aac90 SHA512 91aa1fcfca224454e292540ea7813f4a0eb348f06a4374017326d524949775359fc833de597cc201c97f357eb6c675800828a6e3332572376f3554f1f2e1aca1
-DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
-DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
-DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
-DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
deleted file mode 100644
index a6c1cf0cee51..000000000000
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/diffutils.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz
-	verify-sig? (
-		mirror://gnu/diffutils/${P}.tar.xz.sig
-		https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz.sig
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="nls static"
-
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-diffutils )"
-
-PATCHES=(
-	"${FILESDIR}/ppc-musl.patch"
-	"${FILESDIR}/loong-fix-build.patch"
-)
-
-src_prepare() {
-	default
-
-	# touch generated files after patching m4, to avoid activating maintainer
-	# mode
-	# remove when loong-fix-build.patch is no longer necessary
-	touch ./aclocal.m4 lib/config.hin ./configure || die
-	find . -name Makefile.in -exec touch {} + || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	# required for >=glibc-2.26, bug #653914
-	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
deleted file mode 100644
index f4d48d41ebae..000000000000
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/diffutils.asc
-inherit verify-sig
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="43-2d50"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-diffutils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-4.4-test-color.patch
-	"${FILESDIR}"/${P}-diff-D-option-regression.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed because of ${P}-diff-D-option-regression.patch
-	touch man/diff.1 || die
-}
-
-src_configure() {
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	# required for >=glibc-2.26, bug #653914
-	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
-
-	local myeconfargs=(
-		# Interferes with F_S (sets F_S=2)
-		--disable-gcc-warnings
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild b/sys-apps/diffutils/diffutils-3.9.ebuild
deleted file mode 100644
index 1bbc241086ce..000000000000
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/diffutils.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="43-2d50"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls static"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-diffutils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-4.4-test-color.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	# required for >=glibc-2.26, bug #653914
-	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
-
-	local myeconfargs=(
-		# Interferes with F_S (sets F_S=2)
-		--disable-gcc-warnings
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}

diff --git a/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch b/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch
deleted file mode 100644
index a12e1bc673a0..000000000000
--- a/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61193
-https://git.savannah.gnu.org/cgit/groff.git/commit/?id=10274fb69e517b2c4b10fcd0ba3347e5bd0eefd7
-https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=ba08fbbb0ca5da455bf695236c57bc50e7faed50
-
-From ba08fbbb0ca5da455bf695236c57bc50e7faed50 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 10 Feb 2023 15:33:40 -0800
-Subject: diff: fix bug where -D does not work
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Robert Webb (bug#61193).
-* src/diff.c (main): Omit stray ‘sizeof’.
-* tests/ifdef: New test.
-* tests/Makefile.am (TESTS): Add it.
---- a/src/diff.c
-+++ b/src/diff.c
-@@ -416,7 +416,7 @@ main (int argc, char **argv)
- 	    char *base = b;
- 	    int changes = 0;
- 
--	    for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++)
-+	    for (i = 0; i < sizeof C_ifdef_group_formats; i++)
- 	      {
- 		char ch = C_ifdef_group_formats[i];
- 		switch (ch)

diff --git a/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch b/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch
deleted file mode 100644
index 01f6aeedc956..000000000000
--- a/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/879891
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59905
-https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=89f3daeaaf021a77177daec8666bcd80ec476833
-
-From 89f3daeaaf021a77177daec8666bcd80ec476833 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@fb.com>
-Date: Mon, 16 Jan 2023 15:48:10 -0800
-Subject: tests: accommodate newer GNU make's SIGPIPE-ignore
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* tests/colors: Allow an exit code of not just 141 (SIGPIPE),
-but also "error": 2.
-Reported by Tomasz Kłoczko in http://bugs.gnu.org/59905.
---- a/tests/colors
-+++ b/tests/colors
-@@ -128,6 +128,9 @@ printf '%1000000s-a' > a
- printf '%1000000s-b' > b
- head -c 10 < fifo > /dev/null &
- diff --color=always ---presume-output-tty a b > fifo
--test $? = 141 || fail=1
-+
-+# Depending on version of GNU make (4.3.92-4.4 set SIGPIPE to "ignore"),
-+# either of these is acceptable.
-+case $? in 2|141) ;; *) fail=1 ;; esac
- 
- Exit $fail
--- 
-cgit v1.1

diff --git a/sys-apps/diffutils/files/loong-fix-build.patch b/sys-apps/diffutils/files/loong-fix-build.patch
deleted file mode 100644
index 2b16b47b7ee7..000000000000
--- a/sys-apps/diffutils/files/loong-fix-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with change to generated file added as well.]
-From: Sun Haiyong <youbest@sina.com>
-Date: Tue, 31 Aug 2021 11:11:52 +0800
-Subject: [PATCH] stack-direction: Add support for loongarch CPU
-
-* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
-set "sv_cv_stack_direction" to "-1" .
---- a/m4/stack-direction.m4
-+++ b/m4/stack-direction.m4
-@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
-       i?86 | x86_64 | \
-       i860 | \
-       ia64 | \
-+      loongarch* | \
-       m32r | \
-       m68* | \
-       m88k | \
---- a/configure
-+++ b/configure
-@@ -34088,6 +34088,7 @@ else $as_nop
-       i?86 | x86_64 | \
-       i860 | \
-       ia64 | \
-+      loongarch* | \
-       m32r | \
-       m68* | \
-       m88k | \
--- 
-2.17.2
-

diff --git a/sys-apps/diffutils/files/ppc-musl.patch b/sys-apps/diffutils/files/ppc-musl.patch
deleted file mode 100644
index 4aff0ba1cf5c..000000000000
--- a/sys-apps/diffutils/files/ppc-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Needed to fix build on ppc + musl. Should pop up in next gnulib sync in release (different patch).
-
-https://www.openwall.com/lists/musl/2017/11/05/2
-https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b
---- a/lib/sigsegv.c
-+++ b/lib/sigsegv.c
-@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
- /* both should be equivalent */
- #   if 0
- #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
--#   else
-+#   elif defined(__GLIBC__)
- #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
-+#   else
-+#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
- #   endif
- #  endif
- 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-28  4:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-28  4:04 [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-04-26  4:03 Sam James
2017-05-08 11:29 Lars Wendler
2017-05-08 11:29 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox