ntpd errors after upgrade on current amd64

[Cy Schubert]

In message <551DA257.6060100 at FreeBSD.org>, Jung-uk Kim writes:
> This is a multi-part message in MIME format.
> --------------090800070300040107060309
> Content-Type: text/plain; charset=utf-8
> Content-Transfer-Encoding: 8bit
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
> 
> On 04/01/2015 11:32, Manfred Antar wrote:
> > After build install world on current ntpd doesn't work. Here is
> > error:
> > 
> > FreeBSD/amd64 (pozo.com) (ttyu0)
> > 
> > login: Apr  1 08:29:19 pozo ntpd[49825]: line 22 column 1 syntax
> > error
> 
> ntp_crypto.c was not properly merged.  Basically, the fix for
> SA-14:31.ntp was applied twice.  Please try the attached patch.
> 
> > Apr  1 08:29:19 pozo ntpd[49825]: setsockopt IPV6_MULTICAST_IF 0
> > for fe80::1%2 fails: Can't assign requested address
> 
> A separate issue, I think.
> 
> Jung-uk Kim
> 
> * Note: ntp_parser.y is redundant and it was the root cause of
> inconsistent builds and build failures, i.e., ntp_parser.c and
> ntp_parser.h may be regenerated on the *source* directory depending on
> phase of the moon.  Although we can re-gen them after r280915,
> upstream does not support BSD yacc.

Ntp_parser.y is not redundant. It is referenced by ntp_parser.c. I put that 
fix in two days ago.

I'll re-merge based on your second patch/the posted fix. I'll try it first 
in the port though.


-- 
Cheers,
Cy Schubert <Cy.Schubert at komquats.com> or <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.