[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/files/, app-admin/rsyslog/

2018-08-02 Thread Thomas Deutschmann
commit: 8850a1ff90facedd3d077eaf8ac5c32b39fba760
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug  3 00:57:46 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug  3 01:19:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8850a1ff

app-admin/rsyslog: restructure FILESDIR

"8-stable" sub directory is not needed anymore since upstream
has changed release/version schema long time ago (in 2014).

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 .../rsyslog/files/{8-stable => }/50-default-r1.conf  |  0
 app-admin/rsyslog/files/{8-stable => }/README.gentoo |  0
 .../rsyslog-8.35.0-fix-issue2719.patch   |  0
 .../rsyslog-8.35.0-fix-issue2726.patch   |  0
 .../files/{8-stable => }/rsyslog-r1.logrotate|  0
 app-admin/rsyslog/files/{8-stable => }/rsyslog.conf  |  0
 .../rsyslog/files/{8-stable => }/rsyslog.confd-r1|  0
 .../rsyslog/files/{8-stable => }/rsyslog.initd-r1|  2 +-
 app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild   | 20 
 app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild   | 14 ++
 10 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf 
b/app-admin/rsyslog/files/50-default-r1.conf
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/50-default-r1.conf
rename to app-admin/rsyslog/files/50-default-r1.conf

diff --git a/app-admin/rsyslog/files/8-stable/README.gentoo 
b/app-admin/rsyslog/files/README.gentoo
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/README.gentoo
rename to app-admin/rsyslog/files/README.gentoo

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch 
b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch
rename to app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch 
b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
rename to app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch

diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate 
b/app-admin/rsyslog/files/rsyslog-r1.logrotate
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
rename to app-admin/rsyslog/files/rsyslog-r1.logrotate

diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf 
b/app-admin/rsyslog/files/rsyslog.conf
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/rsyslog.conf
rename to app-admin/rsyslog/files/rsyslog.conf

diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 
b/app-admin/rsyslog/files/rsyslog.confd-r1
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
rename to app-admin/rsyslog/files/rsyslog.confd-r1

diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 
b/app-admin/rsyslog/files/rsyslog.initd-r1
similarity index 97%
rename from app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
rename to app-admin/rsyslog/files/rsyslog.initd-r1
index 7d7aa4bc931..f34bacb7511 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
+++ b/app-admin/rsyslog/files/rsyslog.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}

diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild 
b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
index 3ff1c28e0ac..55f6815d83a 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
@@ -9,8 +9,6 @@ inherit autotools eutils linux-info python-any-r1 systemd
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/;
 
-BRANCH="8-stable"
-
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git;
 
@@ -49,8 +47,8 @@ else
"
 
PATCHES=(
-   "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch
-   "${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch
+   "${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch
+   "${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch
)
 fi
 
@@ -183,7 +181,6 @@ src_configure() {
--disable-generate-man-pages
--without-valgrind-testbench
$(use_enable test testbench)
-   $(use_enable curl libcurl)
# Input Plugins without depedencies
--enable-imdiag
--enable-imfile
@@ -221,7 +218,6 @@ src_configure() {
$(use_enable debug)

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2018-08-02 Thread Thomas Deutschmann
commit: 8831b442e3d08fdc39011c1906edfa071a9af219
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug  3 00:44:02 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug  3 01:19:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8831b442

app-admin/rsyslog: drop old

Bug: https://bugs.gentoo.org/627912
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 app-admin/rsyslog/Manifest |   8 -
 app-admin/rsyslog/files/8-stable/50-default.conf   |  95 -
 .../rsyslog-8.27.0-fix-mmnormalize-tests.patch |  23 -
 ...yslog-8.32.0-fix-building-without-curl-r3.patch | 137 --
 .../8-stable/rsyslog-8.34.0-fix-issue2612.patch|  13 -
 app-admin/rsyslog/files/8-stable/rsyslog.logrotate |  37 --
 app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild | 451 
 app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild | 459 
 app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild | 457 
 app-admin/rsyslog/rsyslog-8.34.0.ebuild| 464 -
 10 files changed, 2144 deletions(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 47c54f0481e..a24a8ca250e 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,12 +1,4 @@
-DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 
48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3
 SHA512 
e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
-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-8.36.0.tar.gz 2639477 BLAKE2B 
9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf
 SHA512 
b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
-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
 DIST rsyslog-docs-8.36.0.tar.gz 7570338 BLAKE2B 
031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2018-07-14 Thread Thomas Deutschmann
commit: 4e136ce392501839c48f8ccfd7738f3afe6d8fec
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jul 14 13:51:52 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jul 14 13:52:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e136ce3

app-admin/rsyslog: fix logrotate for systemd users

Closes: https://bugs.gentoo.org/658842
Package-Manager: Portage-2.3.42, Repoman-2.3.9
RepoMan-Options: --force

 .../rsyslog/files/8-stable/rsyslog-r1.logrotate| 45 ++
 ...slog-8.35.0.ebuild => rsyslog-8.35.0-r1.ebuild} |  2 +-
 ...slog-8.36.0.ebuild => rsyslog-8.36.0-r1.ebuild} |  2 +-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate 
b/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
new file mode 100644
index 000..3a92ba37bde
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
@@ -0,0 +1,45 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#  rotate 7
+#  daily
+#  missingok
+#  notifempty
+#  delaycompress
+#  compress
+#  postrotate
+#  if type -p systemctl 2>&1 1>/dev/null && systemctl 
is-system-running 2>&1 1>/dev/null ; then
+#  systemctl kill -s HUP rsyslog.service
+#  else
+#  test -r /run/rsyslogd.pid && kill -HUP $(cat 
/run/rsyslogd.pid) 2>&1 1>/dev/null
+#  fi
+#  endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+   rotate 4
+   weekly
+   missingok
+   notifempty
+   compress
+   delaycompress
+   sharedscripts
+   postrotate
+   if type -p systemctl 2>&1 1>/dev/null && systemctl 
is-system-running 2>&1 1>/dev/null ; then
+   systemctl kill -s HUP rsyslog.service
+   else
+   test -r /run/rsyslogd.pid && kill -HUP $(cat 
/run/rsyslogd.pid) 2>&1 1>/dev/null
+   fi
+   endscript
+}

