From nobody Tue Feb 22 19:40:09 2022 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 71D5219DCE6C; Tue, 22 Feb 2022 19:40:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K38dj2jglz4ZkQ; Tue, 22 Feb 2022 19:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645558809; 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=C10CH0latHSrmzUplIDafg12PaOXZwB23rUvOv2/+Fk=; b=FArHBbRKQ/fVpfHU1dkJ8nGmer/MzMBmGdm5aKJLxyHVJuD4ncRKIYvLlJd72sF+EyiVAL olMiaTy+KCveDscCVYY2pRP0H4UheN1jXvGdVc7D0gz/kkM+y4ehPF/NFjbTOgahQ8Yq/L GrgAigSxBlNUQs0LWdHRil04BTQvZShUe6mFvdlAT/e7d7KQZUIme8fc1GSuhPQicT0p1t 0l2SfNUfJtHtwFOIZk1XlZpCt5DcD2QS2ludQv3ZuqirVreHA3BKElxt1wDwn1B1NqzInr cOFC9hSu2Z3hAEd/DacApvqH32h+6QiH19bMlKUR2xhVGyl2JzXimu5YYmPOnA== 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 3CF2B1F44; Tue, 22 Feb 2022 19:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21MJe9ln001843; Tue, 22 Feb 2022 19:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MJe9iB001840; Tue, 22 Feb 2022 19:40:09 GMT (envelope-from git) Date: Tue, 22 Feb 2022 19:40:09 GMT Message-Id: <202202221940.21MJe9iB001840@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c4ac829e974e - main - databases/mysql80-server: bring back mysql_secure_installation (+) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4ac829e974e1c9b1de8348588d73a3c1a166a22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645558809; 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=C10CH0latHSrmzUplIDafg12PaOXZwB23rUvOv2/+Fk=; b=hfFZ2IlKlRr0Iy4+On2IHqptVxob8I8Xtj0lkv+EIfmXOpyY5koVs1qPayMJYUWd8inSSf WsTTtcDMhxoQ/Ce68kaP0HleFNLzHjFQN9mRqc1zgpYeGRSJOBj1VnbTJpavwncTOTlyAP UULQ6oH0CpCmzq1+lCcVPY1fCHmZpFrJxDgLxDGBFUL41T35piQdeI3f6Q7oKwMxMqWvGU IPrkj9o74wcz/kv/Zf4Hi3UzwbFTFeBoNRq7CVUPUBVUnj7q1/5Nm7w0D8bH1cAlHaA43f iylfmVBiHjrQAxvsFszgKyuJiAhNZrabTL3u6YhUaP6Bb2SII59EoraF5UHJeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645558809; a=rsa-sha256; cv=none; b=T/OXCXpZxxdstktJyd94GTMqTKTxQKgSJ3w6lURiBmoCGIDVHiSQulQDqLtwPi214Bny0r wZwvryXACCTaU57mu3jZ4HzA2QlamuZvj41lx0KzLXhcIW6fU2lZWAxaHa7sgJBxZ2svns Q3JhHaVW2GCymNqCjZ67rSMfhAuk+jRyXCdW7Y2QXXcXESWG1wwheODnZPwivnLhdF3C8g 0bY+0/51LcBVk8MpTlnNqFt1twm5VrpYfgi4LPMNSJlDBQStIeXHaTodq4da6NLVYf/ch8 N/fEblFNi8CDaqouu6M1xcVH2O5/hYEKqr6zAbJiv7x9e/2u8nX3EIjSWvwZVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4ac829e974e1c9b1de8348588d73a3c1a166a22 commit c4ac829e974e1c9b1de8348588d73a3c1a166a22 Author: Dima Panov AuthorDate: 2022-02-22 19:36:22 +0000 Commit: Dima Panov CommitDate: 2022-02-22 19:36:22 +0000 databases/mysql80-server: bring back mysql_secure_installation (+) Typo in patchfile leads to skip mysql_secure_installation. Bring it back. PR: 262123 Submitted by: amdmi3 Approved by: joneum (implicit) --- databases/mysql80-server/Makefile | 2 +- databases/mysql80-server/files/patch-client_CMakeLists.txt | 2 +- databases/mysql80-server/pkg-plist | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 781d91f5c3f1..ba3a5232c6f9 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -2,7 +2,7 @@ PORTNAME?= mysql PORTVERSION= 8.0.28 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt index e91bae0cceb7..6a433a889e80 100644 --- a/databases/mysql80-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt @@ -56,7 +56,7 @@ ) +ENDIF() + -+IF(NOT_WITHOUT_SERVER) ++IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc LINK_LIBRARIES mysqlclient diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist index 3410b5358397..ac9c0b0e34ce 100644 --- a/databases/mysql80-server/pkg-plist +++ b/databases/mysql80-server/pkg-plist @@ -6,13 +6,15 @@ bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysqldumpslow bin/mysql_client_test bin/mysql_keyring_encryption_test +bin/mysql_secure_installation +bin/mysql_ssl_rsa_setup bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqld_multi bin/mysqld_safe +bin/mysqldumpslow bin/mysqlrouter bin/mysqlrouter_keyring bin/mysqlrouter_passwd