HEADSUP: if_xname changes incoming
Brooks Davis
brooks at one-eyed-alien.net
Fri Oct 31 12:29:47 PST 2003
On Fri, Oct 31, 2003 at 10:27:35AM -0800, Brooks Davis wrote:
> I will be commiting the if_xname changes momentairly. If you experience
> any problems with this commit, please let me know ASAP. I'll send an
> all clear once I've sucessfully built a world/kernel from CVS.
Ok, we're mostly clear. World builds, but I've had to disconnect
ipfstat, ipnat, and ipftest from the build because they need
modifications and are on vendor branch. IP Filter users may wish to
wait to upgrade until this issue is resolve or they may apply the
following patch locally.
The following ports are known to be broken by this commit:
devel/libgtop
devel/libgtop2
net/wmnet
net/wmnet2
Some possiably outdated patches are available at:
http://people.freebsd.org/~brooks/patches/xname-ports/
-- Brooks
Index: contrib/ipfilter/ipt.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipt.c,v
retrieving revision 1.1.1.12
diff -u -p -r1.1.1.12 ipt.c
--- contrib/ipfilter/ipt.c 15 Feb 2003 06:27:40 -0000 1.1.1.12
+++ contrib/ipfilter/ipt.c 31 Oct 2003 20:20:23 -0000
@@ -443,7 +443,8 @@ char *getifname(ptr)
void *ptr;
{
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
#else
char buf[32], *s;
int len;
@@ -458,7 +459,8 @@ void *ptr;
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X";
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
return strdup(netif.if_xname);
#else
if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
Index: contrib/ipfilter/kmem.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/kmem.c,v
retrieving revision 1.1.1.10
diff -u -p -r1.1.1.10 kmem.c
--- contrib/ipfilter/kmem.c 15 Feb 2003 06:27:40 -0000 1.1.1.10
+++ contrib/ipfilter/kmem.c 31 Oct 2003 20:20:23 -0000
@@ -204,7 +204,8 @@ void *ptr;
return ifname;
#else
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
#else
char buf[32];
int len;
@@ -219,7 +220,8 @@ void *ptr;
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X";
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__)
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) && (__FreeBSD_version >= 501113)
return strdup(netif.if_xname);
# else
if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
Index: sbin/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/Makefile,v
retrieving revision 1.128
diff -u -p -r1.128 Makefile
--- sbin/Makefile 31 Oct 2003 18:54:46 -0000 1.128
+++ sbin/Makefile 31 Oct 2003 20:20:23 -0000
@@ -87,7 +87,9 @@ SUBDIR+=devd
.if !defined(NO_IPFILTER)
SUBDIR+=ipf \
ipfs \
- ipmon
+ ipfstat \
+ ipmon \
+ ipnat
.endif
.if !defined(NOINET6)
Index: usr.sbin/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/Makefile,v
retrieving revision 1.277
diff -u -p -r1.277 Makefile
--- usr.sbin/Makefile 31 Oct 2003 18:54:46 -0000 1.277
+++ usr.sbin/Makefile 31 Oct 2003 20:20:23 -0000
@@ -142,7 +142,8 @@ SUBDIR+=mld6query \
.endif
.if !defined(NO_IPFILTER)
-SUBDIR+=ipresend \
+SUBDIR+=ipftest \
+ ipresend \
ipsend \
iptest
.endif
Index: rescue/rescue/Makefile
===================================================================
RCS file: /home/ncvs/src/rescue/rescue/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- rescue/rescue/Makefile 31 Oct 2003 19:48:40 -0000 1.20
+++ rescue/rescue/Makefile 31 Oct 2003 20:20:23 -0000
@@ -128,7 +128,7 @@ CRUNCH_PROGS_sbin+= vinum
.endif
.if !defined(NO_IPFILTER)
-CRUNCH_PROGS_sbin+= ipf ipfs ipmon
+CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat
.endif
# crunchgen does not like C++ programs; this should be fixed someday
--
Any statement of the form "X is the one, true Y" is FALSE.
PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20031031/51ff6790/attachment.bin
More information about the freebsd-current
mailing list