[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20120520-1-18-g9d27a93

[Samuel Thibault]

The following commit has been merged in the master branch:
commit c9f2600f07f73af8711d940bf8c5ce983d4711c7
Author: Samuel Thibault <address@hidden>
Date:   Tue Jun 5 11:22:49 2012 +0000

    Refresh to new upstream
    
      * New upstream snapshot
        - patches/ext2fs_large_stores.patch,libmachdev.patch: Refresh.
      * patches/balloc.patch: Fix parentheses.

diff --git a/debian/changelog b/debian/changelog
index 2b0b68a..7398c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 hurd (20120605-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
+    - patches/ext2fs_large_stores.patch,libmachdev.patch: Refresh.
   * control:
     - Do not make hurd-udeb depend on netdde-udeb, it leads to configure
     recursion, and is not actually needed.
@@ -8,6 +9,7 @@ hurd (20120605-1) UNRELEASED; urgency=low
   * hurd.postinst: Drop error messages while fetching pfinet options.
   * local/setup-translators: Remove /dev/shm directory if any, to be replaced
     with symlink to /run/shm.
+  * patches/balloc.patch: Fix parentheses.
 
  -- Samuel Thibault <address@hidden>  Tue, 22 May 2012 00:07:09 +0000
 
diff --git a/debian/patches/balloc.patch b/debian/patches/balloc.patch
new file mode 100644
index 0000000..4557e25
--- /dev/null
+++ b/debian/patches/balloc.patch
@@ -0,0 +1,13 @@
+diff --git a/ext2fs/balloc.c b/ext2fs/balloc.c
+index 8ad29ce..7fe82ba 100644
+--- a/ext2fs/balloc.c
++++ b/ext2fs/balloc.c
+@@ -197,7 +197,7 @@ repeat:
+            * The goal was occupied; search forward for a free
+            * block within the next 32 blocks
+          */
+-        if (j & 31 == 31)
++        if ((j & 31) == 31)
+           lmap = 0;
+         else
+           lmap = ((((unsigned long *) bh)[j >> 5]) >>
diff --git a/debian/patches/ext2fs_large_stores.patch 
b/debian/patches/ext2fs_large_stores.patch
index 56c9220..cc936aa 100644
--- a/debian/patches/ext2fs_large_stores.patch
+++ b/debian/patches/ext2fs_large_stores.patch
@@ -115,8 +115,8 @@ Index: hurd-debian/ext2fs/balloc.c
 +         * The goal was occupied; search forward for a free
 +         * block within the next 32 blocks
           */
-         lmap = ((((unsigned long *) bh)[j >> 5]) >>
-                 ((j & 31) + 1));
+         if (j & 31 == 31)
+           lmap = 0;
 @@ -242,13 +244,16 @@
          j = k;
          goto got_block;
diff --git a/debian/patches/libmachdev.patch b/debian/patches/libmachdev.patch
index 7cf1b4f..3bca9ff 100644
--- a/debian/patches/libmachdev.patch
+++ b/debian/patches/libmachdev.patch
@@ -9,8 +9,8 @@ index 606765f..766d9b4 100644
 -        if (err != MACH_MSG_SUCCESS)
 +        if (0 && err != MACH_MSG_SUCCESS)
            {
-             mach_port_deallocate(mach_task_self (),
-                                  ((mach_msg_header_t 
*)msg)->msgh_remote_port);
+             /* TODO: remove from filter */
+           }
 @@ -377,7 +377,7 @@ device_open (mach_port_t reply_port, mach_msg_type_name_t 
reply_port_type,
      }
  
@@ -33,29 +33,3 @@ index 6b8d1d4..f0c034f 100644
  
    ports_port_deref (device_to_pi (device));
    return ret;
-diff --git a/libbpf/bpf_impl.c b/libbpf/bpf_impl.c
-index b2dafd1..c8a250b 100644
---- a/libbpf/bpf_impl.c
-+++ b/libbpf/bpf_impl.c
-@@ -45,6 +45,8 @@
- #include "queue.h"
- #include "util.h"
- 
-+static struct net_hash_header filter_hash_header[N_NET_HASH];
-+
- /*
-  * Execute the filter program starting at pc on the packet p
-  * wirelen is the length of the original packet
-diff --git a/libbpf/bpf_impl.h b/libbpf/bpf_impl.h
-index e611491..9073fda 100644
---- a/libbpf/bpf_impl.h
-+++ b/libbpf/bpf_impl.h
-@@ -134,7 +134,7 @@ struct net_hash_header {
-       int n_keys;                     /* zero if not used */
-       int ref_count;                  /* reference count */
-       net_hash_entry_t table[NET_HASH_SIZE];
--} filter_hash_header[N_NET_HASH];
-+};
- 
- typedef struct net_hash_header *net_hash_header_t;
- 

-- 
Debian GNU Hurd packaging