Re: pkg/52020: Upgrading nagios-base package to version 4.3.1

[Alberto Mijares <alberto.m%futurelinkcorporation.com@localhost>]

The following reply was made to PR pkg/52020; it has been noted by GNATS.

From: Alberto Mijares <alberto.m%futurelinkcorporation.com@localhost>
To: gnats-bugs%NetBSD.org@localhost, pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost,
 pkgsrc-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/52020: Upgrading nagios-base package to version 4.3.1
Date: Thu, 2 Mar 2017 14:04:25 -0400

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 --12G2o16Ah6CCmr2qLbqCooaTjcrPT4OEw
 Content-Type: multipart/mixed; boundary="xnCcPWpe9fqfum79lAdhbUo0cBmkHegPA";
  protected-headers="v1"
 From: Alberto Mijares <alberto.m%futurelinkcorporation.com@localhost>
 To: gnats-bugs%NetBSD.org@localhost, pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost,
  pkgsrc-bugs%netbsd.org@localhost
 Message-ID: <0d35e44e-41fe-4e67-d041-c182e69ca4cf%futurelinkcorporation.com@localhost>
 Subject: Re: pkg/52020: Upgrading nagios-base package to version 4.3.1
 References: <pr-pkg-52020%gnats.netbsd.org@localhost>
  <20170301132922.9E7DC7A2A9%mollari.NetBSD.org@localhost>
  <20170302042001.0D1B77A28C%mollari.NetBSD.org@localhost>
 In-Reply-To: <20170302042001.0D1B77A28C%mollari.NetBSD.org@localhost>
 
 --xnCcPWpe9fqfum79lAdhbUo0cBmkHegPA
 Content-Type: text/plain; charset=windows-1252
 Content-Transfer-Encoding: quoted-printable
 
 
 
 On 03/02/2017 12:20 AM, Alberto Jos=E9 Mijares Paredes wrote:
 > The following reply was made to PR pkg/52020; it has been noted by GNAT=
 S.
 >=20
 > From: =3D?UTF-8?Q?Alberto_Jos=3DC3=3DA9_Mijares_Paredes?=3D <alberto.m@=
 futurelinkcorporation.com>
 > To: gnats-bugs%netbsd.org@localhost
 > Cc:=20
 > Subject: Re: pkg/52020: Upgrading nagios-base package to version 4.3.1
 > Date: Wed, 1 Mar 2017 23:48:39 -0430
 >=20
 >  --001a113ed53642eb310549b7b967
 >  Content-Type: text/plain; charset=3DUTF-8
 > =20
 >  Doing more testing (CentOS 7, for example) I realized that this packag=
 e
 >  won't work. Just letting you know so nobody looses his time on this. I=
 'll
 >  come back to you with a new PR if I fix the issue.
 > =20
 > =20
 > =20
 
 
 Guys, this new patch works fine in FreeBSD and CentOS7.
 
 
 diff -r nagios-base.old/CVS/Entries nagios-base/CVS/Entries
 3c3
 < /Makefile/1.67/Tue Feb 28 15:20:09 2017//
 ---
 > /Makefile/1.66/Sun Oct  9 21:42:02 2016//
 diff -r nagios-base.old/distinfo nagios-base/distinfo
 1c1
 < $NetBSD: distinfo,v 1.30 2016/02/09 10:12:53 bouyer Exp $
 ---
 > $NetBSD$
 3,6c3,6
 < SHA1 (nagios-4.0.8.tar.gz) =3D d49586db6905a8e58a082251d8f89ef5c2cab872=
 
 < RMD160 (nagios-4.0.8.tar.gz) =3D b53631755e0a23aba918a99f58b7bea237fdd7=
 99
 < SHA512 (nagios-4.0.8.tar.gz) =3D
 d72fdbcc0beb2de72e5aa788b4ccc83aa30c7f4a4460edaa831f012db04647e4836b876bb=
 7dc235e2a1b525827e9a2a0f4d348919f69fbfbfdaa4d13e968e18c
 < Size (nagios-4.0.8.tar.gz) =3D 1805059 bytes
 ---
 > SHA1 (nagios-4.3.1.tar.gz) =3D 10d80a0588d729bd65bde108ebc5aa82a471a5e7=
 
 > RMD160 (nagios-4.3.1.tar.gz) =3D 7cc263814b09d828b04b5b1c39ae061a1ceb65=
 c7
 > SHA512 (nagios-4.3.1.tar.gz) =3D
 d5f1919e2b32b0b2f4c5766367f0992fcf9b1f6766f4d3386e15e318cc1f57cdae6bc07f0=
 9464fd8212bef1713948fcb25d233eab588438036f996b6c479c97e
 > Size (nagios-4.3.1.tar.gz) =3D 11095797 bytes
 11,42c11
 < SHA1 (patch-Makefile.in) =3D 953eea6b276beba75ab5c64c14d10cdcf1ca2188
 < SHA1 (patch-base_Makefile.in) =3D 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb=
 161
 < SHA1 (patch-base_checks.c) =3D 9c5fb7a8f085eed2fb31ad623eeed22596c6c168=
 
 < SHA1 (patch-base_events.c) =3D 6b659c6980c69ab1947d7a829c87482f53ed817e=
 
 < SHA1 (patch-base_logging.c) =3D 09d532acf5978ff581b7f4d211bdd286a18c188=
 6
 < SHA1 (patch-base_nerd.c) =3D 4105d3a56999077688e42c9c771e76461fe00785
 < SHA1 (patch-cgi_Makefile.in) =3D 25c22914986c0b781f5dd665a7a53778e1031a=
 63
 < SHA1 (patch-cgi_avail.c) =3D d0faf28256e5ee31ad36bdb08d59d8310c7cef8d
 < SHA1 (patch-cgi_cmd.c) =3D 6953e62e99a4df32f8dba452d2a85af66bf3ce8b
 < SHA1 (patch-cgi_extinfo.c) =3D 8cad0787fbe0a782edb93ca299462a5718a34a4b=
 
 < SHA1 (patch-cgi_getcgi.c) =3D 3af474de4f4281f18a306f7d618ff532d0a9ca9e
 < SHA1 (patch-cgi_histogram.c) =3D 4b9f583ec4579d5c5399ad1b7102511c0282b8=
 bc
 < SHA1 (patch-cgi_statusjson.c) =3D 13967c18ee3eaaaf75edb8b3ee028bece7327=
 2ae
 < SHA1 (patch-cgi_trends.c) =3D 4e5057536465192b67fcd5a141f34be816ff4452
 < SHA1 (patch-common_Makefile.in) =3D 7fa093a6109dfa03f9b97e4312d3a09e323=
 5f00f
 < SHA1 (patch-common_comments.c) =3D 7739c9c74333c45e86242383073dfa787854=
 45ec
 < SHA1 (patch-common_downtime.c) =3D 000f1e33ab1ca1c433c3fd0de3d5bf750df6=
 f57f
 < SHA1 (patch-configure) =3D f57db3a43c1abc1aa0d6fe007308089c620624a4
 < SHA1 (patch-daemon-init.in) =3D 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f=
 4
 < SHA1 (patch-html_Makefile.in) =3D cef5febcedfaaa38cdf73283e2bda43b4c114=
 379
 < SHA1 (patch-include_comments.h) =3D c86328a4f1437ee1dc2b6f97be61693414d=
 d4fce
 < SHA1 (patch-include_locations.h.in) =3D
 0ee376f6737b24f0d4ea8b37781aca70147c5e70
 < SHA1 (patch-include_statusjson.h) =3D
 c5a84b9ef3114f2e2480d719bbb4a24c8965e052
 < SHA1 (patch-lib_nsock.c) =3D bd8801e4aff13ebac26e512b44764c2da1e2e5a5
 < SHA1 (patch-lib_runcmd.c) =3D fb34fe5cdc39aca973c1a6e125b125867e6ed262
 < SHA1 (patch-lib_test-squeue.c) =3D 1bc197da815a069f0f37525f1acbf5fb4110=
 d399
 < SHA1 (patch-lib_worker.c) =3D fe1b6d00429556caaefe43afe7bb1c6d9f6fcb0b
 < SHA1 (patch-sample-config_nagios.cfg.in) =3D
 4ad00840ad66d2e01b19c6db76c810fc3fb80795
 < SHA1 (patch-t-tap_test__xsddefault.c) =3D
 db7166fae411a461d8b4a4a31f55af693aeb03b0
 < SHA1 (patch-xdata_xcddefault.c) =3D ba14af868cd773d07e029a2773a44614eed=
 c3e46
 < SHA1 (patch-xdata_xrddefault.c) =3D 8cc130bd14b0dbd6ba57cda9819f4b5d996=
 39178
 < SHA1 (patch-xdata_xsddefault.c) =3D 61c22eb8601adb53ab06b685198c7000b47=
 43c76
 ---
 > SHA1 (patch-daemon-init.in) =3D 6f3c4bf74e877ad77f5d18c873a7d8892ed24bb=
 3
 Only in nagios-base/files: nagios.conf
 diff -r nagios-base.old/Makefile nagios-base/Makefile
 4,6c4
 < DISTNAME=3D		nagios-4.0.8
 < PKGNAME=3D		${DISTNAME:S/-/-base-/}
 < PKGREVISION=3D		9
 ---
 > DISTNAME=3D		nagios-4.3.1
 9c7
 < MASTER_SITES=3D		${MASTER_SITE_SOURCEFORGE:=3Dnagios/}
 ---
 > MASTER_SITES=3D		https://assets.nagios.com/downloads/nagioscore/release=
 s/
 15c13
 < COMMENT=3D		Network monitor
 ---
 > COMMENT=3D		Network Monitor
 52c50
 < PKG_GROUPS+=3D		${NAGIOS_GROUP}
 ---
 > PKG_GROUPS=3D		${NAGIOS_GROUP}
 55c53
 < PKG_USERS+=3D		${NAGIOS_USER}:${NAGIOS_GROUP}
 ---
 > PKG_USERS=3D		${NAGIOS_USER}:${NAGIOS_GROUP}
 57a56,58
 > PKG_HOME.${NAGIOS_USER}=3D	${PREFIX}/${NAGIOS_USER}
 >
 > USERGROUP_PHASE=3D	configure
 69c70,74
 < INSTALLATION_DIRS+=3D	${PKG_SYSCONFDIR}/objects
 ---
 > INSTALLATION_DIRS+=3D	${PKG_SYSCONFDIR}/objects ${EGDIR}
 >
 > #.for files in ${EGFILES}
 > #CONF_FILES+=3D		${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}-sa=
 mple
 > #.endfor
 71,73d75
 < .for files in ${EGFILES}
 < CONF_FILES+=3D		${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
 < .endfor
 82,83d83
 < SPECIAL_PERMS+=3D	${DESTDIR}/${PREFIX}/share/nagios/rss-corefeed.html
 ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
 < SPECIAL_PERMS+=3D	${DESTDIR}/${PREFIX}/share/nagios/rss-newsfeed.html
 ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
 105,106d104
 < 	${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/rss-corefeed.html
 < 	${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/rss-newsfeed.html
 diff -r nagios-base.old/Makefile.common nagios-base/Makefile.common
 9a10,13
 > NAGIOS_GROUP?=3D		nagios
 > NAGIOSCMD_GROUP?=3D	www
 > NAGIOS_USER?=3D		nagios
 >
 14a19,22
 >
 > .if ${OPSYS} =3D=3D "Linux"
 >  USE_TOOLS+=3D             unzip
 > .endif
 Only in nagios-base.old/patches: CVS
 Only in nagios-base.old/patches: patch-base_checks.c
 Only in nagios-base.old/patches: patch-base_events.c
 Only in nagios-base.old/patches: patch-base_logging.c
 Only in nagios-base.old/patches: patch-base_Makefile.in
 Only in nagios-base.old/patches: patch-base_nerd.c
 Only in nagios-base.old/patches: patch-cgi_avail.c
 Only in nagios-base.old/patches: patch-cgi_cmd.c
 Only in nagios-base.old/patches: patch-cgi_extinfo.c
 Only in nagios-base.old/patches: patch-cgi_getcgi.c
 Only in nagios-base.old/patches: patch-cgi_histogram.c
 Only in nagios-base.old/patches: patch-cgi_Makefile.in
 Only in nagios-base.old/patches: patch-cgi_statusjson.c
 Only in nagios-base.old/patches: patch-cgi_trends.c
 Only in nagios-base.old/patches: patch-common_comments.c
 Only in nagios-base.old/patches: patch-common_downtime.c
 Only in nagios-base.old/patches: patch-common_Makefile.in
 Only in nagios-base.old/patches: patch-configure
 diff -r nagios-base.old/patches/patch-daemon-init.in
 nagios-base/patches/patch-daemon-init.in
 1c1
 < $NetBSD: patch-daemon-init.in,v 1.1 2015/04/03 17:06:08 rodent Exp $
 ---
 > $NetBSD$
 3,5c3
 < Fix portability failure.
 <
 < --- daemon-init.in.orig	2014-08-12 15:00:01.000000000 +0000
 ---
 > --- daemon-init.in.orig	2017-02-28 22:08:23.618809000 +0000
 7c5
 < @@ -73,7 +73,7 @@ fi
 ---
 > @@ -75,7 +75,7 @@ fi
 Only in nagios-base.old/patches: patch-html_Makefile.in
 Only in nagios-base.old/patches: patch-include_comments.h
 Only in nagios-base.old/patches: patch-include_locations.h.in
 Only in nagios-base.old/patches: patch-include_statusjson.h
 Only in nagios-base.old/patches: patch-lib_nsock.c
 Only in nagios-base.old/patches: patch-lib_runcmd.c
 Only in nagios-base.old/patches: patch-lib_test-squeue.c
 Only in nagios-base.old/patches: patch-lib_worker.c
 Only in nagios-base.old/patches: patch-Makefile.in
 Only in nagios-base.old/patches: patch-sample-config_nagios.cfg.in
 Only in nagios-base.old/patches: patch-t-tap_test__xsddefault.c
 Only in nagios-base.old/patches: patch-xdata_xcddefault.c
 Only in nagios-base.old/patches: patch-xdata_xrddefault.c
 Only in nagios-base.old/patches: patch-xdata_xsddefault.c
 diff -r nagios-base.old/PLIST nagios-base/PLIST
 1c1
 < @comment $NetBSD: PLIST,v 1.18 2015/04/03 17:06:08 rodent Exp $
 ---
 > @comment $NetBSD$
 4,24c4,33
 < libexec/nagios/cgi-bin/archivejson.cgi
 < libexec/nagios/cgi-bin/avail.cgi
 < libexec/nagios/cgi-bin/cmd.cgi
 < libexec/nagios/cgi-bin/config.cgi
 < libexec/nagios/cgi-bin/extinfo.cgi
 < libexec/nagios/cgi-bin/histogram.cgi
 < libexec/nagios/cgi-bin/history.cgi
 < libexec/nagios/cgi-bin/notifications.cgi
 < libexec/nagios/cgi-bin/objectjson.cgi
 < libexec/nagios/cgi-bin/outages.cgi
 < libexec/nagios/cgi-bin/showlog.cgi
 < libexec/nagios/cgi-bin/status.cgi
 < libexec/nagios/cgi-bin/statusjson.cgi
 < libexec/nagios/cgi-bin/statusmap.cgi
 < libexec/nagios/cgi-bin/statuswml.cgi
 < libexec/nagios/cgi-bin/statuswrl.cgi
 < libexec/nagios/cgi-bin/summary.cgi
 < libexec/nagios/cgi-bin/tac.cgi
 < libexec/nagios/cgi-bin/trends.cgi
 < share/examples/nagios/cgi.cfg-sample
 < share/examples/nagios/nagios.cfg-sample
 ---
 > etc/nagios/cgi.cfg
 > etc/nagios/nagios.cfg
 > etc/nagios/objects/commands.cfg
 > etc/nagios/objects/contacts.cfg
 > etc/nagios/objects/localhost.cfg
 > etc/nagios/objects/printer.cfg
 > etc/nagios/objects/switch.cfg
 > etc/nagios/objects/templates.cfg
 > etc/nagios/objects/timeperiods.cfg
 > etc/nagios/objects/windows.cfg
 > etc/nagios/resource.cfg
 > sbin/archivejson.cgi
 > sbin/avail.cgi
 > sbin/cmd.cgi
 > sbin/config.cgi
 > sbin/extinfo.cgi
 > sbin/histogram.cgi
 > sbin/history.cgi
 > sbin/notifications.cgi
 > sbin/objectjson.cgi
 > sbin/outages.cgi
 > sbin/showlog.cgi
 > sbin/status.cgi
 > sbin/statusjson.cgi
 > sbin/statusmap.cgi
 > sbin/statuswml.cgi
 > sbin/statuswrl.cgi
 > sbin/summary.cgi
 > sbin/tac.cgi
 > sbin/trends.cgi
 26,34c35,40
 < share/examples/nagios/objects/commands.cfg-sample
 < share/examples/nagios/objects/contacts.cfg-sample
 < share/examples/nagios/objects/localhost.cfg-sample
 < share/examples/nagios/objects/printer.cfg-sample
 < share/examples/nagios/objects/switch.cfg-sample
 < 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
 98a105,110
 > 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
 215a228,230
 > share/nagios/images/logos/netbsd.gif
 > share/nagios/images/logos/netbsd.jpg
 > share/nagios/images/logos/netbsd.png
 277a293,295
 > share/nagios/images/logos/suse.gif
 > share/nagios/images/logos/suse.jpg
 > share/nagios/images/logos/suse.png
 316a335
 > share/nagios/images/menu.png
 355,360d373
 < 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
 362a376,380
 > 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
 364a383,391
 > 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
 366a394,398
 > share/nagios/map-directive.html
 > share/nagios/map-form.html
 > share/nagios/map-links.html
 > share/nagios/map-popup.html
 > share/nagios/map.php
 368,372d399
 < 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
 373a401
 > share/nagios/spin/spin.min.js
 380a409
 > share/nagios/stylesheets/histogramgraph.css
 382a412,413
 > share/nagios/stylesheets/map-directive.css
 > share/nagios/stylesheets/map.css
 383a415
 > share/nagios/stylesheets/nag_funcs.css
 391a424,430
 > 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
 395c434
 < @pkgdir etc/nagios/objects
 ---
 > @pkgdir libexec/nagios
 
 
 
 
 
 --xnCcPWpe9fqfum79lAdhbUo0cBmkHegPA--
 
 --12G2o16Ah6CCmr2qLbqCooaTjcrPT4OEw
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAEBCAAGBQJYuF6qAAoJENEAbKV7uuEb4kMP/jhT6NdlTLtFDPEglPIJiO3V
 w8uCSqIPD+9BMo8kHeojyYfhOZQAWU2KIc6GKcHM7FMYAxurr4GB4EnEtYLDG/GN
 OIVNDOel/bY/7WQ/f/AmcUWsZ7EpniH8Jh+l+8QlChQeUazboRwbUWazYsaQWjwn
 f+ifGn3Yv1WbvDm+5SLok8YgFsJhSqZrhitgZuJ1X9IlPgmp7H4z2+61EX29UIXF
 /3bM9s5eMiN6v77PUnFS8TFGGb0Mo0k1jaAD6Ns5pp97yvxvefT1tFZgPo+p9d89
 RBM+ljT5IqL2liUJg3hqOXDFeYucfMmLbZUKKrdUltlW0oqeiCgPRLKWeYI7RvZr
 QdATAdHz50BGfOKrN/jMxkFf8dOTEu1ZI+yD5l/V9JHxtKZ+ScW6N+xE1/6vLxwX
 oTjHtY54Qwv7rdXtW0SeFl/uW5k+nqZHXTSjNzEzWrw+2+Dbo8cEGs6t8dmtjvRA
 4jlk4ztX7jJb6hStyuWphYVll2H8bYaPnEOH/uDoGzClk07vnCW35u0ryh24BVkY
 or9n90h/lpmQiIl1f9ofLOZBrv1i30RLVvnyOKw3sHmafud1w7Q9uZImIhTO0Lvy
 /Jcb7uU5RHU7eeaxrmZrFdwg6o7H9kG3nY2B8ztrpcRMPs30W5zoNzjVqf8XFAUG
 ZHYL2KpgSQH53F1O0zzM
 =etyP
 -----END PGP SIGNATURE-----
 
 --12G2o16Ah6CCmr2qLbqCooaTjcrPT4OEw--