Hello community,
here is the log from the commit of package froxlor for openSUSE:Factory checked
in at 2019-07-12 12:00:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/froxlor (Old)
and /work/SRC/openSUSE:Factory/.froxlor.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "froxlor"
Fri Jul 12 12:00:01 2019 rev:32 rq:714684 version:0.9.40.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/froxlor/froxlor.changes 2017-02-03
17:37:03.630141485 +0100
+++ /work/SRC/openSUSE:Factory/.froxlor.new.4615/froxlor.changes
2019-07-12 12:00:02.596172320 +0200
@@ -1,0 +2,42 @@
+Thu Jul 11 18:02:30 CEST 2019 - ase...@suse.de
+- removing froxlor-suse-config.diff not needed
+
+-------------------------------------------------------------------
+Thu Jul 11 16:13:46 CEST 2019 - ase...@suse.de
+
+patch froxlor-suse-config.diff and
+patch froxlor-pdns.diff
+added for update the froxlor configuration documentation in UI
+
+-------------------------------------------------------------------
+Tue Jul 9 16:05:58 CEST 2019 - ase...@suse.de
+
+- Upstream upgrade to version 0.9.40.1 (bsc#846355)
+ new features besides API that found their way in:
+ - 2FA / TwoFactor Authentication for accounts
+ - MySQL8 compatibility
+ - new implementation of Let's Encrypt (acme.sh)
+ - customizable error/access log handling for webserver (format, level,
+ pipe-to-script, etc.)
+ - lots and lots of bugfixes and small enhancements
+
+-------------------------------------------------------------------
+Thu Jun 7 13:05:40 CEST 2018 - ase...@suse.de
+
+- Upstream upgrade to version 0.9.39.5 (bnc#846355)
+- Dropping froxlor from future distributions and (bnc#958100)
+ Factory/Tumbleweed
+- PHP rand function for random number generation fixed in previous
+ version (bnc#1025193) CVE-2016-5100
+
+-------------------------------------------------------------------
+Thu Feb 8 16:28:23 CET 2018 - ase...@suse.de
+
+- upstream upgrade to version 0.9.39 (bnc#846355)
+
+-------------------------------------------------------------------
+Wed Aug 30 13:51:38 CEST 2017 - ase...@suse.de
+
+- Add and change of froxlor config files and manual
+
+-------------------------------------------------------------------
@@ -4 +46 @@
-- Change Requires in spec file to enable use with php7
+- Change Requires to enable use with php7
@@ -12 +54 @@
-Tue Jan 17 14:49:18 CET 2017 - ase...@suse.de
+Tue Jan 17 14:29:14 CET 2017 - ase...@suse.de
Old:
----
froxlor-0.9.38.7.tar.bz2
froxlor-httpd.conf
New:
----
froxlor-0.9.40.1.tar.bz2
froxlor-pdns.diff
froxlor.conf
froxlor.cron
froxlor.logrotate
leap42.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ froxlor.spec ++++++
--- /var/tmp/diff_new_pack.Bbv3dC/_old 2019-07-12 12:00:03.968172361 +0200
+++ /var/tmp/diff_new_pack.Bbv3dC/_new 2019-07-12 12:00:03.972172361 +0200
@@ -1,7 +1,7 @@
#
# spec file for package froxlor
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,75 +16,108 @@
#
-#
-%define apache_serverroot /srv/www/htdocs
-
+%define apache_serverroot %(%{_sbindir}/apxs2 -q DATADIR)
+%define apache_sysconfdir %(%{_sbindir}/apxs2 -q SYSCONFDIR)
Name: froxlor
-Version: 0.9.38.7
+Version: 0.9.40.1
Release: 0
-Source0: froxlor-%{version}.tar.bz2
-Source1: froxlor-httpd.conf
-Patch0: froxlor.sql.patch
-#Packager: Andrej Semen ase...@suse.de
-Url: http://www.froxlor.org
-# froxlor is under GPL-2.0 and Smarty-3.0.8 is under GPL-3.0. As
both are under in run time in same Memory this lead to GPL-2.0+
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
Summary: Froxlor Server Management Panel a php web-based administration
software
License: GPL-2.0+
Group: Productivity/Networking/Web/Utilities
-BuildRequires: apache2
+Url: http://www.froxlor.org/
+Source0: froxlor-%{version}.tar.bz2
+Source1: leap42.xml
+Source2: froxlor.conf
+Source3: froxlor.cron
+Source4: froxlor.logrotate
+Patch1: froxlor.sql.patch
+Patch2: froxlor-pdns.diff
+BuildRequires: apache2-devel
+BuildRequires: bind
+BuildRequires: fdupes
# Hard requirements
Requires: apache2
-#Requires: apache2-mod_php5
-#Requires: courier-authlib
-#Requires: courier-authlib-mysql
-#Requires: courier-authlib-userdb
-#Requires: courier-imap
-#Requires: cyrus-sasl-saslauthd
-#Requires: cyrus-sasl-sqlauxprop
-Requires: mysql
-Requires: php
+#Requires: apache2-mod_php7
+Requires: cron
+Requires: logrotate
Requires: php-bcmath
Requires: php-curl
Requires: php-mbstring
Requires: php-mysql
+Requires: php-openssl
+Requires: php-pdo
Requires: php-posix
+Requires: php-zip
Requires: postfix
Requires: postfix-mysql
-Requires: pure-ftpd
+#Requires: pure-ftpd
+#Requires: php-mbstring
+#Requires: courier-authlib
+#Requires: courier-authlib-mysql
+#Requires: courier-authlib-userdb
+#Requires: courier-imap
+#Requires: cyrus-sasl-saslauthd
+#Requires: cyrus-sasl-sqlauxprop
+Recommends: mysql
+Recommends: pdns
+Recommends: proftpd-mysql
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
A Server Management Panel is a php web-based administration software.
-Developed by experienced server administrators this open source (GPL) panel
simplifies the effort of managing your hosting platform
+Developed by experienced server administrators this open source (GPL) panel
+simplifies
+the effort of managing your hosting platform
+
+Froxlor can help you set up and manage a lot of system-services, like web-,
+mail- and
+ftpserver and it also brings some nice features such as a complete
+support-ticket system
+and an implementation of the Application Packaging Standard.
-Froxlor can help you set up and manage a lot of system-services, like web-,
mail- and ftpserver and it also brings some nice features such as a complete
support-ticket system and an implementation of the Application Packaging
Standard.
%prep
%setup -q -n %{name}
-#setup1 -T -D -b 1 -n %{name}
-%patch0
+#%patch0 -p1
+%patch1
+%patch2 -p1
%build
%install
-idir=$RPM_BUILD_ROOT/srv/www/htdocs/%{name}
+idir=%{buildroot}/srv/www/htdocs/%{name}
mkdir -p $idir
cp -aRf * $idir
+touch $idir/lib/userdata.inc.php
+rm -f $idir/COPYING
+# apache config
+mkdir -p %{buildroot}%{apache_sysconfdir}/conf.d/
+cp %{SOURCE2} %{buildroot}%{apache_sysconfdir}/conf.d/froxlor.conf
+# bind
+mkdir -p %{buildroot}%{_sysconfdir}/named.d/
+touch %{buildroot}%{_sysconfdir}/named.d/froxlor_bind.conf
+# cron
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d/
+cp %{S:3} %{buildroot}%{_sysconfdir}/cron.d/froxlor
+# logrotate
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
+cp %{S:4} %{buildroot}%{_sysconfdir}/logrotate.d/froxlor
+# openSUSE config template
+cp %{S:1} $idir/lib/configfiles/
-#chmod -R 755 *
-#mkdir -p uploadfiles
-#chmod -R 707 images
-
-echo "froxlor installation see doc http://wiki.froxlor.org/"; >
$idir/README.SUSE
-echo "see also froxlor website http://www.froxlor.org/"; >> $idir/README.SUSE
-echo "For SLE11 and SLE12 see README" >> $idir/README.SUSE
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%fdupes %{buildroot}%{_datadir}/%{name}
+%fdupes %{buildroot}/srv/www/htdocs/%{name}
%files
-%defattr(-,wwwrun,www)
-/srv/www/htdocs/%{name}
+%defattr(-,root,root)
+%attr(0755, wwwrun, root) %dir /srv/www/htdocs/%{name}/lib
+/srv/www/htdocs/%{name}/
+%config %{apache_sysconfdir}/conf.d/*
+%doc COPYING
+%ghost %config(noreplace) /srv/www/htdocs/%{name}/lib/userdata.inc.php
+%config %{_sysconfdir}/named.d/froxlor_bind.conf
+%config %{_sysconfdir}/cron.d/froxlor
+%config %{_sysconfdir}/logrotate.d/froxlor
%changelog
++++++ froxlor-0.9.38.7.tar.bz2 -> froxlor-0.9.40.1.tar.bz2 ++++++
++++ 34008 lines of diff (skipped)
++++++ froxlor-pdns.diff ++++++
diff --git a/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
b/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
index 27a6363..e6e41fa 100644
--- a/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
+++ b/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
@@ -120,7 +120,7 @@ class pdns extends DnsBase
private function _insertZone($domainname, $serial = 0)
{
$ins_stmt = $this->pdns_db->prepare("
- INSERT INTO domains set `name` = :domainname,
`notified_serial` = :serial, `type` = 'NATIVE'
+ INSERT INTO domains set `name` = :domainname,
`notified_serial` = :serial, `type` = 'MASTER'
");
$ins_stmt->execute(array('domainname' => $domainname, 'serial'
=> $serial));
$lastid = $this->pdns_db->lastInsertId();
++++++ froxlor-httpd.conf -> froxlor.conf ++++++
--- /work/SRC/openSUSE:Factory/froxlor/froxlor-httpd.conf 2016-08-22
10:07:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.froxlor.new.4615/froxlor.conf 2019-07-12
12:00:02.608172320 +0200
@@ -1,28 +1,29 @@
<IfModule mod_alias.c>
- Alias /froxlor "/srv/www/froxlor/"
+ Alias /froxlor /srv/www/htdocs/froxlor
</IfModule>
-<IfModule mod_php5.c>
- <Directory "/srv/www/froxlor">
- AllowOverride None
+# AddDefaultCharset UTF-8
+AddType text/x-component .htc
+
+<Directory /srv/www/htdocs/froxlor>
<IfModule mod_version.c>
- <IfVersion < 2.4>
- Order allow,deny
- Allow from all
- </IfVersion>
- <IfVersion >= 2.4>
- <IfModule mod_authz_core.c>
- Require all granted
- </IfModule>
- <IfModule mod_access_compat.c>
- Order allow,deny
- Allow from all
- </IfModule>
- </IfVersion>
+ <IfVersion < 2.4>
+ Order allow,deny
+ Allow from all
+ </IfVersion>
+ <IfVersion >= 2.4>
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+ <IfModule mod_access_compat.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
+ </IfVersion>
</IfModule>
<IfModule !mod_version.c>
- Order allow,deny
- Allow from all
+ Order allow,deny
+ Allow from all
</IfModule>
- </Directory>
-</IfModule>
+ Options -Indexes +FollowSymLinks
+</Directory>
++++++ froxlor.cron ++++++
# automatically generated cron-configuration by froxlor
# do not manually edit this file as it will be re-generated periodically.
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
#
*/1 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q
/srv/www/froxlor/scripts/froxlor_master_cronjob.php
++++++ froxlor.logrotate ++++++
#
# Froxlor logrotate snipet
#
/srv/customers/logs/*.log {
missingok
weekly
rotate 4
compress
delaycompress
notifempty
create
sharedscripts
postrotate
systemctl reload apache2 > /dev/null 2>&1 || true
endscript
}
++++++ froxlor.sql.patch ++++++
--- /var/tmp/diff_new_pack.Bbv3dC/_old 2019-07-12 12:00:04.820172387 +0200
+++ /var/tmp/diff_new_pack.Bbv3dC/_new 2019-07-12 12:00:04.824172387 +0200
@@ -1,6 +1,6 @@
---- install/froxlor.sql.orig 2017-01-25 08:49:59.539319542 +0100
-+++ install/froxlor.sql 2017-01-25 08:51:07.595295664 +0100
-@@ -1,3 +1,14 @@
+--- install/froxlor.sql.orig 2019-07-09 16:04:20.132449558 +0200
++++ install/froxlor.sql 2019-07-09 16:05:05.720484286 +0200
+@@ -1,3 +1,15 @@
+# change path from /var to /srv
+# webspaces: /srv/customers/webs
+# logs: /srv/customers/logs/
@@ -10,12 +10,13 @@
+# fcgi: /srv/www/php-fcgi-scripts
+# backup: /srv/customers/backups/
+# doc documentroot_prefix /srv/customers/webs/
++# asemen 20190709
+
+
DROP TABLE IF EXISTS `ftp_groups`;
CREATE TABLE `ftp_groups` (
`id` int(20) NOT NULL auto_increment,
-@@ -396,7 +407,7 @@
+@@ -401,18 +413,18 @@
('customredirect', 'enabled', '1'),
('customredirect', 'default', '1'),
('perl', 'suexecworkaround', '0'),
@@ -24,23 +25,20 @@
('login', 'domain_login', '0'),
('login', 'maxloginattempts', '3'),
('login', 'deactivatetime', '900'),
-@@ -409,13 +420,13 @@
- ('phpfpm', 'min_spare_servers', '5'),
- ('phpfpm', 'max_spare_servers', '35'),
- ('phpfpm', 'max_requests', '0'),
+ ('phpfpm', 'enabled', '0'),
- ('phpfpm', 'tmpdir', '/var/customers/tmp/'),
+ ('phpfpm', 'tmpdir', '/srv/customers/tmp/'),
('phpfpm', 'peardir', '/usr/share/php/:/usr/share/php5/'),
+ ('phpfpm', 'envpath', '/usr/local/bin:/usr/bin:/bin'),
('phpfpm', 'enabled_ownvhost', '0'),
('phpfpm', 'vhost_httpuser', 'froxlorlocal'),
('phpfpm', 'vhost_httpgroup', 'froxlorlocal'),
- ('phpfpm', 'idle_timeout', '30'),
- ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/'),
+ ('phpfpm', 'aliasconfigdir', '/srv/www/php-fpm/'),
('phpfpm', 'defaultini', '1'),
('phpfpm', 'vhost_defaultini', '2'),
('phpfpm', 'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'),
-@@ -423,14 +434,14 @@
+@@ -516,14 +528,14 @@
('nginx', 'fastcgiparams', '/etc/nginx/fastcgi_params'),
('system', 'lastaccountnumber', '0'),
('system', 'lastguid', '9999'),
@@ -58,40 +56,18 @@
('system', 'vmail_maildirname', 'Maildir'),
('system', 'bind_enable', '1'),
('system', 'bindconf_directory', '/etc/bind/'),
-@@ -451,9 +462,9 @@
+@@ -544,8 +556,8 @@
('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'),
('system', 'webalizer_quiet', '2'),
('system', 'last_archive_run', '000000'),
- ('system', 'mod_fcgid_configdir', '/var/www/php-fcgi-scripts'),
- ('system', 'mod_fcgid_tmpdir', '/var/customers/tmp'),
-- ('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'),
+ ('system', 'mod_fcgid_configdir', '/srv/www/php-fcgi-scripts'),
+ ('system', 'mod_fcgid_tmpdir', '/srv/customers/tmp'),
-+ ('system', 'ssl_cert_file', '/etc/apache2/ssl.crt/apache2.pem'),
+ ('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'),
('system', 'use_ssl', '0'),
('system', 'default_vhostconf', ''),
- ('system', 'mail_quota_enabled', '0'),
-@@ -468,7 +479,7 @@
- ('system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/'),
- ('system', 'index_file_extension', 'html'),
- ('system', 'mod_fcgid_maxrequests', '250'),
-- ('system', 'ssl_key_file','/etc/apache2/apache2.key'),
-+ ('system', 'ssl_key_file','/etc/apache2/ssl.key/apache2.key'),
- ('system', 'ssl_ca_file', ''),
- ('system', 'debug_cron', '0'),
- ('system', 'store_index_file_subs', '1'),
-@@ -509,8 +520,8 @@
- ('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'),
- ('system', 'allow_error_report_admin', '1'),
- ('system', 'allow_error_report_customer', '0'),
-- ('system', 'mdalog', '/var/log/mail.log'),
-- ('system', 'mtalog', '/var/log/mail.log'),
-+ ('system', 'mdalog', '/var/log/mail'),
-+ ('system', 'mtalog', '/var/log/mail'),
- ('system', 'mdaserver', 'dovecot'),
- ('system', 'mtaserver', 'postfix'),
- ('system', 'mailtraffic_enabled', '1'),
-@@ -526,7 +537,7 @@
+@@ -620,7 +632,7 @@
('system', 'letsencryptca', 'production'),
('system', 'letsencryptcountrycode', 'DE'),
('system', 'letsencryptstate', 'Hessen'),
++++++ leap42.xml ++++++
++++ 3884 lines (skipped)
