Attachment 250285 Details for Bug 278641 – Patch 10.0.14 to 10.0.15

[patch] Patch 10.0.14 to 10.0.15

patch-10.0.14-to-10.0.15.diff (text/plain), 9.62 KB, created by Mathias Monnerville on 2024-04-28 19:46:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathias Monnerville

Created: 2024-04-28 19:46:28 UTC

Size: 9.62 KB

patch

obsolete

>diff --git a/www/glpi/Makefile b/www/glpi/Makefile
>index 7aa869f64..6d17e54cf 100644
>--- a/www/glpi/Makefile
>+++ b/www/glpi/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	glpi
>-PORTVERSION=	10.0.14
>+PORTVERSION=	10.0.15
> PORTEPOCH=	1
> CATEGORIES=	www
> MASTER_SITES=	https://github.com/glpi-project/glpi/releases/download/${PORTVERSION}/
>diff --git a/www/glpi/distinfo b/www/glpi/distinfo
>index 0b85cf397..729d25574 100644
>--- a/www/glpi/distinfo
>+++ b/www/glpi/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1711956961
>-SHA256 (glpi-10.0.14.tgz) = 69c7503c453a85ef47b47cbf08d3ebe8cb8bfe0d45f6aeb32d58c10321e911f5
>-SIZE (glpi-10.0.14.tgz) = 59541870
>+TIMESTAMP = 1714325306
>+SHA256 (glpi-10.0.15.tgz) = 8ce94c1403c1143a5b503f18f7b7b9a5d29e83489fc81cc7287b719df0b97236
>+SIZE (glpi-10.0.15.tgz) = 59757265
>diff --git a/www/glpi/pkg-plist b/www/glpi/pkg-plist
>index 2833fd3d9..f8fefb667 100644
>--- a/www/glpi/pkg-plist
>+++ b/www/glpi/pkg-plist
>@@ -711,6 +711,7 @@
> %%WWWDIR%%/front/item_device.common.form.php
> %%WWWDIR%%/front/item_device.php
> %%WWWDIR%%/front/item_devicebattery.form.php
>+%%WWWDIR%%/front/item_devicecamera.form.php
> %%WWWDIR%%/front/item_devicecase.form.php
> %%WWWDIR%%/front/item_devicecontrol.form.php
> %%WWWDIR%%/front/item_devicedrive.form.php
>@@ -1187,6 +1188,8 @@
> %%WWWDIR%%/install/migrations/update_10.0.12_to_10.0.13.php
> %%WWWDIR%%/install/migrations/update_10.0.12_to_10.0.13/configs.php
> %%WWWDIR%%/install/migrations/update_10.0.12_to_10.0.13/location.php
>+%%WWWDIR%%/install/migrations/update_10.0.14_to_10.0.15.php
>+%%WWWDIR%%/install/migrations/update_10.0.14_to_10.0.15/user.php
> %%WWWDIR%%/install/migrations/update_10.0.1_to_10.0.2.php
> %%WWWDIR%%/install/migrations/update_10.0.1_to_10.0.2/agent.php
> %%WWWDIR%%/install/migrations/update_10.0.1_to_10.0.2/configs.php
>@@ -1203,6 +1206,7 @@
> %%WWWDIR%%/install/migrations/update_10.0.3_to_10.0.4/inventory.php
> %%WWWDIR%%/install/migrations/update_10.0.3_to_10.0.4/ticket.php
> %%WWWDIR%%/install/migrations/update_10.0.4_to_10.0.5.php
>+%%WWWDIR%%/install/migrations/update_10.0.4_to_10.0.5/items_disks.php
> %%WWWDIR%%/install/migrations/update_10.0.5_to_10.0.6.php
> %%WWWDIR%%/install/migrations/update_10.0.5_to_10.0.6/appliance.php
> %%WWWDIR%%/install/migrations/update_10.0.5_to_10.0.6/blacklist.php
>@@ -1360,6 +1364,7 @@
> %%WWWDIR%%/install/mysql/glpi-10.0.11-empty.sql
> %%WWWDIR%%/install/mysql/glpi-10.0.12-empty.sql
> %%WWWDIR%%/install/mysql/glpi-10.0.13-empty.sql
>+%%WWWDIR%%/install/mysql/glpi-10.0.14-empty.sql
> %%WWWDIR%%/install/mysql/glpi-10.0.2-empty.sql
> %%WWWDIR%%/install/mysql/glpi-10.0.3-empty.sql
> %%WWWDIR%%/install/mysql/glpi-10.0.4-empty.sql
>@@ -2544,49 +2549,93 @@
> %%WWWDIR%%/public/lib/tinymce.js.map
> %%WWWDIR%%/public/lib/tinymce.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/dark/content.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/dark/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/dark/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/dark/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/default/content.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/default/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/default/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/default/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/document/content.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/document/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/document/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/document/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5-dark/content.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5-dark/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5-dark/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5-dark/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5/content.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/tinymce-5/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/writer/content.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/writer/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/content/writer/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/content/writer/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.css
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.inline.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.inline.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.inline.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.inline.min.js
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.shadowdom.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.shadowdom.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.css
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.inline.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.inline.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.inline.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.inline.min.js
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.shadowdom.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.shadowdom.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.shadowdom.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/oxide/skin.shadowdom.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.css
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.inline.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.inline.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.inline.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.inline.min.js
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5-dark/skin.shadowdom.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.css
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.inline.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.inline.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.inline.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.inline.min.js
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/content.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.min.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.shadowdom.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.shadowdom.js
> %%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.shadowdom.min.css
>+%%WWWDIR%%/public/lib/tinymce/skins/ui/tinymce-5/skin.shadowdom.min.js
> %%WWWDIR%%/resources/.htaccess
> %%WWWDIR%%/resources/Rules/RuleAsset.xml
> %%WWWDIR%%/resources/Rules/RuleDictionnaryOperatingSystem.xml
>@@ -3099,6 +3148,7 @@
> %%WWWDIR%%/src/Lockedfield.php
> %%WWWDIR%%/src/Log.php
> %%WWWDIR%%/src/Mail/Protocol/ProtocolInterface.php
>+%%WWWDIR%%/src/Mail/SMTP/OAuthTokenProvider.php
> %%WWWDIR%%/src/Mail/SMTP/OauthConfig.php
> %%WWWDIR%%/src/Mail/SMTP/OauthProvider/Azure.php
> %%WWWDIR%%/src/Mail/SMTP/OauthProvider/Google.php
>@@ -6617,7 +6667,7 @@
> %%WWWDIR%%/vendor/webmozart/assert/src/Assert.php
> %%WWWDIR%%/vendor/webmozart/assert/src/InvalidArgumentException.php
> %%WWWDIR%%/vendor/webmozart/assert/src/Mixin.php
>-%%WWWDIR%%/version/10.0.14
>+%%WWWDIR%%/version/10.0.15
> @dir %%WWWDIR%%/ajax
> @dir %%WWWDIR%%/bin
> @dir %%WWWDIR%%/config
>@@ -6694,6 +6744,7 @@
> @dir %%WWWDIR%%/install/migrations/update_10.0.10_to_10.0.11
> @dir %%WWWDIR%%/install/migrations/update_10.0.11_to_10.0.12
> @dir %%WWWDIR%%/install/migrations/update_10.0.12_to_10.0.13
>+@dir %%WWWDIR%%/install/migrations/update_10.0.14_to_10.0.15
> @dir %%WWWDIR%%/install/migrations/update_10.0.1_to_10.0.2
> @dir %%WWWDIR%%/install/migrations/update_10.0.2_to_10.0.3
> @dir %%WWWDIR%%/install/migrations/update_10.0.3_to_10.0.4

Flags:

mathias: maintainer-approval+

Actions: View | Diff

Attachments on bug 278641: 250285 | 250286