Changeset 3593


Ignore:
Timestamp:
2006-04-05T14:21:05+02:00 (12 years ago)
Author:
olli
Message:

update pmacct to new upstream release and add SQLite database support

Location:
branches/whiterussian/openwrt/package
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/whiterussian/openwrt/package/Makefile

    r3399 r3593  
    212212pmacct-compile: postgresql-compile 
    213213endif 
     214ifneq ($(BR2_PACKAGE_PMACCT_SQLITE),) 
     215pmacct-compile: sqlite-compile 
     216endif 
    214217 
    215218snort-compile: libnet-compile libpcap-compile pcre-compile 
  • branches/whiterussian/openwrt/package/pmacct/Config.in

    r2551 r3593  
    44        tristate 
    55        default m if CONFIG_DEVEL 
    6         depends BR2_PACKAGE_PMACCT_BASIC || BR2_PACKAGE_PMACCT_MYSQL || BR2_PACKAGE_PMACCT_PGSQL || BR2_PACKAGE_PMACCT_CUSTOM || BR2_PACKAGE_PMACCT_CLIENT 
     6        depends BR2_PACKAGE_PMACCT_BASIC || BR2_PACKAGE_PMACCT_MYSQL || BR2_PACKAGE_PMACCT_PGSQL || BR2_PACKAGE_PMACCT_SQLITE || BR2_PACKAGE_PMACCT_CUSTOM || BR2_PACKAGE_PMACCT_CLIENT 
    77 
    88config BR2_PACKAGE_PMACCT_BASIC 
     
    2222        default m if CONFIG_DEVEL 
    2323        depends BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL 
     24        select BR2_PACKAGE_PMACCT 
     25 
     26config BR2_PACKAGE_PMACCT_SQLITE 
     27        tristate 
     28        default m if CONFIG_DEVEL 
     29        depends BR2_PACKAGE_NFACCTD_SQLITE || BR2_PACKAGE_PMACCTD_SQLITE 
    2430        select BR2_PACKAGE_PMACCT 
    2531 
     
    6571                select BR2_PACKAGE_LIBPCAP 
    6672                select BR2_PACKAGE_LIBPQ 
    67          
     73 
     74        config BR2_PACKAGE_NFACCTD_SQLITE 
     75                prompt "nfacctd-sqlite: with SQLite database support" 
     76                tristate 
     77                select BR2_PACKAGE_PMACCT_SQLITE 
     78                select BR2_PACKAGE_LIBPCAP 
     79                select BR2_PACKAGE_LIBSQLITE 
     80 
    6881        config BR2_PACKAGE_NFACCTD_CUSTOM 
    6982                prompt "nfacctd-custom: customized to your needs" 
     
    97110                depends BR2_PACKAGE_NFACCTD_CUSTOM 
    98111                select BR2_PACKAGE_LIBPQ 
     112 
     113        config BR2_PACKAGE_NFACCTD_WITH_SQLITE 
     114                prompt "SQLite database support" 
     115                bool 
     116                default n 
     117                depends BR2_PACKAGE_NFACCTD_CUSTOM 
     118                select BR2_PACKAGE_LIBSQLITE 
    99119 
    100120endchoice 
     
    115135            - libmysqlclient (for MySQL database logging support) 
    116136            - libpq (for PostgreSQL database logging support) 
     137            - libsqlite (for SQLite database logging support) 
    117138           
    118139         
     
    137158                select BR2_PACKAGE_LIBPCAP 
    138159                select BR2_PACKAGE_LIBPQ 
    139          
     160 
     161        config BR2_PACKAGE_PMACCTD_SQLITE 
     162                prompt "pmacctd-sqlite: with SQLite database support" 
     163                tristate 
     164                select BR2_PACKAGE_PMACCT_SQLITE 
     165                select BR2_PACKAGE_LIBPCAP 
     166                select BR2_PACKAGE_LIBSQLITE 
     167 
    140168        config BR2_PACKAGE_PMACCTD_CUSTOM 
    141169                prompt "pmacctd-custom: customized to your needs" 
     
    170198                select BR2_PACKAGE_LIBPQ 
    171199 
     200        config BR2_PACKAGE_PMACCTD_WITH_SQLITE 
     201                prompt "SQLite database support" 
     202                bool 
     203                default n 
     204                depends BR2_PACKAGE_PMACCTD_CUSTOM 
     205                select BR2_PACKAGE_LIBSQLITE 
     206 
    172207endchoice 
    173208 
  • branches/whiterussian/openwrt/package/pmacct/Makefile

    r1189 r3593  
    44 
    55PKG_NAME:=pmacct 
    6 PKG_VERSION:=0.8.6 
     6PKG_VERSION:=0.10.0 
    77PKG_RELEASE:=1 
    8 PKG_MD5SUM:=b725f7b4af335d2f668cb61621a5c2d9 
     8PKG_MD5SUM:=ed510e7ee2130d1f37f27901b89e985a 
    99 
    1010PKG_SOURCE_URL:=http://www.ba.cnr.it/~paolo/pmacct/ 
    11 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     11PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)rc2.tar.gz 
    1212PKG_CAT:=zcat 
    1313 
     
    2929        --with-pgsql-libs="$(STAGING_DIR)/usr/lib" 
    3030 
     31PMACCT_SQLITE_CONFIGURE_OPTS := \ 
     32        --enable-sqlite3 \ 
     33        --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ 
     34        --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" 
     35 
    3136NFACCTD_CUSTOM_CONFIGURE_OPTS := \ 
    3237 
     
    4550ifeq ($(BR2_PACKAGE_NFACCTD_WITH_PGSQL),y) 
    4651NFACCTD_CUSTOM_CONFIGURE_OPTS += $(PMACCT_PGSQL_CONFIGURE_OPTS) 
     52endif 
     53 
     54ifeq ($(BR2_PACKAGE_NFACCTD_WITH_SQLITE),y) 
     55NFACCTD_CUSTOM_CONFIGURE_OPTS += $(PMACCT_SQLITE_CONFIGURE_OPTS) 
    4756endif 
    4857 
     
    6574endif 
    6675 
     76ifeq ($(BR2_PACKAGE_PMACCTD_WITH_SQLITE),y) 
     77PMACCTD_CUSTOM_CONFIGURE_OPTS += $(PMACCT_SQLITE_CONFIGURE_OPTS) 
     78endif 
     79 
    6780define PKG_build 
    6881 
     
    8093                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ 
    8194                ./configure \ 
    82                   --target=$(GNU_TARGET_NAME) \ 
    83                   --host=$(GNU_TARGET_NAME) \ 
    84                   --build=$(GNU_HOST_NAME) \ 
    85                   --program-prefix="" \ 
    86                   --program-suffix="" \ 
    87                   --prefix=/usr \ 
    88                   --exec-prefix=/usr \ 
    89                   --bindir=/usr/sbin \ 
    90                   --datadir=/usr/share \ 
    91                   --includedir=/usr/include \ 
    92                   --infodir=/usr/share/info \ 
    93                   --libdir=/usr/lib \ 
    94                   --libexecdir=/usr/lib/locate \ 
    95                   --localstatedir=/var/lib \ 
    96                   --mandir=/usr/share/man \ 
    97                   --sbindir=/usr/sbin \ 
    98                   --sysconfdir=/etc \ 
    99                   $(DISABLE_LARGEFILE) \ 
    100                   $(DISABLE_NLS) \ 
    101                   --enable-shared \ 
    102                   --disable-static \ 
    103                   --with-pcap-includes="$(STAGING_DIR)/usr/include" \ 
    104                   --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ 
    105                   $$($(1)_CONFIGURE_OPTS) \ 
     95                        --target=$(GNU_TARGET_NAME) \ 
     96                        --host=$(GNU_TARGET_NAME) \ 
     97                        --build=$(GNU_HOST_NAME) \ 
     98                        --program-prefix="" \ 
     99                        --program-suffix="" \ 
     100                        --prefix=/usr \ 
     101                        --exec-prefix=/usr \ 
     102                        --bindir=/usr/sbin \ 
     103                        --datadir=/usr/share \ 
     104                        --includedir=/usr/include \ 
     105                        --infodir=/usr/share/info \ 
     106                        --libdir=/usr/lib \ 
     107                        --libexecdir=/usr/lib/locate \ 
     108                        --localstatedir=/var/lib \ 
     109                        --mandir=/usr/share/man \ 
     110                        --sbindir=/usr/sbin \ 
     111                        --sysconfdir=/etc \ 
     112                        $(DISABLE_LARGEFILE) \ 
     113                        $(DISABLE_NLS) \ 
     114                        --enable-shared \ 
     115                        --disable-static \ 
     116                        --with-pcap-includes="$(STAGING_DIR)/usr/include" \ 
     117                        --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ 
     118                        $$($(1)_CONFIGURE_OPTS) \ 
    106119        ); 
    107120        $(MAKE) -C $(PKG_BUILD_DIR) \ 
     
    132145$(eval $(call PKG_template,NFACCTD_MYSQL,nfacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    133146$(eval $(call PKG_template,NFACCTD_PGSQL,nfacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     147$(eval $(call PKG_template,NFACCTD_SQLITE,nfacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    134148$(eval $(call PKG_template,NFACCTD_CUSTOM,nfacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    135149$(eval $(call PKG_template,PMACCTD_BASIC,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    136150$(eval $(call PKG_template,PMACCTD_MYSQL,pmacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    137151$(eval $(call PKG_template,PMACCTD_PGSQL,pmacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     152$(eval $(call PKG_template,PMACCTD_SQLITE,pmacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    138153$(eval $(call PKG_template,PMACCTD_CUSTOM,pmacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    139154$(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     
    142157$(eval $(call PKG_build,PMACCT_MYSQL,nfacctd-mysql,pmacctd-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    143158$(eval $(call PKG_build,PMACCT_PGSQL,nfacctd-pgsql,pmacctd-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     159$(eval $(call PKG_build,PMACCT_SQLITE,nfacctd-sqlite,pmacctd-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    144160$(eval $(call PKG_build,NFACCTD_CUSTOM,nfacctd-custom,pmacctd-dummy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    145161$(eval $(call PKG_build,PMACCTD_CUSTOM,nfacctd-dummy,pmacctd-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     
    148164$(eval $(call PKG_package,NFACCTD_MYSQL,nfacctd-mysql,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    149165$(eval $(call PKG_package,NFACCTD_PGSQL,nfacctd-pgsql,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     166$(eval $(call PKG_package,NFACCTD_SQLITE,nfacctd-sqlite,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    150167$(eval $(call PKG_package,NFACCTD_CUSTOM,nfacctd-custom,nfacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    151168$(eval $(call PKG_package,PMACCTD_BASIC,pmacctd-basic,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    152169$(eval $(call PKG_package,PMACCTD_MYSQL,pmacctd-mysql,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    153170$(eval $(call PKG_package,PMACCTD_PGSQL,pmacctd-pgsql,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     171$(eval $(call PKG_package,PMACCTD_SQLITE,pmacctd-sqlite,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    154172$(eval $(call PKG_package,PMACCTD_CUSTOM,pmacctd-custom,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    155173 
Note: See TracChangeset for help on using the changeset viewer.