From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: Squash changes containing private information There were a lot of changes since the previous commit, but a lot of them contained personnal information about users. All thos changes got stashed into a single commit (history is kept in a different place) and private information was moved in a separate private repository --- overlays/php-packages/default.nix | 6 ------ overlays/php-packages/mysqli_patch.patch | 11 ----------- 2 files changed, 17 deletions(-) delete mode 100644 overlays/php-packages/default.nix delete mode 100644 overlays/php-packages/mysqli_patch.patch (limited to 'overlays/php-packages') diff --git a/overlays/php-packages/default.nix b/overlays/php-packages/default.nix deleted file mode 100644 index 90fb613..0000000 --- a/overlays/php-packages/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -self: super: rec { - myPhpPackages.mysqli_pam = self.php74.extensions.mysqli.overrideAttrs(old: { - configureFlags = [ "--with-mysqli=${self.libmysqlclient_pam}/bin/mysql_config" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; - patches = old.patches or [] ++ [ ./mysqli_patch.patch ]; -}); -} diff --git a/overlays/php-packages/mysqli_patch.patch b/overlays/php-packages/mysqli_patch.patch deleted file mode 100644 index a8f03e3..0000000 --- a/overlays/php-packages/mysqli_patch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ext/mysqli/mysqli_nonapi.c -+++ b/ext/mysqli/mysqli_nonapi.c -@@ -263,7 +263,7 @@ void mysqli_common_connect(INTERNAL_FUNC - php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); - - #if !defined(MYSQLI_USE_MYSQLND) -- mysql->mysql->reconnect = MyG(reconnect); -+ mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (my_bool *)&MyG(reconnect)); - #endif - - mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile)); -- cgit v1.2.3