Fix build with gcc2.

3 files changed, 36 insertions, 5 deletions

diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 9c7d4b56f6e..4a2653b0bc9 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2004/11/03 20:53:15 markd Exp $
+$NetBSD: distinfo,v 1.14 2004/11/07 12:21:27 markd Exp $
 
 SHA1 (netatalk-2.0.1.tar.bz2) = b61fd7595b8d03971fbd6c0dce0ed307e8916628
 Size (netatalk-2.0.1.tar.bz2) = 1465827 bytes
-SHA1 (patch-aa) = 23c68f79a8eb8c360cd11f47a88d890b8fc88ab1
+SHA1 (patch-aa) = 038971eea8da4fbab0596b87aa0c2f8d01493a15
 SHA1 (patch-ab) = 057a8a4ef188068237550199e2c87db0c0cc5dfd
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
@@ -10,3 +10,4 @@ SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
 SHA1 (patch-ag) = c99fdca284c08577194f0c8820f724793841208f
 SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6
 SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
+SHA1 (patch-aj) = f28c7ff090794e975ad6d0a0b5f31e03e953d409
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index e7e35176835..b247a3e94f5 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/11/02 11:26:28 markd Exp $
+$NetBSD: patch-aa,v 1.12 2004/11/07 12:21:27 markd Exp $
 
---- configure.orig	2004-09-15 23:44:25.000000000 +1200
+--- configure.orig	Thu Oct 28 03:42:21 2004
 +++ configure
-@@ -19013,7 +19013,7 @@ if test "${enable_krbV_uam+set}" = set; 
+@@ -18960,7 +18960,7 @@ if test "${enable_krbV_uam+set}" = set; 
  		if test x"$enableval" = x"yes"; then
  
  	FOUND_GSSAPI=no
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.11 2004/11/02 11:26:28 markd Exp $
  	GSSAPI_CFLAGS=""
  
  
+@@ -19175,7 +19175,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  (eval $ac_cpp $ac_env_CPPFLAGS_value conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
diff --git a/net/netatalk/patches/patch-aj b/net/netatalk/patches/patch-aj
new file mode 100644
index 00000000000..a2831f46c5f
--- /dev/null
+++ b/net/netatalk/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.4 2004/11/07 12:21:27 markd Exp $
+
+--- etc/uams/uams_gss.c.orig	Mon Nov  8 12:22:44 2004
++++ etc/uams/uams_gss.c
+@@ -135,6 +135,7 @@ static int do_gss_auth( char *service, c
+      * we should be able to detect it.
+      */
+     gss_buffer_desc s_princ_buffer;
++    u_int16_t auth_len;
+ 
+     s_princ_buffer.value = service;
+     s_princ_buffer.length = strlen( service ) + 1;
+@@ -209,7 +210,7 @@ static int do_gss_auth( char *service, c
+ 	    if (wrap_buff.value)
+ 	        gss_release_buffer( &minor_status, &wrap_buff );
+ 
+-	    u_int16_t auth_len = htons( authenticator_buff.length );
++	    auth_len = htons( authenticator_buff.length );
+ 	    /* save the username... note that doing it this way is
+ 	     * not the best idea: if a principal is truncated, a user could be
+ 	     * impersonated