CVS vs git discrepancies, was : textproc/mandoc; ERROR: Patching failed due to modified or broken patch file(s):

[Ottavio Caruso <ottavio2006-usenet2012%yahoo.com@localhost>]

[You might not have received my original message. Scroll down for addendum]

On Fri, 7 Aug 2020 at 23:08, Ottavio Caruso
<ottavio2006-usenet2012%yahoo.com@localhost> wrote:
>
> Hi,
>
> # uname -a
> Linux e130 4.9.0-12-amd64 #1 SMP Debian 4.9.210-1 (2020-01-20) x86_64
> GNU/Linux
>
> pkgsrc=current
>
> This is a build in a clean chroot.
>
>
> root@e130:~/cvs/pkgsrc/current/pkgsrc/textproc/mandoc# bmake configure
> => Bootstrap dependency digest>=20010302: found digest-20190127
> => Bootstrap dependency tnftp-[0-9]*: found tnftp-20151004nb2
> => Checksum SHA1 OK for mandoc-1.14.5.tar.gz
> => Checksum RMD160 OK for mandoc-1.14.5.tar.gz
> => Checksum SHA512 OK for mandoc-1.14.5.tar.gz
> ===> Installing dependencies for mandoc-1.14.5nb1
> => Tool dependency nbpatch-[0-9]*: found nbpatch-20151107
> => Tool dependency checkperms>=1.1: found checkperms-1.12
> => Build dependency cwrappers>=20150314: found cwrappers-20180325
> ===> Skipping vulnerability checks.
> WARNING: No /usr/pkg/pkgdb/pkg-vulnerabilities file found.
> WARNING: To fix run: `/usr/pkg/sbin/pkg_admin -K /usr/pkg/pkgdb
> fetch-pkg-vulnerabilities'.
> ===> Overriding tools for mandoc-1.14.5nb1
> ===> Extracting for mandoc-1.14.5nb1
> echo PREFIX=/usr/pkg >
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo CFLAGS=\"-O2\ -D_FORTIFY_SOURCE=2\ -I/usr/include\" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo LDFLAGS=\"\ \ \ -Wl,-R/usr/pkg/lib\" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo INSTALL=\"/usr/bin/install\" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo INSTALL_PROGRAM=\"/usr/bin/install\ -c\ -s\ -o\ root\ -g\ root\ -m\
> 755\" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo INSTALL_LIB=\"/usr/bin/install\ -c\ -o\ root\ -g\ root\ -m\ 644\"
>  >> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo INSTALL_MAN=\"/usr/bin/install\ -c\ -o\ root\ -g\ root\ -m\ 644\"
>  >> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo INSTALL_DATA=\"/usr/bin/install\ -c\ -o\ root\ -g\ root\ -m\ 644\"
>  >> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo MANDIR="/usr/pkg/man" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo MANM_ROFF="mandoc-roff" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> echo BINM_SOELIM="msoelim" >>
> /root/pkgsrc/work/textproc/mandoc/work/mandoc-1.14.5/configure.local
> ===> Patching for mandoc-1.14.5nb1
> => Applying pkgsrc patches for mandoc-1.14.5nb1
> => Verifying
> /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-configure
> => Applying pkgsrc patch
> /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-configure
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |$NetBSD: patch-configure,v 1.2 2018/08/14 09:21:53 wiz Exp $
> |
> |Avoid broken CC detection.
> |
> |--- configure.orig     2018-07-31 15:37:10.000000000 +0000
> |+++ configure
> --------------------------
> Patching file configure using Plan A...
> Hunk #1 succeeded at 41 (offset 1 line).
> done
> => Verifying
> /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-roff.7
> **************************************
> Ignoring patch file
> /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-roff.7:
> invalid checksum
> **************************************
> ERROR: Patching failed due to modified or broken patch file(s):
> ERROR:  /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-roff.7
> *** Error code 1
>
> Stop.
> bmake[1]: stopped in /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc
> *** Error code 1
>
> Stop.
> bmake: stopped in /root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc

I have made a fresh CVS checkout and the problem persisted. I then
made a fresh git checkout and the problem disappeared.

Please give a look at this diff:

$ diff -ur git/pkgsrc-current/pkgsrc/textproc/mandoc/
chroot/stretch/root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/
Only in chroot/stretch/root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/: CVS
Only in chroot/stretch/root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches:
CVS
diff -ur git/pkgsrc-current/pkgsrc/textproc/mandoc/patches/patch-roff.7
chroot/stretch/root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-roff.7
--- git/pkgsrc-current/pkgsrc/textproc/mandoc/patches/patch-roff.7
2020-08-08 10:38:20.727366367 +0100
+++ chroot/stretch/root/cvs/pkgsrc/current/pkgsrc/textproc/mandoc/patches/patch-roff.7
2019-03-10 11:52:56.000000000 +0000
@@ -7,7 +7,7 @@
 @@ -16,10 +16,10 @@
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
- .Dd $Mdocdate: January 1 2019 $
+ .Dd $Mdocdate: March 10 2019 $
 -.Dt ROFF 7
 +.Dt MANDOC-ROFF 7
  .Os

How come this discrepancy?



-- 
Ottavio Caruso