From: francois <francois@ctrlaltdel.ch>
Date: Sun, 18 Jul 2010 02:28:32 +0000 (-0700)
Subject: iputil.py: Add support for FreeBSD 7,8 and 9
X-Git-Url: https://git.rkrishnan.org/specifications/%5B//%22doc.html/%22?a=commitdiff_plain;h=968edfda119cb29c365e6555ef7e10029062127e;p=tahoe-lafs%2Ftahoe-lafs.git

iputil.py: Add support for FreeBSD 7,8 and 9
committed by: zooko@zooko.com
date: 2010-07-17
and I also patched: NEWS and CREDITS
---

diff --git a/CREDITS b/CREDITS
index f9c982cd..53bc7aaf 100644
--- a/CREDITS
+++ b/CREDITS
@@ -52,7 +52,7 @@ D: packaging, buildbot
 E: cgalvan@enthought.com
 
 N: François Deppierraz
-D: char encodings, testing, duplicity plugin, debugging, FUSE, docs
+D: char encodings, testing, duplicity plugin, debugging, FUSE, docs, FreeBSD
 E: francois@ctrlaltdel.ch
 
 N: Larry Hosken
diff --git a/NEWS b/NEWS
index 42fdd7ce..d4876f1b 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@
    from an attacker who is able to read the disk. (#1083)
  - Fix rarely-encountered incompatibility between Twisted logging utility and
    the new unicode support added in v1.7.0 (#1099)
+ - Fix IP address detection on FreeBSD 7, 8, and 9 (#1098)
 
 * Release 1.7.0 (2010-06-18)
 
diff --git a/src/allmydata/util/iputil.py b/src/allmydata/util/iputil.py
index e24066c3..0d8b9a4e 100644
--- a/src/allmydata/util/iputil.py
+++ b/src/allmydata/util/iputil.py
@@ -154,6 +154,9 @@ _platform_map = {
     "freebsd4": "bsd",
     "freebsd5": "bsd",
     "freebsd6": "bsd",
+    "freebsd7": "bsd",
+    "freebsd8": "bsd",
+    "freebsd9": "bsd",
     "netbsd1": "bsd",
     "netbsd2": "bsd",
     "netbsd3": "bsd",