forked from jsonn/pkgsrc
-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #557 from fac/2016Q4_backport_nagios-base
Backport nagios-base from 2017Q4 for security fixes
- Loading branch information
Showing
21 changed files
with
333 additions
and
911 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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= [email protected] | ||
| HOMEPAGE= http://www.nagios.org/ | ||
| HOMEPAGE= https://www.nagios.org/ | ||
| COMMENT= Network monitor | ||
| LICENSE= gnu-gpl-v2 | ||
|
|
||
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
@@ -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 | ||
|
|
@@ -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" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.