OpenPKG Specs: rrdtool/rrdtool.patch@fd611cde817f (annotated)

rrdtool/rrdtool.patch@fd611cde817f (annotated)

rrdtool/rrdtool.patch

Sat, 24 Mar 2012 21:40:49 +0100

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Sat, 24 Mar 2012 21:40:49 +0100
changeset 414: fd611cde817f
parent 173: 51607f58727f
child 490: 615d51fb3fea
permissions: -rw-r--r--

Introduce many changes to the buildconf and source code including:
(01) clean up, update, and partially update default config files,
(02) seems that Melware is unable to perform release engineering so
update chan_capi to new daily snapshot to solve echo problems,
(03) correct Asterisk inadequate hard coded gmime version check,
(04) force postgresql pthreads linkage to solve build problem,
(05) remove buggy hard coded LibXML configure definitions,
(06) remove local architecture specification to allow GCC
internal logic to determine proper CPU type instead,
(07) remove vendor sound install target causing uncontrolled
downloads and non RPM managed file installation,
(08) solve long outstanding bug in tcptls causing Asterisk
to ignore any intermediate CA certificate signatures,
(09) back out Digium engineering team's bright idea of replacing the
very portable and pervasive POSIX rand(1) with ast_random(), and
then not even implementing it causing all references to fail in
platforms not providing the very new POSIX.1-2008 mkdtemp(3)
function only distributed by BSD and some Linux,
(10) withdraw advanced linker symbol manipulations from SVR5 builds
until either Binutils supports hybrid versioned and anonymous
linker scripts or GCC stops hard coding versioned linker scripts,
(11) correct missing library linkage, some tailored to a specific OS,
(12) remove outdated logic for the no longer distributed gmime-config(1),
(13) remove local gmime buildconf hacks now that Asterisk has corrected
their own build configuration to almost portably support gmime,
(14) solve build problems relating to undetected LibXML paths,
(15) correct erroneous out of tree include definitions,
(16) improve some variable and comment naming,
(17) simplify sound language path hierarchy creation,
and correct australian english installation logic.

 Index: RRDTool-OO-0.31/Makefile.PL
 --- RRDTool-OO-0.31/Makefile.PL.orig	2010-01-09 00:50:31.000000000 +0100
 +++ RRDTool-OO-0.31/Makefile.PL	2010-12-27 08:45:34.000000000 +0100
