From 06b464506a8012d9f5e43a48dc3260aa6138cfcc792aaf91951a4e608f34cf4e Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sun, 31 May 2015 23:19:56 +0000 Subject: [PATCH] Accepting request 309514 from home:computersalat:devel:network fix for boo#927290 (CVE-2015-3306), update to 1.3.5a OBS-URL: https://build.opensuse.org/request/show/309514 OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=34 --- proftpd.changes | 5 ++++- proftpd.spec | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/proftpd.changes b/proftpd.changes index f6615b8..61872f7 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -7,7 +7,10 @@ Sun May 31 18:54:45 UTC 2015 - chris@computersalat.de - rebase patches * proftpd-ftpasswd.patch * proftpd-no_BuildDate.patch -- remove gpg-offline dependency +- remove gpg-offline dependency +- fix permissions on passwd file + * unable to use world-readable AuthUserFile '.../passwd' (perms 0644): + * 0644 -> 0440 ------------------------------------------------------------------- Mon Sep 1 22:04:02 UTC 2014 - andreas.stieger@gmx.de diff --git a/proftpd.spec b/proftpd.spec index 50d1baa..d7a0601 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -188,7 +188,7 @@ export CXXFLAGS="$CFLAGS" # some needed dirs %{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{conf.d,auth} -%{__install} -m 0644 %{S:12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/auth/passwd +%{__install} -m 0440 %{S:12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/auth/passwd %{__install} -d -m 0750 $RPM_BUILD_ROOT/var/log/%{name} %if 0%{?has_systemd} @@ -265,7 +265,7 @@ fi %doc sample-configurations/*.conf %dir %attr(0755,root,root) %{_sysconfdir}/%{name}/ %dir %attr(0750,ftp,ftp) %{_sysconfdir}/%{name}/auth/ -%config(noreplace) %attr(0644,root,ftp) %{_sysconfdir}/%{name}/auth/passwd +%config(noreplace) %attr(0440,root,ftp) %{_sysconfdir}/%{name}/auth/passwd %dir %attr(0755,root,root) %{_sysconfdir}/%{name}/conf.d %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/%{name}.conf %{_sysconfdir}/%{name}/PROFTPD-MIB.txt