[arch-commits] Commit in i2pd/trunk (3 files)

[Daniel Bermond]

    Date: Monday, November 29, 2021 @ 21:56:49
  Author: dbermond
Revision: 1057631

upgpkg: i2pd 2.40.0-1

Modified:
  i2pd/trunk/010-i2pd-use-arch-flags-on-tests.patch
  i2pd/trunk/PKGBUILD
Deleted:
  i2pd/trunk/005-i2pd-fix-test-blinding.patch

----------------------------------------+
 005-i2pd-fix-test-blinding.patch       |   20 --------------------
 010-i2pd-use-arch-flags-on-tests.patch |    8 ++++----
 PKGBUILD                               |   11 +++--------
 3 files changed, 7 insertions(+), 32 deletions(-)

Deleted: 005-i2pd-fix-test-blinding.patch
===================================================================
--- 005-i2pd-fix-test-blinding.patch	2021-11-29 21:42:05 UTC (rev 1057630)
+++ 005-i2pd-fix-test-blinding.patch	2021-11-29 21:56:49 UTC (rev 1057631)
@@ -1,20 +0,0 @@
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -1,4 +1,7 @@
--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 -Wno-unused-parameter -Wextra -pedantic -O0 -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
- 
- TESTS = test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly1305 test-blinding test-elligator
- 
-@@ -22,7 +25,7 @@ test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp
- test-aeadchacha20poly1305: ../libi2pd/Crypto.cpp ../libi2pd/ChaCha20.cpp ../libi2pd/Poly1305.cpp test-aeadchacha20poly1305.cpp
- 	 $(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
-+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
- 
- test-elligator: ../libi2pd/Elligator.cpp ../libi2pd/Crypto.cpp test-elligator.cpp

Modified: 010-i2pd-use-arch-flags-on-tests.patch
===================================================================
--- 010-i2pd-use-arch-flags-on-tests.patch	2021-11-29 21:42:05 UTC (rev 1057630)
+++ 010-i2pd-use-arch-flags-on-tests.patch	2021-11-29 21:56:49 UTC (rev 1057631)
@@ -3,10 +3,10 @@
 @@ -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
+ INCFLAGS += -I../libi2pd
  
- 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
+ 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
@@ -33,7 +33,7 @@
 -	 $(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 $(LOCALESRC) 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 test-blinding.cpp
 -	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
 +	 $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
  

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-29 21:42:05 UTC (rev 1057630)
+++ PKGBUILD	2021-11-29 21:56:49 UTC (rev 1057631)
@@ -9,7 +9,7 @@
 # Contributor: r4sas
 
 pkgname=i2pd
-pkgver=2.39.0
+pkgver=2.40.0
 pkgrel=1
 pkgdesc='A full-featured C++ implementation of the I2P router'
 arch=('x86_64')
@@ -21,7 +21,6 @@
 backup=('etc/i2pd/i2pd.conf'
         'etc/i2pd/tunnels.conf')
 source=("https://github.com/PurpleI2P/i2pd/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        '005-i2pd-fix-test-blinding.patch'
         '010-i2pd-use-arch-flags-on-tests.patch'
         '020-i2pd-config.patch'
         '030-i2pd-do-not-override-config.patch'
@@ -29,9 +28,8 @@
         '050-i2pd-tunnels-d-readme.patch'
         'i2pd.sysusers'
         'i2pd.tmpfiles')
-sha256sums=('3ffeb614cec826e13b50e8306177018ecb8d873668dfe66aadc733ca9fcaa568'
-            '6ac8e8269d3b740266471ccee61166dde8abccc06a77724757f514ffce91df21'
-            '050f6b80eda4e59b9dff1e7bfe023fa2c525d469eda98a097eb59240e44a1319'
+sha256sums=('4443f484ad40753e892170a26c8ee8126e8338bf416d04eab0c55c1c94a4e193'
+            'f6ac6e147a3cd12bbd1766c49869e716d9570fb2ec4a51999cc02f074d080772'
             '45dae1e2f798d23df92c996c233fccb07349d62992d0f625be7fd913719875af'
             'e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11'
             '2b84d85d4234eb3b640925d0dd244c8abe3b48bc69c8456629af923de17acf10'
@@ -40,9 +38,6 @@
             'fe8cc2ec83cb5b5c2b2ec8cce9a989e0cb6fd347e00b84e03a17b12efd152fac')
 
 prepare() {
-    # https://github.com/PurpleI2P/i2pd/pull/1687
-    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/005-i2pd-fix-test-blinding.patch"
-    
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-i2pd-use-arch-flags-on-tests.patch"
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/020-i2pd-config.patch"
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/030-i2pd-do-not-override-config.patch"