lkundrak / rpms / sendmail

Forked from rpms/sendmail 4 years ago
Clone
e861a83
diff -up sendmail-8.14.3/cf/m4/cfhead.m4.movefiles sendmail-8.14.3/cf/m4/cfhead.m4
a25fa21
--- sendmail-8.14.3/cf/m4/cfhead.m4.movefiles	2004-01-28 23:02:22.000000000 +0100
a25fa21
+++ sendmail-8.14.3/cf/m4/cfhead.m4	2008-12-02 18:07:06.000000000 +0100
e861a83
@@ -259,7 +259,7 @@ ifdef(`MAIL_SETTINGS_DIR', , `define(`MA
e861a83
 define(`DATABASE_MAP_TYPE', `hash')
a25fa21
 
e861a83
 # set up default values for options
e861a83
-define(`ALIAS_FILE', `MAIL_SETTINGS_DIR`'aliases')
e861a83
+define(`ALIAS_FILE', `/etc/aliases')
e861a83
 define(`confMAILER_NAME', ``MAILER-DAEMON'')
e861a83
 define(`confFROM_LINE', `From $g $d')
e861a83
 define(`confOPERATORS', `.:%@!^/[]+')
647e3b9
diff -up ./sendmail/aliases.0.orig ./sendmail/aliases.0
647e3b9
--- ./sendmail/aliases.0.orig	2009-12-23 05:48:32.000000000 +0100
647e3b9
+++ ./sendmail/aliases.0	2010-02-01 10:49:56.093920068 +0100
647e3b9
@@ -63,7 +63,7 @@ D?DE?ES?SC?CR?RI?IP?PT?TI?IO?ON?N
647e3b9
        the list of users defined in that file.
647e3b9
 
647e3b9
        This  is  only  the  raw  data file; the actual aliasing information is
647e3b9
-       placed into a binary format in the file /etc/mail/aliases.db using  the
647e3b9
+       placed into a binary format in the file /etc/aliases.db using  the
647e3b9
        program  newaliases(1).   A  newaliases command should be executed each
647e3b9
        time the aliases file is changed for the change to take effect.
647e3b9
 
647e3b9
diff -up ./sendmail/aliases.5.orig ./sendmail/aliases.5
647e3b9
--- ./sendmail/aliases.5.orig	2004-07-12 07:39:21.000000000 +0200
647e3b9
+++ ./sendmail/aliases.5	2010-02-01 10:45:46.407921946 +0100
647e3b9
@@ -23,7 +23,7 @@ ID 
647e3b9
 aliases used by 
647e3b9
 sendmail.
647e3b9
 The file resides in 
647e3b9
-/etc/mail 
647e3b9
+/etc
647e3b9
 and 
647e3b9
 is formatted as a series of lines of the form
647e3b9
 .IP
647e3b9
@@ -96,7 +96,7 @@ list of users defined in that file.
647e3b9
 .PP
647e3b9
 This is only the raw data file; the actual aliasing information is
647e3b9
 placed into a binary format in the file 
647e3b9
-/etc/mail/aliases.db
647e3b9
+/etc/aliases.db
647e3b9
 using the program 
647e3b9
 newaliases(1).  
647e3b9
 A 
647e3b9
diff -up ./sendmail/newaliases.0.orig ./sendmail/newaliases.0
647e3b9
--- ./sendmail/newaliases.0.orig	2009-12-23 05:48:32.000000000 +0100
647e3b9
+++ ./sendmail/newaliases.0	2010-02-01 10:49:46.527918883 +0100
e861a83
@@ -10,7 +10,7 @@ S?SY?YN?NO?OP?PS?SI?IS?S
cvsdist 333a3fa
 
cvsdist 333a3fa
 D?DE?ES?SC?CR?RI?IP?PT?TI?IO?ON?N
cvsdist 35607f7
        N?Ne?ew?wa?al?li?ia?as?se?es?s  rebuilds  the  random access data base for the mail aliases
cvsdist 35607f7
-       file /etc/mail/aliases.  It must be run each time this file is  changed
cvsdist 35607f7
+       file /etc/aliases.  It must be run each time this file is  changed
cvsdist 35607f7
        in order for the change to take effect.
cvsdist 333a3fa
 
cvsdist 35607f7
        N?Ne?ew?wa?al?li?ia?as?se?es?s is identical to ``sendmail -bi''.
e861a83
@@ -22,7 +22,7 @@ D?DE?ES?SC?CR?RI?IP?PT?TI?IO?ON?N
cvsdist 35607f7
        s?se?en?nd?dm?ma?ai?il?l.?.
cvsdist 333a3fa
 
cvsdist 333a3fa
 F?FI?IL?LE?ES?S
cvsdist 333a3fa
-       /etc/mail/aliases   The mail aliases file
cvsdist 333a3fa
+       /etc/aliases   The mail aliases file
cvsdist 333a3fa
 
cvsdist 333a3fa
 S?SE?EE?E A?AL?LS?SO?O
cvsdist 333a3fa
        aliases(5), sendmail(8)
647e3b9
diff -up ./sendmail/newaliases.1.orig ./sendmail/newaliases.1
647e3b9
--- ./sendmail/newaliases.1.orig	2001-10-10 05:23:17.000000000 +0200
647e3b9
+++ ./sendmail/newaliases.1	2010-02-01 10:49:36.194921433 +0100
e861a83
@@ -20,7 +20,7 @@ newaliases
cvsdist 333a3fa
 .SH DESCRIPTION
cvsdist 333a3fa
 .B Newaliases
cvsdist 333a3fa
 rebuilds the random access data base for the mail aliases file
cvsdist 333a3fa
-/etc/mail/aliases.  It must be run each time this file is changed
cvsdist 333a3fa
+/etc/aliases.  It must be run each time this file is changed
cvsdist 333a3fa
 in order for the change to take effect.
cvsdist 333a3fa
 .PP
cvsdist 333a3fa
 .B Newaliases
e861a83
@@ -40,7 +40,7 @@ puts a special token into the data base 
cvsdist 333a3fa
 .B sendmail.
cvsdist 333a3fa
 .SH FILES
cvsdist 333a3fa
 .TP 2i
cvsdist 333a3fa
-/etc/mail/aliases
cvsdist 333a3fa
+/etc/aliases
cvsdist 333a3fa
 The mail aliases file
cvsdist 333a3fa
 .SH SEE ALSO
cvsdist 333a3fa
 aliases(5), sendmail(8)
647e3b9
diff -up ./sendmail/sendmail.0.orig ./sendmail/sendmail.0
647e3b9
--- ./sendmail/sendmail.0.orig	2009-12-23 05:48:32.000000000 +0100
647e3b9
+++ ./sendmail/sendmail.0	2010-02-01 10:49:04.494920283 +0100
e861a83
@@ -430,10 +430,10 @@ F?FI?IL?LE?ES?S
e861a83
        are only approximations.
cvsdist 333a3fa
 
e861a83
 
e861a83
-        /etc/mail/aliases
e861a83
+        /etc/aliases
e861a83
               raw data for alias names
e861a83
 
e861a83
-        /etc/mail/aliases.db
e861a83
+        /etc/aliases.db
e861a83
               data base of alias names
e861a83
 
e861a83
         /etc/mail/sendmail.cf
647e3b9
diff -up ./sendmail/sendmail.8.orig ./sendmail/sendmail.8
647e3b9
--- ./sendmail/sendmail.8.orig	2009-04-10 19:49:19.000000000 +0200
647e3b9
+++ ./sendmail/sendmail.8	2010-02-01 10:50:04.993920355 +0100
647e3b9
@@ -706,10 +706,10 @@ Thus, 
e861a83
 these values are only approximations.
e861a83
 .PP
e861a83
 .TP
e861a83
- /etc/mail/aliases
e861a83
+ /etc/aliases
e861a83
 raw data for alias names
e861a83
 .TP
647e3b9
- /etc/mail/aliases.db
647e3b9
+ /etc/aliases.db
647e3b9
 data base of alias names
647e3b9
 .TP
647e3b9
  /etc/mail/sendmail.cf