From: hawk Date: Tue, 22 Nov 2005 21:59:20 +0000 (+0000) Subject: - updated for 2.0.0 X-Git-Tag: auto/th/dhcpcd-2_0_0-0_1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdhcpcd.git;a=commitdiff_plain;h=ba64c43767b09333d506839880be50d91dbb40c0 - updated for 2.0.0 Changed files: dhcpcd-ntpdrift-66136.patch -> 1.3 dhcpcd-paths_fixes.patch -> 1.7 --- diff --git a/dhcpcd-ntpdrift-66136.patch b/dhcpcd-ntpdrift-66136.patch index d368997..5eabd4a 100644 --- a/dhcpcd-ntpdrift-66136.patch +++ b/dhcpcd-ntpdrift-66136.patch @@ -1,11 +1,11 @@ ---- ./dhcpconfig.c.org Sun Dec 29 23:05:44 2002 -+++ ./dhcpconfig.c Mon Jan 6 12:31:46 2003 -@@ -447,7 +447,7 @@ - fprintf(f, "fudge 127.127.1.0 stratum 3\n"); - fprintf(f, "server 127.127.1.0\n"); - } -- fprintf(f, "driftfile /etc/ntp.drift\n"); -+ fprintf(f, "driftfile /etc/ntp/drift\n"); +--- src/dhcpconfig.c.orig 2005-07-26 11:00:21.000000000 +0200 ++++ src/dhcpconfig.c 2005-11-22 18:15:13.403690696 +0100 +@@ -478,7 +478,7 @@ + fprintf(f,"restrict %s nomodify notrap noquery\nserver %s\n",addr,addr); + } + +- fprintf(f, "driftfile /etc/ntp.drift\n"); ++ fprintf(f, "driftfile /etc/ntp/drift\n"); fprintf(f, "logfile /var/log/ntp.log\n"); fclose(f); } diff --git a/dhcpcd-paths_fixes.patch b/dhcpcd-paths_fixes.patch index 9692f85..19a9a37 100644 --- a/dhcpcd-paths_fixes.patch +++ b/dhcpcd-paths_fixes.patch @@ -1,93 +1,91 @@ ---- ./dhcpcd.c.org4 Wed Jan 1 02:26:32 2003 -+++ ./dhcpcd.c Mon Jan 6 12:55:05 2003 -@@ -88,7 +88,7 @@ - { - int o; - char pidfile[64]; -- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt); -+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt); - o=open(pidfile,O_RDONLY); - if ( o == -1 ) return; - close(o); ---- ./pathnames.h.org4 Sun Sep 29 17:55:31 2002 -+++ ./pathnames.h Mon Jan 6 12:50:24 2003 -@@ -26,7 +26,7 @@ - #include - #include "dhcpcd.h" - --#define PID_FILE_PATH "%s/"PROGRAM_NAME"-%s.pid" -+#define PID_FILE_PATH "/var/run/"PROGRAM_NAME"-%s.pid" - #define DHCP_CACHE_FILE "%s/"PROGRAM_NAME"-%s.cache" - #define DHCP_HOSTINFO "%s/"PROGRAM_NAME"-%s.info" - #define EXEC_ON_CHANGE "%s/"PROGRAM_NAME".exe" -@@ -37,10 +37,10 @@ - #define NIS_CONF "/etc/config/yp.conf" - #define NTP_CONF "/etc/config/ntp.conf" - #else --#define CONFIG_DIR "/etc/dhcpc" -+#define CONFIG_DIR "/var/lib/dhcpc" - #define RESOLV_CONF "/etc/resolv.conf" - #define NIS_CONF "/etc/yp.conf" --#define NTP_CONF "/etc/ntp.conf" -+#define NTP_CONF "/etc/ntp/ntp.conf" +--- src/pathnames.h.orig 2005-11-22 19:21:57.603959728 +0100 ++++ src/pathnames.h 2005-11-22 18:16:32.263702152 +0100 +@@ -41,8 +41,8 @@ + #define CONFIG_DIR "/var/lib/dhcpc" #endif +-#define RESOLV_FILE "%s/resolv.conf" +-#define NIS_FILE "%s/yp.conf" +-#define NTP_FILE "%s/ntp.conf" ++#define RESOLV_FILE "/etc/resolv.conf" ++#define NIS_FILE "/etc/yp.conf" ++#define NTP_FILE "/etc/ntp/ntp.conf" + #endif ---- ./dhcpcd.8.org4 Wed Jan 1 02:31:31 2003 -+++ ./dhcpcd.8 Mon Jan 6 12:52:50 2003 -@@ -137,7 +137,7 @@ - will use - .I - directory instead of default --.I /etc/dhcpc -+.I /var/lib/dhcpc - to store configuration information. +--- src/dhcpcd.8.orig 2005-07-25 10:28:36.000000000 +0200 ++++ src/dhcpcd.8 2005-11-22 22:47:37.828960376 +0100 +@@ -361,7 +361,7 @@ + above. + .PD 1 .TP - .BI \-S -@@ -281,7 +281,7 @@ - .SH FILES - .PD 0 +-.BI /dhcpcd-.info ++.BI /var/lib/dhcpc/dhcpcd-.info + file in which + .B dhcpcd + saves the host information. The word +@@ -370,7 +370,7 @@ + .I eth0 + to which dhcpcd is attached. .TP --.BI /etc/dhcpc -+.BI /var/lib/dhcpc - Default - .I - directory used for storing files -@@ -379,7 +379,7 @@ +-.BI /etc/dhcpc/dhcpcd.exe ++.BI /var/lib/dhcpc/dhcpcd.exe + script file, which .B dhcpcd - exits for any reason. + will try to execute whenever it configures or brings down the interface. The +@@ -401,7 +401,7 @@ + .I -d + debug flag. .TP --.BI /dhcpcd-.pid -+.BI /var/run/dhcpcd-.pid - file containing the process id of - .B dhcpcd. +-.BI /dhcpcd-.cache ++.BI /var/lib/dhcpc/dhcpcd-.cache + Cache file containing the previously assigned IP address and + some other things. The word ---- ./signals.c.org4 Sun Jan 20 23:51:46 2002 -+++ ./signals.c Mon Jan 6 12:56:58 2003 -@@ -44,7 +44,7 @@ - FILE *fp; - pid_t pid; - char pidfile[64]; -- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt); -+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt); - fp=fopen(pidfile,"r"); - if ( fp == NULL ) goto ntrn; - fscanf(fp,"%u",&pid); -@@ -63,7 +63,7 @@ - { - FILE *fp; - char pidfile[64]; -- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt); -+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt); - fp=fopen(pidfile,"w"); - if ( fp == NULL ) - { -@@ -77,7 +77,7 @@ - void deletePidFile() - { - char pidfile[64]; -- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt); -+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt); - unlink(pidfile); - } - /*****************************************************************************/ +@@ -412,38 +412,38 @@ + .B dhcpcd + is attached. + .TP +-.BI /resolv.conf ++.BI /etc/resolv.conf + file created by + .B dhcpcd + when the client receives DNS and domain name options. + The old +-.B /resolv.conf ++.B /etc/resolv.conf + file is renamed to +-.B /resolv.conf.sv ++.B /etc/resolv.conf.sv + and will be restored back when + .B dhcpcd + exits for any reason. + .TP +-.BI /yp.conf ++.BI /etc/yp.conf + file created by + .B dhcpcd + when the client receives NIS options. + The old +-.B /yp.conf ++.B /etc/yp.conf + file is renamed to +-.B /yp.conf.sv ++.B /etc/yp.conf.sv + and is restored back when + .B dhcpcd + exits for any reason. + .TP +-.BI /ntp.conf ++.BI /etc/ntp/ntp.conf + file created by + .B dhcpcd + when the client receives NTP options. + The old +-.B /ntp.conf ++.B /etc/ntp/ntp.conf + file is renamed to +-.B /ntp.conf.sv ++.B /etc/ntp/ntp.conf.sv + and is restored back when + .B dhcpcd + exits for any reason.