Browse Source

better to use gcc and fix building under Solaris

Ralf S. Engelschall 24 years ago
parent
commit
a922ba9fd7
2 changed files with 32 additions and 2 deletions
  1. 30 0
      gated/gated-3-6.patch
  2. 2 2
      gated/gated.spec

+ 30 - 0
gated/gated-3-6.patch

@@ -0,0 +1,30 @@
+*** src/gated/task.h.orig	Sun May 14 14:58:18 2000
+--- src/gated/task.h	Sun May 14 14:59:44 2000
+***************
+*** 321,327 ****
+  extern size_t task_recv_buffer_len;
+  
+  
+! #if defined(SUNOS5_0) || !defined(HAVE_CMSG_SPACE) 
+  #ifndef CMSG_ALIGN
+  #define CMSG_ALIGN(n)   (((n) + 3) & ~3)
+  #define CMSG_SPACE(l)   (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(l))
+--- 321,327 ----
+  extern size_t task_recv_buffer_len;
+  
+  
+! #if (defined(SUNOS5_0) || !defined(HAVE_CMSG_SPACE)) && !defined(__FreeBSD__) 
+  #ifndef CMSG_ALIGN
+  #define CMSG_ALIGN(n)   (((n) + 3) & ~3)
+  #define CMSG_SPACE(l)   (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(l))
+--- src/gated/str.c.orig	Sat Nov 24 14:43:52 2001
++++ src/gated/str.c	Sat Nov 24 14:43:52 2001
+@@ -191,7 +191,7 @@
+ 
+ #define	ARG() \
+ 	_ulong = flags&LONGINT ? va_arg(ap, long) : \
+-	    flags&SHORTINT ? va_arg(ap, short) : va_arg(ap, int);
++	    flags&SHORTINT ? va_arg(ap, int) : va_arg(ap, int);
+ 
+ #define	todigit(c)	((c) - '0')
+ #define	tochar(n)	((n) + '0')

+ 2 - 2
gated/gated.spec

@@ -32,7 +32,7 @@ Distribution: OpenPKG [EXP]
 Group:        Net
 License:      GPL
 Version:      3.6
-Release:      20011121.0
+Release:      20011124.0
 
 #   list of sources
 Source0:      ftp://ftp.gated.merit.edu/net-research/gated/gated-3-6.tar.gz
@@ -45,7 +45,7 @@ Patch0:       gated-3-6.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 0.9-20011025.0, flex, bison
+BuildPreReq:  OpenPKG, openpkg >= 0.9-20011025.0, gcc, flex, bison
 PreReq:       OpenPKG, openpkg >= 0.9-20011025.0
 AutoReq:      no
 AutoReqProv:  no