|
|
@@ -1,6 +1,6 @@
|
|
|
Name: cyrus-imapd
|
|
|
Version: 2.2.13p1
|
|
|
-Release: 8%{?_dist_release}
|
|
|
+Release: 9%{?_dist_release}
|
|
|
|
|
|
# ********************** BUILD TIME OPTIONS START **********************
|
|
|
|
|
|
@@ -129,6 +129,9 @@ Patch51: cyrus-imapd-2.2.12-config.patch
|
|
|
Patch52: cyrus-imapd-2.2.12-db4.6.patch
|
|
|
# Patches >= 100 are fixed in CVS
|
|
|
Patch100: cyrus-imapd-2.2.13-2817.patch
|
|
|
+Patch101: cyrus-imapd-2.2.13p1_CVE-2011-3208.patch
|
|
|
+Patch102: cyrus-imapd_CVE-2011-1926.patch
|
|
|
+Patch103: cyrus-imapd-2.2.13p1_SA46093.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: cyrus-sasl-devel >= 2.1.15-1
|
|
|
@@ -158,7 +161,7 @@ Requires(preun): /sbin/service /sbin/chkconfig
|
|
|
%define _cyrusgroup mail
|
|
|
%define _vardata %{_var}/lib/imap
|
|
|
%define _spooldata %{_var}/spool/imap
|
|
|
-%define _cyrexecdir %{_libdir}/%{name}
|
|
|
+%define _cyrexecdir %{_exec_prefix}/lib/%{name}
|
|
|
%define _confdir master/conf
|
|
|
%define _contribdir %{_datadir}/%{name}/contrib
|
|
|
%if %{PREFORK}
|
|
|
@@ -275,6 +278,9 @@ one running the server.
|
|
|
%patch52 -p1 -b .db46
|
|
|
|
|
|
%patch100 -p0 -b .2817
|
|
|
+%patch101 -p1 -b .CVE-2011-3208
|
|
|
+%patch102 -p1 -b .CVE-2011-1926
|
|
|
+%patch103 -p1 -b .SA46093
|
|
|
|
|
|
aclocal -I ./cmulocal
|
|
|
autoconf -I ./cmulocal
|
|
|
@@ -453,6 +459,7 @@ done
|
|
|
%{buildroot}%{_datadir}/%{name}/rpm
|
|
|
|
|
|
# Install additional files
|
|
|
+%{__install} -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
|
|
%{__install} -m 755 %{SOURCE13} %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
|
|
|
%{__install} -m 755 %{SOURCE28} %{buildroot}%{_cyrexecdir}/rpm_set_permissions
|
|
|
%{__install} -m 644 %{SOURCE14} %{buildroot}%{_datadir}/%{name}/rpm/magic
|
|
|
@@ -480,8 +487,8 @@ done
|
|
|
%{__install} -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
|
|
%{__install} -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/cron.daily/%{name}
|
|
|
|
|
|
-%{__cat} %{SOURCE11} | %{__sed} -e 's,/usr/lib,%{_libdir},g' > %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
|
|
-%{__chmod} 755 %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
|
|
+#%{__cat} %{SOURCE11} | %{__sed} -e 's,/usr/lib,%{_libdir},g' > %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
|
|
+#%{__chmod} 755 %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
|
|
|
|
|
# Install templates
|
|
|
%{__install} -m 755 -d doc/conf
|
|
|
@@ -510,8 +517,8 @@ done
|
|
|
%{__perl} -pi -e 's/FETCHNEWS/CYRFETCHNEWS/g' doc/man/cyrfetchnews.8.html
|
|
|
|
|
|
# Create symlinks
|
|
|
-%{__ln_s} -f %{_libdir}/%{name}/cyradm %{buildroot}%{_bindir}/
|
|
|
-%{__ln_s} -f %{_libdir}/%{name}/imtest %{buildroot}%{_bindir}/
|
|
|
+%{__ln_s} -f %{_cyrexecdir}/cyradm %{buildroot}%{_bindir}/
|
|
|
+%{__ln_s} -f %{_cyrexecdir}/imtest %{buildroot}%{_bindir}/
|
|
|
|
|
|
# Create filelist for perl package, compress manpages before
|
|
|
[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
|
|
|
@@ -753,6 +760,12 @@ fi
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Oct 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-9
|
|
|
+- added Patch101 for CVE-2011-3208
|
|
|
+- added Patch102 for CVE-2011-1926
|
|
|
+- added Patch103 for SA46093
|
|
|
+- define %%{_cyrexecdir} to %%{_execdir}/lib/cyrus-imapd (for x86_64)
|
|
|
+
|
|
|
* Tue Mar 22 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.13p1-8
|
|
|
- rebuild with krb5-libs-1.8.2 and openssl-1.0.0d
|
|
|
|
inagaki