Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2012-10-08 07:12:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2012-09-17 16:57:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2012-10-08 07:12:59.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 26 16:26:34 UTC 2012 - [email protected] + +- added upstream patch to fix the segfault caused by the epn rewrite in #2197 (bnc#780107) + +------------------------------------------------------------------- New: ---- fix_epn_segfault.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.Irw0UX/_old 2012-10-08 07:13:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Irw0UX/_new 2012-10-08 07:13:03.000000000 +0200 @@ -46,6 +46,8 @@ Patch0: icinga-add-ifdefine-to-apache.patch # PATCH-FIX Patch2: icinga-fix-fsf-address.patch +# PATCH-FIX-UPSTREAM fix_epn_segfault.patch [bnc#780107] +Patch3: fix_epn_segfault.patch BuildRequires: apache2-devel BuildRequires: nagios-rpm-macros >= 0.05 %if 0%{?suse_version} >= 1110 @@ -230,6 +232,7 @@ %setup -q %patch0 -p1 %patch2 -p1 +%patch3 -p1 # remove GPLv3+ source files which are not needed for this package rm "t-tap/"*.c ++++++ fix_epn_segfault.patch ++++++ commit cedcb4a3f9fd34e2a72988e560a884fb0d8891af Author: Michael Friedrich <[email protected]> Date: Tue Aug 28 10:27:33 2012 +0200 core: fix epn rewrite in #2197 causes segfault thanks dennis lichtenthaeler for the fix. fixes #3027 diff --git a/base/utils.c b/base/utils.c index b1891b9..c174a8a 100644 --- a/base/utils.c +++ b/base/utils.c @@ -3601,6 +3601,7 @@ int file_uses_embedded_perl(char *fname) { /* grab the first line - we should see Perl. go home if not */ if (fgets(buf, 80, fp) == NULL || strstr(buf, "/bin/perl") == NULL) { fclose(fp); + return FALSE; } /* epn directives must be found in first ten lines of plugin */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
