From 4df3c8e567c102cb9fc2b25926cc40745273b12f Mon Sep 17 00:00:00 2001 From: Alexys Jacob Date: Mon, 5 Sep 2011 12:22:11 +0000 Subject: [PATCH] Multiple ebuild fixes : #381909, #381907, #381905, #381901, #381903. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- app-admin/rsyslog/ChangeLog | 292 +------------------------ app-admin/rsyslog/Manifest | 12 +- app-admin/rsyslog/rsyslog-5.8.5.ebuild | 15 +- 3 files changed, 22 insertions(+), 297 deletions(-) diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog index 620e3ae9501d..8deea68e1e3a 100644 --- a/app-admin/rsyslog/ChangeLog +++ b/app-admin/rsyslog/ChangeLog @@ -1,292 +1,8 @@ # ChangeLog for app-admin/rsyslog # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.53 2011/09/05 09:25:41 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.54 2011/09/05 12:22:11 ultrabug Exp $ -*rsyslog-5.8.5 (05 Sep 2011) - - 05 Sep 2011; Ultrabug files/5-stable/rsyslog.initd, - -rsyslog-5.8.1.ebuild, +rsyslog-5.8.5.ebuild, metadata.xml: - Init script handles baselayout 1 & 2, fix #373913 thanks to Martin Dummer for - reporting. Version bump wrt #381637 and drop old vulnerable version. Add - optional zeromq support to rsyslog. - -*rsyslog-5.8.3 (03 Aug 2011) - - 03 Aug 2011; Ultrabug +rsyslog-5.8.3.ebuild: - Version bump. - -*rsyslog-5.8.1 (23 May 2011) - - 23 May 2011; Ultrabug -rsyslog-5.8.0-r1.ebuild, - +rsyslog-5.8.1.ebuild: - Version bump, drop previous bugged 5.8.x version. Thanks to Opportunist for - spotting, fix #368193. - -*rsyslog-5.8.0-r1 (16 May 2011) - - 16 May 2011; Ultrabug -rsyslog-5.8.0.ebuild, - +rsyslog-5.8.0-r1.ebuild: - EAPI4 and use of systemd eclass, fix #366179. - - 16 May 2011; Ultrabug -files/3-stable/rsyslog.conf, - -files/3-stable/rsyslog.init, -files/3-stable/rsyslog.logrotate, - -rsyslog-3.22.0.ebuild, -files/3-stable/rsyslog-gentoo.conf, - -rsyslog-3.22.1.ebuild, -rsyslog-5.6.4.ebuild: - Remove obsolete v3 branch. Drop old wrt #361219. - - 13 May 2011; Markos Chandras rsyslog-5.6.5.ebuild: - Stable on amd64 wrt bug #361219 - - 13 May 2011; Jeroen Roovers rsyslog-5.6.5.ebuild: - Stable for HPPA (bug #361219). - - 13 May 2011; Thomas Kahle rsyslog-5.6.5.ebuild: - x86 stable per bug 361219 - - 26 Apr 2011; Jeroen Roovers rsyslog-5.6.4.ebuild: - Stable for HPPA (bug #359765). - -*rsyslog-5.8.0 (26 Apr 2011) - - 26 Apr 2011; Ultrabug -rsyslog-3.20.4.ebuild, - +rsyslog-5.8.0.ebuild: - version bump wrt #364145. Drop old stable. Thanks to Opportunist for - reporting. - - 19 Apr 2011; Thomas Kahle rsyslog-5.6.4.ebuild: - x86 stable per bug 359765 - - 16 Apr 2011; Christoph Mende rsyslog-5.6.4.ebuild: - Stable on amd64 wrt bug #359765 - - 07 Apr 2011; Ultrabug rsyslog-3.20.4.ebuild, - rsyslog-3.22.0.ebuild, rsyslog-3.22.1.ebuild, rsyslog-5.6.4.ebuild, - rsyslog-5.6.5.ebuild: - migrate ebuilds to new-style virtual, wrt #358881 - - 30 Mar 2011; Tomáš Chvátal metadata.xml: - Drop logrotate useflag description too. - - 30 Mar 2011; Tomáš Chvátal rsyslog-5.6.4.ebuild, - rsyslog-5.6.5.ebuild: - Drop logrotate useflag. Fixes bug #344175. - - 25 Mar 2011; Ultrabug rsyslog-5.6.5.ebuild: - add back virtual/logger provider waiting for migration (#358881) - -*rsyslog-5.6.5 (24 Mar 2011) - - 24 Mar 2011; Ultrabug +rsyslog-5.6.5.ebuild: - version bump - -*rsyslog-5.6.4 (04 Mar 2011) - - 04 Mar 2011; Ultrabug -rsyslog-5.6.3.ebuild, - +rsyslog-5.6.4.ebuild: - version bump. drop old. - -*rsyslog-5.6.3 (07 Feb 2011) - - 07 Feb 2011; Ultrabug -rsyslog-5.6.2.ebuild, - +rsyslog-5.6.3.ebuild: - Version bump, drop old - -*rsyslog-5.6.2 (10 Jan 2011) - - 10 Jan 2011; Ultrabug -rsyslog-5.4.0.ebuild, - +rsyslog-5.6.2.ebuild, metadata.xml: - Version bump. Fixes bug #343085. Maintainer bump. Thanks to Opportunist and - Nebojsa Trpkovic for their help. - - 29 Oct 2010; Markus Meier rsyslog-5.4.0.ebuild: - readd ~arm, bug #341965 - -*rsyslog-5.4.0 (21 Oct 2010) - - 21 Oct 2010; Tiziano Müller - -files/3-devel/rsyslog.conf, -files/3-devel/rsyslog.init, - -files/3-devel/rsyslog.logrotate, -files/3-devel/rsyslog-gentoo.conf, - +files/5-stable/rsyslog.confd, +files/5-stable/rsyslog.initd, - +files/5-stable/rsyslog.logrotate, +files/5-stable/rsyslog-gentoo.conf, - +rsyslog-5.4.0.ebuild, metadata.xml: - Version bump (bug #292919), also solves bug #283416 and #339985. Thanks to - Ultrabug for the version bump and extensions/fixes and Mike Nerone for - testing. - - 17 Jun 2010; Patrick Lauer rsyslog-3.20.4.ebuild, - rsyslog-3.22.0.ebuild, rsyslog-3.22.1.ebuild: - Migrating away from deprecated postgres virtuals - - 15 Jan 2010; Tiziano Müller rsyslog-3.22.1.ebuild: - Keyworded ~sparc. - - 17 Oct 2009; Markus Meier metadata.xml: - remove dbi description as it is global now - - 10 Oct 2009; Raúl Porcel rsyslog-3.22.1.ebuild: - Add ~arm - -*rsyslog-3.22.1 (14 Aug 2009) - - 14 Aug 2009; Tiziano Müller +rsyslog-3.22.1.ebuild: - Version bump (bug #281363). - - 26 Jul 2009; Thilo Bangert metadata.xml: - add tag - - 21 Jul 2009; rsyslog-3.22.0.ebuild: - Marked stable on AMD64 as requested by Arfrever Frehtes Taifersar Arahesis - in bug #275700. - - 30 Jun 2009; Christian Faulhammer - rsyslog-3.22.0.ebuild: - stable x86, bug 275700 - - 29 Jun 2009; Jeroen Roovers rsyslog-3.22.0.ebuild: - Stable for HPPA (bug #275700). - -*rsyslog-3.22.0 (26 May 2009) - - 26 May 2009; Tiziano Müller -rsyslog-3.20.2.ebuild, - -rsyslog-3.21.10.ebuild, +rsyslog-3.22.0.ebuild: - Version bump for stable branch. Dropped old stable-branch and obsolete - devel-branch ebuild. - - 15 Mar 2009; Markus Meier rsyslog-3.20.4.ebuild: - amd64/x86 stable, bug #254287 - -*rsyslog-3.21.10 (13 Feb 2009) -*rsyslog-3.20.4 (13 Feb 2009) - - 13 Feb 2009; Tiziano Müller +rsyslog-3.20.4.ebuild, - -rsyslog-3.21.9.ebuild, +rsyslog-3.21.10.ebuild: - Version bump. - -*rsyslog-3.21.9 (08 Dec 2008) -*rsyslog-3.20.2 (08 Dec 2008) - - 08 Dec 2008; Tiziano Müller -rsyslog-3.18.4.ebuild, - +rsyslog-3.20.2.ebuild, -rsyslog-3.21.6.ebuild, +rsyslog-3.21.9.ebuild: - Version bump for stable and beta branches, fixes security bug #249878 - (thanks to Bruno Boss & Crag). - - 10 Nov 2008; Tiziano Müller rsyslog-3.21.6.ebuild: - Disable building imdiag with USE=debug (bug #240550) since upstream - doesn't support it. - -*rsyslog-3.21.6 (10 Nov 2008) - - 10 Nov 2008; Tiziano Müller -rsyslog-3.21.5.ebuild, - +rsyslog-3.21.6.ebuild: - Version bump (probably fixes bug #240550). - -*rsyslog-3.21.5 (06 Oct 2008) - - 06 Oct 2008; Tiziano Müller -rsyslog-3.21.4.ebuild, - +rsyslog-3.21.5.ebuild: - Version bump for devel branch - -*rsyslog-3.21.4 (29 Sep 2008) -*rsyslog-3.18.4 (29 Sep 2008) - - 29 Sep 2008; Tiziano Müller -rsyslog-3.18.3.ebuild, - +rsyslog-3.18.4.ebuild, -rsyslog-3.21.3.ebuild, +rsyslog-3.21.4.ebuild: - Version bump for stable and devel branch (changelog says we don't want - 3.18.3 stable, so dropping it) - -*rsyslog-3.21.3 (22 Aug 2008) -*rsyslog-3.18.3 (22 Aug 2008) - - 22 Aug 2008; Tiziano Müller -rsyslog-3.18.1.ebuild, - -rsyslog-3.18.2.ebuild, +rsyslog-3.18.3.ebuild, -rsyslog-3.21.2.ebuild, - +rsyslog-3.21.3.ebuild: - Version bump. Dropped buggy versions. - - 14 Aug 2008; Tiziano Müller - files/3-devel/rsyslog.init, files/3-stable/rsyslog.init: - Added provide logger to init.d-scripts (thanks to Jon Gerdes, bug - #234640). - - 12 Aug 2008; Tiziano Müller rsyslog-3.21.2.ebuild: - Removed inherit autotools since unneeded - -*rsyslog-3.21.2 (12 Aug 2008) -*rsyslog-3.18.2 (12 Aug 2008) - - 12 Aug 2008; Tiziano Müller -rsyslog-3.16.1.ebuild, - +rsyslog-3.18.2.ebuild, -rsyslog-3.21.1.ebuild, +rsyslog-3.21.2.ebuild: - Version bump for stable and unstable branch. Dropped old versions. - -*rsyslog-3.21.1 (31 Jul 2008) -*rsyslog-3.18.1 (31 Jul 2008) - - 31 Jul 2008; Tiziano Müller +rsyslog-3.18.1.ebuild, - -rsyslog-3.19.7.ebuild, +rsyslog-3.21.1.ebuild: - Version bump for stable and unstable branch. Dropped old unstable. - - 25 Jul 2008; Doug Goldstein metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 16 Jun 2008; Jeroen Roovers rsyslog-3.19.7.ebuild: - Marked ~hppa too. - -*rsyslog-3.19.7 (12 Jun 2008) - - 12 Jun 2008; Tiziano Müller -rsyslog-3.19.5.ebuild, - +rsyslog-3.19.7.ebuild: - Version bump for devel-branch - -*rsyslog-3.19.5 (03 Jun 2008) - - 03 Jun 2008; Tiziano Müller - -files/3.19.2-as_needed.patch, rsyslog-3.16.1.ebuild, - -rsyslog-3.19.2.ebuild, +rsyslog-3.19.5.ebuild: - Version bump for devel-branch (upstream included --as-needed patch and - fixed tight-loop bug). Added PROVIDES to satisfy virtual/logger. - -*rsyslog-3.19.2 (19 May 2008) -*rsyslog-3.16.1 (19 May 2008) - - 19 May 2008; Tiziano Müller - -files/3.14.1-implicit_declaration.patch, +files/3.19.2-as_needed.patch, - -rsyslog-3.14.1.ebuild, -rsyslog-3.16.0.ebuild, +rsyslog-3.16.1.ebuild, - -rsyslog-3.17.1.ebuild, +rsyslog-3.19.2.ebuild: - Version bump, cleaned up the old versions due to a couple of serious bugs. - Added GnuTLS USE flag for the devel-branch. Changed dependency for - postgresql to virtual/postgresql-base. - - 14 May 2008; Markus Meier rsyslog-3.16.0.ebuild, - rsyslog-3.17.1.ebuild: - add ~x86, bug #222081 - -*rsyslog-3.17.1 (25 Apr 2008) -*rsyslog-3.16.0 (25 Apr 2008) - - 25 Apr 2008; Tiziano Müller +rsyslog-3.16.0.ebuild, - -rsyslog-3.17.0.ebuild, +rsyslog-3.17.1.ebuild: - Version bump (both stable and testing branches). - -*rsyslog-3.17.0 (09 Apr 2008) -*rsyslog-3.14.1 (09 Apr 2008) - - 09 Apr 2008; Tiziano Müller - -files/3.15/rsyslog.conf, -files/3.15/rsyslog.init, - -files/3.15/rsyslog.logrotate, -files/3.15/rsyslog-gentoo.conf, - +files/3-devel/rsyslog.conf, +files/3-devel/rsyslog.init, - +files/3-stable/rsyslog.conf, +files/3.14.1-implicit_declaration.patch, - +files/3-devel/rsyslog.logrotate, +files/3-devel/rsyslog-gentoo.conf, - +files/3-stable/rsyslog.init, +files/3-stable/rsyslog.logrotate, - +files/3-stable/rsyslog-gentoo.conf, +rsyslog-3.14.1.ebuild, - -rsyslog-3.15.0.ebuild, +rsyslog-3.17.0.ebuild: - Version bump. Added ebuild for stable branch (3.14.x). Reorganized - init.d/conf.d/logrotate files to have one set for the stable and one for - the devel branch. Is supposed to fix bug #216968. - -*rsyslog-3.15.0 (07 Apr 2008) - - 07 Apr 2008; Tiziano Müller - +files/3.15/rsyslog.conf, +files/3.15/rsyslog.init, - +files/3.15/rsyslog.logrotate, +files/3.15/rsyslog-gentoo.conf, - +metadata.xml, +rsyslog-3.15.0.ebuild: - Initial commit (ebuild written by me.) + 05 Sep 2011; Ultrabug rsyslog-5.8.5.ebuild: + Multiple ebuild fixes : #381909, #381907, #381905, #381901, #381903. Thanks + to Agostino Sarubbo. diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 9f4e77e010c5..f21c5b84ee30 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -11,13 +11,13 @@ DIST rsyslog-5.8.5.tar.gz 2364874 RMD160 46b20433e0e5feb807b4777bb8141221fe5dd65 DIST rsyslog-zeromq.tar.gz 22223 RMD160 632a1888d3972da4ce623c8f6973c72b026b035c SHA1 e6f02c25af19022d0cc9d4782f58db3fc27a9f0f SHA256 3cca6ce8722ec5035744a9b88e65b89b35f6b2e6bbdbc9c9bba89d22addd2753 EBUILD rsyslog-5.6.5.ebuild 6297 RMD160 6b8cb731c360fb7b04166700b712686c848f40d9 SHA1 95c09b2b462a63a5f4d3ecd97eaf7b5f616fad27 SHA256 c9a96f5380adc7a13cc223e835021a80cbc201add8eb8a8751dcb68006fc5021 EBUILD rsyslog-5.8.3.ebuild 6451 RMD160 1ce1252069420ec75d4560750d096ad89c2fb79c SHA1 8acb44cfeafeac03db6218d8a05930f015cce422 SHA256 dec2d8de601d101e6de0ffc870dca7ece17472afc2fc48bcd5ae772e58482446 -EBUILD rsyslog-5.8.5.ebuild 7066 RMD160 04f2bf447ee64e94e7479830a652dd2a50bf48ef SHA1 2c4294b177388ff6e23d88cbdd7bcae2f137c33b SHA256 a4b8d3e18ba3f9cae8a54310cef3657acc97c437973481f3ee063b4677936801 -MISC ChangeLog 10757 RMD160 9623dc15a398af231c1276c46e0edee8fbccb497 SHA1 3e2d1f696229763864dea6ae16960ff3993bb2f5 SHA256 e9362bee847325c948d0f9007aa257822e9249c233825e93ec6ed71cb1ebb599 +EBUILD rsyslog-5.8.5.ebuild 7270 RMD160 92c6c5e6a42771b09f7a06be9ccf002a165c59ff SHA1 7ae60a5ccbcfcabfb701864705424910c8593807 SHA256 fd166bc60cc5014993bda6e5520a9b601cf95a0385ebb854f8b89be51888998f +MISC ChangeLog 380 RMD160 ad7a839e6f2ebcc1b664221d84ed7fe56cc953fa SHA1 45bbdc4613cff21e5a393b04b2e64b990c054521 SHA256 697067370f3459c8cde176966cca5bf21da5f3ed2771f2218ebec75d2505c9b2 MISC metadata.xml 790 RMD160 b510baec6979e673985861b294cf81d684847aca SHA1 61f748e9f95c443b5df58e79884bb323af5cfb45 SHA256 582f1c0e1e7d4826802fae8bc1efeae83a2ee04496ccfd1776872fc0dc227b10 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk5klZ4ACgkQKiQSS7ZY+hO4sQD/TgLIj2IbxtKnyDd1qApLPQuk -G4ro4Rws7KR2ypYeUKQA/0OkUIOWauyYrnUC6nqkK2FSedBJMqrFlWxXYRiAV4ne -=uRrO +iF4EAREIAAYFAk5kvvwACgkQKiQSS7ZY+hNtFAEAyAe0iH4Q4NPS8NvngP8ih1jY +ppODHUr0RVkjovSEoKMBALz28c+Iq8/EDPYAD51ZIAz6OBXovF96A1FJRsPFKP10 +=1C4F -----END PGP SIGNATURE----- diff --git a/app-admin/rsyslog/rsyslog-5.8.5.ebuild b/app-admin/rsyslog/rsyslog-5.8.5.ebuild index ba042a9f5a1a..fa4fbf52de0f 100644 --- a/app-admin/rsyslog/rsyslog-5.8.5.ebuild +++ b/app-admin/rsyslog/rsyslog-5.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.1 2011/09/05 09:25:41 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-5.8.5.ebuild,v 1.2 2011/09/05 12:22:11 ultrabug Exp $ EAPI=4 @@ -47,9 +47,12 @@ src_prepare() { if use zeromq; then local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a epatch ${ZEROPATH}/rsyslog-zeromq.patch - cp -r "${ZEROPATH}/{i,o}mzeromq" "${S}/plugins" - eautoreconf + cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins" fi + + # Don't force '-g' CFLAG + sed -i 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' configure.ac || die + eautoreconf } src_configure() { @@ -96,6 +99,10 @@ src_configure() { $(use_enable debug diagtools) $(use_enable debug memcheck) $(use_enable debug valgrind) + ) + + use zeromq && myeconfargs=( + ${myeconfargs[@]-} $(use_enable zeromq imzeromq) $(use_enable zeromq omzeromq) ) @@ -116,6 +123,8 @@ src_install() { keepdir /etc/ssl/${PN} keepdir /etc/${PN}.d + use static-libs || find "${D}" -name '*.la' -delete || die + if use mysql; then insinto /usr/share/doc/${PF}/scripts/mysql doins plugins/ommysql/{createDB.sql,contrib/delete_mysql} -- 2.26.2