David Wolfskill
2004-Jul-04 07:07 UTC
-STABLE build appears broken after ipfilter 3.4.35 MFC
[I sent a copy of this information under separate cover to Darren Reed a little while ago. dhw] Near the end of a "make buildworld" after the commit I see:>>> Rebuilding the temporary build tree >>> stage 1: bootstrap tools >>> stage 2: rebuilding the object tree >>> stage 2: build tools >>> stage 3: cross tools >>> stage 4: populating /usr/obj/usr/src/i386/usr/include >>> stage 4: building libraries >>> stage 4: make dependencies >>> stage 4: building everything..... ===> usr.sbin/ipftest cc -O -pipe -DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DIPFILTER_LOG -I- -I/usr/obj/usr/src/usr.sbin/ipftest -I/usr/src/usr.sbin/ipftest/../../sys/contrib/ipfilter -I/usr/src/usr.sbin/ipftest/../../sys -I/usr/src/usr.sbin/ipftest/../../contrib/ipfilter -c /usr/src/usr.sbin/ipftest/../../contrib/ipfilter/fil.c /usr/src/usr.sbin/ipftest/../../contrib/ipfilter/fil.c:196: conflicting types for `fr_makefrip' /usr/src/usr.sbin/ipftest/../../sys/contrib/ipfilter/netinet/ip_fil.h:633: previous declaration of `fr_makefrip' *** Error code 1 Stop in /usr/src/usr.sbin/ipftest. *** Error code 1 Stop in /usr/src/usr.sbin. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. freebeast(4.10-S)[4] The fil.c:196 (1.1.1.10.2.8, from Sat Mar 1 12:01:36 2003) chunk looks like (cut/paste): ./contrib/ipfilter/fil.c-193- * which is useful for comparing IP headers with. ./contrib/ipfilter/fil.c-194- */ ./contrib/ipfilter/fil.c:195:void fr_makefrip(hlen, ip, fin) ./contrib/ipfilter/fil.c-196-int hlen; ./contrib/ipfilter/fil.c-197-ip_t *ip; -- ./contrib/ipfilter/fil.c-946- fin->fin_out = out; ./contrib/ipfilter/fil.c-947- fin->fin_mp = mp; ./contrib/ipfilter/fil.c:948: fr_makefrip(hlen, ip, fin); ./contrib/ipfilter/fil.c-949- ./contrib/ipfilter/fil.c-950-#ifdef _KERNEL -- ./contrib/ipfilter/ip_fil.c-1320-# endif ./contrib/ipfilter/ip_fil.c-1321- ./contrib/ipfilter/ip_fil.c:1322: fr_makefrip(hlen, ip, &frn); ./contrib/ipfilter/ip_fil.c-1323- ./contrib/ipfilter/ip_fil.c-1324- error = ipfr_fastroute(m, mp, &frn, NULL); while the ip_fil.h (1.18.2.6, from Sun Jul 4 11:37:50 2004) chunk looks like (cut/paste): ./contrib/ipfilter/ip_fil.h-629-extern int fr_ifpaddr __P((int, void *, struct in_addr *)); ./contrib/ipfilter/ip_fil.h-630-extern int fr_lock __P((caddr_t, int *)); ./contrib/ipfilter/ip_fil.h:631:extern void fr_makefrip __P((int, ip_t *, fr_info_t *)); ./contrib/ipfilter/ip_fil.h-632-extern u_short fr_tcpsum __P((mb_t *, ip_t *, tcphdr_t *)); ./contrib/ipfilter/ip_fil.h-633-extern int fr_scanlist __P((u_32_t, ip_t *, fr_info_t *, void *)); It appears that /usr/src/usr.sbin/ipftest is still around in -STABLE, but is rather less of a problem in -CURRENT. In the mean time, -STABLE builds appear to be broken. Suggestions? Thanks, david -- David H. Wolfskill david@catwhisker.org I do not "unsubscribe" from email "services" to which I have not explicitly subscribed. Rather, I block spammers' access to SMTP servers I control, and encourage others who are in a position to do so to do likewise.
Ruslan Ermilov
2004-Jul-04 09:57 UTC
-STABLE build appears broken after ipfilter 3.4.35 MFC
On Sun, Jul 04, 2004 at 07:07:47AM -0700, David Wolfskill wrote:> [I sent a copy of this information under separate cover to Darren Reed > a little while ago. dhw] > > Near the end of a "make buildworld" after the commit I see: > > >>> Rebuilding the temporary build tree > >>> stage 1: bootstrap tools > >>> stage 2: rebuilding the object tree > >>> stage 2: build tools > >>> stage 3: cross tools > >>> stage 4: populating /usr/obj/usr/src/i386/usr/include > >>> stage 4: building libraries > >>> stage 4: make dependencies > >>> stage 4: building everything.. > ... > ===> usr.sbin/ipftest > cc -O -pipe -DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DIPFILTER_LOG -I- -I/usr/obj/usr/src/usr.sbin/ipftest -I/usr/src/usr.sbin/ipftest/../../sys/contrib/ipfilter -I/usr/src/usr.sbin/ipftest/../../sys -I/usr/src/usr.sbin/ipftest/../../contrib/ipfilter -c /usr/src/usr.sbin/ipftest/../../contrib/ipfilter/fil.c > /usr/src/usr.sbin/ipftest/../../contrib/ipfilter/fil.c:196: conflicting types for `fr_makefrip' > /usr/src/usr.sbin/ipftest/../../sys/contrib/ipfilter/netinet/ip_fil.h:633: previous declaration of `fr_makefrip' > *** Error code 1 > > Stop in /usr/src/usr.sbin/ipftest. > *** Error code 1 >I don't know what's wrong at your side, but this definitely compiles correctly here (I have a daily -STABLE buildworld running, and it doesn't indicate the problem. Looking at the files/lines the above mentions, I see that fr_makefrip() is declared identically in both places. Could it be that you have some local changes to one of these files? Cheers, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 187 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20040704/b2afc9a7/attachment.bin