Re: CVS commit: pkgsrc/devel/nss

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

On Thu, Apr 12, 2018 at 02:55:00PM +0100, Patrick Welche wrote:
> On Thu, Apr 12, 2018 at 03:41:39PM +0200, Manuel Bouyer wrote:
> > On Thu, Apr 12, 2018 at 02:30:48PM +0100, Patrick Welche wrote:
> > > Somehow I don't see the right checksum:
> > > 
> > > # grep freebl distinfo
> > > SHA1 (patch-nss_lib_freebl_blinit.c) = 14d250c1aaa84c74cc300e490540ecda551731b9
> > > # cksum -a sha1 patches/patch-nss_lib_freebl_blinit.c 
> > > SHA1 (patches/patch-nss_lib_freebl_blinit.c) = cfa7319c722d650f98e26b9379691cc9d60354b9
> > > # ident distinfo patches/patch-nss_lib_freebl_blinit.c 
> > > distinfo:
> > >      $NetBSD: distinfo,v 1.85 2018/04/12 10:37:11 bouyer Exp $
> > > 
> > > patches/patch-nss_lib_freebl_blinit.c:
> > >      $NetBSD: patch-nss_lib_freebl_blinit.c,v 1.1 2018/04/12 10:37:11 bouyer Exp $
> > 
> > your cksum gives the same result on my machine, but 'make makepatchsum'
> > claims that the value in distinfo is correct (i.e. it doens't
> > update distinfo and sans "distinfo: patches part unchanged").
> > should cksum be applied to the whole patch file, or should it skip the
> > CVS tag ?
> 
> I forgot about the $NetBSD$ part so it must be something else... I see:
> 
> |--- nss/cmd/shlibsign/sign.sh.orig     2011-06-15 21:57:52.000000000 +0000     
> |+++ nss/cmd/shlibsign/sign.sh                                                  
> --------------------------                                                      
> Patching file nss/cmd/shlibsign/sign.sh using Plan A...                         
> Hunk #1 succeeded at 37 (offset 11 lines).                                      
> done                                                                            
> ERROR: Patching failed due to modified or broken patch file(s):                 
> ERROR:  /usr/pkgsrc/devel/nss/patches/patch-nss_lib_freebl_blinit.c
> *** Error code 1

The real error is probably above these lines.
Do you find a .rej file in the work directory ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--