diff --git a/.gitignore b/.gitignore index 88a4a9b..625e049 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /opensmtpd-6.0.3p1.tar.gz /opensmtpd-6.6.2p1.tar.gz /opensmtpd-6.6.4p1.tar.gz +/opensmtpd-6.7.1p1.tar.gz diff --git a/opensmtpd.spec b/opensmtpd.spec index fc8755d..e01e9cd 100644 --- a/opensmtpd.spec +++ b/opensmtpd.spec @@ -9,7 +9,7 @@ Summary: Free implementation of the server-side SMTP protocol as defined by RFC 5321 Name: opensmtpd -Version: 6.6.4p1 +Version: 6.7.1p1 Release: 1%{?prerelease:.%{prerelease}}%{?dist} License: ISC @@ -29,7 +29,12 @@ Source2: opensmtpd.pam BuildRequires: libdb-devel %endif +%if 0%{?el7} +BuildRequires: openssl11-devel +%else BuildRequires: openssl-devel +%endif + BuildRequires: libasr-devel >= 1.0.4 BuildRequires: libevent-devel BuildRequires: zlib-devel @@ -72,6 +77,12 @@ back to Sendmail as a default mail daemon. %build export CFLAGS="%{optflags}" +%if 0%{?el7} +export CFLAGS="$CFLAGS -I%{_includedir}/openssl11" +export CPPFLAGS="$CPPFLAGS -I%{_includedir}/openssl11" +export LDFLAGS="$LDFLAGS -L%{_libdir}/openssl11" +%endif + %configure \ --sysconfdir=%{_sysconfdir}/opensmtpd \ --with-path-CAfile=%{_sysconfdir}/pki/tls/cert.pem \ @@ -147,6 +158,10 @@ exit 0 %post %systemd_post %{name}.service +# fix broken mta-makemapman +[ -f "/var/lib/alternatives/mta" ] && \ + sed -i -e 's|/usr/share/man/man1/makemap.1.gz|/usr/share/man/man8/makemap.8.gz|g' /var/lib/alternatives/mta + %{_sbindir}/alternatives --install %{_sbindir}/sendmail mta %{_sbindir}/sendmail.opensmtpd 10 \ --slave %{_bindir}/mailq mta-mailq %{_bindir}/mailq.opensmtpd \ %if 0%{?_with_pam} @@ -236,6 +251,16 @@ exit 0 %changelog +* Fri May 22 2020 Denis Fateyev - 6.7.1p1-1 +- Update to 6.7.1p1 release +- Remove deprecated "legacy_common_support" build option + +* Fri Apr 10 2020 Denis Fateyev - 6.6.4p1-3 +- Rebuilt for epel7 compatibility + +* Fri Feb 28 2020 Denis Fateyev - 6.6.4p1-2 +- Add "legacy_common_support" build option + * Mon Feb 24 2020 Denis Fateyev - 6.6.4p1-1 - Update to 6.6.4p1 release diff --git a/sources b/sources index ac166a0..3e26fcd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opensmtpd-6.6.4p1.tar.gz) = 267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b +SHA512 (opensmtpd-6.7.1p1.tar.gz) = 403952e77b360f42d8dc8ae7cd7faeced831b9e37bffd7c67d338b7208f7471d50f3594c3475a9282d18cb17435efd305ec8c05f89eaeab5d363ddb1c4d54a2e