syslog-ng: fix various install problems such as missing plugins, etc

Install the plugins as various functionality is no longer in the
utility itself but is packaged as a .so plugin instead. Disable
plugins with too many dependencies (or too exotic).

Bump the version number on the config file to agree with the package's
version number.

Clean up any .la files from libtool.

Start much earlier so that logging doesn't miss startup messages from
other services.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
This commit is contained in:
Philip Prindeville 2017-01-07 16:47:17 -07:00
parent 909209e753
commit 84b136cdb4
3 changed files with 11 additions and 7 deletions

View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=syslog-ng PKG_NAME:=syslog-ng
PKG_VERSION:=3.8.1 PKG_VERSION:=3.8.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/syslog-ng define Package/syslog-ng
SECTION:=admin SECTION:=admin
CATEGORY:=Administration CATEGORY:=Administration
DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libuuid DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libuuid +libcurl
TITLE:=A powerful syslog daemon TITLE:=A powerful syslog daemon
URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
endef endef
@ -41,10 +41,13 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
$(call autoconf_bool,CONFIG_IPV6,ipv6) \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-ampq \
--disable-tcp-wrapper \ --disable-tcp-wrapper \
--disable-glibtest \ --disable-glibtest \
--disable-mongodb \ --disable-mongodb \
--disable-java \ --disable-java \
--disable-json \
--disable-python \
--disable-spoof-source \ --disable-spoof-source \
--disable-sql \ --disable-sql \
--disable-linux-caps \ --disable-linux-caps \
@ -58,13 +61,14 @@ CONFIGURE_VARS += \
define Package/syslog-ng/install define Package/syslog-ng/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsyslog-ng-3.8.so* $(1)/usr/lib/ $(MAKE) -C $(PKG_BUILD_DIR) \
$(INSTALL_DIR) $(1)/usr/sbin install-sbinPROGRAMS install-libLTLIBRARIES \
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/ install-moduleLTLIBRARIES DESTDIR="$(1)"
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc
$(call libtool_remove_files,$(1))
endef endef
$(eval $(call BuildPackage,syslog-ng)) $(eval $(call BuildPackage,syslog-ng))

View file

@ -1,4 +1,4 @@
@version:3.0 @version:3.8
options { options {
chain_hostnames(no); chain_hostnames(no);

View file

@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2006-2016 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
START=50 START=20
SERVICE_USE_PID=1 SERVICE_USE_PID=1