Hi Randy, Here is the diff in the order you requested. In case it helps others, I'm also posting it the list.
Cheers, Matt. # diff ip_fil4.1.15.ORIG ip_fil.wip2 Common subdirectories: ip_fil4.1.15.ORIG/4bsd and ip_fil.wip2/4bsd Common subdirectories: ip_fil4.1.15.ORIG/AIX and ip_fil.wip2/AIX Common subdirectories: ip_fil4.1.15.ORIG/BSD and ip_fil.wip2/BSD Common subdirectories: ip_fil4.1.15.ORIG/BSDOS and ip_fil.wip2/BSDOS Common subdirectories: ip_fil4.1.15.ORIG/BSDOS3 and ip_fil.wip2/BSDOS3 Common subdirectories: ip_fil4.1.15.ORIG/BSDOS4 and ip_fil.wip2/BSDOS4 Common subdirectories: ip_fil4.1.15.ORIG/FWTK and ip_fil.wip2/FWTK Common subdirectories: ip_fil4.1.15.ORIG/FreeBSD and ip_fil.wip2/FreeBSD Common subdirectories: ip_fil4.1.15.ORIG/FreeBSD-2.2 and ip_fil.wip2/FreeBSD-2.2 Common subdirectories: ip_fil4.1.15.ORIG/FreeBSD-3 and ip_fil.wip2/FreeBSD-3 Common subdirectories: ip_fil4.1.15.ORIG/FreeBSD-4.0 and ip_fil.wip2/FreeBSD-4.0 Common subdirectories: ip_fil4.1.15.ORIG/HPUX and ip_fil.wip2/HPUX Common subdirectories: ip_fil4.1.15.ORIG/IRIX and ip_fil.wip2/IRIX Common subdirectories: ip_fil4.1.15.ORIG/Linux and ip_fil.wip2/Linux Common subdirectories: ip_fil4.1.15.ORIG/NetBSD and ip_fil.wip2/NetBSD Common subdirectories: ip_fil4.1.15.ORIG/NetBSD-1.2 and ip_fil.wip2/NetBSD-1.2 Common subdirectories: ip_fil4.1.15.ORIG/OSF and ip_fil.wip2/OSF Common subdirectories: ip_fil4.1.15.ORIG/OpenBSD and ip_fil.wip2/OpenBSD Common subdirectories: ip_fil4.1.15.ORIG/OpenBSD-2 and ip_fil.wip2/OpenBSD-2 Common subdirectories: ip_fil4.1.15.ORIG/OpenBSD-3 and ip_fil.wip2/OpenBSD-3 Common subdirectories: ip_fil4.1.15.ORIG/SunOS4 and ip_fil.wip2/SunOS4 Common subdirectories: ip_fil4.1.15.ORIG/SunOS5 and ip_fil.wip2/SunOS5 Common subdirectories: ip_fil4.1.15.ORIG/etc and ip_fil.wip2/etc diff ip_fil4.1.15.ORIG/fil.c ip_fil.wip2/fil.c 83c83 < #if !defined(_KERNEL) && defined(__FreeBSD__) --- > #if !defined(_KERNEL) && (defined(__FreeBSD__) || defined(__osf__)) /* MJM: > 24-Nov-2006 */ diff ip_fil4.1.15.ORIG/ip_fil.c ip_fil.wip2/ip_fil.c 83c83 < #if defined(__FreeBSD__) --- > #if !defined(_KERNEL) && (defined(__FreeBSD__) || defined(__osf__)) /* MJM: > 24-Nov-2006 */ 101c101 < #if defined(__osf__) || defined(__hpux) || defined(__sgi) --- > #if (defined(_KERNEL) && defined(__osf__)) || defined(__hpux) || > defined(__sgi) /* MJM: 27-Nov-2006 */ diff ip_fil4.1.15.ORIG/ip_fil.h ip_fil.wip2/ip_fil.h 1260c1260 < # ifdef BSD --- > # if defined(BSD) && !defined(__osf__) /* MJM: 24-Nov-2006 */ diff ip_fil4.1.15.ORIG/ip_fil_osf.c ip_fil.wip2/ip_fil_osf.c 56a57,63 > > #if defined(__osf__) > struct proc global_proc, *curproc = &global_proc; > #define p_uid p_ruid > #endif > > #if !defined(_KERNEL) 61,67c68,76 < #define radix_mask ipf_radix_mask < #define radix_node ipf_radix_node < #define radix_node_head ipf_radix_node_head < #include "netinet/ip_pool.h" < #undef radix_mask < #undef radix_node < #undef radix_node_head --- > # define radix_mask ipf_radix_mask > # define radix_node ipf_radix_node > # define radix_node_head ipf_radix_node_head > # include "netinet/ip_pool.h" > # undef radix_mask > # undef radix_node > # undef radix_node_head > #endif > diff ip_fil4.1.15.ORIG/ip_pool.c ip_fil.wip2/ip_pool.c 59c59 < # include <net/radix.h> --- > # include "radix_ipf.h" /* MJM: 27-Nov-2006 */ diff ip_fil4.1.15.ORIG/ip_pool.h ip_fil.wip2/ip_pool.h 19c19 < # if defined(__osf__) || defined(__hpux) --- > # if defined(__hpux) /* MJM: 27-Nov-2006 - osf no longer depends on > radix_ipf_local.h */ Only in ip_fil.wip2: ip_rules.h Only in ip_fil.wip2: ipf diff ip_fil4.1.15.ORIG/ipf.h ip_fil.wip2/ipf.h 13c13 < #if defined(__osf__) --- > #if defined(__osf__) && defined(_KERNEL) /* MJM: 27-Nov-2006 */ Only in ip_fil.wip2: ipftest Common subdirectories: ip_fil4.1.15.ORIG/iplang and ip_fil.wip2/iplang Only in ip_fil.wip2: ipmon Only in ip_fil.wip2: ipnat Only in ip_fil.wip2: ippool Only in ip_fil.wip2: ipscan Common subdirectories: ip_fil4.1.15.ORIG/ipsd and ip_fil.wip2/ipsd Common subdirectories: ip_fil4.1.15.ORIG/ipsend and ip_fil.wip2/ipsend Only in ip_fil.wip2: ipsyncm Only in ip_fil.wip2: ipsyncs Common subdirectories: ip_fil4.1.15.ORIG/l4check and ip_fil.wip2/l4check Common subdirectories: ip_fil4.1.15.ORIG/lib and ip_fil.wip2/lib Common subdirectories: ip_fil4.1.15.ORIG/man and ip_fil.wip2/man Common subdirectories: ip_fil4.1.15.ORIG/net and ip_fil.wip2/net Common subdirectories: ip_fil4.1.15.ORIG/netinet and ip_fil.wip2/netinet Common subdirectories: ip_fil4.1.15.ORIG/perl and ip_fil.wip2/perl Common subdirectories: ip_fil4.1.15.ORIG/rules and ip_fil.wip2/rules Common subdirectories: ip_fil4.1.15.ORIG/samples and ip_fil.wip2/samples Common subdirectories: ip_fil4.1.15.ORIG/test and ip_fil.wip2/test Common subdirectories: ip_fil4.1.15.ORIG/tools and ip_fil.wip2/tools > -----Original Message----- > From: Bradley Randy [mailto:[EMAIL PROTECTED] > Sent: Thursday, 1 February 2007 12:46 AM > To: Muggeridge, Matt > Subject: RE: compiling ipfilter 4.1 on tru64 5.1b > > Matt, > > I'm interested in using "IP Filter" on our Tru64 systems. I saw your > thread from last November on mail-archive.com. I had the same problem as > Greg Rudd when I tried to compile 4.1 so I'm looking at using your patches > to 4.1.15. > If it isn't too much trouble, could you run the 'diff' again except > this > time use the original directory for the first parameter and the changed > directory for the second? I tried using the -R option which seemed to > work > for most of the files, but not all. > > Thanks, > > Randy > > > > > > ****************************************** > > Randy Bradley > > IT Specialist > > USDA, ARS > > Clay Center, NE 68933 > > > > [EMAIL PROTECTED] > > phone: 402-762-4156 > > ****************************************** > >
