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

Daniel Bermond dbermond at archlinux.org
Sat Feb 29 15:49:02 UTC 2020 

    Date: Saturday, February 29, 2020 @ 15:49:02
  Author: dbermond
Revision: 586925

upgpkg: i2pd 2.30.0-1

Added:
  i2pd/trunk/010-i2pd-use-arch-flags-on-tests.patch
    (from rev 586924, i2pd/trunk/010-i2pd-fix-tests.patch)
  i2pd/trunk/030-i2pd-config.patch
    (from rev 586924, i2pd/trunk/030-i2pd-fix-config.patch)
Modified:
  i2pd/trunk/020-i2pd-fix-install.patch
  i2pd/trunk/PKGBUILD
Deleted:
  i2pd/trunk/010-i2pd-fix-tests.patch
  i2pd/trunk/030-i2pd-fix-config.patch

----------------------------------------+
 010-i2pd-fix-tests.patch               |   41 ----------------------------
 010-i2pd-use-arch-flags-on-tests.patch |   45 +++++++++++++++++++++++++++++++
 020-i2pd-fix-install.patch             |    8 ++---
 030-i2pd-config.patch                  |   29 +++++++++++++++++++
 030-i2pd-fix-config.patch              |   29 -------------------
 PKGBUILD                               |   31 +++++++++++----------
 6 files changed, 94 insertions(+), 89 deletions(-)

Deleted: 010-i2pd-fix-tests.patch
===================================================================
--- 010-i2pd-fix-tests.patch	2020-02-29 15:41:30 UTC (rev 586924)
+++ 010-i2pd-fix-tests.patch	2020-02-29 15:49:02 UTC (rev 586925)
@@ -1,41 +0,0 @@
-diff -Naurp a/tests/Makefile b/tests/Makefile
---- a/tests/Makefile	2019-08-27 14:17:32.000000000 +0000
-+++ b/tests/Makefile	2019-09-30 19:57:50.345359424 +0000
-@@ -1,29 +1,26 @@
--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
-+TESTS = test-gost test-gost-sig test-base-64 test-aeadchacha20poly1305 test-blinding
- 
- all: $(TESTS) run
- 
- test-http-%: ../libi2pd/HTTP.cpp test-http-%.cpp
--	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDFLAGS)
- 
- test-base-%: ../libi2pd/Base.cpp test-base-%.cpp
--	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDFLAGS)
- 
- 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 $(LDFLAGS)
- 
- 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
--
--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 $(LDFLAGS)
- 
- 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 $(LDFLAGS)
- 
- 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 $(LDFLAGS)
- 
- run: $(TESTS)
- 	@for TEST in $(TESTS); do ./$$TEST ; done

Copied: i2pd/trunk/010-i2pd-use-arch-flags-on-tests.patch (from rev 586924, i2pd/trunk/010-i2pd-fix-tests.patch)
===================================================================
--- 010-i2pd-use-arch-flags-on-tests.patch	                        (rev 0)
+++ 010-i2pd-use-arch-flags-on-tests.patch	2020-02-29 15:49:02 UTC (rev 586925)
@@ -0,0 +1,45 @@
+diff -Naurp a/tests/Makefile b/tests/Makefile
+--- a/tests/Makefile	2020-02-24 15:46:01.000000000 +0000
++++ b/tests/Makefile	2020-02-24 15:47:19.414667269 +0000
+@@ -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
+ 
+ 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)
+ 
+ test-base-%: ../libi2pd/Base.cpp test-base-%.cpp
+-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
++	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ $(LDFLAGS)
+ 
+ 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)
+ 
+ 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)
+ 
+ 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)
+ 
+ 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)
+ 
+ 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) $(CPPFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system $(LDFLAGS)
+ 
+ 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)
+ 
+ run: $(TESTS)
+ 	@for TEST in $(TESTS); do ./$$TEST ; done

Modified: 020-i2pd-fix-install.patch
===================================================================
--- 020-i2pd-fix-install.patch	2020-02-29 15:41:30 UTC (rev 586924)
+++ 020-i2pd-fix-install.patch	2020-02-29 15:49:02 UTC (rev 586925)
@@ -1,7 +1,7 @@
 diff -Naurp a/build/CMakeLists.txt b/build/CMakeLists.txt
---- a/build/CMakeLists.txt	2019-08-27 14:17:32.000000000 +0000
-+++ b/build/CMakeLists.txt	2019-09-29 17:34:39.792936645 +0000
-@@ -486,20 +486,7 @@ if (WITH_BINARY)
+--- a/build/CMakeLists.txt	2020-02-25 17:08:50.000000000 +0000
++++ b/build/CMakeLists.txt	2020-02-29 14:47:28.000000000 +0000
+@@ -488,20 +488,7 @@ if (WITH_BINARY)
    endif ()
  endif ()
  
@@ -22,7 +22,7 @@
  # install(DIRECTORY ../ DESTINATION src/
  #   # OPTIONAL
  #   COMPONENT Source FILES_MATCHING
-@@ -507,8 +494,8 @@ install(FILES ${I2PD_SOURCES} DESTINATIO
+@@ -509,8 +496,8 @@ install(FILES ${I2PD_SOURCES} DESTINATIO
  #   PATTERN "*.cpp"
  #   )
  

Copied: i2pd/trunk/030-i2pd-config.patch (from rev 586924, i2pd/trunk/030-i2pd-fix-config.patch)
===================================================================
--- 030-i2pd-config.patch	                        (rev 0)
+++ 030-i2pd-config.patch	2020-02-29 15:49:02 UTC (rev 586925)
@@ -0,0 +1,29 @@
+diff -Naurp a/contrib/i2pd.conf b/contrib/i2pd.conf
+--- a/contrib/i2pd.conf	2019-08-27 14:17:32.000000000 +0000
++++ b/contrib/i2pd.conf	2019-10-03 01:26:29.274686807 +0000
+@@ -7,13 +7,13 @@
+ ## by removing the "#" symbol.
+ 
+ ## Tunnels config file
+-## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf
++## Default: /var/lib/i2pd/tunnels.conf (symlink to /etc/i2pd/tunnels.conf)
+ # 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
+-# tunnelsdir = /var/lib/i2pd/tunnels.conf.d
++## Default: /var/lib/i2pd/tunnels.d (symlink to /etc/i2pd/tunnels.d)
++# tunnelsdir = /var/lib/i2pd/tunnels.d
+ 
+ ## Where to write pidfile (don't write by default)
+ # pidfile = /var/run/i2pd.pid
+@@ -27,7 +27,7 @@
+ ##  * syslog - use syslog, see man 3 syslog
+ # log = file
+ ## Path to logfile (default - autodetect)
+-# logfile = /var/log/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 = info

Deleted: 030-i2pd-fix-config.patch
===================================================================
--- 030-i2pd-fix-config.patch	2020-02-29 15:41:30 UTC (rev 586924)
+++ 030-i2pd-fix-config.patch	2020-02-29 15:49:02 UTC (rev 586925)
@@ -1,29 +0,0 @@
-diff -Naurp a/contrib/i2pd.conf b/contrib/i2pd.conf
---- a/contrib/i2pd.conf	2019-08-27 14:17:32.000000000 +0000
-+++ b/contrib/i2pd.conf	2019-10-03 01:26:29.274686807 +0000
-@@ -7,13 +7,13 @@
- ## by removing the "#" symbol.
- 
- ## Tunnels config file
--## Default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf
-+## Default: /var/lib/i2pd/tunnels.conf (symlink to /etc/i2pd/tunnels.conf)
- # 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
--# tunnelsdir = /var/lib/i2pd/tunnels.conf.d
-+## Default: /var/lib/i2pd/tunnels.d (symlink to /etc/i2pd/tunnels.d)
-+# tunnelsdir = /var/lib/i2pd/tunnels.d
- 
- ## Where to write pidfile (don't write by default)
- # pidfile = /var/run/i2pd.pid
-@@ -27,7 +27,7 @@
- ##  * syslog - use syslog, see man 3 syslog
- # log = file
- ## Path to logfile (default - autodetect)
--# logfile = /var/log/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 = info

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-29 15:41:30 UTC (rev 586924)
+++ PKGBUILD	2020-02-29 15:49:02 UTC (rev 586925)
@@ -9,8 +9,8 @@
 # Contributor: r4sas
 
 pkgname=i2pd
-pkgver=2.29.0
-pkgrel=2
+pkgver=2.30.0
+pkgrel=1
 pkgdesc='A full-featured C++ implementation of the I2P router'
 arch=('x86_64')
 url='https://i2pd.website/'
@@ -21,16 +21,16 @@
 backup=('etc/i2pd/i2pd.conf'
         'etc/i2pd/tunnels.conf')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/PurpleI2P/i2pd/archive/${pkgver}.tar.gz"
-        '010-i2pd-fix-tests.patch'
+        '010-i2pd-use-arch-flags-on-tests.patch'
         '020-i2pd-fix-install.patch'
-        '030-i2pd-fix-config.patch'
+        '030-i2pd-config.patch'
         '040-i2pd-do-not-override-config.patch'
         '050-i2pd-tunnels-d-readme.patch'
         'i2pd.sysusers'
         'i2pd.tmpfiles')
-sha256sums=('fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06'
-            'c408f582d1f8d80c0ba560848520424dfa33e1b3035604d605ceccafa66a0aa9'
-            '89cbd39cfe80ac0e9f60a426910b53affebd162486cd85ff3262cb941f6b3f8c'
+sha256sums=('25915cbd33a9f53c89ddf7fbd68fccc5ffc89ab40d4445ccc813da74fae154f2'
+            '9394ed4825fdebe398566d8748cd8b4f1e931f5ab07907e8eda9fb11d4146c67'
+            'bccb099df5f9010055455a6d74f5cc44ad9de09755ca5e7505ae1e56f9273965'
             'f3a2afe0adc2f502dcb388f778a394a2556848fe8be014f3470e205a098e765c'
             'a9a2fabd093b952507a297c755b75ff765f658cad16ec0318b22514d1bba44d7'
             '48217794d5d520751e00efe3ea4fe0f2a340df16c669007cf08058c349746ac1'
@@ -38,25 +38,26 @@
             '55005dfc1cba3e1fa3b6a2740fdbbb0cc9eb3178941ddd7008e2ef1d5c85a088')
 
 prepare() {
-    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-i2pd-fix-tests.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-fix-install.patch"
-    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/030-i2pd-fix-config.patch"
+    patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/030-i2pd-config.patch"
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/040-i2pd-do-not-override-config.patch"
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/050-i2pd-tunnels-d-readme.patch"
 }
 
 build() {
-    cd "${pkgname}-${pkgver}/build"
+    export CXXFLAGS+=" ${CPPFLAGS}"
     cmake \
+        -B "${pkgname}-${pkgver}/build" \
+        -S "${pkgname}-${pkgver}/build" \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DBUILD_SHARED_LIBS:BOOL='ON' \
         -DWITH_UPNP:BOOL='ON' \
-        -DWITH_AESNI='OFF' \
-        -DWITH_AVX='OFF' \
-        -Wno-dev \
-        .
-    make
+        -DWITH_AESNI:BOOL='OFF' \
+        -DWITH_AVX:BOOL='OFF' \
+        -Wno-dev
+    make -C "${pkgname}-${pkgver}/build"
 }
 
 check() {

More information about the arch-commits mailing list