From b4dedca3db21ae57de9849aaad7dfeadb0c48a46 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 2 Jan 2020 13:53:22 +0100 Subject: [PATCH 1/3] Update README.md --- README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index affecf3e..51b9d3d8 100644 --- a/README.md +++ b/README.md @@ -53,14 +53,21 @@ https://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](https://files.fro [HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-debian) -/etc/apt/sources.list.d/froxlor.list -> deb http://debian.froxlor.org {stretch|buster} main +``` +apt-get -y install apt-transport-https lsb-release ca-certificates +wget -O - https://deb.froxlor.org/froxlor.gpg | apt-key add - +echo "deb https://deb.froxlor.org/debian $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list +``` -### Gentoo repository +### Ubuntu repository -[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-gentoo) +[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-ubuntu) -https://files.froxlor.org/gentoo/repositories.xml +``` +apt-get -y install apt-transport-https lsb-release ca-certificates +wget -O - https://deb.froxlor.org/froxlor.gpg | apt-key add - +echo "deb https://deb.froxlor.org/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list +``` ## Contributing From 25d0bbb7665c8f97eb0ab390c04bcbad49da91de Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 3 Jan 2020 12:48:01 +0100 Subject: [PATCH 2/3] switch from algo26-matthias/idna-covert to our own fork as we cannot update to >2.1 without having a minimum requirement for php-7.2 but we need a few fixes for php-7.4 support later on Signed-off-by: Michael Kaufmann --- composer.json | 2 +- composer.lock | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 731e9bf4..b6445f0a 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "phpmailer/phpmailer": "~6.0", "monolog/monolog": "^1.24", "robthree/twofactorauth": "^1.6", - "algo26-matthias/idna-convert": "^2.1" + "froxlor/idna-convert-legacy": "^2.1" }, "require-dev": { "phpunit/phpunit": "8.4.1", diff --git a/composer.lock b/composer.lock index 57aeced7..12069d86 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5699c65bbdcd2a61a9ced0ac7be84d64", + "content-hash": "a7ba15333ffb4a758ea65039b589545b", "packages": [ { - "name": "algo26-matthias/idna-convert", - "version": "v2.1.0", + "name": "froxlor/idna-convert-legacy", + "version": "v2.1.2", "source": { "type": "git", - "url": "https://github.com/algo26-matthias/idna-convert.git", - "reference": "2717d05713454991936bc581d068c6cea0d84e3b" + "url": "https://github.com/Froxlor/idna-convert-legacy.git", + "reference": "09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/2717d05713454991936bc581d068c6cea0d84e3b", - "reference": "2717d05713454991936bc581d068c6cea0d84e3b", + "url": "https://api.github.com/repos/Froxlor/idna-convert-legacy/zipball/09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7", + "reference": "09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7", "shasum": "" }, "require": { @@ -43,6 +43,11 @@ "name": "Matthias Sommerfeld", "email": "matthias.sommerfeld@algo26.de", "role": "Developer" + }, + { + "name": "Michael Kaufmann (d00p)", + "email": "d00p@froxlor.org", + "role": "Developer" } ], "description": "A library for encoding and decoding internationalized domain names", @@ -52,7 +57,7 @@ "idna", "php" ], - "time": "2019-03-04T17:07:46+00:00" + "time": "2019-12-31T12:16:30+00:00" }, { "name": "monolog/monolog", From dd2782771aa8d94cdb88b2eb4c458c5269038ca4 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 3 Jan 2020 13:24:31 +0100 Subject: [PATCH 3/3] set version to 0.10.11 for upcoming maintenance release Signed-off-by: Michael Kaufmann --- install/froxlor.sql | 2 +- install/updates/froxlor/0.10/update_0.10.inc.php | 5 +++++ lib/Froxlor/Froxlor.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index cdac2384..99bac462 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -702,7 +702,7 @@ opcache.interned_strings_buffer'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), ('panel', 'customer_hide_options', ''), ('panel', 'is_configured', '0'), - ('panel', 'version', '0.10.10'), + ('panel', 'version', '0.10.11'), ('panel', 'db_version', '201912311'); diff --git a/install/updates/froxlor/0.10/update_0.10.inc.php b/install/updates/froxlor/0.10/update_0.10.inc.php index de6e9609..9b76e7df 100644 --- a/install/updates/froxlor/0.10/update_0.10.inc.php +++ b/install/updates/froxlor/0.10/update_0.10.inc.php @@ -537,3 +537,8 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201912310')) { lastStepStatus(0); \Froxlor\Froxlor::updateToDbVersion('201912311'); } + +if (\Froxlor\Froxlor::isFroxlorVersion('0.10.10')) { + showUpdateStep("Updating from 0.10.10 to 0.10.11", false); + \Froxlor\Froxlor::updateToVersion('0.10.11'); +} diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index 9eb2ea76..7a96a6f7 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -7,7 +7,7 @@ final class Froxlor { // Main version variable - const VERSION = '0.10.10'; + const VERSION = '0.10.11'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '201912311';