Hejho,
Podłubałem trochę w dovecocie z AC-branch, bo potrzebowałem wtyczki
cmusieve. Przy okazji dodania tej wtyczki pozwoliłem sobie rozbić
dovecota na mniejsze paczki - tak wydaje mi się bardziej koszernie.
Buduje się na i686 i x64_86. W załączeniu diff wzgledęm AC-branch.
Pozdrawiam,
Mateusz
Index: dovecot.spec
===================================================================
RCS file: /cvsroot/SPECS/dovecot.spec,v
retrieving revision 1.40.2.11
diff -u -r1.40.2.11 dovecot.spec
--- dovecot.spec 5 Aug 2007 16:02:04 -0000 1.40.2.11
+++ dovecot.spec 1 Sep 2007 12:19:44 -0000
@@ -6,19 +6,25 @@
%bcond_without pgsql # without PostgreSQL auth
%bcond_without sqlite # without SQLite3 auth
%bcond_without sasl # without SASL auth
-#
+%bcond_without sieve # with LDA sieve plug-in
+
+%define sieve_ver 1.0.2
+%define dovecot_ver 1.0.3
+
Summary: IMAP and POP3 server written with security primarily in mind
Summary(pl): Serwer IMAP i POP3 pisany g³ównie z my¶l± o bezpieczeñstwie
Name: dovecot
-Version: 1.0.3
-Release: 1
+Version: %{dovecot_ver}
+Release: 2
License: LGPL v2.1 and MIT
Group: Networking/Daemons
Source0: http://dovecot.org/releases/1.0/%{name}-%{version}.tar.gz
# Source0-md5: 1d7cc3c4964789554553e7e4ea3f82b4
-Source1: %{name}.pamd
-Source2: %{name}.init
-Source3: %{name}.sysconfig
+%{?with_sieve:Source1: http://dovecot.org/releases/sieve/%{name}-sieve-%{sieve_ver}.tar.gz}
+# Source1-md5: 508926fc9ff8e0f6e13506e237d4916b
+Source2: %{name}.pamd
+Source3: %{name}.init
+Source4: %{name}.sysconfig
Patch0: %{name}-config.patch
URL: http://dovecot.org/
BuildRequires: autoconf
@@ -110,9 +116,229 @@
- quota Maildir++ jest obs³ugiwana, ale twarda quota na systemach
plików mo¿e byæ problematyczna
+%package imap
+Summary: IMAP4 support for dovecot
+Summary(pl): Obs³uga IMAP4 dla dovecot
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description imap
+IMAP4rev1 support for dovecot.
+
+%description -l pl imap
+Obs³uga IMAP4rev1 dla dovecot'a.
+
+%package lda
+Summary: Dovecot's Local Delivery Agent
+Summary(pl): Agent dostarczania lokalnego (LDA) dovecot'a
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description lda
+Dovecot's Local Delivery Agent.
+
+%description -l pl lda
+Agent dostarczania lokalnego dovecot'a.
+
+%package pop3
+Summary: POP3 support for dovecot
+Summary(pl): Obs³uga POP3 dla dovecot
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description pop3
+POP3 support for dovecot.
+
+%description -l pl pop3
+Obs³uga POP3 dla dovecot'a.
+
+%package plugin-acl
+Summary: Access Control Lists for mailboxes
+Summary(pl): ACLe dla skrzynek pocztowych
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-acl
+This plug-in enables Access Control Lists for mailboxes.
+
+%description -l pl plugin-acl
+Ta wtyczka umozliwia korzystanie z ACLi dla skrzynek pocztowych.
+
+
+%package plugin-lazy-expunge
+Summary: Make EXPUNGE and DELETE commands just rename the mails elsewhere
+Summary(pl): Komendy EXPUNGE i DELETE przenosz± wiadomo¶ci zamiast ich usuwaæ
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-lazy-expunge
+This plug-in makes EXPUNGE and DELETE commands just rename the mails
+elsewhere.
+
+%description -l pl plugin-lazy-expunge
+Ta wtyczka sprawia, ¿e komendy EXPUNGE i DELETE przenosz± wiadomo¶ci
+zamiast ich usuwaæ.
+
+
+%package plugin-quota
+Summary: Quota tracking and enforcing
+Summary(pl): ¦ledzenie i pilnowanie quot
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-quota
+This plug-in enables quota tracking and enforcing.
+
+%description -l pl plugin-quota
+Ta wtyczka umozliwia ¶ledzenie i pilnowanie quot.
+
+%package plugin-trash
+Summary: Delete mails from Trash when user would go over quota
+Summary(pl): Usuwanie wiadomo¶ci z kosza gdy u¿ytkownik przekracza quotê
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-plugin-quota = %{version}-%{release}
+
+%description plugin-trash
+This plug-in allows deleting mails from Trash when user would go over quota.
+
+%description -l pl plugin-trash
+Ta wtyczka umo¿liwia usuwanie wiadomo¶ci z kosza gdy u¿ytkownik przekracza quotê.
+
+
+%package plugin-convert
+Summary: Convert user's mailboxes from one format to another on login
+Summary(pl): Konwersja skrzynek pocztowych przy logowaniu
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-convert
+This plug-in allows converting user's mailboxes from one format to another on login.
+
+%description -l pl plugin-convert
+Ta wtyczka umo¿liwia konwersjê skrzynek pocztowych przy logowaniu.
+
+
+
+%package plugin-mail-log
+Summary: Log several mail actions
+Summary(pl): Logowanie operacji na skrzynce
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+
+%description plugin-mail-log
+This plug-in enables logging several mail actions.
+
+%description -l pl plugin-mail-log
+Ta wtyczka umo¿liwia logowanie operacji na skrzynce.
+
+
+%package imap-plugin-imap-quota
+Summary: IMAP commands for requesting current quota
+Summary(pl): Komendy IMAP do pobierania informacji o bierz±cej quocie
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-imap = %{version}-%{release}
+Requires: %{name}-plugin-quota = %{version}-%{release}
+
+%description imap-plugin-imap-quota
+This plug-in enables IMAP commands for requiesting current quota.
+
+%description -l pl imap-plugin-imap-quota
+Ta wtyczka uaktywnia komendy IMAP s³u¿±ce do pobierania informacji o
+bierz±cej quocie.
+
+
+%package imap-plugin-zlib
+Summary: Read-only access to gziped mboxes for dovecot
+Summary(pl): Dostêp tylko do odczytu do gzipowanych skrzynek mbox dla dovecot'a
+Version: %{version}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-imap = %{version}-%{release}
+
+%description imap-plugin-zlib
+This plug-in enables read-only access to gziped mboxes.
+
+%description -l pl imap-plugin-zlib
+Ta wtyczka umo¿liwia dostêp tylko do odczytu do gzipowanych skrzynek mbox.
+
+%if %{with sieve}
+%package sieve
+Summary: Dovecot's sieve stand-alone compiler and decompiler
+Summary(pl): Samodzielny kompilator i dekompilator skryptów siee
+Version: %{sieve_ver}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{dovecot_ver}-%{release}
+
+%description sieve
+Sieve server-side email filtering scripting language compiler and decompiler.
+This package provides sievec which may be used by a managesieve server like
+pysieved (http://woozle.org/~neale/src/pysieved/).
+
+%description -l pl sieve
+Kimpilator i dekompilator skryptów sieve s³u¿±cych do filtrowania poczty
+po stronie serwera. Ten pakiet dostarcza sievec, który mo¿e byæ u¿yty
+przez serwer managesieve taki jak pysieved
+(http://woozle.org/~neale/src/pysieved/).
+
+%package lda-plugin-cmusieve
+Summary: cmusieve plugin for dovecot's LDA
+Summary(pl): Wtyczka cmusieve do LDA dovecot'a
+Version: %{sieve_ver}
+License: LGPL v2.1 and MIT
+Group: Networking/Daemons
+URL: http://dovecot.org/
+Requires: %{name} = %{dovecot_ver}-%{release}
+Requires: %{name}-lda = %{dovecot_ver}-%{release}
+
+%description lda-plugin-cmusieve
+Sieve server-side email filtering scripting language implementation for
+dovecot. This package is provides the cmusieve LDA plug-in.
+
+%description -l pl lda-plugin-cmusieve
+Obs³uga filtrowania poczty po stronie serwera dla dovecot'a. Ten pakiet
+dostarcza wtyczkê cmusieve dla LDA.
+%endif
+
%prep
%setup -q
%patch0 -p1
+%{?with_sieve:tar xvfz %{SOURCE1}}
%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' dovecot-example.conf
@@ -136,11 +362,19 @@
--sysconfdir=/etc/%{name}
%{__make}
+%if %{with sieve}
+cd %{name}-sieve-%{sieve_ver}
+%configure \
+ --with-dovecot=../ \
+ --sysconfdir=/etc/%{name}
+%{__make}
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security}
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT{/var/lib/dovecot,/var/run/dovecot/login}
%{__make} install \
@@ -149,12 +383,19 @@
mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{dovecot-example.conf,dovecot.conf}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
+%if %{with sieve}
+cd %{name}-sieve-%{sieve_ver}
+%{__make} install \
+ moduledir=%{_libdir}/%{name}/plugins \
+ DESTDIR=$RPM_BUILD_ROOT
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -196,12 +437,92 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply
+%attr(755,root,root) %{_libdir}/%{name}/dict
+%attr(755,root,root) %{_libdir}/%{name}/dovecot-auth
+%attr(755,root,root) %{_libdir}/%{name}/gdbhelper
+%attr(755,root,root) %{_libdir}/%{name}/idxview
+%attr(755,root,root) %{_libdir}/%{name}/logview
+%attr(755,root,root) %{_libdir}/%{name}/rawlog
+%attr(755,root,root) %{_libdir}/%{name}/ssl-build-param
+%dir %{_libdir}/%{name}/plugins/imap
+%dir %{_libdir}/%{name}/plugins/lda
+%dir %{_libdir}/%{name}/plugins/pop3
%dir /var/lib/dovecot
%dir /var/run/dovecot
%attr(750,root,dovecot) %dir /var/run/dovecot/login
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+
+%files pop3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/pop3*
+
+%files imap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/imap*
+
+%files lda
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/deliver
+
+%files plugin-acl
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lib01_acl_plugin.so
+%{_libdir}/%{name}/plugins/imap/lib01_acl_plugin.so
+%{_libdir}/%{name}/plugins/lda/lib01_acl_plugin.so
+
+%files plugin-lazy-expunge
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lib02_lazy_expunge_plugin.so
+%{_libdir}/%{name}/plugins/imap/lib02_lazy_expunge_plugin.so
+%{_libdir}/%{name}/plugins/pop3/lib02_lazy_expunge_plugin.so
+
+%files plugin-quota
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lib10_quota_plugin.so
+%{_libdir}/%{name}/plugins/imap/lib10_quota_plugin.so
+%{_libdir}/%{name}/plugins/pop3/lib10_quota_plugin.so
+%{_libdir}/%{name}/plugins/lda/lib10_quota_plugin.so
+
+%files plugin-trash
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lib11_trash_plugin.so
+%{_libdir}/%{name}/plugins/imap/lib11_trash_plugin.so
+%{_libdir}/%{name}/plugins/lda/lib11_trash_plugin.so
+
+%files plugin-convert
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lib20_convert_plugin.so
+%{_libdir}/%{name}/plugins/imap/lib20_convert_plugin.so
+%{_libdir}/%{name}/plugins/pop3/lib20_convert_plugin.so
+%{_libdir}/%{name}/plugins/lda/lib20_convert_plugin.so
+
+%files plugin-mail-log
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lib20_mail_log_plugin.so
+%{_libdir}/%{name}/plugins/imap/lib20_mail_log_plugin.so
+%{_libdir}/%{name}/plugins/pop3/lib20_mail_log_plugin.so
+%{_libdir}/%{name}/plugins/lda/lib20_mail_log_plugin.so
+
+%files imap-plugin-imap-quota
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/imap/lib11_imap_quota_plugin.so
+
+%files imap-plugin-zlib
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/imap/lib20_zlib_plugin.so
+
+%if %{with sieve}
+%files sieve
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/sieve*
+
+%files lda-plugin-cmusieve
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/plugins/lda/lib90_cmusieve_plugin.so
+%endif
+
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl