X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3602051f0fee67040df432f60bd006777b26c97b..589cbb3338e9e85dc482b76f35f735cddfa7c572:/package/snort/Makefile?ds=sidebyside diff --git a/package/snort/Makefile b/package/snort/Makefile index b05ea0104..04a6efc37 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -3,20 +3,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort -PKG_VERSION:=2.3.2 +PKG_VERSION:=2.4.4 PKG_RELEASE:=1 -PKG_MD5SUM:=692602827ce9d1a611630149f8e50ec8 +PKG_MD5SUM:=9dc9060d1f2e248663eceffadfc45e7e -PKG_SOURCE_URL:= \ - http://www.snort.org/dl/current/ \ - http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/ +PKG_SOURCE_URL:=http://www.snort.org/dl/current/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/templates.mk +include $(TOPDIR)/package/rules.mk PKG_CONFIGURE_OPTS := \ --target=$(GNU_TARGET_NAME) \ @@ -41,17 +39,12 @@ PKG_CONFIGURE_OPTS := \ --enable-shared \ --disable-static \ --enable-flexresp \ - --disable-smbalerts \ --with-libnet-includes="$(STAGING_DIR)/usr/include" \ --with-libnet-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcap-includes="$(STAGING_DIR)/usr/include" \ --with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \ --with-libpcre-includes="$(STAGING_DIR)/usr/include" \ --with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \ - --without-odbc \ - --without-openssl \ - --without-oracle \ - --without-snmp \ SNORT_BASIC_CONFIGURE_OPTS := \ --without-mysql \ @@ -67,11 +60,26 @@ SNORT_PGSQL_CONFIGURE_OPTS := \ SNORT_CUSTOM_CONFIGURE_OPTS := \ +ifeq ($(BR2_PACKAGE_SNORT_ENABLE_DEBUG),y) +SNORT_CUSTOM_CONFIGURE_OPTS += --enable-debug +else +SNORT_CUSTOM_CONFIGURE_OPTS += --disable-debug +endif + +ifeq ($(BR2_PACKAGE_SNORT_ENABLE_INLINE),y) +SNORT_CUSTOM_CONFIGURE_OPTS += --enable-inline +SNORT_CUSTOM_CONFIGURE_OPTS += --with-libipq-includes="$(STAGING_DIR)/include/libipq" +SNORT_CUSTOM_CONFIGURE_OPTS += --with-libipq-libraries="$(STAGING_DIR)/lib" +else +SNORT_CUSTOM_CONFIGURE_OPTS += --disable-inline +endif + ifeq ($(BR2_PACKAGE_SNORT_WITH_MYSQL),y) SNORT_CUSTOM_CONFIGURE_OPTS += --with-mysql="$(STAGING_DIR)/usr" else SNORT_CUSTOM_CONFIGURE_OPTS += --without-mysql endif + ifeq ($(BR2_PACKAGE_SNORT_WITH_PGSQL),y) SNORT_CUSTOM_CONFIGURE_OPTS += --with-postgresql="$(STAGING_DIR)/usr" else @@ -85,12 +93,14 @@ BUILD_TARGETS += $(PKG_BUILD_DIR)/$(2) endif $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared + touch -r $(PKG_BUILD_DIR)/Makefile.am $(PKG_BUILD_DIR)/configure.in + touch -r $(PKG_BUILD_DIR)/Makefile.in $(PKG_BUILD_DIR)/configure -$(MAKE) -C $(PKG_BUILD_DIR) distclean (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/mysql" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/mysql" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/mysql" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib/mysql" \ ./configure \ $(PKG_CONFIGURE_OPTS) \ $$($(1)_CONFIGURE_OPTS) \ @@ -98,17 +108,12 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared $(MAKE) -C $(PKG_BUILD_DIR) mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2) -$(PKG_INSTALL_DIR)/usr/sbin/$(2): $(PKG_BUILD_DIR)/$(2) - install -m0755 $(PKG_BUILD_DIR)/$(2) $(PKG_INSTALL_DIR)/usr/sbin/ - -$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_INSTALL_DIR)/usr/sbin/$(2) - rm -rf $$(IDIR_$(1)) - $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4) +$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2) install -m0644 ./ipkg/snort.conffiles $$(IDIR_$(1))/CONTROL/conffiles install -d -m0755 $$(IDIR_$(1))/etc/default - install -m0644 ./ipkg/snort.default $$(IDIR_$(1))/etc/default/snort + install -m0644 ./files/snort.default $$(IDIR_$(1))/etc/default/snort install -d -m0755 $$(IDIR_$(1))/etc/init.d - install -m0755 ./ipkg/snort.init $$(IDIR_$(1))/etc/init.d/snort + install -m0755 ./files/snort.init $$(IDIR_$(1))/etc/init.d/snort install -d -m0755 $$(IDIR_$(1))/etc/snort install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/ install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/ @@ -118,7 +123,7 @@ $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_INSTALL_DIR)/usr/sbin/$(2) install -m0644 $(PKG_BUILD_DIR)/etc/threshold.conf $$(IDIR_$(1))/etc/snort/ install -m0644 $(PKG_BUILD_DIR)/etc/unicode.map $$(IDIR_$(1))/etc/snort/ install -d -m0755 $$(IDIR_$(1))/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/$(2) $$(IDIR_$(1))/usr/sbin/snort + install -m0755 $(PKG_BUILD_DIR)/$(2) $$(IDIR_$(1))/usr/sbin/snort $(RSTRIP) $$(IDIR_$(1)) mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) @@ -135,10 +140,11 @@ $(eval $(call PKG_build,SNORT_MYSQL,snort-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$( $(eval $(call PKG_build,SNORT_PGSQL,snort-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_build,SNORT_CUSTOM,snort-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -include $(TOPDIR)/package/rules.mk +$(PKG_BUILD_DIR)/.configured: + touch $@ $(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS) - touch $(PKG_BUILD_DIR)/.built + touch $@ $(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built mkdir -p $(PKG_INSTALL_DIR)