[pkg-kolab] r1598 - in kolabd/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2012-02-09 19:34:04 +0000 (Thu, 09 Feb 2012)
New Revision: 1598

Added:
   kolabd/trunk/debian/patches/110-cyrus-pts-ldap.diff
Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/control
   kolabd/trunk/debian/patches/series
Log:
Move to plain cyrus

- Recommends cyrus-admin (>= 2.4) and cyrus-imapd (>= 2.3.7)
  (Versioned dependencies because of annotation support)
- Use pts/ldap instead of group patch (Closes: #622777)

Thus, upload to experimental

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2012-02-09 19:27:07 UTC (rev 1597)
+++ kolabd/trunk/debian/changelog	2012-02-09 19:34:04 UTC (rev 1598)
@@ -1,5 +1,6 @@
 kolabd (2.3.2-20110531-1) UNRELEASED; urgency=low
 
+  * Upload to experimental because of various important changes
   * New upstream release (2.3.2-20110531)
     - removed 10-dist_conf.diff: merged upstream
     - removed 55-no-distconf_kolabsrv.diff: not needed anymore
@@ -34,6 +35,10 @@
   * New 92-slapd-template.diff: Drop nested conditions (not supported)
   * Remove no longer relevant README.source
   * Updated README.Debian
+  * Move to plain cyrus:
+    - Recommends cyrus-admin (>= 2.4) and cyrus-imapd (>= 2.3.7)
+      (Versioned dependencies because of annotation support)
+    - Use pts/ldap instead of group patch (Closes: #622777)
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 19 Nov 2011 13:08:21 +0100
 

Modified: kolabd/trunk/debian/control
===================================================================
--- kolabd/trunk/debian/control	2012-02-09 19:27:07 UTC (rev 1597)
+++ kolabd/trunk/debian/control	2012-02-09 19:34:04 UTC (rev 1598)
@@ -18,8 +18,9 @@
  php-kolab-filter, php-kolab-freebusy,
  adduser, lsb-base (>= 3.0-3)
 Recommends: slapd, ldap-utils,
- kolab-cyrus-admin, kolab-cyrus-imapd, kolab-cyrus-pop3d
+ cyrus-admin (>= 2.4), cyrus-imapd (>= 2.3.7)
 Suggests: openssl, db4.2-util, kolab-webadmin,
+ cyrus-pop3d,
  amavisd-new, clamav, clamav-daemon, spamassassin
 Description: groupware server
  Kolab is a secure, scalable, and reliable groupware server.  It consists

Added: kolabd/trunk/debian/patches/110-cyrus-pts-ldap.diff
===================================================================
--- kolabd/trunk/debian/patches/110-cyrus-pts-ldap.diff	                        (rev 0)
+++ kolabd/trunk/debian/patches/110-cyrus-pts-ldap.diff	2012-02-09 19:34:04 UTC (rev 1598)
@@ -0,0 +1,41 @@
+Index: kolabd-2.3.2-20110531/templates/cyrus.conf.template
+===================================================================
+--- kolabd-2.3.2-20110531.orig/templates/cyrus.conf.template	2011-12-05 21:27:24.000000000 +0100
++++ kolabd-2.3.2-20110531/templates/cyrus.conf.template	2011-12-05 21:30:49.000000000 +0100
+@@ -87,6 +87,9 @@
+ 	#pop3s		cmd="pop3proxyd -s" listen="pop3s" prefork=0 maxchild=50
+ 	#lmtp		cmd="lmtpproxyd" listen="lmtp" prefork=1 maxchild=20
+ 	# ----------------------------------------------
++
++	# pts
++	ptloader	cmd="ptloader" listen="/var/run/cyrus/socket/ptsock" prefork=1
+ }
+ 
+ EVENTS {
+Index: kolabd-2.3.2-20110531/templates/imapd.conf.template
+===================================================================
+--- kolabd-2.3.2-20110531.orig/templates/imapd.conf.template	2011-12-05 21:27:22.000000000 +0100
++++ kolabd-2.3.2-20110531/templates/imapd.conf.template	2011-12-05 21:34:31.000000000 +0100
+@@ -326,3 +326,22 @@
+ #
+ # library traces
+ #debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
++
++auth_mech:              pts
++pts_module:             ldap
++ptscache_timeout:       10
++ptloader_sock:          /var/run/cyrus/socket/ptsock
++ldap_group_base:        @@@base_dn@@@
++ldap_member_base:       @@@base_dn@@@
++ldap_scope:             sub
++ldap_realm:             @@@postfix-mydomain@@@ @@@postfix-mydestination|join( )@@@
++ldap_filter:            (|(&(objectclass=gosaMailAccount)(uid=%U))(&(objectclass=kolabInetOrgPerson)(cn=%U)))
++ldap_group_filter:      (&(objectclass=posixGroup)(cn=%U))
++ldap_sasl:              0
++ldap_member_method:     filter
++ldap_member_filter:     (&(objectclass=posixGroup)(memberUid=%U))
++ldap_member_attribute:  cn
++# size limit determines the max number of groups a user may be
++# in before authentication fails
++ldap_size_limit:        64
++

Modified: kolabd/trunk/debian/patches/series
===================================================================
--- kolabd/trunk/debian/patches/series	2012-02-09 19:27:07 UTC (rev 1597)
+++ kolabd/trunk/debian/patches/series	2012-02-09 19:34:04 UTC (rev 1598)
@@ -5,3 +5,4 @@
 93-amavisd-template.diff
 94-cyrus-template.diff
 100-no-rootDSE.diff
+110-cyrus-pts-ldap.diff