aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2015-12-10 08:39:14 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2015-12-10 08:39:19 +0000
commitd49679d4f291dc64963aaa5f800a33e0edbb6f10 (patch)
treeaae405f41af6c60a6158ed6e5079495a65519161
parent93c98bfa2686f63820cad734ea13e2e8471c2ca4 (diff)
downloadaports-d49679d4f291dc64963aaa5f800a33e0edbb6f10.tar.gz
aports-d49679d4f291dc64963aaa5f800a33e0edbb6f10.tar.bz2
aports-d49679d4f291dc64963aaa5f800a33e0edbb6f10.tar.xz
main/pmacct: upgrade to 1.5.2
-rw-r--r--main/pmacct/APKBUILD14
-rw-r--r--main/pmacct/stacksize.patch39
2 files changed, 5 insertions, 48 deletions
diff --git a/main/pmacct/APKBUILD b/main/pmacct/APKBUILD
index f6f811e973..c2218c18ca 100644
--- a/main/pmacct/APKBUILD
+++ b/main/pmacct/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=pmacct
-pkgver=1.5.1
-pkgrel=4
+pkgver=1.5.2
+pkgrel=0
pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic"
url="http://www.pmacct.net/"
arch="all"
@@ -12,7 +12,6 @@ makedepends="bsd-compat-headers libpcap-dev mariadb-dev postgresql-dev
install=
subpackages="$pkgname-doc"
source="http://www.pmacct.net/$pkgname-$pkgver.tar.gz
- stacksize.patch
pmacct.initd
pmacct.confd
pmacctd.conf
@@ -72,24 +71,21 @@ package() {
cp sql/* $pkgdir/usr/share/doc/pmacct/sql
}
-md5sums="80a205e85fd06a30a761877568b01376 pmacct-1.5.1.tar.gz
-3f546ed1ec1829ceb74a29f22c93ad90 stacksize.patch
+md5sums="3cf26857ff3bfec22857ea88046f7f41 pmacct-1.5.2.tar.gz
48ca9df1fce583936fc1e6d80bd0f0c3 pmacct.initd
394bf0687572261e90eecd70c33c8ede pmacct.confd
ecb85e4f9bcb1f6ef0ee1426f979be2b pmacctd.conf
7a549e51959946805a0c1d094213f08c sfacctd.conf
a3b1c231911f9bab7bfa73dbbcb308eb nfacctd.conf
7a549e51959946805a0c1d094213f08c uacctd.conf"
-sha256sums="96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 pmacct-1.5.1.tar.gz
-5d2413220874538bad2c8b0260724d9c866ac8c82b7016318001f56459e44cd9 stacksize.patch
+sha256sums="c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 pmacct-1.5.2.tar.gz
fe0ec3d26a0da0e07112e2dce85b921c188c974f5b4a22f623bdcf2f91fa3a0b pmacct.initd
02c3e0d5a19503d4be63244c77cbc47961d6f168026527ec2910c6c201a5d8fd pmacct.confd
616bf24f769a0d262a793adb4603e08fe2234f1cccc2bc0b7fabf565cf22e138 pmacctd.conf
3cbdea18c609bb4822992ec79b34987b6fc9044550823ebbb349c44af7d8503e sfacctd.conf
e21121a857bb16e76d8af087e5a2d2b1c555ac5f16808d8b7a01377f7d18accc nfacctd.conf
3cbdea18c609bb4822992ec79b34987b6fc9044550823ebbb349c44af7d8503e uacctd.conf"
-sha512sums="c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 pmacct-1.5.1.tar.gz
-298749041888ccdbc999a891627e492d4a3a08a16a4b5368927919fcf6c1579d2ea51b102a05b92eda72b9eb063948786e38a772fe19462e90fdb966ceca94c0 stacksize.patch
+sha512sums="3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 pmacct-1.5.2.tar.gz
b109f2d64c83d6749a8c81784204e54a68ec7bbc146242f02e1fa7061647acc887921cdbf90a5ecc81186a87a5b4a5175a3b5e25f92e51b5dd1426fb390ef754 pmacct.initd
6078607dde8619f8fa5698f217c40a7e46ed85843923abecc87652d2e9df6db677898ee1965367247e6ac838d907533a8b1c7ab0515f3f2dc6f3fd4eb14bd5be pmacct.confd
fa1ead3ee4374ad84cccc0e7043fc86e95da555e2bde3815f03953587f03a609ec3aea227ebf85c9636e071921c5b094359d71d15055f866c05e113cda3b347b pmacctd.conf
diff --git a/main/pmacct/stacksize.patch b/main/pmacct/stacksize.patch
deleted file mode 100644
index 96d6b00c56..0000000000
--- a/main/pmacct/stacksize.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./src/thread_pool.c.orig 2015-06-23 11:22:18.408373704 -0200
-+++ ./src/thread_pool.c 2015-06-23 11:31:55.926972746 -0200
-@@ -42,12 +42,15 @@
- #define pthread_mutex_unlock debug_pthread_mutex_unlock
- #endif
-
-+/* set default stack size to 1MB */
-+#define PMACCT_STACKSIZE 1024*1024
-
- thread_pool_t *allocate_thread_pool(int count)
- {
- int i, rc;
- thread_pool_t *pool;
- thread_pool_item_t *worker;
-+ pthread_attr_t attr, *attrptr = NULL;
-
- // Allocate pool
- pool = malloc(sizeof(thread_pool_t));
-@@ -88,7 +91,19 @@
-
- /* Create the thread */
- worker->thread = malloc(sizeof(pthread_t));
-- rc = pthread_create(worker->thread, NULL, thread_runner, worker);
-+ rc = pthread_attr_init(&attr);
-+ if (rc) {
-+ printf("ERROR: pthread_attr_init failed: %s\n", strerror(rc));
-+ } else {
-+ rc = pthread_attr_setstacksize(&attr, PMACCT_STACKSIZE);
-+ if (rc) {
-+ printf("ERROR: pthread_attr_setstack failed: %s\n", strerror(rc));
-+ } else {
-+ attrptr=&attr;
-+ }
-+ }
-+
-+ rc = pthread_create(worker->thread, attrptr, thread_runner, worker);
-
- if (rc) {
- printf("ERROR: thread creation failed: %s\n", strerror(rc));