Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2014-03-18 14:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2013-10-04 10:27:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.proftpd.new/proftpd.changes 2014-03-18 14:52:08.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 17 18:38:53 UTC 2014 - [email protected] + +- fix for bnc#844183 + * proftpd fails to start due to missing /run/proftpd +- add own tmpfiles.d file + * proftpd.tmpfile + +------------------------------------------------------------------- New: ---- proftpd.tmpfile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.viCweD/_old 2014-03-18 14:52:09.000000000 +0100 +++ /var/tmp/diff_new_pack.viCweD/_new 2014-03-18 14:52:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ Source11: %{name}.init Source12: %{name}.passwd Source13: %{name}.service +Source14: %{name}.tmpfile Source15: %{name}.keyring #PATCH-FIX-openSUSE: pam, logrotate, xinet Patch100: %{name}-dist.patch @@ -194,8 +195,8 @@ %if 0%{?has_systemd} %{__install} -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service -# systemd need to create a tmp dir: /var/run/proftpd -install -D -m 0644 contrib/dist/rpm/proftpd-tmpfs.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/proftpd.conf +# systemd need to create a tmp dir: /run/proftpd +%{__install} -D -m 0644 %{S:14} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf %endif %find_lang %{name} @@ -219,14 +220,13 @@ %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 -#if [ "$1" = "1" ]; then -# #%{__sed} -i "s,\(.*disable.*=\ \)no,\1yes," %{_sysconfdir}/xinetd.d/%{name} -# %{__sed} -i -e "s/@HOST@/$(hostname -s)/" %{_sysconfdir}/%{name}/%{name}.conf -#fi -%{fillup_and_insserv -f proftpd} - %if 0%{?has_systemd} %service_add_post %{name}.service + +%{__install} -d /run/%{name} +%else +%{fillup_and_insserv -f proftpd} +%{__install} -d %{_localstatedir}/run/%{name} %endif %postun @@ -277,9 +277,6 @@ %config(noreplace) %{_sysconfdir}/%{name}/dhparams.pem %{_sysconfdir}/init.d/%{name} %dir %attr(0750,ftp,ftp) %{_localstatedir}/log/%{name} -%if ! 0%{?has_systemd} -%ghost %{_localstatedir}/run/%{name} -%endif %{_sbindir}/* %{_mandir}/man?/* %dir %attr(0755,root,root) %{_libdir}/%{name}/ @@ -291,7 +288,8 @@ %exclude %{_libdir}/%{name}/mod_sql_sqlite.so %if 0%{?has_systemd} %{_unitdir}/%{name}.service -%{_prefix}/lib/tmpfiles.d/proftpd.conf +%{_prefix}/lib/tmpfiles.d/%{name}.conf +%ghost %dir /run/%{name} %endif %files devel ++++++ proftpd.tmpfile ++++++ # proFTPD needs a DIR d /run/proftpd 0755 root root - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
