summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/rsyslog/rsyslog
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
commit1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch)
treea21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-extended/rsyslog/rsyslog
downloadmeta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog/rsyslog')
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/initscript118
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch96
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch28
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf84
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate39
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest3
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch48
7 files changed, 416 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/initscript b/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
new file mode 100644
index 000000000..7a8f8f991
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
@@ -0,0 +1,118 @@
1#! /bin/sh
2#
3# This is an init script for openembedded
4# Copy it to /etc/init.d/rsyslog and type
5# > update-rc.d rsyslog defaults 5
6#
7
8PATH=/sbin:/usr/sbin:/bin:/usr/bin
9NAME=rsyslog
10RSYSLOGD=rsyslogd
11RSYSLOGD_BIN=/usr/sbin/rsyslogd
12RSYSLOGD_OPTIONS=""
13RSYSLOGD_PIDFILE=/var/run/rsyslogd.pid
14SCRIPTNAME=/etc/init.d/$NAME
15# Exit if the package is not installed
16[ -x "$RSYSLOGD_BIN" ] || exit 0
17# Read configuration variable file if it is present
18[ -r /etc/default/$NAME ] && . /etc/default/$NAME
19#
20# Function that starts the daemon/service
21#
22do_start()
23{
24 DAEMON=$1
25 DAEMON_ARGS=$2
26 PIDFILE=$3
27 # Return
28 # 0 if daemon has been started
29 # 1 if daemon could not be started
30 # if daemon had already been started, start-stop-daemon will return 1
31 # so add -o/--oknodo(if nothing is done, exit 0)
32 start-stop-daemon -S --quiet --pidfile $PIDFILE --exec $DAEMON \
33 --oknodo -- $DAEMON_ARGS || return 1
34}
35#
36# Function that stops the daemon/service
37#
38do_stop()
39{
40 NAME=$1
41 PIDFILE=$2
42 # Return
43 # 0 if daemon has been stopped
44 # 1 if daemon was already stopped
45 # 2 if daemon could not be stopped
46 # other if a failure occurred
47 # QUIT/TERM/INT should work here, but they don't ?????
48 start-stop-daemon -K --quiet --signal KILL --pidfile $PIDFILE --name $NAME
49 RETVAL="$?"
50 rm -f $PIDFILE
51 return "$RETVAL"
52}
53#
54# Function that sends a SIGHUP to the daemon/service
55#
56do_reload() {
57 NAME=$1
58 PIDFILE=$2
59 start-stop-daemon -K --signal HUP --quiet --pidfile $PIDFILE --name $NAME
60 return 0
61}
62
63do_status() {
64 NAME=$1
65 PIDFILE=$2
66 # -t: test only but not stop
67 start-stop-daemon -K -t --quiet --pidfile $PIDFILE --name $NAME
68 # exit with status 0 if process is found
69 if [ "$?" = "0" ]; then
70 return 0
71 else
72 return 1
73 fi
74}
75
76case "$1" in
77 start)
78 echo -n "starting $RSYSLOGD ... "
79 do_start "$RSYSLOGD_BIN" "$RSYSLOGD_OPTIONS" "$RSYSLOGD_PIDFILE"
80 case "$?" in
81 0) echo "done" ;;
82 1) echo "failed" ;;
83 esac
84 ;;
85 stop)
86 echo -n "stopping $RSYSLOGD ... "
87 do_stop "$RSYSLOGD" "$RSYSLOGD_PIDFILE"
88 case "$?" in
89 0|1) echo "done" ;;
90 2) echo "failed" ;;
91 esac
92 ;;
93 reload|force-reload)
94 echo -n "reloading $RSYSLOGD ... "
95 do_reload "$RSYSLOGD" "$RSYSLOGD_PIDFILE"
96 echo "done"
97 ;;
98 restart)
99 $0 stop
100 $0 start
101 ;;
102 status)
103 echo -n "status $RSYSLOGD ... "
104 do_status "$RSYSLOGD" "$RSYSLOGD_PIDFILE"
105 if [ "$?" = "0" ]; then
106 echo "running"
107 exit 0
108 else
109 echo "stopped"
110 exit 1
111 fi
112 ;;
113 *)
114 echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload}" >&2
115 exit 3
116 ;;
117esac
118exit 0
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
new file mode 100644
index 000000000..bdcb6e22a
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
@@ -0,0 +1,96 @@
1$MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then
2test cases fall into infinite loop with error message:
3
48062.511110729:4902c480: error: message received is larger than max msg size, we split it
58062.511152265:4902c480: discarding zero-sized message
6
7Update configure to fix it.
8
9Upstream-Status: pending
10
11Kai Kang <kai.kang@windriver.com>
12---
13diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/testsuites/complex1.conf
14--- rsyslog-7.4.4/tests/testsuites/complex1.conf 2013-08-31 00:30:41.000000000 +0800
15+++ rsyslog-7.4.4.new/tests/testsuites/complex1.conf 2013-12-18 14:28:10.644004184 +0800
16@@ -1,7 +1,7 @@
17 # complex test case with multiple actions in gzip mode
18 # rgerhards, 2009-05-22
19-$MaxMessageSize 10k
20 $IncludeConfig diag-common.conf
21+$MaxMessageSize 10k
22
23 $MainMsgQueueTimeoutEnqueue 5000
24
25diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf
26--- rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf 2012-04-04 14:29:55.000000000 +0800
27+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 2013-12-18 14:28:10.645004186 +0800
28@@ -1,7 +1,7 @@
29 # simple async writing test
30 # rgerhards, 2010-03-09
31-$MaxMessageSize 10k
32 $IncludeConfig diag-common.conf
33+$MaxMessageSize 10k
34
35 $ModLoad ../plugins/imtcp/.libs/imtcp
36 $MainMsgQueueTimeoutShutdown 10000
37diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf
38--- rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf 2012-04-04 14:29:55.000000000 +0800
39+++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 2013-12-18 14:28:10.645004186 +0800
40@@ -1,7 +1,7 @@
41 # simple async writing test
42 # rgerhards, 2010-03-09
43-$MaxMessageSize 10k
44 $IncludeConfig diag-common.conf
45+$MaxMessageSize 10k
46
47 $ModLoad ../plugins/imtcp/.libs/imtcp
48 $MainMsgQueueTimeoutShutdown 10000
49diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf
50--- rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf 2013-08-31 00:30:41.000000000 +0800
51+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800
52@@ -1,7 +1,7 @@
53 # simple async writing test
54 # rgerhards, 2010-03-09
55-$MaxMessageSize 10k
56 $IncludeConfig diag-common.conf
57+$MaxMessageSize 10k
58
59 $ModLoad ../plugins/imptcp/.libs/imptcp
60 $MainMsgQueueTimeoutShutdown 10000
61diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf
62--- rsyslog-7.4.4/tests/testsuites/imptcp_large.conf 2013-08-31 00:30:41.000000000 +0800
63+++ rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 2013-12-18 14:28:10.646004189 +0800
64@@ -1,7 +1,7 @@
65 # simple async writing test
66 # rgerhards, 2010-03-09
67-$MaxMessageSize 10k
68 $IncludeConfig diag-common.conf
69+$MaxMessageSize 10k
70
71 $ModLoad ../plugins/imptcp/.libs/imptcp
72 $MainMsgQueueTimeoutShutdown 10000
73diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf
74--- rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf 2013-07-19 20:59:03.000000000 +0800
75+++ rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800
76@@ -1,7 +1,7 @@
77 # simple async writing test
78 # rgerhards, 2010-03-09
79-$MaxMessageSize 10k
80 $IncludeConfig diag-common.conf
81+$MaxMessageSize 10k
82
83 $ModLoad ../plugins/imtcp/.libs/imtcp
84 $MainMsgQueueTimeoutShutdown 10000
85diff -Nru rsyslog-7.4.4/tests/testsuites/wr_large.conf rsyslog-7.4.4.new/tests/testsuites/wr_large.conf
86--- rsyslog-7.4.4/tests/testsuites/wr_large.conf 2012-04-04 14:29:55.000000000 +0800
87+++ rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 2013-12-18 14:28:10.647004190 +0800
88@@ -1,7 +1,7 @@
89 # simple async writing test
90 # rgerhards, 2010-03-09
91-$MaxMessageSize 10k
92 $IncludeConfig diag-common.conf
93+$MaxMessageSize 10k
94
95 $ModLoad ../plugins/imtcp/.libs/imtcp
96 $MainMsgQueueTimeoutShutdown 10000
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch
new file mode 100644
index 000000000..3a16f2649
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch
@@ -0,0 +1,28 @@
1Subject: [PATCH] rsyslog: use serial-tests config needed by ptest
2
3ptest needs buildtest-TESTS and runtest-TESTS targets.
4serial-tests is required to generate those targets.
5
6Upstream-Status: Inappropriate [default automake behavior incompatible with ptest]
7
8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9---
10 configure.ac | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/configure.ac b/configure.ac
14index 1b880f8..0e29742 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -3,7 +3,7 @@
18
19 AC_PREREQ(2.61)
20 AC_INIT([rsyslog],[7.4.4],[rsyslog@lists.adiscon.com])
21-AM_INIT_AUTOMAKE
22+AM_INIT_AUTOMAKE([serial-tests])
23
24 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
25
26--
272.0.0
28
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
new file mode 100644
index 000000000..54f8bb6a5
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
@@ -0,0 +1,84 @@
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# Ported from debian's sysklogd.conf
9
10$ModLoad immark # provides --MARK-- message capability
11$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
12$ModLoad imklog # kernel logging (formerly provided by rklogd)
13
14#
15# Set the default permissions
16#
17$FileCreateMode 0640
18$DirCreateMode 0755
19$Umask 0022
20
21auth,authpriv.* /var/log/auth.log
22*.*;auth,authpriv.none -/var/log/syslog
23cron.* /var/log/cron.log
24daemon.* -/var/log/daemon.log
25kern.* -/var/log/kern.log
26lpr.* -/var/log/lpr.log
27mail.* -/var/log/mail.log
28user.* -/var/log/user.log
29
30#
31# Logging for the mail system. Split it up so that
32# it is easy to write scripts to parse these files.
33#
34mail.info -/var/log/mail.info
35mail.warn -/var/log/mail.warn
36mail.err /var/log/mail.err
37
38# Logging for INN news system
39#
40news.crit /var/log/news.crit
41news.err /var/log/news.err
42news.notice -/var/log/news.notice
43
44#
45# Some `catch-all' logfiles.
46#
47*.=debug;\
48 auth,authpriv.none;\
49 news.none;mail.none -/var/log/debug
50*.=info;*.=notice;*.=warn;\
51 auth,authpriv.none;\
52 cron,daemon.none;\
53 mail,news.none -/var/log/messages
54
55#
56# Emergencies are sent to everybody logged in.
57#
58*.emerg :omusrmsg:*
59
60# Save boot messages also to boot.log
61local7.* /var/log/boot.log
62
63# Remote Logging (we use TCP for reliable delivery)
64# An on-disk queue is created for this action. If the remote host is
65# down, messages are spooled to disk and sent when it is up again.
66#$WorkDirectory /var/spool/rsyslog # where to place spool files
67#$ActionQueueFileName uniqName # unique name prefix for spool files
68$ActionQueueMaxDiskSpace 10m # 1gb space limit (use as much as possible)
69#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
70#$ActionQueueType LinkedList # run asynchronously
71#$ActionResumeRetryCount -1 # infinite retries if host is down
72# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
73#*.* @@remote-host:514
74
75
76# ######### Receiving Messages from Remote Hosts ##########
77# TCP Syslog Server:
78# provides TCP syslog reception and GSS-API (if compiled to support it)
79#$ModLoad imtcp.so # load module
80#$InputTCPServerRun 514 # start up TCP listener at port 514
81
82# UDP Syslog Server:
83#$ModLoad imudp.so # provides UDP syslog reception
84#$UDPServerRun 514 # start a UDP syslog server at standard port 514
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
new file mode 100644
index 000000000..ba1120af4
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
@@ -0,0 +1,39 @@
1# /etc/logrotate.d/rsyslog - Ported from Debian
2
3/var/log/syslog
4{
5 rotate 7
6 daily
7 missingok
8 notifempty
9 delaycompress
10 compress
11 postrotate
12 /etc/init.d/rsyslog reload 2> /dev/null || true
13 endscript
14}
15
16/var/log/mail.info
17/var/log/mail.warn
18/var/log/mail.err
19/var/log/mail.log
20/var/log/daemon.log
21/var/log/kern.log
22/var/log/auth.log
23/var/log/user.log
24/var/log/lpr.log
25/var/log/cron.log
26/var/log/debug
27/var/log/messages
28{
29 rotate 4
30 weekly
31 missingok
32 notifempty
33 compress
34 delaycompress
35 sharedscripts
36 postrotate
37 /etc/init.d/rsyslog reload 2> /dev/null || true
38 endscript
39}
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest
new file mode 100644
index 000000000..38a1d1b72
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest
@@ -0,0 +1,3 @@
1#!/bin/sh
2#
3make -C tests -k runtest-TESTS
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
new file mode 100644
index 000000000..ebc10707c
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
@@ -0,0 +1,48 @@
1From 5c3ba79177f7d1763db33c4358af2af60ff214b7 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Wed, 18 Jun 2014 13:46:52 +0800
4Subject: [PATCH] use pkgconfig to check libgcrypt
5
6Upstream-status: Inappropriate [configuration]
7
8libgcrypt does no longer provide libgcrypt-config, and provide
9*.pc, so we should use pkgconfig to check
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 configure.ac | 19 +------------------
14 1 file changed, 1 insertion(+), 18 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 017116e..1b880f8 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -784,24 +784,7 @@ AC_ARG_ENABLE(libgcrypt,
21 [enable_libgcrypt=yes]
22 )
23 if test "x$enable_libgcrypt" = "xyes"; then
24- AC_CHECK_PROG(
25- [HAVE_LIBGCRYPT_CONFIG],
26- [libgcrypt-config],
27- [yes],,,
28- )
29- if test "x${HAVE_LIBGCRYPT_CONFIG}" != "xyes"; then
30- AC_MSG_FAILURE([libgcrypt-config not found in PATH])
31- fi
32- AC_CHECK_LIB(
33- [gcrypt],
34- [gcry_cipher_open],
35- [LIBGCRYPT_CFLAGS="`libgcrypt-config --cflags`"
36- LIBGCRYPT_LIBS="`libgcrypt-config --libs`"
37- ],
38- [AC_MSG_FAILURE([libgcrypt is missing])],
39- [`libgcrypt-config --libs --cflags`]
40- )
41- AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present])
42+ PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
43 fi
44 AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
45 AC_SUBST(LIBGCRYPT_CFLAGS)
46--
471.7.9.5
48