- 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 7b978b75e10511a29ed8a8b10c71fe1ce6fdade4..7435782345e38ba528cd8330ee4f48389a3d2688 100644 (file)
--- a/util-linux-fhs.patch
+++ b/util-linux-fhs.patch
@@ -1,76 +1,17 @@
-diff -Nur util-linux-2.9r/lib/pathnames.h util-linux-2.9r.pld/lib/pathnames.h
---- util-linux-2.9r/lib/pathnames.h    Thu Jun 10 12:46:57 1999
-+++ util-linux-2.9r.pld/lib/pathnames.h        Thu Jun 10 12:23:57 1999
-@@ -51,6 +51,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
-@@ -66,14 +70,14 @@
- #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                "/var/lock/wtmpxlock"
++#define _PATH_WTMPLOCK                "/var/lock/wtmplock"
  
- /* no more . in DEFPATH */
- #define       _PATH_DEFPATH           "/usr/local/bin:/bin:/usr/bin"
- #define       _PATH_DEFPATH_ROOT      SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
  #define       _PATH_HUSHLOGIN         ".hushlogin"
- #define       _PATH_LASTLOG           LOGDIR "/lastlog"
--#define       _PATH_MAILDIR           VARPATH "/spool/mail"
-+#define       _PATH_MAILDIR           VARPATH "/mail"
+ 
+ #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"
- 
-@@ -100,5 +104,5 @@
- #define _PATH_GTMP              "/etc/gtmp"
- #define _PATH_GTMPTMP           "/etc/gtmptmp"
- 
--#define _PATH_WORDS             "/usr/dict/words"
--#define _PATH_WORDS_ALT         "/usr/dict/web2"
-+#define _PATH_WORDS             "/usr/share/dict/words"
-+#define _PATH_WORDS_ALT         "/usr/share/dict/web2"
-diff -Nur util-linux-2.9r/text-utils/Makefile util-linux-2.9r.pld/text-utils/Makefile
---- util-linux-2.9r/text-utils/Makefile        Wed Feb 24 19:48:48 1999
-+++ util-linux-2.9r.pld/text-utils/Makefile    Thu Jun 10 12:26:19 1999
-@@ -20,7 +20,7 @@
- 
- # Where to put datebase files?
- 
--USRLIB=               more.help
-+DATAMISC=     more.help
- 
- # Programs requiring special compilation
- 
-@@ -60,10 +60,10 @@
- endif
- 
- install install.shadow install.text-utils: all
--      $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRLIBDIR) $(MAN1DIR)
-+      $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(DATAMISCDIR) $(MAN1DIR)
-       $(INSTALLBIN) $(BIN) $(BINDIR)
-       $(INSTALLBIN) $(USRBIN) $(USRBINDIR)
--      $(INSTALLDAT) $(USRLIB) $(USRLIBDIR)
-+      $(INSTALLDAT) $(DATAMISC) $(DATAMISCDIR)
-       $(INSTALLMAN) $(MAN1) $(MAN1DIR)
- 
- .PHONY: clean distclean
-diff -Nur util-linux-2.9r/text-utils/more.c util-linux-2.9r.pld/text-utils/more.c
---- util-linux-2.9r/text-utils/more.c  Thu Jun 10 12:46:56 1999
-+++ util-linux-2.9r.pld/text-utils/more.c      Thu Jun 10 12:21:02 1999
-@@ -57,7 +57,7 @@
- #include <locale.h>
- #include "nls.h"
- 
--#define HELPFILE      "/usr/lib/more.help"
-+#define HELPFILE      "/usr/share/misc/more.help"
- #define VI            "/usr/bin/vi"
- 
- #define Fopen(s,m)    (Currline = 0,file_pos=0,fopen(s,m))