Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2014-04-05 16:50:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2014-04-01 11:34:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2014-04-05 16:50:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 15:20:21 UTC 2014 - [email protected] + +- Add krb5rcache directory to the winbind package; (bnc#870607). +- Cleanup and consolidate the sysconfig and systemd service files. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.T5gHst/_old 2014-04-05 16:50:03.000000000 +0200 +++ /var/tmp/diff_new_pack.T5gHst/_new 2014-04-05 16:50:03.000000000 +0200 @@ -144,7 +144,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3213 +%define SOURCE_TIMESTAMP 3217 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1282,6 +1282,7 @@ %{buildroot}/%{LOGDIR} \ %{buildroot}/%{PIDDIR} \ %{buildroot}/%{_var}/adm/fillup-templates \ + %{buildroot}/%{_var}/cache/krb5rcache \ %{buildroot}/%{_var}/run \ %{buildroot}/%{DOCDIR} \ %{buildroot}/%{DOCBOOKDIR} \ @@ -1356,24 +1357,10 @@ %endif %if 0%{?suse_version} > 1220 for srv_name in nmb smb winbind; do - sed -e "s@PIDFile=/run/${srv_name}d.pid@PIDFile=/run/samba/${srv_name}d.pid@g" \ - -e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' \ - ../packaging/systemd/${srv_name}.service \ - >%{buildroot}/%{_unitdir}/${srv_name}.service - echo -en "## Type: string -## Default: \"-D\" -## ServiceRestart:·${srv_name} -${srv_name^^}DOPTIONS=\"-D\"\n" >>SUSE.sysconfig.${srv_name} + install -m 0644 -p systemd/${srv_name}.service %{buildroot}/%{_unitdir} ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name} done -sed -i -e "s@EnvironmentFile=-/etc/sysconfig/samba@EnvironmentFile=-/etc/sysconfig/samba\nExecStartPre=/usr/share/samba/update-apparmor-samba-profile@g" \ - %{buildroot}/%{_unitdir}/smb.service -head -n 2 ../packaging/systemd/samba.sysconfig > \ - %{buildroot}%_var/adm/fillup-templates/sysconfig.samba -cat SUSE.sysconfig.{nmb,smb} >>\ - %{buildroot}%_var/adm/fillup-templates/sysconfig.samba -cp -a SUSE.sysconfig.winbind \ - %{buildroot}%_var/adm/fillup-templates/sysconfig.samba-winbind +install -m 0644 systemd/sysconfig.* %{buildroot}%_var/adm/fillup-templates install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf %else @@ -1595,6 +1582,9 @@ fi fi %endif +%if 0%{?suse_version} > 1220 +%{fillup_only -ans samba client} +%endif if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb fi @@ -1971,6 +1961,9 @@ %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} +%if 0%{?suse_version} > 1220 +%{_var}/adm/fillup-templates/sysconfig.samba-client +%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %files core-devel @@ -2199,6 +2192,7 @@ %if 0%{?suse_version} > 1220 %{_var}/adm/fillup-templates/sysconfig.samba-winbind %endif +%attr(0770,root,root) %{_var}/cache/krb5rcache %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %files doc -f filelist-samba-doc ++++++ patches.tar.bz2 ++++++ ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/config/swat.xinetd new/vendor-files/config/swat.xinetd --- old/vendor-files/config/swat.xinetd 2014-01-24 13:55:43.000000000 +0100 +++ new/vendor-files/config/swat.xinetd 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# SWAT is the Samba Web Administration Tool. -service swat -{ - socket_type = stream - protocol = tcp - wait = no - user = root - server = /usr/sbin/swat - only_from = 127.0.0.1 - log_on_failure += USERID - disable = yes -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/systemd/nmb.service new/vendor-files/systemd/nmb.service --- old/vendor-files/systemd/nmb.service 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/systemd/nmb.service 2014-03-28 14:01:13.000000000 +0100 @@ -0,0 +1,14 @@ +[Unit] +Description=Samba NMB Daemon +After=syslog.target network.target + +[Service] +Type=forking +Environment=KRB5CCNAME=/run/samba/krb5cc_samba +PIDFile=/run/samba/nmbd.pid +EnvironmentFile=-/etc/sysconfig/samba +ExecStart=/usr/sbin/nmbd $NMBDOPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/systemd/smb.service new/vendor-files/systemd/smb.service --- old/vendor-files/systemd/smb.service 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/systemd/smb.service 2014-03-28 14:01:13.000000000 +0100 @@ -0,0 +1,16 @@ +[Unit] +Description=Samba SMB Daemon +After=syslog.target network.target nmb.service winbind.service + +[Service] +Type=forking +Environment=KRB5CCNAME=/run/samba/krb5cc_samba +PIDFile=/run/samba/smbd.pid +LimitNOFILE=16384 +EnvironmentFile=-/etc/sysconfig/samba +ExecStartPre=/usr/share/samba/update-apparmor-samba-profile +ExecStart=/usr/sbin/smbd $SMBDOPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/systemd/sysconfig.samba new/vendor-files/systemd/sysconfig.samba --- old/vendor-files/systemd/sysconfig.samba 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/systemd/sysconfig.samba 2014-04-01 17:07:17.000000000 +0200 @@ -0,0 +1,8 @@ +## Type: string +## Default: "-D" +## ServiceRestart:·nmb +NMBDOPTIONS="-D" +## Type: string +## Default: "-D" +## ServiceRestart:·smb +SMBDOPTIONS="-D" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/systemd/sysconfig.samba-client new/vendor-files/systemd/sysconfig.samba-client --- old/vendor-files/systemd/sysconfig.samba-client 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/systemd/sysconfig.samba-client 2014-04-01 17:07:21.000000000 +0200 @@ -0,0 +1,2 @@ +## Path: Network/Samba +## Description: Samba process options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/systemd/sysconfig.samba-winbind new/vendor-files/systemd/sysconfig.samba-winbind --- old/vendor-files/systemd/sysconfig.samba-winbind 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/systemd/sysconfig.samba-winbind 2014-04-01 17:04:25.000000000 +0200 @@ -0,0 +1,4 @@ +## Type: string +## Default: "-D" +## ServiceRestart:·winbind +WINBINDDOPTIONS="-D" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/systemd/winbind.service new/vendor-files/systemd/winbind.service --- old/vendor-files/systemd/winbind.service 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/systemd/winbind.service 2014-04-01 16:25:48.000000000 +0200 @@ -0,0 +1,15 @@ +[Unit] +Description=Samba Winbind Daemon +After=syslog.target network.target nmb.service + +[Service] +Type=forking +Environment=KRB5CCNAME=/run/samba/krb5cc_samba +Environment=KRB5RCACHEDIR=/var/cache/krb5rcache +PIDFile=/run/samba/winbindd.pid +EnvironmentFile=-/etc/sysconfig/samba +ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS" +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2014-03-28 12:48:55.000000000 +0100 +++ new/vendor-files/tools/package-data 2014-04-01 18:38:34.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="3213" +SAMBA_PACKAGE_SVN_VERSION="3217" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
