code.vuplus.com Git - vuplus_openembedded/blob - packages/mrouted/mrouted-3.9.diff

   1 diff -Naur mrouted-3.9-beta3.orig/Makefile mrouted-3.9-beta3.neu/Makefile
   2 --- mrouted-3.9-beta3.orig/Makefile     1998-03-01 04:09:11.000000000 +0100
   3 +++ mrouted-3.9-beta3.neu/Makefile      2005-04-09 12:49:39.000000000 +0200
   4 @@ -24,22 +24,22 @@
   5  #
   6  # Uncomment the following three lines if you want to use RSRR (Routing
   7  # Support for Resource Reservations), currently used by RSVP.
   8 -#RSRRDEF=      -DRSRR
   9 -#RSRRC=                rsrr.c
  10 -#RSRRO=                rsrr.o
  11 +RSRRDEF=       -DRSRR
  12 +RSRRC=         rsrr.c
  13 +RSRRO=         rsrr.o
  14  #
  15  LDFLAGS=
  16 -CFLAGS=                -O ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF}       ## SunOS, OSF1, FreeBSD, IRIX
  17 +#CFLAGS=               -O ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF}       ## SunOS, OSF1, FreeBSD, IRIX
  18  #CFLAGS=               -O ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF} -DSYSV -DSUNOS5       ## Solaris 2.x
  19  #LIB2=-lsocket -lnsl   ## Solaris 2.x
  20 -#CFLAGS=               -O ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF} -D__BSD_SOURCE -DRAW_INPUT_IS_RAW -DRAW_OUTPUT_IS_RAW -DIOCTL_OK_ON_RAW_SOCKET        ## Linux
  21 +CFLAGS=                -O ${MCAST_INCLUDE} ${SNMPDEF} ${RSRRDEF} -D__BSD_SOURCE -DRAW_INPUT_IS_RAW -DRAW_OUTPUT_IS_RAW -DIOCTL_OK_ON_RAW_SOCKET        ## Linux
  22  LIBS=          ${SNMPLIBDIR} ${SNMPLIBS} ${LIB2}
  23  LINTFLAGS=     ${MCAST_INCLUDE}
  24  IGMP_SRCS=     igmp.c inet.c kern.c
  25  IGMP_OBJS=     igmp.o inet.o kern.o
  26 -ROUTER_SRCS=   config.c cfparse.y main.c route.c vif.c prune.c callout.c \
  27 +ROUTER_SRCS=   config.c y.y main.c route.c vif.c prune.c callout.c \
  28                 icmp.c ipip.c ${SNMPC} ${RSRRC}
  29 -ROUTER_OBJS=   config.o cfparse.o main.o route.o vif.o prune.o callout.o \
  30 +ROUTER_OBJS=   config.o y.o main.o route.o vif.o prune.o callout.o \
  31                 icmp.o ipip.o ${SNMPO} ${RSRRO}
  32  MAPPER_SRCS=   mapper.c
  33  MAPPER_OBJS=   mapper.o
  34 @@ -58,6 +58,8 @@
  35
  36  all: mrouted map-mbone mrinfo ${MSTAT}
  37
  38 +install:
  39 +
  40  mrouted: ${IGMP_OBJS} ${ROUTER_OBJS} vers.o ${CMULIBS}
  41         rm -f $@
  42         ${CC} ${LDFLAGS} -o $@ ${CFLAGS} ${IGMP_OBJS} ${ROUTER_OBJS} vers.o ${LIBS}
  43 @@ -79,7 +81,7 @@
  44         ${CC} ${LDFLAGS} -o $@ ${CFLAGS} ${MSTAT_OBJS} -Lsnmplib -lsnmp
  45
  46  clean: FRC ${SNMPCLEAN}
  47 -       rm -f ${OBJS} core mrouted map-mbone mrinfo mstat tags TAGS
  48 +       rm -f ${OBJS} vers.o core mrouted map-mbone mrinfo mstat tags TAGS
  49
  50  snmpclean:     FRC
  51         -(cd snmpd; make clean)
  52 diff -Naur mrouted-3.9-beta3.orig/defs.h mrouted-3.9-beta3.neu/defs.h
  53 --- mrouted-3.9-beta3.orig/defs.h       1998-03-01 03:51:42.000000000 +0100
  54 +++ mrouted-3.9-beta3.neu/defs.h        2005-04-09 11:52:46.000000000 +0200
  55 @@ -45,7 +45,7 @@
  56  #undef rtentry
  57  #endif
  58  #endif
  59 -#include <netinet/ip_mroute.h>
  60 +#include "netinet/ip_mroute.h"
  61  #ifdef RSRR
  62  #include <sys/un.h>
  63  #endif /* RSRR */
  64 @@ -180,7 +180,7 @@
  65  #if !(defined(BSD) && (BSD >= 199103))
  66  extern int             errno;
  67  extern int             sys_nerr;
  68 -extern char *          sys_errlist[];
  69 +/*extern char *                sys_errlist[];*/
  70  #endif
  71
  72  #ifdef OLD_KERNEL
  73 diff -Naur mrouted-3.9-beta3.orig/main.c mrouted-3.9-beta3.neu/main.c
  74 --- mrouted-3.9-beta3.orig/main.c       1998-03-01 02:49:00.000000000 +0100
  75 +++ mrouted-3.9-beta3.neu/main.c        2005-04-09 11:52:46.000000000 +0200
  76 @@ -32,6 +32,8 @@
  77  #include "snmp.h"
  78  #endif
  79
  80 +#include <time.h>
  81 +
  82  #ifndef lint
  83  static char rcsid[] = "@(#) $Id: \
  84  main.c,v 3.8.4.29 1998/03/01 01:49:00 fenner Exp $";
  85 diff -Naur mrouted-3.9-beta3.orig/mrouted.conf mrouted-3.9-beta3.neu/mrouted.conf
  86 --- mrouted-3.9-beta3.orig/mrouted.conf 1995-11-29 23:40:47.000000000 +0100
  87 +++ mrouted-3.9-beta3.neu/mrouted.conf  2005-04-09 11:52:46.000000000 +0200
  88 @@ -30,7 +30,7 @@
  89  #
  90  #
  91  # Template tunnel for mcast_install
  92 -tunnel 128.4.0.77 128.4.0.8 metric 1 threshold 64 rate_limit 500  # <-- REPLACE
  93 +#tunnel 128.4.0.77 128.4.0.8 metric 1 threshold 64 rate_limit 500  # <-- REPLACE
  94  #      boundary LOCAL
  95  #
  96  # You might want to specify a boundary on your tunnel to the outside world,
  97 diff -Naur mrouted-3.9-beta3.orig/netinet/ip_mroute.h mrouted-3.9-beta3.neu/netinet/ip_mroute.h
  98 --- mrouted-3.9-beta3.orig/netinet/ip_mroute.h  1970-01-01 01:00:00.000000000 +0100
  99 +++ mrouted-3.9-beta3.neu/netinet/ip_mroute.h   2005-04-09 13:09:11.905210112 +0200
 100 @@ -0,0 +1,12 @@
 101 +#ifndef __NETINET_IP_MROUTE_H
 102 +#define __NETINET_IP_MROUTE_H
 103 +
 104 +#define _LINUX_IN_H
 105 +
 106 +#ifndef __u32
 107 +#define __u32 unsigned long
 108 +#endif
 109 +
 110 +#include <linux/mroute.h>
 111 +
 112 +#endif
 113 diff -Naur mrouted-3.9-beta3.orig/pathnames.h mrouted-3.9-beta3.neu/pathnames.h
 114 --- mrouted-3.9-beta3.orig/pathnames.h  1995-11-29 23:36:57.000000000 +0100
 115 +++ mrouted-3.9-beta3.neu/pathnames.h   2005-04-09 11:52:46.000000000 +0200
 116 @@ -12,14 +12,14 @@
 117
 118  #define _PATH_MROUTED_CONF     "/etc/mrouted.conf"
 119
 120 -#if (defined(BSD) && (BSD >= 199103))
 121 +/*#if (defined(BSD) && (BSD >= 199103))*/
 122  #define _PATH_MROUTED_PID      "/var/run/mrouted.pid"
 123  #define _PATH_MROUTED_GENID    "/var/run/mrouted.genid"
 124  #define _PATH_MROUTED_DUMP     "/var/tmp/mrouted.dump"
 125  #define _PATH_MROUTED_CACHE    "/var/tmp/mrouted.cache"
 126 -#else
 127 +/*#else
 128  #define _PATH_MROUTED_PID      "/etc/mrouted.pid"
 129  #define _PATH_MROUTED_GENID    "/etc/mrouted.genid"
 130  #define _PATH_MROUTED_DUMP     "/usr/tmp/mrouted.dump"
 131  #define _PATH_MROUTED_CACHE    "/usr/tmp/mrouted.cache"
 132 -#endif
 133 +#endif*/
 134 diff -Naur mrouted-3.9-beta3.orig/vers.c mrouted-3.9-beta3.neu/vers.c
 135 --- mrouted-3.9-beta3.orig/vers.c       1970-01-01 01:00:00.000000000 +0100
 136 +++ mrouted-3.9-beta3.neu/vers.c        2005-04-09 11:52:46.000000000 +0200
 137 @@ -0,0 +1 @@
 138 +char todaysversion[]="3.9-beta3";