[PATCH 0/8] Remove mysql

[PATCH 0/8] Remove mysql

[Efraim Flashner]

I saw that a fix was applied to mysql on core-updates to have it build
with openssl-1.1, and I figured that rather than have a version that was
several years out of date (and surely had many many security
vulnerabilities) it would be better to try to just remove it.
`mariadb:dev` provides the `mysql_config` binary that some packages
search for so I used it as a drop-in replacement. Nothing seemed broken
to me after building some packages, so to the best of my knowledge of
these disparate packages and languages all is fine.

Efraim Flashner (8):
  gnu: sysbench: Build with mariadb.
  gnu: ghc-mysql: Build with mariadb.
  gnu: neko: Build with mariadb.
  gnu: inspircd: Build with mariadb.
  gnu: ulogd: Build with mariadb.
  gnu: opensmtpd-extras: Build with mariadb.
  gnu: sbcl-clsql: Build with mariadb.
  gnu: cl-clsql: Build with mariadb.

 gnu/packages/benchmark.scm   |  9 +--------
 gnu/packages/haskell-xyz.scm |  4 ++--
 gnu/packages/haxe.scm        |  3 ++-
 gnu/packages/irc.scm         |  4 ++--
 gnu/packages/linux.scm       |  6 +++---
 gnu/packages/lisp-xyz.scm    | 18 ++++++++++--------
 gnu/packages/mail.scm        |  4 ++--
 7 files changed, 22 insertions(+), 26 deletions(-)


base-commit: 2d06dfc050114dba44e791d8decc8eaa705fee01
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 1/8] gnu: sysbench: Build with mariadb.

[Efraim Flashner]

* gnu/packages/benchmark.scm (sysbench)[arguments]: Remove mysql flag.
[inputs]: Remove mysql. Add mariadb:dev.
---
 gnu/packages/benchmark.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 0cc8def918..da2291194c 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -612,13 +612,6 @@ (define-public sysbench
     (arguments
      (list
       #:configure-flags #~(list "--with-pgsql"
-                                ;; Explicitly specify the library directory of
-                                ;; MySQL, otherwise `mysql_config` gets
-                                ;; consulted and adds unnecessary link
-                                ;; directives.
-                                (string-append "--with-mysql-libs="
-                                               #$(this-package-input "mysql")
-                                               "/lib")
                                 "--with-system-luajit"
                                 "--with-system-ck"
                                 ;; If we let the build tool select the most
@@ -679,7 +672,7 @@ (define-public sysbench
                          libxslt
                          docbook-xml
                          docbook-xsl))
-    (inputs (list ck libaio luajit mysql postgresql))
+    (inputs (list ck libaio luajit (list mariadb "dev") postgresql))
     (home-page "https://github.com/akopytov/sysbench/")
     (synopsis "Scriptable database and system performance benchmark")
     (description "@command{sysbench} is a scriptable multi-threaded benchmark
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 2/8] gnu: ghc-mysql: Build with mariadb.

[Efraim Flashner]

* gnu/packages/haskell-xyz.scm (ghc-mysql)[inputs]: Remove mysql. Add
mariadb:dev.
---
 gnu/packages/haskell-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index f2cc60267b..7071a5e05d 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
-;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
 ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
@@ -14501,7 +14501,7 @@ (define-public ghc-mysql
     (properties '((upstream-name . "mysql")))
     (arguments `(#:tests? #f)) ; TODO: Fails to connect to server.
     (inputs
-     (list mysql zlib openssl))
+     (list (list mariadb "dev") zlib openssl))
     (native-inputs (list ghc-hspec))
     (home-page "https://github.com/paul-rouse/mysql")
     (synopsis "Low-level MySQL client library")
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 3/8] gnu: neko: Build with mariadb.

[Efraim Flashner]

* gnu/packages/haxe.scm (neko)[inputs]: Remove mysql. Add mariadb:dev,
mariadb:lib.
---
 gnu/packages/haxe.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm
index dbe8b2c19e..3e8a6a1a18 100644
--- a/gnu/packages/haxe.scm
+++ b/gnu/packages/haxe.scm
@@ -79,7 +79,8 @@ (define-public neko
                   httpd
                   libgc
                   mbedtls-apache
-                  mysql
+                  (list mariadb "dev")
+                  (list mariadb "lib")
                   openssl
                   pcre
                   sqlite
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 4/8] gnu: inspircd: Build with mariadb.

[Efraim Flashner]

* gnu/packages/irc.scm (inspircd)[inputs]: Remove mysql. Add mariadb:dev.
---
 gnu/packages/irc.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 4bce2d2d47..e5162cc2c4 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014 Kevin Lemonnier <lemonnierk@ulrar.net>
 ;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -749,7 +749,7 @@ (define-public inspircd
            gnutls
            libmaxminddb
            mbedtls-apache
-           mysql
+           (list mariadb "dev")
            openldap
            openssl
            `(,pcre "bin")
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 5/8] gnu: ulogd: Build with mariadb.

[Efraim Flashner]

* gnu/packages/linux.scm (ulogd)[inputs]: Remove mysql. Add mariadb:dev.
[arguments]: Adjust configure-flags accordingly.
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 36b35448cc..3b123257f7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2018, 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
@@ -8093,7 +8093,7 @@ (define-public ulogd
                   libpcap
                   jansson
                   postgresql
-                  mysql
+                  (list mariadb "dev")
                   zlib
                   openssl))
     (arguments
@@ -8101,7 +8101,7 @@ (define-public ulogd
            #~(list (string-append "--with-pgsql="
                                   (assoc-ref %build-inputs "postgresql"))
                    (string-append "--with-mysql="
-                                  (assoc-ref %build-inputs "mysql")))
+                                  (assoc-ref %build-inputs "mariadb")))
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'install 'install-doc
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 6/8] gnu: opensmtpd-extras: Build with mariadb.

