pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

i2pd: changed hardcoded path for 'datadir' variable



Module Name:	pkgsrc-wip
Committed By:	Jake Slazenger <jake.slazenger%yandex.com@localhost>
Pushed By:	jakeSlaz
Date:		Wed Mar 21 09:18:15 2018 +0300
Changeset:	c86b5b59f5100e308d1c02c1b69daeac44aa0869

Modified Files:
	i2pd/Makefile
	i2pd/files/i2pd.conf.NetBSD

Log Message:
i2pd: changed hardcoded path for 'datadir' variable

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c86b5b59f5100e308d1c02c1b69daeac44aa0869

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i2pd/Makefile               | 6 ++++++
 i2pd/files/i2pd.conf.NetBSD | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diffs:
diff --git a/i2pd/Makefile b/i2pd/Makefile
index a38fc8abb1..e4577ba8e7 100644
--- a/i2pd/Makefile
+++ b/i2pd/Makefile
@@ -15,6 +15,12 @@ CMAKE_ARGS+=	-DWITH_LIBRARY=no
 I2PD_SOURCESDIR=${WRKSRC}/..
 EGDIR=			share/examples/i2pd
 
+SUBST_CLASSES+=	fix-paths
+SUBST_STAGE.fix-paths=	pre-configure
+SUBST_MESSAGE.fix-paths=	Fixing hardcoded path for datadir
+SUBST_FILES.fix-paths=	${I2PD_SOURCESDIR}/libi2pd/FS.cpp
+SUBST_SED.fix-paths=	-e 's,/var/lib,${PREFIX}/var,g'
+
 I2PD_USER=		i2pd
 I2PD_GROUP=		i2pd
 PKG_HOME.${I2PD_USER}= ${PREFIX}/var/i2pd
diff --git a/i2pd/files/i2pd.conf.NetBSD b/i2pd/files/i2pd.conf.NetBSD
index b5ec367122..1fcc1e8a3f 100644
--- a/i2pd/files/i2pd.conf.NetBSD
+++ b/i2pd/files/i2pd.conf.NetBSD
@@ -29,7 +29,11 @@ loglevel = info
 
 ## Path to storage of i2pd data (RI, keys, peer profiles, ...)
 ## Default: ~/.i2pd or /var/lib/i2pd
-datadir = /usr/pkg/var/i2pd
+##
+## In 2.18.0 version 'datadir' config variable is ignored by i2pd (known problem)
+## So, on NetBSD, i2pd uses '/usr/pkg/var/i2pd' path by default
+## Use --datadir option if you want to change this path
+#datadir = /usr/pkg/var/i2pd
 
 ## Daemon mode. Router will go to background after start
 daemon = true


Home | Main Index | Thread Index | Old Index