November 2015 - openSUSE Commits - openSUSE Mailing Lists

commit socket_wrapper for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package socket_wrapper for openSUSE:Factory checked in at 2015-11-02 12:55:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/socket_wrapper (Old) and /work/SRC/openSUSE:Factory/.socket_wrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "socket_wrapper" Changes: -------- --- /work/SRC/openSUSE:Factory/socket_wrapper/socket_wrapper.changes 2015-09-09 20:21:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.socket_wrapper.new/socket_wrapper.changes 2015-11-02 12:55:11.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Oct 15 09:15:14 UTC 2015 - asn(a)cryptomilk.org + +- Update to version 1.1.5 + * Added support for TCP_NODELAY in setsockopt/getsockopt + * Fixed cmsg space calculation + +------------------------------------------------------------------- Old: ---- socket_wrapper-1.1.4.tar.gz New: ---- socket_wrapper-1.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ socket_wrapper.spec ++++++ --- /var/tmp/diff_new_pack.AkFJdV/_old 2015-11-02 12:55:11.000000000 +0100 +++ /var/tmp/diff_new_pack.AkFJdV/_new 2015-11-02 12:55:11.000000000 +0100 @@ -24,7 +24,7 @@ ############################# NOTE ################################## Name: socket_wrapper -Version: 1.1.4 +Version: 1.1.5 Release: 0 Summary: A library passing all socket communications trough Unix sockets License: BSD-3-Clause ++++++ socket_wrapper-1.1.4.tar.gz -> socket_wrapper-1.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.1.4/CMakeLists.txt new/socket_wrapper-1.1.5/CMakeLists.txt --- old/socket_wrapper-1.1.4/CMakeLists.txt 2015-08-24 17:53:17.000000000 +0200 +++ new/socket_wrapper-1.1.5/CMakeLists.txt 2015-10-15 09:36:23.000000000 +0200 @@ -8,7 +8,7 @@ set(APPLICATION_VERSION_MAJOR "1") set(APPLICATION_VERSION_MINOR "1") -set(APPLICATION_VERSION_PATCH "4") +set(APPLICATION_VERSION_PATCH "5") set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") @@ -19,7 +19,7 @@ # Increment AGE. Set REVISION to 0 # If the source code was changed, but there were no interface changes: # Increment REVISION. -set(LIBRARY_VERSION "0.1.4") +set(LIBRARY_VERSION "0.1.5") set(LIBRARY_SOVERSION "0") # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.1.4/ChangeLog new/socket_wrapper-1.1.5/ChangeLog --- old/socket_wrapper-1.1.4/ChangeLog 2015-08-24 17:54:04.000000000 +0200 +++ new/socket_wrapper-1.1.5/ChangeLog 2015-10-15 10:25:33.000000000 +0200 @@ -1,6 +1,10 @@ ChangeLog ========== +version 1.1.5 (released 2015-10-15) + * Added support for TCP_NODELAY in setsockopt/getsockopt + * Fixed cmsg space calculation + version 1.1.4 (released 2015-08-25) * Fixed handling of msg_name in recvmsg() * Fixed sendmsg()/recvmsg() TCP support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.1.4/src/socket_wrapper.c new/socket_wrapper-1.1.5/src/socket_wrapper.c --- old/socket_wrapper-1.1.4/src/socket_wrapper.c 2015-08-17 12:21:00.000000000 +0200 +++ new/socket_wrapper-1.1.5/src/socket_wrapper.c 2015-10-15 09:36:23.000000000 +0200 @@ -248,6 +248,7 @@ int connected; int defer_connect; int pktinfo; + int tcp_nodelay; /* The unix path so we can unlink it on close() */ struct sockaddr_un un_addr; @@ -3350,6 +3351,29 @@ optval, optlen); } + } else if (level == IPPROTO_TCP) { + switch (optname) { +#ifdef TCP_NODELAY + case TCP_NODELAY: + /* + * This enables sending packets directly out over TCP. + * As a unix socket is doing that any way, report it as + * enabled. + */ + if (optval == NULL || optlen == NULL || + *optlen < (socklen_t)sizeof(int)) { + errno = EINVAL; + return -1; + } + + *optlen = sizeof(int); + *(int *)optval = si->tcp_nodelay; + + return 0; +#endif /* TCP_NODELAY */ + default: + break; + } } errno = ENOPROTOOPT; @@ -3388,6 +3412,35 @@ optname, optval, optlen); + } else if (level == IPPROTO_TCP) { + switch (optname) { +#ifdef TCP_NODELAY + case TCP_NODELAY: { + int i; + + /* + * This enables sending packets directly out over TCP. + * A unix socket is doing that any way. + */ + if (optval == NULL || optlen == 0 || + optlen < (socklen_t)sizeof(int)) { + errno = EINVAL; + return -1; + } + + i = *discard_const_p(int, optval); + if (i != 0 && i != 1) { + errno = EINVAL; + return -1; + } + si->tcp_nodelay = i; + + return 0; + } +#endif /* TCP_NODELAY */ + default: + break; + } } switch (si->family) { @@ -3686,9 +3739,7 @@ size_t cmspace; uint8_t *p; - cmspace = - (*cm_data_space) + - CMSG_SPACE(cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr))); + cmspace = *cm_data_space + CMSG_ALIGN(cmsg->cmsg_len); p = realloc((*cm_data), cmspace); if (p == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.1.4/tests/CMakeLists.txt new/socket_wrapper-1.1.5/tests/CMakeLists.txt --- old/socket_wrapper-1.1.4/tests/CMakeLists.txt 2015-08-11 17:30:20.000000000 +0200 +++ new/socket_wrapper-1.1.5/tests/CMakeLists.txt 2015-10-14 11:38:17.000000000 +0200 @@ -30,7 +30,8 @@ test_echo_tcp_get_peer_sock_name test_echo_udp_sendto_recvfrom test_echo_udp_send_recv - test_echo_udp_sendmsg_recvmsg) + test_echo_udp_sendmsg_recvmsg + test_swrap_unit) if (HAVE_STRUCT_MSGHDR_MSG_CONTROL) set(SWRAP_TESTS ${SWRAP_TESTS} test_sendmsg_recvmsg_fd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.1.4/tests/test_echo_tcp_socket_options.c new/socket_wrapper-1.1.5/tests/test_echo_tcp_socket_options.c --- old/socket_wrapper-1.1.4/tests/test_echo_tcp_socket_options.c 2015-08-11 17:30:20.000000000 +0200 +++ new/socket_wrapper-1.1.5/tests/test_echo_tcp_socket_options.c 2015-10-14 11:38:17.000000000 +0200 @@ -10,6 +10,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include <netinet/tcp.h> #include <arpa/inet.h> #include <netdb.h> #include <stdlib.h> @@ -293,6 +294,51 @@ } #endif +static void test_sockopt_tcp(void **state) +{ + struct torture_address addr = { + .sa_socklen = sizeof(struct sockaddr_in), + }; + int opt = -1; + socklen_t optlen = sizeof(int); + int rc; + + int s; + + (void) state; /* unused */ + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + assert_int_not_equal(s, -1); + + addr.sa.in.sin_family = AF_INET; + addr.sa.in.sin_port = htons(torture_server_port()); + + rc = inet_pton(addr.sa.in.sin_family, + torture_server_address(AF_INET), + &addr.sa.in.sin_addr); + assert_int_equal(rc, 1); + + rc = connect(s, &addr.sa.s, addr.sa_socklen); + assert_int_equal(rc, 0); + + rc = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen); + assert_return_code(rc, errno); + assert_int_equal(opt, 0); + + opt = 1; /* Turn on TCP_NODELAY */ + optlen = sizeof(int); + rc = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, optlen); + assert_return_code(rc, errno); + + opt = -1; + optlen = sizeof(int); + rc = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen); + assert_return_code(rc, errno); + assert_int_equal(opt, 1); + + close(s); +} + int main(void) { int rc; @@ -311,6 +357,9 @@ setup_ipv6, teardown), #endif + cmocka_unit_test_setup_teardown(test_sockopt_tcp, + setup_echo_srv_tcp_ipv4, + teardown), }; rc = cmocka_run_group_tests(sockopt_tests, NULL, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socket_wrapper-1.1.4/tests/test_swrap_unit.c new/socket_wrapper-1.1.5/tests/test_swrap_unit.c --- old/socket_wrapper-1.1.4/tests/test_swrap_unit.c 1970-01-01 01:00:00.000000000 +0100 +++ new/socket_wrapper-1.1.5/tests/test_swrap_unit.c 2015-10-14 11:38:17.000000000 +0200 @@ -0,0 +1,120 @@ +#include <stdarg.h> +#include <stddef.h> +#include <setjmp.h> +#include <cmocka.h> +#include <stdio.h> +#include <string.h> + +#include "config.h" + +#include "socket_wrapper.c" + +#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL + +/** + * test wrap_sendmsg_filter_cmsghdr() + * + * Prepare a message with two cmsg: + * - the first cmsg is a char buf with the string "Hello World" + * - the second cmsg is a char buf with the string "!\n" + * + * Both cmsgs will be copied without modification by + * wrap_sendmsg_filter_cmsghdr(), so we can check that the msg + * controllen, the cmsg sizes and the payload are the same. + * + * We use an not existing cmsg_type which triggers cmsg copying. + */ +static void test_sendmsg_cmsg(void **state) +{ + int rc = 0; + char byte = '!'; + struct iovec iov; + struct msghdr msg = { 0 }; + struct cmsghdr *cmsg; + char *cmsgbuf; + int cmsgbuf_size; + const char *s1 = "Hello World"; + const int s1_len = strlen(s1); + const char *s2 = "!\n"; + const int s2_len = strlen(s2); + uint8_t *cmbuf = NULL; + size_t cmlen = 0; + + (void)state; /* unused */ + + iov.iov_base = &byte; + iov.iov_len = 1; + + /* + * Prepare cmsgbuf and msg + */ + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + cmsgbuf_size = CMSG_SPACE(s1_len) + CMSG_SPACE(s2_len); + cmsgbuf = calloc(cmsgbuf_size, sizeof(char)); + assert_non_null(cmsgbuf); + msg.msg_control = cmsgbuf; + msg.msg_controllen = cmsgbuf_size; + + /* + * Prepare first cmsg with string "Hello World" + */ + cmsg = CMSG_FIRSTHDR(&msg); + assert_non_null(cmsg); + + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = ~0 - 1; + cmsg->cmsg_len = CMSG_LEN(s1_len); + memcpy(CMSG_DATA(cmsg), s1, s1_len); + + /* + * Prepare second cmsg with string "!\n" + */ + cmsg = CMSG_NXTHDR(&msg, cmsg); + assert_non_null(cmsg); + + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = ~0 - 2; + cmsg->cmsg_len = CMSG_LEN(s2_len); + memcpy(CMSG_DATA(cmsg), s2, s2_len); + + /* + * Now call swrap_sendmsg_filter_cmsghdr() on the msg + */ + rc = swrap_sendmsg_filter_cmsghdr(&msg, &cmbuf, &cmlen); + assert_return_code(rc, errno); + assert_int_equal(cmlen, msg.msg_controllen); + + /* + * Insert filtered cmsgbug into msg and validate cmsgs. + */ + msg.msg_control = cmbuf; + + cmsg = CMSG_FIRSTHDR(&msg); + assert_non_null(cmsg); + assert_int_equal(cmsg->cmsg_len, CMSG_LEN(s1_len)); + assert_memory_equal(CMSG_DATA(cmsg), s1, s1_len); + + cmsg = CMSG_NXTHDR(&msg, cmsg); + assert_non_null(cmsg); + assert_int_equal(cmsg->cmsg_len, CMSG_LEN(s2_len)); + assert_memory_equal(CMSG_DATA(cmsg), s2, s2_len); + + free(cmbuf); + free(cmsgbuf); +} +#endif + +int main(void) { + int rc; + + const struct CMUnitTest unit_tests[] = { +#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL + cmocka_unit_test(test_sendmsg_cmsg), +#endif + }; + + rc = cmocka_run_group_tests(unit_tests, NULL, NULL); + + return rc; +}

1 0

commit python-pyside for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python-pyside for openSUSE:Factory checked in at 2015-11-02 12:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyside (Old) and /work/SRC/openSUSE:Factory/.python-pyside.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pyside" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyside/python-pyside.changes 2014-05-15 19:16:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pyside.new/python-pyside.changes 2015-11-02 12:55:12.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Oct 27 12:08:37 UTC 2015 - rpm(a)fthiessen.de + +- Update to 1.2.4: + * PYSIDE-164: Fix possible deadlock on signal connect/emit + * New release of pyside-Shiboken +- Dropped empty doc package + +------------------------------------------------------------------- Old: ---- pyside-qt4.8+1.2.2.tar.bz2 New: ---- pyside-1.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyside.spec ++++++ --- /var/tmp/diff_new_pack.gbcMhA/_old 2015-11-02 12:55:12.000000000 +0100 +++ /var/tmp/diff_new_pack.gbcMhA/_new 2015-11-02 12:55:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pyside # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,21 +20,19 @@ Name: python-%{tarname} %define libprefix lib%{tarname} %define pyname PySide -Version: 1.2.2 +Version: 1.2.4 Release: 0 -%define qtver 4.8 -%define rversion qt%{qtver}+%{version} +%define major_version %(echo "%{version}" | sed 's/.[0-9]*$//') Summary: PySide - python bindings for Qt License: LGPL-2.1+ Group: Development/Languages/Python Url: http://qt-project.org/wiki/PySide -Source0: http://download.qt-project.org/official_releases/pyside/%{tarname}-%{rversi… +Source0: https://github.com/PySide/%{pyname}/archive/%{version}/%{tarname}-%{version… BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: graphviz-devel BuildRequires: libQtWebKit-devel -BuildRequires: libqt4-devel >= %{qtver} +BuildRequires: libqt4-devel >= 4.5 BuildRequires: libshiboken-devel BuildRequires: libxslt-devel BuildRequires: phonon-devel @@ -63,28 +61,13 @@ This package contains all the developer tools you need to create your own PyQt applications. -%package doc -Summary: PySide - python bindings for Qt -Group: Development/Languages/Python - -%description doc -The PySide project provides LGPL-licensed Python bindings for the Qt -cross-platform application and UI framework. PySide Qt bindings allow both free -open source and proprietary software development and ultimately aim to support -all of the platforms as Qt itself. - -This package contains all the documentation. - %prep -%setup -q -n %{tarname}-%{rversion} +%setup -q -n %{pyname}-%{version} %build -mkdir build -pushd build -cmake .. \ +%cmake .. \ -DBUILD_TESTS=FALSE \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DQT_PHONON_INCLUDE_DIR=%{_includedir}/phonon make %{?_smp_mflags} ctest -R qtcore || true @@ -93,13 +76,14 @@ pushd build %makeinstall DESTDIR=%{buildroot} %fdupes %{buildroot} +popd %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) -%doc COPYING ChangeLog +%doc COPYING %{_libdir}/%{libprefix}-python%{py_ver}.so.* %{py_sitedir}/%{pyname}/ %{_datadir}/%{pyname}/ @@ -111,8 +95,4 @@ %{_libdir}/cmake/* %{_libdir}/pkgconfig/%{tarname}.pc -%files doc -%defattr(-,root,root) -%doc COPYING ChangeLog - %changelog

