Hello community,

here is the log from the commit of package sendmail for openSUSE:Factory
checked in at Mon Aug 15 09:59:27 CEST 2011.



--------
--- sendmail/sendmail.changes   2011-05-31 12:18:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/sendmail/sendmail.changes      2011-08-12 
16:49:26.000000000 +0200
@@ -1,0 +2,26 @@
+Fri Aug 12 14:47:38 UTC 2011 - [email protected]
+
+- Use Pre exec files for configuration on the fly
+
+-------------------------------------------------------------------
+Thu Aug 11 15:17:58 UTC 2011 - [email protected]
+
+- Socket activation does not work for sendmail even with -bs
+  on the command line of sendmail and StandardInput=socket
+
+-------------------------------------------------------------------
+Mon Aug  8 15:14:52 UTC 2011 - [email protected]
+
+- The approach of using makefiles requires make for sendmail 
+
+-------------------------------------------------------------------
+Fri Aug  5 12:23:05 UTC 2011 - [email protected]
+
+- Make /var7run a ghost entry in spec as this is a tmpfs now and
+  create it at start of sendmail if it does not exist (bnc#710279)
+- First try of using systemd unit configration files for both
+  sendmail MTA and sendmail MT client.  Try to start them on
+  demand using systemd unit socket files for both local and remote
+  network as well as systemd unit path file for local mail queue
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  sendmail-client.path
  sendmail-client.service
  sendmail-client.systemd
  sendmail.service
  sendmail.systemd

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sendmail.spec ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old  2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new  2011-08-15 09:54:12.000000000 +0200
@@ -26,18 +26,26 @@
 Group:          Productivity/Networking/Email/Servers
 PreReq:         %fillup_prereq %insserv_prereq
 PreReq:         /bin/mv /bin/rm /bin/sed
+PreReq:         permissions
+%if 0%{?suse_version} > 1130
 PreReq:         sysvinit(network) sysvinit(syslog)
+%endif
 Provides:       sendcf smailcfg smtp_daemon sendmail-tls
-Requires:       filesystem procmail netcfg m4 /bin/fuser
+Requires:       filesystem procmail netcfg m4 /bin/fuser make
 Conflicts:      smail postfix postfix-tls
 Obsoletes:      sendmail-tls
 AutoReqProv:    on
 Version:        8.14.5
-Release:        1
+Release:        2
 Summary:        BSD Sendmail
 Source0:        ftp://ftp.sendmail.org/pub/sendmail/sendmail-%{version}.tar.bz2
 Source1:        FAQ.sendmail-8.14.bz2
 Source2:        sendmail-rpmlintrc
+Source3:        sendmail-client.path
+Source4:        sendmail.service
+Source5:        sendmail-client.service
+Source6:        sendmail.systemd
+Source7:        sendmail-client.systemd
 Patch0:         sendmail-%{version}.dif
 Patch1:         sendmail-8.13.5-select.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -82,7 +90,7 @@
 
 %package -n rmail
 Version:        8.14.3
-Release:        61
+Release:        62
 Summary:        Rmail of the BSD Sendmail
 License:        PERMISSIVE-OSI-COMPLIANT
 Group:          Productivity/Networking/Email/Servers
@@ -105,7 +113,7 @@
     set -f
     cat <<-EOF > file-list
        %%defattr(-,root,root)
-       %%dir    %%attr(1750,root,root)   %{_localstatedir}/run/sendmail
+       %%ghost %%dir %%attr(1750,root,root)   %{_localstatedir}/run/sendmail
        %%dir    %%attr(0750,root,root)   %{_localstatedir}/lib/sendmail
        %%attr(0600,root,root)            
%{_localstatedir}/lib/sendmail/statistics
        %%attr(0600,root,root)            %{_mailcnfdir}/statistics
@@ -175,6 +183,10 @@
     mkdir -p %{buildroot}%{_mandir}/man5
     mkdir -p %{buildroot}%{_mandir}/man8
     mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+%if 0%{?suse_version} > 1140
+    mkdir -p %{buildroot}/lib/systemd/system
+    mkdir -p %{buildroot}/%{_mailcnfdir}/system
+%endif
     make \
        DESTDIR=%{buildroot} \
        SUBDIRS="%{SUBDIRS}" \
@@ -298,6 +310,17 @@
        make DESTDIR=%{buildroot} short
        PATH=$OPATH
     popd
+%if 0%{?suse_version} > 1140
+    #
+    # systemd unit conf files
+    install -m 0644 %{S:3} %{buildroot}/lib/systemd/system/
+    install -m 0644 %{S:4} %{buildroot}/lib/systemd/system/
+    install -m 0644 %{S:5} %{buildroot}/lib/systemd/system/
+    install -m 0644 %{S:6} %{buildroot}/%{_mailcnfdir}/system/sm.pre
+    install -m 0644 %{S:7} %{buildroot}/%{_mailcnfdir}/system/sm-client.pre
+    chmod 0755 %{buildroot}/%{_mailcnfdir}/system/sm.pre
+    chmod 0755 %{buildroot}/%{_mailcnfdir}/system/sm-client.pre
+%endif
     #
     # Remove some files we don't wish to package
     #
@@ -307,6 +330,20 @@
 %clean
 rm -rf %{buildroot}
 
+%if %{defined verify_permissions}
+%verifyscript
+%verify_permissions -e %{_localstatedir}/run/sendmail/
+%verify_permissions -e %{_localstatedir}/spool/mqueue/
+%verify_permissions -e %{_sysconfdir}/sendmail.cf
+%verify_permissions -e %{_sysconfdir}/init.d/sendmail
+%verify_permissions -e %{_mailcnfdir}/auth/
+%verify_permissions -e %{_mailcnfdir}/certs/
+%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/
+%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/mail.local
+%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/smrsh
+%verify_permissions -e %{_sbindir}/sendmail
+%endif
+
 %pre
 # Check for rc.config: 
 if test -f etc/rc.config ; then
@@ -361,9 +398,31 @@
 fi
 %{fillup_and_insserv -nY sendmail sendmail}
 %{fillup_only -an mail}
+if test -x bin/systemctl ; then
+  bin/systemctl enable sendmail.service >/dev/null 2>&1 || :
+  bin/systemctl enable sendmail-client.service >/dev/null 2>&1 || :
+  bin/systemctl enable sendmail-client.path >/dev/null 2>&1 || :
+fi
+%if %{defined set_permissions}
+%set_permissions %{_localstatedir}/run/sendmail/
+%set_permissions %{_localstatedir}/spool/mqueue/
+%set_permissions %{_sysconfdir}/sendmail.cf
+%set_permissions %{_sysconfdir}/init.d/sendmail
+%set_permissions %{_mailcnfdir}/auth/
+%set_permissions %{_mailcnfdir}/certs/
+%set_permissions %{_prefix}/lib/sendmail.d/bin/
+%set_permissions %{_prefix}/lib/sendmail.d/bin/mail.local
+%set_permissions %{_prefix}/lib/sendmail.d/bin/smrsh
+%set_permissions %{_sbindir}/sendmail
+%endif
 
 %preun
 %{stop_on_removal sendmail}
+if test -x bin/systemctl ; then
+  bin/systemctl disable sendmail.service >/dev/null 2>&1 || :
+  bin/systemctl disable sendmail-client.service >/dev/null 2>&1 || :
+  bin/systemctl disable sendmail-client.path >/dev/null 2>&1 || :
+fi
 
 %postun
 %{restart_on_update sendmail}
@@ -376,6 +435,9 @@
 # %dir %attr(0750,root,mail) %{_sysconfdir}/aliases.d
 %dir %attr(0750,root,root) %{_mailcnfdir}/auth
 %dir %attr(0750,root,root) %{_mailcnfdir}/certs
+%if 0%{?suse_version} > 1140
+%dir %attr(0750,root,root) %{_mailcnfdir}/system
+%endif
 %config(noreplace) %{_sysconfdir}/sendmail.cf
 # %{_sysconfdir}/aliases is part of netcfg
 # %config(noreplace) %{_sysconfdir}/aliases
@@ -407,6 +469,13 @@
 %config %attr(0644,root,root) 
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sendmail
 %config %attr(0744,root,root) %{_sysconfdir}/init.d/sendmail
 %config %attr(0755,root,root) /sbin/conf.d/SuSEconfig.sendmail
+%if 0%{?suse_version} > 1140
+%config %attr(0644,root,root) /lib/systemd/system/sendmail-client.path
+%config %attr(0644,root,root) /lib/systemd/system/sendmail.service
+%config %attr(0644,root,root) /lib/systemd/system/sendmail-client.service
+%config %attr(0755,root,root) %{_mailcnfdir}/system/sm.pre
+%config %attr(0755,root,root) %{_mailcnfdir}/system/sm-client.pre
+%endif
 %{_bindir}/hoststat
 %{_bindir}/mailq
 %{_bindir}/newaliases

++++++ uucp.spec ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old  2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new  2011-08-15 09:54:12.000000000 +0200
@@ -26,7 +26,7 @@
 Recommends:     stunnel
 AutoReqProv:    on
 Version:        1.07
-Release:        432
+Release:        433
 Summary:        Taylor UUCP
 Source0:        uucp-1.07.tar.bz2
 Source1:        uucpcfg.tar.bz2


++++++ sendmail-8.14.5.dif ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old  2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new  2011-08-15 09:54:12.000000000 +0200
@@ -228,7 +228,7 @@
 +divert(0)dnl
 --- cf/m4/cfhead.m4
 +++ cf/m4/cfhead.m4    2008-02-20 18:00:46.000000000 +0000
-@@ -303,6 +303,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_
+@@ -304,6 +304,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_
  define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, 
{auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
  define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, 
{rcpt_addr}'')
  define(`confMILTER_MACROS_EOM', `{msg_id}')
@@ -839,15 +839,6 @@
        while (<CF>)
        {
                chomp;
---- devtools/M4/header.m4
-+++ devtools/M4/header.m4      2008-09-30 13:06:57.000000000 +0000
-@@ -34,3 +34,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
- define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
- define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
- define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
-+define(`REPLACEDEF', `define(`_$1', `esyscmd(`x='$1`;echo -n 
${x//$2/$3}')')dnl
-+define(`$1', _$1)dnl
-+undefine(`_$1')')
 --- devtools/M4/UNIX/manpage.m4
 +++ devtools/M4/UNIX/manpage.m4        2007-04-05 13:33:07.000000000 +0000
 @@ -69,7 +69,7 @@ ifdef(`confNO_MAN_INSTALL', `divert(-1)'
@@ -869,8 +860,17 @@
 +      ${CC} -M ${O} ${COPTS} ${SRCS} >> Makefile
  
  #     End of $RCSfile: CC-M.m4,v $
+--- devtools/M4/header.m4
++++ devtools/M4/header.m4      2008-09-30 13:06:57.000000000 +0000
+@@ -34,3 +34,6 @@ define(`PUSHDIVERT', `pushdef(`__D__', d
+ define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
+ define(`APPENDDEF', `define(`$1', ifdef(`$1', `$1 $2', `$2'))')
+ define(`PREPENDDEF', `define(`$1', ifdef(`$1', `$2 $1', `$2'))')
++define(`REPLACEDEF', `define(`_$1', `esyscmd(`x='$1`;echo -n 
${x//$2/$3}')')dnl
++define(`$1', _$1)dnl
++undefine(`_$1')')
 --- devtools/Site/site.config.m4
-+++ devtools/Site/site.config.m4       2010-01-26 14:58:44.791429617 +0000
++++ devtools/Site/site.config.m4       2010-01-26 14:58:45.000000000 +0000
 @@ -0,0 +1,158 @@
 +dnl
 +dnl Sendmail site file for SuSE Linux
@@ -1114,7 +1114,7 @@
  the syntax.
  .)f
  Most messages are a sequence of
-@@ -1515,7 +1515,7 @@ The disk based host information is store
+@@ -1518,7 +1518,7 @@ The disk based host information is store
  directory called
  .b \&.hoststat \**.
  .(f
@@ -1123,7 +1123,7 @@
  .b HostStatusDirectory
  option;
  it can, of course, go anywhere you like in your filesystem.
-@@ -1566,7 +1566,7 @@ and sendmail knows about it,
+@@ -1569,7 +1569,7 @@ and sendmail knows about it,
  will use the native version.
  Ultrix, Solaris, and DEC OSF/1 are examples of such systems\**.
  .(f
@@ -1132,7 +1132,7 @@
  but since the APIs are apparently not available in the libraries
  .i sendmail
  does not use the native service switch in this release.
-@@ -1659,7 +1659,7 @@ will not have the desired effect
+@@ -1662,7 +1662,7 @@ will not have the desired effect
  (except on prep.ai.MIT.EDU,
  and they probably don't want me)\**.
  .(f
@@ -1141,7 +1141,7 @@
  will permit aliasing;
  this is normally limited to the local mailer.
  .)f
-@@ -1674,7 +1674,7 @@ are comments.
+@@ -1677,7 +1677,7 @@ are comments.
  The second form is processed by the
  .i ndbm \|(3)\**
  .(f
@@ -1150,7 +1150,7 @@
  .i gdbm
  package does not work.
  .)f
-@@ -1812,7 +1812,7 @@ Before
+@@ -1815,7 +1815,7 @@ Before
  will access the database,
  it checks to insure that this entry exists\**.
  .(f
@@ -1159,7 +1159,7 @@
  .b AliasWait
  option is required in the configuration
  for this action to occur.
-@@ -2235,7 +2235,7 @@ Some options have security implications.
+@@ -2238,7 +2238,7 @@ Some options have security implications.
  Sendmail allows you to set these,
  but relinquishes its set-user-ID or set-group-ID permissions thereafter\**.
  .(f
@@ -1168,7 +1168,7 @@
  thus, if you are executing as root,
  as from root's crontab file or during system startup
  the root permissions will still be honored.
-@@ -2603,7 +2603,7 @@ the time to wait for another command.
+@@ -2606,7 +2606,7 @@ the time to wait for another command.
  The timeout waiting for a reply to an IDENT query
  [5s\**, unspecified].
  .(f
@@ -1177,7 +1177,7 @@
  .)f
  .ip lhlo
  The wait for a reply to an LMTP LHLO command
-@@ -3852,7 +3852,7 @@ and
+@@ -3855,7 +3855,7 @@ and
  is looked up in the host database(s)
  and replaced by the canonical name\**.
  .(f
@@ -1186,7 +1186,7 @@
  completely equivalent
  to $(host \fIhostname\fP$).
  In particular, a
-@@ -3937,7 +3937,7 @@ part.
+@@ -3940,7 +3940,7 @@ part.
  If the mailer is local
  the host part may be omitted\**.
  .(f
@@ -1195,7 +1195,7 @@
  .q "per user"
  extensions.
  For example, in the address
-@@ -4678,7 +4678,7 @@ for interpolation into argv's for mailer
+@@ -4681,7 +4681,7 @@ for interpolation into argv's for mailer
  or for other contexts.
  The ones marked \(dg are information passed into sendmail\**,
  .(f
@@ -1204,7 +1204,7 @@
  all of these macros have reasonable defaults.
  Previous versions required that they be defined.
  .)f
-@@ -5204,7 +5204,7 @@ and then passing that to
+@@ -5208,7 +5208,7 @@ and then passing that to
  .i gethostbyname (3)
  which is supposed to return the canonical version of that host name.\**
  .(f
@@ -1213,7 +1213,7 @@
  .i gethostname
  might return
  .q foo
-@@ -5232,7 +5232,7 @@ it is imperative that the config file se
+@@ -5236,7 +5236,7 @@ it is imperative that the config file se
  .b $j
  to the fully qualified domain name\**.
  .(f
@@ -1222,7 +1222,7 @@
  .b $j
  at all, so up until 8.6,
  config files
-@@ -6929,7 +6929,7 @@ will run as this user.
+@@ -6933,7 +6933,7 @@ will run as this user.
  Defaults to 1:1.
  The value can also be given as a symbolic user name.\**
  .(f
@@ -1231,7 +1231,7 @@
  .b g
  option has been combined into the
  .b DefaultUser
-@@ -7659,7 +7659,7 @@ noactualrecipient        Don't put X-Actual-Rec
+@@ -7663,7 +7663,7 @@ noactualrecipient        Don't put X-Actual-Rec
                which reveal the actual account that addresses map to.
  .)b
  .(f
@@ -1240,7 +1240,7 @@
  the
  .b noreceipts
  flag turns off support for RFC 1891
-@@ -7899,7 +7899,7 @@ If set to a non-zero (non-root) value,
+@@ -7903,7 +7903,7 @@ If set to a non-zero (non-root) value,
  .i sendmail
  will change to this user id shortly after startup\**.
  .(f
@@ -1249,7 +1249,7 @@
  it changes to this user after accepting a connection
  but before reading any
  .sm SMTP
-@@ -8530,7 +8530,7 @@ line may have an optional
+@@ -8534,7 +8534,7 @@ line may have an optional
  to indicate that this configuration file uses modifications
  specific to a particular vendor\**.
  .(f
@@ -1258,7 +1258,7 @@
  to the list of recognized vendors by editing the routine
  .i setvendor
  in
-@@ -9707,7 +9707,7 @@ gets their outgoing mail stamped as
+@@ -9711,7 +9711,7 @@ gets their outgoing mail stamped as
  but people not listed in the database use the local hostname.
  .sh 3 "Creating the database\**"
  .(f
@@ -1267,7 +1267,7 @@
  Other features are available which provide similar functionality,
  e.g., virtual hosting and mapping local addresses into a
  generic form as explained in cf/README.
-@@ -10264,7 +10264,7 @@ and
+@@ -10268,7 +10268,7 @@ and
  fields are always scanned on ARPANET mail
  to determine the sender\**;
  .(f
@@ -1276,7 +1276,7 @@
  this information is contained in the envelope.
  The older ARPANET protocols did not completely distinguish
  envelope from header.
-@@ -10492,7 +10492,7 @@ The distribution includes several possib
+@@ -10496,7 +10496,7 @@ The distribution includes several possib
  If you are porting to a new environment
  you may need to add some new tweaks.\**
  .(f
@@ -1285,7 +1285,7 @@
  [email protected].
  .)f
  .sh 2 "Configuration in sendmail/daemon.c"
-@@ -11336,7 +11336,7 @@ the following is a queue file sent to
+@@ -11340,7 +11340,7 @@ the following is a queue file sent to
  and
  .q [email protected] \**:
  .(f
@@ -1295,7 +1295,7 @@
  nothing can replace looking at what your own system generates.
  .)f
 --- include/sm/conf.h
-+++ include/sm/conf.h  2011-05-31 12:06:28.875925609 +0200
++++ include/sm/conf.h  2011-05-31 10:06:28.875925609 +0000
 @@ -1457,23 +1457,47 @@ extern void            *malloc();
  #   define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
  #  endif /* !defined(KERNEL_VERSION) */
@@ -1332,7 +1332,7 @@
  #  define HASUNSETENV 1       /* has unsetenv(3) call */
  #  define ERRLIST_PREDEFINED  /* don't declare sys_errlist */
  #  define GIDSET_T    gid_t   /* from <linux/types.h> */
-+#  define HAVE_NANOSLEEP      1               /* part of libc in Linux */
++#  define HAVE_NANOSLEEP      1               /* moved from librt to libc in 
S11 */
 +#  define SOCKADDR_LEN_T      socklen_t       /* arg#3 to accept, getsockname 
*/
 +#  define SOCKOPT_LEN_T               socklen_t       /* arg#5 to getsockopt 
*/
  #  ifndef HASGETUSERSHELL
@@ -1668,7 +1668,7 @@
                closecontrolsocket(true);
 --- sendmail/domain.c
 +++ sendmail/domain.c  2006-08-10 09:32:28.000000000 +0000
-@@ -889,14 +889,20 @@ cnameloop:
+@@ -870,14 +870,20 @@ cnameloop:
                if (qtype == initial)
                        gotmx = false;
                if (tTd(8, 5))
@@ -1693,7 +1693,7 @@
                                      answer.qb2, sizeof(answer.qb2));
 --- sendmail/readcf.c
 +++ sendmail/readcf.c  2006-08-10 09:32:28.000000000 +0000
-@@ -1561,15 +1561,20 @@ makemailer(line)
+@@ -1570,15 +1570,20 @@ makemailer(line)
  #endif /* NETUNIX */
                    )
                {
@@ -1955,8 +1955,8 @@
  .SH SEE ALSO
  sendmail(8)
 --- suse/Makefile
-+++ suse/Makefile      2006-08-10 09:32:29.000000000 +0000
-@@ -0,0 +1,55 @@
++++ suse/Makefile      2011-08-12 09:41:30.792460792 +0000
+@@ -0,0 +1,57 @@
 +#
 +# Rebuild databases of sendmail
 +#
@@ -2012,6 +2012,8 @@
 +      makemap $(CONF) btree $(NOFOLD) $@ < $<
 +      test -e $@ && touch $@
 +      chmod --reference=$< $@
++
++#
 --- suse/NOTICE
 +++ suse/NOTICE        2006-08-10 09:32:29.000000000 +0000
 @@ -0,0 +1,11 @@
@@ -2026,6 +2028,59 @@
 +separator and therefore forwards it to the mail hub which in turns relays it 
because it
 +came from a trusted local host. So if a mailserver allows UUCP (bang-format) 
addresses,
 +all systems from which it allows relaying should do the same. 
+--- suse/README.SuSE
++++ suse/README.SuSE   2006-08-10 09:32:29.000000000 +0000
+@@ -0,0 +1,50 @@
++Copyright (c) 2000-2002 SuSE GmbH Nuernberg, Germany.
++Copyright (c) 2006 SuSE LINUX Products GmbH, Germany.
++
++   Changes of sendmail for SuSE Linux
++   ==================================
++
++One major change is the OS type which is chosen to be
++
++  suse-linux
++
++to see, what configuration is used just read
++
++  /usr/share/sendmail/ostype/suse-linux.m4
++
++As you can see in that file, the privacy flags are set to:
++
++  authwarnings,needmailhelo,novrfy,noexpn,noverb
++
++Service providers who use ETRN feature on port 25 should
++use /etc/mail/linux.mc to overwrite this. Read linux.mc
++carefully, change, enable, or disable the configuration
++therein to fit your needs.  For instance if you need
++a MSA (Mail Submission Agent) daemon you could re-enable
++it in /etc/mail/linux.mc.
++
++If you use your own configuration remember to set
++
++  MAIL_CREATE_CONFIG="no"
++
++within
++
++  /etc/sysconfig/mail
++
++and generate your own sendmail.cf by
++
++  m4 < /etc/mail/linux.mc > /etc/sendmail.cf
++
++and your own /etc/mail/submit.cf by
++
++  m4 < /etc/mail/linux.submit.mc > /etc/mail/submit.cf
++
++Before you're doing this you may edit linux.mc and
++linux.submit.mc to fit your needs and configuration.
++
++After restarting sendmail your configuration is activated.
++
++For more information read /etc/mail/README.
++
++
++       Your SuSE team
 --- suse/README
 +++ suse/README        2006-08-10 09:32:29.000000000 +0000
 @@ -0,0 +1,264 @@
@@ -2293,59 +2348,6 @@
 +  Use a "temporary failure, please try again" so that email is not lost
 +  if we cannot get the DNS data due to network problems.
 +
---- suse/README.SuSE
-+++ suse/README.SuSE   2006-08-10 09:32:29.000000000 +0000
-@@ -0,0 +1,50 @@
-+Copyright (c) 2000-2002 SuSE GmbH Nuernberg, Germany.
-+Copyright (c) 2006 SuSE LINUX Products GmbH, Germany.
-+
-+   Changes of sendmail for SuSE Linux
-+   ==================================
-+
-+One major change is the OS type which is chosen to be
-+
-+  suse-linux
-+
-+to see, what configuration is used just read
-+
-+  /usr/share/sendmail/ostype/suse-linux.m4
-+
-+As you can see in that file, the privacy flags are set to:
-+
-+  authwarnings,needmailhelo,novrfy,noexpn,noverb
-+
-+Service providers who use ETRN feature on port 25 should
-+use /etc/mail/linux.mc to overwrite this. Read linux.mc
-+carefully, change, enable, or disable the configuration
-+therein to fit your needs.  For instance if you need
-+a MSA (Mail Submission Agent) daemon you could re-enable
-+it in /etc/mail/linux.mc.
-+
-+If you use your own configuration remember to set
-+
-+  MAIL_CREATE_CONFIG="no"
-+
-+within
-+
-+  /etc/sysconfig/mail
-+
-+and generate your own sendmail.cf by
-+
-+  m4 < /etc/mail/linux.mc > /etc/sendmail.cf
-+
-+and your own /etc/mail/submit.cf by
-+
-+  m4 < /etc/mail/linux.submit.mc > /etc/mail/submit.cf
-+
-+Before you're doing this you may edit linux.mc and
-+linux.submit.mc to fit your needs and configuration.
-+
-+After restarting sendmail your configuration is activated.
-+
-+For more information read /etc/mail/README.
-+
-+
-+       Your SuSE team
 --- suse/SuSEconfig.sendmail
 +++ suse/SuSEconfig.sendmail   2008-02-20 17:58:13.000000000 +0000
 @@ -0,0 +1,472 @@
@@ -3552,6 +3554,40 @@
 +# send all email for a specific host to one local user called "foo":
 +#host.sub.org         local:foo
 +#
+--- suse/messages/sendmail-local-only.de
++++ suse/messages/sendmail-local-only.de       2006-08-10 09:32:29.000000000 
+0000
+@@ -0,0 +1,14 @@
++Hallo,
++
++sendmail lauscht nur an Port 25 von localhost. Falls Sie einen
++Mailserver betreiben m�chten, m�ssen Sie die Variable
++SMTPD_LISTEN_REMOTE in /etc/sysconfig/mail auf "yes" setzen
++und sendmail mit
++
++   rcsendmail restart
++
++neu starten.
++
++Have a lot of fun...
++
++                        Your SuSE Team
+--- suse/messages/sendmail-local-only.en
++++ suse/messages/sendmail-local-only.en       2006-08-10 09:32:29.000000000 
+0000
+@@ -0,0 +1,14 @@
++Hello,
++
++by default sendmail is listening on port 25 of localhost only.
++If you want to setup a mail server you have to enable the
++port 25 externally by setting the variable SMTPD_LISTEN_REMOTE
++to "yes" in /etc/sysconfig/mail and restart sendmail with
++
++    rcsendmail restart
++
++on the command line.
++
++Have a lot of fun...
++
++                        Your SuSE Team
 --- suse/permissions
 +++ suse/permissions   2006-08-10 09:32:29.000000000 +0000
 @@ -0,0 +1,12 @@
@@ -3583,8 +3619,8 @@
 +/usr/lib/sendmail.d/bin/mail.local    root:root       0511
 +/var/run/sendmail/                    root:root       1750
 --- suse/rc
-+++ suse/rc    2010-07-16 15:19:29.563424975 +0000
-@@ -0,0 +1,133 @@
++++ suse/rc    2011-08-04 13:37:56.508426105 +0000
+@@ -0,0 +1,135 @@
 +#! /bin/sh
 +# Copyright (c) 1996-2002 SuSE Gmbh Nuernberg, Germany.
 +# Copyright (c) 2006-2008 SuSE LINUX Products GmbH, Germany.
@@ -3666,6 +3702,8 @@
 +case "$1" in
 +    start)
 +      echo -n "Initializing SMTP port (sendmail)"
++      test -d /var/run          || mkdir --mode 0755 /var/run
++      test -d /var/run/sendmail || mkdir --mode 1750 /var/run/sendmail
 +      startproc -p $srvpid -i $msppid /usr/sbin/sendmail $SENDMAIL_ARGS
 +      rc_status && \
 +      poll25
@@ -4626,40 +4664,6 @@
 +#            ^^^^^^^^^^^
 +#     (these are <TAB> stops)
 +#
---- suse/messages/sendmail-local-only.de
-+++ suse/messages/sendmail-local-only.de       2006-08-10 09:32:29.000000000 
+0000
-@@ -0,0 +1,14 @@
-+Hallo,
-+
-+sendmail lauscht nur an Port 25 von localhost. Falls Sie einen
-+Mailserver betreiben m�chten, m�ssen Sie die Variable
-+SMTPD_LISTEN_REMOTE in /etc/sysconfig/mail auf "yes" setzen
-+und sendmail mit
-+
-+   rcsendmail restart
-+
-+neu starten.
-+
-+Have a lot of fun...
-+
-+                        Your SuSE Team
---- suse/messages/sendmail-local-only.en
-+++ suse/messages/sendmail-local-only.en       2006-08-10 09:32:29.000000000 
+0000
-@@ -0,0 +1,14 @@
-+Hello,
-+
-+by default sendmail is listening on port 25 of localhost only.
-+If you want to setup a mail server you have to enable the
-+port 25 externally by setting the variable SMTPD_LISTEN_REMOTE
-+to "yes" in /etc/sysconfig/mail and restart sendmail with
-+
-+    rcsendmail restart
-+
-+on the command line.
-+
-+Have a lot of fun...
-+
-+                        Your SuSE Team
 --- vacation/vacation.c
 +++ vacation/vacation.c        2006-08-10 09:32:29.000000000 +0000
 @@ -699,6 +699,7 @@ junkmail(from)

++++++ sendmail-client.path ++++++
# This file is part of package sendmail.
#
# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany.
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback
#
# Description:
#
#  Watch out if any mail will be stored below the
#  directory /var/spool/clientmqueue/ and start the
#  sendmail client service if any.
#

[Unit]
Description=Sendmail Client Mail Queue Watcher
Before=mail-transfer-agent.target

[Path]
DirectoryNotEmpty=/var/spool/clientmqueue

[Install]
WantedBy=multi-user.target
++++++ sendmail-client.service ++++++
# This file is part of package sendmail.
#
# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany.
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback
#
# Description:
#
#  Used to start the sendmail Mail Transport Client service
#  which handles all mails stored at /var/spool/clientmqueue/
#

[Unit]
Description=Sendmail Mail Transport Client
Requires=sendmail.service
After=sendmail.service
Before=mail-transfer-agent.target
ConditionDirectoryNotEmpty=|/var/spool/clientmqueue

[Service]
Type=forking
PIDFile=/var/spool/clientmqueue/sm-client.pid
ExecStartPre=-/etc/mail/system/sm-client.pre
Environment=SENDMAIL_CLIENT_ARGS=-L sendmail-client -Ac -qp30m
EnvironmentFile=-/etc/sysconfig/mail
EnvironmentFile=-/etc/sysconfig/sendmail
ExecStart=/usr/sbin/sendmail $SENDMAIL_CLIENT_ARGS

[Install]
WantedBy=multi-user.target
++++++ sendmail-client.systemd ++++++
#!/bin/bash
#
# /etc/mail/system/sm-client.pre
#
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback/
#
# Description:
#
#   Helper script to set up the environment for sendmail
#   Mail Transport Client if started by systemd
#
 
pidfile=/var/spool/clientmqueue/sm-client.pid

typeset -i timeout=1000
typeset -i port=25

for cfg in /etc/sendmail.cf /etc/mail/sendmail.cf ; do
    test -s $cfg && break
done
for sed in /bin/sed /usr/bin/sed ; do
    test -x $sed && break
done
for fuser in /bin/fuser /usr/bin/fuser ; do
    test -x $fuser && break
done
for usleep in /bin/usleep /usr/bin/usleep ; do
    test -x $usleep && break
done

#
# Make sure that configuration is uptodate
#
if test -x /usr/bin/make ; then
    /usr/bin/make -C /etc/mail > /dev/null 2>&1
fi

#
# Create /var/run/sendmail if not exit
#
test -d /var/run            || /bin/mkdir --mode 0755 /var/run
test -d /var/run/sendmail   || /bin/mkdir --mode 1750 /var/run/sendmail

#
# Some default permissions
#
/bin/touch              $pidfile
/bin/chown mail:mail    $pidfile
/bin/chmod 0600         $pidfile

#
# Check for DaemonPortOptions
#
PortOpts=$($sed -rn '/^O[[:blank:]]+DaemonPortOptions=.*Name=MTA.*$/I {
                s/[[:blank:]]+//g
                s/^O[^=]+=(.*)/\1/p
            }' $cfg)

#
# Seek for port beside 25 aka smtp
#
for opt in ${PortOpts//,/ } ; do
    case "${opt%=*}" in
    [Pp]ort) port=${opt#*=}
    esac
done
unset opt

#
# Now wait that sendmail MTA is becoming ready
#
while ! $fuser -sn tcp $port > /dev/null 2>&1 ; do
    ((timeout-- <= 0)) && break
    $usleep 10000
done

#
# end of /etc/mail/system/sm-client.pre
++++++ sendmail-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.i3YSOd/_old  2011-08-15 09:54:12.000000000 +0200
+++ /var/tmp/diff_new_pack.i3YSOd/_new  2011-08-15 09:54:12.000000000 +0200
@@ -1,6 +1,12 @@
 addFilter(".*hidden-file-or-dir.*/var/spool/mqueue/\.hoststat.*")
 addFilter(".*executable-sourced-script.*/sbin/conf\.d/SuSEconfig\.sendmail.*")
 
addFilter(".*non-etc-or-var-file-marked-as-conffile.*/sbin/conf\.d/SuSEconfig\.sendmail.*")
+addFilter(".*non-etc-or-var-file-marked-as-conffile.*/lib/systemd/system/.*")
 
addFilter(".*sourced-script-with-shebang.*/sbin/conf\.d/SuSEconfig\.sendmail.*")
 addFilter(".*zero-length.*/var/spool/clientmqueue/sm-client\.st.*")
 addFilter(".*zero-length.*/var/lib/sendmail/statistics.*")
+addFilter(".*no-manual-page-for-binary.*hoststat.*")
+addFilter(".*no-manual-page-for-binary.*rcsendmail.*")
+addFilter(".*no-manual-page-for-binary.*purgestat.*")
+addFilter(".*no-manual-page-for-binary.*sendmail.nissl.*")
+addFilter(".*macro-in-comment.*")

++++++ sendmail.service ++++++
# This file is part of package sendmail.
#
# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany.
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback
#
# Description:
#
#  Used to start the sendmail Mail Transport Agent service
#  which handles all mails stored at /var/spool/mqueue/ and
#  all connections on port 25 aka smtp at localhost as well
#  as on all other network interfaces.
#

[Unit]
Description=Sendmail Mail Transport Agent
Requires=var-run.mount nss-lookup.target network.target remote-fs.target 
syslog.target time-sync.target
After=var-run.mount nss-lookup.target network.target remote-fs.target 
syslog.target time-sync.target
Wants=amavis.service cyrus.service ldap.service nscd.service ypbind.service 
sendmail-client.service
After=amavis.service cyrus.service ldap.service nscd.service ypbind.service
Before=sendmail-client.service mail-transfer-agent.target
Conflicts=postfix.service exim.service

[Service]
Type=forking
PIDFile=/var/run/sendmail.pid
ExecStartPre=-/bin/echo 'Initializing SMTP port (sendmail)'
ExecStartPre=-/etc/mail/system/sm.pre
Environment=SENDMAIL_ARGS=-L sendmail -Am -bd -q30m -om
Environment=SENDMAIL_PORT_OPTS=
EnvironmentFile=-/etc/sysconfig/mail
EnvironmentFile=-/etc/sysconfig/sendmail
EnvironmentFile=-/var/run/sendmail/port
ExecStart=/usr/sbin/sendmail $SENDMAIL_PORT_OPTS $SENDMAIL_ARGS

[Install]
WantedBy=multi-user.target
++++++ sendmail.systemd ++++++
#!/bin/bash
#
# /etc/mail/system/sm.pre
#
# Author: Werner Fink
# Please send feedback to http://www.suse.de/feedback/
#
# Description:
#
#   Helper script to set up the environment for sendmail
#   Mail Transport Agent (MTA) if started by systemd
#

sysconf=/etc/sysconfig/mail
   port=/var/run/sendmail/port

for cfg in /etc/sendmail.cf /etc/mail/sendmail.cf ; do
    test -s $cfg && break
done
for sed in /bin/sed /usr/bin/sed ; do
    test -x $sed && break
done

#
# Make sure that configuration is uptodate
#
if test -x /usr/bin/make ; then
    /usr/bin/make -C /etc/mail > /dev/null 2>&1
fi

#
# Create /var/run/sendmail if not exit
#
test -d /var/run            || /bin/mkdir --mode 0755 /var/run
test -d /var/run/sendmail   || /bin/mkdir --mode 1750 /var/run/sendmail

#
# Handle SMTPD_LISTEN_REMOTE from /etc/sysconfig/sendmail
# that is write out environment file to be read by the
# systemd service unit file for sendmail MTA.
#
if test ! -s $port -o $cfg -nt $port -o $sysconf -nt $port ; then
    . $sysconf
    umask 066
    if test "$SMTPD_LISTEN_REMOTE" != "yes" ; then
        PortOpts=$($sed -rn '/^O[[:blank:]]+DaemonPortOptions=.*Name=MTA.*$/I {
                        s/[[:blank:]]+//g
                        s/^O[^=]+=(.*)/\1/p
                    }' $cfg)
        PortOpts="${PortOpts:+${PortOpts},}Addr=127.0.0.1"
        echo SENDMAIL_PORT_OPTS="\"-O DaemonPortOptions=${PortOpts}\""
    else
        echo SENDMAIL_PORT_OPTS="\"\""
    fi  > $port
    
fi

#
# end of /etc/mail/system/sm.pre

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to