Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/files/, net-analyzer/rrdtool/
Date: Thu, 07 Feb 2019 14:45:00
Message-Id: 1549550689.6e2ab6ce13c79a17810fbced7bf03d670cd59f6c.jer@gentoo
1 commit: 6e2ab6ce13c79a17810fbced7bf03d670cd59f6c
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 7 14:43:54 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 7 14:44:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2ab6ce
7
8 net-analyzer/rrdtool: Fix rrdcached.socket
9
10 Package-Manager: Portage-2.3.59, Repoman-2.3.12
11 Fixes: https://bugs.gentoo.org/677368
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 .../files/rrdtool-1.7.1-rrdcached.socket.patch | 25 ++++++++++++++++++++++
15 net-analyzer/rrdtool/rrdtool-1.7.1.ebuild | 1 +
16 2 files changed, 26 insertions(+)
17
18 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch b/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch
19 new file mode 100644
20 index 00000000000..5dd21450441
21 --- /dev/null
22 +++ b/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch
23 @@ -0,0 +1,25 @@
24 +--- a/etc/Makefile.am
25 ++++ b/etc/Makefile.am
26 +@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
27 +
28 + if HAVE_SYSTEMD
29 + systemdsystemunit_DATA = \
30 +- etc/rrdcached.socket \
31 +- etc/rrdcached.service
32 ++ rrdcached.socket \
33 ++ rrdcached.service
34 + endif
35 +\ No newline at end of file
36 +--- a/etc/Makefile.in
37 ++++ b/etc/Makefile.in
38 +@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
39 + rrdcached.socket.in rrdcached.service.in
40 +
41 + @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
42 +-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
43 +-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
44 ++@HAVE_SYSTEMD_TRUE@ rrdcached.socket \
45 ++@HAVE_SYSTEMD_TRUE@ rrdcached.service
46 +
47 + all: all-am
48 +
49
50 diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
51 index 41552b5c687..fea91bb10cf 100644
52 --- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
53 +++ b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild
54 @@ -54,6 +54,7 @@ PATCHES=(
55 "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
56 "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
57 "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
58 + "${FILESDIR}"/${PN}-1.7.1-rrdcached.socket.patch
59
60 )
61 S=${WORKDIR}/${MY_P}