Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2018-04-23 15:25:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba" Mon Apr 23 15:25:17 2018 rev:234 rq:597770 version:4.8.0+git.19.f53c6c0aa6f Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2018-04-04 11:13:41.390047468 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2018-04-23 15:25:19.231727533 +0200 @@ -1,0 +2,10 @@ +Wed Apr 11 14:55:09 UTC 2018 - aap...@suse.com + +- Use new foreground execution flags for systemd samba daemons; + (bsc#1088574); (bsc#1071090); (bsc#1065551); + + Add %post scriptlet to clear old sysconfig flags +- Update vendor-files to commit 880b3e7. + + Set samba sysconfig template variables to "" + + Add required daemon flags directly to systemd unit + +------------------------------------------------------------------- Old: ---- vendor-files-git.9c6e2d0.tar.bz2 New: ---- vendor-files-git.880b3e7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.uucyBT/_old 2018-04-23 15:25:21.099659683 +0200 +++ /var/tmp/diff_new_pack.uucyBT/_new 2018-04-23 15:25:21.103659538 +0200 @@ -28,20 +28,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} -%if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} -# SLE15 dropped python2 (bsc#1082139) -# disabling all python things until full python3 port is done -# this removes: -# - contents of package samba-python -# - contents of package libsamba-policy0 -# - contents of package libsamba-policy-devel -# - file libsamba-python-samba4.so from pkg samba-libs -# - file libsamba-net-samba4.so from pkg samba-libs -# - bin & manpage of smbtorture from pkg samba-test -%define with_python 0 -%else %define with_python 1 -%endif %if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} # SLE15 dropped perl-Parse-Yapp @@ -58,7 +45,7 @@ %define build_ceph 1 %endif %endif -%define vendor_files_git_vers git.9c6e2d0 +%define vendor_files_git_vers git.880b3e7 %define talloc_version 2.1.10 %define tevent_version 0.9.34 @@ -67,7 +54,7 @@ %global with_mitkrb5 1 %global with_dc 0 -%if 0%{?suse_version} > 1320 && 0%{?is_opensuse} +%if 0%{?suse_version} > 1320 %ifnarch ppc %global with_dc 1 %endif @@ -1367,6 +1354,19 @@ %post %if 0%{?suse_version} > 1220 + +# bsc#1088574; bsc#1071090; bsc#1065551 +if [ -f %{_unitdir}/smb.service ] && \ + grep -qE '^ExecStart=.*smbd.*foreground.*no-process-group' %{_unitdir}/smb.service && \ + [ -f %{_sysconfdir}/sysconfig/samba ] && \ + grep -q -- '-D' %{_sysconfdir}/sysconfig/samba +then + echo using foreground execution for samba systemd units + echo overwriting samba sysconfig to remove daemon related flags... + sed -i 's/-D *//g' %{_sysconfdir}/sysconfig/samba + sed -i 's/-F *//g' %{_sysconfdir}/sysconfig/samba +fi + %if %{with_dc} %service_add_post nmb.service smb.service samba-ad-dc.service %else ++++++ vendor-files-git.9c6e2d0.tar.bz2 -> vendor-files-git.880b3e7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.9c6e2d0/systemd/nmb.service new/vendor-files-git.880b3e7/systemd/nmb.service --- old/vendor-files-git.9c6e2d0/systemd/nmb.service 2018-03-07 16:27:52.000000000 +0100 +++ new/vendor-files-git.880b3e7/systemd/nmb.service 2018-04-11 18:30:07.000000000 +0200 @@ -7,7 +7,7 @@ NotifyAccess=all Environment=KRB5CCNAME=/run/samba/krb5cc_samba EnvironmentFile=-/etc/sysconfig/samba -ExecStart=/usr/sbin/nmbd $NMBDOPTIONS +ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.9c6e2d0/systemd/smb.service new/vendor-files-git.880b3e7/systemd/smb.service --- old/vendor-files-git.9c6e2d0/systemd/smb.service 2018-03-07 16:27:52.000000000 +0100 +++ new/vendor-files-git.880b3e7/systemd/smb.service 2018-04-11 18:30:07.000000000 +0200 @@ -9,7 +9,7 @@ LimitNOFILE=16384 EnvironmentFile=-/etc/sysconfig/samba ExecStartPre=/usr/share/samba/update-apparmor-samba-profile -ExecStart=/usr/sbin/smbd $SMBDOPTIONS +ExecStart=/usr/sbin/smbd --foreground --no-process-group $SMBDOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.9c6e2d0/systemd/sysconfig.samba new/vendor-files-git.880b3e7/systemd/sysconfig.samba --- old/vendor-files-git.9c6e2d0/systemd/sysconfig.samba 2018-03-07 16:27:52.000000000 +0100 +++ new/vendor-files-git.880b3e7/systemd/sysconfig.samba 2018-04-11 18:30:07.000000000 +0200 @@ -1,10 +1,10 @@ ## Path: Network/Samba ## Description: Samba process options ## Type: string -## Default: "-D -F" +## Default: "" ## ServiceRestart:·nmb -NMBDOPTIONS="-D -F" +NMBDOPTIONS="" ## Type: string -## Default: "-D -F" +## Default: "" ## ServiceRestart:·smb -SMBDOPTIONS="-D -F" +SMBDOPTIONS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.9c6e2d0/systemd/sysconfig.samba-winbind new/vendor-files-git.880b3e7/systemd/sysconfig.samba-winbind --- old/vendor-files-git.9c6e2d0/systemd/sysconfig.samba-winbind 2018-03-07 16:27:52.000000000 +0100 +++ new/vendor-files-git.880b3e7/systemd/sysconfig.samba-winbind 2018-04-11 18:30:07.000000000 +0200 @@ -1,6 +1,6 @@ ## Path: Network/Samba ## Description: Samba process options ## Type: string -## Default: "-D -F" +## Default: "" ## ServiceRestart:·winbind -WINBINDOPTIONS="-D -F" +WINBINDOPTIONS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files-git.9c6e2d0/systemd/winbind.service new/vendor-files-git.880b3e7/systemd/winbind.service --- old/vendor-files-git.9c6e2d0/systemd/winbind.service 2018-03-07 16:27:52.000000000 +0100 +++ new/vendor-files-git.880b3e7/systemd/winbind.service 2018-04-11 18:30:07.000000000 +0200 @@ -11,7 +11,7 @@ Environment=KRB5CCNAME=/run/samba/krb5cc_samba Environment=KRB5RCACHEDIR=/var/cache/krb5rcache EnvironmentFile=-/etc/sysconfig/samba -ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS" +ExecStart=/usr/sbin/winbindd --foreground --no-process-group "$WINBINDOPTIONS" ExecReload=/usr/bin/kill -HUP $MAINPID [Install]