View | Details | Raw Unified | Return to bug 253965 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (+4 lines)
Lines 41-46 Link Here
41
HARDENING_CMAKE_BOOL=	WITH_HARDENING
41
HARDENING_CMAKE_BOOL=	WITH_HARDENING
42
HARDENING_DESC=		Use hardening compiler flags
42
HARDENING_DESC=		Use hardening compiler flags
43
43
44
post-patch:
45
	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/libi2pd/Reseed.cpp
46
44
do-install:
47
do-install:
45
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
48
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
46
	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
49
	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
Lines 48-53 Link Here
48
	${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf
51
	${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf
49
	@${MKDIR} ${STAGEDIR}${ETCDIR}
52
	@${MKDIR} ${STAGEDIR}${ETCDIR}
50
	${INSTALL_DATA} ${WRKSRC}/contrib/i2pd.conf ${STAGEDIR}${ETCDIR}/i2pd.conf.sample
53
	${INSTALL_DATA} ${WRKSRC}/contrib/i2pd.conf ${STAGEDIR}${ETCDIR}/i2pd.conf.sample
54
	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} "certificates" ${STAGEDIR}${DATADIR})
51
	@${MKDIR} ${STAGEDIR}/var/run/i2pd
55
	@${MKDIR} ${STAGEDIR}/var/run/i2pd
52
	@${MKDIR} ${STAGEDIR}/var/log/i2pd
56
	@${MKDIR} ${STAGEDIR}/var/log/i2pd
53
	@${MKDIR} ${STAGEDIR}/var/db/i2pd
57
	@${MKDIR} ${STAGEDIR}/var/db/i2pd
(-)files/patch-libi2pd_Reseed.cpp (+13 lines)
Line 0 Link Here
1
Static files belong to datadir, not vardir.
2
3
--- libi2pd/Reseed.cpp.orig	2021-02-15 13:21:30 UTC
4
+++ libi2pd/Reseed.cpp
5
@@ -497,7 +497,7 @@ namespace data
6
 
7
 	void Reseeder::LoadCertificates ()
8
 	{
9
-		std::string certDir = i2p::fs::DataDirPath("certificates", "reseed");
10
+		std::string certDir = "%%DATADIR%%/certificates/reseed";
11
 		std::vector<std::string> files;
12
 		int numCertificates = 0;
13
 
(-)pkg-plist (+15 lines)
Lines 1-6 Link Here
1
bin/i2pd
1
bin/i2pd
2
etc/newsyslog.conf.d/i2pd.conf
2
etc/newsyslog.conf.d/i2pd.conf
3
man/man1/i2pd.1.gz
3
man/man1/i2pd.1.gz
4
%%DATADIR%%/certificates/family/gostcoin.crt
5
%%DATADIR%%/certificates/family/i2p-dev.crt
6
%%DATADIR%%/certificates/family/i2pd-dev.crt
7
%%DATADIR%%/certificates/family/mca2-i2p.crt
8
%%DATADIR%%/certificates/family/volatile.crt
9
%%DATADIR%%/certificates/reseed/acetone_at_mail.i2p.crt
10
%%DATADIR%%/certificates/reseed/creativecowpat_at_mail.i2p.crt
11
%%DATADIR%%/certificates/reseed/echelon_at_mail.i2p.crt
12
%%DATADIR%%/certificates/reseed/hankhill19580_at_gmail.com.crt
13
%%DATADIR%%/certificates/reseed/hottuna_at_mail.i2p.crt
14
%%DATADIR%%/certificates/reseed/igor_at_novg.net.crt
15
%%DATADIR%%/certificates/reseed/lazygravy_at_mail.i2p.crt
16
%%DATADIR%%/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
17
%%DATADIR%%/certificates/reseed/reseed_at_diva.exchange.crt
18
%%DATADIR%%/certificates/router/orignal_at_mail.i2p.crt
4
@sample %%ETCDIR%%/i2pd.conf.sample
19
@sample %%ETCDIR%%/i2pd.conf.sample
5
@dir(%%USER%%,%%GROUP%%,755) /var/run/i2pd
20
@dir(%%USER%%,%%GROUP%%,755) /var/run/i2pd
6
@dir(%%USER%%,%%GROUP%%,755) /var/log/i2pd
21
@dir(%%USER%%,%%GROUP%%,755) /var/log/i2pd

Return to bug 253965