keks-overlay.git

monit patch completed
Parent 94ac751
Hanno Böck

Hanno Böck commited on 2010-06-28 16:39:53
Zeige 3 geänderte Dateien mit 137 Einfügungen und 2 Löschungen.

app-admin/monit/Manifest
Zeige Datei @ 8ecebff
... ... 
@@ -1,3 +1,4 @@
1 
+AUX monit-5.1.1-fix-newlines-v2.diff 8575 RMD160 d2c6ca80245d44303d63cd0f15432958e27e39c9 SHA1 9b828e6b141a62ad2897b397c92312e9678fe531 SHA256 bde6b8314d6487cf700305b3d5dca1824708e6547d1cf09331d0d5e1aa51f130
1 2 
 AUX monit-5.1.1-fix-newlines.diff 3409 RMD160 03ab4835667196b79b2d90d03dfe38661bb622aa SHA1 bd1d288514c5de7dad50e47a512aecfbdec530b1 SHA256 13cdc10e544ac932689809c752db18c9865cc169b19c52fb13d97ed8b0934330
2 3 
 AUX monit.initd-4.10.1 621 RMD160 0f70764ab590ced7dc86699a20973db2b291e5c8 SHA1 15545615e23c234561e691709def4722dbe31567 SHA256 7f6564cb738e6430e8d1dca9be7a63db1baf4b421f5445767e235658f0b1c024
3 4 
 AUX monit.initd-4.8.1 621 RMD160 61f37cc1d7cac73e107c4d7c3b98339e83dac0ae SHA1 bb808a6fd853b74985688a9cb383b8e352f5b60f SHA256 a4f0c8d928686a498ab156dfca55567078d60090378c79e7611f10809a885798
... ... 
@@ -5,6 +6,6 @@ AUX monit.initd-5.0 618 RMD160 d8e488aeed8fe34d8aa69456c6f6d3f0ff162230 SHA1 e26
5 6 
 DIST monit-4.10.1.tar.gz 606273 RMD160 6c517b19bc43f4023dfca4de1df09272b41af02d SHA1 c87aa0c6e0b1d13f46b7e9d84937191e25a907a6 SHA256 f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
6 7 
 DIST monit-5.1.1.tar.gz 615924 RMD160 1b4fed4e039adfd626f3c49436702c0272948327 SHA1 cad2ff02a2f6dbfb5773d13e42506adb2165d15c SHA256 bf789e0660410e8c63f4b3dc2eeab9889347e6494a6dc1c0e764343cae0dc1ba
7 8 
 EBUILD monit-4.10.1.ebuild 1213 RMD160 7738cbf8f8c3efd8a0cbd6c3cd6d3ccdb2452217 SHA1 f26cddbe92ea07defc01e1f434826ac3a1b69ee4 SHA256 a5699d5432dacee66a9843942c3dcdbf4be6ff0b967e418bb13d514e85f1813f
8 
-EBUILD monit-5.1.1.ebuild 1246 RMD160 58b50739a28a7162d3aabc370680c1b2ea27ea19 SHA1 dfa1a2f8ac73d8b5e1835d6f12eb922d7eb60904 SHA256 2f877e398e8e5e54da2293334e938975b41cb134b28e31b17a70bfa3a5fa6a20
9 
+EBUILD monit-5.1.1.ebuild 1249 RMD160 bf15d3aadbe37c1beec511c086f8306b97117326 SHA1 00a4447ac8d1e7585466666a880cb6d8330fab7b SHA256 23c2fcd625d067720040180e2bd32fefea411d2ef9ce8cf9abeb0293028efdde
9 10 
 MISC ChangeLog 6153 RMD160 1817a09de9a367aaa7fac714e7621aa77ac60374 SHA1 6ee00e9429624c74a0ef9bfb3e0b1ece2c8e3192 SHA256 df4855d4cee6c28657d4fc9af233e1a4086854d59423a401909fb8273f91d35f
10 11 
 MISC metadata.xml 283 RMD160 6e720fc6781f6653a0979215b63fafcb8801a223 SHA1 4714773a5fe2324a1b7ddb185fe710de78f3ac29 SHA256 5499d2de743ec9bb5befea5bdc63e0659eec4e44ecef80d6c7c1713708e05b05
