diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index d9aca960d6..c647331918 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -8,17 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
-PKG_VERSION:=5.4.0
-PKG_RELEASE:=1
+PKG_VERSION:=4.19.0
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=fe97aa60a0d4c5ac830be18937e18dc3400ca713a33a89ad896ff1e3d46086ae
+PKG_HASH:=d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
 PKG_CPE_ID:=cpe:/a:iproute2_project:iproute2
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -35,7 +37,6 @@ define Package/ip-tiny
 $(call Package/iproute2/Default)
  TITLE:=Routing control utility (Minimal)
  VARIANT:=tiny
- DEFAULT_VARIANT:=1
  PROVIDES:=ip
  ALTERNATIVES:=200:/sbin/ip:/usr/libexec/ip-tiny
  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
@@ -47,67 +48,55 @@ $(call Package/iproute2/Default)
  VARIANT:=full
  PROVIDES:=ip
  ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full
- DEPENDS:=+libnl-tiny +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +libcap
+ DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/tc
 $(call Package/iproute2/Default)
   TITLE:=Traffic control utility
-  VARIANT:=tc
-  PROVIDES:=tc
-  DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap
+  DEPENDS:=+kmod-sched-core +(PACKAGE_devlink||PACKAGE_rdma):libmnl +libelf1
 endef
 
 define Package/genl
 $(call Package/iproute2/Default)
   TITLE:=General netlink utility frontend
-  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/ip-bridge
 $(call Package/iproute2/Default)
   TITLE:=Bridge configuration utility from iproute2
-  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/ss
 $(call Package/iproute2/Default)
   TITLE:=Socket statistics utility
-  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/nstat
 $(call Package/iproute2/Default)
   TITLE:=Network statistics utility
-  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/devlink
 $(call Package/iproute2/Default)
   TITLE:=Network devlink utility
-  DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap
+  DEPENDS:=+libmnl
 endef
 
 define Package/rdma
 $(call Package/iproute2/Default)
   TITLE:=Network rdma utility
-  DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap
+  DEPENDS:=+libmnl
 endef
 
 ifeq ($(BUILD_VARIANT),tiny)
   IP_CONFIG_TINY:=y
 endif
 
-ifeq ($(BUILD_VARIANT),full)
-  HAVE_ELF:=y
-  HAVE_CAP:=y
-endif
-
-ifeq ($(BUILD_VARIANT),tc)
-  HAVE_ELF:=y
-  SHARED_LIBS:=y
-endif
-
 ifdef CONFIG_PACKAGE_devlink
   HAVE_MNL:=y
 endif
@@ -117,23 +106,25 @@ ifdef CONFIG_PACKAGE_rdma
 endif
 
 define Build/Configure
