Match latest upstream changes

3 files changed, 20 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 952ab109afcd..4f8d24129a64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = i2pd-git
 	pkgdesc = A full-featured C++ implementation of the I2P router (git version)
-	pkgver = 2.38.0.r111.ga7175427
+	pkgver = 2.39.0.r5.gc762acd7
 	pkgrel = 1
 	url = https://i2pd.website/
 	arch = x86_64
@@ -26,7 +26,7 @@ pkgbase = i2pd-git
 	source = i2pd.sysusers
 	source = i2pd.tmpfiles
 	sha256sums = SKIP
-	sha256sums = 0064503a9124b764d01db862ba3c2ff97bc5961d41359970df2d6ce9842a5ab5
+	sha256sums = 050f6b80eda4e59b9dff1e7bfe023fa2c525d469eda98a097eb59240e44a1319
 	sha256sums = 45dae1e2f798d23df92c996c233fccb07349d62992d0f625be7fd913719875af
 	sha256sums = e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11
 	sha256sums = 2b84d85d4234eb3b640925d0dd244c8abe3b48bc69c8456629af923de17acf10
diff --git a/010-i2pd-use-arch-flags-on-tests.patch b/010-i2pd-use-arch-flags-on-tests.patch
index 7172f5ddb7d8..6849f0a093a8 100644
--- a/010-i2pd-use-arch-flags-on-tests.patch
+++ b/010-i2pd-use-arch-flags-on-tests.patch
@@ -1,44 +1,45 @@
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -1,32 +1,32 @@
--CXXFLAGS += -Wall -Wextra -pedantic -O0 -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -I../libi2pd/ -pthread -Wl,--unresolved-symbols=ignore-in-object-files
-+CXXFLAGS += -Wall -Wextra -pedantic -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -I../libi2pd/ -pthread -Wl,--unresolved-symbols=ignore-in-object-files
- 
- TESTS = test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly1305 test-blinding test-elligator
+@@ -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 -I../i18n
  
+ LOCALESRC = ../i18n/Afrikaans.cpp ../i18n/English.cpp ../i18n/Russian.cpp ../i18n/Turkmen.cpp ../i18n/Ukrainian.cpp ../i18n/Uzbek.cpp
+@@ -8,28 +8,28 @@ TESTS = test-gost test-gost-sig test-bas
  all: $(TESTS) run
  
  test-http-%: ../libi2pd/HTTP.cpp test-http-%.cpp
 -	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
-+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ $(LDFLAGS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
  
  test-base-%: ../libi2pd/Base.cpp test-base-%.cpp
 -	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
-+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ $(LDFLAGS)
++	$(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) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto $(LDFLAGS)
++	$(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) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system $(LDFLAGS)
++	$(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) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system $(LDFLAGS)
++	$(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) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system $(LDFLAGS)
++	 $(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
+ 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 $(LOCALESRC) test-blinding.cpp
 -	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
-+	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system $(LDFLAGS)
++	 $(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) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system $(LDFLAGS)
++	 $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
  
  run: $(TESTS)
  	@for TEST in $(TESTS); do ./$$TEST ; done
diff --git a/PKGBUILD b/PKGBUILD
index ab95670ba9d4..f187915aec48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: DDoSolitary <DDoSolitary@gmail.com>
 
 pkgname=i2pd-git
-pkgver=2.38.0.r111.ga7175427
+pkgver=2.39.0.r5.gc762acd7
 pkgrel=1
 pkgdesc='A full-featured C++ implementation of the I2P router (git version)'
 arch=('x86_64')
@@ -26,7 +26,7 @@ source=('git+https://github.com/PurpleI2P/i2pd.git#branch=openssl'
         'i2pd.sysusers'
         'i2pd.tmpfiles')
 sha256sums=('SKIP'
-            '0064503a9124b764d01db862ba3c2ff97bc5961d41359970df2d6ce9842a5ab5'
+            '050f6b80eda4e59b9dff1e7bfe023fa2c525d469eda98a097eb59240e44a1319'
             '45dae1e2f798d23df92c996c233fccb07349d62992d0f625be7fd913719875af'
             'e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11'
             '2b84d85d4234eb3b640925d0dd244c8abe3b48bc69c8456629af923de17acf10'
@@ -83,7 +83,7 @@ package() {
     install -D -m644 contrib/tunnels.d/{*.conf,README} -t "${pkgdir}/usr/share/doc/i2pd/tunnels.d"
     
     # headers
-    install -D -m644 libi2pd{,_client}/*.h -t "${pkgdir}/usr/include/i2pd"
+    install -D -m644 {i18n,libi2pd{,_client}}/*.h -t "${pkgdir}/usr/include/i2pd"
     
     # man page
     install -D -m644 debian/i2pd.1 -t "${pkgdir}/usr/share/man/man1"