fix valgrind failing test

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 2ed5945924f06889315f8a2d8dbb3e7644c20896..dacacf535359834d55e0b5e42bb7be223b97c1a3 100644 (file)
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.135 2015/03/26 15:17:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.136 2015/03/27 09:45:23 ultrabug Exp $
+
+  27 Mar 2015; Ultrabug <ultrabug@gentoo.org> rsyslog-8.7.0-r2.ebuild,
+  +files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.
+  patch:
+  disable failing valgrind test by Thomas D.
 
 *rsyslog-8.7.0-r2 (26 Mar 2015)
 

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 3d4fd68ff337417904e0807234ae332cff8a225c..d6cc2b89e0ab03d2078aa30ff46eebaac95f4590 100644 (file)
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 8-stable/10-respect_CFLAGS-r1.patch 781 SHA256 14d8f77bbab2e77e177f357e93766b599c06e70ccc9c1ff0d74fc18a463a995b SHA512 a3db26c106e83805d4fe066fff1abfc6c04031933528f61ddda95098c1199e53deebada98834e06f202656f1b2ab06f3a7e765ee58d37407b9fbd96d2b4deb66 WHIRLPOOL aa64b9aa2014b217004a13abae429c2b11e3dc8c056e0206be3d69f3e45e888404adcc208348db35c4d4ced986310b453984ce6d3b585fe60fc419d5f02e2eb6
 AUX 8-stable/10-respect_CFLAGS.patch 646 SHA256 e1c28e8088a9237d3987da5b6902235eb11de3343f3d3516cb4f011d25f70cac SHA512 446ae1bd61817ed20012b504db81daeb2b8e121d82ca4c6dc561a3e468e740d676ac695dfc46c4417b62c3d97fcd4b2db9e9207ef65017eda2a090a9fc209594 WHIRLPOOL 2bc4c4800c9f0650f181fa1095cc4b5c495936a5a3bd82b50281b4d23dbf76fdd2d10d0419c13284f345496ca0006781efe7a0f51edc1d6f858b04ad63b7453f
 AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
+AUX 8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch 1990 SHA256 9907303d04ddfb46237c727e04d76167291a7d7ffe1e751b65267b0abae15b37 SHA512 d533d11b9eab8da93f74d772f601606ec68ab1750c3a32cb9bd96417f3e020b51068d6b2d02f97e049bbb266847f41d15c49ab377b2c03da4b2fd759275b799b WHIRLPOOL 41d10f1f18c00535ff7326b9459ca27f266929027e717744ab1ec136c613852ecb7d87c6e9cab6a12169163b5fbe6e4c9d181b5044a3edc3320e90d586477525
 AUX 8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch 1148 SHA256 058ff2c124656a8f156e021530df0cf80d4adc37e347612f3cb2b60574cd84a7 SHA512 1f7ebb3b5e0b2fb6ada7c176893488082a681224e7fca66d7370ef679974341ce289df853d302a858a732d0af3082bce67bee2f081950c96021699993e845a9c WHIRLPOOL 2a2296e9f448cb8a22dfb18787748ee9a4ce950d76d42966493d179cae97b71f3a60bf139b69c8b3f968594c32f4627f7ea449e99b83cad281c25e46bd1f5b90
 AUX 8-stable/50-rsyslog-run-queue-persist-test-only-once.patch 616 SHA256 94cbb40e2d4bc23313385323e6ae4f58ec979ba01bf01bbef7c8b6867a696ec9 SHA512 087d5b0911baa898e3fe7b2b80b15923129c3a5d4874f17693508760c1e38b44139b2fd7e1cb4b8c589631d0c41b56ed26ad8df2300ad2f18be43d0f5f04ba4f WHIRLPOOL 6062c8acda4ca608e4f7d94585b8ea40823f40d37e25428d18824e36f0299bcd7b912e8ab0dcc1631ddcf709754e74d46aaf5e9115cbe36b3d8a55f939436a5c
 AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
