Hello community, here is the log from the commit of package glib-networking for openSUSE:Factory checked in at 2017-11-01 11:07:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib-networking (Old) and /work/SRC/openSUSE:Factory/.glib-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib-networking" Wed Nov 1 11:07:30 2017 rev:55 rq:537578 version:2.54.1 Changes: -------- --- /work/SRC/openSUSE:Factory/glib-networking/glib-networking.changes 2017-09-13 21:55:49.123067005 +0200 +++ /work/SRC/openSUSE:Factory/.glib-networking.new/glib-networking.changes 2017-11-01 11:07:30.078456966 +0100 @@ -1,0 +2,8 @@ +Fri Oct 27 22:32:33 UTC 2017 - [email protected] + +- Update to version 2.54.1: + + gnutls: Fix using different client certs for different + connections (bgo#781578). + + Updated translations. + +------------------------------------------------------------------- Old: ---- glib-networking-2.54.0.tar.xz New: ---- glib-networking-2.54.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib-networking.spec ++++++ --- /var/tmp/diff_new_pack.byfOnr/_old 2017-11-01 11:07:31.382409333 +0100 +++ /var/tmp/diff_new_pack.byfOnr/_new 2017-11-01 11:07:31.386409186 +0100 @@ -17,13 +17,13 @@ Name: glib-networking -Version: 2.54.0 +Version: 2.54.1 Release: 0 Summary: Network-related GIO modules for glib License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Url: http://www.gnome.org -Source: http://download.gnome.org/sources/glib-networking/2.54/%{name}-%{version}.tar.xz +Url: https://www.gnome.org +Source: https://download.gnome.org/sources/glib-networking/2.54/%{name}-%{version}.tar.xz Source99: baselibs.conf # For directory ownership BuildRequires: dbus-1 ++++++ glib-networking-2.54.0.tar.xz -> glib-networking-2.54.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/NEWS new/glib-networking-2.54.1/NEWS --- old/glib-networking-2.54.0/NEWS 2017-09-12 16:44:38.000000000 +0200 +++ new/glib-networking-2.54.1/NEWS 2017-10-27 03:18:48.000000000 +0200 @@ -1,3 +1,11 @@ +2.54.1 +====== + + * gnutls: Fix using different client certs for different connections + [#781578, Martin Pitt] + + * Updated translations: Catalan (Valencian), Greek, Persian + 2.54.0 ====== * New/updated translations: Basque, Belarusian, Brazilian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/aclocal.m4 new/glib-networking-2.54.1/aclocal.m4 --- old/glib-networking-2.54.0/aclocal.m4 2017-09-12 16:45:03.000000000 +0200 +++ new/glib-networking-2.54.1/aclocal.m4 2017-10-27 03:20:20.000000000 +0200 @@ -20,218 +20,6 @@ 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'.])]) -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` - - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include <glib.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n";); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/"; - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include <glib.h> -#include <stdio.h> -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - AC_SUBST(GLIB_COMPILE_RESOURCES) - rm -f conf.glibtest -]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 11 (pkg-config-0.29.1) @@ -576,6 +364,218 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include <glib.h> +#include <stdio.h> +#include <stdlib.h> + +int +main () +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n";); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/"; + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include <glib.h> +#include <stdio.h> +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) + # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/configure new/glib-networking-2.54.1/configure --- old/glib-networking-2.54.0/configure 2017-09-12 16:45:03.000000000 +0200 +++ new/glib-networking-2.54.1/configure 2017-10-27 03:20:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glib-networking 2.54.0. +# Generated by GNU Autoconf 2.69 for glib-networking 2.54.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='glib-networking' PACKAGE_TARNAME='glib-networking' -PACKAGE_VERSION='2.54.0' -PACKAGE_STRING='glib-networking 2.54.0' +PACKAGE_VERSION='2.54.1' +PACKAGE_STRING='glib-networking 2.54.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network' PACKAGE_URL='' @@ -1397,7 +1397,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 glib-networking 2.54.0 to adapt to many kinds of systems. +\`configure' configures glib-networking 2.54.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1467,7 +1467,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib-networking 2.54.0:";; + short | recursive ) echo "Configuration of glib-networking 2.54.1:";; esac cat <<\_ACEOF @@ -1622,7 +1622,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib-networking configure 2.54.0 +glib-networking configure 2.54.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1900,7 +1900,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glib-networking $as_me 2.54.0, which was +It was created by glib-networking $as_me 2.54.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2769,7 +2769,7 @@ # Define the identity of the package. PACKAGE='glib-networking' - VERSION='2.54.0' + VERSION='2.54.1' cat >>confdefs.h <<_ACEOF @@ -16612,7 +16612,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glib-networking $as_me 2.54.0, which was +This file was extended by glib-networking $as_me 2.54.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16678,7 +16678,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glib-networking config.status 2.54.0 +glib-networking config.status 2.54.1 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/glib-networking-2.54.0/configure.ac new/glib-networking-2.54.1/configure.ac --- old/glib-networking-2.54.0/configure.ac 2017-09-12 16:42:07.000000000 +0200 +++ new/glib-networking-2.54.1/configure.ac 2017-10-27 03:17:30.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([glib-networking],[2.54.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) +AC_INIT([glib-networking],[2.54.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h]) AC_CONFIG_HEADERS([config.h]) Binary files old/glib-networking-2.54.0/po/[email protected] and new/glib-networking-2.54.1/po/[email protected] differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/po/[email protected] new/glib-networking-2.54.1/po/[email protected] --- old/glib-networking-2.54.0/po/[email protected] 2017-08-07 23:35:45.000000000 +0200 +++ new/glib-networking-2.54.1/po/[email protected] 2017-10-18 00:35:21.000000000 +0200 @@ -7,129 +7,132 @@ msgid "" msgstr "" "Project-Id-Version: glib-networking master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 20:04+0100\n" -"PO-Revision-Date: 2012-08-16 19:02+0200\n" -"Last-Translator: Gil Forcada <[email protected]>\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; +"product=glib&keywords=I18N+L10N&component=network\n" +"POT-Creation-Date: 2017-09-09 14:14+0000\n" +"PO-Revision-Date: 2017-09-01 14:11+0200\n" +"Last-Translator: Xavi Ivars <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" -"Language: ca@valencia\n" +"Language: ca-valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 1.8.11\n" -#: ../proxy/libproxy/glibproxyresolver.c:150 +#: proxy/libproxy/glibproxyresolver.c:157 msgid "Proxy resolver internal error." msgstr "" "S'ha produït un error intern al sistema de resolució del servidor " "intermediari." -#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#: tls/gnutls/gtlscertificate-gnutls.c:176 #, c-format msgid "Could not parse DER certificate: %s" msgstr "No s'ha pogut analitzar el certificat DER: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#: tls/gnutls/gtlscertificate-gnutls.c:197 #, c-format msgid "Could not parse PEM certificate: %s" msgstr "No s'ha pogut analitzar el certificat PEM: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:225 +#: tls/gnutls/gtlscertificate-gnutls.c:228 #, c-format msgid "Could not parse DER private key: %s" msgstr "No s'ha pogut analitzar la clau privada DER: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:256 +#: tls/gnutls/gtlscertificate-gnutls.c:259 #, c-format msgid "Could not parse PEM private key: %s" msgstr "No s'ha pogut analitzar la clau privada PEM: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:296 +#: tls/gnutls/gtlscertificate-gnutls.c:299 msgid "No certificate data provided" msgstr "No s'ha proporcionat cap dada per al certificat" -#: ../tls/gnutls/gtlsclientconnection-gnutls.c:309 +#: tls/gnutls/gtlsclientconnection-gnutls.c:375 msgid "Server required TLS certificate" msgstr "El servidor requereix un certificat TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:258 +#: tls/gnutls/gtlsconnection-gnutls.c:310 #, c-format msgid "Could not create TLS connection: %s" msgstr "No s'ha pogut crear una connexió TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:520 +#: tls/gnutls/gtlsconnection-gnutls.c:572 msgid "Connection is closed" msgstr "La connexió està tancada" -#: ../tls/gnutls/gtlsconnection-gnutls.c:582 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1425 +#: tls/gnutls/gtlsconnection-gnutls.c:645 +#: tls/gnutls/gtlsconnection-gnutls.c:1528 msgid "Operation would block" msgstr "L'operació bloquejaria" -#: ../tls/gnutls/gtlsconnection-gnutls.c:712 -#: ../tls/gnutls/gtlsconnection-gnutls.c:755 +#: tls/gnutls/gtlsconnection-gnutls.c:792 +#: tls/gnutls/gtlsconnection-gnutls.c:831 msgid "Peer failed to perform TLS handshake" msgstr "L'altre extrem de la connexió no ha pogut realitzar l'encaixada TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:729 +#: tls/gnutls/gtlsconnection-gnutls.c:810 msgid "Peer requested illegal TLS rehandshake" msgstr "" "L'altre extrem de la connexió ha sol·licitat una reencaixada TLS no vàlida" -#: ../tls/gnutls/gtlsconnection-gnutls.c:761 +#: tls/gnutls/gtlsconnection-gnutls.c:837 msgid "TLS connection closed unexpectedly" msgstr "La connexió TLS s'ha tancat de manera inesperada" -#: ../tls/gnutls/gtlsconnection-gnutls.c:771 +#: tls/gnutls/gtlsconnection-gnutls.c:847 msgid "TLS connection peer did not send a certificate" msgstr "L'altre extrem de la connexió TLS no ha enviat cap certificat" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1152 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1171 +#: tls/gnutls/gtlsconnection-gnutls.c:853 +#, c-format +msgid "Peer sent fatal TLS alert: %s" +msgstr "L'altre extrem de la connexió ha enviat una alerta fatal TLS: %s" + +#: tls/gnutls/gtlsconnection-gnutls.c:1241 +#: tls/gnutls/gtlsconnection-gnutls.c:1274 #, c-format msgid "Error performing TLS handshake: %s" msgstr "S'ha produït un error en realitzar l'encaixada TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1181 +#: tls/gnutls/gtlsconnection-gnutls.c:1284 msgid "Server did not return a valid TLS certificate" msgstr "El servidor no ha retornat un certificat TLS vàlid" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1256 +#: tls/gnutls/gtlsconnection-gnutls.c:1354 msgid "Unacceptable TLS certificate" msgstr "No es pot acceptar el certificat TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1448 +#: tls/gnutls/gtlsconnection-gnutls.c:1562 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "S'ha produït un error en llegir les dades del sòcol TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1477 +#: tls/gnutls/gtlsconnection-gnutls.c:1591 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "S'ha produït un error en escriure les dades al sòcol TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1521 -msgid "Connection is already closed" -msgstr "La connexió ja està tancada" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1531 +#: tls/gnutls/gtlsconnection-gnutls.c:1655 #, c-format msgid "Error performing TLS close: %s" msgstr "S'ha produït un error en realitzar el tancament TLS: %s" -#: ../tls/gnutls/gtlsserverconnection-gnutls.c:103 +#: tls/gnutls/gtlsserverconnection-gnutls.c:107 msgid "Certificate has no private key" msgstr "El certificat no té cap clau privada" -#: ../tls/pkcs11/gpkcs11pin.c:108 +#: tls/pkcs11/gpkcs11pin.c:111 msgid "" "This is the last chance to enter the PIN correctly before the token is " "locked." msgstr "" -"Esta és la darrera oportunitat per introduir el PIN de manera correcta abans " -"de bloquejar el testimoni." +"Esta és la darrera oportunitat per introduir el PIN de manera correcta " +"abans de bloquejar el testimoni." -#: ../tls/pkcs11/gpkcs11pin.c:110 +#: tls/pkcs11/gpkcs11pin.c:113 msgid "" "Several PIN attempts have been incorrect, and the token will be locked after " "further failures." @@ -137,22 +140,25 @@ "S'ha intentat introduir el PIN de manera incorrecta diverses vegades, i es " "bloquejarà el testimoni si es torna a fallar." -#: ../tls/pkcs11/gpkcs11pin.c:112 +#: tls/pkcs11/gpkcs11pin.c:115 msgid "The PIN entered is incorrect." msgstr "S'ha introduït un PIN incorrecte." -#: ../tls/pkcs11/gpkcs11slot.c:446 +#: tls/pkcs11/gpkcs11slot.c:449 msgid "Module" msgstr "Mòdul" -#: ../tls/pkcs11/gpkcs11slot.c:447 +#: tls/pkcs11/gpkcs11slot.c:450 msgid "PKCS#11 Module Pointer" msgstr "Punter del mòdul PKCS#11" -#: ../tls/pkcs11/gpkcs11slot.c:454 +#: tls/pkcs11/gpkcs11slot.c:457 msgid "Slot ID" msgstr "Identificador de ranura" -#: ../tls/pkcs11/gpkcs11slot.c:455 +#: tls/pkcs11/gpkcs11slot.c:458 msgid "PKCS#11 Slot Identifier" msgstr "Identificador de la ranura PKCS#11" + +#~ msgid "Connection is already closed" +#~ msgstr "La connexió ja està tancada" Binary files old/glib-networking-2.54.0/po/el.gmo and new/glib-networking-2.54.1/po/el.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/po/el.po new/glib-networking-2.54.1/po/el.po --- old/glib-networking-2.54.0/po/el.po 2015-03-03 03:29:27.000000000 +0100 +++ new/glib-networking-2.54.1/po/el.po 2017-10-18 00:35:21.000000000 +0200 @@ -7,121 +7,122 @@ msgid "" msgstr "" "Project-Id-Version: glib-networking master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; "product=glib&keywords=I18N+L10N&component=network\n" -"POT-Creation-Date: 2014-07-09 05:52+0000\n" -"PO-Revision-Date: 2014-07-09 14:43+0200\n" -"Last-Translator: Tom Tryfonidis <[email protected]>\n" +"POT-Creation-Date: 2017-05-23 15:17+0000\n" +"PO-Revision-Date: 2017-09-09 10:31+0200\n" +"Last-Translator: Efstathios Iosifidis <[email protected]>\n" "Language-Team: [email protected]\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.5\n" +"X-Generator: Poedit 1.5.7\n" "X-Project-Style: gnome\n" -#: ../proxy/libproxy/glibproxyresolver.c:157 +#: proxy/libproxy/glibproxyresolver.c:157 msgid "Proxy resolver internal error." msgstr "Εσωτερικό σφάλμα επίλυσης διαμεσολαβητή." -#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#: tls/gnutls/gtlscertificate-gnutls.c:176 #, c-format msgid "Could not parse DER certificate: %s" msgstr "Αδυναμία ανάλυσης πιστοποιητικού DER: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#: tls/gnutls/gtlscertificate-gnutls.c:197 #, c-format msgid "Could not parse PEM certificate: %s" msgstr "Αδυναμία ανάλυσης πιστοποιητικού PEM: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:225 +#: tls/gnutls/gtlscertificate-gnutls.c:228 #, c-format msgid "Could not parse DER private key: %s" msgstr "Αδυναμία ανάλυσης ιδιωτικού κλειδιού DER: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:256 +#: tls/gnutls/gtlscertificate-gnutls.c:259 #, c-format msgid "Could not parse PEM private key: %s" msgstr "Αδυναμία ανάλυσης ιδιωτικού κλειδιού PEM: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:296 +#: tls/gnutls/gtlscertificate-gnutls.c:299 msgid "No certificate data provided" msgstr "Δεν παρέχονται δεδομένα πιστοποιητικού" -#: ../tls/gnutls/gtlsclientconnection-gnutls.c:324 +#: tls/gnutls/gtlsclientconnection-gnutls.c:375 msgid "Server required TLS certificate" msgstr "Ο διακομιστής απαίτησε πιστοποιητικό TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:267 +#: tls/gnutls/gtlsconnection-gnutls.c:310 #, c-format msgid "Could not create TLS connection: %s" msgstr "Αδύνατη η δημιουργία σύνδεσης TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:531 +#: tls/gnutls/gtlsconnection-gnutls.c:572 msgid "Connection is closed" msgstr "Η σύνδεση έκλεισε" -#: ../tls/gnutls/gtlsconnection-gnutls.c:594 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1465 +#: tls/gnutls/gtlsconnection-gnutls.c:645 +#: tls/gnutls/gtlsconnection-gnutls.c:1528 msgid "Operation would block" msgstr "Η λειτουργία θα μπλοκαριστεί" -#: ../tls/gnutls/gtlsconnection-gnutls.c:733 -#: ../tls/gnutls/gtlsconnection-gnutls.c:772 +#: tls/gnutls/gtlsconnection-gnutls.c:792 +#: tls/gnutls/gtlsconnection-gnutls.c:831 msgid "Peer failed to perform TLS handshake" msgstr "Ο ομότιμος υπολογιστής απέτυχε να εκτελέσει «χειραψία» TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:751 +#: tls/gnutls/gtlsconnection-gnutls.c:810 msgid "Peer requested illegal TLS rehandshake" msgstr "Ο ομότιμος υπολογιστής απαίτησε παράτυπη «χειραψία» TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:778 +#: tls/gnutls/gtlsconnection-gnutls.c:837 msgid "TLS connection closed unexpectedly" msgstr "Η σύνδεση TLS τερματίστηκε απρόσμενα" -#: ../tls/gnutls/gtlsconnection-gnutls.c:788 +#: tls/gnutls/gtlsconnection-gnutls.c:847 msgid "TLS connection peer did not send a certificate" msgstr "Η ομότιμη σύνδεση TLS δεν έστειλε πιστοποιητικό" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1178 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1211 +#: tls/gnutls/gtlsconnection-gnutls.c:853 +#, c-format +msgid "Peer sent fatal TLS alert: %s" +msgstr "Το ομότιμο έστειλε ειδοποίηση μοιραίου σφάλματος TLS: %s" + +#: tls/gnutls/gtlsconnection-gnutls.c:1241 +#: tls/gnutls/gtlsconnection-gnutls.c:1274 #, c-format msgid "Error performing TLS handshake: %s" msgstr "Σφάλμα κατά τη «χειραψία» TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1221 +#: tls/gnutls/gtlsconnection-gnutls.c:1284 msgid "Server did not return a valid TLS certificate" msgstr "Ο διακομιστής δεν επέστρεψε ένα έγκυρο πιστοποιητικό TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1296 +#: tls/gnutls/gtlsconnection-gnutls.c:1354 msgid "Unacceptable TLS certificate" msgstr "Μη αποδεκτό πιστοποιητικό TLS" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1499 +#: tls/gnutls/gtlsconnection-gnutls.c:1562 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "Σφάλμα κατά την ανάγνωση δεδομένων από την υποδοχή TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1528 +#: tls/gnutls/gtlsconnection-gnutls.c:1591 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "Σφάλμα κατά την εγγραφή δεδομένων στην υποδοχή TLS: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1572 -msgid "Connection is already closed" -msgstr "Η σύνδεση έχει ήδη κλείσει" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1582 +#: tls/gnutls/gtlsconnection-gnutls.c:1655 #, c-format msgid "Error performing TLS close: %s" msgstr "Σφάλμα κατά το κλείσιμο TLS: %s" -#: ../tls/gnutls/gtlsserverconnection-gnutls.c:103 +#: tls/gnutls/gtlsserverconnection-gnutls.c:107 msgid "Certificate has no private key" msgstr "Το πιστοποιητικό δεν έχει ιδιωτικό κλειδί" -#: ../tls/pkcs11/gpkcs11pin.c:108 +#: tls/pkcs11/gpkcs11pin.c:111 msgid "" "This is the last chance to enter the PIN correctly before the token is " "locked." @@ -129,7 +130,7 @@ "Αυτή είναι η τελευταία σας ευκαιρία να πληκτρολογήσετε σωστά το PIN πριν να " "κλειδωθεί το διακριτικό." -#: ../tls/pkcs11/gpkcs11pin.c:110 +#: tls/pkcs11/gpkcs11pin.c:113 msgid "" "Several PIN attempts have been incorrect, and the token will be locked after " "further failures." @@ -137,22 +138,25 @@ "Αρκετές προσπάθειες PIN ήταν εσφαλμένες, και το διακριτικό θα κλειδωθεί μετά " "από περαιτέρω αποτυχίες." -#: ../tls/pkcs11/gpkcs11pin.c:112 +#: tls/pkcs11/gpkcs11pin.c:115 msgid "The PIN entered is incorrect." msgstr "Δεν είναι έγκυρο το PIN που πληκτρολογήσατε." -#: ../tls/pkcs11/gpkcs11slot.c:446 +#: tls/pkcs11/gpkcs11slot.c:449 msgid "Module" msgstr "Άρθρωμα" -#: ../tls/pkcs11/gpkcs11slot.c:447 +#: tls/pkcs11/gpkcs11slot.c:450 msgid "PKCS#11 Module Pointer" msgstr "Δείκτης αρθρώματος PKCS#11" -#: ../tls/pkcs11/gpkcs11slot.c:454 +#: tls/pkcs11/gpkcs11slot.c:457 msgid "Slot ID" msgstr "Αναγνωριστικό υποδοχής" -#: ../tls/pkcs11/gpkcs11slot.c:455 +#: tls/pkcs11/gpkcs11slot.c:458 msgid "PKCS#11 Slot Identifier" msgstr "Αναγνωριστικό θέσης PKCS#11" + +#~ msgid "Connection is already closed" +#~ msgstr "Η σύνδεση έχει ήδη κλείσει" Binary files old/glib-networking-2.54.0/po/fa.gmo and new/glib-networking-2.54.1/po/fa.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/po/fa.po new/glib-networking-2.54.1/po/fa.po --- old/glib-networking-2.54.0/po/fa.po 2017-08-07 23:35:45.000000000 +0200 +++ new/glib-networking-2.54.1/po/fa.po 2017-10-18 00:35:21.000000000 +0200 @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: glib-networking master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; "product=glib&keywords=I18N+L10N&component=network\n" -"POT-Creation-Date: 2012-11-29 22:09+0000\n" -"PO-Revision-Date: 2013-03-23 18:10+0330\n" +"POT-Creation-Date: 2017-05-23 15:17+0000\n" +"PO-Revision-Date: 2017-09-30 00:38+0330\n" "Last-Translator: Arash Mousavi <[email protected]>\n" "Language-Team: Persian\n" "Language: fa\n" @@ -17,116 +17,116 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 2.0.4\n" -#: ../proxy/libproxy/glibproxyresolver.c:150 +#: proxy/libproxy/glibproxyresolver.c:157 msgid "Proxy resolver internal error." msgstr "خطای داخلی تحلیلگر پیشکار." -#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#: tls/gnutls/gtlscertificate-gnutls.c:176 #, c-format msgid "Could not parse DER certificate: %s" msgstr "تجزیه گواهینامه DER امکانپذیر نبود: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#: tls/gnutls/gtlscertificate-gnutls.c:197 #, c-format msgid "Could not parse PEM certificate: %s" msgstr "تجزیه گواهینامه PEM امکانپذیر نبود: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:225 +#: tls/gnutls/gtlscertificate-gnutls.c:228 #, c-format msgid "Could not parse DER private key: %s" msgstr "تجزیه کلید خصوصی DER امکانپذیر نبود: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:256 +#: tls/gnutls/gtlscertificate-gnutls.c:259 #, c-format msgid "Could not parse PEM private key: %s" msgstr "تجزیه کلید خصوصی PEM امکانپذیر نبود: %s" -#: ../tls/gnutls/gtlscertificate-gnutls.c:296 +#: tls/gnutls/gtlscertificate-gnutls.c:299 msgid "No certificate data provided" msgstr "هیچ اطلاعات گواهینامهای ارائه نشده" -#: ../tls/gnutls/gtlsclientconnection-gnutls.c:309 +#: tls/gnutls/gtlsclientconnection-gnutls.c:375 msgid "Server required TLS certificate" msgstr "کارگزار به گواهینامه TLS احتیاج دارد" -#: ../tls/gnutls/gtlsconnection-gnutls.c:254 +#: tls/gnutls/gtlsconnection-gnutls.c:310 #, c-format msgid "Could not create TLS connection: %s" msgstr "نمیتوان اتصال TLS ایجاد کرد: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:514 +#: tls/gnutls/gtlsconnection-gnutls.c:572 msgid "Connection is closed" msgstr "اتصال بسته شده است" -#: ../tls/gnutls/gtlsconnection-gnutls.c:576 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1382 +#: tls/gnutls/gtlsconnection-gnutls.c:645 +#: tls/gnutls/gtlsconnection-gnutls.c:1528 msgid "Operation would block" msgstr "عملیات میتواند بلوکه شود" -#: ../tls/gnutls/gtlsconnection-gnutls.c:703 +#: tls/gnutls/gtlsconnection-gnutls.c:792 +#: tls/gnutls/gtlsconnection-gnutls.c:831 msgid "Peer failed to perform TLS handshake" msgstr "برقراری TLS handshake توسط همتا شکست خورد" -#: ../tls/gnutls/gtlsconnection-gnutls.c:720 +#: tls/gnutls/gtlsconnection-gnutls.c:810 msgid "Peer requested illegal TLS rehandshake" msgstr "همتا درخواست یک TLS rehandshake غیرقانونی کرده است" -#: ../tls/gnutls/gtlsconnection-gnutls.c:746 +#: tls/gnutls/gtlsconnection-gnutls.c:837 msgid "TLS connection closed unexpectedly" msgstr "اتصال TLS بطور غیر منتظرهای شکست خورد" -#: ../tls/gnutls/gtlsconnection-gnutls.c:756 -#| msgid "TLS connection closed unexpectedly" +#: tls/gnutls/gtlsconnection-gnutls.c:847 msgid "TLS connection peer did not send a certificate" msgstr "همتا اتصال TLS گواهینامهای ارسال نکرد" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1064 -#: ../tls/gnutls/gtlsconnection-gnutls.c:1083 +#: tls/gnutls/gtlsconnection-gnutls.c:853 +#, c-format +msgid "Peer sent fatal TLS alert: %s" +msgstr "همتا یک هشدارِ جدی TLS ارسال کرد: %s" + +#: tls/gnutls/gtlsconnection-gnutls.c:1241 +#: tls/gnutls/gtlsconnection-gnutls.c:1274 #, c-format msgid "Error performing TLS handshake: %s" msgstr "خطا در هنگام انجام TLS handshake. خطا: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1228 -msgid "Unacceptable TLS certificate" -msgstr "گواهینامه TLS غیر قابل پذیرش" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1239 -#| msgid "Server required TLS certificate" +#: tls/gnutls/gtlsconnection-gnutls.c:1284 msgid "Server did not return a valid TLS certificate" msgstr "کارگزار گواهینامه TLS معتبری ارسال نکرد" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1405 +#: tls/gnutls/gtlsconnection-gnutls.c:1354 +msgid "Unacceptable TLS certificate" +msgstr "گواهینامه TLS غیر قابل پذیرش" + +#: tls/gnutls/gtlsconnection-gnutls.c:1562 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "خطا در هنگام هواندن اطلاعات از طریق سوکت TLS. خط: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1434 +#: tls/gnutls/gtlsconnection-gnutls.c:1591 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "خطا در هنگام نوشتن اطلاعات در سوکت TLS. خطا: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1478 -msgid "Connection is already closed" -msgstr "اتصال از قبل بسته شده است" - -#: ../tls/gnutls/gtlsconnection-gnutls.c:1488 +#: tls/gnutls/gtlsconnection-gnutls.c:1655 #, c-format msgid "Error performing TLS close: %s" msgstr "خطا در هنگام انجام بستن TLS. خطا: %s" -#: ../tls/gnutls/gtlsserverconnection-gnutls.c:103 +#: tls/gnutls/gtlsserverconnection-gnutls.c:107 msgid "Certificate has no private key" msgstr "گواهینامه هیچ کلید خصوصیای ندارد" -#: ../tls/pkcs11/gpkcs11pin.c:108 +#: tls/pkcs11/gpkcs11pin.c:111 msgid "" "This is the last chance to enter the PIN correctly before the token is " "locked." msgstr "آخرین شانس برای صحیح وارد کردن PIN قبل از قفل شدن رمز است." -#: ../tls/pkcs11/gpkcs11pin.c:110 +#: tls/pkcs11/gpkcs11pin.c:113 msgid "" "Several PIN attempts have been incorrect, and the token will be locked after " "further failures." @@ -134,22 +134,25 @@ "تعدادی از تلاشهای برای وارد کردن PIN شکست خورده است، و رمز پس از شکستهای " "بعدی قفل خواهد شد." -#: ../tls/pkcs11/gpkcs11pin.c:112 +#: tls/pkcs11/gpkcs11pin.c:115 msgid "The PIN entered is incorrect." msgstr "عبارت PIN وارد شده نادرست است." -#: ../tls/pkcs11/gpkcs11slot.c:446 +#: tls/pkcs11/gpkcs11slot.c:449 msgid "Module" msgstr "ماژول" -#: ../tls/pkcs11/gpkcs11slot.c:447 +#: tls/pkcs11/gpkcs11slot.c:450 msgid "PKCS#11 Module Pointer" msgstr "نشانگر ماژول PKCS#11" -#: ../tls/pkcs11/gpkcs11slot.c:454 +#: tls/pkcs11/gpkcs11slot.c:457 msgid "Slot ID" msgstr "شناسهی جایگاه" -#: ../tls/pkcs11/gpkcs11slot.c:455 +#: tls/pkcs11/gpkcs11slot.c:458 msgid "PKCS#11 Slot Identifier" msgstr "شناساگر جایگاه PKCS#11" + +#~ msgid "Connection is already closed" +#~ msgstr "اتصال از قبل بسته شده است" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/po/glib-networking.pot new/glib-networking-2.54.1/po/glib-networking.pot --- old/glib-networking-2.54.0/po/glib-networking.pot 2016-08-15 23:53:10.000000000 +0200 +++ new/glib-networking-2.54.1/po/glib-networking.pot 2017-10-27 03:20:24.000000000 +0200 @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR glib-networking contributors # This file is distributed under the same license as the glib-networking package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: glib-networking 2.49.90\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=glib&component=network\n" -"POT-Creation-Date: 2016-08-15 17:53-0400\n" +"Project-Id-Version: glib-networking 2.54.1\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; +"product=glib&keywords=I18N+L10N&component=network\n" +"POT-Creation-Date: 2017-10-26 20:20-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -46,66 +46,71 @@ msgid "No certificate data provided" msgstr "" -#: tls/gnutls/gtlsclientconnection-gnutls.c:375 +#: tls/gnutls/gtlsclientconnection-gnutls.c:393 msgid "Server required TLS certificate" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:323 +#: tls/gnutls/gtlsconnection-gnutls.c:310 #, c-format msgid "Could not create TLS connection: %s" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:585 +#: tls/gnutls/gtlsconnection-gnutls.c:572 msgid "Connection is closed" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:658 -#: tls/gnutls/gtlsconnection-gnutls.c:1537 +#: tls/gnutls/gtlsconnection-gnutls.c:645 +#: tls/gnutls/gtlsconnection-gnutls.c:1528 msgid "Operation would block" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:808 -#: tls/gnutls/gtlsconnection-gnutls.c:847 +#: tls/gnutls/gtlsconnection-gnutls.c:792 +#: tls/gnutls/gtlsconnection-gnutls.c:831 msgid "Peer failed to perform TLS handshake" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:826 +#: tls/gnutls/gtlsconnection-gnutls.c:810 msgid "Peer requested illegal TLS rehandshake" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:853 +#: tls/gnutls/gtlsconnection-gnutls.c:837 msgid "TLS connection closed unexpectedly" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:863 +#: tls/gnutls/gtlsconnection-gnutls.c:847 msgid "TLS connection peer did not send a certificate" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:1250 -#: tls/gnutls/gtlsconnection-gnutls.c:1283 +#: tls/gnutls/gtlsconnection-gnutls.c:853 +#, c-format +msgid "Peer sent fatal TLS alert: %s" +msgstr "" + +#: tls/gnutls/gtlsconnection-gnutls.c:1241 +#: tls/gnutls/gtlsconnection-gnutls.c:1274 #, c-format msgid "Error performing TLS handshake: %s" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:1293 +#: tls/gnutls/gtlsconnection-gnutls.c:1284 msgid "Server did not return a valid TLS certificate" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:1363 +#: tls/gnutls/gtlsconnection-gnutls.c:1354 msgid "Unacceptable TLS certificate" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:1571 +#: tls/gnutls/gtlsconnection-gnutls.c:1562 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:1600 +#: tls/gnutls/gtlsconnection-gnutls.c:1591 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "" -#: tls/gnutls/gtlsconnection-gnutls.c:1664 +#: tls/gnutls/gtlsconnection-gnutls.c:1655 #, c-format msgid "Error performing TLS close: %s" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/gnutls/gtlsclientconnection-gnutls.c new/glib-networking-2.54.1/tls/gnutls/gtlsclientconnection-gnutls.c --- old/glib-networking-2.54.0/tls/gnutls/gtlsclientconnection-gnutls.c 2017-08-07 23:35:45.000000000 +0200 +++ new/glib-networking-2.54.1/tls/gnutls/gtlsclientconnection-gnutls.c 2017-10-27 03:09:31.000000000 +0200 @@ -100,9 +100,8 @@ } static void -g_tls_client_connection_gnutls_constructed (GObject *object) +g_tls_client_connection_gnutls_compute_session_id (GTlsClientConnectionGnutls *gnutls) { - GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (object); GSocketConnection *base_conn; GSocketAddress *remote_addr; GInetAddress *iaddr; @@ -124,24 +123,41 @@ GInetSocketAddress *isaddr = G_INET_SOCKET_ADDRESS (remote_addr); const gchar *server_hostname; gchar *addrstr, *session_id; + GTlsCertificate *cert = NULL; + gchar *cert_hash = NULL; iaddr = g_inet_socket_address_get_address (isaddr); port = g_inet_socket_address_get_port (isaddr); addrstr = g_inet_address_to_string (iaddr); server_hostname = get_server_identity (gnutls); - session_id = g_strdup_printf ("%s/%s/%d", addrstr, + + /* If we have a certificate, make its hash part of the session ID, so + * that different connections to the same server can use different + * certificates. */ + g_object_get (G_OBJECT (gnutls), "certificate", &cert, NULL); + if (cert) + { + GByteArray *der = NULL; + g_object_get (G_OBJECT (cert), "certificate", &der, NULL); + if (der) + { + cert_hash = g_compute_checksum_for_data (G_CHECKSUM_SHA256, der->data, der->len); + g_byte_array_unref (der); + } + g_object_unref (cert); + } + session_id = g_strdup_printf ("%s/%s/%d/%s", addrstr, server_hostname ? server_hostname : "", - port); + port, + cert_hash ?: ""); gnutls->priv->session_id = g_bytes_new_take (session_id, strlen (session_id)); g_free (addrstr); + g_free (cert_hash); } g_object_unref (remote_addr); } g_object_unref (base_conn); - - if (G_OBJECT_CLASS (g_tls_client_connection_gnutls_parent_class)->constructed) - G_OBJECT_CLASS (g_tls_client_connection_gnutls_parent_class)->constructed (object); } static void @@ -326,6 +342,8 @@ { GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn); + g_tls_client_connection_gnutls_compute_session_id (gnutls); + /* Try to get a cached session */ if (gnutls->priv->session_data_override) { @@ -434,7 +452,6 @@ gobject_class->get_property = g_tls_client_connection_gnutls_get_property; gobject_class->set_property = g_tls_client_connection_gnutls_set_property; - gobject_class->constructed = g_tls_client_connection_gnutls_constructed; gobject_class->finalize = g_tls_client_connection_gnutls_finalize; connection_gnutls_class->failed = g_tls_client_connection_gnutls_failed; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/tests/Makefile.am new/glib-networking-2.54.1/tls/tests/Makefile.am --- old/glib-networking-2.54.0/tls/tests/Makefile.am 2017-08-07 23:35:45.000000000 +0200 +++ new/glib-networking-2.54.1/tls/tests/Makefile.am 2017-10-27 03:09:31.000000000 +0200 @@ -52,6 +52,9 @@ files/client-future.pem \ files/client-past.pem \ files/client.pem \ + files/client2-and-key.pem \ + files/client2-key.pem \ + files/client2.pem \ files/intermediate-ca.pem \ files/non-ca.pem \ files/server-and-key.pem \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/tests/Makefile.in new/glib-networking-2.54.1/tls/tests/Makefile.in --- old/glib-networking-2.54.0/tls/tests/Makefile.in 2017-09-12 16:45:04.000000000 +0200 +++ new/glib-networking-2.54.1/tls/tests/Makefile.in 2017-10-27 03:20:21.000000000 +0200 @@ -730,6 +730,9 @@ files/client-future.pem \ files/client-past.pem \ files/client.pem \ + files/client2-and-key.pem \ + files/client2-key.pem \ + files/client2.pem \ files/intermediate-ca.pem \ files/non-ca.pem \ files/server-and-key.pem \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/tests/connection.c new/glib-networking-2.54.1/tls/tests/connection.c --- old/glib-networking-2.54.0/tls/tests/connection.c 2017-08-07 23:35:45.000000000 +0200 +++ new/glib-networking-2.54.1/tls/tests/connection.c 2017-10-27 03:09:31.000000000 +0200 @@ -918,6 +918,7 @@ GTlsCertificate *cert; GTlsCertificate *peer; gboolean cas_changed; + GSocketClient *client; test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &error); g_assert_no_error (error); @@ -956,6 +957,36 @@ g_assert (cas_changed == TRUE); g_object_unref (cert); + g_object_unref (test->database); + g_object_unref (test->client_connection); + + /* Now start a new connection to the same server with a different client cert */ + client = g_socket_client_new (); + connection = G_IO_STREAM (g_socket_client_connect (client, G_SOCKET_CONNECTABLE (test->address), + NULL, &error)); + g_assert_no_error (error); + g_object_unref (client); + test->client_connection = g_tls_client_connection_new (connection, test->identity, &error); + g_object_unref (connection); + + g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (test->client_connection), + 0); + cert = g_tls_certificate_new_from_file (tls_test_file_path ("client2-and-key.pem"), &error); + g_assert_no_error (error); + g_tls_connection_set_certificate (G_TLS_CONNECTION (test->client_connection), cert); + g_object_unref (cert); + g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), test->database); + + read_test_data_async (test); + g_main_loop_run (test->loop); + + g_assert_no_error (test->read_error); + g_assert_no_error (test->server_error); + + /* peer should see the second client cert */ + peer = g_tls_connection_get_peer_certificate (G_TLS_CONNECTION (test->server_connection)); + g_assert (peer != NULL); + g_assert (g_tls_certificate_is_same (peer, cert)); } static void @@ -973,6 +1004,10 @@ GIOStream *connection; GError *error = NULL; gboolean accepted_changed; + GSocketClient *client; + GTlsCertificate *cert; + GTlsCertificate *peer; + GTlsInteraction *interaction; test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &error); g_assert_no_error (error); @@ -1003,6 +1038,51 @@ g_assert_error (test->server_error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED); g_assert (accepted_changed == TRUE); + + g_object_unref (test->client_connection); + g_object_unref (test->database); + g_clear_error (&test->read_error); + g_clear_error (&test->server_error); + + /* Now start a new connection to the same server with a valid client cert; + * this should succeed, and not use the cached failed session from above */ + client = g_socket_client_new (); + connection = G_IO_STREAM (g_socket_client_connect (client, G_SOCKET_CONNECTABLE (test->address), + NULL, &error)); + g_assert_no_error (error); + g_object_unref (client); + test->client_connection = g_tls_client_connection_new (connection, test->identity, &error); + g_object_unref (connection); + + g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), test->database); + + /* Have the interaction return a certificate */ + cert = g_tls_certificate_new_from_file (tls_test_file_path ("client-and-key.pem"), &error); + g_assert_no_error (error); + interaction = mock_interaction_new_static_certificate (cert); + g_tls_connection_set_interaction (G_TLS_CONNECTION (test->client_connection), interaction); + g_object_unref (interaction); + + /* All validation in this test */ + g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (test->client_connection), + G_TLS_CERTIFICATE_VALIDATE_ALL); + + accepted_changed = FALSE; + g_signal_connect (test->client_connection, "notify::accepted-cas", + G_CALLBACK (on_notify_accepted_cas), &accepted_changed); + + read_test_data_async (test); + g_main_loop_run (test->loop); + + g_assert_no_error (test->read_error); + g_assert_no_error (test->server_error); + + peer = g_tls_connection_get_peer_certificate (G_TLS_CONNECTION (test->server_connection)); + g_assert (peer != NULL); + g_assert (g_tls_certificate_is_same (peer, cert)); + g_assert (accepted_changed == TRUE); + + g_object_unref (cert); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/tests/files/client2-and-key.pem new/glib-networking-2.54.1/tls/tests/files/client2-and-key.pem --- old/glib-networking-2.54.0/tls/tests/files/client2-and-key.pem 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.54.1/tls/tests/files/client2-and-key.pem 2017-10-27 03:09:31.000000000 +0200 @@ -0,0 +1,45 @@ +-----BEGIN CERTIFICATE----- +MIIC3DCCAkUCAQEwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND +T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0 +ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN +AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNzA0MjEwODUwMjdaFw00MjA0MTUwODUw +MjdaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN +UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt +cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcDxJFF30lE +s/w8KN7ENjhaXosDqOe/IiNTStg+f1CL+/bKdcSu8wTyQsltv/+fi/jiw4ls1chP +Eni7r+HtkPdMVG5mvuaGzPFyVCl1YkOihS0v0+YQkm83LcC7jU2+dvrDQYMFWH9d +ehfFur9Cwmur5EH5Xl2nKehYifMYmljh/jPMPdCj6xWGUN6p/k459hz1JGvfWlqa +1o/35j9uakjBtsFeOKT5SEZsg2S9DudYsHfC/ncXl1LrJCFzQBY1ifhDr3FHrEsM +ieoAi4+qNq1ZZxwzppB81MAyggaJmqHUo/IpvJxWF8AhK202skiDYURk7k1kyT7g +ZWRwl72Wz/kCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAPiq0yRWbFD+17cz5TrRsG +kapRrVmwqpX4nrv+pvBgzT6aatV5SZDXq+jqw1L2n2B/DEUwDXJ0R8vV0J2hE/KE ++7YRWgM0LyT/iYp5CC1n3GKpirxarz5hwXHVmNsMnYjLRc/4NVGkyDOqTZIPN106 +C8hyhUIMHGLBqWMxCG7myQ== +-----END CERTIFICATE----- +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAtwPEkUXfSUSz/Dwo3sQ2OFpeiwOo578iI1NK2D5/UIv79sp1 +xK7zBPJCyW2//5+L+OLDiWzVyE8SeLuv4e2Q90xUbma+5obM8XJUKXViQ6KFLS/T +5hCSbzctwLuNTb52+sNBgwVYf116F8W6v0LCa6vkQfleXacp6FiJ8xiaWOH+M8w9 +0KPrFYZQ3qn+Tjn2HPUka99aWprWj/fmP25qSMG2wV44pPlIRmyDZL0O51iwd8L+ +dxeXUuskIXNAFjWJ+EOvcUesSwyJ6gCLj6o2rVlnHDOmkHzUwDKCBomaodSj8im8 +nFYXwCErbTaySINhRGTuTWTJPuBlZHCXvZbP+QIDAQABAoIBAQC2hfJ39BiRiQx8 +Jj+YlFWC9FXQDNFad1wDoSFG82WkHkgnRJoZk2XZbAfBvkw7E5LUoMvk9f9sK7g/ +Yugxye3HRX/7L0t6u7wPnTdktaZPz/lELKwHikWQ15Yw3pw5ihg9VZizpBQzyjVn +GhN6holCOweF6L79Zic8i3jhUos00lciPtKgH2fMXDL/CMMsHsd+Nr52sWmsXTpG +Rv5p64O2RnDRP555HTzlgkgrsFUuyrR7/BAGa6j9XyXN+9HjybOpwcMLDlvrXrZH +pxUeneJZIGRUIrF3c3iSVXbPHfySp/WWPD+zobXGnw1uyeWW7YPjFUu7ABATt84j +KNS5Uz5RAoGBANnw1TboXUoFKcMp8fUidZT5n1AbqqFj2KgMuMN0lUha2Fnd40a1 +yFZbO8P7RDTlQT++krH6jSV1VHfPaN4CQrfC7XQDkGjEc95Eyi0fNSuHpZirX5Ci +/fsoryls6Kkd62SPA8jDRvbv+EYRxKT8uIQsy871UDcIaHs8+IBnti+tAoGBANb5 +i+HK9Y65DuA/6W26oBW2yGLyRaIoZDWinE7LA1EiZBWwHmXyw602egjUsKRGPCKI +DCjFpLts13ZvEprTIev0enhmk/tulZ/p0+lcuY0Dd6nfTZVhejJjaLE8o5SgxXGr +U3UEemW78T9DEA3tZjt8hu8YzYWRCvLPa+8kPrr9AoGAeM+I0cQjGoocKWSSDKoK +dged6YE8p/Q6QIW00hxJOG+raL2YZDUWldBDJBOgLpY7AkP4+5IBNheBOF0QK6kj +JMx4ZownO/xSoo6NaE/ZYIT0JdoxwnKnydc2qgcGPeEpAHhKx7qAFxjVDrqAwFib +TCGs5M+VpLwTduVId52GH40CgYEAoFVIdeP41zTAmpIwWC2b3fYQaHPHaZT0gGhC +aiXR2H5s5RwQ3/p65MI/rDxtbmgPy7VqVDJslXktDeDzoFOd9izF9uySrDEjGTy9 +V0xX+4s9gY3RgHtONyybVa0jV+O8vvWH7jujyiKtYIB1Bd4spGtQ/ByklFzELKp1 +FswSmUUCgYA9lZ4bEbfFUVCTYJyLlNCFBvDhD+FaWHZ3fQOM/w0jRQVz1B1Y7BO+ +r9Uih1rcUYHUBKE61GiJh3uFFD2IwCkhICvdof0B0WsnoEuSvoTwe6pAGZbKdonY +ATM1joBOoLbgDIrE2aESBXztMErJ2Lx+q1kPbULF6cEfvYnDdQTM1Q== +-----END RSA PRIVATE KEY----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/tests/files/client2-key.pem new/glib-networking-2.54.1/tls/tests/files/client2-key.pem --- old/glib-networking-2.54.0/tls/tests/files/client2-key.pem 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.54.1/tls/tests/files/client2-key.pem 2017-10-27 03:09:31.000000000 +0200 @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAtwPEkUXfSUSz/Dwo3sQ2OFpeiwOo578iI1NK2D5/UIv79sp1 +xK7zBPJCyW2//5+L+OLDiWzVyE8SeLuv4e2Q90xUbma+5obM8XJUKXViQ6KFLS/T +5hCSbzctwLuNTb52+sNBgwVYf116F8W6v0LCa6vkQfleXacp6FiJ8xiaWOH+M8w9 +0KPrFYZQ3qn+Tjn2HPUka99aWprWj/fmP25qSMG2wV44pPlIRmyDZL0O51iwd8L+ +dxeXUuskIXNAFjWJ+EOvcUesSwyJ6gCLj6o2rVlnHDOmkHzUwDKCBomaodSj8im8 +nFYXwCErbTaySINhRGTuTWTJPuBlZHCXvZbP+QIDAQABAoIBAQC2hfJ39BiRiQx8 +Jj+YlFWC9FXQDNFad1wDoSFG82WkHkgnRJoZk2XZbAfBvkw7E5LUoMvk9f9sK7g/ +Yugxye3HRX/7L0t6u7wPnTdktaZPz/lELKwHikWQ15Yw3pw5ihg9VZizpBQzyjVn +GhN6holCOweF6L79Zic8i3jhUos00lciPtKgH2fMXDL/CMMsHsd+Nr52sWmsXTpG +Rv5p64O2RnDRP555HTzlgkgrsFUuyrR7/BAGa6j9XyXN+9HjybOpwcMLDlvrXrZH +pxUeneJZIGRUIrF3c3iSVXbPHfySp/WWPD+zobXGnw1uyeWW7YPjFUu7ABATt84j +KNS5Uz5RAoGBANnw1TboXUoFKcMp8fUidZT5n1AbqqFj2KgMuMN0lUha2Fnd40a1 +yFZbO8P7RDTlQT++krH6jSV1VHfPaN4CQrfC7XQDkGjEc95Eyi0fNSuHpZirX5Ci +/fsoryls6Kkd62SPA8jDRvbv+EYRxKT8uIQsy871UDcIaHs8+IBnti+tAoGBANb5 +i+HK9Y65DuA/6W26oBW2yGLyRaIoZDWinE7LA1EiZBWwHmXyw602egjUsKRGPCKI +DCjFpLts13ZvEprTIev0enhmk/tulZ/p0+lcuY0Dd6nfTZVhejJjaLE8o5SgxXGr +U3UEemW78T9DEA3tZjt8hu8YzYWRCvLPa+8kPrr9AoGAeM+I0cQjGoocKWSSDKoK +dged6YE8p/Q6QIW00hxJOG+raL2YZDUWldBDJBOgLpY7AkP4+5IBNheBOF0QK6kj +JMx4ZownO/xSoo6NaE/ZYIT0JdoxwnKnydc2qgcGPeEpAHhKx7qAFxjVDrqAwFib +TCGs5M+VpLwTduVId52GH40CgYEAoFVIdeP41zTAmpIwWC2b3fYQaHPHaZT0gGhC +aiXR2H5s5RwQ3/p65MI/rDxtbmgPy7VqVDJslXktDeDzoFOd9izF9uySrDEjGTy9 +V0xX+4s9gY3RgHtONyybVa0jV+O8vvWH7jujyiKtYIB1Bd4spGtQ/ByklFzELKp1 +FswSmUUCgYA9lZ4bEbfFUVCTYJyLlNCFBvDhD+FaWHZ3fQOM/w0jRQVz1B1Y7BO+ +r9Uih1rcUYHUBKE61GiJh3uFFD2IwCkhICvdof0B0WsnoEuSvoTwe6pAGZbKdonY +ATM1joBOoLbgDIrE2aESBXztMErJ2Lx+q1kPbULF6cEfvYnDdQTM1Q== +-----END RSA PRIVATE KEY----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.54.0/tls/tests/files/client2.pem new/glib-networking-2.54.1/tls/tests/files/client2.pem --- old/glib-networking-2.54.0/tls/tests/files/client2.pem 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.54.1/tls/tests/files/client2.pem 2017-10-27 03:09:31.000000000 +0200 @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC3DCCAkUCAQEwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND +T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0 +ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN +AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNzA0MjEwODUwMjdaFw00MjA0MTUwODUw +MjdaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN +UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt +cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcDxJFF30lE +s/w8KN7ENjhaXosDqOe/IiNTStg+f1CL+/bKdcSu8wTyQsltv/+fi/jiw4ls1chP +Eni7r+HtkPdMVG5mvuaGzPFyVCl1YkOihS0v0+YQkm83LcC7jU2+dvrDQYMFWH9d +ehfFur9Cwmur5EH5Xl2nKehYifMYmljh/jPMPdCj6xWGUN6p/k459hz1JGvfWlqa +1o/35j9uakjBtsFeOKT5SEZsg2S9DudYsHfC/ncXl1LrJCFzQBY1ifhDr3FHrEsM +ieoAi4+qNq1ZZxwzppB81MAyggaJmqHUo/IpvJxWF8AhK202skiDYURk7k1kyT7g +ZWRwl72Wz/kCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAPiq0yRWbFD+17cz5TrRsG +kapRrVmwqpX4nrv+pvBgzT6aatV5SZDXq+jqw1L2n2B/DEUwDXJ0R8vV0J2hE/KE ++7YRWgM0LyT/iYp5CC1n3GKpirxarz5hwXHVmNsMnYjLRc/4NVGkyDOqTZIPN106 +C8hyhUIMHGLBqWMxCG7myQ== +-----END CERTIFICATE-----
