Hello community, here is the log from the commit of package dhcpcd for openSUSE:11.1 checked in at Wed Dec 3 17:06:46 CET 2008. -------- --- old-versions/11.1/all/dhcpcd/dhcpcd.changes 2008-12-03 00:13:22.000000000 +0100 +++ /mounts/work_src_done/11.1/dhcpcd/dhcpcd.changes 2008-12-03 15:55:06.123434000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 3 15:48:36 CET 2008 - varkoly@suse.de + +- Fix the last patch. Processes could not exit. + +------------------------------------------------------------------- calling whatdependson for 11.1-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.E28252/_old 2008-12-03 17:06:17.000000000 +0100 +++ /var/tmp/diff_new_pack.E28252/_new 2008-12-03 17:06:17.000000000 +0100 @@ -19,7 +19,7 @@ Name: dhcpcd Version: 3.2.3 -Release: 42 +Release: 44 Summary: A DHCP Client Daemon Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 @@ -97,6 +97,8 @@ %changelog * Wed Dec 03 2008 varkoly@suse.de +- Fix the last patch. Processes could not exit. +* Wed Dec 03 2008 varkoly@suse.de - (bnc#450917) - RC2: Installer is endless waiting for eth0 * Thu Nov 27 2008 varkoly@suse.de - Fixing the patch for (bnc#447237) ++++++ dhcpcd-3.2.3-lastlease.diff ++++++ --- /var/tmp/diff_new_pack.E28252/_old 2008-12-03 17:06:17.000000000 +0100 +++ /var/tmp/diff_new_pack.E28252/_new 2008-12-03 17:06:17.000000000 +0100 @@ -1,7 +1,6 @@ -diff -ur dhcpcd-3.2.3-gepatched//client.c dhcpcd-3.2.3/client.c ---- dhcpcd-3.2.3-gepatched//client.c 2008-11-27 12:40:31.000000000 +0100 -+++ dhcpcd-3.2.3/client.c 2008-12-02 23:08:50.000000000 +0100 -@@ -217,10 +217,9 @@ +--- dhcpcd-3.2.3/client.c ++++ dhcpcd-3.2.3/client.c 2008/12/03 14:13:39 +@@ -217,10 +217,9 @@ static bool get_old_lease (state_t *stat #ifdef ENABLE_ARP /* Check that no-one is using the address */ @@ -14,7 +13,20 @@ { memset (&dhcp->address, 0, sizeof (dhcp->address)); memset (&dhcp->netmask, 0, sizeof (dhcp->netmask)); -@@ -475,9 +474,7 @@ +@@ -321,8 +320,10 @@ static bool client_setup (state_t *state + if (! get_old_lease (state, options)) + #endif + { +- free (dhcp); +- return (false); ++ free_dhcp (dhcp); ++ memset (dhcp, 0, sizeof (*dhcp)); ++ // do not fail when there is no old lease! ++ //return (false); + } + state->timeout = 0; + +@@ -475,9 +476,7 @@ static int wait_for_packet (struct pollf int timeout = 0; int retval = 0; @@ -25,7 +37,7 @@ /* We need to zero our signal fd, otherwise we will block * trying to read a signal. */ fds[POLLFD_SIGNAL].revents = 0; -@@ -486,9 +483,8 @@ +@@ -486,9 +485,8 @@ static int wait_for_packet (struct pollf fds[POLLFD_IFACE].fd = iface->fd; @@ -37,7 +49,25 @@ { logger (LOG_DEBUG, "waiting for infinity"); while (retval == 0) { -@@ -713,7 +709,7 @@ +@@ -644,8 +642,6 @@ static int handle_timeout (state_t *stat + { + if (errno == EINTR) + return (0); +- if (options->dolastlease) +- return (-1); + free_dhcp (dhcp); + memset (dhcp, 0, sizeof (*dhcp)); + } else if (errno == EINTR) +@@ -705,7 +701,7 @@ static int handle_timeout (state_t *stat + } + #endif + +- if (! state->daemonised) ++ if (! state->daemonised && options->timeout != 0) + return (-1); + } + +@@ -713,7 +709,7 @@ static int handle_timeout (state_t *stat case STATE_INIT: state->xid = (uint32_t) random (); do_socket (state, SOCKET_OPEN); @@ -46,17 +76,3 @@ iface->start_uptime = uptime (); if (dhcp->address.s_addr == 0) { if (! IN_LINKLOCAL (ntohl (iface->previous_address.s_addr))) -@@ -1092,8 +1088,12 @@ - retval = 0; - else - retval = -1; -- } else if (retval == 0) -+ } else if (retval == 0) { - retval = handle_timeout (state, options); -+ /* We should never exit if timeout is 0 */ -+ if( options->timeout == 0 ) -+ retval = 0; -+ } - else if (retval > 0 && - state->socket != SOCKET_CLOSED && - fds[POLLFD_IFACE].revents & POLLIN) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org