From fcda1eb2e8b53ec496aa6933ec784a88bde98e72 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 24 Apr 2020 13:31:55 +0200 Subject: [PATCH 1/5] No carddav plugin without a server ! What the fuck !!! What an idea to add the plugin without a server, it breaks roundcube ! --- scripts/install | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 82334d0..c0bb6fe 100644 --- a/scripts/install +++ b/scripts/install @@ -157,6 +157,7 @@ then ynh_composer_exec --commands="require roundcube/carddav $carddav_version" carddav_tmp_config="../conf/carddav.config.inc.php" + carddav_server=0 # Look for installed and supported CardDAV servers for carddav_app in "owncloud" "nextcloud" "baikal" @@ -165,6 +166,7 @@ then --output-as json | grep -Po '"id":[ ]?"\K.*?(?=")' | head -1) if [ -n "$carddav_app_id" ] then + carddav_server=1 # Retrieve app settings and enable relevant preset carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain) carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path) @@ -178,7 +180,11 @@ then # Copy the plugin configuration file cp "$carddav_tmp_config" ""$final_path/plugins/carddav/config.inc.php"" - installed_plugins+=" 'carddav'," + # Do not actualy add the carddav plugin if there's no carddav server available... + if [ $carddav_server -eq 1 ] + then + installed_plugins+=" 'carddav'," + fi fi # Install Enigma plugin From f16fb754281cc65ecb286c9d0616f2a3e8919d4a Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 24 Apr 2020 13:34:42 +0200 Subject: [PATCH 2/5] Fix carddav in upgrade --- scripts/upgrade | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index da248f8..96958de 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -199,6 +199,7 @@ then ynh_composer_exec --commands="require roundcube/carddav $carddav_version" carddav_tmp_config="../conf/carddav.config.inc.php" + carddav_server=0 # Look for installed and supported CardDAV servers for carddav_app in "owncloud" "nextcloud" "baikal" @@ -207,6 +208,7 @@ then --output-as json | grep -Po '"id":[ ]?"\K.*?(?=")' | head -1) if [ -n "$carddav_app_id" ] then + carddav_server=1 # Retrieve app settings and enable relevant preset carddav_domain=$(ynh_app_setting_get --app=$carddav_app_id --key=domain) carddav_path=$(ynh_app_setting_get --app=$carddav_app_id --key=path) @@ -220,7 +222,11 @@ then # Copy the plugin configuration file cp "$carddav_tmp_config" ""$final_path/plugins/carddav/config.inc.php"" - installed_plugins+=" 'carddav'," + # Do not actually add the carddav plugin if there's no carddav server available... + if [ $carddav_server -eq 1 ] + then + installed_plugins+=" 'carddav'," + fi fi # Install Enigma plugin From 00eea510e97659452a999f6a6e5013709395dd53 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 24 Apr 2020 13:35:37 +0200 Subject: [PATCH 3/5] php-net-ldap isn't available anymore --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 055fb42..16d78b9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Package dependencies -pkg_dependencies="php-cli php-common php-intl php-json php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-net-ldap2 php-net-ldap3 php-zip php-gd php-mbstring php-curl" +pkg_dependencies="php-cli php-common php-intl php-json php-pear php-auth-sasl php-mail-mime php-patchwork-utf8 php-net-smtp php-net-socket php-zip php-gd php-mbstring php-curl" # Plugins version contextmenu_version=2.3 From c163bb27ab52f52c01b5a41edd8b05b25c11296e Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 24 Apr 2020 13:51:14 +0200 Subject: [PATCH 4/5] Replace php-net-ldap3 by kolab/net_ldap3 According to that "SOOOO" helpful comment. Finally found that actually a dependency is missing in buster, but no one actually cares... --- scripts/install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index c0bb6fe..38d9854 100644 --- a/scripts/install +++ b/scripts/install @@ -142,6 +142,9 @@ ynh_script_progression --message="Installing additional plugins..." --weight=60 # Create logs and temp directories mkdir -p "$final_path/"{logs,temp} +# Install net_LDAP +ynh_composer_exec --commands="require kolab/net_ldap3" + # Install contextmenu and automatic_addressbook plugins # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook # https://plugins.roundcube.net/packages/johndoh/contextmenu From aa18bfa9d5fb45a8f0adecb7ce2b632b9eabc73f Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 24 Apr 2020 13:59:22 +0200 Subject: [PATCH 5/5] net_ldap3 in upgrade as well --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 96958de..748deb0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -184,6 +184,9 @@ then # Create logs and temp directories mkdir -p "$final_path/"{logs,temp} + # Install net_LDAP + ynh_composer_exec --commands="require kolab/net_ldap3" + # Update or install contextmenu and automatic_addressbook plugins # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook # https://plugins.roundcube.net/packages/johndoh/contextmenu