Sync changes to SLFO-1.2 branch

add -std=gnu11 to compiler flags, to fix gcc15 compile time error, and to still allow build on Leap 15.6 (forwarded request 1267987 from hsk17)

OBS-URL: https://build.opensuse.org/request/show/1268036
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sendmail?expand=0&rev=128

sendmail-rpmlintrc

@@ -10,5 +10,9 @@ addFilter(".*binary-or-shlib-calls-gethostbyname.*")
 addFilter(".*explicit-lib-dependency.*libmilter1_0.*")
 addFilter(".*standard-dir-owned-by-package.*/var/spool/mail.*")
 addFilter(".*E:.*obsolete-suse-version-check.*")
-addFilter(".*E:.*filelist-forbidden-fhs23.*/var/mail.*")
+addFilter(".*[WE]:.*filelist-forbidden-fhs23.*/var/mail.*")
 addFilter(".*E:.*explicit-lib-dependency.*libnss_usrfiles2.*")
+addFilter(".*sendmail-devel.*:.*W:.*no-dependency-on.*sendmail\*/sendmail-libs/libsendmail\*.*")
+addFilter(".*W:.*no-version-in-last-changelog.*")
+addFilter(".*W:.*permissions-missing-verifyscript.*")
+addFilter(".*W:.*no-%check-section.*")

sendmail.8.18.1-reproducibleuname.patch

@@ -0,0 +1,12 @@
+Index: sendmail-8.18.1/devtools/bin/Build
+===================================================================
+--- sendmail-8.18.1.orig/devtools/bin/Build
++++ sendmail-8.18.1/devtools/bin/Build
+@@ -325,6 +325,7 @@ then
+ 	arch=`uname -m | sed -e 's/ //g' -e 's/\//-/g'`
+ 	os=`uname -s | sed -e 's/\//-/g' -e 's/ //g'`
+ 	rel=`uname -r | sed -e 's/(/-/g' -e 's/)//g' -e 's/ //g'`
++	rel=6.12
+ fi
+ 
+ #

sendmail.changes

