Hello community, here is the log from the commit of package dhcpcd for openSUSE:Factory checked in at Wed Dec 2 12:39:04 CET 2009. -------- --- dhcpcd/dhcpcd.changes 2009-11-21 18:20:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd.changes 2009-11-27 17:42:51.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 26 20:21:28 CET 2009 - varkoly@suse.de + +- bnc#558744 dhcpcd-3.x does not provide DHCPGIADDR and DHCPSIADDR info + file as dhcpcd-1.x did + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc#558744.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.Iw5YqY/_old 2009-12-02 12:38:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Iw5YqY/_new 2009-12-02 12:38:10.000000000 +0100 @@ -19,7 +19,7 @@ Name: dhcpcd Version: 3.2.3 -Release: 48 +Release: 49 Summary: A DHCP Client Daemon Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 @@ -37,7 +37,8 @@ Patch8: dhcpcd-%{version}-unaligned.diff Patch9: dhcpcd-%{version}-fiximplicit.diff Patch10: bnc#551350.diff -License: GPL v2 or later +Patch11: bnc#558744.diff +License: GPLv2+ Group: Productivity/Networking/Boot/Clients Provides: dhcp_client Requires: net-tools @@ -69,6 +70,7 @@ %patch8 %patch9 -p1 %patch10 -p1 +%patch11 -p1 cp %{S:1} . cp %{S:3} . ++++++ bnc#558744.diff ++++++ diff -u dhcpcd-3.2.3-patched//dhcp.c dhcpcd-3.2.3//dhcp.c --- dhcpcd-3.2.3-patched//dhcp.c 2009-11-27 21:50:34.755671212 +0100 +++ dhcpcd-3.2.3//dhcp.c 2009-11-27 21:52:13.374669989 +0100 @@ -653,6 +653,8 @@ return (-1); } + dhcp->siaddr = message->siaddr; + dhcp->giaddr = message->giaddr; dhcp->address.s_addr = message->yiaddr; dhcp->leasedfrom = tv.tv_sec; dhcp->frominfo = false; diff -u dhcpcd-3.2.3-patched//dhcp.h dhcpcd-3.2.3//dhcp.h --- dhcpcd-3.2.3-patched//dhcp.h 2009-11-27 21:50:34.755671212 +0100 +++ dhcpcd-3.2.3//dhcp.h 2009-11-27 21:52:13.374669989 +0100 @@ -200,6 +200,8 @@ struct address_head *netbiosddservers; char *netbiosscope; char *netbiosnodetype; + uint32_t siaddr; + uint32_t giaddr; } dhcp_t; diff -u dhcpcd-3.2.3-patched//info.c dhcpcd-3.2.3//info.c --- dhcpcd-3.2.3-patched//info.c 2009-11-27 21:50:34.755671212 +0100 +++ dhcpcd-3.2.3//info.c 2009-11-27 22:04:59.934820658 +0100 @@ -107,6 +107,7 @@ FILE *f; route_t *route; struct stat sb; + struct in_addr n; if (options->test) f = stdout; @@ -121,9 +122,15 @@ return (false); } } - + if (dhcp->giaddr) { + n.s_addr = dhcp->giaddr; + fprintf (f, "DHCPGIADDR='%s'\n", inet_ntoa (n)); + } + if (dhcp->siaddr) { + n.s_addr = dhcp->siaddr; + fprintf (f, "DHCPSIADDR='%s'\n", inet_ntoa (n)); + } if (dhcp->address.s_addr) { - struct in_addr n; n.s_addr = dhcp->address.s_addr & dhcp->netmask.s_addr; fprintf (f, "IPADDR='%s'\n", inet_ntoa (dhcp->address)); fprintf (f, "NETMASK='%s'\n", inet_ntoa (dhcp->netmask)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org