update d-host-duplicates.patch for porterboxes

diff --git a/debian/patches/d-host-duplicates.patch b/debian/patches/d-host-duplicates.patch
index 6fe15290785eb4f78c0a650b5f662b69bcbb217f..af8596a3c52909d533ffd176cfab3c73001245ed 100644 (file)
--- a/debian/patches/d-host-duplicates.patch
+++ b/debian/patches/d-host-duplicates.patch
@@ -6,8 +6,8 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/libstd/sys_common/net.rs
 +++ b/src/libstd/sys_common/net.rs
-@@ -609,21 +609,3 @@
-             .finish()
+@@ -659,26 +659,3 @@
+         res.field(name, &self.inner.as_inner()).finish()
      }
  }
 -
@@ -21,10 +21,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -        let mut addrs = HashMap::new();
 -        let lh = match LookupHost::try_from(("localhost", 0)) {
 -            Ok(lh) => lh,
--            Err(e) => panic!("couldn't resolve `localhost': {}", e)
+-            Err(e) => panic!("couldn't resolve `localhost': {}", e),
 -        };
--        for sa in lh { *addrs.entry(sa).or_insert(0) += 1; };
--        assert_eq!(addrs.iter().filter(|&(_, &v)| v > 1).collect::<Vec<_>>(), vec![],
--                   "There should be no duplicate localhost entries");
+-        for sa in lh {
+-            *addrs.entry(sa).or_insert(0) += 1;
+-        }
+-        assert_eq!(
+-            addrs.iter().filter(|&(_, &v)| v > 1).collect::<Vec<_>>(),
+-            vec![],
+-            "There should be no duplicate localhost entries"
+-        );
 -    }
 -}

diff --git a/debian/patches/series b/debian/patches/series
index 64e59d0cdf151d8710b22177aa36852ebf17d86c..9a983379fb5533164a1f3146e156447a4d04462d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,9 @@ u-make-tests-work-without-rpath.patch
 u-tests-ignore-arm.patch
 u-mips-fixes.diff
 #u-allow-system-compiler-rt.patch
-u-vendor-typenum-115.patch 
+u-vendor-typenum-115.patch
 u-fix-exec.patch
+u-ignore-endian.patch
 
 # not forwarded, or forwarded but unlikely to be merged
 u-rustc-llvm-cross-flags.patch
@@ -38,5 +39,4 @@ d-use-local-css.patch
 d-fix-mips64el-bootstrap.patch
 
 # Work around for some porterboxes, keep this commented
-#d-host-duplicates.patch
-u-ignore-endian.patch
+d-host-duplicates.patch