git: fe377bbb78a5 - main - net/libnss-mysql: WARNING: MYSQL_OPT_RECONNECT is deprecated and will be removed in a future version (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 05 Nov 2024 18:06:38 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe377bbb78a53fd6b22450d580ce67b1cfee3696 commit fe377bbb78a53fd6b22450d580ce67b1cfee3696 Author: Max Khon <fjoe@FreeBSD.org> AuthorDate: 2024-11-05 18:05:23 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-11-05 18:06:15 +0000 net/libnss-mysql: WARNING: MYSQL_OPT_RECONNECT is deprecated and will be removed in a future version (+) PR: 280862 --- net/libnss-mysql/Makefile | 2 +- net/libnss-mysql/files/patch-src_mysql.c | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index bc4902e6c683..7b7c8f37bc50 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -1,6 +1,6 @@ PORTNAME= libnss-mysql PORTVERSION= 1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= SF diff --git a/net/libnss-mysql/files/patch-src_mysql.c b/net/libnss-mysql/files/patch-src_mysql.c deleted file mode 100644 index 11f9a288c6c9..000000000000 --- a/net/libnss-mysql/files/patch-src_mysql.c +++ /dev/null @@ -1,22 +0,0 @@ ---- 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",