Match openports.se upstream i2pd-2.45.0
このコミットが含まれているのは:
コミット
85e5808569
23
README.md
23
README.md
|
@ -1,6 +1,29 @@
|
|||
# OpenBSD Ports
|
||||
Modified OpenBSD 7.2 ports. Everything here works with OpenBSD 7.2.
|
||||
|
||||
## Temporary Notice
|
||||
If you have i2pd-2.45.0 installed from this repo, the portfiles have been modified to match the
|
||||
upstream OpenBSD ports and to fix some missing libraries. Back up the contents of `/etc/i2pd`
|
||||
and your website keys, for example `/var/lib/i2pd/website.dat`.
|
||||
|
||||
Run these commands to upgrade:
|
||||
|
||||
```
|
||||
rm -rf /etc/i2pd
|
||||
pkg_delete -c i2pd
|
||||
cd /tmp
|
||||
ftp https://gitler.moe/koishi/openbsd-ports/archive/master.tar.gz
|
||||
tar xzvf /tmp/master.tar.gz
|
||||
rm -rf /usr/ports/net/i2pd
|
||||
mv /tmp/openbsd-ports/net/i2pd /usr/ports/net/
|
||||
cd /usr/ports/net/i2pd
|
||||
make clean
|
||||
rm -rf /usr/ports/pobj/i2pd-2.45.0/
|
||||
rm -f /usr/ports/packages/amd64/all/i2pd-2.45.0.tgz
|
||||
rm -f /usr/ports/plist/amd64/i2pd-2.45.0
|
||||
make install
|
||||
```
|
||||
|
||||
## How to install
|
||||
First if you haven't done so, download and unpack the ports tree for your current OpenBSD version.
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ GH_TAGNAME = 2.45.0
|
|||
CATEGORIES = net
|
||||
HOMEPAGE = https://i2pd.website
|
||||
|
||||
MAINTAINER = Koishi Komeiji <koishi@fedora.email>
|
||||
MAINTAINER = Koishi Komeiji <koishi@i2pmail.org>
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
|
|
@ -10,30 +10,30 @@ Index: tests/Makefile
|
|||
|
||||
@@ -14,8 +14,8 @@ test-base-%: ../libi2pd/Base.cpp test-base-%.cpp
|
||||
test-gost: ../libi2pd/Gost.cpp ../libi2pd/I2PEndian.cpp test-gost.cpp
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto
|
||||
|
||||
-test-gost-sig: ../libi2pd/Gost.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Crypto.cpp ../libi2pd/Log.cpp test-gost-sig.cpp
|
||||
- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
+test-gost-sig: ../libi2pd/Gost.cpp ../libi2pd/Config.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Crypto.cpp ../libi2pd/Log.cpp test-gost-sig.cpp
|
||||
+ $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -lboost_program_options-mt
|
||||
+ $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -lboost_program_options-mt
|
||||
|
||||
test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/Crypto.cpp test-x25519.cpp
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/Crypto.cpp test-x25519.cpp
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
@@ -23,14 +23,14 @@ test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndi
|
||||
test-aeadchacha20poly1305: ../libi2pd/Crypto.cpp ../libi2pd/ChaCha20.cpp ../libi2pd/Poly1305.cpp test-aeadchacha20poly1305.cpp
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
|
||||
-test-blinding: ../libi2pd/Crypto.cpp ../libi2pd/Blinding.cpp ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/util.cpp ../libi2pd/Identity.cpp ../libi2pd/Signature.cpp ../libi2pd/Timestamp.cpp test-blinding.cpp
|
||||
- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
+test-blinding: ../libi2pd/Crypto.cpp ../libi2pd/Config.cpp ../libi2pd/Blinding.cpp ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/util.cpp ../libi2pd/Identity.cpp ../libi2pd/Signature.cpp ../libi2pd/Timestamp.cpp test-blinding.cpp
|
||||
+ $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -lboost_program_options-mt
|
||||
+ $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -lboost_program_options-mt
|
||||
|
||||
test-elligator: ../libi2pd/Elligator.cpp ../libi2pd/Crypto.cpp test-elligator.cpp
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
|
||||
|
||||
run: $(TESTS)
|
||||
- @for TEST in $(TESTS); do ./$$TEST ; done
|
||||
+ @for TEST in $(TESTS); do echo -n "$$TEST: "; ./$$TEST && echo OK; done
|
||||
- @for TEST in $(TESTS); do ./$$TEST ; done
|
||||
+ @for TEST in $(TESTS); do echo -n "$$TEST: "; ./$$TEST && echo OK; done
|
||||
|
||||
clean:
|
||||
rm -f $(TESTS)
|
||||
rm -f $(TESTS)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
@newgroup _i2pd:838
|
||||
@newuser _i2pd:838:838:daemon:i2pd account:${LOCALSTATEDIR}/lib/i2pd:/sbin/nologin
|
||||
@newuser _i2pd:838:838::i2pd account:${LOCALSTATEDIR}/lib/i2pd:/sbin/nologin
|
||||
@rcscript ${RCDIR}/i2pd
|
||||
@bin bin/i2pd
|
||||
include/i2pd/
|
||||
|
@ -46,6 +46,7 @@ include/i2pd/RouterInfo.h
|
|||
include/i2pd/SAM.h
|
||||
include/i2pd/SOCKS.h
|
||||
include/i2pd/SSU2.h
|
||||
include/i2pd/SSU2Session.h
|
||||
include/i2pd/Signature.h
|
||||
include/i2pd/Siphash.h
|
||||
include/i2pd/Streaming.h
|
||||
|
@ -60,6 +61,7 @@ include/i2pd/TunnelConfig.h
|
|||
include/i2pd/TunnelEndpoint.h
|
||||
include/i2pd/TunnelGateway.h
|
||||
include/i2pd/TunnelPool.h
|
||||
include/i2pd/UDPTunnel.h
|
||||
include/i2pd/api.h
|
||||
include/i2pd/util.h
|
||||
include/i2pd/version.h
|
||||
|
@ -104,6 +106,12 @@ share/examples/i2pd/certificates/family/mca2-i2p.crt
|
|||
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/mca2-i2p.crt
|
||||
@owner
|
||||
@group
|
||||
share/examples/i2pd/certificates/family/stormycloud.crt
|
||||
@owner _i2pd
|
||||
@group _i2pd
|
||||
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/family/stormycloud.crt
|
||||
@owner
|
||||
@group
|
||||
share/examples/i2pd/certificates/family/volatile.crt
|
||||
@owner _i2pd
|
||||
@group _i2pd
|
||||
|
@ -152,6 +160,12 @@ share/examples/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt
|
|||
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/hottuna_at_mail.i2p.crt
|
||||
@owner
|
||||
@group
|
||||
share/examples/i2pd/certificates/reseed/i2p-reseed_at_mk16.de.crt
|
||||
@owner _i2pd
|
||||
@group _i2pd
|
||||
@sample ${LOCALSTATEDIR}/lib/i2pd/certificates/reseed/i2p-reseed_at_mk16.de.crt
|
||||
@owner
|
||||
@group
|
||||
share/examples/i2pd/certificates/reseed/igor_at_novg.net.crt
|
||||
@owner _i2pd
|
||||
@group _i2pd
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
Resource Limits: File Descriptors
|
||||
=================================
|
||||
|
||||
By default, the _i2pd user, and so the i2pd process runs in the login(1)
|
||||
class of "daemon". The default limits on file descriptors are
|
||||
insufficient to run i2pd; instead you should put the _i2pd user and
|
||||
process in their own login(1) class with tuned resources. You should
|
||||
also raise the system-wide maxfiles limit.
|
||||
By default, the i2pd process runs in the login(1) class of "daemon".
|
||||
The default limits on file descriptors are insufficient to run i2pd; instead you
|
||||
should put the _i2pd user and process in their own login(1) class with tuned
|
||||
resources.
|
||||
You should also raise the system-wide maxfiles limit.
|
||||
|
||||
1. Configure i2pd login class in the login.conf(5) file:
|
||||
|
||||
|
@ -20,5 +20,5 @@ also raise the system-wide maxfiles limit.
|
|||
|
||||
2. Adjust kern.maxfiles, if needed:
|
||||
|
||||
# sysctl kern.maxfiles=16000
|
||||
# echo "kern.maxfiles=16000" >> /etc/sysctl.conf
|
||||
# sysctl kern.maxfiles=16000
|
||||
# echo "kern.maxfiles=16000" >> /etc/sysctl.conf
|
||||
|
|
新しいイシューから参照