Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport nagios-base from 2017Q4 for security fixes #557

Merged
merged 1 commit into from
Feb 5, 2018
Merged

Backport nagios-base from 2017Q4 for security fixes #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions net/nagios-base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# $NetBSD: Makefile,v 1.66 2016/10/09 21:42:02 wiz Exp $
# $NetBSD: Makefile,v 1.74 2017/09/03 08:53:12 wiz Exp $
#

DISTNAME= nagios-4.0.8
DISTNAME= nagios-4.3.2
PKGNAME= ${DISTNAME:S/-/-base-/}
PKGREVISION= 8
PKGREVISION= 3
CATEGORIES= net sysutils
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
DISTFILES+= nagios-netbsd40-icons.tar.gz
SITES.nagios-netbsd40-icons.tar.gz= ${MASTER_SITE_LOCAL}

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nagios.org/
HOMEPAGE= https://www.nagios.org/
COMMENT= Network monitor
LICENSE= gnu-gpl-v2

Expand All @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --with-command-group=${NAGIOSCMD_GROUP}
CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/share/examples/rc.d
CONFIGURE_ARGS+= --with-lockfile=/var/run/nagios/nagios.lock

USE_TOOLS+= mail:run perl
USE_TOOLS+= mail:run perl unzip
CONFIGURE_ARGS+= --with-mail=${TOOLS_PLATFORM.mail:Q}

RCD_SCRIPTS+= nagios
Expand Down Expand Up @@ -66,8 +66,7 @@ EGFILES+= objects/contacts.cfg objects/timeperiods.cfg
EGFILES+= objects/localhost.cfg objects/windows.cfg
EGFILES+= objects/printer.cfg objects/switch.cfg

INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/objects

OWN_DIRS= ${PKG_SYSCONFDIR}/objects
.for files in ${EGFILES}
CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
.endfor
Expand All @@ -78,9 +77,7 @@ OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775

SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/rss-corefeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/rss-newsfeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
SPECIAL_PERMS+= share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644

