cvs commit: src/contrib/ipfilter - Imported sources

[Ruslan Ermilov]

On Tue, Apr 26, 2005 at 02:59:27PM +0000, Darren Reed wrote:
> darrenr     2005-04-26 14:59:27 UTC
> 
>   FreeBSD src repository
> 
>   src/contrib/ipfilter - Imported sources
>   Update of /home/ncvs/src/contrib/ipfilter
>   In directory repoman.freebsd.org:/tmp/cvs-serv12244
>   
>   Log Message:
>   Missing file from vendor branch import.
>   
>   Status:
>   
>   Vendor Tag:	DARRENR
>   Release Tags:	v4-1-8
>   		
>   C src/contrib/ipfilter/ip_fil.c
>   
>   1 conflicts created by this import.
>   Use the following command to help the merge:
>   
>   	cvs checkout -jDARRENR:yesterday -jDARRENR src/contrib/ipfilter
>   
Here's some more changes that are needed in contrib/ipfilter:

%%%
Index: tools/ipfs.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/tools/ipfs.c,v
retrieving revision 1.2
diff -u -r1.2 ipfs.c
--- tools/ipfs.c	25 Apr 2005 18:20:15 -0000	1.2
+++ tools/ipfs.c	26 Apr 2005 14:56:11 -0000
@@ -41,7 +41,7 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include "ipf.h"
-#include "ipl.h"
+#include "netinet/ipl.h"
 
 #if !defined(lint)
 static const char rcsid[] = "@(#)Id: ipfs.c,v 1.12 2003/12/01 01:56:53 darrenr Exp";
Index: tools/ipnat.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/tools/ipnat.c,v
retrieving revision 1.2
diff -u -r1.2 ipnat.c
--- tools/ipnat.c	25 Apr 2005 18:20:15 -0000	1.2
+++ tools/ipnat.c	26 Apr 2005 15:00:49 -0000
@@ -51,7 +51,7 @@
 # include <nlist.h>
 #endif
 #include "ipf.h"
-#include "ipl.h"
+#include "netinet/ipl.h"
 #include "kmem.h"
 
 #ifdef	__hpux
%%%

I've temporarily disconnected (locally) ipftest from build, but I hope
the above commit (after merging changes) will fix it.  I'm now working
on fixing the rescue build, by making a libipf a true library with a
namespace in bsd.libnames.mk (though I must admit the location choosen
for the library is far from the best, and will require some magic).


Cheers,
-- 
Ruslan Ermilov
ru at 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/cvs-all/attachments/20050426/9cd60180/attachment.bin