@@ -10,52 +10,12 @@
      }
  };
 -# Check if RRDs is installed
 -
 -eval "use RRDs 1.2011";
 -
 -    # (1) libcgi is missing on most Linux/FreeBSD systems, and we
 -    #     don't need it anyway.
 -    # (2) as of rrdtool-1.2.11, tcl libs didn't compile, so let's
 -    #     leave them out.
 -my $CONFIGURE_OPTS = "--enable-perl-site-install --prefix=/usr --disable-tcl --disable-rrdcgi";
 -
 -my $DIST_URL =
 -"http://oss.oetiker.ch/rrdtool/pub/rrdtool.tar.gz";
 -
 -if($@) {
 -    print <<EOT;
 -This module requires rrdtool 1.2.x and the RRDs module to be
 -installed. They are available in the rrdtool distribution:
 - $DIST_URL
 -EOT
 -
 -    $| = 1;
 -    my $in = prompt ("Do you want me to install it for you right now (y/n)?","n");
 -    chomp $in;
 -    if($in =~ /^\s*$/ or $in =~ /y/i) {
 -        if($> != 0) {
 -            die "\nYou need to be root to do this.\n";
 -        }
 -        eval { install_RRDs() };
 -        if($@) {
 -            print $@;
 -            note();
 -            exit 0;
 -        }
 -    } else {
 -        note();
 -        exit 0;
 -    }
 -}
 -
  # See lib/ExtUtils/MakeMaker.pm for details of how to influence
  # the contents of the Makefile that is written.
  WriteMakefile(
      NAME              => 'RRDTool::OO',
      VERSION_FROM      => 'lib/RRDTool/OO.pm', # finds $VERSION
      PREREQ_PM         => {
 -                         Log::Log4perl => '0.40',
                           RRDs          => 0,
                           }, # e.g., Module::Name => 1.1
      $ExtUtils::MakeMaker::VERSION >= 6.50 ? (%$meta_merge) : (),
 Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm
 --- RRDTool-OO-0.31/lib/RRDTool/OO.pm.orig	2010-05-26 02:26:34.000000000 +0200
 +++ RRDTool-OO-0.31/lib/RRDTool/OO.pm	2010-12-27 08:45:34.000000000 +0100
@@ -5,7 +5,6 @@
  use warnings;
  use Carp;
  use RRDs;
 -use Log::Log4perl qw(:easy);
  our $VERSION = '0.31';
@@ -189,7 +188,7 @@
          # Check if we got all mandatory parameters
      for(@{$ref->{mandatory}}) {
          if(! exists $options_hash{$_}) {
 -            Log::Log4perl->get_logger("")->logcroak(
 +            croak(
                  "Mandatory parameter '$_' not set " .
                  "in $method() (@{[%mandatory]}) (@$options)");
          }
@@ -201,7 +200,7 @@
          for(keys %options_hash) {
              if(! exists $optional{$_} and
                 ! exists $mandatory{$_}) {
 -                Log::Log4perl->get_logger("")->logcroak(
 +               croak(
                      "Illegal parameter '$_' in $method()");
              }
          }
 Index: bindings/perl-shared/Makefile.PL
 --- bindings/perl-shared/Makefile.PL.orig	2010-12-17 17:10:20.000000000 +0100
 +++ bindings/perl-shared/Makefile.PL	2010-12-27 08:47:23.000000000 +0100
@@ -1,36 +1,7 @@
  use ExtUtils::MakeMaker;
  use Config;
 -# See lib/ExtUtils/MakeMaker.pm for details of how to influence
 -# the contents of the Makefile that is written.
 -# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
 -# path to librrd.so then the Makefile will be written such that RRDs.so knows
 -# where to find librrd.so later on ...
 -my $R="";
 -if ($ARGV[-1] =~ /RPATH=(\S+)/){
 -	pop @ARGV;
 -	my $rp = $1;
 -	for ($^O){
 -	        /linux/   && do{ $R = "-Wl,--rpath -Wl,$rp"};
 -	        /hpux/    && do{ $R = "+b$rp"};
 -	        /solaris/ && do{ $R = "-R$rp"};
 -	        /bsd/     && do{ $R = "-R$rp"};
 -                /aix/     && do{ $R = "-blibpath:$rp"};
 -	}
 -}
 -
 -# darwin works without this because librrd contains its
 -# install_name which will includes the final location of the
 -# library after it is installed. This install_name gets transfered
 -# to the perl shared object.
 -
 -my $librrd;
 -if ($^O eq 'darwin'){
 -        $librrd = '-lrrd';
 -}
 -else {
 -        $librrd = "-L../../src/.libs/ $R -lrrd";
 -}
 +my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lxml2 -lz -liconv -lm -lsocket -lnsl -lpangocairo -lpango -lcairo -lpangoft2 -lglib2 -lintl -lgobject2 -lgmodule2 -lpcre -lpixman-1 -lfontconfig -lexpat -lfreetype -lpng -lz -lpango -lm -lfontconfig -lexpat -lgobject2 -lgmodule2 -lglib2 -lintl -liconv -lpcre -lfreetype -lart_lgpl";
  WriteMakefile(
      'NAME'         => 'RRDs',
 Index: bindings/python/setup.py
 --- bindings/python/setup.py.orig	2008-03-15 11:39:48.000000000 +0100
 +++ bindings/python/setup.py	2010-12-27 08:45:34.000000000 +0100
@@ -47,7 +47,7 @@
            Extension(
              "rrdtoolmodule",
              ["rrdtoolmodule.c"],
 -            libraries=['rrd'],
 +            libraries=['rrd', 'freetype', 'art_lgpl', 'png', 'z'],
              library_dirs=[library_dir],
              include_dirs=[include_dir],
            )
 Index: configure
 --- configure.orig	2010-12-26 20:51:06.000000000 +0100
 +++ configure	2010-12-27 08:45:34.000000000 +0100
@@ -24785,13 +24785,13 @@
   if test "x""" != "x"; then
     CPPFLAGS="$CPPFLAGS -I"""
   fi
 -  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib-2.0" >&5
 -$as_echo_n "checking for glib_check_version in -lglib-2.0... " >&6; }
 +  { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib2" >&5
 +$as_echo_n "checking for glib_check_version in -lglib2... " >&6; }
  if test "${ac_cv_lib_glib_2_0_glib_check_version+set}" = set; then
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lglib-2.0  $LIBS"
 +LIBS="-lglib2  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -24980,7 +24980,7 @@
  fi
  if test "x$ac_cv_header_glib_h" = x""yes; then
 -  LIBS="-lglib-2.0 ${LIBS}";EX_CHECK_STATE=YES
 +  LIBS="-lglib2 ${LIBS}";EX_CHECK_STATE=YES
  fi
@@ -25043,7 +25043,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lglib-2.0  $LIBS"
 +LIBS="-lglib2  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -25335,7 +25335,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpangocairo-1.0  $LIBS"
 +LIBS="-lpangocairo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -25524,7 +25524,7 @@
  fi
  if test "x$ac_cv_header_pango_pango_h" = x""yes; then
 -  LIBS="-lpangocairo-1.0 ${LIBS}";EX_CHECK_STATE=YES
 +  LIBS="-lpangocairo ${LIBS}";EX_CHECK_STATE=YES
  fi
@@ -25587,7 +25587,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpangocairo-1.0  $LIBS"
 +LIBS="-lpangocairo  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -28938,9 +28938,9 @@
  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION} -I${py_prefix}/include/python"
  if test "$py_prefix" != "$py_exec_prefix"; then
 -  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 +  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} -I${py_exec_prefix}/include/python"
  fi
  save_CPPFLAGS="$CPPFLAGS"
 Index: src/rrd_daemon.c
 --- src/rrd_daemon.c.orig	2010-12-21 17:06:32.000000000 +0100
 +++ src/rrd_daemon.c	2010-12-27 08:45:34.000000000 +0100
@@ -113,7 +113,7 @@
  #include <tcpd.h>
  #endif /* HAVE_LIBWRAP */
 -#include <glib-2.0/glib.h>
 +#include <glib2/glib.h>
  /* }}} */
  #define RRDD_LOG(severity, ...) \
 Index: src/rrd_open.c
 --- src/rrd_open.c.orig	2010-12-26 20:24:48.000000000 +0100
 +++ src/rrd_open.c	2010-12-27 08:45:34.000000000 +0100
@@ -265,7 +265,7 @@
  #endif
      if (rdwr & RRD_CREAT)
          goto out_done;
 -#ifdef USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED) && defined(MADV_SEQUENTIAL) && defined(MADV_RANDOM)
      if (rdwr & RRD_COPY) {
          /* We will read everything in a moment (copying) */
          madvise(data, rrd_file->file_len, MADV_WILLNEED );
@@ -300,7 +300,7 @@
                        rrd->stat_head->version);
          goto out_nullify_head;
      }
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
      /* the ds_def will be needed soonish, so hint accordingly */
      madvise(data + PAGE_START(offset),
              sizeof(ds_def_t) * rrd->stat_head->ds_cnt, MADV_WILLNEED);
@@ -308,7 +308,7 @@
      __rrd_read(rrd->ds_def, ds_def_t,
                 rrd->stat_head->ds_cnt);
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
      /* the rra_def will be needed soonish, so hint accordingly */
      madvise(data + PAGE_START(offset),
              sizeof(rra_def_t) * rrd->stat_head->rra_cnt, MADV_WILLNEED);
@@ -323,7 +323,7 @@
              rrd_set_error("live_head_t malloc");
              goto out_close;
          }
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
          /* the live_head will be needed soonish, so hint accordingly */
          madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
  #endif
@@ -333,7 +333,7 @@
          rrd->live_head->last_up = *rrd->legacy_last_up;
          rrd->live_head->last_up_usec = 0;
      } else {
 -#if defined USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_WILLNEED)
          /* the live_head will be needed soonish, so hint accordingly */
          madvise(data + PAGE_START(offset),
                  sizeof(live_head_t), MADV_WILLNEED);
@@ -504,7 +504,7 @@
                         + rrd->rra_ptr[i].cur_row
                         * rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
          if (active_block > dontneed_start) {
 -#ifdef USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_DONTNEED)
              madvise(rrd_simple_file->file_start + dontneed_start,
                      active_block - dontneed_start - 1, MADV_DONTNEED);
  #endif
@@ -529,7 +529,7 @@
      }
      if (dontneed_start < rrd_file->file_len) {
 -#ifdef USE_MADVISE
 +#if defined(USE_MADVISE) && defined(MADV_DONTNEED)
  	    madvise(rrd_simple_file->file_start + dontneed_start,
  		    rrd_file->file_len - dontneed_start, MADV_DONTNEED);
  #endif

OpenPKG Specs / annotate

rrdtool/rrdtool.patch@fd611cde817f (annotated)

rrdtool/rrdtool.patch