Hello community, here is the log from the commit of package dhcpcd for openSUSE:Factory checked in at 2012-03-01 17:19:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcpcd (Old) and /work/SRC/openSUSE:Factory/.dhcpcd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcpcd", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/dhcpcd/dhcpcd.changes 2011-10-02 09:57:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dhcpcd.new/dhcpcd.changes 2012-03-01 17:19:13.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 8 15:45:13 UTC 2012 - [email protected] + +- place binary into /usr tree (UsrMerge project) + +------------------------------------------------------------------- +Fri Oct 21 18:51:10 UTC 2011 - [email protected] + +- N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch + When getting a new lease send the serverID and lease + addr in a DHCP_REQUEST package (bnc #725856). + +------------------------------------------------------------------- New: ---- N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.sc1tka/_old 2012-03-01 17:19:15.000000000 +0100 +++ /var/tmp/diff_new_pack.sc1tka/_new 2012-03-01 17:19:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dhcpcd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,12 @@ # - Name: dhcpcd Version: 3.2.3 Release: 47.<RELEASE6> Summary: A DHCP Client Daemon +License: GPL-2.0+ +Group: Productivity/Networking/Boot/Clients Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 Source: dhcpcd-%{version}.tar.bz2 @@ -49,8 +50,7 @@ Patch20: dhcpcd-3.2.3-renew-unicast.diff Patch21: dhcpcd-3.2.3-xen-checksum.diff Patch22: dhcpcd-3.2.3-option-checks.diff -License: GPLv2+ -Group: Productivity/Networking/Boot/Clients +Patch23: N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch Provides: dhcp_client Requires: net-tools PreReq: sysconfig @@ -86,6 +86,7 @@ %patch20 -p0 %patch21 -p0 %patch22 -p0 +%patch23 -p2 cp %{S:1} . cp %{S:3} . @@ -93,8 +94,12 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -O2 -pipe -fpie -DENABLE_SYSV=1 -UENABLE_DUID" LDFLAGS="-pie" %install -make install DESTDIR="$RPM_BUILD_ROOT" -install -D %{S:2} $RPM_BUILD_ROOT/usr/sbin/dhcpcd-test +make install DESTDIR="$RPM_BUILD_ROOT" BINDIR=%{_sbindir} +install -D %{S:2} $RPM_BUILD_ROOT/%{_sbindir}/dhcpcd-test +#UsrMerge +mkdir $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/dhcpcd $RPM_BUILD_ROOT/sbin +#EndUserMerge %post #remove dhcpcd 1 parameters which are not implemented in dhcpcd 3.2.3 @@ -111,7 +116,10 @@ %doc README dhcpcd-1-vs-3 README.SUSE %doc %{_mandir}/man8/dhcpcd.8* %defattr(0755,root,root) +#UsrMerge /sbin/dhcpcd -/usr/sbin/dhcpcd-test +#EndUsrMerge +%{_sbindir}/dhcpcd +%{_sbindir}/dhcpcd-test %changelog ++++++ N_When-getting-a-new-lease-send-the-serverID-and-lease-addr-in-a-DHCP_REQUEST-package.patch ++++++ From: Egbert Eich <[email protected]> Date: Fri Oct 21 19:30:32 2011 +0200 Subject: [PATCH] When getting a new lease send the serverID and lease addr in a DHCP_REQUEST package. Patch-Mainline: N/A Git-commit: a29a820f4fe4dc3b05f4ee1baf344b6b5b8aa25b References: bnc #725856 Signed-off-by: Egbert Eich <[email protected]> When a lease cannot be renewed dhcpclient tries to get a new lease starting with a DHCP_DISCOVER. In this case the serverID and lease addr needs to be sent in the DHCP_REQUEST package. This only happens when the if statement if (dhcp->address.s_addr && dhcp->address.s_addr != iface->previous_address.s_addr) { is true. Thus iface->previous_address.s_addr needs to be when the lease renewal fails and we reenter STATE_INIT. (bnc #725856) Signed-off-by: Egbert Eich <[email protected]> --- dhcpcd-3.2.3/client.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dhcpcd-3.2.3/client.c b/dhcpcd-3.2.3/client.c index fd97908..2671fba 100644 --- a/dhcpcd-3.2.3/client.c +++ b/dhcpcd-3.2.3/client.c @@ -798,6 +798,7 @@ static int handle_dhcp (state_t *state, int type, const options_t *options) state->state = STATE_INIT; state->timeout = 0; state->xid = 0; + state->interface->previous_address.s_addr = 0; free_dhcp (dhcp); memset (dhcp, 0, sizeof (*dhcp)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
