- updated to 1.2.4

- add patch for CVE-2005-2661
- run as imapproxy uid/gid
- fix broken upgrade
- add service restart on upgrade

Changed files:
    up-imapproxy.spec -> 1.13

diff --git a/up-imapproxy.spec b/up-imapproxy.spec
index 204a00ceceab3964a7ab30757a4099cbd6dc657d..4ca23094dbdc309da5816d8b1d9c18e167011d51 100644 (file)
--- a/up-imapproxy.spec
+++ b/up-imapproxy.spec
@@ -1,18 +1,28 @@
-# TODO: update to 1.2.4 _and_ fix CVE-2005-2661
 Summary:       Imapproxy Daemon
 Summary(pl):   Serwer proxy dla protoko³u IMAP
 Name:          up-imapproxy
-Version:       1.2.3
+Version:       1.2.4
 Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.imapproxy.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: ad4dafd1417903feb1e09ec569ff1ad5
+# Source0-md5: ad68dd2258255ac6ef87165f518390e9
 Source1:       %{name}.init
+Patch0:                %{name}-config.patch
+Patch1:                %{name}-CVE-2005-2661.patch
 URL:           http://www.imapproxy.org/
 BuildRequires: libwrap-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,preun):  rc-scripts
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires:      libwrap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,6 +35,8 @@ po
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -43,15 +55,29 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/imapproxy
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 150 imapproxy
+%useradd -u 150 -c "IMAP proxy daemon" -g imapproxy imapproxy
+
 %post
 /sbin/chkconfig --add imapproxy
+%service imapproxy restart "IMAP proxy daemon"
 
 %preun
-/sbin/chkconfig --del imapproxy
+if [ "$1" = "0" ]; then
+       %service imapproxy stop
+       /sbin/chkconfig --del imapproxy
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+       %userremove imapproxy
+       %groupremove imapproxy
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc README README.ssl ChangeLog
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapproxy.conf
 %attr(754,root,root) /etc/rc.d/init.d/imapproxy
-%attr(750,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/*