git: 1ddac929279f - main - databases/mariadb106-server: Remove rogue files

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Mon, 02 Sep 2024 05:01:52 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1ddac929279f16ddf236c08ebc3ca9b31fbbebc5

commit 1ddac929279f16ddf236c08ebc3ca9b31fbbebc5
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-09-02 04:50:33 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-09-02 05:01:46 +0000

    databases/mariadb106-server: Remove rogue files
    
    These look to have been unintentionally committed in a34cf9c2dbf5 and
    are causing the pre-commit hooks to reject merges.
    
    Approved by:    portmgr (blanket)
---
 databases/mariadb106-server/patch                  | 23 ----------------------
 .../mariadb106-server/patch-mysys__ssl_openssl.c   | 17 ----------------
 2 files changed, 40 deletions(-)

diff --git a/databases/mariadb106-server/patch b/databases/mariadb106-server/patch
deleted file mode 100644
index 78c70e302f6a..000000000000
--- a/databases/mariadb106-server/patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
-new file mode 100644
-index 000000000000..5f809d5ae662
---- /dev/null
-+++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
-@@ -0,0 +1,17 @@
-+--- mysys_ssl/openssl.c
-++++ mysys_ssl/openssl.c
-+@@ -36,8 +36,12 @@
-+ static uint testing;
-+ static size_t alloc_size, alloc_count;
-+ 
-+-static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
-+-                                             int l __attribute__((unused)))
-++static void *coc_malloc(size_t size
-++#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L)
-++                                           , const char *f __attribute__((unused)),
-++                                             int l __attribute__((unused))
-++#endif
-++)
-+ {
-+   if (unlikely(testing))
-+   {
diff --git a/databases/mariadb106-server/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/patch-mysys__ssl_openssl.c
deleted file mode 100644
index 5f809d5ae662..000000000000
--- a/databases/mariadb106-server/patch-mysys__ssl_openssl.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- mysys_ssl/openssl.c
-+++ mysys_ssl/openssl.c
-@@ -36,8 +36,12 @@
- static uint testing;
- static size_t alloc_size, alloc_count;
- 
--static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
--                                             int l __attribute__((unused)))
-+static void *coc_malloc(size_t size
-+#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L)
-+                                           , const char *f __attribute__((unused)),
-+                                             int l __attribute__((unused))
-+#endif
-+)
- {
-   if (unlikely(testing))
-   {