diff --git a/app-admin/rsyslog/rsyslog-8.35.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.35.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
index c11a69c68de..88d35b15d84 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
@@ -320,7 +320,7 @@ src_install() {
newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
 
insinto /etc/logrotate.d/
-   newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+   newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
 
if use mysql; then
insinto /usr/share/doc/${PF}/scripts/mysql

diff --git a/app-admin/rsyslog/rsyslog-8.36.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.36.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
index 023b88252ce..cf864d50b49 100644
--- a/app-admin/rsyslog/rsyslog-8.36.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
@@ -329,7 +329,7 @@ src_install() {
newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
 
insinto /etc/logrotate.d/
-   newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+   newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
 
if use mysql; then
insinto /usr/share/doc/${PF}/scripts/mysql



[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2018-02-09 Thread Thomas Deutschmann
commit: cd2e1aa22d7d3e899a09d74030bc785fac170d53
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Feb  9 23:16:41 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Feb  9 23:21:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2e1aa2

app-admin/rsyslog: Fix building without net-misc/curl

Previous patch was incomplete and missed a header include.

Closes: https://bugs.gentoo.org/646262
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --force

 ...h => rsyslog-8.32.0-fix-building-without-curl-r3.patch} | 14 ++
 .../{rsyslog-8.32.0-r2.ebuild => rsyslog-8.32.0-r3.ebuild} |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch
 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
similarity index 93%
rename from 
app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch
rename to 
app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
index 23a189d0309..534183a8ca2 100644
--- 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r2.patch
+++ 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
@@ -121,3 +121,17 @@ 
https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e1
  omelasticsearch_la_LDFLAGS = -module -avoid-version
  omelasticsearch_la_LIBADD =  $(CURL_LIBS) $(LIBM)
  
+--- a/grammar/rainerscript.c
 b/grammar/rainerscript.c
+@@ -36,7 +36,11 @@
+ #include 
+ #include 
+ #include 
++
++#ifdef HAVE_LIBCURL
+ #include 
++#endif
++
+ #include "rsyslog.h"
+ #include "rainerscript.h"
+ #include "conf.h"

diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild 
b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild
rename to app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild
index 71638d76e21..33668a1674d 100644
--- a/app-admin/rsyslog/rsyslog-8.32.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r3.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-r2.patch )
+   PATCHES=( 
"${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2018-01-11 Thread Thomas Deutschmann
commit: 4465542779449c4f6a7cdcff384b7f65b60eabfb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 11 17:42:04 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 11 17:42:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44655427

app-admin/rsyslog: Rev bump patch

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...out-curl.patch => rsyslog-8.32.0-fix-building-without-curl-r1.patch} | 2 +-
 app-admin/rsyslog/{rsyslog-8.32.0.ebuild => rsyslog-8.32.0-r1.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl.patch
 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
similarity index 98%
rename from 
app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl.patch
rename to 
app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
index fa2f71939cc..2706b4b581a 100644
--- 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl.patch
+++ 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
@@ -41,7 +41,7 @@ https://github.com/rsyslog/rsyslog/pull/2378
varFreeMembers([0]);
 +#else
 +  LogError(0, RS_RET_INTERNAL_ERROR,
-+  "rainerscript: internal error: HTTP_Fetch not 
supported, not built with libcurl support\n");
++  "rainerscript: internal error: HTTP_Fetch not 
supported, not built with libcurl support");
 +#endif
break;
default:

diff --git a/app-admin/rsyslog/rsyslog-8.32.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.32.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
index 41822ad7cfa..3dc7a42ded1 100644
--- a/app-admin/rsyslog/rsyslog-8.32.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r1.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.patch )
+   PATCHES=( 
"${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r1.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2018-01-11 Thread Thomas Deutschmann
commit: 2f79a874c6a43f1f5497d1eb5cb87c4fabead44c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 11 17:33:23 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 11 17:34:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f79a874

app-admin/rsyslog: Bump to v8.32.0

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/rsyslog/Manifest |   2 +
 .../rsyslog-8.32.0-fix-building-without-curl.patch |  90 
 app-admin/rsyslog/metadata.xml |   2 +-
 app-admin/rsyslog/rsyslog-8.32.0.ebuild| 459 +
 4 files changed, 552 insertions(+), 1 deletion(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index f1197093d3e..1c2e73a510a 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -7,6 +7,7 @@ DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 
48ed55cbf02eca22591c3d1d59db8f956e4d8
 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-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
@@ -16,3 +17,4 @@ DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 
9753b1a48b9d3bb045f2d088de5df0bb
 DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 
18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa
 SHA512 
791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
 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

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl.patch
 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl.patch
new file mode 100644
index 000..fa2f71939cc
--- /dev/null
+++ 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl.patch
@@ -0,0 +1,90 @@
+https://github.com/rsyslog/rsyslog/pull/2378
+
+--- a/configure.ac
 b/configure.ac
+@@ -454,6 +454,8 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-10-17 Thread Thomas Deutschmann
commit: 6541356e4d17cf8c329218c45a8163a73ab02a18
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Oct 17 15:47:57 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Oct 17 16:23:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6541356e

app-admin/rsyslog: Bump to v8.30.0

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 app-admin/rsyslog/Manifest |   2 +
 .../8-stable/rsyslog-8.30.0-fix-kerberos.patch |  22 +
 app-admin/rsyslog/rsyslog-8.30.0.ebuild| 451 +
 3 files changed, 475 insertions(+)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 85d4b4fd005..094d5874001 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -5,6 +5,7 @@ DIST rsyslog-8.26.0.tar.gz 2393148 SHA256 
637d43c4384f8b96dda873a0b8384045f72cb4
 DIST rsyslog-8.27.0.tar.gz 2435123 SHA256 
02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512 
dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753
 WHIRLPOOL 
1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
 DIST rsyslog-8.28.0.tar.gz 2471122 SHA256 
4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e SHA512 
e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
 WHIRLPOOL 
b3c07391b9730498aff9ca30a407bd18d5faea07ec37d389dc59daef595318aa11e66fa153a452f48a55df4a2c15789569b845a831266d702b4801b39856a208
 DIST rsyslog-8.29.0.tar.gz 2447907 SHA256 
220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 SHA512 
6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
 WHIRLPOOL 
e82a07b18481b49a2b41ba2fc40b3d0715ebdfec7508592b09f154c10ce36cf079714683e1deb94f13ebbe20fbe242cd695d547e6dbb23ec6939ccdb67540173
+DIST rsyslog-8.30.0.tar.gz 2468224 SHA256 
dfb9c3efe52ad03ad9f4479699139fb447177049553b6993315f53b668a2251f SHA512 
90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
 WHIRLPOOL 
b965024cd94dbc2e81dedb2ac3fe3c12d82913b83f7d4f3b123ad8e101c14a5ca7eb17d087081a68545584e6d18e0069f779c63ddaad274c9f2e05d860887d0d
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 
f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 
120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 WHIRLPOOL 
fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
 DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 
f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 
b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 WHIRLPOOL 
e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
 DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256 
3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512 
e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
 WHIRLPOOL 
8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756
@@ -12,3 +13,4 @@ DIST rsyslog-docs-8.26.0.tar.gz 4381345 SHA256 
4d3b46e6c06fecbd4100fad118c22569e
 DIST rsyslog-docs-8.27.0.tar.gz 4411093 SHA256 
f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512 
08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c
 WHIRLPOOL 
1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b
 DIST rsyslog-docs-8.28.0.tar.gz 4424901 SHA256 
f6c41f7c3fca369dd28a72133b03693ad5c37252375ecadc6184ff1a954764db SHA512 
c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d
 WHIRLPOOL 
f6636ba7196c689e42651ac9c847b05f3eafdbe87186fad478c47d55f2856e5b200d2871612ca046c6d9c06ad2d80838ad226510ba59a3f2cfe234626ca8c75f
 DIST rsyslog-docs-8.29.0.tar.gz 4473644 SHA256 
ca3f6a11a165221b4e5e189d9b86ea146245d7ad892758ef9c543db73a914663 SHA512 
791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
 WHIRLPOOL 
74f4fccfa14e44a574590110bf3d0591555b6bb0685fd65a575b002e503d61996a593d51dbedbc9ff390d9bef1942d1b3fa55e7eb334a6bf5cabb3c2c9a2e5a1
+DIST rsyslog-docs-8.30.0.tar.gz 4487378 SHA256 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-09-24 Thread Thomas Deutschmann
commit: 2a2a8f96bfc5aeb4d7e70786f14f97b99b060780
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep 24 17:49:24 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep 24 17:49:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2a8f96

app-admin/rsyslog: Run mmnormalize tests only when mmnormalize module was 
actually enabled

Bug: https://bugs.gentoo.org/631246
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 .../rsyslog-8.27.0-fix-mmnormalize-tests.patch | 23 ++
 app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild |  1 +
 app-admin/rsyslog/rsyslog-8.28.0.ebuild|  2 ++
 app-admin/rsyslog/rsyslog-8.29.0.ebuild|  2 ++
 4 files changed, 28 insertions(+)

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
new file mode 100644
index 000..6ef7e642628
--- /dev/null
+++ 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
@@ -0,0 +1,23 @@
+https://github.com/rsyslog/rsyslog/pull/1791
+---
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tests/Makefile.am
 b/tests/Makefile.am
+@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \
+   mmnormalize_processing_test2.sh \
+   mmnormalize_processing_test3.sh \
+   mmnormalize_processing_test4.sh
+-endif
+ 
+ if ENABLE_IMPTCP
+ TESTS +=  \
+@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED
+ TESTS += \
+   mmnormalize_regex.sh
+ endif
++endif
+ 
+ if ENABLE_MMJSONPARSE
+ TESTS += \

diff --git a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild 
b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
index 14c282597e3..129f495b9e7 100644
--- a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
@@ -51,6 +51,7 @@ else

"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch

"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch

"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
+   "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch
)
 fi
 

diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
index 00aaa3c6d18..dc74da9df9b 100644
--- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
@@ -46,6 +46,8 @@ else

http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz
 -> ${MY_FILENAME}
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.27.0-fix-mmnormalize-tests.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"

diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
index f3914443f42..d8b4b91b033 100644
--- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
@@ -46,6 +46,8 @@ else

http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz
 -> ${MY_FILENAME}
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.27.0-fix-mmnormalize-tests.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-08-12 Thread Thomas Deutschmann
commit: c3675fd960dd315ea50f5973ac8541bdfc9709bb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Aug 12 18:20:15 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug 12 18:20:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3675fd9

app-admin/rsyslog: Bump to v8.29.0

Ebuild changes:
===
 - "Name" parameter added to default provided actions (bug #625556)

Gentoo-Bug: https://bugs.gentoo.org/625556
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/rsyslog/Manifest |   2 +
 .../rsyslog/files/8-stable/50-default-r1.conf  | 107 +
 app-admin/rsyslog/rsyslog-8.29.0.ebuild| 449 +
 3 files changed, 558 insertions(+)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 3a17533008e..85d4b4fd005 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -4,9 +4,11 @@ DIST rsyslog-8.25.0.tar.gz 2386720 SHA256 
c756f16a083e5d4081fb9bfb236303a839cdca
 DIST rsyslog-8.26.0.tar.gz 2393148 SHA256 
637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 SHA512 
96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
 WHIRLPOOL 
dc267dfdbbcfe5b5354d200a2e337dada22a0aa943e71998e1462bc23d38bb8e3f2b16162108831f12cfa3eec0d462d40a5e6a598f26b2edcef7c71ad56a1c3f
 DIST rsyslog-8.27.0.tar.gz 2435123 SHA256 
02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512 
dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753
 WHIRLPOOL 
1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
 DIST rsyslog-8.28.0.tar.gz 2471122 SHA256 
4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e SHA512 
e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
 WHIRLPOOL 
b3c07391b9730498aff9ca30a407bd18d5faea07ec37d389dc59daef595318aa11e66fa153a452f48a55df4a2c15789569b845a831266d702b4801b39856a208
+DIST rsyslog-8.29.0.tar.gz 2447907 SHA256 
220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 SHA512 
6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
 WHIRLPOOL 
e82a07b18481b49a2b41ba2fc40b3d0715ebdfec7508592b09f154c10ce36cf079714683e1deb94f13ebbe20fbe242cd695d547e6dbb23ec6939ccdb67540173
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 
f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 
120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 WHIRLPOOL 
fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
 DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 
f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 
b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 WHIRLPOOL 
e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
 DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256 
3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512 
e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
 WHIRLPOOL 
8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756
 DIST rsyslog-docs-8.26.0.tar.gz 4381345 SHA256 
4d3b46e6c06fecbd4100fad118c22569e6b0d23b0f5cfb1fbcf501bfc9d115bb SHA512 
5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8
 WHIRLPOOL 
a01c661bea94a38af755803d385250d8f394064c2f1450c5a8b2b0e9e6879565219c84ded70c40300d2bbf524a30bf152bc5502f65917d757b0552920f6a7cd8
 DIST rsyslog-docs-8.27.0.tar.gz 4411093 SHA256 
f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512 
08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c
 WHIRLPOOL 
1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b
 DIST rsyslog-docs-8.28.0.tar.gz 4424901 SHA256 
f6c41f7c3fca369dd28a72133b03693ad5c37252375ecadc6184ff1a954764db SHA512 
c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d
 WHIRLPOOL 
f6636ba7196c689e42651ac9c847b05f3eafdbe87186fad478c47d55f2856e5b200d2871612ca046c6d9c06ad2d80838ad226510ba59a3f2cfe234626ca8c75f
+DIST rsyslog-docs-8.29.0.tar.gz 4473644 SHA256 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-06-01 Thread Thomas Deutschmann
commit: 7ce43d2ae8bd68ae2c5f6964b26817851ed53cd1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun  1 14:19:26 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun  1 14:19:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ce43d2a

app-admin/rsyslog: Rev bump to fix hostname detection without network

See https://github.com/rsyslog/rsyslog/pull/1595

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 ...hostname-detection-when-getaddrinfo-fails.patch | 27 ++
 ...slog-8.27.0.ebuild => rsyslog-8.27.0-r1.ebuild} |  1 +
 2 files changed, 28 insertions(+)

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
new file mode 100644
index 000..a9470ccf4b6
--- /dev/null
+++ 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
@@ -0,0 +1,27 @@
+From 1a7d3a088969b47798bc1da712ca2772f91a7c02 Mon Sep 17 00:00:00 2001
+From: Jiri Vymazal 
+Date: Wed, 31 May 2017 16:26:56 +0200
+Subject: [PATCH] Ignoring NONAME error from getaddrinfo so we have hostname
+ set even without working network
+
+---
+ runtime/net.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/runtime/net.c b/runtime/net.c
+index 2d8de9429..edffc677a 100644
+--- a/runtime/net.c
 b/runtime/net.c
+@@ -1188,7 +1188,11 @@ getLocalHostname(uchar **ppName)
+   memset(, 0, sizeof(flags));
+   flags.ai_flags = AI_CANONNAME;
+   int error = getaddrinfo((char*)hnbuf, NULL, , );
+-  if (error != 0) {
++  if (error != 0 &&
++  error != EAI_NONAME && error != EAI_AGAIN && error != 
EAI_FAIL) {
++  /* If we get one of errors above, network is probably
++   * not working yet, so we fall back to local hostname 
below
++   */
+   dbgprintf("getaddrinfo: %s\n", gai_strerror(error));
+   ABORT_FINALIZE(RS_RET_IO_ERROR);
+   }

diff --git a/app-admin/rsyslog/rsyslog-8.27.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
similarity index 99%
rename from app-admin/rsyslog/rsyslog-8.27.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
index ef11286bd70..c1791672bd3 100644
--- a/app-admin/rsyslog/rsyslog-8.27.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
@@ -56,6 +56,7 @@ else
PATCHES=(

"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch

"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
+   
"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
)
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-05-17 Thread Thomas Deutschmann
commit: 35b514a4d22485c6a13b683837910370908e62fc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed May 17 22:19:18 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed May 17 22:28:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b514a4

app-admin/rsyslog: Bump to v8.27.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/rsyslog/Manifest |   2 +
 .../rsyslog-8.26.0-fix-zmq3-format-security.patch  |  39 ++
 .../rsyslog-8.27.0-fix-librdkafka-detection.patch  |  43 ++
 app-admin/rsyslog/metadata.xml |   2 +-
 app-admin/rsyslog/rsyslog-8.27.0.ebuild| 460 +
 5 files changed, 545 insertions(+), 1 deletion(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index cfa9d3bb1ef..f4e0a200147 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,7 +2,9 @@ DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 
3379b30f2e6ef05a0f1c7327c73923fa5877a8
 DIST rsyslog-8.24.0.tar.gz 2374240 SHA256 
37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512 
b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
 WHIRLPOOL 
c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df
 DIST rsyslog-8.25.0.tar.gz 2386720 SHA256 
c756f16a083e5d4081fb9bfb236303a839cdca0a2c00017bd770b2e2e9677427 SHA512 
0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f
 WHIRLPOOL 
2c4925fda01e49f95ed3d2f43898cdf8f6d679ace5c2a1d1d330dfc422936ae7751cfefa480359b26d2cb782a8217865336f5e04e65e81ffce565b3388c2ff01
 DIST rsyslog-8.26.0.tar.gz 2393148 SHA256 
637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 SHA512 
96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
 WHIRLPOOL 
dc267dfdbbcfe5b5354d200a2e337dada22a0aa943e71998e1462bc23d38bb8e3f2b16162108831f12cfa3eec0d462d40a5e6a598f26b2edcef7c71ad56a1c3f
+DIST rsyslog-8.27.0.tar.gz 2435123 SHA256 
02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512 
dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753
 WHIRLPOOL 
1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 
f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 
120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 WHIRLPOOL 
fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
 DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 
f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 
b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 WHIRLPOOL 
e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
 DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256 
3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512 
e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
 WHIRLPOOL 
8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756
 DIST rsyslog-docs-8.26.0.tar.gz 4381345 SHA256 
4d3b46e6c06fecbd4100fad118c22569e6b0d23b0f5cfb1fbcf501bfc9d115bb SHA512 
5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8
 WHIRLPOOL 
a01c661bea94a38af755803d385250d8f394064c2f1450c5a8b2b0e9e6879565219c84ded70c40300d2bbf524a30bf152bc5502f65917d757b0552920f6a7cd8
+DIST rsyslog-docs-8.27.0.tar.gz 4411093 SHA256 
f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512 
08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c
 WHIRLPOOL 
1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b

diff --git 
a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
new file mode 100644
index 000..b285798bfe4
--- /dev/null
+++ 
b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
@@ -0,0 +1,39 @@
+--- a/contrib/imzmq3/imzmq3.c
 b/contrib/imzmq3/imzmq3.c
+@@ -403,7 +403,7 @@ static rsRetVal 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-04-01 Thread Thomas Deutschmann
commit: 5526ee34e1764adb6e0f02d35419e78e8db37094
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Apr  1 17:38:50 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Apr  1 17:39:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5526ee34

app-admin/rsyslog: Fix building without librelp (bug #614424)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 ...g-8.24.0-fix-tcpflood-without-librelp-r1.patch} | 60 --
 ...g-8.24.0-r1.ebuild => rsyslog-8.24.0-r2.ebuild} |  2 +-
 ...g-8.25.0-r1.ebuild => rsyslog-8.25.0-r2.ebuild} |  2 +-
 3 files changed, 36 insertions(+), 28 deletions(-)

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-r1.patch
similarity index 75%
rename from 
app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch
rename to 
app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch
index c3287068f0c..a03a6562722 100644
--- 
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-r1.patch
@@ -1,19 +1,27 @@
-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
+Patch to allow building of tcpflood without librelp
 
-closes https://github.com/rsyslog/rsyslog/issues/1426

- tests/tcpflood.c | 24 +---
- 1 file changed, 21 insertions(+), 3 deletions(-)
+Cherry pick of
+https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f
+https://github.com/rsyslog/rsyslog/pull/1493
 
-diff --git a/tests/tcpflood.c b/tests/tcpflood.c
-index c500a51..aa79794 100644
 a/tests/tcpflood.c
+
+Gentoo-Bug: https://bugs.gentoo.org/613264
+Gentoo-Bug: https://bugs.gentoo.org/614424
+
+diff -u b/tests/tcpflood.c b/tests/tcpflood.c
+--- b/tests/tcpflood.c
 +++ b/tests/tcpflood.c
-@@ -149,7 +149,9 @@ static int numMsgsToSend = 1; /* number of messages to 
send */
+@@ -96,7 +96,9 @@
+ #include 
+ #include 
+ #include 
++#ifdef ENABLE_RELP
+ #include 
++#endif
+ #include 
+ #include 
+ #include 
+@@ -149,7 +151,9 @@
  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 */
@@ -23,7 +31,7 @@ index c500a51..aa79794 100644
  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);
+@@ -216,6 +220,7 @@
  static int sendTLS(int i, char *buf, int lenBuf);
  static void closeTLSSess(int __attribute__((unused)) i);
  
@@ -31,7 +39,7 @@ index c500a51..aa79794 100644
  /* RELP subsystem */
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wformat-security"
-@@ -235,6 +238,7 @@ initRELP_PLAIN(void)
+@@ -235,6 +240,7 @@
CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog",
eRelpCmdState_Required));
  }