@@ -16,13 +17,13 @@ DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6f
 DIST rsyslog-doc-8.4.2.tar.gz 4066598 SHA256 21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 SHA512 cbb46e219af5a7b9c60e3a60a75713f88405f7a4036f9d308f17a06ae8e8db0bdff9eae5807a067b9347a0aad264ef9ed73e6587502df2de412569f6d13b7ff6 WHIRLPOOL 97f4de085bf388523df8fa245607c965b0bfdeb13f28c6659f4a267fccaa9f6f7a898cc2f68822796ad69266e5593297db572a9679c8e20e5bc5fd6d26d067f5
 DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
 EBUILD rsyslog-8.4.2.ebuild 9553 SHA256 7a4c84cef6a9dfd89be22ca8736487597acf5ebe022ab6e7fbadd0f30f1e3c44 SHA512 29c00a2bc9c879e75a14af69f82c0a4eb734d82862a5e02c1c194a3aff8191f22ba32afb256683a3e2d68374d89a30b1a16446180f35a6f2ec53d6b1a326ca1f WHIRLPOOL c1624c6f3fe27c233a8193b1ce7010be36f8c8c3ac2c4a4115cd1ff5da78b5b17924ce3a9a72d4190abb9a1415b184da84427c3f2f5b74de99b04ef586d16993
-EBUILD rsyslog-8.7.0-r2.ebuild 11185 SHA256 770ff78e66f88d51df1129c7cf16394d8510369a4453c25bd3cedc1637fc0eca SHA512 1e69fdf9caed3bd6b95c9b8904088ae97c2bd8ab2cdcfb4d1bc5c54b7b1e710a6359bb460be69b324e1412a5f12a6f8cb91d844b4281f6e8295a3fdc1abe590a WHIRLPOOL 9640323300f8970acf5f6ff8442fbaba28ee79456b07e8872c0e1383236c842d50bbbf24be23d42d6406609b913f964f4e6e340e242b078c9f283b1c589aa550
-MISC ChangeLog 26119 SHA256 b121a66fa3a0d0d89364da42d725394051cbd51726023938e173a3f8432cb6f1 SHA512 7891f615b680c19c327c7a09c6fa507d0f43b72bc96bc92cf558f4f13b60f3136da2d6e166d14d893fb3dc08463c3f58b0c6603795f62ae70100ed566046528b WHIRLPOOL 4bb0904f87d3e9f1033599b20a346e1a4b959e408ec2e717e5ecf01b5e52c8d77cabaf75c710f457ffec26cacbe4118edd25e564e58a281bc2348490ca0ccfa7
+EBUILD rsyslog-8.7.0-r2.ebuild 11321 SHA256 ef4e539ba7571813253d29486259a51867dc6e671286d426b3aeb28089b6eb46 SHA512 6b7bd86140ade9455afc6a834bb5ef54202d89965bbf2f0d0a1e428fc1ab1bdbc11d1154b33fdf901bb15d0cfd6be25ef018609044e0a76a3b8a1e27a8dfc103 WHIRLPOOL 0ffa2c19d2dd24d20b2b918991d73ce7c7c7b6dedec418bd10af85e9d987bed6f44ec9b75e307a265d7faa34e378b311e26b3534b963de33fa03895e219c54d2
+MISC ChangeLog 26325 SHA256 6774babd8a832b8d98f3fd43d1f59fe6069a3abef57148bfc4b852d70d79bbd8 SHA512 217df5a4a53cc75e51aa24e4f99cccefa58aa7bd6d376b90c507fc5b6cfc79b5a1a6ed817a732284645bdaf80b0815d407c16dfcb5c53a086a19189006cee002 WHIRLPOOL f9a95953326f5e0097911f1e6963a566bc52d2ea46a97c5a4175c36063dca4a4a00296da4e6f441313420cd7ee0fc5435584eba7703c4badadb84bef4f235b0f
 MISC metadata.xml 2907 SHA256 34ee0914c446e0c687bf670dd78f9a5d622db4e119717e6ac2a0376202a7dc68 SHA512 4dadaaaf210a50813311bfa8b25136bb39ef963f19120ed006e49eb91ef81941790dd51394f13fd9f84fba5bf2e42d456ecac3083cdd7124d1ed1cbd32e2e770 WHIRLPOOL bd06001a2a33427ac323c95c4dda9de66e19b81645ac4c9f428d9cedaa7ba95c819db1208c4ff0d39540c9117f958dc268da55402004a0d4d3262c485d4f2a2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUUIvoACgkQKiQSS7ZY+hPwfAEA5iHUASPI51pohqUYupnWPY0j