+	$(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
+	$(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
+		$(PKG_BUILD_DIR)/Makefile
+	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
+		$(PKG_BUILD_DIR)/Makefile
 	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
 		> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
 endef
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
-TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
 
 MAKE_FLAGS += \
-	KERNEL_INCLUDE="$(LINUX_DIR)/user_headers/include" \
-	SHARED_LIBS=$(SHARED_LIBS) \
+	EXTRA_CCOPTS="-I$(STAGING_DIR)/usr/include/libnl-tiny" \
+	KERNEL_INCLUDE="$(LINUX_DIR)/include" \
+	SHARED_LIBS="" \
+	LDFLAGS="$(TARGET_LDFLAGS) -Wl,--gc-sections" \
 	IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
-	HAVE_ELF=$(HAVE_ELF) \
 	HAVE_MNL=$(HAVE_MNL) \
-	HAVE_CAP=$(HAVE_CAP) \
 	IPT_LIB_DIR=/usr/lib/iptables \
-	XT_LIB_DIR=/usr/lib/iptables \
 	FPIC="$(FPIC)"
 
 define Build/Compile
@@ -162,10 +153,6 @@ define Package/tc/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/
-ifeq ($(SHARED_LIBS),y)
-	$(INSTALL_DIR) $(1)/usr/lib/tc
-	$(CP) $(PKG_BUILD_DIR)/tc/*.so $(1)/usr/lib/tc
-endif
 endef
 
 define Package/genl/install
diff --git a/package/network/utils/iproute2/files/15-teql b/package/network/utils/iproute2/files/15-teql
old mode 100644
new mode 100755
diff --git a/package/network/utils/iproute2/patches/001-fix-print_0xhex-on-32-bit.patch b/package/network/utils/iproute2/patches/001-fix-print_0xhex-on-32-bit.patch
new file mode 100644
index 0000000000..25994b4173
--- /dev/null
+++ b/package/network/utils/iproute2/patches/001-fix-print_0xhex-on-32-bit.patch
@@ -0,0 +1,343 @@
+From 90c5c969f0b9a2fbb0016b955fecc359aa884220 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <stephen@networkplumber.org>
+Date: Mon, 10 Dec 2018 14:20:32 -0800
+Subject: [PATCH] fix print_0xhex on 32 bit
+
+The argument to print_0xhex is converted to unsigned long long
+so the format string give for normal printout has to be some
+variant of %llx. Otherwise, bogus values will be printed on
+32 bit platforms.
+
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ bridge/link.c            | 2 +-
+ ip/ipaddress.c           | 2 +-
+ ip/iplink_bridge.c       | 2 +-
+ ip/iplink_bridge_slave.c | 6 +++---
+ ip/iplink_geneve.c       | 5 ++---
+ ip/iplink_vxlan.c        | 8 +++-----
+ ip/ipntable.c            | 2 +-
+ ip/iproute.c             | 8 ++++----
+ ip/iproute_lwtunnel.c    | 2 +-
+ ip/iprule.c              | 6 +++---
+ ip/iptuntap.c            | 2 +-
+ ip/link_gre.c            | 6 +++---
+ ip/link_gre6.c           | 4 ++--
+ ip/link_ip6tnl.c         | 2 +-
+ ip/link_iptnl.c          | 4 ++--
+ ip/link_vti.c            | 2 +-
+ ip/link_vti6.c           | 2 +-
+ tc/m_ife.c               | 2 +-
+ tc/q_htb.c               | 2 +-
+ tc/q_taprio.c            | 2 +-
+ 20 files changed, 34 insertions(+), 37 deletions(-)
+
+--- a/bridge/link.c
++++ b/bridge/link.c
+@@ -90,7 +90,7 @@ static void print_hwmode(__u16 mode)
+ {
+ 	if (mode >= ARRAY_SIZE(hw_mode))
+ 		print_0xhex(PRINT_ANY, "hwmode",
+-			    "hwmode %#hx ", mode);
++			    "hwmode %#llx ", mode);
+ 	else
+ 		print_string(PRINT_ANY, "hwmode",
+ 			     "hwmode %s ", hw_mode[mode]);
+--- a/ip/ipaddress.c
++++ b/ip/ipaddress.c
+@@ -129,7 +129,7 @@ static void print_operstate(FILE *f, __u
+ 		if (is_json_context())
+ 			print_uint(PRINT_JSON, "operstate_index", NULL, state);
+ 		else
+-			print_0xhex(PRINT_FP, NULL, "state %#x", state);
++			print_0xhex(PRINT_FP, NULL, "state %#llx", state);
+ 	} else if (brief) {
+ 		print_color_string(PRINT_ANY,
+ 				   oper_state_color(state),
+--- a/ip/iplink_bridge.c
++++ b/ip/iplink_bridge.c
+@@ -524,7 +524,7 @@ static void bridge_print_opt(struct link
+ 	if (tb[IFLA_BR_GROUP_FWD_MASK])
+ 		print_0xhex(PRINT_ANY,
+ 			    "group_fwd_mask",
+-			    "group_fwd_mask %#x ",
++			    "group_fwd_mask %#llx ",
+ 			    rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK]));
+ 
+ 	if (tb[IFLA_BR_GROUP_ADDR]) {
+--- a/ip/iplink_bridge_slave.c
++++ b/ip/iplink_bridge_slave.c
+@@ -167,11 +167,11 @@ static void bridge_slave_print_opt(struc
+ 			     rta_getattr_u8(tb[IFLA_BRPORT_UNICAST_FLOOD]));
+ 
+ 	if (tb[IFLA_BRPORT_ID])
+-		print_0xhex(PRINT_ANY, "id", "port_id 0x%x ",
++		print_0xhex(PRINT_ANY, "id", "port_id %#llx ",
+ 			    rta_getattr_u16(tb[IFLA_BRPORT_ID]));
+ 
+ 	if (tb[IFLA_BRPORT_NO])
+-		print_0xhex(PRINT_ANY, "no", "port_no 0x%x ",
++		print_0xhex(PRINT_ANY, "no", "port_no %#llx ",
+ 			   rta_getattr_u16(tb[IFLA_BRPORT_NO]));
+ 
+ 	if (tb[IFLA_BRPORT_DESIGNATED_PORT])
+@@ -266,7 +266,7 @@ static void bridge_slave_print_opt(struc
+ 
+ 		fwd_mask = rta_getattr_u16(tb[IFLA_BRPORT_GROUP_FWD_MASK]);
+ 		print_0xhex(PRINT_ANY, "group_fwd_mask",
+-			    "group_fwd_mask 0x%x ", fwd_mask);
++			    "group_fwd_mask %#llx ", fwd_mask);
+ 		_bitmask2str(fwd_mask, convbuf, sizeof(convbuf), fwd_mask_tbl);
+ 		print_string(PRINT_ANY, "group_fwd_mask_str",
+ 			     "group_fwd_mask_str %s ", convbuf);
+--- a/ip/iplink_geneve.c
++++ b/ip/iplink_geneve.c
+@@ -276,7 +276,7 @@ static void geneve_print_opt(struct link
+ 		tos = rta_getattr_u8(tb[IFLA_GENEVE_TOS]);
+ 	if (tos) {
+ 		if (is_json_context() || tos != 1)
+-			print_0xhex(PRINT_ANY, "tos", "tos 0x%x ", tos);
++			print_0xhex(PRINT_ANY, "tos", "tos %#llx ", tos);
+ 		else
+ 			print_string(PRINT_FP, NULL, "tos %s ", "inherit");
+ 	}
+@@ -286,8 +286,7 @@ static void geneve_print_opt(struct link
+ 
+ 		if (label)
+ 			print_0xhex(PRINT_ANY,
+-				    "label",
+-				    "flowlabel %#x ",
++				    "label", "flowlabel %#llx ",
+ 				    ntohl(label));
+ 	}
+ 
+--- a/ip/iplink_vxlan.c
++++ b/ip/iplink_vxlan.c
+@@ -522,7 +522,7 @@ static void vxlan_print_opt(struct link_
+ 		tos = rta_getattr_u8(tb[IFLA_VXLAN_TOS]);
+ 	if (tos) {
+ 		if (is_json_context() || tos != 1)
+-			print_0xhex(PRINT_ANY, "tos", "tos 0x%x ", tos);
++			print_0xhex(PRINT_ANY, "tos", "tos %#llx ", tos);
+ 		else
+ 			print_string(PRINT_FP, NULL, "tos %s ", "inherit");
+ 	}
+@@ -542,10 +542,8 @@ static void vxlan_print_opt(struct link_
+ 		__u32 label = rta_getattr_u32(tb[IFLA_VXLAN_LABEL]);
+ 
+ 		if (label)
+-			print_0xhex(PRINT_ANY,
+-				    "label",
+-				    "flowlabel %#x ",
+-				    ntohl(label));
++			print_0xhex(PRINT_ANY, "label",
++				    "flowlabel %#llx ", ntohl(label));
+ 	}
+ 
+ 	if (tb[IFLA_VXLAN_AGEING]) {
+--- a/ip/ipntable.c
++++ b/ip/ipntable.c
+@@ -360,7 +360,7 @@ static void print_ndtconfig(const struct
+ 	print_uint(PRINT_ANY, "hash_rnd",
+ 		   "        hash_rnd %u ", ndtc->ndtc_hash_rnd);
+ 	print_0xhex(PRINT_ANY, "hash_mask",
+-		    "hash_mask %08x ", ndtc->ndtc_hash_mask);
++		    "hash_mask %08llx ", ndtc->ndtc_hash_mask);
+ 
+ 	print_uint(PRINT_ANY, "hash_chain_gc",
+ 		   "hash_chain_gc %u ", ndtc->ndtc_hash_chain_gc);
+--- a/ip/iproute.c
++++ b/ip/iproute.c
+@@ -346,7 +346,7 @@ static void print_rtax_features(FILE *fp
+ 
+ 	if (features)
+ 		print_0xhex(PRINT_ANY,
+-			    "features", "0x%x ", of);
++			    "features", "%#llx ", of);
+ }
+ 
+ static void print_rt_flags(FILE *fp, unsigned int flags)
+@@ -483,10 +483,10 @@ static void print_rta_cacheinfo(FILE *fp
+ 	}
+ 	if (ci->rta_id)
+ 		print_0xhex(PRINT_ANY, "ipid",
+-			    "ipid 0x%04x ", ci->rta_id);
++			    "ipid 0x%04llx ", ci->rta_id);
+ 	if (ci->rta_ts || ci->rta_tsage) {
+ 		print_0xhex(PRINT_ANY, "ts",
+-			    "ts 0x%x", ci->rta_ts);
++			    "ts 0x%llx", ci->rta_ts);
+ 		print_uint(PRINT_ANY, "tsage",
+ 			   "tsage %usec ", ci->rta_tsage);
+ 	}
+@@ -885,7 +885,7 @@ int print_route(const struct sockaddr_nl
+ 				print_uint(PRINT_JSON, "mark", NULL, mark);
+ 			else if (mark >= 16)
+ 				print_0xhex(PRINT_FP, NULL,
+-					    "mark 0x%x ", mark);
++					    "mark 0x%llx ", mark);
+ 			else
+ 				print_uint(PRINT_FP, NULL,
+ 					   "mark %u ", mark);
+--- a/ip/iproute_lwtunnel.c
++++ b/ip/iproute_lwtunnel.c
+@@ -115,7 +115,7 @@ static void print_srh(FILE *fp, struct i
+ 
+ 		tlv = (struct sr6_tlv_hmac *)((char *)srh + offset);
+ 		print_0xhex(PRINT_ANY, "hmac",
+-			    "hmac 0x%X ", ntohl(tlv->hmackeyid));
++			    "hmac %llX ", ntohl(tlv->hmackeyid));
+ 	}
+ }
+ 
+--- a/ip/iprule.c
++++ b/ip/iprule.c
+@@ -263,10 +263,10 @@ int print_rule(const struct sockaddr_nl
+ 
+ 		if (tb[FRA_FWMASK] &&
+ 		    (mask = rta_getattr_u32(tb[FRA_FWMASK])) != 0xFFFFFFFF) {
+-			print_0xhex(PRINT_ANY, "fwmark", "fwmark 0x%x", mark);
+-			print_0xhex(PRINT_ANY, "fwmask", "/0x%x ", mask);
++			print_0xhex(PRINT_ANY, "fwmark", "fwmark %#llx", mark);
++			print_0xhex(PRINT_ANY, "fwmask", "/%#llx ", mask);
+ 		} else {
+-			print_0xhex(PRINT_ANY, "fwmark", "fwmark 0x%x ", mark);
++			print_0xhex(PRINT_ANY, "fwmark", "fwmark %#llx ", mark);
+ 		}
+ 	}
+ 
+--- a/ip/iptuntap.c
++++ b/ip/iptuntap.c
+@@ -254,7 +254,7 @@ static void print_flags(long flags)
+ 	flags &= ~(IFF_TUN | IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE |
+ 		   IFF_VNET_HDR | IFF_PERSIST | IFF_NOFILTER);
+ 	if (flags)
+-		print_0xhex(PRINT_ANY, NULL, "%#x", flags);
++		print_0xhex(PRINT_ANY, NULL, "%#llx", flags);
+ 
+ 	close_json_array(PRINT_JSON, NULL);
+ }
+--- a/ip/link_gre.c
++++ b/ip/link_gre.c
+@@ -463,7 +463,7 @@ static void gre_print_opt(struct link_ut
+ 		tos = rta_getattr_u8(tb[IFLA_GRE_TOS]);
+ 	if (tos) {
+ 		if (is_json_context() || tos != 1)
+-			print_0xhex(PRINT_ANY, "tos", "tos 0x%x ", tos);
++			print_0xhex(PRINT_ANY, "tos", "tos %#llx ", tos);
+ 		else
+ 			print_string(PRINT_FP, NULL, "tos %s ", "inherit");
+ 	}
+@@ -508,7 +508,7 @@ static void gre_print_opt(struct link_ut
+ 
+ 		if (fwmark) {
+ 			print_0xhex(PRINT_ANY,
+-				    "fwmark", "fwmark 0x%x ", fwmark);
++				    "fwmark", "fwmark %#llx ", fwmark);
+ 		}
+ 	}
+ 
+@@ -541,7 +541,7 @@ static void gre_print_opt(struct link_ut
+ 		__u16 erspan_hwid = rta_getattr_u16(tb[IFLA_GRE_ERSPAN_HWID]);
+ 
+ 		print_0xhex(PRINT_ANY,
+-			    "erspan_hwid", "erspan_hwid 0x%x ", erspan_hwid);
++			    "erspan_hwid", "erspan_hwid %#llx ", erspan_hwid);
+ 	}
+ 
+ 	tnl_print_encap(tb,
+--- a/ip/link_gre6.c
++++ b/ip/link_gre6.c
+@@ -576,7 +576,7 @@ static void gre_print_opt(struct link_ut
+ 
+ 		if (fwmark) {
+ 			print_0xhex(PRINT_ANY,
+-				    "fwmark", "fwmark 0x%x ", fwmark);
++				    "fwmark", "fwmark %#llx ", fwmark);
+ 		}
+ 	}
+ 
+@@ -609,7 +609,7 @@ static void gre_print_opt(struct link_ut
+ 		__u16 erspan_hwid = rta_getattr_u16(tb[IFLA_GRE_ERSPAN_HWID]);
+ 
+ 		print_0xhex(PRINT_ANY,
+-			    "erspan_hwid", "erspan_hwid 0x%x ", erspan_hwid);
++			    "erspan_hwid", "erspan_hwid %#llx ", erspan_hwid);
+ 	}
+ 
+ 	tnl_print_encap(tb,
+--- a/ip/link_ip6tnl.c
++++ b/ip/link_ip6tnl.c
+@@ -457,7 +457,7 @@ static void ip6tunnel_print_opt(struct l
+ 
+ 		if (fwmark) {
+ 			print_0xhex(PRINT_ANY,
+-				    "fwmark", "fwmark 0x%x ", fwmark);
++				    "fwmark", "fwmark %#llx ", fwmark);
+ 		}
+ 	}
+ 
+--- a/ip/link_iptnl.c
++++ b/ip/link_iptnl.c
+@@ -418,7 +418,7 @@ static void iptunnel_print_opt(struct li
+ 		tos = rta_getattr_u8(tb[IFLA_IPTUN_TOS]);
+ 	if (tos) {
+ 		if (is_json_context() || tos != 1)
+-			print_0xhex(PRINT_ANY, "tos", "tos 0x%x ", tos);
++			print_0xhex(PRINT_ANY, "tos", "tos %#llx ", tos);
+ 		else
+ 			print_string(PRINT_FP, NULL, "tos %s ", "inherit");
+ 	}
+@@ -476,7 +476,7 @@ static void iptunnel_print_opt(struct li
+ 
+ 		if (fwmark) {
+ 			print_0xhex(PRINT_ANY,
+-				    "fwmark", "fwmark 0x%x ", fwmark);
++				    "fwmark", "fwmark %#llx ", fwmark);
+ 		}
+ 	}
+ 
+--- a/ip/link_vti.c
++++ b/ip/link_vti.c
+@@ -208,7 +208,7 @@ static void vti_print_opt(struct link_ut
+ 
+ 		if (fwmark) {
+ 			print_0xhex(PRINT_ANY,
+-				    "fwmark", "fwmark 0x%x ", fwmark);
++				    "fwmark", "fwmark %#llx ", fwmark);
+ 		}
+ 	}
+ }
+--- a/ip/link_vti6.c
++++ b/ip/link_vti6.c
+@@ -210,7 +210,7 @@ static void vti6_print_opt(struct link_u
+ 
+ 		if (fwmark) {
+ 			print_0xhex(PRINT_ANY,
+-				    "fwmark", "fwmark 0x%x ", fwmark);
++				    "fwmark", "fwmark %#llx ", fwmark);
+ 		}
+ 	}
+ }
+--- a/tc/m_ife.c
++++ b/tc/m_ife.c
+@@ -247,7 +247,7 @@ static int print_ife(struct action_util
+ 	if (tb[TCA_IFE_TYPE]) {
+ 		ife_type = rta_getattr_u16(tb[TCA_IFE_TYPE]);
+ 		has_optional = 1;
+-		print_0xhex(PRINT_ANY, "type", "type 0x%X ", ife_type);
++		print_0xhex(PRINT_ANY, "type", "type %#llX ", ife_type);
+ 	}
+ 
+ 	if (has_optional)
+--- a/tc/q_htb.c
++++ b/tc/q_htb.c
+@@ -332,7 +332,7 @@ static int htb_print_opt(struct qdisc_ut
+ 		if (RTA_PAYLOAD(tb[TCA_HTB_INIT])  < sizeof(*gopt)) return -1;
+ 
+ 		print_int(PRINT_ANY, "r2q", "r2q %d", gopt->rate2quantum);
+-		print_0xhex(PRINT_ANY, "default", " default %x", gopt->defcls);
++		print_0xhex(PRINT_ANY, "default", " default %#llx", gopt->defcls);
+ 		print_uint(PRINT_ANY, "direct_packets_stat",
+ 			   " direct_packets_stat %u", gopt->direct_pkts);
+ 		if (show_details) {
diff --git a/package/network/utils/iproute2/patches/002-tc-fix-xtables-incorrect-usage-of-LDFLAGS.patch b/package/network/utils/iproute2/patches/002-tc-fix-xtables-incorrect-usage-of-LDFLAGS.patch
new file mode 100644
index 0000000000..d5981360a9
--- /dev/null
+++ b/package/network/utils/iproute2/patches/002-tc-fix-xtables-incorrect-usage-of-LDFLAGS.patch
@@ -0,0 +1,35 @@
+From 6ddb36c3a9686df1cca2f4d06518395f1eb9d5cc Mon Sep 17 00:00:00 2001
+From: Syrone Wong <wong.syrone@gmail.com>
+Date: Wed, 12 Dec 2018 19:35:08 +0800
+Subject: [PATCH] tc: fix xtables incorrect usage of LDFLAGS
+
+The incorrect setting of LDFLAGS causes error below:
+
+> em_ipt.o: In function `em_ipt_print_epot':
+> em_ipt.c:(.text.em_ipt_print_epot+0x2e): undefined reference to
+> `xtables_init_all'
+
+em_ipt.c gets involved when TC_CONFIG_XT=y, which requires xtables,
+while tc/Makefile doesn't pass flags correctly. It adds '-lxtables'
+to LDFLAGS instead of LDLIBS.
+
+Fixes: dd296215 ("tc: add em_ipt ematch for calling xtables matches from tc matching context")
+
+Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
+Acked-by: Eyal Birger <eyal.birger@gmail.com>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ tc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -170,7 +170,7 @@ em_ipset.o: CFLAGS += $$($(PKG_CONFIG) x
+ em_ipt.o: CFLAGS += $$($(PKG_CONFIG) xtables --cflags)
+ 
+ ifeq ($(TC_CONFIG_XT),y)
+-  LDFLAGS += $$($(PKG_CONFIG) xtables --libs)
++  LDLIBS += $$($(PKG_CONFIG) xtables --libs)
+ endif
+ 
+ %.yacc.c: %.y
diff --git a/package/network/utils/iproute2/patches/100-config.patch b/package/network/utils/iproute2/patches/100-config.patch
new file mode 100644
index 0000000000..7f23cfc35e
--- /dev/null
+++ b/package/network/utils/iproute2/patches/100-config.patch
@@ -0,0 +1,7 @@
+--- /dev/null
++++ b/Config
+@@ -0,0 +1,4 @@
++# Fixed config to disable ATM support even if present on host system
++IP_CONFIG_SETNS:=y
++TC_CONFIG_ATM:=n
++TC_CONFIG_XT:=y
diff --git a/package/network/utils/iproute2/patches/100-configure.patch b/package/network/utils/iproute2/patches/100-configure.patch
deleted file mode 100644
index 248b1c0e01..0000000000
--- a/package/network/utils/iproute2/patches/100-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -32,7 +32,8 @@ int main(int argc, char **argv) {
- }
- EOF
- 
--    if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then
-+# OpenWrt: disable ATM support even if present on host system
-+    if [ 1 -eq 0 ]; then
- 	echo "TC_CONFIG_ATM:=y" >>$CONFIG
- 	echo yes
-     else
diff --git a/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch b/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch
deleted file mode 100644
index 720a7ac1e9..0000000000
--- a/package/network/utils/iproute2/patches/115-add-config-xtlibdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tc/Makefile
-+++ b/tc/Makefile
-@@ -124,6 +124,9 @@ CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PR
- ifneq ($(IPT_LIB_DIR),)
- 	CFLAGS += -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
- endif
-+ifneq ($(XT_LIB_DIR),)
-+	CFLAGS += -DXT_LIB_DIR=\"$(XT_LIB_DIR)\"
-+endif
- 
- YACC := bison
- LEX := flex
diff --git a/package/network/utils/iproute2/patches/130-no_netem.patch b/package/network/utils/iproute2/patches/130-no_netem.patch
index aa93366f29..58062655c9 100644
--- a/package/network/utils/iproute2/patches/130-no_netem.patch
+++ b/package/network/utils/iproute2/patches/130-no_netem.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -55,7 +55,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
+@@ -61,7 +61,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
  CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
  YACCFLAGS = -d -t -v
  
diff --git a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
index d255ae7b0e..697a6471a7 100644
--- a/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
+++ b/package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
@@ -1,11 +1,11 @@
 --- a/configure
 +++ b/configure
-@@ -255,7 +255,7 @@ check_selinux()
+@@ -281,7 +281,7 @@ check_selinux()
  
  check_mnl()
  {
--	if ${PKG_CONFIG} libmnl --exists; then
-+	if [ "${HAVE_MNL}" = "y" ] && ${PKG_CONFIG} libmnl --exists; then
+-	if ${PKG_CONFIG} libmnl --exists
++	if [ "${HAVE_MNL}" = "y" ] && ${PKG_CONFIG} libmnl --exists
+ 	then
  		echo "HAVE_MNL:=y" >>$CONFIG
  		echo "yes"
- 
diff --git a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch b/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
deleted file mode 100644
index 2e3ad18809..0000000000
--- a/package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -228,7 +228,7 @@ EOF
- 
- check_elf()
- {
--    if ${PKG_CONFIG} libelf --exists; then
-+    if [ "${HAVE_ELF}" = "y" ] && ${PKG_CONFIG} libelf --exists; then
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
diff --git a/package/network/utils/iproute2/patches/150-extra-ccopts.patch b/package/network/utils/iproute2/patches/150-extra-ccopts.patch
new file mode 100644
index 0000000000..d036ba703c
--- /dev/null
+++ b/package/network/utils/iproute2/patches/150-extra-ccopts.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -54,7 +54,7 @@ HOSTCC ?= $(CC)
+ DEFINES += -D_GNU_SOURCE
+ # Turn on transparent support for LFS
+ DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-CCOPTS = -O2
++CCOPTS = -O2 $(EXTRA_CCOPTS)
+ WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
+ WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
+ 
diff --git a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch b/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
deleted file mode 100644
index 05336a737c..0000000000
--- a/package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -313,7 +313,7 @@ EOF
- 
- check_cap()
- {
--	if ${PKG_CONFIG} libcap --exists; then
-+	if [ "${HAVE_CAP}" = "y" ] && ${PKG_CONFIG} libcap --exists; then
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch
index 7129d4f19e..dc0547a256 100644
--- a/package/network/utils/iproute2/patches/170-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch
@@ -1,6 +1,6 @@
 --- a/ip/Makefile
 +++ b/ip/Makefile
-@@ -17,6 +17,13 @@ RTMONOBJ=rtmon.o
+@@ -16,6 +16,13 @@ RTMONOBJ=rtmon.o
  
  include ../config.mk
  
@@ -14,7 +14,7 @@
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
  SCRIPTS=ifcfg rtpr routel routef
  TARGETS=ip rtmon
-@@ -46,7 +53,7 @@ else
+@@ -45,7 +52,7 @@ else
  
  ip: static-syms.o
  static-syms.o: static-syms.h
@@ -25,24 +25,24 @@
  		sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
 --- a/ip/ip.c
 +++ b/ip/ip.c
-@@ -48,10 +48,16 @@ static void usage(void)
+@@ -47,10 +47,16 @@ static void usage(void)
  	fprintf(stderr,
- 		"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
- 		"       ip [ -force ] -batch filename\n"
+ "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
+ "       ip [ -force ] -batch filename\n"
 +#ifndef IPROUTE2_TINY
- 		"where  OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n"
- 		"                   tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n"
- 		"                   netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n"
- 		"                   vrf | sr | nexthop }\n"
+ "where  OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n"
+ "                   tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n"
+ "                   netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n"
+ "                   vrf | sr }\n"
 +#else
-+		"where  OBJECT := { link | address | route | rule | neigh | tunnel | maddress |\n"
-+		"                   mroute | mrule | monitor | netns | macsec | token | ila |\n"
-+		"                   vrf | sr }\n"
++"where  OBJECT := { link | address | route | rule | neigh | tunnel | maddress |\n"
++"                   mroute | mrule | monitor | netns | macsec | token | ila |\n"
++"                   vrf | sr }\n"
 +#endif
- 		"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
- 		"                    -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
- 		"                    -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
-@@ -74,35 +80,49 @@ static const struct cmd {
+ "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
+ "                    -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
+ "                    -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
+@@ -72,32 +78,44 @@ static const struct cmd {
  	int (*func)(int argc, char **argv);
  } cmds[] = {
  	{ "address",	do_ipaddr },
@@ -86,12 +86,25 @@
 +#endif
  	{ "vrf",	do_ipvrf},
  	{ "sr",		do_seg6 },
-+#ifndef IPROUTE2_TINY
- 	{ "nexthop",	do_ipnh },
-+#endif
  	{ "help",	do_help },
- 	{ 0 }
- };
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -1012,6 +1012,7 @@ const char *rt_addr_n2a_r(int af, int le
+ 		return inet_ntop(af, addr, buf, buflen);
+ 	case AF_MPLS:
+ 		return mpls_ntop(af, addr, buf, buflen);
++#ifndef IPROUTE2_TINY
+ 	case AF_IPX:
+ 		return ipx_ntop(af, addr, buf, buflen);
+ 	case AF_DECnet:
+@@ -1021,6 +1022,7 @@ const char *rt_addr_n2a_r(int af, int le
+ 		memcpy(dna.a_addr, addr, 2);
+ 		return dnet_ntop(af, &dna, buf, buflen);
+ 	}
++#endif
+ 	case AF_PACKET:
+ 		return ll_addr_n2a(addr, len, ARPHRD_VOID, buf, buflen);
+ 	case AF_BRIDGE:
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -3,6 +3,10 @@ include ../config.mk
diff --git a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
deleted file mode 100644
index 0385bd737b..0000000000
--- a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/tc/Makefile
-+++ b/tc/Makefile
-@@ -111,7 +111,7 @@ LDLIBS += -L. -lm
- 
- ifeq ($(SHARED_LIBS),y)
- LDLIBS += -ldl
--LDFLAGS += -Wl,-export-dynamic
-+LDFLAGS += -Wl,--dynamic-list=dynsyms.list
- endif
- 
- TCLIB := tc_core.o
-@@ -141,7 +141,7 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
- all: tc $(TCSO)
- 
- tc: $(TCOBJ) $(LIBNETLINK) libtc.a
--	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
-+	$(QUIET_LINK)$(CC) $(filter-out dynsyms.list, $^) $(LDFLAGS) $(LDLIBS) -o $@
- 
- libtc.a: $(TCLIB)
- 	$(QUIET_AR)$(AR) rcs $@ $^
-@@ -163,6 +163,7 @@ install: all
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
- 	rm -f emp_ematch.yacc.*
-+	rm -f dynsyms.list
- 
- q_atm.so: q_atm.c
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
-@@ -202,4 +203,15 @@ static-syms.h: $(wildcard *.c)
- 		sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
- 	done > $@
- 
-+else
-+
-+tc: dynsyms.list
-+dynsyms.list: $(wildcard *.c)
-+	files="$(filter-out $(patsubst %.so,%.c,$(TCSO)), $^)" ; \
-+	echo "{" > $@ ; \
-+	for s in `grep -B 3 '\<dlsym' $$files | sed -n '/snprintf/{s:.*"\([^"]*\)".*:\1:;s:%s::;p}'` ; do \
-+		sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:\1;:;p}' $$files ; \
-+	done >> $@ ; \
-+	echo "show_stats; print_tm; parse_rtattr; get_u32; matches; addattr_l; addattr_nest; addattr_nest_end; };" >> $@
-+
- endif
diff --git a/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch b/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch
index 449d4512fe..5de663f5c6 100644
--- a/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch
+++ b/package/network/utils/iproute2/patches/180-drop_FAILED_POLICY.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
 
 --- a/ip/rtm_map.c
 +++ b/ip/rtm_map.c
-@@ -54,6 +54,8 @@ char *rtnl_rtntype_n2a(int id, char *buf
+@@ -48,6 +48,8 @@ char *rtnl_rtntype_n2a(int id, char *buf
  		return "nat";
  	case RTN_XRESOLVE:
  		return "xresolve";
@@ -20,7 +20,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
  	default:
  		snprintf(buf, len, "%d", id);
  		return buf;
-@@ -89,6 +91,8 @@ int rtnl_rtntype_a2n(int *id, char *arg)
+@@ -83,6 +85,8 @@ int rtnl_rtntype_a2n(int *id, char *arg)
  		res = RTN_UNICAST;
  	else if (strcmp(arg, "throw") == 0)
  		res = RTN_THROW;
@@ -31,7 +31,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
  		if (!end || end == arg || *end || res > 255)
 --- a/include/uapi/linux/rtnetlink.h
 +++ b/include/uapi/linux/rtnetlink.h
-@@ -235,6 +235,7 @@ enum {
+@@ -228,6 +228,7 @@ enum {
  	RTN_THROW,		/* Not in this table		*/
  	RTN_NAT,		/* Translate this address	*/
  	RTN_XRESOLVE,		/* Use external resolver	*/
diff --git a/package/network/utils/iproute2/patches/190-link-libelf-to-tc-only.patch b/package/network/utils/iproute2/patches/190-link-libelf-to-tc-only.patch
new file mode 100644
index 0000000000..1c44616253
--- /dev/null
+++ b/package/network/utils/iproute2/patches/190-link-libelf-to-tc-only.patch
@@ -0,0 +1,60 @@
+--- a/configure
++++ b/configure
+@@ -257,8 +257,9 @@ check_elf()
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++	echo 'CFLAGS += -DHAVE_ELF' >> $CONFIG
++	echo 'ELF_CFLAGS += ' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
++	echo 'ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+     else
+ 	echo "no"
+     fi
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -11,9 +11,17 @@ UTILOBJ = utils.o rt_names.o ll_map.o ll
+ 	inet_proto.o namespace.o json_writer.o json_print.o \
+ 	names.o color.o bpf.o exec.o fs.o
+ 
++ELFOBJ=$(patsubst %.o,%.elf.o,$(UTILOBJ))
++
+ NLOBJ=libgenl.o libnetlink.o
+ 
+-all: libnetlink.a libutil.a
++all: libnetlink.a libutil.a libutil-elf.a
++
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) -UHAVE_ELF $(EXTRA_CFLAGS) -c -o $@ $<
++
++%.elf.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(ELF_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ 
+ libnetlink.a: $(NLOBJ)
+ 	$(QUIET_AR)$(AR) rcs $@ $^
+@@ -21,7 +29,10 @@ libnetlink.a: $(NLOBJ)
+ libutil.a: $(UTILOBJ) $(ADDLIB)
+ 	$(QUIET_AR)$(AR) rcs $@ $^
+ 
++libutil-elf.a: $(ELFOBJ) $(ADDLIB)
++	$(QUIET_AR)$(AR) rcs $@ $^
++
+ install:
+ 
+ clean:
+-	rm -f $(NLOBJ) $(UTILOBJ) $(ADDLIB) libnetlink.a libutil.a
++	rm -f $(NLOBJ) $(UTILOBJ) $(ELFOBJ) $(ADDLIB) libnetlink.a libutil.a libutil-elf.a
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -132,8 +132,8 @@ MODDESTDIR := $(DESTDIR)$(LIBDIR)/tc
+ 
+ all: tc $(TCSO)
+ 
+-tc: $(TCOBJ) $(LIBNETLINK) libtc.a
+-	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
++tc: $(TCOBJ) $(subst libutil.a,libutil-elf.a,$(LIBNETLINK)) libtc.a
++	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) $(ELF_LDLIBS) -o $@
+ 
+ libtc.a: $(TCLIB)
+ 	$(QUIET_AR)$(AR) rcs $@ $^
diff --git a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch b/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
deleted file mode 100644
index f6ec945297..0000000000
--- a/package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -299,14 +299,8 @@ EOF
-     if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
- 	echo "no"
-     else
--	if ${PKG_CONFIG} libbsd --exists; then
--		echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
--		echo "no"
--	else
--		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
--		echo "yes"
--	fi
-+	echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
-+	echo "yes"
-     fi
-     rm -f $TMPDIR/strtest.c $TMPDIR/strtest
- }