Tue Apr 26 10:36:48 2016 UTC ()
Fix build on NetBSD >=7.99.27 due route(4) change (deprecation of RTF_LLINFO). Courtesy of leot.


(adam)
diff -r1.49 -r1.50 pkgsrc/www/squid3/distinfo
diff -r0 -r1.1 pkgsrc/www/squid3/patches/patch-src_eui_Eui48.cc
cvs diff -r1.49 -r1.50 pkgsrc/www/squid3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2016/04/22 15:14:22 1.49
+++ pkgsrc/www/squid3/Attic/distinfo 2016/04/26 10:36:48 1.50
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.49 2016/04/22 15:14:22 adam Exp $ 1$NetBSD: distinfo,v 1.50 2016/04/26 10:36:48 adam Exp $
2 2
3SHA1 (squid-3.5.17.tar.xz) = 8ef6fe7d778df9538a4aa29d7e8ace52246e7a23 3SHA1 (squid-3.5.17.tar.xz) = 8ef6fe7d778df9538a4aa29d7e8ace52246e7a23
4RMD160 (squid-3.5.17.tar.xz) = f0fdba7aa5601c0b43583819d58c778de351eb7e 4RMD160 (squid-3.5.17.tar.xz) = f0fdba7aa5601c0b43583819d58c778de351eb7e
5SHA512 (squid-3.5.17.tar.xz) = 7531c208278ee42b9e34b4e49a249bb033389207546cf0172a2657d60d08146d36ee8f9296e16eea13c552bad01f3ef8592b1486556756edb0b3304b17306661 5SHA512 (squid-3.5.17.tar.xz) = 7531c208278ee42b9e34b4e49a249bb033389207546cf0172a2657d60d08146d36ee8f9296e16eea13c552bad01f3ef8592b1486556756edb0b3304b17306661
6Size (squid-3.5.17.tar.xz) = 2318216 bytes 6Size (squid-3.5.17.tar.xz) = 2318216 bytes
7SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288 7SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
8SHA1 (patch-compat_debug.cc) = 95fc0aa6901834175b9bbf1ddb51eeb7d9ddc8c7 8SHA1 (patch-compat_debug.cc) = 95fc0aa6901834175b9bbf1ddb51eeb7d9ddc8c7
9SHA1 (patch-compat_debug.h) = a828871704b1578b520d412393c3d398099a5fdc 9SHA1 (patch-compat_debug.h) = a828871704b1578b520d412393c3d398099a5fdc
10SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 10SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
11SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6 11SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
12SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 12SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
13SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939 13SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939
 14SHA1 (patch-src_eui_Eui48.cc) = 1096f3293cc5a4249a1ce1738b2e5c4113d0a982
14SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 15SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
15SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f 16SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
File Added: pkgsrc/www/squid3/patches/Attic/patch-src_eui_Eui48.cc
$NetBSD: patch-src_eui_Eui48.cc,v 1.1 2016/04/26 10:36:48 adam Exp $

Fix build on NetBSD >=7.99.27 due route(4) change (deprecation of RTF_LLINFO).

--- src/eui/Eui48.cc.orig	2016-04-20 12:24:03.000000000 +0000
+++ src/eui/Eui48.cc
@@ -375,7 +375,11 @@ Eui::Eui48::lookup(const Ip::Address &c)
 
     mib[4] = NET_RT_FLAGS;
 
+#ifdef RTF_LLDATA
+    mib[5] = RTF_LLDATA;
+#else
     mib[5] = RTF_LLINFO;
+#endif
 
     if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) {
         debugs(28, DBG_CRITICAL, "Can't estimate ARP table size!");