[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: 674ec4fbbe6745ff3a18e57fcbda464874495538 Author: Maciej Barć gentoo org> AuthorDate: Mon Jun 24 19:26:15 2024 + Commit: Maciej Barć gentoo org> CommitDate: Mon Jun 24 20:08:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674ec4fb app-admin/rsyslog: remove /var/empty/dev/log sock Signed-off-by: Maciej Barć gentoo.org> app-admin/rsyslog/files/50-default-r2.conf | 103 ++ app-admin/rsyslog/files/README.gentoo-r1 | 39 ++ app-admin/rsyslog/rsyslog-8.2404.0-r1.ebuild | 509 +++ 3 files changed, 651 insertions(+) diff --git a/app-admin/rsyslog/files/50-default-r2.conf b/app-admin/rsyslog/files/50-default-r2.conf new file mode 100644 index ..07f27b6820a1 --- /dev/null +++ b/app-admin/rsyslog/files/50-default-r2.conf @@ -0,0 +1,103 @@ +### +### DEFAULT ACTIONS ### +### + +auth,authpriv.* action( + name="action_auth" + type="omfile" + File="/var/log/auth.log" + FileCreateMode="0600" + FileOwner="root" + FileGroup="adm" + Sync="off" +) + +cron.* action( + name="action_cron" + type="omfile" + File="/var/log/cron.log" + FileOwner="root" + FileGroup="adm" +) + +daemon.* action( + name="action_daemon" + type="omfile" + File="/var/log/daemon.log" + FileOwner="root" + FileGroup="adm" +) + +kern.* action( + name="action_kern" + type="omfile" + File="/var/log/kern.log" + FileOwner="root" + FileGroup="adm" +) + +lpr.* action( + name="action_lpr" + type="omfile" + File="/var/log/lpr.log" + FileOwner="root" + FileGroup="adm" +) + +mail.* action( + name="action_mail" + type="omfile" + File="/var/log/mail.log" + FileOwner="root" + FileGroup="adm" +) + +news.* action( + name="action_news" + type="omfile" + File="/var/log/news.log" + FileOwner="root" + FileGroup="adm" +) + +user.* action( + name="action_user" + type="omfile" + File="/var/log/user.log" + FileOwner="root" + FileGroup="adm" +) + +*.=debug;auth,authpriv,news,mail.none action( + name="action_debug" + type="omfile" + File="/var/log/debug.log" + FileOwner="root" + FileGroup="adm" +) + +*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( + name="action_messages" + type="omfile" + File="/var/log/messages" + FileOwner="root" + FileGroup="adm" +) + +# Uncomment the following directive to re-enable the +# deprecated "/var/log/syslog" log file (don't forget to re-enable log +# rotation in "/etc/logrotate.d/rsyslog" if you do that!) +#*.*;auth,authpriv.none action( +# name="action_syslog" +# type="omfile" +# File="/var/log/syslog" +# FileOwner="root" +# FileGroup="adm" +#) + +*.emerg action( + name="action_emerge" + type="omusrmsg" + Users="*" + action.execOnlyOnceEveryInterval="10" +) diff --git a/app-admin/rsyslog/files/README.gentoo-r1 b/app-admin/rsyslog/files/README.gentoo-r1 new file mode 100644 index ..98f63a39cada --- /dev/null +++ b/app-admin/rsyslog/files/README.gentoo-r1 @@ -0,0 +1,39 @@ +Introduction + + +Since rsyslog version 7.6 we are shipping a new default Gentoo +configuration. See bug #501982 to learn more about what we were trying to +achieve by rewriting the entire configuration. + + +Important changes += + +1. "/var/log/syslog" log file is now deprecated + + Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no + longer being written per default. We are considering this file as + deprecated/obsolet for the typical user/system. + The content from this log file is still availble through other + (dedicated) log files, see + + - /var/log/cron.log + - /var/log/daemon.log + - /var/log/mail.log + - /var/log/messages + + If you really need the old "/var/log/syslog" log file, all you have to + do is uncommenting the corresponding configuration directive in + "/etc/rsyslog.d/50-default.conf". + + If you do so, don't forget to re-enable log rotation in + "/etc/logrotate.d/rsyslog", too. + + +2. "/var/empty/dev/log" no longer default + + Before version 8.2404.0-r1 there was an additional input socket in + "/var/empty/dev/log" (default chroot location) in 8.2404.0-r1 that socket + was removed form the default configuration. Users can enable that socket + if they need to on their own but it shouldn't be necessary when running new + versions of openssh. diff --git a/app-admin/rsyslog/rsyslog-8.2404.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2404.0-r1.ebuild new file mode 100644 index ..514cb65782b2 --- /dev/null +++ b/app-admin/rsyslog/rsyslog-8.2404.0-r1.ebuild @@ -0,0 +1,509 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: 1388126a51519fd0a2d1aea3e32499f0938c44f1 Author: Maciej Barć gentoo org> AuthorDate: Mon Feb 13 22:32:08 2023 + Commit: Maciej Barć gentoo org> CommitDate: Mon Feb 13 22:42:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1388126a app-admin/rsyslog: remove configure bashisms Closes: https://bugs.gentoo.org/881381 Signed-off-by: Maciej Barć gentoo.org> .../files/rsyslog-8.2112.0-pr5024-configure.patch | 44 ++ app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild | 2 + app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild | 2 + app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild | 2 + app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild | 7 +++- app-admin/rsyslog/rsyslog-8.2212.0.ebuild | 2 + 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch new file mode 100644 index ..eae9fbc4d024 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2112.0-pr5024-configure.patch @@ -0,0 +1,44 @@ +From e3c750b98564bc66b50ae35e91f5222c441f8b75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Bar=C4=87?= +Date: Wed, 16 Nov 2022 15:17:31 +0100 +Subject: [PATCH] configure.ac: remove bashisms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +replace [[ ]] with test and == with = + +Signed-off-by: Maciej Barć +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3a43681d72..6e66ec904b 100644 +--- a/configure.ac b/configure.ac +@@ -1138,13 +1138,13 @@ AC_ARG_ENABLE(gnutls-tests, + no) enable_gnutls_tests="no" ;; +*) AC_MSG_ERROR(bad value ${enableval} for --enable-gnutls-tests) ;; + esac], +-[if [[ "$enable_gnutls" == "yes" ]]; then ++[if test "x$enable_gnutls" = "xyes"; then + enable_gnutls_tests=yes + else + enable_gnutls_tests=no + fi] + ) +-if [[ "$enable_gnutls_tests" == "yes" ]] && [[ "$enable_gnutls" != "yes" ]]; then ++if test "x$enable_gnutls_tests" = "xyes" && test "x$enable_gnutls" != "xyes"; then + AC_MSG_WARN([gnutls-tests can not be enabled without gnutls support. Disabling gnutls tests...]) + enable_gnutls_tests="no" + fi +@@ -1852,7 +1852,7 @@ AC_ARG_ENABLE(imfile-tests, + esac], + [enable_imfile_tests=yes] + ) +-if [[ "$enable_imfile_tests" == "yes" ]] && [[ "$enable_imfile" != "yes" ]]; then ++if test "x$enable_imfile_tests" = "xyes" && test "x$enable_imfile" != "xyes"; then + AC_MSG_WARN([imfile-tests can not be enabled without imfile support. Disabling imfile tests...]) + enable_imfile_tests="no" + fi diff --git a/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild index 966d7a160de0..dc51fa17b90d 100644 --- a/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2112.0-r1.ebuild @@ -115,6 +115,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild index a3a544366833..db90e08def7a 100644 --- a/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2206.0-r1.ebuild @@ -117,6 +117,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild index 5bb2f9c0d333..47f4429d19fc 100644 --- a/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2208.0-r1.ebuild @@ -117,6 +117,8 @@ fi CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" +PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch ) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild index c8b36f38a08a..fddffc4ef68c 100644 --- a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild @@ -114,11 +114,14 @@ if [[ ${PV} == "" ]]; then BDEPEND+=" >=dev-python/docutils-0.12" fi -PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch ) - CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: 132bceef3c592d8df0463dd0ea101ff24d3d4939 Author: Maciej Barć gentoo org> AuthorDate: Mon Oct 24 15:20:47 2022 + Commit: Maciej Barć gentoo org> CommitDate: Mon Oct 24 15:21:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132bceef app-admin/rsyslog: add hostname log patch Closes: https://bugs.gentoo.org/878121 Signed-off-by: Maciej Barć gentoo.org> .../files/rsyslog-8.2210.0-5004-hostname.patch | 40 ++ ...-8.2210.0.ebuild => rsyslog-8.2210.0-r1.ebuild} | 2 ++ 2 files changed, 42 insertions(+) diff --git a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch new file mode 100644 index ..4f6c6cf944b6 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch @@ -0,0 +1,40 @@ +From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Thu, 20 Oct 2022 18:08:11 +0200 +Subject: [PATCH] core bugfix: local hostname invalid if no global() config + object given + +The local hostname is invalidly set to "[localhost]" on rsyslog startup +if no global() config object is present in rsyslog.conf. Sending a HUP +corrects the hostname. + +This is a regression from ba00a9f25293f + +closes https://github.com/rsyslog/rsyslog/issues/4975, +closes https://github.com/rsyslog/rsyslog/issues/4825 +--- + runtime/glbl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/runtime/glbl.c b/runtime/glbl.c +index 3a9350b903..ed9a307804 100644 +--- a/runtime/glbl.c b/runtime/glbl.c +@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void) + stddbg = -1; + } + ++finalize_it: + /* we have now read the config. We need to query the local host name now +* as it was set by the config. +* +@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void) +* are taken from that queue, the hostname will be adapted. +*/ + queryLocalHostname(); +- +-finalize_it: RETiRet; ++ RETiRet; + } + + diff --git a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2210.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild index 87f42ed5e63c..124a6ec61a3d 100644 --- a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild @@ -114,6 +114,8 @@ if [[ ${PV} == "" ]]; then BDEPEND+=" >=dev-python/docutils-0.12" fi +PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch ) + CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: 1fb5670d27a2b131f998c55dec0d3c53b41ba86e Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Oct 21 15:18:49 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Oct 21 18:08:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb5670d app-admin/rsyslog: skip omfwd_fast_imuxsock when running without dev-libs/liblogging[stdlog] Bug: https://bugs.gentoo.org/819087 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> ...og-8.2110.0-skip-omfwd_fast_imuxsock-test.patch | 29 ++ app-admin/rsyslog/rsyslog-8.2110.0.ebuild | 8 +++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch new file mode 100644 index 000..88b4a6f6c6c --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2110.0-skip-omfwd_fast_imuxsock-test.patch @@ -0,0 +1,29 @@ +From 440fd1d51c5aa7763d3d810b542a7e373a6738eb Mon Sep 17 00:00:00 2001 +From: Michael Biebl +Date: Tue, 19 Oct 2021 23:00:50 +0200 +Subject: [PATCH] testbench: skip omfwd_fast_imuxsock.sh if liblogging-stdlog + is not available + +Fixes #4712 +--- + tests/omfwd_fast_imuxsock.sh | 7 +++ + 1 file changed, 7 insertions(+) + +diff --git a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh +index bb35b58d18..10f9f19c18 100755 +--- a/tests/omfwd_fast_imuxsock.sh b/tests/omfwd_fast_imuxsock.sh +@@ -4,6 +4,13 @@ + . ${srcdir:=.}/diag.sh init + skip_platform "SunOS" "We have no ATOMIC BUILTINS, so OverallQueueSize counting of imdiag is NOT threadsafe and the counting will fail on SunOS" + ++./syslog_caller -fsyslog_inject-l -m0 > /dev/null 2>&1 ++no_liblogging_stdlog=$? ++if [ $no_liblogging_stdlog -ne 0 ];then ++ echo "liblogging-stdlog not available - skipping test" ++ exit 77 ++fi ++ + # export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout" + export NUMMESSAGES=10 + diff --git a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild b/app-admin/rsyslog/rsyslog-8.2110.0.ebuild index 3646a0ea17e..9dab13ad4b6 100644 --- a/app-admin/rsyslog/rsyslog-8.2110.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2110.0.ebuild @@ -97,10 +97,8 @@ RDEPEND=" zeromq? ( >=net-libs/czmq-4:=[drafts] )" -DEPEND="${RDEPEND} - test? ( - >=dev-libs/liblogging-1.0.1[stdlog] - )" + +DEPEND="${RDEPEND}" if [[ ${PV} == "" ]]; then BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" @@ -109,6 +107,8 @@ if [[ ${PV} == "" ]]; then BDEPEND+=" >=dev-python/docutils-0.12" fi +PATCHES=( "${FILESDIR}"/${P}-skip-omfwd_fast_imuxsock-test.patch ) + CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: 6147ad5b6c8e65442bb5da08e6e1e4a4950203b5 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Apr 6 00:15:26 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Apr 6 00:15:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6147ad5b app-admin/rsyslog: fix Py3 failure in diag.sh Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> ...-8.1903.0-add-py3-support-to-omhttp-test.patch} | 0 ...8.1903.0-fix-py3-compatibility-in-diag.sh.patch | 22 ++ app-admin/rsyslog/rsyslog-8.1903.0.ebuild | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch similarity index 100% rename from app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch.patch rename to app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch new file mode 100644 index 000..615bb50bdb9 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch @@ -0,0 +1,22 @@ +From f0847e46c148233b6ab5d6088ca4e1dc664e82a4 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sat, 6 Apr 2019 02:07:51 +0200 +Subject: [PATCH] testbench: fix Python 3 compatibility + +--- + tests/diag.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/diag.sh b/tests/diag.sh +index 5b4b3df46..2926e6ac2 100755 +--- a/tests/diag.sh b/tests/diag.sh +@@ -1334,7 +1334,7 @@ get_inode() { + printf 'FAIL: file "%s" does not exist in get_inode\n' "$1" + error_exit 100 + fi +- python -c 'import os; import stat; print os.lstat("'$1'")[stat.ST_INO]' ++ python -c 'import os; import stat; print(os.lstat("'$1'")[stat.ST_INO])' + } + + diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild index d1896aca472..dcc28922f7b 100644 --- a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild @@ -102,7 +102,8 @@ fi PATCHES=( "${FILESDIR}"/${P}-add-missing-tests.patch - "${FILESDIR}"/${P}-add-py3-support-to-omhttp-test.patch.patch + "${FILESDIR}"/${P}-add-py3-support-to-omhttp-test.patch + "${FILESDIR}"/${P}-fix-py3-compatibility-in-diag.sh.patch ) CONFIG_CHECK="~INOTIFY_USER"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: fef17a8d569a1fc18c54240f6e1b6135f70f2550 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Apr 5 22:42:59 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Apr 5 23:53:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef17a8d app-admin/rsyslog: fix tests with Py3 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> ...03.0-add-py3-support-to-omhttp-test.patch.patch | 83 ++ app-admin/rsyslog/rsyslog-8.1903.0.ebuild | 5 +- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch.patch new file mode 100644 index 000..6600c61666e --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch.patch @@ -0,0 +1,83 @@ +From c82b747eaf96cc77efa530ca5844ba01b91bfc88 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sat, 6 Apr 2019 00:28:54 +0200 +Subject: [PATCH] tests: omhttp: add Python 3 compatibility + +Fixes: https://github.com/rsyslog/rsyslog/issues/3599 +--- + tests/omhttp_server.py | 22 +++--- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/tests/omhttp_server.py b/tests/omhttp_server.py +index 6962138fa..d3fdb3a9a 100644 +--- a/tests/omhttp_server.py b/tests/omhttp_server.py +@@ -36,16 +36,16 @@ def validate_auth(self): + if 'Authorization' not in self.headers: + self.send_response(401) + self.end_headers() +-self.wfile.write('missing "Authorization" header') ++self.wfile.write(b'missing "Authorization" header') + return False + + auth_header = self.headers['Authorization'] + _, b64userpwd = auth_header.split() +-userpwd = base64.b64decode(b64userpwd) ++userpwd = base64.b64decode(b64userpwd).decode('utf-8') + if userpwd != metadata['userpwd']: + self.send_response(401) + self.end_headers() +-self.wfile.write('invalid auth: {0}'.format(userpwd)) ++self.wfile.write(b'invalid auth: {0}'.format(userpwd)) + return False + + return True +@@ -60,16 +60,16 @@ def do_POST(self): + if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']: + self.send_response(400) + self.end_headers() +-self.wfile.write('BAD REQUEST') ++self.wfile.write(b'BAD REQUEST') + return + + if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0: + self.send_response(500) + self.end_headers() +-self.wfile.write('INTERNAL ERROR') ++self.wfile.write(b'INTERNAL ERROR') + return + +-content_length = int(self.headers['Content-Length']) ++content_length = int(self.headers['Content-Length'] or 0) + raw_data = self.rfile.read(content_length) + + if metadata['decompress']: +@@ -79,12 +79,12 @@ def do_POST(self): + + if self.path not in data: + data[self.path] = [] +-data[self.path].append(post_data) ++data[self.path].append(post_data.decode('utf-8')) + +-res = json.dumps({'msg': 'ok'}) ++res = json.dumps({'msg': 'ok'}).encode('utf8') + + self.send_response(200) +-self.send_header('Content-Type', 'application/json') ++self.send_header('Content-Type', 'application/json; charset=utf-8') + self.send_header('Content-Length', len(res)) + self.end_headers() + +@@ -97,10 +97,10 @@ def do_GET(self): + else: + result = [] + +-res = json.dumps(result) ++res = json.dumps(result).encode('utf8') + + self.send_response(200) +-self.send_header('Content-Type', 'application/json') ++self.send_header('Content-Type', 'application/json; charset=utf-8') + self.send_header('Content-Length', len(res)) + self.end_headers() + diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild index 341d02321a0..d1896aca472 100644 --- a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild @@ -100,7 +100,10 @@ if [[ ${PV} == "" ]]; then DEPEND+=" >=dev-python/docutils-0.12" fi -PATCHES=( "${FILESDIR}"/${P}-add-missing-tests.patch ) +PATCHES=( + "${FILESDIR}"/${P}-add-missing-tests.patch + "${FILESDIR}"/${P}-add-py3-support-to-omhttp-test.patch.patch +) CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: cd9eb4e731adfdc7e013c6cea127555f55739f9d Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Nov 3 22:38:47 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Nov 3 22:42:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9eb4e7 app-admin/rsyslog: fix automagic dependency on dev-libs/liblogging Closes: https://bugs.gentoo.org/667836 Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Thomas Deutschmann gentoo.org> ...slog-8.39.0-fix-liblogging_stdlog-linking.patch | 321 + ...slog-8.38.0.ebuild => rsyslog-8.38.0-r1.ebuild} | 1 + app-admin/rsyslog/rsyslog-8.39.0.ebuild| 3 + 3 files changed, 325 insertions(+) diff --git a/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch b/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch new file mode 100644 index 000..6ccf8f0252d --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch @@ -0,0 +1,321 @@ +https://github.com/rsyslog/rsyslog/pull/3240 + +--- a/configure.ac b/configure.ac +@@ -1436,6 +1436,12 @@ fi + AM_CONDITIONAL(ENABLE_KSI_LS12, test x$enable_ksi_ls12 = xyes) + + # liblogging-stdlog support ++# we use liblogging-stdlog inside the testbench, which is why we need to check for it in any case ++PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3, ++ AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]), ++ [AC_MSG_NOTICE([liblogging-stdlog not found, parts of the testbench will not run])] ++) ++ + AC_ARG_ENABLE(liblogging-stdlog, + [AS_HELP_STRING([--enable-liblogging-stdlog],[Enable liblogging-stdlog support @<:@default=no@:>@])], + [case "${enableval}" in +@@ -1445,18 +1451,15 @@ AC_ARG_ENABLE(liblogging-stdlog, + esac], + [enable_liblogging_stdlog=no] + ) ++if test "x$enable_liblogging_stdlog" = "xyes" -a "x$HAVE_LIBLOGGING_STDLOG" != "x1"; then ++ AC_MSG_ERROR(--enable-liblogging-stdlog set but liblogging was not found) ++fi ++AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, [test "x$enable_liblogging_stdlog" = "xyes"]) + if test "x$enable_liblogging_stdlog" = "xyes"; then +- PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3, +- AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]) +- ) ++ AC_MSG_NOTICE(DEBUG: liblogging_stdlog enabled) ++else ++ AC_MSG_NOTICE(DEBUG: liblogging_stdlog disabled) + fi +-AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, test x$enable_liblogging_stdlog = xyes) +- +-# we use liblogging-stdlog inside the testbench, which is why we need to check for it in any case +-PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3, +- AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]), +- [AC_MSG_NOTICE([liblogging-stdlog not found, parts of the testbench will not run])] +-) + + # RFC 3195 support + AC_ARG_ENABLE(rfc3195, +--- a/plugins/imklog/Makefile.am b/plugins/imklog/Makefile.am +@@ -10,6 +10,11 @@ if ENABLE_IMKLOG_LINUX + imklog_la_SOURCES += bsd.c + endif + +-imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) +-imklog_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS) ++imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) ++imklog_la_LDFLAGS = -module -avoid-version + imklog_la_LIBADD = ++ ++if ENABLE_LIBLOGGING_STDLOG ++imklog_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS) ++imklog_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS) ++endif +--- a/plugins/immark/Makefile.am b/plugins/immark/Makefile.am +@@ -1,6 +1,11 @@ + pkglib_LTLIBRARIES = immark.la + + immark_la_SOURCES = immark.c immark.h +-immark_la_CPPFLAGS = $(RSRT_CFLAGS) -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) +-immark_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS) ++immark_la_CPPFLAGS = $(RSRT_CFLAGS) -I$(top_srcdir) $(PTHREADS_CFLAGS) ++immark_la_LDFLAGS = -module -avoid-version + immark_la_LIBADD = ++ ++if ENABLE_LIBLOGGING_STDLOG ++immark_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS) ++immark_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS) ++endif +--- a/plugins/imtcp/Makefile.am b/plugins/imtcp/Makefile.am +@@ -1,6 +1,11 @@ + pkglib_LTLIBRARIES = imtcp.la + + imtcp_la_SOURCES = imtcp.c +-imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) +-imtcp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS) ++imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) ++imtcp_la_LDFLAGS = -module -avoid-version + imtcp_la_LIBADD = ++ ++if ENABLE_LIBLOGGING_STDLOG ++imtcp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS) ++imtcp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS) ++endif +--- a/plugins/imudp/Makefile.am b/plugins/imudp/Makefile.am +@@ -1,6 +1,11 @@ + pkg
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/
commit: a6b83f082a08073c99ad5e8b0a8564fb30083816 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Sep 20 22:36:53 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Sep 20 22:37:15 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b83f08 app-admin/rsyslog: fix omprog-output-capture-mt test when using Py3 Package-Manager: Portage-2.3.49, Repoman-2.3.10 ...-8.38.0-fix-omprog-output-capture-mt-test.patch | 66 ++ app-admin/rsyslog/rsyslog-8.38.0.ebuild| 2 +- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch b/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch new file mode 100644 index 000..c78e0e502d4 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch @@ -0,0 +1,66 @@ +From 0b0a1262f2b401ea16b7d0b36d8254c500cb9d8e Mon Sep 17 00:00:00 2001 +From: Joan Sala +Date: Thu, 20 Sep 2018 22:37:58 +0200 +Subject: [PATCH] testbench: fix incompatibility of one omprog test with + Python3 + +Python3 writes to stderr immediately, and this caused the +captured output to differ with respect to Python2. Simplified +the test to do a single write to stderr. Also a cast to int +was needed when calculating 'numRepeats'. + +closes #3030 +--- + tests/omprog-output-capture-mt.sh | 2 +- + .../testsuites/omprog-output-capture-mt-bin.py | 17 +++-- + 2 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/tests/omprog-output-capture-mt.sh b/tests/omprog-output-capture-mt.sh +index 50f5c6354..080fabd2a 100755 +--- a/tests/omprog-output-capture-mt.sh b/tests/omprog-output-capture-mt.sh +@@ -24,7 +24,7 @@ else + LINE_LENGTH=511 # 512 minus 1 byte (for the newline char) + fi + +-export command_line="/usr/bin/stdbuf -oL -eL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH" ++export command_line="/usr/bin/stdbuf -oL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH" + + check_command_available stdbuf + generate_conf +diff --git a/tests/testsuites/omprog-output-capture-mt-bin.py b/tests/testsuites/omprog-output-capture-mt-bin.py +index 6c81da24b..03097f37b 100755 +--- a/tests/testsuites/omprog-output-capture-mt-bin.py b/tests/testsuites/omprog-output-capture-mt-bin.py +@@ -10,7 +10,7 @@ + logLine = sys.stdin.readline() + while logLine: + logLine = logLine.strip() +-numRepeats = lineLength / len(logLine) ++numRepeats = int(lineLength / len(logLine)) + lineToStdout = (linePrefix + "[stdout] " + logLine*numRepeats)[:lineLength] + lineToStderr = (linePrefix + "[stderr] " + logLine*numRepeats)[:lineLength] + +@@ -22,16 +22,13 @@ + # size of the block buffer is generally greater than PIPE_BUF). + sys.stdout.write(lineToStdout + "\n") + +-# Write to stderr using two writes. Since stderr is unbuffered, each write will be written +-# immediately to the pipe, and this will cause intermingled lines in the output file. +-# However, we avoid this by executing this script with 'stdbuf -eL', which forces line +-# buffering for stderr. We could alternatively do a single write. +-sys.stderr.write(lineToStderr) +-sys.stderr.write("\n") ++# Write to stderr using a single write. Since stderr is unbuffered, each write will be ++# written immediately (and atomically) to the pipe. ++sys.stderr.write(lineToStderr + "\n") + +-# Note: In future versions of Python3, stderr will possibly be line buffered (see +-# https://bugs.python.org/issue13601). +-# Note: When writing to stderr using the Python logging module, it seems that line ++# Note (FTR): In future versions of Python3, stderr will possibly be line buffered (see ++# https://bugs.python.org/issue13601). The previous write will also be atomic in this case. ++# Note (FTR): When writing to stderr using the Python logging module, it seems that line + # buffering is also used (although this could depend on the Python version). + + logLine = sys.stdin.readline() diff --git a/app-admin/rsyslog/rsyslog-8.38.0.ebuild b/app-admin/rsyslog/rsyslog-8.38.0.ebuild index 6df02d0bab4..c8801a0aef2 100644 --- a/app-admin/rsyslog/rsyslog-8.38.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.38.0.ebuild @@ -23,7 +23,7 @@ else doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " - PATCHES=() + PATCHES=( "${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: 0b181b006262ef34a81662783d7a1865e6d848f4 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat May 19 17:44:38 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat May 19 17:44:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b181b00 app-admin/rsyslog: Fix mmkubernetes test Package-Manager: Portage-2.3.38, Repoman-2.3.9 .../8-stable/rsyslog-8.35.0-fix-issue2726.patch| 41 ++ app-admin/rsyslog/rsyslog-8.35.0.ebuild| 5 ++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch new file mode 100644 index 000..eaec239c383 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch @@ -0,0 +1,41 @@ +From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001 +From: Rich Megginson +Date: Thu, 17 May 2018 18:38:25 -0600 +Subject: [PATCH] mmkubernetes test python must encode response + +https://github.com/rsyslog/rsyslog/issues/2721 +Was not working on python3 - must use `encode()` to convert the +string to a `bytes` object. +Also run the server with python -u to make sure we get the log +output from the kubernetes test server. +--- + tests/mmkubernetes-basic.sh | 2 +- + tests/mmkubernetes_test_server.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh +index 0bbfd08ca..d320c343f 100755 +--- a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh +@@ -4,7 +4,7 @@ + . $srcdir/diag.sh init + + testsrv=mmk8s-test-server +-python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 & ++python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 & + BGPROCESS=$! + . $srcdir/diag.sh wait-startup $testsrv + echo background mmkubernetes_test_server.py process id is $BGPROCESS +diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py +index 0de215603..24f4e1b0e 100644 +--- a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py +@@ -104,7 +104,7 @@ def do_GET(self): + self.log_error(resp) + self.send_response(status) + self.end_headers() +-self.wfile.write(json.dumps(json.loads(resp), separators=(',',':'))) ++self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode()) + + port = int(sys.argv[1]) + diff --git a/app-admin/rsyslog/rsyslog-8.35.0.ebuild b/app-admin/rsyslog/rsyslog-8.35.0.ebuild index b225c3969c6..6c81d3b33a1 100644 --- a/app-admin/rsyslog/rsyslog-8.35.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.35.0.ebuild @@ -48,7 +48,10 @@ else doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " - PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch ) + PATCHES=( + "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch + "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch + ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: ff84bcd39bf6347e772341dbb55fccf084f1da0f Author: Thomas Deutschmann gentoo org> AuthorDate: Wed May 16 23:11:40 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed May 16 23:11:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff84bcd3 app-admin/rsyslog: Bump to v8.35.0 Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-admin/rsyslog/Manifest | 2 + .../8-stable/rsyslog-8.35.0-fix-issue2719.patch| 241 +++ app-admin/rsyslog/rsyslog-8.35.0.ebuild| 464 + 3 files changed, 707 insertions(+) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 7818558481f..fe8ef0c9003 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -2,7 +2,9 @@ DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d8 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0 DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e +DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5 DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 +DIST rsyslog-docs-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch new file mode 100644 index 000..8996acd27e8 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch @@ -0,0 +1,241 @@ +Add missing files for mmkubernetes tests + +Upstream bug: https://github.com/rsyslog/rsyslog/pull/2719 + +--- /dev/null b/tests/mmkubernetes-basic.out.json +@@ -0,0 +1,110 @@ ++[{ ++ "kubernetes": { ++"namespace_id": "namespace-name2-id", ++"namespace_labels": { ++ "label_1_key": "label 1 value", ++ "label_with_empty_value": "", ++ "label_2_key": "label 2 value" ++}, ++"creation_timestamp": "2018-04-09T21:56:39Z", ++"pod_id": "pod-name2-id", ++"labels": { ++ "custom_label": "pod-name2-label-value", ++ "deploymentconfig": "pod-name2-dc", ++ "component": "pod-name2-component", ++ "label_with_empty_value": "", ++ "deployment": "pod-name2-deployment" ++}, ++"pod_name": "pod-name2", ++"namespace_name": "namespace-name2", ++"container_name": "container-name2", ++"master_url": "http://localhost:18443"; ++ }, ++ "docker": { ++"container_id": "id2"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: 0103e8a3df3a22408e0987b12aab01fac47eae62 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Apr 4 01:11:18 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Apr 4 01:50:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0103e8a3 app-admin/rsyslog: Cleanup old Package-Manager: Portage-2.3.26, Repoman-2.3.7 app-admin/rsyslog/Manifest | 16 - ...og-8.24.0-fix-tcpflood-without-librelp-r1.patch | 160 .../rsyslog-8.26.0-fix-zmq3-format-security.patch | 39 -- ...hostname-detection-when-getaddrinfo-fails.patch | 27 -- .../rsyslog-8.27.0-fix-librdkafka-detection.patch | 43 -- .../8-stable/rsyslog-8.30.0-fix-kerberos.patch | 22 - app-admin/rsyslog/rsyslog-8.19.0.ebuild| 444 app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild | 448 app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild | 450 app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild | 452 app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild | 456 app-admin/rsyslog/rsyslog-8.28.0.ebuild| 10 +- app-admin/rsyslog/rsyslog-8.29.0.ebuild| 451 app-admin/rsyslog/rsyslog-8.30.0.ebuild| 451 app-admin/rsyslog/rsyslog-8.31.0.ebuild| 457 - app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild | 6 +- app-admin/rsyslog/rsyslog-8.33.1.ebuild| 6 +- 17 files changed, 11 insertions(+), 3927 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index fec19775007..7818558481f 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,24 +1,8 @@ -DIST rsyslog-8.19.0.tar.gz 2279714 BLAKE2B ae736b72e00ba6ba338476d8fc349f2b958f0c8f8b08417ed6cc192fcb17182f4c95018fbe973355b90833fab723211d653f4ac2a0fe9ef385ebe6d34251e4de SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 -DIST rsyslog-8.24.0.tar.gz 2374240 BLAKE2B a708ed52dcc0182acbfb6d7adee8f1670c60e65e87b2240f88330622b515dbe1cc45a2bb3233cb630be4658b8cae394bab7839167808dd41d75632c76932a77e SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d -DIST rsyslog-8.25.0.tar.gz 2386720 BLAKE2B 192f0084b0aa9588606c458494634d6f1445598371de4ce160ade647b44abdbd6456125060f46fc62bbaa8f981c31247a91b8dedd41f89e83a4ee021c9828dad SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f -DIST rsyslog-8.26.0.tar.gz 2393148 BLAKE2B 660853aae1f0853b0df66755cb64c569692b849816b92d41421c3650502eab069163d65445fe49e7c005a7bba9ead6cfe36b125a715b4fd8cd24a78dae7d2484 SHA512 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 -DIST rsyslog-8.27.0.tar.gz 2435123 BLAKE2B ebd95d5995d604a16495c2c760bfc65348a2b696a2aec838ba06d2eac379627d2b8495f03177aa8813d012d6163073cde71d442a63fe2da173bdcb55c90f458a SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1 -DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 -DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 -DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: 194b8b0b4b291c65ce55cce7283a7e6329dd3152 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Apr 4 01:05:39 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Apr 4 01:50:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194b8b0b app-admin/rsyslog: Bump to v8.34.0 Ebuild changes: === - New mmkubernetes module added. - New fmhttp module added. Package-Manager: Portage-2.3.26, Repoman-2.3.7 app-admin/rsyslog/Manifest | 2 + .../8-stable/rsyslog-8.34.0-fix-issue2612.patch| 13 + app-admin/rsyslog/metadata.xml | 1 + app-admin/rsyslog/rsyslog-8.34.0.ebuild| 464 + 4 files changed, 480 insertions(+) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 1aed447abe5..fec19775007 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -9,6 +9,7 @@ DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9 DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0 +DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 @@ -20,3 +21,4 @@ DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5 +DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch new file mode 100644 index 000..4e9e566e84c --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch @@ -0,0 +1,13 @@ +https://github.com/rsyslog/rsyslog/issues/2612 + +--- a/configure.ac +
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: d15a6d9a7f78fda28c89d09d426f2f0ae440aea0 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Feb 20 20:38:36 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Feb 20 20:38:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15a6d9a app-admin/rsyslog: Bump to v8.33.0 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-admin/rsyslog/Manifest | 2 + .../8-stable/rsyslog-8.33.0-missing-files.patch| 80 app-admin/rsyslog/rsyslog-8.33.0.ebuild| 459 + 3 files changed, 541 insertions(+) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 1c2e73a510a..7d39f2c0d64 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -8,6 +8,7 @@ DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac +DIST rsyslog-8.33.0.tar.gz 2487783 BLAKE2B 2bb38007ee911ee3198818968053fd2ed97cd962d0761c4bc9be571d95eda9bdfd63dae4b8b724dbb5d87cbcbacfdeff5ed2529342af9678b064f2e2b1422cc6 SHA512 b0fd0c5976325bee9b29534c6f6dfad2f70d22e2fc4a7d5f28563116b7360290c7e31aa77ee5ecdf25e726b45d03899b00e4d653d0954284b88e8be918e0f333 DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 @@ -18,3 +19,4 @@ DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf51242 DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce +DIST rsyslog-docs-8.33.0.tar.gz 6770247 BLAKE2B e850ed0cc0c61c1d97c488b37034a0ce56d6fb41f324c4de4c56cbd13a5157ad35fa34062cc883ffdf1ad2d08b764490dbfd04c03571a3e549f28adba97e46e9 SHA512 fd1e21ce5b7e69058273e9232b682541faee21554fb83e3c1c6f4b88cc21ce00e56e199eb0e0a554b1290fbc456f989f65632cf94653005e0c25e311dedb6733 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch new file mode 100644 index 000..9b0b24e8957 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch @@ -0,0 +1,80 @@ +https://github.com/rsyslog/rsyslog/issues/2493 + +--- /dev/null b/tests/omstdout-basic.sh +@@ -0,0 +1,27 @@ ++#!/bin/bash ++# add 2016-11-22 by Pascal Withopf, released under ASL 2.0 ++. $srcdir/diag.sh init ++. $src
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: e49658404784a043f47f3d9dcb27938b244d33cb Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Feb 9 14:25:29 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 9 14:25:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4965840 app-admin/rsyslog: Fix building without net-misc/curl Closes: https://bugs.gentoo.org/646262 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --force ...slog-8.32.0-fix-building-without-curl-r2.patch} | 61 +- ...g-8.32.0-r1.ebuild => rsyslog-8.32.0-r2.ebuild} | 2 +- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch similarity index 62% rename from app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch rename to app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch index 2706b4b581a..23a189d0309 100644 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch @@ -1,19 +1,10 @@ -https://github.com/rsyslog/rsyslog/pull/2378 +https://github.com/rsyslog/rsyslog/commit/d9475f133e3c79875a7c4ccd92038b7123c1f155 +https://github.com/rsyslog/rsyslog/commit/468eeb79b8da91fb71dfef6bfb25476b2a37f446 +https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e168 a/configure.ac -+++ b/configure.ac -@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then - ) - fi - -+AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes") -+ - # klog - AC_ARG_ENABLE(klog, - [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])], --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c -@@ -1935,6 +1935,7 @@ done: +@@ -1935,6 +1935,7 @@ num2ipv4(struct svar *__restrict__ const sourceVal) { return(estr); } @@ -21,7 +12,7 @@ https://github.com/rsyslog/rsyslog/pull/2378 /* curl callback for doFunc_http_request */ static size_t curlResult(void *ptr, size_t size, size_t nmemb, void *userdata) -@@ -2010,6 +2011,7 @@ finalize_it: +@@ -2010,6 +2011,7 @@ doFunc_http_request(struct cnffunc *__restrict__ const func, } RETiRet; } @@ -46,6 +37,19 @@ https://github.com/rsyslog/rsyslog/pull/2378 break; default: if(Debug) { + +--- a/configure.ac b/configure.ac +@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then + ) + fi + ++AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes") ++ + # klog + AC_ARG_ENABLE(klog, + [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])], + --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -226,7 +226,6 @@ TESTS += \ @@ -88,3 +92,32 @@ https://github.com/rsyslog/rsyslog/pull/2378 endif # HAVE_VALGRIND if ENABLE_ROOT_TESTS + +--- a/grammar/Makefile.am b/grammar/Makefile.am +@@ -12,8 +12,11 @@ libgrammar_la_SOURCES = \ + parserif.h \ + grammar.h + libgrammar_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) +-#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS) +-libgrammar_la_LIBADD = $(CURL_LIBS) ++libgrammar_la_LIBADD = ++if ENABLE_LIBCURL ++libgrammar_la_CPPFLAGS += $(CURL_CFLAGS) ++libgrammar_la_LIBADD += $(CURL_LIBS) ++endif + + #testdriver_SOURCES = testdriver.c libgrammar.la + #testdriver_CPPFLAGS = $(RSRT_CFLAGS) + +--- a/plugins/omelasticsearch/Makefile.am b/plugins/omelasticsearch/Makefile.am +@@ -1,7 +1,7 @@ + pkglib_LTLIBRARIES = omelasticsearch.la + + omelasticsearch_la_SOURCES = omelasticsearch.c +-omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) ++omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(CURL_CFLAGS) + omelasticsearch_la_LDFLAGS = -module -avoid-version + omelasticsearch_la_LIBADD = $(CURL_LIBS) $(LIBM) + diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild rename to app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild index 38c0e9447e8..71638d76e21 100644 --- a/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild @@ -48,7 +48,7 @@ else doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " - PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r1.patch ) + PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r2.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0"
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: ca146e0fe852b1d417f5eaae2922204d290b22b6 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Mar 21 14:39:30 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Mar 21 14:39:53 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca146e0f app-admin/rsyslog: Fix building without librelp (bug #613264) Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --force ...yslog-8.24.0-fix-tcpflood-without-librelp.patch | 152 + ...slog-8.24.0.ebuild => rsyslog-8.24.0-r1.ebuild} | 2 + ...slog-8.25.0.ebuild => rsyslog-8.25.0-r1.ebuild} | 2 + 3 files changed, 156 insertions(+) diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch new file mode 100644 index 000..c3287068f0c --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch @@ -0,0 +1,152 @@ +From 73e3b7ab2f8a3974d31844b492ad02d61ed5727f Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards +Date: Thu, 23 Feb 2017 13:18:44 +0100 +Subject: [PATCH] testbench: tcpflood failed to build if RELP support was + disabled + +closes https://github.com/rsyslog/rsyslog/issues/1426 +--- + tests/tcpflood.c | 24 +--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/tests/tcpflood.c b/tests/tcpflood.c +index c500a51..aa79794 100644 +--- a/tests/tcpflood.c b/tests/tcpflood.c +@@ -149,7 +149,9 @@ static int numMsgsToSend = 1; /* number of messages to send */ + static int numConnections = 1; /* number of connections to create */ + static int softLimitConnections = 0; /* soft connection limit, see -c option description */ + static int *sockArray; /* array of sockets to use */ ++#ifdef ENABLE_RELP + static relpClt_t **relpCltArray; /* array of sockets to use */ ++#endif + static int msgNum = 0;/* initial message number to start with */ + static int bShowProgress = 1; /* show progress messages */ + static int bSilent = 0; /* completely silent operation */ +@@ -216,6 +218,7 @@ static void initTLSSess(int); + static int sendTLS(int i, char *buf, int lenBuf); + static void closeTLSSess(int __attribute__((unused)) i); + ++#ifdef ENABLE_RELP + /* RELP subsystem */ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wformat-security" +@@ -235,6 +238,7 @@ initRELP_PLAIN(void) + CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog", + eRelpCmdState_Required)); + } ++#endif /* #ifdef ENABLE_RELP */ + + /* prepare send subsystem for UDP send */ + static int +@@ -273,6 +277,7 @@ int openConn(int *fd, const int connIdx) + port = targetPort; + } + if(transport == TP_RELP_PLAIN) { ++ #ifdef ENABLE_RELP + relpRetVal relp_r; + relpClt_t *relpClt; + char relpPort[16]; +@@ -286,6 +291,7 @@ int openConn(int *fd, const int connIdx) + return(1); + } + *fd = 1; /* mimic "all ok" state */ ++ #endif + } else { /* TCP, with or without TLS */ + if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) { + perror("\nsocket()"); +@@ -336,8 +342,10 @@ int openConnections(void) + sessArray = calloc(numConnections, sizeof(gnutls_session_t)); + # endif + sockArray = calloc(numConnections, sizeof(int)); ++ #ifdef ENABLE_RELP + if(transport == TP_RELP_PLAIN) + relpCltArray = calloc(numConnections, sizeof(relpClt_t*)); ++ #endif + for(i = 0 ; i < numConnections ; ++i) { + if(i % 10 == 0) { + if(bShowProgress) +@@ -356,8 +364,10 @@ int openConnections(void) +* at least something. +*/ + if(transport == TP_RELP_PLAIN) { ++ #ifdef ENABLE_RELP + CHKRELP(relpEngineCltDestruct(pRelpEngine, + relpCltArray+i)); ++ #endif + } else { /* TCP and TLS modes */ + if(transport == TP_TLS) + closeTLSSess(i); +@@ -403,14 +413,13 @@ void closeConnections(void) + + if(bShowProgress) + if(write(1, " close connections", sizeof(" close connections")-1)){} +- //if(transport == TP_RELP_PLAIN) +- //sleep(10);/* we need to let librelp settle a bit */ + for(i = 0 ; i < numConnections ; ++i) { + if(i % 10 == 0 && bShowProgress) { + lenMsg = sprintf(msgBuf, "\r%5.5d", i); +
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: b78301c462346539a72f29020eda566c3549be5f Author: Thomas D whissi de> AuthorDate: Fri Feb 5 15:05:05 2016 + Commit: Lars Wendler gentoo org> CommitDate: Fri Feb 5 15:24:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b78301c4 app-admin/rsyslog: Bump to version 8.16.0 Signed-off-by: Lars Wendler gentoo.org> app-admin/rsyslog/Manifest | 2 + 15.0-imfile-readmode2-vg-test-workaround.patch | 30 ++ ...8.15.0-imtcp-tls-basic-vg-test-workaround.patch | 12 + ...rsyslog-8.16.0-fix-queue-engine-issue-262.patch | 51 +++ app-admin/rsyslog/rsyslog-8.16.0.ebuild| 432 + 5 files changed, 527 insertions(+) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index fcdb484..66ab944 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,6 +1,8 @@ DIST rsyslog-8.12.0.tar.gz 2091620 SHA256 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20 SHA512 7735f15f8a843ee41530d180d00ab3a6854ef28e9036db7ecfe0525549b3ab2b184149c2edc4553240dd4e3003ee12ebcdf47719669daa3cc6915d5a30888c72 WHIRLPOOL b96faab541fd8b53558738b7bd71d3b6acc7d66da4fb0552d781f0e214c00a11b4a74464f7b9c9a1d62bc359658f93d380a490ee78afc11d1702975a6edc6823 DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7 +DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc WHIRLPOOL 809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead +DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0 WHIRLPOOL ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch new file mode 100644 index 000..99e2d36 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch @@ -0,0 +1,30 @@ +Workaround for https://github.com/rsyslog/rsyslog/issues/746 + +--- rsyslog-/tests/imfile-readmode2-vg.sh 2016-01-20 12:35:20.368238216 +0100 rsyslog-/tests/imfile-readmode2-vg.sh 2016-01-20 12:36:14.357031527 +0100 +@@ -11,7 +11,7 @@ echo 'msgnum:0 + echo 'msgnum:2' >> rsyslog.input + + # sleep a little to give rsyslog a chance to begin processing +-sleep 1 ++sleep 10 + + # write some more lines (see https://github.com/rsyslog/rsyslog/issues/144) + echo 'msgnum:3 +@@ -19,14 +19,14 @@ echo 'msgnum:3 + echo 'msgnum:5' >> rsyslog.input # this one shouldn't be written to t
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: b2fc2901e8b2e08a19e8b2eca4b29c86e1a93e9b Author: Lars Wendler gentoo org> AuthorDate: Fri Oct 9 14:10:12 2015 + Commit: Lars Wendler gentoo org> CommitDate: Fri Oct 9 14:12:02 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2fc2901 app-admin/rsyslog: Bump to version 8.13.0 Package-Manager: portage-2.2.23 Signed-off-by: Lars Wendler gentoo.org> app-admin/rsyslog/Manifest | 2 + .../50-rsyslog-8.12.0-fix-re_extract.patch | 130 +++ ...rsyslog-8.13.0-lookup-table-reload-bugfix.patch | 141 +++ app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 | 30 ++ app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 | 73 app-admin/rsyslog/rsyslog-8.13.0.ebuild| 423 + 6 files changed, 799 insertions(+) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index d8ba9f1..3af7b48 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,6 +1,8 @@ DIST rsyslog-8.12.0.tar.gz 2091620 SHA256 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20 SHA512 7735f15f8a843ee41530d180d00ab3a6854ef28e9036db7ecfe0525549b3ab2b184149c2edc4553240dd4e3003ee12ebcdf47719669daa3cc6915d5a30888c72 WHIRLPOOL b96faab541fd8b53558738b7bd71d3b6acc7d66da4fb0552d781f0e214c00a11b4a74464f7b9c9a1d62bc359658f93d380a490ee78afc11d1702975a6edc6823 +DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7 DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 9422cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133 DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b +DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0 diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch new file mode 100644 index 000..f049d53 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch @@ -0,0 +1,130 @@ +From a88d67df6e55e0a5f484f6aff8aa6e9813c5c31a Mon Sep 17 00:00:00 2001 +From: Janmejay Singh +Date: Mon, 28 Sep 2015 20:38:05 +0530 +Subject: [PATCH] fixed re_extract bug, which fails the regex-compile for + extract as fn-init fails when fn does not have exactly 2 args + + +Fixes: https://github.com/rsyslog/rsyslog/issues/499 + +--- + grammar/rainerscript.c | 2 +- + tests/Makefile.am| 6 ++ + tests/rscript_re_extract.sh | 14 ++ + tests/rscript_re_match.sh| 1
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: 69cb945b638721fddbc41d4940caf7672d959504 Author: Lars Wendler gentoo org> AuthorDate: Fri Oct 9 14:11:13 2015 + Commit: Lars Wendler gentoo org> CommitDate: Fri Oct 9 14:12:04 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cb945b app-admin/rsyslog: Removed old. Package-Manager: portage-2.2.23 Signed-off-by: Lars Wendler gentoo.org> app-admin/rsyslog/Manifest | 2 - .../rsyslog/files/8-stable/10-respect_CFLAGS.patch | 11 - app-admin/rsyslog/rsyslog-8.12.0.ebuild| 414 - app-admin/rsyslog/rsyslog-8.9.0.ebuild | 409 4 files changed, 836 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 3af7b48..fcdb484 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,8 +1,6 @@ DIST rsyslog-8.12.0.tar.gz 2091620 SHA256 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20 SHA512 7735f15f8a843ee41530d180d00ab3a6854ef28e9036db7ecfe0525549b3ab2b184149c2edc4553240dd4e3003ee12ebcdf47719669daa3cc6915d5a30888c72 WHIRLPOOL b96faab541fd8b53558738b7bd71d3b6acc7d66da4fb0552d781f0e214c00a11b4a74464f7b9c9a1d62bc359658f93d380a490ee78afc11d1702975a6edc6823 DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7 DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d -DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 9422cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133 DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c -DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0 diff --git a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch deleted file mode 100644 index c74279b..000 --- a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ configure.old 2014-10-02 15:41:45.692471540 +0200 -+++ configure.ac 2014-10-02 15:42:11.122743182 +0200 -@@ -835,7 +835,7 @@ - AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes) - RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)" - if test "$GCC" = "yes" --then RSRT_CFLAGS="$RSRT_CFLAGS -W -std=c99 -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g" -+then RSRT_CFLAGS="$RSRT_CFLAGS -W -std=c99 -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute" - fi - RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)" - AC_SUBST(RSRT_CFLAGS1) diff --git a/app-admin/rsyslog/rsyslog-8.12.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
commit: 12334d143c50f9275df381eeccab98a9ea498d97 Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 18 15:18:12 2015 + Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 18 15:18:12 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12334d14 app-admin/rsyslog: Version bump. Thanks to Whissi for providing the ebuild and to Ultrabug for kindly permitting the commit. Package-Manager: portage-2.2.20.1 Signed-off-by: Lars Wendler gentoo.org> app-admin/rsyslog/Manifest | 2 + .../40-rsyslog-fix-parallel-build-issue-479.patch | 25 ++ app-admin/rsyslog/rsyslog-8.12.0.ebuild| 414 + 3 files changed, 441 insertions(+) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index c2219c3..d8ba9f1 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,4 +1,6 @@ +DIST rsyslog-8.12.0.tar.gz 2091620 SHA256 466bfeac8296e89de1eb9029880998ba7b5fc25694143197bb47167df6cb7e20 SHA512 7735f15f8a843ee41530d180d00ab3a6854ef28e9036db7ecfe0525549b3ab2b184149c2edc4553240dd4e3003ee12ebcdf47719669daa3cc6915d5a30888c72 WHIRLPOOL b96faab541fd8b53558738b7bd71d3b6acc7d66da4fb0552d781f0e214c00a11b4a74464f7b9c9a1d62bc359658f93d380a490ee78afc11d1702975a6edc6823 DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 9422cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133 +DIST rsyslog-doc-8.12.0.tar.gz 4212441 SHA256 f88517c1e5ae3a8ba129d531b5b4bb79e80f70898a8a5b72a0abd7a8a0feb8f0 SHA512 a1b3907e1a474076dd11e76b267eff35dadbd5abaf3ab802a187ce045eecc6028c854ed8e661650e10c74c79408c6ded341d16af94a05f10c529faaa8f606afb WHIRLPOOL aa21ea93536bab4c9761bdbe2e6c67f650bf181f64cb7c4a78c646d319a5472895be2a118c90d7c42548575b76f62e5dc6b0c4103cf373ab9e3704a6999c6c1b DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0 diff --git a/app-admin/rsyslog/files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch b/app-admin/rsyslog/files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch new file mode 100644 index 000..831e9ed --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch @@ -0,0 +1,25 @@ +From ac3e7d316efee0b7a2b953aebdd3268f2b7c31c5 Mon Sep 17 00:00:00 2001 +From: Thomas D. +Date: Thu, 13 Aug 2015 17:50:36 +0200 +Fix: Parallel build issue "cannot find ../runtime/.libs/librsyslog.a: No such file or directory" (Fixes #479) + +This issue was introduced with commit fb4fd2ddd2f08380ad65a8cafc5f124890b136ad. +--- + runtime/Makefile.am | 1 + + 1 files changed, 1 insertions(+) + +diff --git a/runtime/Makefile.am b/runtime/Makefile.am +index 1f3e350..d02ed4f 100644 +--- a/runtime/Makefile.am b/runtime/Makefile.am +@@ -186,6 +186,7 @@ if ENABLE_LIBGCRYPT +libgcry_la_SOURCES = libgcry.c libgcry_common.c libgcry.h +libgcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS) +pkglib_LTLIBRARIES += lmcry_gcry.la ++ lmcry_gcry_la_DEPENDENCIES = librsyslog.la +lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h +lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS) +lmcry_gcry_la_LDFLAGS = -module -avoid-version \ +-- +2.5.0 + diff --git a/app-admin/rsyslog/rsyslog-8.12.0.ebuild b/app-admin/rsyslog/rsyslog-8.12.0.ebuild new file mode 100644 index 000..81f79c4 --- /dev/null +++ b/app-admin/rsyslog/rsyslog-8.12.0.ebuild @@ -0,0 +1,414 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils eutils systemd + +DESCRIPTION="An enhanced