commit: cee2b656924f8f4b581ebfdfc2b4d2626c9be3ba Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Thu Dec 13 13:19:27 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Thu Dec 13 13:19:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee2b656
app-admin/rsyslog: fix omusrmsg Closes: https://bugs.gentoo.org/673004 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch | 13 +++++++++++++ .../{rsyslog-8.38.0-r1.ebuild => rsyslog-8.38.0-r2.ebuild} | 5 ++++- .../{rsyslog-8.39.0.ebuild => rsyslog-8.39.0-r1.ebuild} | 5 ++++- .../{rsyslog-8.40.0.ebuild => rsyslog-8.40.0-r1.ebuild} | 2 ++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch new file mode 100644 index 00000000000..9247d0b067f --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch @@ -0,0 +1,13 @@ +https://github.com/rsyslog/rsyslog/issues/3346 + +--- a/tools/omusrmsg.c ++++ b/tools/omusrmsg.c +@@ -261,7 +261,7 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData) + + /* compute the device name */ + strcpy(p, _PATH_DEV); +- memcpy(p, ut.ut_line, UNAMESZ); ++ strncat(p, ut.ut_line, UNAMESZ); + + /* we must be careful when writing to the terminal. A terminal may block + * (for example, a user has pressed <ctl>-s). In that case, we can not diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild rename to app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild index 8cd541ba555..0433b628342 100644 --- a/app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild @@ -23,7 +23,10 @@ else doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " - PATCHES=( "${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch ) + PATCHES=( + "${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch + "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch + ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/rsyslog/rsyslog-8.39.0.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.39.0.ebuild rename to app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild index 94111420401..1f68aea21c3 100644 --- a/app-admin/rsyslog/rsyslog-8.39.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild @@ -23,7 +23,10 @@ else doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " - PATCHES=( "${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch ) + PATCHES=( + "${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch + "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch + ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/rsyslog/rsyslog-8.40.0.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.40.0.ebuild rename to app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild index 62debd0de64..985c553dc4a 100644 --- a/app-admin/rsyslog/rsyslog-8.40.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild @@ -22,6 +22,8 @@ else https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " + + PATCHES=( "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0"
