View | Details | Raw Unified | Return to bug 159304 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-9 / +11 lines)
Lines 6-23 Link Here
6
#
6
#
7
7
8
PORTNAME=	nagios
8
PORTNAME=	nagios
9
PORTVERSION=	3.2.3
9
PORTVERSION=	3.3.1
10
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
12
12
13
MAINTAINER=	jarrod@downtools.com.au
13
MAINTAINER=	jarrod@downtools.com.au
14
COMMENT=	Extremely powerful network monitoring system
14
COMMENT=	Extremely powerful network monitoring system
15
15
16
LICENSE=	GPLv2
17
16
LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
18
LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
17
RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
19
RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
18
20
19
USE_ICONV=	yes
21
USE_ICONV=	yes
20
USE_PERL5_BUILD=	yes
22
USE_PERL5_BUILD=yes
21
USE_AUTOTOOLS=	autoconf libltdl
23
USE_AUTOTOOLS=	autoconf libltdl
22
USE_RC_SUBR=	nagios
24
USE_RC_SUBR=	nagios
23
25
Lines 41-46 Link Here
41
NAGIOSHTMURL?=	/nagios
43
NAGIOSHTMURL?=	/nagios
42
NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
44
NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
43
45
46
USERS=		${NAGIOSUSER}
47
GROUPS=		${NAGIOSGROUP}
48
44
.include <bsd.port.pre.mk>
49
.include <bsd.port.pre.mk>
45
50
46
CPPFLAGS=	-I${LOCALBASE}/include -fPIC
51
CPPFLAGS=	-I${LOCALBASE}/include -fPIC
Lines 62-71 Link Here
62
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
67
		--with-checkresult-dir=${NAGIOSDIR}/checkresults \
63
		--disable-statuswrl
68
		--disable-statuswrl
64
69
65
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
70
CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
66
		CFLAGS="${CFLAGS}" \
67
		LDFLAGS="${LDFLAGS}" \
68
		LIBS="-L${LOCALBASE}/lib" \
69
		PERL=${PERL}
71
		PERL=${PERL}
70
72
71
MAKE_JOBS_UNSAFE=	yes
73
MAKE_JOBS_UNSAFE=	yes
Lines 111-125 Link Here
111
CONFIGURE_ARGS+=	--disable-event-broker
113
CONFIGURE_ARGS+=	--disable-event-broker
112
.endif
114
.endif
113
115
116
post-extract:
117
	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
118
114
post-patch:
119
post-patch:
115
.if defined(WITH_UNHANDLED_HACK)
120
.if defined(WITH_UNHANDLED_HACK)
116
	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
