Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

collectd: remove encryption feature from network plugin

Browse source 
Remove the encryption functionality from the network plugin.
It is a non-core functionality and causes a need for additional
dependency on the main program when enabled in 5.7.1.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2017-02-06 11:28:58 +02:00
parent a3b019fce5
commit 616520a76e
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
utils/collectd/Makefile
View file

@ -182,7 +182,7 @@ endef
define Package/collectd define Package/collectd
$(call Package/collectd/Default) $(call Package/collectd/Default)
DEPENDS:= +libpthread +zlib +libltdl +libip4tc +PACKAGE_COLLECTD_ENCRYPTED_NETWORK:libgcrypt DEPENDS:= +libpthread +zlib +libltdl +libip4tc
MENU:=1 MENU:=1
endef endef
@ -191,14 +191,6 @@ define Package/collectd/description
and provides mechanismns to store the values in a variety of ways. and provides mechanismns to store the values in a variety of ways.
endef endef
define Package/collectd/config
config PACKAGE_COLLECTD_ENCRYPTED_NETWORK
bool "Enable ability to use encrypted networking"
default n
depends on PACKAGE_collectd
select PACKAGE_collectd-mod-network
endef
ifneq ($(CONFIG_avr32),) ifneq ($(CONFIG_avr32),)
TARGET_CFLAGS += -fsigned-char TARGET_CFLAGS += -fsigned-char
endif endif
@ -209,19 +201,10 @@ CONFIGURE_ARGS+= \
--disable-debug \ --disable-debug \
--enable-daemon \ --enable-daemon \
--with-nan-emulation \ --with-nan-emulation \
--without-libgcrypt \
--without-perl-bindings \ --without-perl-bindings \
--without-libudev --without-libudev
ifneq ($(CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK),)
CONFIGURE_ARGS+= \
--with-libgcrypt=$(STAGING_DIR)/usr
CONFIGURE_VARS+= \
LDFLAGS="$$$$LDFLAGS -lgcrypt"
else
CONFIGURE_ARGS+= \
--without-libgcrypt
endif
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
CFLAGS="$$$$CFLAGS $(FPIC)" \ CFLAGS="$$$$CFLAGS $(FPIC)" \
LDFLAGS="$$$$LDFLAGS -lm -lz" \ LDFLAGS="$$$$LDFLAGS -lm -lz" \
@ -352,7 +335,7 @@ $(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,))
$(eval $(call BuildPlugin,memory,physical memory usage input,memory,)) $(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus)) $(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus))
$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:libmnl)) $(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:libmnl))
$(eval $(call BuildPlugin,network,network input/output,network,+PACKAGE_COLLECTD_ENCRYPTED_NETWORK:libgcrypt)) $(eval $(call BuildPlugin,network,network input/output,network,))
$(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl)) $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
$(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,)) $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common)) $(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common))