1 0

commit freexl for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package freexl for openSUSE:Factory checked in at 2015-11-02 12:55:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freexl (Old) and /work/SRC/openSUSE:Factory/.freexl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freexl" Changes: -------- --- /work/SRC/openSUSE:Factory/freexl/freexl.changes 2015-04-21 10:53:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freexl.new/freexl.changes 2015-11-02 12:55:10.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Oct 31 06:40:08 UTC 2015 - mpluskal(a)suse.com + +- Update to 1.0.2 + * no changelog provided by upstream + +------------------------------------------------------------------- Old: ---- freexl-1.0.1.tar.gz New: ---- freexl-1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freexl.spec ++++++ --- /var/tmp/diff_new_pack.cUDHYC/_old 2015-11-02 12:55:10.000000000 +0100 +++ /var/tmp/diff_new_pack.cUDHYC/_new 2015-11-02 12:55:10.000000000 +0100 @@ -18,7 +18,7 @@ %define libname lib%{name}1 Name: freexl -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: Library to extract valid data from within an Excel License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ @@ -55,7 +55,8 @@ %setup -q %build -%configure --disable-static +%configure \ + --disable-static make %{?_smp_mflags} @@ -67,7 +68,7 @@ %install make install %{?_smp_flags} DESTDIR=%{buildroot} -rm -rf %{buildroot}%{_libdir}/lib*.la +find %{buildroot} -type f -name "*.la" -delete -print %fdupes -s html %post -n %{libname} -p /sbin/ldconfig ++++++ freexl-1.0.1.tar.gz -> freexl-1.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/Makefile.am new/freexl-1.0.2/Makefile.am --- old/freexl-1.0.1/Makefile.am 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/Makefile.am 2015-07-14 09:45:23.000000000 +0200 @@ -5,7 +5,7 @@ EXTRA_DIST = makefile.vc nmake.opt \ images/piazza.jpg images/piazza.eps mainpage.doxy config-msvc.h -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = freexl.pc @@ -14,7 +14,7 @@ lcov --directory src --capture --initial --output-file freexl_cov.info coverage:: - lcov --directory src --output-file freexl_cov.info --capture - genhtml -o covresults freexl_cov.info + lcov --rc lcov_branch_coverage=1 --directory src --output-file freexl_cov.info --capture + genhtml --rc lcov_branch_coverage=1 -o covresults freexl_cov.info MOSTLYCLEANFILES = freexl_cov.info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/Makefile.in new/freexl-1.0.2/Makefile.in --- old/freexl-1.0.1/Makefile.in 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/Makefile.in 2015-07-14 09:45:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,12 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/Doxyfile.in \ - $(srcdir)/freexl.pc.in COPYING compile config.guess config.sub \ - depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -92,6 +96,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -184,6 +190,10 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(srcdir)/freexl.pc.in AUTHORS COPYING \ + ChangeLog INSTALL NEWS README compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -352,7 +362,7 @@ EXTRA_DIST = makefile.vc nmake.opt \ images/piazza.jpg images/piazza.eps mainpage.doxy config-msvc.h -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = freexl.pc MOSTLYCLEANFILES = freexl_cov.info @@ -366,16 +376,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile + $(AUTOMAKE) --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -631,15 +640,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -674,17 +683,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -865,13 +874,15 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-pkgconfigDATA +.PRECIOUS: Makefile + coverage-init: lcov --directory src --capture --initial --output-file freexl_cov.info coverage:: - lcov --directory src --output-file freexl_cov.info --capture - genhtml -o covresults freexl_cov.info + lcov --rc lcov_branch_coverage=1 --directory src --output-file freexl_cov.info --capture + genhtml --rc lcov_branch_coverage=1 -o covresults freexl_cov.info # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/aclocal.m4 new/freexl-1.0.2/aclocal.m4 --- old/freexl-1.0.1/aclocal.m4 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/aclocal.m4 2015-07-14 09:45:23.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -409,7 +408,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -499,8 +498,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,7 +572,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -602,7 +605,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -645,7 +648,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -680,7 +683,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -730,7 +733,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -771,7 +774,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -798,7 +801,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -827,7 +830,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -874,7 +877,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -893,7 +896,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -974,7 +977,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1034,7 +1037,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1062,7 +1065,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1081,7 +1084,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/compile new/freexl-1.0.2/compile --- old/freexl-1.0.1/compile 2014-09-10 13:57:56.000000000 +0200 +++ new/freexl-1.0.2/compile 2015-01-07 13:05:37.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/configure new/freexl-1.0.2/configure --- old/freexl-1.0.1/configure 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/configure 2015-07-14 09:45:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FreeXL 1.0.1. +# Generated by GNU Autoconf 2.69 for FreeXL 1.0.2. # # Report bugs to <a.furieri(a)lqt.it>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='FreeXL' PACKAGE_TARNAME='freexl' -PACKAGE_VERSION='1.0.1' -PACKAGE_STRING='FreeXL 1.0.1' +PACKAGE_VERSION='1.0.2' +PACKAGE_STRING='FreeXL 1.0.2' PACKAGE_BUGREPORT='a.furieri(a)lqt.it' PACKAGE_URL='' @@ -1326,7 +1326,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeXL 1.0.1 to adapt to many kinds of systems. +\`configure' configures FreeXL 1.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeXL 1.0.1:";; + short | recursive ) echo "Configuration of FreeXL 1.0.2:";; esac cat <<\_ACEOF @@ -1508,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeXL configure 1.0.1 +FreeXL configure 1.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2052,7 +2052,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeXL $as_me 1.0.1, which was +It was created by FreeXL $as_me 1.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2437,7 +2437,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2609,8 +2609,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2629,7 +2629,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2923,7 +2923,7 @@ # Define the identity of the package. PACKAGE='freexl' - VERSION='1.0.1' + VERSION='1.0.2' cat >>confdefs.h <<_ACEOF @@ -2957,8 +2957,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3016,6 +3016,7 @@ fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -17812,7 +17813,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeXL $as_me 1.0.1, which was +This file was extended by FreeXL $as_me 1.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17878,7 +17879,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FreeXL config.status 1.0.1 +FreeXL config.status 1.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/configure.ac new/freexl-1.0.2/configure.ac --- old/freexl-1.0.1/configure.ac 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/configure.ac 2015-07-14 09:45:23.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(FreeXL, 1.0.1, a.furieri(a)lqt.it) +AC_INIT(FreeXL, 1.0.2, a.furieri(a)lqt.it) AC_LANG(C) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/examples/Makefile.in new/freexl-1.0.2/examples/Makefile.in --- old/freexl-1.0.1/examples/Makefile.in 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/examples/Makefile.in 2015-07-14 09:45:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ host_triplet = @host@ noinst_PROGRAMS = test_xl$(EXEEXT) xl2sql$(EXEEXT) subdir = examples -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -89,6 +97,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -164,6 +173,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -306,7 +316,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu examples/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -582,6 +591,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/headers/Makefile.in new/freexl-1.0.2/headers/Makefile.in --- old/freexl-1.0.1/headers/Makefile.in 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/headers/Makefile.in 2015-07-14 09:45:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = headers -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(include_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -88,6 +96,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \ + $(noinst_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -159,6 +169,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -298,7 +309,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu headers/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu headers/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -545,6 +555,8 @@ ps ps-am tags tags-am uninstall uninstall-am \ uninstall-includeHEADERS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/src/Makefile.in new/freexl-1.0.2/src/Makefile.in --- old/freexl-1.0.1/src/Makefile.in 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/src/Makefile.in 2015-07-14 09:45:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -88,6 +96,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -191,6 +200,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -335,7 +345,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -634,6 +643,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/src/freexl.c new/freexl-1.0.2/src/freexl.c --- old/freexl-1.0.1/src/freexl.c 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/src/freexl.c 2015-07-14 09:45:23.000000000 +0200 @@ -1076,6 +1076,7 @@ /* allocating the rows and cells for the active Worksheet */ unsigned int row; unsigned int col; + double dsize; biff_cell_value *p_cell; if (workbook == NULL) @@ -1083,6 +1084,14 @@ if (workbook->active_sheet == NULL) return FREEXL_NULL_ARGUMENT; +/* testing for an unrealistically high memory size > 256MB */ + dsize = + (double) sizeof (biff_cell_value) * + (double) (workbook->active_sheet->rows) * + (double) (workbook->active_sheet->columns); + if (dsize > 256.0 * 1024.0 * 1024.0) + return FREEXL_INSUFFICIENT_MEMORY; + /* allocating the cell values array */ workbook->active_sheet->cell_values = malloc (sizeof (biff_cell_value) * @@ -1735,6 +1744,8 @@ } workbook->shared_strings.utf8_strings = malloc (sizeof (char **) * workbook->shared_strings.string_count); + if (workbook->shared_strings.utf8_strings == NULL) + return FREEXL_INSUFFICIENT_MEMORY; for (i_string = 0; i_string < workbook->shared_strings.string_count; i_string++) *(workbook->shared_strings.utf8_strings + i_string) = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freexl-1.0.1/tests/Makefile.in new/freexl-1.0.2/tests/Makefile.in --- old/freexl-1.0.1/tests/Makefile.in 2015-03-22 13:08:49.000000000 +0100 +++ new/freexl-1.0.2/tests/Makefile.in 2015-07-14 09:45:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -91,8 +101,6 @@ walk_sst_oocalc97$(EXEEXT) check_datetime_biff8$(EXEEXT) \ check_boolean_biff8$(EXEEXT) check_oocalc97_intvalue$(EXEEXT) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -100,6 +108,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -453,6 +462,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -612,7 +623,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -851,7 +861,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1267,6 +1277,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.

1 0

