Hello community, here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2014-04-09 13:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old) and /work/SRC/openSUSE:Factory/.roundcubemail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "roundcubemail" Changes: -------- --- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes 2014-03-09 20:22:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes 2014-04-09 13:15:57.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Apr 8 06:55:11 UTC 2014 - [email protected] + +- Update to 1.0.0 + * Cleaned up the configuration into a single file + * Importing email messages and contact group assignments + * Advanced LDAP address book functionality + * A toggle to switch between HTML and plaintext view + * Save drafts in local storage for recovery + * Canned responses to save and recall boilerplate texts + * Improved keyboard navigation in messages list + * Optimized UI to work on tablet devices + * Attachment reminder plugin + + many bug fixes + +------------------------------------------------------------------- @@ -6,0 +22,11 @@ +Fri Feb 28 16:52:47 UTC 2014 - [email protected] + +- Require php-pear-Net_Sieve for managesieve plugin + +------------------------------------------------------------------- +Thu Feb 27 16:39:07 UTC 2014 - [email protected] + +- Be more verbose if migration happened +- Deny web access to roundcubemail/{migration,migrated} + +------------------------------------------------------------------- @@ -12,0 +39,27 @@ +Thu Feb 13 09:35:39 UTC 2014 - [email protected] + +- Renamed logrotate config to just 'roundcubemail' + +------------------------------------------------------------------- +Wed Feb 12 16:57:46 UTC 2014 - [email protected] + +- Fixed logrotate config installation path (bnc#863569) + +------------------------------------------------------------------- +Wed Feb 12 14:41:25 UTC 2014 - [email protected] + +- Add %ghost for /migration and /migrated + +------------------------------------------------------------------- +Wed Feb 12 10:18:43 UTC 2014 - [email protected] + +- Update to roundcubemail-1.0-rc +- Removed roundcubemail-1.0.beta_SQL_dir.patch + +------------------------------------------------------------------- +Wed Jan 22 11:15:31 UTC 2014 - [email protected] + +- Update to roundcubemail-1.0-beta +- Rebased roundcubemail-0.9.5_SQL_dir.patch as roundcubemail-1.0.beta_SQL_dir.patch + +------------------------------------------------------------------- @@ -43 +96 @@ -- New upstream release 0.9.5 +- New upstream release 0.9.5 (bnc#847179) (CVE-2013-6172) Old: ---- roundcubemail-0.9.5-dep.tar.gz New: ---- roundcubemail-1.0.0-dep.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ roundcubemail.spec ++++++ --- /var/tmp/diff_new_pack.Pt3vkl/_old 2014-04-09 13:15:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Pt3vkl/_new 2014-04-09 13:15:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: roundcubemail -Version: 0.9.5 +Version: 1.0.0 Release: 0 Summary: A modern browser-based multilingual IMAP client License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause @@ -29,6 +29,7 @@ Source2: %{name}-httpd.conf Source4: README.openSUSE Source5: %{name}.logrotate +Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE roundcubemail-0.9.1_config-dir.patch -- use the general config directory /etc Patch0: %{name}-0.9.1_config-dir.patch @@ -41,7 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: http_daemon -Requires: mod_php_any +Requires: mod_php_any >= 5.3 Requires: php-exif Requires: php-gettext Requires: php-iconv @@ -59,11 +60,10 @@ Requires: php-pear-Net_IDNA2 >= 0.1.1 Requires: php-pear-Net_LDAP2 Requires: php-pear-Net_SMTP +Requires: php-pear-Net_Sieve Requires: php-pear-Net_Socket -%if 0%{?suse_version} Recommends: logrotate -%endif Recommends: php-mysql Recommends: php5-intl Recommends: php5-fileinfo @@ -90,27 +90,26 @@ %setup -q -n %{name}-%{version}-dep %patch0 -p1 cp %{SOURCE4} . -cp %{SOURCE5} . # remove cruft from source archive find . -name ".gitignore" -delete # no need to check .htaccess each time, the apache config takes care of the restrictions find . -name ".htaccess" -delete # remove mssql scripts (not needed on openSUSE) -rm -rf \ +%{__rm} -rf \ SQL/mssql/ \ SQL/mssql.*.sql # remove shebang from chpass-wrapper sed -i '1d' plugins/password/helpers/chpass-wrapper.py # remove INSTALL doc -rm INSTALL +%{__rm} INSTALL %build %install # install roundcubemail.logrotate -%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate -mv %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate/ +%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} # extract roundcube-framework %{__install} -d -m 0755 %{buildroot}%{_datadir}/php5 @@ -123,24 +122,23 @@ # install config mkdir -p %{buildroot}%{_sysconfdir}/%{name} cp config/* %{buildroot}%{roundcubeconfigpath}/ -cp %{buildroot}%{roundcubeconfigpath}/main.inc.php.dist %{buildroot}%{roundcubeconfigpath}/main.inc.php -cp %{buildroot}%{roundcubeconfigpath}/db.inc.php.dist %{buildroot}%{roundcubeconfigpath}/db.inc.php -rm -rf %{buildroot}%{roundcubepath}/config -ln -s %{roundcubeconfigpath} %{buildroot}%{roundcubepath}/config +%{__install} %{buildroot}%{roundcubeconfigpath}/config.inc.php.sample %{buildroot}%{roundcubeconfigpath}/config.inc.php +%{__rm} -rf %{buildroot}%{roundcubepath}/config +%{__ln_s} %{roundcubeconfigpath} %{buildroot}%{roundcubepath}/config # logs + temp go into /var/ -rm -rf %{buildroot}%{roundcubepath}/logs \ +%{__rm} -rf %{buildroot}%{roundcubepath}/logs \ %{buildroot}%{roundcubepath}/temp -mkdir -p %{buildroot}%{_localstatedir}/log/%{name} \ +%{__install} -d %{buildroot}%{_localstatedir}/log/%{name} \ %{buildroot}%{_localstatedir}/lib/%{name} -ln -s %{_localstatedir}/log/%{name}/ %{buildroot}%{roundcubepath}/logs -ln -s %{_localstatedir}/lib/%{name}/ %{buildroot}%{roundcubepath}/temp +%{__ln_s} %{_localstatedir}/log/%{name}/ %{buildroot}%{roundcubepath}/logs +%{__ln_s} %{_localstatedir}/lib/%{name}/ %{buildroot}%{roundcubepath}/temp # move some plugin configs to /etc/roundcubemail for PLUGIN in acl managesieve password; do if [[ -f %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist ]]; then mv %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist %{buildroot}%{roundcubeconfigpath}/$PLUGIN.inc.php - ln -s %{roundcubeconfigpath}/$PLUGIN.inc.php %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php + %{__ln_s} %{roundcubeconfigpath}/$PLUGIN.inc.php %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php fi done @@ -157,14 +155,15 @@ # create a link for SQL %{__ln_s} %{_defaultdocdir}/%{name}/SQL %{buildroot}%{roundcubepath}/SQL +# Make ghost files +mkdir %{buildroot}%{roundcubepath}/migrated +mkdir %{buildroot}%{roundcubepath}/migration + # fdupes %if 0%{suse_version} >= 1100 %fdupes %{buildroot}%{roundcubepath} %endif -%clean -rm -rf %{buildroot} - %pre # backup logs, temp and config for migration if [[ ! -h %{roundcubepath}/logs ]]; then @@ -201,10 +200,7 @@ done echo $str } -if [ -f %{roundcubeconfigpath}/main.inc.php ]; then - sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/main.inc.php || : &> /dev/null -fi -sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/main.inc.php.dist || : &> /dev/null +sed -i "s/rcmail-\!24ByteDESkey\*Str/`makedesstr`/" %{roundcubeconfigpath}/defaults.inc.php || : &> /dev/null # enable apache required apache modules if [ -x /usr/sbin/a2enmod ]; then @@ -235,14 +231,26 @@ fi fi done +for MIGDIR in migration migrated; do + if [[ -d %{roundcubepath}/$MIGDIR ]]; then + find %{roundcubepath}/$MIGDIR -empty -delete + fi + if [[ -d %{roundcubepath}/$MIGDIR ]]; then + echo "Found %{roundcubepath}/$MIGDIR! Make sure you delete this folder after checking the migration!" + fi +done -# make config, if none exist -if [ ! -f %{roundcubeconfigpath}/main.inc.php ]; then - cp %{roundcubeconfigpath}/main.inc.php.dist %{roundcubeconfigpath}/main.inc.php -fi -if [ ! -f %{roundcubeconfigpath}/db.inc.php ]; then - cp %{roundcubeconfigpath}/db.inc.php.dist %{roundcubeconfigpath}/db.inc.php +# update/make new config +if [ ! -f %{roundcubeconfigpath}/config.inc.php ]; then + if [ -f %{roundcubeconfigpath}/main.inc.php ] && [ -f %{roundcubeconfigpath}/db.inc.php ]; then + %{roundcubepath}/bin/update.sh \ + --version '?' \ + --accept + else + cp %{roundcubeconfigpath}/config.inc.php.sample %{roundcubeconfigpath}/config.inc.php + fi fi + exit 0 %files @@ -255,25 +263,25 @@ %doc SQL/ %dir %{roundcubepath} %dir %{roundcubeconfigpath} -%ghost %config(noreplace) %{roundcubeconfigpath}/db.inc.php -%ghost %config(noreplace) %{roundcubeconfigpath}/main.inc.php +%ghost %config(noreplace) %{roundcubeconfigpath}/config.inc.php %config(noreplace) %{roundcubeconfigpath}/acl.inc.php %config(noreplace) %{roundcubeconfigpath}/managesieve.inc.php %config(noreplace) %{roundcubeconfigpath}/password.inc.php -%config %{roundcubeconfigpath}/db.inc.php.dist -%config %{roundcubeconfigpath}/main.inc.php.dist +%config %{roundcubeconfigpath}/config.inc.php.sample +%config %{roundcubeconfigpath}/defaults.inc.php %config %{roundcubeconfigpath}/mimetypes.php %config(noreplace) %{apache_sysconfdir}/conf.d/roundcubemail.conf -%dir %{_sysconfdir}/logrotate -%config(noreplace) %{_sysconfdir}/logrotate/%{name}.logrotate +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{roundcubepath}/composer.json-dist %{roundcubepath}/config %{roundcubepath}/index.php %{roundcubepath}/robots.txt -%attr(0755,root,root) %{roundcubepath}/bin/*.sh %dir %{roundcubepath}/bin +%attr(0755,root,root) %{roundcubepath}/bin/*.sh %{roundcubepath}/installer/ %{roundcubepath}/logs +%ghost %{roundcubepath}/migrated/ +%ghost %{roundcubepath}/migration/ %{roundcubepath}/plugins/ %{roundcubepath}/program/ %{roundcubepath}/skins/ ++++++ roundcubemail-0.9.5-dep.tar.gz -> roundcubemail-1.0.0-dep.tar.gz ++++++ ++++ 171392 lines of diff (skipped) ++++++ roundcubemail-httpd.conf ++++++ --- /var/tmp/diff_new_pack.Pt3vkl/_old 2014-04-09 13:16:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Pt3vkl/_new 2014-04-09 13:16:00.000000000 +0200 @@ -91,13 +91,6 @@ </IfModule> </Directory> - <Directory __ROUNDCUBEPATH__/program> - <IfModule mod_rewrite.c> - RewriteEngine On - RewriteRule !^js|.*\.gif$ - [F] - </IfModule> - </Directory> - <Directory __ROUNDCUBEPATH__/config> Options -FollowSymLinks AllowOverride None @@ -122,7 +115,7 @@ </IfModule> </Directory> - <Directory __ROUNDCUBEPATH__/temp> + <Directory __ROUNDCUBEPATH__/migration> Options -FollowSymLinks AllowOverride None <IfModule mod_authz_core.c> @@ -133,7 +126,19 @@ Deny from all </IfModule> </Directory> - + + <Directory __ROUNDCUBEPATH__/migrated> + Options -FollowSymLinks + AllowOverride None + <IfModule mod_authz_core.c> + Require all denied + </IfModule> + <IfModule !mod_authz_core.c> + Order allow,deny + Deny from all + </IfModule> + </Directory> + <Directory __ROUNDCUBEPATH__/plugins/enigma/home> <IfModule mod_authz_core.c> Require all denied @@ -144,6 +149,24 @@ </IfModule> </Directory> + <Directory __ROUNDCUBEPATH__/program> + <IfModule mod_rewrite.c> + RewriteEngine On + RewriteRule !^js|.*\.gif$ - [F] + </IfModule> + </Directory> + + <Directory __ROUNDCUBEPATH__/temp> + Options -FollowSymLinks + AllowOverride None + <IfModule mod_authz_core.c> + Require all denied + </IfModule> + <IfModule !mod_authz_core.c> + Order allow,deny + Deny from all + </IfModule> + </Directory> # </VirtualHost> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
