From a23233ab0fb53326325185f04f7ffb78d1e29719 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 28 Aug 2020 22:30:20 +0200
Subject: [PATCH 1/2] Add apt regenconf hook to manage sury pinning policy on
 all

---
 data/hooks/conf_regen/10-apt | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100755 data/hooks/conf_regen/10-apt

diff --git a/data/hooks/conf_regen/10-apt b/data/hooks/conf_regen/10-apt
new file mode 100755
index 000000000..4ce838e4c
--- /dev/null
+++ b/data/hooks/conf_regen/10-apt
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+do_pre_regen() {
+    pending_dir=$1
+
+    mkdir --parents "${pending_dir}/etc/apt/preferences.d"
+
+    for package in "php" "php-fpm" "php-mysql" "php-xml" "php-zip" "php-mbstring" "php-ldap" "php-gd" "php-curl" "php-bz2" "php-json" "php-sqlite3" "php-intl" "openssl" "libssl1.1" "libssl-dev"
+    do
+        echo "
+Package: $package
+Pin: origin \"packages.sury.org\" 
+Pin-Priority: -1" >> "/etc/apt/preferences.d/extra_php_version"
+    done
+}
+
+do_post_regen() {
+  regen_conf_files=$1
+}
+
+FORCE=${2:-0}
+DRY_RUN=${3:-0}
+
+case "$1" in
+  pre)
+    do_pre_regen $4
+    ;;
+  post)
+    do_post_regen $4
+    ;;
+  *)
+    echo "hook called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
+esac
+
+exit 0

From 346728e55dbed915f9dbee68929a92cf70f1ffcf Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 28 Aug 2020 22:31:10 +0200
Subject: [PATCH 2/2] Remove the pinning stuff of sury from the helpers, since
 it's now managed by the regenconf core

---
 data/helpers.d/apt | 6 ------
 data/helpers.d/php | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/data/helpers.d/apt b/data/helpers.d/apt
index 377464786..1a4a9f74a 100644
--- a/data/helpers.d/apt
+++ b/data/helpers.d/apt
@@ -265,12 +265,6 @@ ynh_install_app_dependencies () {
             then
                 # Re-add sury
                 ynh_install_extra_repo --repo="https://packages.sury.org/php/ $(ynh_get_debian_release) main" --key="https://packages.sury.org/php/apt.gpg" --name=extra_php_version --priority=600
-
-                # Pin this sury repository to prevent sury of doing shit
-                for package_to_not_upgrade in "php" "php-fpm" "php-mysql" "php-xml" "php-zip" "php-mbstring" "php-ldap" "php-gd" "php-curl" "php-bz2" "php-json" "php-sqlite3" "php-intl" "openssl" "libssl1.1" "libssl-dev"
-                do
-                    ynh_pin_repo --package="$package_to_not_upgrade" --pin="origin \"packages.sury.org\"" --priority="-1" --name=extra_php_version --append
-                done
             fi
         fi
     fi
diff --git a/data/helpers.d/php b/data/helpers.d/php
index 0fe118fde..489c448a8 100644
--- a/data/helpers.d/php
+++ b/data/helpers.d/php
@@ -364,12 +364,6 @@ ynh_install_php () {
     # Set the default PHP version back as the default version for php-cli.
     update-alternatives --set php /usr/bin/php$YNH_DEFAULT_PHP_VERSION
 
-    # Pin this extra repository after packages are installed to prevent sury of doing shit
-    for package_to_not_upgrade in "php" "php-fpm" "php-mysql" "php-xml" "php-zip" "php-mbstring" "php-ldap" "php-gd" "php-curl" "php-bz2" "php-json" "php-sqlite3" "php-intl" "openssl" "libssl1.1" "libssl-dev"
-    do
-        ynh_pin_repo --package="$package_to_not_upgrade" --pin="origin \"packages.sury.org\"" --priority="-1" --name=extra_php_version --append
-    done
-
     # Advertise service in admin panel
     yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log"
 }