Re: linux-ipsec: Redhat 5.0

From: Bob Rich <rrich(at)rrich.nsg.stercomm.com>
Date: Mon Jun 01 1998 - 13:48:07 EDT

Todd,

Essentially the RH50 workaround wasn't applied to the klips/utils source. I basically ripped the idea from pluto/Makefile and pluto/kernel.c... undefine the offending buggers before the kernel headers are included.

I'm hoping that the list isn't against smallish patches. Apply from the klips directory with something like

klips:$ patch -p0 <utils.patch

(This is the first patch i've ever done, let alone posted to a mailing list, but it seems to work...apologies for any mistakes)

 On Fri, 29 May 1998, Todd Huss wrote:

> Has anyone had troubles getting freeswan-8.0 to work with Redhat linux
> 5.0? I am able to patch and compile the 2.0.33 kernel just fine. I was
> also able to compile Pluto once I added the -DRH50 define to the
> Makefile, however, I'm getting the same error "redefenition of 'struct
> timespec'" when I try and do make utils. 
> 
> This is the same error I got when trying to compile Pluto, however, in
> the Pluto makefile I was able to put in the -DRH50 flag to get it
> working. In the klips/utils directory I don't see any such option. Any
> suggestions?
> 
> Thanks,
> Todd
> 
> 

diff -u utils/Makefile utils.rh5/Makefile --- utils/Makefile Mon May 11 22:28:07 1998
+++ utils.rh5/Makefile Mon Jun 1 13:30:12 1998
@@ -48,7 +48,7 @@
 #  

 CC=gcc
-CFLAGS=-O2 -I../src -g
+CFLAGS=-O2 -I../src -g -DRH50

 ALL=spi eroute spigrp tncfg klipsdebug  BINDIR=/usr/local/sbin  

diff -u utils/addrt.c utils.rh5/addrt.c

--- utils/addrt.c	Wed Apr  8 01:35:09 1998

+++ utils.rh5/addrt.c	Mon Jun  1 13:28:45 1998

@@ -44,6 +44,28 @@
 #include <errno.h>  

 #include <sys/socket.h>
+
+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+
+

 #include 
 #include 
 #include 
diff -u utils/eroute.c utils.rh5/eroute.c
--- utils/eroute.c	Sun Apr 12 23:15:29 1998

+++ utils.rh5/eroute.c	Mon Jun  1 13:28:54 1998

@@ -47,6 +47,27 @@
 #include <errno.h>  

 #include <sys/socket.h>
+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+
+

 #include 
 #include 
 #include 
diff -u utils/klipsdebug.c utils.rh5/klipsdebug.c
--- utils/klipsdebug.c	Mon May 11 22:26:27 1998

+++ utils.rh5/klipsdebug.c	Mon Jun  1 13:29:07 1998

@@ -50,6 +50,27 @@
 #include <errno.h>  

 #include <sys/socket.h>
+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+
+

 #include <linux/skbuff.h>  

 #include <netinet/in.h>
diff -u utils/setsa.c utils.rh5/setsa.c

--- utils/setsa.c	Wed Apr  8 01:35:09 1998

+++ utils.rh5/setsa.c	Mon Jun  1 13:29:15 1998

@@ -47,6 +47,27 @@
 #include <errno.h>  

 #include <sys/socket.h>
+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+
+

 #include <linux/skbuff.h>  

 #include <netinet/in.h>
diff -u utils/spi.c utils.rh5/spi.c

--- utils/spi.c	Tue May  5 23:37:11 1998

+++ utils.rh5/spi.c	Mon Jun  1 13:29:43 1998

@@ -54,6 +54,26 @@
 #include <errno.h>  

 #include <sys/socket.h>
+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+

 #include <linux/skbuff.h>  

 #include <netinet/in.h>
diff -u utils/spigrp.c utils.rh5/spigrp.c

--- utils/spigrp.c	Wed Apr  8 01:35:09 1998

+++ utils.rh5/spigrp.c	Mon Jun  1 13:29:51 1998

@@ -44,6 +44,26 @@
 #include <errno.h>  

 #include <sys/socket.h>
+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+

 #include <linux/skbuff.h>  

 #include <netinet/in.h>
diff -u utils/tncfg.c utils.rh5/tncfg.c

--- utils/tncfg.c	Thu Apr 23 17:11:39 1998

+++ utils.rh5/tncfg.c	Mon Jun  1 13:30:01 1998

@@ -40,6 +40,26 @@

 #include 
 #include 
 #include 

+
+# ifdef RH50
+# undef FD_SET
+# undef FD_CLR
+# undef FD_ISSET
+# undef FD_ZERO
+
+# ifndef _STRUCT_TIMESPEC
+# define _STRUCT_TIMESPEC
+# endif
+
+# ifndef _I386_BYTEORDER_H
+# define _I386_BYTEORDER_H
+# endif
+
+# ifndef _I386_STRING_H_
+# define _I386_STRING_H_
+# endif
+# endif /* RH50 */
+

 #include <linux/types.h>
 #include <linux/if.h>   Received on Thu Jun 4 23:14:45 1998