Attachment 223134 Details for Bug 253965 – Patch

[patch] Patch

i2pd.patch (text/plain), 2.67 KB, created by Dmitry Marakasov on 2021-03-09 22:42:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2021-03-09 22:42:30 UTC

Size: 2.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 567392)
>+++ Makefile	(working copy)
>@@ -41,6 +41,9 @@
> HARDENING_CMAKE_BOOL=	WITH_HARDENING
> HARDENING_DESC=		Use hardening compiler flags
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/libi2pd/Reseed.cpp
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>@@ -48,6 +51,7 @@
> 	${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${INSTALL_DATA} ${WRKSRC}/contrib/i2pd.conf ${STAGEDIR}${ETCDIR}/i2pd.conf.sample
>+	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} "certificates" ${STAGEDIR}${DATADIR})
> 	@${MKDIR} ${STAGEDIR}/var/run/i2pd
> 	@${MKDIR} ${STAGEDIR}/var/log/i2pd
> 	@${MKDIR} ${STAGEDIR}/var/db/i2pd
>Index: files/patch-libi2pd_Reseed.cpp
>===================================================================
>--- files/patch-libi2pd_Reseed.cpp	(nonexistent)
>+++ files/patch-libi2pd_Reseed.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+Static files belong to datadir, not vardir.
>+
>+--- libi2pd/Reseed.cpp.orig	2021-02-15 13:21:30 UTC
>++++ libi2pd/Reseed.cpp
>+@@ -497,7 +497,7 @@ namespace data
>+ 
>+ 	void Reseeder::LoadCertificates ()
>+ 	{
>+-		std::string certDir = i2p::fs::DataDirPath("certificates", "reseed");
>++		std::string certDir = "%%DATADIR%%/certificates/reseed";
>+ 		std::vector<std::string> files;
>+ 		int numCertificates = 0;
>+ 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 567392)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,21 @@
> bin/i2pd
> etc/newsyslog.conf.d/i2pd.conf
> man/man1/i2pd.1.gz
>+%%DATADIR%%/certificates/family/gostcoin.crt
>+%%DATADIR%%/certificates/family/i2p-dev.crt
>+%%DATADIR%%/certificates/family/i2pd-dev.crt
>+%%DATADIR%%/certificates/family/mca2-i2p.crt
>+%%DATADIR%%/certificates/family/volatile.crt
>+%%DATADIR%%/certificates/reseed/acetone_at_mail.i2p.crt
>+%%DATADIR%%/certificates/reseed/creativecowpat_at_mail.i2p.crt
>+%%DATADIR%%/certificates/reseed/echelon_at_mail.i2p.crt
>+%%DATADIR%%/certificates/reseed/hankhill19580_at_gmail.com.crt
>+%%DATADIR%%/certificates/reseed/hottuna_at_mail.i2p.crt
>+%%DATADIR%%/certificates/reseed/igor_at_novg.net.crt
>+%%DATADIR%%/certificates/reseed/lazygravy_at_mail.i2p.crt
>+%%DATADIR%%/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
>+%%DATADIR%%/certificates/reseed/reseed_at_diva.exchange.crt
>+%%DATADIR%%/certificates/router/orignal_at_mail.i2p.crt
> @sample %%ETCDIR%%/i2pd.conf.sample
> @dir(%%USER%%,%%GROUP%%,755) /var/run/i2pd
> @dir(%%USER%%,%%GROUP%%,755) /var/log/i2pd

Actions: View | Diff

Attachments on bug 253965: 222925 | 222926 | 222927 | 223134