From 58e501817766283105f21ca6dd1f6003a60d1369 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 8 Feb 2022 23:03:08 +0100 Subject: [PATCH 1/3] Upgrade to 1.16~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++++ conf/app.src | 4 ++-- conf/core-plugins.src | 4 ++-- conf/plugin-microsoft-teams.src | 4 ++-- manifest.json | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b17840a..272db3a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in osTicket is a widely-used open source support ticket system. It seamlessly integrates inquiries created via email, phone and web-based forms into a simple easy-to-use multi-user web interface. Manage, organize and archive all your support requests and responses in one place while providing your customers with accountability and responsiveness they deserve. -**Shipped version:** 1.15.4~ynh2 +**Shipped version:** 1.16~ynh1 **Demo:** http://www.ostickethacks.com/demo/demo_info.php diff --git a/README_fr.md b/README_fr.md index fe679ac..9b6ac54 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour osTicket is a widely-used open source support ticket system. It seamlessly integrates inquiries created via email, phone and web-based forms into a simple easy-to-use multi-user web interface. Manage, organize and archive all your support requests and responses in one place while providing your customers with accountability and responsiveness they deserve. -**Version incluse :** 1.15.4~ynh2 +**Version incluse :** 1.16~ynh1 **Démo :** http://www.ostickethacks.com/demo/demo_info.php diff --git a/check_process b/check_process index 9c79a58..0e85d9d 100644 --- a/check_process +++ b/check_process @@ -26,6 +26,8 @@ #upgrade=1 from_commit=55e224ea95f384ab8db46941366b0205cd8d3032 # 1.15.3.1~ynh1 upgrade=1 from_commit=049b860396347599e0633adf277549146644e460 + # 1.15.4~ynh2 + upgrade=1 from_commit=9af7e309b19966c19dab60fbb54a46b6d2269323 backup_restore=1 multi_instance=1 port_already_use=0 @@ -46,3 +48,5 @@ Notification=none name=1.15.2~ynh2 ; commit=049b860396347599e0633adf277549146644e460 name=1.15.3.1~ynh1 + ; commit=9af7e309b19966c19dab60fbb54a46b6d2269323 + name=1.15.4~ynh2 diff --git a/conf/app.src b/conf/app.src index 36d568b..f6bda90 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/osTicket/osTicket/releases/download/v1.15.4/osTicket-v1.15.4.zip -SOURCE_SUM=6c7cf5fe74258dd0beac6176c438468f468a0a3f07f1f6a0349cc68a9e514302 +SOURCE_URL=https://github.com/osTicket/osTicket/releases/download/v1.16/osTicket-v1.16.zip +SOURCE_SUM=cebf6bb58e41044cee7c6e1493e6e88e7f5aa8739e7260d034001b613fe1eedf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/core-plugins.src b/conf/core-plugins.src index 4ac451c..489756c 100644 --- a/conf/core-plugins.src +++ b/conf/core-plugins.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/f00b381190164b237cfb799a4fc4ce6a86eea9f4.tar.gz -SOURCE_SUM=ab2518d70454faad37666f47b41f6bc861c8928b44f574307c1494e9df8ff591 +SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/fc089b9339c2a89e293b99be878252f03276cdc7.tar.gz +SOURCE_SUM=227dd80a42cd9b66f45b0c60779bba4a1d1d7b71e59311f472960fdf1293ec9f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/plugin-microsoft-teams.src b/conf/plugin-microsoft-teams.src index 0e3159a..5e328a1 100644 --- a/conf/plugin-microsoft-teams.src +++ b/conf/plugin-microsoft-teams.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ipavlovi/osTicket-Microsoft-Teams-plugin/archive/dcb66302d6ffc4ee3e016acbd98949b0d69dde01.tar.gz -SOURCE_SUM=8601973c07ca3d18f10333a3458b5b6f48a56c87361be9b3832605db245157e2 +SOURCE_URL=https://github.com/ipavlovi/osTicket-Microsoft-Teams-plugin/archive/183a4248e9c605ee403a0054dbf076616b0459d2.tar.gz +SOURCE_SUM=f53388328d6647ba11a0586dfc46ca8f42e418688098a9ea0e9e7c8ec4f1e255 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 0a18e7e..9d55a8d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source support ticket system", "fr": "Système de ticket de support open source" }, - "version": "1.15.4~ynh2", + "version": "1.16~ynh1", "url": "https://osticket.com", "upstream": { "license": "GPL-2.0-or-later", From df98bc844eee48bd3e283bc672f4bb73e475f4e2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 9 Feb 2022 20:35:44 +0100 Subject: [PATCH 2/3] Fix plugins --- conf/core-plugins.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/core-plugins.src b/conf/core-plugins.src index 489756c..2f78814 100644 --- a/conf/core-plugins.src +++ b/conf/core-plugins.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/fc089b9339c2a89e293b99be878252f03276cdc7.tar.gz -SOURCE_SUM=227dd80a42cd9b66f45b0c60779bba4a1d1d7b71e59311f472960fdf1293ec9f +SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/845bc9edcd6daf20cc4f3dc1c84e2e168c2bc9d5.tar.gz +SOURCE_SUM=74ee58abc3a9e0bfce7fed5c671abc87421a97b1deca550865e461cb05e728cc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From d0847b7e4c9940094dd9407a374e1769611ffeec Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 10 Feb 2022 01:32:12 +0100 Subject: [PATCH 3/3] Fix core plugin --- conf/core-plugins.src | 4 ++-- scripts/install | 1 - scripts/upgrade | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/core-plugins.src b/conf/core-plugins.src index 2f78814..489756c 100644 --- a/conf/core-plugins.src +++ b/conf/core-plugins.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/845bc9edcd6daf20cc4f3dc1c84e2e168c2bc9d5.tar.gz -SOURCE_SUM=74ee58abc3a9e0bfce7fed5c671abc87421a97b1deca550865e461cb05e728cc +SOURCE_URL=https://github.com/osTicket/osTicket-plugins/archive/fc089b9339c2a89e293b99be878252f03276cdc7.tar.gz +SOURCE_SUM=227dd80a42cd9b66f45b0c60779bba4a1d1d7b71e59311f472960fdf1293ec9f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/install b/scripts/install index 7b92513..e449011 100644 --- a/scripts/install +++ b/scripts/install @@ -89,7 +89,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path/include/plugins/build" --source_id="core-plugins" -ynh_replace_string --match_string="net_ldap2" --replace_string="Net_LDAP2" --target_file="$final_path/include/plugins/build/auth-ldap/plugin.php" ynh_setup_source --dest_dir="$final_path/include/plugins/build/archiver" --source_id="plugin-archiver" ynh_setup_source --dest_dir="$final_path/include/plugins/build/attachment_preview" --source_id="plugin-attachment_preview" ynh_setup_source --dest_dir="$final_path/include/plugins/build/autocloser" --source_id="plugin-autocloser" diff --git a/scripts/upgrade b/scripts/upgrade index 3a1b332..6f5593f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -84,7 +84,6 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path/include/plugins/build" --source_id="core-plugins" - ynh_replace_string --match_string="net_ldap2" --replace_string="Net_LDAP2" --target_file="$final_path/include/plugins/build/auth-ldap/plugin.php" ynh_setup_source --dest_dir="$final_path/include/plugins/build/archiver" --source_id="plugin-archiver" ynh_setup_source --dest_dir="$final_path/include/plugins/build/attachment_preview" --source_id="plugin-attachment_preview" ynh_setup_source --dest_dir="$final_path/include/plugins/build/autocloser" --source_id="plugin-autocloser"