From 01127e28ed5cceefabe42b243acfa8ad51098dd0 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 27 Sep 2009 11:00:30 +0200 Subject: [PATCH] Imported Debian patch 0.3-1 --- debian/changelog | 17 +++++++++++++++++ debian/conf/apache.conf | 10 ++++++---- debian/conf/lighttpd.conf | 3 +++ debian/control | 6 +++--- debian/control.in | 4 ++-- debian/copyright | 1 + debian/patches/log-failed-logins.patch | 13 ------------- debian/po/cs.po | 10 ++++------ debian/po/it.po | 18 ++++++++---------- debian/roundcube-core.README.Debian | 5 ++++- debian/roundcube-core.dirs | 1 + debian/roundcube-core.install | 4 +++- debian/roundcube-core.links | 2 +- debian/roundcube-core.postinst | 2 +- debian/rules | 14 +++++++++++--- 15 files changed, 65 insertions(+), 45 deletions(-) delete mode 100644 debian/patches/log-failed-logins.patch diff --git a/debian/changelog b/debian/changelog index 347ce08..51699f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +roundcube (0.3-1) unstable; urgency=low + + * New upstream release. Closes: #545498. + * Update debconf translations: + + Italian, thanks to Luca Monducci. Closes: #544199. + + Czech, thanks to Miroslav Kure. Closes: #546413. + * Roundcube configuration now uses 'language' instead of 'locale_string' + to specify the default language. Update postinst to reflect this + change. Thanks to Richard van den Berg for noticing this. Closes: #544579. + * Depends on libjs-jquery (>= 1.3) since this is now used by roundcube. + * Don't ship any plugins for now but ship an empty plugins directory. + * Ship main .htaccess since it is needed to setup correctly PHP (for + example, to disable PHP Suhosin cookie encryption). + * Bump Standards-Version. No changes required. + + -- Vincent Bernat Sun, 27 Sep 2009 11:00:30 +0200 + roundcube (0.2.2-1) unstable; urgency=low * New upstream release diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf index 79e3d41..f4befee 100644 --- a/debian/conf/apache.conf +++ b/debian/conf/apache.conf @@ -12,10 +12,12 @@ - Options +FollowSymLinks - AllowOverride All - order allow,deny - allow from all + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all # Protecting basic directories: diff --git a/debian/conf/lighttpd.conf b/debian/conf/lighttpd.conf index 38c43d4..46a12ae 100644 --- a/debian/conf/lighttpd.conf +++ b/debian/conf/lighttpd.conf @@ -2,6 +2,9 @@ # virtual host configuration. Do not forget to adapt the rest of the # configuration. +# Look at /var/lib/roundcube/.htaccess. You may need to migrate some +# of those php_flag/php_value to your setup. + alias.url += ("/roundcube/program/js/tiny_mce" => "/usr/share/tinymce/www") alias.url += ("/roundcube" => "/var/lib/roundcube") diff --git a/debian/control b/debian/control index 9c96ec3..789ab6a 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,15 @@ Section: web Priority: extra Maintainer: Debian Roundcube Maintainers Uploaders: Vincent Bernat , Romain Beauxis -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf +Build-Depends: cdbs, debhelper, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf Homepage: http://www.roundcube.net/ -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube 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 +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) Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers diff --git a/debian/control.in b/debian/control.in index 615a3c9..4d3065e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,13 +5,13 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: @cdbs@, po-debconf Homepage: http://www.roundcube.net/ -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube 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 +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) Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers diff --git a/debian/copyright b/debian/copyright index 2518c53..8b396ea 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,6 +22,7 @@ Some files are taken from other projects : - lib/{enriched,icl_commons,imap,mime,utf7}.inc from IlohaMail project, GPL license - lib/encoding/*.map from Unicode, Inc., with "BSD-lite" license - debian/patches/xss-fix.patch contains code from Squirrelmail, GPLv2 + - program/js/jquery-1.3.min.js is MIT and GPLv2 licensed - lib/magic is an autogenerated file. We don't ship it and use the one from libmagic1 instead. Here is the license: diff --git a/debian/patches/log-failed-logins.patch b/debian/patches/log-failed-logins.patch deleted file mode 100644 index 09bfc71..0000000 --- a/debian/patches/log-failed-logins.patch +++ /dev/null @@ -1,13 +0,0 @@ -Log failed logins. ---- roundcube-0.1.1/index.php 2008-11-11 18:17:37.939438895 +0900 -+++ roundcube-0.1.1-secured/index.php 2008-11-11 18:01:06.000000000 +0900 -@@ -101,6 +101,9 @@ - } - else { - $OUTPUT->show_message($IMAP->error_code < -1 ? 'imaperror' : 'loginfailed', 'warning'); -+ if($IMAP->error_code != -1){ -+ file_put_contents('php://stderr',"[".strftime("%c")."] [roundcube] [client ".$_SERVER['REMOTE_ADDR']."] failed login attempt.\n"); -+ } - $RCMAIL->kill_session(); - } - } diff --git a/debian/po/cs.po b/debian/po/cs.po index e40ccb0..3e23c45 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -1,14 +1,14 @@ -# SOME DESCRIPTIVE TITLE. +# Czech translation of roundcube debconf messages. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# This file is distributed under the same license as the roundcube package. +# Miroslav Kure , 2008,2009. # 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: 2008-03-09 13:03+0100\n" +"PO-Revision-Date: 2009-09-13 09:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -78,8 +78,6 @@ msgstr "IMAP servery používané s RoundCube:" #. Type: string #. Description #: ../templates:4001 -#, fuzzy -#| msgid "Please select the IMAP server that should be used with RoundCube." msgid "Please select the IMAP server(s) that should be used with RoundCube." msgstr "Vyberte prosím IMAP server, který se má s RoundCube použít." diff --git a/debian/po/it.po b/debian/po/it.po index 6f42d62..922fc92 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,14 +1,14 @@ -# Italian (it) translation of debconf templates for roundcube -# Copyright (C) 2007 Free Software Foundation, Inc. -# This file is distributed under the same license as the roundcube package. -# Luca Monducci , 2007-2008. -# +# Italian (it) translation of debconf templates for roundcube +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the roundcube package. +# Luca Monducci , 2007-2009. +# msgid "" msgstr "" -"Project-Id-Version: roundcube 0.1 italian debconf templates\n" +"Project-Id-Version: roundcube 0.2.2 italian debconf templates\n" "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" "POT-Creation-Date: 2009-02-15 17:05+0100\n" -"PO-Revision-Date: 2008-03-08 12:09+0100\n" +"PO-Revision-Date: 2009-08-30 12:09+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -78,10 +78,8 @@ msgstr "Server IMAP da usare con RoundCube:" #. Type: string #. Description #: ../templates:4001 -#, fuzzy -#| msgid "Please select the IMAP server that should be used with RoundCube." msgid "Please select the IMAP server(s) that should be used with RoundCube." -msgstr "Scegliere il server IMAP che deve essere usato con RoundCube." +msgstr "Scegliere il/i server IMAP da usare con RoundCube." #. Type: string #. Description diff --git a/debian/roundcube-core.README.Debian b/debian/roundcube-core.README.Debian index 86a78c5..ce57edd 100644 --- a/debian/roundcube-core.README.Debian +++ b/debian/roundcube-core.README.Debian @@ -5,4 +5,7 @@ To use tinymce editor: - set $rcmail_config['enable_htmleditor'] to TRUE in /etc/roundcube/main.inc.php - -- Vincent Bernat , Sun, 22 Jun 2008 12:13:32 +0200 +No plugins are shipped (except core plugins) with this package of +roundcube. Add your plugin in /var/lib/roundcube/plugins. + + -- Vincent Bernat , Sun, 27 Sep 2009 10:21:40 +0200 diff --git a/debian/roundcube-core.dirs b/debian/roundcube-core.dirs index 2bcbe8c..a008a6e 100644 --- a/debian/roundcube-core.dirs +++ b/debian/roundcube-core.dirs @@ -6,4 +6,5 @@ usr/share/dbconfig-common/data/roundcube/upgrade/sqlite etc/roundcube var/log/roundcube var/lib/roundcube/config +var/lib/roundcube/plugins etc/default diff --git a/debian/roundcube-core.install b/debian/roundcube-core.install index 7183022..ddeac9e 100644 --- a/debian/roundcube-core.install +++ b/debian/roundcube-core.install @@ -1,3 +1,5 @@ -robots.txt index.php program/ bin/ usr/share/roundcube +robots.txt index.php .htaccess program/ bin/ usr/share/roundcube skins temp var/lib/roundcube +plugins/filesystem_attachments var/lib/roundcube/plugins debian/conf/* etc/roundcube +config/*.php etc/roundcube diff --git a/debian/roundcube-core.links b/debian/roundcube-core.links index 812c7a4..fa13d43 100644 --- a/debian/roundcube-core.links +++ b/debian/roundcube-core.links @@ -1,6 +1,6 @@ etc/roundcube/main.inc.php var/lib/roundcube/config/main.inc.php -etc/roundcube/db.inc.php var/lib/roundcube/config/db.inc.php var/lib/roundcube/temp usr/share/roundcube/temp +var/lib/roundcube/plugins usr/share/roundcube/plugins var/lib/roundcube/skins usr/share/roundcube/skins var/lib/roundcube/config usr/share/roundcube/config var/log/roundcube var/lib/roundcube/logs diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst index 5db3c4b..b41830d 100644 --- a/debian/roundcube-core.postinst +++ b/debian/roundcube-core.postinst @@ -71,7 +71,7 @@ case "$1" in cat /usr/share/roundcube/main.inc.php.dist | \ sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \ -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \ - -e "s+^\(\$rcmail_config\['locale_string'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp + -e "s+^\(\$rcmail_config\['language'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE chown root:www-data $CONFFILE diff --git a/debian/rules b/debian/rules index c04db28..d737fee 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,9 @@ DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG # Then check manually if everything's ok binary-install/roundcube-core:: + # Remove plugins + rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/plugins + # Symlink all that is in /usr/share/roundcube to /var/lib/roundcube find debian/roundcube-core/usr/share/roundcube -maxdepth 1 -mindepth 1 | \ while read i; do \ @@ -18,9 +21,12 @@ binary-install/roundcube-core:: "`echo "$$i" | sed -e s#debian/roundcube-core/usr/share/roundcube/#var/lib/roundcube/#`"; \ fi \ done - # Install config/db.inc.php.dist + # Install config files install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube-core/usr/share/roundcube + for c in $(CURDIR)/debian/roundcube-core/etc/roundcube/*.php; do \ + dh_link -proundcube-core etc/roundcube/$$(basename $$c) var/lib/roundcube/config/$$(basename $$c) ; \ + done # Database related files # Install empty tables and updates for each db type @@ -32,15 +38,17 @@ binary-install/roundcube-core:: cp -r $(CURDIR)/debian/sql/* $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/. # Some files are executable while not being scripts or binary... - find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program -type f -print0 | xargs -r0 chmod -x + find $(CURDIR)/debian/roundcube-core/usr/share/roundcube -type f -print0 | xargs -r0 chmod -x # Remove useless file rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm - find $(CURDIR)/debian/roundcube-core -name '.htaccess' -print0 | xargs -r0 rm find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm # Remove files shipped in tinymce package rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce + # Remove jquery as well + rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/jquery-1.3.min.js + dh_link -proundcube-core usr/share/javascript/jquery/jquery.min.js usr/share/roundcube/program/js/jquery-1.3.min.js $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/% : install -d $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg) -- 2.39.5