From 422f007e9d3a3b3954afcbb8dfac4243139f3fca Mon Sep 17 00:00:00 2001
From: David Prevot <dprevot+git@evolix.fr>
Date: Wed, 17 Jan 2024 16:45:36 +0100
Subject: [PATCH] php: drop apt_preferences(5) file for sury
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It doesn’t work as expected, and all covered cases should already be
available from http://pub.evolix.org/evolix/dists/ (if
$release_name-phpXY is not available, $release should probably be fixed
or the correct suite added to the repository).
---
 php/files/sury.preferences | 7 -------
 php/tasks/sury_pre.yml     | 9 ---------
 2 files changed, 16 deletions(-)
 delete mode 100644 php/files/sury.preferences

diff --git a/php/files/sury.preferences b/php/files/sury.preferences
deleted file mode 100644
index adcc5918..00000000
--- a/php/files/sury.preferences
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: php* libapache2-mod-php* libpcre2* libzip4* libgd* libpcre3*
-Pin: origin packages.sury.org
-Pin-Priority: 999
-
-Package: *
-Pin: origin packages.sury.org
-Pin-Priority: 50
diff --git a/php/tasks/sury_pre.yml b/php/tasks/sury_pre.yml
index a0640e4c..599f9425 100644
--- a/php/tasks/sury_pre.yml
+++ b/php/tasks/sury_pre.yml
@@ -27,15 +27,6 @@
     repo: "deb [signed-by={{ apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix {{ ansible_distribution_release }}-php{{ php_version | replace('.', '')}} main"
     filename: evolix-php
     state: present
-  when:
-    - ansible_distribution_release == "bullseye"
-
-- name: Setup deb.sury.org repository - Add preferences file
-  ansible.builtin.copy:
-    src: sury.preferences
-    dest: /etc/apt/preferences.d/z-sury
-  when:
-    - ansible_distribution_release != "bullseye"
 
 - name: Setup deb.sury.org repository - Add GPG key
   ansible.builtin.copy: