diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-06-10 17:40:26 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-06-10 17:40:26 +0000 |
| commit | b70d597134e23de130c5f96c55473451482e5be7 (patch) | |
| tree | cc510ad6fe1a02a4709e267671561bde2e18f60d | |
| parent | 744486a9adf509bf04bbaf7d43e694e003ecd656 (diff) | |
Update to new upstream release (v0.8.6), fix dependencies selection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1189 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/pmacct/Config.in | 28 | ||||
| -rw-r--r-- | package/pmacct/Makefile | 4 |
2 files changed, 24 insertions, 8 deletions
diff --git a/package/pmacct/Config.in b/package/pmacct/Config.in index af4868e0f..e050b4ee3 100644 --- a/package/pmacct/Config.in +++ b/package/pmacct/Config.in @@ -3,12 +3,12 @@ menu "pmacct - IPv4/IPv6 accounting and aggregation tools" config BR2_PACKAGE_PMACCT bool default n - select BR2_PACKAGE_LIBPCAP + depends BR2_PACKAGE_PMACCT_BASIC || BR2_PACKAGE_PMACCT_MYSQL || BR2_PACKAGE_PMACCT_PGSQL || BR2_PACKAGE_PMACCT_CUSTOM || BR2_PACKAGE_PMACCT_CLIENT config BR2_PACKAGE_PMACCT_BASIC bool default n - depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCT_CLIENT + depends BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC select BR2_PACKAGE_PMACCT config BR2_PACKAGE_PMACCT_MYSQL @@ -16,14 +16,18 @@ config BR2_PACKAGE_PMACCT_MYSQL default n depends BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_PMACCTD_MYSQL select BR2_PACKAGE_PMACCT - select BR2_PACKAGE_LIBMYSQLCLIENT config BR2_PACKAGE_PMACCT_PGSQL bool default n depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL select BR2_PACKAGE_PMACCT - select BR2_PACKAGE_LIBPQ + +config BR2_PACKAGE_PMACCT_CUSTOM + bool + default n + depends BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_CUSTOM + select BR2_PACKAGE_PMACCT choice prompt "nfacctd - NetFlow accounting daemon" @@ -45,21 +49,27 @@ choice prompt "nfacctd: without database support" tristate select BR2_PACKAGE_PMACCT_BASIC + select BR2_PACKAGE_LIBPCAP config BR2_PACKAGE_NFACCTD_MYSQL prompt "nfacctd-mysql: with MySQL database support" tristate select BR2_PACKAGE_PMACCT_MYSQL + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBMYSQLCLIENT config BR2_PACKAGE_NFACCTD_PGSQL prompt "nfacctd-pgsql: with PostgreSQL database support" tristate select BR2_PACKAGE_PMACCT_PGSQL + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBPQ config BR2_PACKAGE_NFACCTD_CUSTOM prompt "nfacctd-custom: customized to your needs" tristate - select BR2_PACKAGE_PMACCT + select BR2_PACKAGE_PMACCT_CUSTOM + select BR2_PACKAGE_LIBPCAP config BR2_PACKAGE_NFACCTD_ENABLE_DEBUG prompt "debug (enable debugging options, useful for bugreports)" @@ -111,21 +121,27 @@ choice prompt "pmacctd: without database support" tristate select BR2_PACKAGE_PMACCT_BASIC + select BR2_PACKAGE_LIBPCAP config BR2_PACKAGE_PMACCTD_MYSQL prompt "pmacctd-mysql: with MySQL database support" tristate select BR2_PACKAGE_PMACCT_MYSQL + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBMYSQLCLIENT config BR2_PACKAGE_PMACCTD_PGSQL prompt "pmacctd-pgsql: with PostgreSQL database support" tristate select BR2_PACKAGE_PMACCT_PGSQL + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBPQ config BR2_PACKAGE_PMACCTD_CUSTOM prompt "pmacctd-custom: customized to your needs" tristate - select BR2_PACKAGE_PMACCT + select BR2_PACKAGE_PMACCT_CUSTOM + select BR2_PACKAGE_LIBPCAP config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG prompt "debug (enable debugging options, useful for bugreports)" diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index c8d083791..0d6046874 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pmacct -PKG_VERSION:=0.8.5 +PKG_VERSION:=0.8.6 PKG_RELEASE:=1 -PKG_MD5SUM:=996d6402946553f81d94e0a60e6fc509 +PKG_MD5SUM:=b725f7b4af335d2f668cb61621a5c2d9 PKG_SOURCE_URL:=http://www.ba.cnr.it/~paolo/pmacct/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz |