Hello community, here is the log from the commit of package xinetd for openSUSE:Factory checked in at 2017-05-10 20:34:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinetd (Old) and /work/SRC/openSUSE:Factory/.xinetd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinetd" Wed May 10 20:34:10 2017 rev:35 rq:492825 version:2.3.15.1+git20170504.58c3611 Changes: -------- --- /work/SRC/openSUSE:Factory/xinetd/xinetd.changes 2017-05-03 15:52:24.544723860 +0200 +++ /work/SRC/openSUSE:Factory/.xinetd.new/xinetd.changes 2017-05-10 20:34:12.776880179 +0200 @@ -1,0 +2,8 @@ +Thu May 04 10:07:43 UTC 2017 - [email protected] + +- Update to version 2.3.15.1+git20170504.58c3611: + * Warn when not using tirpc and fix some quoting in configure.ac + * Fixup poll.h related warnings + * Fix compat with ipv6 to ipv4 fallback wrt bsc#1037552 + +------------------------------------------------------------------- Old: ---- xinetd-2.3.15.1+git20170421.98c06ca.tar.xz New: ---- xinetd-2.3.15.1+git20170504.58c3611.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinetd.spec ++++++ --- /var/tmp/diff_new_pack.JekjAH/_old 2017-05-10 20:34:13.608762812 +0200 +++ /var/tmp/diff_new_pack.JekjAH/_new 2017-05-10 20:34:13.616761683 +0200 @@ -17,7 +17,7 @@ Name: xinetd -Version: 2.3.15.1+git20170421.98c06ca +Version: 2.3.15.1+git20170504.58c3611 Release: 0 Summary: An 'inetd' with Expanded Functionality License: xinetd ++++++ xinetd-2.3.15.1+git20170421.98c06ca.tar.xz -> xinetd-2.3.15.1+git20170504.58c3611.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/.travis.yml new/xinetd-2.3.15.1+git20170504.58c3611/.travis.yml --- old/xinetd-2.3.15.1+git20170421.98c06ca/.travis.yml 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/.travis.yml 2017-05-04 12:06:32.000000000 +0200 @@ -1,12 +1,17 @@ # see travis-ci.org for details +env: + global: + # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created + # via the "travis encrypt" command using the project repo's public key + - secure: "tGETfSCDBHPBdmx3H4G+RI9yLxnoGHvR81TH4hn99zI1lhcUFAZnIy+XEy3VTKqLAQfMecnT0RbizPvzRDS2+sNhbAGLeETImLV9om67tv0UDAQo8y0rIZvOu61zvhvA3pU6UKayWSgALikXFHxxLNAx6vFYcGU5n7yCZ89EG8/oWAWszMZsZplkSArC7A6++vVOGjXREsSo4UFxgUyUACihOpVfTtDCweUxKWpEcWpvwYaOmckdE5MtxCbtsRSZHGF7bctErZQp0tTXbqDMCOJZwL+brYXDeNyrozeDeVhxeNkFSywmbNEw0lwEydyBfKQgAFa4AtwxpwpVlG/mRvs6li34m4/5+A0TNLP2XhbIiDCdpOuQ17pNgQTCnAizjpmeS8BVUgCtxtVtbLrB6mrIlMl3lxgVksrel7U0d6370MbNtD1T5O3T+mjYd0L61QKgAkZIoerruYe2LqjPuUAAdXjlky42rX1jmtGBCeulY9hA53efjXytiw27foDFWRc/V6NnD2sIsQ04+IAzkFzYA2orQCXqVQhUyr7UlZdERkTs4+t0yY+66Rqs/NGblVW3AwKxNz04dI94gmmu+Gza0/2DasbFON96ZVvW3HmlrQPSjgB7r3ls5nGZxgKb/5IPTmj/qg5us2dGbkX7pG/mWVXFOUFtsQC86DNOASk=" + sudo: required language: c os: - linux - - osx compiler: - clang @@ -14,9 +19,20 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libtirpc-dev libwrap0-dev libselinux-dev ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi script: - sh autogen.sh - ./configure --without-libwrap --without-labeled-networking --without-loadavg - make - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make distcheck ; fi + +addons: + coverity_scan: + project: + name: "openSUSE/xinetd" + description: "Build submitted via Travis CI" + notification_email: [email protected] + build_command_prepend: "./autogen.sh; ./configure; make clean" + build_command: "make -j4" + branch_pattern: master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/README.md new/xinetd-2.3.15.1+git20170504.58c3611/README.md --- old/xinetd-2.3.15.1+git20170421.98c06ca/README.md 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/README.md 2017-05-04 12:06:32.000000000 +0200 @@ -1,6 +1,7 @@ # xinetd # [](https://travis-ci.org/openSUSE/xinetd) +[](https://scan.coverity.com/projects/opensuse-xinetd) xinetd is a powerful replacement for inetd. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/configure.ac new/xinetd-2.3.15.1+git20170504.58c3611/configure.ac --- old/xinetd-2.3.15.1+git20170421.98c06ca/configure.ac 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/configure.ac 2017-05-04 12:06:32.000000000 +0200 @@ -39,14 +39,16 @@ AC_SUBST([LIBM_LIBS]) PKG_CHECK_MODULES([TIRPC],[libtirpc], [ AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.]) -], [:]) +], [ + AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>]) +]) # ====================================== # Check for various headers and settings # ====================================== AC_FUNC_MMAP -AC_CHECK_HEADER(sys/filio.h, [AC_DEFINE([HAVE_SYS_FILIO_H], [1], ["Have FreeBSD filio.h"])]) -AC_CHECK_FUNC(poll, [AC_DEFINE([HAVE_POLL], [1], ["Have available poll function"])]) +AC_CHECK_HEADER(sys/filio.h, [AC_DEFINE([HAVE_SYS_FILIO_H], [1], [Have FreeBSD filio.h])]) +AC_CHECK_FUNC(poll, [AC_DEFINE([HAVE_POLL], [1], [Have available poll function])]) # ====== # Switch @@ -76,7 +78,7 @@ [with_loadavg=yes] ) AS_IF([test x"$with_loadavg" != "xno"], [ - AC_DEFINE([HAVE_LOADAVG], [1], ["Have loadavg for balancing"]) + AC_DEFINE([HAVE_LOADAVG], [1], [Have loadavg for balancing]) ]) AC_ARG_WITH([libwrap], @@ -86,7 +88,7 @@ ) AS_IF([test x"$with_libwrap" != "xno"], [ AC_CHECK_LIB(wrap, request_init, [ - AC_DEFINE([LIBWRAP], [1], ["Have libwrap TCP wrappers present"]) + AC_DEFINE([LIBWRAP], [1], [Have libwrap TCP wrappers present]) WRAP_LIBS="-lwrap" ],[ AC_MSG_ERROR([Missing libwrap from tcp_wrappers]) @@ -102,7 +104,7 @@ ) AS_IF([test x"$with_labeled_networking" != "xno"], [ PKG_CHECK_MODULES([SELINUX],[libselinux], [ - AC_DEFINE(LABELED_NET, 1, "") + AC_DEFINE([LABELED_NET], [1], [Use selinux for network labeling]) ],[]) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/src/confparse.c new/xinetd-2.3.15.1+git20170504.58c3611/src/confparse.c --- old/xinetd-2.3.15.1+git20170421.98c06ca/src/confparse.c 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/src/confparse.c 2017-05-04 12:06:32.000000000 +0200 @@ -516,10 +516,12 @@ } if( SC_IPV4( scp ) && SC_IPV6( scp ) ) { - msg( LOG_ERR, func, - "Service %s specified as both IPv4 and IPv6 - DISABLING", - SC_NAME(scp)); - return FAILED ; + msg( LOG_INFO, func, + "Service %s will use IPv6 or fallback to IPv4", + SC_NAME(scp)); + // we only need ipv6 defined and fallback to ipv4 if needed + // so clean it up for now + M_CLEAR(SC_XFLAGS(scp), SF_IPV4); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/src/intcommon.c new/xinetd-2.3.15.1+git20170504.58c3611/src/intcommon.c --- old/xinetd-2.3.15.1+git20170421.98c06ca/src/intcommon.c 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/src/intcommon.c 2017-05-04 12:06:32.000000000 +0200 @@ -14,9 +14,6 @@ #include <errno.h> #include <stdlib.h> #include <unistd.h> -#ifdef HAVE_POLL -#include <poll.h> -#endif #include "intcommon.h" #include "msg.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/src/intcommon.h new/xinetd-2.3.15.1+git20170504.58c3611/src/intcommon.h --- old/xinetd-2.3.15.1+git20170421.98c06ca/src/intcommon.h 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/src/intcommon.h 2017-05-04 12:06:32.000000000 +0200 @@ -3,10 +3,17 @@ #include "config.h" #include <sys/types.h> +#ifdef HAVE_POLL +#include <poll.h> +#endif #include "int.h" void int_fail(const struct intercept_s *ip,const char *lsyscall); +#ifdef HAVE_POLL +int int_poll(int pfds_last, struct pollfd *pfd_array); +#else int int_select(int max,fd_set *read_mask); +#endif #ifdef __GNUC__ __attribute__ ((noreturn)) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/src/tcpint.c new/xinetd-2.3.15.1+git20170504.58c3611/src/tcpint.c --- old/xinetd-2.3.15.1+git20170421.98c06ca/src/tcpint.c 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/src/tcpint.c 2017-05-04 12:06:32.000000000 +0200 @@ -90,7 +90,6 @@ #ifdef HAVE_POLL struct pollfd *pfd_array; int pfds_last = 0; - int pfds_allocated = MAX_FDS; #else fd_set socket_mask ; int mask_max ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xinetd-2.3.15.1+git20170421.98c06ca/src/udpint.c new/xinetd-2.3.15.1+git20170504.58c3611/src/udpint.c --- old/xinetd-2.3.15.1+git20170421.98c06ca/src/udpint.c 2017-04-21 10:02:46.000000000 +0200 +++ new/xinetd-2.3.15.1+git20170504.58c3611/src/udpint.c 2017-05-04 12:06:32.000000000 +0200 @@ -100,7 +100,6 @@ #ifdef HAVE_POLL struct pollfd *pfd_array; int pfds_last = 0; - int pfds_allocated = MAX_FDS; #else fd_set socket_mask ; int mask_max ;
