diff options
| author | Larry Rosenman <ler@FreeBSD.org> | 2018-12-04 17:53:58 +0000 |
|---|---|---|
| committer | Larry Rosenman <ler@FreeBSD.org> | 2018-12-04 17:53:58 +0000 |
| commit | 7c09023980d518147766c251a874b143be5aac82 (patch) | |
| tree | c6c5ed4815293f151ab983d26a076d327d7f323c /mail | |
| parent | c635b9019ccad0a9dace339ed0e796c7e9c41fc5 (diff) | |
| download | ports-7c09023980d518147766c251a874b143be5aac82.tar.gz ports-7c09023980d518147766c251a874b143be5aac82.zip | |
Notes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dovecot/Makefile | 2 | ||||
| -rw-r--r-- | mail/dovecot/files/patch-src_lib-sql_driver-mysql.c | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index b0edd1979ac7..b466d14b6d35 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -8,7 +8,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/2.3/ diff --git a/mail/dovecot/files/patch-src_lib-sql_driver-mysql.c b/mail/dovecot/files/patch-src_lib-sql_driver-mysql.c new file mode 100644 index 000000000000..b9084bd86ea5 --- /dev/null +++ b/mail/dovecot/files/patch-src_lib-sql_driver-mysql.c @@ -0,0 +1,24 @@ +--- src/lib-sql/driver-mysql.c.orig 2018-11-23 11:06:45 UTC ++++ src/lib-sql/driver-mysql.c +@@ -173,7 +173,9 @@ static int driver_mysql_connect(struct sql_db *_db) + static void driver_mysql_disconnect(struct sql_db *_db) + { + struct mysql_db *db = (struct mysql_db *)_db; +- mysql_close(db->mysql); ++ if (db->mysql != NULL) ++ mysql_close(db->mysql); ++ db->mysql = NULL; + } + + static int driver_mysql_parse_connect_string(struct mysql_db *db, +@@ -311,7 +313,9 @@ static void driver_mysql_deinit_v(struct sql_db *_db) + _db->no_reconnect = TRUE; + sql_db_set_state(&db->api, SQL_DB_STATE_DISCONNECTED); + +- mysql_close(db->mysql); ++ if (db->mysql != NULL) ++ mysql_close(db->mysql); ++ db->mysql = NULL; + + sql_connection_log_finished(_db); + event_unref(&_db->event); |