- rel 8; versioned O

[packages/util-linux.git] / util-linux-fhs.patch

diff --git a/util-linux-fhs.patch b/util-linux-fhs.patch
index 5b4f110899fbe0413f8de68a9b6ae1f80ed6dfea..7435782345e38ba528cd8330ee4f48389a3d2688 100644 (file)
--- a/util-linux-fhs.patch
+++ b/util-linux-fhs.patch
@@ -1,33 +1,17 @@
-diff -urN util-linux-2.11d.org/lib/pathnames.h util-linux-2.11d/lib/pathnames.h
---- util-linux-2.11d.org/lib/pathnames.h       Sun Jun  3 21:48:00 2001
-+++ util-linux-2.11d/lib/pathnames.h   Sun Jun  3 21:48:47 2001
-@@ -86,6 +86,10 @@
- #define LOGDIR                  "/var/log"
- #endif
+--- util-linux-ng-2.17.2/include/pathnames.h.orig      2010-03-22 09:05:42.000000000 +0100
++++ util-linux-ng-2.17.2/include/pathnames.h   2010-05-09 10:46:42.934937584 +0200
+@@ -20,12 +20,12 @@
+ #define       _PATH_DEFPATH_ROOT      "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
  
-+#ifndef DATAMISCDIR
-+#define DATAMISCDIR              "/usr/share/misc"
-+#endif
-+
- #ifndef VARPATH
- #define VARPATH                       "/var"
- #endif
-@@ -101,7 +105,7 @@
- #define SECURETTY             "/etc/securetty"
- #define _PATH_UTMP            "/var/run/utmpx"
- #define _PATH_WTMP            LOGDIR "/wtmpx"
+ #define _PATH_SECURETTY               "/etc/securetty"
 -#define _PATH_WTMPLOCK                "/etc/wtmplock"
-+#define _PATH_WTMPLOCK                VARPATH "/lock/wtmplock"
++#define _PATH_WTMPLOCK                "/var/lock/wtmplock"
  
- /* no more . in DEFPATH */
- #define       _PATH_DEFPATH           "/usr/local/bin:/bin:/usr/bin"
-@@ -110,7 +114,7 @@
- #define       _PATH_LASTLOG           LOGDIR "/lastlog"
+ #define       _PATH_HUSHLOGIN         ".hushlogin"
  
  #ifndef _PATH_MAILDIR
--#define       _PATH_MAILDIR           VARPATH "/spool/mail"
-+#define       _PATH_MAILDIR           VARPATH "/mail"
+-#define       _PATH_MAILDIR           "/var/spool/mail"
++#define       _PATH_MAILDIR           "/var/mail"
  #endif
  #define       _PATH_MOTDFILE          "/etc/motd"
  #define       _PATH_NOLOGIN           "/etc/nologin"
-