commit octave-forge-parallel for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package octave-forge-parallel for openSUSE:Factory checked in at 2015-11-02 12:55:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave-forge-parallel (Old) and /work/SRC/openSUSE:Factory/.octave-forge-parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "octave-forge-parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/octave-forge-parallel/octave-forge-parallel.changes 2015-08-31 22:58:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-parallel.new/octave-forge-parallel.changes 2015-11-02 12:55:08.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 30 21:02:29 UTC 2015 - dmitry_r(a)opensuse.org + +- Update to version 3.0.3 + * Bugfix release + +------------------------------------------------------------------- Old: ---- parallel-3.0.2.tar.gz New: ---- parallel-3.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave-forge-parallel.spec ++++++ --- /var/tmp/diff_new_pack.mHrhwB/_old 2015-11-02 12:55:09.000000000 +0100 +++ /var/tmp/diff_new_pack.mHrhwB/_new 2015-11-02 12:55:09.000000000 +0100 @@ -18,7 +18,7 @@ %define octpkg parallel Name: octave-forge-%{octpkg} -Version: 3.0.2 +Version: 3.0.3 Release: 0 Summary: Parallel Computing for Octave License: GPL-3.0+ ++++++ parallel-3.0.2.tar.gz -> parallel-3.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/DESCRIPTION new/parallel-3.0.3/DESCRIPTION --- old/parallel-3.0.2/DESCRIPTION 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/DESCRIPTION 2015-10-29 14:16:11.000000000 +0100 @@ -1,6 +1,6 @@ Name: Parallel -Version: 3.0.2 -Date: 2015-07-16 +Version: 3.0.3 +Date: 2015-10-29 Author: Hayato Fujiwara, Jaroslav Hajek, Olaf Till Maintainer: Olaf Till <i7tiol(a)t-online.de> Title: Parallel Computing. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/NEWS new/parallel-3.0.3/NEWS --- old/parallel-3.0.2/NEWS 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/NEWS 2015-10-29 14:16:11.000000000 +0100 @@ -1,3 +1,10 @@ +parallel 3.0.3 +-------------- + + ** Fix bug in package building if SRP is not provided by gnutls. + + ** Documentation spelling and typo fixes. + parallel 3.0.2 -------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/doc/README new/parallel-3.0.3/doc/README --- old/parallel-3.0.2/doc/README 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/doc/README 2015-10-29 14:16:11.000000000 +0100 @@ -2,7 +2,7 @@ -- Functions for initialization of a cluster and execution of arbitrary commands on chosen remote machines. Please see e.g. the - documentation of "connect()", "pserver()", and of the functions + documentation of "pconnect()", "pserver()", and of the functions referenced therein. -- Higher level functions, based on the lower level parallel cluster diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/inst/__netcellfun_guardfun__.m new/parallel-3.0.3/inst/__netcellfun_guardfun__.m --- old/parallel-3.0.2/inst/__netcellfun_guardfun__.m 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/inst/__netcellfun_guardfun__.m 2015-10-29 14:16:11.000000000 +0100 @@ -30,8 +30,8 @@ try [varargout{1:nout}] = func (varargin{:}); catch + errs = lasterror (); errs.index = idx; - [errs.message, errs.identifier] = lasterr (); [varargout{1:nout}] = errh (errs, varargin{:}); end_try_catch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/inst/parcellfun.m new/parallel-3.0.3/inst/parcellfun.m --- old/parallel-3.0.2/inst/parcellfun.m 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/inst/parcellfun.m 2015-10-29 14:16:11.000000000 +0100 @@ -263,8 +263,8 @@ try [res{:}] = fun (argsc{:}); catch + errs = lasterror (); # fields 'message', 'identifier', 'stack' errs.index = cmd; - [errs.message, errs.identifier] = lasterr (); [res{:}] = error_handler (errs, argsc{:}); end_try_catch endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/configure new/parallel-3.0.3/src/configure --- old/parallel-3.0.2/src/configure 2015-07-16 17:56:46.000000000 +0200 +++ new/parallel-3.0.3/src/configure 2015-10-29 14:16:24.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for parallel 3.0.2. +# Generated by GNU Autoconf 2.69 for parallel 3.0.3. # # Report bugs to <i7tiol(a)t-online.de>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='3.0.2' -PACKAGE_STRING='parallel 3.0.2' +PACKAGE_VERSION='3.0.3' +PACKAGE_STRING='parallel 3.0.3' PACKAGE_BUGREPORT='i7tiol(a)t-online.de' PACKAGE_URL='' @@ -625,12 +625,12 @@ ac_subst_vars='LTLIBOBJS HAVE_GETPASS LIBOBJS -EGREP -GREP -CPP HAVE_GNUTLS_EXTRA HAVE_GNUTLS PKG_CONFIG +EGREP +GREP +CPP MKOCTFILE ac_ct_CC CFLAGS @@ -1236,7 +1236,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures parallel 3.0.2 to adapt to many kinds of systems. +\`configure' configures parallel 3.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1297,7 +1297,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 3.0.2:";; + short | recursive ) echo "Configuration of parallel 3.0.3:";; esac cat <<\_ACEOF @@ -1379,7 +1379,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 3.0.2 +parallel configure 3.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1469,52 +1469,6 @@ } # ac_fn_c_try_compile -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -1716,6 +1670,52 @@ } # ac_fn_c_check_header_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache @@ -1970,7 +1970,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by parallel $as_me 3.0.2, which was +It was created by parallel $as_me 3.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3409,183 +3409,6 @@ # Checks for libraries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5 -$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; } -if ${ac_cv_lib_gnutls_gnutls_global_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgnutls $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gnutls_global_init (); -int -main () -{ -return gnutls_global_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gnutls_gnutls_global_init=yes -else - ac_cv_lib_gnutls_gnutls_global_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5 -$as_echo "$ac_cv_lib_gnutls_gnutls_global_init" >&6; } -if test "x$ac_cv_lib_gnutls_gnutls_global_init" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGNUTLS 1 -_ACEOF - - LIBS="-lgnutls $LIBS" - -fi - -if test "x$ac_cv_lib_gnutls_gnutls_global_init" = "xyes"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="pkg-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test -z "$PKG_CONFIG"; then - HAVE_GNUTLS=no - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS disabled since pkg-config not found" >&5 -$as_echo "$as_me: WARNING: TLS disabled since pkg-config not found" >&2;} - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <gnutls/gnutls.h> - #include <stdio.h> -int -main () -{ -printf ("%u", gnutls_srp_2048_group_prime.size); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - $as_echo "#define HAVE_LIBGNUTLS 1" >>confdefs.h - - HAVE_GNUTLS=yes - -else - HAVE_GNUTLS=no - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS disabled since symbol gnutls_srp_2048_group_prime not found in gnutls library - built with --disable-srp-authentication?" >&5 -$as_echo "$as_me: WARNING: TLS disabled since symbol gnutls_srp_2048_group_prime not found in gnutls library - built with --disable-srp-authentication?" >&2;} -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init_extra in -lgnutls-extra" >&5 -$as_echo_n "checking for gnutls_global_init_extra in -lgnutls-extra... " >&6; } -if ${ac_cv_lib_gnutls_extra_gnutls_global_init_extra+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgnutls-extra $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gnutls_global_init_extra (); -int -main () -{ -return gnutls_global_init_extra (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gnutls_extra_gnutls_global_init_extra=yes -else - ac_cv_lib_gnutls_extra_gnutls_global_init_extra=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_extra_gnutls_global_init_extra" >&5 -$as_echo "$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" >&6; } -if test "x$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGNUTLS_EXTRA 1 -_ACEOF - - LIBS="-lgnutls-extra $LIBS" - -fi - - if test "x$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" = "xyes"; then - $as_echo "#define HAVE_LIBGNUTLS_EXTRA 1" >>confdefs.h - - HAVE_GNUTLS_EXTRA=yes - - else - HAVE_GNUTLS_EXTRA=no - - fi -else - HAVE_GNUTLS=no - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS disabled since no gnutls library found" >&5 -$as_echo "$as_me: WARNING: TLS disabled since no gnutls library found" >&2;} -fi - -# Checks for header files. ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3983,6 +3806,184 @@ done +ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" +if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : + +fi + + +if test "x$ac_cv_header_gnutls_gnutls_h" = "xno"; then + as_fn_error $? "gnutls/gnutls.h not found or not compilable" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5 +$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; } +if ${ac_cv_lib_gnutls_gnutls_global_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgnutls $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gnutls_global_init (); +int +main () +{ +return gnutls_global_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gnutls_gnutls_global_init=yes +else + ac_cv_lib_gnutls_gnutls_global_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5 +$as_echo "$ac_cv_lib_gnutls_gnutls_global_init" >&6; } +if test "x$ac_cv_lib_gnutls_gnutls_global_init" = xyes; then : + echo -n "" +fi + +if test "x$ac_cv_lib_gnutls_gnutls_global_init" = "xyes"; then + LIBS="-lgnutls $LIBS" + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PKG_CONFIG="pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -z "$PKG_CONFIG"; then + HAVE_GNUTLS=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS disabled since pkg-config not found" >&5 +$as_echo "$as_me: WARNING: TLS disabled since pkg-config not found" >&2;} + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <gnutls/gnutls.h> + #include <stdio.h> +int +main () +{ +printf ("%u", gnutls_srp_2048_group_prime.size); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + $as_echo "#define HAVE_LIBGNUTLS 1" >>confdefs.h + + HAVE_GNUTLS=yes + +else + HAVE_GNUTLS=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS disabled since symbol gnutls_srp_2048_group_prime not found in gnutls library - built with --disable-srp-authentication?" >&5 +$as_echo "$as_me: WARNING: TLS disabled since symbol gnutls_srp_2048_group_prime not found in gnutls library - built with --disable-srp-authentication?" >&2;} +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init_extra in -lgnutls-extra" >&5 +$as_echo_n "checking for gnutls_global_init_extra in -lgnutls-extra... " >&6; } +if ${ac_cv_lib_gnutls_extra_gnutls_global_init_extra+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgnutls-extra $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gnutls_global_init_extra (); +int +main () +{ +return gnutls_global_init_extra (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gnutls_extra_gnutls_global_init_extra=yes +else + ac_cv_lib_gnutls_extra_gnutls_global_init_extra=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_extra_gnutls_global_init_extra" >&5 +$as_echo "$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" >&6; } +if test "x$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" = xyes; then : + echo -n "" +fi + + if test "x$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" = "xyes"; then + LIBS="-lgnutls-extra $LIBS" + $as_echo "#define HAVE_LIBGNUTLS_EXTRA 1" >>confdefs.h + + HAVE_GNUTLS_EXTRA=yes + + else + HAVE_GNUTLS_EXTRA=no + + fi +else + HAVE_GNUTLS=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: TLS disabled since no gnutls library found" >&5 +$as_echo "$as_me: WARNING: TLS disabled since no gnutls library found" >&2;} +fi + +# Checks for header files. for ac_header in arpa/inet.h fcntl.h limits.h malloc.h sys/malloc.h netdb.h netinet/in.h stdio_ext.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -5118,7 +5119,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by parallel $as_me 3.0.2, which was +This file was extended by parallel $as_me 3.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5180,7 +5181,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -parallel config.status 3.0.2 +parallel config.status 3.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/configure.ac new/parallel-3.0.3/src/configure.ac --- old/parallel-3.0.2/src/configure.ac 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/configure.ac 2015-10-29 14:16:11.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.62) -AC_INIT(parallel, 3.0.2, i7tiol(a)t-online.de) +AC_INIT(parallel, 3.0.3, i7tiol(a)t-online.de) AC_CONFIG_SRCDIR([pconnect.cc]) AC_CONFIG_HEADERS([config.h]) @@ -12,8 +12,13 @@ AC_CHECK_PROG(MKOCTFILE, mkoctfile, mkoctfile) # Checks for libraries. -AC_CHECK_LIB([gnutls], [gnutls_global_init], []) +AC_CHECK_HEADER([gnutls/gnutls.h]) +if test "x$ac_cv_header_gnutls_gnutls_h" = "xno"; then + AC_MSG_ERROR([gnutls/gnutls.h not found or not compilable]) +fi +AC_CHECK_LIB([gnutls], [gnutls_global_init], [[echo -n ""]]) if test "x$ac_cv_lib_gnutls_gnutls_global_init" = "xyes"; then + LIBS="-lgnutls $LIBS" AC_CHECK_PROG(PKG_CONFIG, pkg-config, pkg-config) if test -z "$PKG_CONFIG"; then AC_SUBST([HAVE_GNUTLS], [no]) @@ -28,8 +33,9 @@ [AC_SUBST([HAVE_GNUTLS], [no]) AC_MSG_WARN([TLS disabled since symbol gnutls_srp_2048_group_prime not found in gnutls library - built with --disable-srp-authentication?])]) fi - AC_CHECK_LIB([gnutls-extra], [gnutls_global_init_extra], []) + AC_CHECK_LIB([gnutls-extra], [gnutls_global_init_extra], [[echo -n ""]]) if test "x$ac_cv_lib_gnutls_extra_gnutls_global_init_extra" = "xyes"; then + LIBS="-lgnutls-extra $LIBS" AC_DEFINE([HAVE_LIBGNUTLS_EXTRA], 1) AC_SUBST([HAVE_GNUTLS_EXTRA], [yes]) else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/network_get_info.cc new/parallel-3.0.3/src/network_get_info.cc --- old/parallel-3.0.2/src/network_get_info.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/network_get_info.cc 2015-10-29 14:16:11.000000000 +0100 @@ -48,10 +48,26 @@ DEFUN_DLD (network_get_info, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} network_get_info (@var{connections})\n\ +@deftypefn {Loadable Function} {} network_get_info (@var{connections})\n\ Return an informational structure-array with one entry for each machine specified by @var{connections}.\n\ -This function can only be successfully called at the client machine. See @code{pconnect} for a description of the @var{connections} variable. @var{connections} can contain all connections of the network, a subset of them, or a single connection. For the local machine (client), if contained in @var{connections}, some fields of the returned structure may be empty.\n\n\ -The fields of the returned structure are @code{local_machine}: true for the connection representing the local machine, @code{nproc}: number of usable processors of the machine, @code{nlocaljobs}: configured number of local processes on the machine, @code{peername}: name of the machine (empty for local machine), @code{open}: true if the connection is open, @code{network_id}: uuid of the network, @code{real_node_id}: internal id assigned to node, @code{0} for client, servers starting with @code{1}.\n\n\ +\n\ +This function can only be successfully called at the client\n\ +machine. See @code{pconnect} for a description of the\n\ +@var{connections} variable. @var{connections} can contain all\n\ +connections of the network, a subset of them, or a single\n\ +connection. For the local machine (client), if contained in\n\ +@var{connections}, some fields of the returned structure may be\n\ +empty.\n\ +\n\ +The fields of the returned structure are @code{local_machine}: true\n\ +for the connection representing the local machine, @code{nproc}:\n\ +number of usable processors of the machine, @code{nlocaljobs}:\n\ +configured number of local processes on the machine, @code{peername}:\n\ +name of the machine (empty for local machine), @code{open}: true if\n\ +the connection is open, @code{network_id}: uuid of the network,\n\ +@code{real_node_id}: internal id assigned to node, @code{0} for\n\ +client, servers starting with @code{1}.\n\ +\n\ @seealso{pconnect, pserver, reval, psend, precv, sclose, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/network_set.cc new/parallel-3.0.3/src/network_set.cc --- old/parallel-3.0.2/src/network_set.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/network_set.cc 2015-10-29 14:16:11.000000000 +0100 @@ -48,10 +48,20 @@ DEFUN_DLD (network_set, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} network_set (@var{connections}, @var{key}, @var{val})\n\ +@deftypefn {Loadable Function} {} network_set (@var{connections}, @var{key}, @var{val})\n\ Set the property named by @var{key} to the value @var{val} for each machine specified by @var{connections}.\n\ -This function can only be successfully called at the client machine. See @code{pconnect} for a description of the @var{connections} variable. @var{connections} can contain all connections of the network, a subset of them, or a single connection.\n\n\ -Possible values of @var{key}: @code{'nlocaljobs'}: configured number of local processes on the machine (usable by functions for parallel execution); needs a non-negative integer in @var{val}, @code{0} means not specified.\n\n\ +\n\ +This function can only be successfully called at the client\n\ +machine. See @code{pconnect} for a description of the\n\ +@var{connections} variable. @var{connections} can contain all\n\ +connections of the network, a subset of them, or a single\n\ +connection.\n\ +\n\ +Possible values of @var{key}: @code{'nlocaljobs'}: configured number\n\ +of local processes on the machine (usable by functions for parallel\n\ +execution); needs a non-negative integer in @var{val}, @code{0} means\n\ +not specified.\n\ +\n\ @seealso{pconnect, pserver, reval, psend, precv, sclose, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/parallel_generate_srp_data.cc new/parallel-3.0.3/src/parallel_generate_srp_data.cc --- old/parallel-3.0.2/src/parallel_generate_srp_data.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/parallel_generate_srp_data.cc 2015-10-29 14:16:11.000000000 +0100 @@ -37,9 +37,19 @@ \n\ @code{fullfile (a = pkg (\"prefix\"), \"parallel-srp-data\")}\n\ \n\ -Server files are placed in subdirectory @code{server}. By default, a client authentication file is placed in subdirectory @code{client}. The latter contains the given @var{username} and the cleartext password. You do not nead this file if you prefer to be prompted for username and password at connection time. In this case, you can prevent the client authentication file from being written by passing as the argument @var{options} a structure with a value of @code{false} in the field @code{unattended}.\n\ -\n\ -For authentication, subdir @code{server}, and possibly subdir @code{client}, have to be placed together with their contents at the respective machines. They can either be placed under the directory given by:\n\ +Server files are placed in subdirectory @code{server}. By default, a\n\ +client authentication file is placed in subdirectory\n\ +@code{client}. The latter contains the given @var{username} and the\n\ +cleartext password. You do not need this file if you prefer to be\n\ +prompted for username and password at connection time. In this case,\n\ +you can prevent the client authentication file from being written by\n\ +passing as the argument @var{options} a structure with a value of\n\ +@code{false} in the field @code{unattended}.\n\ +\n\ +For authentication, subdir @code{server}, and possibly subdir\n\ +@code{client}, have to be placed together with their contents at the\n\ +respective machines. They can either be placed under the directory\n\ +given by:\n\ \n\ @code{fullfile (OCTAVE_HOME (), \"share\", \"octave\", \"parallel-srp-data\")}\n\ \n\ @@ -47,9 +57,14 @@ \n\ @code{fullfile (a = pkg (\"prefix\"), \"parallel-srp-data\")}\n\ \n\ -Files in the former directory will take precedence over those in the latter. The contents of the files @code{passwd} and @code{user_passwd} (if present) must be kept secret.\n\ -\n\ -This function zeroizes sensitive data before releasing its memory. Due to usage of external libraries, however, it still can't be excluded that sensitive data is still on the swap device after application shutdown.\n\ +Files in the former directory will take precedence over those in the\n\ +latter. The contents of the files @code{passwd} and @code{user_passwd}\n\ +(if present) must be kept secret.\n\ +\n\ +This function zeroizes sensitive data before releasing its memory. Due\n\ +to usage of external libraries, however, it still can't be excluded\n\ +that sensitive data is still on the swap device after application\n\ +shutdown.\n\ \n\ @seealso{pconnect, pserver, reval, psend, precv, sclose, select_sockets}\n\ @end deftypefn") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/pconnect.cc new/parallel-3.0.3/src/pconnect.cc --- old/parallel-3.0.2/src/pconnect.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/pconnect.cc 2015-10-29 14:16:11.000000000 +0100 @@ -53,15 +53,73 @@ @deftypefn {Loadable Function} {@var{connections} =} pconnect (@var{hosts})\n\ @deftypefnx {Loadable Function} {@var{connections} =} pconnect (@var{hosts}, @var{options})\n\ Connects to a network of parallel cluster servers.\n\ -As a precondition, a server must have been started at each machine of the cluster, see @code{pserver}.\n\n\ -@var{hosts} is a cell-array of strings, holding the names of all server machines. The machines must be unique, and their names must be resolvable to the correct addresses also at each server machine, not only at the client. This means e.g. that the name @code{localhost} is not acceptable (exception: @code{localhost} is acceptable as the first of all names).\n\n\ -Alternatively, but deprecated, @var{hosts} can be given as previously, as a character array with a machine name in each row. If it is given in this way, the first row must contain the name of the client machine (for backwards compatibility), so that there is one row more than the now prefered cell-array @var{hosts} would have entries.\n\n\ -@code{pconnect} returns an opaque variable holding the network connections. This variable can be indexed to obtain a subset of connections or even a single connection. (For backwards compatibility, a second index of @code{:} is allowed, which has no effect). At the first index position is the client machine, so this position does not correspond to a real connection. At the following index positions are the server machines in the same order as specified in the cell-array @var{hosts}. So in the whole the variable of network connections has one position more than the number of servers given in @var{hosts} (except if @var{hosts} was given in the above mentioned deprecated way). You can display the variable of network connections to see what is in it. The variable of network connections, or subsets of it, is passed to the other functions for parallel cluster excecution (@code{reval}, @code{psend}, @code{precv}, @code{sclose}, @code{select_sockets} among others -- see documentation of these functions).\n\n\ -@var{options}: structure of options; field @code{use_tls} is @code{true} by default (TLS with SRP authentication); if set to @code{false}, there will be no encryption or authentication. Field @code{password_file} can be set to an alternative path to the file with authentication information (see below). Field @code{user} can specify the username for authentication; if the username is so specified, no file with authentication information will be used at the client, but the password will be queried from the user.\n\n\ -The client and the server must both use or both not use TLS. If TLS is switched off, different measures must be taken to protect ports 12501 and 12502 at the servers and the client against unauthorized access; e.g. by a firewall or by physical isolation of the network.\n\n\ -For using TLS, authorization data must be present at the server machine. These data can conveniently be generated by @code{parallel_generate_srp_data}. By default, the client authentication file is created in the same run. The helptext of @code{parallel_generate_srp_data} documents the expected locations of the authentication data.\n\n\ -The SRP password will be sent over the encrypted TLS channel from the client to each server, to avoid permanently storing passwords at the server for server-to-server data connections. Due to inevitable usage of external libraries, memory with sensitive data can, however, be on the swap device even after shutdown of the application, both at the client and at the server machines.\n\n\ -Example (let data travel through all machines), assuming @code{pserver} was called on each remote machine and authentication data is present (e.g. generated with @code{parallel_generate_srp_data}):\n\n\ +\n\ +As a precondition, a server must have been started at each machine of\n\ +the cluster, see @code{pserver}.\n\ +\n\ +@var{hosts} is a cell-array of strings, holding the names of all\n\ +server machines. The machines must be unique, and their names must be\n\ +resolvable to the correct addresses also at each server machine, not\n\ +only at the client. This means e.g. that the name @code{localhost} is\n\ +not acceptable (exception: @code{localhost} is acceptable as the first\n\ +of all names).\n\ +\n\ +Alternatively, but deprecated, @var{hosts} can be given as previously,\n\ +as a character array with a machine name in each row. If it is given\n\ +in this way, the first row must contain the name of the client machine\n\ +(for backwards compatibility), so that there is one row more than the\n\ +now preferred cell-array @var{hosts} would have entries.\n\ +\n\ +@code{pconnect} returns an opaque variable holding the network\n\ +connections. This variable can be indexed to obtain a subset of\n\ +connections or even a single connection. (For backwards compatibility,\n\ +a second index of @code{:} is allowed, which has no effect). At the\n\ +first index position is the client machine, so this position does not\n\ +correspond to a real connection. At the following index positions are\n\ +the server machines in the same order as specified in the cell-array\n\ +@var{hosts}. So in the whole the variable of network connections has\n\ +one position more than the number of servers given in @var{hosts}\n\ +(except if @var{hosts} was given in the above mentioned deprecated\n\ +way). You can display the variable of network connections to see what\n\ +is in it. The variable of network connections, or subsets of it, is\n\ +passed to the other functions for parallel cluster excecution\n\ +(@code{reval}, @code{psend}, @code{precv}, @code{sclose},\n\ +@code{select_sockets} among others -- see documentation of these\n\ +functions).\n\ +\n\ +@var{options}: structure of options; field @code{use_tls} is\n\ +@code{true} by default (TLS with SRP authentication); if set to\n\ +@code{false}, there will be no encryption or authentication. Field\n\ +@code{password_file} can be set to an alternative path to the file\n\ +with authentication information (see below). Field @code{user} can\n\ +specify the username for authentication; if the username is so\n\ +specified, no file with authentication information will be used at the\n\ +client, but the password will be queried from the user.\n\ +\n\ +The client and the server must both use or both not use TLS. If TLS is\n\ +switched off, different measures must be taken to protect ports 12501\n\ +and 12502 at the servers and the client against unauthorized access;\n\ +e.g. by a firewall or by physical isolation of the network.\n\ +\n\ +For using TLS, authorization data must be present at the server\n\ +machine. These data can conveniently be generated by\n\ +@code{parallel_generate_srp_data}. By default, the client\n\ +authentication file is created in the same run. The helptext of\n\ +@code{parallel_generate_srp_data} documents the expected locations of\n\ +the authentication data.\n\ +\n\ +The SRP password will be sent over the encrypted TLS channel from the\n\ +client to each server, to avoid permanently storing passwords at the\n\ +server for server-to-server data connections. Due to inevitable usage\n\ +of external libraries, memory with sensitive data can, however, be on\n\ +the swap device even after shutdown of the application, both at the\n\ +client and at the server machines.\n\ +\n\ +Example (let data travel through all machines), assuming\n\ +@code{pserver} was called on each remote machine and authentication\n\ +data is present (e.g. generated with\n\ +@code{parallel_generate_srp_data}):\n\ +\n\ @example\n\ @group\n\ sockets = pconnect (@{'remote.machine.1', 'remote.machine.2'@});\n\ @@ -72,7 +130,8 @@ --> ans = some data\n\ sclose (sockets);\n\ @end group\n\ -@end example\n\n\ +@end example\n\ +\n\ @seealso{pserver, reval, psend, precv, sclose, parallel_generate_srp_data, select_sockets, rfefal}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/precv.cc new/parallel-3.0.3/src/precv.cc --- old/parallel-3.0.2/src/precv.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/precv.cc 2015-10-29 14:16:11.000000000 +0100 @@ -33,11 +33,27 @@ DEFUN_DLD (precv, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} precv (@var{single_connection})\n\ +@deftypefn {Loadable Function} {} precv (@var{single_connection})\n\ Receive a data value from the parallel cluster machine specified by @var{single_connection}.\n\ -This function can be called both at the client machine and (with @code{reval}) at a server machine. @var{single_connection} must be a single connection obtained by indexing the @var{connections} variable. Please see @code{pconnect} for a description of the @var{connections} variable, and @code{pserver} for a description of this variable (named @code{sockets}) at the server side. If @var{single_connection} corresponds to the machine at which @code{precv} was called, an error is thrown.\n\n\ -The value received with @code{precv} must be sent with @code{send} from another machine of the cluster. Note that data can be transfered this way between each pair of machines, even sent by a server and received by a different server.\n\n\ -if @code{precv} is called at the client machine, ac corresponding @code{send} should have been called before at the source machine, otherwise the client will hang.\n\n\ +\n\ +This function can be called both at the client machine and (with\n\ +@code{reval}) at a server machine. @var{single_connection} must be a\n\ +single connection obtained by indexing the @var{connections}\n\ +variable. Please see @code{pconnect} for a description of the\n\ +@var{connections} variable, and @code{pserver} for a description of\n\ +this variable (named @code{sockets}) at the server side. If\n\ +@var{single_connection} corresponds to the machine at which\n\ +@code{precv} was called, an error is thrown.\n\ +\n\ +The value received with @code{precv} must be sent with @code{psend}\n\ +from another machine of the cluster. Note that data can be transferred\n\ +this way between each pair of machines, even sent by a server and\n\ +received by a different server.\n\ +\n\ +If @code{precv} is called at the client machine, a corresponding\n\ +@code{psend} should have been called before at the source machine,\n\ +otherwise the client will hang.\n\ +\n\ @seealso{pconnect, pserver, reval, psend, sclose, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/psend.cc new/parallel-3.0.3/src/psend.cc --- old/parallel-3.0.2/src/psend.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/psend.cc 2015-10-29 14:16:11.000000000 +0100 @@ -36,11 +36,27 @@ DEFUN_DLD (psend, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} psend (@var{value}, @var{connections})\n\ +@deftypefn {Loadable Function} {} psend (@var{value}, @var{connections})\n\ Send the value in variable @var{value} to all parallel cluster machines specified by @var{connections}.\n\ -This function can be called both at the client machine and (with @code{reval}) at a server machine. See @code{pconnect} for a description of the @var{connections} variable, and @code{pserver} for a description of this variable (named @code{sockets}) at the server side. @var{connections} can contain all connections of the network, a subset of them, or a single connection. The machine at which @code{send} was called (client or server), if contained in the @var{connections} variable, is ignored.\n\n\ -The value sent with @code{psend} must be received with @code{recv} at the target machine. Note that values can be sent to each machine, even from a server machine to a different server machine.\n\n\ -If @code{psend} is called at the client machine, a corresponding @code{recv} should have been called before at the target machine, otherwise the client will hang if @var{value} contains large data (which can not be held by the operating systems socket buffers).\n\n\ +\n\ +This function can be called both at the client machine and (with\n\ +@code{reval}) at a server machine. See @code{pconnect} for a\n\ +description of the @var{connections} variable, and @code{pserver} for\n\ +a description of this variable (named @code{sockets}) at the server\n\ +side. @var{connections} can contain all connections of the network, a\n\ +subset of them, or a single connection. The machine at which\n\ +@code{psend} was called (client or server), if contained in the\n\ +@var{connections} variable, is ignored.\n\ +\n\ +The value sent with @code{psend} must be received with @code{precv} at\n\ +the target machine. Note that values can be sent to each machine, even\n\ +from a server machine to a different server machine.\n\ +\n\ +If @code{psend} is called at the client machine, a corresponding\n\ +@code{precv} should have been called before at the target machine,\n\ +otherwise the client will hang if @var{value} contains large data\n\ +(which can not be held by the operating systems socket buffers).\n\ +\n\ @seealso{pconnect, pserver, reval, precv, sclose, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/pserver.cc new/parallel-3.0.3/src/pserver.cc --- old/parallel-3.0.2/src/pserver.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/pserver.cc 2015-10-29 14:16:11.000000000 +0100 @@ -234,18 +234,65 @@ DEFUN_DLD (pserver, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} pserver ()\n\ -@deftypefnx {Loadable Function} pserver (@var{options})\n\ +@deftypefn {Loadable Function} {} pserver ()\n\ +@deftypefnx {Loadable Function} {} pserver (@var{options})\n\ This function starts a server of the parallel cluster and should be called once at any server machine.\n\ -It is important to call this function in a way assuring that Octave is quit as soon as the function returns, i.e. call it e.g. like @code{octave --eval \"pserver\"} or @code{octave --eval \"pserver (struct ('fieldname', value))\"}.\n\n\ -If a directory path corresponding to the current directory of the client exists on the server machine, it will be used as the servers current directory for the respective client (multiple clients are possible). Otherwise, @code{/tmp} will be used. The Octave functions the server is supposed to call and the files it possibly has to access must be available at the server machine. This can e.g. be achieved by having the server machine mount a network file system (which is outside the scope of this package documentation).\n\n\ -The parent server process can only be terminated by sending it a signal. The pid of this process, as long as it is running, will be stored in the file @code{/tmp/.octave-<hostname>.pid}.\n\n\ -If a connection is accepted from a client, the server collects a network identifier and the names of all server machines of the network from the client. Then, connections are automatically established between all machines of the network. Data exchange will be possible between all machines (client or server) in both directions. Commands can only be sent from the client to any server.\n\n\ -The opaque variable holding the network connections, in the same order as in the corresponding variable returned by @code{pconnect}, is accessible under the variable name @code{sockets} at the server side. Do not overwrite or clear this variable. The own server machine will also be contained at some index position of this variable, but will not correspond to a real connection. See @code{pconnect} for further information.\n\n\ -@var{options}: structure of options; field @code{use_tls} is @code{true} by default (TLS with SRP authentication); if set to @code{false}, there will be no encryption or authentication. Field @code{auth_file} can be set to an alternative path to the file with authentication information (see below).\n\n\ -The client and the server must both use or both not use TLS. If TLS is switched off, different measures must be taken to protect ports 12501 and 12502 at the servers and the client against unauthorized access; e.g. by a firewall or by physical isolation of the network.\n\n\ -For using TLS, authorization data must be present at the server machine. These data can conveniently be generated by @code{parallel_generate_srp_data}; the helptext of the latter function documents the expected location of these data.\n\n\ -The SRP password will be sent over the encrypted TLS channel from the client to each server, to avoid permanently storing passwords at the server for server-to-server data connections. Due to inevitable usage of external libraries, memory with sensitive data can, however, be on the swap device even after shutdown of the application.\n\n\ +\n\ +It is important to call this function in a way assuring that Octave is\n\ +quit as soon as the function returns, i.e. call it e.g. like\n\ +@code{octave --eval \"pserver\"} or @code{octave --eval \"pserver\n\ +(struct ('fieldname', value))\"}.\n\ +\n\ +If a directory path corresponding to the current directory of the\n\ +client exists on the server machine, it will be used as the servers\n\ +current directory for the respective client (multiple clients are\n\ +possible). Otherwise, @code{/tmp} will be used. The Octave functions\n\ +the server is supposed to call and the files it possibly has to access\n\ +must be available at the server machine. This can e.g. be achieved by\n\ +having the server machine mount a network file system (which is\n\ +outside the scope of this package documentation).\n\ +\n\ +The parent server process can only be terminated by sending it a\n\ +signal. The pid of this process, as long as it is running, will be\n\ +stored in the file @code{/tmp/.octave-<hostname>.pid}.\n\ +\n\ +If a connection is accepted from a client, the server collects a\n\ +network identifier and the names of all server machines of the network\n\ +from the client. Then, connections are automatically established\n\ +between all machines of the network. Data exchange will be possible\n\ +between all machines (client or server) in both directions. Commands\n\ +can only be sent from the client to any server.\n\ +\n\ +The opaque variable holding the network connections, in the same order\n\ +as in the corresponding variable returned by @code{pconnect}, is\n\ +accessible under the variable name @code{sockets} at the server\n\ +side. Do not overwrite or clear this variable. The own server machine\n\ +will also be contained at some index position of this variable, but\n\ +will not correspond to a real connection. See @code{pconnect} for\n\ +further information.\n\ +\n\ +@var{options}: structure of options; field @code{use_tls} is\n\ +@code{true} by default (TLS with SRP authentication); if set to\n\ +@code{false}, there will be no encryption or authentication. Field\n\ +@code{auth_file} can be set to an alternative path to the file with\n\ +authentication information (see below).\n\ +\n\ +The client and the server must both use or both not use TLS. If TLS is\n\ +switched off, different measures must be taken to protect ports 12501\n\ +and 12502 at the servers and the client against unauthorized access;\n\ +e.g. by a firewall or by physical isolation of the network.\n\ +\n\ +For using TLS, authorization data must be present at the server\n\ +machine. These data can conveniently be generated by\n\ +@code{parallel_generate_srp_data}; the helptext of the latter function\n\ +documents the expected location of these data.\n\ +\n\ +The SRP password will be sent over the encrypted TLS channel from the\n\ +client to each server, to avoid permanently storing passwords at the\n\ +server for server-to-server data connections. Due to inevitable usage\n\ +of external libraries, memory with sensitive data can, however, be on\n\ +the swap device even after shutdown of the application.\n\ +\n\ @seealso{pconnect, reval, psend, precv, sclose, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/reval.cc new/parallel-3.0.3/src/reval.cc --- old/parallel-3.0.2/src/reval.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/reval.cc 2015-10-29 14:16:11.000000000 +0100 @@ -48,9 +48,19 @@ DEFUN_DLD (reval, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} reval (@var{commands}, @var{connections})\n\ +@deftypefn {Loadable Function} {} reval (@var{commands}, @var{connections})\n\ Evaluate @var{commands} at all remote hosts specified by @var{connections}.\n\ -This function can only be successfully called at the client machine. @var{commands} must be a string containing Octave commands suitable for execution with Octaves @code{eval()} function. See @code{pconnect} for a description of the @var{connections} variable. @var{connections} can contain all connections of the network, a subset of them, or a single connection. The local machine (client), if contained in @var{connections}, is ignored. @var{commands} is executed in the same way at each specified machine.\n\n\ +\n\ +This function can only be successfully called at the client\n\ +machine. @var{commands} must be a string containing Octave commands\n\ +suitable for execution with Octaves @code{eval()} function. See\n\ +@code{pconnect} for a description of the @var{connections}\n\ +variable. @var{connections} can contain all connections of the\n\ +network, a subset of them, or a single connection. The local machine\n\ +(client), if contained in @var{connections}, is\n\ +ignored. @var{commands} is executed in the same way at each specified\n\ +machine.\n\ +\n\ @seealso{pconnect, pserver, psend, precv, sclose, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/sclose.cc new/parallel-3.0.3/src/sclose.cc --- old/parallel-3.0.2/src/sclose.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/sclose.cc 2015-10-29 14:16:11.000000000 +0100 @@ -48,9 +48,13 @@ DEFUN_DLD (sclose, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} sclose (@var{connections})\n\ +@deftypefn {Loadable Function} {} sclose (@var{connections})\n\ Close the parallel cluster network to which @var{connections} belongs.\n\ -See @code{pconnect} for a description of the @var{connections} variable. All connections of the network are closed, even if @var{connections} contains only a subnet or a single connection.\n\n\ +\n\ +See @code{pconnect} for a description of the @var{connections}\n\ +variable. All connections of the network are closed, even if\n\ +@var{connections} contains only a subnet or a single connection.\n\ +\n\ @seealso{pconnect, pserver, reval, psend, precv, parallel_generate_srp_data, select_sockets}\n\ @end deftypefn") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/select.cc new/parallel-3.0.3/src/select.cc --- old/parallel-3.0.2/src/select.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/select.cc 2015-10-29 14:16:11.000000000 +0100 @@ -30,6 +30,7 @@ "-*- texinfo -*-\n\ @deftypefn {Loadable Function} {[@var{n}, @var{ridx}, @var{widx}, @var{eidx}] =} select (@var{read_fids}, @var{write_fids}, @var{except_fids}, @var{timeout}[, @var{nfds}])\n\ Calls Unix @code{select}, see the respective manual.\n\ +\n\ The following interface was chosen:\n\ @var{read_fids}, @var{write_fids}, @var{except_fids}: vectors of stream-ids.\n\ @var{timeout}: seconds, negative for infinite.\n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parallel-3.0.2/src/select_sockets.cc new/parallel-3.0.3/src/select_sockets.cc --- old/parallel-3.0.2/src/select_sockets.cc 2015-07-16 17:56:32.000000000 +0200 +++ new/parallel-3.0.3/src/select_sockets.cc 2015-10-29 14:16:11.000000000 +0100 @@ -42,16 +42,34 @@ DEFUN_DLD (select_sockets, args, , "-*- texinfo -*-\n\ -@deftypefn {Loadable Function} select_sockets (@var{connections}, @var{timeout})\n\ -@deftypefnx {Loadable Function} select_sockets (@var{connections}, @var{timeout}, @var{nfds})\n\ -Calls Unix @code{select} for data connections in a parallel cluster.\n\n\ -This function is for advanced usage (and therefore has minimal documentation), typically the programming of schedulers. It can be called at the client or at a server.\n\n\ -@var{connections}: valid connections object (see @code{pconnect} and @code{pserver}, possibly indexed).\n\n\ -@var{timeout}: seconds, negative for infinite.\n\n\ -@var{nfds}: Passed to Unix @code{select} as first argument, see documentation of Uix @code{select}. Default: @code{FD_SETSIZE} (platform specific).\n\n\ -An error is returned if nfds or a watched filedescriptor plus one exceeds FD_SETSIZE.\n\n\ -Returns an index vector to @var{connections} indicating connections with pending input, readable with @code{precv}.\n\n\ -If called at the client, the command connections are included into the UNIX @code{select} call and checked for error flags, and @code{select_sockets} returns an error if a flag for a remote error is received.\n\n\ +@deftypefn {Loadable Function} {} select_sockets (@var{connections}, @var{timeout})\n\ +@deftypefnx {Loadable Function} {} select_sockets (@var{connections}, @var{timeout}, @var{nfds})\n\ +Calls Unix @code{select} for data connections in a parallel cluster.\n\ +\n\ +This function is for advanced usage (and therefore has minimal\n\ +documentation), typically the programming of schedulers. It can be\n\ +called at the client or at a server.\n\ +\n\ +@var{connections}: valid connections object (see @code{pconnect} and\n\ +@code{pserver}, possibly indexed).\n\ +\n\ +@var{timeout}: seconds, negative for infinite.\n\ +\n\ +@var{nfds}: Passed to Unix @code{select} as first argument, see\n\ +documentation of Uix @code{select}. Default: @code{FD_SETSIZE}\n\ +(platform specific).\n\ +\n\ +An error is returned if nfds or a watched filedescriptor plus one\n\ +exceeds FD_SETSIZE.\n\ +\n\ +Returns an index vector to @var{connections} indicating connections\n\ +with pending input, readable with @code{precv}.\n\ +\n\ +If called at the client, the command connections are included into the\n\ +UNIX @code{select} call and checked for error flags, and\n\ +@code{select_sockets} returns an error if a flag for a remote error is\n\ +received.\n\ +\n\ @seealso{pconnect, pserver, reval, psend, precv, sclose, parallel_generate_srp_data}\n\ @end deftypefn") {

