Hello community,
here is the log from the commit of package dhcpcd
checked in at Tue Sep 9 22:07:18 CEST 2008.
--------
--- dhcpcd/dhcpcd.changes 2008-07-17 17:37:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd.changes 2008-09-09 09:48:51.352438000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 9 09:37:41 CEST 2008 - varkoly@suse.de
+
+- (bnc#423145) - SUSE-specific dhcpcd patch makes retrieving IP impossible
+
+-------------------------------------------------------------------
New:
----
README.SUSE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcpcd.spec ++++++
--- /var/tmp/diff_new_pack.g31155/_old 2008-09-09 22:06:42.000000000 +0200
+++ /var/tmp/diff_new_pack.g31155/_new 2008-09-09 22:06:42.000000000 +0200
@@ -19,13 +19,14 @@
Name: dhcpcd
Version: 3.2.3
-Release: 28
+Release: 33
Summary: A DHCP Client Daemon
Url: http://developer.berlios.de/projects/dhcpcd/
#Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2
Source: dhcpcd-%{version}.tar.bz2
Source1: dhcpcd-1-vs-3
Source2: dhcpcd-test
+Source3: README.SUSE
Patch1: dhcpcd-%{version}-suse.diff
Patch2: dhcpcd-%{version}-more-params.diff
Patch3: dhcpcd-%{version}-ntp-runtime-servers.diff
@@ -59,6 +60,7 @@
%patch5
%patch6 -p1
cp %{S:1} .
+cp %{S:3} .
%build
make CFLAGS="$RPM_OPT_FLAGS -O2 -pipe -fpie -DENABLE_SYSV=1 -UENABLE_DUID" LDFLAGS="-pie"
@@ -79,7 +81,7 @@
%files
%defattr(-,root,root)
-%doc README dhcpcd-1-vs-3
+%doc README dhcpcd-1-vs-3 README.SUSE
%doc %{_mandir}/man8/dhcpcd.8*
%defattr(0755,root,root)
/sbin/dhcpcd
@@ -89,6 +91,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 09 2008 varkoly@suse.de
+- (bnc#423145) - SUSE-specific dhcpcd patch makes retrieving IP impossible
* Thu Jul 17 2008 varkoly@suse.de
- New option "-C --netconfig"
* Wed Jul 16 2008 varkoly@suse.de
++++++ dhcpcd-3.2.3-more-params.diff ++++++
--- /var/tmp/diff_new_pack.g31155/_old 2008-09-09 22:06:42.000000000 +0200
+++ /var/tmp/diff_new_pack.g31155/_new 2008-09-09 22:06:42.000000000 +0200
@@ -1,8 +1,7 @@
-Dateien dhcpcd-3.2.3-suse/client.o und dhcpcd-3.2.3-more-params/client.o sind verschieden.
diff -u dhcpcd-3.2.3-suse/dhcp.c dhcpcd-3.2.3-more-params/dhcp.c
--- dhcpcd-3.2.3-suse/dhcp.c 2008-02-25 09:28:19.000000000 +0100
-+++ dhcpcd-3.2.3-more-params/dhcp.c 2008-04-22 17:42:26.000000000 +0200
-@@ -312,6 +312,12 @@
++++ dhcpcd-3.2.3-more-params/dhcp.c 2008-09-09 09:42:58.000000000 +0200
+@@ -312,6 +312,11 @@
*p++ = DHCP_ROOTPATH;
*p++ = DHCP_SIPSERVER;
#endif
@@ -11,11 +10,10 @@
+ *p++ = DHCP_NETBIOSNAMESERVER;
+ *p++ = DHCP_NETBIOSDDSERVER;
+ *p++ = DHCP_NETBIOSSCOPE;
-+ *p++ = DHCP_NETBIOSNAMESERVER;
}
*n_params = p - n_params - 1;
-@@ -474,6 +480,12 @@
+@@ -474,6 +479,12 @@
free (dhcp->fqdn->name);
free (dhcp->fqdn);
}
@@ -28,7 +26,7 @@
}
static bool dhcp_add_address (struct address_head **addresses,
-@@ -787,6 +799,13 @@
+@@ -787,6 +798,13 @@
GETSTR (dhcp->nisdomain);
break;
#endif
@@ -42,7 +40,7 @@
#undef GETSTR
#define GETADDR(_var) \
-@@ -809,6 +828,18 @@
+@@ -809,6 +827,18 @@
GETADDR (dhcp->nisservers);
break;
#endif
@@ -61,11 +59,9 @@
#undef GETADDR
case DHCP_DNSSEARCH:
-Dateien dhcpcd-3.2.3-suse/dhcpcd und dhcpcd-3.2.3-more-params/dhcpcd sind verschieden.
-Nur in dhcpcd-3.2.3-more-params: dhcp.c.orig.
diff -u dhcpcd-3.2.3-suse/dhcp.h dhcpcd-3.2.3-more-params/dhcp.h
--- dhcpcd-3.2.3-suse/dhcp.h 2008-02-25 09:28:19.000000000 +0100
-+++ dhcpcd-3.2.3-more-params/dhcp.h 2008-04-23 12:36:29.000000000 +0200
++++ dhcpcd-3.2.3-more-params/dhcp.h 2008-09-03 11:20:52.000000000 +0200
@@ -74,18 +74,47 @@
DHCP_DNSSERVER = 6,
DHCP_LOGSERVER = 7,
@@ -129,11 +125,9 @@
} dhcp_t;
/* Sizes for DHCP options */
-Nur in dhcpcd-3.2.3-more-params: dhcp.h.orig.
-Dateien dhcpcd-3.2.3-suse/dhcp.o und dhcpcd-3.2.3-more-params/dhcp.o sind verschieden.
diff -u dhcpcd-3.2.3-suse/info.c dhcpcd-3.2.3-more-params/info.c
--- dhcpcd-3.2.3-suse/info.c 2008-02-25 09:28:19.000000000 +0100
-+++ dhcpcd-3.2.3-more-params/info.c 2008-04-23 12:50:07.000000000 +0200
++++ dhcpcd-3.2.3-more-params/info.c 2008-09-09 09:46:24.000000000 +0200
@@ -245,6 +245,48 @@
}
#endif
@@ -183,18 +177,16 @@
if (! options->test)
fclose (f);
return (true);
-@@ -459,6 +501,18 @@
+@@ -459,6 +501,16 @@
parse_uint (&dhcp->renewaltime, value, "RENEWALTIME");
else if (strcmp (var, "REBINDTIME") == 0)
parse_uint (&dhcp->rebindtime, value, "REBINDTIME");
-+ else if (strcmp (var, "NETBIOSSCOPE") == 0)
-+ parse_uint (&dhcp->rebindtime, value, "NETBIOSSCOPE");
-+ else if (strcmp (var, "NETBIOSNAMESERVER") == 0)
-+ parse_uint (&dhcp->rebindtime, value, "NETBIOSNAMESERVER");
+ else if (strcmp (var, "LPRSERVER") == 0)
+ dhcp->lprservers = parse_addresses (value, "LPRSERVER");
+ else if (strcmp (var, "LOGSERVER") == 0)
+ dhcp->logservers = parse_addresses (value, "LOGSERVER");
++ else if (strcmp (var, "NETBIOSSCOPE") == 0)
++ parse_uint (&dhcp->netbiosscope, value, "NETBIOSSCOPE");
+ else if (strcmp (var, "NETBIOSNAMESERVER") == 0)
+ dhcp->netbiosnameservers = parse_addresses (value, "NETBIOSNAMESERVER");
+ else if (strcmp (var, "NETBIOSDDSERVER") == 0)
@@ -202,7 +194,3 @@
next:
free (line);
-Nur in dhcpcd-3.2.3-more-params: info.c.orig.
-Dateien dhcpcd-3.2.3-suse/info.o und dhcpcd-3.2.3-more-params/info.o sind verschieden.
-Dateien dhcpcd-3.2.3-suse/interface.o und dhcpcd-3.2.3-more-params/interface.o sind verschieden.
-Gemeinsame Unterverzeichnisse: dhcpcd-3.2.3-suse/mk und dhcpcd-3.2.3-more-params/mk.
++++++ dhcpcd-3.2.3-netconfig.diff ++++++
--- /var/tmp/diff_new_pack.g31155/_old 2008-09-09 22:06:42.000000000 +0200
+++ /var/tmp/diff_new_pack.g31155/_new 2008-09-09 22:06:42.000000000 +0200
@@ -1,17 +1,7 @@
-Index: dhcpcd-3.2.3/dhcpcd.8.in
-===================================================================
---- dhcpcd-3.2.3.orig/dhcpcd.8.in
-+++ dhcpcd-3.2.3/dhcpcd.8.in
-@@ -29,7 +29,7 @@
- .Nd an RFC 2131 compliant DHCP client
- .Sh SYNOPSIS
- .Nm
--.Op Fl dknpADEGHMKLNRSTY
-+.Op Fl dknpADEGHMKLNRSTYC
- .Op Fl c , -script Ar script
- .Op Fl h , -hostname Ar hostname
- .Op Fl i , -classid Ar classid
-@@ -315,6 +315,13 @@ Don't touch
+diff -u dhcpcd-3.2.3-clientid/dhcpcd.8.in dhcpcd-3.2.3-netconfig/dhcpcd.8.in
+--- dhcpcd-3.2.3-clientid/dhcpcd.8.in 2008-09-03 11:19:39.000000000 +0200
++++ dhcpcd-3.2.3-netconfig/dhcpcd.8.in 2008-09-03 11:33:21.000000000 +0200
+@@ -311,6 +311,13 @@
or restart the ypbind service.
.It Fl D , -nisdomain
Forces dhcpcd to set domainname of the host to the domainname option supplied by DHCP server.
@@ -25,11 +15,10 @@
.El
.Sh NOTES
Because
-Index: dhcpcd-3.2.3/dhcpcd.c
-===================================================================
---- dhcpcd-3.2.3.orig/dhcpcd.c
-+++ dhcpcd-3.2.3/dhcpcd.c
-@@ -84,6 +84,7 @@ static const struct option longopts[] =
+diff -u dhcpcd-3.2.3-clientid/dhcpcd.c dhcpcd-3.2.3-netconfig/dhcpcd.c
+--- dhcpcd-3.2.3-clientid/dhcpcd.c 2008-09-03 11:19:39.000000000 +0200
++++ dhcpcd-3.2.3-netconfig/dhcpcd.c 2008-09-03 11:33:21.000000000 +0200
+@@ -83,6 +83,7 @@
{"msscr", no_argument, NULL, 'S'},
{"test", no_argument, NULL, 'T'},
{"nonis", no_argument, NULL, 'Y'},
@@ -37,8 +26,8 @@
{"help", no_argument, &dohelp, 1},
{"version", no_argument, &doversion, 1},
#ifdef THERE_IS_NO_FORK
-@@ -140,7 +141,7 @@ static void usage (void)
- printf ("usage: "PACKAGE" [-adknpEGHKMNRSTYKD] [-c script] [-h hostname] [-i classID]\n"
+@@ -139,7 +140,7 @@
+ printf ("usage: "PACKAGE" [-adknpEGHKMNRSTYD] [-c script] [-h hostname] [-i classID]\n"
" [-l leasetime] [-m metric] [-r ipaddress] [-s ipaddress]\n"
" [-t timeout] [-u userclass] [-F none | ptr | both]\n"
- " [-I clientID] <interface>\n");
@@ -46,7 +35,7 @@
}
int main(int argc, char **argv)
-@@ -180,6 +181,7 @@ int main(int argc, char **argv)
+@@ -178,6 +179,7 @@
options->doinform = false;
options->doipv4ll = true;
options->doduid = true;
@@ -54,7 +43,7 @@
options->timeout = DEFAULT_TIMEOUT;
gethostname (options->hostname, sizeof (options->hostname));
-@@ -364,7 +366,8 @@ int main(int argc, char **argv)
+@@ -362,7 +364,8 @@
}
break;
case 'G':
@@ -64,21 +53,7 @@
break;
case 'H':
options->dohostname++;
-@@ -398,9 +401,10 @@ int main(int argc, char **argv)
- case 'R':
- options->dodns = false;
- break;
-- case 'K':
-- options->keepsearch = true;
-- break;
-+ case 'K':
-+ if(!options->netconfig)
-+ options->keepsearch = true;
-+ break;
- case 'S':
- options->domscsr++;
- break;
-@@ -415,9 +419,19 @@ int main(int argc, char **argv)
+@@ -410,9 +413,19 @@
case 'Y':
options->donis = false;
break;
@@ -90,24 +65,23 @@
+ options->donisdom = true;
+ break;
+ case 0x9999:
-+ options->keepsearch = false;
+ options->dodns = false;
+ options->donis = false;
+ options->donisdom = false;
+ options->dontp = false;
+ options->dogateway = true;
+ options->netconfig = true;
++ options->script = "/etc/sysconfig/network/scripts/dhcpcd-netconfig-hook";
+ break;
case '?':
usage ();
-Index: dhcpcd-3.2.3/dhcpcd.h
-===================================================================
---- dhcpcd-3.2.3.orig/dhcpcd.h
-+++ dhcpcd-3.2.3/dhcpcd.h
-@@ -78,6 +78,7 @@ typedef struct options_t {
+diff -u dhcpcd-3.2.3-clientid/dhcpcd.h dhcpcd-3.2.3-netconfig/dhcpcd.h
+--- dhcpcd-3.2.3-clientid/dhcpcd.h 2008-09-03 11:19:39.000000000 +0200
++++ dhcpcd-3.2.3-netconfig/dhcpcd.h 2008-09-03 11:33:21.000000000 +0200
+@@ -77,6 +77,7 @@
+ bool dorequest;
bool doipv4ll;
- bool keepsearch;
bool doduid;
+ bool netconfig;
int domscsr;
++++++ dhcpcd-3.2.3-ntp-runtime-servers.diff ++++++
--- /var/tmp/diff_new_pack.g31155/_old 2008-09-09 22:06:42.000000000 +0200
+++ /var/tmp/diff_new_pack.g31155/_new 2008-09-09 22:06:42.000000000 +0200
@@ -1,7 +1,7 @@
-diff -u dhcpcd-3.2.3-more-params/configure.c dhcpcd-3.2.3-ntp-runtime-servers/configure.c
---- dhcpcd-3.2.3-more-params/configure.c 2008-04-23 12:32:34.000000000 +0200
-+++ dhcpcd-3.2.3-ntp-runtime-servers/configure.c 2008-05-14 14:32:23.000000000 +0200
-@@ -508,6 +508,42 @@
+diff -u dhcpcd-3.2.3-more-params//configure.c dhcpcd-3.2.3-ntp-runtime-servers/configure.c
+--- dhcpcd-3.2.3-more-params//configure.c 2008-09-03 11:19:39.000000000 +0200
++++ dhcpcd-3.2.3-ntp-runtime-servers/configure.c 2008-09-03 11:22:23.000000000 +0200
+@@ -266,6 +266,42 @@
}
#ifdef ENABLE_NTP
@@ -44,7 +44,7 @@
static int _make_ntp (const char *file, const char *ifname, const dhcp_t *dhcp)
{
FILE *f;
-@@ -639,6 +675,7 @@
+@@ -397,6 +433,7 @@
return (retval);
}
#endif
@@ -52,7 +52,7 @@
#ifdef ENABLE_NIS
#define PREFIXSIZE 256
-@@ -1001,8 +1038,12 @@
+@@ -750,8 +787,12 @@
#ifdef ENABLE_NTP
if (options->dontp && dhcp->ntpservers)
@@ -65,9 +65,9 @@
#ifdef ENABLE_NIS
if (options->donis && (dhcp->nisservers || dhcp->nisdomain))
-diff -u dhcpcd-3.2.3-more-params/configure.h dhcpcd-3.2.3-ntp-runtime-servers/configure.h
---- dhcpcd-3.2.3-more-params/configure.h 2008-04-11 11:39:41.000000000 +0200
-+++ dhcpcd-3.2.3-ntp-runtime-servers/configure.h 2008-05-14 14:31:56.000000000 +0200
+diff -u dhcpcd-3.2.3-more-params//configure.h dhcpcd-3.2.3-ntp-runtime-servers/configure.h
+--- dhcpcd-3.2.3-more-params//configure.h 2008-02-25 09:28:19.000000000 +0100
++++ dhcpcd-3.2.3-ntp-runtime-servers/configure.h 2008-09-03 11:24:24.000000000 +0200
@@ -32,6 +32,21 @@
#include "interface.h"
#include "dhcp.h"
@@ -87,7 +87,6 @@
+RUNTIME_SERVERS=\"%s\"\n\
+"
+
- #define MODIFY_RESOLVCONF "/sbin/modify_resolvconf"
+ int configure (const options_t *options, interface_t *iface,
+ const dhcp_t *dhcp, bool up);
- #define RESOLVCONF_INFO "\
-Gemeinsame Unterverzeichnisse: dhcpcd-3.2.3-more-params/mk und dhcpcd-3.2.3-ntp-runtime-servers/mk.
++++++ dhcpcd-3.2.3-set-route.diff ++++++
--- /var/tmp/diff_new_pack.g31155/_old 2008-09-09 22:06:42.000000000 +0200
+++ /var/tmp/diff_new_pack.g31155/_new 2008-09-09 22:06:42.000000000 +0200
@@ -1,8 +1,7 @@
-Index: dhcpcd-3.2.3/configure.c
-===================================================================
---- dhcpcd-3.2.3.orig/configure.c
-+++ dhcpcd-3.2.3/configure.c
-@@ -945,6 +945,15 @@ int configure (const options_t *options,
+diff -u dhcpcd-3.2.3-ntp-runtime-servers/configure.c dhcpcd-3.2.3-set-route/configure.c
+--- dhcpcd-3.2.3-ntp-runtime-servers/configure.c 2008-09-03 11:22:23.000000000 +0200
++++ dhcpcd-3.2.3-set-route/configure.c 2008-09-03 11:26:50.000000000 +0200
+@@ -703,6 +703,15 @@
! options->dogateway)
continue;
++++++ dhcpcd-3.2.3-suse.diff ++++++
--- /var/tmp/diff_new_pack.g31155/_old 2008-09-09 22:06:42.000000000 +0200
+++ /var/tmp/diff_new_pack.g31155/_new 2008-09-09 22:06:42.000000000 +0200
@@ -1,296 +1,6 @@
diff -u dhcpcd-3.2.3/configure.c dhcpcd-3.2.3-suse/configure.c
--- dhcpcd-3.2.3/configure.c 2008-02-25 09:28:19.000000000 +0100
+++ dhcpcd-3.2.3-suse/configure.c 2008-04-22 17:30:26.000000000 +0200
-@@ -30,7 +30,7 @@
- #include