Fix enough problems with Clang so that the build hangs in the RPC

compiler, which seems to also occur at least with GCC 4.7's cpp.

8 files changed, 152 insertions, 22 deletions

diff --git a/security/sfs/distinfo b/security/sfs/distinfo
index 43a33a8014a..5b0c20c7c58 100644
--- a/security/sfs/distinfo
+++ b/security/sfs/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.5 2008/02/16 22:03:49 apb Exp $
+$NetBSD: distinfo,v 1.6 2013/10/15 14:48:38 joerg Exp $
 
 SHA1 (sfs-0.7.2.tar.gz) = 3619afc9b785e4aa41f7cdf202c5b233a6b5fe08
 RMD160 (sfs-0.7.2.tar.gz) = 30cd5e21c4f63292ef0f5671720f6036d08e5ff1
 Size (sfs-0.7.2.tar.gz) = 1283652 bytes
 SHA1 (patch-aa) = 32bf5ca41bf588bdd4f2471c727822aac2906472
-SHA1 (patch-ab) = 7719eda254e57d7cc6cf3ae06db7b3beb30b9f94
-SHA1 (patch-ac) = 3afc535280b6f58090159fd9242edc63563e108d
-SHA1 (patch-ad) = f662ca56204ae71c64b2bdbb8a09384f868107c9
+SHA1 (patch-ab) = 812135658ed2e8e08991eea092a19f843e102f40
+SHA1 (patch-ac) = b5cbcecc97495ced32f03b105c118aaadc006159
+SHA1 (patch-ad) = 3da13512ed3f6d4b60959cb88807dffcf26cb74e
 SHA1 (patch-ae) = 80222c0384e5d746d1fce66231c0f35e32a572fd
-SHA1 (patch-af) = dd5c53e2971e7ad317578e136bac5f239ccdf00d
+SHA1 (patch-af) = 7e6b1fa9c2ed27e119179332f62c17439ff18cbf
 SHA1 (patch-ag) = 963134e5b5746600dc184f4651bb70cdfaebf125
 SHA1 (patch-ah) = b411915bed2f6e008c2fa577aae4a96d2a45b2ab
 SHA1 (patch-ai) = c3c9cc83d07eb423c6732bbfe4191793c2f6dfd8
@@ -22,6 +22,8 @@ SHA1 (patch-ap) = 0edbc273d983bfa97df16d7e7ab6070b82d09726
 SHA1 (patch-aq) = c401278ff8c7499e006ff629f1583d6d02982388
 SHA1 (patch-ar) = 9b8e5fbc3d68883755378c6b010c22f387910c5d
 SHA1 (patch-as) = 6fdeac607eacb5f0a9364195f915b6addbc5e705
+SHA1 (patch-async_init.h) = b886c40cd1d9d8527846e39f9c54a6efafd5216e
+SHA1 (patch-async_itree.h) = 51fe7bf6761079b8cc898cd8cd7d26c65a994d54
 SHA1 (patch-at) = c7ca70c5a5741cd55444d66de475788eda331ca0
 SHA1 (patch-au) = 80b0fb5b855860b0706e74ef113dd1f72366da62
 SHA1 (patch-av) = bc68e7066c0208933b5b1b006d884ffd7eb0c8bf
@@ -51,3 +53,4 @@ SHA1 (patch-bs) = a426787d1b2a74a92a091046c1c9fdf7696a87f4
 SHA1 (patch-bt) = 41b1359d716493aadd861818c9a377247191ecec
 SHA1 (patch-bu) = 42924f5d59315b99d3d397eedde977366ec0ad96
 SHA1 (patch-bv) = d77635ff12f3b6324fc76fbad7ad8a314c2cb12e
+SHA1 (patch-rpcc_genheader.C) = c6e7bfc4035bd15568fda3050a63157b372ebf06
diff --git a/security/sfs/patches/patch-ab b/security/sfs/patches/patch-ab
index fc4ad4cbf03..332c5dc1ed8 100644
--- a/security/sfs/patches/patch-ab
+++ b/security/sfs/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2006/10/21 11:53:13 agc Exp $
+$NetBSD: patch-ab,v 1.2 2013/10/15 14:48:38 joerg Exp $
 
---- ./async/dnsparse.C.orig	2002-06-26 07:36:31.000000000 +0100
-+++ ./async/dnsparse.C
+--- async/dnsparse.C.orig	2002-06-26 06:36:31.000000000 +0000
++++ async/dnsparse.C
 @@ -323,7 +323,7 @@ dnsparse::tomxlist ()
    n_chars += strlen (name) + 1;
  
    ref <mxlist> mxl = refcounted<mxlist, vsize>::alloc
 -    (offsetof (mxlist, m_mxes[nmx]) + n_chars);
