From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- app-crypt/tpm2-tss/Manifest | 9 +- ...igure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch | 53 ------------ ...4.2-Dont-run-systemd-sysusers-in-Makefile.patch | 15 ---- app-crypt/tpm2-tss/metadata.xml | 1 - app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild | 78 ------------------ app-crypt/tpm2-tss/tpm2-tss-3.1.1.ebuild | 94 +++++++++++++++++++++ app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild | 95 ++++++++++++++++++++++ 7 files changed, 193 insertions(+), 152 deletions(-) delete mode 100644 app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch delete mode 100644 app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch delete mode 100644 app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild create mode 100644 app-crypt/tpm2-tss/tpm2-tss-3.1.1.ebuild create mode 100644 app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild (limited to 'app-crypt/tpm2-tss') diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest index 53e0c825241f..ad05338f021c 100644 --- a/app-crypt/tpm2-tss/Manifest +++ b/app-crypt/tpm2-tss/Manifest @@ -1,10 +1,9 @@ -AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2 -AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745 AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1005626205d440fabda7f88444b0eef344df8f6ead5716807bcbaf490e7b24afc12580ae25c506fcc45dfb4bac0789d9b897dfcaae943c6ba9795b2f4f1d8 SHA512 adbff50c66a22659b563344c216d60bb80951016c3d7180c07c0498c285c9099a60e5573ed0ce29c7732de28d4c390b8eac16bf695c739d0c614dd344f1bfb46 -DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405 +DIST tpm2-tss-3.1.1.tar.gz 1592495 BLAKE2B 0f021516700ca14a1c987d7078f1402eb2a6e2f7fc325df3ace3bd9104fe5a2211aa335af0b7f05f5e0d8c2038e0033ba498551021fa2fb5947c213813ef8796 SHA512 3010a32be2d41c2f2e06c2b745a18b3f36aaa0aec7568361902deed26779e8f76c84076ceb2a9447df8194cfc9d3b50116b7311d51d83d63037dbdca60c1384e DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23 -EBUILD tpm2-tss-2.4.6.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5 EBUILD tpm2-tss-3.1.0.ebuild 1730 BLAKE2B e240c1e2dbe8ec07ea76f3106b4193ed07c59c69b769259529579838500d2b8431119116fa03ee8b712778c59c8aaca680c4a20462a76deef81e7a19387b2f35 SHA512 1856795cde9db35aa62dbe81872c7b01c62f5383927b0f7f5dcad7f19cd4d92885eacebcec3a56e9e1389a57f5548a2dba7f52d11afc4080840ada1e3b924e01 +EBUILD tpm2-tss-3.1.1.ebuild 2463 BLAKE2B 8a7f65df052be128b54178a82eabd3d1374364e2cb779497fb306162a82cfda23656bafb5cbd86a4e12df0356b18701bcbe0290b6d73ff22fbd765f138d69429 SHA512 f1ac1ecb7cccdae3076e536a6bc08693221cf4ac1f1ecc2b43450a7a6502d31c2b91ef2d380ce485e4fdd19029e89bed29ea13e37af9d2c3b188061572597c56 EBUILD tpm2-tss-3.2.0-r2.ebuild 2493 BLAKE2B 9f027015cc2bd37f220f0628a419985cde67cebbc910a7515c7a5498fc42588fbfc56c389effeed688e02d870e0fe033b06cbeafaaa4968c580ed75045e94b3d SHA512 51e754e89e83e6d9877b3715d7331fa39b4bc71d305f16ba7afb33d17bf4545d8b79789bdf5777ef5e74bac968364320c5cb7b991eb5c1117ac9d9c1a338b3e8 -MISC metadata.xml 827 BLAKE2B d771c64e37ccd09adbf4c40c412b744b1fdecc5497116e1fb5518f26921195a9141710f4e4d8daaabe6fb9076719bf87c088665fcd6d037d4875bfa761f9bcb6 SHA512 9b1fb93de976edafed96599a093aa4f8058d2542b6dd9be0fb2de5849f77394f2e17b6f4397c14b1dc13b679fb91c38c7852cfaed37908d4c0a2f216a56c659c +EBUILD tpm2-tss-3.2.0-r3.ebuild 2508 BLAKE2B 351f163b26b452cdffeca84245826c29eace7e48b1eab6e08d2625e94f2e83227a6cabe15de4d7a2d43f684766d0537a174f090ed50f68d1490e39223e1dcbde SHA512 23fa5d59d93ef7d593a788a2bab0db22582746f4004c9b7106b0af715eb6dd4d3ab63f5187cf974c7fefb1021dfde21066cc39d86dafaa498269bcf831d8f5e1 +MISC metadata.xml 747 BLAKE2B 0462c5942012c444e13bf094be03e0cc142b3b5e3e613570506f84be45bb3019876f3f44454b078668c7e3cbd4a60819cd2ea57c588cab34bfe82f76f222bcf8 SHA512 dab6f379190e40b0321597f0c5fa03ee5731eb77e91dc5d82d2f57c896cf40a074598ba1dedd1575e4e23e1fc5ed306f83cb50992fca6cc2bc1a1db822765a7a diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch deleted file mode 100644 index 111c3d75c690..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 94cc338b0c5b97702e994ec628d684ee2c114547 Mon Sep 17 00:00:00 2001 -From: Tadeusz Struk -Date: Tue, 24 Mar 2020 16:42:14 -0700 -Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces - -PKG_CHECK_MODULES needs to be wrapped inside squere -brackets when inside AS_IF, or it spit out errors: - -./configure: line 13054: JSONC_CFLAGS: command not found -./configure: line 13055: C: command not found -./configure: line 13056: JSONC_LIBS: command not found -./configure: line 13155: CURL_CFLAGS: command not found -./configure: line 13156: CURL_LIBS: command not found - -Signed-off-by: Tadeusz Struk ---- - Makefile.am | 2 +- - configure.ac | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 85683f9b..9144a5ad 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD = $(libtss2_sys) $(libtss2_mu) $(libtss2_e - - src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC) - src_tss2_fapi_libtss2_fapi_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi --src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS) -+src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS) - if HAVE_LD_VERSION_SCRIPT - src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map - endif # HAVE_LD_VERSION_SCRIPT -diff --git a/configure.ac b/configure.ac -index a202d4a6..2edf609e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"], - AC_MSG_ERROR([FAPI has to be compiled with OpenSSL])) - - AS_IF([test "x$enable_fapi" = xyes ], -- PKG_CHECK_MODULES([JSON_C], [json-c])) -+ [PKG_CHECK_MODULES([JSONC], [json-c])]) - - AS_IF([test "x$enable_fapi" = xyes ], -- PKG_CHECK_MODULES([CURL], [libcurl])) -+ [PKG_CHECK_MODULES([CURL], [libcurl])]) - - AC_ARG_WITH([tctidefaultmodule], - [AS_HELP_STRING([--with-tctidefaultmodule], --- -2.26.2 - diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch deleted file mode 100644 index c37a73531c02..000000000000 --- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 322415b8..39e09063 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -602,10 +602,6 @@ endif #FAPI - EXTRA_DIST += dist/tpm-udev.rules - - install-dirs: --if HOSTOS_LINUX -- (systemd-sysusers && systemd-tmpfiles --create) || \ -- ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true --endif - - install-data-hook: install-dirs - -if [ ! -z "$(udevrulesprefix)" ]; then \ diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml index 42f4f7e8b1bd..0a726fa2d171 100644 --- a/app-crypt/tpm2-tss/metadata.xml +++ b/app-crypt/tpm2-tss/metadata.xml @@ -11,7 +11,6 @@ Enable feature API (requires openssl as crypto backend) - Use dev-libs/libgcrypt as crypto engine Use net-libs/mbedtls as crypto engine Use dev-libs/openssl as crypto engine diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild deleted file mode 100644 index 2db31aefd06e..000000000000 --- a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info tmpfiles udev - -DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" -HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" -SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc64 x86" -IUSE="doc +fapi gcrypt +openssl static-libs test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="^^ ( gcrypt openssl ) - fapi? ( openssl !gcrypt )" - -RDEPEND="acct-group/tss - acct-user/tss - fapi? ( - dev-libs/json-c - net-misc/curl - ) - gcrypt? ( dev-libs/libgcrypt:0= ) - openssl? ( dev-libs/openssl:0= )" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch" - "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch" -) - -pkg_setup() { - local CONFIG_CHECK=" \ - ~TCG_TPM - " - linux-info_pkg_setup - kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --localstatedir=/var \ - $(use_enable doc doxygen-doc) \ - $(use_enable fapi) \ - $(use_enable static-libs static) \ - $(use_enable test unit) \ - --disable-tcti-mssim \ - --disable-defaultflags \ - --disable-weakcrypto \ - --with-crypto="$(usex gcrypt gcrypt ossl)" \ - --with-runstatedir=/run \ - --with-udevrulesdir="$(get_udevdir)/rules.d" \ - --with-udevrulesprefix=60- \ - --with-sysusersdir="/usr/lib/sysusers.d" \ - --with-tmpfilesdir="/usr/lib/tmpfiles.d" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process tpm2-tss-fapi.conf -} diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.1.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.1.1.ebuild new file mode 100644 index 000000000000..7d2a404b0018 --- /dev/null +++ b/app-crypt/tpm2-tss/tpm2-tss-3.1.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info multilib-minimal tmpfiles udev + +DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" +HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" +SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc +fapi +openssl mbedtls static-libs test" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="^^ ( mbedtls openssl ) + fapi? ( openssl !mbedtls )" + +RDEPEND="acct-group/tss + acct-user/tss + fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) + openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )" + +DEPEND="${RDEPEND} + test? ( app-crypt/swtpm + dev-libs/uthash + dev-util/cmocka + fapi? ( net-misc/curl ) )" +BDEPEND="sys-apps/acl + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch" +) + +pkg_setup() { + local CONFIG_CHECK=" \ + ~TCG_TPM + " + linux-info_pkg_setup + kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" +} + +src_prepare() { + default + + # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version. + sed -i \ + "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \ + "configure.ac" || die + + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf \ + --localstatedir=/var \ + $(use_enable doc doxygen-doc) \ + $(use_enable fapi) \ + $(use_enable static-libs static) \ + $(multilib_native_use_enable test unit) \ + $(multilib_native_use_enable test integration) \ + $(multilib_native_use_enable test self-generated-certificate) \ + --disable-defaultflags \ + --disable-weakcrypto \ + --with-crypto="$(usex mbedtls mbed ossl)" \ + --with-runstatedir=/run \ + --with-udevrulesdir="$(get_udevdir)/rules.d" \ + --with-udevrulesprefix=60- \ + --with-sysusersdir="/usr/lib/sysusers.d" \ + --with-tmpfilesdir="/usr/lib/tmpfiles.d" +} + +multilib_src_install() { + default + + if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then + # Safeguard for bug #833887 + die "pkg-config file version doesn't match ${PV}! Please report a bug!" + fi + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + tmpfiles_process tpm2-tss-fapi.conf + udev_reload +} diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild new file mode 100644 index 000000000000..76e430b121d9 --- /dev/null +++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info multilib-minimal tmpfiles udev + +DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack" +HOMEPAGE="https://github.com/tpm2-software/tpm2-tss" +SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc +fapi +openssl mbedtls static-libs test" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="^^ ( mbedtls openssl ) + fapi? ( openssl !mbedtls )" + +RDEPEND="acct-group/tss + acct-user/tss + fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}] + >=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] ) + mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) + openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )" + +DEPEND="${RDEPEND} + test? ( app-crypt/swtpm + dev-libs/uthash + dev-util/cmocka + fapi? ( >=net-misc/curl-7.80.0 ) )" +BDEPEND="sys-apps/acl + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch" +) + +pkg_setup() { + local CONFIG_CHECK=" \ + ~TCG_TPM + " + linux-info_pkg_setup + kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required" +} + +src_prepare() { + default + + # See bug #833887 (and similar); eautoreconf means .pc file gets wrong version. + sed -i \ + "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \ + "configure.ac" || die + + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf \ + --localstatedir=/var \ + $(use_enable doc doxygen-doc) \ + $(use_enable fapi) \ + $(use_enable static-libs static) \ + $(multilib_native_use_enable test unit) \ + $(multilib_native_use_enable test integration) \ + $(multilib_native_use_enable test self-generated-certificate) \ + --disable-tcti-libtpms \ + --disable-defaultflags \ + --disable-weakcrypto \ + --with-crypto="$(usex mbedtls mbed ossl)" \ + --with-runstatedir=/run \ + --with-udevrulesdir="$(get_udevdir)/rules.d" \ + --with-udevrulesprefix=60- \ + --with-sysusersdir="/usr/lib/sysusers.d" \ + --with-tmpfilesdir="/usr/lib/tmpfiles.d" +} + +multilib_src_install() { + default + + if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then + # Safeguard for bug #833887 + die "pkg-config file version doesn't match ${PV}! Please report a bug!" + fi + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + tmpfiles_process tpm2-tss-fapi.conf + udev_reload +} -- cgit v1.2.3