@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Mon Jul  7 09:39:00 UTC 2025 - Marcus Meissner <meissner@suse.com>
+
+- ran /usr/lib/obs/service/source_validators/helpers/fix_changelog
+  to fixup changes to current standard.
+
+-------------------------------------------------------------------
+Tue Apr  8 20:30:53 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- add -std=gnu11 to compiler flags, to fix gcc15 compile time
+  error, and to still allow build on Leap 15.6
+
+-------------------------------------------------------------------
+Mon Mar 17 14:24:06 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Update keyring 
+
+-------------------------------------------------------------------
+Wed Feb 12 11:42:54 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Skip /var/spool/mail/ from  permissons files of sendmail (boo#1236847)
+- Handle Leap 16.0 similar to TW
+
+-------------------------------------------------------------------
+Thu Feb  6 09:23:52 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Avoid rpmlint warning 
+
+-------------------------------------------------------------------
+Thu Feb  6 07:38:18 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Skip sysvinit 
+
+-------------------------------------------------------------------
+Tue Jan 28 10:33:28 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Allow libmilter to be installed without local MTA as it can be
+  used with a remote MTA as well
+
+-------------------------------------------------------------------
+Tue Jan 28 09:22:40 UTC 2025 - Marcus Meissner <meissner@suse.com>
+
+- reduce requires smtp_daemon to recommends, to allow e.g. smaller
+  clamav footprints.
+
+-------------------------------------------------------------------
+Tue Dec 17 12:20:45 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add sendmail.8.18.1-reproducibleuname.patch to not embed
+  the build machine's kernel version in debuginfo (boo#1234629)
+
 -------------------------------------------------------------------
 Mon Feb 26 13:07:48 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
@@ -2382,8 +2433,8 @@ Wed Sep 27 14:25:56 CEST 2000 - werner@suse.de
 
 - Fix VERSIONID format handling
 
--------------------------------------------------------------------
 
+-------------------------------------------------------------------
 Mon Sep 11 14:43:42 CEST 2000 - werner@suse.de
 
 - Fix some typos in README.SuSE (Thanks to Pavel Janik)
@@ -2531,7 +2582,7 @@ Fri Nov  5 15:16:55 CET 1999 - schwab@suse.de
 - Fix typo in %post
 
 -------------------------------------------------------------------
-Wed Nov  3 18:52:30 CET 1999 - werner@suse.de
+Wed Nov  3 18:52:31 CET 1999 - werner@suse.de
 
 - Workaround for fillup kludge
 
@@ -2775,24 +2826,24 @@ Fri Jan 16 11:43:26 MET 1998 - bs@suse.de
 - minor bugfix in /sbin/conf.d/SuSEconfig.sendmail 
   (exit if no rc.config exists)
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Thu Nov 27 19:32:57 MET 1997 - florian@suse.de
 
 - fix some typos in docu files
 - update to newest version of Anti-Spam support
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Wed Nov 19 12:55:00 MET 1997 - florian@suse.de
 
 - enable NIS support
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Sun Nov 16 23:02:59 MET 1997 - florian@suse.de
 
 - update /etc/mail/README
 
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Mon Oct 27 12:27:38 MET 1997 - florian@suse.de
 
 - update to sendmail 8.8.8
@@ -2804,18 +2855,18 @@ Mon Oct 27 12:27:38 MET 1997 - florian@suse.de
 - sample /etc/mail/linux.mc for complex email setups
 
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Sun Apr 27 15:19:41 CEST 1997 - bs@suse.de
 
 start sendmail in background in sbin/init.d/sendmail
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Thu Feb 27 12:30:11 CET 1997 - bs@suse.de
 
 
 added alias faxmaster
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Wed Jan 22 22:24:11 CET 1997 - florian@suse.de
 
 
@@ -2826,17 +2877,17 @@ Wed Jan 22 22:24:11 CET 1997 - florian@suse.de
 - add slightly better /etc/aliases
 
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Tue Dec  3 16:07:28 CET 1996 - florian@suse.de
 
 - update to 8.8.4 (due to a security hole)
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Mon Nov 18 13:45:34 CET 1996 - florian@suse.de
 
 - update to 8.8.3 (due to a big security hole)
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Thu Oct 17 16:05:09 CEST 1996 - florian@suse.de
 
 
@@ -2847,21 +2898,21 @@ Thu Oct 17 16:05:09 CEST 1996 - florian@suse.de
 
 
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Tue Sep 24 11:58:15 MET DST 1996 - florian@suse.de
 
 
 - added two small patches from Eric Allman(?)
 
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Sat Sep 21 01:18:40 MET DST 1996 - florian@suse.de
 
 
 - update to newer version
 
 
-----------------------------------------------------------------------------
+-------------------------------------------------------------------
 Tue Sep  3 16:43:00 MET DST 1996 - florian@suse.de
 
 

sendmail.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sendmail
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,14 +21,6 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-#
-# sysvinit -- build for SysVinit and not for systemd
-#
-%if 0%{?suse_version} > 1140
-%bcond_with     sysvinit
-%else
-%bcond_without  sysvinit
-%endif
 %define libmilter_somajor 1
 %define libmilter_sominor 0
 %define libmilter_sopatch 1
@@ -60,13 +52,11 @@ BuildRequires:  mailx
 BuildRequires:  netcfg
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
-%if 0%{?suse_version} >= 1699
+%if 0%{?suse_version} >= 1600
 BuildRequires:  permissions-config
 %endif
+BuildRequires:  permissions
 BuildRequires:  procmail
-%if %{with sysvinit}
-Requires(pre):  sysvinit(network)
-%endif
 BuildRequires:  tcpd-devel
 BuildRequires:  vacation
 URL:            http://www.sendmail.org/
@@ -88,16 +78,17 @@ Requires:       procmail
 %if 0%{?suse_version} <= 1140
 Requires(pre):  %insserv_prereq
 Requires(post): %insserv_prereq
-Requires(postun):%insserv_prereq
+Requires(postun): %insserv_prereq
 %endif
 %if 0%{?suse_version} >= 1330
 Requires(pre):  group(daemon)
 Requires(pre):  user(daemon)
 Requires(pre):  group(mail)
 Requires(pre):  user(mail)
-%if 0%{?suse_version} >= 1699
+%if 0%{?suse_version} >= 1600
 Requires(pre):  permissions-config
 %endif
+Requires(pre):  permissions
 Requires(post): group(mail)
 Requires(post): user(mail)
 %endif
@@ -110,19 +101,19 @@ Requires(post): permissions
 Requires(post): sed
 Requires(post): /usr/bin/openssl
 Requires(post): /usr/bin/timeout
-Requires(posttrans):ca-certificates
-Requires(posttrans):coreutils
-Requires(posttrans):findutils
-Requires(posttrans):permissions
-Requires(posttrans):m4
-Requires(posttrans):sed
-Requires(posttrans):/usr/bin/openssl
-Requires(posttrans):/usr/bin/timeout
+Requires(posttrans): ca-certificates
+Requires(posttrans): coreutils
+Requires(posttrans): findutils
+Requires(posttrans): permissions
+Requires(posttrans): m4
+Requires(posttrans): sed
+Requires(posttrans): /usr/bin/openssl
+Requires(posttrans): /usr/bin/timeout
 %if 0%{?suse_version} >= 1330
-Requires(verify):group(mail)
-Requires(verify):user(mail)
+Requires(verify): group(mail)
+Requires(verify): user(mail)
 %endif
-Requires(verify):permissions
+Requires(verify): permissions
 %{?systemd_ordering}
 Conflicts:      postfix
 Conflicts:      postfix-tls
@@ -154,6 +145,7 @@ Patch4:         sendmail-8.14.8-m4header.patch
 Patch5:         sendmail-fd-passing-libmilter.patch
 # PATCH-FIX-OPENSUSE: make build result reproducible
 Patch8:         sendmail-8.15.2-reproducible.patch
+Patch9:         sendmail.8.18.1-reproducibleuname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir	%{_sysconfdir}
 %global         _mailcnfdir	%{_sysconfdir}/mail
@@ -186,9 +178,10 @@ access sendmail features.
 
 %package -n libmilter%{libmilter_somajor}_%{libmilter_sominor}
 Summary:        BSD Sendmail Content Management API (milter)
-# To be exact: a MTA with libmilter support *is* required
 Group:          System/Libraries
-Requires:       smtp_daemon
+# To be exact: a MTA with libmilter support *is* required (but also a remote one)
+Suggests:       smtp_daemon
+Suggests:       libmilter-doc
 
 %description -n libmilter%{libmilter_somajor}_%{libmilter_sominor}
 Sendmail's Content Management API (milter) provides third-party programs to
@@ -250,16 +243,13 @@ processed mail on to the MTA (e.g. sendmail).
 %patch -P 5 -p1 -b .fdmilt
 %patch -P 0 -p0 -b .p0
 %patch -P 8 -p1 -b .reproducible
+%patch -P 9 -p1 -b .reproducibleuname
     tar --strip-components=1 -xf %{S:1}
     set -f
     cat <<-EOF > file-list
 	%%defattr(-,root,root)
-%if %{with sysvinit}
-	%%ghost %%dir %%attr(1750,root,root)   %{_localstatedir}/run/sendmail/
-%else
 	%%dir %{_tmpfilesdir}/
 	%{_tmpfilesdir}/sendmail.conf
-%endif
 	%%dir    %%attr(0750,root,root)        %{_localstatedir}/lib/sendmail/
 	%%attr(0600,root,root)                 %{_localstatedir}/lib/sendmail/statistics
 	%%attr(0600,root,root)                 %{_mailcnfdir}/statistics
@@ -268,7 +258,7 @@ processed mail on to the MTA (e.g. sendmail).
 	# Part of filesystem RPM
 	# %%dir    %%attr(0770,root,mail)      %{_localstatedir}/spool/clientmqueue/
 	%%attr(0660,root,mail)                 %{_localstatedir}/spool/clientmqueue/sm-client.st
-%if 0%{?suse_version} >= 1699
+%if 0%{?suse_version} >= 1600
 	%%attr(0755,root,root)        %{_datadir}/permissions/permissions.d/
 	%%attr(0644,root,root)        %{_datadir}/permissions/permissions.d/sendmail
 	%%attr(0644,root,root)        %{_datadir}/permissions/permissions.d/sendmail.paranoid
@@ -290,15 +280,11 @@ processed mail on to the MTA (e.g. sendmail).
 	EOF
     set +f
 
-%if %{with sysvinit}
-    sed -ri '/SMTPUTF8/,/-licuuc/d' devtools/Site/site.config.m4
-%endif
-
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
     #
     ID=$(id -u)
-    RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing -D_GNU_SOURCE"
+    RPM_OPT_FLAGS="%{optflags} -std=gnu11 -fno-strict-aliasing -D_GNU_SOURCE"
     ARCH_LIB=%{_lib}
     export ARCH_LIB
     gcc $RPM_OPT_FLAGS -I./include -o milterversion milterversion.c
@@ -349,9 +335,6 @@ processed mail on to the MTA (e.g. sendmail).
     mkdir -p %{buildroot}%{_mailcnfdir}/certs/newcerts
     mkdir -p %{buildroot}%{_mailcnfdir}/certs/scripts
     mkdir -p %{buildroot}%{_mailcnfdir}/auth
-%if %{with sysvinit}
-    mkdir -p %{buildroot}%{_sysconfdir}/init.d
-%endif
 
 %if 0%{?suse_version} > 1500
     mkdir -p %{buildroot}%{_pam_vendordir}
@@ -365,7 +348,7 @@ processed mail on to the MTA (e.g. sendmail).
     mkdir -p %{buildroot}%{_includedir}/sm/os
     chmod 0750 %{buildroot}%{_mailcnfdir}/certs
     chmod 0750 %{buildroot}%{_mailcnfdir}/auth
-%if 0%{?suse_version} >= 1699
+%if 0%{?suse_version} >= 1600
     mkdir -p %{buildroot}%{_datadir}/permissions/permissions.d
 %else
     mkdir -p %{buildroot}%{_sysconfdir}/permissions.d
@@ -376,12 +359,10 @@ processed mail on to the MTA (e.g. sendmail).
     mkdir -p %{buildroot}%{_fillupdir}
     mkdir -p %{buildroot}/var/spool/mail
     ln -s spool/mail %{buildroot}/var/mail
-%if %{without sysvinit}
     mkdir -p %{buildroot}%{_unitdir}
     mkdir -p %{buildroot}%{_mailcnfdir}/system
     chmod 0755 %{buildroot}%{_mailcnfdir}/system
     mkdir -p %{buildroot}%{_tmpfilesdir}
-%endif
     make \
 	DESTDIR=%{buildroot} \
 	SUBDIRS="%{SUBDIRS}" \
@@ -411,10 +392,6 @@ processed mail on to the MTA (e.g. sendmail).
     chown -R root:root %{buildroot}%{_localstatedir}/spool/mqueue
     chmod 0700         %{buildroot}%{_localstatedir}/spool/mqueue
     chmod 0700         %{buildroot}%{_localstatedir}/spool/mqueue/.hoststat
-%if %{with sysvinit}
-    mkdir -p           %{buildroot}%{_localstatedir}/run/sendmail
-    chmod 1750         %{buildroot}%{_localstatedir}/run/sendmail
-%endif
     mkdir -p           %{buildroot}%{_localstatedir}/lib/sendmail
     chmod 0750         %{buildroot}%{_localstatedir}/lib/sendmail
     touch              %{buildroot}%{_localstatedir}/lib/sendmail/statistics
@@ -487,23 +464,21 @@ processed mail on to the MTA (e.g. sendmail).
 		    local-host-names %{buildroot}%{_mailcnfdir}/
     install -m 0600 auth-info %{buildroot}%{_mailcnfdir}/auth/
     install -m 0755 sendmail.nissl %{buildroot}%{_sbindir}/
-%if 0%{?suse_version} >= 1699
+echo XXXXX %suse_version
+%if 0%{?suse_version} >= 1600
+    mkdir -p %{buildroot}%{_datadir}/permissions/permissions.d
     install -m 0644 permissions %{buildroot}%{_datadir}/permissions/permissions.d/sendmail
     install -m 0644 permissions.paranoid %{buildroot}%{_datadir}/permissions/permissions.d/sendmail.paranoid
 %else
+    mkdir -p %{buildroot}%{_sysconfdir}/permissions.d
     install -m 0644 permissions %{buildroot}%{_sysconfdir}/permissions.d/sendmail
     install -m 0644 permissions.paranoid %{buildroot}%{_sysconfdir}/permissions.d/sendmail.paranoid
+    test -d /var/spool/mail/ || exit 1
+    test 1777 = "$(stat --printf='%a' /var/spool/mail/)" || exit 1
 %endif
-%if %{with sysvinit}
-    install -m 0755 rc   %{buildroot}%{_sysconfdir}/init.d/sendmail
-    sed -ri 's|@@EXECPREFIX@@|%{_libexecdir}|' %{buildroot}%{_sysconfdir}/permissions.d/sendmail
-    sed -ri 's|@@EXECPREFIX@@|%{_libexecdir}|' %{buildroot}%{_sysconfdir}/permissions.d/sendmail.paranoid
-    sed -ri 's|@@VARRUN@@|%{_localstatedir}/run|' %{buildroot}%{_sysconfdir}/permissions.d/sendmail
-    sed -ri 's|@@VARRUN@@|%{_localstatedir}/run|' %{buildroot}%{_sysconfdir}/permissions.d/sendmail.paranoid
-%else
     mkdir -p %{buildroot}%{_tmpfilesdir}
     install -m 0644 tmpfile %{buildroot}%{_tmpfilesdir}/sendmail.conf
-%if 0%{?suse_version} >= 1699
+%if 0%{?suse_version} >= 1600
     sed -ri '\@/etc/init.d/sendmail@d' %{buildroot}%{_datadir}/permissions/permissions.d/sendmail
     sed -ri '\@/etc/init.d/sendmail@d' %{buildroot}%{_datadir}/permissions/permissions.d/sendmail.paranoid
     sed -ri 's|@@EXECPREFIX@@|%{_libexecdir}|' %{buildroot}%{_datadir}/permissions/permissions.d/sendmail
@@ -518,7 +493,6 @@ processed mail on to the MTA (e.g. sendmail).
     sed -ri '\|@@VARRUN@@|d' %{buildroot}%{_sysconfdir}/permissions.d/sendmail
     sed -ri '\|@@VARRUN@@|d' %{buildroot}%{_sysconfdir}/permissions.d/sendmail.paranoid
 %endif
-%endif
 %if 0%{?suse_version} > 1500
     install -m 0644 smtp %{buildroot}%{_pam_vendordir}/smtp
 %else
@@ -566,12 +540,8 @@ processed mail on to the MTA (e.g. sendmail).
 	chmod 0644 %{_sysconfdir}/sendmail.cf
 	chmod 0644 %{_mailcnfdir}/submit.cf
     fi
-%if %{with sysvinit}
-    ln -sf %{_sysconfdir}/init.d/sendmail %{buildroot}%{_sbindir}/rcsendmail
-%else
     ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsendmail
     ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsendmail-client
-%endif
     ln -sf ../aliases  %{buildroot}%{_mailcnfdir}/aliases
     pushd %{buildroot}%{_mailcnfdir}/
 	OPATH=$PATH
@@ -579,7 +549,6 @@ processed mail on to the MTA (e.g. sendmail).
 	make DESTDIR=%{buildroot} short
 	PATH=$OPATH
     popd
-%if %{without sysvinit}
     #
     # systemd unit conf files
     install -m 0644 %{S:3} %{buildroot}%{_unitdir}/
@@ -587,7 +556,6 @@ processed mail on to the MTA (e.g. sendmail).
     install -m 0644 %{S:5} %{buildroot}%{_unitdir}/
     install -m 0755 %{S:6} %{buildroot}%{_mailcnfdir}/system/sm-client.pre
     install -m 0644 %{S:7} %{buildroot}%{_tmpfilesdir}/sendmail.conf
-%endif
     #
     # Documentation for libmilter
     #
@@ -606,20 +574,16 @@ processed mail on to the MTA (e.g. sendmail).
 
 %if %{defined verify_permissions}
 %verifyscript
-%if %{with sysvinit}
-%verify_permissions -e %{_localstatedir}/run/sendmail
+%verify_permissions -e %{_localstatedir}/spool/clientmqueue/
+%if 0%{?suse_version} < 1600
+%verify_permissions -e %{_localstatedir}/spool/mail/
 %endif
-%verify_permissions -e %{_localstatedir}/spool/clientmqueue
-%verify_permissions -e %{_localstatedir}/spool/mqueue
+%verify_permissions -e %{_localstatedir}/spool/mqueue/
 %verify_permissions -e %{_sysconfdir}/sendmail.cf
-%if %{with sysvinit}
-%verify_permissions -e %{_sysconfdir}/init.d/sendmail
-%else
-%verify_permissions -e %{_mailcnfdir}/system
-%endif
-%verify_permissions -e %{_mailcnfdir}/auth
-%verify_permissions -e %{_mailcnfdir}/certs
-%verify_permissions -e %{_libexecdir}/sendmail.d/bin
+%verify_permissions -e %{_mailcnfdir}/system/
+%verify_permissions -e %{_mailcnfdir}/auth/
+%verify_permissions -e %{_mailcnfdir}/certs/
+%verify_permissions -e %{_libexecdir}/sendmail.d/bin/
 %verify_permissions -e %{_libexecdir}/sendmail.d/bin/mail.local
 %verify_permissions -e %{_libexecdir}/sendmail.d/bin/smrsh
 %verify_permissions -e %{_sbindir}/sendmail
@@ -654,9 +618,6 @@ if test -s /etc/sysconfig/sendmail ; then
   sed -ri '/(SENDMAIL_ARGS|Default:)/{s/-bd/-bD/g}' /etc/sysconfig/sendmail
 fi
 %{fillup_only -an mail}
-%if %{with sysvinit}
-%{fillup_and_insserv -nY sendmail sendmail}
-%else
 %{fillup_only -n sendmail}
 %service_add_post sendmail.service sendmail-client.service sendmail-client.path
 PATH=bin:usr/bin:$PATH
@@ -665,31 +626,24 @@ if type -p systemctl > /dev/null 2>&1 ; then
   systemctl enable sendmail-client.service >/dev/null 2>&1 || :
   systemctl enable sendmail-client.path >/dev/null 2>&1 || :
 fi
-%endif
 %if %{defined set_permissions}
-%if %{with sysvinit}
-%set_permissions %{_localstatedir}/run/sendmail
+%set_permissions %{_localstatedir}/spool/clientmqueue/
+%if 0%{?suse_version} < 1600
+%set_permissions %{_localstatedir}/spool/mail/
 %endif
-%set_permissions %{_localstatedir}/spool/clientmqueue
-%set_permissions %{_localstatedir}/spool/mqueue
+%set_permissions %{_localstatedir}/spool/mqueue/
 %set_permissions %{_sysconfdir}/sendmail.cf
-%if %{with sysvinit}
-%set_permissions %{_sysconfdir}/init.d/sendmail
-%else
-%set_permissions %{_mailcnfdir}/system
-%endif
-%set_permissions %{_mailcnfdir}/auth
-%set_permissions %{_mailcnfdir}/certs
-%set_permissions %{_libexecdir}/sendmail.d/bin
+%set_permissions %{_mailcnfdir}/system/
+%set_permissions %{_mailcnfdir}/auth/
+%set_permissions %{_mailcnfdir}/certs/
+%set_permissions %{_libexecdir}/sendmail.d/bin/
 %set_permissions %{_libexecdir}/sendmail.d/bin/mail.local
 %set_permissions %{_libexecdir}/sendmail.d/bin/smrsh
 %set_permissions %{_sbindir}/sendmail
 %endif
 
 %pre
-%if ! %{with sysvinit}
 %service_add_pre sendmail.service sendmail-client.service sendmail-client.path
-%endif
 %if 0%{?suse_version} > 1500
 # Prepare for migration to /usr/etc; save any old .rpmsave
 for i in pam.d/smtp ; do
@@ -698,25 +652,14 @@ done
 %endif
 
 %preun
-%if %{with sysvinit}
-%{stop_on_removal sendmail}
-%else
 %service_del_preun sendmail.service sendmail-client.service sendmail-client.path
-%endif
 
 %postun
 if test $1 = 0; then
-%if %{with sysvinit}
-    %{restart_on_update sendmail}
-%endif
     rm -rf %{_localstatedir}/lib/sendmail
     exit 0
 fi
-%if ! %{with sysvinit}
 %service_del_postun sendmail.service sendmail-client.service sendmail-client.path
-%else
-%{insserv_cleanup}
-%endif
 
 %posttrans
 if test -x %{_libexecdir}/sendmail.d/update ; then
@@ -739,10 +682,8 @@ done
 # %dir %attr(0750,root,mail) %{_sysconfdir}/aliases.d/
 %dir %attr(0750,root,root) %{_mailcnfdir}/auth/
 %dir %attr(0750,root,root) %{_mailcnfdir}/certs/
-%if %{without sysvinit}
 %dir %attr(0755,root,root) %{_mailcnfdir}/system/
-%ghost /run/sendmail/
-%endif
+%ghost %attr(0750,root,mail) /run/sendmail/
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sendmail.cf
 # %{_sysconfdir}/aliases is part of netcfg
 # %config(noreplace) %{_sysconfdir}/aliases
@@ -778,18 +719,13 @@ done
 %else
 %config %attr(0644,root,root) %{_sysconfdir}/pam.d/smtp
 %endif
-%if %{with sysvinit}
-%config %attr(0744,root,root) %{_sysconfdir}/init.d/sendmail
-%endif
 %attr(0755,root,root) %{_libexecdir}/sendmail.d/update
 %attr(0755,root,root) %{_sbindir}/config.sendmail
-%if %{without sysvinit}
 %config %attr(0644,root,root) %{_unitdir}/sendmail-client.path
 %config %attr(0644,root,root) %{_unitdir}/sendmail.service
 %config %attr(0644,root,root) %{_unitdir}/sendmail-client.service
 %config %attr(0755,root,root) %{_mailcnfdir}/system/sm-client.pre
 %attr(0644,root,root) %{_tmpfilesdir}/sendmail.conf
-%endif
 %{_bindir}/hoststat
 %{_bindir}/mailq
 %{_bindir}/newaliases
@@ -823,7 +759,7 @@ done
 %attr(2555,root,mail) %{_sbindir}/sendmail
 %{_sbindir}/sendmail.nissl
 %{_sbindir}/rcsendmail*
-%if 0%{?suse_version} > 1140
+%if 0%{?suse_version} >= 1600
 %dir %attr(1777,root,root) /var/spool/mail/
 %endif
 /var/mail