121
	@${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \
117
		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
122
		-e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
118
.endif
123
.endif
119
124
120
pre-su-install:
121
	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
122
123
post-install:
125
post-install:
124
	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw
126
	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw
125
	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults
127
	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (nagios-3.2.3.tar.gz) = 7ec850a4d1d8d8ee36b06419ac912695e29962641c757cf21301b1befcb23434
1
SHA256 (nagios-3.3.1.tar.gz) = c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652
2
SIZE (nagios-3.2.3.tar.gz) = 3249447
2
SIZE (nagios-3.3.1.tar.gz) = 1714630
(-)pkg-plist (-228 / +230 lines)
Lines 33-39 Link Here
33
%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
33
%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
34
%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
34
%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
35
%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
35
%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
36
%%NAGIOSWWWDIR%%/config.inc.php
36
%%NAGIOSWWWDIR%%/stylesheets/avail.css
37
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
38
%%NAGIOSWWWDIR%%/stylesheets/cmd.css
39
%%NAGIOSWWWDIR%%/stylesheets/common.css
40
%%NAGIOSWWWDIR%%/stylesheets/config.css
41
%%NAGIOSWWWDIR%%/stylesheets/extinfo.css
42
%%NAGIOSWWWDIR%%/stylesheets/histogram.css
43
%%NAGIOSWWWDIR%%/stylesheets/history.css
44
%%NAGIOSWWWDIR%%/stylesheets/ministatus.css
45
%%NAGIOSWWWDIR%%/stylesheets/notifications.css
46
%%NAGIOSWWWDIR%%/stylesheets/outages.css
47
%%NAGIOSWWWDIR%%/stylesheets/showlog.css
48
%%NAGIOSWWWDIR%%/stylesheets/status.css
49
%%NAGIOSWWWDIR%%/stylesheets/statusmap.css
50
%%NAGIOSWWWDIR%%/stylesheets/summary.css
51
%%NAGIOSWWWDIR%%/stylesheets/tac.css
52
%%NAGIOSWWWDIR%%/stylesheets/trends.css
37
%%NAGIOSWWWDIR%%/contexthelp/A1.html
53
%%NAGIOSWWWDIR%%/contexthelp/A1.html
38
%%NAGIOSWWWDIR%%/contexthelp/A2.html
54
%%NAGIOSWWWDIR%%/contexthelp/A2.html
39
%%NAGIOSWWWDIR%%/contexthelp/A3.html
55
%%NAGIOSWWWDIR%%/contexthelp/A3.html
Lines 97-291 Link Here
97
%%NAGIOSWWWDIR%%/contexthelp/N5.html
113
%%NAGIOSWWWDIR%%/contexthelp/N5.html
98
%%NAGIOSWWWDIR%%/contexthelp/N6.html
114
%%NAGIOSWWWDIR%%/contexthelp/N6.html
99
%%NAGIOSWWWDIR%%/contexthelp/N7.html
115
%%NAGIOSWWWDIR%%/contexthelp/N7.html
100
%%NAGIOSWWWDIR%%/docs/about.html
116
%%NAGIOSWWWDIR%%/images/logos/nagios.gd2
101
%%NAGIOSWWWDIR%%/docs/activechecks.html
117
%%NAGIOSWWWDIR%%/images/logos/nagios.gif
102
%%NAGIOSWWWDIR%%/docs/adaptive.html
118
%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png
103
%%NAGIOSWWWDIR%%/docs/addons.html
119
%%NAGIOSWWWDIR%%/images/logos/unknown.gd2
104
%%NAGIOSWWWDIR%%/docs/beginners.html
120
%%NAGIOSWWWDIR%%/images/logos/unknown.gif
105
%%NAGIOSWWWDIR%%/docs/cachedchecks.html
121
%%NAGIOSWWWDIR%%/images/logos/novell40.gif
106
%%NAGIOSWWWDIR%%/docs/cgiauth.html
122
%%NAGIOSWWWDIR%%/images/logos/irix.jpg
107
%%NAGIOSWWWDIR%%/docs/cgiincludes.html
123
%%NAGIOSWWWDIR%%/images/logos/aix.png
108
%%NAGIOSWWWDIR%%/docs/cgis.html
124
%%NAGIOSWWWDIR%%/images/logos/beos.png
109
%%NAGIOSWWWDIR%%/docs/cgisecurity.html
125
%%NAGIOSWWWDIR%%/images/logos/stampede.png
110
%%NAGIOSWWWDIR%%/docs/checkscheduling.html
126
%%NAGIOSWWWDIR%%/images/logos/amiga.gd2
111
%%NAGIOSWWWDIR%%/docs/clusters.html
127
%%NAGIOSWWWDIR%%/images/logos/novell40.png
112
%%NAGIOSWWWDIR%%/docs/config.html
128
%%NAGIOSWWWDIR%%/images/logos/next.gif
113
%%NAGIOSWWWDIR%%/docs/configcgi.html
129
%%NAGIOSWWWDIR%%/images/logos/switch40.gif
114
%%NAGIOSWWWDIR%%/docs/configmain.html
130
%%NAGIOSWWWDIR%%/images/logos/mainframe.gif
115
%%NAGIOSWWWDIR%%/docs/configobject.html
131
%%NAGIOSWWWDIR%%/images/logos/mainframe.gd2
116
%%NAGIOSWWWDIR%%/docs/customobjectvars.html
132
%%NAGIOSWWWDIR%%/images/logos/caldera.gif
117
%%NAGIOSWWWDIR%%/docs/dependencies.html
133
%%NAGIOSWWWDIR%%/images/logos/slackware.gif
118
%%NAGIOSWWWDIR%%/docs/dependencychecks.html
134
%%NAGIOSWWWDIR%%/images/logos/printer.gd2
119
%%NAGIOSWWWDIR%%/docs/distributed.html
135
%%NAGIOSWWWDIR%%/images/logos/cat5000.gd2
120
%%NAGIOSWWWDIR%%/docs/downtime.html
136
%%NAGIOSWWWDIR%%/images/logos/win40.png
121
%%NAGIOSWWWDIR%%/docs/embeddedperl.html
137
%%NAGIOSWWWDIR%%/images/logos/router.gd2
122
%%NAGIOSWWWDIR%%/docs/epnplugins.html
138
%%NAGIOSWWWDIR%%/images/logos/beos.jpg
123
%%NAGIOSWWWDIR%%/docs/escalations.html
139
%%NAGIOSWWWDIR%%/images/logos/mandrake.gd2
124
%%NAGIOSWWWDIR%%/docs/eventhandlers.html
140
%%NAGIOSWWWDIR%%/images/logos/caldera.jpg
125
%%NAGIOSWWWDIR%%/docs/extcommands.html
141
%%NAGIOSWWWDIR%%/images/logos/turbolinux.gd2
126
%%NAGIOSWWWDIR%%/docs/faststartup.html
142
%%NAGIOSWWWDIR%%/images/logos/slackware.gd2
127
%%NAGIOSWWWDIR%%/docs/flapping.html
143
%%NAGIOSWWWDIR%%/images/logos/workstation.gd2
128
%%NAGIOSWWWDIR%%/docs/freshness.html
144
%%NAGIOSWWWDIR%%/images/logos/switch.gd2
129
%%NAGIOSWWWDIR%%/docs/funstuff.html
145
%%NAGIOSWWWDIR%%/images/logos/internet.gif
130
%%NAGIOSWWWDIR%%/docs/hostchecks.html
146
%%NAGIOSWWWDIR%%/images/logos/caldera.png
131
%%NAGIOSWWWDIR%%/docs/knownissues.html
147
%%NAGIOSWWWDIR%%/images/logos/openbsd.jpg
132
%%NAGIOSWWWDIR%%/docs/images/activechecks.png
148
%%NAGIOSWWWDIR%%/images/logos/signal.png
133
%%NAGIOSWWWDIR%%/docs/images/cachedcheckgraphs.png
149
%%NAGIOSWWWDIR%%/images/logos/desktop-server.gif
134
%%NAGIOSWWWDIR%%/docs/images/cachedchecks.png
150
%%NAGIOSWWWDIR%%/images/logos/notebook.gd2
135
%%NAGIOSWWWDIR%%/docs/images/cachedchecks1.png
151
%%NAGIOSWWWDIR%%/images/logos/hpux.jpg
136
%%NAGIOSWWWDIR%%/docs/images/cgi-avail-a.png
152
%%NAGIOSWWWDIR%%/images/logos/firewall.gd2
137
%%NAGIOSWWWDIR%%/docs/images/cgi-avail-b.png
153
%%NAGIOSWWWDIR%%/images/logos/unicos.gd2
138
%%NAGIOSWWWDIR%%/docs/images/cgi-cmd.png
154
%%NAGIOSWWWDIR%%/images/logos/mandrake.jpg
139
%%NAGIOSWWWDIR%%/docs/images/cgi-config.png
155
%%NAGIOSWWWDIR%%/images/logos/mac40.gif
140
%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-a.png
156
%%NAGIOSWWWDIR%%/images/logos/printer.gif
141
%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-b.png
157
%%NAGIOSWWWDIR%%/images/logos/turbolinux.png
142
%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-c.png
158
%%NAGIOSWWWDIR%%/images/logos/sun40.gd2
143
%%NAGIOSWWWDIR%%/docs/images/cgi-extinfo-d.png
159
%%NAGIOSWWWDIR%%/images/logos/station.gd2
144
%%NAGIOSWWWDIR%%/docs/images/cgi-histogram.png
160
%%NAGIOSWWWDIR%%/images/logos/novell40.jpg
145
%%NAGIOSWWWDIR%%/docs/images/cgi-history.png
161
%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gd2
146
%%NAGIOSWWWDIR%%/docs/images/cgi-notifications.png
162
%%NAGIOSWWWDIR%%/images/logos/aix.gd2
147
%%NAGIOSWWWDIR%%/docs/images/cgi-outages.png
163
%%NAGIOSWWWDIR%%/images/logos/freebsd40.png
148
%%NAGIOSWWWDIR%%/docs/images/cgi-showlog.png
164
%%NAGIOSWWWDIR%%/images/logos/rack-server.gd2
149
%%NAGIOSWWWDIR%%/docs/images/cgi-status-a.png
165
%%NAGIOSWWWDIR%%/images/logos/debian.png
150
%%NAGIOSWWWDIR%%/docs/images/cgi-status-b.png
166
%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gd2
151
%%NAGIOSWWWDIR%%/docs/images/cgi-status-c.png
167
%%NAGIOSWWWDIR%%/images/logos/router.gif
152
%%NAGIOSWWWDIR%%/docs/images/cgi-status-d.png
168
%%NAGIOSWWWDIR%%/images/logos/workstation.png
153
%%NAGIOSWWWDIR%%/docs/images/cgi-statusmap.png
169
%%NAGIOSWWWDIR%%/images/logos/next.png
154
%%NAGIOSWWWDIR%%/docs/images/cgi-statuswml.png
170
%%NAGIOSWWWDIR%%/images/logos/unicos.jpg
155
%%NAGIOSWWWDIR%%/docs/images/cgi-statuswrl.png
171
%%NAGIOSWWWDIR%%/images/logos/notebook.gif
156
%%NAGIOSWWWDIR%%/docs/images/cgi-summary.png
172
%%NAGIOSWWWDIR%%/images/logos/yellowdog.gd2
157
%%NAGIOSWWWDIR%%/docs/images/cgi-tac.png
173
%%NAGIOSWWWDIR%%/images/logos/monitor.png
158
%%NAGIOSWWWDIR%%/docs/images/cgi-trends.png
174
%%NAGIOSWWWDIR%%/images/logos/satellite.png
159
%%NAGIOSWWWDIR%%/docs/images/checkmark.png
175
%%NAGIOSWWWDIR%%/images/logos/wifi_modem.png
160
%%NAGIOSWWWDIR%%/docs/images/checktiming.png
176
%%NAGIOSWWWDIR%%/images/logos/rack-server.gif
161
%%NAGIOSWWWDIR%%/docs/images/configoverview.png
177
%%NAGIOSWWWDIR%%/images/logos/yellowdog.png
162
%%NAGIOSWWWDIR%%/docs/images/distributed.png
178
%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gd2
163
%%NAGIOSWWWDIR%%/docs/images/downtime.png
179
%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gif
164
%%NAGIOSWWWDIR%%/docs/images/epn.png
180
%%NAGIOSWWWDIR%%/images/logos/beos.gif
165
%%NAGIOSWWWDIR%%/docs/images/eventhandlers.png
181
%%NAGIOSWWWDIR%%/images/logos/mandrake.gif
166
%%NAGIOSWWWDIR%%/docs/images/externalcommands.png
182
%%NAGIOSWWWDIR%%/images/logos/san.gif
167
%%NAGIOSWWWDIR%%/docs/images/fast-startup.png
183
%%NAGIOSWWWDIR%%/images/logos/globe.png
168
%%NAGIOSWWWDIR%%/docs/images/fast-startup1.png
184
%%NAGIOSWWWDIR%%/images/logos/debian.jpg
169
%%NAGIOSWWWDIR%%/docs/images/fast-startup2.png
185
%%NAGIOSWWWDIR%%/images/logos/novell40.gd2
170
%%NAGIOSWWWDIR%%/docs/images/freshness.png
186
%%NAGIOSWWWDIR%%/images/logos/ethernet_card.png
171
%%NAGIOSWWWDIR%%/docs/images/host-dependencies.png
187
%%NAGIOSWWWDIR%%/images/logos/irix.png
172
%%NAGIOSWWWDIR%%/docs/images/important.gif
188
%%NAGIOSWWWDIR%%/images/logos/storm.gif
173
%%NAGIOSWWWDIR%%/docs/images/integrationoverview.png
189
%%NAGIOSWWWDIR%%/images/logos/redhat.png
174
%%NAGIOSWWWDIR%%/docs/images/interleaved1.png
190
%%NAGIOSWWWDIR%%/images/logos/apple.png
175
%%NAGIOSWWWDIR%%/docs/images/interleaved2.png
191
%%NAGIOSWWWDIR%%/images/logos/storm.png
176
%%NAGIOSWWWDIR%%/docs/images/interleaved3.png
192
%%NAGIOSWWWDIR%%/images/logos/freebsd40.gd2
177
%%NAGIOSWWWDIR%%/docs/images/logofullsize.png
193
%%NAGIOSWWWDIR%%/images/logos/internet_device.png
178
%%NAGIOSWWWDIR%%/docs/images/monitoring-printers.png
194
%%NAGIOSWWWDIR%%/images/logos/sun40.png
179
%%NAGIOSWWWDIR%%/docs/images/monitoring-routers.png
195
%%NAGIOSWWWDIR%%/images/logos/wifi.gif
180
%%NAGIOSWWWDIR%%/docs/images/monitoring-windows.png
196
%%NAGIOSWWWDIR%%/images/logos/ng-switch40.jpg
181
%%NAGIOSWWWDIR%%/docs/images/mrtg-activehostchecks.png
197
%%NAGIOSWWWDIR%%/images/logos/cat1900.gd2
182
%%NAGIOSWWWDIR%%/docs/images/mrtg-activelychecked.png
198
%%NAGIOSWWWDIR%%/images/logos/router40.png
183
%%NAGIOSWWWDIR%%/docs/images/mrtg-activeservicechecks.png
199
%%NAGIOSWWWDIR%%/images/logos/workstation_locked.png
184
%%NAGIOSWWWDIR%%/docs/images/mrtg-cachedchecks.png
200
%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.jpg
185
%%NAGIOSWWWDIR%%/docs/images/mrtg-commandbuffers.png
201
%%NAGIOSWWWDIR%%/images/logos/router40.jpg
186
%%NAGIOSWWWDIR%%/docs/images/mrtg-externalcommands.png
202
%%NAGIOSWWWDIR%%/images/logos/logo.gd2
187
%%NAGIOSWWWDIR%%/docs/images/mrtg-hostperfstats.png
203
%%NAGIOSWWWDIR%%/images/logos/win40.jpg
188
%%NAGIOSWWWDIR%%/docs/images/mrtg-hoststatechange.png
204
%%NAGIOSWWWDIR%%/images/logos/firewall.gif
189
%%NAGIOSWWWDIR%%/docs/images/mrtg-passivechecks.png
205
%%NAGIOSWWWDIR%%/images/logos/hub.gif
190
%%NAGIOSWWWDIR%%/docs/images/mrtg-passivelychecked.png
206
%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg
191
%%NAGIOSWWWDIR%%/docs/images/mrtg-serviceperfstats.png
207
%%NAGIOSWWWDIR%%/images/logos/debian.gif
192
%%NAGIOSWWWDIR%%/docs/images/mrtg-servicestatechange.png
208
%%NAGIOSWWWDIR%%/images/logos/freebsd40.jpg
193
%%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png
209
%%NAGIOSWWWDIR%%/images/logos/linux40.gd2
194
%%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png
210
%%NAGIOSWWWDIR%%/images/logos/redhat.gd2
195
%%NAGIOSWWWDIR%%/docs/images/nagios.jpg
211
%%NAGIOSWWWDIR%%/images/logos/graph.gif
196
%%NAGIOSWWWDIR%%/docs/images/nagiosexchange.png
212
%%NAGIOSWWWDIR%%/images/logos/san.gd2
197
%%NAGIOSWWWDIR%%/docs/images/nagiossupport.png
213
%%NAGIOSWWWDIR%%/images/logos/apple.gd2
198
%%NAGIOSWWWDIR%%/docs/images/ndoutils.png
214
%%NAGIOSWWWDIR%%/images/logos/fax.gd2
199
%%NAGIOSWWWDIR%%/docs/images/network-outage1.png
215
%%NAGIOSWWWDIR%%/images/logos/stampede.gd2
200
%%NAGIOSWWWDIR%%/docs/images/network-outage2.png
216
%%NAGIOSWWWDIR%%/images/logos/amiga.gif
201
%%NAGIOSWWWDIR%%/docs/images/noninterleaved1.png
217
%%NAGIOSWWWDIR%%/images/logos/thin-client.gif
202
%%NAGIOSWWWDIR%%/docs/images/noninterleaved2.png
218
%%NAGIOSWWWDIR%%/images/logos/turbolinux.gif
203
%%NAGIOSWWWDIR%%/docs/images/note.gif
219
%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gd2
204
%%NAGIOSWWWDIR%%/docs/images/nrpe.png
220
%%NAGIOSWWWDIR%%/images/logos/next.jpg
205
%%NAGIOSWWWDIR%%/docs/images/nsca.png
221
%%NAGIOSWWWDIR%%/images/logos/desktop-server.gd2
206
%%NAGIOSWWWDIR%%/docs/images/nscpp.png
222
%%NAGIOSWWWDIR%%/images/logos/freebsd40.gif
207
%%NAGIOSWWWDIR%%/docs/images/objects-commands.png
223
%%NAGIOSWWWDIR%%/images/logos/fax.gif
208
%%NAGIOSWWWDIR%%/docs/images/objects-contacts.png
224
%%NAGIOSWWWDIR%%/images/logos/caldera.gd2
209
%%NAGIOSWWWDIR%%/docs/images/objects-hosts.png
225
%%NAGIOSWWWDIR%%/images/logos/hub.gd2
210
%%NAGIOSWWWDIR%%/docs/images/objects-services.png
226
%%NAGIOSWWWDIR%%/images/logos/redhat.gif
211
%%NAGIOSWWWDIR%%/docs/images/objects-timeperiods.png
227
%%NAGIOSWWWDIR%%/images/logos/win40.gif
212
%%NAGIOSWWWDIR%%/docs/images/passivechecks.png
228
%%NAGIOSWWWDIR%%/images/logos/hpux.png
213
%%NAGIOSWWWDIR%%/docs/images/passivehosttranslation.png
229
%%NAGIOSWWWDIR%%/images/logos/bluetooth.png
214
%%NAGIOSWWWDIR%%/docs/images/plugins.png
230
%%NAGIOSWWWDIR%%/images/logos/mandrake.png
215
%%NAGIOSWWWDIR%%/docs/images/predictive-dependency-checks.png
231
%%NAGIOSWWWDIR%%/images/logos/linux40.jpg
216
%%NAGIOSWWWDIR%%/docs/images/printer.png
232
%%NAGIOSWWWDIR%%/images/logos/apple.gif
217
%%NAGIOSWWWDIR%%/docs/images/reachability1.png
233
%%NAGIOSWWWDIR%%/images/logos/sun40.jpg
218
%%NAGIOSWWWDIR%%/docs/images/reachability2.png
234
%%NAGIOSWWWDIR%%/images/logos/slackware.jpg
219
%%NAGIOSWWWDIR%%/docs/images/reachability3.png
235
%%NAGIOSWWWDIR%%/images/logos/aix.gif
220
%%NAGIOSWWWDIR%%/docs/images/reachability4.png
236
%%NAGIOSWWWDIR%%/images/logos/storm.jpg
221
%%NAGIOSWWWDIR%%/docs/images/redudancy.png
237
%%NAGIOSWWWDIR%%/images/logos/debian.gd2
222
%%NAGIOSWWWDIR%%/docs/images/redundancy.png
238
%%NAGIOSWWWDIR%%/images/logos/stampede.gif
223
%%NAGIOSWWWDIR%%/docs/images/security.png
239
%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gif
224
%%NAGIOSWWWDIR%%/docs/images/security1.png
240
%%NAGIOSWWWDIR%%/images/logos/linux40.gif
225
%%NAGIOSWWWDIR%%/docs/images/security2.png
241
%%NAGIOSWWWDIR%%/images/logos/hp-printer40.jpg
226
%%NAGIOSWWWDIR%%/docs/images/security3.png
242
%%NAGIOSWWWDIR%%/images/logos/sun40.gif
227
%%NAGIOSWWWDIR%%/docs/images/seealso.gif
243
%%NAGIOSWWWDIR%%/images/logos/mac40.gd2
228
%%NAGIOSWWWDIR%%/docs/images/service-dependencies.png
244
%%NAGIOSWWWDIR%%/images/logos/irix.gif
229
%%NAGIOSWWWDIR%%/docs/images/statetransitions.png
245
%%NAGIOSWWWDIR%%/images/logos/storm.gd2
230
%%NAGIOSWWWDIR%%/docs/images/statetransitions2.png
246
%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.png
231
%%NAGIOSWWWDIR%%/docs/images/stoprestart.png
247
%%NAGIOSWWWDIR%%/images/logos/ng-switch40.png
232
%%NAGIOSWWWDIR%%/docs/images/switch.png
248
%%NAGIOSWWWDIR%%/images/logos/aix.jpg
233
%%NAGIOSWWWDIR%%/docs/images/tcpwrappers.png
249
%%NAGIOSWWWDIR%%/images/logos/hp-printer40.png
234
%%NAGIOSWWWDIR%%/docs/images/tip.gif
250
%%NAGIOSWWWDIR%%/images/logos/database.gd2
235
%%NAGIOSWWWDIR%%/docs/images/tuning.png
251
%%NAGIOSWWWDIR%%/images/logos/redhat.jpg
236
%%NAGIOSWWWDIR%%/docs/images/upto.gif
252
%%NAGIOSWWWDIR%%/images/logos/internet.gd2
237
%%NAGIOSWWWDIR%%/docs/index.html
253
%%NAGIOSWWWDIR%%/images/logos/turbolinux.jpg
238
%%NAGIOSWWWDIR%%/docs/int-snmptrap.html
254
%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gif
239
%%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html
255
%%NAGIOSWWWDIR%%/images/logos/workstation.gif
240
%%NAGIOSWWWDIR%%/docs/integration.html
256
%%NAGIOSWWWDIR%%/images/logos/sunlogo.gif
241
%%NAGIOSWWWDIR%%/docs/largeinstalltweaks.html
257
%%NAGIOSWWWDIR%%/images/logos/sunlogo.png
242
%%NAGIOSWWWDIR%%/docs/macrolist.html
258
%%NAGIOSWWWDIR%%/images/logos/database.gif
243
%%NAGIOSWWWDIR%%/docs/macros.html
259
%%NAGIOSWWWDIR%%/images/logos/win40.gd2
244
%%NAGIOSWWWDIR%%/docs/monitoring-linux.html
260
%%NAGIOSWWWDIR%%/images/logos/hpux.gif
245
%%NAGIOSWWWDIR%%/docs/monitoring-netware.html
261
%%NAGIOSWWWDIR%%/images/logos/mac40.jpg
246
%%NAGIOSWWWDIR%%/docs/monitoring-printers.html
262
%%NAGIOSWWWDIR%%/images/logos/unicos.png
247
%%NAGIOSWWWDIR%%/docs/monitoring-publicservices.html
263
%%NAGIOSWWWDIR%%/images/logos/router40.gif
248
%%NAGIOSWWWDIR%%/docs/monitoring-routers.html
264
%%NAGIOSWWWDIR%%/images/logos/beos.gd2
249
%%NAGIOSWWWDIR%%/docs/monitoring-windows.html
265
%%NAGIOSWWWDIR%%/images/logos/openbsd.gif
250
%%NAGIOSWWWDIR%%/docs/mrtggraphs.html
266
%%NAGIOSWWWDIR%%/images/logos/amiga.png
251
%%NAGIOSWWWDIR%%/docs/nagiostats.html
267
%%NAGIOSWWWDIR%%/images/logos/switch40.jpg
252
%%NAGIOSWWWDIR%%/docs/networkreachability.html
268
%%NAGIOSWWWDIR%%/images/logos/mac40.png
253
%%NAGIOSWWWDIR%%/docs/notifications.html
269
%%NAGIOSWWWDIR%%/images/logos/server.png
254
%%NAGIOSWWWDIR%%/docs/objectdefinitions.html
270
%%NAGIOSWWWDIR%%/images/logos/switch40.gd2
255
%%NAGIOSWWWDIR%%/docs/objectinheritance.html
271
%%NAGIOSWWWDIR%%/images/logos/slackware.png
256
%%NAGIOSWWWDIR%%/docs/objecttricks.html
272
%%NAGIOSWWWDIR%%/images/logos/sunlogo.jpg
257
%%NAGIOSWWWDIR%%/docs/oncallrotation.html
273
%%NAGIOSWWWDIR%%/images/logos/irix.gd2
258
%%NAGIOSWWWDIR%%/docs/passivechecks.html
274
%%NAGIOSWWWDIR%%/images/logos/wifi.gd2
259
%%NAGIOSWWWDIR%%/docs/passivestatetranslation.html
275
%%NAGIOSWWWDIR%%/images/logos/switch.gif
260
%%NAGIOSWWWDIR%%/docs/perfdata.html
276
%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif
261
%%NAGIOSWWWDIR%%/docs/pluginapi.html
277
%%NAGIOSWWWDIR%%/images/logos/router40.gd2
262
%%NAGIOSWWWDIR%%/docs/plugins.html
278
%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gif
263
%%NAGIOSWWWDIR%%/docs/quickstart-fedora.html
279
%%NAGIOSWWWDIR%%/images/logos/linux40.png
264
%%NAGIOSWWWDIR%%/docs/quickstart-opensuse.html
280
%%NAGIOSWWWDIR%%/images/logos/unicos.gif
265
%%NAGIOSWWWDIR%%/docs/quickstart-ubuntu.html
281
%%NAGIOSWWWDIR%%/images/logos/switch40.png
266
%%NAGIOSWWWDIR%%/docs/quickstart.html
282
%%NAGIOSWWWDIR%%/images/logos/amiga.jpg
267
%%NAGIOSWWWDIR%%/docs/redundancy.html
283
%%NAGIOSWWWDIR%%/images/logos/hpux.gd2
268
%%NAGIOSWWWDIR%%/docs/robots.txt
284
%%NAGIOSWWWDIR%%/images/logos/openbsd.gd2
269
%%NAGIOSWWWDIR%%/docs/security.html
285
%%NAGIOSWWWDIR%%/images/logos/sunlogo.gd2
270
%%NAGIOSWWWDIR%%/docs/servicechecks.html
286
%%NAGIOSWWWDIR%%/images/logos/thin-client.gd2
271
%%NAGIOSWWWDIR%%/docs/stalking.html
287
%%NAGIOSWWWDIR%%/images/logos/webcamera.png
272
%%NAGIOSWWWDIR%%/docs/startstop.html
288
%%NAGIOSWWWDIR%%/images/logos/apple.jpg
273
%%NAGIOSWWWDIR%%/docs/statetypes.html
289
%%NAGIOSWWWDIR%%/images/logos/openbsd.png
274
%%NAGIOSWWWDIR%%/docs/timeperiods.html
290
%%NAGIOSWWWDIR%%/images/logos/cat2900.gd2
275
%%NAGIOSWWWDIR%%/docs/toc.html
291
%%NAGIOSWWWDIR%%/images/logos/next.gd2
276
%%NAGIOSWWWDIR%%/docs/tuning.html
292
%%NAGIOSWWWDIR%%/images/logos/stampede.jpg
277
%%NAGIOSWWWDIR%%/docs/upgrading.html
278
%%NAGIOSWWWDIR%%/docs/verifyconfig.html
279
%%NAGIOSWWWDIR%%/docs/volatileservices.html
280
%%NAGIOSWWWDIR%%/docs/whatsnew.html
281
%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
282
%%NAGIOSWWWDIR%%/images/ack.gif
293
%%NAGIOSWWWDIR%%/images/ack.gif
283
%%NAGIOSWWWDIR%%/images/action.gif
294
%%NAGIOSWWWDIR%%/images/action.gif
284
%%NAGIOSWWWDIR%%/images/command.png
285
%%NAGIOSWWWDIR%%/images/comment.gif
295
%%NAGIOSWWWDIR%%/images/comment.gif
286
%%NAGIOSWWWDIR%%/images/contexthelp1.gif
296
%%NAGIOSWWWDIR%%/images/contexthelp1.gif
287
%%NAGIOSWWWDIR%%/images/contexthelp2.gif
297
%%NAGIOSWWWDIR%%/images/contexthelp2.gif
288
%%NAGIOSWWWDIR%%/images/critical.png
289
%%NAGIOSWWWDIR%%/images/delay.gif
298
%%NAGIOSWWWDIR%%/images/delay.gif
290
%%NAGIOSWWWDIR%%/images/delete.gif
299
%%NAGIOSWWWDIR%%/images/delete.gif
291
%%NAGIOSWWWDIR%%/images/detail.gif
300
%%NAGIOSWWWDIR%%/images/detail.gif
Lines 295-330 Link Here
295
%%NAGIOSWWWDIR%%/images/empty.gif
304
%%NAGIOSWWWDIR%%/images/empty.gif
296
%%NAGIOSWWWDIR%%/images/enabled.gif
305
%%NAGIOSWWWDIR%%/images/enabled.gif
297
%%NAGIOSWWWDIR%%/images/extinfo.gif
306
%%NAGIOSWWWDIR%%/images/extinfo.gif
298
%%NAGIOSWWWDIR%%/images/favicon.ico
299
%%NAGIOSWWWDIR%%/images/flapping.gif
307
%%NAGIOSWWWDIR%%/images/flapping.gif
300
%%NAGIOSWWWDIR%%/images/globe-support-150x150.png
301
%%NAGIOSWWWDIR%%/images/greendot.gif
308
%%NAGIOSWWWDIR%%/images/greendot.gif
302
%%NAGIOSWWWDIR%%/images/histogram.png
303
%%NAGIOSWWWDIR%%/images/history.gif
309
%%NAGIOSWWWDIR%%/images/history.gif
304
%%NAGIOSWWWDIR%%/images/hostevent.gif
310
%%NAGIOSWWWDIR%%/images/hostevent.gif
305
%%NAGIOSWWWDIR%%/images/info.png
306
%%NAGIOSWWWDIR%%/images/left.gif
311
%%NAGIOSWWWDIR%%/images/left.gif
307
%%NAGIOSWWWDIR%%/images/logofullsize.png
308
%%NAGIOSWWWDIR%%/images/logos/nagios.gd2
309
%%NAGIOSWWWDIR%%/images/logos/nagios.gif
310
%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png
311
%%NAGIOSWWWDIR%%/images/logos/unknown.gd2
312
%%NAGIOSWWWDIR%%/images/logos/unknown.gif
313
%%NAGIOSWWWDIR%%/images/logrotate.png
314
%%NAGIOSWWWDIR%%/images/ndisabled.gif
312
%%NAGIOSWWWDIR%%/images/ndisabled.gif
315
%%NAGIOSWWWDIR%%/images/noack.gif
313
%%NAGIOSWWWDIR%%/images/noack.gif
314
%%NAGIOSWWWDIR%%/images/up.gif
316
%%NAGIOSWWWDIR%%/images/notes.gif
315
%%NAGIOSWWWDIR%%/images/notes.gif
317
%%NAGIOSWWWDIR%%/images/notify.gif
316
%%NAGIOSWWWDIR%%/images/notify.gif
318
%%NAGIOSWWWDIR%%/images/orangedot.gif
317
%%NAGIOSWWWDIR%%/images/orangedot.gif
319
%%NAGIOSWWWDIR%%/images/passiveonly.gif
318
%%NAGIOSWWWDIR%%/images/passiveonly.gif
320
%%NAGIOSWWWDIR%%/images/recovery.png
321
%%NAGIOSWWWDIR%%/images/redudancy.png
322
%%NAGIOSWWWDIR%%/images/redundancy.png
323
%%NAGIOSWWWDIR%%/images/restart.gif
319
%%NAGIOSWWWDIR%%/images/restart.gif
324
%%NAGIOSWWWDIR%%/images/right.gif
320
%%NAGIOSWWWDIR%%/images/right.gif
325
%%NAGIOSWWWDIR%%/images/sblogo.png
326
%%NAGIOSWWWDIR%%/images/serviceevent.gif
321
%%NAGIOSWWWDIR%%/images/serviceevent.gif
327
%%NAGIOSWWWDIR%%/images/sflogo.png
328
%%NAGIOSWWWDIR%%/images/splunk1.gif
322
%%NAGIOSWWWDIR%%/images/splunk1.gif
329
%%NAGIOSWWWDIR%%/images/splunk2.gif
323
%%NAGIOSWWWDIR%%/images/splunk2.gif
330
%%NAGIOSWWWDIR%%/images/start.gif
324
%%NAGIOSWWWDIR%%/images/start.gif
Lines 333-376 Link Here
333
%%NAGIOSWWWDIR%%/images/status3.gif
327
%%NAGIOSWWWDIR%%/images/status3.gif
334
%%NAGIOSWWWDIR%%/images/status4.gif
328
%%NAGIOSWWWDIR%%/images/status4.gif
335
%%NAGIOSWWWDIR%%/images/stop.gif
329
%%NAGIOSWWWDIR%%/images/stop.gif
330
%%NAGIOSWWWDIR%%/images/trends.gif
331
%%NAGIOSWWWDIR%%/images/zoom1.gif
332
%%NAGIOSWWWDIR%%/images/zoom2.gif
336
%%NAGIOSWWWDIR%%/images/tacdisabled.jpg
333
%%NAGIOSWWWDIR%%/images/tacdisabled.jpg
337
%%NAGIOSWWWDIR%%/images/tacdisabled.png
338
%%NAGIOSWWWDIR%%/images/tacenabled.jpg
334
%%NAGIOSWWWDIR%%/images/tacenabled.jpg
335
%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
336
%%NAGIOSWWWDIR%%/images/command.png
337
%%NAGIOSWWWDIR%%/images/info.png
338
%%NAGIOSWWWDIR%%/images/critical.png
339
%%NAGIOSWWWDIR%%/images/globe-support-150x150.png
340
%%NAGIOSWWWDIR%%/images/histogram.png
341
%%NAGIOSWWWDIR%%/images/logofullsize.png
342
%%NAGIOSWWWDIR%%/images/logrotate.png
343
%%NAGIOSWWWDIR%%/images/recovery.png
344
%%NAGIOSWWWDIR%%/images/redudancy.png
345
%%NAGIOSWWWDIR%%/images/redundancy.png
346
%%NAGIOSWWWDIR%%/images/sblogo.png
347
%%NAGIOSWWWDIR%%/images/sflogo.png
348
%%NAGIOSWWWDIR%%/images/tacdisabled.png
339
%%NAGIOSWWWDIR%%/images/tacenabled.png
349
%%NAGIOSWWWDIR%%/images/tacenabled.png
340
%%NAGIOSWWWDIR%%/images/thermcrit.png
350
%%NAGIOSWWWDIR%%/images/thermcrit.png
341
%%NAGIOSWWWDIR%%/images/thermok.png
351
%%NAGIOSWWWDIR%%/images/thermok.png
342
%%NAGIOSWWWDIR%%/images/thermwarn.png
352
%%NAGIOSWWWDIR%%/images/thermwarn.png
343
%%NAGIOSWWWDIR%%/images/trends.gif
344
%%NAGIOSWWWDIR%%/images/trendshost.png
353
%%NAGIOSWWWDIR%%/images/trendshost.png
345
%%NAGIOSWWWDIR%%/images/trendssvc.png
354
%%NAGIOSWWWDIR%%/images/trendssvc.png
346
%%NAGIOSWWWDIR%%/images/unknown.png
355
%%NAGIOSWWWDIR%%/images/unknown.png
347
%%NAGIOSWWWDIR%%/images/up.gif
348
%%NAGIOSWWWDIR%%/images/warning.png
356
%%NAGIOSWWWDIR%%/images/warning.png
349
%%NAGIOSWWWDIR%%/images/weblogo1.png
357
%%NAGIOSWWWDIR%%/images/weblogo1.png
350
%%NAGIOSWWWDIR%%/images/zoom1.gif
358
%%NAGIOSWWWDIR%%/images/favicon.ico
351
%%NAGIOSWWWDIR%%/images/zoom2.gif
359
%%NAGIOSWWWDIR%%/images/graph.gif
360
%%NAGIOSWWWDIR%%/images/action-orig.gif
361
%%NAGIOSWWWDIR%%/images/action-nagios.gif
362
%%NAGIOSWWWDIR%%/images/action-graph.gif
363
%%NAGIOSWWWDIR%%/includes/rss/extlib/Snoopy.class.inc
364
%%NAGIOSWWWDIR%%/includes/rss/rss_cache.inc
365
%%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc
366
%%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc
367
%%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc
352
%%NAGIOSWWWDIR%%/includes/utils.inc.php
368
%%NAGIOSWWWDIR%%/includes/utils.inc.php
369
%%NAGIOSWWWDIR%%/robots.txt
370
%%NAGIOSWWWDIR%%/config.inc.php
353
%%NAGIOSWWWDIR%%/index.php
371
%%NAGIOSWWWDIR%%/index.php
354
%%NAGIOSWWWDIR%%/main.php
372
%%NAGIOSWWWDIR%%/main.php
355
%%NAGIOSWWWDIR%%/robots.txt
356
%%NAGIOSWWWDIR%%/side.php
373
%%NAGIOSWWWDIR%%/side.php
357
%%NAGIOSWWWDIR%%/stylesheets/avail.css
358
%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
359
%%NAGIOSWWWDIR%%/stylesheets/cmd.css
360
%%NAGIOSWWWDIR%%/stylesheets/common.css
361
%%NAGIOSWWWDIR%%/stylesheets/config.css
362
%%NAGIOSWWWDIR%%/stylesheets/extinfo.css
363
%%NAGIOSWWWDIR%%/stylesheets/histogram.css
364
%%NAGIOSWWWDIR%%/stylesheets/history.css
365
%%NAGIOSWWWDIR%%/stylesheets/ministatus.css
366
%%NAGIOSWWWDIR%%/stylesheets/notifications.css
367
%%NAGIOSWWWDIR%%/stylesheets/outages.css
368
%%NAGIOSWWWDIR%%/stylesheets/showlog.css
369
%%NAGIOSWWWDIR%%/stylesheets/status.css
370
%%NAGIOSWWWDIR%%/stylesheets/statusmap.css
371
%%NAGIOSWWWDIR%%/stylesheets/summary.css
372
%%NAGIOSWWWDIR%%/stylesheets/tac.css
373
%%NAGIOSWWWDIR%%/stylesheets/trends.css
374
@dirrmtry etc/nagios/objects
374
@dirrmtry etc/nagios/objects
375
@dirrmtry etc/nagios
375
@dirrmtry etc/nagios
376
@dirrm %%NAGIOSWWWDIR%%/cgi-bin
376
@dirrm %%NAGIOSWWWDIR%%/cgi-bin
Lines 379-390 Link Here
379
@dirrm %%NAGIOSWWWDIR%%/docs
379
@dirrm %%NAGIOSWWWDIR%%/docs
380
@dirrm %%NAGIOSWWWDIR%%/images/logos
380
@dirrm %%NAGIOSWWWDIR%%/images/logos
381
@dirrm %%NAGIOSWWWDIR%%/images
381
@dirrm %%NAGIOSWWWDIR%%/images
382
@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib
383
@dirrm %%NAGIOSWWWDIR%%/includes/rss
382
@dirrm %%NAGIOSWWWDIR%%/includes
384
@dirrm %%NAGIOSWWWDIR%%/includes
383
@dirrm %%NAGIOSWWWDIR%%/media
385
@dirrm %%NAGIOSWWWDIR%%/media
384
@dirrm %%NAGIOSWWWDIR%%/ssi
386
@dirrm %%NAGIOSWWWDIR%%/ssi
385
@dirrm %%NAGIOSWWWDIR%%/stylesheets
387
@dirrm %%NAGIOSWWWDIR%%/stylesheets
386
@dirrmtry %%NAGIOSWWWDIR%%
388
@dirrmtry %%NAGIOSWWWDIR%%
387
@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
389
@dirrmtry %%NAGIOSDIR%%/archives
388
@unexec rmdir %%NAGIOSDIR%%/checkresults 2>/dev/null || true
390
@dirrmtry %%NAGIOSDIR%%/checkresults
389
@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
391
@dirrmtry %%NAGIOSDIR%%/rw
390
@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true
392
@dirrmtry %%NAGIOSDIR%%
(-)files/patch-base-Makefile.in (-15 lines)
Removed Link Here
1
--- base/Makefile.in.orig	Wed Jan 24 04:58:34 2007
2
+++ base/Makefile.in	Fri Jul 20 13:34:45 2007
3
@@ -193,9 +193,9 @@
4
 	$(MAKE) install-basic
5
 
6
 install-basic:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
8
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
9
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
10
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
11
+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
12
+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
13
 
14
 strip-post-install:
15
 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
(-)files/patch-base__Makefile.in (+15 lines)
Added Link Here
1
--- ./base/Makefile.in.orig	2011-07-29 21:29:18.000000000 -0400
2
+++ ./base/Makefile.in	2011-07-29 21:29:47.000000000 -0400
3
@@ -204,9 +204,9 @@
4
 	$(MAKE) install-basic
5
 
6
 install-basic:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
8
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
9
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
10
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
11
+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
12
+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
13
 
14
 strip-post-install:
15
 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
(-)files/patch-configure.in (-39 / +5 lines)
Lines 1-38 Link Here
1
--- configure.in.orig	2010-03-09 19:39:59.000000000 +0100
1
--- ./configure.in.orig	2011-07-29 21:34:51.000000000 -0400
2
+++ configure.in	2010-04-07 20:18:58.585012048 +0200
2
+++ ./configure.in	2011-07-29 21:38:47.000000000 -0400
3
@@ -6,7 +6,6 @@
3
@@ -6,7 +6,6 @@
4
 
4
 
5
 AC_INIT(base/nagios.c)
5
 AC_INIT(base/nagios.c)
6
 AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
6
 AC_CONFIG_HEADER(include/config.h include/snprintf.h)
7
-AC_PREFIX_DEFAULT(/usr/local/nagios)
7
-AC_PREFIX_DEFAULT(/usr/local/nagios)
8
 
8
 
9
 PKG_NAME=nagios
9
 PKG_NAME=nagios
10
 PKG_VERSION="3.2.1"
10
 PKG_VERSION="3.3.1"
11
@@ -125,7 +124,15 @@
11
@@ -201,7 +200,7 @@
12
 dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
13
 THREADLIBS=""
14
 have_pthreads="no"
15
+have_thr="no"
16
 
17
+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
18
+AC_CHECK_LIB(thr,pthread_create)
19
+if test $ac_cv_lib_thr_pthread_create = yes; then
20
+	THREADLIBS="-lthr"
21
+	have_pthreads="yes"
22
+	have_thr="yes"
23
+else
24
 dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
25
 dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
26
 AC_DEFUN([AC_PTHREAD_FREEBSD],[
27
@@ -186,6 +193,7 @@
28
 if test $have_pthreads = "no"; then
29
 	AC_PTHREAD_FREEBSD
30
 fi
31
+fi
32
 
33
 AC_SUBST(THREADLIBS)
34
 
35
@@ -201,7 +209,7 @@
36
 AC_SUBST(nagios_grp)
12
 AC_SUBST(nagios_grp)
37
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios])
13
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios])
38
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios])
14
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios])
Lines 41-53 Link Here
41
 AC_SUBST(INSTALL_OPTS)
