diff -Nru diffutils-3.8/debian/changelog diffutils-3.8/debian/changelog --- diffutils-3.8/debian/changelog 2022-08-15 17:10:00.000000000 +0000 +++ diffutils-3.8/debian/changelog 2022-12-20 22:45:00.000000000 +0000 @@ -1,3 +1,21 @@ +diffutils (1:3.8-3) unstable; urgency=medium + + * Use a common debian/watch file which is valid for most GNU packages. + + -- Santiago Vila Tue, 20 Dec 2022 23:45:00 +0100 + +diffutils (1:3.8-2) unstable; urgency=medium + + * Convert debian/copyright to DEP-5 format. Closes: #1020560. + Thanks to Bastian Germann. + * Define SIGSEGV_FAULT_STACKPOINTER for loongarch. Closes: #1025140. + Temporarily enable autoreconf for the above to work. + * Set upstream metadata fields Bug-Submit, Name and Repository-Browse. + * Update standards version to 4.6.1. + * Update watch file format version to 4. + + -- Santiago Vila Thu, 15 Dec 2022 21:45:00 +0100 + diffutils (1:3.8-1) unstable; urgency=medium * New upstream release. Closes: #1004520, #1011740. diff -Nru diffutils-3.8/debian/control diffutils-3.8/debian/control --- diffutils-3.8/debian/control 2022-08-15 16:00:00.000000000 +0000 +++ diffutils-3.8/debian/control 2022-12-20 21:00:00.000000000 +0000 @@ -3,7 +3,7 @@ Priority: required Maintainer: Santiago Vila Build-Depends: debhelper-compat (= 13), texinfo -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Homepage: https://www.gnu.org/software/diffutils/ Rules-Requires-Root: no diff -Nru diffutils-3.8/debian/copyright diffutils-3.8/debian/copyright --- diffutils-3.8/debian/copyright 2022-08-15 16:00:00.000000000 +0000 +++ diffutils-3.8/debian/copyright 2022-12-20 21:00:00.000000000 +0000 @@ -1,44 +1,423 @@ -This is the Debian prepackaged version of the GNU diffutils package. -GNU `diff' was written by Mike Haertel, David Hayes, Richard Stallman, -Len Tower, and Paul Eggert. Wayne Davison designed and implemented -the unified output format. GNU `diff3' was written by Randy Smith. -GNU `sdiff' was written by Thomas Lord. GNU `cmp' was written by -Torbjorn Granlund and David MacKenzie. - -The source for this release was obtained from - -https://ftp.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz - -Program copyright and license: -============================= - -Copyright (C) 1988-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013, 2015-2021 -Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -On Debian systems, the complete text of the GNU General Public License -may be found in `/usr/share/common-licenses/GPL'. - - -Manual copyright and license: -============================ - -Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2021 Free -Software Foundation, Inc. - - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.3 or - any later version published by the Free Software Foundation; with no - Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - -On Debian systems, the complete text of the GNU Free Documentation -License may be found in `/usr/share/common-licenses/GFDL'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: diffutils +Upstream-Contact: bug-diffutils@gnu.org +Source: https://ftp.gnu.org/gnu/diffutils/ +Comment: This is the Debian prepackaged version of the GNU diffutils package. + GNU `diff' was written by Mike Haertel, David Hayes, Richard Stallman, + Len Tower, and Paul Eggert. Wayne Davison designed and implemented + the unified output format. GNU `diff3' was written by Randy Smith. + GNU `sdiff' was written by Thomas Lord. GNU `cmp' was written by + Torbjorn Granlund and David MacKenzie. + +Files: * +Copyright: 1985-1986, 1988-1989, 1990-2021 Free Software Foundation, Inc. +License: GPL-3+ + +Files: aclocal.m4 + build-aux/config.rpath + m4/* +Copyright: 1996-2021 Free Software Foundation, Inc. +License: FSFULLR + +Files: */Makefile.in +Copyright: 1994-2021 Free Software Foundation, Inc. +License: GPL-3+ and FSFULLR + +Files: lib/* + gnulib-tests/accept.c + gnulib-tests/arpa_inet.in.h + gnulib-tests/bind.c + gnulib-tests/connect.c + gnulib-tests/fdopen.c + gnulib-tests/fpucw.h + gnulib-tests/getcwd-lgpl.c + gnulib-tests/glthread/thread.c + gnulib-tests/glthread/thread.h + gnulib-tests/hash-pjw.c + gnulib-tests/hash-pjw.h + gnulib-tests/ioctl.c + gnulib-tests/listen.c + gnulib-tests/nanosleep.c + gnulib-tests/netinet_in.in.h + gnulib-tests/perror.c + gnulib-tests/pipe.c + gnulib-tests/pthread-thread.c + gnulib-tests/pthread.in.h + gnulib-tests/pthread_sigmask.c + gnulib-tests/same-inode.h + gnulib-tests/sched.in.h + gnulib-tests/select.c + gnulib-tests/setsockopt.c + gnulib-tests/sig-handler.c + gnulib-tests/sig-handler.h + gnulib-tests/sigaction.c + gnulib-tests/sigprocmask.c + gnulib-tests/sleep.c + gnulib-tests/snprintf.c + gnulib-tests/socket.c + gnulib-tests/sockets.c + gnulib-tests/sockets.h + gnulib-tests/strerror_r.c + gnulib-tests/sys_ioctl.in.h + gnulib-tests/sys_select.in.h + gnulib-tests/sys_socket.c + gnulib-tests/sys_socket.in.h + gnulib-tests/sys_uio.in.h + gnulib-tests/w32sock.h + gnulib-tests/wctomb-impl.h + gnulib-tests/wctomb.c + gnulib-tests/windows-thread.c + gnulib-tests/windows-thread.h + gnulib-tests/windows-tls.c + gnulib-tests/windows-tls.h +Copyright: 1985, 1987-2021 Free Software Foundation, Inc. +License: LGPL-2.1+ + +Files: gnulib-tests/gnulib.mk + lib/gnulib.mk +Copyright: Copyright (C) 2002-2021 Free Software Foundation, Inc. +License: GPL-3+ with autoconf exception + This file is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this file. If not, see . + . + As a special exception to the GNU General Public License, + this file may be distributed as part of a program that + contains a configuration script generated by Autoconf, under + the same distribution terms as the rest of that program. + . + On Debian systems, the complete text of the GNU General Public License version + 3 may be found in `/usr/share/common-licenses/GPL-3'. + +Files: build-aux/texinfo.tex +Copyright: Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc. +License: GPL-3+ with texinfo exception + This texinfo.tex file is free software: you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + . + This texinfo.tex file is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied warranty + of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + As a special exception, when this file is read by TeX when processing + a Texinfo source document, you may use the result without + restriction. This Exception is an additional permission under section 7 + of the GNU General Public License, version 3 ("GPLv3"). + . + On Debian systems, the complete text of the GNU General Public License + version 3 may be found in `/usr/share/common-licenses/GPL-3'. + +Files: gnulib-tests/_Noreturn.h + gnulib-tests/arg-nonnull.h + gnulib-tests/c++defs.h + gnulib-tests/warn-on-use.h + lib/_Noreturn.h + lib/arg-nonnull.h + lib/c++defs.h + lib/warn-on-use.h +Copyright: 1995-2021 Free Software Foundation, Inc. +License: LGPL-2.0+ + +Files: build-aux/ar-lib + build-aux/compile + build-aux/depcomp + build-aux/gnupload + build-aux/mdate-sh + build-aux/missing + build-aux/test-driver + gnulib-tests/altstack-util.h + gnulib-tests/mmap-anon-util.h + gnulib-tests/test-dynarray.c + gnulib-tests/test-sigsegv-catch-segv1.c + gnulib-tests/test-sigsegv-catch-segv2.c + gnulib-tests/test-sigsegv-catch-stackoverflow1.c + gnulib-tests/test-sigsegv-catch-stackoverflow2.c + lib/sigsegv.in.h +Copyright: 1995-2021 Free Software Foundation, Inc. +License: GPL-2+ + +Files: lib/sigsegv.c +Copyright: 1993-2021 Free Software Foundation, Inc. + 2018 Nylon Chen +License: GPL-2+ + +Files: lib/stackvma.c + lib/stackvma.h +Copyright: 2002-2021 Free Software Foundation, Inc. + 2003-2006 Paolo Bonzini +License: GPL-2+ + +Files: build-aux/install-sh +Copyright: 1994 X Consortium +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + +Files: INSTALL +Copyright: 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free Software Foundation, Inc. +License: FSFAP + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. This file is offered as-is, + without warranty of any kind. + +Files: README + doc/*.texi + doc/diffutils.info +Copyright: 1992-1994, 1998, 2001-2002, 2004, 2006, 2007, 2008, 2009-2021 + Free Software Foundation, Inc. +License: GFDL-NIV-1.3 + +Files: lib/Makefile.am + lib/argmatch.c + lib/argmatch.h + lib/basename.c + lib/c-stack.c + lib/c-stack.h + lib/cmpbuf.c + lib/cmpbuf.h + lib/diffseq.h + lib/dirname.c + lib/exclude.c + lib/exclude.h + lib/file-type.c + lib/file-type.h + lib/filenamecat.c + lib/prepargs.c + lib/progname.c + lib/progname.h + lib/propername.c + lib/propername.h + lib/quote.h + lib/quotearg.c + lib/quotearg.h + lib/sh-quote.c + lib/sh-quote.h + lib/stat-macros.h + lib/stdopen.c + lib/stdopen.h + lib/system-quote.c + lib/system-quote.h + lib/trim.c + lib/trim.h + lib/unlocked-io.h + lib/xalloc-die.c + lib/xalloc.h + lib/xasprintf.c + lib/xfreopen.c + lib/xfreopen.h + lib/xmalloc.c + lib/xmalloca.c + lib/xmalloca.h + lib/xreadlink.c + lib/xreadlink.h + lib/xstdopen.c + lib/xstdopen.h + lib/xstriconv.c + lib/xstriconv.h + lib/xstrtoimax.c + lib/xstrtol.c + lib/xstrtol.h + lib/xstrtoul.c + lib/xvasprintf.c + lib/xvasprintf.h + m4/gnulib-comp.m4 +Copyright: 1985-1986, 1988-1989, 1990-2021 Free Software Foundation, Inc. +License: GPL-3+ + +Files: gnulib-tests/atoll.c + gnulib-tests/putenv.c + gnulib-tests/symlink.c + gnulib-tests/wctob.c + lib/freopen.c + lib/gettime.c + lib/ialloc.c + lib/ialloc.h + lib/mbscasecmp.c + lib/mbslen.c + lib/mbsstr.c + lib/mbuiter.c + lib/mbuiter.h + lib/nstrftime.c + lib/strftime.h + lib/strtoimax.c + lib/strtol.c + lib/strtoll.c + lib/time-internal.h + lib/time_rz.c + lib/timespec.c + lib/timespec.h + lib/tzset.c + lib/version-etc-fsf.c + lib/version-etc.c + lib/version-etc.h +Copyright: 1985-1986, 1988-1989, 1990-2021 Free Software Foundation, Inc. +License: LGPL-3.0+ + +Files: lib/str-kmp.h +Copyright: 2005-2021 Free Software Foundation, Inc. +License: LGPL-3.0+ or GPL-2+ + This file is free software. + It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". + You can redistribute it and/or modify it under either + - the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version, or + - the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) + any later version, or + - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". + . + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License and the GNU General Public License + for more details. + . + You should have received a copy of the GNU Lesser General Public + License and of the GNU General Public License along with this + program. If not, see . */ + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 3 may be found in `/usr/share/common-licenses/LGPL-3'. + +Files: debian/* +Copyright: 2022 Santiago Vila +License: public-domain + I believe that none of these files contain any creative + expression eligible for copyright. + +License: LGPL-2.0+ + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2 may be found in `/usr/share/common-licenses/LGPL-2'. + +License: LGPL-2.1+ + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + . + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2.1 may be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-3.0+ + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 3 of the + License, or (at your option) any later version. + . + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 3 may be found in `/usr/share/common-licenses/LGPL-3'. + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License version + 3 may be found in `/usr/share/common-licenses/GPL-3'. + +License: GPL-2+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License version + 2 may be found in `/usr/share/common-licenses/GPL-2'. + +License: FSFULLR + This file is free software; the Free Software Foundation + gives unlimited permission to copy and/or distribute it, + with or without modifications, as long as this notice is preserved. + +License: GFDL-NIV-1.3 + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no + Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled + GNU Free Documentation License. + . + On Debian systems, the complete text of the GNU Free Documentation License + version 1.3 may be found in `/usr/share/common-licenses/GFDL-1.3'. diff -Nru diffutils-3.8/debian/patches/01-add-loongarch-define.patch diffutils-3.8/debian/patches/01-add-loongarch-define.patch --- diffutils-3.8/debian/patches/01-add-loongarch-define.patch 1970-01-01 00:00:00.000000000 +0000 +++ diffutils-3.8/debian/patches/01-add-loongarch-define.patch 2022-12-20 21:01:00.000000000 +0000 @@ -0,0 +1,25 @@ +From: Dandan Zhang +Subject: define SIGSEGV_FAULT_STACKPOINTER for loongarch +Bug-Debian: https://bugs.debian.org/1025140 + +--- a/lib/sigsegv.c ++++ b/lib/sigsegv.c +@@ -168,6 +168,18 @@ + because $bsp and $bspstore never differ by more than ca. 1 KB. */ + # define SIGSEGV_FAULT_BSP_POINTER ((ucontext_t *) ucp)->uc_mcontext.sc_ar_bsp + ++# elif defined __loongarch__ || defined __loongarch64 ++ ++/* See glibc/sysdeps/unix/sysv/linux/loongarch/sys/ucontext.h ++ and the definition of GET_STACK in ++ glibc/sysdeps/unix/sysv/linux/loongarch/sigcontextinfo.h. ++ Note that the 'mcontext_t' defined in ++ glibc/sysdeps/unix/sysv/linux/loongarch/sys/ucontext.h ++ and the 'struct sigcontext' defined in ++ are effectively the same. */ ++ ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.__gregs[LARCH_REG_SP] ++ + # elif defined __m68k__ + + /* See glibc/sysdeps/unix/sysv/linux/m68k/sys/ucontext.h diff -Nru diffutils-3.8/debian/patches/series diffutils-3.8/debian/patches/series --- diffutils-3.8/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ diffutils-3.8/debian/patches/series 2022-12-20 21:00:00.000000000 +0000 @@ -0,0 +1 @@ +01-add-loongarch-define.patch diff -Nru diffutils-3.8/debian/rules diffutils-3.8/debian/rules --- diffutils-3.8/debian/rules 2022-08-15 16:00:00.000000000 +0000 +++ diffutils-3.8/debian/rules 2022-12-20 21:00:00.000000000 +0000 @@ -4,7 +4,7 @@ package = diffutils -override_dh_autoreconf: +# override_dh_autoreconf: override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) distclean diff -Nru diffutils-3.8/debian/upstream/metadata diffutils-3.8/debian/upstream/metadata --- diffutils-3.8/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ diffutils-3.8/debian/upstream/metadata 2022-12-20 21:00:00.000000000 +0000 @@ -0,0 +1,4 @@ +--- +Name: GNU diffutils +Bug-Submit: bug-diffutils@gnu.org +Repository-Browse: https://git.savannah.gnu.org/cgit/diffutils.git diff -Nru diffutils-3.8/debian/watch diffutils-3.8/debian/watch --- diffutils-3.8/debian/watch 2022-08-15 16:00:00.000000000 +0000 +++ diffutils-3.8/debian/watch 2022-12-20 21:00:00.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -opts=pgpsigurlmangle=s/$/.sig/ https://ftp.gnu.org/gnu/diffutils/diffutils-(\d.+)\.tar\.xz +version=4 +opts=pgpsigurlmangle=s/$/.sig/ https://ftp.gnu.org/gnu/@PACKAGE@/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@