Changeset 789


Ignore:
Timestamp:
2005-05-03T03:36:33+02:00 (12 years ago)
Author:
nico
Message:

Updated snort to v2.3.3, added debug and inline-mode options to -custom package, fixed makefile, changed source url in control files

Location:
trunk/openwrt/package/snort
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/snort/Config.in

    r667 r789  
    4242                select BR2_PACKAGE_LIBPCRE 
    4343         
     44        config BR2_PACKAGE_SNORT_ENABLE_DEBUG 
     45                prompt "debug (enable debugging options, useful for bugreports)" 
     46                bool 
     47                default n 
     48                depends BR2_PACKAGE_SNORT_CUSTOM 
     49 
     50        config BR2_PACKAGE_SNORT_ENABLE_INLINE 
     51                prompt "inline mode (read packets from iptables instead of libpcap)" 
     52                bool 
     53                default n 
     54                depends BR2_PACKAGE_SNORT_CUSTOM 
     55                select BR2_PACKAGE_IPTABLES 
     56 
    4457        config BR2_PACKAGE_SNORT_WITH_MYSQL 
    4558                prompt "MySQL database support" 
    4659                bool 
    47                 default y 
     60                default n 
    4861                depends BR2_PACKAGE_SNORT_CUSTOM 
    4962                select BR2_PACKAGE_LIBMYSQLCLIENT 
     
    5265                prompt "PostgreSQL database support" 
    5366                bool 
    54                 default y 
     67                default n 
    5568                depends BR2_PACKAGE_SNORT_CUSTOM 
    5669                select BR2_PACKAGE_LIBPQ 
     
    6073config BR2_PACKAGE_SNORT 
    6174        tristate 
    62         default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL 
     75        default BR2_PACKAGE_SNORT_BASIC || BR2_PACKAGE_SNORT_MYSQL || BR2_PACKAGE_SNORT_PGSQL || BR2_PACKAGE_SNORT_CUSTOM 
    6376 
  • trunk/openwrt/package/snort/Makefile

    r667 r789  
    44 
    55PKG_NAME:=snort 
    6 PKG_VERSION:=2.3.2 
     6PKG_VERSION:=2.3.3 
    77PKG_RELEASE:=1 
    8 PKG_MD5SUM:=692602827ce9d1a611630149f8e50ec8 
     8PKG_MD5SUM:=06bf140893e7cb120aaa9372d10a0100 
    99 
    1010PKG_SOURCE_URL:= \ 
     
    4242        --disable-static \ 
    4343        --enable-flexresp \ 
    44         --disable-smbalerts \ 
    4544        --with-libnet-includes="$(STAGING_DIR)/usr/include" \ 
    4645        --with-libnet-libraries="$(STAGING_DIR)/usr/lib" \ 
     
    4948        --with-libpcre-includes="$(STAGING_DIR)/usr/include" \ 
    5049        --with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \ 
    51         --without-odbc \ 
    52         --without-openssl \ 
    53         --without-oracle \ 
    54         --without-snmp \ 
    5550 
    5651SNORT_BASIC_CONFIGURE_OPTS := \ 
     
    6863SNORT_CUSTOM_CONFIGURE_OPTS := \ 
    6964 
     65ifeq ($(BR2_PACKAGE_SNORT_ENABLE_DEBUG),y) 
     66SNORT_CUSTOM_CONFIGURE_OPTS += --enable-debug 
     67else 
     68SNORT_CUSTOM_CONFIGURE_OPTS += --disable-debug 
     69endif 
     70 
     71ifeq ($(BR2_PACKAGE_SNORT_ENABLE_INLINE),y) 
     72SNORT_CUSTOM_CONFIGURE_OPTS += --enable-inline 
     73SNORT_CUSTOM_CONFIGURE_OPTS += --with-libipq-includes="$(STAGING_DIR)/include/libipq" 
     74SNORT_CUSTOM_CONFIGURE_OPTS += --with-libipq-libraries="$(STAGING_DIR)/lib" 
     75else 
     76SNORT_CUSTOM_CONFIGURE_OPTS += --disable-inline 
     77endif 
     78 
    7079ifeq ($(BR2_PACKAGE_SNORT_WITH_MYSQL),y) 
    7180SNORT_CUSTOM_CONFIGURE_OPTS += --with-mysql="$(STAGING_DIR)/usr" 
     
    7382SNORT_CUSTOM_CONFIGURE_OPTS += --without-mysql 
    7483endif 
     84 
    7585ifeq ($(BR2_PACKAGE_SNORT_WITH_PGSQL),y) 
    7686SNORT_CUSTOM_CONFIGURE_OPTS += --with-postgresql="$(STAGING_DIR)/usr" 
     
    8696 
    8797$(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared 
     98        touch -r $(PKG_BUILD_DIR)/Makefile.am $(PKG_BUILD_DIR)/configure.in  
     99        touch -r $(PKG_BUILD_DIR)/Makefile.in $(PKG_BUILD_DIR)/configure 
    88100        -$(MAKE) -C $(PKG_BUILD_DIR) distclean 
    89101        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ 
     
    99111        mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2) 
    100112 
    101 $(PKG_INSTALL_DIR)/usr/sbin/$(2): $(PKG_BUILD_DIR)/$(2) 
    102         install -m0755 $(PKG_BUILD_DIR)/$(2) $(PKG_INSTALL_DIR)/usr/sbin/ 
    103  
    104 $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_INSTALL_DIR)/usr/sbin/$(2) 
     113$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2) 
    105114        rm -rf $$(IDIR_$(1)) 
    106115        $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4) 
     
    119128        install -m0644 $(PKG_BUILD_DIR)/etc/unicode.map $$(IDIR_$(1))/etc/snort/ 
    120129        install -d -m0755 $$(IDIR_$(1))/usr/sbin 
    121         cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/$(2) $$(IDIR_$(1))/usr/sbin/snort 
     130        install -m0755 $(PKG_BUILD_DIR)/$(2) $$(IDIR_$(1))/usr/sbin/snort 
    122131        $(RSTRIP) $$(IDIR_$(1)) 
    123132        mkdir -p $(PACKAGE_DIR) 
  • trunk/openwrt/package/snort/ipkg/snort-custom.control

    r667 r789  
    1 Package: snort 
     1Package: snort-custom 
    22Priority: optional 
    33Section: net 
     
    55Architecture: [TBDL] 
    66Maintainer: Nico <nthill@free.fr> 
    7 Source: http://nthill.free.fr/openwrt/sources/snort/ 
     7Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/snort/ 
    88Description: a flexible Network Intrusion Detection System (NIDS), 
    99 built with custom options 
  • trunk/openwrt/package/snort/ipkg/snort-mysql.control

    r667 r789  
    55Architecture: [TBDL] 
    66Maintainer: Nico <nthill@free.fr> 
    7 Source: http://nthill.free.fr/openwrt/sources/snort/ 
     7Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/snort/ 
    88Description: a flexible Network Intrusion Detection System (NIDS), 
    99 built with MySQL database logging support 
  • trunk/openwrt/package/snort/ipkg/snort-pgsql.control

    r667 r789  
    55Architecture: [TBDL] 
    66Maintainer: Nico <nthill@free.fr> 
    7 Source: http://nthill.free.fr/openwrt/sources/snort/ 
     7Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/snort/ 
    88Description: a flexible Network Intrusion Detection System (NIDS), 
    99 built with PostgreSQL database logging support 
  • trunk/openwrt/package/snort/ipkg/snort.control

    r667 r789  
    55Architecture: [TBDL] 
    66Maintainer: Nico <nthill@free.fr> 
    7 Source: http://nthill.free.fr/openwrt/sources/snort/ 
     7Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/snort/ 
    88Description: a flexible Network Intrusion Detection System (NIDS), 
    99 built without database logging support 
Note: See TracChangeset for help on using the changeset viewer.