maksbotan 14/04/16 16:14:42
Modified: rsyslog-7.4.3.ebuild rsyslog-7.4.7.ebuild
rsyslog-7.4.6.ebuild rsyslog-7.4.10.ebuild
rsyslog-7.2.7.ebuild rsyslog-7.4.4.ebuild ChangeLog
Log:
Add upstream patch for >=dev-libs/json-c-0.12, bug #507730. Thanks to Thomas
D. <whi...@whissi.de>.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
F8DBDADE)
Revision Changes Path
1.8 app-admin/rsyslog/rsyslog-7.4.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild?r1=1.7&r2=1.8
Index: rsyslog-7.4.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rsyslog-7.4.3.ebuild 1 Mar 2014 22:11:24 -0000 1.7
+++ rsyslog-7.4.3.ebuild 16 Apr 2014 16:14:41 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v
1.7 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v
1.8 2014/04/16 16:14:41 maksbotan Exp $
EAPI=4
AUTOTOOLS_AUTORECONF=yes
@@ -50,6 +50,7 @@
PATCHES=(
"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch
"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch
+ "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
)
src_configure() {
1.5 app-admin/rsyslog/rsyslog-7.4.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild?r1=1.4&r2=1.5
Index: rsyslog-7.4.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rsyslog-7.4.7.ebuild 1 Mar 2014 22:11:24 -0000 1.4
+++ rsyslog-7.4.7.ebuild 16 Apr 2014 16:14:41 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v
1.4 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v
1.5 2014/04/16 16:14:41 maksbotan Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=yes
@@ -49,6 +49,10 @@
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
+src_prepare() {
+ epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+}
+
src_configure() {
# Maintainer notes:
# * rfc3195 needs a library and development of that library
1.6 app-admin/rsyslog/rsyslog-7.4.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild?r1=1.5&r2=1.6
Index: rsyslog-7.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rsyslog-7.4.6.ebuild 1 Mar 2014 22:11:24 -0000 1.5
+++ rsyslog-7.4.6.ebuild 16 Apr 2014 16:14:41 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v
1.5 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v
1.6 2014/04/16 16:14:41 maksbotan Exp $
EAPI=4
AUTOTOOLS_AUTORECONF=yes
@@ -48,6 +48,10 @@
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
+src_prepare() {
+ epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+}
+
src_configure() {
# Maintainer notes:
# * rfc3195 needs a library and development of that library
1.2 app-admin/rsyslog/rsyslog-7.4.10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild?r1=1.1&r2=1.2
Index: rsyslog-7.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog-7.4.10.ebuild 10 Mar 2014 13:00:19 -0000 1.1
+++ rsyslog-7.4.10.ebuild 16 Apr 2014 16:14:41 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild,v
1.1 2014/03/10 13:00:19 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild,v
1.2 2014/04/16 16:14:41 maksbotan Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=yes
@@ -50,6 +50,10 @@
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
+src_prepare() {
+ epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+}
+
src_configure() {
# Maintainer notes:
# * rfc3195 needs a library and development of that library
1.10 app-admin/rsyslog/rsyslog-7.2.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild?r1=1.9&r2=1.10
Index: rsyslog-7.2.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rsyslog-7.2.7.ebuild 1 Mar 2014 22:11:24 -0000 1.9
+++ rsyslog-7.2.7.ebuild 16 Apr 2014 16:14:41 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v
1.9 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v
1.10 2014/04/16 16:14:41 maksbotan Exp $
EAPI=4
AUTOTOOLS_AUTORECONF=yes
@@ -51,7 +51,11 @@
"${FILESDIR}"/${PN}-7.2.5-json-c-pkgconfig.patch
# Fix runtime UUID/JSON libs linking
- "${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch )
+ "${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch
+
+ # Fix for #507730
+ "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+)
src_prepare() {
# Don't force '-g' CFLAG
1.10 app-admin/rsyslog/rsyslog-7.4.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild?r1=1.9&r2=1.10
Index: rsyslog-7.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rsyslog-7.4.4.ebuild 1 Mar 2014 22:11:24 -0000 1.9
+++ rsyslog-7.4.4.ebuild 16 Apr 2014 16:14:41 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v
1.9 2014/03/01 22:11:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.4.ebuild,v
1.10 2014/04/16 16:14:41 maksbotan Exp $
EAPI=4
AUTOTOOLS_AUTORECONF=yes
@@ -48,6 +48,10 @@
DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
+src_prepare() {
+ epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+}
+
src_configure() {
# Maintainer notes:
# * rfc3195 needs a library and development of that library
1.111 app-admin/rsyslog/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.111&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?rev=1.111&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/ChangeLog?r1=1.110&r2=1.111
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog 10 Mar 2014 13:00:19 -0000 1.110
+++ ChangeLog 16 Apr 2014 16:14:41 -0000 1.111
@@ -1,6 +1,13 @@
# ChangeLog for app-admin/rsyslog
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.110
2014/03/10 13:00:19 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.111
2014/04/16 16:14:41 maksbotan Exp $
+
+ 16 Apr 2014; Maxim Koltsov <maksbo...@gentoo.org>
+ +files/7-stable/rsyslog-7.x-mmjsonparse.patch, rsyslog-7.2.7.ebuild,
+ rsyslog-7.4.10.ebuild, rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild,
+ rsyslog-7.4.6.ebuild, rsyslog-7.4.7.ebuild:
+ Add upstream patch for >=dev-libs/json-c-0.12, bug #507730. Thanks to Thomas
+ D. <whi...@whissi.de>.
*rsyslog-7.4.10 (10 Mar 2014)
