dhcpcd: bump to 6.11.5

1.) pkg version bumped from 6.4.3 to 6.11.5
2.) maintainer changed to me (#4944 dhcpcd: needs a new maintainer)
3.) source changed from bz2 to xz
4.) removed old unnecessary patch
5.) minor style improvements

Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>

diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index e11083d739258408752e228a8d5e520c1a79bf97..a5119c6da0bb72950091ca651ef0edd7844a9734 100644 (file)
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpcd
-PKG_VERSION:=6.4.3
+PKG_VERSION:=6.11.5
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=ftp://roy.marples.name/pub/dhcpcd \
     http://roy.marples.name/downloads/dhcpcd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=36ad01619ee81ac3815467d0157c38a14f5db464371326e97f719be362d5ab9c
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_HASH:=6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e
 
 PKG_LICENSE:=BSD-2c
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Roy Marples <roy@marples.name>
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -45,8 +45,11 @@ define Package/dhcpcd/description
     * ARP ping profiles
 endef
 
-CONFIGURE_ARGS+=       --prefix=/ --sbindir=/sbin \
-                       --libexecdir=/lib/dhcpcd --dbdir=/var/dhcpcd
+CONFIGURE_ARGS+= \
+       --prefix=/ \
+       --sbindir=/sbin \
+       --libexecdir=/lib/dhcpcd \
+       --dbdir=/var/dhcpcd
 
 define Package/dhcpcd/install
        $(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/dhcpcd/dhcpcd-hooks

diff --git a/net/dhcpcd/patches/001-fix-musl.patch b/net/dhcpcd/patches/001-fix-musl.patch
deleted file mode 100644 (file)
index 5751a4c..0000000
--- a/net/dhcpcd/patches/001-fix-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/dhcp6.c
-+++ b/dhcp6.c
-@@ -1047,8 +1047,8 @@ logsend:
- 
-       ctx = ifp->ctx->ipv6;
-       dst.sin6_scope_id = ifp->index;
--      ctx->sndhdr.msg_name = (caddr_t)&dst;
--      ctx->sndhdr.msg_iov[0].iov_base = (caddr_t)state->send;
-+      ctx->sndhdr.msg_name = (void *)&dst;
-+      ctx->sndhdr.msg_iov[0].iov_base = (void *)state->send;
-       ctx->sndhdr.msg_iov[0].iov_len = state->send_len;
- 
-       /* Set the outbound interface */