1 |
commit: a299e275255caae5bb040d250763c746340b8336 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 26 00:23:28 2016 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 26 00:29:05 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a299e275 |
7 |
|
8 |
net-analyzer/nagios-core: new patch and revision to fix logo installation. |
9 |
|
10 |
The fix for bug 388321 required a patch, but that patch broke the |
11 |
installation of the theme logos (which live in their own |
12 |
directory). That patch has been updated as a new revision, |
13 |
use-INSTALL-to-install-themes-r1.patch, to avoid impacting |
14 |
nagios-core-4.0.8-r2.ebuild which is stable on amd64. The new revision |
15 |
nagios-4.1.1-r1 should pick up the new patch. |
16 |
|
17 |
Gentoo-Bug: 388321 |
18 |
Gentoo-Bug: 581148 |
19 |
|
20 |
Package-Manager: portage-2.2.26 |
21 |
|
22 |
.../files/use-INSTALL-to-install-themes-r1.patch | 65 ++++++++++++++++++++++ |
23 |
...re-4.1.1.ebuild => nagios-core-4.1.1-r1.ebuild} | 6 +- |
24 |
2 files changed, 68 insertions(+), 3 deletions(-) |
25 |
|
26 |
diff --git a/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes-r1.patch b/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes-r1.patch |
27 |
new file mode 100644 |
28 |
index 0000000..a14f5a3 |
29 |
--- /dev/null |
30 |
+++ b/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes-r1.patch |
31 |
@@ -0,0 +1,65 @@ |
32 |
+From b6552e3b0b006fa28014150d199813de12d89ef4 Mon Sep 17 00:00:00 2001 |
33 |
+From: Michael Orlitzky <michael@××××××××.com> |
34 |
+Date: Mon, 25 Apr 2016 20:06:18 -0400 |
35 |
+Subject: [PATCH 1/1] Use $(INSTALL) to install themes. |
36 |
+ |
37 |
+Most of the images installed under the htdocs folder are installed |
38 |
+mode 644 with owner:group nagios:nagios. This is due to the use of |
39 |
+$(INSTALL) in html/Makefile. However, the theme images and stylesheets |
40 |
+are currently installed with a simple "cp -r", which leads to |
41 |
+inconsistencies like the following: |
42 |
+ |
43 |
+ $ cd /usr/share/nagios/htdocs/images |
44 |
+ $ ls action*.gif |
45 |
+ -rw-rw-r-- 1 nagios nagios 1.3K 2014-11-12 08:22 action.gif |
46 |
+ -rw-r--r-- 1 root root 1.3K 2014-11-12 08:22 action-graph.gif |
47 |
+ -rw-r--r-- 1 root root 171 2014-11-12 08:22 action-nagios.gif |
48 |
+ -rw-r--r-- 1 root root 162 2014-11-12 08:22 action-orig.gif |
49 |
+ |
50 |
+By using $(INSTALL) in the install-exfoliation and install-classicui |
51 |
+targets, we enforce some consistency. |
52 |
+--- |
53 |
+ Makefile.in | 20 ++++++++++++++++---- |
54 |
+ 1 file changed, 16 insertions(+), 4 deletions(-) |
55 |
+ |
56 |
+diff --git a/Makefile.in b/Makefile.in |
57 |
+index 5b97513..0ec50b7 100644 |
58 |
+--- a/Makefile.in |
59 |
++++ b/Makefile.in |
60 |
+@@ -300,8 +300,14 @@ install-webconf: |
61 |
+ @echo "" |
62 |
+ |
63 |
+ install-exfoliation: |
64 |
+- cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets |
65 |
+- cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images |
66 |
++ for file in contrib/exfoliation/stylesheets/*.*; \ |
67 |
++ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done |
68 |
++ |
69 |
++ for file in contrib/exfoliation/images/*.*; \ |
70 |
++ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done |
71 |
++ |
72 |
++ for file in contrib/exfoliation/images/logos/*.*; \ |
73 |
++ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done |
74 |
+ |
75 |
+ @echo "" |
76 |
+ @echo "*** Exfoliation theme installed ***" |
77 |
+@@ -309,8 +315,14 @@ install-exfoliation: |
78 |
+ @echo "" |
79 |
+ |
80 |
+ install-classicui: |
81 |
+- cp -rf html/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets |
82 |
+- cp -rf html/images/* $(DESTDIR)$(HTMLDIR)/images |
83 |
++ for file in html/stylesheets/*.*; \ |
84 |
++ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done |
85 |
++ |
86 |
++ for file in html/images/*.*; \ |
87 |
++ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done |
88 |
++ |
89 |
++ for file in html/images/logos/*.*; \ |
90 |
++ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done |
91 |
+ |
92 |
+ @echo "" |
93 |
+ @echo "*** Classic theme installed ***" |
94 |
+-- |
95 |
+2.7.3 |
96 |
+ |
97 |
|
98 |
diff --git a/net-analyzer/nagios-core/nagios-core-4.1.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.1.1-r1.ebuild |
99 |
similarity index 98% |
100 |
rename from net-analyzer/nagios-core/nagios-core-4.1.1.ebuild |
101 |
rename to net-analyzer/nagios-core/nagios-core-4.1.1-r1.ebuild |
102 |
index 69a4faa..748ef0e 100644 |
103 |
--- a/net-analyzer/nagios-core/nagios-core-4.1.1.ebuild |
104 |
+++ b/net-analyzer/nagios-core/nagios-core-4.1.1-r1.ebuild |
105 |
@@ -1,4 +1,4 @@ |
106 |
-# Copyright 1999-2015 Gentoo Foundation |
107 |
+# Copyright 1999-2016 Gentoo Foundation |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
# $Id$ |
110 |
|
111 |
@@ -92,9 +92,9 @@ src_prepare(){ |
112 |
# |
113 |
# http://tracker.nagios.org/view.php?id=651 |
114 |
# |
115 |
- # Gentoo bug #388321. |
116 |
+ # Gentoo bugs #388321 and #581148. |
117 |
# |
118 |
- epatch "${FILESDIR}"/use-INSTALL-to-install-themes.patch |
119 |
+ epatch "${FILESDIR}"/use-INSTALL-to-install-themes-r1.patch |
120 |
} |
121 |
|
122 |
src_configure() { |