Attachment 231407 Details for Bug 261031 – Proposed patch for update to 22.1.0

[patch] Proposed patch for update to 22.1.0

0001-Update-to-22.01.0.patch (text/plain), 7.71 KB, created by Oleksandr Kryvulia on 2022-01-28 12:28:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleksandr Kryvulia

Created: 2022-01-28 12:28:50 UTC

Size: 7.71 KB

patch

obsolete

>From 39424ac3461deb5dece398c0dba2052766ea9e2a Mon Sep 17 00:00:00 2001
>From: Oleksandr Kryvulia <o.kryvulia@flex-it.com.ua>
>Date: Fri, 28 Jan 2022 14:24:11 +0200
>Subject: [PATCH] Update to 22.01.0
>
>---
> net-mgmt/librenms/Makefile                    | 31 +++++--------
> net-mgmt/librenms/distinfo                    |  8 ++--
> .../librenms/files/patch-config.php.default   | 44 +++----------------
> .../librenms/files/patch-poller-wrapper.py    | 11 -----
> 4 files changed, 19 insertions(+), 75 deletions(-)
> delete mode 100644 net-mgmt/librenms/files/patch-poller-wrapper.py
>
>diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
>index 37283690fcba..e32f0533787c 100644
>--- a/net-mgmt/librenms/Makefile
>+++ b/net-mgmt/librenms/Makefile
>@@ -1,16 +1,16 @@
> PORTNAME=	librenms
>-PORTVERSION=	21.5.1
>-PORTREVISION=	3
>-PORTEPOCH=	1
>+PORTVERSION=	22.1.0
>+PORTREVISION=	0
>+PORTEPOCH=	
> CATEGORIES=	net-mgmt
>-MASTER_SITES=	LOCAL/dvl:vendor
>-DISTFILES=	${PORTNAME}-vendor-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:vendor
> 
> MAINTAINER=	dvl@FreeBSD.org
> COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
> 
> LICENSE=	GPLv3
> 
>+EXTRACT_DEPENDS+= ${LOCALBASE}/bin/composer:devel/php-composer2@${PHP_FLAVOR} 
>+
> # perhaps we also need python-memcache python-mysqldb
> RUN_DEPENDS+=	${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
> 		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
>@@ -29,8 +29,8 @@ USE_PHP=	ctype curl dom fileinfo filter gd hash json ldap mbstring \
> 		snmp sockets tokenizer xml xmlwriter zip
> USE_RC_SUBR=	librenms
> 
>-SHEBANG_FILES=	../${PORTNAME}-vendor-${PORTVERSION}/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
>-		../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php \
>+SHEBANG_FILES=	vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
>+		vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php \
> 		poller-wrapper.py poller.php scripts/auth_test.php \
> 		scripts/check_requirements.py scripts/github-remove \
> 		scripts/Migration/Standard_Conversion/convert_no_xml.sh \
>@@ -95,7 +95,7 @@ _SCRIPT_FILES=		daily.sh lnms
> _RELEASE_TIMESTAMP=	1621427246
> _ROOT_DIRS=		LibreNMS app bootstrap config contrib database doc html \
> 			includes licenses mibs misc resources routes scripts \
>-			sql-schema storage tests
>+			sql-schema storage tests vendor
> _DOCS=			AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE.txt \
> 			README.md
> # these are directories which require a generic @DIR entry in pkg-plist
>@@ -108,6 +108,9 @@ _OTHER_DIRS=		html/js/lang resources/views/overview/custom \
> 			vendor/ramsey/collection/bin \
> 			vendor/symfony/string/Resources/bin
> 
>+post-extract:
>+	${LOCALBASE}/bin/composer install -n -d ${WRKSRC}
>+
> post-patch:
> 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/LibreNMS/Util/Version.php
> 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/LibreNMS/Validations/Php.php
>@@ -131,18 +134,6 @@ do-install:
> .for f in ${_SCRIPT_FILES}
> 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
> .endfor
>-	${MKDIR} ${STAGEDIR}/${WWWDIR}/vendor
>-	(cd ${WRKDIR}/${PORTNAME}-vendor-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/vendor)
>-
>-# As of 1.66_1, the package installs bootstrap/cache
>-# This was previously left to the code to populate.
>-# That causese problems when the code doesn't do that update.
>-	${MV} ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache/* ${STAGEDIR}/${WWWDIR}/bootstrap/cache/
>-	${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache
>-
>-# similarly with html/js/lang
>-	${MV} ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang/* ${STAGEDIR}/${WWWDIR}/html/js/lang/
>-	${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang
> 
> # Make daily.sh executable
> #	${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh
>diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo
>index 6c271717904b..ece60e4d2c56 100644
>--- a/net-mgmt/librenms/distinfo
>+++ b/net-mgmt/librenms/distinfo
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1621543700
>-SHA256 (librenms-vendor-21.5.1.tar.gz) = 746a0ffd58a0f9d7428283c9b3b706e514b405781a5fc4c2685492479bad2580
>-SIZE (librenms-vendor-21.5.1.tar.gz) = 28282743
>-SHA256 (librenms-librenms-21.5.1_GH0.tar.gz) = 4baa930bb0c884b2d596047a01f79d717992dafefb5e744b1b5438f5570dbb8b
>-SIZE (librenms-librenms-21.5.1_GH0.tar.gz) = 50159109
>+TIMESTAMP = 1643285514
>+SHA256 (librenms-librenms-22.1.0_GH0.tar.gz) = e7fecaf0986ed8372d0a7efd835e6563eaa181fe79b69c71b26c54240e1c0187
>+SIZE (librenms-librenms-22.1.0_GH0.tar.gz) = 53607721
>diff --git a/net-mgmt/librenms/files/patch-config.php.default b/net-mgmt/librenms/files/patch-config.php.default
>index 27d957e2e7a3..4f0c05f1d4d7 100644
>--- a/net-mgmt/librenms/files/patch-config.php.default
>+++ b/net-mgmt/librenms/files/patch-config.php.default
>@@ -1,6 +1,6 @@
>---- config.php.default.orig	2020-07-10 19:56:16 UTC
>+--- config.php.default.orig	2022-01-05 12:52:10 UTC
> +++ config.php.default
>-@@ -2,10 +2,26 @@
>+@@ -2,9 +2,25 @@
>  
>  ## Have a look in misc/config_definitions.json for examples of settings you can set here. DO NOT EDIT misc/config_definitions.json!
>  
>@@ -14,51 +14,17 @@
> +
>  // This is the user LibreNMS will run as
> -//Please ensure this user is created and has the correct permissions to your install
>--$config['user'] = 'librenms';
>+-#$config['user'] = 'librenms';
> +// Please ensure this user is created and has the correct permissions to your install
> +// The FreeBSD package sets this.
> +// It's up to you to install a webserver, such as Apache or Nginx. By default, they
> +// run as the www user.
> +//
> +$config['user'] = 'www';
>- 
>++
> +#
> +# The FreeBSD package set the above items
> +#
>-+
>+ 
>  ### This should *only* be set if you want to *force* a particular hostname/port
>  ### It will prevent the web interface being usable form any other hostname
>- #$config['base_url']        = "/";
>-@@ -27,7 +43,8 @@ $config['auth_mechanism'] = "mysql"; # default, other 
>- #$config['nets'][] = "192.168.0.0/16";
>- 
>- # Uncomment the next line to disable daily updates
>--#$config['update'] = 0;
>-+# FreeBSD package uncommented this line for you.
>-+$config['update'] = 0;
>- 
>- # Number in days of how long to keep old rrd files. 0 disables this feature
>- $config['rrd_purge'] = 0;
>-@@ -43,3 +60,22 @@ $config['enable_billing'] = 1;
>- 
>- # Enable the in-built services support (Nagios plugins)
>- $config['show_services'] = 1;
>-+
>-+# These paths are supplied by the FreeBSD port and correct those found in
>-+# the code.
>-+
>-+$config['snmpwalk']       = '%%LOCALBASE%%/bin/snmpwalk';
>-+$config['snmpget']        = '%%LOCALBASE%%/bin/snmpget';
>-+$config['snmpbulkwalk']   = '%%LOCALBASE%%/bin/snmpbulkwalk';
>-+$config['snmptranslate']  = '%%LOCALBASE%%/bin/snmptranslate';
>-+
>-+$config['ping']           = '/sbin/ping';
>-+$config['mtr']            = '%%LOCALBASE%%/bin/mtr';
>-+$config['nmap']           = '%%LOCALBASE%%/bin/nmap';
>-+
>-+$config['nagios_plugins'] = '%%LOCALBASE%%/libexec/nagios';
>-+$config['ipmitool']       = '%%LOCALBASE%%/bin/ipmitool';
>-+$config['virsh']          = '%%LOCALBASE%%/bin/virsh';
>-+$config['dot']            = '%%LOCALBASE%%/bin/dot';
>-+$config['sfdp']           = '%%LOCALBASE%%/bin/sfdp';
>-+$config['nfdump']         = '%%LOCALBASE%%/bin/nfdump';
>diff --git a/net-mgmt/librenms/files/patch-poller-wrapper.py b/net-mgmt/librenms/files/patch-poller-wrapper.py
>deleted file mode 100644
>index 9b42e406c9a9..000000000000
>--- a/net-mgmt/librenms/files/patch-poller-wrapper.py
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- poller-wrapper.py.orig	2021-01-14 02:21:36 UTC
>-+++ poller-wrapper.py
>-@@ -44,6 +44,8 @@ except ImportError as exc:
>-     print('ERROR: %s' % exc)
>-     sys.exit(2)
>- 
>-+os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin'
>-+
>- 
>- APP_NAME = "poller_wrapper"
>- LOG_FILE = "logs/" + APP_NAME + ".log"
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 261031: 230815 | 231407