Mon Aug 28 09:00:13 2017 UTC ()
Add two patches to provide conditional compat define for RTF_LLINFO,
for the benefit of netbsd-8 ++.
No PKGREVISION bump, this is a build fix only.
OK'ed by bouyer@.
(he)
diff -r1.5 -r1.6 pkgsrc/net/p5-Net-RawIP/distinfo
diff -r0 -r1.1 pkgsrc/net/p5-Net-RawIP/patches/patch-eth.c
diff -r0 -r1.1 pkgsrc/net/p5-Net-RawIP/patches/patch-rdev.c
--- pkgsrc/net/p5-Net-RawIP/distinfo 2015/11/04 00:35:23 1.5
+++ pkgsrc/net/p5-Net-RawIP/distinfo 2017/08/28 09:00:13 1.6
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2015/11/04 00:35:23 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2017/08/28 09:00:13 he Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (Net-RawIP-0.25.tar.gz) = e1e2a85374436e314bce7cfb091415ebf72e6fba | | 3 | SHA1 (Net-RawIP-0.25.tar.gz) = e1e2a85374436e314bce7cfb091415ebf72e6fba |
| 4 | RMD160 (Net-RawIP-0.25.tar.gz) = 1bae7de1e4df034394e3928701b16e2e04b80894 | | 4 | RMD160 (Net-RawIP-0.25.tar.gz) = 1bae7de1e4df034394e3928701b16e2e04b80894 |
| 5 | SHA512 (Net-RawIP-0.25.tar.gz) = c48c77389db9dc8d5c64d67e5c62bac5e3314dbc36bcfa51aa20d07224492edaa65f5c71d47ca0b804ac62b1b02387e172cd3561eadaa3a1a8040968b182b3ca | | 5 | SHA512 (Net-RawIP-0.25.tar.gz) = c48c77389db9dc8d5c64d67e5c62bac5e3314dbc36bcfa51aa20d07224492edaa65f5c71d47ca0b804ac62b1b02387e172cd3561eadaa3a1a8040968b182b3ca |
| 6 | Size (Net-RawIP-0.25.tar.gz) = 43474 bytes | | 6 | Size (Net-RawIP-0.25.tar.gz) = 43474 bytes |
| | | 7 | SHA1 (patch-eth.c) = 406b8347f2f1f1a5f12a9294f0a14756e2a0937e |
| | | 8 | SHA1 (patch-rdev.c) = ae6f8686793ed0a06c68fb3bc3ca1daa8a1794b2 |
$NetBSD: patch-eth.c,v 1.1 2017/08/28 09:00:13 he Exp $
Provide conditional compat define for RTF_LLINFO.
--- eth.c.orig 2007-04-03 10:59:40.000000000 +0000
+++ eth.c
@@ -203,6 +203,9 @@ int mac_disc(unsigned int addr,unsigned
mib[2] = 0;
mib[3] = AF_INET;
mib[4] = NET_RT_FLAGS;
+#if !defined(RTF_LLINFO) && defined(RTF_LLDATA) /* For netbsd-8 ++ */
+# define RTF_LLINFO RTF_LLDATA
+#endif
mib[5] = RTF_LLINFO;
found = 0;
if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
$NetBSD: patch-rdev.c,v 1.1 2017/08/28 09:00:13 he Exp $
Provide conditional compat define for RTF_LLINFO.
--- rdev.c.orig 2007-04-03 10:59:40.000000000 +0000
+++ rdev.c
@@ -159,6 +159,9 @@ ip_rt_dev(u_int32_t addr,u_char *name)
}
ADVANCE(cp, sa);
}
+#if !defined(RTF_LLINFO) && defined(RTF_LLDATA) /* netbsd-8 ++ */
+# define RTF_LLINFO RTF_LLDATA
+#endif
if(!(rtm->rtm_flags & RTF_LLINFO) && (rtm->rtm_flags & RTF_HOST))
mask = 0xffffffff;
if(!mask && dest && (dest != local)) continue;