[rrd-users] Why is this patch getting rejected?

[Ulf Zimmermann]

Patch applies, getting one warning during autoreconf:

+ autoreconf
/usr/share/aclocal/libmcrypt.m4:17: warning: underquoted definition of AM_PATH_LIBMCRYPT
  run info '(automake)Extending aclocal'
  or see http://sources.redhat.com/automake/automake.html#Extending-aclocal


> -----Original Message-----
> From: Tobias Oetiker [mailto:tobi at oetiker.ch]
> Sent: Tuesday, December 28, 2010 7:18 AM
> To: Ulf Zimmermann
> Cc: rrd-users at lists.oetiker.ch
> Subject: Re: [rrd-users] Why is this patch getting rejected?
> 
> Hi Ulf,
> 
> try the attached patch
> 
> cheers
> tobi
> 
> Yesterday Ulf Zimmermann wrote:
> 
> > I had built with help of Tobi, a 1.4.2 version, which has a no-graph support,
> so it could be built on EL4.  When I try to apply the updated patch to 1.4.5 it
> fails, but I can't see why:
> >
> > patch -p0 -s --verbose < /home/ulf/rpmbuild/SOURCES/rrdtool-1.4.5-
> no_graph_patch
> > Hmm...  Looks like a unified diff to me...
> > The text leading up to this was:
> > --------------------------
> > |Index: src/rrd_tool.c
> >
> |=========================================================
> ==========
> > |--- src/rrd_tool.c     (revision 1966)
> > |+++ src/rrd_tool.c     (working copy)
> > --------------------------
> > Patching file src/rrd_tool.c using Plan A...
> > Hunk #1 succeeded at 695 (offset 2 lines).
> > Hunk #2 succeeded at 770 (offset 1 line).
> > Hunk #3 succeeded at 809 (offset 2 lines).
> > Hunk #4 succeeded at 820 with fuzz 1 (offset 1 line).
> > Hmm...  The next patch looks like a unified diff to me...
> > The text leading up to this was:
> > --------------------------
> > |Index: src/Makefile.am
> >
> |=========================================================
> ==========
> > |--- src/Makefile.am    (revision 1966)
> > |+++ src/Makefile.am    (working copy)
> > --------------------------
> > Patching file src/Makefile.am using Plan A...
> > Hunk #1 succeeded at 29.
> > Hmm...  The next patch looks like a unified diff to me...
> > The text leading up to this was:
> > --------------------------
> > |Index: configure.ac
> >
> |=========================================================
> ==========
> > |--- configure.ac       (revision 1966)
> > |+++ configure.ac       (working copy)
> > --------------------------
> > Patching file configure.ac using Plan A...
> > Hunk #1 succeeded at 102.
> > Hunk #2 FAILED at 543.
> > Hunk #3 succeeded at 964.
> > 1 out of 3 hunks FAILED -- saving rejects to file configure.ac.rej
> > Done
> >
> > The reject file has:
> >
> > el4build ulf BUILD/rrdtool-1.4.5 > cat configure.ac.rej
> > ***************
> > *** 536,554 ****
> >
> >   AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
> >
> >
> >   CORE_LIBS="$LIBS"
> >
> > - dnl EX_CHECK_ALL(z,          zlibVersion,               zlib.h,                 zlib,        1.2.3,
> http://www.gzip.org/zlib/, "")
> > - dnl EX_CHECK_ALL(png,        png_access_version_number, png.h,
> libpng,      1.2.10,  http://prdownloads.sourceforge.net/libpng/, "")
> > - dnl EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,
> freetype2,   2.1.10,  http://prdownloads.sourceforge.net/freetype/,
> /usr/include/freetype2)
> > - dnl EX_CHECK_ALL(fontconfig, FcInit,                    fontconfig.h,
> fontconfig,  2.3.1,  http://fontconfig.org/release/, /usr/include)
> >   EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,
> cairo-png,   1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,
> cairo-svg,   1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,
> cairo-pdf,   1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,
> cairo-ps,    1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,
> 2.12.12, ftp://ftp.gtk.org/pub/glib/2.12/, "")
> >   EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,
> pango/pango.h,  pangocairo,  1.17,
> http://ftp.gnome.org/pub/GNOME/sources/pango/1.17, "")
> >   EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-
> 2.0,        2.6.31,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
> >
> >   if test "$EX_CHECK_ALL_ERR" = "YES"; then
> > --- 543,561 ----
> >
> >   AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no])
> >
> > + AM_CONDITIONAL(BUILD_RRDGRAPH,[test $enable_rrd_graph != no])
> > +
> >
> >   CORE_LIBS="$LIBS"
> >
> > + if test $enable_rrd_graph != no; then
> >   EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,
> cairo-png,   1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,
> cairo-svg,   1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,
> cairo-pdf,   1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,
> cairo-ps,    1.4.6,  http://cairographics.org/releases/, "")
> >   EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,
> 2.12.12, ftp://ftp.gtk.org/pub/glib/2.12/, "")
> >   EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,
> pango/pango.h,  pangocairo,  1.17,
> http://ftp.gnome.org/pub/GNOME/sources/pango/1.17, "")
> > + fi
> >   EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-
> 2.0,        2.6.31,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
> >
> >   if test "$EX_CHECK_ALL_ERR" = "YES"; then
> >
> >
> 
> --
> Tobi Oetiker, OETIKER+PARTNER AG, Aarweg 15 CH-4600 Olten, Switzerland
> http://it.oetiker.ch tobi at oetiker.ch ++41 62 775 9902 / sb: -9900