From nobody Mon Sep 02 05:01:52 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WxxSJ3LkCz5MSSZ; Mon, 02 Sep 2024 05:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WxxSJ2x2fz4tkZ; Mon, 2 Sep 2024 05:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725253312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iiLWSluuNq7oowCYS2EwndkoI4iX6QOSsdV0FhjZj8=; b=a5XSbOK6em/lyRc9dPZcBC5AeJ/KEqfueqIcPnJFRI901M0Q7W9vtWMOmZTAHtsHrty+Sy JYJDcqqd0OB8KCeg51+eRitdh3nqMvQ3ts4+vcIOC5iP1GAA45SQukqtRfFBmrfp5ly4pH Wa6XHPpO22S7L7OH8DtsCkD56zofd+e2Z6osUP6swJ4qSiDOxvtsrZMubNR4TPJ7m6TvQM F+de1psaP6RLy/n2HoBIlINzAUb8caES2lhUXaPopVtZKMQQXt5nUXqkmlmnDJxT8CqKmu yXPxunrZFhHVZHuUlmALCFDCFY5MFykMMDnp+W8IuRs3jkauFc2CiZWV4nI4Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725253312; a=rsa-sha256; cv=none; b=xlsa2SLJBm5/fMydsSbBEftzx9qZ9jEDuZLdo5t9T7dGBUU27eqLIgHeaOnN8R05R7KgBM 1QyQ8qinWy9cahQZ05kQeo2qAjqHKI4t8mGH53WE3+bRW3rWEXIwxwi3t0uNmtjihD7XNh 5oTw2GQxXppwogb4pfj/s7OVyuITC0MU9D7I3No5g0B38nK/v8ViL4uDtQd/pon5FP+KUB cZTsfRNivje7VVABIiRb5x2+89rxCPU5LsGKtPFdaMyQfa8a23s3dAK84xjqWrb6vL19db vrLKCJpCsqTGyTyD2wc2Sb4tsW6EHL1S9LdV0wmraZd3zSRcdPxXyGEeeeja0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725253312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iiLWSluuNq7oowCYS2EwndkoI4iX6QOSsdV0FhjZj8=; b=s18AhdKYOLa+s1wrAHWGDk6r56Zrguju3bw9w1r87lcztQ8y64V4sz6RJNPrA2IOfIRITR MQRMVHeiDZCXaI4tBj3h8JuUiDcPyroA9MExkQAqohXDLPvgye+b4kI9j92d1g39LFMbGo zZaSomiDyrH5LLmBSDtC9bhOre3rC5U6jMPcyGTi0x5WYc96FikWkL78Q9yySlWivXbf8K quDgj3buzsUZT8Jq1MQGq7mpwU8Rogj1/Li5UQqT2KeCAmWsIErvAhpm8Et7Pta3ZwV/zr optvY4PgagdI+Qmsy/w6IgUu9fFzN0ByoyNIzuuib05wM+KRx8+cOzakoTISHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WxxSJ2XlxzydX; Mon, 2 Sep 2024 05:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48251qZ0021630; Mon, 2 Sep 2024 05:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48251qNm021627; Mon, 2 Sep 2024 05:01:52 GMT (envelope-from git) Date: Mon, 2 Sep 2024 05:01:52 GMT Message-Id: <202409020501.48251qNm021627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 1ddac929279f - main - databases/mariadb106-server: Remove rogue files List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ddac929279f16ddf236c08ebc3ca9b31fbbebc5 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ddac929279f16ddf236c08ebc3ca9b31fbbebc5 commit 1ddac929279f16ddf236c08ebc3ca9b31fbbebc5 Author: Jason E. Hale AuthorDate: 2024-09-02 04:50:33 +0000 Commit: Jason E. Hale 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)) - {