Package: trickle Version: 1.07-3 Followup-For: Bug #324580
I've modified the upstream source directly to minimize the diff. The other approach would be to hack modify the configure.in autotools file and generate a humongous diff.gz, which I'd rather avoid. This is intended as a workaround for Debian sid, but it's a good idea to notify upstream of the problem and decide if there's a cleaner way to fix this. This package still builds with or without the below patch on my Sarge chroot. diff -rup -x debian orig++trickle-1.07/client.c trickle-1.07/client.c --- orig++trickle-1.07/client.c 2003-05-08 19:16:42.000000000 -0700 +++ trickle-1.07/client.c 2005-08-30 00:36:57.672186709 -0700 @@ -34,6 +34,9 @@ #include <string.h> #ifdef HAVE_NETINET_IN_H +# ifdef in_addr_t +# undef in_addr_t +# endif /* workaround for the in_addr_t #defined in config.h */ #include <netinet/in.h> #endif /* HAVE_NETINET_IN_H */ diff -rup -x debian orig++trickle-1.07/trickle-overload.c trickle-1.07/trickle-overload.c --- orig++trickle-1.07/trickle-overload.c 2004-12-12 17:21:53.000000000 -0800 +++ trickle-1.07/trickle-overload.c 2005-08-30 00:36:57.677185397 -0700 @@ -24,6 +24,9 @@ #include <sys/time.h> #endif /* HAVE_SYS_TIME_H */ +# ifdef in_addr_t +# undef in_addr_t +# endif /* workaround for the in_addr_t #defined in config.h */ #include <netinet/in.h> #ifdef HAVE_ERR_H diff -rup -x debian orig++trickle-1.07/tricklectl.c trickle-1.07/tricklectl.c --- orig++trickle-1.07/tricklectl.c 2004-12-12 15:50:10.000000000 -0800 +++ trickle-1.07/tricklectl.c 2005-08-30 00:36:57.677185397 -0700 @@ -33,6 +33,9 @@ #endif /* defined(HAVE_TIME_H) && defined(TIME_WITH_SYS_TIME) */ #ifdef HAVE_NETINET_IN_H +# ifdef in_addr_t +# undef in_addr_t +# endif /* workaround for the in_addr_t #defined in config.h */ #include <netinet/in.h> #endif /* HAVE_NETINET_IN_H */ diff -rup -x debian orig++trickle-1.07/trickled.c trickle-1.07/trickled.c --- orig++trickle-1.07/trickled.c 2003-12-12 14:33:23.000000000 -0800 +++ trickle-1.07/trickled.c 2005-08-30 00:36:57.679184872 -0700 @@ -30,6 +30,9 @@ #include <sys/time.h> #endif /* HAVE_SYS_TIME_H */ +#ifdef in_addr_t +# undef in_addr_t +#endif /* workaround for the in_addr_t #defined in config.h */ #include <netinet/in.h> #include <netinet/in_systm.h> diff -rup -x debian orig++trickle-1.07/trickledu.c trickle-1.07/trickledu.c --- orig++trickle-1.07/trickledu.c 2004-02-12 22:11:21.000000000 -0800 +++ trickle-1.07/trickledu.c 2005-08-30 00:36:57.680184609 -0700 @@ -30,6 +30,9 @@ #endif /* defined(HAVE_TIME_H) && defined(TIME_WITH_SYS_TIME) */ #ifdef HAVE_NETINET_IN_H +# ifdef in_addr_t +# undef in_addr_t +# endif /* workaround for the in_addr_t #defined in config.h */ #include <netinet/in.h> #endif /* HAVE_NETINET_IN_H */ /End of diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
