Add an extra padding u_short to the sockaddr_m structure to meet the

stricter requirements now present in sys/net/rtsock.c in a -current kernel.
This change is sufficient for i386, but may still not be correct for
LP64 systems or systems with different alignment constraints.
Thanks to wrstuden for identifying the kernel change that affected this.

4 files changed, 30 insertions, 2 deletions

diff --git a/net/netatalk-asun/files/patch-sum b/net/netatalk-asun/files/patch-sum
index 8c73bf7261d..66cc330394d 100644
--- a/net/netatalk-asun/files/patch-sum
+++ b/net/netatalk-asun/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/08/15 14:48:22 abs Exp $
+$NetBSD: patch-sum,v 1.6 2000/10/18 03:59:33 briggs Exp $
 
 MD5 (patch-aa) = b01f99db357aae4fdc2cd6e20879efc1
 MD5 (patch-ab) = c8320acad0a11821edad3f4d0d926441
@@ -34,3 +34,4 @@ MD5 (patch-be) = 29ccc7e5d265a3448596f55528a04131
 MD5 (patch-bf) = 660abf089a9b6de182a5e2f6caa88ade
 MD5 (patch-bg) = 27548334cfd47590de166137cee27960
 MD5 (patch-bh) = cb33252bae65a59f65fd7bb71b642020
+MD5 (patch-bi) = a38fa5ace2b28f70cb15bd2f78d1d78f
diff --git a/net/netatalk-asun/patches/patch-bi b/net/netatalk-asun/patches/patch-bi
new file mode 100644
index 00000000000..a8079afb761
--- /dev/null
+++ b/net/netatalk-asun/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.3 2000/10/18 03:59:33 briggs Exp $
+--- etc/atalkd/route.c.orig	Tue Oct 17 23:29:04 2000
++++ etc/atalkd/route.c	Tue Oct 17 23:30:19 2000
+@@ -34,7 +34,8 @@
+     u_char	sam_family;
+     u_short	sam_pad;
+     u_short	sam_mask;
+-} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
++    u_short	sam_pad2;
++} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
+ 
+ struct rt_msg_at {
+     struct rt_msghdr	rtma_rtm;
diff --git a/net/netatalk/files/patch-sum b/net/netatalk/files/patch-sum
index fc33cc04bb0..d6aa61a8eab 100644
--- a/net/netatalk/files/patch-sum
+++ b/net/netatalk/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.8 2000/07/31 17:16:00 abs Exp $
+$NetBSD: patch-sum,v 1.9 2000/10/18 03:59:32 briggs Exp $
 
 MD5 (patch-aa) = db4dd5105f7563b533f5ee32ad0a557a
 MD5 (patch-ab) = c9013bae176432478a2b323bb5b42dd5
@@ -33,3 +33,4 @@ MD5 (patch-bd) = 057a4d866210552a0df5f7c7dced8ea3
 MD5 (patch-be) = eb1f7aede474b220c6dc7cbf6e538c1c
 MD5 (patch-bf) = 1d5feb54ac1c84df74b952cd7354dbfc
 MD5 (patch-bg) = e2a1229c267566ecc20b0caa2d15b7cd
+MD5 (patch-bh) = a38fa5ace2b28f70cb15bd2f78d1d78f
diff --git a/net/netatalk/patches/patch-bh b/net/netatalk/patches/patch-bh
new file mode 100644
index 00000000000..240218b7242
--- /dev/null
+++ b/net/netatalk/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2000/10/18 03:59:33 briggs Exp $
+--- etc/atalkd/route.c.orig	Tue Oct 17 23:29:04 2000
++++ etc/atalkd/route.c	Tue Oct 17 23:30:19 2000
+@@ -34,7 +34,8 @@
+     u_char	sam_family;
+     u_short	sam_pad;
+     u_short	sam_mask;
+-} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff };
++    u_short	sam_pad2;
++} mask = { sizeof( struct sockaddr_m ), 0, 0, 0xffff, 0 };
+ 
+ struct rt_msg_at {
+     struct rt_msghdr	rtma_rtm;