app-admin/monit/files/monit-5.1.1-fix-newlines-v2.diff
Zeige Datei @ 8ecebff
... ... 
@@ -0,0 +1,134 @@
1 
+diff -Naur monit-5.1.1/validate.c monit-5.1.1-1//validate.c
2 
+--- monit-5.1.1/validate.c	2010-02-23 11:32:40.000000000 +0100
3 
++++ monit-5.1.1-1//validate.c	2010-06-28 16:14:13.000000000 +0200
4 
+@@ -692,7 +692,7 @@
5 
+       snprintf(report, STRLEN, "cpu usage of %.1f%% matches resource limit [cpu usage%s%.1f%%]", s->inf->cpu_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
6 
+       okay = FALSE;
7 
+     } else
8 
+-      snprintf(report, STRLEN, "'%s' cpu usage check succeeded [current cpu usage=%.1f%%]\n", s->name, s->inf->cpu_percent/10.0);
9 
++      snprintf(report, STRLEN, "'%s' cpu usage check succeeded [current cpu usage=%.1f%%]", s->name, s->inf->cpu_percent/10.0);
10 
+     break;
11 
+
12 
+   case RESOURCE_ID_TOTAL_CPU_PERCENT:
13 
+@@ -702,7 +702,7 @@
14 
+       snprintf(report, STRLEN, "total cpu usage of %.1f%% matches resource limit [cpu usage%s%.1f%%]", s->inf->total_cpu_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
15 
+       okay = FALSE;
16 
+     } else
17 
+-      snprintf(report, STRLEN, "'%s' total cpu usage check succeeded [current cpu usage=%.1f%%]\n", s->name, s->inf->total_cpu_percent/10.0);
18 
++      snprintf(report, STRLEN, "'%s' total cpu usage check succeeded [current cpu usage=%.1f%%]", s->name, s->inf->total_cpu_percent/10.0);
19 
+     break;
20 
+
21 
+   case RESOURCE_ID_CPUUSER:
22 
+@@ -710,7 +710,7 @@
23 
+       snprintf(report, STRLEN, "cpu user usage of %.1f%% matches resource limit [cpu user usage%s%.1f%%]", systeminfo.total_cpu_user_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
24 
+       okay = FALSE;
25 
+     } else
26 
+-      snprintf(report, STRLEN, "'%s' cpu user usage check succeeded [current cpu user usage=%.1f%%]\n", s->name, systeminfo.total_cpu_user_percent/10.0);
27 
++      snprintf(report, STRLEN, "'%s' cpu user usage check succeeded [current cpu user usage=%.1f%%]", s->name, systeminfo.total_cpu_user_percent/10.0);
28 
+     break;
29 
+
30 
+   case RESOURCE_ID_CPUSYSTEM:
31 
+@@ -718,7 +718,7 @@
32 
+       snprintf(report, STRLEN, "cpu system usage of %.1f%% matches resource limit [cpu system usage%s%.1f%%]", systeminfo.total_cpu_syst_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
33 
+       okay = FALSE;
34 
+     } else
35 
+-      snprintf(report, STRLEN, "'%s' cpu system usage check succeeded [current cpu system usage=%.1f%%]\n", s->name, systeminfo.total_cpu_syst_percent/10.0);
36 
++      snprintf(report, STRLEN, "'%s' cpu system usage check succeeded [current cpu system usage=%.1f%%]", s->name, systeminfo.total_cpu_syst_percent/10.0);
37 
+     break;
38 
+
39 
+   case RESOURCE_ID_CPUWAIT:
40 
+@@ -726,7 +726,7 @@
41 
+       snprintf(report, STRLEN, "cpu wait usage of %.1f%% matches resource limit [cpu wait usage%s%.1f%%]", systeminfo.total_cpu_wait_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
42 
+       okay = FALSE;
43 
+     } else
44 
+-      snprintf(report, STRLEN, "'%s' cpu wait usage check succeeded [current cpu wait usage=%.1f%%]\n", s->name, systeminfo.total_cpu_wait_percent/10.0);
45 
++      snprintf(report, STRLEN, "'%s' cpu wait usage check succeeded [current cpu wait usage=%.1f%%]", s->name, systeminfo.total_cpu_wait_percent/10.0);
46 
+     break;
47 
+
48 
+   case RESOURCE_ID_MEM_PERCENT:
49 
+@@ -735,13 +735,13 @@
50 
+         snprintf(report, STRLEN, "mem usage of %.1f%% matches resource limit [mem usage%s%.1f%%]", systeminfo.total_mem_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
51 
+         okay = FALSE;
52 
+       } else
53 
+-        snprintf(report, STRLEN, "'%s' mem usage check succeeded [current mem usage=%.1f%%]\n", s->name, systeminfo.total_mem_percent/10.0);
54 
++        snprintf(report, STRLEN, "'%s' mem usage check succeeded [current mem usage=%.1f%%]", s->name, systeminfo.total_mem_percent/10.0);
55 
+     } else {
56 
+       if (Util_evalQExpression(r->operator, s->inf->mem_percent, r->limit)) {
57 
+         snprintf(report, STRLEN, "mem usage of %.1f%% matches resource limit [mem usage%s%.1f%%]", s->inf->mem_percent/10.0, operatorshortnames[r->operator], r->limit/10.0);
58 
+         okay = FALSE;
59 
+       } else
60 
+-        snprintf(report, STRLEN, "'%s' mem usage check succeeded [current mem usage=%.1f%%]\n", s->name, s->inf->mem_percent/10.0);
61 
++        snprintf(report, STRLEN, "'%s' mem usage check succeeded [current mem usage=%.1f%%]", s->name, s->inf->mem_percent/10.0);
62 
+     }
63 
+     break;
64 
+
65 
+@@ -751,13 +751,13 @@
66 
+         snprintf(report, STRLEN, "mem amount of %ldkB matches resource limit [mem amount%s%ldkB]", systeminfo.total_mem_kbyte, operatorshortnames[r->operator], r->limit);
67 
+         okay = FALSE;
68 
+       } else
69 
+-        snprintf(report, STRLEN, "'%s' mem amount check succeeded [current mem amount=%ldkB]\n", s->name, systeminfo.total_mem_kbyte);
70 
++        snprintf(report, STRLEN, "'%s' mem amount check succeeded [current mem amount=%ldkB]", s->name, systeminfo.total_mem_kbyte);
71 
+     } else {
72 
+       if (Util_evalQExpression(r->operator, s->inf->mem_kbyte, r->limit)) {
73 
+         snprintf(report, STRLEN, "mem amount of %ldkB matches resource limit [mem amount%s%ldkB]", s->inf->mem_kbyte, operatorshortnames[r->operator], r->limit);
74 
+         okay = FALSE;
75 
+       } else
76 
+-        snprintf(report, STRLEN, "'%s' mem amount check succeeded [current mem amount=%ldkB]\n", s->name, s->inf->mem_kbyte);
77 
++        snprintf(report, STRLEN, "'%s' mem amount check succeeded [current mem amount=%ldkB]", s->name, s->inf->mem_kbyte);
78 
+     }
79 
+     break;
80 
+
81 
+@@ -766,7 +766,7 @@
82 
+       snprintf(report, STRLEN, "loadavg(1min) of %.1f matches resource limit " "[loadavg(1min)%s%.1f]", systeminfo.loadavg[0], operatorshortnames[r->operator], r->limit/10.0);
83 
+       okay = FALSE;
84 
+     } else
85 
+-      snprintf(report, STRLEN, "'%s' loadavg(1min) check succeeded [current loadavg(1min)=%.1f]\n", s->name, systeminfo.loadavg[0]);
86 
++      snprintf(report, STRLEN, "'%s' loadavg(1min) check succeeded [current loadavg(1min)=%.1f]", s->name, systeminfo.loadavg[0]);
87 
+     break;
88 
+
89 
+   case RESOURCE_ID_LOAD5:
90 
+@@ -774,7 +774,7 @@
91 
+       snprintf(report, STRLEN, "loadavg(5min) of %.1f matches resource limit " "[loadavg(5min)%s%.1f]", systeminfo.loadavg[1], operatorshortnames[r->operator], r->limit/10.0);
92 
+       okay = FALSE;
93 
+     } else
94 
+-      snprintf(report, STRLEN, "'%s' loadavg(5min) check succeeded [current loadavg(5min)=%.1f]\n", s->name, systeminfo.loadavg[1]);
95 
++      snprintf(report, STRLEN, "'%s' loadavg(5min) check succeeded [current loadavg(5min)=%.1f]", s->name, systeminfo.loadavg[1]);
96 
+     break;
97 
+
98 
+   case RESOURCE_ID_LOAD15:
99 
+@@ -782,7 +782,7 @@
100 
+       snprintf(report, STRLEN, "loadavg(15min) of %.1f matches resource limit " "[loadavg(15min)%s%.1f]", systeminfo.loadavg[2], operatorshortnames[r->operator], r->limit/10.0);
101 
+       okay = FALSE;
102 
+     } else
103 
+-      snprintf(report, STRLEN, "'%s' loadavg(15min) check succeeded [current loadavg(15min)=%.1f]\n", s->name, systeminfo.loadavg[2]);
104 
++      snprintf(report, STRLEN, "'%s' loadavg(15min) check succeeded [current loadavg(15min)=%.1f]", s->name, systeminfo.loadavg[2]);
105 
+     break;
106 
+
107 
+   case RESOURCE_ID_CHILDREN:
108 
+@@ -790,7 +790,7 @@
109 
+       snprintf(report, STRLEN, "children of %i matches resource limit [children%s%ld]", s->inf->children, operatorshortnames[r->operator], r->limit);
110 
+       okay = FALSE;
111 
+     } else
112 
+-      snprintf(report, STRLEN, "'%s' children check succeeded [current children=%i]\n", s->name, s->inf->children);
113 
++      snprintf(report, STRLEN, "'%s' children check succeeded [current children=%i]", s->name, s->inf->children);
114 
+     break;
115 
+
116 
+   case RESOURCE_ID_TOTAL_MEM_KBYTE:
117 
+@@ -798,7 +798,7 @@
118 
+       snprintf(report, STRLEN, "total mem amount of %ldkB matches resource limit" " [total mem amount%s%ldkB]", s->inf->total_mem_kbyte, operatorshortnames[r->operator], r->limit);
119 
+       okay = FALSE;
120 
+     } else
121 
+-      snprintf(report, STRLEN, "'%s' total mem amount check succeeded " "[current total mem amount=%ldkB]\n", s->name, s->inf->total_mem_kbyte);
122 
++      snprintf(report, STRLEN, "'%s' total mem amount check succeeded " "[current total mem amount=%ldkB]", s->name, s->inf->total_mem_kbyte);
123 
+     break;
124 
+
125 
+   case RESOURCE_ID_TOTAL_MEM_PERCENT:
126 
+@@ -806,7 +806,7 @@
127 
+       snprintf(report, STRLEN, "total mem amount of %.1f%% matches resource limit" " [total mem amount%s%.1f%%]", (float)s->inf->total_mem_percent/10.0, operatorshortnames[r->operator], (float)r->limit/10.0);
128 
+       okay = FALSE;
129 
+     } else
130 
+-      snprintf(report, STRLEN, "'%s' total mem amount check succeeded " "[current total mem amount=%.1f%%]\n", s->name, s->inf->total_mem_percent/10.0);
131 
++      snprintf(report, STRLEN, "'%s' total mem amount check succeeded " "[current total mem amount=%.1f%%]", s->name, s->inf->total_mem_percent/10.0);
132 
+     break;
133 
+
134 
+   default:
app-admin/monit/monit-5.1.1.ebuild
Zeige Datei @ 8ecebff
... ... 
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
20 20 
 	sys-devel/bison"
21 21
22 22 
 src_prepare() {
23 
-	epatch "${FILESDIR}"/monit-5.1.1-fix-newlines.diff
23 
+	epatch "${FILESDIR}"/monit-5.1.1-fix-newlines-v2.diff
24 24 
 	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
25 25 
 }
26 26
27 27