From owner-ctm-users@FreeBSD.ORG Fri Sep 21 04:54:26 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CBD05106564A for ; Fri, 21 Sep 2012 04:54:26 +0000 (UTC) (envelope-from aehlig@linta.de) Received: from linta.de (isilmar-3.linta.de [188.40.101.200]) by mx1.freebsd.org (Postfix) with ESMTP id 13F128FC14 for ; Fri, 21 Sep 2012 04:54:25 +0000 (UTC) Received: (qmail 32588 invoked by uid 10); 21 Sep 2012 04:47:43 -0000 Received: from curry.linta.de by isilmar.linta.de with BSMTP; 21 Sep 2012 04:47:43 -0000 Received: by curry.linta.de (Postfix, from userid 1001) id 9130B1CC1D; Fri, 21 Sep 2012 06:47:29 +0200 (CEST) Date: Fri, 21 Sep 2012 06:47:29 +0200 From: "Klaus T. Aehlig" To: Stephen Montgomery-Smith Message-ID: <20120921044729.GA47944@curry.linta.de> References: <4EF55B2B.9010700@missouri.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="jI8keyz6grp/JLjh" Content-Disposition: inline In-Reply-To: <4EF55B2B.9010700@missouri.edu> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "ctm-users@freebsd.org" Subject: Re: svn-cur X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2012 04:54:26 -0000 --jI8keyz6grp/JLjh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, > You will have to apply the patch to /usr/src/usr.sbin/ctm/ctm and > rebuild ctm. (I think "make depend && make && make install" is what you > need to do.) sorry if I missed something, but may I suggest another patch (see attached, to be applied on top of the other patches). With the change to svn, the name of the deltas has changed from .gz to .xz, which has the effect that ctm_rmail no longer finds the missing pieces in the pieces directory so one would have to apply them by hand... Best regards, Klaus --jI8keyz6grp/JLjh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-for-ctm_rmail --- /usr/src/usr.sbin/ctm/ctm_rmail/ctm_rmail.c.orig 2012-09-20 23:02:19.000000000 +0200 +++ /usr/src/usr.sbin/ctm/ctm_rmail/ctm_rmail.c 2012-09-21 06:25:11.000000000 +0200 @@ -198,7 +198,7 @@ */ for (;;) { - sprintf(delta, "%s.%04d.gz", class, ++dn); + sprintf(delta, "%s.%05d.xz", class, ++dn); mk_delta_name(fname, delta); if (stat(fname, &sb) < 0) --jI8keyz6grp/JLjh-- From owner-ctm-users@FreeBSD.ORG Fri Sep 21 11:43:36 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E185A106566B for ; Fri, 21 Sep 2012 11:43:36 +0000 (UTC) (envelope-from jhs@berklix.com) Received: from tower.berklix.org (tower.berklix.org [83.236.223.114]) by mx1.freebsd.org (Postfix) with ESMTP id 45DB38FC0C for ; Fri, 21 Sep 2012 11:43:35 +0000 (UTC) Received: from mart.js.berklix.net (p5DCBCC5B.dip.t-dialin.net [93.203.204.91]) (authenticated bits=0) by tower.berklix.org (8.14.2/8.14.2) with ESMTP id q8LBhRO5042863; Fri, 21 Sep 2012 11:43:28 GMT (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (fire.js.berklix.net [192.168.91.41]) by mart.js.berklix.net (8.14.3/8.14.3) with ESMTP id q8LBhQpp053524; Fri, 21 Sep 2012 13:43:27 +0200 (CEST) (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (localhost [127.0.0.1]) by fire.js.berklix.net (8.14.4/8.14.4) with ESMTP id q8LBh2EO034636; Fri, 21 Sep 2012 13:43:14 +0200 (CEST) (envelope-from jhs@fire.js.berklix.net) Message-Id: <201209211143.q8LBh2EO034636@fire.js.berklix.net> To: "Klaus T. Aehlig" From: "Julian H. Stacey" Organization: http://berklix.com BSD Unix Linux Consultancy, Munich Germany User-agent: EXMH on FreeBSD http://berklix.com/free/ X-URL: http://www.berklix.com In-reply-to: Your message "Fri, 21 Sep 2012 06:47:29 +0200." <20120921044729.GA47944@curry.linta.de> Date: Fri, 21 Sep 2012 13:43:01 +0200 Sender: jhs@berklix.com Cc: "ctm-users@freebsd.org" Subject: Re: svn-cur X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2012 11:43:37 -0000 "Klaus T. Aehlig" wrote: > Hi, > > > You will have to apply the patch to /usr/src/usr.sbin/ctm/ctm and > > rebuild ctm. (I think "make depend && make && make install" is what you > > need to do.) > > sorry if I missed something, but may I suggest another patch (see attached, > to be applied on top of the other patches). With the change to svn, the > name of the deltas has changed from .gz to .xz, which has the effect that > ctm_rmail no longer finds the missing pieces in the pieces directory so > one would have to apply them by hand... > > Best regards, > Klaus My ctms are applying automaticaly (without this patch), (but occasionaly some pieces didnt get assembled to deltas, but I didnt pay much attention why or what length names, I just assumed email loss, & ftp'd afresh. However various newer streams use longer names eg: cvs-cur.18865.gz svn-cur.00776.xz svn-ports-cur.00019.xz src-cur.10586.gz so your patch seems plausible. These also need considering: mkCTM/mkCTM:11: if {[file exists [format "%s/$CTMname.%04d" $CTMdest $nbr]]} { return 1 } mkCTM/mkCTM:12: if {[file exists [format "%s/$CTMname.%04d.gz" $CTMdest $nbr]]} { return 1 } PS it mentions gz but not xz too ? Hmm .... mkCTM/mkCTM:111: set nm [format "%s.%04d%s" $CTMname $CTMnbr $CTMsuff] Sorry no time to read code more, over to others. Maybe other phenomena also stopping your automatic application ? eg: --------- My: http://berklix.com/~jhs/src/bsd/jhs/bin/local/mail/ctm-freebsd-svn-incoming Has: PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin; export PATH # local added 2012_05_31, before that it only stored, but did not apply ctms. Is local in your path ? --------- line 963 of my: http://berklix.com/~jhs/src/bsd/fixes/FreeBSD/src/jhs/etc/sendmail/common.cpp * END_HOST needs pipes for receiving ctm_rmail FEATURE(smrsh) -------- Cheers, Julian -- Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com Reply below not above, like a play script. Indent old text with "> ". Send plain text. Not: HTML, multipart/alternative, base64, quoted-printable. From owner-ctm-users@FreeBSD.ORG Fri Sep 21 13:02:42 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4273E106564A for ; Fri, 21 Sep 2012 13:02:42 +0000 (UTC) (envelope-from stephen@missouri.edu) Received: from wilberforce.math.missouri.edu (wilberforce.math.missouri.edu [128.206.184.213]) by mx1.freebsd.org (Postfix) with ESMTP id 0AD328FC16 for ; Fri, 21 Sep 2012 13:02:41 +0000 (UTC) Received: from [127.0.0.1] (wilberforce.math.missouri.edu [128.206.184.213]) by wilberforce.math.missouri.edu (8.14.5/8.14.5) with ESMTP id q8LD2emP032152; Fri, 21 Sep 2012 08:02:41 -0500 (CDT) (envelope-from stephen@missouri.edu) Message-ID: <505C6570.8060801@missouri.edu> Date: Fri, 21 Sep 2012 08:02:40 -0500 From: Stephen Montgomery-Smith User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: "Klaus T. Aehlig" References: <4EF55B2B.9010700@missouri.edu> <20120921044729.GA47944@curry.linta.de> In-Reply-To: <20120921044729.GA47944@curry.linta.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "ctm-users@freebsd.org" Subject: Re: svn-cur X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2012 13:02:42 -0000 On 09/20/2012 11:47 PM, Klaus T. Aehlig wrote: > > Hi, > >> You will have to apply the patch to /usr/src/usr.sbin/ctm/ctm and >> rebuild ctm. (I think "make depend && make && make install" is what you >> need to do.) > > sorry if I missed something, but may I suggest another patch (see attached, > to be applied on top of the other patches). With the change to svn, the > name of the deltas has changed from .gz to .xz, which has the effect that > ctm_rmail no longer finds the missing pieces in the pieces directory so > one would have to apply them by hand... Can you think of a way that ctm_rmail would work in both instances (check both for 4 and 5 digit numbers, and check gz and xz)? I think that is what is needed if the tool is to be universal. From owner-ctm-users@FreeBSD.ORG Fri Sep 21 13:03:54 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E943106566B for ; Fri, 21 Sep 2012 13:03:54 +0000 (UTC) (envelope-from stephen@missouri.edu) Received: from wilberforce.math.missouri.edu (wilberforce.math.missouri.edu [128.206.184.213]) by mx1.freebsd.org (Postfix) with ESMTP id 144B08FC17 for ; Fri, 21 Sep 2012 13:03:53 +0000 (UTC) Received: from [127.0.0.1] (wilberforce.math.missouri.edu [128.206.184.213]) by wilberforce.math.missouri.edu (8.14.5/8.14.5) with ESMTP id q8LD3jLb032220; Fri, 21 Sep 2012 08:03:45 -0500 (CDT) (envelope-from stephen@missouri.edu) Message-ID: <505C65B1.6030408@missouri.edu> Date: Fri, 21 Sep 2012 08:03:45 -0500 From: Stephen Montgomery-Smith User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: "Julian H. Stacey" References: <201209211143.q8LBh2EO034636@fire.js.berklix.net> In-Reply-To: <201209211143.q8LBh2EO034636@fire.js.berklix.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "ctm-users@freebsd.org" , "Klaus T. Aehlig" Subject: Re: svn-cur X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2012 13:03:54 -0000 On 09/21/2012 06:43 AM, Julian H. Stacey wrote: > "Klaus T. Aehlig" wrote: >> Hi, >> >>> You will have to apply the patch to /usr/src/usr.sbin/ctm/ctm and >>> rebuild ctm. (I think "make depend && make && make install" is what you >>> need to do.) >> >> sorry if I missed something, but may I suggest another patch (see attached, >> to be applied on top of the other patches). With the change to svn, the >> name of the deltas has changed from .gz to .xz, which has the effect that >> ctm_rmail no longer finds the missing pieces in the pieces directory so >> one would have to apply them by hand... >> >> Best regards, >> Klaus > > My ctms are applying automaticaly (without this patch), > (but occasionaly some pieces didnt get assembled to deltas, but > I didnt pay much attention why or what length names, I just assumed > email loss, & ftp'd afresh. > > However various newer streams use longer names eg: > cvs-cur.18865.gz > svn-cur.00776.xz > svn-ports-cur.00019.xz > src-cur.10586.gz > so your patch seems plausible. > > These also need considering: > > mkCTM/mkCTM:11: if {[file exists [format "%s/$CTMname.%04d" $CTMdest $nbr]]} { return 1 } > > mkCTM/mkCTM:12: if {[file exists [format "%s/$CTMname.%04d.gz" $CTMdest $nbr]]} { return 1 } > > PS it mentions gz but not xz too ? Hmm .... > > mkCTM/mkCTM:111: set nm [format "%s.%04d%s" $CTMname $CTMnbr $CTMsuff] > > Sorry no time to read code more, over to others. Right now, I have a mkCTM and a mkSVN. From owner-ctm-users@FreeBSD.ORG Sat Sep 22 09:43:41 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F01A81065670 for ; Sat, 22 Sep 2012 09:43:40 +0000 (UTC) (envelope-from aehlig@linta.de) Received: from linta.de (isilmar-3.linta.de [188.40.101.200]) by mx1.freebsd.org (Postfix) with ESMTP id 20E228FC0A for ; Sat, 22 Sep 2012 09:43:38 +0000 (UTC) Received: (qmail 14293 invoked by uid 10); 22 Sep 2012 09:43:31 -0000 Received: from curry.linta.de by isilmar.linta.de with BSMTP; 22 Sep 2012 09:43:31 -0000 Received: by curry.linta.de (Postfix, from userid 1001) id 72FAA1CC1D; Sat, 22 Sep 2012 11:43:19 +0200 (CEST) Date: Sat, 22 Sep 2012 11:43:19 +0200 From: "Klaus T. Aehlig" To: Stephen Montgomery-Smith Message-ID: <20120922094319.GA55036@curry.linta.de> References: <4EF55B2B.9010700@missouri.edu> <20120921044729.GA47944@curry.linta.de> <505C6570.8060801@missouri.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline In-Reply-To: <505C6570.8060801@missouri.edu> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "ctm-users@freebsd.org" Subject: Re: svn-cur X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Sep 2012 09:43:41 -0000 --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Dear Stephen, > Can you think of a way that ctm_rmail would work in both instances > (check both for 4 and 5 digit numbers, and check gz and xz)? I think > that is what is needed if the tool is to be universal. yes, you're right. One should take care of all cases. See a new version of the patch attached. Best, Klaus --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-for-ctm_rmail --- /usr/src/usr.sbin/ctm/ctm_rmail/ctm_rmail.c.orig 2012-09-22 08:59:08.000000000 +0200 +++ /usr/src/usr.sbin/ctm/ctm_rmail/ctm_rmail.c 2012-09-22 11:37:21.000000000 +0200 @@ -150,6 +150,7 @@ char fname[PATH_MAX]; char here[PATH_MAX]; char buf[PATH_MAX*2]; + char *deltanamescheme[] = { "%s.%04d.gz", "%s.%04d.xz", "%s.%05d.gz", "%s.%05d.xz", NULL }; /* * Grab a lock on the ctm mutex file so that we can be sure we are @@ -198,10 +199,16 @@ */ for (;;) { - sprintf(delta, "%s.%04d.gz", class, ++dn); - mk_delta_name(fname, delta); + ++dn; + for (i=0; deltanamescheme[i]; i++) + { + sprintf(delta, deltanamescheme[i], class, dn); + mk_delta_name(fname, delta); - if (stat(fname, &sb) < 0) + if (stat(fname, &sb) >= 0) + break; + } + if (!deltanamescheme[i]) break; sprintf(buf, "(cd %s && ctm %s%s%s%s) 2>&1", base_dir, --h31gzZEtNLTqOjlF-- From owner-ctm-users@FreeBSD.ORG Sat Sep 22 23:52:21 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E8A0106564A for ; Sat, 22 Sep 2012 23:52:21 +0000 (UTC) (envelope-from stephen@missouri.edu) Received: from wilberforce.math.missouri.edu (wilberforce.math.missouri.edu [128.206.184.213]) by mx1.freebsd.org (Postfix) with ESMTP id 44A638FC14 for ; Sat, 22 Sep 2012 23:52:20 +0000 (UTC) Received: from [127.0.0.1] (wilberforce.math.missouri.edu [128.206.184.213]) by wilberforce.math.missouri.edu (8.14.5/8.14.5) with ESMTP id q8MNqJJA032012; Sat, 22 Sep 2012 18:52:19 -0500 (CDT) (envelope-from stephen@missouri.edu) Message-ID: <505E4F33.9060006@missouri.edu> Date: Sat, 22 Sep 2012 18:52:19 -0500 From: Stephen Montgomery-Smith User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: "Klaus T. Aehlig" References: <4EF55B2B.9010700@missouri.edu> <20120921044729.GA47944@curry.linta.de> <505C6570.8060801@missouri.edu> <20120922094319.GA55036@curry.linta.de> In-Reply-To: <20120922094319.GA55036@curry.linta.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "ctm-users@freebsd.org" Subject: Re: svn-cur X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Sep 2012 23:52:21 -0000 On 09/22/2012 04:43 AM, Klaus T. Aehlig wrote: > > Dear Stephen, > >> Can you think of a way that ctm_rmail would work in both instances >> (check both for 4 and 5 digit numbers, and check gz and xz)? I think >> that is what is needed if the tool is to be universal. > > yes, you're right. One should take care of all cases. See a new version of > the patch attached. > > Best, > Klaus > Do you mind if I put your patch on the CTM ftp sites? I'll attribute it to you. I should add, I haven't tested them myself, but I trust that you did a good job. I don't use ctm_ramil myself. The only change I will make is to the path names in the first two lines patch, so that it can be applied the same way as my patches.