Mailinglist Archive: opensuse-commit (1828 mails)

< Previous Next >
commit dhcpcd
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 02 Sep 2008 00:44:41 +0200
  • Message-id: <20080901224442.5DE9E67815E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package dhcpcd
checked in at Tue Sep 2 00:44:41 CEST 2008.


--------
--- dhcpcd/dhcpcd.changes 2008-07-16 16:03:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd.changes 2008-07-17
17:37:26.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 17 13:20:21 CEST 2008 - varkoly@xxxxxxx
+
+- New option "-C --netconfig"
+
+-------------------------------------------------------------------



New:
----
dhcpcd-3.2.3-netconfig.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dhcpcd.spec ++++++
--- /var/tmp/diff_new_pack.e24151/_old 2008-09-02 00:44:33.000000000 +0200
+++ /var/tmp/diff_new_pack.e24151/_new 2008-09-02 00:44:33.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package dhcpcd (Version 3.2.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

@@ -12,7 +19,7 @@

Name: dhcpcd
Version: 3.2.3
-Release: 11
+Release: 28
Summary: A DHCP Client Daemon
Url: http://developer.berlios.de/projects/dhcpcd/
#Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2
@@ -24,6 +31,7 @@
Patch3: dhcpcd-%{version}-ntp-runtime-servers.diff
Patch4: dhcpcd-%{version}-set-route.diff
Patch5: dhcpcd-%{version}-clientid.diff
+Patch6: dhcpcd-%{version}-netconfig.diff
License: GPL v2 or later
Group: Productivity/Networking/Boot/Clients
Provides: dhcp_client
@@ -49,6 +57,7 @@
%patch3 -p1
%patch4 -p1
%patch5
+%patch6 -p1
cp %{S:1} .

%build
@@ -72,6 +81,7 @@
%defattr(-,root,root)
%doc README dhcpcd-1-vs-3
%doc %{_mandir}/man8/dhcpcd.8*
+%defattr(0755,root,root)
/sbin/dhcpcd
/usr/sbin/dhcpcd-test

@@ -79,6 +89,8 @@
rm -rf $RPM_BUILD_ROOT

%changelog
+* Thu Jul 17 2008 varkoly@xxxxxxx
+- New option "-C --netconfig"
* Wed Jul 16 2008 varkoly@xxxxxxx
- (bnc#402559) – dhcpcd incompatible behavior of DHCLIENT_CLIENT_ID
* Wed Jun 04 2008 varkoly@xxxxxxx

++++++ dhcpcd-1-vs-3 ++++++
--- dhcpcd/dhcpcd-1-vs-3 2008-06-05 14:23:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd-1-vs-3 2008-07-17
17:37:25.000000000 +0200
@@ -156,6 +156,10 @@
implemented outside the client; all the necessary
information is recorded in the
/var/lib/dhcpcd/dhcpcd-<interface>.info file.

+ --netconfig
+ Forces dhcpcd to use the SuSE netconfig tool. This option turn on
following options: -N, -R, -Y and sets -c to
+ /etc/sysconfig/network/scripts/dhcpcd-netconfig-hook.
+
Missing in dhcpcd-3.0



++++++ dhcpcd-3.2.3-netconfig.diff ++++++
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
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.
+.It Fl -netconfig
+Forces dhcpcd to use the SuSE netconfig tool. This option turn on following
options:
+.Fl N , R , Y
+and sets
+.Fl c
+to
+.Pa /etc/sysconfig/network/scripts/dhcpcd-netconfig-hook .
.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[] =
{"msscr", no_argument, NULL, 'S'},
{"test", no_argument, NULL, 'T'},
{"nonis", no_argument, NULL, 'Y'},
+ {"netconfig", no_argument, NULL, 0x9999},
{"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"
" [-l leasetime] [-m metric] [-r ipaddress] [-s
ipaddress]\n"
" [-t timeout] [-u userclass] [-F none | ptr |
both]\n"
- " [-I clientID] <interface>\n");
+ " [-I clientID] [ --netconfig ] <interface>\n");
}

int main(int argc, char **argv)
@@ -180,6 +181,7 @@ int main(int argc, char **argv)
options->doinform = false;
options->doipv4ll = true;
options->doduid = true;
+ options->netconfig = false;
options->timeout = DEFAULT_TIMEOUT;

gethostname (options->hostname, sizeof (options->hostname));
@@ -364,7 +366,8 @@ int main(int argc, char **argv)
}
break;
case 'G':
- options->dogateway = false;
+ if(!options->netconfig)
+ options->dogateway = false;
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)
case 'Y':
options->donis = false;
break;
- case 'D':
- options->donisdom = true;
- break;
+ case 'D':
+ if(!options->netconfig)
+ 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;
+ 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 {
bool doipv4ll;
bool keepsearch;
bool doduid;
+ bool netconfig;
int domscsr;

struct in_addr request_address;
++++++ dhcpcd-3.2.3-set-route.diff ++++++
--- /var/tmp/diff_new_pack.e24151/_old 2008-09-02 00:44:33.000000000 +0200
+++ /var/tmp/diff_new_pack.e24151/_new 2008-09-02 00:44:33.000000000 +0200
@@ -1,7 +1,8 @@
-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-05-14
13:50:37.000000000 +0200
-+++ dhcpcd-3.2.3-set-route/configure.c 2008-05-14 13:59:53.000000000 +0200
-@@ -944,6 +944,15 @@
+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,
! options->dogateway)
continue;


++++++ dhcpcd-3.2.3-suse.diff ++++++
--- /var/tmp/diff_new_pack.e24151/_old 2008-09-02 00:44:33.000000000 +0200
+++ /var/tmp/diff_new_pack.e24151/_new 2008-09-02 00:44:33.000000000 +0200
@@ -395,7 +395,7 @@
diff -u dhcpcd-3.2.3/dhcpcd.c dhcpcd-3.2.3-suse/dhcpcd.c
--- dhcpcd-3.2.3/dhcpcd.c 2008-02-25 09:28:19.000000000 +0100
+++ dhcpcd-3.2.3-suse/dhcpcd.c 2008-04-22 17:16:40.000000000 +0200
-@@ -71,14 +71,17 @@
+@@ -71,14 +71,16 @@
{"userclass", required_argument, NULL, 'u'},
{"exit", no_argument, NULL, 'x'},
{"lastlease", no_argument, NULL, 'E'},
@@ -409,7 +409,6 @@
{"nomtu", no_argument, NULL, 'M'},
{"nontp", no_argument, NULL, 'N'},
{"nodns", no_argument, NULL, 'R'},
-+ {"keepsearch", no_argument, NULL, 'K'},
{"msscr", no_argument, NULL, 'S'},
{"test", no_argument, NULL, 'T'},
{"nonis", no_argument, NULL, 'Y'},



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread