[packaging] Branch 'debian/hosted-kolab-webadmin' - debian/patches

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun Dec 5 16:58:28 CET 2010


 debian/patches/70-sieve-port-i18n.diff |   93 +++++++++++++++++++++++++++++++++
 debian/patches/80-issue4025.diff       |   41 ++++++++++++++
 debian/patches/series                  |    2 
 3 files changed, 136 insertions(+)

New commits:
commit 860b94f11ff69b7f521d3a6f95dd9d5791fb17cd
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Dec 5 15:58:16 2010 +0000

    Add two patches from upstream

diff --git a/debian/patches/70-sieve-port-i18n.diff b/debian/patches/70-sieve-port-i18n.diff
new file mode 100644
index 0000000..e12f3e4
--- /dev/null
+++ b/debian/patches/70-sieve-port-i18n.diff
@@ -0,0 +1,93 @@
+Description: allow another port than 2000 for sieve
+ (i18n part)
+Bug: https://issues.kolab.org/issue4373
+Bug-Debian: http://bugs.debian.org/598010
+
+Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/de/LC_MESSAGES/messages.po
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/de/LC_MESSAGES/messages.po	2010-09-30 23:35:59.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/php/admin/locale/de/LC_MESSAGES/messages.po	2010-09-30 23:36:02.000000000 +0200
+@@ -1675,8 +1675,8 @@
+ msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
+ 
+ #: ../../../www/admin/settings/index.php.in:277
+-msgid "Sieve service (TCP port 2000)"
+-msgstr "Sieve-Dienst (TCP-Port 2000)"
++msgid "Sieve service (TCP port %s)"
++msgstr "Sieve-Dienst (TCP-Port %s)"
+ 
+ #: ../../../www/admin/settings/index.php.in:278
+ msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/es/LC_MESSAGES/messages.po
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/es/LC_MESSAGES/messages.po	2010-09-30 23:35:59.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/php/admin/locale/es/LC_MESSAGES/messages.po	2010-09-30 23:36:02.000000000 +0200
+@@ -1669,8 +1669,8 @@
+ msgstr "Servicio IMAP/SSL (puerto TCP 993)"
+ 
+ #: ../../../www/admin/settings/index.php.in:277
+-msgid "Sieve service (TCP port 2000)"
+-msgstr "Servicio Sieve (puerto TCP 2000)"
++msgid "Sieve service (TCP port %s)"
++msgstr "Servicio Sieve (puerto TCP %s)"
+ 
+ #: ../../../www/admin/settings/index.php.in:278
+ msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/fr/LC_MESSAGES/messages.po
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/fr/LC_MESSAGES/messages.po	2010-09-30 23:35:59.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/php/admin/locale/fr/LC_MESSAGES/messages.po	2010-09-30 23:36:02.000000000 +0200
+@@ -1674,8 +1674,8 @@
+ msgstr "Service IMAP/SSL (TCP port 993)"
+ 
+ #: ../../../www/admin/settings/index.php.in:279
+-msgid "Sieve service (TCP port 2000)"
+-msgstr "Service Sieve (TCP port 2000)"
++msgid "Sieve service (TCP port %s)"
++msgstr "Service Sieve (TCP port %s)"
+ 
+ #: ../../../www/admin/settings/index.php.in:280
+ msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/it/LC_MESSAGES/messages.po
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/it/LC_MESSAGES/messages.po	2010-09-30 23:35:59.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/php/admin/locale/it/LC_MESSAGES/messages.po	2010-09-30 23:36:02.000000000 +0200
+@@ -1669,8 +1669,8 @@
+ msgstr "Servizio IMAP/SSL (Porta TCP 993)"
+ 
+ #: ../../../www/admin/settings/index.php.in:277
+-msgid "Sieve service (TCP port 2000)"
+-msgstr "Servizio Sieve (Porta TCP 2000)"
++msgid "Sieve service (TCP port %s)"
++msgstr "Servizio Sieve (Porta TCP %s)"
+ 
+ #: ../../../www/admin/settings/index.php.in:278
+ msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/nl/LC_MESSAGES/messages.po
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/nl/LC_MESSAGES/messages.po	2010-09-30 23:35:59.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/php/admin/locale/nl/LC_MESSAGES/messages.po	2010-09-30 23:36:02.000000000 +0200
+@@ -1656,8 +1656,8 @@
+ msgstr "IMAP/SSL Service (TCP poort 993)"
+ 
+ #: ../../../www/admin/settings/index.php.in:277
+-msgid "Sieve service (TCP port 2000)"
+-msgstr "Sieve service (TCP poort 2000)"
++msgid "Sieve service (TCP port %s)"
++msgstr "Sieve service (TCP poort %s)"
+ 
+ #: ../../../www/admin/settings/index.php.in:278
+ msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
+Index: kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/www/admin/settings/index.php.in	2010-09-30 23:35:59.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in	2010-09-30 23:43:11.000000000 +0200
+@@ -276,7 +276,7 @@
+ 				  array( 'service' => 'pop3s', 'name' => _('POP3/SSL service (TCP port 995)'), 'enabled' => toboolstr( $pop3s ) ),
+ 				  array( 'service' => 'imap', 'name'  => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
+ 				  array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ),
+-				  array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ),
++				  array( 'service' => 'sieve', 'name' => sprintf(_('Sieve service (TCP port %s)'), 2000), 'enabled' => toboolstr( $sieve ) ),
+ 				  array( 'service' => 'http', 'name'  => _('FreeBusy Service via HTTP (in addition to HTTPS)'), 'enabled' => toboolstr( $http ) ),
+ 				  array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'), 
+ 						 'enabled' => toboolstr( $amavis ) ) );
diff --git a/debian/patches/80-issue4025.diff b/debian/patches/80-issue4025.diff
new file mode 100644
index 0000000..107fdca
--- /dev/null
+++ b/debian/patches/80-issue4025.diff
@@ -0,0 +1,41 @@
+Author: gunnar
+
+Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
+In directory doto:/tmp/cvs-serv13268/kolab-webadmin/kolab-webadmin/www/admin/user
+
+Modified Files:
+      Tag: kolab_2_2_branch
+	user.php.in 
+Log Message:
+kolab/issue4025 (Users can not change theire password (in 2.2.3))
+
+Index: user.php.in
+===================================================================
+RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
+retrieving revision 1.28.2.3
+retrieving revision 1.28.2.4
+diff -u -d -r1.28.2.3 -r1.28.2.4
+--- a/www/admin/user/user.php.in	7 Dec 2009 13:17:02 -0000	1.28.2.3
++++ b/www/admin/user/user.php.in	15 Jan 2010 15:32:33 -0000	1.28.2.4
+@@ -521,7 +521,9 @@
+   $entries['givenname']['comment'] = '';
+   $entries['sn']['comment'] = '';
+   $entries['alias']['attrs'] = 'readonly';
++  $entries['kolabdelegate']['attrs'] = 'readonly';
+   $entries['kolabhomeserver']['attrs'] = 'readonly';
++  $entries['kolabAllowSMTPRecipient']['attrs'] = 'readonly';
+   $entries['accttype']['attrs'] = 'readonly';
+   $entries['uid']['attrs'] = 'readonly';
+ }
+@@ -717,6 +719,8 @@
+ 			   unset($ldap_object['mail']);
+ 			   unset($ldap_object['uid']);
+ 			   unset($ldap_object['kolabHomeServer']);
++			   unset($ldap_object['kolabAllowSMTPRecipient']);
++			   unset($ldap_object['kolabDelegate']);
+ 			 }
+ 			 if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {			   
+ 			   array_push($errors, sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
+
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 3006902..fb5da58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 10-dist_conf.diff
 60-no_extra_doc.diff
+70-sieve-port-i18n.diff
+80-issue4025.diff




More information about the packaging-commits mailing list