possible problem receiving with ctm on current

[Montgomery-Smith, Stephen]

On 02/05/2018 03:37 PM, Julian H. Stacey wrote:
> "Montgomery-Smith, Stephen" wrote:
>> On 02/04/2018 04:41 PM, Julian H. Stacey wrote:
>>> Hi ctm-users at freebsd.org
>>> A current box was some weeks old, so I just did a make world & now see:
>>>
>>> On current box:
>>>   uname -a
>>>   FreeBSD lapr.js.berklix.net 12.0-CURRENT FreeBSD 12.0-CURRENT #0:
>>>   Sun Feb  4 03:03:45 CET 2018
>>>   jhs at lapr.js.berklix.net:/data/release/s4/usr/obj/usr/src/amd64.amd64/sys/GENERIC amd64
>>>   
>>>   md5 /pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz
>>>   MD5 (/pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz) = a3ea38b3d22451ac0653214db5279784
>>>
>>>   ctm /pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz
>>>   /pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz Fatal error: Probably not a CTM-patch at all.
>>>   ctm: exit(65)
>>>
>>>   gzip -d !$
>>>   gzip -d /pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz
>>>
>>>   ctm /pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383
>>>   /pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383 Fatal error: Expected CTM keyword.
>>>   Got [CTMSV]
>>>   ctm: exit(65)
>>>
>>> & yet svn-cur.06383.xz applied on my older 9.2-RELEASE where I'm up to date
>>>         /pub/FreeBSD/development/CTM/svn-cur            svn-cur.06386.xz
>>>         /pub/FreeBSD/development/FreeBSD-SVN            svn-cur 6386 
>>>         /pri/FreeBSD/development/FreeBSD-SVN            svn-cur 6386 
>>>         /usr/svn                                        svn-cur 6386 
>>>
>>> my local svn-cur.06383.xz (delivered from freebsd.org mail list)
>>> has same md5 as that delivered by Stephen's rsync to
>>> ftp://ctm.berklix.org/pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz
>>> MD5 (/pub/FreeBSD/development/CTM/svn-cur/svn-cur.06383.xz) = a3ea38b3d22451ac0653214db5279784
>>>
>>> Anyone else receiving ctm on current see this problem ?
>>>
>>> Cheers,
>>> Julian
>>>
>>
>> Did you remember to apply the patch to ctm when you rebuilt everything?
>>
>> ftp://ctm.berklix.org/pub/FreeBSD/development/CTM/svn-cur/patch-for-ctm-v09
> 
> Thanks Stephen, that solved it !
> 
> I didn't realise there were still ctm patches not committed to src/ by now.
> 
> I'm suprised it hadn't bitten me before, so investigated why:
>   {
>   I've been running make world on that box frequently this last half
>   year or more; Sometimes I was rdist'ing my ctms trees from my older 9.2
>   box; Sometimes I ran ctm of [some] deltas local on the current box.
> 
>   Maybe I didnt notice before that ctm on src & ports may have worked, but
>   on svn/ perhaps failed, & maybe my local rdist updated svn later. 
> 
>   Maybe I didnt run ctm on current till after I'd also run my
>   http://berklix.com/~jhs/bin/.csh/customise script which sucked
>   in & applied my src/ patch tree - that turned out to include an obsolete
>   patch-for-ctm-v04 (as your README says, any older & it wouldn't work).
> 
>   I've now included your latest 4 patches in my patch tree
>   http://berklix.com/~jhs/src/bsd/fixes/FreeBSD/src/gen/usr.sbin/ctm/
>   so my src/ will get auto. patched.
>   }
> 
> I think we should get your patches commited, they've had long enough in test ?
> 	  16221 Nov 15  2014 patch-for-ctm-v09
> 	    878 Sep 24  2012 patch-for-ctm_rmail
> 	    583 Dec 25  2011 patch-for-ctm_smail
> 	   8655 Nov 15  2014 patch-for-mkctm-v05
> Would you like to file a send-pr or should I ?
> 
> Cheers,
> Julian
> 

I think I already submitted a patch.  Although it is probably not
completely up to date.  No-one took it.