From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Igor Zubkov To: ALT Devel discussion list Date: Thu, 12 Oct 2006 20:50:18 +0300 User-Agent: KMail/1.9.4 References: <20061012093406.04E3EB0D94@basalt.office.altlinux.org> <452E6DE2.7040506@solin.spb.ru> In-Reply-To: <452E6DE2.7040506@solin.spb.ru> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4505236.Ra296EP1Wu"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200610122050.21994.icesik@mail.ru> Subject: Re: [devel] diald-1.0-alt4.1: rebuild failed [1] X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2006 17:53:16 -0000 Archived-At: List-Archive: List-Post: --nextPart4505236.Ra296EP1Wu Content-Type: multipart/mixed; boundary="Boundary-01=_bBoLFEixWrgMWdV" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_bBoLFEixWrgMWdV Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: base64 Content-Disposition: inline 9yDTz8/C3cXOyckgz9QgMTIgz8vU0cLS0SAyMDA2IDE5OjMxIEFsZWtzZXkgQXZkZWV2IM7B0MnT wcwoYSk6Cj4gUUEgVGVhbSBSb2JvdCDQydvF1DoKPiA+IFBhY2thZ2U6IGRpYWxkLTEuMC1hbHQ0 LjEKPiA+IFBhY2thZ2VyOiBBbGVrc2V5IEF2ZGVldiA8c29sb0BhbHRsaW51eD4KPiA+IEJ1aWxk IFN0YXRpc3RpY3M6Cj4gPiAJNCB0aW1lKHMpIChsYXN0IHRpbWU6IFR1ZSBBdWcgMTcgMjAwNCkg YnkgQWxla3NleSBBdmRlZXYgPHNvbG9AYWx0bGludXg+Cj4gPiAJMSB0aW1lKHMpIChsYXN0IHRp bWU6IFRodSBKYW4gMTIgMjAwNikgYnkgQUxUIFFBIFRlYW0gUm9ib3QKPiA+IDxxYS1yb2JvdEBh bHRsaW51eD4gU3RhdHVzOiByZWJ1aWxkIGZhaWxlZC4KPiA+IENhbm5vdCBidWlsZCB0aGlzIHBh Y2thZ2UgZm9yIDEgd2VlayhzKSAoc2luY2UgV2VkIE9jdCAwNCAyMDA2KS4KPiA+IFBsZWFzZSBp bnZlc3RpZ2F0ZS4KPgo+ICAg/NTP1CDQwcvF1CDNxc7RIMLPzNjbxSDOxSDJztTF0sXT1cXULgoK 8MHU3iDEzNEg0M/eyc7Jy8kg0NLJzMHHwcAuICjT0MXLINTP1sUgzsUg0MzPyM8gwtnMzyDC2SDQ z97J09TJ1NgpLiA7KQo= --Boundary-01=_bBoLFEixWrgMWdV Content-Type: text/x-diff; charset="iso-8859-15"; name="diald-1.0-alt-glibc25.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="diald-1.0-alt-glibc25.patch" =E6=C1=CA=CC=D9 diald-1.0.orig/access.o =C9 diald-1.0/access.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/buffer.o =C9 diald-1.0/buffer.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/bufio.o =C9 diald-1.0/bufio.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/dev.o =C9 diald-1.0/dev.o =D2=C1=DA=CC=C9=DE= =C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/diald =C9 diald-1.0/diald =D2=C1=DA=CC=C9=DE= =C1=C0=D4=D3=D1 diff -urN diald-1.0.orig/diald.c diald-1.0/diald.c =2D-- diald-1.0.orig/diald.c 2006-10-12 20:40:44 +0300 +++ diald-1.0/diald.c 2006-10-12 20:48:30 +0300 @@ -189,10 +189,10 @@ if (proxy.fd >=3D 0) FD_SET(proxy.fd, &readfds); if (snoopfd >=3D 0) FD_SET(snoopfd, &readfds); /* Compute the likely timeout for the next second boundary */ =2D ts =3D tstamp + PAUSETIME*CLK_TCK - ticks(); + ts =3D tstamp + PAUSETIME*sysconf(_SC_CLK_TCK) - ticks(); if (ts < 0) ts =3D 0; =2D timeout.tv_sec =3D ts/CLK_TCK; =2D timeout.tv_usec =3D 1000*(ts%CLK_TCK)/CLK_TCK; + timeout.tv_sec =3D ts/sysconf(_SC_CLK_TCK); + timeout.tv_usec =3D 1000*(ts%sysconf(_SC_CLK_TCK))/sysconf(_SC_CLK_TC= K); sel =3D select(256,&readfds,0,0,&timeout); if (sel < 0 && errno =3D=3D EBADF) { PIPE *p; @@ -278,7 +278,7 @@ /* check if ticks() has advanced a second since last check. * This is immune to wall clock skew because we use the ticks count. */ =2D ts =3D tstamp + PAUSETIME*CLK_TCK - ticks(); + ts =3D tstamp + PAUSETIME*sysconf(_SC_CLK_TCK) - ticks(); if (ts <=3D 0) { tstamp =3D ticks(); fire_timers(); =E6=C1=CA=CC=D9 diald-1.0.orig/diald.o =C9 diald-1.0/diald.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/filter.o =C9 diald-1.0/filter.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/firewall.o =C9 diald-1.0/firewall.o =D2=C1= =DA=CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/fsm.o =C9 diald-1.0/fsm.o =D2=C1=DA=CC=C9=DE= =C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/lock.o =C9 diald-1.0/lock.o =D2=C1=DA=CC=C9= =DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/log.o =C9 diald-1.0/log.o =D2=C1=DA=CC=C9=DE= =C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/modem.o =C9 diald-1.0/modem.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/options.o =C9 diald-1.0/options.o =D2=C1=DA= =CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/parse.o =C9 diald-1.0/parse.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/ppp.o =C9 diald-1.0/ppp.o =D2=C1=DA=CC=C9=DE= =C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/proxyarp.o =C9 diald-1.0/proxyarp.o =D2=C1= =DA=CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/proxy_dev.o =C9 diald-1.0/proxy_dev.o =D2=C1= =DA=CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/proxy.o =C9 diald-1.0/proxy.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/proxy_slip.o =C9 diald-1.0/proxy_slip.o =D2= =C1=DA=CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/proxy_tap.o =C9 diald-1.0/proxy_tap.o =D2=C1= =DA=CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/proxy_tun.o =C9 diald-1.0/proxy_tun.o =D2=C1= =DA=CC=C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/route.o =C9 diald-1.0/route.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/shell.o =C9 diald-1.0/shell.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/slip.o =C9 diald-1.0/slip.o =D2=C1=DA=CC=C9= =DE=C1=C0=D4=D3=D1 diff -urN diald-1.0.orig/timer.c diald-1.0/timer.c =2D-- diald-1.0.orig/timer.c 2006-10-12 20:40:44 +0300 +++ diald-1.0/timer.c 2006-10-12 20:48:51 +0300 @@ -36,7 +36,7 @@ unsigned long timestamp() { struct tms buf; =2D return times(&buf)/CLK_TCK; + return times(&buf)/sysconf(_SC_CLK_TCK); } =20 unsigned long ticks() =E6=C1=CA=CC=D9 diald-1.0.orig/timer.o =C9 diald-1.0/timer.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 =E6=C1=CA=CC=D9 diald-1.0.orig/utils.o =C9 diald-1.0/utils.o =D2=C1=DA=CC= =C9=DE=C1=C0=D4=D3=D1 --Boundary-01=_bBoLFEixWrgMWdV-- --nextPart4505236.Ra296EP1Wu Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQBFLoBdOBELD6yTwyQRAn+vAJ9eMb5x3+0BZb185DZI4LfwOmUYrgCgq4h2 O42ZGPWkivjMpRIQREXRzk0= =WPUt -----END PGP SIGNATURE----- --nextPart4505236.Ra296EP1Wu--