Attachment 198596 Details for Bug 232658 – patch to 1.44

[patch] patch to 1.44

patch-librenms-1.44.diff (text/plain), 11.87 KB, created by Dan Langille on 2018-10-24 19:28:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2018-10-24 19:28:52 UTC

Size: 11.87 KB

patch

obsolete

>Index: net-mgmt/librenms/Makefile
>===================================================================
>--- net-mgmt/librenms/Makefile	(revision 482903)
>+++ net-mgmt/librenms/Makefile	(working copy)
>@@ -2,12 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	librenms
>-PORTVERSION=	1.43
>-PORTREVISION=	1
>+PORTVERSION=	1.44
> # RELEASE_TIMESTAMP is used for a patch inside the vendor code
> # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01
> # It sits here so you remember to update it with each release
>-RELEASE_TIMESTAMP=	1535704658
>+RELEASE_TIMESTAMP=	1539772408
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	LOCAL/dvl:vendor
>@@ -30,7 +29,7 @@
> 
> USES=		python${PY_MYSQL} shebangfix
> 
>-USE_PHP=	ctype curl filter gd hash json ldap mbstring mcrypt mysqli openssl pdo posix session simplexml snmp tokenizer xml zip
>+USE_PHP=	ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql posix session simplexml snmp tokenizer xml zip
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	librenms
>@@ -104,7 +103,7 @@
> 		poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py snmp-scan.py \
> 		snmptrap.php syslog.php validate.php
> 
>-ROOT_DIRS=	LibreNMS app bootstrap config contrib database doc html includes lib licenses logs mibs misc resources routes scripts sql-schema storage tests
>+ROOT_DIRS=	LibreNMS app bootstrap config contrib database doc html includes licenses logs mibs misc resources routes scripts sql-schema storage tests
> 
> # these are directories which require a generic @DIR entry in pkg-plist
> OTHER_DIRS=	storage/app/public \
>Index: net-mgmt/librenms/distinfo
>===================================================================
>--- net-mgmt/librenms/distinfo	(revision 482903)
>+++ net-mgmt/librenms/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1535832769
>-SHA256 (librenms-vendor-1.43.tar.gz) = e7364c085d5c636fdf8fd1dbc3d35da16b7a6ceee8934e740c8c3a8f6766d95a
>-SIZE (librenms-vendor-1.43.tar.gz) = 31842846
>-SHA256 (librenms-librenms-1.43_GH0.tar.gz) = 6f5fc969eae766d894715f703628534b35420ba3b77cc25988abfd522f14cb6c
>-SIZE (librenms-librenms-1.43_GH0.tar.gz) = 32876746
>+TIMESTAMP = 1540387130
>+SHA256 (librenms-vendor-1.44.tar.gz) = b7b54db763ac27e3fae36b3fe79377299c006da806350a21cd097c3e2c18b1d4
>+SIZE (librenms-vendor-1.44.tar.gz) = 31697443
>+SHA256 (librenms-librenms-1.44_GH0.tar.gz) = e7b213b5c3a2b7efe45f0bae5851510329ad9d010258ba453fcce6b30e8140ff
>+SIZE (librenms-librenms-1.44_GH0.tar.gz) = 31890956
>Index: net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php
>===================================================================
>--- net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php	(nonexistent)
>+++ net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php	(working copy)
>@@ -0,0 +1,12 @@
>+--- LibreNMS/Validations/Dependencies.php.orig	2018-10-24 19:04:18 UTC
>++++ LibreNMS/Validations/Dependencies.php
>+@@ -38,6 +38,9 @@ class Dependencies extends BaseValidatio
>+      */
>+     public function validate(Validator $validator)
>+     {
>++        $validator->ok("Installed from package; no Composer required");
>++        return;
>++
>+         $composer_output = trim(shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php --version'));
>+         $found = preg_match(
>+             '/Composer.*(\d+\.\d+\.\d+(-RC\d*|-beta\d?|-alpha\d+)?)/',
>
>Property changes on: net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php
>===================================================================
>--- net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php	(nonexistent)
>+++ net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php	(working copy)
>@@ -0,0 +1,10 @@
>+--- LibreNMS/Validations/Programs.php.orig	2018-10-17 10:33:28 UTC
>++++ LibreNMS/Validations/Programs.php
>+@@ -73,6 +73,7 @@ class Programs extends BaseValidation
>+             return;
>+         }
>+ 
>++        $validator->warn("fping FAILURES can be ignored if running LibreNMS in a jail without ::1. You may want to test it manually: fping ::1");
>+         $validator->fail(
>+             "$bin could not be executed. $bin must have CAP_NET_RAW capability (getcap) or suid. Selinux exlusions may be required.\n ($output)"
>+         );
>
>Property changes on: net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php
>===================================================================
>--- net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php	(nonexistent)
>+++ net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php	(working copy)
>@@ -0,0 +1,18 @@
>+--- LibreNMS/Validations/User.php.orig	2018-10-17 10:33:28 UTC
>++++ LibreNMS/Validations/User.php
>+@@ -71,6 +71,7 @@ class User extends BaseValidation
>+                 "sudo setfacl -d -m g::rwx $rrd_dir $log_dir $dir/bootstrap/cache/ $dir/storage/\n" .
>+                 "sudo chmod -R ug=rwX $rrd_dir $log_dir $dir/bootstrap/cache/ $dir/storage/\n";
>+ 
>++            if (!Config::get('installed_from_package')) {
>+             $find_result = rtrim(`find $dir \! -user $lnms_username -o \! -group $lnms_groupname 2> /dev/null`);
>+             if (!empty($find_result)) {
>+                 // Ignore files created by the webserver
>+@@ -124,6 +125,7 @@ class User extends BaseValidation
>+                     'Some folders have incorrect file permissions, this may cause issues.'
>+                 )->setFix($fix)->setList('Files', explode(PHP_EOL, $incorrect)));
>+             }
>++            }
>+         } else {
>+             $validator->warn("You don't have \$config['user'] set, this most likely needs to be set to librenms");
>+         }
>
>Property changes on: net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/librenms/files/patch-html_install.php
>===================================================================
>--- net-mgmt/librenms/files/patch-html_install.php	(revision 482903)
>+++ net-mgmt/librenms/files/patch-html_install.php	(working copy)
>@@ -1,6 +1,6 @@
>---- html/install.php.orig	2018-08-04 20:07:12 UTC
>+--- html/install.php.orig	2018-10-17 10:33:28 UTC
> +++ html/install.php
>-@@ -357,7 +357,7 @@ $config_file = <<<"EOD"
>+@@ -358,7 +358,7 @@ $config_file = <<<"EOD"
>  
>  // This is the user LibreNMS will run as
>  //Please ensure this user is created and has the correct permissions to your install
>@@ -9,7 +9,7 @@
>  
>  ### Locations - it is recommended to keep the default
>  #\$config\['install_dir'\]  = "$install_dir";
>-@@ -383,8 +383,8 @@ $config_file = <<<"EOD"
>+@@ -384,15 +384,15 @@ $config_file = <<<"EOD"
>  #\$config\['nets'\]\[\] = "192.168.0.0/16";
>  
>  # Update configuration
>@@ -20,3 +20,20 @@
>  EOD;
>  
>  if (!file_exists("../config.php")) {
>+     $conf = fopen("../config.php", 'w');
>+     if ($conf != false) {
>+         if (fwrite($conf, "<?php\n") === false) {
>+-            echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
>++            echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
>+             echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
>+         } else {
>+             $config_file = stripslashes($config_file);
>+@@ -400,7 +400,7 @@ if (!file_exists("../config.php")) {
>+             echo("<div class='alert alert-success'>The config file has been created</div>");
>+         }
>+     } else {
>+-        echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
>++        echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
>+         echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
>+     }
>+ }
>Index: net-mgmt/librenms/files/patch-includes_common.php
>===================================================================
>--- net-mgmt/librenms/files/patch-includes_common.php	(revision 482903)
>+++ net-mgmt/librenms/files/patch-includes_common.php	(working copy)
>@@ -1,6 +1,6 @@
>---- includes/common.php.orig	2018-08-04 20:07:12 UTC
>+--- includes/common.php.orig	2018-10-17 10:33:28 UTC
> +++ includes/common.php
>-@@ -1157,6 +1157,10 @@ function version_info($remote = false)
>+@@ -1158,6 +1158,10 @@ function version_info($remote = false)
>          $output['local_sha']    = $local_sha;
>          $output['local_date']   = $local_date;
>          $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
>@@ -11,16 +11,13 @@
>      }
>      $output['db_schema']   = dbIsConnected() ? get_db_schema() : '?';
>      $output['php_ver']     = phpversion();
>-@@ -1713,6 +1717,12 @@ function set_numeric($value, $default = 
>+@@ -1719,6 +1723,9 @@ function set_numeric($value, $default = 
>  
>  function check_git_exists()
>  {
>-+    global $config;
>++    # installed from package; git not involved
>++    return false;
> +
>-+    if (!empty($config['installed_from_package'])) {
>-+        return false;
>-+    }
>-+
>      exec('git > /dev/null 2>&1', $response, $exit_code);
>      if ($exit_code === 1) {
>          return true;
>Index: net-mgmt/librenms/files/patch-includes_defaults.inc.php
>===================================================================
>--- net-mgmt/librenms/files/patch-includes_defaults.inc.php	(revision 482903)
>+++ net-mgmt/librenms/files/patch-includes_defaults.inc.php	(working copy)
>@@ -1,6 +1,6 @@
>---- includes/defaults.inc.php.orig	2018-08-04 20:07:12 UTC
>+--- includes/defaults.inc.php.orig	2018-10-17 10:33:28 UTC
> +++ includes/defaults.inc.php
>-@@ -47,19 +47,19 @@ $config['own_hostname'] = 'localhost';
>+@@ -49,19 +49,19 @@ $config['own_hostname'] = 'localhost';
>  $config['fping_options']['timeout'] = 500;
>  $config['fping_options']['count']   = 3;
>  $config['fping_options']['interval'] = 500;
>Index: net-mgmt/librenms/files/pkg-message.in
>===================================================================
>--- net-mgmt/librenms/files/pkg-message.in	(revision 482903)
>+++ net-mgmt/librenms/files/pkg-message.in	(working copy)
>@@ -1,14 +1,17 @@
>-=== Configuration details ===
>-The following is recommended for /usr/local/etc/mysql/my.cnf
>+=== UPGRADE details ===
> 
>-NOTE: these are global settings.  Please read this first:
>+Depending on the version, you may have to run the upgrade script.
> 
>-http://dev.mysql.com/doc/refman/5.7/en/sql-mode.html
>+cd %%WWWDIR%%
>+./build-base.php
> 
>-[mysqld]
>-innodb_file_per_table=1
>-sql-mode=""
>+re: https://docs.librenms.org/#General/Updating/
> 
>+=== Configuration details ===
>+
>+NOTE: setting sql-mode="" is no longer required. You can remove
>+it from /usr/local/etc/mysql/my.cnf
>+
> You can mostly follow the guide at:
> http://docs.librenms.org/
>

Actions: View | Diff

Attachments on bug 232658: 198596 | 198853