From 7d007b34db8516c7f6b2ad75a1e179954ccc51ac Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 23 Nov 2011 19:19:48 +0000 Subject: Replace original patch with the version accepted upstream Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-util/monodevelop-database/Manifest | 26 ++----- dev-util/valgrind/ChangeLog | 9 ++- dev-util/valgrind/Manifest | 12 +-- .../files/valgrind-3.7.0-fix-gcc-regex.patch | 39 ++++++++-- dev-util/valgrind/valgrind-3.7.0-r1.ebuild | 85 ++++++++++++++++++++++ dev-util/valgrind/valgrind-3.7.0.ebuild | 85 ---------------------- 6 files changed, 138 insertions(+), 118 deletions(-) create mode 100644 dev-util/valgrind/valgrind-3.7.0-r1.ebuild delete mode 100644 dev-util/valgrind/valgrind-3.7.0.ebuild (limited to 'dev-util') diff --git a/dev-util/monodevelop-database/Manifest b/dev-util/monodevelop-database/Manifest index eb81e8c07788..4311ce5ed570 100644 --- a/dev-util/monodevelop-database/Manifest +++ b/dev-util/monodevelop-database/Manifest @@ -1,26 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 -DIST monodevelop-database-2.4.tar.bz2 416904 RMD160 cebbfb01b4de7cd2824cf1f4f2bca63f0dcfd507 SHA1 7b41d6715ac0a1d14b36f1038439f141dab95f85 SHA256 091daf30bc44f0d361418e709d800f1fe4c3a0e63657f139e209f9886bc78c5e DIST monodevelop-database-2.6.tar.gz 581632 RMD160 a9574e0f709d1f50331f6841702ce9c6d8bf1a4f SHA1 90b4f65c537fbd43d3cd68872e86812974b34659 SHA256 bb14cb9c8d9c73a12f14d3788a09b17b4765073335e83f920ec84718ba6c8ce8 -EBUILD monodevelop-database-2.4.ebuild 893 RMD160 93f33048e7b1cb40f0f276a0b6923d2760ba4a81 SHA1 ceec30608ae06746519c1775d8409ff73c5b3477 SHA256 30b55c45728eadd3c3c1cffb9e0a025c52e29c4076e26e15223bbf4cc5a076d9 +DIST monodevelop-database-2.8.2.tar.bz2 434910 RMD160 cca4a229c061c506f282c4b84d07112d5bbc27a1 SHA1 1e61ddd953fd8c267848037c7f641e07c47e9ff5 SHA256 3d7f89343a4ffa78333403ea004481fe443b5abb184ab9805fa3a5194a01f017 EBUILD monodevelop-database-2.6.ebuild 829 RMD160 e8c15e0821825bb7d5c9452f804059d1bb5647c3 SHA1 f6f82e68c4424d054a72d8b43b7be5be47246408 SHA256 ab35d8f45ac73e8c2190dd37c980bab58882ae1b6aa0e26dc6a41d9283df2739 -MISC ChangeLog 3243 RMD160 dd242431e49551f747618f06da8bff3017cbba37 SHA1 bcaf907736c7561629e0bfb75e3a6de2241fad33 SHA256 ec378842d4299596595eb3428138d2150eb9ab24aae62ab110cb3da9eb8b5459 +EBUILD monodevelop-database-2.8.2.ebuild 784 RMD160 f4513723f86988ea72a14a3e779ad7034dacd884 SHA1 a27605a706aae97630892b83e2a2b7eb6a50d677 SHA256 20e5f08e315636c22d55d8202dca225d642f8adf3d5cb11ddef2705017245edf +MISC ChangeLog 3430 RMD160 277b167a3b76137f231ac97db8f3a3ca5bd63c39 SHA1 61bf198af2850e2f4a99c5ab2b9ded0c659719a0 SHA256 5ab8d17995700419d273b52e85a424fbd07afc57b9889f0012a214631e6a6c9f MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOtSrOAAoJEPqDWhW0r/LCyIAQAKQJgMeUbtkY+GJJ1JDBlIUF -Y4eu9rnd09rsmOwBPzVZYqy3p+PT9d3mSHOhodA5t1UXMpGO/xgFhKBoZj7Ns5Gy -WvfSVSIWMWD7xgI6Zth+S0EeCPL7A8Jj9MtVcy1qhKRavtVvsUmE3g3wyHYrCGLm -kX721zAAp/7sycjePo/2vyCZv52GaDUBC55VdDgurgnnjLCBAUtmYti0F9oScqAz -KmT3AhNn2aWJq1g8AkyF0Z3EmxnFhjRTHL/epalptJ3lUqGzrnR1NwfCqcU+kkJB -ZBHB4bh208oPTCXWhPJy+5WPOxzyIJwzRKp1rdBLlyrNOSqlsp0dfqYnkqvOopfP -6sp0pPdOdX42J3T8s++g7Gc3OdquEg0N6vViq3zre3lvg/TPbAkaIvnbkDL0ld6x -AP9rlkRxTvLCqc1YzFk0rRen5knZy8RO/ZtvQODVdR9EMXkg9R+s300C4WF917h7 -dknunII39m5i1Rkppb6KSr14OJnNjlVJ93Pc8l+JSSQyGJ0ek0oxuncqNLKDOeuf -Ctz/I078UT4TYEoG/BcC4fgOOogNYEj3ZudEfVVe2Hl+/VKOiJ2O7EAvOdux8uPv -5ucXI5tylyfPdjHJpwum07KML3mD3hrccnXIavTfLTpwnEHz16wriZCouJV98MQf -aZwWLe0sjivh48MR661N -=eLN4 +iEYEARECAAYFAk7NR6MACgkQCaWpQKGI+9T+wwCdFJrgEgz1bTbho8l6hcdWqVBJ +OyQAn2eFUe8V5BsPK/MYtues6W1fVAC8 +=cJnG -----END PGP SIGNATURE----- diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog index 3f455db9bef8..1f29e062cda7 100644 --- a/dev-util/valgrind/ChangeLog +++ b/dev-util/valgrind/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/valgrind # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.130 2011/11/11 01:40:06 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.131 2011/11/23 19:19:48 blueness Exp $ + +*valgrind-3.7.0-r1 (23 Nov 2011) + + 23 Nov 2011; Anthony G. Basile -valgrind-3.7.0.ebuild, + +valgrind-3.7.0-r1.ebuild, files/valgrind-3.7.0-fix-gcc-regex.patch: + Replace original patch with the version accepted upstream + https://bugs.kde.org/show_bug.cgi?id=286384 *valgrind-3.7.0 (11 Nov 2011) diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 78177affb083..a3b77b94e571 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -22,7 +22,7 @@ AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458b AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5 AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582 AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217 -AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1 +AUX valgrind-3.7.0-fix-gcc-regex.patch 1723 RMD160 f4fdc113f58d7151315f6a65a262471d4f8a75db SHA1 7ed537bcc935a40001a3d11fbff353e9cee342d5 SHA256 3a587d7dcc1ed447cc006cfef0cfb3597f17c96ac8adc7adbdc14d313a1d6852 AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479 AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751 AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019 @@ -44,13 +44,13 @@ EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b EBUILD valgrind-3.6.1-r1.ebuild 3178 RMD160 a03c893ce8f98cea7edd092ec7edda616865a705 SHA1 e69f76d0df29f2fec61f4bff952bb5eac8d1a5f1 SHA256 4e9205aa4f2d69d5b3680da1f821add903c28af49e7317570f0fa863b4896d1c EBUILD valgrind-3.6.1-r2.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858 EBUILD valgrind-3.6.1.ebuild 3068 RMD160 5ae01b6484705ad9c7e7bf7e888a355054e6e4c2 SHA1 bcf3c5107a61fbfabbee441d3a304a9ffad8f672 SHA256 93eea5c2c81b7b92ba250706bec21d21575a88c5d426b37096409772119f4e0f -EBUILD valgrind-3.7.0.ebuild 2717 RMD160 91d54ff7700b5ee4e7152ca20ae1632c82ae3861 SHA1 6f6569e361abb436746dd15d33907007ac9aa33a SHA256 e69e1f2c83950236ade1490886cfe1991e116f82f45adb5a6e84f849028104c6 -MISC ChangeLog 21621 RMD160 ec66aa7d4d1d6f1d010e7f3b2671b8d52a8a70d8 SHA1 05fdb4784fad96b253cacca993ddda1b96f7d2c0 SHA256 bb8e73f626cfe693111020924bae70b81a8fe54642f7b11a1c66e439f8731d9d +EBUILD valgrind-3.7.0-r1.ebuild 2720 RMD160 4d4a707fac4c62a68d3de02ac44e23b8f641a4e1 SHA1 6283fed760b8fcd3391639e0cc8d92d398b110f6 SHA256 93b9f2dc0f5b24f17b4ae070740641b03de1d02b38f9a1bc808e660d31deea94 +MISC ChangeLog 21912 RMD160 656a40ea76a17092667bc7ff87ca0dae36758ee3 SHA1 ae4ed1fef24d8d39be43ee53d6cc4af37d994926 SHA256 da7722a27734f11bafa77a5473749e1dc6c6da51d341a5cc5c9ada1dad0790de MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk68fQEACgkQl5yvQNBFVTVBYQCfVcoS1qlqt0H2zNo4/vVfI7ZV -AJ0An3nbMV+tQPciRFI3Vj4p4sIcr01q -=5WHT +iEYEAREIAAYFAk7NR18ACgkQl5yvQNBFVTXQcgCfaJZg070dBFNHSmhSs6nQUxAf +cM4An2xNI2FFbYra1zGHWTY1bU43dAR6 +=6dbN -----END PGP SIGNATURE----- diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch index 3233333ce1b9..feabf069354a 100644 --- a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch +++ b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch @@ -1,12 +1,35 @@ -diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in ---- valgrind-3.7.0.orig//configure.in 2011-11-05 07:13:30.000000000 -0400 -+++ valgrind-3.7.0/configure.in 2011-11-10 18:13:39.000000000 -0500 -@@ -109,7 +109,7 @@ - | head -n 1 \ - | $SED 's/i686-apple-darwin10//' \ - | $SED 's/i686-apple-darwin11//' \ +Index: configure.in +=================================================================== +--- configure.in (revision 12273) ++++ configure.in (revision 12274) +@@ -98,18 +98,21 @@ + # We don't want gcc < 3.0 + AC_MSG_CHECKING([for a supported version of gcc]) + +-# Try to get the gcc version, sed-ing out some unexpected stuff +-# that appears with the default gcc on OSX 10.6 and 10.7 respectively. +-# Without this, the version number comes out as 686, 10 or 11 :-( ++# Obtain the compiler version. + # +-# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) +-# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) ++# A few examples of how the ${CC} --version output looks like: + # ++# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2 ++# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2 ++# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585] ++# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2 ++# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) ++# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) ++# Clang: clang version 2.9 (tags/RELEASE_29/final) ++# + [gcc_version=`${CC} --version \ +- | head -n 1 \ +- | $SED 's/i686-apple-darwin10//' \ +- | $SED 's/i686-apple-darwin11//' \ - | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`] -+ | $SED 's/.*\s\([.0-9]*\)$/\1/'`] ++ | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \ ++ -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`] is_clang="notclang" if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then diff --git a/dev-util/valgrind/valgrind-3.7.0-r1.ebuild b/dev-util/valgrind/valgrind-3.7.0-r1.ebuild new file mode 100644 index 000000000000..dad752a9c226 --- /dev/null +++ b/dev-util/valgrind/valgrind-3.7.0-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r1.ebuild,v 1.1 2011/11/23 19:19:48 blueness Exp $ + +EAPI=4 +inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils + +DESCRIPTION="An open-source memory debugger for GNU/Linux" +HOMEPAGE="http://www.valgrind.org" +SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="mpi" + +DEPEND="mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +src_prepare() { + # Correct hard coded doc location + sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die + + # Respect CFLAGS, LDFLAGS + epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch + + # Changing Makefile.all.am to disable SSP + epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch + + # Yet more local labels, this time for ppc32 & ppc64 + epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch + + # Don't build in empty assembly files for other platforms or we'll get a QA + # warning about executable stacks. + epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch + + # Fix the regex to get gcc's version + epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch + + # Regenerate autotools files + eautoreconf +} + +src_configure() { + local myconf + + # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression" + # while compiling insn_sse.c in none/tests/x86 + # -fpie valgrind seemingly hangs when built with pie on + # amd64 (bug #102157) + # -fstack-protector more undefined references to __guard and __stack_smash_handler + # because valgrind doesn't link to glibc (bug #114347) + # -ggdb3 segmentation fault on startup + filter-flags -fomit-frame-pointer + filter-flags -fpie + filter-flags -fstack-protector + replace-flags -ggdb3 -ggdb2 + + if use amd64 || use ppc64; then + ! has_multilib_profile && myconf="${myconf} --enable-only64bit" + fi + + # Don't use mpicc unless the user asked for it (bug #258832) + if ! use mpi; then + myconf="${myconf} --without-mpicc" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS FAQ.txt NEWS README* + + pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux +} + +pkg_postinst() { + ewarn "Valgrind will not work if glibc does not have debug symbols." + ewarn "To fix this you can add splitdebug to FEATURES in make.conf" + ewarn "and remerge glibc. See:" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703" +} diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild deleted file mode 100644 index 5f5f18241da3..000000000000 --- a/dev-util/valgrind/valgrind-3.7.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0.ebuild,v 1.1 2011/11/11 01:40:06 blueness Exp $ - -EAPI=4 -inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils - -DESCRIPTION="An open-source memory debugger for GNU/Linux" -HOMEPAGE="http://www.valgrind.org" -SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="mpi" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -src_prepare() { - # Correct hard coded doc location - sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die - - # Respect CFLAGS, LDFLAGS - epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - - # Changing Makefile.all.am to disable SSP - epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch - - # Yet more local labels, this time for ppc32 & ppc64 - epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch - - # Don't build in empty assembly files for other platforms or we'll get a QA - # warning about executable stacks. - epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch - - # Fix the regex to get gcc's version - epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch - - # Regenerate autotools files - eautoreconf -} - -src_configure() { - local myconf - - # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression" - # while compiling insn_sse.c in none/tests/x86 - # -fpie valgrind seemingly hangs when built with pie on - # amd64 (bug #102157) - # -fstack-protector more undefined references to __guard and __stack_smash_handler - # because valgrind doesn't link to glibc (bug #114347) - # -ggdb3 segmentation fault on startup - filter-flags -fomit-frame-pointer - filter-flags -fpie - filter-flags -fstack-protector - replace-flags -ggdb3 -ggdb2 - - if use amd64 || use ppc64; then - ! has_multilib_profile && myconf="${myconf} --enable-only64bit" - fi - - # Don't use mpicc unless the user asked for it (bug #258832) - if ! use mpi; then - myconf="${myconf} --without-mpicc" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS FAQ.txt NEWS README* - - pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux -} - -pkg_postinst() { - ewarn "Valgrind will not work if glibc does not have debug symbols." - ewarn "To fix this you can add splitdebug to FEATURES in make.conf" - ewarn "and remerge glibc. See:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703" -} -- cgit v1.2.3-65-gdbad