Hello community, here is the log from the commit of package dhcpcd checked in at Fri Nov 28 14:56:08 CET 2008. -------- --- dhcpcd/dhcpcd.changes 2008-11-21 10:19:48.000000000 +0100 +++ dhcpcd/dhcpcd.changes 2008-11-27 20:28:37.911812000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 27 20:27:46 CET 2008 - varkoly@suse.de + +- Fixing the patch for (bnc#447237) + +------------------------------------------------------------------- +Wed Nov 26 14:52:16 CET 2008 - schwab@suse.de + +- Fix unaligned access. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dhcpcd-3.2.3-unaligned.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.t20556/_old 2008-11-28 14:55:08.000000000 +0100 +++ /var/tmp/diff_new_pack.t20556/_new 2008-11-28 14:55:08.000000000 +0100 @@ -19,7 +19,7 @@ Name: dhcpcd Version: 3.2.3 -Release: 40 +Release: 41 Summary: A DHCP Client Daemon Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 @@ -34,6 +34,7 @@ Patch5: dhcpcd-%{version}-clientid.diff Patch6: dhcpcd-%{version}-netconfig.diff Patch7: dhcpcd-%{version}-lastlease.diff +Patch8: dhcpcd-%{version}-unaligned.diff License: GPL v2 or later Group: Productivity/Networking/Boot/Clients Provides: dhcp_client @@ -61,7 +62,8 @@ %patch4 -p1 %patch5 %patch6 -p1 -%patch7 +%patch7 -p1 +%patch8 cp %{S:1} . cp %{S:3} . @@ -94,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 27 2008 varkoly@suse.de +- Fixing the patch for (bnc#447237) +* Wed Nov 26 2008 schwab@suse.de +- Fix unaligned access. * Fri Nov 21 2008 varkoly@suse.de - (bnc#447237) - dhcpcd -E (--lastlease) does not work * Mon Oct 20 2008 varkoly@suse.de ++++++ dhcpcd-3.2.3-lastlease.diff ++++++ --- /var/tmp/diff_new_pack.t20556/_old 2008-11-28 14:55:08.000000000 +0100 +++ /var/tmp/diff_new_pack.t20556/_new 2008-11-28 14:55:08.000000000 +0100 @@ -1,6 +1,7 @@ ---- client.c-orig 2008-11-21 09:23:21.119833000 +0100 -+++ client.c 2008-11-21 10:07:38.617577000 +0100 -@@ -217,20 +217,23 @@ +diff -ru 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-11-27 16:36:10.000000000 +0100 +@@ -217,10 +217,9 @@ #ifdef ENABLE_ARP /* Check that no-one is using the address */ @@ -13,25 +14,49 @@ { memset (&dhcp->address, 0, sizeof (dhcp->address)); memset (&dhcp->netmask, 0, sizeof (dhcp->netmask)); - memset (&dhcp->broadcast, 0, sizeof (dhcp->broadcast)); -+ logger (LOG_ERR, "Sombody uses our IP"); - return (false); - } - - /* Ok, lets use this */ - if (IN_LINKLOCAL (dhcp->address.s_addr)) -+ { -+ logger (LOG_ERR, "We are link local"); - return (true); -+ } +@@ -642,14 +641,9 @@ + errno = 0; + if (! get_old_lease (state, options)) + { +- if (errno == EINTR) +- return (0); +- if (options->dolastlease) +- return (-1); + free_dhcp (dhcp); + memset (dhcp, 0, sizeof (*dhcp)); +- } else if (errno == EINTR) +- return (0); ++ } + } #endif - /* Ensure that we can still use the lease */ -@@ -252,6 +255,7 @@ - offset = 0; - state->timeout = dhcp->renewaltime - offset; - iface->start_uptime = uptime (); -+ logger (LOG_INFO, "Successfuly read last lease"); - return (true); - } +@@ -705,8 +699,6 @@ + } #endif + +- if (! state->daemonised) +- return (-1); + } + + switch (state->state) { +@@ -1093,7 +1085,7 @@ + else + retval = -1; + } else if (retval == 0) +- retval = handle_timeout (state, options); ++ handle_timeout (state, options); + else if (retval > 0 && + state->socket != SOCKET_CLOSED && + fds[POLLFD_IFACE].revents & POLLIN) +diff -ru dhcpcd-3.2.3-gepatched//dhcpcd.8.in dhcpcd-3.2.3/dhcpcd.8.in +--- dhcpcd-3.2.3-gepatched//dhcpcd.8.in 2008-11-27 12:40:31.000000000 +0100 ++++ dhcpcd-3.2.3/dhcpcd.8.in 2008-11-27 16:35:44.000000000 +0100 +@@ -309,6 +309,8 @@ + Don't touch + .Pa /etc/yp.conf + or restart the ypbind service. ++.It Fl E , -lastlease ++Force the dhcpcd client to try to use the last lease as fallback + .It Fl D , -nisdomain + Forces dhcpcd to set domainname of the host to the domainname option supplied by DHCP server. + .It Fl -netconfig ++++++ dhcpcd-3.2.3-unaligned.diff ++++++ --- arp.c +++ arp.c @@ -257,7 +257,7 @@ int arp_claim (interface_t *iface, struc rh.c = (unsigned char *) ar_sha (reply); /* Ensure the ARP reply is for the our address */ - if (rp.a->s_addr != address.s_addr) + if (memcmp (rp.c, &address, sizeof (struct in_addr)) != 0) continue; /* Some systems send a reply back from our hwaddress, @@ -267,7 +267,7 @@ int arp_claim (interface_t *iface, struc continue; logger (LOG_ERR, "ARPOP_REPLY received from %s (%s)", - inet_ntoa (*rp.a), + inet_ntoa (address), hwaddr_ntoa (rh.c, (size_t) reply->ar_hln)); retval = -1; goto eexit; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org