Date: Tuesday, February 22, 2022 @ 21:44:09 Author: dbermond Revision: 1136193
upgpkg: i2pd 2.41.0-1 Deleted: i2pd/trunk/010-i2pd-use-arch-flags-on-tests.patch i2pd/trunk/020-i2pd-config.patch ----------------------------------------+ 010-i2pd-use-arch-flags-on-tests.patch | 45 ------------------------------- 020-i2pd-config.patch | 35 ------------------------ 2 files changed, 80 deletions(-) Deleted: 010-i2pd-use-arch-flags-on-tests.patch =================================================================== --- 010-i2pd-use-arch-flags-on-tests.patch 2022-02-22 21:37:27 UTC (rev 1136192) +++ 010-i2pd-use-arch-flags-on-tests.patch 2022-02-22 21:44:09 UTC (rev 1136193) @@ -1,45 +0,0 @@ ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -1,4 +1,4 @@ --CXXFLAGS += -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -pthread -Wl,--unresolved-symbols=ignore-in-object-files -+CXXFLAGS += -Wall -Wno-unused-parameter -Wextra -pedantic -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -pthread -Wl,--unresolved-symbols=ignore-in-object-files - INCFLAGS += -I../libi2pd - - TESTS = test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly1305 test-blinding test-elligator -@@ -6,28 +6,28 @@ TESTS = test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly13 - all: $(TESTS) run - - test-http-%: ../libi2pd/HTTP.cpp test-http-%.cpp -- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ - - test-base-%: ../libi2pd/Base.cpp test-base-%.cpp -- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ - - test-gost: ../libi2pd/Gost.cpp ../libi2pd/I2PEndian.cpp test-gost.cpp -- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -+ $(CXX) $(CPPFLAGS) $(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) $(CPPFLAGS) $(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 -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system - - 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) $(CPPFLAGS) $(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) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system - - test-elligator: ../libi2pd/Elligator.cpp ../libi2pd/Crypto.cpp test-elligator.cpp -- $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system - - run: $(TESTS) - @for TEST in $(TESTS); do ./$$TEST ; done Deleted: 020-i2pd-config.patch =================================================================== --- 020-i2pd-config.patch 2022-02-22 21:37:27 UTC (rev 1136192) +++ 020-i2pd-config.patch 2022-02-22 21:44:09 UTC (rev 1136193) @@ -1,35 +0,0 @@ ---- a/contrib/i2pd.conf -+++ b/contrib/i2pd.conf -@@ -8,19 +8,22 @@ - - ## Tunnels config file - ## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf -+## Note: /var/lib/i2pd/tunnels.conf is a symlink to /etc/i2pd/tunnels.conf (use the latter) - # tunconf = /var/lib/i2pd/tunnels.conf - - ## Tunnels config files path - ## Use that path to store separated tunnels in different config files. - ## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d -+## Note: /var/lib/i2pd/tunnels.d is a symlink to /etc/i2pd/tunnels.d (use the latter) - # tunnelsdir = /var/lib/i2pd/tunnels.d - - ## Path to certificates used for verifying .su3, families - ## Default: ~/.i2pd/certificates or /var/lib/i2pd/certificates -+## Note: /var/lib/i2pd/certificates is a symlink to /usr/share/i2pd/certificates (use the latter) - # certsdir = /var/lib/i2pd/certificates - - ## Where to write pidfile (default: i2pd.pid, not used in Windows) --# pidfile = /run/i2pd.pid -+# pidfile = /run/i2pd/i2pd.pid - - ## Logging configuration section - ## By default logs go to stdout with level 'info' and higher -@@ -32,7 +35,7 @@ - ## * syslog - use syslog, see man 3 syslog - # log = file - ## Path to logfile (default - autodetect) --# logfile = /var/log/i2pd/i2pd.log -+logfile = /var/log/i2pd/i2pd.log - ## Log messages above this level (debug, info, *warn, error, none) - ## If you set it to none, logging will be disabled - # loglevel = warn
