From nobody Wed Feb 01 12:08:34 2023 X-Original-To: dev-commits-ports-all@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 4P6LKt6lBcz3c3Zf; Wed, 1 Feb 2023 12:08:34 +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 4P6LKt6CD8z42TX; Wed, 1 Feb 2023 12:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675253314; 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=4bZ/XRwOjwgDEeMRhj8sZwO0ytEBSYlUuqeW6u5GoMw=; b=qNE+mQSjp8rVuHzBdcR8SHpyjGcs2cdL1CLZuDbpsiWphEoSNJURac1Pek/uEoH/7vXm4l MTisqBJ447VDsAXOVtOMMdjq0kcA0idRIBRd+zAKVG+1COl/jl077gPV2zAkKm2sEuk+RA fPjqSzd4nwnBDzWPjaeecFI5W6tgIvHuSjvKFaSY8g7Mlxb28wAcu1EcA8weOLAFhgNITO RZpQWPClw5lCe1BTOXO3b1UVjvUNhXHv68SOvy7VHTObxra2uD1rOXHRQVkbLNPZ3fl05V ZWiDY8I+Slj1bka4pMIDc0BnQnmG+G6zY5+okFZrbbUrz0IJYIJfCiTolrhtPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675253314; 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=4bZ/XRwOjwgDEeMRhj8sZwO0ytEBSYlUuqeW6u5GoMw=; b=f6tzAutBl8JLc2SLuPIZ2XNusRHaPcwdgy66qbU1cQJsQT/TCQzawtVOAmXaFwAcNVGeJZ 1Z0HEDknohEuvA/2o77KEL8R3PaoTGvy3lxs04hIHpwDD3kgIb/1u46Z7ypQ5KQJqWOZxT vxKnlwHedE7wCKfUcmKVnIx3/osPcyHSlGiSLJTED04dmN/oTAmV3AATDWPK+0Xmlk5paz k5IM973AHsuV4IBh3W3YzC1s6J1PoFOwXncvbh6vZ+gR/Li/VYXn/pwRGnSr4eO1qN6uap kbuLbRBHctmkmo88tstI71Q+gRRG8jIA3Kw0XdOJ/cp1PcTlVj7jBf3iFACLHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675253314; a=rsa-sha256; cv=none; b=uF6pLorC5u8NtAZ4e6Sbidb34ptF51h+z9BV6qtzPPVEPlKoiZQCe++90sm+w4ym54O6DN HrMuWaLJOn0k3LgcQPTHMW8eWQjuHBajDoAjtLKYXXIV3zaUwQh3y4+oQGtJ7Jor+kF2Wk WP8rju9ABoNQDilTYuodcAnFvkiTi/FUPyIMwdEpJsbLt/6mV7GtroE0l71V6nuuHm/IMX MvFhF5q6uHXjPdZhMwAC/Bl1+LCJeorq0il5Kyt8YWGWpr0Ry//CEgFLLKQV9MeRc5sdbP Bh8A4AgNJKlXihcemLLqYzhduD6KtMUzMDl9Hh6x6wlMsNjf/QQiLRpxp8qmzA== 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 4P6LKt4yw9z1SR6; Wed, 1 Feb 2023 12:08:34 +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 311C8Yaw089955; Wed, 1 Feb 2023 12:08:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311C8YiO089954; Wed, 1 Feb 2023 12:08:34 GMT (envelope-from git) Date: Wed, 1 Feb 2023 12:08:34 GMT Message-Id: <202302011208.311C8YiO089954@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: 1709b49e199d - main - net/libnss-mysql: unbreak build with mysql80/maria105+ (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 1709b49e199d5ca6c4059585ff56668649e6c0ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1709b49e199d5ca6c4059585ff56668649e6c0ef commit 1709b49e199d5ca6c4059585ff56668649e6c0ef Author: Dima Panov AuthorDate: 2023-02-01 12:06:35 +0000 Commit: Dima Panov CommitDate: 2023-02-01 12:08:25 +0000 net/libnss-mysql: unbreak build with mysql80/maria105+ (+) Transfer maintainership vd => fluffy PR: 269130 Approved by: vd --- net/libnss-mysql/Makefile | 2 +- net/libnss-mysql/files/patch-src_mysql.c | 22 ++++++++++++++++++++++ net/libnss-mysql/files/patch-src_nss__mysql.h | 13 +++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index c6a37c172892..7fcd6930feba 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 5 CATEGORIES= net MASTER_SITES= SF -MAINTAINER= vd@FreeBSD.org +MAINTAINER= fluffy@FreeBSD.org COMMENT= NSS module using a MySQL database for backend WWW= http://libnss-mysql.sourceforge.net/ diff --git a/net/libnss-mysql/files/patch-src_mysql.c b/net/libnss-mysql/files/patch-src_mysql.c new file mode 100644 index 000000000000..11f9a288c6c9 --- /dev/null +++ b/net/libnss-mysql/files/patch-src_mysql.c @@ -0,0 +1,22 @@ +--- src/mysql.c.orig 2005-09-04 03:34:02 UTC ++++ src/mysql.c +@@ -196,6 +196,7 @@ _nss_mysql_connect_sql (MYSQL_RES **mresult) + int retval; + sql_server_t *server = &conf.sql.server; + unsigned int port; ++ my_bool reconnect = 1; + + DENTER + +@@ -238,8 +239,9 @@ _nss_mysql_connect_sql (MYSQL_RES **mresult) + DSRETURN (NSS_UNAVAIL) + } + ci.valid = ntrue; +- ci.link.reconnect = 0; /* Safety: We can't let MySQL assume socket is +- still valid; see _nss_mysql_validate_socket */ ++ /* Safety: We can't let MySQL assume socket is still valid; ++ see _nss_mysql_validate_socket */ ++ mysql_options(&ci.link, MYSQL_OPT_RECONNECT, &reconnect); + DSRETURN (NSS_SUCCESS) + } + _nss_mysql_log (LOG_ALERT, "Connection to server '%s' failed: %s", diff --git a/net/libnss-mysql/files/patch-src_nss__mysql.h b/net/libnss-mysql/files/patch-src_nss__mysql.h new file mode 100644 index 000000000000..866715e32797 --- /dev/null +++ b/net/libnss-mysql/files/patch-src_nss__mysql.h @@ -0,0 +1,13 @@ +--- src/nss_mysql.h.orig 2005-09-04 03:34:02 UTC ++++ src/nss_mysql.h +@@ -72,6 +72,10 @@ typedef nss_status_t NSS_STATUS; + /* Default initializers */ + #define DEF_TIMEOUT 3 + ++#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 ++#define my_bool bool ++#endif ++ + #ifdef DEBUG + void _nss_mysql_debug (char *fmt, ...); + #define DEBUG_FILE "/tmp/libnss-mysql-debug.log"