diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/clamav/Makefile | 6 | ||||
| -rw-r--r-- | net/fping/Makefile | 8 | ||||
| -rw-r--r-- | net/kea/Makefile | 7 | ||||
| -rw-r--r-- | net/kea/patches/001-fix-cross-compile.patch | 2 | ||||
| -rw-r--r-- | net/openssh/Makefile | 4 | ||||
| -rw-r--r-- | net/snort/files/snort.init | 15 | ||||
| -rw-r--r-- | net/snort3/Makefile | 3 |
7 files changed, 26 insertions, 19 deletions
diff --git a/net/clamav/Makefile b/net/clamav/Makefile index ba45fff84..b8d0625a9 100644 --- a/net/clamav/Makefile +++ b/net/clamav/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=clamav -PKG_VERSION:=0.101.1 -PKG_RELEASE:=2 +PKG_VERSION:=0.101.2 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \ @@ -18,7 +18,7 @@ PKG_CPE_ID:=cpe:/a:clamav:clamav PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/ -PKG_HASH:=fa368fa9b2f57638696150c7d108b06dec284e8d8e3b8e702c784947c01fb806 +PKG_HASH:=0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/net/fping/Makefile b/net/fping/Makefile index d3bdedde0..34bfdd3be 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fping -PKG_VERSION:=4.1 +PKG_VERSION:=4.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://fping.org/dist/ -PKG_HASH:=2733e2a18cc2b5b935c4e3b5b84ccf2080c38043f1864d7c43326e8048ddab73 +PKG_SOURCE_URL:=https://fping.org/dist/ +PKG_HASH:=7d339674b6a95aae1d8ad487ff5056fd95b474c3650938268f6a905c3771b64a PKG_MAINTAINER:=Nikil Mehta <nikil.mehta@gmail.com> PKG_LICENSE:=BSD-4-Clause @@ -27,7 +27,7 @@ define Package/fping SECTION:=net CATEGORY:=Network TITLE:=sends ICMP ECHO_REQUEST packets to network hosts - URL:=http://fping.org/ + URL:=https://fping.org/ endef diff --git a/net/kea/Makefile b/net/kea/Makefile index e66aedd62..36c035db9 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kea PKG_VERSION:=1.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=BangLang Huang<banglang.huang@foxmail.com>, Rosy Song<rosysong@rosinson.com> PKG_BUILD_DEPENDS:=boost log4cplus kea/host HOST_BUILD_DEPENDS:=boost boost/host log4cplus/host @@ -99,6 +99,7 @@ endef CONFIGURE_ARGS += \ --with-log4cplus="$(STAGING_DIR)/usr" \ + --with-openssl="$(STAGING_DIR)/usr" \ $(if $(CONFIG_PACKAGE_kea-perfdhcp),--enable-perfdhcp,) CONFIGURE_VARS += \ @@ -108,12 +109,14 @@ HOST_CONFIGURE_ARGS += \ --enable-static-link \ --enable-boost-headers-only \ --with-log4cplus="$(STAGING_DIR_HOSTPKG)" \ - --with-boost-include="$(STAGING_DIR)/usr/include" + --with-boost-include="$(STAGING_DIR)/usr/include" \ + --without-pic HOST_LDFLAGS += \ -Wl,--gc-sections,--as-needed TARGET_CXXFLAGS += \ + $(FPIC) \ -fdata-sections \ -ffunction-sections diff --git a/net/kea/patches/001-fix-cross-compile.patch b/net/kea/patches/001-fix-cross-compile.patch index 40a47501a..d3a1521a9 100644 --- a/net/kea/patches/001-fix-cross-compile.patch +++ b/net/kea/patches/001-fix-cross-compile.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -594,10 +594,10 @@ AC_TRY_COMPILE([ +@@ -580,10 +580,10 @@ AC_TRY_COMPILE([ AC_MSG_RESULT(no)) AC_MSG_CHECKING(for usuable C++11 regex) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index d71cee690..39b02758f 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=7.9p1 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ @@ -180,7 +180,7 @@ CONFIGURE_ARGS += \ --without-pam endif -ifeq ($(CONFIG_OPENSSL_ENGINE_CRYPTO),y) +ifeq ($(CONFIG_OPENSSL_ENGINE),y) CONFIGURE_ARGS+= \ --with-ssl-engine endif diff --git a/net/snort/files/snort.init b/net/snort/files/snort.init index c3d962902..7905c6ff3 100644 --- a/net/snort/files/snort.init +++ b/net/snort/files/snort.init @@ -8,26 +8,29 @@ USE_PROCD=1 PROG=/usr/bin/snort validate_snort_section() { - uci_validate_section snort snort "${1}" \ + uci_load_validate snort snort "$1" "$2" \ 'config_file:string' \ 'interface:string' } -start_service() { - local config_file interface - - validate_snort_section snort || { +start_snort_instance() { + [ "$2" = 0 ] || { echo "validation failed" return 1 } procd_open_instance procd_set_param command $PROG "-q" "--daq-dir" "/usr/lib/daq/" "-i" "$interface" "-c" "$config_file" "-s" "-N" - procd_set_param file $CONFIGFILE + procd_set_param file $config_file procd_set_param respawn procd_close_instance } +start_service() +{ + validate_snort_section snort start_snort_instance +} + stop_service() { service_stop ${PROG} diff --git a/net/snort3/Makefile b/net/snort3/Makefile index f5f3d8807..34efb7a9d 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 PKG_VERSION:=3.0.0-beta PKG_VERSION_SHORT:=3.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> @@ -50,6 +50,7 @@ CMAKE_OPTIONS += \ -DMAKE_HTML_DOC:BOOL=NO \ -DMAKE_PDF_DOC:BOOL=NO \ -DMAKE_TEXT_DOC:BOOL=NO \ + -DHAVE_LZMA=OFF TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc TARGET_LDFLAGS += -ltirpc |