Attachment 182437 Details for Bug 218608 – Patch including 1.27 upgrade

[patch] Patch including 1.27 upgrade

patch.diff (text/plain), 6.67 KB, created by Jonathan Price on 2017-05-09 11:44:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2017-05-09 11:44:46 UTC

Size: 6.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 440481)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	librenms
>-PORTVERSION=	1.26
>+PORTVERSION=	1.27
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt
> 
>@@ -41,7 +41,7 @@
> 		vendor/ezyang/htmlpurifier/maintenance/update-config.php \
> 		vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
> 
>-USE_PHP=	ctype curl filter gd hash json mcrypt mysqli openssl session simplexml snmp tokenizer xml
>+USE_PHP=	ctype curl filter gd hash json ldap mcrypt mysqli openssl session simplexml snmp tokenizer xml
> 
> NO_BUILD=	yes
> 
>@@ -149,6 +149,8 @@
> 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
> 	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
> 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
>+	@${FIND} -s ${STAGEDIR}${WWWDIR} -type d | \
>+		${SED} -e 's#^${STAGEDIR}#@dir #' >> ${TMPPLIST}
> 	${INSTALL_DATA} ${WRKSRC}/config.php.default \
> 	       ${STAGEDIR}/${WWWDIR}/config.php.sample
> 	@${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 440481)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491554959
>-SHA256 (librenms-librenms-1.26_GH0.tar.gz) = cc76a343296c48a6a2423efc9138e2a52d2827178ba733c0714dc6ef38d264e8
>-SIZE (librenms-librenms-1.26_GH0.tar.gz) = 57165188
>+TIMESTAMP = 1494329428
>+SHA256 (librenms-librenms-1.27_GH0.tar.gz) = 822f275cb1b35b46c0c86a6a89fc1a7f4b3d0689a3ffbb0192577bcd301187ab
>+SIZE (librenms-librenms-1.27_GH0.tar.gz) = 56912738
>Index: files/patch-daily.sh
>===================================================================
>--- files/patch-daily.sh	(revision 440481)
>+++ files/patch-daily.sh	(working copy)
>@@ -1,14 +1,5 @@
> --- daily.sh.orig	2017-03-26 12:06:00 UTC
> +++ daily.sh
>-@@ -113,7 +113,7 @@ main () {
>-         # only try to su if we are root (or sudo)
>-         if [[ "$EUID" -eq 0 ]]; then
>-             echo "Re-running ${DAILY_SCRIPT} as ${LIBRENMS_USER} user"
>--            su -l "$LIBRENMS_USER" -c "$DAILY_SCRIPT $@"
>-+            sudo -u "$LIBRENMS_USER" "$DAILY_SCRIPT"
>-             exit;
>-         fi
>- 
> @@ -123,27 +123,6 @@ main () {
>      fi
>  
>Index: files/patch-includes_common.php
>===================================================================
>--- files/patch-includes_common.php	(revision 440481)
>+++ files/patch-includes_common.php	(working copy)
>@@ -1,7 +1,7 @@
>---- includes/common.php.orig	2017-01-29 06:54:29 UTC
>+--- includes/common.php.orig	2017-03-26 12:06:00 UTC
> +++ includes/common.php
>-@@ -1095,10 +1095,8 @@ function version_info($remote = true)
>-             curl_setopt($api, CURLOPT_RETURNTRANSFER, 1);
>+@@ -1098,10 +1098,8 @@ function version_info($remote = true)
>+             curl_setopt($api, CURLOPT_CONNECTTIMEOUT, 5);
>              $output['github'] = json_decode(curl_exec($api), true);
>          }
> -        list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`));
>Index: files/patch-includes_defaults.inc.php
>===================================================================
>--- files/patch-includes_defaults.inc.php	(revision 440481)
>+++ files/patch-includes_defaults.inc.php	(working copy)
>@@ -1,8 +1,8 @@
>---- includes/defaults.inc.php.orig      2017-01-01 15:50:41.000000000 +0000
>-+++ includes/defaults.inc.php   2017-01-09 13:24:06.964918000 +0000
>-@@ -36,26 +36,26 @@
>+--- includes/defaults.inc.php.orig	2017-03-26 12:06:00 UTC
>++++ includes/defaults.inc.php
>+@@ -41,26 +41,26 @@ $config['db_port']               = 3306;
>  $config['own_hostname'] = 'localhost';
>-
>+ 
>  // Location of executables
> -$config['rrdtool']                  = '/usr/bin/rrdtool';
> +$config['rrdtool']                  = '/usr/local/bin/rrdtool';
>@@ -38,6 +38,6 @@
> +$config['virsh']          = '/usr/local/bin/virsh';
> +$config['dot']            = '/usr/local/bin/dot';
> +$config['sfdp']           = '/usr/local/bin/sfdp';
>-
>+ 
>  // Memcached - Keep immediate statistics
>  $config['memcached']['enable'] = false;
>Index: files/patch-validate.php
>===================================================================
>--- files/patch-validate.php	(nonexistent)
>+++ files/patch-validate.php	(working copy)
>@@ -0,0 +1,39 @@
>+--- validate.php.orig	2017-04-11 18:45:34 UTC
>++++ validate.php
>+@@ -108,13 +108,6 @@ if (!($username === 'root' || (isset($co
>+     print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : ''));
>+ }
>+ 
>+-if ($git_found === true) {
>+-    if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {
>+-        $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));
>+-        print_warn("Your install is out of date, last update: " . $commit_date->format('r'));
>+-    }
>+-}
>+-
>+ // Check php modules we use to make sure they are loaded
>+ $extensions = array('pcre','curl','session','snmp','mcrypt');
>+ foreach ($extensions as $extension) {
>+@@ -302,22 +295,6 @@ if (dbFetchCell('SELECT COUNT(*) FROM `d
>+ }
>+ 
>+ 
>+-if ($git_found === true) {
>+-    if ($versions['local_branch'] != 'master') {
>+-        print_warn("Your local git branch is not master, this will prevent automatic updates.");
>+-    }
>+-
>+-    // check for modified files
>+-    $modifiedcmd = 'git diff --name-only --exit-code';
>+-    if ($username === 'root') {
>+-        $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
>+-    }
>+-    exec($modifiedcmd, $cmdoutput, $code);
>+-    if ($code !== 0 && !empty($cmdoutput)) {
>+-        print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
>+-        print_list($cmdoutput, "\t %s\n");
>+-    }
>+-}
>+ // Modules test
>+ $modules = explode(',', $options['m']);
>+ foreach ($modules as $module) {
>
>Property changes on: files/patch-validate.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: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 440481)
>+++ files/pkg-message.in	(working copy)
>@@ -16,6 +16,7 @@
> - Installation directory is %%WWWDIR%%
> - The following lines should be added to /etc/crontab:
> 
>+PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
> 33	*/6	*	*	*	www	cd %%WWWDIR%% && %%PHP%% discovery.php -h all >> /dev/null 2>&1
> */5	*	*	*	*	www	cd %%WWWDIR%% && %%PHP%% discovery.php -h new >> /dev/null 2>&1
> */5	*	*	*	*	www	cd %%WWWDIR%% && %%PYTHON%% poller-wrapper.py 16 >> /dev/null 2>&1

Flags:

freebsd: maintainer-approval?

Actions: View | Diff

Attachments on bug 218608: 181735 | 182437