Changeset d8d0d77 in freewrt


Ignore:
Timestamp:
Jan 21, 2007, 3:40:47 AM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
6a98850
Parents:
a04df31
Message:

convert to new style, remove database support, disable inline, update to latest upstream, we add more features as soon as we decided about a better flavour system

git-svn-id: svn://www.freewrt.org/trunk/freewrt@1698 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
5 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • mk/pkg-depend.mk

    ra04df31 rd8d0d77  
    1313bitlbee-compile: libiconv-compile openssl-compile glib-compile
    1414bluez-utils-compile: bluez-libs-compile libusb-compile
    15 cbtt-compile: mysql-compile zlib-compile
     15cbtt-compile: mysql-compile zlib-compile uclibc++-compile
    1616clinkc-compile: expat-compile
    1717cups-compile: zlib-compile
     
    102102siproxd-compile: libosip2-compile
    103103sipsak-compile: openssl-compile
     104snort-compile: libnet-compile libpcap-compile pcre-compile
    104105socat-compile: openssl-compile
    105106sqlite-compile: ncurses-compile readline-compile
     
    262263endif
    263264
    264 snort-compile: libnet-compile libpcap-compile pcre-compile
    265 ifeq ($(FWRT_PACKAGE_SNORT_WITH_MYSQL),y)
    266 snort-compile: mysql-compile
    267 endif
    268 ifeq ($(FWRT_PACKAGE_SNORT_WITH_PGSQL),y)
    269 snort-compile: postgresql-compile
    270 endif
    271 ifeq ($(FWRT_PACKAGE_SNORT_ENABLE_INLINE),y)
    272 snort-compile: iptables-compile
    273 endif
    274265
    275266snort-wireless-compile: libnet-compile libpcap-compile pcre-compile
  • package/snort/Config.in

    ra04df31 rd8d0d77  
    1 #menu "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
    2 
    3 config FWRT_COMPILE_SNORT
     1config FWRT_PACKAGE_SNORT
     2        prompt "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
    43        tristate
    54        default n
    6         depends FWRT_PACKAGE_SNORT_BASIC || FWRT_PACKAGE_SNORT_MYSQL || FWRT_PACKAGE_SNORT_PGSQL || FWRT_PACKAGE_SNORT_CUSTOM
    7 
    8 choice
    9         prompt "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
    10         tristate
    11         optional
     5        select FWRT_PACKAGE_LIBNET
     6        select FWRT_PACKAGE_LIBPCAP
     7        select FWRT_PACKAGE_LIBPCRE
    128        help
    139         
     
    1713         
    1814          Depends:
    19             - libmysqlclient (for MySQL database logging support)
    2015            - libnet
    2116            - libpcap
    2217            - libpcre
    23             - libpq (for PostgreSQL database logging support)
    2418       
    25         config FWRT_PACKAGE_SNORT_BASIC
    26                 prompt   "snort...........................   without database support"
    27                 tristate
    28                 select FWRT_COMPILE_SNORT
    29                 select FWRT_PACKAGE_LIBNET
    30                 select FWRT_PACKAGE_LIBPCAP
    31                 select FWRT_PACKAGE_LIBPCRE
    32        
    33         config FWRT_PACKAGE_SNORT_MYSQL
    34                 prompt   "snort-mysql.....................   with MySQL database support"
    35                 tristate
    36                 select FWRT_COMPILE_SNORT
    37                 select FWRT_PACKAGE_LIBNET
    38                 select FWRT_PACKAGE_LIBPCAP
    39                 select FWRT_PACKAGE_LIBPCRE
    40                 select FWRT_PACKAGE_LIBMYSQLCLIENT
    41        
    42         config FWRT_PACKAGE_SNORT_PGSQL
    43                 prompt   "snort-pgsql.....................   with PostgreSQL database support"
    44                 tristate
    45                 select FWRT_COMPILE_SNORT
    46                 select FWRT_PACKAGE_LIBNET
    47                 select FWRT_PACKAGE_LIBPCAP
    48                 select FWRT_PACKAGE_LIBPCRE
    49                 select FWRT_PACKAGE_LIBPQ
    50        
    51         config FWRT_PACKAGE_SNORT_CUSTOM
    52                 prompt   "snort-custom....................   customized to your needs"
    53                 tristate
    54                 select FWRT_COMPILE_SNORT
    55                 select FWRT_PACKAGE_LIBNET
    56                 select FWRT_PACKAGE_LIBPCAP
    57                 select FWRT_PACKAGE_LIBPCRE
    58        
    59         config FWRT_PACKAGE_SNORT_ENABLE_DEBUG
    60                 prompt "debug (enable debugging options, useful for bugreports)"
    61                 bool
    62                 default n
    63                 depends FWRT_PACKAGE_SNORT_CUSTOM
    64 
    65         config FWRT_PACKAGE_SNORT_ENABLE_INLINE
    66                 prompt "Inline mode (read packets from iptables instead of libpcap)"
    67                 bool
    68                 default n
    69                 depends FWRT_PACKAGE_SNORT_CUSTOM
    70                 select FWRT_PACKAGE_IPTABLES
    71 
    72         config FWRT_PACKAGE_SNORT_WITH_MYSQL
    73                 prompt "MySQL database support"
    74                 bool
    75                 default n
    76                 depends FWRT_PACKAGE_SNORT_CUSTOM
    77                 select FWRT_PACKAGE_LIBMYSQLCLIENT
    78 
    79         config FWRT_PACKAGE_SNORT_WITH_PGSQL
    80                 prompt "PostgreSQL database support"
    81                 bool
    82                 default n
    83                 depends FWRT_PACKAGE_SNORT_CUSTOM
    84                 select FWRT_PACKAGE_LIBPQ
    85 
    86 endchoice
    87 
    88 #endmenu
  • package/snort/Makefile

    ra04df31 rd8d0d77  
    55# or at http://www.freewrt.org/licence for details.
    66
    7 include $(TOPDIR)/rules.mk
     7include ${TOPDIR}/rules.mk
    88
    99PKG_NAME:=              snort
    10 PKG_VERSION:=           2.4.5
    11 PKG_RELEASE:=           2
    12 PKG_MD5SUM:=            108b3c20dcbaf3cdb17ea9203342eaaa
     10PKG_VERSION:=           2.6.1.2
     11PKG_RELEASE:=           1
     12PKG_MD5SUM:=            22c448e25538cdf74c62abe586aeac0a
    1313PKG_INIT:=              60
     14PKG_SOURCE_URL:=        http://www.snort.org/dl/current/
    1415
    15 PKG_SOURCE_URL:=        http://www.snort.org/dl/current/
    16 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
     16include ${TOPDIR}/mk/package.mk
    1717
    18 include $(TOPDIR)/mk/package.mk
     18$(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    1919
    20 PKG_CONFIGURE_OPTS:=    \
    21         --target=$(GNU_TARGET_NAME) \
    22         --host=$(GNU_TARGET_NAME) \
    23         --build=$(GNU_HOST_NAME) \
    24         --program-prefix="" \
    25         --program-suffix="" \
    26         --prefix=/usr \
    27         --exec-prefix=/usr \
    28         --bindir=/usr/sbin \
    29         --datadir=/usr/share \
    30         --includedir=/usr/include \
    31         --infodir=/usr/share/info \
    32         --libdir=/usr/lib \
    33         --libexecdir=/usr/lib/locate \
    34         --localstatedir=/var/lib \
    35         --mandir=/usr/share/man \
    36         --sbindir=/usr/sbin \
    37         --sysconfdir=/etc \
    38         --disable-nls \
    39         --enable-shared \
    40         --disable-static \
    41         --enable-flexresp \
    42         --with-libnet-includes="$(STAGING_DIR)/usr/include" \
    43         --with-libnet-libraries="$(STAGING_DIR)/usr/lib" \
    44         --with-libpcap-includes="$(STAGING_DIR)/usr/include" \
    45         --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
    46         --with-libpcre-includes="$(STAGING_DIR)/usr/include" \
    47         --with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \
     20CONFIGURE_STYLE=        gnu
     21CONFIGURE_ARGS+=        --enable-flexresp \
     22                        --with-libnet-includes="${STAGING_DIR}/usr/include" \
     23                        --with-libnet-libraries="${STAGING_DIR}/usr/lib" \
     24                        --with-libpcap-includes="${STAGING_DIR}/usr/include" \
     25                        --with-libpcap-libraries="${STAGING_DIR}/usr/lib" \
     26                        --with-libpcre-includes="${STAGING_DIR}/usr/include" \
     27                        --with-libpcre-libraries="${STAGING_DIR}/usr/lib" \
     28                        --without-mysql \
     29                        --without-postgresql \
     30                        --disable-debug \
     31                        --disable-inline
     32BUILD_STYLE=            auto
     33INSTALL_STYLE=          auto
    4834
    49 SNORT_BASIC_CONFIGURE_OPTS := \
    50         --without-mysql \
    51         --without-postgresql \
    52 
    53 SNORT_MYSQL_CONFIGURE_OPTS := \
    54         --with-mysql=$(STAGING_DIR)/usr \
    55         --without-postgresql \
    56 
    57 SNORT_PGSQL_CONFIGURE_OPTS := \
    58         --without-mysql \
    59         --with-postgresql=$(STAGING_DIR)/usr \
    60 
    61 SNORT_CUSTOM_CONFIGURE_OPTS := \
    62 
    63 ifeq ($(FWRT_PACKAGE_SNORT_ENABLE_DEBUG),y)
    64 SNORT_CUSTOM_CONFIGURE_OPTS += --enable-debug
    65 else
    66 SNORT_CUSTOM_CONFIGURE_OPTS += --disable-debug
    67 endif
    68 
    69 ifeq ($(FWRT_PACKAGE_SNORT_ENABLE_INLINE),y)
    70 SNORT_CUSTOM_CONFIGURE_OPTS += --enable-inline
    71 SNORT_CUSTOM_CONFIGURE_OPTS += --with-libipq-includes="$(STAGING_DIR)/include/libipq"
    72 SNORT_CUSTOM_CONFIGURE_OPTS += --with-libipq-libraries="$(STAGING_DIR)/lib"
    73 else
    74 SNORT_CUSTOM_CONFIGURE_OPTS += --disable-inline
    75 endif
    76 
    77 ifeq ($(FWRT_PACKAGE_SNORT_WITH_MYSQL),y)
    78 SNORT_CUSTOM_CONFIGURE_OPTS += --with-mysql="$(STAGING_DIR)/usr"
    79 else
    80 SNORT_CUSTOM_CONFIGURE_OPTS += --without-mysql
    81 endif
    82 
    83 ifeq ($(FWRT_PACKAGE_SNORT_WITH_PGSQL),y)
    84 SNORT_CUSTOM_CONFIGURE_OPTS += --with-postgresql="$(STAGING_DIR)/usr"
    85 else
    86 SNORT_CUSTOM_CONFIGURE_OPTS += --without-postgresql
    87 endif
    88 
    89 define PKG_build
    90 
    91 ifneq ($(FWRT_PACKAGE_$(1)),)
    92 BUILD_TARGETS += $(WRKBUILD)/$(2)
    93 endif
    94 
    95 $(WRKBUILD)/$(2): $(WRKBUILD)/.prepared
    96         touch -r $(WRKBUILD)/Makefile.am $(WRKBUILD)/configure.in
    97         touch -r $(WRKBUILD)/Makefile.in $(WRKBUILD)/configure
    98         -$(MAKE) -C $(WRKBUILD) distclean
    99         (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
    100                 $(TARGET_CONFIGURE_OPTS) \
    101                 CFLAGS="$(TARGET_CFLAGS)" \
    102                 CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/mysql" \
    103                 LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib/mysql" \
    104                 ./configure \
    105                   $(PKG_CONFIGURE_OPTS) \
    106                   $$($(1)_CONFIGURE_OPTS) \
    107         );
    108         $(MAKE) -C $(WRKBUILD)
    109         mv $(WRKBUILD)/src/snort $(WRKBUILD)/$(2)
    110 
    111 $$(IPKG_$(1)): $(WRKBUILD)/.installed $(WRKBUILD)/$(2)
    112         install -m0644 ./ipkg/snort.conffiles $$(IDIR_$(1))/CONTROL/conffiles
    113         install -d -m0755 $$(IDIR_$(1))/etc/init.d
    114         install -m0755 ./files/snort.init \
    115                 $$(IDIR_$(1))/etc/init.d/S$(PKG_INIT)snort
    116         install -d -m0755 $$(IDIR_$(1))/etc/snort
    117         install -m0644 $(WRKBUILD)/etc/snort.conf $$(IDIR_$(1))/etc/snort/
    118         install -m0644 $(WRKBUILD)/etc/classification.config $$(IDIR_$(1))/etc/snort/
    119         install -m0644 $(WRKBUILD)/etc/gen-msg.map $$(IDIR_$(1))/etc/snort/
    120         install -m0644 $(WRKBUILD)/etc/reference.config $$(IDIR_$(1))/etc/snort/
    121         install -m0644 $(WRKBUILD)/etc/sid-msg.map $$(IDIR_$(1))/etc/snort/
    122         install -m0644 $(WRKBUILD)/etc/threshold.conf $$(IDIR_$(1))/etc/snort/
    123         install -m0644 $(WRKBUILD)/etc/unicode.map $$(IDIR_$(1))/etc/snort/
    124         install -d -m0755 $$(IDIR_$(1))/usr/sbin
    125         install -m0755 $(WRKBUILD)/$(2) $$(IDIR_$(1))/usr/sbin/snort
    126         $(RSTRIP) $$(IDIR_$(1))
    127         mkdir -p $(PACKAGE_DIR)
    128         $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
    129 
    130 endef
    131 
    132 $(eval $(call PKG_template,SNORT_BASIC,snort,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    133 $(eval $(call PKG_template,SNORT_MYSQL,snort-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    134 $(eval $(call PKG_template,SNORT_PGSQL,snort-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    135 $(eval $(call PKG_template,SNORT_CUSTOM,snort-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    136 
    137 $(eval $(call PKG_build,SNORT_BASIC,snort,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    138 $(eval $(call PKG_build,SNORT_MYSQL,snort-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    139 $(eval $(call PKG_build,SNORT_PGSQL,snort-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    140 $(eval $(call PKG_build,SNORT_CUSTOM,snort-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    141 
    142 $(WRKBUILD)/.configured:
    143         touch $@
    144 
    145 $(WRKBUILD)/.built: $(BUILD_TARGETS)
    146         touch $@
    147 
    148 $(WRKBUILD)/.installed: $(WRKBUILD)/.built
    149         mkdir -p $(WRKINST)
    150         $(MAKE) -C $(WRKBUILD) \
    151                 DESTDIR="$(WRKINST)" \
    152                 install
    153         touch $@
     35post-install:
     36        ${INSTALL_DIR} ${IDIR_SNORT}/usr/bin
     37        ${INSTALL_DIR} ${IDIR_SNORT}/etc/init.d
     38        ${INSTALL_DIR} ${IDIR_SNORT}/etc/snort
     39        ${INSTALL_BIN} ./files/snort.init \
     40                ${IDIR_SNORT}/etc/init.d/S${PKG_INIT}snort
     41        ${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort/
     42        ${INSTALL_DATA} ${WRKBUILD}/etc/classification.config \
     43                ${IDIR_SNORT}/etc/snort/
     44        ${INSTALL_DATA} ${WRKBUILD}/etc/gen-msg.map ${IDIR_SNORT}/etc/snort/
     45        ${INSTALL_DATA} ${WRKBUILD}/etc/reference.config ${IDIR_SNORT}/etc/snort/
     46        ${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map ${IDIR_SNORT}/etc/snort/
     47        ${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf ${IDIR_SNORT}/etc/snort/
     48        ${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map ${IDIR_SNORT}/etc/snort/
     49        ${INSTALL_BIN} ${WRKINST}/usr/bin/snort ${IDIR_SNORT}/usr/bin
    15450
    15551include ${TOPDIR}/mk/pkg-bottom.mk
Note: See TracChangeset for help on using the changeset viewer.