cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to olsrd 0.5.6-r5. Also make it work on 64 bit machines.

Browse Source 
PR:		ports/137158 (The upgrade)
Submitted by:	Hung-Yi Chen <gaod@hychen.org> (The upgrade)
This commit is contained in:
John Hay 2009-08-01 15:51:51 +00:00
parent c42d70402e
commit e7d553e97a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=238726
4 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/olsrd/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= olsrd
DISTVERSION= 0.5.6-r4
DISTVERSION= 0.5.6-r5
CATEGORIES= net
MASTER_SITES= http://www.olsr.org/releases/0.5/ \
http://ftp2.za.freebsd.org/pub/mesh/pc/protocols/olsr/

6
net/olsrd/distinfo
View File

@ -1,3 +1,3 @@
MD5 (olsrd-0.5.6-r4.tar.bz2) = 16076660413bcf625ba8772fdb3d607f
SHA256 (olsrd-0.5.6-r4.tar.bz2) = a5864f214d4fdfbd27e9b254ce3f04efbc31761697b57329a7d0cdea26002a2c
SIZE (olsrd-0.5.6-r4.tar.bz2) = 548009
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

52
net/olsrd/files/patch-src-bsd-kernel_routes.c
View File

@ -1,30 +1,24 @@
--- src/bsd/kernel_routes.c.orig 2009-03-17 23:52:47.000000000 +0200
+++ src/bsd/kernel_routes.c 2009-03-21 19:45:54.000000000 +0200
@@ -176,7 +176,9 @@
memcpy(walker, sdl, sdl->sdl_len);
walker += sdl_size;
rtm->rtm_addrs |= RTA_GATEWAY;
+#ifdef RTF_CLONING
rtm->rtm_flags |= RTF_CLONING;
+#endif
#ifndef _WRS_KERNEL
rtm->rtm_flags &= ~RTF_HOST;
#endif
@@ -295,7 +297,7 @@
#endif
memcpy(walker, &sin6, sizeof(sin6));
walker += sin_size;
- rtm->rtm_addrs = RTA_GATEWAY;
+ rtm->rtm_addrs |= RTA_GATEWAY;
}
else {
/*
@@ -313,7 +315,7 @@
#endif
memcpy(walker, &sin6, sizeof(sin6));
walker += sin_size;
- rtm->rtm_addrs = RTA_GATEWAY;
+ rtm->rtm_addrs |= RTA_GATEWAY;
rtm->rtm_flags |= RTF_GATEWAY;
}
--- 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

20
net/olsrd/files/patch-src-bsd-net.c Normal file
View File

@ -0,0 +1,20 @@
--- 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;