[Limacute-commit] r136 - trunk/RPM/SRC/kolabd
limacute at projects.linpro.no
limacute at projects.linpro.no
Mon Apr 23 23:53:31 CEST 2007
Author: limacute
Date: 2007-04-23 23:53:30 +0200 (Mon, 23 Apr 2007)
New Revision: 136
Added:
trunk/RPM/SRC/kolabd/kolabd-2.1.0.patch
trunk/RPM/SRC/kolabd/kolabd-2.1.0.tar.bz2
Removed:
trunk/RPM/SRC/kolabd/kolabd-2.0.99.patch
trunk/RPM/SRC/kolabd/kolabd-2.0.99.tar.bz2
trunk/RPM/SRC/kolabd/kolabd.spec.patch
Modified:
trunk/RPM/SRC/kolabd/kolabd.spec
Log:
Update kolabd from rc2 with limacute patch.
Deleted: trunk/RPM/SRC/kolabd/kolabd-2.0.99.patch
===================================================================
--- trunk/RPM/SRC/kolabd/kolabd-2.0.99.patch 2007-04-23 21:31:10 UTC (rev 135)
+++ trunk/RPM/SRC/kolabd/kolabd-2.0.99.patch 2007-04-23 21:53:30 UTC (rev 136)
@@ -1,377 +0,0 @@
-diff -Naur kolabd-2.0.99.orig/Makefile.am kolabd-2.0.99/Makefile.am
---- kolabd-2.0.99.orig/Makefile.am 2006-03-09 22:52:02.000000000 +0100
-+++ kolabd-2.0.99/Makefile.am 2007-02-17 02:21:40.000000000 +0100
-@@ -62,6 +62,7 @@
- templates/resmgr.conf.template \
- templates/saslauthd.conf.template \
- templates/session_vars.php.template \
-+ templates/sharedfolders.pcre.template \
- templates/slapd.access.template \
- templates/slapd.conf.template \
- templates/slapd.replicas.template \
-@@ -444,6 +445,12 @@
- CLEANFILES += templates/session_vars.php.template
- EXTRA_DIST += templates/session_vars.php.template.in
-
-+templates/sharedfolders.pcre.template:
-+ @$(mkinstalldirs) templates
-+ $(do_subst) <$(srcdir)/templates/sharedfolders.pcre.template.in >$@
-+CLEANFILES += templates/sharedfolders.pcre.template
-+EXTRA_DIST += templates/sharedfolders.pcre.template.in
-+
- templates/slapd.access.template:
- @$(mkinstalldirs) templates
- $(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
-diff -Naur kolabd-2.0.99.orig/Makefile.in kolabd-2.0.99/Makefile.in
---- kolabd-2.0.99.orig/Makefile.in 2007-02-05 18:29:29.000000000 +0100
-+++ kolabd-2.0.99/Makefile.in 2007-02-17 02:21:40.000000000 +0100
-@@ -188,6 +188,7 @@
- templates/resmgr.conf.template.in \
- templates/saslauthd.conf.template.in \
- templates/session_vars.php.template.in \
-+ templates/sharedfolders.pcre.template.in \
- templates/slapd.access.template.in \
- templates/slapd.conf.template.in \
- templates/slapd.replicas.template.in \
-@@ -222,6 +223,7 @@
- templates/rc.conf.template templates/resmgr.conf.template \
- templates/saslauthd.conf.template \
- templates/session_vars.php.template \
-+ templates/sharedfolders.pcre.template \
- templates/slapd.access.template templates/slapd.conf.template \
- templates/slapd.replicas.template \
- templates/smtpd.conf.template templates/transport.template \
-@@ -275,6 +277,7 @@
- templates/resmgr.conf.template \
- templates/saslauthd.conf.template \
- templates/session_vars.php.template \
-+ templates/sharedfolders.pcre.template \
- templates/slapd.access.template \
- templates/slapd.conf.template \
- templates/slapd.replicas.template \
-@@ -1073,6 +1076,10 @@
- @$(mkinstalldirs) templates
- $(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@
-
-+templates/sharedfolders.pcre.template:
-+ @$(mkinstalldirs) templates
-+ $(do_subst) <$(srcdir)/templates/sharedfolders.pcre.template.in >$@
-+
- templates/slapd.access.template:
- @$(mkinstalldirs) templates
- $(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
-diff -Naur kolabd-2.0.99.orig/kolab2.schema kolabd-2.0.99/kolab2.schema
---- kolabd-2.0.99.orig/kolab2.schema 2007-02-02 16:16:45.000000000 +0100
-+++ kolabd-2.0.99/kolab2.schema 2007-02-17 02:21:40.000000000 +0100
-@@ -384,6 +384,30 @@
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-+attributetype ( 1.3.6.1.4.1.19414.2.1.511
-+ NAME 'postfix-require-fqdn'
-+ EQUALITY booleanMatch
-+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-+ SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.4.1.19414.2.1.512
-+ NAME 'postfix-reject-unknown'
-+ EQUALITY booleanMatch
-+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-+ SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.4.1.19414.2.1.513
-+ NAME 'postfix-rbl'
-+ EQUALITY booleanMatch
-+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-+ SINGLE-VALUE )
-+
-+attributetype ( 1.3.6.1.4.1.19414.2.1.514
-+ NAME 'postfix-greylist'
-+ EQUALITY booleanMatch
-+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-+ SINGLE-VALUE )
-+
- ##########################
- # cyrus imapd attributes #
- ##########################
-@@ -534,6 +558,10 @@
- postfix-virtual $
- postfix-enable-virus-scan $
- postfix-allow-unauthenticated $
-+ postfix-greylist $
-+ postfix-rbl $
-+ postfix-reject-unknown $
-+ postfix-require-fqdn $
- cyrus-quotawarn $
- cyrus-autocreatequota $
- cyrus-admins $
-@@ -565,6 +593,7 @@
- SUP top STRUCTURAL
- MUST cn
- MAY ( acl $
-+ mail $
- alias $
- cyrus-userquota $
- kolabHomeServer $
-diff -Naur kolabd-2.0.99.orig/kolabd.spec.orig kolabd-2.0.99/kolabd.spec.orig
---- kolabd-2.0.99.orig/kolabd.spec.orig 1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.0.99/kolabd.spec.orig 2007-02-05 18:29:30.000000000 +0100
-@@ -0,0 +1,126 @@
-+##
-+## kolabd.spec -- OpenPKG RPM Specification
-+## Copyright (c) 2004-2005 Klaraelvdalens Datakonsult AB <http://www.klaralvdalens-datakonsult.se>
-+## Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
-+## Copyright (c) 2000-2004 Ralf S. Engelschall <rse at engelschall.com>
-+## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
-+##
-+## Permission to use, copy, modify, and distribute this software for
-+## any purpose with or without fee is hereby granted, provided that
-+## the above copyright notice and this permission notice appear in all
-+## copies.
-+##
-+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+## SUCH DAMAGE.
-+##
-+
-+# package version
-+%define V_ei_maj 2.0
-+%define V_ei_min 99
-+%define V_cf 1.0.4
-+
-+# package information
-+Name: kolabd
-+Summary: Kolab2 Groupware Server Daemon
-+URL: http://www.kolab.org/
-+Vendor: Erfrakon, Intevation, Code Fusion, Klaraelvdalens Datakonsult AB
-+Packager: Klaraelvdalens Datakonsult AB
-+Distribution: OpenPKG
-+Class: PLUS
-+Group: Mail
-+License: GPL
-+Version: 2.0.99
-+Release: 20070205
-+
-+# list of sources
-+Source0: kolabd-%{version}.tar.bz2
-+#Source1: rc.kolabd
-+
-+# build information
-+Prefix: %{l_prefix}
-+BuildRoot: %{l_buildroot}
-+BuildPreReq: OpenPKG, openpkg >= 2.0.0
-+PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.23-2.3.0_kolab2, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
-+PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
-+PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
-+PreReq: gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes
-+PreReq: postfix >= 2.1.5-2.2.0_kolab3, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
-+PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes
-+PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
-+PreReq: perl-kolab >= 5.8.7-20050728, perl-db
-+PreReq: amavisd >= 2.3.1-2.4.0
-+PreReq: clamav
-+AutoReq: no
-+AutoReqProv: no
-+
-+%option kolab_version snapshot
-+
-+%description
-+ Kolab is the KDE Groupware Server that provides full groupware
-+ features to either KDE Kolab clients or Microsoft Outlook[tm]
-+ clients using third party plugins and web clients in the future.
-+ In addition it is a robust and flexible general IMAP mail server
-+ with LDAP addressbooks.
-+ Kolab %{V_ei_maj}.%{V_ei_min}
-+
-+ The Code Fusion fork adds functionality such as integration with
-+ Active Directory, a more modularised backend, separation of the
-+ daemon and the configuration generator and more.
-+ Code Fusion Engine %{V_cf}, shares Admin (see above)
-+
-+%track
-+ prog kolab-ei = {
-+ version = %{V_ei_maj}.%{V_ei_min}
-+ url = ftp://ftp.kdab.net/pub/kolab/server/current/
-+ regex = kolabd-(__VER__)\.src\.rpm
-+ }
-+
-+%prep
-+ %setup -q
-+
-+%build
-+ ./configure --prefix=%{l_prefix} --with-dist=kolab
-+ %{l_make} %{l_mflags}
-+
-+%install
-+ rm -rf $RPM_BUILD_ROOT
-+
-+ # install package
-+ %{l_make} %{l_mflags} install \
-+ DESTDIR=$RPM_BUILD_ROOT
-+
-+ # generate file list
-+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-+ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \
-+ '%config %{l_prefix}/etc/kolab/*.pem' \
-+ '%config %{l_prefix}/etc/kolab/*.schema' \
-+ '%config %{l_prefix}/etc/kolab/kolab.conf' \
-+ '%config %{l_prefix}/etc/kolab/quotawarning.txt' \
-+ '%config %{l_prefix}/etc/kolab/templates/*.template'
-+
-+%files -f files
-+
-+%clean
-+ rm -rf $RPM_BUILD_ROOT
-+
-+%post
-+ %{l_shtool} echo -e "Installing crontab entry"
-+ # NOTE: OpenPKG's dcron package does not work currently,
-+ # so we have to rely on the host system's cron:
-+ %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
-+ '
-+*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | crontab - -u %{l_musr}
-+
-+ echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b' as user root."
-+ echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."
-+ echo "In every case execute '$RPM_INSTALL_PREFIX/bin/openpkg rc kolabd restart' as user root."
-diff -Naur kolabd-2.0.99.orig/kolabd.spec.rej kolabd-2.0.99/kolabd.spec.rej
---- kolabd-2.0.99.orig/kolabd.spec.rej 1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.0.99/kolabd.spec.rej 2007-02-17 02:21:40.000000000 +0100
-@@ -0,0 +1,17 @@
-+***************
-+*** 40,46 ****
-+ Group: Mail
-+ License: GPL
-+ Version: 2.0.99
-+- Release: 20070117
-+
-+ # list of sources
-+ Source0: kolabd-%{version}.tar.bz2
-+--- 40,46 ----
-+ Group: Mail
-+ License: GPL
-+ Version: 2.0.99
-++ Release: 20070130
-+
-+ # list of sources
-+ Source0: kolabd-%{version}.tar.bz2
-diff -Naur kolabd-2.0.99.orig/quotawarning.txt kolabd-2.0.99/quotawarning.txt
---- kolabd-2.0.99.orig/quotawarning.txt 2005-06-06 23:27:25.000000000 +0200
-+++ kolabd-2.0.99/quotawarning.txt 2007-02-17 02:21:40.000000000 +0100
-@@ -1,15 +1,15 @@
--[This is an automatically generated message.]
-+[Denne meldingen er sendt av et dataprogram.]
-
--The mailbox for <user> is <percent>% full, please clean it up.
--The size of the mailbox is currently <used> KB out of a total
--allowed <total> KB.
-+Epostkontoen for <user> er <percent>% full, vennligst rydd opp og
-+slett unødig epost, samt epost med store vedlegg.
-+Epostkontoen bruker <used> KB av maksimalt <total> KB.
-
- <admin>
-
--[Dies ist eine automatisch generierte Nachricht]
-+[This is an automatically generated message.]
-
--Das Postfach für <user> ist zu <percent>% gefüllt. Bitte
--räumen Sie es auf.
--Das Postfach belegt zurzeit <used> KB von erlaubten <total> KB.
-+The mailbox for <user> is <percent>% full, please clean it up.
-+The size of the mailbox is currently <used> KB out of a total
-+allowed <total> KB.
-
- <admin>
-diff -Naur kolabd-2.0.99.orig/templates/httpd.conf.template.in kolabd-2.0.99/templates/httpd.conf.template.in
---- kolabd-2.0.99.orig/templates/httpd.conf.template.in 2007-02-05 17:38:39.000000000 +0100
-+++ kolabd-2.0.99/templates/httpd.conf.template.in 2007-02-17 02:23:22.000000000 +0100
-@@ -135,7 +135,7 @@
- AccessFileName .htaccess
-
- <Location @webserver_web_prefix@/>
-- ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/admin/
-+ ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/squirrelmail/
- </Location>
- <Location "@webserver_web_prefix@/fbview">
- Deny from all
-@@ -420,3 +420,4 @@
-
- # used for local non Kolab extension
- Include @webserver_confdir@/apache.local
-+Include @webserver_confdir@/apache.d/*.conf
-diff -Naur kolabd-2.0.99.orig/templates/main.cf.template.in kolabd-2.0.99/templates/main.cf.template.in
---- kolabd-2.0.99.orig/templates/main.cf.template.in 2007-01-29 11:45:45.000000000 +0100
-+++ kolabd-2.0.99/templates/main.cf.template.in 2007-02-17 02:21:40.000000000 +0100
-@@ -71,7 +71,9 @@
- canonical_maps = hash:@emailserver_confdir@/canonical
- virtual_maps = hash:@emailserver_confdir@/virtual,
- ldap:@emailserver_confdir@/ldapdistlist.cf,
-- ldap:@emailserver_confdir@/ldapvirtual.cf
-+ ldap:@emailserver_confdir@/ldapvirtual.cf,
-+ pcre:@emailserver_confdir@/sharedfolders.pcre
-+
- relocated_maps = hash:@emailserver_confdir@/relocated
- transport_maps = hash:@emailserver_confdir@/transport, ldap:@emailserver_confdir@/ldaptransport.cf
- alias_maps = hash:@aliases_file@
-@@ -137,9 +139,35 @@
- # authentication via sasl
-
- ## Kolab Policy Server
--smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,
-- reject_unauth_destination, reject_unlisted_recipient, check_policy_service unix:private/kolabpolicy
--smtpd_sender_restrictions = permit_mynetworks, check_policy_service unix:private/kolabpolicy
-+smtpd_recipient_restrictions =
-+ @@@if postfix-require-fqdn@@@
-+ reject_non_fqdn_recipient,
-+ @@@endif@@@
-+ permit_mynetworks,
-+ @@@if postfix-reject-unknown@@@
-+ reject_unknown_recipient_domain
-+ @@@endif@@@
-+ permit_sasl_authenticated,
-+ reject_unauth_destination,
-+ reject_unlisted_recipient,
-+ @@@if postfix-rbl@@@
-+ reject_rbl_client relays.ordb.org,
-+ reject_rbl_client sbl-xbl.spamhaus.org,
-+ @@@endif@@@
-+ @@@if postfix-greylist@@@
-+ check_policy_service unix:../postgrey/postgrey.socket,
-+ @@@endif@@@
-+ check_policy_service unix:private/kolabpolicy
-+
-+smtpd_sender_restrictions =
-+ @@@if postfix-require-fqdn@@@
-+ reject_non_fqdn_sender,
-+ @@@endif@@@
-+ permit_mynetworks,
-+ @@@if postfix-reject-unknown@@@
-+ reject_unknown_sender_domain
-+ @@@endif@@@
-+ check_policy_service unix:private/kolabpolicy
- kolabpolicy_time_limit = 3600
- kolabpolicy_max_idle = 20
-
-diff -Naur kolabd-2.0.99.orig/templates/sharedfolders.pcre.template.in kolabd-2.0.99/templates/sharedfolders.pcre.template.in
---- kolabd-2.0.99.orig/templates/sharedfolders.pcre.template.in 1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.0.99/templates/sharedfolders.pcre.template.in 2007-02-17 02:21:40.000000000 +0100
-@@ -0,0 +1,10 @@
-+KOLAB_META_START
-+TARGET=@emailserver_confdir@/sharedfolders.pcre
-+PERMISSIONS=0640
-+OWNERSHIP=@emailserver_usr@:@emailserver_grp@
-+KOLAB_META_END
-+# Handle delivery to subfolder of shared folder,
-+# discovered by presence of / in localpart
-+# which means a / before a +
-+# a / after a + is just delivery to a users subfolder.
-+/^([^\+]+\/.+)$/ kolab+shared/${1}
Deleted: trunk/RPM/SRC/kolabd/kolabd-2.0.99.tar.bz2
===================================================================
(Binary files differ)
Copied: trunk/RPM/SRC/kolabd/kolabd-2.1.0.patch (from rev 128, trunk/RPM/SRC/kolabd/kolabd-2.0.99.patch)
===================================================================
--- trunk/RPM/SRC/kolabd/kolabd-2.0.99.patch 2007-03-27 09:28:46 UTC (rev 128)
+++ trunk/RPM/SRC/kolabd/kolabd-2.1.0.patch 2007-04-23 21:53:30 UTC (rev 136)
@@ -0,0 +1,379 @@
+diff -Naur kolabd-2.1.0.orig/Makefile.am kolabd-2.1.0/Makefile.am
+--- kolabd-2.1.0.orig/Makefile.am 2006-03-09 22:52:02.000000000 +0100
++++ kolabd-2.1.0/Makefile.am 2007-04-23 23:41:25.000000000 +0200
+@@ -62,6 +62,7 @@
+ templates/resmgr.conf.template \
+ templates/saslauthd.conf.template \
+ templates/session_vars.php.template \
++ templates/sharedfolders.pcre.template \
+ templates/slapd.access.template \
+ templates/slapd.conf.template \
+ templates/slapd.replicas.template \
+@@ -444,6 +445,12 @@
+ CLEANFILES += templates/session_vars.php.template
+ EXTRA_DIST += templates/session_vars.php.template.in
+
++templates/sharedfolders.pcre.template:
++ @$(mkinstalldirs) templates
++ $(do_subst) <$(srcdir)/templates/sharedfolders.pcre.template.in >$@
++CLEANFILES += templates/sharedfolders.pcre.template
++EXTRA_DIST += templates/sharedfolders.pcre.template.in
++
+ templates/slapd.access.template:
+ @$(mkinstalldirs) templates
+ $(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
+diff -Naur kolabd-2.1.0.orig/Makefile.in kolabd-2.1.0/Makefile.in
+--- kolabd-2.1.0.orig/Makefile.in 2007-04-20 17:09:11.000000000 +0200
++++ kolabd-2.1.0/Makefile.in 2007-04-23 23:41:25.000000000 +0200
+@@ -188,6 +188,7 @@
+ templates/resmgr.conf.template.in \
+ templates/saslauthd.conf.template.in \
+ templates/session_vars.php.template.in \
++ templates/sharedfolders.pcre.template.in \
+ templates/slapd.access.template.in \
+ templates/slapd.conf.template.in \
+ templates/slapd.replicas.template.in \
+@@ -222,6 +223,7 @@
+ templates/rc.conf.template templates/resmgr.conf.template \
+ templates/saslauthd.conf.template \
+ templates/session_vars.php.template \
++ templates/sharedfolders.pcre.template \
+ templates/slapd.access.template templates/slapd.conf.template \
+ templates/slapd.replicas.template \
+ templates/smtpd.conf.template templates/transport.template \
+@@ -275,6 +277,7 @@
+ templates/resmgr.conf.template \
+ templates/saslauthd.conf.template \
+ templates/session_vars.php.template \
++ templates/sharedfolders.pcre.template \
+ templates/slapd.access.template \
+ templates/slapd.conf.template \
+ templates/slapd.replicas.template \
+@@ -1073,6 +1076,10 @@
+ @$(mkinstalldirs) templates
+ $(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@
+
++templates/sharedfolders.pcre.template:
++ @$(mkinstalldirs) templates
++ $(do_subst) <$(srcdir)/templates/sharedfolders.pcre.template.in >$@
++
+ templates/slapd.access.template:
+ @$(mkinstalldirs) templates
+ $(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
+diff -Naur kolabd-2.1.0.orig/kolab2.schema kolabd-2.1.0/kolab2.schema
+--- kolabd-2.1.0.orig/kolab2.schema 2007-02-02 16:16:45.000000000 +0100
++++ kolabd-2.1.0/kolab2.schema 2007-04-23 23:41:25.000000000 +0200
+@@ -384,6 +384,30 @@
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
++attributetype ( 1.3.6.1.4.1.19414.2.1.511
++ NAME 'postfix-require-fqdn'
++ EQUALITY booleanMatch
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
++ SINGLE-VALUE )
++
++attributetype ( 1.3.6.1.4.1.19414.2.1.512
++ NAME 'postfix-reject-unknown'
++ EQUALITY booleanMatch
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
++ SINGLE-VALUE )
++
++attributetype ( 1.3.6.1.4.1.19414.2.1.513
++ NAME 'postfix-rbl'
++ EQUALITY booleanMatch
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
++ SINGLE-VALUE )
++
++attributetype ( 1.3.6.1.4.1.19414.2.1.514
++ NAME 'postfix-greylist'
++ EQUALITY booleanMatch
++ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
++ SINGLE-VALUE )
++
+ ##########################
+ # cyrus imapd attributes #
+ ##########################
+@@ -534,6 +558,10 @@
+ postfix-virtual $
+ postfix-enable-virus-scan $
+ postfix-allow-unauthenticated $
++ postfix-greylist $
++ postfix-rbl $
++ postfix-reject-unknown $
++ postfix-require-fqdn $
+ cyrus-quotawarn $
+ cyrus-autocreatequota $
+ cyrus-admins $
+@@ -565,6 +593,7 @@
+ SUP top STRUCTURAL
+ MUST cn
+ MAY ( acl $
++ mail $
+ alias $
+ cyrus-userquota $
+ kolabHomeServer $
+diff -Naur kolabd-2.1.0.orig/kolabd.spec.orig kolabd-2.1.0/kolabd.spec.orig
+--- kolabd-2.1.0.orig/kolabd.spec.orig 1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.0/kolabd.spec.orig 2007-04-23 23:41:25.000000000 +0200
+@@ -0,0 +1,126 @@
++##
++## kolabd.spec -- OpenPKG RPM Specification
++## Copyright (c) 2004-2005 Klaraelvdalens Datakonsult AB <http://www.klaralvdalens-datakonsult.se>
++## Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
++## Copyright (c) 2000-2004 Ralf S. Engelschall <rse at engelschall.com>
++## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
++##
++## Permission to use, copy, modify, and distribute this software for
++## any purpose with or without fee is hereby granted, provided that
++## the above copyright notice and this permission notice appear in all
++## copies.
++##
++## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
++## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
++## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
++## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
++## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
++## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++## SUCH DAMAGE.
++##
++
++# package version
++%define V_ei_maj 2.0
++%define V_ei_min 99
++%define V_cf 1.0.4
++
++# package information
++Name: kolabd
++Summary: Kolab2 Groupware Server Daemon
++URL: http://www.kolab.org/
++Vendor: Erfrakon, Intevation, Code Fusion, Klaraelvdalens Datakonsult AB
++Packager: Klaraelvdalens Datakonsult AB
++Distribution: OpenPKG
++Class: PLUS
++Group: Mail
++License: GPL
++Version: 2.0.99
++Release: 20070205
++
++# list of sources
++Source0: kolabd-%{version}.tar.bz2
++#Source1: rc.kolabd
++
++# build information
++Prefix: %{l_prefix}
++BuildRoot: %{l_buildroot}
++BuildPreReq: OpenPKG, openpkg >= 2.0.0
++PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.23-2.3.0_kolab2, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
++PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
++PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
++PreReq: gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes
++PreReq: postfix >= 2.1.5-2.2.0_kolab3, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
++PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes
++PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
++PreReq: perl-kolab >= 5.8.7-20050728, perl-db
++PreReq: amavisd >= 2.3.1-2.4.0
++PreReq: clamav
++AutoReq: no
++AutoReqProv: no
++
++%option kolab_version snapshot
++
++%description
++ Kolab is the KDE Groupware Server that provides full groupware
++ features to either KDE Kolab clients or Microsoft Outlook[tm]
++ clients using third party plugins and web clients in the future.
++ In addition it is a robust and flexible general IMAP mail server
++ with LDAP addressbooks.
++ Kolab %{V_ei_maj}.%{V_ei_min}
++
++ The Code Fusion fork adds functionality such as integration with
++ Active Directory, a more modularised backend, separation of the
++ daemon and the configuration generator and more.
++ Code Fusion Engine %{V_cf}, shares Admin (see above)
++
++%track
++ prog kolab-ei = {
++ version = %{V_ei_maj}.%{V_ei_min}
++ url = ftp://ftp.kdab.net/pub/kolab/server/current/
++ regex = kolabd-(__VER__)\.src\.rpm
++ }
++
++%prep
++ %setup -q
++
++%build
++ ./configure --prefix=%{l_prefix} --with-dist=kolab
++ %{l_make} %{l_mflags}
++
++%install
++ rm -rf $RPM_BUILD_ROOT
++
++ # install package
++ %{l_make} %{l_mflags} install \
++ DESTDIR=$RPM_BUILD_ROOT
++
++ # generate file list
++ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
++ %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \
++ '%config %{l_prefix}/etc/kolab/*.pem' \
++ '%config %{l_prefix}/etc/kolab/*.schema' \
++ '%config %{l_prefix}/etc/kolab/kolab.conf' \
++ '%config %{l_prefix}/etc/kolab/quotawarning.txt' \
++ '%config %{l_prefix}/etc/kolab/templates/*.template'
++
++%files -f files
++
++%clean
++ rm -rf $RPM_BUILD_ROOT
++
++%post
++ %{l_shtool} echo -e "Installing crontab entry"
++ # NOTE: OpenPKG's dcron package does not work currently,
++ # so we have to rely on the host system's cron:
++ %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
++ '
++*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | crontab - -u %{l_musr}
++
++ echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b' as user root."
++ echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."
++ echo "In every case execute '$RPM_INSTALL_PREFIX/bin/openpkg rc kolabd restart' as user root."
+diff -Naur kolabd-2.1.0.orig/kolabd.spec.rej kolabd-2.1.0/kolabd.spec.rej
+--- kolabd-2.1.0.orig/kolabd.spec.rej 1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.0/kolabd.spec.rej 2007-04-23 23:41:25.000000000 +0200
+@@ -0,0 +1,17 @@
++***************
++*** 40,46 ****
++ Group: Mail
++ License: GPL
++ Version: 2.0.99
++- Release: 20070117
++
++ # list of sources
++ Source0: kolabd-%{version}.tar.bz2
++--- 40,46 ----
++ Group: Mail
++ License: GPL
++ Version: 2.0.99
+++ Release: 20070130
++
++ # list of sources
++ Source0: kolabd-%{version}.tar.bz2
+diff -Naur kolabd-2.1.0.orig/quotawarning.txt kolabd-2.1.0/quotawarning.txt
+--- kolabd-2.1.0.orig/quotawarning.txt 2005-06-06 23:27:25.000000000 +0200
++++ kolabd-2.1.0/quotawarning.txt 2007-04-23 23:41:25.000000000 +0200
+@@ -1,15 +1,15 @@
+-[This is an automatically generated message.]
++[Denne meldingen er sendt av et dataprogram.]
+
+-The mailbox for <user> is <percent>% full, please clean it up.
+-The size of the mailbox is currently <used> KB out of a total
+-allowed <total> KB.
++Epostkontoen for <user> er <percent>% full, vennligst rydd opp og
++slett unødig epost, samt epost med store vedlegg.
++Epostkontoen bruker <used> KB av maksimalt <total> KB.
+
+ <admin>
+
+-[Dies ist eine automatisch generierte Nachricht]
++[This is an automatically generated message.]
+
+-Das Postfach für <user> ist zu <percent>% gefüllt. Bitte
+-räumen Sie es auf.
+-Das Postfach belegt zurzeit <used> KB von erlaubten <total> KB.
++The mailbox for <user> is <percent>% full, please clean it up.
++The size of the mailbox is currently <used> KB out of a total
++allowed <total> KB.
+
+ <admin>
+diff -Naur kolabd-2.1.0.orig/templates/httpd.conf.template.in kolabd-2.1.0/templates/httpd.conf.template.in
+--- kolabd-2.1.0.orig/templates/httpd.conf.template.in 2007-02-05 15:57:00.000000000 +0100
++++ kolabd-2.1.0/templates/httpd.conf.template.in 2007-04-23 23:41:25.000000000 +0200
+@@ -135,7 +135,7 @@
+ AccessFileName .htaccess
+
+ <Location @webserver_web_prefix@/>
+- ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/admin/
++ ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/squirrelmail/
+ </Location>
+ <Location "@webserver_web_prefix@/fbview">
+ Deny from all
+@@ -420,3 +420,4 @@
+
+ # used for local non Kolab extension
+ Include @webserver_confdir@/apache.local
++Include @webserver_confdir@/apache.d/*.conf
+diff -Naur kolabd-2.1.0.orig/templates/main.cf.template.in kolabd-2.1.0/templates/main.cf.template.in
+--- kolabd-2.1.0.orig/templates/main.cf.template.in 2007-04-20 15:03:48.000000000 +0200
++++ kolabd-2.1.0/templates/main.cf.template.in 2007-04-23 23:43:52.000000000 +0200
+@@ -71,7 +71,9 @@
+ canonical_maps = hash:@emailserver_confdir@/canonical
+ virtual_maps = hash:@emailserver_confdir@/virtual,
+ ldap:@emailserver_confdir@/ldapdistlist.cf,
+- ldap:@emailserver_confdir@/ldapvirtual.cf
++ ldap:@emailserver_confdir@/ldapvirtual.cf,
++ pcre:@emailserver_confdir@/sharedfolders.pcre
++
+ relocated_maps = hash:@emailserver_confdir@/relocated
+ transport_maps = hash:@emailserver_confdir@/transport, ldap:@emailserver_confdir@/ldaptransport.cf
+ alias_maps = hash:@aliases_file@
+@@ -137,11 +139,35 @@
+ # authentication via sasl
+
+ ## Kolab Policy Server
+-smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated,
+- reject_unauth_destination, reject_unlisted_recipient,
+- check_policy_service unix:private/kolabpolicy
+-smtpd_sender_restrictions = permit_mynetworks,
+- check_policy_service unix:private/kolabpolicy
++smtpd_recipient_restrictions =
++ @@@if postfix-require-fqdn@@@
++ reject_non_fqdn_recipient,
++ @@@endif@@@
++ permit_mynetworks,
++ @@@if postfix-reject-unknown@@@
++ reject_unknown_recipient_domain
++ @@@endif@@@
++ permit_sasl_authenticated,
++ reject_unauth_destination,
++ reject_unlisted_recipient,
++ @@@if postfix-rbl@@@
++ reject_rbl_client relays.ordb.org,
++ reject_rbl_client sbl-xbl.spamhaus.org,
++ @@@endif@@@
++ @@@if postfix-greylist@@@
++ check_policy_service unix:../postgrey/postgrey.socket,
++ @@@endif@@@
++ check_policy_service unix:private/kolabpolicy
++
++smtpd_sender_restrictions =
++ @@@if postfix-require-fqdn@@@
++ reject_non_fqdn_sender,
++ @@@endif@@@
++ permit_mynetworks,
++ @@@if postfix-reject-unknown@@@
++ reject_unknown_sender_domain
++ @@@endif@@@
++ check_policy_service unix:private/kolabpolicy
+ kolabpolicy_time_limit = 3600
+ kolabpolicy_max_idle = 20
+
+diff -Naur kolabd-2.1.0.orig/templates/sharedfolders.pcre.template.in kolabd-2.1.0/templates/sharedfolders.pcre.template.in
+--- kolabd-2.1.0.orig/templates/sharedfolders.pcre.template.in 1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.0/templates/sharedfolders.pcre.template.in 2007-04-23 23:41:25.000000000 +0200
+@@ -0,0 +1,10 @@
++KOLAB_META_START
++TARGET=@emailserver_confdir@/sharedfolders.pcre
++PERMISSIONS=0640
++OWNERSHIP=@emailserver_usr@:@emailserver_grp@
++KOLAB_META_END
++# Handle delivery to subfolder of shared folder,
++# discovered by presence of / in localpart
++# which means a / before a +
++# a / after a + is just delivery to a users subfolder.
++/^([^\+]+\/.+)$/ kolab+shared/${1}
Added: trunk/RPM/SRC/kolabd/kolabd-2.1.0.tar.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/RPM/SRC/kolabd/kolabd-2.1.0.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/RPM/SRC/kolabd/kolabd.spec
===================================================================
--- trunk/RPM/SRC/kolabd/kolabd.spec 2007-04-23 21:31:10 UTC (rev 135)
+++ trunk/RPM/SRC/kolabd/kolabd.spec 2007-04-23 21:53:30 UTC (rev 136)
@@ -39,8 +39,8 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 2.0.99
-Release: 20070205_limacute
+Version: 2.1.0
+Release: 20070420_limacute
# list of sources
Source0: kolabd-%{version}.tar.bz2
@@ -50,17 +50,16 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.0.0
-PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.23-2.3.0_kolab2, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
+BuildPreReq: OpenPKG, openpkg >= 2.5.0
+PreReq: OpenPKG, openpkg >= 2.5.0, openldap >= 2.3.29, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail
PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes
PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes
-PreReq: gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes
-PreReq: postfix >= 2.1.5-2.2.0_kolab3, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
-PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes
-PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
-PreReq: perl-kolab >= 5.8.7-20050728, perl-db
-PreReq: amavisd >= 2.3.1-2.4.0
-PreReq: clamav
+PreReq: postfix >= 2.2.5, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq: imapd >= 2.2.12-2.5.0, imapd::with_group = yes
+PreReq: apache >= 1.3.33-2.5.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
+PreReq: perl-kolab >= 5.8.7-20070420, perl-db
+PreReq: amavisd >= 2.3.3-2.5.0
+PreReq: clamav >= 0.90-20070214
AutoReq: no
AutoReqProv: no
Deleted: trunk/RPM/SRC/kolabd/kolabd.spec.patch
===================================================================
--- trunk/RPM/SRC/kolabd/kolabd.spec.patch 2007-04-23 21:31:10 UTC (rev 135)
+++ trunk/RPM/SRC/kolabd/kolabd.spec.patch 2007-04-23 21:53:30 UTC (rev 136)
@@ -1,28 +0,0 @@
---- ../kolabd/kolabd.spec 2006-11-10 19:46:51.000000000 +0100
-+++ kolabd.spec 2006-11-29 18:38:04.000000000 +0100
-@@ -40,11 +40,14 @@
- Group: Mail
- License: GPL
- Version: 2.0.99
--Release: 20061110
-+Release: 20061110_limacute
-
- # list of sources
- Source0: kolabd-%{version}.tar.bz2
- #Source1: rc.kolabd
-+Patch0: quotawarning.txt.patch
-+Patch1: httpd.conf.template.in.patch
-+Patch2: slapd.conf.template.in.patch
-
- # build information
- Prefix: %{l_prefix}
-@@ -87,6 +90,9 @@
-
- %prep
- %setup -q
-+ %patch0
-+ %patch1
-+ %patch2
-
- %build
- ./configure --prefix=%{l_prefix} --with-dist=kolab
More information about the Limacute-commit
mailing list