[pkg-kolab] r1533 - in kolab-webadmin/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Thu Sep 30 21:48:47 UTC 2010
Author: sathieu
Date: 2010-09-30 21:48:46 +0000 (Thu, 30 Sep 2010)
New Revision: 1533
Added:
kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff
kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff
Modified:
kolab-webadmin/trunk/debian/changelog
kolab-webadmin/trunk/debian/patches/series
Log:
Change sieve port to 4190 (#598010)
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2010-09-30 21:07:59 UTC (rev 1532)
+++ kolab-webadmin/trunk/debian/changelog 2010-09-30 21:48:46 UTC (rev 1533)
@@ -2,8 +2,10 @@
* Updated Standards-Version to 3.9.1: no changes
* Switch to dpkg-source 3.0 (quilt) format
+ * 70-sieve-port-i18n.diff, 71-sieve-port-number.diff: Change sieve port
+ to 4190 (Closes: #598010)
- -- Mathieu Parent <sathieu at debian.org> Thu, 30 Sep 2010 23:03:03 +0200
+ -- Mathieu Parent <sathieu at debian.org> Thu, 30 Sep 2010 23:49:56 +0200
kolab-webadmin (2.2.3-20091217-2) unstable; urgency=low
Added: kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff 2010-09-30 21:48:46 UTC (rev 1533)
@@ -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 ) ) );
Added: kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff (rev 0)
+++ kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff 2010-09-30 21:48:46 UTC (rev 1533)
@@ -0,0 +1,31 @@
+Description: allow another port than 2000 for sieve
+ (port number part)
+Bug: https://issues.kolab.org/issue4373
+Bug-Debian: http://bugs.debian.org/598010
+
+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:37:57.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in 2010-09-30 23:38:08.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' => sprintf(_('Sieve service (TCP port %s)'), 2000), 'enabled' => toboolstr( $sieve ) ),
++ array( 'service' => 'sieve', 'name' => sprintf(_('Sieve service (TCP port %s)'), 4190), '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 ) ) );
+Index: kolab-webadmin-2.2.3-20091217/php/admin/include/Sieve.php
+===================================================================
+--- kolab-webadmin-2.2.3-20091217.orig/php/admin/include/Sieve.php 2010-09-30 23:42:41.000000000 +0200
++++ kolab-webadmin-2.2.3-20091217/php/admin/include/Sieve.php 2010-09-30 23:42:50.000000000 +0200
+@@ -147,7 +147,7 @@
+ * @param string $logintype Type of login to perform
+ * @param string $euser Effective User (if $user=admin, login as $euser)
+ */
+- function Net_Sieve($user = null , $pass = null , $host = 'localhost', $port = 2000, $logintype = '', $euser = '', $debug = false)
++ function Net_Sieve($user = null , $pass = null , $host = 'localhost', $port = 'sieve', $logintype = '', $euser = '', $debug = false)
+ {
+ $this->_state = NET_SIEVE_STATE_DISCONNECTED;
+ $this->_data['user'] = $user;
Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series 2010-09-30 21:07:59 UTC (rev 1532)
+++ kolab-webadmin/trunk/debian/patches/series 2010-09-30 21:48:46 UTC (rev 1533)
@@ -1,3 +1,5 @@
10-dist_conf.diff
60-no_extra_doc.diff
+70-sieve-port-i18n.diff
+71-sieve-port-number.diff
80-issue4025.diff
More information about the pkg-kolab-devel
mailing list