Blob Blame History Raw
diff -up sendmail-8.14.3/cf/m4/cfhead.m4.movefiles sendmail-8.14.3/cf/m4/cfhead.m4
--- sendmail-8.14.3/cf/m4/cfhead.m4.movefiles	2004-01-28 23:02:22.000000000 +0100
+++ sendmail-8.14.3/cf/m4/cfhead.m4	2008-12-02 18:07:06.000000000 +0100
@@ -259,7 +259,7 @@ ifdef(`MAIL_SETTINGS_DIR', , `define(`MA
 define(`DATABASE_MAP_TYPE', `hash')
 
 # set up default values for options
-define(`ALIAS_FILE', `MAIL_SETTINGS_DIR`'aliases')
+define(`ALIAS_FILE', `/etc/aliases')
 define(`confMAILER_NAME', ``MAILER-DAEMON'')
 define(`confFROM_LINE', `From $g $d')
 define(`confOPERATORS', `.:%@!^/[]+')
diff -up ./sendmail/aliases.0.orig ./sendmail/aliases.0
--- ./sendmail/aliases.0.orig	2009-12-23 05:48:32.000000000 +0100
+++ ./sendmail/aliases.0	2010-02-01 10:49:56.093920068 +0100
@@ -63,7 +63,7 @@ DDEESSCCRRIIPPTTIIOONN
        the list of users defined in that file.
 
        This  is  only  the  raw  data file; the actual aliasing information is
-       placed into a binary format in the file /etc/mail/aliases.db using  the
+       placed into a binary format in the file /etc/aliases.db using  the
        program  newaliases(1).   A  newaliases command should be executed each
        time the aliases file is changed for the change to take effect.
 
diff -up ./sendmail/aliases.5.orig ./sendmail/aliases.5
--- ./sendmail/aliases.5.orig	2004-07-12 07:39:21.000000000 +0200
+++ ./sendmail/aliases.5	2010-02-01 10:45:46.407921946 +0100
@@ -23,7 +23,7 @@ ID 
 aliases used by 
 sendmail.
 The file resides in 
-/etc/mail 
+/etc
 and 
 is formatted as a series of lines of the form
 .IP
@@ -96,7 +96,7 @@ list of users defined in that file.
 .PP
 This is only the raw data file; the actual aliasing information is
 placed into a binary format in the file 
-/etc/mail/aliases.db
+/etc/aliases.db
 using the program 
 newaliases(1).  
 A 
diff -up ./sendmail/newaliases.0.orig ./sendmail/newaliases.0
--- ./sendmail/newaliases.0.orig	2009-12-23 05:48:32.000000000 +0100
+++ ./sendmail/newaliases.0	2010-02-01 10:49:46.527918883 +0100
@@ -10,7 +10,7 @@ SSYYNNOOPPSSIISS
 
 DDEESSCCRRIIPPTTIIOONN
        NNeewwaalliiaasseess  rebuilds  the  random access data base for the mail aliases
-       file /etc/mail/aliases.  It must be run each time this file is  changed
+       file /etc/aliases.  It must be run each time this file is  changed
        in order for the change to take effect.
 
        NNeewwaalliiaasseess is identical to ``sendmail -bi''.
@@ -22,7 +22,7 @@ DDEESSCCRRIIPPTTIIOONN
        sseennddmmaaiill..
 
 FFIILLEESS
-       /etc/mail/aliases   The mail aliases file
+       /etc/aliases   The mail aliases file
 
 SSEEEE AALLSSOO
        aliases(5), sendmail(8)
diff -up ./sendmail/newaliases.1.orig ./sendmail/newaliases.1
--- ./sendmail/newaliases.1.orig	2001-10-10 05:23:17.000000000 +0200
+++ ./sendmail/newaliases.1	2010-02-01 10:49:36.194921433 +0100
@@ -20,7 +20,7 @@ newaliases
 .SH DESCRIPTION
 .B Newaliases
 rebuilds the random access data base for the mail aliases file
-/etc/mail/aliases.  It must be run each time this file is changed
+/etc/aliases.  It must be run each time this file is changed
 in order for the change to take effect.
 .PP
 .B Newaliases
@@ -40,7 +40,7 @@ puts a special token into the data base 
 .B sendmail.
 .SH FILES
 .TP 2i
-/etc/mail/aliases
+/etc/aliases
 The mail aliases file
 .SH SEE ALSO
 aliases(5), sendmail(8)
diff -up ./sendmail/sendmail.0.orig ./sendmail/sendmail.0
--- ./sendmail/sendmail.0.orig	2009-12-23 05:48:32.000000000 +0100
+++ ./sendmail/sendmail.0	2010-02-01 10:49:04.494920283 +0100
@@ -430,10 +430,10 @@ FFIILLEESS
        are only approximations.
 
 
-        /etc/mail/aliases
+        /etc/aliases
               raw data for alias names
 
-        /etc/mail/aliases.db
+        /etc/aliases.db
               data base of alias names
 
         /etc/mail/sendmail.cf
diff -up ./sendmail/sendmail.8.orig ./sendmail/sendmail.8
--- ./sendmail/sendmail.8.orig	2009-04-10 19:49:19.000000000 +0200
+++ ./sendmail/sendmail.8	2010-02-01 10:50:04.993920355 +0100
@@ -706,10 +706,10 @@ Thus, 
 these values are only approximations.
 .PP
 .TP
- /etc/mail/aliases
+ /etc/aliases
 raw data for alias names
 .TP
- /etc/mail/aliases.db
+ /etc/aliases.db
 data base of alias names
 .TP
  /etc/mail/sendmail.cf