-+    (((unsigned int)&(((mxlist *)0)->m_mxes[nmx])) + n_chars);
++    (((unsigned int)(size_t)&(((mxlist *)0)->m_mxes[nmx])) + n_chars);
    mxrec *mxrecs = mxl->m_mxes;
    char *np = (char *) &mxrecs[nmx];
  
diff --git a/security/sfs/patches/patch-ac b/security/sfs/patches/patch-ac
index 333c4e2628f..1b9447fbe3b 100644
--- a/security/sfs/patches/patch-ac
+++ b/security/sfs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/10/21 11:53:13 agc Exp $
+$NetBSD: patch-ac,v 1.2 2013/10/15 14:48:38 joerg Exp $
 
---- ./async/ihash.h.orig	2002-05-28 11:29:16.000000000 +0100
-+++ ./async/ihash.h
-@@ -213,7 +213,7 @@ class ihash
+--- async/ihash.h.orig	2002-05-28 10:29:16.000000000 +0000
++++ async/ihash.h
+@@ -213,10 +213,10 @@ class ihash
    const H hash;
  
  public:
@@ -10,4 +10,28 @@ $NetBSD: patch-ac,v 1.1 2006/10/21 11:53:13 agc Exp $
 +  ihash () : eq (E ()), hash (H ()) {}
    ihash (const E &e, const H &h) : eq (e), hash (h) {}
  
-   void insert (V *elm) { insert_val (elm, hash (elm->*key)); }
+-  void insert (V *elm) { insert_val (elm, hash (elm->*key)); }
++  void insert (V *elm) { this->insert_val (elm, hash (elm->*key)); }
+ 
+ #if 0
+   template<class T> V *operator[] (const T &k) const {
+@@ -224,16 +224,16 @@ public:
+   V *operator[] (const K &k) const {
+ #endif
+     V *v;
+-    for (v = lookup_val (hash (k));
++    for (v = this->lookup_val (hash (k));
+ 	 v && !eq (k, v->*key);
+-	 v = next_val (v))
++	 v = this->next_val (v))
+       ;
+     return v;
+   }
+ 
+   V *nextkeq (V *v) {
+     const K &k = v->*key;
+-    while ((v = next_val (v)) && !eq (k, v->*key))
++    while ((v = this->next_val (v)) && !eq (k, v->*key))
+       ;
+     return v;
+   };
diff --git a/security/sfs/patches/patch-ad b/security/sfs/patches/patch-ad
index e8c0c285017..dfd3a108c9d 100644
--- a/security/sfs/patches/patch-ad
+++ b/security/sfs/patches/patch-ad
@@ -1,7 +1,25 @@
-$NetBSD: patch-ad,v 1.1 2006/10/21 11:53:13 agc Exp $
+$NetBSD: patch-ad,v 1.2 2013/10/15 14:48:38 joerg Exp $
 
---- ./async/qhash.h.orig	2002-05-28 11:50:37.000000000 +0100
-+++ ./async/qhash.h
+--- async/qhash.h.orig	2002-05-28 10:50:37.000000000 +0000
++++ async/qhash.h
+@@ -69,7 +69,7 @@ class qhash
+ 
+   slot *getslot (const K &k) const {
+     slot *s;
+-    for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s))
++    for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s))
+       ;
+     return s;
+   }
+@@ -152,7 +152,7 @@ class bhash // <K, void, H, E, kludge>
+ 
+   slot *getslot (const K &k) const {
+     slot *s;
+-    for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s))
++    for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s))
+       ;
+     return s;
+   }
 @@ -166,7 +166,7 @@ class bhash // <K, void, H, E, kludge>
  
  public:
diff --git a/security/sfs/patches/patch-af b/security/sfs/patches/patch-af
index c2f5bc4ae2b..ca838f22643 100644
--- a/security/sfs/patches/patch-af
+++ b/security/sfs/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2006/10/21 11:53:13 agc Exp $
+$NetBSD: patch-af,v 1.2 2013/10/15 14:48:38 joerg Exp $
 
---- ./async/vec.h.orig	2002-05-28 11:29:16.000000000 +0100
-+++ ./async/vec.h
+--- async/vec.h.orig	2002-05-28 10:29:16.000000000 +0000
++++ async/vec.h
 @@ -72,7 +72,14 @@ public:
  };
  
