Wed Feb 3 11:25:20 UTC 2010

Author: jskarvad

Update of /cvs/pkgs/rpms/sendmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15278

Modified Files:
	.cvsignore sendmail.spec sources 
Added Files:
	sendmail-8.14.4-aliases_dir.patch 
	sendmail-8.14.4-dynamic.patch sendmail-8.14.4-makemapman.patch 
	sendmail-8.14.4-switchfile.patch 
Removed Files:
	sendmail-8.13.7-aliases_dir.patch 
	sendmail-8.14.0-dynamic.patch sendmail-8.14.3-exitpanic.patch 
	sendmail-8.14.3-makemapman.patch 
	sendmail-8.14.3-movefiles.patch 
	sendmail-8.14.3-switchfile.patch 
Log Message:
* Tue Feb 02 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.4-1
- new version 8.14.4 (#552078)
- RPM attributes S, 5, T not recorded for statistics file
- adapted patches: makemapman, dynamic, switchfile (#552078)
- movefiles patch incorporated into aliases_dir patch
- drop exitpanic patch (fixed upstream)


sendmail-8.14.4-aliases_dir.patch:
 ./sendmail/aliases.0            |    2 +-
 ./sendmail/aliases.5            |    4 ++--
 ./sendmail/newaliases.0         |    4 ++--
 ./sendmail/newaliases.1         |    4 ++--
 ./sendmail/sendmail.0           |    4 ++--
 ./sendmail/sendmail.8           |    4 ++--
 sendmail-8.14.3/cf/m4/cfhead.m4 |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE sendmail-8.14.4-aliases_dir.patch ---
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

sendmail-8.14.4-dynamic.patch:
 devtools/OS/Linux |   10 +++++-----
 libsm/Makefile.m4 |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE sendmail-8.14.4-dynamic.patch ---
--- sendmail-8.14.4/devtools/OS/Linux		2010-01-03 22:55:35.000000000 +0100
+++ sendmail-8.14.4/devtools/OS/Linux.dynamic	2010-01-03 22:59:03.000000000 +0100
@@ -7,7 +7,7 @@
 define(`confCCOPTS_SO', `-fPIC')
 define(`confSM_OS_HEADER', `sm_os_linux')
 define(`confMANROOT', `/usr/share/man/man')
-define(`confLIBS', `-ldl')
+define(`confLIBS', `-pie -ldl')
 define(`confEBINDIR', `/usr/sbin')
 APPENDDEF(`confLIBSEARCH', `crypt nsl')
 
@@ -22,19 +22,19 @@
 ifelse(confBLDVARIANT, `DEBUG',
 dnl Debug build
 `
-	define(`confOPTIMIZE',`-g -Wall')
+	define(`confOPTIMIZE',`-g -Wall -fpie')
 ',
 dnl Optimized build
 confBLDVARIANT, `OPTIMIZED',
 `
-	define(`confOPTIMIZE',`-O2')
+	define(`confOPTIMIZE',`-O2 -fpie')
 ',
 dnl Purify build
 confBLDVARIANT, `PURIFY',
 `
-	define(`confOPTIMIZE',`-g')
+	define(`confOPTIMIZE',`-g -fpie')
 ',
 dnl default
 `
-	define(`confOPTIMIZE',`-O2')
+	define(`confOPTIMIZE',`-O2 -fpie')
 ')
--- sendmail-8.14.4/libsm/Makefile.m4		2006-08-16 23:06:31.000000000 +0200
+++ sendmail-8.14.4/libsm/Makefile.m4.dynamic	2010-01-03 23:01:36.000000000 +0100
@@ -6,7 +6,7 @@
 define(`confREQUIRE_SM_OS_H', `true')
 PREPENDDEF(`confENVDEF', `confMAPDEF')
 bldPRODUCT_START(`library', `libsm')
-define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c ')
+define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c ')
 bldPRODUCT_END
 dnl msg.c
 dnl syslogio.c

sendmail-8.14.4-makemapman.patch:
 cf/cf/Build       |    2 +-
 devtools/OS/Linux |    4 +++-
 makemap/makemap.8 |    6 ------
 rmail/rmail.c     |    1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

--- NEW FILE sendmail-8.14.4-makemapman.patch ---
--- sendmail-8.14.4/cf/cf/Build				1999-03-02 03:37:12.000000000 +0100
+++ sendmail-8.14.4/cf/cf/Build.makemapman		2010-01-03 22:49:38.000000000 +0100
@@ -18,7 +18,7 @@
 SMROOT=${SMROOT-../..}
 BUILDTOOLS=${BUILDTOOLS-$SMROOT/devtools}
 
-M4=`sh $BUILDTOOLS/bin/find_m4.sh`
+M4=/usr/bin/m4
 ret=$?
 if [ $ret -ne 0 ]
 then
--- sendmail-8.14.4/devtools/OS/Linux			2009-01-22 03:15:42.000000000 +0100
+++ sendmail-8.14.4/devtools/OS/Linux.makemapman	2010-01-03 22:50:27.000000000 +0100
@@ -6,7 +6,7 @@
 define(`confDEPEND_TYPE', `CC-M')
 define(`confCCOPTS_SO', `-fPIC')
 define(`confSM_OS_HEADER', `sm_os_linux')
-define(`confMANROOT', `/usr/man/man')
+define(`confMANROOT', `/usr/share/man/man')
 define(`confLIBS', `-ldl')
 define(`confEBINDIR', `/usr/sbin')
 APPENDDEF(`confLIBSEARCH', `crypt nsl')
@@ -16,6 +16,8 @@
 define(`confMTLDOPTS', `-lpthread')
 define(`confLDOPTS_SO', `-shared')
 define(`confSONAME',`-soname')
+define('confSBINGRP', 'mail')
+define('confSBINMODE', '6755')
 
 ifelse(confBLDVARIANT, `DEBUG',
 dnl Debug build
--- sendmail-8.14.4/makemap/makemap.8			2008-05-03 01:07:48.000000000 +0200
+++ sendmail-8.14.4/makemap/makemap.8.makemapman	2010-01-03 22:51:04.000000000 +0100
@@ -52,12 +52,6 @@
 parameter.  
 They may be
 .TP
-dbm
-DBM format maps.  
-This requires the 
-ndbm(3) 
-library.
-.TP
 btree
 B-Tree format maps.  
 This requires the new Berkeley DB 
--- sendmail-8.14.4/rmail/rmail.c			2001-09-18 23:45:29.000000000 +0200
+++ sendmail-8.14.4/rmail/rmail.c.makemapman		2010-01-03 22:51:36.000000000 +0100
@@ -276,7 +276,6 @@
 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
 	args[i++] = "-G";		/* relay submission */
 	args[i++] = "-oee";		/* No errors, just status. */
-	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
 
 	/* set from system and protocol used */

sendmail-8.14.4-switchfile.patch:
 conf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sendmail-8.14.4-switchfile.patch ---
--- sendmail-8.14.4/sendmail/conf.c		2009-12-18 18:25:12.000000000 +0100
+++ sendmail-8.14.4/sendmail/conf.c.switchfile	2010-01-03 23:08:27.000000000 +0100
@@ -972,7 +972,7 @@
 				if (p != NULL)
 					*p = '\0';
 #ifndef SM_NSSWITCH_DELIMS
-# define SM_NSSWITCH_DELIMS	" \t"
+# define SM_NSSWITCH_DELIMS	" \t:"
 #endif /* SM_NSSWITCH_DELIMS */
 				p = strpbrk(buf, SM_NSSWITCH_DELIMS);
 				if (p != NULL)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	22 Jul 2008 13:02:10 -0000	1.23
+++ .cvsignore	3 Feb 2010 11:25:19 -0000	1.24
@@ -1,12 +1 @@
-sendmail.8.13.1.tar.gz
-sendmail.8.13.2.tar.gz
-sendmail.8.13.3.tar.gz
-sendmail.8.13.4.tar.gz
-sendmail.8.13.5.tar.gz
-sendmail.8.13.6.tar.gz
-sendmail.8.13.7.tar.gz
-sendmail.8.13.8.tar.gz
-sendmail.8.14.0.tar.gz
-sendmail.8.14.1.tar.gz
-sendmail.8.14.2.tar.gz
-sendmail.8.14.3.tar.gz
+sendmail.8.14.4.tar.gz


Index: sendmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- sendmail.spec	3 Jan 2010 22:45:02 -0000	1.105
+++ sendmail.spec	3 Feb 2010 11:25:20 -0000	1.106
@@ -13,8 +13,8 @@
 
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
-Version: 8.14.3
-Release: 10%{?dist}
+Version: 8.14.4
+Release: 1%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -34,21 +34,19 @@ Source14: sendmail-etc-mail-local-host-n
 Source15: sendmail-etc-mail-mailertable
 Source16: sendmail-etc-mail-trusted-users
 Source17: sendmail-etc-mail-virtusertable
-Patch3: sendmail-8.14.3-makemapman.patch
+Patch3: sendmail-8.14.4-makemapman.patch
 Patch4: sendmail-8.14.3-smrsh_paths.patch
-Patch5: sendmail-8.14.3-movefiles.patch
 Patch7: sendmail-8.13.7-pid.patch
 Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.14.0-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
-Patch13: sendmail-8.13.7-aliases_dir.patch
+Patch13: sendmail-8.14.4-aliases_dir.patch
 Patch14: sendmail-8.13.7-vacation.patch
 Patch15: sendmail-8.14.1-noversion.patch
 Patch16: sendmail-8.13.1-localdomain.patch
 Patch17: sendmail-8.14.3-sharedmilter.patch
-Patch18: sendmail-8.14.3-switchfile.patch
-Patch19: sendmail-8.14.3-exitpanic.patch
+Patch18: sendmail-8.14.4-switchfile.patch
 Patch20: sendmail-8.14.3-milterfdleaks.patch
 Patch21: sendmail-8.14.3-ipv6-bad-helo.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -147,7 +145,6 @@ This package includes the milter shared 
 
 %patch3 -p1 -b .makemapman
 %patch4 -p1 -b .smrsh_paths
-%patch5 -p1 -b .movefiles
 %patch7 -p1 -b .pid
 %patch9 -p1 -b .hesiod
 %patch10 -p1 -b .manpage
@@ -162,7 +159,6 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch17 -p1 -b .sharedmilter
 
 %patch18 -p1 -b .switchfile
-%patch19 -p1 -b .exitpanic
 %patch20 -p1 -b .milterfdleaks
 %patch21 -p1 -b .ipv6-bad-helo
 
@@ -497,7 +493,7 @@ exit 0
 %attr(0770,smmsp,smmsp) %dir %{spooldir}/clientmqueue
 %attr(0700,root,mail) %dir %{spooldir}/mqueue
 
-%config(noreplace) %{stdir}/statistics
+%config(noreplace) %verify(not size mtime md5) %{stdir}/statistics
 %config(noreplace) %{maildir}/Makefile
 %config(noreplace) %{maildir}/make
 %config(noreplace) %{maildir}/sendmail.cf
@@ -566,6 +562,13 @@ exit 0
 
 
 %changelog
+* Tue Feb 02 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.4-1
+- new version 8.14.4 (#552078)
+- RPM attributes S, 5, T not recorded for statistics file
+- adapted patches: makemapman, dynamic, switchfile (#552078)
+- movefiles patch incorporated into aliases_dir patch
+- drop exitpanic patch (fixed upstream)
+
 * Sun Jan 03 2010 Robert Scheck <robert at fedoraproject.org> 8.14.3-10
 - handle IPv6:::1 in block_bad_helo.m4 like 127.0.0.1 (#549217)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sendmail/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	22 Jul 2008 13:02:10 -0000	1.23
+++ sources	3 Feb 2010 11:25:20 -0000	1.24
@@ -1 +1 @@
-a5ee5d26e1f546a2da5fb9a513bd6bce  sendmail.8.14.3.tar.gz
+1b23d5000c8e7bfe82ec1a27f2f5fdc5  sendmail.8.14.4.tar.gz


--- sendmail-8.13.7-aliases_dir.patch DELETED ---


--- sendmail-8.14.0-dynamic.patch DELETED ---


--- sendmail-8.14.3-exitpanic.patch DELETED ---


--- sendmail-8.14.3-makemapman.patch DELETED ---


--- sendmail-8.14.3-movefiles.patch DELETED ---


--- sendmail-8.14.3-switchfile.patch DELETED ---