[Efraim Flashner]

* gnu/packages/mail.scm (opensmtpd-extras)[inputs]: Remove mysql. Add
mariadb:dev.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 353773de09..82a2828386 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo@famulari.name>
@@ -3258,7 +3258,7 @@ (define-public opensmtpd-extras
     (inputs
      `(("libressl" ,libressl)
        ("libevent" ,libevent)
-       ("mysql" ,mysql)
+       ("mysql" ,mariadb "dev")
        ("opensmtpd" ,opensmtpd)
        ("postgresql" ,postgresql)
        ("python" ,python-2)
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 7/8] gnu: sbcl-clsql: Build with mariadb.

[Efraim Flashner]

* gnu/packages/lisp-xyz.scm (sbcl-clsql)[inputs]: Remove mysql. Add
mariadb:dev, mariadb:lib.
[arguments]: Adjust custom 'build-helper-library phase to build with
and link to mariadb.
---
 gnu/packages/lisp-xyz.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 5f64809b28..d1ed5629e3 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018-2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@@ -13138,7 +13138,8 @@ (define-public sbcl-clsql
     (inputs
      `(("cffi" ,sbcl-cffi)
        ("md5" ,sbcl-md5)
-       ("mysql" ,mysql)
+       ("mariadb-dev" ,mariadb "dev")
+       ("mariadb-lib" ,mariadb "lib")
        ("postgresql" ,postgresql)
        ("postmodern" ,sbcl-postmodern)
        ("sqlite" ,sqlite)
@@ -13184,15 +13185,16 @@ (define-public sbcl-clsql
                   lib))
                (substitute* "db-mysql/mysql-loader.lisp"
                  (("libmysqlclient" all)
-                  (string-append (assoc-ref inputs "mysql") "/lib/" all))
+                  (string-append (assoc-ref inputs "mariadb-lib") "/lib/" all))
                  (("clsql-mysql-system::\\*library-file-dir\\*")
                   lib)))
              #t))
          (add-before 'build 'build-helper-library
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((mysql (assoc-ref inputs "mysql"))
-                    (inc-dir (string-append mysql "/include/mysql"))
-                    (lib-dir (string-append mysql "/lib"))
+             (let* ((mariadb-dev (assoc-ref inputs "mariadb-dev"))
+                    (mariadb-lib (assoc-ref inputs "mariadb-lib"))
+                    (inc-dir (string-append mariadb-dev "/include/mysql"))
+                    (lib-dir (string-append mariadb-lib "/lib"))
                     (shared-lib-dir (string-append (assoc-ref outputs "out")
                                                    "/lib"))
                     (shared-lib (string-append shared-lib-dir
@@ -13202,7 +13204,7 @@ (define-public sbcl-clsql
                        "-I" inc-dir
                        "db-mysql/clsql_mysql.c"
                        "-Wl,-soname=clsql_mysql"
-                       "-L" lib-dir "-lmysqlclient" "-lz"
+                       "-L" lib-dir "-lmariadb" "-lz"
                        "-o" shared-lib)
                #t)))
          (add-after 'unpack 'fix-tests
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 8/8] gnu: cl-clsql: Build with mariadb.

[Efraim Flashner]

* gnu/packages/lisp-xyz.scm (cl-clsql)[inputs]: Remove mysql. Add
mariadb:dev.
---
 gnu/packages/lisp-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index d1ed5629e3..7dd39c127e 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -13227,7 +13227,7 @@ (define-public cl-clsql
     (native-inputs
      `(("rt" ,cl-rt)))
     (inputs
-     (list mysql postgresql sqlite zlib))
+     (list (list mariadb "dev") postgresql sqlite zlib))
     (propagated-inputs
      `(("cffi" ,cl-cffi)
        ("md5" ,cl-md5)
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#62903] [PATCH 0/8] Remove mysql

[Andreas Enge]

Am Mon, Apr 17, 2023 at 04:29:13PM +0300 schrieb Efraim Flashner:
> I saw that a fix was applied to mysql on core-updates to have it build
> with openssl-1.1, and I figured that rather than have a version that was
> several years out of date (and surely had many many security
> vulnerabilities) it would be better to try to just remove it.
> `mariadb:dev` provides the `mysql_config` binary that some packages
> search for so I used it as a drop-in replacement. Nothing seemed broken
> to me after building some packages, so to the best of my knowledge of
> these disparate packages and languages all is fine.

From what one reads, this seems to be the route to go; so unless a
mysql champion chimes in, I am in favour of this change once QA gives
a green button. Would you suggest to remove mysql altogether in a
later commit?

Andreas

[bug#62903] [PATCH 0/8] Remove mysql

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]

On Wed, Apr 19, 2023 at 12:51:46PM +0200, Andreas Enge wrote:
> Am Mon, Apr 17, 2023 at 04:29:13PM +0300 schrieb Efraim Flashner:
> > I saw that a fix was applied to mysql on core-updates to have it build
> > with openssl-1.1, and I figured that rather than have a version that was
> > several years out of date (and surely had many many security
> > vulnerabilities) it would be better to try to just remove it.
> > `mariadb:dev` provides the `mysql_config` binary that some packages
> > search for so I used it as a drop-in replacement. Nothing seemed broken
> > to me after building some packages, so to the best of my knowledge of
> > these disparate packages and languages all is fine.
> 
> From what one reads, this seems to be the route to go; so unless a
> mysql champion chimes in, I am in favour of this change once QA gives
> a green button. Would you suggest to remove mysql altogether in a
> later commit?

That's certainly my hope. I feel like it's already been abandoned by us
when we switched to mariadb, and the last commit touching it was more
than 2 years ago.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]