Accepting request 807583 from server:mail

OBS-URL: https://build.opensuse.org/request/show/807583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/exim?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2020-05-20 16:44:42 +00:00 committed by Git OBS Bridge
commit eb761c6527
2 changed files with 22 additions and 15 deletions

View File

@ -1,3 +1,8 @@
Tue May 19 13:47:05 CEST 2020 - wullinger@rz.uni-kiel.de
- switch pretrans to use lua
(fixes bsc#1171877)
-------------------------------------------------------------------
Tue May 12 08:19:17 UTC 2020 - wullinger@rz.uni-kiel.de
- bring changes from current in +fixes branch
(patch-exim-fixes-ee83de04d3087efaf808d1f2235a988275c2ee94)

View File

@ -73,7 +73,7 @@ Requires(pre): group(mail)
Requires(pre): fileutils textutils
%endif
Version: 4.93.0.4
Release: 3
Release: 4
%if %{with_mysql}
BuildRequires: mysql-devel
%endif
@ -382,20 +382,22 @@ install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbin
# apparmor profile
install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/usr/share/apparmor/extra-profiles/usr.sbin.exim
%pretrans
if [ -d "%{_docdir}/%{name}/doc/cve-2019-13917" ]; then
moved_suffix=""
moved_index=""
while [ -d "%{_docdir}/%{name}/doc/cve-2019-13917.rpmmoved${moved_suffix}${moved_index}" ]; do
if [ -z "${moved_suffix}" ]; then
moved_suffix="."
moved_index="0"
else
moved_index=$((${moved_index} + 1))
fi
done
mv "%{_docdir}/%{name}/doc/cve-2019-13917" "%{_docdir}/%{name}/doc/cve-2019-13917.rpmmoved${moved_suffix}${moved_index}"
fi
%pretrans -p <lua>
docdir = rpm.expand('%{_docdir}')
pkgname = rpm.expand('%{name}')
path = docdir .. '/' .. pkgname .. '/doc/cve-2019-13917'
st = posix.stat(path)
if st and st.type == "directory" then
status = os.rename(path, path .. ".rpmmoved")
if not status then
suffix = 0
while not status do
suffix = suffix + 1
status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
end
os.rename(path, path .. ".rpmmoved")
end
end
%pre
%if 0%{?suse_version} > 1220