Attachment 164593 Details for Bug 205573 – Patch

[patch] Patch

torrus.patch (text/plain), 5.03 KB, created by Dmitry Marakasov on 2015-12-24 12:01:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-12-24 12:01:39 UTC

Size: 5.03 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 404121)
>+++ Makefile	(working copy)
>@@ -10,7 +10,8 @@
> MAINTAINER=	corsmith@gmail.com
> COMMENT=	Data Series Processing Framework - think mrtg with xml configs
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2 # or later
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
> 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
>@@ -28,7 +29,8 @@
> USE_GNOME=	libxml2
> USES=		perl5
> USE_PERL5=	run
>-GNU_CONFIGURE=	YES
>+GNU_CONFIGURE=	yes
>+NO_ARCH=	yes
> 
> USERS=		torrus
> GROUPS=		torrus
>@@ -48,14 +50,15 @@
> 		--enable-pkgonly
> 
> post-install:
>-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/log/torrus
>-	${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus
>-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/cache
>-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/collector_rrd
>-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/db
>-	${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus/reports
>-	${INSTALL} -d -m 775 ${STAGEDIR}/var/torrus/session_data
>-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/session_data/lock
>-	${INSTALL} -d -m 2775 ${STAGEDIR}/var/torrus/session_data/store
>+	@${MKDIR} ${STAGEDIR}/var/torrus/session_data/store
>+	@${MKDIR} ${STAGEDIR}/var/torrus/session_data/lock
>+	@${MKDIR} ${STAGEDIR}/var/torrus/session_data
>+	@${MKDIR} ${STAGEDIR}/var/torrus/reports
>+	@${MKDIR} ${STAGEDIR}/var/torrus/db
>+	@${MKDIR} ${STAGEDIR}/var/torrus/collector_rrd
>+	@${MKDIR} ${STAGEDIR}/var/torrus/cache
>+	@${MKDIR} ${STAGEDIR}/var/torrus
>+	@${MKDIR} ${STAGEDIR}/var/run/torrus
>+	@${MKDIR} ${STAGEDIR}/var/log/torrus
> 
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 404121)
>+++ pkg-plist	(working copy)
>@@ -298,57 +298,21 @@
> %%SITE_PERL%%/Torrus/SQL/SrvExport.pm
> %%SITE_PERL%%/Torrus/SQL.pm
> %%SITE_PERL%%/Torrus/TimeStamp.pm
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/log/torrus 2>/dev/null || true
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/run/torrus 2>/dev/null || true
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/cache
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/collector_rrd
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/db
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/reports
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data 2>/dev/null || true
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data/store 2>/dev/null || true
>-@exec chown %%TORRUS_USER%%:%%TORRUS_USER%% /var/torrus/session_data/lock 2>/dev/null || true
>-@exec mkdir %D/etc/torrus/templates 2>/dev/null || true
>-@exec mkdir %D/%%DATADIR%%/plugins 2>/dev/null || true
>-@exec mkdir %D/%%DATADIR%%/plugins/devdiscover-config 2>/dev/null || true
>-@exec mkdir %D/%%DATADIR%%/plugins/torrus-config 2>/dev/null || true
>-@exec mkdir %D/%%DATADIR%%/plugins/wrapper 2>/dev/null || true
>-@exec mkdir %D/%%DATADIR%%/sup/webscripts 2>/dev/null || true
>-@dirrm %%DATADIR%%/xmlconfig/vendor
>-@dirrm %%DATADIR%%/xmlconfig/old
>-@dirrm %%DATADIR%%/xmlconfig/generic
>-@dirrm %%DATADIR%%/xmlconfig/examples
>-@dirrm %%DATADIR%%/xmlconfig
>-@dirrm %%DATADIR%%/templates
>-@dirrm %%DATADIR%%/sup/webscripts
>-@dirrm %%DATADIR%%/sup/webplain
>-@dirrm %%DATADIR%%/sup/styling
>-@dirrm %%DATADIR%%/sup/mibs
>-@dirrm %%DATADIR%%/sup/dtd
>-@dirrm %%DATADIR%%/sup
>-@dirrm %%DATADIR%%/plugins/wrapper
>-@dirrm %%DATADIR%%/plugins/torrus-config
>-@dirrm %%DATADIR%%/plugins/devdiscover-config
>-@dirrm %%DATADIR%%/plugins
>-@dirrm %%DATADIR%%/conf_defaults
>-@dirrm %%DATADIR%%
>-@dirrm %%EXAMPLESDIR%%
>-@dirrm %%DOCSDIR%%/devdoc
>-@dirrm %%DOCSDIR%%
>-@dirrm libexec/torrus/scripts/xml
>-@dirrm libexec/torrus/scripts
>-@dirrm libexec/torrus
>-@dirrmtry /var/torrus/session_data/store
>-@dirrmtry /var/torrus/session_data/lock
>-@dirrmtry /var/torrus/session_data
>-@dirrmtry /var/torrus/reports
>-@dirrmtry /var/torrus/db
>-@dirrmtry /var/torrus/collector_rrd
>-@dirrmtry /var/torrus/cache
>-@dirrmtry /var/torrus/
>-@dirrmtry /var/log/torrus
>-@dirrmtry etc/torrus/xmlconfig
>-@dirrmtry etc/torrus/templates
>-@dirrmtry etc/torrus/discovery
>-@dirrmtry etc/torrus/conf
>-@dirrmtry etc/torrus
>+@dir %%DATADIR%%/sup/webscripts
>+@dir %%DATADIR%%/sup
>+@dir %%DATADIR%%/plugins/wrapper
>+@dir %%DATADIR%%/plugins/torrus-config
>+@dir %%DATADIR%%/plugins/devdiscover-config
>+@dir etc/torrus/templates
>+@dir etc/torrus/discovery
>+@dir etc/torrus
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/session_data/store
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/session_data/lock
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,775) /var/torrus/session_data
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,775) /var/torrus/reports
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/db
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/collector_rrd
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/torrus/cache
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,775) /var/torrus/
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/log/torrus
>+@dir(%%TORRUS_USER%%,%%TORRUS_USER%%,2775) /var/run/torrus

Actions: View | Diff

Attachments on bug 205573: 164593