diff options
| author | John Hay <jhay@FreeBSD.org> | 2009-10-11 17:54:19 +0000 |
|---|---|---|
| committer | John Hay <jhay@FreeBSD.org> | 2009-10-11 17:54:19 +0000 |
| commit | 41eb5baa7f2185ee245e725f28587d452c338e9d (patch) | |
| tree | bd3e736fc50618017762d7a9d73170b1e70089a2 /net/olsrd | |
| parent | 50b1133051dab6d2647b76986003496d893489c1 (diff) | |
| download | ports-41eb5baa7f2185ee245e725f28587d452c338e9d.tar.gz ports-41eb5baa7f2185ee245e725f28587d452c338e9d.zip | |
Upgrade to olsrd 0.5.6-r6.
Notes
Notes:
svn path=/head/; revision=242690
Diffstat (limited to 'net/olsrd')
| -rw-r--r-- | net/olsrd/Makefile | 3 | ||||
| -rw-r--r-- | net/olsrd/distinfo | 6 | ||||
| -rw-r--r-- | net/olsrd/files/patch-src-bsd-kernel_routes.c | 24 | ||||
| -rw-r--r-- | net/olsrd/files/patch-src-bsd-net.c | 20 |
4 files changed, 4 insertions, 49 deletions
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index 938d1e2acb3f..620810c2089f 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -6,8 +6,7 @@ # PORTNAME= olsrd -DISTVERSION= 0.5.6-r5 -PORTREVISION= 1 +DISTVERSION= 0.5.6-r6 CATEGORIES= net MASTER_SITES= http://www.olsr.org/releases/0.5/ \ http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/ diff --git a/net/olsrd/distinfo b/net/olsrd/distinfo index 68e39793a2b0..cf6f9357cc99 100644 --- a/net/olsrd/distinfo +++ b/net/olsrd/distinfo @@ -1,3 +1,3 @@ -MD5 (olsrd-0.5.6-r5.tar.bz2) = 57a365750457e13e2e1a5c7963b1d344 -SHA256 (olsrd-0.5.6-r5.tar.bz2) = 8ed8c070bbe08cfeaf965e22a7c760219af168b56f816cc49f2fca2877bacac8 -SIZE (olsrd-0.5.6-r5.tar.bz2) = 543158 +MD5 (olsrd-0.5.6-r6.tar.bz2) = 07362792da718bed8943c2d7d1b4acfe +SHA256 (olsrd-0.5.6-r6.tar.bz2) = 6a59ddcb60d3c1dfed08b1e1accd5eefd3209541a8f7ba7c37dcd5beeecef398 +SIZE (olsrd-0.5.6-r6.tar.bz2) = 548331 diff --git a/net/olsrd/files/patch-src-bsd-kernel_routes.c b/net/olsrd/files/patch-src-bsd-kernel_routes.c deleted file mode 100644 index 837f968c5968..000000000000 --- a/net/olsrd/files/patch-src-bsd-kernel_routes.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/bsd/kernel_routes.c.orig 2009-02-01 19:57:23.000000000 +0000 -+++ src/bsd/kernel_routes.c 2009-06-17 15:57:01.000000000 +0000 -@@ -95,8 +95,8 @@ - sin4.sin_len = sizeof(sin4); - sin4.sin_family = AF_INET; - -- sin_size = 1 + ((sizeof(struct sockaddr_in) - 1) | 3); -- sdl_size = 1 + ((sizeof(struct sockaddr_dl) - 1) | 3); -+ sin_size = 1 + ((sizeof(struct sockaddr_in) - 1) | (sizeof(long) - 1)); -+ sdl_size = 1 + ((sizeof(struct sockaddr_dl) - 1) | (sizeof(long) - 1)); - - /********************************************************************** - * FILL THE ROUTING MESSAGE HEADER -@@ -250,8 +252,8 @@ - sdl.sdl_len = sizeof(sdl); - sdl.sdl_family = AF_LINK; - -- sin_size = 1 + ((sizeof(struct sockaddr_in6) - 1) | 3); -- sdl_size = 1 + ((sizeof(struct sockaddr_dl) - 1) | 3); -+ sin_size = 1 + ((sizeof(struct sockaddr_in6) - 1) | (sizeof(long) - 1)); -+ sdl_size = 1 + ((sizeof(struct sockaddr_dl) - 1) | (sizeof(long) - 1)); - - /********************************************************************** - * FILL THE ROUTING MESSAGE HEADER diff --git a/net/olsrd/files/patch-src-bsd-net.c b/net/olsrd/files/patch-src-bsd-net.c deleted file mode 100644 index 56afa51d2772..000000000000 --- a/net/olsrd/files/patch-src-bsd-net.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/bsd/net.c.orig 2009-03-23 19:49:15.000000000 +0000 -+++ src/bsd/net.c 2009-06-09 11:51:33.000000000 +0000 -@@ -127,7 +127,7 @@ - set_sysctl_int(const char *name, int new) - { - int old; --#if __MacOSX__ || __OpenBSD__ -+#if __FreeBSD__ || __MacOSX__ || __OpenBSD__ - size_t len = sizeof(old); - #else - unsigned int len = sizeof(old); -@@ -537,7 +537,7 @@ - break; - } - ifr6.ifr_addr = *sin6; -- if (ioctl(s6, SIOCGIFAFLAG_IN6, (int)&ifr6) < 0) { -+ if (ioctl(s6, SIOCGIFAFLAG_IN6, &ifr6) < 0) { - OLSR_PRINTF(3, "ioctl(SIOCGIFAFLAG_IN6)"); - close(s6); - break; |