@@ -39,7 +47,7 @@ index c500a51..aa79794 100644
  
  /* prepare send subsystem for UDP send */
  static int
-@@ -273,6 +277,7 @@ int openConn(int *fd, const int connIdx)
+@@ -273,6 +279,7 @@
port = targetPort;
}
if(transport == TP_RELP_PLAIN) {
@@ -47,7 +55,7 @@ index c500a51..aa79794 100644
relpRetVal relp_r;
relpClt_t *relpClt;
char relpPort[16];
-@@ -286,6 +291,7 @@ int openConn(int *fd, const int connIdx)
+@@ -286,6 +293,7 @@
return(1);
}
*fd = 1; /* mimic "all ok" state */
@@ -55,7 +63,7 @@ index c500a51..aa79794 100644
} else { /* TCP, with or without TLS */
if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
perror("\nsocket()");
-@@ -336,8 +342,10 @@ int openConnections(void)
+@@ -336,8 +344,10 @@
sessArray = calloc(numConnections, sizeof(gnutls_session_t));
  # endif
sockArray = calloc(numConnections, sizeof(int));
@@ -66,7 +74,7 @@ index c500a51..aa79794 100644
for(i = 0 ; i < numConnections ; ++i) {
if(i % 10 == 0) {
if(bShowProgress)
-@@ -356,8 +364,10 @@ int openConnections(void)
+@@ -356,8 +366,10 @@
 * at least something.
 */
if(transport == TP_RELP_PLAIN) {
@@ -77,7 +85,7 @@ index c500a51..aa79794 100644
} else { /* 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2017-03-01 Thread Thomas Deutschmann
commit: d57f3215d422f2a10d7a1ad8307d22ebabed75c8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Mar  1 22:18:41 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Mar  1 22:19:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57f3215

app-admin/rsyslog: Drop old versions for cleanup

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/rsyslog/Manifest |   6 -
 15.0-imfile-readmode2-vg-test-workaround.patch |  30 --
 ...8.15.0-imtcp-tls-basic-vg-test-workaround.patch |  12 -
 .../50-rsyslog-8.16.0-fix-leap-year-handling.patch |  86 
 ...rsyslog-8.16.0-fix-queue-engine-issue-262.patch |  51 ---
 .../50-rsyslog-8.16.0-restrict-build-deps.patch|  55 ---
 app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild | 423 ---
 app-admin/rsyslog/rsyslog-8.22.0.ebuild| 451 -
 app-admin/rsyslog/rsyslog-8.23.0.ebuild| 451 -
 9 files changed, 1565 deletions(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 6611ae0e83b..e62b3f2e103 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,12 +1,6 @@
-DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 
4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 
e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc
 WHIRLPOOL 
809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa
 DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 
3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 
77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44
 WHIRLPOOL 
3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b
-DIST rsyslog-8.22.0.tar.gz 2259652 SHA256 
06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca SHA512 
105c7a81bd96c6b68b9e9f4d1ae06e63bf531afe4dfd91efb73b2a96e8264270579ccacc6a1bf77ad284913fb7f4bac55f83c5b38f7fa7675f6c4a6fa9b2f3ca
 WHIRLPOOL 
22cb36592654adf67124f31417ad332163d72c852b7d6e471d58f3a45aa8123d1ce701c4853b4e884927587e26dac3645cbe6ffcf291b22c7f789f9513df81a5
-DIST rsyslog-8.23.0.tar.gz 2338318 SHA256 
244e79552d37a5729f3f53786062828adc16fd080eeb0de6507bff55ed21693b SHA512 
4e4832287f02d4b0435b3711241d58cad9f393ce14318bbccce7b89dceeed01205960e7df4b2629831429e550c0865407374eb6a5548ecb47a3aea90c7d7df2d
 WHIRLPOOL 
a4ac676faa6ad09b3e7cf0fbc9c6f827d96a4c14106c3692b523ffc9b90f74745bab7edff2b0c914c160db1f3f83c5f5589203ad8c7cec718c7be8dc2fd0ab66
 DIST rsyslog-8.24.0.tar.gz 2374240 SHA256 
37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512 
b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
 WHIRLPOOL 
c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df
 DIST rsyslog-8.25.0.tar.gz 2386720 SHA256 
c756f16a083e5d4081fb9bfb236303a839cdca0a2c00017bd770b2e2e9677427 SHA512 
0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f
 WHIRLPOOL 
2c4925fda01e49f95ed3d2f43898cdf8f6d679ace5c2a1d1d330dfc422936ae7751cfefa480359b26d2cb782a8217865336f5e04e65e81ffce565b3388c2ff01
-DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 
03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 
746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0
 WHIRLPOOL 
ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 
f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 
120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 WHIRLPOOL 
fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
-DIST rsyslog-docs-8.22.0.tar.gz 4307880 SHA256 
4367e52dddcaca111c40585aa632a9dc68f27ae2e5a51685a08dbabf4e1d2c59 SHA512 
e1d09182d564985ede4826b7366e183d75abf67b24e3aa65d607fc080cf6901612dbbb32188c640b69a4562b2bee2018b4116c6d0fa18ceb1575b9b700e85481
 WHIRLPOOL 
0f5aa06ce8b4c1c5aabbe378c67052ca54c730709736025b70c553cb4caaf7c9e257ea4146f3cc40d59ec3d3f34ef38df2683421fcffb89dc95fd65644eb2ee2
-DIST rsyslog-docs-8.23.0.tar.gz 4316852 SHA256 
c2b23952e5878af334a7b71de76fc6bd432e90dff968da545d3bd73f8a4a147f SHA512 
5c57159e17c728e0fcada5cd03dfe45edca2f9b6554628729387eedb94936c0ef16254f5b0e3524dd6ce732d57e42994e1293478bd28b51747a49f725f148bc0
 WHIRLPOOL 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2016-08-28 Thread Thomas Deutschmann
commit: 85ef4a41db344646dbb93d8583a231bc2058f0d6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Aug 28 18:47:47 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Aug 28 18:48:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ef4a41

app-admin/rsyslog: Restricting build depedencies for v8.16.0

While this version builds against =dev-libs/libfastjson-0.99.2 it does not
build against >dev-libs/libfastjson-0.99.2.

Additional, if you build rsyslog against dev-libs/json-c but build also against
dev-libs/liblognorm which was build against >dev-libs/libfastjson-0.99.2
you will get runtime errors.

To solve this problem we are restricting rsyslog-8.16.0 to build only against
dev-libs/json-c and also restricting to =dev-libs/liblognorm-1.1.2* (last
version which builds against dev-libs/json-c).

Package-Manager: portage-2.3.0

 .../50-rsyslog-8.16.0-restrict-build-deps.patch| 55 ++
 app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild |  3 +-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git 
a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch 
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch
new file mode 100644
index ..b28fbed
--- /dev/null
+++ 
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch
@@ -0,0 +1,55 @@
+From ac9acbd9297cf986873e972968aca98d65377dab Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann
+Date: Sun, 28 Aug 2016 20:08:58 +0200
+Subject: [PATCH 1/2] configure: Restrict to json-c usage
+
+---
+ configure.ac | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4551c46..6789ab2 100644
+--- a/configure.ac
 b/configure.ac
+@@ -26,10 +26,8 @@ PKG_PROG_PKG_CONFIG
+ 
+ # modules we require
+ PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
+-PKG_CHECK_MODULES([JSON_C], [libfastjson],, [
+-  PKG_CHECK_MODULES([JSON_C], [json],, [
+-  PKG_CHECK_MODULES([JSON_C], [json-c],,)
+-  ])
++PKG_CHECK_MODULES([JSON_C], [json],, [
++  PKG_CHECK_MODULES([JSON_C], [json-c],,)
+ ])
+ 
+ save_CFLAGS="$CFLAGS"
+-- 
+2.9.3
+
+
+From 7eed92763725244a53c50110fbe7419ba90d41a6 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann
+Date: Sun, 28 Aug 2016 20:15:32 +0200
+Subject: [PATCH 2/2] configure: Restrict to liblognorm-1.1.2 usage
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6789ab2..5f29106 100644
+--- a/configure.ac
 b/configure.ac
+@@ -927,7 +927,7 @@ AC_ARG_ENABLE(mmnormalize,
+ [enable_mmnormalize=no]
+ )
+ if test "x$enable_mmnormalize" = "xyes"; then
+-  PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.1.2)
++  PKG_CHECK_MODULES(LIBLOGNORM, lognorm = 1.1.2)
+ 
+   save_CFLAGS="$CFLAGS"
+   save_LIBS="$LIBS"
+-- 
+2.9.3
+

diff --git a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild 
b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
index 7716605..49f4469 100644
--- a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
@@ -16,6 +16,7 @@ PATCHES=(

"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch

"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
+   "${FILESDIR}"/8-stable/50-rsyslog-8.16.0-restrict-build-deps.patch
 )
 
 if [[ ${PV} == "" ]]; then
@@ -57,7 +58,7 @@ RDEPEND="
mysql? ( virtual/mysql )
normalize? (
>=dev-libs/libee-0.4.0
-   >=dev-libs/liblognorm-1.1.2:=
+   =dev-libs/liblognorm-1.1.2*:=
)
omudpspoof? ( >=net-libs/libnet-1.1.6 )
postgres? ( >=dev-db/postgresql-8.4.20:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2016-08-23 Thread Thomas Deutschmann
commit: e1a19e35b2cbe62c9f107ab3f83a143d4e394d5d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 24 00:56:39 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 24 00:57:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a19e35

app-admin/rsyslog: Drop old version

Package-Manager: portage-2.3.0

 app-admin/rsyslog/Manifest |   2 -
 .../8-stable/50-rsyslog-8.18.0-issue963.patch  | 482 -
 .../8-stable/50-rsyslog-8.18.0-issue964.patch  |  46 --
 app-admin/rsyslog/rsyslog-8.18.0.ebuild| 454 ---
 4 files changed, 984 deletions(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 91908c0..ea50d7e 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,8 +1,6 @@
 DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 
4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 
e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc
 WHIRLPOOL 
809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa
-DIST rsyslog-8.18.0.tar.gz 2261731 SHA256 
94346237ecfa22c9f78cebc3f18d59056f5d9846eb906c75beaa7e486f02c695 SHA512 
6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7
 WHIRLPOOL 
8efa5d7639b2c5978bdbbcf9837ca87d91a1ccf37dfa5b66e5aa05221d4a31ff57093eb5d604d036f3fd7cafb394f25eaf9302cf2143402d2a9255f4fc53b196
 DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 
3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 
77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44
 WHIRLPOOL 
3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b
 DIST rsyslog-8.21.0.tar.gz 2290993 SHA256 
bdb1fde87b75107b58d1cd5d00408822fb15b9f3efb8d9dbb93a1dee128339ab SHA512 
f56b4227d535a6d354082e2c138feb1d1bb1010a3a780cf23d54e882cfaa893cd7d90f29da29b925957192d3e3c617cadede8938c3e1b162bfc4c6cf65a592a9
 WHIRLPOOL 
f1ab94924e21a5dfa29d29f29b95e2bb9892e8a4ad23452753decfc69bffaef3bfd448edee8fd733f54858c189e2c6b9504da5f2dda8a6296f6a6a11d1b2a60e
 DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 
03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 
746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0
 WHIRLPOOL 
ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b
-DIST rsyslog-docs-8.18.0.tar.gz 4269339 SHA256 
8de82dece85a9a83d9c1feaf7fdfb883c2bfe5a82d84b846161bec0b9dba22c6 SHA512 
c560f6a8c05f951d245b8bf96e3c58f9023761edf0e5e25b4a01dab934c1db8ad74baf7e90bd1139d3c6b5af396fca525a7818e87fcbf161317c21e005aae0b2
 WHIRLPOOL 
2d133a86d3a2abf5f4e3c57e0b65015ed3ad4770b4dfcd34420395fc11ab7d5752811afcb83a776bc51d665b75729bd76a0d94793d508e28aebeb815884dceff
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 
f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 
120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 WHIRLPOOL 
fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
 DIST rsyslog-docs-8.21.0.tar.gz 4289500 SHA256 
0a98557083e5f9ce92dbd5ea3d6f4b7d1fa123e181c9597c344cc1be064c93af SHA512 
ff1bfb5f3816ff30d8584d9afce0195b76adccb230c705be79b99f889e35bfd41d9079ff457866a474b023352108c67af85add1dad46ebc2e20be3a3c99ed907
 WHIRLPOOL 
5efa5561377cfc3d35958cb1b71c0b96e210b9f9bc6213774294d22714c1928d7e0bc0eac1f96632554011a6522b009bdfee440fe59fe1f8306f54f2006e1ce7

diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch 
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch
deleted file mode 100644
index e1f6a32..
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch
+++ /dev/null
@@ -1,482 +0,0 @@
-From b81d6dd36545f79c46e0a3488a9b26d0db75646a Mon Sep 17 00:00:00 2001
-From: Thomas D.
-Date: Tue, 19 Apr 2016 02:09:18 +0200
-Subject: [PATCH 2/2] testbench: Use LD_PRELOAD=libfaketime.so instead of
- faketime binary
-
-Fixes: https://github.com/rsyslog/rsyslog/issues/963

- tests/faketime_common.sh | 20 +++-
- tests/now-utc-casecmp.sh |  2 +-
- tests/now-utc-ymd.sh |  2 +-
- tests/now-utc.sh |  2 +-
- tests/now_family_utc.sh  |  2 +-
- tests/timegenerated-dateordinal-invld.sh |  8 
- tests/timegenerated-dateordinal.sh   | 28 ++--
- 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2016-06-12 Thread Patrice Clement
commit: 736df1f8aedae24bd7b9041c354823cda71eae79
Author: Thomas Deutschmann  whissi  de>
AuthorDate: Sat Jun 11 23:59:32 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Jun 12 17:24:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736df1f8

app-admin/rsyslog: Remove old

Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1659

Signed-off-by: Patrice Clement  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/rsyslog-8.13.0.ebuild| 423 -
 4 files changed, 696 deletions(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 034e443..1701cf1 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,8 +1,6 @@
-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.18.0.tar.gz 2261731 SHA256 
94346237ecfa22c9f78cebc3f18d59056f5d9846eb906c75beaa7e486f02c695 SHA512 
6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7
 WHIRLPOOL 
8efa5d7639b2c5978bdbbcf9837ca87d91a1ccf37dfa5b66e5aa05221d4a31ff57093eb5d604d036f3fd7cafb394f25eaf9302cf2143402d2a9255f4fc53b196
 DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 
3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 
77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44
 WHIRLPOOL 
3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b
-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-docs-8.18.0.tar.gz 4269339 SHA256 
8de82dece85a9a83d9c1feaf7fdfb883c2bfe5a82d84b846161bec0b9dba22c6 SHA512 
c560f6a8c05f951d245b8bf96e3c58f9023761edf0e5e25b4a01dab934c1db8ad74baf7e90bd1139d3c6b5af396fca525a7818e87fcbf161317c21e005aae0b2
 WHIRLPOOL 
2d133a86d3a2abf5f4e3c57e0b65015ed3ad4770b4dfcd34420395fc11ab7d5752811afcb83a776bc51d665b75729bd76a0d94793d508e28aebeb815884dceff
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 
f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 
120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 WHIRLPOOL 
fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b

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
deleted file mode 100644
index f049d53..000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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| 14 ++
- 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/, profiles/arch/arm/, ...

2016-04-26 Thread Ian Delaney
commit: c6e82bf2f832748f45ce6e2b9a35219465d36db5
Author: Thomas D  whissi  de>
AuthorDate: Mon Apr 25 15:55:05 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Apr 26 08:49:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e82bf2

app-admin/rsyslog: Bump to v8.18.0

Keyword for hppa dropped because of unkeyworded deps
Use flag grok p-use masked under:
- profiles/arch/arm/package.use.mask
- profiles/default/linux/uclibc/arm/package.use.mask

Gentoo-bug: #577508, #577008, #577510, #581180
Signed-off-by: Ian Delaney  gentoo.org>
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1348
Signed-off-by: Ian Delaney  gentoo.org>

 app-admin/rsyslog/Manifest |   2 +
 .../8-stable/50-rsyslog-8.18.0-issue963.patch  | 482 +
 .../8-stable/50-rsyslog-8.18.0-issue964.patch  |  46 ++
 app-admin/rsyslog/metadata.xml |   5 +-
 app-admin/rsyslog/rsyslog-8.18.0.ebuild| 465 
 profiles/arch/arm/package.use.mask |   8 +-
 profiles/default/linux/uclibc/arm/package.use.mask |   8 +-
 7 files changed, 1013 insertions(+), 3 deletions(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index bf5ce27..27c7948 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,4 +1,6 @@
 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.18.0.tar.gz 2261731 SHA256 
94346237ecfa22c9f78cebc3f18d59056f5d9846eb906c75beaa7e486f02c695 SHA512 
6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7
 WHIRLPOOL 
8efa5d7639b2c5978bdbbcf9837ca87d91a1ccf37dfa5b66e5aa05221d4a31ff57093eb5d604d036f3fd7cafb394f25eaf9302cf2143402d2a9255f4fc53b196
 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-docs-8.18.0.tar.gz 4269339 SHA256 
8de82dece85a9a83d9c1feaf7fdfb883c2bfe5a82d84b846161bec0b9dba22c6 SHA512 
c560f6a8c05f951d245b8bf96e3c58f9023761edf0e5e25b4a01dab934c1db8ad74baf7e90bd1139d3c6b5af396fca525a7818e87fcbf161317c21e005aae0b2
 WHIRLPOOL 
2d133a86d3a2abf5f4e3c57e0b65015ed3ad4770b4dfcd34420395fc11ab7d5752811afcb83a776bc51d665b75729bd76a0d94793d508e28aebeb815884dceff

diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch 
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch
new file mode 100644
index 000..e1f6a32
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch
@@ -0,0 +1,482 @@
+From b81d6dd36545f79c46e0a3488a9b26d0db75646a Mon Sep 17 00:00:00 2001
+From: Thomas D.
+Date: Tue, 19 Apr 2016 02:09:18 +0200
+Subject: [PATCH 2/2] testbench: Use LD_PRELOAD=libfaketime.so instead of
+ faketime binary
+
+Fixes: https://github.com/rsyslog/rsyslog/issues/963
+---
+ tests/faketime_common.sh | 20 +++-
+ tests/now-utc-casecmp.sh |  2 +-
+ tests/now-utc-ymd.sh |  2 +-
+ tests/now-utc.sh |  2 +-
+ tests/now_family_utc.sh  |  2 +-
+ tests/timegenerated-dateordinal-invld.sh |  8 
+ tests/timegenerated-dateordinal.sh   | 28 ++--
+ tests/timegenerated-utc-legacy.sh|  2 +-
+ tests/timegenerated-utc.sh   |  2 +-
+ tests/timegenerated-uxtimestamp-invld.sh |  8 
+ tests/timegenerated-uxtimestamp.sh   | 26 --
+ tests/timegenerated-ymd.sh

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2016-03-11 Thread Ian Delaney
commit: 968a7ec803b82b4018724e268bc2a475e4c98a4c
Author: Thomas D  whissi  de>
AuthorDate: Sat Mar 12 02:51:55 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Mar 12 04:31:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968a7ec8

app-admin/rsyslog: Rev bump to fix a leap year issue

Bug: https://github.com/rsyslog/rsyslog/issues/830

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1034

 .../50-rsyslog-8.16.0-fix-leap-year-handling.patch |  86 
 app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild | 433 +
 2 files changed, 519 insertions(+)

diff --git 
a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
 
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
new file mode 100644
index 000..6cf8fa6
--- /dev/null
+++ 
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
@@ -0,0 +1,86 @@
+From ffb321f1698a971e0acda48cafa97bb344cf0829 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards 
+Date: Wed, 2 Mar 2016 11:43:09 +0100
+Subject: [PATCH] bugfix: unixtimestamp was incorrectly computed
+
+The problem happened in leap year from March til then end
+of year and healed itself at the begining of the next year.
+During the problem period, the timestamp was 24 hours too
+low.
+
+This is primarily a simple fix that can also be applied to
+older rsyslog versions. However, we will see if we can
+refactor the code to make use of mktime(). Originally, that
+was not done for some issues seen, which may no longer
+apply.
+
+fixes https://github.com/rsyslog/rsyslog/issues/830
+---
+ runtime/datetime.c | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/runtime/datetime.c b/runtime/datetime.c
+index efb4c81..a07c1b7 100644
+--- a/runtime/datetime.c
 b/runtime/datetime.c
+@@ -1054,6 +1054,11 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+   MonthInDays = 0;/* any value fits ;) */
+   break;
+   }   
++  /* adjust for leap years */
++  if((ts->year % 100 != 0 && ts->year % 4 == 0) || (ts->year == 2000)) {
++  if(ts->month > 2)
++  MonthInDays++;
++  }
+ 
+ 
+   /*  1) Counting how many Years have passed since 1970
+@@ -1064,7 +1069,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+ 
+   NumberOfYears = ts->year - yearInSec_startYear - 1;
+   NumberOfDays = MonthInDays + ts->day - 1;
+-  TimeInUnixFormat = yearInSecs[NumberOfYears] + NumberOfDays * 86400;
++  TimeInUnixFormat = (yearInSecs[NumberOfYears] + 1) + NumberOfDays * 
86400;
+ 
+   /*Add Hours, minutes and seconds */
+   TimeInUnixFormat += ts->hour*60*60;
+From 5cb41f748329986d5e2aa8d5e87f224bb9cb8234 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards 
+Date: Wed, 2 Mar 2016 15:58:18 +0100
+Subject: [PATCH] timestamp handling: guard against invalid dates
+
+We do not permit dates outside of the year 1970..2100
+interval. Note that network-receivers do already guard
+against this, so the new guard only guards against invalid
+system time. Still good to have (especially when things are
+extended...)
+---
+ runtime/datetime.c | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/runtime/datetime.c b/runtime/datetime.c
+index 9641363..87290c9 100644
+--- a/runtime/datetime.c
 b/runtime/datetime.c
+@@ -1023,6 +1023,13 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+   int utcOffset;
+   time_t TimeInUnixFormat;
+ 
++  if(ts->year < 1970 || ts->year > 2100) {
++  TimeInUnixFormat = 0;
++  errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year 
%d "
++  "in timestamp - returning 1970-01-01 instead", 
ts->year);
++  goto done;
++  }
++
+   /* Counting how many Days have passed since the 01.01 of the
+* selected Year (Month level), according to the selected Month*/
+ 
+@@ -1096,6 +1103,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+   if(ts->OffsetMode == '+')
+   utcOffset *= -1; /* if timestamp is ahead, we need to "go back" 
to UTC */
+   TimeInUnixFormat += utcOffset;
++done:
+   return TimeInUnixFormat;
+ }
+ 

diff --git a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild 
b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
new file mode 100644
index 000..607fecf
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/;
+
+BRANCH="8-stable"
+
+PATCHES=(
+   

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/

2016-02-05 Thread Lars Wendler
commit: bb3bc4375d2c3564bba80af8c5d95428ec6fddf9
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Feb  5 15:11:30 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Feb  5 15:24:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3bc437

app-admin/rsyslog: Removed old.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler  gentoo.org>

 app-admin/rsyslog/Manifest |   4 -
 .../files/8-stable/10-respect_CFLAGS-r1.patch  |  15 -
 .../40-rsyslog-fix-parallel-build-issue-479.patch  |  25 --
 ...on-to-disable-valgrind-usage-in-testbench.patch |  56 ---
 ...g-fix-size-based-legacy-config-statements.patch |  31 --
 ...-rsyslog-run-queue-persist-test-only-once.patch |  22 --
 app-admin/rsyslog/files/8-stable/rsyslog.confd |  30 --
 app-admin/rsyslog/files/8-stable/rsyslog.initd |  69 
 app-admin/rsyslog/rsyslog-8.12.0-r1.ebuild | 420 -
 app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild  | 413 
 10 files changed, 1085 deletions(-)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 66ab944..bf5ce27 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,8 +1,4 @@
-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/10-respect_CFLAGS-r1.patch 
b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch
deleted file mode 100644
index de89e67..000
--- a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index bebb399..5003f10 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -792,8 +792,8 @@ if test "x$enable_rsyslogrt" = "xyes"; then
- fi
- AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
- RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
--if test "$GCC" =