diff --git a/exim-4.97.1.tar.bz2 b/exim-4.97.1.tar.bz2 new file mode 100644 index 0000000..9ccd6dc --- /dev/null +++ b/exim-4.97.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a9614ac5b5d10dd98bfc7594561503a51a89c2ccbc52bca3153ee98af1cb37a +size 2071215 diff --git a/exim-4.97.1.tar.bz2.asc b/exim-4.97.1.tar.bz2.asc new file mode 100644 index 0000000..48a9dc7 --- /dev/null +++ b/exim-4.97.1.tar.bz2.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFEBAABCAAuFiEEqYbzpr1jd9hzCVjevOWMjOQfMt8FAmWJz+4QHGpnaEB3aXpt +YWlsLm9yZwAKCRC85YyM5B8y36vHB/91YtRyZA32+VbpdOjNE+c+gHIFo8qSgzsz +ZqwoJCcx7oXis4+0HHghXuXHhkunBj7uQfOZlM1vbkIJs3tc0PKYvCYVzILX6Fta +MGhz9xAuyY0iIgvP3khvOHlT7GDgU6OQ+r05Adr/Gicls2NXuHkfG4BRDcMO3NVX +J/flHg76Z0xAzxV4lKyDXIPFkRnGw6CGUbascpjzoyZNOfx9TXysVhU8URPkZfLV +d+DnlbJ5PQgrPM24Z0EcjgpydPl1uAGmCyrb9TfhurC+eo6eEyLaiDgF+dFz032y +Lh7JiRsKWZR1PU38ahPaUAg+1qsw9I6WHGiD/04LlQiyDwJBTQZR +=uIow +-----END PGP SIGNATURE----- diff --git a/exim-4.97.tar.bz2 b/exim-4.97.tar.bz2 deleted file mode 100644 index a1735ed..0000000 --- a/exim-4.97.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0f6141b126a929e431d6ac8af3d6a1e310621ffe1f628b7b0de1e9b05488bfd -size 2077471 diff --git a/exim-4.97.tar.bz2.asc b/exim-4.97.tar.bz2.asc deleted file mode 100644 index ad45dbb..0000000 --- a/exim-4.97.tar.bz2.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFEBAABCAAuFiEEqYbzpr1jd9hzCVjevOWMjOQfMt8FAmVGQN8QHGpnaEB3aXpt -YWlsLm9yZwAKCRC85YyM5B8y38ukCADMRsjAIBe/tFwrh0pXkHQNJISfuZaCjGWL -KzIF3LEAaPhV2VSeFIUjBIiLmxjrIAMev3hbHk/O49XEzXXsobazF/G/zNJeMTY9 -uWEc+gzkztD5I1eWVbEp0MxHxo7IGf3NWHqKzA3kOdYpPhTdyX9Td9uIYvNnXSfj -Byo8OxUExu34iLaUB9g5I6ja3o799rxZ9XWHdOTIDjD96fYEQq2N0GVsuwa+Gy76 -ePZPS4KONmYRbr0Mhgk3CpFzFwn+x4xoNKmFvxNRdq1qeQOqiEr07dS0/Tk210LZ -A5Xg5mooj877FeXxUNlYVcJgqZpt/pRFdgptEfQhyhCOX24TiHgU -=mtGN ------END PGP SIGNATURE----- diff --git a/exim.changes b/exim.changes index 9e466af..061462d 100644 --- a/exim.changes +++ b/exim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 30 15:35:31 UTC 2023 - Dirk Müller + +- update to 4.97.1 (bsc#1218387, CVE-2023-51766): + * Fixes for the smtp protocol smuggling (CVE-2023-51766) + +------------------------------------------------------------------- Tue Nov 7 09:03:46 UTC 2023 - Peter Wullinger - update to exim 4.97 @@ -32,7 +39,7 @@ Wed Jan 25 12:56:05 UTC 2023 - Thorsten Kukuk Tue Oct 18 10:00:39 UTC 2022 - Peter Wullinger - add patch-cve-2022-3559 (fixes CVE-2022-3559, bsc#1204427, Bug 2915) - + ------------------------------------------------------------------- Thu Sep 29 13:36:20 UTC 2022 - Peter Wullinger @@ -108,7 +115,7 @@ Mon Jun 27 08:33:59 UTC 2022 - Peter Wullinger may not be tainted. * Fix CHUNKING on a continued-transport. Previously the usabilility of the facility was not passed across execs, and only the first message - passed over a connection could use BDAT; any further ones using DATA. + passed over a connection could use BDAT; any further ones using DATA. * Support the PIPECONNECT facility in the smtp transport when the helo_data uses $sending_ip_address and an interface is specified. * OpenSSL: fix transport-required OCSP stapling verification under session @@ -124,7 +131,7 @@ Mon Jun 27 08:33:59 UTC 2022 - Peter Wullinger * Fix ${srs_encode ...} to handle an empty sender address, now returning an empty address. * Bug 2855: Handle a v4mapped sender address given us by a frontending - proxy. + proxy. Wed Jan 19 11:41:15 UTC 2022 - Peter Wullinger @@ -161,7 +168,7 @@ Tue Sep 14 07:31:37 UTC 2021 - Johannes Segitz ------------------------------------------------------------------- Thu Jul 8 06:08:34 UTC 2021 - Steve Kowalik -- Update eximstats-html-update.py to run under Python 3. +- Update eximstats-html-update.py to run under Python 3. ------------------------------------------------------------------- Mon May 17 15:03:24 CEST 2021 - wullinger@rz.uni-kiel.de @@ -261,7 +268,7 @@ 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 @@ -403,8 +410,8 @@ Sat Sep 7 18:22:08 UTC 2019 - poeml@cmdline.net Thu Jul 25 13:43:52 UTC 2019 - alex - update to exim 4.92.1 - * CVE-2019-13917: Fixed an issue with ${sort} expansion which could - allow remote attackers to execute other programs with root privileges + * CVE-2019-13917: Fixed an issue with ${sort} expansion which could + allow remote attackers to execute other programs with root privileges (boo#1142207) ------------------------------------------------------------------- @@ -417,7 +424,7 @@ Wed Jun 5 07:14:44 CEST 2019 - wullinger@rz.uni-kiel.de * DANE is now SUPPORT_DANE ------------------------------------------------------------------- -Sat Mar 23 05:03:11 UTC 2019 - seanlew@opensuse.org +Sat Mar 23 05:03:11 UTC 2019 - seanlew@opensuse.org - update to exim 4.92 * ${l_header:} expansion @@ -528,7 +535,7 @@ Mon Apr 16 13:57:17 UTC 2018 - wullinger@rz.uni-kiel.de ------------------------------------------------------------------- Thu Mar 15 20:22:09 UTC 2018 - crrodriguez@opensuse.org -- Replace xorg-x11-devel by individual pkgconfig() buildrequires. +- Replace xorg-x11-devel by individual pkgconfig() buildrequires. ------------------------------------------------------------------- Tue Feb 13 13:39:34 UTC 2018 - kbabioch@suse.com @@ -613,7 +620,7 @@ Mon Nov 27 06:45:14 UTC 2017 - meissner@suse.com ------------------------------------------------------------------- Thu Nov 23 13:43:04 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- @@ -646,16 +653,16 @@ Mon Apr 24 07:45:00 UTC 2017 - wullinger@rz.uni-kiel.de - exim-4.86.2+fixes-867e8fe25dbfb1e31493488ad695bde55b890397.patch: import exim-4_86_2+fixes branch - + fix CVE-2016-1531 + + fix CVE-2016-1531 when installed setuid root, allows local users to gain privileges via the perl_startup - argument. + argument. + fix Bug 1805: store the initial working directory, expand $initial_cwd + fix Bug 1671: segfault after delivery (https://bugs.exim.org/show_bug.cgi?id=1671) + Don't issue env warning if env is empty - fix-CVE-2016-9963-31c02defdc5118834e801d4fe8f11c1d9b5ebadf.patch: DKIM information leakage - + ------------------------------------------------------------------- Mon Apr 4 15:55:31 UTC 2016 - e.istomin@edss.ee diff --git a/exim.spec b/exim.spec index 77b600a..e74c454 100644 --- a/exim.spec +++ b/exim.spec @@ -18,85 +18,31 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - %bcond_without mysql %bcond_without pgsql %bcond_without sqlite %bcond_without ldap %bcond_without i18n - %if 0%{?suse_version} > 1199 || 0%{?centos_version} > 599 || 0%{?rhel_version} > 599 %bcond_without dane %else %bcond_with dane %endif - Name: exim -BuildRequires: cyrus-sasl-devel -BuildRequires: db-devel -BuildRequires: libidn-devel -%if 0%{?suse_version} >= 1330 && 0%{?suse_version} < 1599 -BuildRequires: libnsl-devel -%endif -BuildRequires: libspf2-devel -BuildRequires: pam-devel -%if %{with_ldap} -BuildRequires: openldap2-devel -%endif -BuildRequires: pcre2-devel -BuildRequires: tcpd-devel -BuildRequires: pkgconfig(libcrypto) -BuildRequires: pkgconfig(libssl) -BuildRequires: pkgconfig(xaw7) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xt) -URL: http://www.exim.org/ -Conflicts: postfix -Conflicts: sendmail -Conflicts: sendmail-tls -Provides: smtp_daemon -%if %{?suse_version:%suse_version}%{?!suse_version:0} > 800 -Requires: logrotate -BuildRequires: perl-File-FcntlLock -Requires: perl-File-FcntlLock -%if 0%{?suse_version} > 1220 -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif -Requires(pre): %fillup_prereq permissions -%if 0%{?suse_version} >= 1330 -BuildRequires: group(mail) -BuildRequires: user(mail) -Requires(pre): user(mail) -Requires(pre): group(mail) -%endif -Requires(pre): fileutils textutils -%endif -Version: 4.97 +Version: 4.97.1 Release: 0 -%if %{with_mysql} -BuildRequires: mysql-devel -%endif -%if %{with_pgsql} -BuildRequires: postgresql-devel -%endif -%if %{with_sqlite} -BuildRequires: sqlite3-devel -%endif Summary: The Exim Mail Transfer Agent, a Replacement for sendmail License: GPL-2.0-or-later Group: Productivity/Networking/Email/Servers -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2 -Source3: http://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2.asc -# http://ftp.exim.org/pub/exim/Exim-Maintainers-Keyring.asc -Source4: exim.keyring +URL: https://www.exim.org/ +Source: https://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2 Source1: sysconfig.exim Source2: exim.logrotate +Source3: https://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2.asc +# http://ftp.exim.org/pub/exim/Exim-Maintainers-Keyring.asc +Source4: exim.keyring Source11: exim.rc Source12: permissions.exim Source13: apparmor.usr.sbin.exim @@ -107,6 +53,59 @@ Source40: exim.service Source41: exim_db.8.gz Patch0: exim-tail.patch Patch1: gnu_printf.patch +BuildRequires: cyrus-sasl-devel +BuildRequires: db-devel +BuildRequires: libidn-devel +BuildRequires: libspf2-devel +BuildRequires: pam-devel +BuildRequires: pcre2-devel +BuildRequires: pkgconfig +BuildRequires: tcpd-devel +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xt) +Conflicts: postfix +Conflicts: sendmail +Conflicts: sendmail-tls +Provides: smtp_daemon +%if 0%{?suse_version} >= 1330 && 0%{?suse_version} < 1599 +BuildRequires: libnsl-devel +%endif +%if %{with_ldap} +BuildRequires: openldap2-devel +%endif +%if %{?suse_version:%suse_version}%{?!suse_version:0} > 800 +BuildRequires: perl-File-FcntlLock +Requires: logrotate +Requires: perl-File-FcntlLock +Requires(pre): %fillup_prereq +Requires(pre): fileutils +Requires(pre): permissions +Requires(pre): textutils +%if 0%{?suse_version} > 1220 +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} +%else +Requires(pre): %insserv_prereq +%endif +%if 0%{?suse_version} >= 1330 +BuildRequires: group(mail) +BuildRequires: user(mail) +Requires(pre): group(mail) +Requires(pre): user(mail) +%endif +%endif +%if %{with_mysql} +BuildRequires: mysql-devel +%endif +%if %{with_pgsql} +BuildRequires: postgresql-devel +%endif +%if %{with_sqlite} +BuildRequires: sqlite3-devel +%endif %package -n eximon Summary: Eximon, an graphical frontend to administer Exim's mail queue @@ -136,13 +135,13 @@ header of mails. %description -n eximstats-html If this package is installed alongside the exim MTA, and you enable -EXIM_REPORT_WEEKLY_HTML in /etc/sysconfig/exim, logrotate/cron will +EXIM_REPORT_WEEKLY_HTML in %{_sysconfdir}/sysconfig/exim, logrotate/cron will create HTML reports in /srv/www/eximstats. -You can edit /etc/apache2/conf.d/eximstats.conf to configure your +You can edit %{_sysconfdir}/apache2/conf.d/eximstats.conf to configure your webserver for the reports. -The script /usr/sbin/eximstats-html-update.py can create the reports +The script %{_sbindir}/eximstats-html-update.py can create the reports for log files that were rotated in the past. (You would only run this once, if at all. The rest is done by logrotate / cron.) @@ -160,11 +159,11 @@ CFLAGS_OPT_WERROR="-Werror=format-security -Werror=missing-format-attribute" %endif cat <<-EOF > Local/Makefile # see src/EDITME for comments. - BIN_DIRECTORY=/usr/sbin - CONFIGURE_FILE=/etc/exim/exim.conf + BIN_DIRECTORY=%{_sbindir} + CONFIGURE_FILE=%{_sysconfdir}/exim/exim.conf EXIM_USER=ref:mail EXIM_GROUP=ref:mail - SPOOL_DIRECTORY=/var/spool/exim + SPOOL_DIRECTORY=%{_localstatedir}/spool/exim ROUTER_ACCEPT=yes ROUTER_DNSLOOKUP=yes ROUTER_IPLITERAL=yes @@ -206,21 +205,21 @@ cat <<-EOF > Local/Makefile # LOOKUP_NISPLUS=yes LOOKUP_PASSWD=yes # LOOKUP_WHOSON=yes - CYRUS_SASLAUTHD_SOCKET=/var/run/sasl2/mux + CYRUS_SASLAUTHD_SOCKET=%{_localstatedir}/run/sasl2/mux %if %{with_ldap} LDAP_LIB_TYPE=OPENLDAP2 LOOKUP_LIBS+=-llber -lldap %endif %if %{with_mysql} - LOOKUP_INCLUDE+=-I /usr/include/mysql + LOOKUP_INCLUDE+=-I %{_includedir}/mysql LOOKUP_LIBS+=-L %{_libdir}/mysql -lmysqlclient %endif %if %{with_pgsql} - LOOKUP_INCLUDE+=-I /usr/include/pgsql + LOOKUP_INCLUDE+=-I %{_includedir}/pgsql LOOKUP_LIBS+=-lpq %endif %if %{with_sqlite} - LOOKUP_INCLUDE+=-I /usr/include/sqlite3 + LOOKUP_INCLUDE+=-I %{_includedir}/sqlite3 LOOKUP_LIBS+=-lsqlite3 %endif EXIM_MONITOR=eximon.bin @@ -236,24 +235,24 @@ cat <<-EOF > Local/Makefile USE_OPENSSL=yes TLS_LIBS=-lssl -lcrypto INFO_DIRECTORY=%{_infodir} - LOG_FILE_PATH=/var/log/exim/%%s.log + LOG_FILE_PATH=%{_localstatedir}/log/exim/%%s.log EXICYCLOG_MAX=10 SYSLOG_LOG_PID=yes SYSLOG_LONG_LINES=yes COMPRESS_COMMAND=/bin/gzip COMPRESS_SUFFIX=gz - ZCAT_COMMAND=/usr/bin/zcat + ZCAT_COMMAND=%{_bindir}/zcat SUPPORT_PAM=yes # You probably need to add -lpam to EXTRALIBS - # RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf - # CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck + # RADIUS_CONFIG_FILE=%{_sysconfdir}/radiusclient/radiusclient.conf + # CYRUS_PWCHECK_SOCKET=%{_localstatedir}/pwcheck/pwcheck # USE_TCP_WRAPPERS=yes NO_SYMLINK=yes CHOWN_COMMAND=/bin/chown CHGRP_COMMAND=/bin/chgrp MV_COMMAND=/bin/mv RM_COMMAND=/bin/rm - PERL_COMMAND=/usr/bin/perl + PERL_COMMAND=%{_bindir}/perl # APPENDFILE_MODE=0600 # APPENDFILE_DIRECTORY_MODE=0700 # APPENDFILE_LOCKFILE_MODE=0600 @@ -275,7 +274,7 @@ cat <<-EOF > Local/Makefile # PERL_CC= # PERL_CCOPTS= # PERL_LIBS= - PID_FILE_PATH=/var/run/exim.pid + PID_FILE_PATH=%{_localstatedir}/run/exim.pid # SPOOL_DIRECTORY_MODE=0750 # SPOOL_MODE=0640 SUPPORT_MOVE_FROZEN_MESSAGES=yes @@ -289,7 +288,7 @@ cat <<-EOF > Local/Makefile EXPERIMENTAL_PROXY=yes EXPERIMENTAL_CERTNAMES=yes EXPERIMENTAL_DSN=yes - SYSTEM_ALIASES_FILE=/etc/aliases + SYSTEM_ALIASES_FILE=%{_sysconfdir}/aliases # enable SRS SUPPORT_SRS=yes %if %{with dane} @@ -300,73 +299,73 @@ cat <<-EOF > Local/Makefile EXPERIMENTAL_INTERNATIONAL=yes %endif LDFLAGS += -lidn - CFLAGS=$RPM_OPT_FLAGS -std=gnu99 -Wall $CFLAGS_OPT_WERROR -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE + CFLAGS=%{optflags} -std=gnu99 -Wall $CFLAGS_OPT_WERROR -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLDAP_DEPRECATED $fPIE EXTRALIBS=-ldl -lpam -L/usr/X11R6/%{_lib} $pie EOF touch Local/eximon.conf rm -f doc/*.{orig,txt~} %build -make +%make_build %install %if 0%{?suse_version} > 1220 -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} +mkdir -p %{buildroot}/%{_unitdir} %else -mkdir -p $RPM_BUILD_ROOT/etc/init.d +mkdir -p %{buildroot}%{_initddir} %endif %if 0%{?suse_version} > 1500 -mkdir -p $RPM_BUILD_ROOT%{_distconfdir}/logrotate.d +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d %else -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %endif -mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin,lib} -mkdir -p $RPM_BUILD_ROOT/var/log/exim -mkdir -p $RPM_BUILD_ROOT/var/spool/mail/ -ln -s spool/mail $RPM_BUILD_ROOT/var -mkdir -p $RPM_BUILD_ROOT%{_fillupdir} -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT/usr/bin -make inst_dest=$RPM_BUILD_ROOT/usr/sbin \ - inst_conf=$RPM_BUILD_ROOT/etc/exim/exim.conf \ - inst_info=$RPM_BUILD_ROOT/%{_infodir} \ +mkdir -p %{buildroot}%{_prefix}/{bin,sbin,lib} +mkdir -p %{buildroot}%{_localstatedir}/log/exim +mkdir -p %{buildroot}%{_localstatedir}/spool/mail/ +ln -s spool/mail %{buildroot}%{_localstatedir} +mkdir -p %{buildroot}%{_fillupdir} +mkdir -p %{buildroot}%{_mandir}/man8 +mkdir -p %{buildroot}%{_bindir} +make inst_dest=%{buildroot}%{_sbindir} \ + inst_conf=%{buildroot}%{_sysconfdir}/exim/exim.conf \ + inst_info=%{buildroot}/%{_infodir} \ INSTALL_ARG=-no_chown install #mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim -mv $RPM_BUILD_ROOT/usr/sbin/exim-4.9* $RPM_BUILD_ROOT/usr/sbin/exim -mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done +mv %{buildroot}%{_sbindir}/exim-4.9* %{buildroot}%{_sbindir}/exim +mv %{buildroot}%{_sysconfdir}/exim/exim.conf src/configure.default # with all substitutions done %if 0%{?suse_version} > 1220 -install -m 0644 %{S:40} $RPM_BUILD_ROOT/%{_unitdir}/exim.service +install -m 0644 %{SOURCE40} %{buildroot}/%{_unitdir}/exim.service %else -install -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/exim +install -m 0755 %{SOURCE11} %{buildroot}%{_initddir}/exim %endif # aka... for i in \ - /usr/lib/sendmail \ - /usr/bin/runq \ - /usr/bin/rsmtp \ - /usr/bin/mailq \ - /usr/bin/newaliases + %{_prefix}/lib/sendmail \ + %{_bindir}/runq \ + %{_bindir}/rsmtp \ + %{_bindir}/mailq \ + %{_bindir}/newaliases do ln -sf ../sbin/exim $RPM_BUILD_ROOT$i done -ln -sf exim $RPM_BUILD_ROOT/usr/sbin/sendmail +ln -sf exim %{buildroot}%{_sbindir}/sendmail %if 0%{?suse_version} > 1220 -ln -sv service $RPM_BUILD_ROOT/usr/sbin/rcexim +ln -sv service %{buildroot}%{_sbindir}/rcexim %else -ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim +ln -sv ../..%{_initddir}/exim %{buildroot}%{_sbindir}/rcexim %endif -mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/bin/ -cp -p %{S:1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.exim +mv %{buildroot}%{_sbindir}/eximon* %{buildroot}%{_bindir}/ +cp -p %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.exim %if 0%{?suse_version} > 1500 -install -m 0644 %{S:2} $RPM_BUILD_ROOT%{_distconfdir}/logrotate.d/exim +install -m 0644 %{SOURCE2} %{buildroot}%{_distconfdir}/logrotate.d/exim %else -install -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/exim +install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/exim %endif # man pages -mv doc/exim.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ -cp $RPM_SOURCE_DIR/exim_db.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 -gunzip $RPM_BUILD_ROOT/%{_mandir}/man8/exim_db.8.gz -pod2man --center=EXIM --section=8 $RPM_BUILD_ROOT/usr/sbin/eximstats > $RPM_BUILD_ROOT/%{_mandir}/man8/eximstats.8 +mv doc/exim.8 %{buildroot}/%{_mandir}/man8/ +cp $RPM_SOURCE_DIR/exim_db.8.gz %{buildroot}/%{_mandir}/man8 +gunzip %{buildroot}/%{_mandir}/man8/exim_db.8.gz +pod2man --center=EXIM --section=8 %{buildroot}%{_sbindir}/eximstats > %{buildroot}/%{_mandir}/man8/eximstats.8 for i in \ sendmail \ runq \ @@ -374,32 +373,32 @@ for i in \ mailq \ newaliases do - ln -sf exim.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/$i.8.gz + ln -sf exim.8.gz %{buildroot}/%{_mandir}/man8/$i.8.gz done for i in \ exim_dumpdb \ exim_fixdb \ exim_tidydb do - ln -sf exim_db.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/$i.8.gz + ln -sf exim_db.8.gz %{buildroot}/%{_mandir}/man8/$i.8.gz done -perl -pi -e 's%/usr/share/doc/exim4%/usr/share/doc/packages/exim%g' `find $RPM_BUILD_ROOT/%{_mandir}/man8 -name "*.8"` +perl -pi -e 's%%{_datadir}/doc/exim4%%{_docdir}/exim%{g}' `find %{buildroot}/%{_mandir}/man8 -name "*.8"` gzip -9 doc/*.txt # # package the utilities without executable permissions, to silence rpmlint warnings chmod 644 util/*.{pl,sh} src/convert4r* # # eximstats-html files -mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats -mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/ +mkdir -p %{buildroot}/srv/www/eximstats +mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d/ %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1310 - cp -p %{S:31} $RPM_BUILD_ROOT/etc/apache2/conf.d/ + cp -p %{SOURCE31} %{buildroot}%{_sysconfdir}/apache2/conf.d/ %else - cp -p %{S:32} $RPM_BUILD_ROOT/etc/apache2/conf.d/eximstats.conf + cp -p %{SOURCE32} %{buildroot}%{_sysconfdir}/apache2/conf.d/eximstats.conf %endif -install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir} +install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py %{buildroot}/%{_sbindir} # 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 %{buildroot}%{_datadir}/apparmor/extra-profiles/usr.sbin.exim %pretrans -p docdir = rpm.expand('%{_docdir}') @@ -441,26 +440,25 @@ done %if 0%{?suse_version} < 1131 %run_permissions %else -%set_permissions /usr/sbin/exim +%set_permissions %{_sbindir}/exim %endif if ! test -s etc/exim/exim.conf; then if test -s etc/exim.conf; then mv etc/exim.conf etc/exim/ - echo moving exim.conf to /etc/exim/ + echo moving exim.conf to %{_sysconfdir}/exim/ else cp -p usr/share/doc/packages/%{name}/configure.default etc/exim/exim.conf - echo copying default config file to /etc/exim/exim.conf + echo copying default config file to %{_sysconfdir}/exim/exim.conf fi fi %if 0%{?suse_version} > 1220 -%{fillup_only} +%fillup_only %service_add_post exim.service %else %{fillup_and_insserv exim} %endif exit 0 %if %{?suse_version:1}%{?!suse_version:0} - %preun %if 0%{?suse_version} > 1220 %service_del_preun exim.service @@ -480,32 +478,32 @@ exit 0 %endif %verifyscript -%verify_permissions -e /usr/sbin/exim +%verify_permissions -e %{_sbindir}/exim %files -%defattr(-,root,root) %ghost %{_docdir}/%{name}/doc/cve-2019-13917.rpmmoved -%doc ACKNOWLEDGMENTS CHANGES LICENCE NOTICE README.UPDATING README +%license LICENCE +%doc ACKNOWLEDGMENTS CHANGES NOTICE README.UPDATING README %doc doc %doc src/configure.default %doc build-Linux-*/convert4r{3,4} %doc util -%doc %{_mandir}/man8/* -/usr/sbin/exicyclog -/usr/sbin/exigrep -/usr/sbin/exiqgrep -%verify(not mode) %attr(4755,root,root) /usr/sbin/exim -/usr/sbin/exim_* -/usr/sbin/eximstats -/usr/sbin/exinext -/usr/sbin/exipick -/usr/sbin/exiqsumm -/usr/sbin/exiwhat -%dir /etc/exim +%{_mandir}/man8/* +%{_sbindir}/exicyclog +%{_sbindir}/exigrep +%{_sbindir}/exiqgrep +%verify(not mode) %attr(4755,root,root) %{_sbindir}/exim +%{_sbindir}/exim_* +%{_sbindir}/eximstats +%{_sbindir}/exinext +%{_sbindir}/exipick +%{_sbindir}/exiqsumm +%{_sbindir}/exiwhat +%dir %{_sysconfdir}/exim %if 0%{?suse_version} > 1220 %{_unitdir}/exim.service %else -%config /etc/init.d/exim +%config %{_initddir}/exim %endif %if 0%{?suse_version} > 1500 %{_distconfdir}/logrotate.d/exim @@ -513,34 +511,32 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/exim %endif %if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000 -%config(noreplace) /etc/permissions.d/exim +%config(noreplace) %{_sysconfdir}/permissions.d/exim %endif -%dir /usr/share/apparmor -%dir /usr/share/apparmor/extra-profiles -%config(noreplace) /usr/share/apparmor/extra-profiles/usr.sbin.exim -/usr/sbin/rcexim -/usr/bin/mailq -/usr/bin/runq -/usr/bin/rsmtp -/usr/bin/newaliases -/usr/sbin/sendmail -/usr/lib/sendmail +%dir %{_datadir}/apparmor +%dir %{_datadir}/apparmor/extra-profiles +%config(noreplace) %{_datadir}/apparmor/extra-profiles/usr.sbin.exim +%{_sbindir}/rcexim +%{_bindir}/mailq +%{_bindir}/runq +%{_bindir}/rsmtp +%{_bindir}/newaliases +%{_sbindir}/sendmail +%{_prefix}/lib/sendmail %{_fillupdir}/sysconfig.exim -%dir %attr(750,mail,mail) /var/log/exim -%dir %attr(1777,root,root) /var/spool/mail -/var/mail +%dir %attr(750,mail,mail) %{_localstatedir}/log/exim +%dir %attr(1777,root,root) %{_localstatedir}/spool/mail +%{_localstatedir}/mail %files -n eximon -%defattr(-,root,root) -/usr/bin/eximon -/usr/bin/eximon.bin +%{_bindir}/eximon +%{_bindir}/eximon.bin %files -n eximstats-html -%defattr(-,root,root) %attr(0750,root,www) /srv/www/eximstats -%dir /etc/apache2 -%dir /etc/apache2/conf.d -%config /etc/apache2/conf.d/eximstats.conf +%dir %{_sysconfdir}/apache2 +%dir %{_sysconfdir}/apache2/conf.d +%config %{_sysconfdir}/apache2/conf.d/eximstats.conf %{_sbindir}/eximstats-html-update.py %changelog