changeset
Update to new major vendor version from 1 to 2, adjusting buildconf accordingly.
Wed, 08 Feb 2012 20:16:25 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:16:25 +0200
- changeset 608
- 09548e292fb1
- parent 607
- 3f80fa12b972
- child 609
- 747afbba9aa8
Update to new major vendor version from 1 to 2, adjusting buildconf accordingly.
1.1 --- a/dovecot/dovecot.conf Wed Feb 08 20:16:40 2012 +0200 1.2 +++ b/dovecot/dovecot.conf Wed Feb 08 20:16:25 2012 +0200 1.3 @@ -2,72 +2,103 @@ 1.4 ## dovecot.conf -- Dovecot server configuration 1.5 ## 1.6 1.7 -protocols = imap 1.8 +protocols = imap pop3 sieve 1.9 1.10 -protocol imap { 1.11 - listen = 127.0.0.1:143 1.12 - ssl_listen = 127.0.0.1:993 1.13 - log_path = @l_prefix@/var/dovecot/log/imap-error.log 1.14 - info_log_path = @l_prefix@/var/dovecot/log/imap-info.log 1.15 - login_executable = @l_prefix@/libexec/dovecot/imap-login 1.16 - mail_executable = @l_prefix@/libexec/dovecot/rawlog @l_prefix@/libexec/dovecot/imap 1.17 +service imap-login { 1.18 + protocol = imap 1.19 + inet_listener imap { 1.20 + address = 127.0.0.1 1.21 + port = 143 1.22 + } 1.23 + inet_listener imaps { 1.24 + address = 127.0.0.1 1.25 + port = 993 1.26 + } 1.27 + client_limit = 256 1.28 + process_limit = 128 1.29 + process_min_avail = 4 1.30 + user = @l_musr@ 1.31 +} 1.32 + 1.33 +service pop3-login { 1.34 + protocol = pop3 1.35 + inet_listener pop3 { 1.36 + address = 127.0.0.1 1.37 + port = 110 1.38 + } 1.39 + inet_listener pop3s { 1.40 + address = 127.0.0.1 1.41 + port = 995 1.42 + } 1.43 + client_limit = 256 1.44 + process_limit = 128 1.45 + process_min_avail = 4 1.46 + user = @l_musr@ 1.47 +} 1.48 + 1.49 +service managesieve-login { 1.50 + protocol = sieve 1.51 + inet_listener sieve { 1.52 + address = 127.0.0.1 1.53 + port = 4190 1.54 + } 1.55 + client_limit = 256 1.56 + process_limit = 128 1.57 + process_min_avail = 4 1.58 + user = @l_musr@ 1.59 +} 1.60 + 1.61 +service auth { 1.62 + unix_listener auth-master { 1.63 + mode = 0660 1.64 + } 1.65 + unix_listener auth-client { 1.66 + mode = 0660 1.67 + } 1.68 + unix_listener auth-userdb { 1.69 + mode = 0660 1.70 + } 1.71 } 1.72 1.73 ssl = yes 1.74 -ssl_cert_file = @l_prefix@/etc/x509/example-server.crt.pem 1.75 -ssl_key_file = @l_prefix@/etc/x509/example-server.key.pem 1.76 +ssl_ca = <@l_prefix@/etc/x509/example-ca.crt.pem 1.77 +ssl_cert = <@l_prefix@/etc/x509/example-server.crt.pem 1.78 +ssl_key = <@l_prefix@/etc/x509/example-server.key.pem 1.79 1.80 -log_path = @l_prefix@/var/dovecot/log/dovecot-error.log 1.81 -info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log 1.82 -log_timestamp = '%b %d %H:%M:%S ' 1.83 - 1.84 -login_user = @l_nusr@ 1.85 -login_processes_count = 4 1.86 -login_max_processes_count = 128 1.87 -login_max_connections = 256 1.88 - 1.89 -mail_location = mbox:~/.mail:INBOX=~/.mail/inbox 1.90 +mail_location = mbox:~/.mail:INBOX=~/.mail/inbox:INDEX=~/.mail 1.91 mail_uid = @l_rusr@ 1.92 mail_gid = @l_rusr@ 1.93 mail_privileged_group = @l_rusr@ 1.94 mbox_read_locks = fcntl 1.95 mbox_write_locks = fcntl 1.96 1.97 +plugin { 1.98 + sieve_dir = ~/.mail/.sieve 1.99 + sieve = ~/.mail/.sieve.active 1.100 +} 1.101 + 1.102 auth_realms = example.com 1.103 -auth_default_realm = 1.104 auth_verbose = yes 1.105 disable_plaintext_auth = no 1.106 1.107 +auth_mechanisms = plain login 1.108 auth_debug = no 1.109 auth_debug_passwords = no 1.110 mail_debug = no 1.111 verbose_ssl = no 1.112 1.113 +default_login_user = @l_musr@ 1.114 +default_internal_user = @l_rusr@ 1.115 + 1.116 protocol lda { 1.117 postmaster_address = postmaster 1.118 - log_path = @l_prefix@/var/dovecot/log/deliver-error.log 1.119 - info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log 1.120 } 1.121 1.122 -auth default { 1.123 - mechanisms = plain login 1.124 - passdb passwd { 1.125 - } 1.126 - userdb passwd { 1.127 - } 1.128 - socket listen { 1.129 - master { 1.130 - path = @l_prefix@/var/dovecot/run/auth-master 1.131 - mode = 0600 1.132 - user = @l_rusr@ 1.133 - group = @l_rugrp@ 1.134 - } 1.135 - client { 1.136 - path = @l_prefix@/var/dovecot/run/auth-client 1.137 - mode = 0660 1.138 - user = @l_musr@ 1.139 - group = @l_mgrp@ 1.140 - } 1.141 - } 1.142 +passdb { 1.143 + driver = passwd 1.144 } 1.145 1.146 +userdb { 1.147 + driver = passwd 1.148 +} 1.149 +
2.1 --- a/dovecot/dovecot.patch Wed Feb 08 20:16:40 2012 +0200 2.2 +++ b/dovecot/dovecot.patch Wed Feb 08 20:16:25 2012 +0200 2.3 @@ -1,9 +1,8 @@ 2.4 Index: configure.in 2.5 -diff -Nau configure.in.orig configure.in 2.6 ---- configure.in.orig 2009-07-27 07:26:10 +0200 2.7 -+++ configure.in 2009-07-27 16:49:17 +0200 2.8 -@@ -1964,14 +1964,14 @@ 2.9 - AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) 2.10 +--- configure.in.orig 2011-03-04 19:47:50.000000000 +0100 2.11 ++++ configure.in 2011-03-05 13:00:48.000000000 +0100 2.12 +@@ -2100,14 +2100,14 @@ 2.13 + AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO) 2.14 if test $PG_CONFIG = NO; then 2.15 # based on code from PHP 2.16 - for i in /usr /usr/local /usr/local/pgsql; do 2.17 @@ -22,10 +21,9 @@ 2.18 PGSQL_LIBDIR=$i/$j 2.19 fi 2.20 Index: configure 2.21 -diff -Nau configure.orig configure 2.22 ---- configure.orig 2009-07-27 07:26:28 +0200 2.23 -+++ configure 2009-07-27 16:50:02 +0200 2.24 -@@ -29410,14 +29410,14 @@ 2.25 +--- configure.orig 2011-03-04 19:47:55.000000000 +0100 2.26 ++++ configure 2011-03-05 13:00:48.000000000 +0100 2.27 +@@ -22858,14 +22858,14 @@ 2.28 2.29 if test $PG_CONFIG = NO; then 2.30 # based on code from PHP 2.31 @@ -44,49 +42,3 @@ 2.32 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 2.33 PGSQL_LIBDIR=$i/$j 2.34 fi 2.35 -Index: src/deliver/deliver.c 2.36 -diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c 2.37 ---- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 2.38 -+++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 2.39 -@@ -46,7 +46,7 @@ 2.40 - #include <syslog.h> 2.41 - 2.42 - #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf" 2.43 --#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail" 2.44 -+#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail" 2.45 - #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" 2.46 - 2.47 - /* After buffer grows larger than this, create a temporary file to /tmp 2.48 -Index: src/master/master-settings.c 2.49 -diff -Nau src/master/master-settings.c.orig src/master/master-settings.c 2.50 ---- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200 2.51 -+++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200 2.52 -@@ -179,8 +179,8 @@ 2.53 - 2.54 - /* general */ 2.55 - MEMBER(protocols) "imap imaps", 2.56 -- MEMBER(listen) "*", 2.57 -- MEMBER(ssl_listen) "", 2.58 -+ MEMBER(listen) "127.0.0.1", 2.59 -+ MEMBER(ssl_listen) "127.0.0.1", 2.60 - 2.61 - MEMBER(ssl) "yes", 2.62 - MEMBER(ssl_ca_file) "", 2.63 -@@ -200,7 +200,7 @@ 2.64 - /* login */ 2.65 - MEMBER(login_dir) "login", 2.66 - MEMBER(login_executable) NULL, 2.67 -- MEMBER(login_user) "dovecot", 2.68 -+ MEMBER(login_user) "@l_musr@", 2.69 - MEMBER(login_greeting) PACKAGE_NAME" ready.", 2.70 - MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", 2.71 - MEMBER(login_log_format) "%$: %s", 2.72 -@@ -321,7 +321,7 @@ 2.73 - MEMBER(anonymous_username) "anonymous", 2.74 - MEMBER(krb5_keytab) "", 2.75 - MEMBER(gssapi_hostname) "", 2.76 -- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", 2.77 -+ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", 2.78 - MEMBER(failure_delay) 2, 2.79 - 2.80 - MEMBER(verbose) FALSE,
3.1 --- a/dovecot/dovecot.spec Wed Feb 08 20:16:40 2012 +0200 3.2 +++ b/dovecot/dovecot.spec Wed Feb 08 20:16:25 2012 +0200 3.3 @@ -1,6 +1,6 @@ 3.4 ## 3.5 ## dovecot.spec -- OpenPKG RPM Package Specification 3.6 -## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> 3.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 3.8 ## 3.9 ## Permission to use, copy, modify, and distribute this software for 3.10 ## any purpose with or without fee is hereby granted, provided that 3.11 @@ -21,20 +21,10 @@ 3.12 ## SUCH DAMAGE. 3.13 ## 3.14 3.15 -# MSvB: 3.16 -# MSvB: Problem, dovecot is creating %{l_prefix}/var/lib 3.17 -# MSvB: ...and /opmi/var/dovecot/users/n ??? 3.18 -# MSvB: 3.19 - 3.20 # package version 3.21 -%define V_major 1.2 3.22 -%define V_minor 6 3.23 -%define V_sieve_base 1.2 3.24 -%define V_sieve 0.1.13 3.25 -%define V_managesieve_base 1.2.6 3.26 -%define V_managesieve 0.11.9 3.27 -%define V_managesieved_base 1.2 3.28 -%define V_managesieved 0.11.9 3.29 +%define V_major 2.0 3.30 +%define V_minor 18 3.31 +%define V_pigeonhole 0.2.6 3.32 3.33 # package information 3.34 Name: dovecot 3.35 @@ -47,13 +37,12 @@ 3.36 Group: Mail 3.37 License: MIT+LGPL 3.38 Version: %{V_major}.%{V_minor} 3.39 -Release: 20091104 3.40 +Release: 20120208 3.41 3.42 # package options 3.43 %option with_fsl yes 3.44 -%option with_pam yes 3.45 %option with_sieve yes 3.46 -%option with_managesieve yes 3.47 +%option with_pam no 3.48 %option with_ldap no 3.49 %option with_mysql no 3.50 %option with_pgsql no 3.51 @@ -61,21 +50,19 @@ 3.52 3.53 # list of sources 3.54 Source0: http://www.dovecot.org/releases/%{V_major}/dovecot-%{V_major}.%{V_minor}.tar.gz 3.55 -Source1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_sieve_base}-sieve-%{V_sieve}.tar.gz 3.56 -Source2: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved}.tar.gz 3.57 -Source3: fsl.dovecot 3.58 -Source4: rc.dovecot 3.59 -Source5: dovecot.conf 3.60 +Source1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_major}-pigeonhole-%{V_pigeonhole}.tar.gz 3.61 +Source2: fsl.dovecot 3.62 +Source3: rc.dovecot 3.63 +Source4: dovecot.conf 3.64 Patch0: dovecot.patch 3.65 -Patch1: http://www.rename-it.nl/dovecot/%{V_major}/dovecot-%{V_managesieve_base}-managesieve-%{V_managesieve}.diff.gz 3.66 3.67 # build information 3.68 Prefix: %{l_prefix} 3.69 BuildRoot: %{l_buildroot} 3.70 BuildPreReq: OpenPKG, openpkg >= 20060823 3.71 PreReq: OpenPKG, openpkg >= 20060823, MTA, x509 3.72 -BuildPreReq: libiconv, openssl 3.73 -PreReq: libiconv, openssl 3.74 +BuildPreReq: libiconv, openssl, zlib, bzip2 3.75 +PreReq: libiconv, openssl, zlib, bzip2 3.76 %if "%{with_fsl}" == "yes" 3.77 BuildPreReq: fsl 3.78 PreReq: fsl 3.79 @@ -84,8 +71,8 @@ 3.80 BuildPreReq: openldap 3.81 PreReq: openldap 3.82 %endif 3.83 -%if "%{with_managesieve}" == "yes" 3.84 -BuildPreReq: gettext 3.85 +%if "%{with_sieve}" == "yes" 3.86 +BuildPreReq: gettext, autoconf, automake, libtool 3.87 PreReq: gettext 3.88 %endif 3.89 %if "%{with_pam}" == "yes" 3.90 @@ -117,22 +104,12 @@ 3.91 prog dovecot = { 3.92 version = %{V_major}.%{V_minor} 3.93 url = http://www.dovecot.org/download.html 3.94 - regex = dovecot-(__VER__)\.tar\.gz 3.95 + regex = dovecot-(\d+\.\d+(?:\.\d+))\.tar\.gz 3.96 } 3.97 prog dovecot:sieve = { 3.98 - version = %{V_sieve} 3.99 + version = %{V_pigeonhole} 3.100 url = http://www.rename-it.nl/dovecot/%{V_major}/ 3.101 - regex = dovecot-%{V_sieve_base}-sieve-(__VER__)\.tar\.gz 3.102 - } 3.103 - prog dovecot:managesieved = { 3.104 - version = %{V_managesieved} 3.105 - url = http://www.rename-it.nl/dovecot/%{V_major}/ 3.106 - regex = dovecot-%{V_managesieved_base}-managesieve-(__VER__)\.tar\.gz 3.107 - } 3.108 - prog dovecot:managesieve = { 3.109 - version = %{V_managesieve} 3.110 - url = http://www.rename-it.nl/dovecot/%{V_major}/ 3.111 - regex = dovecot-%{V_managesieve_base}-managesieve-(__VER__)\.diff\.gz 3.112 + regex = dovecot-%{V_major}-pigeonhole-(__VER__)\.tar\.gz 3.113 } 3.114 3.115 %prep 3.116 @@ -140,13 +117,14 @@ 3.117 %if "%{with_sieve}" == "yes" 3.118 %setup -q -T -D -a 1 3.119 %endif 3.120 -%if "%{with_managesieve}" == "yes" 3.121 - %setup -q -T -D -a 2 3.122 - %{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1 -b 3.123 -%endif 3.124 %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b 3.125 3.126 %build 3.127 + # build Dovecot 3.128 + %{l_shtool} subst \ 3.129 + -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \ 3.130 + src/config/all-settings.c \ 3.131 + src/lib-lda/lda-settings.c 3.132 cppflags="%{l_cppflags}" 3.133 ldflags="%{l_ldflags} %{l_fsl_ldflags}" 3.134 libs="%{l_fsl_libs}" 3.135 @@ -157,17 +135,11 @@ 3.136 %if "%{with_mysql}" == "yes" 3.137 cppflags="$cppflags %{l_cppflags mysql}" 3.138 ldflags="$ldflags %{l_ldflags mysql}" 3.139 - sql_drivers="$sql_drivers,mysql" 3.140 %endif 3.141 %if "%{with_pgsql}" == "yes" 3.142 libs="$libs -lssl -lcrypto -lcrypt" 3.143 - sql_drivers="$sql_drivers,pgsql" 3.144 -%endif 3.145 -%if "%{with_sqlite}" == "yes" 3.146 - sql_drivers="$sql_drivers,sqlite" 3.147 %endif 3.148 sql_drivers=`echo "$sql_drivers" | sed 's;^,;;'` 3.149 - 3.150 CC="%{l_cc}" \ 3.151 CFLAGS="%{l_cflags -O}" \ 3.152 CPPFLAGS="$cppflags" \ 3.153 @@ -176,12 +148,11 @@ 3.154 ./configure \ 3.155 --prefix=%{l_prefix} \ 3.156 --mandir=%{l_prefix}/man \ 3.157 - --sysconfdir=%{l_prefix}/etc/dovecot \ 3.158 + --sysconfdir=%{l_prefix}/etc \ 3.159 --with-ssldir=%{l_prefix}/etc/dovecot/ssl \ 3.160 --datadir=%{l_prefix}/share/dovecot \ 3.161 --docdir=%{l_prefix}/share/dovecot/doc \ 3.162 --with-rundir=%{l_prefix}/var/dovecot/run \ 3.163 - --with-statedir=%{l_prefix}/var/dovecot/dat \ 3.164 --with-libiconv-prefix=%{l_prefix} \ 3.165 --with-ssl=openssl \ 3.166 --with-docs \ 3.167 @@ -192,7 +163,6 @@ 3.168 %endif 3.169 %if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_sqlite}" == "yes" 3.170 --with-sql \ 3.171 - --with-sql-drivers="$sql_drivers" \ 3.172 %if "%{with_mysql}" == "yes" 3.173 --with-mysql \ 3.174 %else 3.175 @@ -210,7 +180,6 @@ 3.176 %endif 3.177 %else 3.178 --without-sql \ 3.179 - --without-sql-drivers \ 3.180 --without-mysql \ 3.181 --without-pgsql \ 3.182 --without-sqlite \ 3.183 @@ -224,12 +193,14 @@ 3.184 --without-gssapi \ 3.185 --without-lucene \ 3.186 --without-vpopmail \ 3.187 + --enable-shared \ 3.188 --disable-static 3.189 %{l_make} %{l_mflags -O} 3.190 3.191 %if "%{with_sieve}" == "yes" 3.192 # build optional Dovecot LDA sieve plugin 3.193 - ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} 3.194 + ( cd dovecot-*-pigeonhole-* 3.195 + ./autogen.sh 3.196 CC="%{l_cc}" \ 3.197 CFLAGS="%{l_cflags -O}" \ 3.198 CPPFLAGS="%{l_cppflags}" \ 3.199 @@ -237,51 +208,33 @@ 3.200 ./configure \ 3.201 --prefix=%{l_prefix} \ 3.202 --mandir=%{l_prefix}/man \ 3.203 - --with-dovecot=`pwd`/.. 3.204 - %{l_make} %{l_mflags -O} 3.205 - ) || exit $? 3.206 -%endif 3.207 -%if "%{with_managesieve}" == "yes" 3.208 - # build optional Dovecot LDA managesieve daemon 3.209 - ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} 3.210 - CC="%{l_cc}" \ 3.211 - CFLAGS="%{l_cflags -O}" \ 3.212 - CPPFLAGS="%{l_cppflags}" \ 3.213 - LDFLAGS="%{l_ldflags}" \ 3.214 - ./configure \ 3.215 - --prefix=%{l_prefix} \ 3.216 - --mandir=%{l_prefix}/man \ 3.217 - --with-dovecot-sieve=`pwd`/../dovecot-%{V_sieve_base}-sieve-%{V_sieve} \ 3.218 - --with-dovecot=`pwd`/.. 3.219 + --with-dovecot=`pwd`/.. \ 3.220 + --with-managesieve 3.221 %{l_make} %{l_mflags -O} 3.222 ) || exit $? 3.223 %endif 3.224 3.225 %install 3.226 + # clean build cruft 3.227 rm -rf $RPM_BUILD_ROOT 3.228 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.229 + 3.230 + # install Dovecot 3.231 + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" 3.232 3.233 %if "%{with_sieve}" == "yes" 3.234 # install optional Dovecot LDA sieve plugin 3.235 - ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} 3.236 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.237 - ) || exit $? 3.238 -%endif 3.239 -%if "%{with_managesieve}" == "yes" 3.240 - # install optional Dovecot LDA managesieve daemon 3.241 - ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} 3.242 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.243 + ( cd dovecot-*-pigeonhole-* 3.244 + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" 3.245 ) || exit $? 3.246 %endif 3.247 3.248 # create additional dirctories 3.249 %{l_shtool} mkdir -f -p -m 755 \ 3.250 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ssl \ 3.251 - $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/dat \ 3.252 $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/log \ 3.253 $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/run/login 3.254 3.255 - # install runcommand script 3.256 + # install run-command script 3.257 %{l_shtool} mkdir -f -p -m 755 \ 3.258 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d 3.259 %{l_shtool} install -c -m 755 %{l_value -s -a} \ 3.260 @@ -289,13 +242,12 @@ 3.261 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ 3.262 3.263 # strip installation 3.264 - rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot*example.conf 3.265 - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \ 3.266 - >/dev/null 2>&1 || true 3.267 - rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/auth \ 3.268 - $RPM_BUILD_ROOT%{l_prefix}/include/dovecot \ 3.269 - $RPM_BUILD_ROOT%{l_prefix}/include \ 3.270 - >/dev/null 2>&1 || true 3.271 + rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot 3.272 + rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/README 3.273 + rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot*example.conf 3.274 + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/dovecot 3.275 + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.a >/dev/null 2>&1 || true 3.276 + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la >/dev/null 2>&1 || true 3.277 strip \ 3.278 $RPM_BUILD_ROOT%{l_prefix}/sbin/* \ 3.279 $RPM_BUILD_ROOT%{l_prefix}/libexec/dovecot/* \ 3.280 @@ -304,7 +256,7 @@ 3.281 # install default server configuration 3.282 %{l_shtool} mkdir -f -p -m 755 \ 3.283 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot 3.284 - %{l_shtool} install -c -m 640 %{l_value -s -a} \ 3.285 + %{l_shtool} install -c -m 644 %{l_value -s -a} \ 3.286 %{SOURCE dovecot.conf} \ 3.287 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ 3.288 3.289 @@ -320,15 +272,12 @@ 3.290 '%not %dir %{l_prefix}/etc/fsl' \ 3.291 '%config %{l_prefix}/etc/fsl/fsl.dovecot' \ 3.292 '%config %attr(0600,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/dovecot/*' \ 3.293 - '%config %attr(0640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ 3.294 + '%config %attr(0644,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ 3.295 '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/dovecot/ssl' \ 3.296 - '%dir %attr(0755,%{l_musr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ 3.297 - '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/dat' \ 3.298 - '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ 3.299 - '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \ 3.300 - '%dir %attr(0750,%{l_musr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \ 3.301 - '%doc %{l_prefix}/share/dovecot/doc' \ 3.302 - '%doc %{l_prefix}/share/dovecot/doc/wiki' 3.303 + '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ 3.304 + '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ 3.305 + '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \ 3.306 + '%dir %attr(0750,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run/login' 3.307 3.308 %files -f files 3.309 3.310 @@ -347,7 +296,6 @@ 3.311 [ $1 -eq 0 ] || exit 0 3.312 %{l_rc} dovecot stop 2>/dev/null 3.313 rm -f $RPM_INSTALL_PREFIX/var/dovecot/* >/dev/null 2>&1 || true 3.314 - rm -f $RPM_INSTALL_PREFIX/var/dovecot/dat/* >/dev/null 2>&1 || true 3.315 rm -f $RPM_INSTALL_PREFIX/var/dovecot/log/* >/dev/null 2>&1 || true 3.316 rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/* >/dev/null 2>&1 || true 3.317 rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/login/* >/dev/null 2>&1 || true