1 0

commit open-vm-tools for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2015-11-02 12:55:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-vm-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2015-10-24 10:30:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2015-11-02 12:55:07.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 30 15:55:45 UTC 2015 - mlatimer(a)suse.com + +- Enable vgauth for openSUSE Leap 42.1 (bsc#952645) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.kSTcS3/_old 2015-11-02 12:55:08.000000000 +0100 +++ /var/tmp/diff_new_pack.kSTcS3/_new 2015-11-02 12:55:08.000000000 +0100 @@ -28,12 +28,16 @@ %bcond_with deploypkg %endif -# vgauth is enabled on versions > 13.2 (which include xml-security-c and xerces-c) -%if 0%{?suse_version} > 1320 +# vgauth is enabled for openSUSE Factory, Leap 42.1 and SLES12SP1 (which include xml-security-c and xerces-c) +%if 0%{?is_opensuse} && 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1320 +%bcond_without vgauth +%else +%if 0%{?sle_version} >= 0120100 %bcond_without vgauth %else %bcond_with vgauth %endif +%endif # exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554] %define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'

1 0

commit vdr-plugin-satip for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package vdr-plugin-satip for openSUSE:Factory checked in at 2015-11-02 12:55:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vdr-plugin-satip (Old) and /work/SRC/openSUSE:Factory/.vdr-plugin-satip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vdr-plugin-satip" Changes: -------- --- /work/SRC/openSUSE:Factory/vdr-plugin-satip/vdr-plugin-satip.changes 2015-05-18 22:32:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vdr-plugin-satip.new/vdr-plugin-satip.changes 2015-11-02 12:55:06.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 28 19:45:46 UTC 2015 - seife+obs(a)b1-systems.com + +- update to version 2.2.3 (2015-09-18) + * Added a timeout for releasing idling devices + * Reset the RTSP connection after any failed connect + * Added tweaks for minisatip and Schwaiger MS41IP + +------------------------------------------------------------------- Old: ---- vdr-satip-2.2.2.tgz New: ---- vdr-satip-2.2.3.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr-plugin-satip.spec ++++++ --- /var/tmp/diff_new_pack.98SRik/_old 2015-11-02 12:55:07.000000000 +0100 +++ /var/tmp/diff_new_pack.98SRik/_new 2015-11-02 12:55:07.000000000 +0100 @@ -18,7 +18,7 @@ Name: vdr-plugin-satip -Version: 2.2.2 +Version: 2.2.3 Release: 0 Summary: SAT>IP Input Plugin for the Video Disc Recorder VDR License: GPL-2.0 ++++++ vdr-satip-2.2.2.tgz -> vdr-satip-2.2.3.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/HISTORY new/satip-2.2.3/HISTORY --- old/satip-2.2.2/HISTORY 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/HISTORY 2015-09-18 03:20:00.000000000 +0200 @@ -137,3 +137,10 @@ interface. - Added new ATTA and DETA SVDRP commands. - Set the default device count to two. + +2015-09-18: Version 2.2.3 + +- Added a timeout for releasing idling devices. +- Reset the RTSP connection after any failed connect. +- Added tweaks for minisatip and Schwaiger MS41IP. +- Updated for vdr-2.3.1 (Thanks to Klaus Schmidinger). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/device.c new/satip-2.2.3/device.c --- old/satip-2.2.2/device.c 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/device.c 2015-09-18 03:20:00.000000000 +0200 @@ -103,7 +103,12 @@ bool live = (device == cDevice::ActualDevice()); bool lock = device->HasLock(); const cChannel *channel = device->GetCurrentlyTunedTransponder(); +#if defined(APIVERSNUM) && APIVERSNUM >= 20301 + LOCK_TIMERS_READ; + for (const cTimer *timer = Timers->First(); timer; timer = Timers->Next(timer)) { +#else for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) { +#endif if (timer->Recording()) { cRecordControl *control = cRecordControls::GetRecordControl(timer); if (control && control->Device() == device) @@ -128,13 +133,20 @@ cString cSatipDevice::GetGeneralInformation(void) { debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM); +#if defined(APIVERSNUM) && APIVERSNUM >= 20301 + LOCK_CHANNELS_READ; +#endif return cString::sprintf("SAT>IP device: %d\nCardIndex: %d\nStream: %s\nSignal: %s\nStream bitrate: %s\n%sChannel: %s", deviceIndexM, CardIndex(), pTunerM ? *pTunerM->GetInformation() : "", pTunerM ? *pTunerM->GetSignalStatus() : "", pTunerM ? *pTunerM->GetTunerStatistic() : "", *GetBufferStatistic(), +#if defined(APIVERSNUM) && APIVERSNUM >= 20301 + *Channels->GetByNumber(cDevice::CurrentChannel())->ToText()); +#else *Channels.GetByNumber(cDevice::CurrentChannel())->ToText()); +#endif } cString cSatipDevice::GetPidsInformation(void) @@ -350,7 +362,7 @@ bool cSatipDevice::SetPid(cPidHandle *handleP, int typeP, bool onP) { - debug12("%s (%d, %d, %d) [device %u]", __PRETTY_FUNCTION__, handleP->pid, typeP, onP, deviceIndexM); + debug12("%s (%d, %d, %d) [device %u]", __PRETTY_FUNCTION__, handleP ? handleP->pid : -1, typeP, onP, deviceIndexM); if (pTunerM && handleP && handleP->pid >= 0) { if (onP) return pTunerM->SetPid(handleP->pid, typeP, true); @@ -460,6 +472,11 @@ return slot; } +bool cSatipDevice::IsIdle(void) +{ + return !Receiving(); +} + uchar *cSatipDevice::GetData(int *availableP) { debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/device.h new/satip-2.2.3/device.h --- old/satip-2.2.2/device.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/device.h 2015-09-18 03:20:00.000000000 +0200 @@ -43,7 +43,7 @@ // constructor & destructor public: - cSatipDevice(unsigned int deviceIndexP); + explicit cSatipDevice(unsigned int deviceIndexP); virtual ~cSatipDevice(); cString GetInformation(unsigned int pageP = SATIP_DEVICE_INFO_ALL); @@ -110,6 +110,7 @@ virtual int GetId(void); virtual int GetPmtPid(void); virtual int GetCISlot(void); + virtual bool IsIdle(void); }; #endif // __SATIP_DEVICE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/deviceif.h new/satip-2.2.3/deviceif.h --- old/satip-2.2.2/deviceif.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/deviceif.h 2015-09-18 03:20:00.000000000 +0200 @@ -16,9 +16,10 @@ virtual int GetId(void) = 0; virtual int GetPmtPid(void) = 0; virtual int GetCISlot(void) = 0; + virtual bool IsIdle(void) = 0; private: - cSatipDeviceIf(const cSatipDeviceIf&); + explicit cSatipDeviceIf(const cSatipDeviceIf&); cSatipDeviceIf& operator=(const cSatipDeviceIf&); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/discoverif.h new/satip-2.2.3/discoverif.h --- old/satip-2.2.2/discoverif.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/discoverif.h 2015-09-18 03:20:00.000000000 +0200 @@ -15,7 +15,7 @@ virtual void SetUrl(const char *urlP) = 0; private: - cSatipDiscoverIf(const cSatipDiscoverIf&); + explicit cSatipDiscoverIf(const cSatipDiscoverIf&); cSatipDiscoverIf& operator=(const cSatipDiscoverIf&); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/msearch.h new/satip-2.2.3/msearch.h --- old/satip-2.2.2/msearch.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/msearch.h 2015-09-18 03:20:00.000000000 +0200 @@ -26,7 +26,7 @@ bool registeredM; public: - cSatipMsearch(cSatipDiscoverIf &discoverP); + explicit cSatipMsearch(cSatipDiscoverIf &discoverP); virtual ~cSatipMsearch(); void Probe(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/po/ca_ES.po new/satip-2.2.3/po/ca_ES.po --- old/satip-2.2.2/po/ca_ES.po 2015-04-26 11:53:39.000000000 +0200 +++ new/satip-2.2.3/po/ca_ES.po 2015-09-18 18:04:09.000000000 +0200 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.2.2\n" +"Project-Id-Version: vdr-satip 2.2.3\n" "Report-Msgid-Bugs-To: <see README>\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/po/de_DE.po new/satip-2.2.3/po/de_DE.po --- old/satip-2.2.2/po/de_DE.po 2015-04-26 11:53:39.000000000 +0200 +++ new/satip-2.2.3/po/de_DE.po 2015-09-18 18:04:09.000000000 +0200 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.2.2\n" +"Project-Id-Version: vdr-satip 2.2.3\n" "Report-Msgid-Bugs-To: <see README>\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/po/es_ES.po new/satip-2.2.3/po/es_ES.po --- old/satip-2.2.2/po/es_ES.po 2015-04-26 11:53:39.000000000 +0200 +++ new/satip-2.2.3/po/es_ES.po 2015-09-18 18:04:09.000000000 +0200 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.2.2\n" +"Project-Id-Version: vdr-satip 2.2.3\n" "Report-Msgid-Bugs-To: <see README>\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/po/fi_FI.po new/satip-2.2.3/po/fi_FI.po --- old/satip-2.2.2/po/fi_FI.po 2015-04-26 11:53:39.000000000 +0200 +++ new/satip-2.2.3/po/fi_FI.po 2015-09-18 18:04:09.000000000 +0200 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-satip 2.2.2\n" +"Project-Id-Version: vdr-satip 2.2.3\n" "Report-Msgid-Bugs-To: <see README>\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/pollerif.h new/satip-2.2.3/pollerif.h --- old/satip-2.2.2/pollerif.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/pollerif.h 2015-09-18 03:20:00.000000000 +0200 @@ -17,7 +17,7 @@ virtual cString ToString(void) const = 0; private: - cSatipPollerIf(const cSatipPollerIf&); + explicit cSatipPollerIf(const cSatipPollerIf&); cSatipPollerIf& operator=(const cSatipPollerIf&); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/rtcp.c new/satip-2.2.3/rtcp.c --- old/satip-2.2.2/rtcp.c 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/rtcp.c 2015-09-18 03:20:00.000000000 +0200 @@ -36,7 +36,7 @@ int cSatipRtcp::GetApplicationOffset(int *lengthP) { - debug16("%s (%d) [device %d]", __PRETTY_FUNCTION__, *lengthP, tunerM.GetId()); + debug16("%s (%d) [device %d]", __PRETTY_FUNCTION__, lengthP ? *lengthP : -1, tunerM.GetId()); if (!lengthP) return -1; int offset = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/rtcp.h new/satip-2.2.3/rtcp.h --- old/satip-2.2.2/rtcp.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/rtcp.h 2015-09-18 03:20:00.000000000 +0200 @@ -23,7 +23,7 @@ int GetApplicationOffset(int *lengthP); public: - cSatipRtcp(cSatipTunerIf &tunerP); + explicit cSatipRtcp(cSatipTunerIf &tunerP); virtual ~cSatipRtcp(); // for internal poller interface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/rtp.h new/satip-2.2.3/rtp.h --- old/satip-2.2.2/rtp.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/rtp.h 2015-09-18 03:20:00.000000000 +0200 @@ -28,7 +28,7 @@ int GetHeaderLength(unsigned char *bufferP, unsigned int lengthP); public: - cSatipRtp(cSatipTunerIf &tunerP); + explicit cSatipRtp(cSatipTunerIf &tunerP); virtual ~cSatipRtp(); virtual void Close(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/rtsp.h new/satip-2.2.3/rtsp.h --- old/satip-2.2.2/rtsp.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/rtsp.h 2015-09-18 03:20:00.000000000 +0200 @@ -50,7 +50,7 @@ cSatipRtsp& operator=(const cSatipRtsp&); public: - cSatipRtsp(cSatipTunerIf &tunerP); + explicit cSatipRtsp(cSatipTunerIf &tunerP); virtual ~cSatipRtsp(); cString RtspUnescapeString(const char *strP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/satip.c new/satip-2.2.3/satip.c --- old/satip-2.2.2/satip.c 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/satip.c 2015-09-18 03:20:00.000000000 +0200 @@ -27,7 +27,7 @@ #define GITVERSION "" #endif - const char VERSION[] = "2.2.2" GITVERSION; + const char VERSION[] = "2.2.3" GITVERSION; static const char DESCRIPTION[] = trNOOP("SAT>IP Devices"); class cPluginSatip : public cPlugin { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/server.c new/satip-2.2.3/server.c --- old/satip-2.2.2/server.c 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/server.c 2015-09-18 03:20:00.000000000 +0200 @@ -108,7 +108,8 @@ quirksM = cString::sprintf("%s%sPlayPids", *quirksM, isempty(*quirksM) ? "" : ","); } // These devices contain a frontend locking bug: - if (strstr(*descriptionM, "fritzdvbc") // Fritz!WLAN Repeater DVB-C + if (strstr(*descriptionM, "fritzdvbc") || // Fritz!WLAN Repeater DVB-C + strstr(*descriptionM, "Schwaiger Sat>IP Server") // Schwaiger MS41IP ) { quirkM |= eSatipQuirkForceLock; quirksM = cString::sprintf("%s%sForceLock", *quirksM, isempty(*quirksM) ? "" : ","); @@ -116,8 +117,11 @@ debug3("%s description=%s quirks=%s", __PRETTY_FUNCTION__, *descriptionM, *quirksM); } // These devices support the X_PMT protocol extension - if (strstr(*descriptionM, "OctopusNet")) // Digital Devices OctopusNet + if (strstr(*descriptionM, "OctopusNet") || // Digital Devices OctopusNet + strstr(*descriptionM, "minisatip") // minisatip server + ) { hasCiM = true; + } char *s, *p = strdup(*modelM); char *r = strtok_r(p, ",", &s); while (r) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/setup.c new/satip-2.2.3/setup.c --- old/satip-2.2.2/setup.c 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/setup.c 2015-09-18 03:20:00.000000000 +0200 @@ -94,7 +94,7 @@ void Setup(void); public: - cSatipServerInfo(cSatipServer *serverP); + explicit cSatipServerInfo(cSatipServer *serverP); virtual ~cSatipServerInfo(); virtual eOSState ProcessKey(eKeys keyP); }; @@ -145,7 +145,7 @@ cSatipServer *serverM; public: - cSatipServerItem(cSatipServer *serverP); + explicit cSatipServerItem(cSatipServer *serverP); cSatipServer *Server(void) { return serverM; } virtual void SetMenuItem(cSkinDisplayMenu *displayMenuP, int indexP, bool currentP, bool selectableP); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/tuner.c new/satip-2.2.3/tuner.c --- old/satip-2.2.2/tuner.c 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/tuner.c 2015-09-18 03:20:00.000000000 +0200 @@ -91,6 +91,10 @@ void cSatipTuner::Action(void) { debug1("%s Entering [device %d]", __PRETTY_FUNCTION__, deviceIdM); + + bool lastIdleStatus = false; + cTimeMs idleCheck(eIdleCheckTimeoutMs); + cTimeMs tuning(eTuningTimeoutMs); reConnectM.Set(eConnectTimeoutMs); // Do the thread loop while (Running()) { @@ -107,6 +111,7 @@ case tsSet: debug4("%s: tsSet [device %d]", __PRETTY_FUNCTION__, deviceIdM); if (Connect()) { + tuning.Set(eTuningTimeoutMs); RequestState(tsTuned, smInternal); UpdatePids(true); } @@ -116,6 +121,8 @@ case tsTuned: debug4("%s: tsTuned [device %d]", __PRETTY_FUNCTION__, deviceIdM); reConnectM.Set(eConnectTimeoutMs); + idleCheck.Set(eIdleCheckTimeoutMs); + lastIdleStatus = false; // Read reception statistics via DESCRIBE and RTCP if (hasLockM || ReadReceptionStatus()) { // Quirk for devices without valid reception data @@ -127,6 +134,10 @@ if (hasLockM) RequestState(tsLocked, smInternal); } + else if (tuning.TimedOut()) { + error("Tuning timeout - retuning [device %d]", deviceIdM); + RequestState(tsSet, smInternal); + } break; case tsLocked: debug4("%s: tsLocked [device %d]", __PRETTY_FUNCTION__, deviceIdM); @@ -145,6 +156,16 @@ RequestState(tsSet, smInternal); break; } + if (idleCheck.TimedOut()) { + bool currentIdleStatus = deviceM->IsIdle(); + if (lastIdleStatus && currentIdleStatus) { + info("Idle timeout - releasing [device %d]", deviceIdM); + RequestState(tsRelease, smInternal); + } + lastIdleStatus = currentIdleStatus; + idleCheck.Set(eIdleCheckTimeoutMs); + break; + } break; default: error("Unknown tuner status %d [device %d]", currentStateM, deviceIdM); @@ -209,8 +230,7 @@ return true; } } - else - rtspM.Reset(); + rtspM.Reset(); streamIdM = -1; error("Connect failed [device %d]", deviceIdM); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/tuner.h new/satip-2.2.3/tuner.h --- old/satip-2.2.2/tuner.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/tuner.h 2015-09-18 03:20:00.000000000 +0200 @@ -83,6 +83,8 @@ eStatusUpdateTimeoutMs = 1000, // in milliseconds ePidUpdateIntervalMs = 250, // in milliseconds eConnectTimeoutMs = 5000, // in milliseconds + eIdleCheckTimeoutMs = 15000, // in milliseconds + eTuningTimeoutMs = 20000, // in milliseconds eMinKeepAliveIntervalMs = 30000 // in milliseconds }; enum eTunerState { tsIdle, tsRelease, tsSet, tsTuned, tsLocked }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/satip-2.2.2/tunerif.h new/satip-2.2.3/tunerif.h --- old/satip-2.2.2/tunerif.h 2015-04-26 03:20:00.000000000 +0200 +++ new/satip-2.2.3/tunerif.h 2015-09-18 03:20:00.000000000 +0200 @@ -19,7 +19,7 @@ virtual int GetId(void) = 0; private: - cSatipTunerIf(const cSatipTunerIf&); + explicit cSatipTunerIf(const cSatipTunerIf&); cSatipTunerIf& operator=(const cSatipTunerIf&); };

1 0

commit python3-kombu for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package python3-kombu for openSUSE:Factory checked in at 2015-11-02 12:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-kombu (Old) and /work/SRC/openSUSE:Factory/.python3-kombu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-kombu" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-kombu/python3-kombu.changes 2015-10-20 00:06:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-kombu.new/python3-kombu.changes 2015-11-02 12:55:05.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Oct 29 15:34:13 UTC 2015 - arun(a)gmx.de + +- update to version 3.0.29: + * Fixed serialization issue for "bindings.as_dict()" (Issue #453). + Fix contributed by Sergey Tikhonov. + * Json serializer wrongly treated bytes as "ascii", not "utf-8" + (Issue #532). + * MongoDB: Now supports pymongo 3.x. + Contributed by Len Buckens. + * SQS: Tests passing on Python 3. + Fix contributed by Felix Yan + +------------------------------------------------------------------- Old: ---- kombu-3.0.28.tar.gz New: ---- kombu-3.0.29.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-kombu.spec ++++++ --- /var/tmp/diff_new_pack.bMOpZv/_old 2015-11-02 12:55:06.000000000 +0100 +++ /var/tmp/diff_new_pack.bMOpZv/_new 2015-11-02 12:55:06.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-kombu -Version: 3.0.28 +Version: 3.0.29 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause ++++++ kombu-3.0.28.tar.gz -> kombu-3.0.29.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/AUTHORS new/kombu-3.0.29/AUTHORS --- old/kombu-3.0.28/AUTHORS 2015-10-09 23:52:37.000000000 +0200 +++ new/kombu-3.0.29/AUTHORS 2015-10-26 18:58:25.000000000 +0100 @@ -42,6 +42,7 @@ Eric Wang <eric1990(a)gmail.com> Fabrice Rabaute <fabrice(a)expa.com> Felix Schwarz <felix.schwarz(a)oss.schwarz.eu> +Felix Yan <felixonmars(a)archlinux.org> Fernando Jorge Mota <f.j.mota13(a)gmail.com> Flavio [FlaPer87] Percoco Premoli <flaper87(a)flaper87.org> Florian Munz <surf(a)theflow.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/Changelog new/kombu-3.0.29/Changelog --- old/kombu-3.0.28/Changelog 2015-10-12 20:57:52.000000000 +0200 +++ new/kombu-3.0.29/Changelog 2015-10-26 19:10:33.000000000 +0100 @@ -4,11 +4,43 @@ Change history ================ +.. _version-3.0.29: + +3.0.29 +====== +:release-date: 2015-10-26 11:10 A.M PDT +:release-by: Ask Solem + +- Fixed serialization issue for ``bindings.as_dict()`` (Issue #453). + + Fix contributed by Sergey Tikhonov. + +- Json serializer wrongly treated bytes as ``ascii``, not ``utf-8`` + (Issue #532). + +- MongoDB: Now supports pymongo 3.x. + + Contributed by Len Buckens. + +- SQS: Tests passing on Python 3. + + Fix contributed by Felix Yan + .. _version-3.0.28: 3.0.28 ====== -:release-date: 2015-10-12 12:00 PM PDT +:release-date: 2015-10-12 12:00 P.M PDT +:release-by: Ask Solem + +:.. admonition:: Django transport migrations. + + If you're using Django 1.8 and have already created the + kombu_transport_django tables, you have to run a fake initial migration: + + .. code-block:: pycon + + python manage.py migrate kombu_transport_django --fake-initial - No longer compatible with South by default. @@ -30,7 +62,7 @@ 3.0.27 ====== -:release-date: 2015-10-09 3:10 PM PDT +:release-date: 2015-10-09 3:10 P.M PDT :release-by: Ask Solem - Now depends on :mod:`amqp` 1.4.7. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/PKG-INFO new/kombu-3.0.29/PKG-INFO --- old/kombu-3.0.28/PKG-INFO 2015-10-12 21:38:35.000000000 +0200 +++ new/kombu-3.0.29/PKG-INFO 2015-10-26 19:13:16.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 3.0.28 +Version: 3.0.29 Summary: Messaging library for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging library for Python ======================================== - :Version: 3.0.28 + :Version: 3.0.29 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/README.rst new/kombu-3.0.29/README.rst --- old/kombu-3.0.28/README.rst 2015-10-12 21:37:59.000000000 +0200 +++ new/kombu-3.0.29/README.rst 2015-10-26 19:10:16.000000000 +0100 @@ -4,7 +4,7 @@ kombu - Messaging library for Python ======================================== -:Version: 3.0.28 +:Version: 3.0.29 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/docs/changelog.rst new/kombu-3.0.29/docs/changelog.rst --- old/kombu-3.0.28/docs/changelog.rst 2015-10-12 20:57:52.000000000 +0200 +++ new/kombu-3.0.29/docs/changelog.rst 2015-10-26 19:10:33.000000000 +0100 @@ -4,11 +4,43 @@ Change history ================ +.. _version-3.0.29: + +3.0.29 +====== +:release-date: 2015-10-26 11:10 A.M PDT +:release-by: Ask Solem + +- Fixed serialization issue for ``bindings.as_dict()`` (Issue #453). + + Fix contributed by Sergey Tikhonov. + +- Json serializer wrongly treated bytes as ``ascii``, not ``utf-8`` + (Issue #532). + +- MongoDB: Now supports pymongo 3.x. + + Contributed by Len Buckens. + +- SQS: Tests passing on Python 3. + + Fix contributed by Felix Yan + .. _version-3.0.28: 3.0.28 ====== -:release-date: 2015-10-12 12:00 PM PDT +:release-date: 2015-10-12 12:00 P.M PDT +:release-by: Ask Solem + +:.. admonition:: Django transport migrations. + + If you're using Django 1.8 and have already created the + kombu_transport_django tables, you have to run a fake initial migration: + + .. code-block:: pycon + + python manage.py migrate kombu_transport_django --fake-initial - No longer compatible with South by default. @@ -30,7 +62,7 @@ 3.0.27 ====== -:release-date: 2015-10-09 3:10 PM PDT +:release-date: 2015-10-09 3:10 P.M PDT :release-by: Ask Solem - Now depends on :mod:`amqp` 1.4.7. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/docs/introduction.rst new/kombu-3.0.29/docs/introduction.rst --- old/kombu-3.0.28/docs/introduction.rst 2015-10-12 21:37:59.000000000 +0200 +++ new/kombu-3.0.29/docs/introduction.rst 2015-10-26 19:10:16.000000000 +0100 @@ -4,7 +4,7 @@ kombu - Messaging library for Python ======================================== -:Version: 3.0.28 +:Version: 3.0.29 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/__init__.py new/kombu-3.0.29/kombu/__init__.py --- old/kombu-3.0.28/kombu/__init__.py 2015-10-12 21:37:54.000000000 +0200 +++ new/kombu-3.0.29/kombu/__init__.py 2015-10-26 19:10:12.000000000 +0100 @@ -11,7 +11,7 @@ 'version_info_t', ('major', 'minor', 'micro', 'releaselevel', 'serial'), ) -VERSION = version_info_t(3, 0, 28, '', '') +VERSION = version_info_t(3, 0, 29, '', '') __version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION) __author__ = 'Ask Solem' __contact__ = 'ask(a)celeryproject.org' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/entity.py new/kombu-3.0.29/kombu/entity.py --- old/kombu-3.0.28/kombu/entity.py 2015-10-09 23:52:37.000000000 +0200 +++ new/kombu-3.0.29/kombu/entity.py 2015-10-26 18:43:46.000000000 +0100 @@ -7,7 +7,7 @@ """ from __future__ import absolute_import -from .abstract import MaybeChannelBound +from .abstract import MaybeChannelBound, Object from .exceptions import ContentDisallowed from .five import string_t from .serialization import prepare_accept_content @@ -299,7 +299,7 @@ return not self.auto_delete -class binding(object): +class binding(Object): """Represents a queue or exchange binding. :keyword exchange: Exchange to bind to. @@ -309,6 +309,13 @@ """ + attrs = ( + ('exchange', None), + ('routing_key', None), + ('arguments', None), + ('unbind_arguments', None) + ) + def __init__(self, exchange=None, routing_key='', arguments=None, unbind_arguments=None): self.exchange = exchange diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/serialization.py new/kombu-3.0.29/kombu/serialization.py --- old/kombu-3.0.28/kombu/serialization.py 2015-10-09 23:52:37.000000000 +0200 +++ new/kombu-3.0.29/kombu/serialization.py 2015-10-26 18:43:47.000000000 +0100 @@ -311,7 +311,7 @@ def _loads(obj): if isinstance(obj, bytes_t): - obj = obj.decode() + obj = obj.decode('utf-8') return json_loads(obj) registry.register('json', json_dumps, _loads, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/tests/case.py new/kombu-3.0.29/kombu/tests/case.py --- old/kombu-3.0.28/kombu/tests/case.py 2015-10-09 23:52:37.000000000 +0200 +++ new/kombu-3.0.29/kombu/tests/case.py 2015-10-26 18:43:47.000000000 +0100 @@ -24,6 +24,7 @@ PY3 = sys.version_info[0] == 3 +MagicMock = mock.MagicMock patch = mock.patch call = mock.call @@ -50,7 +51,7 @@ in the class, not just the instance.""" def __enter__(self): - pass + return self def __exit__(self, *exc_info): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/tests/test_entities.py new/kombu-3.0.29/kombu/tests/test_entities.py --- old/kombu-3.0.28/kombu/tests/test_entities.py 2015-10-09 23:52:37.000000000 +0200 +++ new/kombu-3.0.29/kombu/tests/test_entities.py 2015-10-26 18:43:47.000000000 +0100 @@ -4,6 +4,7 @@ from kombu import Connection, Exchange, Producer, Queue, binding from kombu.exceptions import NotBoundError +from kombu.serialization import registry from .case import Case, Mock, call from .mocks import Transport @@ -360,6 +361,13 @@ d = q.as_dict(recurse=True) self.assertEqual(d['exchange']['name'], self.exchange.name) + def test_queue_dump(self): + b = binding(self.exchange, 'rk') + q = Queue('foo', self.exchange, 'rk', bindings=[b]) + d = q.as_dict(recurse=True) + self.assertEqual(d['bindings'][0]['routing_key'], 'rk') + registry.dumps(d) + def test__repr__(self): b = Queue('foo', self.exchange, 'foo') self.assertIn('foo', repr(b)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/tests/transport/test_SQS.py new/kombu-3.0.29/kombu/tests/transport/test_SQS.py --- old/kombu-3.0.28/kombu/tests/transport/test_SQS.py 2015-10-10 00:07:16.000000000 +0200 +++ new/kombu-3.0.29/kombu/tests/transport/test_SQS.py 2015-10-26 18:43:47.000000000 +0100 @@ -164,7 +164,7 @@ self.assertEqual(len(results), 1) # Now test getting many messages - for i in xrange(3): + for i in range(3): message = 'message: {0}'.format(i) self.producer.publish(message) @@ -210,11 +210,11 @@ self.assertEqual(message, results) def test_puts_and_gets(self): - for i in xrange(3): + for i in range(3): message = 'message: %s' % i self.producer.publish(message) - for i in xrange(3): + for i in range(3): self.assertEqual('message: %s' % i, self.queue(self.channel).get().payload) @@ -233,7 +233,7 @@ self.channel.qos.prefetch_count = 5 # Now, generate all the messages - for i in xrange(message_count): + for i in range(message_count): message = 'message: %s' % i self.producer.publish(message) @@ -262,11 +262,11 @@ self.channel.qos.prefetch_count = 5 # Now, generate all the messages - for i in xrange(message_count): + for i in range(message_count): self.producer.publish('message: %s' % i) # Now drain all the events - for i in xrange(message_count): + for i in range(message_count): self.channel.drain_events() # How many times was the SQSConnectionMock get_message method called? @@ -283,11 +283,11 @@ self.channel.qos.prefetch_count = None # Now, generate all the messages - for i in xrange(message_count): + for i in range(message_count): self.producer.publish('message: %s' % i) # Now drain all the events - for i in xrange(message_count): + for i in range(message_count): self.channel.drain_events() # How many times was the SQSConnectionMock get_message method called? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/tests/transport/test_redis.py new/kombu-3.0.29/kombu/tests/transport/test_redis.py --- old/kombu-3.0.28/kombu/tests/transport/test_redis.py 2015-10-10 00:02:48.000000000 +0200 +++ new/kombu-3.0.29/kombu/tests/transport/test_redis.py 2015-10-26 18:43:47.000000000 +0100 @@ -14,7 +14,7 @@ from kombu.utils import eventio # patch poll from kombu.tests.case import ( - Case, Mock, call, module_exists, skip_if_not_module, patch, + Case, ContextMock, Mock, call, module_exists, skip_if_not_module, patch, ) @@ -178,6 +178,12 @@ self.client = client self.stack = [] + def __enter__(self): + return self + + def __exit__(self, *exc_info): + pass + def __getattr__(self, key): if key not in self.__dict__: @@ -342,11 +348,11 @@ with patch('kombu.transport.redis.loads') as loads: loads.return_value = 'M', 'EX', 'RK' client = self.channel.client = Mock(name='client') + client.pipeline = ContextMock() restore = self.channel._do_restore_message = Mock( name='_do_restore_message', ) - pipe = Mock(name='pipe') - client.pipeline.return_value = pipe + pipe = client.pipeline.return_value pipe_hget = Mock(name='pipe.hget') pipe.hget.return_value = pipe_hget pipe_hget_hdel = Mock(name='pipe.hget.hdel') @@ -371,6 +377,10 @@ def test_qos_restore_visible(self): client = self.channel.client = Mock(name='client') + + def pipe(*args, **kwargs): + return Pipeline(client) + client.pipeline = pipe client.zrevrangebyscore.return_value = [ (1, 10), (2, 20), @@ -1202,7 +1212,8 @@ # Won uuid.return_value = lock_id client.setnx.return_value = True - pipe = client.pipeline.return_value = Mock(name='pipe') + client.pipeline = ContextMock() + pipe = client.pipeline.return_value pipe.get.return_value = lock_id held = False with redis.Mutex(client, 'foo1', 100): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/transport/mongodb.py new/kombu-3.0.29/kombu/transport/mongodb.py --- old/kombu-3.0.28/kombu/transport/mongodb.py 2015-10-09 23:52:37.000000000 +0200 +++ new/kombu-3.0.29/kombu/transport/mongodb.py 2015-10-26 18:49:31.000000000 +0100 @@ -22,6 +22,12 @@ from . import virtual +try: + from pymongo.cursor import CursorType +except ImportError: + class CursorType(object): # noqa + pass + DEFAULT_HOST = '127.0.0.1' DEFAULT_PORT = 27017 @@ -172,15 +178,26 @@ return hostname, dbname, options + def _prepare_client_options(self, options): + if pymongo.version_tuple >= (3, ): + options.pop('auto_start_request', None) + return options + def _open(self, scheme='mongodb://'): hostname, dbname, options = self._parse_uri(scheme=scheme) - mongoconn = MongoClient( - host=hostname, ssl=options['ssl'], - auto_start_request=options['auto_start_request'], - connectTimeoutMS=options['connectTimeoutMS'], - use_greenlets=_detect_environment() != 'default', - ) + conf = self._prepare_client_options(options) + conf['host'] = hostname + + env = _detect_environment() + if env == 'gevent': + from gevent import monkey + monkey.patch_all() + elif env == 'eventlet': + from eventlet import monkey_patch + monkey_patch() + + mongoconn = MongoClient(**conf) database = mongoconn[dbname] version = mongoconn.server_info()['version'] @@ -284,11 +301,18 @@ ) def create_broadcast_cursor(self, exchange, routing_key, pattern, queue): - cursor = self.get_broadcast().find( - query={'queue': exchange}, - sort=[('$natural', 1)], - tailable=True, - ) + if pymongo.version_tuple >= (3, ): + query = dict(filter={'queue': exchange}, + sort=[('$natural', 1)], + cursor_type=CursorType.TAILABLE + ) + else: + query = dict(query={'queue': exchange}, + sort=[('$natural', 1)], + tailable=True + ) + + cursor = self.get_broadcast().find(**query) ret = self._broadcast_cursors[queue] = BroadcastCursor(cursor) return ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu/transport/redis.py new/kombu-3.0.29/kombu/transport/redis.py --- old/kombu-3.0.28/kombu/transport/redis.py 2015-10-12 20:57:12.000000000 +0200 +++ new/kombu-3.0.29/kombu/transport/redis.py 2015-10-26 18:43:47.000000000 +0100 @@ -115,14 +115,14 @@ raise MutexHeld() finally: if i_won: - pipe = client.pipeline(True) try: - pipe.watch(name) - if pipe.get(name) == lock_id: - pipe.multi() - pipe.delete(name) - pipe.execute() - pipe.unwatch() + with client.pipeline(True) as pipe: + pipe.watch(name) + if pipe.get(name) == lock_id: + pipe.multi() + pipe.delete(name) + pipe.execute() + pipe.unwatch() except redis.WatchError: pass @@ -160,11 +160,11 @@ self.ack(delivery_tag) @contextmanager - def pipe_or_acquire(self, pipe=None): + def pipe_or_acquire(self, pipe=None, client=None): if pipe: yield pipe else: - with self.channel.conn_or_acquire() as client: + with self.channel.conn_or_acquire(client) as client: yield client.pipeline() def _remove_from_indices(self, delivery_tag, pipe=None): @@ -191,8 +191,9 @@ def restore_by_tag(self, tag, client=None, leftmost=False): with self.channel.conn_or_acquire(client) as client: - p, _, _ = self._remove_from_indices( - tag, client.pipeline().hget(self.unacked_key, tag)).execute() + with client.pipeline() as pipe: + p, _, _ = self._remove_from_indices( + tag, pipe.hget(self.unacked_key, tag)).execute() if p: M, EX, RK = loads(bytes_to_str(p)) # json is unicode self.channel._do_restore_message(M, EX, RK, client, leftmost) @@ -484,10 +485,10 @@ return super(Channel, self)._restore(message) tag = message.delivery_tag with self.conn_or_acquire() as client: - P, _ = client.pipeline() \ - .hget(self.unacked_key, tag) \ - .hdel(self.unacked_key, tag) \ - .execute() + with client.pipeline() as pipe: + P, _ = pipe.hget(self.unacked_key, tag) \ + .hdel(self.unacked_key, tag) \ + .execute() if P: M, EX, RK = loads(bytes_to_str(P)) # json is unicode self._do_restore_message(M, EX, RK, client, leftmost) @@ -651,12 +652,12 @@ def _size(self, queue): with self.conn_or_acquire() as client: - cmds = client.pipeline() - for pri in PRIORITY_STEPS: - cmds = cmds.llen(self._q_for_pri(queue, pri)) - sizes = cmds.execute() - return sum(size for size in sizes - if isinstance(size, numbers.Integral)) + with client.pipeline() as pipe: + for pri in PRIORITY_STEPS: + pipe = pipe.llen(self._q_for_pri(queue, pri)) + sizes = pipe.execute() + return sum(size for size in sizes + if isinstance(size, numbers.Integral)) def _q_for_pri(self, queue, pri): pri = self.priority(pri) @@ -707,17 +708,17 @@ self.sep.join([routing_key or '', pattern or '', queue or ''])) - cmds = client.pipeline() - for pri in PRIORITY_STEPS: - cmds = cmds.delete(self._q_for_pri(queue, pri)) - cmds.execute() + with client.pipeline() as pipe: + for pri in PRIORITY_STEPS: + pipe = pipe.delete(self._q_for_pri(queue, pri)) + pipe.execute() def _has_queue(self, queue, **kwargs): with self.conn_or_acquire() as client: - cmds = client.pipeline() - for pri in PRIORITY_STEPS: - cmds = cmds.exists(self._q_for_pri(queue, pri)) - return any(cmds.execute()) + with client.pipeline() as pipe: + for pri in PRIORITY_STEPS: + pipe = pipe.exists(self._q_for_pri(queue, pri)) + return any(pipe.execute()) def get_table(self, exchange): key = self.keyprefix_queue % exchange @@ -729,12 +730,12 @@ def _purge(self, queue): with self.conn_or_acquire() as client: - cmds = client.pipeline() - for pri in PRIORITY_STEPS: - priq = self._q_for_pri(queue, pri) - cmds = cmds.llen(priq).delete(priq) - sizes = cmds.execute() - return sum(sizes[::2]) + with client.pipeline() as pipe: + for pri in PRIORITY_STEPS: + priq = self._q_for_pri(queue, pri) + pipe = pipe.llen(priq).delete(priq) + sizes = pipe.execute() + return sum(sizes[::2]) def close(self): if self._pool: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/kombu.egg-info/PKG-INFO new/kombu-3.0.29/kombu.egg-info/PKG-INFO --- old/kombu-3.0.28/kombu.egg-info/PKG-INFO 2015-10-12 21:38:31.000000000 +0200 +++ new/kombu-3.0.29/kombu.egg-info/PKG-INFO 2015-10-26 19:13:11.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 3.0.28 +Version: 3.0.29 Summary: Messaging library for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging library for Python ======================================== - :Version: 3.0.28 + :Version: 3.0.29 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.28/requirements/test-ci3.txt new/kombu-3.0.29/requirements/test-ci3.txt --- old/kombu-3.0.28/requirements/test-ci3.txt 2015-09-29 23:47:57.000000000 +0200 +++ new/kombu-3.0.29/requirements/test-ci3.txt 2015-10-26 18:43:47.000000000 +0100 @@ -3,3 +3,4 @@ redis PyYAML msgpack-python>0.2.0 # 0.2.0 dropped 2.5 support +boto

1 0

commit kiwi-config-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2015-11-02 12:55:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-config-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2015-05-24 19:33:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2015-11-02 12:55:04.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 23 15:31:30 UTC 2015 - dimstar(a)opensuse.org + +- Rebase kiwi-config-openSUSE.changes: xdm's display-manager + received a minor fix. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.ofjfff/_old 2015-11-02 12:55:05.000000000 +0100 +++ /var/tmp/diff_new_pack.ofjfff/_new 2015-11-02 12:55:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kiwi-config-openSUSE # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ xdm-liveinstall.patch ++++++ --- /var/tmp/diff_new_pack.ofjfff/_old 2015-11-02 12:55:05.000000000 +0100 +++ /var/tmp/diff_new_pack.ofjfff/_new 2015-11-02 12:55:05.000000000 +0100 @@ -1,6 +1,27 @@ ---- usr/lib/YaST2/startup/YaST2.call.orig 2011-02-17 14:54:48.000000000 +0000 -+++ usr/lib/YaST2/startup/YaST2.call 2011-04-08 08:01:31.000000000 +0000 -@@ -646,7 +646,9 @@ +Index: usr/lib/X11/display-manager +=================================================================== +--- usr/lib/X11/display-manager.orig ++++ usr/lib/X11/display-manager +@@ -182,7 +182,13 @@ case "$1" in + rc_exit + fi + fi +- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed ++ if cat /proc/cmdline | grep -q liveinstall; then ++ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit ++ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer ++ else ++ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed ++ fi ++ + if rc_status ; then + # when started up successfuly, use DMs PID file as ours + ln -snf $PIDFILE $PIDFILELNK +Index: usr/lib/YaST2/startup/YaST2.call +=================================================================== +--- usr/lib/YaST2/startup/YaST2.call.orig ++++ usr/lib/YaST2/startup/YaST2.call +@@ -632,7 +632,9 @@ esac # 8) Call YaST2 #--------------------------------------------- Y2_MODULE_NAME=${1:-installation}; shift @@ -10,21 +31,3 @@ start_yast #============================================= - ---- usr/lib/X11/display-manager.orig 2012-09-19 14:09:30.000000000 +0000 -+++ usr/lib/X11/display-manager 2012-09-19 14:10:05.000000000 +0000 -@@ -182,7 +182,13 @@ - rc_exit - fi - fi -- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+ if cat /proc/cmdline | grep -q liveinstall; then -+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit -+ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer -+ else -+ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed -+ fi -+ - # After a crash or a kill signal we may have - # a wrong ownership of /dev/xconsole - if rc_status ; then

1 0

commit pdf2djvu for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package pdf2djvu for openSUSE:Factory checked in at 2015-11-02 12:55:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdf2djvu (Old) and /work/SRC/openSUSE:Factory/.pdf2djvu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pdf2djvu" Changes: -------- --- /work/SRC/openSUSE:Factory/pdf2djvu/pdf2djvu.changes 2015-10-06 13:25:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pdf2djvu.new/pdf2djvu.changes 2015-11-02 12:55:02.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Oct 25 09:49:21 UTC 2015 - lazy.kent(a)opensuse.org + +- Update to 0.9.2. + * Improve error handling. + + Ignore document outline items with non-existent + destinations. + * Improve the test suite. + * Update Polish, German, Portuguese, Russian translations. + +------------------------------------------------------------------- Old: ---- pdf2djvu-0.9.1.tar.xz pdf2djvu-0.9.1.tar.xz.asc New: ---- pdf2djvu-0.9.2.tar.xz pdf2djvu-0.9.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdf2djvu.spec ++++++ --- /var/tmp/diff_new_pack.lFspJG/_old 2015-11-02 12:55:03.000000000 +0100 +++ /var/tmp/diff_new_pack.lFspJG/_new 2015-11-02 12:55:03.000000000 +0100 @@ -17,7 +17,7 @@ Name: pdf2djvu -Version: 0.9.1 +Version: 0.9.2 Release: 0 Summary: PDF to DjVu Converter License: GPL-2.0 ++++++ pdf2djvu-0.9.1.tar.xz -> pdf2djvu-0.9.2.tar.xz ++++++ ++++ 3142 lines of diff (skipped)

1 0

commit kdepim for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '15

02 Nov '15

Hello community, here is the log from the commit of package kdepim for openSUSE:Factory checked in at 2015-11-02 12:54:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim (Old) and /work/SRC/openSUSE:Factory/.kdepim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim/kdepim.changes 2015-10-19 22:40:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim.new/kdepim.changes 2015-11-02 12:55:01.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Oct 29 11:46:19 UTC 2015 - dvaleev(a)suse.com + +- Add disk constraints + +------------------------------------------------------------------- +Wed Oct 21 17:00:29 UTC 2015 - tittiatcoke(a)gmail.com + +- Add upstream bugfix boo949130.diff to prevent kmail from + crashing (boo#949130) + +------------------------------------------------------------------- New: ---- _constraints boo949130.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim.spec ++++++ --- /var/tmp/diff_new_pack.AYrlHU/_old 2015-11-02 12:55:02.000000000 +0100 +++ /var/tmp/diff_new_pack.AYrlHU/_new 2015-11-02 12:55:02.000000000 +0100 @@ -64,6 +64,8 @@ Source0: kdepim-%{version}.tar.xz # PATCH-FIX-OPENSUSE disable-qt5uitools-cmake-requirement.diff alarrosa(a)suse.com -- Don't include cmake files that depend on newer cmake versions Patch0: disable-qt5uitools-cmake-requirement.diff +# PATCH-FIX-UPSTREAM boo949130.diff montel(a)kde.org -- Prevent kmail from crashing (boo#949130) +Patch1: boo949130.diff BuildRequires: akonadi-calendar-devel BuildRequires: akonadi-contact-devel BuildRequires: akonadi-devel @@ -144,6 +146,7 @@ %if ! 0%{?is_opensuse} && 0%{?suse_version} == 1315 %patch0 -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKDEPIM_NO_TEXTTOSPEECH=TRUE ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">8</size> </disk> </hardware> </constraints> ++++++ boo949130.diff ++++++ From: Montel Laurent <montel(a)kde.org> Date: Thu, 15 Oct 2015 13:35:51 +0000 Subject: Fix Bug 351395 - Crash when the identity's "dictionary" setting is changed X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=7744a9211d819488ba9de6… --- Fix Bug 351395 - Crash when the identity's "dictionary" setting is changed FIXED-IN: 5.0.2 BUG: 351395 --- --- a/kmail/editor/kmcomposewin.cpp +++ b/kmail/editor/kmcomposewin.cpp @@ -455,11 +455,12 @@ mExternalEditorWarning = new ExternalEditorWarning(this); v->addWidget(mExternalEditorWarning); - readConfig(); setupStatusBar(attachmentView->widget()); setupActions(); setupEditor(); rethinkFields(); + readConfig(); + updateSignatureAndEncryptionStateIndicators(); applyMainWindowSettings(KMKernel::self()->config()->group("Composer"));

1 0