17
 AC_SUBST(INSTALL_OPTS)
42
 
18
 
43
 AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user)
19
 AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user)
44
@@ -668,6 +676,9 @@
45
 
46
 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
47
 	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" 
48
+	if test x$have_thr = xyes; then
49
+		PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
50
+	fi
51
 	PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" 
52
 	CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" 
53
 	USEPERL=yes
(-)files/patch-contrib-Makefile.in (-17 lines)
Removed Link Here
1
--- contrib/Makefile.in.orig	Tue Nov 15 12:19:36 2005
2
+++ contrib/Makefile.in	Wed Dec 28 17:49:25 2005
3
@@ -46,10 +46,10 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
8
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
9
-	for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
10
-	for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
11
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
12
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
13
+	for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
14
+	for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
15
 
16
 ##############################################################################
17
 # rules and dependencies for actual target programs
(-)files/patch-contrib__Makefile.in (+17 lines)
Added Link Here
1
--- ./contrib/Makefile.in.orig	2011-07-29 21:31:10.000000000 -0400
2
+++ ./contrib/Makefile.in	2011-07-29 21:31:44.000000000 -0400
3
@@ -51,10 +51,10 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
8
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
9
-	for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
10
-	for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
11
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
12
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
13
+	for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
14
+	for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
15
 
16
 ##############################################################################
17
 # rules and dependencies for actual target programs
(-)files/patch-html-Makefile.in (-73 lines)
Removed Link Here
1
--- html/Makefile.in.orig	2009-06-17 13:27:21.000000000 +0930
2
+++ html/Makefile.in	2009-07-06 19:27:38.000000000 +0930
3
@@ -33,46 +33,46 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
8
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
9
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
10
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
11
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
12
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
13
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
14
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
15
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
16
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
17
-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
18
-	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
19
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
20
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
21
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
22
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
23
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
24
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
25
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
26
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
27
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
28
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
29
+	$(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
30
+	$(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
31
 # Remove old HTML files (PHP files are used now)
32
 	rm -f $(DESTDIR)$(HTMLDIR)/index.html
33
 	rm -f $(DESTDIR)$(HTMLDIR)/main.html
34
 	rm -f $(DESTDIR)$(HTMLDIR)/side.html
35
 	for file in *.php; \
36
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
37
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
38
 #	for file in media/*.wav; \
39
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
40
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
41
 	for file in stylesheets/*.css; \
42
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
43
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
44
 	for file in contexthelp/*.html; \
45
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
46
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
47
 	for file in docs/*.html; \
48
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
49
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
50
 	for file in docs/images/*.*; \
51
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
52
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
53
 	for file in images/*.gif; \
54
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
55
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
56
 	for file in images/*.jpg; \
57
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
58
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
59
 	for file in images/*.png; \
60
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
61
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
62
 	for file in images/*.ico; \
63
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
64
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
65
 	for file in images/logos/*.*; \
66
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
67
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
68
 	for file in includes/*.*; \
69
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
70
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
71
 
72
 install-unstripped:
73
 	$(MAKE) install
(-)files/patch-html-docs-configcgi.html (-11 lines)
Removed Link Here
1
--- html/docs/configcgi.html.orig	2009-06-17 17:13:52.000000000 +0200
2
+++ html/docs/configcgi.html	2009-11-27 23:16:02.000000000 +0100
3
@@ -1250,7 +1250,7 @@
4
 
5
 <td valign=top>Example:</td>
6
 
7
-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
8
+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td>
9
 
10
 </tr>
11
 
(-)files/patch-html__Makefile.in (+84 lines)
Added Link Here
1
--- ./html/Makefile.in.orig	2011-07-29 22:11:21.000000000 -0400
2
+++ ./html/Makefile.in	2011-07-29 22:12:01.000000000 -0400
3
@@ -33,52 +33,52 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
8
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
9
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
10
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
11
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
12
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
13
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
14
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
15
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
16
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
17
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
18
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
19
-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
20
-#	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
21
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
22
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
23
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
24
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
25
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
26
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
27
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
28
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
29
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
30
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
31
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
32
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
33
+	$(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
34
+#	$(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
35
 # Remove old HTML files (PHP files are used now)
36
 	rm -f $(DESTDIR)$(HTMLDIR)/index.html
37
 	rm -f $(DESTDIR)$(HTMLDIR)/main.html
38
 	rm -f $(DESTDIR)$(HTMLDIR)/side.html
39
 	for file in *.php; \
40
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
41
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
42
 #	for file in media/*.wav; \
43
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
44
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
45
 	for file in stylesheets/*.css; \
46
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
47
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
48
 	for file in contexthelp/*.html; \
49
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
50
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
51
 #	for file in docs/*.html; \
52
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
53
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
54
 #	for file in docs/images/*.*; \
55
-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
56
+#	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
57
 	for file in images/*.gif; \
58
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
59
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
60
 	for file in images/*.jpg; \
61
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
62
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
63
 	for file in images/*.png; \
64
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
65
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
66
 	for file in images/*.ico; \
67
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
68
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
69
 	for file in images/logos/*.*; \
70
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
71
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
72
 	for file in includes/*.*; \
73
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
74
-	for file in includes/rss/*; \
75
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
76
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
77
+	for file in includes/rss/*.*; \
78
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
79
 	for file in includes/rss/extlib/*; \
80
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
81
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
82
 
83
 install-unstripped:
84
 	$(MAKE) install

Return to bug 159304