diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-23 16:10:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-26 08:55:19 +0000 |
| commit | e7ed74af5ee4e491cd13aa8f1c7edca107e1e02d (patch) | |
| tree | 035dd35df2efc095055b496046617fec95f7410c /main/pmacct | |
| parent | 2dc6862bdf1e448783e46abb062653769ce19729 (diff) | |
| download | aports-e7ed74af5ee4e491cd13aa8f1c7edca107e1e02d.tar.bz2 aports-e7ed74af5ee4e491cd13aa8f1c7edca107e1e02d.tar.xz | |
main/pmacct: upgrade to 1.7.0
Diffstat (limited to 'main/pmacct')
| -rw-r--r-- | main/pmacct/APKBUILD | 8 | ||||
| -rw-r--r-- | main/pmacct/mariadb.patch | 25 |
2 files changed, 30 insertions, 3 deletions
diff --git a/main/pmacct/APKBUILD b/main/pmacct/APKBUILD index 4cd4dce365..4c34e9d21e 100644 --- a/main/pmacct/APKBUILD +++ b/main/pmacct/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=pmacct -pkgver=1.6.2 +pkgver=1.7.0 pkgrel=0 pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic" url="http://www.pmacct.net/" arch="all" license="GPL" -makedepends="bsd-compat-headers libpcap-dev mariadb-dev postgresql-dev +makedepends="bsd-compat-headers libpcap-dev mariadb-connector-c-dev postgresql-dev zlib-dev jansson-dev sqlite-dev" subpackages="$pkgname-doc" source="http://www.pmacct.net/$pkgname-$pkgver.tar.gz + mariadb.patch pmacct.initd pmacct.confd pmacctd.conf @@ -65,7 +66,8 @@ package() { cp sql/* $pkgdir/usr/share/doc/pmacct/sql } -sha512sums="8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46 pmacct-1.6.2.tar.gz +sha512sums="14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5 pmacct-1.7.0.tar.gz +dab77f60a6ef1914eaa817d1faeee7bdae0ffbde9f7473d43495b1ee3087ac826735f5a0f30f7cadacfa82a03731a506fc40f5c08aa1fdcfb34bcee370460039 mariadb.patch b109f2d64c83d6749a8c81784204e54a68ec7bbc146242f02e1fa7061647acc887921cdbf90a5ecc81186a87a5b4a5175a3b5e25f92e51b5dd1426fb390ef754 pmacct.initd 6078607dde8619f8fa5698f217c40a7e46ed85843923abecc87652d2e9df6db677898ee1965367247e6ac838d907533a8b1c7ab0515f3f2dc6f3fd4eb14bd5be pmacct.confd fa1ead3ee4374ad84cccc0e7043fc86e95da555e2bde3815f03953587f03a609ec3aea227ebf85c9636e071921c5b094359d71d15055f866c05e113cda3b347b pmacctd.conf diff --git a/main/pmacct/mariadb.patch b/main/pmacct/mariadb.patch new file mode 100644 index 0000000000..ded2d0faf4 --- /dev/null +++ b/main/pmacct/mariadb.patch @@ -0,0 +1,25 @@ +diff --git a/src/mysql_plugin.c b/src/mysql_plugin.c +index d2503e7..d477270 100644 +--- a/src/mysql_plugin.c ++++ b/src/mysql_plugin.c +@@ -668,8 +668,9 @@ void MY_DB_Connect(struct DBdesc *db, char *host) + MYSQL *dbptr = db->desc; + + if (!db->fail) { ++ my_bool reconnect = 1; + mysql_init(db->desc); +- dbptr->reconnect = TRUE; ++ mysql_options(db->desc, MYSQL_OPT_RECONNECT, &reconnect); + if (!mysql_real_connect(db->desc, host, config.sql_user, config.sql_passwd, config.sql_db, 0, NULL, 0)) { + sql_db_fail(db); + MY_get_errmsg(db); +@@ -768,5 +769,9 @@ void MY_init_default_values(struct insert_data *idata) + + void MY_mysql_get_version() + { ++#ifdef MARIADB_CLIENT_VERSION_STR ++ printf("MySQL %s\n", MARIADB_CLIENT_VERSION_STR); ++#else + printf("MySQL %s\n", MYSQL_SERVER_VERSION); ++#endif + } |