SUBST_CLASSES+= files
SUBST_STAGE.files= post-build
Expand All @@ -92,18 +89,16 @@ pre-build:
${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist

post-install:
${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${DESTDIR}/${EGDIR}/nagios.conf
${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${DESTDIR}${EGDIR}/nagios.conf
${INSTALL_DATA} ${WRKDIR}/netbsd40.gd2 \
${DESTDIR}/${PREFIX}/share/nagios/images/logos/
${DESTDIR}${PREFIX}/share/nagios/images/logos/
${INSTALL_DATA} ${WRKDIR}/netbsd40.gif \
${DESTDIR}/${PREFIX}/share/nagios/images/logos/
${DESTDIR}${PREFIX}/share/nagios/images/logos/
${INSTALL_DATA} ${WRKDIR}/netbsd40.jpg \
${DESTDIR}/${PREFIX}/share/nagios/images/logos/
${DESTDIR}${PREFIX}/share/nagios/images/logos/
${INSTALL_DATA} ${WRKDIR}/netbsd40.png \
${DESTDIR}/${PREFIX}/share/nagios/images/logos/
${DESTDIR}${PREFIX}/share/nagios/images/logos/
${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/jsonquery.html
${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/rss-corefeed.html
${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/rss-newsfeed.html

.include "../../mk/dlopen.buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
Expand Down
63 changes: 51 additions & 12 deletions net/nagios-base/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.18 2015/04/03 17:06:08 rodent Exp $
@comment $NetBSD: PLIST,v 1.19 2017/05/24 07:42:39 manu Exp $
bin/nagios
bin/nagiostats
libexec/nagios/cgi-bin/archivejson.cgi
Expand Down Expand Up @@ -32,6 +32,12 @@ share/examples/nagios/objects/templates.cfg-sample
share/examples/nagios/objects/timeperiods.cfg-sample
share/examples/nagios/objects/windows.cfg-sample
share/examples/nagios/resource.cfg-sample
share/nagios/angularjs/angular-1.3.9/angular.min.js
share/nagios/angularjs/angular-1.3.9/angular.min.js.map
share/nagios/angularjs/ui-bootstrap-tpls-0.12.0.min.js
share/nagios/angularjs/ui-utils-0.2.1/ui-utils.js
share/nagios/bootstrap-3.3.0/css/bootstrap-theme.min.css
share/nagios/bootstrap-3.3.0/css/bootstrap.min.css
share/nagios/config.inc.php
share/nagios/contexthelp/A1.html
share/nagios/contexthelp/A2.html
Expand Down Expand Up @@ -96,6 +102,12 @@ share/nagios/contexthelp/N4.html
share/nagios/contexthelp/N5.html
share/nagios/contexthelp/N6.html
share/nagios/contexthelp/N7.html
share/nagios/d3/d3.min.js
share/nagios/graph-header.html
share/nagios/histogram-form.html
share/nagios/histogram-graph.html
share/nagios/histogram-links.html
share/nagios/histogram.html
share/nagios/images/Nagios-clearbg.png
share/nagios/images/NagiosEnterprises-whitebg-112x46.png
share/nagios/images/ack.gif
Expand Down Expand Up @@ -213,6 +225,9 @@ share/nagios/images/logos/monitor.png
share/nagios/images/logos/nagios.gd2
share/nagios/images/logos/nagios.gif
share/nagios/images/logos/nagiosvrml.png
share/nagios/images/logos/netbsd.gif
share/nagios/images/logos/netbsd.jpg
share/nagios/images/logos/netbsd.png
share/nagios/images/logos/netbsd40.gd2
share/nagios/images/logos/netbsd40.gif
share/nagios/images/logos/netbsd40.jpg
Expand Down Expand Up @@ -275,6 +290,9 @@ share/nagios/images/logos/sunlogo.gd2
share/nagios/images/logos/sunlogo.gif
share/nagios/images/logos/sunlogo.jpg
share/nagios/images/logos/sunlogo.png
share/nagios/images/logos/suse.gif
share/nagios/images/logos/suse.jpg
share/nagios/images/logos/suse.png
share/nagios/images/logos/switch.gd2
share/nagios/images/logos/switch.gif
share/nagios/images/logos/switch40.gd2
Expand Down Expand Up @@ -314,6 +332,7 @@ share/nagios/images/logos/yellowdog.gif
share/nagios/images/logos/yellowdog.jpg
share/nagios/images/logos/yellowdog.png
share/nagios/images/logrotate.png
share/nagios/images/menu.png
share/nagios/images/ndisabled.gif
share/nagios/images/noack.gif
share/nagios/images/notes.gif
Expand Down Expand Up @@ -352,35 +371,48 @@ share/nagios/images/warning.png
share/nagios/images/weblogo1.png
share/nagios/images/zoom1.gif
share/nagios/images/zoom2.gif
share/nagios/includes/jquery-1.7.1.min.js
share/nagios/includes/rss/extlib/Snoopy.class.inc
share/nagios/includes/rss/rss_cache.inc
share/nagios/includes/rss/rss_fetch.inc
share/nagios/includes/rss/rss_parse.inc
share/nagios/includes/rss/rss_utils.inc
share/nagios/includes/utils.inc.php
share/nagios/index.php
share/nagios/infobox.html
share/nagios/js/histogram-events.js
share/nagios/js/histogram-form.js
share/nagios/js/histogram-graph.js
share/nagios/js/histogram.js
share/nagios/js/jquery-1.7.1.min.js
share/nagios/js/jsonquery.js
share/nagios/js/map-directive.js
share/nagios/js/map-form.js
share/nagios/js/map.js
share/nagios/js/nag_funcs.js
share/nagios/js/nagios-decorations.js
share/nagios/js/nagios-time.js
share/nagios/js/trends-form.js
share/nagios/js/trends-graph.js
share/nagios/js/trends.js
share/nagios/jsonquery.html
share/nagios/main.php
share/nagios/map-directive.html
share/nagios/map-form.html
share/nagios/map-links.html
share/nagios/map-popup.html
share/nagios/map.php
share/nagios/robots.txt
share/nagios/rss-corebanner.php
share/nagios/rss-corefeed.html
share/nagios/rss-corefeed.php
share/nagios/rss-newsfeed.html
share/nagios/rss-newsfeed.php
share/nagios/side.php
share/nagios/spin/spin.min.js
share/nagios/stylesheets/avail.css
share/nagios/stylesheets/checksanity.css
share/nagios/stylesheets/cmd.css
share/nagios/stylesheets/common.css
share/nagios/stylesheets/config.css
share/nagios/stylesheets/extinfo.css
share/nagios/stylesheets/histogram.css
share/nagios/stylesheets/histogramgraph.css
share/nagios/stylesheets/history.css
share/nagios/stylesheets/jsonquery.css
share/nagios/stylesheets/map-directive.css
share/nagios/stylesheets/map.css
share/nagios/stylesheets/ministatus.css
share/nagios/stylesheets/nag_funcs.css
share/nagios/stylesheets/notifications.css
share/nagios/stylesheets/outages.css
share/nagios/stylesheets/showlog.css
Expand All @@ -389,6 +421,13 @@ share/nagios/stylesheets/statusmap.css
share/nagios/stylesheets/summary.css
share/nagios/stylesheets/tac.css
share/nagios/stylesheets/trends.css
share/nagios/stylesheets/trendsgraph.css
share/nagios/trends-form.html
share/nagios/trends-graph.html
share/nagios/trends-host-yaxis.html
share/nagios/trends-links.html
share/nagios/trends-service-yaxis.html
share/nagios/trends.html
@pkgdir share/nagios/ssi
@pkgdir share/nagios/media
@pkgdir share/nagios/docs/images
Expand Down
35 changes: 13 additions & 22 deletions net/nagios-base/distinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,33 @@
$NetBSD: distinfo,v 1.30 2016/02/09 10:12:53 bouyer Exp $
$NetBSD: distinfo,v 1.32 2017/08/20 06:59:16 manu Exp $

SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872
RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799
SHA512 (nagios-4.0.8.tar.gz) = d72fdbcc0beb2de72e5aa788b4ccc83aa30c7f4a4460edaa831f012db04647e4836b876bb7dc235e2a1b525827e9a2a0f4d348919f69fbfbfdaa4d13e968e18c
Size (nagios-4.0.8.tar.gz) = 1805059 bytes
SHA1 (nagios-4.3.2.tar.gz) = 3a8a765583bd0588e77d87d32d7f2d618911c1f0
RMD160 (nagios-4.3.2.tar.gz) = f6e8f13b3c6caed38a8d83112b880ab2a2e1c6c9
SHA512 (nagios-4.3.2.tar.gz) = 679e76f7a232b9b0dbbc2697f51b58d09ae3d3833e0e6922bb39d90768c81f2eb09b9ab36b7fdaeca893cebd93fc1edc1232f245498d4420980ba4659df60a31
Size (nagios-4.3.2.tar.gz) = 11096863 bytes
SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe
RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee
SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f216e90d03a157208e57e23930c1e5915353406f09bd762ad11e6306625544292bd919f8524a2239aac758afb1
Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
SHA1 (patch-Makefile.in) = 953eea6b276beba75ab5c64c14d10cdcf1ca2188
SHA1 (patch-Makefile.in) = 0bf706869847ad100a809f47c2415eb30e9db098
SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161
SHA1 (patch-base_checks.c) = 9c5fb7a8f085eed2fb31ad623eeed22596c6c168
SHA1 (patch-base_events.c) = 6b659c6980c69ab1947d7a829c87482f53ed817e
SHA1 (patch-base_logging.c) = 09d532acf5978ff581b7f4d211bdd286a18c1886
SHA1 (patch-base_logging.c) = e0efd9dc51dd9f726ada11c6e7745e1cd9755bc9
SHA1 (patch-base_nerd.c) = 4105d3a56999077688e42c9c771e76461fe00785
SHA1 (patch-base_utils.c) = aaf6396ec4f8454a3f4a8e92a4881c32ff331dc0
SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63
SHA1 (patch-cgi_avail.c) = d0faf28256e5ee31ad36bdb08d59d8310c7cef8d
SHA1 (patch-cgi_cmd.c) = 6953e62e99a4df32f8dba452d2a85af66bf3ce8b
SHA1 (patch-cgi_extinfo.c) = 8cad0787fbe0a782edb93ca299462a5718a34a4b
SHA1 (patch-cgi_avail.c) = 44b4b0f9eaf43dd35ea6c048b6fc1dbb295c7aeb
SHA1 (patch-cgi_cmd.c) = edbf60422c4f36f045e97b27494bc7307c60143e
SHA1 (patch-cgi_getcgi.c) = 3af474de4f4281f18a306f7d618ff532d0a9ca9e
SHA1 (patch-cgi_histogram.c) = 4b9f583ec4579d5c5399ad1b7102511c0282b8bc
SHA1 (patch-cgi_statusjson.c) = 13967c18ee3eaaaf75edb8b3ee028bece73272ae
SHA1 (patch-cgi_trends.c) = 4e5057536465192b67fcd5a141f34be816ff4452
SHA1 (patch-cgi_trends.c) = 89188c74665522cc317ab1098746a0245f572dc8
SHA1 (patch-common_Makefile.in) = 7fa093a6109dfa03f9b97e4312d3a09e3235f00f
SHA1 (patch-common_comments.c) = 7739c9c74333c45e86242383073dfa78785445ec
SHA1 (patch-common_downtime.c) = 000f1e33ab1ca1c433c3fd0de3d5bf750df6f57f
SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4
SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4
SHA1 (patch-html_Makefile.in) = cef5febcedfaaa38cdf73283e2bda43b4c114379
SHA1 (patch-include_comments.h) = c86328a4f1437ee1dc2b6f97be61693414dd4fce
SHA1 (patch-html_Makefile.in) = e35b082215189c4fa552b56fc8f8a3ec8664e95b
SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70
SHA1 (patch-include_statusjson.h) = c5a84b9ef3114f2e2480d719bbb4a24c8965e052
SHA1 (patch-lib_nsock.c) = bd8801e4aff13ebac26e512b44764c2da1e2e5a5
SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262
SHA1 (patch-lib_test-squeue.c) = 1bc197da815a069f0f37525f1acbf5fb4110d399
SHA1 (patch-lib_worker.c) = fe1b6d00429556caaefe43afe7bb1c6d9f6fcb0b
SHA1 (patch-lib_worker.c) = af2b8034016f0c4736a672b5cb285a2960b9f2e6
SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795
SHA1 (patch-t-tap_test__xsddefault.c) = db7166fae411a461d8b4a4a31f55af693aeb03b0
SHA1 (patch-xdata_xcddefault.c) = ba14af868cd773d07e029a2773a44614eedc3e46
SHA1 (patch-xdata_xrddefault.c) = 8cc130bd14b0dbd6ba57cda9819f4b5d99639178
SHA1 (patch-xdata_xsddefault.c) = 61c22eb8601adb53ab06b685198c7000b4743c76
69 changes: 40 additions & 29 deletions net/nagios-base/patches/patch-Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
$NetBSD: patch-Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $
$NetBSD: patch-Makefile.in,v 1.3 2017/05/24 07:42:39 manu Exp $

Adjustments to build procedure.

--- Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000
+++ Makefile.in
@@ -25,9 +25,9 @@ prefix=@prefix@
--- Makefile.in.orig 2017-05-09 19:03:31.000000000 +0200
+++ Makefile.in 2017-05-22 04:04:17.000000000 +0200
@@ -24,11 +24,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
LOGDIR=@localstatedir@
CHECKRESULTDIR=@CHECKRESULTDIR@
Expand All @@ -16,18 +17,19 @@ Adjustments to build procedure.
LIBEXECDIR=@libexecdir@
LIBDIR=@libdir@
INCLUDEDIR=@includedir@/nagios
@@ -36,9 +36,8 @@ datarootdir=@datarootdir@
HTMLDIR=@datadir@
@@ -36,9 +36,8 @@
LN_S=@LN_S@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
COMMAND_OPTS=@COMMAND_OPTS@
-HTTPD_CONF=@HTTPD_CONF@
LN_HTTPD_SITES_ENABLED=@LN_HTTPD_SITES_ENABLED@
INIT_DIR=@init_dir@
-INIT_OPTS=-o root -g root
+INIT_OPTS=-o root -g wheel
INIT_OPTS=@INIT_OPTS@
CGICFGDIR=$(CGIDIR)

USE_EVENTBROKER=@USE_EVENTBROKER@
@@ -71,75 +70,6 @@ all:
@@ -72,77 +71,8 @@
all:
cd $(SRC_BASE) && $(MAKE)
cd $(SRC_CGI) && $(MAKE)
cd $(SRC_HTM) && $(MAKE)
Expand Down Expand Up @@ -81,7 +83,7 @@ Adjustments to build procedure.
- @echo ""
- @echo " - Look at the sample config files"
- @echo " - Read the documentation on the Nagios Library at:"
- @echo " http://library.nagios.com"
- @echo " https://library.nagios.com"
- @echo ""
- @echo "before you post a question to one of the mailing lists."
- @echo "Also make sure to include pertinent information that could"
Expand All @@ -94,7 +96,7 @@ Adjustments to build procedure.
- @echo ""
- @echo "For more information on obtaining support for Nagios, visit:"
- @echo ""
- @echo " http://support.nagios.com"
- @echo " https://support.nagios.com"
- @echo ""
- @echo "*************************************************************"
- @echo ""
Expand All @@ -103,7 +105,9 @@ Adjustments to build procedure.

$(SRC_LIB)/libnagios.a:
cd $(SRC_LIB) && $(MAKE)
@@ -245,11 +175,6 @@ install-unstripped:

@@ -246,13 +176,8 @@
$(MAKE) install-exfoliation
$(MAKE) install-basic

install-basic:
Expand All @@ -115,7 +119,9 @@ Adjustments to build procedure.

@echo ""
@echo "*** Main program, CGIs and HTML files installed ***"
@@ -270,20 +195,20 @@ install-basic:
@echo ""
@@ -271,22 +196,22 @@
@echo ""


install-config:
Expand Down Expand Up @@ -150,25 +156,29 @@ Adjustments to build procedure.
@echo ""
@echo "*** Config files installed ***"
@echo ""
@@ -300,8 +225,15 @@ install-webconf:
@echo "Remember, these are *SAMPLE* config files. You'll need to read"
@@ -305,15 +230,15 @@
@echo ""

install-exfoliation:
- cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
- cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
+ for file in contrib/exfoliation/stylesheets/* ; \
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ for file in contrib/exfoliation/images/*.* ; \
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
+ for file in contrib/exfoliation/images/logos/* ; \
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
@cd contrib/exfoliation; \
- $(INSTALL) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets; \
+ $(BSD_INSTALL_DATA_DIR) -d $(DESTDIR)$(HTMLDIR)/stylesheets; \
for file in $$(find ./stylesheets/ -type f); do \
- $(INSTALL) -m 644 $(INSTALL_OPTS) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
+ $(BSD_INSTALL_DATA) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
done; \
- $(INSTALL) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images; \
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images; \
for file in $$(find ./images -type f); do \
- $(INSTALL) -m 644 $(INSTALL_OPTS) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
+ $(BSD_INSTALL_DATA) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
done; \
cd ../..

@echo ""
@echo "*** Exfoliation theme installed ***"
@@ -329,7 +261,10 @@ install-daemoninit:
@@ -349,9 +274,12 @@
@echo ""


install-commandmode:
Expand All @@ -180,3 +190,4 @@ Adjustments to build procedure.
chmod g+s $(DESTDIR)$(LOGDIR)/rw

@echo ""
@echo "*** External command directory configured ***"
Loading