* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libverto/files/, dev-libs/libverto/
@ 2020-12-27 18:38 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-12-27 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 3c57696b76daca4c60e1fddc84a4bea3b0ab7551
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 18:38:45 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 18:38:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c57696b
dev-libs/libverto: cleanup old (EAPI 5)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libverto/Manifest | 2 -
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 | 51 --------------
dev-libs/libverto/libverto-0.3.0.ebuild | 60 -----------------
7 files changed, 257 deletions(-)
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 3bfbe654753..9aaab2bc48e 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -1,3 +1 @@
-DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
-DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch
deleted file mode 100644
index de403720dd6..00000000000
--- a/dev-libs/libverto/files/libverto-Wflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-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
deleted file mode 100644
index e63c032b0c8..00000000000
--- a/dev-libs/libverto/files/libverto-libev-c89.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 94dceac5d69..00000000000
--- a/dev-libs/libverto/files/libverto-load.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-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
deleted file mode 100644
index dce747239dc..00000000000
--- a/dev-libs/libverto/files/libverto-verify-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-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
deleted file mode 100644
index 12650e13dfb..00000000000
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit ltprune 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 sparc x86"
-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
deleted file mode 100644
index 7786a2f773c..00000000000
--- a/dev-libs/libverto/libverto-0.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 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 ~riscv ~s390 ~sparc ~x86"
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libverto/files/, dev-libs/libverto/
@ 2021-01-07 14:20 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-01-07 14:20 UTC (permalink / raw
To: gentoo-commits
commit: 1a720b41737ae88adc368418b296bcd26a0eb742
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 14:20:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 14:20:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a720b41
dev-libs/libverto: fix runtime breakage with non-bash
Thanks-to: Nick Bowler <nbowler <AT> draconx.ca>
Closes: https://bugs.gentoo.org/762823
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libverto/files/libverto-0.3.1-non-bash.patch | 133 +++++++++++++++++++++
...verto-0.3.1.ebuild => libverto-0.3.1-r1.ebuild} | 10 +-
2 files changed, 140 insertions(+), 3 deletions(-)
diff --git a/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch
new file mode 100644
index 00000000000..df7162e21a7
--- /dev/null
+++ b/dev-libs/libverto/files/libverto-0.3.1-non-bash.patch
@@ -0,0 +1,133 @@
+Strips bashisms from configure.ac causing breakage in net-nds/gssproxy
+https://bugs.gentoo.org/762823
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,22 +91,22 @@ AC_ARG_WITH([tevent],
+
+ # Ensure that if a builtin is chosen only one is built
+ BUILTIN_MODULE=
+-if test x$WITH_GLIB == xbuiltin; then
++if test x$WITH_GLIB = xbuiltin; then
+ BUILTIN_MODULE=glib
+ WITH_LIBEV=no
+ WITH_LIBEVENT=no
+ WITH_TEVENT=no
+-elif test x$WITH_LIBEV == xbuiltin; then
++elif test x$WITH_LIBEV = xbuiltin; then
+ BUILTIN_MODULE=libev
+ WITH_LIBGLIB=no
+ WITH_LIBEVENT=no
+ WITH_TEVENT=no
+-elif test x$WITH_LIBEVENT == xbuiltin; then
++elif test x$WITH_LIBEVENT = xbuiltin; then
+ BUILTIN_MODULE=libevent
+ WITH_LIBGLIB=no
+ WITH_LIBEV=no
+ WITH_TEVENT=no
+-elif test x$WITH_TEVENT == xbuiltin; then
++elif test x$WITH_TEVENT = xbuiltin; then
+ BUILTIN_MODULE=tevent
+ WITH_GLIB=no
+ WITH_LIBEV=no
+@@ -118,29 +118,29 @@ if test x$BUILTIN_MODULE != x; then
+ fi
+
+ # Ensure that there is only one default (convert duplicate default to yes)
+-if test x$WITH_GLIB == xdefault; then
++if test x$WITH_GLIB = xdefault; then
+ AC_DEFINE([DEFUALT_MODULE], [glib])
+- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
+- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
+- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes
++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes
+ fi
+-if test x$WITH_LIBEV == xdefault; then
++if test x$WITH_LIBEV = xdefault; then
+ AC_DEFINE([DEFUALT_MODULE], [libev])
+- test x$WITH_LIBGLIB == xdefault && WITH_GLIB=yes
+- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
+- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes
++ test x$WITH_LIBGLIB = xdefault && WITH_GLIB=yes
++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes
+ fi
+-if test x$WITH_LIBEVENT == xdefault; then
++if test x$WITH_LIBEVENT = xdefault; then
+ AC_DEFINE([DEFUALT_MODULE], [libevent])
+- test x$WITH_GLIB == xdefault && WITH_GLIB=yes
+- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
+- test x$WITH_TEVENT == xdefault && WITH_TEVENT=yes
++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes
++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
++ test x$WITH_TEVENT = xdefault && WITH_TEVENT=yes
+ fi
+-if test x$WITH_TEVENT == xdefault; then
++if test x$WITH_TEVENT = xdefault; then
+ AC_DEFINE([DEFUALT_MODULE], [tevent])
+- test x$WITH_GLIB == xdefault && WITH_GLIB=yes
+- test x$WITH_LIBEV == xdefault && WITH_LIBEV=yes
+- test x$WITH_LIBEVENT == xdefault && WITH_LIBEVENT=yes
++ test x$WITH_GLIB = xdefault && WITH_GLIB=yes
++ test x$WITH_LIBEV = xdefault && WITH_LIBEV=yes
++ test x$WITH_LIBEVENT = xdefault && WITH_LIBEVENT=yes
+ fi
+
+ BUILD_GLIB=no
+@@ -151,7 +151,7 @@ BUILD_TEVENT=no
+ if test x$WITH_GLIB != xno; then
+ PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB],
+ [test x$WITH_GLIB != xauto && AC_MSG_ERROR("glib not found")])
+- if test x$BUILD_GLIB == xauto; then
++ if test x$BUILD_GLIB = xauto; then
+ BUILD_GLIB=yes
+ fi
+ fi
+@@ -165,7 +165,7 @@ if test x$WITH_LIBEV != xno; then
+ ),
+ [test x$WITH_LIBEV != xauto && AC_MSG_ERROR("ev.h not found")]
+ )
+- if test x$BUILD_LIBEV == xauto; then
++ if test x$BUILD_LIBEV = xauto; then
+ BUILD_LIBEV=yes
+ fi
+ fi
+@@ -173,7 +173,7 @@ fi
+ if test x$WITH_LIBEVENT != xno; then
+ PKG_CHECK_MODULES([libevent], [libevent >= 2.0], [BUILD_LIBEVENT=$WITH_LIBEVENT],
+ [test x$WITH_LIBEVENT != xauto && AC_MSG_ERROR("libevent not found")])
+- if test x$BUILD_LIBEVENT == xauto; then
++ if test x$BUILD_LIBEVENT = xauto; then
+ BUILD_LIBEVENT=yes
+ fi
+ fi
+@@ -181,19 +181,19 @@ fi
+ if test x$WITH_TEVENT != xno; then
+ PKG_CHECK_MODULES([tevent], [tevent], [BUILD_TEVENT=$WITH_TEVENT],
+ [test x$WITH_TEVENT != xauto && AC_MSG_ERROR("tevent not found")])
+- if test x$BUILD_TEVENT == xauto; then
++ if test x$BUILD_TEVENT = xauto; then
+ BUILD_TEVENT=yes
+ fi
+ fi
+
+-AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE == x && test x$BUILD_GLIB != xno])
+-AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEV != xno])
+-AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_LIBEVENT != xno])
+-AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE == x && test x$BUILD_TEVENT != xno])
+-AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE == xglib])
+-AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE == xlibev])
+-AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE == xlibevent])
+-AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE == xtevent])
++AM_CONDITIONAL([MODULE_GLIB], [test x$BUILTIN_MODULE = x && test x$BUILD_GLIB != xno])
++AM_CONDITIONAL([MODULE_LIBEV], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEV != xno])
++AM_CONDITIONAL([MODULE_LIBEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_LIBEVENT != xno])
++AM_CONDITIONAL([MODULE_TEVENT], [test x$BUILTIN_MODULE = x && test x$BUILD_TEVENT != xno])
++AM_CONDITIONAL([BUILTIN_GLIB], [test x$BUILTIN_MODULE = xglib])
++AM_CONDITIONAL([BUILTIN_LIBEV], [test x$BUILTIN_MODULE = xlibev])
++AM_CONDITIONAL([BUILTIN_LIBEVENT], [test x$BUILTIN_MODULE = xlibevent])
++AM_CONDITIONAL([BUILTIN_TEVENT], [test x$BUILTIN_MODULE = xtevent])
+
+ AC_MSG_NOTICE()
+ AC_MSG_NOTICE([BUILD CONFIGURATION])
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1-r1.ebuild
similarity index 90%
rename from dev-libs/libverto/libverto-0.3.1.ebuild
rename to dev-libs/libverto/libverto-0.3.1-r1.ebuild
index 8ea4ef46aa1..6964058d33d 100644
--- a/dev-libs/libverto/libverto-0.3.1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,6 +13,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="glib +libev libevent tevent +threads static-libs"
+REQUIRED_USE="|| ( glib libev libevent tevent ) "
DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] )
@@ -21,10 +22,13 @@ DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
RDEPEND="${DEPEND}"
-REQUIRED_USE="|| ( glib libev libevent tevent ) "
-
DOCS=( AUTHORS ChangeLog NEWS INSTALL README )
+PATCHES=(
+ # Runtime breakage caused by bashisms, bug #762823
+ "${FILESDIR}/${PN}-0.3.1-non-bash.patch"
+)
+
src_prepare() {
default
# known problem uptream with tevent write test. tevent does not fire a
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libverto/files/, dev-libs/libverto/
@ 2018-12-15 13:05 Eray Aslan
0 siblings, 0 replies; 3+ messages in thread
From: Eray Aslan @ 2018-12-15 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 5b6faf1954ea6d10706b6fce3f4b7e946a4bc90c
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 15 13:04:49 2018 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat Dec 15 13:04:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6faf19
dev-libs/libverto: bump to 0.3.0
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
dev-libs/libverto/Manifest | 1 +
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.3.0.ebuild | 59 ++++++++++++++++
6 files changed, 204 insertions(+)
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index d6c141c8cef..bd696befe31 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -1,2 +1,3 @@
DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
DIST libverto-0.2.6.tar.gz 352690 BLAKE2B b1610fd7c64fff31d46640ef10fd895f9ce2f0d1d4fd4ac205f2ec5f519f695c8ec82da8b9539c28c0d087bfd3664101192010ee59a9632f09b3ed92e52c1054 SHA512 aa8d047501d28741f2f8185fc4a0ef6dc4b99dbe69b583c40cd4c0afc97db4dd0a928d9ec23861fff61651e9ac82e52da9473b8e62ccc11a91e5e5c6b41dfd3b
+DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch
new file mode 100644
index 00000000000..de403720dd6
--- /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 <rharwood@redhat.com>
+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 00000000000..e63c032b0c8
--- /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 00000000000..94dceac5d69
--- /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 <rharwood@redhat.com>
+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 00000000000..dce747239dc
--- /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 <rharwood@redhat.com>
+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.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild
new file mode 100644
index 00000000000..f0b436a4b83
--- /dev/null
+++ b/dev-libs/libverto/libverto-0.3.0.ebuild
@@ -0,0 +1,59 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-07 14:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-27 18:38 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libverto/files/, dev-libs/libverto/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-01-07 14:20 Sam James
2018-12-15 13:05 Eray Aslan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox