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 f9c982cdeece7ace489557cd104d3b6c7406ddee..53bc7aaf1b567e2db1c38dfc6da07e27a73ecdf2 100644 (file)
--- 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 42fdd7cefe22cdd4f1c4b64f6a652ce44af15773..d4876f1b6d5c3a64b3115cafca17b2e415046a56 100644 (file)
--- 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 e24066c364b03c4df3bf9f7d16ca644d489a8384..0d8b9a4e8e380e8e08e18a3b356ddfd633fa9bad 100644 (file)
--- 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",