Date: Tue, 26 Apr 2005 18:56:08 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Darren Reed <darrenr@FreeBSD.org> Cc: current@FreeBSD.org Subject: Patchset to fix ipfilter build breakage Message-ID: <20050426155608.GF94543@ip.net.ua>
next in thread | raw e-mail | index | archive | help
--8bBEDOJVaa9YlTAt
Content-Type: multipart/mixed; boundary="cz6wLo+OExbGG7q/"
Content-Disposition: inline
--cz6wLo+OExbGG7q/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi Darren,
Maybe I could save you some time by the attached patchset.
I'm building with all of your latest changes, yet the
following problems.
Fixed by the patchset:
- libipf is made a standard library; this allows to use
ipfilter bits in rescue; also fixes "make checkdpadd",
- removed lot of NetBSD'ism from sbin/ipf/ makefiles,
- redefinition of "rcsid" in sys/contrib/ipfilter/.
Not fixed by the patchset:
- A lot of warnings when compiling on amd64 (see my
other email); they are masked by NO_WERROR in this
patchset but should be fixed of course
- rescue is still broken: the libipf library is a
culprit -- it has a lot of undefined symbols that
consumers are expected to provide, thus preventing
it to be used in rescue. When compiling a rescue
binary, it fails with the following:
: MAKEOBJDIRPREFIX=3D/usr/obj/usr/src/rescue/rescue make -f rescue.mk exe
: cc -static -o rescue rescue.o cat.lo chflags.lo chio.lo chmod.lo cp.lo da=
te.lo dd.lo df.lo echo.lo ed.lo expr.lo getfacl.lo hostname.lo kenv.lo kill=
=2Elo ln.lo ls.lo mkdir.lo mv.lo pax.lo ps.lo pwd.lo realpath.lo rm.lo rmdi=
r.lo setfacl.lo sh.lo stty.lo sync.lo test.lo rcp.lo csh.lo atacontrol.lo b=
adsect.lo bsdlabel.lo camcontrol.lo ccdconfig.lo clri.lo devfs.lo dmesg.lo =
dump.lo dumpfs.lo dumpon.lo fsck.lo fsck_ffs.lo fsck_msdosfs.lo fsdb.lo fsi=
rand.lo gbde.lo ifconfig.lo init.lo kldconfig.lo kldload.lo kldstat.lo kldu=
nload.lo ldconfig.lo md5.lo mdconfig.lo mdmfs.lo mknod.lo mount.lo mount_cd=
9660.lo mount_ext2fs.lo mount_msdosfs.lo mount_nfs.lo mount_ntfs.lo mount_n=
ullfs.lo mount_std.lo mount_udf.lo mount_umapfs.lo mount_unionfs.lo newfs.l=
o newfs_msdos.lo nos-tun.lo ping.lo reboot.lo restore.lo rcorder.lo route.l=
o routed.lo rtquery.lo rtsol.lo savecore.lo slattach.lo spppcontrol.lo star=
tslip.lo swapon.lo sysctl.lo tunefs.lo umount.lo atm.lo atmconfig.lo fore_d=
nld.lo ilmid.lo ping6.lo ipf.lo ipfs.lo ipfstat.lo ipmon.lo ipnat.lo fdisk.=
lo dhclient.lo bzip2.lo tar.lo vi.lo id.lo gzip.lo chroot.lo /usr/obj/usr/s=
rc/rescue/rescue/../librescue/exec.o /usr/obj/usr/src/rescue/rescue/../libr=
escue/getusershell.o /usr/obj/usr/src/rescue/rescue/../librescue/login_clas=
s.o /usr/obj/usr/src/rescue/rescue/../librescue/popen.o /usr/obj/usr/src/re=
scue/rescue/../librescue/rcmdsh.o /usr/obj/usr/src/rescue/rescue/../libresc=
ue/sysctl.o /usr/obj/usr/src/rescue/rescue/../librescue/system.o -lcrypt -l=
edit -lkvm -ll -lm -ltermcap -lutil -lcrypto -latm -lipf -lalias -lbsdxml -=
lcam -lcurses -ldevstat -lipsec -lipx -lgeom -lkiconv -lmd -lreadline -lsbu=
f -lufs -lz -lbz2 -larchive
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(print_toif.o)(.text+0x32): In funct=
ion `print_toif':
: : undefined reference to `use_inet6'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(nametokva.o)(.text+0x2b): In functi=
on `nametokva':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_pool.o)(.text+0xa0): In functi=
on `load_pool':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_pool.o)(.text+0xe2): In functi=
on `load_pool':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_pool.o)(.text+0x111): In funct=
ion `load_pool':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_pool.o)(.text+0x132): In funct=
ion `load_pool':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_pool.o)(.text+0x13b): more und=
efined references to `opts' follow
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(ntomask.o)(.text+0x24): In function=
`ntomask':
: : undefined reference to `use_inet6'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(ntomask.o)(.text+0x3d): In function=
`ntomask':
: : undefined reference to `use_inet6'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_poolnode.o)(.text+0xca): In fu=
nction `load_poolnode':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_poolnode.o)(.text+0xea): In fu=
nction `load_poolnode':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_poolnode.o)(.text+0x133): In f=
unction `load_poolnode':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_poolnode.o)(.text+0x13c): In f=
unction `load_poolnode':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_hashnode.o)(.text+0xbb): In fu=
nction `load_hashnode':
: : undefined reference to `opts'
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(load_hashnode.o)(.text+0xdb): more =
undefined references to `opts' follow
: /usr/obj/usr/src/tmp/usr/lib/libipf.a(printmask.o)(.text+0x2): In functio=
n `printmask':
: : undefined reference to `use_inet6'
: *** Error code 1
:=20
: Stop in /usr/obj/usr/src/rescue/rescue.
: *** Error code 1
Perhaps this is easy to fix, perhaps not. If not, this means that we won't
ship rescue with ipfilter bits, which would be very unfortunate for some
users. In this case, we can make the libipf an internal library, not
installed under /usr/lib. (This can be done by adding INTERNALLIB=3D in
sbin/ipf/libipf/Makefile, and tweaking sbin/Makefile.inc to define
LIBIPF as ${.OBJDIR}/.../libipf.a, and using ${LIBIPF} both in DPADD
and in LDADD.)
Please let me know if I can help you some more...
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--cz6wLo+OExbGG7q/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p
Content-Transfer-Encoding: quoted-printable
Index: Makefile.inc1
=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: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.492
diff -u -r1.492 Makefile.inc1
--- Makefile.inc1 6 Apr 2005 01:55:43 -0000 1.492
+++ Makefile.inc1 26 Apr 2005 15:40:05 -0000
@@ -998,6 +998,10 @@
_prebuild_libs+=3D lib/libypclnt
.endif
=20
+.if !defined(NO_IPFILTER)
+_generic_libs+=3D sbin/ipf/libipf
+.endif
+
_generic_libs+=3D usr.bin/lex/lib
=20
.if ${MACHINE_ARCH} =3D=3D "i386"
Index: share/mk/bsd.libnames.mk
=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: /home/ncvs/src/share/mk/bsd.libnames.mk,v
retrieving revision 1.94
diff -u -r1.94 bsd.libnames.mk
--- share/mk/bsd.libnames.mk 19 Apr 2005 04:01:22 -0000 1.94
+++ share/mk/bsd.libnames.mk 26 Apr 2005 15:40:05 -0000
@@ -53,6 +53,9 @@
LIBHISTORY?=3D ${DESTDIR}${LIBDIR}/libhistory.a
LIBIPSEC?=3D ${DESTDIR}${LIBDIR}/libipsec.a
LIBIPX?=3D ${DESTDIR}${LIBDIR}/libipx.a
+.if !defined(NO_IPFILTER)
+LIBIPF?=3D ${DESTDIR}${LIBDIR}/libipf.a
+.endif
.if !defined(NO_BIND) && defined(WITH_BIND_LIBS)
LIBISC?=3D ${DESTDIR}${LIBDIR}/libisc.a
LIBISCCC?=3D ${DESTDIR}${LIBDIR}/libisccc.a
Index: rescue/rescue/Makefile
=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: /home/ncvs/src/rescue/rescue/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- rescue/rescue/Makefile 18 Mar 2005 12:55:07 -0000 1.42
+++ rescue/rescue/Makefile 26 Apr 2005 15:40:06 -0000
@@ -125,6 +125,7 @@
=20
.if !defined(NO_IPFILTER)
CRUNCH_PROGS_sbin+=3D ipf ipfs ipfstat ipmon ipnat
+CRUNCH_LIBS+=3D -lipf
.endif
=20
# crunchgen does not like C++ programs; this should be fixed someday
@@ -166,6 +167,11 @@
CRUNCH_SRCDIR_fore_dnld=3D $(.CURDIR)/../../sbin/atm/fore_dnld
CRUNCH_SRCDIR_ilmid=3D $(.CURDIR)/../../sbin/atm/ilmid
CRUNCH_SRCDIR_rtquery=3D $(.CURDIR)/../../sbin/routed/rtquery
+CRUNCH_SRCDIR_ipf=3D $(.CURDIR)/../../sbin/ipf/ipf
+CRUNCH_SRCDIR_ipfs=3D $(.CURDIR)/../../sbin/ipf/ipfs
+CRUNCH_SRCDIR_ipfstat=3D $(.CURDIR)/../../sbin/ipf/ipfstat
+CRUNCH_SRCDIR_ipmon=3D $(.CURDIR)/../../sbin/ipf/ipmon
+CRUNCH_SRCDIR_ipnat=3D $(.CURDIR)/../../sbin/ipf/ipnat
CRUNCH_ALIAS_reboot=3D fastboot halt fasthalt
CRUNCH_ALIAS_restore=3D rrestore
CRUNCH_ALIAS_dump=3D rdump
Index: sbin/ipf/Makefile.inc
=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: /home/ncvs/src/sbin/ipf/Makefile.inc,v
retrieving revision 1.1
diff -u -r1.1 Makefile.inc
--- sbin/ipf/Makefile.inc 25 Apr 2005 18:55:50 -0000 1.1
+++ sbin/ipf/Makefile.inc 26 Apr 2005 15:40:06 -0000
@@ -1,6 +1,4 @@
-# $FreeBSD: src/sbin/ipf/Makefile.inc,v 1.1 2005/04/25 18:55:50 darrenr Ex=
p $
-
-.include <bsd.own.mk>
+# $FreeBSD: src/sbin/ipf/Makefile.inc,v 1.1 2005/04/25 18:55:50 darrenr Ex=
p $
=20
CFLAGS+=3D -I${.CURDIR}/../../../contrib/ipfilter
CFLAGS+=3D -I${.CURDIR}/../../../contrib/ipfilter/tools
@@ -8,9 +6,8 @@
CFLAGS+=3D -I${.CURDIR}/../../../sys/contrib/ipfilter
CFLAGS+=3D -DSTATETOP -D__UIO_EXPOSE
=20
-IPFOBJDIR=3D ${.OBJDIR}/../libipf
-DPADD+=3D ${IPFOBJDIR}/libipf.a ${LIBKVM}
-LDADD+=3D -L${IPFOBJDIR} -lipf -lkvm
+DPADD+=3D ${LIBIPF} ${LIBKVM}
+LDADD+=3D -lipf -lkvm
=20
CLEANFILES+=3D y.tab.c y.tab.h
=20
@@ -19,6 +16,4 @@
${.CURDIR}/../../../contrib/ipfilter/tools \
${.CURDIR}/../../../contrib/ipfilter/man
=20
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
+.include "../Makefile.inc"
Index: sbin/ipf/ipf/Makefile
=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: /home/ncvs/src/sbin/ipf/ipf/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sbin/ipf/ipf/Makefile 25 Apr 2005 18:55:50 -0000 1.1
+++ sbin/ipf/ipf/Makefile 26 Apr 2005 15:40:06 -0000
@@ -14,7 +14,6 @@
CLEANFILES+=3D ipf_l.c ipf_l.h
=20
ipf_y.c: ipf_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ipf_yy/g' \
-e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
@@ -25,20 +24,13 @@
ipf_y.h: ipf_y.c
=20
ipf_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
-e 's/y.tab.h/ipf_y.h/' \
-e 's/lexer.h/ipf_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ipf_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
-BINDIR=3D /sbin
-.if defined(NO_DYNAMICROOT)
-LDSTATIC?=3D -static
-.endif
-
.include <bsd.prog.mk>
Index: sbin/ipf/ipftest/Makefile
=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: /home/ncvs/src/sbin/ipf/ipftest/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sbin/ipf/ipftest/Makefile 26 Apr 2005 15:35:50 -0000 1.2
+++ sbin/ipf/ipftest/Makefile 26 Apr 2005 15:40:11 -0000
@@ -1,6 +1,6 @@
# $FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.2 2005/04/26 15:35:50 darren=
r Exp $
=20
-NOGCCERROR=3D # defined
+NO_WERROR=3D # XXX
=20
.include <bsd.own.mk>
=20
@@ -30,7 +30,6 @@
CLEANFILES+=3D ippool.tab.c ippool.tab.h
=20
ipnat_y.c: ipnat_y.y
- ${_MKTARGET_CREATE}
${YACC} -b ipnat -d ${.ALLSRC}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.c/ipnat_y.c/' \
@@ -43,19 +42,16 @@
ipnat_y.h: ipnat_y.c
=20
ipnat_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.h/ipnat_y.h/' \
-e 's/lexer.h/ipnat_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ipnat_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
ippool_y.c: ippool_y.y
- ${_MKTARGET_CREATE}
${YACC} -b ippool -d ${.ALLSRC}
sed -e 's/yy/ippool_yy/g' \
-e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
@@ -66,19 +62,16 @@
ippool_y.h: ippool_y.c
=20
ippool_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
-e 's/y.tab.h/ippool_y.h/' \
-e 's/lexer.h/ippool_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ippool_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
ipf_y.c: ipf_y.y
- ${_MKTARGET_CREATE}
${YACC} -b ipf -d ${.ALLSRC}
sed -e 's/yy/ipf_yy/g' \
-e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
@@ -89,14 +82,12 @@
ipf_y.h: ipf_y.c
=20
ipf_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
-e 's/y.tab.h/ipf_y.h/' \
-e 's/lexer.h/ipf_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ipf_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipf_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
Index: sbin/ipf/ipmon/Makefile
=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: /home/ncvs/src/sbin/ipf/ipmon/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sbin/ipf/ipmon/Makefile 25 Apr 2005 18:55:51 -0000 1.1
+++ sbin/ipf/ipmon/Makefile 26 Apr 2005 15:40:11 -0000
@@ -3,6 +3,7 @@
PROG=3D ipmon
SRCS=3D ipmon.c ipmon_y.c ipmon_l.c
MAN=3D ipmon.8
+NO_WERROR=3D # XXX
=20
CFLAGS+=3D -DLOGFAC=3DLOG_LOCAL0 -I.
=20
@@ -12,7 +13,6 @@
CLEANFILES+=3D ipmon_l.c ipmon_l.h
=20
ipmon_y.c: ipmon_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ipmon_yy/g' \
-e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \
@@ -23,14 +23,12 @@
ipmon_y.h: ipmon_y.c
=20
ipmon_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipmon_yy/g' \
-e 's/y.tab.h/ipmon_y.h/' \
-e 's/lexer.h/ipmon_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ipmon_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipmon_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
Index: sbin/ipf/ipnat/Makefile
=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: /home/ncvs/src/sbin/ipf/ipnat/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sbin/ipf/ipnat/Makefile 25 Apr 2005 18:55:51 -0000 1.1
+++ sbin/ipf/ipnat/Makefile 26 Apr 2005 15:40:11 -0000
@@ -12,7 +12,6 @@
CLEANFILES+=3D ipnat_l.c ipnat_l.h
=20
ipnat_y.c: ipnat_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.c/ipnat_y.c/' \
@@ -25,14 +24,12 @@
ipnat_y.h: ipnat_y.c
=20
ipnat_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
-e 's/y.tab.h/ipnat_y.h/' \
-e 's/lexer.h/ipnat_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ipnat_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ipnat_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
Index: sbin/ipf/ippool/Makefile
=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: /home/ncvs/src/sbin/ipf/ippool/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sbin/ipf/ippool/Makefile 25 Apr 2005 18:55:51 -0000 1.1
+++ sbin/ipf/ippool/Makefile 26 Apr 2005 15:40:11 -0000
@@ -4,6 +4,7 @@
SRCS=3D ippool_y.c ippool_l.c kmem.c ippool.c
MAN=3D ippool.5 ippool.8
CFLAGS+=3D -I.
+NO_WERROR=3D # XXX
=20
DPSRCS+=3D ippool_l.h ippool_y.h
=20
@@ -11,7 +12,6 @@
CLEANFILES+=3D ippool_l.c ippool_l.h
=20
ippool_y.c: ippool_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
sed -e 's/yy/ippool_yy/g' \
-e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
@@ -22,14 +22,12 @@
ippool_y.h: ippool_y.c
=20
ippool_l.c: lexer.c
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
-e 's/y.tab.h/ippool_y.h/' \
-e 's/lexer.h/ippool_l.h/' \
${.ALLSRC} > ${.TARGET}
=20
ippool_l.h: lexer.h
- ${_MKTARGET_CREATE}
sed -e 's/yy/ippool_yy/g' \
${.ALLSRC} > ${.TARGET}
=20
Index: sbin/ipf/ipsend/Makefile
=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: /home/ncvs/src/sbin/ipf/ipsend/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sbin/ipf/ipsend/Makefile 25 Apr 2005 18:55:51 -0000 1.1
+++ sbin/ipf/ipsend/Makefile 26 Apr 2005 15:40:11 -0000
@@ -23,7 +23,6 @@
${NETBSDSRCDIR}/dist/ipf/iplang
=20
iplang_y.c: iplang_y.y
- ${_MKTARGET_CREATE}
${YACC} -d ${.ALLSRC}
mv y.tab.c ${.TARGET}
mv y.tab.h ${.TARGET:.c=3D.h}
Index: sbin/ipf/libipf/Makefile
=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: /home/ncvs/src/sbin/ipf/libipf/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sbin/ipf/libipf/Makefile 25 Apr 2005 18:55:52 -0000 1.1
+++ sbin/ipf/libipf/Makefile 26 Apr 2005 15:40:11 -0000
@@ -1,11 +1,7 @@
-# $FreeBSD: src/sbin/ipf/libipf/Makefile,v 1.1 2005/04/25 18:55:52 darrenr=
Exp $
-
-MKPRIVATELIB=3D yes
-USE_SHLIBDIR=3D yes
-
-NOGCCERROR=3D # defined
+# $FreeBSD: src/sbin/ipf/libipf/Makefile,v 1.1 2005/04/25 18:55:52 darrenr=
Exp $
=20
LIB=3D ipf
+NO_WERROR=3D # XXX
=20
SRCS=3D addicmp.c addipopt.c addkeep.c bcopywrap.c binprint.c \
buildopts.c checkrev.c count6bits.c count4bits.c debug.c \
Index: sys/contrib/ipfilter/netinet/fil.c
=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: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v
retrieving revision 1.44
diff -u -r1.44 fil.c
--- sys/contrib/ipfilter/netinet/fil.c 25 Apr 2005 18:43:13 -0000 1.44
+++ sys/contrib/ipfilter/netinet/fil.c 26 Apr 2005 15:40:55 -0000
@@ -136,7 +136,7 @@
=20
#if !defined(lint)
static const char sccsid[] =3D "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren=
Reed";
-static const char rcsid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/neti=
net/fil.c,v 1.44 2005/04/25 18:43:13 darrenr Exp $";
+static const char fbsdid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/net=
inet/fil.c,v 1.44 2005/04/25 18:43:13 darrenr Exp $";
static const char rcsid[] =3D "@(#)Id: fil.c,v 2.243.2.57 2005/03/28 10:47=
:50 darrenr Exp";
#endif
=20
Index: sys/contrib/ipfilter/netinet/ip_auth.c
=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: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_auth.c,v
retrieving revision 1.39
diff -u -r1.39 ip_auth.c
--- sys/contrib/ipfilter/netinet/ip_auth.c 25 Apr 2005 18:43:13 -0000 1.39
+++ sys/contrib/ipfilter/netinet/ip_auth.c 26 Apr 2005 15:40:58 -0000
@@ -119,7 +119,7 @@
/* END OF INCLUDES */
=20
#if !defined(lint)
-static const char rcsid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/neti=
net/ip_auth.c,v 1.39 2005/04/25 18:43:13 darrenr Exp $";
+static const char fbsdid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/net=
inet/ip_auth.c,v 1.39 2005/04/25 18:43:13 darrenr Exp $";
static const char rcsid[] =3D "@(#)Id: ip_auth.c,v 2.73.2.3 2004/08/26 11:=
25:21 darrenr Exp";
#endif
=20
Index: sys/contrib/ipfilter/netinet/ip_frag.c
=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: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_frag.c,v
retrieving revision 1.27
diff -u -r1.27 ip_frag.c
--- sys/contrib/ipfilter/netinet/ip_frag.c 25 Apr 2005 18:43:14 -0000 1.27
+++ sys/contrib/ipfilter/netinet/ip_frag.c 26 Apr 2005 15:41:01 -0000
@@ -102,7 +102,7 @@
=20
#if !defined(lint)
static const char sccsid[] =3D "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 D=
arren Reed";
-static const char rcsid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/neti=
net/ip_frag.c,v 1.27 2005/04/25 18:43:14 darrenr Exp $";
+static const char fbsdid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/net=
inet/ip_frag.c,v 1.27 2005/04/25 18:43:14 darrenr Exp $";
static const char rcsid[] =3D "@(#)Id: ip_frag.c,v 2.77 2004/01/27 00:24:5=
4 darrenr Exp";
#endif
=20
Index: sys/contrib/ipfilter/netinet/ip_nat.c
=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: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_nat.c,v
retrieving revision 1.38
diff -u -r1.38 ip_nat.c
--- sys/contrib/ipfilter/netinet/ip_nat.c 25 Apr 2005 18:43:14 -0000 1.38
+++ sys/contrib/ipfilter/netinet/ip_nat.c 26 Apr 2005 15:41:59 -0000
@@ -107,7 +107,7 @@
=20
#if !defined(lint)
static const char sccsid[] =3D "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren R=
eed";
-static const char rcsid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/neti=
net/ip_nat.c,v 1.38 2005/04/25 18:43:14 darrenr Exp $";
+static const char fbsdid[] =3D "@(#)$FreeBSD: src/sys/contrib/ipfilter/net=
inet/ip_nat.c,v 1.38 2005/04/25 18:43:14 darrenr Exp $";
static const char rcsid[] =3D "@(#)Id: ip_nat.c,v 2.195.2.38 2005/03/28 11=
:09:54 darrenr Exp";
#endif
=20
--cz6wLo+OExbGG7q/--
--8bBEDOJVaa9YlTAt
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)
iD8DBQFCbmSYqRfpzJluFF4RAoxtAJoD8eFq0GCOhYbXVJvrLQbmn9T11ACeKt90
7CpzAGbDeea0KrKav43fwYA=
=uQX4
-----END PGP SIGNATURE-----
--8bBEDOJVaa9YlTAt--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050426155608.GF94543>