Hello community, here is the log from the commit of package libnice for openSUSE:Factory checked in at 2015-05-16 07:13:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnice (Old) and /work/SRC/openSUSE:Factory/.libnice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libnice" Changes: -------- --- /work/SRC/openSUSE:Factory/libnice/libnice.changes 2015-04-27 12:58:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libnice.new/libnice.changes 2015-05-16 07:13:43.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 15 07:29:10 UTC 2015 - [email protected] + +- Update to version 0.1.13: + + Fix build on non-Windows platforms that don't have + getifaddrs(). + + Fix build regression on Windows. + +------------------------------------------------------------------- Old: ---- libnice-0.1.12.tar.gz New: ---- libnice-0.1.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnice.spec ++++++ --- /var/tmp/diff_new_pack.Vvqlad/_old 2015-05-16 07:13:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Vvqlad/_new 2015-05-16 07:13:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: libnice -Version: 0.1.12 +Version: 0.1.13 Release: 0 Summary: Interactive Connectivity Establishment implementation License: MPL-1.1 or LGPL-2.1 ++++++ libnice-0.1.12.tar.gz -> libnice-0.1.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/NEWS new/libnice-0.1.13/NEWS --- old/libnice-0.1.12/NEWS 2015-04-23 03:07:54.000000000 +0200 +++ new/libnice-0.1.13/NEWS 2015-04-28 21:29:37.000000000 +0200 @@ -1,3 +1,8 @@ +libnice 0.1.13 (2015-04-28) +=========================== +Fix build on non-Windows platforms that don't have getifaddrs() +Fix build regression on Windows + libnice 0.1.12 (2015-04-22) =========================== Fix regression in SDP parser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/agent/interfaces.c new/libnice-0.1.13/agent/interfaces.c --- old/libnice-0.1.12/agent/interfaces.c 2015-04-20 23:37:13.000000000 +0200 +++ new/libnice-0.1.13/agent/interfaces.c 2015-04-28 20:43:18.000000000 +0200 @@ -71,6 +71,34 @@ #include <net/if.h> #include <arpa/inet.h> +#endif /* G_OS_UNIX */ + +#if (defined(G_OS_UNIX) && defined(HAVE_GETIFADDRS)) || defined(G_OS_WIN32) +/* Works on both UNIX and Windows. Magic! */ +static gchar * +sockaddr_to_string (const struct sockaddr *addr) +{ + char addr_as_string[INET6_ADDRSTRLEN+1]; + size_t addr_len; + + switch (addr->sa_family) { + case AF_INET: addr_len = sizeof (struct sockaddr_in); break; + case AF_INET6: addr_len = sizeof (struct sockaddr_in6); break; + default: return NULL; + } + + if (getnameinfo (addr, addr_len, + addr_as_string, sizeof (addr_as_string), NULL, 0, + NI_NUMERICHOST) != 0) { + return NULL; + } + + return g_strdup (addr_as_string); +} +#endif + +#ifdef G_OS_UNIX + #ifdef HAVE_GETIFADDRS GList * @@ -190,11 +218,6 @@ return FALSE; } -#ifdef HAVE_GETIFADDRS - -static gchar * -sockaddr_to_string (const struct sockaddr *addr); - static GList * add_ip_to_list (GList *list, gchar *ip, gboolean append) { @@ -212,6 +235,8 @@ return g_list_prepend (list, ip); } +#ifdef HAVE_GETIFADDRS + GList * nice_interfaces_get_local_ips (gboolean include_loopback) { @@ -328,7 +353,7 @@ else nice_debug ("Ignoring loopback interface"); } else { - if (nice_interfaces_is_private_ip (sa)) { + if (nice_interfaces_is_private_ip ((struct sockaddr *) sa)) { ips = add_ip_to_list (ips, g_strdup (inet_ntoa (sa->sin_addr)), TRUE); } else { ips = add_ip_to_list (ips, g_strdup (inet_ntoa (sa->sin_addr)), FALSE); @@ -461,9 +486,6 @@ return ret; } -static gchar * -sockaddr_to_string (const struct sockaddr *addr); - GList * nice_interfaces_get_local_ips (gboolean include_loopback) { IP_ADAPTER_ADDRESSES *addresses = NULL, *a; @@ -638,25 +660,3 @@ #error Can not use this method for retreiving ip list from OS other than unix or windows #endif /* G_OS_WIN32 */ #endif /* G_OS_UNIX */ - -/* Works on both UNIX and Windows. Magic! */ -static gchar * -sockaddr_to_string (const struct sockaddr *addr) -{ - char addr_as_string[INET6_ADDRSTRLEN+1]; - size_t addr_len; - - switch (addr->sa_family) { - case AF_INET: addr_len = sizeof (struct sockaddr_in); break; - case AF_INET6: addr_len = sizeof (struct sockaddr_in6); break; - default: return NULL; - } - - if (getnameinfo (addr, addr_len, - addr_as_string, sizeof (addr_as_string), NULL, 0, - NI_NUMERICHOST) != 0) { - return NULL; - } - - return g_strdup (addr_as_string); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/configure new/libnice-0.1.13/configure --- old/libnice-0.1.12/configure 2015-04-23 03:10:37.000000000 +0200 +++ new/libnice-0.1.13/configure 2015-04-28 21:30:10.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libnice 0.1.12. +# Generated by GNU Autoconf 2.69 for libnice 0.1.13. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libnice' PACKAGE_TARNAME='libnice' -PACKAGE_VERSION='0.1.12' -PACKAGE_STRING='libnice 0.1.12' +PACKAGE_VERSION='0.1.13' +PACKAGE_STRING='libnice 0.1.13' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1405,7 +1405,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 libnice 0.1.12 to adapt to many kinds of systems. +\`configure' configures libnice 0.1.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,7 +1476,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libnice 0.1.12:";; + short | recursive ) echo "Configuration of libnice 0.1.13:";; esac cat <<\_ACEOF @@ -1618,7 +1618,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libnice configure 0.1.12 +libnice configure 0.1.13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2037,7 +2037,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libnice $as_me 0.1.12, which was +It was created by libnice $as_me 0.1.13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3016,7 +3016,7 @@ # Define the identity of the package. PACKAGE='libnice' - VERSION='0.1.12' + VERSION='0.1.13' cat >>confdefs.h <<_ACEOF @@ -3121,7 +3121,7 @@ # If there was an incompatible interface change: # Increment CURRENT. Set AGE and REVISION to 0 LIBNICE_CURRENT=16 -LIBNICE_REVISION=1 +LIBNICE_REVISION=2 LIBNICE_AGE=6 LIBNICE_LIBVERSION=${LIBNICE_CURRENT}:${LIBNICE_REVISION}:${LIBNICE_AGE} LIBNICE_LT_LDFLAGS="-version-info ${LIBNICE_LIBVERSION} -no-undefined" @@ -16643,7 +16643,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libnice $as_me 0.1.12, which was +This file was extended by libnice $as_me 0.1.13, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16709,7 +16709,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libnice config.status 0.1.12 +libnice config.status 0.1.13 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/libnice-0.1.12/configure.ac new/libnice-0.1.13/configure.ac --- old/libnice-0.1.12/configure.ac 2015-04-23 03:10:30.000000000 +0200 +++ new/libnice-0.1.13/configure.ac 2015-04-28 21:30:02.000000000 +0200 @@ -5,7 +5,7 @@ dnl also use -Werror. git and pre-releases default to -Werror dnl use a three digit version number for releases, and four for cvs/prerelease -AC_INIT([libnice],[0.1.12]) +AC_INIT([libnice],[0.1.13]) LIBNICE_RELEASE="yes" AC_CANONICAL_TARGET @@ -40,7 +40,7 @@ # If there was an incompatible interface change: # Increment CURRENT. Set AGE and REVISION to 0 LIBNICE_CURRENT=16 -LIBNICE_REVISION=1 +LIBNICE_REVISION=2 LIBNICE_AGE=6 LIBNICE_LIBVERSION=${LIBNICE_CURRENT}:${LIBNICE_REVISION}:${LIBNICE_AGE} LIBNICE_LT_LDFLAGS="-version-info ${LIBNICE_LIBVERSION} -no-undefined" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/examples/sdp-example.c new/libnice-0.1.13/examples/sdp-example.c --- old/libnice-0.1.12/examples/sdp-example.c 2015-04-23 02:58:46.000000000 +0200 +++ new/libnice-0.1.13/examples/sdp-example.c 2015-04-28 20:44:45.000000000 +0200 @@ -44,7 +44,9 @@ #include <agent.h> +#if GLIB_CHECK_VERSION(2, 36, 0) #include <gio/gnetworking.h> +#endif static GMainLoop *gloop; static gchar *stun_addr = NULL; @@ -93,10 +95,11 @@ g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port); } -#if !GLIB_CHECK_VERSION(2, 36, 0) +#if GLIB_CHECK_VERSION(2, 36, 0) + g_networking_init(); +#else g_type_init(); #endif - g_networking_init(); gloop = g_main_loop_new(NULL, FALSE); @@ -122,7 +125,7 @@ gchar *sdp, *sdp64; #ifdef G_OS_WIN32 - io_stdin = g_io_channel_win32_new(_fileno(stdin)); + io_stdin = g_io_channel_win32_new_fd(_fileno(stdin)); #else io_stdin = g_io_channel_unix_new(fileno(stdin)); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/examples/simple-example.c new/libnice-0.1.13/examples/simple-example.c --- old/libnice-0.1.12/examples/simple-example.c 2015-04-23 02:58:46.000000000 +0200 +++ new/libnice-0.1.13/examples/simple-example.c 2015-04-28 20:44:53.000000000 +0200 @@ -42,10 +42,11 @@ #include <string.h> #include <ctype.h> -#include <gio/gnetworking.h> - #include <agent.h> +#if GLIB_CHECK_VERSION(2, 36, 0) +#include <gio/gnetworking.h> +#endif static GMainLoop *gloop; static GIOChannel* io_stdin; @@ -104,14 +105,15 @@ g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port); } -#if !GLIB_CHECK_VERSION(2, 36, 0) +#if GLIB_CHECK_VERSION(2, 36, 0) + g_networking_init(); +#else g_type_init(); #endif - g_networking_init(); gloop = g_main_loop_new(NULL, FALSE); #ifdef G_OS_WIN32 - io_stdin = g_io_channel_win32_new(_fileno(stdin)); + io_stdin = g_io_channel_win32_new_fd(_fileno(stdin)); #else io_stdin = g_io_channel_unix_new(fileno(stdin)); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/examples/threaded-example.c new/libnice-0.1.13/examples/threaded-example.c --- old/libnice-0.1.12/examples/threaded-example.c 2015-04-23 02:58:46.000000000 +0200 +++ new/libnice-0.1.13/examples/threaded-example.c 2015-04-28 20:44:40.000000000 +0200 @@ -44,7 +44,9 @@ #include <agent.h> +#if GLIB_CHECK_VERSION(2, 36, 0) #include <gio/gnetworking.h> +#endif static GMainLoop *gloop; static gchar *stun_addr = NULL; @@ -102,7 +104,9 @@ g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port); } -#if !GLIB_CHECK_VERSION(2, 36, 0) +#if GLIB_CHECK_VERSION(2, 36, 0) + g_networking_init(); +#else g_type_init(); #endif g_networking_init(); @@ -132,7 +136,7 @@ int rval; #ifdef G_OS_WIN32 - io_stdin = g_io_channel_win32_new(_fileno(stdin)); + io_stdin = g_io_channel_win32_new_fd(_fileno(stdin)); #else io_stdin = g_io_channel_unix_new(fileno(stdin)); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnice-0.1.12/stun/tests/test-conncheck.c new/libnice-0.1.13/stun/tests/test-conncheck.c --- old/libnice-0.1.12/stun/tests/test-conncheck.c 2014-07-23 19:43:35.000000000 +0200 +++ new/libnice-0.1.13/stun/tests/test-conncheck.c 2015-04-28 20:43:18.000000000 +0200 @@ -197,7 +197,8 @@ /* Invalid socket address */ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); - val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); + val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, + (char *) ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); @@ -216,7 +217,8 @@ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); val = stun_message_append64 (&req, STUN_ATTRIBUTE_ICE_CONTROLLING, tie + 1); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); + val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, + (char *) ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0); @@ -238,7 +240,8 @@ assert (stun_agent_init_request (&agent, &req, req_buf, sizeof(req_buf), STUN_BINDING)); val = stun_message_append64 (&req, STUN_ATTRIBUTE_ICE_CONTROLLED, tie - 1); assert (val == STUN_MESSAGE_RETURN_SUCCESS); - val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, ufrag); + val = stun_message_append_string (&req, STUN_ATTRIBUTE_USERNAME, + (char *) ufrag); assert (val == STUN_MESSAGE_RETURN_SUCCESS); rlen = stun_agent_finish_message (&agent, &req, pass, pass_len); assert (rlen > 0);
