svn commit: r568793 - in head/security/i2pd: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Fri Mar 19 12:37:04 UTC 2021
Author: amdmi3
Date: Fri Mar 19 12:37:03 2021
New Revision: 568793
URL: https://svnweb.freebsd.org/changeset/ports/568793
Log:
- Install reseed certificates [1]
- Switch to upstream installation
PR: 253965 [1]
Submitted by: admin at support.od.ua [1]
Added:
head/security/i2pd/files/patch-libi2pd_Reseed.cpp (contents, props changed)
Modified:
head/security/i2pd/Makefile
head/security/i2pd/pkg-plist
Modified: head/security/i2pd/Makefile
==============================================================================
--- head/security/i2pd/Makefile Fri Mar 19 12:06:46 2021 (r568792)
+++ head/security/i2pd/Makefile Fri Mar 19 12:37:03 2021 (r568793)
@@ -41,18 +41,21 @@ 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}
Added: head/security/i2pd/files/patch-libi2pd_Reseed.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/i2pd/files/patch-libi2pd_Reseed.cpp Fri Mar 19 12:37:03 2021 (r568793)
@@ -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;
+
Modified: head/security/i2pd/pkg-plist
==============================================================================
--- head/security/i2pd/pkg-plist Fri Mar 19 12:06:46 2021 (r568792)
+++ head/security/i2pd/pkg-plist Fri Mar 19 12:37:03 2021 (r568793)
@@ -1,6 +1,23 @@
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
More information about the svn-ports-head
mailing list