- updated to 1.3.22pl4

Changed files:
    dhcpcd-noMoFakery.patch -> 1.2
    dhcpcd-noNISfakery.patch -> 1.2
    dhcpcd-ntpdrift-66136.patch -> 1.2
    dhcpcd-paths_fixes.patch -> 1.6

diff --git a/dhcpcd-noMoFakery.patch b/dhcpcd-noMoFakery.patch
index f835e2a93a081a4736ea89440e16db09b3ca7b36..ac2fa26ddd6e0883ea4a4319cc3fedb1b7bbf491 100644 (file)
--- a/dhcpcd-noMoFakery.patch
+++ b/dhcpcd-noMoFakery.patch
@@ -1,20 +1,20 @@
---- dhcpcd-1.3.21-pl2/client.c.sopwith Tue Feb  5 14:47:35 2002
-+++ dhcpcd-1.3.21-pl2/client.c Tue Feb  5 14:50:23 2002
-@@ -718,7 +718,7 @@
+--- ./dhcpconfig.c.org2        Mon Jan  6 12:31:46 2003
++++ ./dhcpconfig.c     Mon Jan  6 12:36:42 2003
+@@ -334,7 +334,7 @@
      ((unsigned char *)&DhcpIface.ciaddr)[1],
      ((unsigned char *)&DhcpIface.ciaddr)[2],
      ((unsigned char *)&DhcpIface.ciaddr)[3]);
 -  if ( ReplResolvConf )
-+  if ( ReplResolvConf && DhcpOptions.len[dns])
++  if ( ReplResolvConf  && DhcpOptions.len[dns] )
      {
        resolv_renamed=1+rename(RESOLV_CONF,""RESOLV_CONF".sv");
        f=fopen(RESOLV_CONF,"w");
-@@ -785,7 +785,7 @@
+@@ -406,7 +406,7 @@
        else
        syslog(LOG_ERR,"dhcpConfig: fopen: %m\n");
      }
 -  if ( ReplNTPConf )
-+  if ( ReplNTPConf && DhcpOptions.len[ntpServers] >= 4)
++  if ( ReplNTPConf  && DhcpOptions.len[ntpServers] >= 4 )
      {
        ntp_renamed=1+rename(NTP_CONF,""NTP_CONF".sv");
        f=fopen(NTP_CONF,"w");

diff --git a/dhcpcd-noNISfakery.patch b/dhcpcd-noNISfakery.patch
index c28a3014dae044ab61d1dad7f45b407fc0df9cb3..fe8fe679d47d9583c7bb3fc0b10f8661f1219aa4 100644 (file)
--- a/dhcpcd-noNISfakery.patch
+++ b/dhcpcd-noNISfakery.patch
@@ -1,6 +1,6 @@
---- dhcpcd-1.3.21-pl2/client.c.sopwith Thu Jan 31 18:58:26 2002
-+++ dhcpcd-1.3.21-pl2/client.c Thu Jan 31 19:01:35 2002
-@@ -764,18 +764,14 @@
+--- ./dhcpconfig.c.org3        Mon Jan  6 12:36:42 2003
++++ ./dhcpconfig.c     Mon Jan  6 12:39:21 2003
+@@ -381,18 +381,14 @@
      * because the resolver won't notice the change in resolv.conf */
        (void)res_init();
      }

diff --git a/dhcpcd-ntpdrift-66136.patch b/dhcpcd-ntpdrift-66136.patch
index 30de8ef3aa4163d9fd74539a5a2c0be74fcaafdb..d3689974d8ac2eade20ad7d38bd8ce2c84d88bec 100644 (file)
--- a/dhcpcd-ntpdrift-66136.patch
+++ b/dhcpcd-ntpdrift-66136.patch
@@ -1,6 +1,6 @@
---- dhcpcd-1.3.22-pl1/client.c.sopwith Thu Jun 20 15:15:49 2002
-+++ dhcpcd-1.3.22-pl1/client.c Thu Jun 20 15:16:34 2002
-@@ -902,7 +902,7 @@
+--- ./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");
            }

diff --git a/dhcpcd-paths_fixes.patch b/dhcpcd-paths_fixes.patch
index 1a0d1b80df63c816d11d33f0503c30d4ef24aaaa..9692f856cc51673efe554cc7a684fb5da30e7100 100644 (file)
--- a/dhcpcd-paths_fixes.patch
+++ b/dhcpcd-paths_fixes.patch
@@ -1,19 +1,41 @@
---- dhcpcd-1.3.22-pl1/pathnames.h~     Thu Jan 17 04:18:10 2002
-+++ dhcpcd-1.3.22-pl1/pathnames.h      Mon Sep  9 19:49:26 2002
-@@ -26,8 +26,8 @@
+--- ./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 <paths.h>
  #include "dhcpcd.h"
  
 -#define PID_FILE_PATH         "%s/"PROGRAM_NAME"-%s.pid"
--#define CONFIG_DIR            "/etc/dhcpc"
 +#define PID_FILE_PATH         "/var/run/"PROGRAM_NAME"-%s.pid"
-+#define CONFIG_DIR            "/var/lib/dhcpc"
  #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"
---- dhcpcd-1.3.22-pl1/dhcpcd.8~        Mon Sep  9 19:50:54 2002
-+++ dhcpcd-1.3.22-pl1/dhcpcd.8 Mon Sep  9 19:50:54 2002
-@@ -136,7 +136,7 @@
+@@ -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"
+ #endif
+ 
+ #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 <ConfigDir>
  directory instead of default
@@ -21,8 +43,8 @@
 +.I /var/lib/dhcpc
  to store configuration information.
  .TP
- .BI \-R
-@@ -265,7 +265,7 @@
+ .BI \-S
+@@ -281,7 +281,7 @@
  .SH FILES
  .PD 0
  .TP
@@ -31,30 +53,17 @@
  Default 
  .I <ConfigDir>
  directory used for storing files
-@@ -363,7 +363,7 @@
+@@ -379,7 +379,7 @@
  .B dhcpcd
  exits for any reason.
  .TP
 -.BI <ConfigDir>/dhcpcd-<interface>.pid
-+.BI /var/run/dhcpcd-<interface>.pid
++.BI  /var/run/dhcpcd-<interface>.pid
  file containing the process id of
  .B dhcpcd.
  The word
-diff -ur dhcpcd-1.3.22-pl1.orig/client.c dhcpcd-1.3.22-pl1/client.c
---- dhcpcd-1.3.22-pl1.orig/client.c    Mon Jan 21 00:46:27 2002
-+++ dhcpcd-1.3.22-pl1/client.c Fri Oct 11 18:14:08 2002
-@@ -1670,7 +1670,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);
-diff -ur dhcpcd-1.3.22-pl1.orig/signals.c dhcpcd-1.3.22-pl1/signals.c
---- dhcpcd-1.3.22-pl1.orig/signals.c   Sun Jan 20 23:51:46 2002
-+++ dhcpcd-1.3.22-pl1/signals.c        Fri Oct 11 18:13:21 2002
+--- ./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;