[arch-commits] Commit in i2pd/trunk (9 files)
Daniel Bermond
dbermond at archlinux.org
Sat May 30 14:37:10 UTC 2020
Date: Saturday, May 30, 2020 @ 14:37:10
Author: dbermond
Revision: 637429
upgpkg: i2pd 2.32.0-1
Added:
i2pd/trunk/020-i2pd-config.patch
(from rev 637428, i2pd/trunk/030-i2pd-config.patch)
i2pd/trunk/030-i2pd-do-not-override-config.patch
(from rev 637428, i2pd/trunk/040-i2pd-do-not-override-config.patch)
i2pd/trunk/040-i2pd-tunnels-d-readme.patch
(from rev 637428, i2pd/trunk/050-i2pd-tunnels-d-readme.patch)
Modified:
i2pd/trunk/010-i2pd-use-arch-flags-on-tests.patch
i2pd/trunk/PKGBUILD
Deleted:
i2pd/trunk/020-i2pd-fix-install.patch
i2pd/trunk/030-i2pd-config.patch
i2pd/trunk/040-i2pd-do-not-override-config.patch
i2pd/trunk/050-i2pd-tunnels-d-readme.patch
----------------------------------------+
010-i2pd-use-arch-flags-on-tests.patch | 5 +---
020-i2pd-config.patch | 30 +++++++++++++++++++++++++
020-i2pd-fix-install.patch | 35 ------------------------------
030-i2pd-config.patch | 29 ------------------------
030-i2pd-do-not-override-config.patch | 29 ++++++++++++++++++++++++
040-i2pd-do-not-override-config.patch | 35 ------------------------------
040-i2pd-tunnels-d-readme.patch | 8 ++++++
050-i2pd-tunnels-d-readme.patch | 9 -------
PKGBUILD | 36 ++++++++++++++-----------------
9 files changed, 86 insertions(+), 130 deletions(-)
Modified: 010-i2pd-use-arch-flags-on-tests.patch
===================================================================
--- 010-i2pd-use-arch-flags-on-tests.patch 2020-05-30 13:34:50 UTC (rev 637428)
+++ 010-i2pd-use-arch-flags-on-tests.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -1,6 +1,5 @@
-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
+--- 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
Copied: i2pd/trunk/020-i2pd-config.patch (from rev 637428, i2pd/trunk/030-i2pd-config.patch)
===================================================================
--- 020-i2pd-config.patch (rev 0)
+++ 020-i2pd-config.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -0,0 +1,30 @@
+--- a/contrib/i2pd.conf
++++ b/contrib/i2pd.conf
+@@ -8,15 +8,17 @@
+
+ ## 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
+
+ ## 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
+@@ -27,7 +29,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
Deleted: 020-i2pd-fix-install.patch
===================================================================
--- 020-i2pd-fix-install.patch 2020-05-30 13:34:50 UTC (rev 637428)
+++ 020-i2pd-fix-install.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -1,35 +0,0 @@
-diff -Naurp a/build/CMakeLists.txt b/build/CMakeLists.txt
---- a/build/CMakeLists.txt 2020-04-10 17:33:54.000000000 +0000
-+++ b/build/CMakeLists.txt 2020-04-11 21:52:44.000000000 +0000
-@@ -469,20 +469,7 @@ if (WITH_BINARY)
- endif ()
- endif ()
-
--install(FILES ../LICENSE
-- DESTINATION .
-- COMPONENT Runtime
-- )
--# Take a copy on Appveyor
--install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
-- DESTINATION .
-- COMPONENT Runtime
-- RENAME LICENSE_OPENSSL
-- OPTIONAL # for local builds only!
-- )
--
- file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*")
--install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
- # install(DIRECTORY ../ DESTINATION src/
- # # OPTIONAL
- # COMPONENT Source FILES_MATCHING
-@@ -490,8 +477,8 @@ install(FILES ${I2PD_SOURCES} DESTINATIO
- # PATTERN "*.cpp"
- # )
-
--file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h")
--install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
-+file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h")
-+install(FILES ${I2PD_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/i2pd COMPONENT Headers)
- # install(DIRECTORY ../ DESTINATION src/
- # # OPTIONAL
- # COMPONENT Headers FILES_MATCHING
Deleted: 030-i2pd-config.patch
===================================================================
--- 030-i2pd-config.patch 2020-05-30 13:34:50 UTC (rev 637428)
+++ 030-i2pd-config.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -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
Copied: i2pd/trunk/030-i2pd-do-not-override-config.patch (from rev 637428, i2pd/trunk/040-i2pd-do-not-override-config.patch)
===================================================================
--- 030-i2pd-do-not-override-config.patch (rev 0)
+++ 030-i2pd-do-not-override-config.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -0,0 +1,29 @@
+--- a/contrib/i2pd.service
++++ b/contrib/i2pd.service
+@@ -11,20 +11,24 @@ RuntimeDirectoryMode=0700
+ LogsDirectory=i2pd
+ LogsDirectoryMode=0700
+ Type=forking
+-ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
++ExecStart=/usr/sbin/i2pd --conf=/var/lib/i2pd/i2pd.conf --pidfile=/run/i2pd/i2pd.pid --daemon --service
+ ExecReload=/bin/sh -c "kill -HUP $MAINPID"
+ PIDFile=/run/i2pd/i2pd.pid
+ ### Uncomment, if auto restart needed
+ #Restart=on-failure
+
++# SIGQUIT is setted by upstream and always generates a core dump.
++# You can ignore the failed exit (core dump) when stopping the service.
+ KillSignal=SIGQUIT
++
+ # If you have the patience waiting 10 min on restarting/stopping it, uncomment this.
+ # i2pd stops accepting new tunnels and waits ~10 min while old ones do not die.
+ #KillSignal=SIGINT
+ #TimeoutStopSec=10m
+
+-# If you have problems with hanging i2pd, you can try increase this
++# If you have problems with hanging i2pd, you can try to increase this
+ LimitNOFILE=4096
++
+ # To enable write of coredump uncomment this
+ #LimitCORE=infinity
+
Deleted: 040-i2pd-do-not-override-config.patch
===================================================================
--- 040-i2pd-do-not-override-config.patch 2020-05-30 13:34:50 UTC (rev 637428)
+++ 040-i2pd-do-not-override-config.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -1,35 +0,0 @@
-diff -Naurp a/contrib/i2pd.service b/contrib/i2pd.service
---- a/contrib/i2pd.service 2019-08-27 14:17:32.000000000 +0000
-+++ b/contrib/i2pd.service 2019-10-06 14:20:27.895454321 +0000
-@@ -11,23 +11,25 @@ RuntimeDirectoryMode=0700
- LogsDirectory=i2pd
- LogsDirectoryMode=0700
- Type=forking
--ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/var/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
-+ExecStart=/usr/bin/i2pd --conf=/var/lib/i2pd/i2pd.conf --pidfile=/run/i2pd/i2pd.pid --daemon --service
- ExecReload=/bin/kill -HUP $MAINPID
--PIDFile=/var/run/i2pd/i2pd.pid
--### Uncomment, if auto restart needed
--#Restart=on-failure
-+PIDFile=/run/i2pd/i2pd.pid
-+PrivateDevices=yes
-
-+# SIGQUIT is setted by upstream and always generates a core dump.
-+# You can ignore the failed exit (core dump) when stopping the service.
- KillSignal=SIGQUIT
-+
- # If you have the patience waiting 10 min on restarting/stopping it, uncomment this.
- # i2pd stops accepting new tunnels and waits ~10 min while old ones do not die.
- #KillSignal=SIGINT
- #TimeoutStopSec=10m
-
--# If you have problems with hanging i2pd, you can try increase this
-+# If you have problems with hanging i2pd, you can try to increase this
- LimitNOFILE=4096
-+
- # To enable write of coredump uncomment this
- #LimitCORE=infinity
--PrivateDevices=yes
-
- [Install]
- WantedBy=multi-user.target
Copied: i2pd/trunk/040-i2pd-tunnels-d-readme.patch (from rev 637428, i2pd/trunk/050-i2pd-tunnels-d-readme.patch)
===================================================================
--- 040-i2pd-tunnels-d-readme.patch (rev 0)
+++ 040-i2pd-tunnels-d-readme.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -0,0 +1,8 @@
+--- a/contrib/tunnels.d/README
++++ b/contrib/tunnels.d/README
+@@ -1,4 +1,4 @@
+-# In that directory you can store separated config files for every tunnel.
++# In the /etc/i2pd/tunnels.d directory you can store separated config files for every tunnel.
+ # Please read documentation for more info.
+ #
+ # You can find examples in /usr/share/doc/i2pd/tunnels.d directory
Deleted: 050-i2pd-tunnels-d-readme.patch
===================================================================
--- 050-i2pd-tunnels-d-readme.patch 2020-05-30 13:34:50 UTC (rev 637428)
+++ 050-i2pd-tunnels-d-readme.patch 2020-05-30 14:37:10 UTC (rev 637429)
@@ -1,9 +0,0 @@
-diff -Naurp a/contrib/tunnels.d/README b/contrib/tunnels.d/README
---- a/contrib/tunnels.d/README 2019-08-27 14:17:32.000000000 +0000
-+++ b/contrib/tunnels.d/README 2019-09-30 18:48:51.066404952 +0000
-@@ -1,4 +1,4 @@
--# In that directory you can store separated config files for every tunnel.
-+# In the /etc/i2pd/tunnels.d directory you can store separated config files for every tunnel.
- # Please read documentation for more info.
- #
- # You can find examples in /usr/share/doc/i2pd/tunnels.d directory
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-30 13:34:50 UTC (rev 637428)
+++ PKGBUILD 2020-05-30 14:37:10 UTC (rev 637429)
@@ -9,7 +9,7 @@
# Contributor: r4sas
pkgname=i2pd
-pkgver=2.31.0
+pkgver=2.32.0
pkgrel=1
pkgdesc='A full-featured C++ implementation of the I2P router'
arch=('x86_64')
@@ -22,31 +22,27 @@
'etc/i2pd/tunnels.conf')
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/PurpleI2P/i2pd/archive/${pkgver}.tar.gz"
'010-i2pd-use-arch-flags-on-tests.patch'
- '020-i2pd-fix-install.patch'
- '030-i2pd-config.patch'
- '040-i2pd-do-not-override-config.patch'
- '050-i2pd-tunnels-d-readme.patch'
+ '020-i2pd-config.patch'
+ '030-i2pd-do-not-override-config.patch'
+ '040-i2pd-tunnels-d-readme.patch'
'i2pd.sysusers'
'i2pd.tmpfiles')
-sha256sums=('7e37abcf49e9f59ef6939069f4d74fc6bf29b09deec111bd3561021fc1349528'
- '9394ed4825fdebe398566d8748cd8b4f1e931f5ab07907e8eda9fb11d4146c67'
- 'e55b877e8d2ac520abf2645436c03296427c3fe1fd62f290ec062aa5607c261f'
- 'f3a2afe0adc2f502dcb388f778a394a2556848fe8be014f3470e205a098e765c'
- 'a9a2fabd093b952507a297c755b75ff765f658cad16ec0318b22514d1bba44d7'
- '48217794d5d520751e00efe3ea4fe0f2a340df16c669007cf08058c349746ac1'
+sha256sums=('a68bcc3585fb150bb3781a77ddab97d2618fe58dc004543a9dddb74518e22e58'
+ '0064503a9124b764d01db862ba3c2ff97bc5961d41359970df2d6ce9842a5ab5'
+ '452550678ea5702a6492eb58e8d0452b91dc5d0aaa112cf04542df74a3dc0dfc'
+ '45cfc3035c5b5cfc92cfffec1fe7d7efc4fed3229195cdb640ec4a6c405af149'
+ 'cfcb6b07b67aff3e3af12767f4649d88b9320dc71907b6c01b465e5c138cdaa3'
'88b2e709228049ba11f37863f87de75ab6cde295104852871384337cfdc906a3'
'55005dfc1cba3e1fa3b6a2740fdbbb0cc9eb3178941ddd7008e2ef1d5c85a088')
prepare() {
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-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"
+ 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"
+ patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/040-i2pd-tunnels-d-readme.patch"
}
build() {
- export CXXFLAGS+=" ${CPPFLAGS}"
cmake \
-B "${pkgname}-${pkgver}/build" \
-S "${pkgname}-${pkgver}/build" \
@@ -65,9 +61,6 @@
}
package() {
- local _dir
- local _file
-
cd "${pkgname}-${pkgver}"
make -C build DESTDIR="$pkgdir" install
@@ -78,6 +71,8 @@
install -d -m755 "${pkgdir}/etc/i2pd/tunnels.d"
# certificates
+ local _dir
+ local _file
while read -r -d '' _file
do
_dir="${_file#contrib/certificates}"
@@ -95,6 +90,9 @@
install -D -m644 contrib/tunnels.d/IRC-Ilita.conf -t "${pkgdir}/usr/share/doc/${pkgname}/tunnels.d"
install -D -m644 contrib/tunnels.d/IRC-Irc2P.conf -t "${pkgdir}/usr/share/doc/${pkgname}/tunnels.d"
+ # headers
+ install -D -m644 libi2pd{,_client}/*.h -t "${pkgdir}/usr/include/i2pd"
+
# man page
install -D -m644 debian/i2pd.1 -t "${pkgdir}/usr/share/man/man1"
More information about the arch-commits
mailing list