Revision: 7959
http://sourceforge.net/p/ipcop/svn/7959
Author: owes
Date: 2015-04-19 11:49:58 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
Update dhcpcd to 6.8.1
Modified Paths:
--------------
ipcop/trunk/lfs/dhcpcd
ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
ipcop/trunk/updates/2.2.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/dhcpcd-6.7.1_lease-RENEW.patch
Modified: ipcop/trunk/lfs/dhcpcd
===================================================================
--- ipcop/trunk/lfs/dhcpcd 2015-04-17 20:19:03 UTC (rev 7958)
+++ ipcop/trunk/lfs/dhcpcd 2015-04-19 11:49:58 UTC (rev 7959)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = dhcpcd
-VER = 6.7.1
+VER = 6.8.1
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ffb716b0e9327968e7200d519e1d4c0d
+$(DL_FILE)_MD5 = 2a60bd16cf04c9479b895d3f9223bc95
install : $(TARGET)
@@ -83,7 +83,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_lease-RENEW.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
--dbdir=/var/run
cd $(DIR_APP) && make
Deleted: ipcop/trunk/src/patches/dhcpcd-6.7.1_lease-RENEW.patch
===================================================================
--- ipcop/trunk/src/patches/dhcpcd-6.7.1_lease-RENEW.patch 2015-04-17
20:19:03 UTC (rev 7958)
+++ ipcop/trunk/src/patches/dhcpcd-6.7.1_lease-RENEW.patch 2015-04-19
11:49:58 UTC (rev 7959)
@@ -1,53 +0,0 @@
-From upstream 25e8e4b75a and e5d80fd918
-
---- a/dhcp.c
-+++ a/dhcp.c
-@@ -1893,11 +1893,12 @@
- syslog(LOG_WARNING,
- "%s: renewal time greater than rebind "
- "time, forcing to %"PRIu32" seconds",
- ifp->name, lease->renewaltime);
- }
-- syslog(lease->addr.s_addr == state->addr.s_addr ?
-+ syslog(lease->addr.s_addr == state->addr.s_addr &&
-+ !(state->added & STATE_FAKE) ?
- LOG_DEBUG : LOG_INFO,
- "%s: leased %s for %"PRIu32" seconds", ifp->name,
- inet_ntoa(lease->addr), lease->leasetime);
- }
- }
-@@ -1906,11 +1907,11 @@
- script_runreason(ifp, state->reason);
- eloop_exit(ifp->ctx->eloop, EXIT_SUCCESS);
- return;
- }
- if (state->reason == NULL) {
-- if (state->old && state->new->cookie != htonl(MAGIC_COOKIE)) {
-+ if (state->old && !(state->added & STATE_FAKE)) {
- if (state->old->yiaddr == state->new->yiaddr &&
- lease->server.s_addr)
- state->reason = "RENEW";
- else
- state->reason = "REBIND";
-@@ -3205,18 +3206,13 @@
- ipv4ll_start(ifp);
- }
- return;
- }
-
-- if (state->offer == NULL || state->offer->cookie == 0) {
-- /* If we don't have an address yet, enter the reboot
-- * state to ensure at least fallback in short order. */
-- if (state->addr.s_addr == INADDR_ANY ||
-- state->added & STATE_FAKE)
-- state->state = DHS_REBOOT;
-+ if (state->offer == NULL || state->offer->cookie == 0)
- dhcp_discover(ifp);
-- } else
-+ else
- dhcp_reboot(ifp);
- }
-
- void
- dhcp_start(struct interface *ifp)
-
Modified: ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
===================================================================
--- ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-04-17 20:19:03 UTC
(rev 7958)
+++ ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-04-19 11:49:58 UTC
(rev 7959)
@@ -135,6 +135,9 @@
/usr/lib/libdb-6.so
/usr/lib/libdb-6.1.so
##
+## dhcpcd-6.8.1
+/usr/sbin/dhcpcd
+##
## ethtool-3.18
/usr/sbin/ethtool
##
Modified: ipcop/trunk/updates/2.2.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.2.0/information.xml 2015-04-17 20:19:03 UTC (rev
7958)
+++ ipcop/trunk/updates/2.2.0/information.xml 2015-04-19 11:49:58 UTC (rev
7959)
@@ -6,8 +6,8 @@
<isoimages>yes</isoimages>
<description>
Upgrade linux kernel to 3.10-1 (3.10.73).<br />
- Upgrade bind to 9.10.2, coreutils to 8.23, db to 6.1.23, ethtool to
3.18,
- glib to 2.42.2, gmp to 6.0.0a, gnupg to 1.4.19, iproute2 to 3.19.0,
+ Upgrade bind to 9.10.2, coreutils to 8.23, db to 6.1.23, dhcpcd to
6.8.1,
+ ethtool to 3.18, glib to 2.42.2, gmp to 6.0.0a, gnupg to 1.4.19,
iproute2 to 3.19.0,
libffi to 3.2.1, libgcrypt to 1.6.3, libgpg-error to 1.18, libpcap to
1.7.2,
libtool to 2.4.6, lzo to 2.09, nano to 2.4.0, ntp to 4.2.8p2,
openssh to 6.8p1, openssl to 1.0.2a, patch to 2.7.5, perl to 5.20.2-2,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
