head 1.4;
access;
symbols
pkgsrc-2026Q1:1.4.0.86
pkgsrc-2026Q1-base:1.4
pkgsrc-2025Q4:1.4.0.84
pkgsrc-2025Q4-base:1.4
pkgsrc-2025Q3:1.4.0.82
pkgsrc-2025Q3-base:1.4
pkgsrc-2025Q2:1.4.0.80
pkgsrc-2025Q2-base:1.4
pkgsrc-2025Q1:1.4.0.78
pkgsrc-2025Q1-base:1.4
pkgsrc-2024Q4:1.4.0.76
pkgsrc-2024Q4-base:1.4
pkgsrc-2024Q3:1.4.0.74
pkgsrc-2024Q3-base:1.4
pkgsrc-2024Q2:1.4.0.72
pkgsrc-2024Q2-base:1.4
pkgsrc-2024Q1:1.4.0.70
pkgsrc-2024Q1-base:1.4
pkgsrc-2023Q4:1.4.0.68
pkgsrc-2023Q4-base:1.4
pkgsrc-2023Q3:1.4.0.66
pkgsrc-2023Q3-base:1.4
pkgsrc-2023Q2:1.4.0.64
pkgsrc-2023Q2-base:1.4
pkgsrc-2023Q1:1.4.0.62
pkgsrc-2023Q1-base:1.4
pkgsrc-2022Q4:1.4.0.60
pkgsrc-2022Q4-base:1.4
pkgsrc-2022Q3:1.4.0.58
pkgsrc-2022Q3-base:1.4
pkgsrc-2022Q2:1.4.0.56
pkgsrc-2022Q2-base:1.4
pkgsrc-2022Q1:1.4.0.54
pkgsrc-2022Q1-base:1.4
pkgsrc-2021Q4:1.4.0.52
pkgsrc-2021Q4-base:1.4
pkgsrc-2021Q3:1.4.0.50
pkgsrc-2021Q3-base:1.4
pkgsrc-2021Q2:1.4.0.48
pkgsrc-2021Q2-base:1.4
pkgsrc-2021Q1:1.4.0.46
pkgsrc-2021Q1-base:1.4
pkgsrc-2020Q4:1.4.0.44
pkgsrc-2020Q4-base:1.4
pkgsrc-2020Q3:1.4.0.42
pkgsrc-2020Q3-base:1.4
pkgsrc-2020Q2:1.4.0.38
pkgsrc-2020Q2-base:1.4
pkgsrc-2020Q1:1.4.0.18
pkgsrc-2020Q1-base:1.4
pkgsrc-2019Q4:1.4.0.40
pkgsrc-2019Q4-base:1.4
pkgsrc-2019Q3:1.4.0.36
pkgsrc-2019Q3-base:1.4
pkgsrc-2019Q2:1.4.0.34
pkgsrc-2019Q2-base:1.4
pkgsrc-2019Q1:1.4.0.32
pkgsrc-2019Q1-base:1.4
pkgsrc-2018Q4:1.4.0.30
pkgsrc-2018Q4-base:1.4
pkgsrc-2018Q3:1.4.0.28
pkgsrc-2018Q3-base:1.4
pkgsrc-2018Q2:1.4.0.26
pkgsrc-2018Q2-base:1.4
pkgsrc-2018Q1:1.4.0.24
pkgsrc-2018Q1-base:1.4
pkgsrc-2017Q4:1.4.0.22
pkgsrc-2017Q4-base:1.4
pkgsrc-2017Q3:1.4.0.20
pkgsrc-2017Q3-base:1.4
pkgsrc-2017Q2:1.4.0.16
pkgsrc-2017Q2-base:1.4
pkgsrc-2017Q1:1.4.0.14
pkgsrc-2017Q1-base:1.4
pkgsrc-2016Q4:1.4.0.12
pkgsrc-2016Q4-base:1.4
pkgsrc-2016Q3:1.4.0.10
pkgsrc-2016Q3-base:1.4
pkgsrc-2016Q2:1.4.0.8
pkgsrc-2016Q2-base:1.4
pkgsrc-2016Q1:1.4.0.6
pkgsrc-2016Q1-base:1.4
pkgsrc-2015Q4:1.4.0.4
pkgsrc-2015Q4-base:1.4
pkgsrc-2015Q3:1.4.0.2
pkgsrc-2015Q3-base:1.4
pkgsrc-2015Q2:1.3.0.36
pkgsrc-2015Q2-base:1.3
pkgsrc-2015Q1:1.3.0.34
pkgsrc-2015Q1-base:1.3
pkgsrc-2014Q4:1.3.0.32
pkgsrc-2014Q4-base:1.3
pkgsrc-2014Q3:1.3.0.30
pkgsrc-2014Q3-base:1.3
pkgsrc-2014Q2:1.3.0.28
pkgsrc-2014Q2-base:1.3
pkgsrc-2014Q1:1.3.0.26
pkgsrc-2014Q1-base:1.3
pkgsrc-2013Q4:1.3.0.24
pkgsrc-2013Q4-base:1.3
pkgsrc-2013Q3:1.3.0.22
pkgsrc-2013Q3-base:1.3
pkgsrc-2013Q2:1.3.0.20
pkgsrc-2013Q2-base:1.3
pkgsrc-2013Q1:1.3.0.18
pkgsrc-2013Q1-base:1.3
pkgsrc-2012Q4:1.3.0.16
pkgsrc-2012Q4-base:1.3
pkgsrc-2012Q3:1.3.0.14
pkgsrc-2012Q3-base:1.3
pkgsrc-2012Q2:1.3.0.12
pkgsrc-2012Q2-base:1.3
pkgsrc-2012Q1:1.3.0.10
pkgsrc-2012Q1-base:1.3
pkgsrc-2011Q4:1.3.0.8
pkgsrc-2011Q4-base:1.3
pkgsrc-2011Q3:1.3.0.6
pkgsrc-2011Q3-base:1.3
pkgsrc-2011Q2:1.3.0.4
pkgsrc-2011Q2-base:1.3
pkgsrc-2011Q1:1.3.0.2
pkgsrc-2011Q1-base:1.3
pkgsrc-2010Q4:1.2.0.38
pkgsrc-2010Q4-base:1.2
pkgsrc-2010Q3:1.2.0.36
pkgsrc-2010Q3-base:1.2
pkgsrc-2010Q2:1.2.0.34
pkgsrc-2010Q2-base:1.2
pkgsrc-2010Q1:1.2.0.32
pkgsrc-2010Q1-base:1.2
pkgsrc-2009Q4:1.2.0.30
pkgsrc-2009Q4-base:1.2
pkgsrc-2009Q3:1.2.0.28
pkgsrc-2009Q3-base:1.2
pkgsrc-2009Q2:1.2.0.26
pkgsrc-2009Q2-base:1.2
pkgsrc-2009Q1:1.2.0.24
pkgsrc-2009Q1-base:1.2
pkgsrc-2008Q4:1.2.0.22
pkgsrc-2008Q4-base:1.2
pkgsrc-2008Q3:1.2.0.20
pkgsrc-2008Q3-base:1.2
cube-native-xorg:1.2.0.18
cube-native-xorg-base:1.2
pkgsrc-2008Q2:1.2.0.16
pkgsrc-2008Q2-base:1.2
cwrapper:1.2.0.14
pkgsrc-2008Q1:1.2.0.12
pkgsrc-2008Q1-base:1.2
pkgsrc-2007Q4:1.2.0.10
pkgsrc-2007Q4-base:1.2
pkgsrc-2007Q3:1.2.0.8
pkgsrc-2007Q3-base:1.2
pkgsrc-2007Q2:1.2.0.6
pkgsrc-2007Q2-base:1.2
pkgsrc-2007Q1:1.2.0.4
pkgsrc-2007Q1-base:1.2
pkgsrc-2006Q4:1.2.0.2
pkgsrc-2006Q4-base:1.2
pkgsrc-2006Q3:1.1.0.6
pkgsrc-2006Q3-base:1.1
pkgsrc-2006Q2:1.1.0.4
pkgsrc-2006Q2-base:1.1
pkgsrc-2006Q1:1.1.0.2
pkgsrc-2006Q1-base:1.1;
locks; strict;
comment @# @;
1.4
date 2015.09.09.08.35.51; author hauke; state Exp;
branches;
next 1.3;
commitid 5NJRSCkfvT1AsyAy;
1.3
date 2011.03.15.20.36.03; author bouyer; state Exp;
branches;
next 1.2;
1.2
date 2006.12.16.15.25.41; author bouyer; state Exp;
branches;
next 1.1;
1.1
date 2006.03.09.20.25.28; author bouyer; state Exp;
branches;
next ;
desc
@@
1.4
log
@Upgrade Netdisco to v1.3.3. x1.1 had been broken since around Perl 5.16.
Adapt for use with Apache 2.4.x
From the ChangeLog:
1.3.3 (2014-03-27)
Bugfixes:
* [113] Collect SSID in macsuck - fixed for unknown SSID (Jiri)
* [] Proper fallback from SNMPv3 to SNMPv2 when discovering
* [99] Node update should only search within the VLAN
* [] Skip HSRP addresses during arpnip
1.3.2 (2013-08-29)
Bugfixes:
* [113] Collect SSID in macsuck (Jiri)
1.3.1 (2013-07-08)
Bugfixes:
* [] Include 'topology' table when DB is (re)created
* [] Updates to 'node' and 'node_wireless' table definitions
1.3 (2013-05-20)
Bugfixes:
* [] Undefined MAC would make is_mac() die (N. Giefing)
* [] Apply quotemeta to avoid Inventory explosion (T. Gerlach)
* [94] Netdisco -O does not import oui.txt due to spaces in oui.txt
1.2 (2013-04-13)
Features:
* [3598045] Collect VLAN in macsuck (Jiri Dvorak)
* [3598089] Collect SSID in macsuck (Jiri Dvorak)
* [] Capture BSSID, per AP MAC, associated with wireless SSID in
device_port_ssid table if available.
* [] Add config directive "reverse_lookup_ipv6" to control whether
reverse DNS lookups should be performed for IPv6 addresses.
* [] Add option to node.html to search for entries only appearing on
a given date.
* [] Config directive "macsuck_no_vlan" now accepts both vlan names
and numbers (VIDs). Patch from Peter Hicks.
* [] Collect and display "vmVlanType", indicating whether a VLAN is
static or dynamic on a switch port. Currently Cisco-specific.
Patch from Wolfgang Friebel.
* [] New database table "topology" to support adding topology links
without a discovery protocol or an external topology text file.
* [] New config option "snmpdiscover_timeout" to override SNMP
timeout during discovery. This speeds up finding the correct
SNMP string when default timeout needs to be large.
* [] Add report "Inventory by Name", patch from Laurens Vets.
* [] Add config option for macsuck to ignore specific VLANs on
specific devices (Peter Hicks)
* [] Add config option for macsuck to ignore unnamed VLANs (Peter
Hicks)
* [] Ignore devices with vendor "netdisco" - support for pseudo
devices to interconnect discovered devices/ports
* [] Improved "multiple nodes on port" display (N. Bernstein)
* [] Default to _not_ vacuum db tables. Opt 'vacuum' to enable.
Bugfixes:
+ [3541443] Remove port rename from find_neighbors() handle in SNMP::Info
* [] Report "Undiscovered neighbors" also showed neighbors advertising
an address not equal to their root_ip.
+ [] Change job log dir creation to use mkpath to resolve potential
race condition.
+ [] Fix wireless client info collection to properly manage its
transaction.
+ [] Fix deprecated use of qw() in device view for Perl 5.14 (cstamas)
+ [] Fix "Device Module Search" issue with searching on serial number.
+ [] Fix error message during discovery to be more accurate and not
print variables that might be undef.
* [] Fix warnings about undef data when running netdisco -B
* [] VLAN inventory: with odd number of results, last row not displayed
* [] Fix infinite loop of later worker if earlier worker dies
before completing all his work.
@
text
@$NetBSD$
--- netdisco_apache.conf.orig 2014-03-27 22:48:23.000000000 +0000
+++ netdisco_apache.conf
@@@@ -4,7 +4,5 @@@@
-#
-# Apache 1.x Users -- Comment out these four lines
-#
LoadModule perl_module libexec/apache2/mod_perl.so
LoadModule apreq_module libexec/apache2/mod_apreq2.so
+PerlModule CGI
PerlModule Apache2::compat
@@@@ -16,4 +14,8 @@@@ PerlModule Apache::DBI
- order allow,deny
- allow from all
+ # Apache <= 2.2
+ #order allow,deny
+ #allow from all
+
+ # Apache >= 2.4
+ Require all granted
@
1.3
log
@Update to 1.0. Summary of changes since 0.95:
- improved user interface
- improved vlan support
- improved support for wifi AP and IP phones
- updated snmp mibs
and more ...
@
text
@d1 1
a1 1
$NetBSD: patch-ad,v 1.2 2006/12/16 15:25:41 bouyer Exp $
d3 3
a5 8
--- netdisco_apache.conf.orig 2009-06-03 01:27:02.000000000 +0200
+++ netdisco_apache.conf 2011-03-14 17:00:47.000000000 +0100
@@@@ -12,8 +12,10 @@@@
# Pool Database Connections
PerlModule Apache::DBI
+@@APACHE2@@PerlModule CGI
+@@APACHE2@@PerlModule Apache2::Request
d7 8
d16 8
a23 2
order allow,deny
allow from all
@
1.2
log
@Upgrade to 0.95:
support more devices
severay bug fixes
[] Apache-based HTTP authentication added.
[1107564] Disable BULKWALK on a per device or per device type basis:
bulkwalk_no, arpnip_no, macsuck_no, discover_no use same syntax,
see README
[1111654] Allow wrap in config file with \ char
[969117] Automatically reloads config file in web front end when it changes.
[1392968] The map key is now automatically derived from configuration (i.e.,
entries in node_map)
[1107578] Port Control via VLANs
[744598] Inventory by subnet - IP Inventory feature improved to dump whole
subnets
[1107579] The map can be clustered by device Location fields. Thanks to Bjorn
Isaksson for the patch.
[1393653] Modules for optional features (e.g., NBT) are now loaded when
needed, not at startup.
[1116552] The devices in the "Choose Device" box on the Admin Panel
are now listed in numerical order by IP address, to make
it easier to find the one you're looking for.
[1116547] Contact field is now searched in the device search. New backend
database field time_recent in node database, for nodes that move
around a lot, it's the last time this node moved *back* to this
device (time_first is the first time ever). Add macsuck_only,
arpnip_only, discover_only limits Get SSIDs and channel from
wireless base station ports, and display SSID in device
port, add SSID inventory and SSID search
[1462199] Add SNMP timeout parameter to create_device()
[1492791] Added options snmp_force_v*
[] pg_all, pg_run, pg_init, pg_back unified into single sql/pg script
This script parses netdisco.conf for database settings.
[] Add graph_png option to use png output from graphviz
@
text
@d1 1
a1 1
$NetBSD: patch-ad,v 1.1 2006/03/09 20:25:28 bouyer Exp $
d3 3
a5 3
--- netdisco_apache.conf.orig 2006-11-14 01:27:14.000000000 +0100
+++ netdisco_apache.conf 2006-12-06 22:08:24.000000000 +0100
@@@@ -14,8 +14,10 @@@@
d12 1
a12 2
-
+
a15 16
@@@@ -24,12 +26,12 @@@@
# Preload the netdisco module into global server space.
# and parse the config file only once.
{ package HTML::Mason::Commands;
- use lib '/usr/local/netdisco';
+ use lib '/usr/pkg/netdisco';
use netdisco qw/:all/;
- &netdisco::config('/usr/local/netdisco/netdisco.conf');
+ &netdisco::config('/usr/pkg/netdisco/netdisco.conf');
# Uncomment next two lines to setup switch reverse proxy.
- #use lib '/usr/local/netdisco/switch';
+ #use lib '/usr/pkg/netdisco/switch';
#use Apache::ProxyRewriteMax;
}
@
1.1
log
@Make httpd config fragment work for apache-2 too.
Fix PLIST
Add dependancy to p5-Graph, p5-GraphViz isn't enough.
bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1.1.1 2005/05/25 17:06:49 bouyer Exp $
d3 3
a5 3
--- netdisco_apache.conf.orig 2004-03-07 20:13:49.000000000 +0100
+++ netdisco_apache.conf 2006-03-09 16:34:23.000000000 +0100
@@@@ -4,8 +4,10 @@@@
d17 1
a17 1
@@@@ -14,12 +16,12 @@@@
a32 12
@@@@ -30,8 +32,9 @@@@
use strict;
my $ah = new HTML::Mason::ApacheHandler(
- comp_root => '/usr/local/netdisco/html',
- data_dir => '/usr/local/netdisco/mason',
+@@APACHE2@@ args_method => 'mod_perl',
+ comp_root => '/usr/pkg/netdisco/html',
+ data_dir => '/usr/pkg/netdisco/mason',
request_class => 'MasonX::Request::WithApacheSession',
session_class => 'Apache::Session::Postgres',
session_commit => 1,
@