Index: head/security/i2pd/Makefile =================================================================== --- head/security/i2pd/Makefile (revision 568792) +++ head/security/i2pd/Makefile (revision 568793) @@ -1,59 +1,62 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= i2pd PORTVERSION= 2.36.0 PORTREVISION= 1 CATEGORIES= security net-p2p MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ implementation of I2P client LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_thread.so:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= PurpleI2P USES= cmake:insource compiler:c++11-lib ssl CMAKE_ARGS= -DWITH_GUI=OFF CMAKE_SOURCE_PATH= ${WRKSRC}/build USE_RC_SUBR= ${PORTNAME} PORTDOCS= * USERS= _i2pd GROUPS= _i2pd PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}" SUB_LIST= USER="${USERS}" GROUP="${GROUPS}" SUB_FILES= i2pd.newsyslog.conf pkg-message OPTIONS_DEFINE= AESNI UPNP DOCS HARDENING AESNI_DESC= Use AES-NI instructions set AESNI_CMAKE_BOOL= WITH_AESNI UPNP_DESC= Include support for UPnP client UPNP_CMAKE_BOOL= WITH_UPNP UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc HARDENING_CMAKE_BOOL= WITH_HARDENING HARDENING_DESC= Use hardening compiler flags -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin +post-patch: + @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/libi2pd/Reseed.cpp + +post-install: ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${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 -do-install-DOCS-on: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Index: head/security/i2pd/files/patch-libi2pd_Reseed.cpp =================================================================== --- head/security/i2pd/files/patch-libi2pd_Reseed.cpp (nonexistent) +++ head/security/i2pd/files/patch-libi2pd_Reseed.cpp (revision 568793) @@ -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 files; + int numCertificates = 0; + Property changes on: head/security/i2pd/files/patch-libi2pd_Reseed.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/i2pd/pkg-plist =================================================================== --- head/security/i2pd/pkg-plist (revision 568792) +++ head/security/i2pd/pkg-plist (revision 568793) @@ -1,7 +1,24 @@ bin/i2pd etc/newsyslog.conf.d/i2pd.conf +lib/libi2pd.a +lib/libi2pdclient.a 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 @dir(%%USER%%,%%GROUP%%,755) /var/db/i2pd