@@ -17,12 +17,23 @@ $NetBSD: patch-af,v 1.1 2006/10/21 11:53:13 agc Exp $
    void move (elm_t *dst) {
      if (dst == firstp)
        return;
-@@ -92,7 +99,7 @@ template<class T, size_t N = 0> class ve
+@@ -92,8 +99,8 @@ template<class T, size_t N = 0> class ve
      { return *new (implicit_cast<void *> (&e)) elm_t (v); }
    static void destroy (elm_t &e) { e.~elm_t (); }
  
 -  void init () { lastp = firstp = basep = def_basep (); limp = def_limp (); }
+-  void del () { while (firstp < lastp) firstp++->~elm_t (); bfree (basep); }
 +  void init () { lastp = firstp = basep = this->def_basep (); limp = this->def_limp (); }
-   void del () { while (firstp < lastp) firstp++->~elm_t (); bfree (basep); }
++  void del () { while (firstp < lastp) firstp++->~elm_t (); this->bfree (basep); }
  
  #define append(v)						\
+ do {								\
+@@ -134,7 +141,7 @@ public:
+       elm_t *obasep = basep;
+       move (static_cast<elm_t *> (txmalloc (nalloc * sizeof (elm_t))));
+       limp = basep + nalloc;
+-      bfree (obasep);
++      this->bfree (obasep);
+     }
+     else
+       move (basep);
diff --git a/security/sfs/patches/patch-async_init.h b/security/sfs/patches/patch-async_init.h
new file mode 100644
index 00000000000..8b4fb226cb5
--- /dev/null
+++ b/security/sfs/patches/patch-async_init.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-async_init.h,v 1.1 2013/10/15 14:48:38 joerg Exp $
+
+--- async/init.h.orig	2013-10-14 20:49:48.000000000 +0000
++++ async/init.h
+@@ -43,7 +43,7 @@ public:
+ };
+ #define INITFN(fn)				\
+ static void fn ();				\
+-static initfn init_ ## fn (fn) __attribute__ ((unused))
++static __attribute__((used)) initfn init_ ## fn (fn)
+ 
+ class exitfn {
+   void (*const fn) ();
+@@ -53,6 +53,6 @@ public:
+ };
+ #define EXITFN(fn)					\
+ static void fn ();					\
+-static exitfn exit_ ## fn (fn) __attribute__ ((unused))
++static __attribute__((used))  exitfn exit_ ## fn (fn)
+ 
+ #endif /* !_ASYNC_INIT_H_ */
diff --git a/security/sfs/patches/patch-async_itree.h b/security/sfs/patches/patch-async_itree.h
new file mode 100644
index 00000000000..85f85b72803
--- /dev/null
+++ b/security/sfs/patches/patch-async_itree.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-async_itree.h,v 1.1 2013/10/15 14:48:38 joerg Exp $
+
+--- async/itree.h.orig	2013-10-14 20:52:43.000000000 +0000
++++ async/itree.h
+@@ -86,7 +86,7 @@ class itree_core {
+   itree_core (const itree_core &);
+   itree_core &operator = (const itree_core &);
+ 
+-#define eos ((int) &(((T *) 0)->*field).p)
++#define eos ((int)(size_t) &(((T *) 0)->*field).p)
+ #define cmpfn scmp, (void *) this
+ 
+ public:
+@@ -217,7 +217,7 @@ public:
+ #else
+   V *operator[] (const K &k) {
+     // return search (wrap (this, &kvcmp, &k));
+-    return search (skvcmp, &kcmp, &k);
++    return this->search (skvcmp, &kcmp, &k);
+   }
+ #endif
+ };
diff --git a/security/sfs/patches/patch-rpcc_genheader.C b/security/sfs/patches/patch-rpcc_genheader.C
new file mode 100644
index 00000000000..920a5149fca
--- /dev/null
+++ b/security/sfs/patches/patch-rpcc_genheader.C
@@ -0,0 +1,31 @@
+$NetBSD: patch-rpcc_genheader.C,v 1.1 2013/10/15 14:48:38 joerg Exp $
+
+--- rpcc/genheader.C.orig	2013-10-14 21:19:36.000000000 +0000
++++ rpcc/genheader.C
+@@ -32,7 +32,7 @@ pmshl (str id)
+ }
+ 
+ static str
+-decltype (const rpc_decl *d)
++my_decltype (const rpc_decl *d)
+ {
+   if (d->type == "string")
+     return strbuf () << "rpc_str<" << d->bound << ">";
+@@ -71,7 +71,7 @@ static void
+ pdecl (str prefix, const rpc_decl *d)
+ {
+   str name = d->id;
+-  aout << prefix << decltype (d) << " " << name << ";\n";
++  aout << prefix << my_decltype (d) << " " << name << ";\n";
+ }
+ 
+ static void
+@@ -194,7 +194,7 @@ dumpunion (const rpc_sym *s)
+     if (!rt->swval)
+       hasdefault = true;
+     if (rt->tagvalid && rt->tag.type != "void") {
+-      str type = decltype (&rt->tag);
++      str type = my_decltype (&rt->tag);
+       if (type[type.len ()-1] == '>')
+ 	type = type << " ";
+       aout << "    union_entry<" << type << "> "