From 8a5da3d7fa061789f3efe6639af73a4fcc937386 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 9 Feb 2017 16:48:47 +0000 Subject: rrdtool: update to 1.6.0 --- abs/extra/rrdtool/ChangeLog | 67 -------------- abs/extra/rrdtool/PKGBUILD | 26 +++--- abs/extra/rrdtool/rrdtool-pangofont.patch | 39 --------- abs/extra/rrdtool/rrdtool-systemd.patch | 140 ------------------------------ 4 files changed, 12 insertions(+), 260 deletions(-) delete mode 100644 abs/extra/rrdtool/ChangeLog delete mode 100644 abs/extra/rrdtool/rrdtool-pangofont.patch delete mode 100644 abs/extra/rrdtool/rrdtool-systemd.patch diff --git a/abs/extra/rrdtool/ChangeLog b/abs/extra/rrdtool/ChangeLog deleted file mode 100644 index 10d12b8..0000000 --- a/abs/extra/rrdtool/ChangeLog +++ /dev/null @@ -1,67 +0,0 @@ -2010-08-19 Eric Belanger - - * rrdtool 1.4.4-2 - * Rebuilt for python2 - -2010-08-12 Eric Belanger - - * rrdtool 1.4.4-1 - * Upstream update - * Corrected license - * Removed old patch - -2010-04-29 Eric Belanger - - * rrdtool 1.4.3-1 - * Upstream update - * Cleaned up depends - * Specified localstatedir - -2010-01-18 Eric Belanger - - * rrdtool 1.4.2-2 - * Rebuilt for libpng 1.4 and libjpeg 8 - -2010-01-01 Eric Belanger - - * rrdtool 1.4.2-1 - * Upstream update - -2009-11-07 Eric Belanger - - * rrdtool 1.4.1-1 - * Upstream update - * Added lua binding - * Fixed optdepends array syntax (close FS#16053) - * Disabled rpath - -2009-05-21 Eric Belanger - - * rrdtool 1.3.8-1 - * Upstream update - * Added intltool makedepends - -2009-05-02 Eric Belanger - - * rrdtool 1.3.7-1.1 - * Disabled SMP build - * Added missing ruby binding for x86_64 (close FS#14539) - -2009-04-08 Eric Belanger - - * rrdtool 1.3.7-1 - * Upstream update - -2009-01-21 Eric Belanger - - * rrdtool 1.3.6-1 - * Upstream update - -2009-01-02 Eric Belanger - - * rrdtool 1.3.5-1 - * Upstream update - * Replaced install scriptlet by optdepends - * Added libxml2 and pango depends - * Libtool slayed - * Added ChangeLog diff --git a/abs/extra/rrdtool/PKGBUILD b/abs/extra/rrdtool/PKGBUILD index fb5a6fe..1e997ad 100644 --- a/abs/extra/rrdtool/PKGBUILD +++ b/abs/extra/rrdtool/PKGBUILD @@ -2,36 +2,34 @@ # Maintainer: Eric Bélanger pkgname=rrdtool -pkgver=1.4.8 -pkgrel=4 +pkgver=1.6.0 +pkgrel=2 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" license=('GPL' 'custom') 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' \ +optdepends=('perl: to use corresponding binding' + 'tcl: to use corresponding binding' + 'python2: to use corresponding binding' + 'ruby: to use corresponding binding' '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') +source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) +sha1sums=('9866b41bda9416188f236d61d24f185b173fd571') prepare() { cd ${pkgname}-${pkgver} + sed -i 's|/usr/bin/python|/usr/bin/python2|' examples/stripes.py # 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" + sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i bindings/Makefile.am + aclocal + automake } build() { 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 \ diff --git a/abs/extra/rrdtool/rrdtool-pangofont.patch b/abs/extra/rrdtool/rrdtool-pangofont.patch deleted file mode 100644 index 60936d8..0000000 --- a/abs/extra/rrdtool/rrdtool-pangofont.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001 -From: Tobias Oetiker -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 deleted file mode 100644 index 856f9ef..0000000 --- a/abs/extra/rrdtool/rrdtool-systemd.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001 -From: Tobias Oetiker -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 -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 command. - -+Authorization does not work when rrcached is socket-activated by systemd. -+ - =head2 Encryption - - There is no encryption. --- -1.8.4 - -- cgit v0.12