From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- dev-libs/libverto/Manifest | 11 +-- dev-libs/libverto/files/libverto-Wflags.patch | 25 +++++++ dev-libs/libverto/files/libverto-libev-c89.patch | 15 +++++ dev-libs/libverto/files/libverto-load.patch | 78 ++++++++++++++++++++++ .../libverto/files/libverto-verify-cflags.patch | 26 ++++++++ dev-libs/libverto/libverto-0.2.5-r1.ebuild | 6 +- dev-libs/libverto/libverto-0.2.5.ebuild | 51 -------------- dev-libs/libverto/libverto-0.2.6.ebuild | 51 -------------- dev-libs/libverto/libverto-0.3.0.ebuild | 60 +++++++++++++++++ 9 files changed, 214 insertions(+), 109 deletions(-) create mode 100644 dev-libs/libverto/files/libverto-Wflags.patch create mode 100644 dev-libs/libverto/files/libverto-libev-c89.patch create mode 100644 dev-libs/libverto/files/libverto-load.patch create mode 100644 dev-libs/libverto/files/libverto-verify-cflags.patch delete mode 100644 dev-libs/libverto/libverto-0.2.5.ebuild delete mode 100644 dev-libs/libverto/libverto-0.2.6.ebuild create mode 100644 dev-libs/libverto/libverto-0.3.0.ebuild (limited to 'dev-libs/libverto') diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest index ef00ddc0b432..70b59bf11c20 100644 --- a/dev-libs/libverto/Manifest +++ b/dev-libs/libverto/Manifest @@ -1,6 +1,9 @@ +AUX libverto-Wflags.patch 800 BLAKE2B c933153042d1d66dd41e4cd307a6e1c6ac96c77d147e0574b35e75dfab5e42278e73177648e49524ce22b3da3829b92a69cb79d8349eeb883780da086de41c04 SHA512 c8e05cfdf7537624b844731e3bf595765641745ce18d88ac4e1cceb80f6ae6bb1a97480bdac50f7d222b334e7226a495c5bbe33d6d537dc8d79ca825fd90fb52 +AUX libverto-libev-c89.patch 392 BLAKE2B 265d2d37db847cfbd495d26ea7ce93e7fa244960c99f4758a7b6a6c7d315b84788def5a0254a80f0ece1b2ca08b188da8e215d2bdaa672796aa98740c1051ab1 SHA512 a9e1cf3206f350ecb7acd1b77417d2cea387396ac7dd68e30fd3b0ad097a677bee4d6735e8fb9abe95ed2758206e226bb85e002a5a9974865b87f8b01d59b619 +AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88cf5fbd0d47360a660e0a29927d17dbfe47afbd0c72404843f3847466f199e0d865de4f3856f3fb133878c8 SHA512 caa4d4d3be591e9e025f7a75e1cb20190469888c35563b332244a7c6a0191147888a19415ca3fe33171336e4b7361c3dc75d62e1c60380892452c13c0e1b8490 +AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e -DIST libverto-0.2.6.tar.gz 352690 BLAKE2B b1610fd7c64fff31d46640ef10fd895f9ce2f0d1d4fd4ac205f2ec5f519f695c8ec82da8b9539c28c0d087bfd3664101192010ee59a9632f09b3ed92e52c1054 SHA512 aa8d047501d28741f2f8185fc4a0ef6dc4b99dbe69b583c40cd4c0afc97db4dd0a928d9ec23861fff61651e9ac82e52da9473b8e62ccc11a91e5e5c6b41dfd3b -EBUILD libverto-0.2.5-r1.ebuild 1499 BLAKE2B a97d265fcde7e10561922e65cd82e996a1db10b9610343bf98eca138220770ea3d171a98ea9fa0c198f4748219f96e3faaf73171c8cd73e41178cb234bf48bb1 SHA512 b0857b0ad06148bf06d019cdb333bdb00844fa183dbe80a317b945330ed3fdf77dcc46bbad247a5bf7055e2abb0d7560450b9f707e6ff6d56013242f700df34e -EBUILD libverto-0.2.5.ebuild 1370 BLAKE2B 90b0ceacf5ad29c383436ef3bf297edf9ea185bf0912727ad9f5509dd40c0f7f8b5e46c36c2d9667924617211f6e0064946283a591b0ce085abad17e6bd8e8ed SHA512 322710aac677120e167565e02ed2b6685cf88338ca9d28767c0181fba68de44f78f20dc15571f62ff98ec81775c210931b3ed543cd427ffaaf3a4aa8576c5fe3 -EBUILD libverto-0.2.6.ebuild 1509 BLAKE2B fc4a2ae5eb631f867e0cad789fe6052abc4096f776a3774eb622dbc43f33a1d3dc944df16113cf50878fb06237e430462518b3ea8420110f061f34e1f0b89af2 SHA512 0e33abd39d5fe51f523b3a2739a2b0be8126eafe3d8aa048a343d10545bc53b53c6adab93f9012616c4199c3f3e2ff7f55b4996716656eb514edd65caf776544 +DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f +EBUILD libverto-0.2.5-r1.ebuild 1513 BLAKE2B 751d2c63ba2794894bfdeea87513e514d5092c556f61454d65ac65ecaae830470563aa1d67ccb53ddef9efff58bf2677929e4d20c9edbf26a13b51f8929d4d44 SHA512 7bc75b511a82cb5fcd41be4515ababeaaf23b8cce57b924ede667c9291aac100592842c1dee55ec7d6ab7ccca8cd0c9c90c3b5924aa788bae9802650fddd7f2c +EBUILD libverto-0.3.0.ebuild 1737 BLAKE2B 7630b8cabb87827838e7366e0b3fdc047eebb91a380e17b1ddda7b71fcb280fcc0bd8ad5559ac150a16e73154c270540762179ff6c9b5fd09bc95181d932f9df SHA512 f13a3ea85ee2fa92ac49315c4fcc70c19340706505062b027c06d90f7c32ecd30d53dc2cf6fbee12913d7a55f72238f05807cda68fb17b71444f4c8f071956e7 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00 diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch new file mode 100644 index 000000000000..de403720dd62 --- /dev/null +++ b/dev-libs/libverto/files/libverto-Wflags.patch @@ -0,0 +1,25 @@ +From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Wed, 31 Jan 2018 18:21:04 +0100 +Subject: [PATCH] Turn off -Wcast-function-type + +The glib event library forces all callbacks to the same type, even +when they have different arities. Turn off the gcc warning for this +gross behavior. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4084965..dcab593 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], + + AC_PROG_CC_C99 + +-for flag in -Wall -Wextra; do ++for flag in -Wall -Wextra -Wno-cast-function-type; do + OLD_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $flag" + AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS]) diff --git a/dev-libs/libverto/files/libverto-libev-c89.patch b/dev-libs/libverto/files/libverto-libev-c89.patch new file mode 100644 index 000000000000..e63c032b0c89 --- /dev/null +++ b/dev-libs/libverto/files/libverto-libev-c89.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 09ee123..b7b5908 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], + [AC_USE_SYSTEM_EXTENSIONS], + [AC_GNU_SOURCE]) + +-AC_PROG_CC_C89 +-for flag in -std=c89 -Wall -Wextra; do ++AC_PROG_CC_C99 ++for flag in -Wall -Wextra; do + AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],) + done + diff --git a/dev-libs/libverto/files/libverto-load.patch b/dev-libs/libverto/files/libverto-load.patch new file mode 100644 index 000000000000..94dceac5d69c --- /dev/null +++ b/dev-libs/libverto/files/libverto-load.patch @@ -0,0 +1,78 @@ +From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Wed, 24 Oct 2018 16:57:11 -0400 +Subject: [PATCH] Fix rare leak of DSO in module_load + +--- + src/module.c | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/src/module.c b/src/module.c +index 1f1b7c9..0b59034 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -182,7 +182,7 @@ module_load(const char *filename, const char *symbname, + intdll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + #endif /* WIN32 */ + if (!intdll) +- return dllerror(); ++ goto fail; + + /* Get the module symbol */ + #ifdef WIN32 +@@ -190,16 +190,12 @@ module_load(const char *filename, const char *symbname, + #else /* WIN32 */ + intsym = dlsym(intdll, symbname); + #endif /* WIN32 */ +- if (!intsym) { +- module_close(intdll); +- return dllerror(); +- } ++ if (!intsym) ++ goto fail; + + /* Figure out whether or not to load this module */ +- if (!shouldload(intsym, misc, &interr)) { +- module_close(intdll); +- return interr; +- } ++ if (!shouldload(intsym, misc, &interr)) ++ goto fail; + + /* Re-open the module */ + module_close(intdll); +@@ -208,9 +204,8 @@ module_load(const char *filename, const char *symbname, + #else /* WIN32 */ + intdll = dlopen(filename, RTLD_NOW | RTLD_LOCAL); + #endif /* WIN32 */ +- if (!intdll) { +- return dllerror(); +- } ++ if (!intdll) ++ goto fail; + + /* Get the symbol again */ + #ifdef WIN32 +@@ -218,14 +213,18 @@ module_load(const char *filename, const char *symbname, + #else /* WIN32 */ + intsym = dlsym(intdll, symbname); + #endif /* WIN32 */ +- if (!intsym) { +- module_close(intdll); +- return dllerror(); +- } ++ if (!intsym) ++ goto fail; + + if (dll) + *dll = intdll; + if (symb) + *symb = intsym; + return NULL; ++ ++fail: ++ if (!interr) ++ interr = dllerror(); ++ module_close(intdll); ++ return interr; + } diff --git a/dev-libs/libverto/files/libverto-verify-cflags.patch b/dev-libs/libverto/files/libverto-verify-cflags.patch new file mode 100644 index 000000000000..dce747239dc7 --- /dev/null +++ b/dev-libs/libverto/files/libverto-verify-cflags.patch @@ -0,0 +1,26 @@ +From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Wed, 31 Jan 2018 17:52:39 +0100 +Subject: [PATCH] Verify flags prior to adding them to CFLAGS, not after + +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b7b5908..4084965 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,8 +8,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], + [AC_GNU_SOURCE]) + + AC_PROG_CC_C99 ++ + for flag in -Wall -Wextra; do +- AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],) ++ OLD_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $flag" ++ AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS]) + done + + AC_CANONICAL_SYSTEM diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild index 66e4198d03c0..1486d1ddb5e4 100644 --- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild +++ b/dev-libs/libverto/libverto-0.2.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,8 +6,8 @@ EAPI=5 inherit multilib-minimal DESCRIPTION="Main event loop abstraction library" -HOMEPAGE="https://fedorahosted.org/libverto/" -SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz" +HOMEPAGE="https://github.com/latchset/libverto/" +SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-libs/libverto/libverto-0.2.5.ebuild b/dev-libs/libverto/libverto-0.2.5.ebuild deleted file mode 100644 index 9e2921bdff40..000000000000 --- a/dev-libs/libverto/libverto-0.2.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Main event loop abstraction library" -HOMEPAGE="https://fedorahosted.org/libverto/" -SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd" -IUSE="glib +libev libevent tevent +threads static-libs" - -# file collisions -DEPEND="!=app-crypt/mit-krb5-1.10.1-r0 - !=app-crypt/mit-krb5-1.10.1-r1 - !=app-crypt/mit-krb5-1.10.1-r2 - glib? ( >=dev-libs/glib-2.29 ) - libev? ( >=dev-libs/libev-4.11 ) - libevent? ( >=dev-libs/libevent-2.0 ) - tevent? ( sys-libs/tevent )" - -RDEPEND="${DEPEND}" - -REQUIRED_USE="|| ( glib libev libevent tevent ) " - -src_prepare() { - # known problem uptream with tevent write test. tevent does not fire a - # callback on error, but we explicitly test for this behaviour. Do not run - # tevent tests for now. - sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die -} - -src_configure() { - econf \ - $(use_with glib) \ - $(use_with libev) \ - $(use_with libevent) \ - $(use_with tevent) \ - $(use_with threads pthread) \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS ChangeLog NEWS INSTALL README - - use static-libs || find "${D}" -name '*.la' -delete -} diff --git a/dev-libs/libverto/libverto-0.2.6.ebuild b/dev-libs/libverto/libverto-0.2.6.ebuild deleted file mode 100644 index 7e7972bdcb53..000000000000 --- a/dev-libs/libverto/libverto-0.2.6.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib-minimal - -DESCRIPTION="Main event loop abstraction library" -HOMEPAGE="https://fedorahosted.org/libverto/" -SRC_URI="https://fedorahosted.org/releases/l/i/libverto/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" -IUSE="glib +libev libevent tevent +threads static-libs" - -# file collisions -DEPEND="!=app-crypt/mit-krb5-1.10.1-r0 - !=app-crypt/mit-krb5-1.10.1-r1 - !=app-crypt/mit-krb5-1.10.1-r2 - glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) - libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] ) - tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )" - -RDEPEND="${DEPEND}" - -REQUIRED_USE="|| ( glib libev libevent tevent ) " - -src_prepare() { - # known problem uptream with tevent write test. tevent does not fire a - # callback on error, but we explicitly test for this behaviour. Do not run - # tevent tests for now. - sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - $(use_with glib) \ - $(use_with libev) \ - $(use_with libevent) \ - $(use_with tevent) \ - $(use_with threads pthread) \ - $(use_enable static-libs static) -} - -multilib_src_install_all() { - dodoc AUTHORS ChangeLog NEWS INSTALL README - use static-libs || prune_libtool_files --all -} diff --git a/dev-libs/libverto/libverto-0.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild new file mode 100644 index 000000000000..5ef09140c7af --- /dev/null +++ b/dev-libs/libverto/libverto-0.3.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="Main event loop abstraction library" +HOMEPAGE="https://github.com/latchset/libverto/" +SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" +IUSE="glib +libev libevent tevent +threads static-libs" + +# file collisions +DEPEND="!=app-crypt/mit-krb5-1.10.1-r0 + !=app-crypt/mit-krb5-1.10.1-r1 + !=app-crypt/mit-krb5-1.10.1-r2 + glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) + libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] ) + libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] ) + tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )" + +RDEPEND="${DEPEND}" + +REQUIRED_USE="|| ( glib libev libevent tevent ) " + +PATCHES=( "${FILESDIR}/${PN}-libev-c89.patch" \ + "${FILESDIR}/${PN}-verify-cflags.patch" \ + "${FILESDIR}/${PN}-Wflags.patch" \ + "${FILESDIR}/${PN}-load.patch" ) + +DOCS=( AUTHORS ChangeLog NEWS INSTALL README ) + +src_prepare() { + default + # known problem uptream with tevent write test. tevent does not fire a + # callback on error, but we explicitly test for this behaviour. Do not run + # tevent tests for now. + sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf \ + $(use_with glib) \ + $(use_with libev) \ + $(use_with libevent) \ + $(use_with tevent) \ + $(use_with threads pthread) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + default + use static-libs || find "${ED}" -name '*.la' -delete +} -- cgit v1.2.3