- rel 2; provide compat symlink for runuser (upstream uses different location than...

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

diff --git a/util-linux-fhs.patch b/util-linux-fhs.patch
index 24efd45765a937e90fd1ce31a49ec979b55d0822..7bbb01f7c934646a1951e3f4a23d177dcc61c677 100644 (file)
--- a/util-linux-fhs.patch
+++ b/util-linux-fhs.patch
@@ -1,12 +1,29 @@
-diff -urN util-linux-2.11d.org/include/pathnames.h util-linux-2.11d/include/pathnames.h
---- util-linux-2.11d.org/include/pathnames.h   Sun Jun  3 21:48:00 2001
-+++ util-linux-2.11d/include/pathnames.h       Sun Jun  3 21:48:47 2001
-@@ -101,7 +105,7 @@
- #define SECURETTY             "/etc/securetty"
- #define _PATH_UTMP            "/var/run/utmp"
- #define _PATH_WTMP            LOGDIR "/wtmp"
+--- util-linux-2.21/include/pathnames.h~       2011-12-18 22:28:28.000000000 +0200
++++ util-linux-2.21/include/pathnames.h        2012-03-05 17:32:49.986673893 +0200
+@@ -26,13 +26,13 @@
+ #define       _PATH_DEFPATH_ROOT      "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
+ 
+ #define _PATH_SECURETTY               "/etc/securetty"
 -#define _PATH_WTMPLOCK                "/etc/wtmplock"
-+#define _PATH_WTMPLOCK                VARPATH "/lock/wtmplock"
++#define _PATH_WTMPLOCK                "/var/lock/wtmplock"
+ 
+ #define       _PATH_HUSHLOGIN         ".hushlogin"
+ #define       _PATH_HUSHLOGINS        "/etc/hushlogins"
  
- /* no more . in DEFPATH */
- #define       _PATH_DEFPATH           "/usr/local/bin:/bin:/usr/bin"
+ #ifndef _PATH_MAILDIR
+-#define       _PATH_MAILDIR           "/var/spool/mail"
++#define       _PATH_MAILDIR           "/var/mail"
+ #endif
+ #define       _PATH_MOTDFILE          "/etc/motd"
+ #define       _PATH_NOLOGIN           "/etc/nologin"
+--- util-linux-2.21/login-utils/login.1~       2012-02-10 15:45:52.000000000 +0200
++++ util-linux-2.21/login-utils/login.1        2012-03-05 18:07:04.386917212 +0200
+@@ -223,7 +223,7 @@
+ .I /var/run/utmp
+ .I /var/log/wtmp
+ .I /var/log/lastlog
+-.I /var/spool/mail/*
++.I /var/mail/*
+ .I /etc/motd
+ .I /etc/passwd
+ .I /etc/nologin