- other_path_fix + dhcpcd-pid_path_fix = dhcpcd-paths_fixes,

- added fix also paths in dhcpcd(8) man page.

Changed files:
    dhcpcd-other_path_fix.patch -> 1.2
    dhcpcd-paths_fixes.patch -> 1.1
    dhcpcd-pid_path_fix.patch -> 1.2

diff --git a/dhcpcd-other_path_fix.patch b/dhcpcd-other_path_fix.patch
deleted file mode 100644 (file)
index 2fa72ba..0000000
--- a/dhcpcd-other_path_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pathnames.org      Tue Sep  8 16:17:20 2002
-+++ pathnames.h        Tue Sep  8 16:16:34 2002
-@@ -26,7 +26,7 @@
- #include <paths.h>
- #include "dhcpcd.h"
- 
- #define PID_FILE_PATH         "/var/run/"PROGRAM_NAME".pid"
--#define CONFIG_DIR            "/etc/dhcpc"
-+#define CONFIG_DIR            "/var/lib/dhcpc"
- #define DHCP_CACHE_FILE               "%s/"PROGRAM_NAME"-%s.cache"
- #define DHCP_HOSTINFO         "%s/"PROGRAM_NAME"-%s.info"

diff --git a/dhcpcd-paths_fixes.patch b/dhcpcd-paths_fixes.patch
new file mode 100644 (file)
index 0000000..574de6c
--- /dev/null
+++ b/dhcpcd-paths_fixes.patch
@@ -0,0 +1,33 @@
+--- 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 @@
+ #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".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 @@
+ will use
+ .I <ConfigDir>
+ directory instead of default
+-.I /etc/dhcpc
++.I /var/lib/dhcpc
+ to store configuration information.
+ .TP
+ .BI \-R
+@@ -265,7 +265,7 @@
+ .SH FILES
+ .PD 0
+ .TP
+-.BI /etc/dhcpc
++.BI /var/lib/dhcpc
+ Default 
+ .I <ConfigDir>
+ directory used for storing files

diff --git a/dhcpcd-pid_path_fix.patch b/dhcpcd-pid_path_fix.patch
deleted file mode 100644 (file)
index a01b4ab..0000000
--- a/dhcpcd-pid_path_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pathnames.org      Tue Aug  6 13:17:20 2002
-+++ pathnames.h        Tue Aug  6 13:16:34 2002
-@@ -26,7 +26,7 @@
- #include <paths.h>
- #include "dhcpcd.h"
- 
--#define PID_FILE_PATH         "%s/"PROGRAM_NAME"-%s.pid"
-+#define PID_FILE_PATH         "/var/run/"PROGRAM_NAME".pid"
- #define CONFIG_DIR            "/etc/dhcpc"
- #define DHCP_CACHE_FILE               "%s/"PROGRAM_NAME"-%s.cache"
- #define DHCP_HOSTINFO         "%s/"PROGRAM_NAME"-%s.info"