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

Merge pull request #2498 from cshore/pull-request-collectd-encrypted-networking

Browse source 
utils/collectd: Add option to enable encrypted network output
This commit is contained in:
Hannu Nyman 2016-03-15 10:39:55 +02:00
commit f9fd67b4a5
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
utils/collectd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.5.1 PKG_VERSION:=5.5.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/ PKG_SOURCE_URL:=http://collectd.org/files/
@ -176,6 +176,14 @@ 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
@ -185,8 +193,15 @@ CONFIGURE_ARGS+= \
--disable-debug \ --disable-debug \
--enable-daemon \ --enable-daemon \
--with-nan-emulation \ --with-nan-emulation \
--without-perl-bindings \ --without-perl-bindings
ifneq ($(CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK),)
CONFIGURE_ARGS+= \
--with-libgcrypt=$(STAGING_DIR)/include
else
CONFIGURE_ARGS+= \
--without-libgcrypt --without-libgcrypt
endif
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
CFLAGS="$$$$CFLAGS $(FPIC)" \ CFLAGS="$$$$CFLAGS $(FPIC)" \
@ -317,7 +332,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)) $(eval $(call BuildPlugin,network,network input/output,network,+PACKAGE_COLLECTD_ENCRYPTED_NETWORK:libgcrypt))
$(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)) $(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))