From 067b6a8f9d44f008b93d92eda8f05cc35c1de62e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 5 Dec 2014 19:45:29 +0000
Subject: rrdtool: update to 1.4.8

---
 abs/extra/rrdtool/PKGBUILD                |  53 ++++++-----
 abs/extra/rrdtool/rrdtool-pangofont.patch |  39 +++++++++
 abs/extra/rrdtool/rrdtool-systemd.patch   | 140 ++++++++++++++++++++++++++++++
 3 files changed, 210 insertions(+), 22 deletions(-)
 create mode 100644 abs/extra/rrdtool/rrdtool-pangofont.patch
 create mode 100644 abs/extra/rrdtool/rrdtool-systemd.patch

diff --git a/abs/extra/rrdtool/PKGBUILD b/abs/extra/rrdtool/PKGBUILD
index d22d133..fb5a6fe 100644
--- a/abs/extra/rrdtool/PKGBUILD
+++ b/abs/extra/rrdtool/PKGBUILD
@@ -1,39 +1,48 @@
-# $Id: PKGBUILD 88191 2010-08-21 01:59:03Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom K <tom@archlinux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
-pkgver=1.4.4
-pkgrel=2
+pkgver=1.4.8
+pkgrel=4
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
 license=('GPL' 'custom')
-depends=('libpng' 'libxml2' 'pango')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
+depends=('libxml2' 'pango' 'ttf-dejavu')
+makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua51')
 optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
