[arch-commits] Commit in i2pd/repos (9 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Jan 28 02:58:12 UTC 2020
Date: Tuesday, January 28, 2020 @ 02:58:12
Author: foutrelis
Revision: 557042
archrelease: copy trunk to community-staging-x86_64
Added:
i2pd/repos/community-staging-x86_64/
i2pd/repos/community-staging-x86_64/010-i2pd-fix-tests.patch
(from rev 557041, i2pd/trunk/010-i2pd-fix-tests.patch)
i2pd/repos/community-staging-x86_64/020-i2pd-fix-install.patch
(from rev 557041, i2pd/trunk/020-i2pd-fix-install.patch)
i2pd/repos/community-staging-x86_64/030-i2pd-fix-config.patch
(from rev 557041, i2pd/trunk/030-i2pd-fix-config.patch)
i2pd/repos/community-staging-x86_64/040-i2pd-do-not-override-config.patch
(from rev 557041, i2pd/trunk/040-i2pd-do-not-override-config.patch)
i2pd/repos/community-staging-x86_64/050-i2pd-tunnels-d-readme.patch
(from rev 557041, i2pd/trunk/050-i2pd-tunnels-d-readme.patch)
i2pd/repos/community-staging-x86_64/PKGBUILD
(from rev 557041, i2pd/trunk/PKGBUILD)
i2pd/repos/community-staging-x86_64/i2pd.sysusers
(from rev 557041, i2pd/trunk/i2pd.sysusers)
i2pd/repos/community-staging-x86_64/i2pd.tmpfiles
(from rev 557041, i2pd/trunk/i2pd.tmpfiles)
---------------------------------------+
010-i2pd-fix-tests.patch | 41 ++++++++++++
020-i2pd-fix-install.patch | 35 ++++++++++
030-i2pd-fix-config.patch | 29 +++++++++
040-i2pd-do-not-override-config.patch | 35 ++++++++++
050-i2pd-tunnels-d-readme.patch | 9 ++
PKGBUILD | 102 ++++++++++++++++++++++++++++++++
i2pd.sysusers | 1
i2pd.tmpfiles | 6 +
8 files changed, 258 insertions(+)
Copied: i2pd/repos/community-staging-x86_64/010-i2pd-fix-tests.patch (from rev 557041, i2pd/trunk/010-i2pd-fix-tests.patch)
===================================================================
--- community-staging-x86_64/010-i2pd-fix-tests.patch (rev 0)
+++ community-staging-x86_64/010-i2pd-fix-tests.patch 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1,41 @@
+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/repos/community-staging-x86_64/020-i2pd-fix-install.patch (from rev 557041, i2pd/trunk/020-i2pd-fix-install.patch)
===================================================================
--- community-staging-x86_64/020-i2pd-fix-install.patch (rev 0)
+++ community-staging-x86_64/020-i2pd-fix-install.patch 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1,35 @@
+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)
+ 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
+@@ -507,8 +494,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
Copied: i2pd/repos/community-staging-x86_64/030-i2pd-fix-config.patch (from rev 557041, i2pd/trunk/030-i2pd-fix-config.patch)
===================================================================
--- community-staging-x86_64/030-i2pd-fix-config.patch (rev 0)
+++ community-staging-x86_64/030-i2pd-fix-config.patch 2020-01-28 02:58:12 UTC (rev 557042)
@@ -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
Copied: i2pd/repos/community-staging-x86_64/040-i2pd-do-not-override-config.patch (from rev 557041, i2pd/trunk/040-i2pd-do-not-override-config.patch)
===================================================================
--- community-staging-x86_64/040-i2pd-do-not-override-config.patch (rev 0)
+++ community-staging-x86_64/040-i2pd-do-not-override-config.patch 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1,35 @@
+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/repos/community-staging-x86_64/050-i2pd-tunnels-d-readme.patch (from rev 557041, i2pd/trunk/050-i2pd-tunnels-d-readme.patch)
===================================================================
--- community-staging-x86_64/050-i2pd-tunnels-d-readme.patch (rev 0)
+++ community-staging-x86_64/050-i2pd-tunnels-d-readme.patch 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1,9 @@
+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
Copied: i2pd/repos/community-staging-x86_64/PKGBUILD (from rev 557041, i2pd/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1,102 @@
+# Maintainer: Daniel Bermond <dbermond at archlinux.org>
+# Contributor: robertfoster
+# Contributor: kurych
+# Contributor: redfish
+# Contributor: atommixz
+# Contributor: denn
+# Contributor: post-factum
+# Contributor: wrdcrrtmnstr
+# Contributor: r4sas
+
+pkgname=i2pd
+pkgver=2.29.0
+pkgrel=2
+pkgdesc='A full-featured C++ implementation of the I2P router'
+arch=('x86_64')
+url='https://i2pd.website/'
+license=('BSD')
+depends=('boost-libs' 'libminiupnpc.so' 'openssl' 'zlib')
+makedepends=('cmake' 'boost')
+provides=('i2p-router')
+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'
+ '020-i2pd-fix-install.patch'
+ '030-i2pd-fix-config.patch'
+ '040-i2pd-do-not-override-config.patch'
+ '050-i2pd-tunnels-d-readme.patch'
+ 'i2pd.sysusers'
+ 'i2pd.tmpfiles')
+sha256sums=('fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06'
+ 'c408f582d1f8d80c0ba560848520424dfa33e1b3035604d605ceccafa66a0aa9'
+ '89cbd39cfe80ac0e9f60a426910b53affebd162486cd85ff3262cb941f6b3f8c'
+ 'f3a2afe0adc2f502dcb388f778a394a2556848fe8be014f3470e205a098e765c'
+ 'a9a2fabd093b952507a297c755b75ff765f658cad16ec0318b22514d1bba44d7'
+ '48217794d5d520751e00efe3ea4fe0f2a340df16c669007cf08058c349746ac1'
+ '88b2e709228049ba11f37863f87de75ab6cde295104852871384337cfdc906a3'
+ '55005dfc1cba3e1fa3b6a2740fdbbb0cc9eb3178941ddd7008e2ef1d5c85a088')
+
+prepare() {
+ patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-i2pd-fix-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}/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"
+ cmake \
+ -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
+}
+
+check() {
+ make -C "${pkgname}-${pkgver}/tests"
+}
+
+package() {
+ local _dir
+ local _file
+
+ cd "${pkgname}-${pkgver}"
+
+ make -C build DESTDIR="$pkgdir" install
+
+ # config
+ install -D -m644 contrib/i2pd.conf -t "${pkgdir}/etc/i2pd"
+ install -D -m644 contrib/tunnels.conf -t "${pkgdir}/etc/i2pd"
+ install -d -m755 "${pkgdir}/etc/i2pd/tunnels.d"
+
+ # certificates
+ while read -r -d '' _file
+ do
+ _dir="${_file#contrib/certificates}"
+ _dir="${_dir%/*}"
+ install -D -m644 "$_file" -t "${pkgdir}/usr/share/i2pd/certificates/${_dir}"
+ done < <(find contrib/certificates -type f -print0)
+
+ # systemd
+ install -D -m644 contrib/i2pd.service -t "${pkgdir}/usr/lib/systemd/system"
+ 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"
+
+ # tunnels.d examples
+ install -D -m644 contrib/tunnels.d/README -t "${pkgdir}/usr/share/doc/${pkgname}/tunnels.d"
+ 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"
+
+ # man page
+ install -D -m644 debian/i2pd.1 -t "${pkgdir}/usr/share/man/man1"
+
+ # license
+ install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
Copied: i2pd/repos/community-staging-x86_64/i2pd.sysusers (from rev 557041, i2pd/trunk/i2pd.sysusers)
===================================================================
--- community-staging-x86_64/i2pd.sysusers (rev 0)
+++ community-staging-x86_64/i2pd.sysusers 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1 @@
+u i2pd - "i2pd user" /var/lib/i2pd -
Copied: i2pd/repos/community-staging-x86_64/i2pd.tmpfiles (from rev 557041, i2pd/trunk/i2pd.tmpfiles)
===================================================================
--- community-staging-x86_64/i2pd.tmpfiles (rev 0)
+++ community-staging-x86_64/i2pd.tmpfiles 2020-01-28 02:58:12 UTC (rev 557042)
@@ -0,0 +1,6 @@
+d /var/lib/i2pd 0700 i2pd i2pd - - -
+d /var/log/i2pd 0700 i2pd i2pd - - -
+L /var/lib/i2pd/i2pd.conf - - - - /etc/i2pd/i2pd.conf
+L /var/lib/i2pd/tunnels.d - - - - /etc/i2pd/tunnels.d
+L /var/lib/i2pd/tunnels.conf - - - - /etc/i2pd/tunnels.conf
+L /var/lib/i2pd/certificates - - - - /usr/share/i2pd/certificates
More information about the arch-commits
mailing list