mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

databases/mariadb106-server: Remove rogue files

Browse Source 
These look to have been unintentionally committed in a34cf9c2db and
are causing the pre-commit hooks to reject merges.

Approved by:	portmgr (blanket)
This commit is contained in:
Jason E. Hale 2024-09-02 00:50:33 -04:00
parent 0c0e139e25
commit 1ddac92927
2 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
databases/mariadb106-server/patch
View File

@ -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))
+ {

17
databases/mariadb106-server/patch-mysys__ssl_openssl.c
View File

@ -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))
{