-options=('!libtool' '!emptydirs' '!makeflags')
-changelog=ChangeLog
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-md5sums=('93ad2fc2e9ddcd7d99c611fe30284a54')
-sha1sums=('e4715c13f2a6fd077c54911d396eb573788377b0')
+            'lua51: to use corresponding binding')
+options=('!emptydirs' '!makeflags')
+source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
+        rrdtool-pangofont.patch rrdtool-systemd.patch)
+sha1sums=('56d68857f39e70bfa32360947614d8220702ed02'
+          '8c600285bdab7776c1d5301df7cf486d69eae048'
+          '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
+  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am
+  patch -p1 -i "${srcdir}/rrdtool-pangofont.patch"
+  patch -p1 -i "${srcdir}/rrdtool-systemd.patch"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --localstatedir=/var --disable-rpath --enable-perl \
-    --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
+  cd ${pkgname}-${pkgver}
+  autoreconf
+  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+    LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
+    ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
+    --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install \
-    --enable-tcl
-  make
+    --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
+  make LIBS+="-lglib-2.0"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" LIBRUBYARG_SHARED="-Wl,-L/usr/lib -lruby" \
-    LIBPATH="-L. -L/usr/lib -L../../src/.libs" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/abs/extra/rrdtool/rrdtool-pangofont.patch b/abs/extra/rrdtool/rrdtool-pangofont.patch
new file mode 100644
index 0000000..60936d8
--- /dev/null
+++ b/abs/extra/rrdtool/rrdtool-pangofont.patch
@@ -0,0 +1,39 @@
+From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi@oetiker.ch>
+Date: Wed, 24 Apr 2013 23:49:28 +0200
+Subject: [PATCH] move to non-deprecated pango_font_map_create_context
+
+---
+ configure.ac    | 2 +-
+ src/rrd_graph.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f9e395..d6b2722 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,
+ EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,            cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
+ EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
+-EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_context_set_font_options,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
++EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
+ 
+ fi
+ EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
+diff --git a/src/rrd_graph.c b/src/rrd_graph.c
+index 5547aa6..25ae485 100644
+--- a/src/rrd_graph.c
++++ b/src/rrd_graph.c
+@@ -4282,7 +4282,7 @@ void rrd_graph_init(
+         fontmap = pango_cairo_font_map_get_default();
+     }
+ 
+-    context =  pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap);
++    context =  pango_font_map_create_context(fontmap);
+ 
+     pango_cairo_context_set_resolution(context, 100);
+ 
+-- 
+1.8.1.6
+
diff --git a/abs/extra/rrdtool/rrdtool-systemd.patch b/abs/extra/rrdtool/rrdtool-systemd.patch
new file mode 100644
index 0000000..856f9ef
--- /dev/null
+++ b/abs/extra/rrdtool/rrdtool-systemd.patch
@@ -0,0 +1,140 @@
+From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi@oetiker.ch>
+Date: Mon, 2 Jul 2012 15:05:32 +0000
+Subject: [PATCH] serviced config etc files for rrdtool
+
+git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2292 a5681a0c-68f1-0310-ab6d-d61299d08faa
+---
+ etc/rrdcached.service.in | 19 +++++++++++++++++++
+ etc/rrdcached.socket.in  | 18 ++++++++++++++++++
+ 2 files changed, 37 insertions(+)
+ create mode 100644 etc/rrdcached.service.in
+ create mode 100644 etc/rrdcached.socket.in
+
+diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in
+new file mode 100644
+index 0000000..3b6f309
+--- /dev/null
++++ b/etc/rrdcached.service.in
+@@ -0,0 +1,19 @@
++#
++# To customize, copy this file to /etc/systemd/system/
++# and edit there
++#
++
++[Unit]
++Description=Data caching daemon for rrdtool
++Documentation=man:rrdcached(1)
++
++[Service]
++# If you enable socket-activable rrdcached.socket,
++# command line socket declarations will be ignored
++ExecStart=@prefix@/bin/rrdcached -g
++#WorkingDirectory=
++#User=
++#Group=
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/etc/rrdcached.socket.in b/etc/rrdcached.socket.in
+new file mode 100644
+index 0000000..7a2d63e
+--- /dev/null
++++ b/etc/rrdcached.socket.in
+@@ -0,0 +1,18 @@
++#
++# To customize, copy this file to /etc/systemd/system/
++# and edit there
++#
++
++[Unit]
++Description=sockets activating rrdcached
++Documentation=man:rrdcached(1)
++
++[Socket]
++ListenStream=/tmp/rrdcached.sock
++#ListenStream=[::1]:42217
++#DirectoryMode=0755
++#SocketMode=0666
++#BindToDevice=
++
++[Install]
++WantedBy=sockets.target
+-- 
+1.8.4
+
+From 134ed0d33953e7e71c55454591c1078f7ae1db8a Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi@oetiker.ch>
+Date: Mon, 2 Jul 2012 14:01:06 +0000
+Subject: [PATCH] wire up systemd support in autoconf -- tomek@pipebreaker.pl
+
+git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa
+---
+ Makefile.am       |  6 ++++++
+ configure.ac      | 12 ++++++++++++
+ doc/rrdcached.pod |  2 ++
+ 3 files changed, 20 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 20b2e0a..11d16d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4
+ 
+ #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+ 
++if HAVE_SYSTEMD
++systemdsystemunit_DATA = \
++	etc/rrdcached.socket \
++	etc/rrdcached.service
++endif
++
+ site-perl-inst: site-perl-install
+ 
+ site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
+diff --git a/configure.ac b/configure.ac
+index 51c3f81..ab210d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory])
+ if test -z "$RRDDOCDIR"; then
+    RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi
+ 
++# systemd check
++PKG_PROG_PKG_CONFIG
++AC_ARG_WITH([systemdsystemunitdir],
++	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++	[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
++if test "x$with_systemdsystemunitdir" != xno; then
++	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++	AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service])
++fi
++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
++
+ 
+ CONFIGURE_PART(Apply Configuration Information)
+  
+@@ -993,6 +1004,7 @@ echo "       Build librrd MT: $enable_pthread"
+ echo "           Use gettext: $USE_NLS"
+ echo "           With libDBI: $have_libdbi"
+ echo "          With libwrap: $have_libwrap"
++echo "      With systemd dir: $with_systemdsystemunitdir"
+ echo
+ echo "             Libraries: $ALL_LIBS"
+ echo
+diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod
+index 18adcf1..7c0b30c 100644
+--- a/doc/rrdcached.pod
++++ b/doc/rrdcached.pod
+@@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example,
+ external clients want to draw graphs of the cached data, they should only be
+ allowed to use the C<FLUSH> command.
+ 
++Authorization does not work when rrcached is socket-activated by systemd. 
++
+ =head2 Encryption
+ 
+ There is no encryption.
+-- 
+1.8.4
+
-- 
cgit v0.12

