From owner-freebsd-current@FreeBSD.ORG Sun Jun 20 20:08:59 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC83616A4CE for ; Sun, 20 Jun 2004 20:08:59 +0000 (GMT) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by mx1.FreeBSD.org (Postfix) with ESMTP id 699C143D53 for ; Sun, 20 Jun 2004 20:08:59 +0000 (GMT) (envelope-from max@love2party.net) Received: from [212.227.126.209] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1Bc8cW-0005YN-00; Sun, 20 Jun 2004 22:08:52 +0200 Received: from [217.227.145.110] (helo=donor.laier.local) by mrelayng.kundenserver.de with asmtp (TLSv1:RC4-MD5:128) (Exim 3.35 #1) id 1Bc8cW-00078G-00; Sun, 20 Jun 2004 22:08:52 +0200 From: Max Laier To: freebsd-current@freebsd.org Date: Sun, 20 Jun 2004 22:09:59 +0200 User-Agent: KMail/1.6.2 References: <20040619190814.96149.qmail@web50706.mail.yahoo.com> In-Reply-To: <20040619190814.96149.qmail@web50706.mail.yahoo.com> MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Boundary-03=_X8e1AQKPZ4cjOcr"; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200406202209.59939.max@love2party.net> X-Provags-ID: kundenserver.de abuse@kundenserver.de auth:e28873fbe4dbe612ce62ab869898ff08 cc: Kim Culhan Subject: Re: -current build failure -not seen on the list X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 20:08:59 -0000 --Boundary-03=_X8e1AQKPZ4cjOcr Content-Type: multipart/mixed; boundary="Boundary-01=_X8e1AW4iU+RZ8TF" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_X8e1AW4iU+RZ8TF Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Saturday 19 June 2004 21:08, Kim Culhan wrote: > Is anyone seeing this: > > contrib/altq -I../../../contrib/ipfilter -I../../../contrib/pf > -I../../../contrib/dev/ath -I../../../contrib/dev/ath/freebsd > -I../../../contrib/ngatm -D_KERNEL -include opt_global.h -fno-common > -finline-limit=3D8000 -mno-align-long-strings > -mpreferred-stack-boundary=3D2 -ffreestanding -Werror > ../../../netinet/in_proto.c > In file included from ../../../netinet/in_proto.c:91: > ../../../contrib/pf/net/pfvar.h:55: error: redefinition of `union > sockaddr_union' > *** Error code 1 > > Is my build environment hosed ? No, this is a problem when you add both: options FAST_IPSEC and device pfsync Attached patch is a quick-fix. I will investigate a more final solution. So= rry=20 for the delay. =2D-=20 Best regards, | mlaier@freebsd.org Max Laier | ICQ #67774661 http://pf4freebsd.love2party.net/ | mlaier@EFnet --Boundary-01=_X8e1AW4iU+RZ8TF Content-Type: text/x-diff; charset="iso-8859-1"; name="sockaddr_union.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="sockaddr_union.diff" Index: pfvar.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/pf/net/pfvar.h,v retrieving revision 1.6 diff -u -r1.6 pfvar.h =2D-- pfvar.h 16 Jun 2004 23:24:00 -0000 1.6 +++ pfvar.h 20 Jun 2004 20:05:41 -0000 @@ -52,11 +52,13 @@ * If we include , we need _KERNEL definition. * This makes pfctl compilation difficult. */ +#ifndef _NETIPSEC_KEYDB_H_ union sockaddr_union { struct sockaddr sa; struct sockaddr_in sin; struct sockaddr_in6 sin6; }; +#endif #endif =20 #include --Boundary-01=_X8e1AW4iU+RZ8TF-- --Boundary-03=_X8e1AQKPZ4cjOcr Content-Type: application/pgp-signature Content-Description: signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQBA1e8XXyyEoT62BG0RAqvFAJ9HyeyxJ1NfO/EvIiEJy8HPNoudkACfVuzm OAx0+tNqG9A5K+c1JZvzfH0= =0eXC -----END PGP SIGNATURE----- --Boundary-03=_X8e1AQKPZ4cjOcr--