From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 8 May 2014 00:57:47 +0000 (+0000)
Subject: dhcpcd: update to 6.1.0
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3e7a733a5ba8b81c5b92b2edb079463c536c2190;p=openwrt%2Fsvn-archive%2Fpackages.git

dhcpcd: update to 6.1.0

DHCPv6 and other features
see: http://roy.marples.name/projects/dhcpcd/wiki/DhcpcdHistory

-update download location
-install default dhcpcd hooks script and example hooks

v2:
-add CFLAGS to configure test

configure test failed silently on OMAP because of missing CFLAGS (-mfloat-abi=hard) with
../arm-openwrt-linux-uclibcgnueabi/bin/ld: error: _getifaddrs uses VFP register arguments

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 40726
---

diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 572f9a332..3828b1f2b 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcpcd
-PKG_VERSION:=3.0.17
+PKG_VERSION:=6.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.berlios.de/dhcpcd/
-PKG_MD5SUM:=e9100e53f64ca1f9fb0d392c3a623738
+PKG_SOURCE_URL:=ftp://roy.marples.name/pub/dhcpcd
+PKG_MD5SUM:=6070040c57492925af9ac6aed980de2a
 
 PKG_INSTALL:=1
 
@@ -24,6 +24,7 @@ define Package/dhcpcd
   CATEGORY:=Network
   SUBMENU:=IP Addresses and Names
   TITLE:=DHCP client for automatically configuring IPv4 networking
+  DEPENDS:=+librt
   URL:=http://roy.marples.name/projects/dhcpcd
 endef
 
@@ -33,8 +34,11 @@ define Package/dhcpcd/description
 endef
 
 define Package/dhcpcd/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/* $(1)/sbin/
+	$(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/etc/dhcpcd.enter-hook
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcpcd $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dhcpcd-run-hooks $(1)/sbin/
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dhcpcd.conf $(1)/etc/dhcpcd.conf
+	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/lib/dhcpcd-hooks/* $(1)/etc/dhcpcd.enter-hook/
 endef
 
 $(eval $(call BuildPackage,dhcpcd))
diff --git a/net/dhcpcd/patches/001-configure_add_cflags_to_getifaddrs_test.patch b/net/dhcpcd/patches/001-configure_add_cflags_to_getifaddrs_test.patch
new file mode 100644
index 000000000..a4133775d
--- /dev/null
+++ b/net/dhcpcd/patches/001-configure_add_cflags_to_getifaddrs_test.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -369,7 +369,7 @@ int main(void) {
+ 	return getifaddrs(&ifap);
+ }
+ EOF
+-if $XCC _getifaddrs.c -o _getifaddrs 2>/dev/null; then
++if $XCC $CFLAGS _getifaddrs.c -o _getifaddrs 2>/dev/null; then
+ 	echo "yes"
+ else
+ 	echo "no"
diff --git a/net/dhcpcd/patches/001-run_dir.patch b/net/dhcpcd/patches/001-run_dir.patch
deleted file mode 100644
index cbb26ffcd..000000000
--- a/net/dhcpcd/patches/001-run_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dhcpcd-3.0.17/pathnames.h.orig	2007-05-31 15:28:04.000000000 -0700
-+++ dhcpcd-3.0.17/pathnames.h	2007-05-31 15:28:16.000000000 -0700
-@@ -48,7 +48,7 @@
- #define STATEDIR            "/var"
- #define PIDFILE             STATEDIR "/run/" PACKAGE "-%s.pid"
- 
--#define CONFIGDIR           STATEDIR "/lib/" PACKAGE
-+#define CONFIGDIR           STATEDIR "/run/" PACKAGE
- #define INFOFILE            CONFIGDIR "/" PACKAGE "-%s.info"
- 
- #endif