Hello community, here is the log from the commit of package froxlor for openSUSE:Factory checked in at 2014-03-06 11:57:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/froxlor (Old) and /work/SRC/openSUSE:Factory/.froxlor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "froxlor" Changes: -------- --- /work/SRC/openSUSE:Factory/froxlor/froxlor.changes 2014-02-02 18:08:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.froxlor.new/froxlor.changes 2014-03-06 11:57:15.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Feb 25 11:44:42 CET 2014 - asemen@suse.de + +- upstream upgrade to version 0.9.32-rc1 (bnc#846355) +#69: calculate/show mail-traffic +#433: redirect to last URL after session-timeout +#1321: log faulty login-attempts +#1340: add 'description' to ftp-users +#1378: added database validation in the admin menu to check for its integrity +#858: runtime of cronjobs +- APS (complete) +- Autoresponder (complete) +- Backup (complete) + +------------------------------------------------------------------- @@ -4 +18 @@ -- upstream upragde to version 0.9.31.2 (bnc#846355) +- upstream upgrade to version 0.9.31.2 (bnc#846355) @@ -13 +27 @@ -- upstream upragde to version 0.9.31 (bnc#846355) +- upstream upgrade to version 0.9.31 (bnc#846355) @@ -27 +41 @@ -- upstream upragde to version 0.9.30 (bnc#846355) +- upstream upgrade to version 0.9.30 (bnc#846355) @@ -46 +60 @@ -- upstream upragde to version 0.9.29 (bnc#846355) +- upstream upgrade to version 0.9.29 (bnc#846355) Old: ---- froxlor-0.9.31.2.tar.bz2 New: ---- froxlor-0.9.32.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ froxlor.spec ++++++ --- /var/tmp/diff_new_pack.D2aOgr/_old 2014-03-06 11:57:16.000000000 +0100 +++ /var/tmp/diff_new_pack.D2aOgr/_new 2014-03-06 11:57:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package froxlor # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define apache_serverroot /srv/www/htdocs Name: froxlor -Version: 0.9.31.2 +Version: 0.9.32.0 Release: 0 Source0: froxlor-%{version}.tar.bz2 Source1: froxlor.suse.adapt.template.config.tar.bz2 ++++++ configfiles_index.inc.php.patch ++++++ --- /var/tmp/diff_new_pack.D2aOgr/_old 2014-03-06 11:57:16.000000000 +0100 +++ /var/tmp/diff_new_pack.D2aOgr/_new 2014-03-06 11:57:16.000000000 +0100 @@ -1,9 +1,10 @@ ---- lib/configfiles_index.inc.php.orig 2013-10-10 14:38:12.401901296 +0200 -+++ lib/configfiles_index.inc.php 2013-10-10 14:38:32.578217003 +0200 -@@ -45,5 +45,5 @@ - - $cfgPath = 'lib/configfiles/'; - $configfiles = Array(); --$configfiles = array_merge(include $cfgPath . 'wheezy.inc.php', include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php'); -+$configfiles = array_merge(include $cfgPath . 'wheezy.inc.php', include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php'); - +--- lib/configfiles_index.inc.php 2014-02-14 14:08:58.000000000 +0100 ++++ lib/configfiles_index.inc.php.orig 2014-02-25 13:21:45.610883626 +0100 +@@ -46,6 +46,7 @@ + include $cfgPath . 'lucid.inc.php', + include $cfgPath . 'gentoo.inc.php', + include $cfgPath . 'suse11.inc.php', ++ include $cfgPath . 'suse.inc.php', + include $cfgPath . 'sle10.inc.php', + include $cfgPath . 'freebsd.inc.php' + ); ++++++ froxlor-0.9.31.2.tar.bz2 -> froxlor-0.9.32.0.tar.bz2 ++++++ ++++ 45024 lines of diff (skipped) ++++++ froxlor.sql.patch ++++++ --- /var/tmp/diff_new_pack.D2aOgr/_old 2014-03-06 11:57:17.000000000 +0100 +++ /var/tmp/diff_new_pack.D2aOgr/_new 2014-03-06 11:57:17.000000000 +0100 @@ -1,6 +1,6 @@ ---- install/froxlor.sql.before 2014-01-31 11:39:00.794261833 +0100 -+++ install/froxlor.sql 2014-01-31 11:41:24.024498248 +0100 -@@ -1,3 +1,14 @@ +--- install/froxlor.sql.orig 2014-02-25 12:12:30.280495934 +0100 ++++ install/froxlor.sql 2014-02-25 14:09:16.692796712 +0100 +@@ -1,3 +1,13 @@ +# change path from /var to /srv +# webspaces: /srv/customers/webs +# logs: /srv/customers/logs/ @@ -9,13 +9,12 @@ +# cgi: /srv/www/cgi-bin/ +# fcgi: /srv/www/php-fcgi-scripts +# backup: /srv/customers/backups/ -+# asemen 20140131 -+ -+ ++# asemen 20140225 ++ + DROP TABLE IF EXISTS `ftp_groups`; CREATE TABLE `ftp_groups` ( `id` int(20) NOT NULL auto_increment, - `groupname` varchar(60) NOT NULL default '', -@@ -404,7 +415,7 @@ +@@ -382,7 +392,7 @@ ('customredirect', 'enabled', '1'), ('customredirect', 'default', '1'), ('perl', 'suexecworkaround', '0'), @@ -24,7 +23,7 @@ ('login', 'domain_login', '0'), ('login', 'maxloginattempts', '3'), ('login', 'deactivatetime', '900'), -@@ -417,27 +428,27 @@ +@@ -395,27 +405,27 @@ ('phpfpm', 'min_spare_servers', '5'), ('phpfpm', 'max_spare_servers', '35'), ('phpfpm', 'max_requests', '0'), @@ -36,9 +35,9 @@ ('phpfpm', 'vhost_httpgroup', 'froxlorlocal'), ('phpfpm', 'idle_timeout', '30'), - ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/'), -+ ('phpfpm', 'aliasconfigdir', '/srv/www/php-fpm/'), ++ ('phpfpm', 'aliasconfigdir', ''/srv/www/php-fpm/'), ('phpfpm', 'defaultini', '1'), - ('phpfpm', 'vhost_defaultini', '1'), + ('phpfpm', 'vhost_defaultini', '2'), ('phpfpm', 'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'), ('nginx', 'fastcgiparams', '/etc/nginx/fastcgi_params'), ('system', 'lastaccountnumber', '0'), @@ -57,7 +56,7 @@ ('system', 'vmail_maildirname', 'Maildir'), ('system', 'bind_enable', '1'), ('system', 'bindconf_directory', '/etc/bind/'), -@@ -458,8 +469,8 @@ +@@ -436,8 +446,8 @@ ('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'), ('system', 'webalizer_quiet', '2'), ('system', 'last_archive_run', '000000'), @@ -68,12 +67,3 @@ ('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'), ('system', 'use_ssl', '0'), ('system', 'openssl_cnf', '[ req ]\r\ndefault_bits = 1024\r\ndistinguished_name = req_distinguished_name\r\nattributes = req_attributes\r\nprompt = no\r\noutput_password =\r\ninput_password =\r\n[ req_distinguished_name ]\r\nC = DE\r\nST = froxlor\r\nL = froxlor \r\nO = Testcertificate\r\nOU = froxlor \r\nCN = @@domain_name@@\r\nemailAddress = @@email@@ \r\n[ req_attributes ]\r\nchallengePassword =\r\n'), -@@ -493,7 +504,7 @@ - ('system', 'report_trafficmax', '90'), - ('system', 'validate_domain', '1'), - ('system', 'backup_enabled', '0'), -- ('system', 'backup_dir', '/var/customers/backups/'), -+ ('system', 'backup_dir', '/srv/customers/backups/'), - ('system', 'backup_mysqldump_path', '/usr/bin/mysqldump'), - ('system', 'backup_count', '1'), - ('system', 'backup_bigfile', '1'), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org