|
@@ -1,7 +1,7 @@
|
|
|
Summary: Dovecot Secure imap server
|
|
|
Summary(ja): Dovecot セキュア IMAP サーバ
|
|
|
Name: dovecot
|
|
|
-Version: 2.2.36
|
|
|
+Version: 2.3.6
|
|
|
Release: 1%{?_dist_release}
|
|
|
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
|
|
|
License: MIT and LGPLv2 and BSD with advertising
|
|
@@ -14,7 +14,7 @@ Group: System Environment/Daemons
|
|
|
|
|
|
# pigeonhole
|
|
|
%define build_pigeonhole 1
|
|
|
-%define pigeonholever 0.4.24
|
|
|
+%define pigeonholever 0.5.6
|
|
|
|
|
|
# pop before smtp (drac)
|
|
|
%define build_drac 0
|
|
@@ -24,7 +24,7 @@ URL: http://www.dovecot.org/
|
|
|
Source: https://www.dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
|
|
|
Source1: dovecot.init
|
|
|
Source2: dovecot.pam
|
|
|
-Source8: https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-%{pigeonholever}.tar.gz
|
|
|
+Source8: https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz
|
|
|
Source9: dovecot.sysconfig
|
|
|
Source10: dovecot.tmpfilesd
|
|
|
|
|
@@ -42,6 +42,9 @@ Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
|
|
|
Patch3: dovecot-1.0.rc7-mkcert-paths.patch
|
|
|
Patch4: dovecot-2.2-mkcert-10years.patch
|
|
|
|
|
|
+Patch10: dovecot-2.3.0.1-libxcrypt.patch
|
|
|
+Patch11: dovecot-2.3.4-de42b54.patch
|
|
|
+
|
|
|
Packager: iwamoto
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -53,6 +56,7 @@ BuildRequires: libtool autoconf automake, gettext-devel
|
|
|
BuildRequires: pkgconfig
|
|
|
BuildRequires: krb5-devel
|
|
|
BuildRequires: tcp_wrappers
|
|
|
+BuildRequires: libxcrypt-devel
|
|
|
|
|
|
# Package includes an initscript service file,
|
|
|
# needs to require initscripts package
|
|
@@ -212,11 +216,13 @@ cp %{SOURCE110} .
|
|
|
|
|
|
sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10-ssl.conf
|
|
|
|
|
|
+sed -i -e 's/^#define CLIENT_PROGRESS_TIMEOUT.*$/#define CLIENT_PROGRESS_TIMEOUT 30/' src/lib-http/test-http-payload.c
|
|
|
+
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
%if %{build_pigeonhole}
|
|
|
#pigeonhole
|
|
|
-pushd dovecot-2.2-pigeonhole-%{pigeonholever}
|
|
|
+pushd dovecot-2.3-pigeonhole-%{pigeonholever}
|
|
|
autoreconf -fiv
|
|
|
%configure \
|
|
|
INSTALL_DATA="install -c -p -m644" \
|
|
@@ -240,7 +246,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
|
|
|
|
|
|
%if %{build_pigeonhole}
|
|
|
-pushd dovecot-2.2-pigeonhole-%{pigeonholever}
|
|
|
+pushd dovecot-2.3-pigeonhole-%{pigeonholever}
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
popd
|
|
|
%endif
|
|
@@ -290,7 +296,7 @@ install -p -m 644 doc/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconf
|
|
|
install -p -m 644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf
|
|
|
|
|
|
# Install pigeonhole conf
|
|
|
-pushd dovecot-2.2-pigeonhole-%{pigeonholever}
|
|
|
+pushd dovecot-2.3-pigeonhole-%{pigeonholever}
|
|
|
install -p -m 644 doc/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d
|
|
|
popd
|
|
|
|
|
@@ -364,12 +370,13 @@ fi
|
|
|
|
|
|
%check
|
|
|
make check
|
|
|
-cd dovecot-2.2-pigeonhole-%{pigeonholever}
|
|
|
+cd dovecot-2.3-pigeonhole-%{pigeonholever}
|
|
|
make check
|
|
|
|
|
|
%files -f libs.filelist
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc doc/* AUTHORS ChangeLog COPYING COPYING.LGPL COPYING.MIT NEWS README
|
|
|
+%license COPYING COPYING.LGPL COPYING.MIT
|
|
|
+%doc doc/* AUTHORS ChangeLog NEWS README
|
|
|
# %doc AUTHORS ChangeLog NEWS README doc/*.txt
|
|
|
|
|
|
%dir %{_sysconfdir}/dovecot
|
|
@@ -484,6 +491,11 @@ make check
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon May 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.6-1
|
|
|
+- updated to the 2.3.x series.
|
|
|
+- updated pigeonhole to 0.5.6.
|
|
|
+- imported Patch10 and 11.
|
|
|
+
|
|
|
* Tue Nov 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.36-1
|
|
|
- new upstream release.
|
|
|
- updated pigeonhole to 0.4.24.
|