From d082d3772b8e1be4542b30f2a66b8cfb93e3a42b Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 2 Sep 2010 07:54:58 +0200 Subject: [PATCH] Imported Debian patch 0.3.1-5 --- debian/changelog | 11 ++ debian/control | 2 +- debian/control.in | 2 +- debian/patches/received-headers-sa.patch | 37 +++++++ debian/patches/series | 1 + debian/po/da.po | 135 +++++++++++++++++++++++ 6 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 debian/patches/received-headers-sa.patch create mode 100644 debian/po/da.po diff --git a/debian/changelog b/debian/changelog index c286dbd..6b987e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +roundcube (0.3.1-5) unstable; urgency=low + + * Depends on php-mail-mime 1.7.0 or more recent to handle correctly + 'mime_param_folding' directive. Closes: #588295. + * Add Danish debconf translation, thanks to Joe Dalton. + Closes: #593271. + * Add a patch to fix Received header to behave better with Spam + Assassin. Closes: #595204. + + -- Vincent Bernat Thu, 02 Sep 2010 07:54:58 +0200 + roundcube (0.3.1-4) unstable; urgency=low * Update README.Debian to state that the variable to modify is diff --git a/debian/control b/debian/control index bc79c1a..e7d4251 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/trunk/ Package: roundcube-core Architecture: all -Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3) +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.7.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3) Suggests: php-auth-sasl Replaces: roundcube Breaks: roundcube (<< 0.1~rc2-2) diff --git a/debian/control.in b/debian/control.in index a0772fe..badc5d5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/trunk/ Package: roundcube-core Architecture: all -Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3) +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.7.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3) Suggests: php-auth-sasl Replaces: roundcube Breaks: roundcube (<< 0.1~rc2-2) diff --git a/debian/patches/received-headers-sa.patch b/debian/patches/received-headers-sa.patch new file mode 100644 index 0000000..740792d --- /dev/null +++ b/debian/patches/received-headers-sa.patch @@ -0,0 +1,37 @@ +Fix Received headers to behave better with SpamAssassin? + http://trac.roundcube.net/changeset/3291 + http://trac.roundcube.net/ticket/1486513 + +--- a/program/steps/mail/sendmail.inc 2009-11-16 23:49:07 +0000 ++++ a/program/steps/mail/sendmail.inc 2010-02-24 00:48:24 +0000 +@@ -259,8 +259,8 @@ + $http_header .= ' ('. rcmail_encrypt_header($host) . ')'; + } else { + $http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']'); +- $http_header .= ' ('. ($host == $hostname ? '' : $hostname . ' ') . +- '[' . $host .'])'; ++ if ($host != $hostname) ++ $http_header .= ' (['. $host .'])'; + } + $http_header .= $nldlm . ' via '; + } +@@ -272,14 +272,14 @@ + $http_header .= ' ('. rcmail_encrypt_header($host) . ')'; + } else { + $http_header .= (($host != $hostname) ? $hostname : '[' . $host . ']'); +- $http_header .= ' ('. ($host == $hostname ? '' : $hostname . ' ') . +- '[' . $host .'])'; ++ if ($host != $hostname) ++ $http_header .= ' (['. $host .'])'; + } + // BY + $http_header .= $nldlm . 'by ' . $_SERVER['HTTP_HOST']; + // WITH +- $http_header .= $nldlm . 'with ' . $_SERVER['SERVER_PROTOCOL'] . +- ' ('.$_SERVER['REQUEST_METHOD'] . '); ' . date('r'); ++ $http_header .= $nldlm . 'with HTTP (' . $_SERVER['SERVER_PROTOCOL'] . ++ ' '.$_SERVER['REQUEST_METHOD'] . '); ' . date('r'); + $http_header = wordwrap($http_header, 69, $nldlm); + + $headers['Received'] = $http_header; + diff --git a/debian/patches/series b/debian/patches/series index dae62da..b2874f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ changeset_r3202.patch dont-limit-email-local-part.patch disable-dns-prefetch.patch default-charset-utf8.patch +received-headers-sa.patch diff --git a/debian/po/da.po b/debian/po/da.po new file mode 100644 index 0000000..145c999 --- /dev/null +++ b/debian/po/da.po @@ -0,0 +1,135 @@ +# Danish translation roundcube. +# Copyright (C) 2010 roundcube & nedenstående oversættere. +# This file is distributed under the same license as the roundcube package. +# Joe Hansen (joedalton2@yahoo.dk), 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: roundcube\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2009-02-15 17:05+0100\n" +"PO-Revision-Date: 2010-08-16 17:30+01:00\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Choices +#: ../templates:2001 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../templates:2001 +msgid "lighttpd" +msgstr "lighttpd" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "Web server(s) to configure automatically:" +msgstr "Internetservere at konfigurere automatisk:" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "" +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." +msgstr "" +"RoundCube understøtter enhver internetserver, der er understøttet af PHP, " +"dog kan kun Apache 2 og lighttpd konfigureres automatisk." + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "" +"Please select the web server(s) that should be configured automatically for " +"RoundCube." +msgstr "" +"Vælg venligst de internetservere som skal konfigureres automatisk for " +"RoundCube." + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Should the webserver(s) be restarted now?" +msgstr "Skal internetserverne genstartes nu?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"In order to activate the new configuration, the reconfigured web server(s) " +"have to be restarted." +msgstr "" +"For at aktivere den nye konfiguration, skal de rekonfigurerede " +"internetservere genstartes." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "IMAP server(s) used with RoundCube:" +msgstr "IMAP-servere brugt med RoundCube:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Please select the IMAP server(s) that should be used with RoundCube." +msgstr "Vælg venligst IMAP-serveren som skal bruges med RoundCube." + +# engelsk fejl? pull-down menu -> drop down menu +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"If this is left blank, a text box will be displayed at login. Entering a " +"space-separated list of hosts will display a pull-down menu. Entering a " +"single host will enforce using this host." +msgstr "" +"Hvis denne efterlades tom, vil en tekstboks blive vist ved logind. " +"Indtastning af en mellemrumsadskilt liste af værter vil vise en " +"rullegardinsmenu. Indtastning af en enkelt vært vil fremtvinge brug af denne " +"vært." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"To use SSL connections, please enter host names as 'ssl://hostname:993'." +msgstr "" +"For at bruge SSL-forbindelser, indtast venligst værtsnavne som »ssl://" +"hostname:993«." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Default language:" +msgstr "Standardsprog:" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Please choose the default language for RoundCube." +msgstr "Vælg venligst standardsproget for RoundCube." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "This choice can be overridden by individual users in their preferences." +msgstr "" +"Dette valg kan overskrives af individuelle brugere i deres indstillinger." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "" +"However, the default language will be used for the login screen and the " +"first connection of users." +msgstr "" +"Standardsproget vil blive brugt til logindskærmen og den første forbindelse " +"for brugere." -- 2.39.5