Update to new upstream release (v0.8.6), fix dependencies selection

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1189 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/pmacct/Config.in b/openwrt/package/pmacct/Config.in
index af4868e..e050b4e 100644 (file)
--- a/openwrt/package/pmacct/Config.in
+++ b/openwrt/package/pmacct/Config.in
@@ -3,12 +3,12 @@ menu "pmacct - IPv4/IPv6 accounting and aggregation tools"
 config BR2_PACKAGE_PMACCT
        bool
        default n
 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
 
 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
        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
        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
 
 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"
 
 choice
        prompt "nfacctd - NetFlow accounting daemon"


@@ -45,21 +49,27 @@ choice
                prompt "nfacctd: without database support"
                tristate
                select BR2_PACKAGE_PMACCT_BASIC
                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
        
        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
        
        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
        
        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)"
 
        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
                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
 
        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
        
        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
        
        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)"
        
        config BR2_PACKAGE_PMACCTD_ENABLE_DEBUG
                prompt "debug (enable debugging options, useful for bugreports)"

diff --git a/openwrt/package/pmacct/Makefile b/openwrt/package/pmacct/Makefile
index c8d0837..0d60468 100644 (file)
--- a/openwrt/package/pmacct/Makefile
+++ b/openwrt/package/pmacct/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pmacct
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pmacct

-PKG_VERSION:=0.8.5
+PKG_VERSION:=0.8.6

 PKG_RELEASE:=1
 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
 
 PKG_SOURCE_URL:=http://www.ba.cnr.it/~paolo/pmacct/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz