summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Mitchell <jmitchell@cbnl.com>2013-10-14 14:20:13 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-17 21:36:58 +0200
commitb239cd1553f6ca751b33d10abb0ea0263a557b38 (patch)
tree76b08a9cf25aeb6e7cd112f47f111abb7545a5d6
parenteb2ad2746f54313ba0a5d34c1712436a25f7fe47 (diff)
downloadmeta-openembedded-b239cd1553f6ca751b33d10abb0ea0263a557b38.tar.gz
rsyslog: update to 7.4.4
Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf60
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb5
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb (renamed from meta-oe/recipes-extended/rsyslog/rsyslog.inc)24
3 files changed, 16 insertions, 73 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
deleted file mode 100644
index 47fc4402a..000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
+++ /dev/null
@@ -1,60 +0,0 @@
1# if you experience problems, check
2# http://www.rsyslog.com/troubleshoot for assistance
3
4# rsyslog v3: load input modules
5# If you do not load inputs, nothing happens!
6# You may need to set the module load path if modules are not found.
7
8$ModLoad immark # provides --MARK-- message capability
9$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
10$ModLoad imklog # kernel logging (formerly provided by rklogd)
11
12# Log all kernel messages to the console.
13# Logging much else clutters up the screen.
14#kern.* /dev/console
15
16# Log anything (except mail) of level info or higher.
17# Don't log private authentication messages!
18*.info;mail.none;authpriv.none;cron.none -/var/log/messages
19
20# The authpriv file has restricted access.
21authpriv.* /var/log/secure
22
23# Log all the mail messages in one place.
24mail.* -/var/log/maillog
25
26
27# Log cron stuff
28cron.* -/var/log/cron
29
30# Everybody gets emergency messages
31*.emerg *
32
33# Save news errors of level crit and higher in a special file.
34uucp,news.crit -/var/log/spooler
35
36# Save boot messages also to boot.log
37local7.* /var/log/boot.log
38
39# Remote Logging (we use TCP for reliable delivery)
40# An on-disk queue is created for this action. If the remote host is
41# down, messages are spooled to disk and sent when it is up again.
42#$WorkDirectory /rsyslog/spool # where to place spool files
43#$ActionQueueFileName uniqName # unique name prefix for spool files
44#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
45#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
46#$ActionQueueType LinkedList # run asynchronously
47#$ActionResumeRetryCount -1 # infinite retries if host is down
48# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
49#*.* @@remote-host:514
50
51
52# ######### Receiving Messages from Remote Hosts ##########
53# TCP Syslog Server:
54# provides TCP syslog reception and GSS-API (if compiled to support it)
55#$ModLoad imtcp.so # load module
56#$InputTCPServerRun 514 # start up TCP listener at port 514
57
58# UDP Syslog Server:
59#$ModLoad imudp.so # provides UDP syslog reception
60#$UDPServerRun 514 # start a UDP syslog server at standard port 514
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb
deleted file mode 100644
index 3a6540d6a..000000000
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require rsyslog.inc
2PR = "${INC_PR}.0"
3
4SRC_URI[md5sum] = "37562d0e71a24938a9ed7f242bd32d35"
5SRC_URI[sha256sum] = "e034b02473fd7e5313522173ec2f6c57e6fbcaec2c6b289edb968b1d64ae3ffd"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
index 4b2935fae..010100405 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
@@ -1,24 +1,32 @@
1DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd" 1DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
2DEPENDS = "zlib" 2DEPENDS = "zlib libestr json-c"
3DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 3DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
4HOMEPAGE = "http://www.rsyslog.com/" 4HOMEPAGE = "http://www.rsyslog.com/"
5LICENSE = "GPLv3" 5LICENSE = "GPLv3"
6LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973" 6LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
7 7
8INC_PR = "r8"
9
10SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ 8SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
11 file://rsyslog.conf" 9 file://initscript \
10"
11
12SRC_URI[md5sum] = "ebcc010a6205c28eb505c0fe862f32c6"
13SRC_URI[sha256sum] = "276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087"
12 14
13inherit autotools pkgconfig systemd 15inherit autotools pkgconfig systemd update-rc.d
14 16
15EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 17EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)} --enable-cached-man-pages"
16 18
17do_install_append() { 19do_install_append() {
18 install -d ${D}/${sysconfdir}/${PN} 20 install -d "${D}${sysconfdir}/init.d"
19 install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf 21 install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/rsyslogd
22 install -m 755 ${S}/platform/redhat/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
20} 23}
21 24
25FILES_${PN} += "${bindir}"
26
27INITSCRIPT_NAME = "rsyslogd"
28INITSCRIPT_PARAMS = "defaults"
29
22CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" 30CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
23 31
24RPROVIDES_${PN} += "${PN}-systemd" 32RPROVIDES_${PN} += "${PN}-systemd"