[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfilter
Subject:    re: looking for the *correct* 3.4.17 patch...
From:       "Stephen Hilton" <nospam () hiltonbsd ! com>
Date:       2001-04-27 17:14:42
[Download RAW message or body]

I think this is the correct patch for 3.4.17 posted by Cy Schubert
on 04-13-2001, I have used this with success several times.

Thank's Mr. Schubert

-------------------------------------------------------------------

--- fils.c.orig	Fri Dec  1 16:13:56 2000
+++ fils.c	Fri Apr 13 07:26:14 2001
@@ -5,8 +5,14 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  */
-#ifdef  __FreeBSD__
-# include <osreldate.h>
+#ifdef __FreeBSD__
+# ifndef __FreeBSD_cc_version
+#  include <osreldate.h>
+# else
+#  if __FreeBSD_cc_version < 430000
+#   include <osreldate.h>
+#  endif
+# endif
 #endif
 #include <stdio.h>
 #include <string.h>
--- ip_compat.h.orig	Tue Apr  3 07:13:35 2001
+++ ip_compat.h	Fri Apr 13 09:07:00 2001
@@ -264,10 +264,26 @@
 
 #if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
 # ifdef IPFILTER_LKM
-#  include <osreldate.h>
+#  ifndef __FreeBSD_cc_version
+#   include <osreldate.h>
+#  else
+#   if __FreeBSD_cc_version < 430000
+#    include <osreldate.h>
+#   else
+#    include <sys/param.h>
+#   endif
+#  endif
 #  define       ACTUALLY_LKM_NOT_KERNEL
 # else
-#  include <sys/osreldate.h>
+#  ifndef __FreeBSD_cc_version
+#   include <sys/osreldate.h>
+#  else
+#   if __FreeBSD_cc_version < 430000
+#    include <sys/osreldate.h>
+#   else
+#    include <sys/param.h>
+#   endif
+#  endif
 # endif
 # if __FreeBSD__ < 3
 #  include <machine/spl.h>
--- ip_fil.c.orig	Tue Apr  3 07:13:37 2001
+++ ip_fil.c	Fri Apr 13 09:07:10 2001
@@ -28,7 +28,13 @@
 #endif
 #if defined(__FreeBSD__) && !defined(__FreeBSD_version)
 # if !defined(_KERNEL) || defined(IPFILTER_LKM)
-#  include <osreldate.h>
+#  ifndef __FreeBSD_cc_version
+#   include <osreldate.h>
+#  else
+#   if __FreeBSD_cc_version < 430000
+#    include <osreldate.h>
+#   endif
+#  endif
 # endif
 #endif
 #ifndef	_KERNEL
--- ip_log.c.orig	Tue Apr  3 08:45:49 2001
+++ ip_log.c	Fri Apr 13 09:07:18 2001
@@ -21,7 +21,13 @@
 #  endif
 # else
 #  ifdef KLD_MODULE
-#   include <osreldate.h>
+#   ifndef __FreeBSD_cc_version
+#    include <osreldate.h>
+#   else
+#    if __FreeBSD_cc_version < 430000
+#     include <osreldate.h>
+#    endif
+#   endif
 #  endif
 # endif
 #endif
--- ipf.c.orig	Wed Oct 25 03:37:11 2000
+++ ipf.c	Fri Apr 13 09:05:05 2001
@@ -6,7 +6,13 @@
  * to the original author and the contributors.
  */
 #ifdef	__FreeBSD__
-# include <osreldate.h>
+# ifndef __FreeBSD_cc_version
+#  include <osreldate.h>
+# else
+#  if __FreeBSD_cc_version < 430000
+#   include <osreldate.h>
+#  endif
+# endif
 #endif
 #include <stdio.h>
 #include <unistd.h>
--- ipfs.c.orig	Tue Apr  3 07:14:09 2001
+++ ipfs.c	Fri Apr 13 09:07:33 2001
@@ -6,7 +6,13 @@
  * to the original author and the contributors.
  */
 #ifdef	__FreeBSD__
-# include <osreldate.h>
+# ifndef __FreeBSD_cc_version
+#  include <osreldate.h>
+# else
+#  if __FreeBSD_cc_version < 430000
+#   include <osreldate.h>
+#  endif
+# endif
 #endif
 #include <stdio.h>
 #include <unistd.h>
--- ipt.c.orig	Mon Mar 13 14:10:25 2000
+++ ipt.c	Fri Apr 13 09:07:39 2001
@@ -6,7 +6,13 @@
  * to the original author and the contributors.
  */
 #ifdef	__FreeBSD__
-# include <osreldate.h>
+# ifndef __FreeBSD_cc_version
+#  include <osreldate.h>
+# else
+#  if __FreeBSD_cc_version < 430000
+#   include <osreldate.h>
+#  endif
+# endif
 #endif
 #include <stdio.h>
 #include <assert.h>
--- mlf_ipl.c.orig	Mon Nov 27 02:44:46 2000
+++ mlf_ipl.c	Fri Apr 13 09:07:49 2001
@@ -15,10 +15,22 @@
 
 #if defined(__FreeBSD__) && (__FreeBSD__ > 1)
 # ifdef	IPFILTER_LKM
-#  include <osreldate.h>
+#  ifndef __FreeBSD_cc_version
+#   include <osreldate.h>
+#  else
+#   if __FreeBSD_cc_version < 430000
+#    include <osreldate.h>
+#   endif
+#  endif
 #  define	ACTUALLY_LKM_NOT_KERNEL
 # else
-#  include <sys/osreldate.h>
+#  ifndef __FreeBSD_cc_version
+#   include <sys/osreldate.h>
+#  else
+#   if __FreeBSD_cc_version < 430000
+#    include <sys/osreldate.h>
+#   endif
+#  endif
 # endif
 #endif
 #include <sys/systm.h>

-------------------------------------------------------------------

> Regards,                         Phone:  (250)387-8437
> Cy Schubert                        Fax:  (250)387-5766
> Team Leader, Sun/Alpha Team   Internet:  Cy.Schubert@osg.gov.bc.ca
> Open Systems Group, ITSD, ISTA
> Province of BC

[prev in list] [next in list] [prev in thread] [next in thread]