-QFny4pqsKVOt/sDSJroA/193JmNuBSUZNIfrgC/q9NgeqUMrSC73eJqgQmPVRZrJ
-=bJIT
+iF4EAREIAAYFAlUVJrcACgkQKiQSS7ZY+hNIJAEA6vSG3pdq9KnwaJKN/VZIMuDn
+F3gA3khlS34pBQvPzQkA/jtb2pmELLFzhgGLqYlzV7aWr7c0cANI3iitmUz0oLzS
+=ZEkk
 -----END PGP SIGNATURE-----

diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch
new file mode 100644 (file)
index 0000000..77d7919
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch
@@ -0,0 +1,56 @@
+From 2945539d12bbb79c44fd4402e87150b4ec58af25 Mon Sep 17 00:00:00 2001
+From: Thomas D.
+Date: Tue, 24 Mar 2015 02:03:13 +0100
+Subject: [PATCH] Add option to disable valgrind usage in testbench
+
+Temporary workaround for https://github.com/rsyslog/rsyslog/issues/263
+
+---
+ configure.ac | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c72f80..cdfdd25 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,10 +13,6 @@ AC_CONFIG_HEADERS([config.h])
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-# check if valgrind is present
+-AC_CHECK_PROG(have_valgrind, [valgrind], [yes])
+-AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes)
+-
+ # Checks for programs.
+ AC_PROG_LEX
+ AC_PROG_YACC
+@@ -1125,6 +1121,29 @@ if test "x$enable_testbench" = "xyes"; then
+ fi
+ 
+ 
++# valgrind-testbench
++AC_ARG_WITH([valgrind_testbench],
++        [AS_HELP_STRING([--without-valgrind-testbench], [Don't use valgrind in testbench])]
++)
++
++if test "x$with_valgrind_testbench" != "xno"; then
++        AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no])
++
++        if test "x$enable_testbench" = "xyes" && test "x$VALGRIND" = "xno"; then
++                if test "x$with_valgrind_testbench" = "xyes"; then
++                        AC_MSG_ERROR([valgrind is missing but forced with --with-valgrind-testbench. Either install valgrind or remove the option!])
++                else
++                        AC_MSG_WARN([valgrind is missing -- testbench won't use valgrind!])
++                fi
++        else
++                AC_MSG_NOTICE([testbench will use valgrind])
++        fi
++else
++      AC_MSG_NOTICE([testbench won't use valgrind due to set --without-valgrind-testbench option])
++fi
++AM_CONDITIONAL([HAVE_VALGRIND], [test "x$with_valgrind_testbench" != "xno" && test "x$VALGRIND" != "xno"])
++
++
+ # settings for the file input module
+ AC_ARG_ENABLE(imfile,
+         [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])],

diff --git a/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild
index f2edd509ab340621b613d885d5765b2c55d5bf98..b7da0dc7c9f3b3de0da3cde6bd8976f832ab02c8 100644 (file)
--- a/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.1 2015/03/26 15:17:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.2 2015/03/27 09:45:23 ultrabug Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -37,6 +37,7 @@ else
 
        PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-run-queue-persist-test-only-once.patch )
        PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-fix-size-based-legacy-config-statements.patch )
+       PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -142,6 +143,7 @@ src_configure() {
 
        local myeconfargs=(
                --disable-generate-man-pages
+               --without-valgrind-testbench
                $(use_enable test testbench)
                # Input Plugins without depedencies
                --enable-imdiag