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 Tue May 12 08:19:17 UTC 2020 - wullinger@rz.uni-kiel.de
- bring changes from current in +fixes branch - bring changes from current in +fixes branch
(patch-exim-fixes-ee83de04d3087efaf808d1f2235a988275c2ee94) (patch-exim-fixes-ee83de04d3087efaf808d1f2235a988275c2ee94)

View File

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