update to LibreNMS-201508

net/librenms/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2015/07/16 02:50:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2015/08/12 15:25:04 sthen Exp $
 
 COMMENT =	auto-discovering network management/monitoring system
 
-DISTNAME =	librenms-0.20150716
-GH_ACCOUNT =	librenms
-GH_PROJECT =	librenms
-GH_COMMIT =	f51be32ca9390f15f9d4975a755fbeb29c4be502
+V =		201508
+DISTNAME =	librenms-$V
+DISTFILES =	librenms-$V{$V}.tar.gz
 
 CATEGORIES =	net www
 
@@ -16,6 +15,8 @@ MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
+MASTER_SITES =	https://github.com/librenms/librenms/archive/
+
 MODULES =	lang/php \
 		lang/python
 MODPY_BUILDDEP = No

net/librenms/distinfo

@@ -1,2 +1,2 @@
-SHA256 (librenms-0.20150716.tar.gz) = 4oQDouOjLqTOtJAGJOZz+rerN3qJ6g+K3byGec47KVg=
-SIZE (librenms-0.20150716.tar.gz) = 24429282
+SHA256 (librenms-201508.tar.gz) = YNzdR3idnomMYZvgAUN50nZa2jB8h8hehlW+hcVPPA4=
+SIZE (librenms-201508.tar.gz) = 28367865

net/librenms/patches/patch-daily_sh

@@ -1,27 +1,30 @@
-$OpenBSD: patch-daily_sh,v 1.2 2015/06/25 20:47:27 sthen Exp $
---- daily.sh.orig	Thu Jun 25 20:56:52 2015
-+++ daily.sh	Thu Jun 25 20:56:55 2015
-@@ -1,15 +1,15 @@
--#!/usr/local/bin/bash
+$OpenBSD: patch-daily_sh,v 1.3 2015/08/12 15:25:04 sthen Exp $
+--- daily.sh.orig	Fri Aug  7 22:09:06 2015
++++ daily.sh	Fri Aug  7 22:10:19 2015
+@@ -1,17 +1,17 @@
+-#!/usr/bin/env bash
 +#!/bin/ksh
  
- cd $(dirname $0) || exit 1
+ set -eu
  
--if [ $(php daily.php -f update) -eq 1 ]; then 
-+if [ $(%PHP% daily.php -f update) -eq 1 ]; then 
-   git pull --quiet
--  php includes/sql-schema/update.php
-+  %PHP% includes/sql-schema/update.php
+ cd "$(dirname "$0")"
+ 
+-if [ "$(php daily.php -f update)" -eq 1 ]; then
++if [ "$(%PHP% daily.php -f update)" -eq 1 ]; then
+     git pull --quiet
+-    php includes/sql-schema/update.php
++    %PHP% includes/sql-schema/update.php
  fi
  
 -php daily.php -f syslog
 -php daily.php -f eventlog
 -php daily.php -f authlog
--php daily.php -f perf_times 
+-php daily.php -f perf_times
 -php daily.php -f callback
+-php daily.php -f device_perf
 +%PHP% daily.php -f syslog
 +%PHP% daily.php -f eventlog
 +%PHP% daily.php -f authlog
-+%PHP% daily.php -f perf_times 
++%PHP% daily.php -f perf_times
 +%PHP% daily.php -f callback
- php daily.php -f device_perf
++%PHP% daily.php -f device_perf

net/librenms/patches/patch-includes_defaults_inc_php

@@ -1,7 +1,7 @@
-$OpenBSD: patch-includes_defaults_inc_php,v 1.5 2015/07/16 02:50:33 sthen Exp $
---- includes/defaults.inc.php.orig	Thu Jul 16 01:06:21 2015
-+++ includes/defaults.inc.php	Thu Jul 16 01:09:41 2015
-@@ -28,35 +28,35 @@ $config['project_name'] = 'LibreNMS';
+$OpenBSD: patch-includes_defaults_inc_php,v 1.6 2015/08/12 15:25:04 sthen Exp $
+--- includes/defaults.inc.php.orig	Fri Aug  7 22:09:07 2015
++++ includes/defaults.inc.php	Fri Aug  7 22:09:17 2015
+@@ -40,35 +40,35 @@ $config['project_name'] = 'LibreNMS';
  $config['project_id']   = strtolower($config['project_name']);
  
  $config['temp_dir']    = '/tmp';
@@ -55,7 +55,7 @@ $OpenBSD: patch-includes_defaults_inc_php,v 1.5 2015/07/16 02:50:33 sthen Exp $
  
  // Memcached - Keep immediate statistics
  $config['memcached']['enable'] = false;
-@@ -377,17 +377,17 @@ $config['billing']['bill_autoadd'] = 0;
+@@ -428,17 +428,17 @@ $config['billing']['bill_autoadd'] = 0;
  $config['billing']['base'] = 1000;
  // Set the base to divider bytes to kB, MB, GB ,... (1000|1024)
  // External Integration
@@ -77,7 +77,7 @@ $OpenBSD: patch-includes_defaults_inc_php,v 1.5 2015/07/16 02:50:33 sthen Exp $
  // $config['nfsen_suffix']   = "_yourdomain_com";
  // Location Mapping
  // Use this feature to map ugly locations to pretty locations
-@@ -696,7 +696,7 @@ $config['api_demo'] = 0;
+@@ -749,7 +749,7 @@ $config['api_demo'] = 0;
  // Set this to 1 if you want to disable some untrusting features for the API
  // Distributed Poller-Settings
  $config['distributed_poller']                = false;

net/librenms/patches/patch-includes_definitions_inc_php

@@ -1,11 +1,11 @@
-$OpenBSD: patch-includes_definitions_inc_php,v 1.6 2015/07/16 02:50:33 sthen Exp $
+$OpenBSD: patch-includes_definitions_inc_php,v 1.7 2015/08/12 15:25:04 sthen Exp $
 
 Minimal handling for running inside chroot. Not really recommended and some
 functionality will be lost, but it might be enough for some users.
 
---- includes/definitions.inc.php.orig	Thu Jul 16 01:06:21 2015
-+++ includes/definitions.inc.php	Thu Jul 16 01:10:11 2015
-@@ -1942,6 +1942,8 @@ if (isset($config['enable_printers']) && $config['enab
+--- includes/definitions.inc.php.orig	Fri Aug  7 22:09:07 2015
++++ includes/definitions.inc.php	Fri Aug  7 22:09:17 2015
+@@ -1605,6 +1605,8 @@ if (isset($config['enable_printers']) && $config['enab
      $config['device_types'][$i]['icon'] = 'printer.png';
  }
  

net/librenms/patches/patch-validate_php

@@ -1,7 +1,7 @@
-$OpenBSD: patch-validate_php,v 1.2 2015/07/16 02:50:33 sthen Exp $
---- validate.php.orig	Thu Jul 16 01:06:30 2015
-+++ validate.php	Thu Jul 16 01:15:52 2015
-@@ -34,7 +34,7 @@ if (isset($options['h'])) {
+$OpenBSD: patch-validate_php,v 1.3 2015/08/12 15:25:04 sthen Exp $
+--- validate.php.orig	Fri Aug  7 22:09:16 2015
++++ validate.php	Fri Aug  7 22:09:17 2015
+@@ -35,7 +35,7 @@ if (isset($options['h'])) {
      exit;
  }