From owner-svn-ports-all@FreeBSD.ORG Tue Jan 13 20:44:46 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C6C3DBF2; Tue, 13 Jan 2015 20:44:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7CD79FC; Tue, 13 Jan 2015 20:44:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0DKikwf014366; Tue, 13 Jan 2015 20:44:46 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0DKijmd014360; Tue, 13 Jan 2015 20:44:45 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201501132044.t0DKijmd014360@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 13 Jan 2015 20:44:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376985 - in head/net-mgmt/netdot: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2015 20:44:46 -0000 Author: pi Date: Tue Jan 13 20:44:44 2015 New Revision: 376985 URL: https://svnweb.freebsd.org/changeset/ports/376985 QAT: https://qat.redports.org/buildarchive/r376985/ Log: net-mgmt/netdot: 1.0.6 -> 1.0.7 Changes: https://osl.uoregon.edu/redmine/projects/netdot/activity - Works with Apache 2.4 PR: 195968 Submitted by: Nick Hilliard (maintainer) Modified: head/net-mgmt/netdot/Makefile head/net-mgmt/netdot/distinfo head/net-mgmt/netdot/files/patch-stagedir head/net-mgmt/netdot/files/pkg-message.in head/net-mgmt/netdot/pkg-plist Modified: head/net-mgmt/netdot/Makefile ============================================================================== --- head/net-mgmt/netdot/Makefile Tue Jan 13 20:23:58 2015 (r376984) +++ head/net-mgmt/netdot/Makefile Tue Jan 13 20:44:44 2015 (r376985) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= netdot -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= net-mgmt MASTER_SITES= http://netdot.uoregon.edu/pub/dists/ @@ -12,6 +12,7 @@ COMMENT= Open source tool to organize an LICENSE= GPLv2 RUN_DEPENDS= p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \ + mp2bug:${PORTSDIR}/www/mod_perl2 \ p5-Apache-Session>=1.6:${PORTSDIR}/www/p5-Apache-Session \ p5-Apache-AuthCookie>=0:${PORTSDIR}/www/p5-Apache-AuthCookie \ p5-Apache2-SiteControl>=1.0:${PORTSDIR}/www/p5-Apache2-SiteControl \ Modified: head/net-mgmt/netdot/distinfo ============================================================================== --- head/net-mgmt/netdot/distinfo Tue Jan 13 20:23:58 2015 (r376984) +++ head/net-mgmt/netdot/distinfo Tue Jan 13 20:44:44 2015 (r376985) @@ -1,2 +1,2 @@ -SHA256 (netdot-1.0.6.tar.gz) = 0b1d98f8bf2a92901a290cf6689880fe9e98790bb54d95e7747d67b92783501e -SIZE (netdot-1.0.6.tar.gz) = 2208181 +SHA256 (netdot-1.0.7.tar.gz) = f8fe9804973d09f953dd520795312d5ef2b595151fadd595a1fec2758d99d79c +SIZE (netdot-1.0.7.tar.gz) = 2216634 Modified: head/net-mgmt/netdot/files/patch-stagedir ============================================================================== --- head/net-mgmt/netdot/files/patch-stagedir Tue Jan 13 20:23:58 2015 (r376984) +++ head/net-mgmt/netdot/files/patch-stagedir Tue Jan 13 20:44:44 2015 (r376985) @@ -1,158 +1,11 @@ -diff -bur Makefile.orig Makefile ---- Makefile.orig 2013-12-19 15:09:48.000000000 +0000 -+++ Makefile 2014-06-29 16:27:32.000000000 +0100 -@@ -7,7 +7,8 @@ - # Netdot Makefile - # - PERL ?= /usr/bin/perl --PREFIX ?= /usr/local/netdot -+PREFIX ?= /usr/local/www/netdot -+STAGEDIR ?= $(PREFIX) - APACHEUSER ?= apache - APACHEGROUP ?= apache - MAKE ?= make -@@ -23,6 +24,7 @@ - @echo - @echo " PERL = $(PERL)" - @echo " PREFIX = $(PREFIX)" -+ @echo " STAGEDIR = $(STAGEDIR)" - @echo " APACHEUSER = $(APACHEUSER)" - @echo " APACHEGROUP = $(APACHEGROUP)" - @echo " MAKE = $(MAKE)" -@@ -88,14 +90,14 @@ - @echo "Creating necessary directories..." - echo $(PREFIX) > ./.prefix - for dir in $(DIR); do \ -- if test -d $(PREFIX)/$$dir; then \ -- echo "Skipping dir $(PREFIX)/$$dir; already exists"; \ -+ if test -d $(STAGEDIR)/$$dir; then \ -+ echo "Skipping dir $(STAGEDIR)/$$dir; already exists"; \ - else \ -- mkdir -m $(DMOD) -p $(PREFIX)/$$dir ; \ -+ mkdir -m $(DMOD) -p $(STAGEDIR)/$$dir ; \ - fi ; \ - done -- chown -R $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/tmp -- chmod 750 $(PREFIX)/tmp -+ chown -R $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/tmp -+ chmod 750 $(STAGEDIR)/tmp - - htdocs: - cd $@ ; $(MAKE) all DIR=$@ -diff -bur doc/Makefile.orig doc/Makefile ---- doc/Makefile.orig 2011-09-23 16:00:36.000000000 +0100 -+++ doc/Makefile 2014-06-29 16:32:27.000000000 +0100 -@@ -11,8 +11,8 @@ - $(substitute) - - for dir in $(NDIR); do \ -- chown $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/$$dir; \ -- chmod 0755 $(PREFIX)/$(DIR)/$$dir; \ -+ chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/$$dir; \ -+ chmod 0755 $(STAGEDIR)/$(DIR)/$$dir; \ - done - - # This section creates the doc/ subdirs -diff -bur etc/utility-Makefile.orig etc/utility-Makefile ---- etc/utility-Makefile.orig 2012-07-13 19:17:17.000000000 +0100 -+++ etc/utility-Makefile 2014-06-29 16:37:23.000000000 +0100 -@@ -17,6 +17,7 @@ - - # Defaults - REPLACE_PREFIX = $(PREFIX) -+REPLACE_STAGEDIR=$(STAGEDIR) - REPLACE_LIB = $(REPLACE_PREFIX)/lib - REPLACE_ETC = $(REPLACE_PREFIX)/etc - REPLACE_PERL = $(PERL) -@@ -41,7 +42,7 @@ - for file in $(FILES); do\ - $(SED) -r $(REPLACEMENT_EXPRESSIONS) $$file\ - > $$file.tmp;\ -- install -m $(FMOD) $$file.tmp $(PREFIX)/$(DIR)/$$file;\ -+ install -m $(FMOD) $$file.tmp $(STAGEDIR)/$(DIR)/$$file;\ - rm -rf $$file.tmp;\ - done - @echo "Done." -@@ -51,10 +52,10 @@ - define mkdirs - @echo "Creating necessary directories..." - for dir in $(NDIR); do \ -- if test -d $(PREFIX)/$(DIR)/$$dir; then \ -- echo "Skipping dir $(PREFIX)/$(DIR)/$$dir; already exists"; \ -+ if test -d $(STAGEDIR)/$(DIR)/$$dir; then \ -+ echo "Skipping dir $(STAGEDIR)/$(DIR)/$$dir; already exists"; \ - else \ -- mkdir -m $(DMOD) -p $(PREFIX)/$(DIR)/$$dir ; \ -+ mkdir -m $(DMOD) -p $(STAGEDIR)/$(DIR)/$$dir ; \ - fi ; \ - done - @echo "Done." -@@ -64,6 +65,6 @@ - # left hanging around - define wipedir - @echo "Wiping out directory before installing" --rm -fr $(PREFIX)/$(DIR) -+rm -fr $(STAGEDIR)/$(DIR) - @echo "done" - endef -diff -bur export/Makefile.orig export/Makefile ---- export/Makefile.orig 2012-07-13 19:17:17.000000000 +0100 -+++ export/Makefile 2014-06-29 16:32:47.000000000 +0100 -@@ -11,8 +11,8 @@ - $(substitute) - - for dir in $(NDIR); do \ -- chown $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/$$dir; \ -- chmod 0755 $(PREFIX)/$(DIR)/$$dir; \ -+ chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/$$dir; \ -+ chmod 0755 $(STAGEDIR)/$(DIR)/$$dir; \ - done - - # This section creates the export/ subdirs -diff -bur htdocs/Makefile.orig htdocs/Makefile ---- htdocs/Makefile.orig 2012-07-13 19:17:17.000000000 +0100 -+++ htdocs/Makefile 2014-06-29 16:33:00.000000000 +0100 +--- htdocs/Makefile.orig 2014-12-14 15:02:04.000000000 +0000 ++++ htdocs/Makefile 2014-12-14 15:02:12.000000000 +0000 @@ -9,7 +9,7 @@ all: wipedir dir $(substitute) -- ln -s $(PREFIX)/doc/manual/netdot-manual.htm $(PREFIX)/$(DIR)/help/manual.html +- ln -s $(STAGEDIR)/doc/manual/netdot-manual.htm $(STAGEDIR)/$(DIR)/help/manual.html + ln -s $(PREFIX)/doc/manual/netdot-manual.htm $(STAGEDIR)/$(DIR)/help/manual.html # Wipe out dir before installing wipedir: -@@ -20,10 +20,10 @@ - $(mkdirs) - - @echo "Hacking together mason permissions fix..." -- touch $(PREFIX)/$(DIR)/masondata/obj/.__obj_create_marker -- chown -R $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/masondata -- chmod 0755 $(PREFIX)/$(DIR)/masondata -+ touch $(STAGEDIR)/$(DIR)/masondata/obj/.__obj_create_marker -+ chown -R $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/masondata -+ chmod 0755 $(STAGEDIR)/$(DIR)/masondata - # Graphs can be updated dynamically so apache needs +w -- chown $(APACHEUSER):$(APACHEGROUP) $(PREFIX)/$(DIR)/img/graphs -- chmod 0750 $(PREFIX)/$(DIR)/img/graphs -+ chown $(APACHEUSER):$(APACHEGROUP) $(STAGEDIR)/$(DIR)/img/graphs -+ chmod 0750 $(STAGEDIR)/$(DIR)/img/graphs - -diff -bur var/Makefile.orig var/Makefile ---- var/Makefile.orig 2011-09-23 16:00:38.000000000 +0100 -+++ var/Makefile 2014-06-29 16:34:01.000000000 +0100 -@@ -13,7 +13,7 @@ - POLLSTATSRRD = pollstats.rrd - - all: -- if ! test -r $(PREFIX)/$(DIR)/$(POLLSTATSRRD); then \ -+ if ! test -r $(STAGEDIR)/$(DIR)/$(POLLSTATSRRD); then \ - rrdtool create $(POLLSTATSRRD) -s 3600 \ - DS:ips:GAUGE:7200:0:4294967296 \ - DS:macs:GAUGE:7200:0:4294967296 \ -@@ -24,5 +24,5 @@ - RRA:AVERAGE:0.5:24:365 \ - RRA:MAX:0.5:24:30 \ - RRA:MIN:0.5:24:30; \ -- install -m $(FMOD) $(POLLSTATSRRD) $(PREFIX)/$(DIR)/$(POLLSTATSRRD); \ -+ install -m $(FMOD) $(POLLSTATSRRD) $(STAGEDIR)/$(DIR)/$(POLLSTATSRRD); \ - fi; Modified: head/net-mgmt/netdot/files/pkg-message.in ============================================================================== --- head/net-mgmt/netdot/files/pkg-message.in Tue Jan 13 20:23:58 2015 (r376984) +++ head/net-mgmt/netdot/files/pkg-message.in Tue Jan 13 20:44:44 2015 (r376985) @@ -28,5 +28,11 @@ what should be added to your server's cr %%WWWDIR%%/etc/netdot_apache2_local.conf %%WWWDIR%%/etc/netdot_apache2_ldap.conf +6. Running Apache 2.4? Make sure that both the mod_perl and mod_apreq2 have +been added to httpd.conf: + +LoadModule perl_module libexec/apache24/mod_perl.so +LoadModule apreq_module libexec/apache24/mod_apreq2.so + Note that any changes to Site.conf require an apache reload. ############################################################################### Modified: head/net-mgmt/netdot/pkg-plist ============================================================================== --- head/net-mgmt/netdot/pkg-plist Tue Jan 13 20:23:58 2015 (r376984) +++ head/net-mgmt/netdot/pkg-plist Tue Jan 13 20:44:44 2015 (r376985) @@ -28,6 +28,7 @@ %%WWWDIR%%/etc/default_data %%WWWDIR%%/etc/netdot.cron %%WWWDIR%%/etc/netdot.meta +%%WWWDIR%%/etc/netdot_apache24_local.conf %%WWWDIR%%/etc/netdot_apache2_ldap.conf %%WWWDIR%%/etc/netdot_apache2_local.conf %%WWWDIR%%/etc/netdot_apache2_radius.conf @@ -202,6 +203,7 @@ %%WWWDIR%%/htdocs/rest/host %%WWWDIR%%/htdocs/rest/host_contacts %%WWWDIR%%/htdocs/rest/index.html +%%WWWDIR%%/htdocs/rest/updatedev %%WWWDIR%%/htdocs/user_help/autohandler %%WWWDIR%%/htdocs/user_help/dhandler %%WWWDIR%%/htdocs/user_help/hosts.html @@ -319,58 +321,58 @@ %%WWWDIR%%/upgrade/updatedb %%WWWDIR%%/upgrade/upgrade-tasks %%WWWDIR%%/var/pollstats.rrd -@dirrmtry %%WWWDIR%%/bin -@dirrmtry %%WWWDIR%%/doc/manual -@dirrmtry %%WWWDIR%%/doc -@dirrmtry %%WWWDIR%%/htdocs/cable_plant -@dirrmtry %%WWWDIR%%/htdocs/css -@dirrmtry %%WWWDIR%%/htdocs/generic -@dirrmtry %%WWWDIR%%/htdocs/help -@dirrmtry %%WWWDIR%%/htdocs/img/graphs -@dirrmtry %%WWWDIR%%/htdocs/img -@dirrmtry %%WWWDIR%%/htdocs/java_script -@dirrmtry %%WWWDIR%%/htdocs/management -@dirrmtry %%WWWDIR%%/htdocs/contacts -@dirrmtry %%WWWDIR%%/htdocs/operations -@dirrmtry %%WWWDIR%%/htdocs/reports -@dirrmtry %%WWWDIR%%/htdocs/export -@dirrmtry %%WWWDIR%%/htdocs/user_management -@dirrmtry %%WWWDIR%%/htdocs/user_help -@dirrmtry %%WWWDIR%%/htdocs/rest -@dirrmtry %%WWWDIR%%/lib/Netdot/Manual -@dirrmtry %%WWWDIR%%/lib/Netdot/Meta/Table -@dirrmtry %%WWWDIR%%/lib/Netdot/Meta -@dirrmtry %%WWWDIR%%/lib/Netdot/Model/Plugins -@dirrmtry %%WWWDIR%%/lib/Netdot/Model/Device/CLI -@dirrmtry %%WWWDIR%%/lib/Netdot/Model/Device -@dirrmtry %%WWWDIR%%/lib/Netdot/Model -@dirrmtry %%WWWDIR%%/lib/Netdot/UI -@dirrmtry %%WWWDIR%%/lib/Netdot/Util -@dirrmtry %%WWWDIR%%/lib/Netdot/Exporter -@dirrmtry %%WWWDIR%%/lib/Netdot -@dirrmtry %%WWWDIR%%/lib -@dirrmtry %%WWWDIR%%/etc -@dirrmtry %%WWWDIR%%/import -@dirrmtry %%WWWDIR%%/export/docs -@dirrmtry %%WWWDIR%%/export/nagios -@dirrmtry %%WWWDIR%%/export/sysmon -@dirrmtry %%WWWDIR%%/export/rancid -@dirrmtry %%WWWDIR%%/export/cacti -@dirrmtry %%WWWDIR%%/export/ethers -@dirrmtry %%WWWDIR%%/export/bind -@dirrmtry %%WWWDIR%%/export/dhcpd -@dirrmtry %%WWWDIR%%/export/smokeping -@dirrmtry %%WWWDIR%%/export -@dirrmtry %%WWWDIR%%/htdocs/masondata/obj +@dir %%WWWDIR%%/bin +@dir %%WWWDIR%%/doc/manual +@dir %%WWWDIR%%/doc +@dir %%WWWDIR%%/htdocs/cable_plant +@dir %%WWWDIR%%/htdocs/css +@dir %%WWWDIR%%/htdocs/generic +@dir %%WWWDIR%%/htdocs/help +@dir %%WWWDIR%%/htdocs/img/graphs +@dir %%WWWDIR%%/htdocs/img +@dir %%WWWDIR%%/htdocs/java_script +@dir %%WWWDIR%%/htdocs/management +@dir %%WWWDIR%%/htdocs/contacts +@dir %%WWWDIR%%/htdocs/operations +@dir %%WWWDIR%%/htdocs/reports +@dir %%WWWDIR%%/htdocs/export +@dir %%WWWDIR%%/htdocs/user_management +@dir %%WWWDIR%%/htdocs/user_help +@dir %%WWWDIR%%/htdocs/rest +@dir %%WWWDIR%%/lib/Netdot/Manual +@dir %%WWWDIR%%/lib/Netdot/Meta/Table +@dir %%WWWDIR%%/lib/Netdot/Meta +@dir %%WWWDIR%%/lib/Netdot/Model/Plugins +@dir %%WWWDIR%%/lib/Netdot/Model/Device/CLI +@dir %%WWWDIR%%/lib/Netdot/Model/Device +@dir %%WWWDIR%%/lib/Netdot/Model +@dir %%WWWDIR%%/lib/Netdot/UI +@dir %%WWWDIR%%/lib/Netdot/Util +@dir %%WWWDIR%%/lib/Netdot/Exporter +@dir %%WWWDIR%%/lib/Netdot +@dir %%WWWDIR%%/lib +@dir %%WWWDIR%%/etc +@dir %%WWWDIR%%/import +@dir %%WWWDIR%%/export/docs +@dir %%WWWDIR%%/export/nagios +@dir %%WWWDIR%%/export/sysmon +@dir %%WWWDIR%%/export/rancid +@dir %%WWWDIR%%/export/cacti +@dir %%WWWDIR%%/export/ethers +@dir %%WWWDIR%%/export/bind +@dir %%WWWDIR%%/export/dhcpd +@dir %%WWWDIR%%/export/smokeping +@dir %%WWWDIR%%/export +@dir %%WWWDIR%%/htdocs/masondata/obj @unexec rm -rf %D/%%WWWDIR%%/htdocs/masondata/obj 2> /dev/null || true -@dirrmtry %%WWWDIR%%/htdocs/masondata/cache -@dirrmtry %%WWWDIR%%/htdocs/masondata -@dirrmtry %%WWWDIR%%/htdocs -@dirrmtry %%WWWDIR%%/tmp/sessions/locks -@dirrmtry %%WWWDIR%%/tmp/sessions +@dir %%WWWDIR%%/htdocs/masondata/cache +@dir %%WWWDIR%%/htdocs/masondata +@dir %%WWWDIR%%/htdocs +@dir %%WWWDIR%%/tmp/sessions/locks +@dir %%WWWDIR%%/tmp/sessions @unexec rm -rf %D/%%WWWDIR%%/tmp/sessions 2> /dev/null || true -@dirrmtry %%WWWDIR%%/tmp -@dirrmtry %%WWWDIR%%/upgrade -@dirrmtry %%WWWDIR%%/var -@dirrmtry %%WWWDIR%% +@dir %%WWWDIR%%/tmp +@dir %%WWWDIR%%/upgrade +@dir %%WWWDIR%%/var +@dir %%WWWDIR%% @unexec if [ -d %%WWWDIR%% ]; then echo "===> There are files/directories remaining under %D/%%WWWDIR%%. If you wish to deinstall netdot completely, inspect this directory for any files you may want to keep and then remove it."; fi