Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libverto for openSUSE:Factory checked in at 2022-10-03 13:44:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libverto (Old) and /work/SRC/openSUSE:Factory/.libverto.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libverto" Mon Oct 3 13:44:41 2022 rev:9 rq:1006732 version:0.3.2 Changes: -------- libverto-libev.changes: same change --- /work/SRC/openSUSE:Factory/libverto/libverto.changes 2020-08-31 16:47:39.048278804 +0200 +++ /work/SRC/openSUSE:Factory/.libverto.new.2275/libverto.changes 2022-10-03 13:44:57.413375151 +0200 @@ -1,0 +2,8 @@ +Sat Sep 24 09:08:52 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 0.3.2: + * Fix use-after-free in verto_reinitialize + * Fix use-after-free in verto_free() + * Remove broken tevent support + +------------------------------------------------------------------- Old: ---- libverto-0.3.1.tar.gz libverto-tevent.changes libverto-tevent.spec New: ---- libverto-0.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libverto-glib.spec ++++++ --- /var/tmp/diff_new_pack.y4JC1P/_old 2022-10-03 13:44:57.965376365 +0200 +++ /var/tmp/diff_new_pack.y4JC1P/_new 2022-10-03 13:44:57.969376374 +0200 @@ -1,7 +1,7 @@ # # spec file for package libverto-glib # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define sover 1 %define src_name libverto Name: libverto-glib -Version: 0.3.1 +Version: 0.3.2 Release: 0 Summary: Main loop abstraction library License: MIT libverto-libev.spec: same change ++++++ libverto.spec ++++++ --- /var/tmp/diff_new_pack.y4JC1P/_old 2022-10-03 13:44:58.049376550 +0200 +++ /var/tmp/diff_new_pack.y4JC1P/_new 2022-10-03 13:44:58.057376568 +0200 @@ -1,7 +1,7 @@ # # spec file for package libverto # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define sover 1 Name: libverto -Version: 0.3.1 +Version: 0.3.2 Release: 0 Summary: Main loop abstraction library License: MIT ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.y4JC1P/_old 2022-10-03 13:44:58.109376682 +0200 +++ /var/tmp/diff_new_pack.y4JC1P/_new 2022-10-03 13:44:58.113376691 +0200 @@ -2,5 +2,4 @@ libverto-devel libverto-glib1 libverto-libev1 -libverto-tevent1 ++++++ libverto-0.3.1.tar.gz -> libverto-0.3.2.tar.gz ++++++ ++++ 2249 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/AUTHORS new/libverto-0.3.2/AUTHORS --- old/libverto-0.3.1/AUTHORS 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/AUTHORS 2021-03-15 18:56:36.000000000 +0100 @@ -1 +1,2 @@ Nathaniel McCallum <npmccal...@redhat.com> +Robbie Harwood <rharw...@redhat.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/ChangeLog new/libverto-0.3.2/ChangeLog --- old/libverto-0.3.1/ChangeLog 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/ChangeLog 2021-03-15 18:56:36.000000000 +0100 @@ -1,41 +1 @@ -2012-08-25 Nathaniel McCallum <npmccal...@redhat.com> - * == Release 0.2.5 == - * fix libev's set_flags() implementation - * add AIX dlopen() support - * export symbols based on symbol list files - * add support for building in a static module - * add support for specifying default module - -2012-02-09 Nathaniel McCallum <npmccal...@redhat.com> - * == Release 0.2.4 == - * add verto_set_flags() - -2012-02-08 Nathaniel McCallum <npmccal...@redhat.com> - * == Release 0.2.3 == - * add external allocator support - * add extern "C" to all headers - * support getting fd state in callbacks - * support getting ctx from ev - * add support for auto-closing file descriptors - * fix a bug where we wrote to free'd memory - -2011-11-11 Nathaniel McCallum <npmccal...@redhat.com> - * == Release 0.2.2 == - * Remove trailing uses of types starting with _ - * Documentation fix - -2011-11-10 Nathaniel McCallum <npmccal...@redhat.com> - * == Release 0.2.1 == - * Build system fix for broken 0.2.0 release - -2011-11-10 Nathaniel McCallum <npmccal...@redhat.com> - * == Release 0.2.0 == - * Fix inconsistent verto_default() singleton state - * Give modules unique table names - * Remove signal table verification magic (no longer needed) - * Give verto_reinitialize() an error condition (int return value) - * Add (optional) pthread locking around our global state - * Cleanup the build system arguments - -2011-09-30 Nathaniel McCallum <npmccal...@redhat.com> - * Initial release +This file is no longer used; see git history. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/Makefile.am new/libverto-0.3.2/Makefile.am --- old/libverto-0.3.1/Makefile.am 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/Makefile.am 2021-03-15 18:56:36.000000000 +0100 @@ -13,9 +13,5 @@ pkgconfig_DATA += libverto-libevent.pc endif -if MODULE_TEVENT -pkgconfig_DATA += libverto-tevent.pc -endif - ACLOCAL_AMFLAGS=-I m4 SUBDIRS=src tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/NEWS new/libverto-0.3.2/NEWS --- old/libverto-0.3.1/NEWS 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/NEWS 2021-03-15 18:56:36.000000000 +0100 @@ -1 +1 @@ -Sample NEWS file for libverto project. +This file is not used; see git history. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/compile new/libverto-0.3.2/compile --- old/libverto-0.3.1/compile 2019-02-27 00:45:22.000000000 +0100 +++ new/libverto-0.3.2/compile 2021-03-15 21:44:30.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/configure.ac new/libverto-0.3.2/configure.ac --- old/libverto-0.3.1/configure.ac 2019-02-27 00:40:59.000000000 +0100 +++ new/libverto-0.3.2/configure.ac 2021-03-15 21:39:12.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(libverto, 0.3.1) +AC_INIT(libverto, 0.3.2) m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS], @@ -80,37 +80,20 @@ *) WITH_LIBEVENT=auto;; esac], [WITH_LIBEVENT=auto]) -AC_ARG_WITH([tevent], - [AS_HELP_STRING([--with-tevent], - [build the tevent library @<:@default: automatic@:>@])], - [case $withval in - no) WITH_TEVENT=no;; - yes) WITH_TEVENT=yes;; - *) WITH_TEVENT=auto;; - esac], [WITH_TEVENT=auto]) - # Ensure that if a builtin is chosen only one is built BUILTIN_MODULE= 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 BUILTIN_MODULE=libev WITH_LIBGLIB=no WITH_LIBEVENT=no - WITH_TEVENT=no 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 - BUILTIN_MODULE=tevent - WITH_GLIB=no - WITH_LIBEV=no - WITH_LIBEVENT=no fi AC_SUBST([BUILTIN_MODULE], $BUILTIN_MODULE) if test x$BUILTIN_MODULE != x; then @@ -122,31 +105,21 @@ 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 fi 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 fi 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 -fi -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 fi BUILD_GLIB=no BUILD_LIBEV=no BUILD_LIBEVENT=no -BUILD_TEVENT=no if test x$WITH_GLIB != xno; then PKG_CHECK_MODULES([glib], [glib-2.0], [BUILD_GLIB=$WITH_GLIB], @@ -178,22 +151,12 @@ fi 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 - 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]) AC_MSG_NOTICE() AC_MSG_NOTICE([BUILD CONFIGURATION]) @@ -201,7 +164,6 @@ AC_MSG_NOTICE(AS_HELP_STRING([glib], [$BUILD_GLIB])) AC_MSG_NOTICE(AS_HELP_STRING([libev], [$BUILD_LIBEV])) AC_MSG_NOTICE(AS_HELP_STRING([libevent], [$BUILD_LIBEVENT])) -AC_MSG_NOTICE(AS_HELP_STRING([tevent], [$BUILD_TEVENT])) AC_MSG_NOTICE() AC_CONFIG_FILES(Makefile @@ -210,6 +172,5 @@ libverto-glib.pc libverto-libev.pc libverto-libevent.pc - libverto-tevent.pc libverto.pc) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/libverto-glib.pc.in new/libverto-0.3.2/libverto-glib.pc.in --- old/libverto-0.3.1/libverto-glib.pc.in 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/libverto-glib.pc.in 2019-06-03 22:03:56.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -exec_prefix=@exec_prefix@ Name: libverto-glib Description: Event loop abstraction interface (glib module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/libverto-libev.pc.in new/libverto-0.3.2/libverto-libev.pc.in --- old/libverto-0.3.1/libverto-libev.pc.in 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/libverto-libev.pc.in 2019-06-03 22:04:03.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -exec_prefix=@exec_prefix@ Name: libverto-libev Description: Event loop abstraction interface (libev module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/libverto-libevent.pc.in new/libverto-0.3.2/libverto-libevent.pc.in --- old/libverto-0.3.1/libverto-libevent.pc.in 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/libverto-libevent.pc.in 2019-06-03 22:03:59.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -exec_prefix=@exec_prefix@ Name: libverto-libevent Description: Event loop abstraction interface (libevent module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/libverto-tevent.pc.in new/libverto-0.3.2/libverto-tevent.pc.in --- old/libverto-0.3.1/libverto-tevent.pc.in 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/libverto-tevent.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -prefix=@prefix@ -libdir=@libdir@ -includedir=@includedir@ -exec_prefix=@exec_prefix@ - -Name: libverto-tevent -Description: Event loop abstraction interface (tevent module) -Version: @VERSION@ -Libs: -L${libdir} -lverto-tevent -Cflags: -I${includedir} -Requires.private: libverto diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/libverto.pc.in new/libverto-0.3.2/libverto.pc.in --- old/libverto-0.3.1/libverto.pc.in 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/libverto.pc.in 2019-06-03 22:03:05.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -exec_prefix=@exec_prefix@ Name: libverto Description: Event loop abstraction interface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/m4/libtool.m4 new/libverto-0.3.2/m4/libtool.m4 --- old/libverto-0.3.1/m4/libtool.m4 2019-02-27 00:45:19.000000000 +0100 +++ new/libverto-0.3.2/m4/libtool.m4 2021-03-15 21:44:28.000000000 +0100 @@ -1041,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1071,11 +1071,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -1492,7 +1492,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4704,6 +4704,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/missing new/libverto-0.3.2/missing --- old/libverto-0.3.1/missing 2019-02-27 00:45:22.000000000 +0100 +++ new/libverto-0.3.2/missing 2021-03-15 21:44:30.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/src/Makefile.am new/libverto-0.3.2/src/Makefile.am --- old/libverto-0.3.1/src/Makefile.am 2017-08-02 17:13:13.000000000 +0200 +++ new/libverto-0.3.2/src/Makefile.am 2021-03-15 18:56:36.000000000 +0100 @@ -1,7 +1,7 @@ AM_CFLAGS = -Wall -Wdeclaration-after-statement AM_LDFLAGS = -version-info 1:0:0 EXTRA_DIST = libverto.symbols libverto-glib.symbols libverto-libev.symbols \ - libverto-libevent.symbols libverto-tevent.symbols + libverto-libevent.symbols include_HEADERS = verto.h verto-module.h noinst_HEADERS = module.h @@ -24,10 +24,6 @@ libverto_la_SOURCES += verto-libevent.c endif -if BUILTIN_TEVENT -libverto_la_SOURCES += verto-tevent.c -endif - if MODULE_GLIB lib_LTLIBRARIES += libverto-glib.la include_HEADERS += verto-glib.h @@ -57,13 +53,3 @@ libverto_libevent_la_LDFLAGS = $(AM_LDFLAGS) $(libevent_LIBS) \ -export-symbols $(srcdir)/libverto-libevent.symbols endif - -if MODULE_TEVENT -lib_LTLIBRARIES += libverto-tevent.la -include_HEADERS += verto-tevent.h -libverto_tevent_la_SOURCES = verto-tevent.c -libverto_tevent_la_LIBADD = libverto.la -libverto_tevent_la_CFLAGS = $(AM_CFLAGS) $(tevent_CFLAGS) -libverto_tevent_la_LDFLAGS = $(AM_LDFLAGS) $(tevent_LIBS) \ - -export-symbols $(srcdir)/libverto-tevent.symbols -endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/src/libverto-tevent.symbols new/libverto-0.3.2/src/libverto-tevent.symbols --- old/libverto-0.3.1/src/libverto-tevent.symbols 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/src/libverto-tevent.symbols 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -verto_convert_tevent -verto_default_tevent -verto_module_table_tevent -verto_new_tevent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/src/verto-tevent.c new/libverto-0.3.2/src/verto-tevent.c --- old/libverto-0.3.1/src/verto-tevent.c 2017-08-02 17:13:13.000000000 +0200 +++ new/libverto-0.3.2/src/verto-tevent.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,164 +0,0 @@ -/* - * Copyright 2011 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation files - * (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include <stdlib.h> -#include <string.h> -#include <errno.h> - -#include <verto-tevent.h> - -#define VERTO_MODULE_TYPES -typedef struct tevent_context verto_mod_ctx; -typedef void verto_mod_ev; -#include <verto-module.h> - -#ifndef TEVENT_FD_ERROR -#define TEVENT_FD_ERROR 0 -#endif /* TEVENT_FD_ERROR */ - -static verto_mod_ctx * -tevent_ctx_new(void) -{ - return tevent_context_init(NULL); -} - -static void -tevent_ctx_free(verto_mod_ctx *ctx) -{ - talloc_free(ctx); -} - -static void -tevent_ctx_run_once(verto_mod_ctx *ctx) -{ - tevent_loop_once(ctx); -} - -static void -tevent_ctx_reinitialize(verto_mod_ctx *ctx) -{ - tevent_re_initialise(ctx); -} - -static void -tevent_fd_cb(struct tevent_context *c, struct tevent_fd *e, - uint16_t fl, void *data) -{ - verto_ev_flag state = VERTO_EV_FLAG_NONE; - - if (fl & TEVENT_FD_READ) - state |= VERTO_EV_FLAG_IO_READ; - if (fl & TEVENT_FD_WRITE) - state |= VERTO_EV_FLAG_IO_WRITE; - if (fl & TEVENT_FD_ERROR) - state |= VERTO_EV_FLAG_IO_ERROR; - - verto_set_fd_state(data, state); - verto_fire(data); -} - -static void -tevent_timer_cb(struct tevent_context *c, struct tevent_timer *e, - struct timeval ct, void *data) -{ - verto_fire(data); -} - -static void -tevent_signal_cb(struct tevent_context *c, struct tevent_signal *e, - int signum, int count, void *siginfo, void *data) -{ - verto_fire(data); -} - -static void -tevent_ctx_set_flags(verto_mod_ctx *ctx, const verto_ev *ev, - verto_mod_ev *evpriv) -{ - if (verto_get_type(ev) == VERTO_EV_TYPE_IO) { - uint16_t teventflags = TEVENT_FD_ERROR; - if (verto_get_flags(ev) & VERTO_EV_FLAG_IO_READ) - teventflags |= TEVENT_FD_READ; - if (verto_get_flags(ev) & VERTO_EV_FLAG_IO_WRITE) - teventflags |= TEVENT_FD_WRITE; - tevent_fd_set_flags(evpriv, teventflags); - } -} - -static verto_mod_ev * -tevent_ctx_add(verto_mod_ctx *ctx, const verto_ev *ev, verto_ev_flag *flags) - -{ - time_t interval; - struct timeval tv; - struct tevent_fd *tfde; - - *flags |= VERTO_EV_FLAG_PERSIST; - switch (verto_get_type(ev)) { - case VERTO_EV_TYPE_IO: - tfde = tevent_add_fd(ctx, ctx, verto_get_fd(ev), TEVENT_FD_ERROR, - tevent_fd_cb, (void *) ev); - if (tfde) { - tevent_ctx_set_flags(ctx, ev, tfde); - if (verto_get_flags(ev) & VERTO_EV_FLAG_IO_CLOSE_FD) { - *flags |= VERTO_EV_FLAG_IO_CLOSE_FD; - tevent_fd_set_auto_close(tfde); - } - } - return tfde; - case VERTO_EV_TYPE_TIMEOUT: - *flags &= ~VERTO_EV_FLAG_PERSIST; /* Timeout events don't persist */ - interval = verto_get_interval(ev); - tv = tevent_timeval_current_ofs(interval / 1000, interval % 1000 * 1000); - return tevent_add_timer(ctx, ctx, tv, - tevent_timer_cb, (void *) ev); - case VERTO_EV_TYPE_SIGNAL: - return tevent_add_signal(ctx, ctx, verto_get_signal(ev), - 0, tevent_signal_cb, (void *) ev); - case VERTO_EV_TYPE_IDLE: - case VERTO_EV_TYPE_CHILD: - default: - return NULL; /* Not supported */ - } -} - -static void -tevent_ctx_del(verto_mod_ctx *priv, const verto_ev *ev, verto_mod_ev *evpriv) -{ - talloc_free(evpriv); -} - -#define tevent_ctx_break NULL -#define tevent_ctx_run NULL -#define tevent_ctx_default NULL -VERTO_MODULE(tevent, tevent_context_init, - VERTO_EV_TYPE_IO | - VERTO_EV_TYPE_TIMEOUT | - VERTO_EV_TYPE_SIGNAL); - -verto_ctx * -verto_convert_tevent(struct tevent_context *context) -{ - return verto_convert(tevent, 0, context); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/src/verto-tevent.h new/libverto-0.3.2/src/verto-tevent.h --- old/libverto-0.3.1/src/verto-tevent.h 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/src/verto-tevent.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -/* - * Copyright 2011 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation files - * (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#ifndef VERTO_TEVENT_H_ -#define VERTO_TEVENT_H_ - -#include <verto.h> -#include <tevent.h> - -#ifdef __cplusplus -extern "C" -{ -#endif /* __cplusplus */ - -verto_ctx * -verto_new_tevent(void); - -verto_ctx * -verto_default_tevent(void); - -verto_ctx * -verto_convert_tevent(struct tevent_context *context); - -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ -#endif /* VERTO_TEVENT_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/src/verto.c new/libverto-0.3.2/src/verto.c --- old/libverto-0.3.1/src/verto.c 2017-08-31 22:35:52.000000000 +0200 +++ new/libverto-0.3.2/src/verto.c 2021-03-15 21:37:45.000000000 +0100 @@ -583,6 +583,8 @@ void verto_free(verto_ctx *ctx) { + verto_ev *cur, *next; + if (!ctx) return; @@ -591,8 +593,12 @@ return; /* Cancel all pending events */ - while (ctx->events) - verto_del(ctx->events); + next = NULL; + for (cur = ctx->events; cur != NULL; cur = next) { + next = cur->next; + verto_del(cur); + } + ctx->events = NULL; /* Free the private */ if (!ctx->deflt || !ctx->module->funcs->ctx_default) @@ -658,20 +664,28 @@ int verto_reinitialize(verto_ctx *ctx) { - verto_ev *tmp, *next; + verto_ev *next, *prev, *cur; int error = 1; if (!ctx) return 0; /* Delete all events, but keep around the forkable ev structs */ - for (tmp = ctx->events; tmp; tmp = next) { - next = tmp->next; - - if (tmp->flags & VERTO_EV_FLAG_REINITIABLE) - ctx->module->funcs->ctx_del(ctx->ctx, tmp, tmp->ev); - else - verto_del(tmp); + prev = NULL; + for (cur = ctx->events; cur != NULL; cur = next) { + next = cur->next; + + if (cur->flags & VERTO_EV_FLAG_REINITIABLE) { + ctx->module->funcs->ctx_del(ctx->ctx, cur, cur->ev); + prev = cur; + continue; + } + + verto_del(cur); + if (prev) + prev->next = next; + if (cur == ctx->events) + ctx->events = next; } /* Reinit the loop */ @@ -679,10 +693,10 @@ ctx->module->funcs->ctx_reinitialize(ctx->ctx); /* Recreate events that were marked forkable */ - for (tmp = ctx->events; tmp; tmp = tmp->next) { - tmp->actual = make_actual(tmp->flags); - tmp->ev = ctx->module->funcs->ctx_add(ctx->ctx, tmp, &tmp->actual); - if (!tmp->ev) + for (cur = ctx->events; cur != NULL; cur = cur->next) { + cur->actual = make_actual(cur->flags); + cur->ev = ctx->module->funcs->ctx_add(ctx->ctx, cur, &cur->actual); + if (!cur->ev) error = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/test-driver new/libverto-0.3.2/test-driver --- old/libverto-0.3.1/test-driver 2019-02-27 00:45:22.000000000 +0100 +++ new/libverto-0.3.2/test-driver 2021-03-15 21:44:30.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/tests/Makefile.am new/libverto-0.3.2/tests/Makefile.am --- old/libverto-0.3.1/tests/Makefile.am 2015-09-08 23:59:51.000000000 +0200 +++ new/libverto-0.3.2/tests/Makefile.am 2021-03-15 18:56:36.000000000 +0100 @@ -12,9 +12,6 @@ if MODULE_LIBEVENT AM_CFLAGS += -DHAVE_LIBEVENT=1 endif -if MODULE_TEVENT -AM_CFLAGS += -DHAVE_TEVENT=1 -endif check_PROGRAMS = timeout idle child signal read write EXTRA_DIST = test.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libverto-0.3.1/tests/test.h new/libverto-0.3.2/tests/test.h --- old/libverto-0.3.1/tests/test.h 2017-08-29 23:13:51.000000000 +0200 +++ new/libverto-0.3.2/tests/test.h 2021-03-15 18:56:36.000000000 +0100 @@ -49,9 +49,6 @@ #ifdef HAVE_LIBEVENT "libevent", #endif -#ifdef HAVE_TEVENT - "tevent", -#endif NULL, NULL, };