Update patches and add logrotate file

7 files changed, 20 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1518b575d33c..292eb4b0eb3a 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.39.0.r17.g76dca1b4
+	pkgver = 2.42.0.r1.ge2ef8822
 	pkgrel = 1
 	url = https://i2pd.website/
 	arch = x86_64
@@ -17,16 +17,15 @@ pkgbase = i2pd-git
 	conflicts = i2pd
 	backup = etc/i2pd/i2pd.conf
 	backup = etc/i2pd/tunnels.conf
+	backup = etc/logrotate.d/i2pd
 	source = git+https://github.com/PurpleI2P/i2pd.git#branch=openssl
-	source = 010-i2pd-use-arch-flags-on-tests.patch
-	source = 020-i2pd-config.patch
-	source = 030-i2pd-do-not-override-config.patch
-	source = 040-i2pd-systemd-service-hardening.patch
-	source = 050-i2pd-tunnels-d-readme.patch
+	source = 010-i2pd-config.patch
+	source = 020-i2pd-do-not-override-config.patch
+	source = 030-i2pd-systemd-service-hardening.patch
+	source = 040-i2pd-tunnels-d-readme.patch
 	source = i2pd.sysusers
 	source = i2pd.tmpfiles
 	sha256sums = SKIP
-	sha256sums = f6ac6e147a3cd12bbd1766c49869e716d9570fb2ec4a51999cc02f074d080772
 	sha256sums = 45dae1e2f798d23df92c996c233fccb07349d62992d0f625be7fd913719875af
 	sha256sums = e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11
 	sha256sums = 2b84d85d4234eb3b640925d0dd244c8abe3b48bc69c8456629af923de17acf10
diff --git a/020-i2pd-config.patch b/010-i2pd-config.patch
index 6ab1e33b0a57..6ab1e33b0a57 100644
--- a/020-i2pd-config.patch
+++ b/010-i2pd-config.patch
diff --git a/010-i2pd-use-arch-flags-on-tests.patch b/010-i2pd-use-arch-flags-on-tests.patch
deleted file mode 100644
index 25d74dd0cdb1..000000000000
--- a/010-i2pd-use-arch-flags-on-tests.patch
+++ /dev/null
@@ -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
diff --git a/030-i2pd-do-not-override-config.patch b/020-i2pd-do-not-override-config.patch
index f020dcdb9a39..f020dcdb9a39 100644
--- a/030-i2pd-do-not-override-config.patch
+++ b/020-i2pd-do-not-override-config.patch
diff --git a/040-i2pd-systemd-service-hardening.patch b/030-i2pd-systemd-service-hardening.patch
index c8168223f9a8..c8168223f9a8 100644
--- a/040-i2pd-systemd-service-hardening.patch
+++ b/030-i2pd-systemd-service-hardening.patch
diff --git a/050-i2pd-tunnels-d-readme.patch b/040-i2pd-tunnels-d-readme.patch
index cb0d14f68748..cb0d14f68748 100644
--- a/050-i2pd-tunnels-d-readme.patch
+++ b/040-i2pd-tunnels-d-readme.patch
diff --git a/PKGBUILD b/PKGBUILD
index d408498c41d6..680c870c8c94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: DDoSolitary <DDoSolitary@gmail.com>
 
 pkgname=i2pd-git
-pkgver=2.39.0.r17.g76dca1b4
+pkgver=2.42.0.r1.ge2ef8822
 pkgrel=1
 pkgdesc='A full-featured C++ implementation of the I2P router (git version)'
 arch=('x86_64')
@@ -16,17 +16,16 @@ makedepends=('git' 'cmake' 'boost')
 provides=('i2pd' 'i2p-router')
 conflicts=('i2pd')
 backup=('etc/i2pd/i2pd.conf'
-        'etc/i2pd/tunnels.conf')
+        'etc/i2pd/tunnels.conf'
+        'etc/logrotate.d/i2pd')
 source=('git+https://github.com/PurpleI2P/i2pd.git#branch=openssl'
-        '010-i2pd-use-arch-flags-on-tests.patch'
-        '020-i2pd-config.patch'
-        '030-i2pd-do-not-override-config.patch'
-        '040-i2pd-systemd-service-hardening.patch'
-        '050-i2pd-tunnels-d-readme.patch'
+        '010-i2pd-config.patch'
+        '020-i2pd-do-not-override-config.patch'
+        '030-i2pd-systemd-service-hardening.patch'
+        '040-i2pd-tunnels-d-readme.patch'
         'i2pd.sysusers'
         'i2pd.tmpfiles')
 sha256sums=('SKIP'
-            'f6ac6e147a3cd12bbd1766c49869e716d9570fb2ec4a51999cc02f074d080772'
             '45dae1e2f798d23df92c996c233fccb07349d62992d0f625be7fd913719875af'
             'e98eaa783fcd8e1ab84980f68158e3bb9eb5ec101f26c748946a313152643f11'
             '2b84d85d4234eb3b640925d0dd244c8abe3b48bc69c8456629af923de17acf10'
@@ -35,11 +34,10 @@ sha256sums=('SKIP'
             'fe8cc2ec83cb5b5c2b2ec8cce9a989e0cb6fd347e00b84e03a17b12efd152fac')
 
 prepare() {
-    patch -d i2pd -Np1 -i "${srcdir}/010-i2pd-use-arch-flags-on-tests.patch"
-    patch -d i2pd -Np1 -i "${srcdir}/020-i2pd-config.patch"
-    patch -d i2pd -Np1 -i "${srcdir}/030-i2pd-do-not-override-config.patch"
-    patch -d i2pd -Np1 -i "${srcdir}/040-i2pd-systemd-service-hardening.patch"
-    patch -d i2pd -Np1 -i "${srcdir}/050-i2pd-tunnels-d-readme.patch"
+    patch -d i2pd -Np1 -i "${srcdir}/010-i2pd-config.patch"
+    patch -d i2pd -Np1 -i "${srcdir}/020-i2pd-do-not-override-config.patch"
+    patch -d i2pd -Np1 -i "${srcdir}/030-i2pd-systemd-service-hardening.patch"
+    patch -d i2pd -Np1 -i "${srcdir}/040-i2pd-tunnels-d-readme.patch"
 }
 
 pkgver() {
@@ -79,6 +77,9 @@ package() {
     install -D -m644 "${srcdir}/i2pd.sysusers" "${pkgdir}/usr/lib/sysusers.d/i2pd.conf"
     install -D -m644 "${srcdir}/i2pd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/i2pd.conf"
     
+    # logrotate
+    install -D -m644 contrib/i2pd.logrotate "${pkgdir}/etc/logrotate.d/i2pd"
+    
     # tunnels.d examples
     install -D -m644 contrib/tunnels.d/{*.conf,README} -t "${pkgdir}/usr/share/doc/i2pd/tunnels.d"