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,26 +1,26 @@ PORTNAME= libnss-mysql PORTVERSION= 1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= SF MAINTAINER= fluffy@FreeBSD.org COMMENT= NSS module using a MySQL database for backend WWW= https://libnss-mysql.sourceforge.net/ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${LOCALBASE} INSTALL_TARGET= install-strip USES= libtool mysql USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} 's,$${srcdir}/aux/mkinstalldirs,$${mkinstalldirs},' \ ${WRKSRC}/Makefile.in post-install: .for f in libnss-mysql.cfg libnss-mysql-root.cfg ${MV} ${STAGEDIR}${PREFIX}/etc/$f ${STAGEDIR}${PREFIX}/etc/$f.sample .endfor .include 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",