Hello community,

here is the log from the commit of package glib-networking for openSUSE:Factory 
checked in at 2013-10-17 14:06:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glib-networking (Old)
 and      /work/SRC/openSUSE:Factory/.glib-networking.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "glib-networking"

Changes:
--------
--- /work/SRC/openSUSE:Factory/glib-networking/glib-networking.changes  
2013-09-27 17:12:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.glib-networking.new/glib-networking.changes     
2013-10-17 14:06:27.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Oct 15 14:30:07 UTC 2013 - dims...@opensuse.org
+
+- Update to version 2.38.1:
+  + glibpacrunner: Don't crash if there is an internal libproxy
+    error (rh#866927).
+  + tls/tests: Fix installed tests to not accidentally depend on
+    having the source tree still exist (bgo#709628).
+  + Updated translations.
+- Cleanup wrongly installed /files directory (bgo#710197).
+
+-------------------------------------------------------------------

Old:
----
  glib-networking-2.38.0.tar.xz

New:
----
  glib-networking-2.38.1.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glib-networking.spec ++++++
--- /var/tmp/diff_new_pack.jbE12r/_old  2013-10-17 14:06:45.000000000 +0200
+++ /var/tmp/diff_new_pack.jbE12r/_new  2013-10-17 14:06:45.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           glib-networking
-Version:        2.38.0
+Version:        2.38.1
 Release:        0
 Summary:        Network-related GIO modules for glib
 License:        LGPL-2.1+
@@ -61,6 +61,8 @@
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+# These test-files should only be installed with configure 
--enable-installed-tests (bgo#710197).
+rm -r %{buildroot}/files
 %find_lang %{name}
 
 %clean

++++++ glib-networking-2.38.0.tar.xz -> glib-networking-2.38.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/NEWS 
new/glib-networking-2.38.1/NEWS
--- old/glib-networking-2.38.0/NEWS     2013-09-24 00:19:19.000000000 +0200
+++ new/glib-networking-2.38.1/NEWS     2013-10-15 15:28:56.000000000 +0200
@@ -1,3 +1,14 @@
+2.38.1
+======
+  * glibpacrunner: Don't crash if there is an internal libproxy error.
+    (rhbz #866927)
+
+  * tls/tests: Fix installed tests to not accidentally depend on
+    having the source tree still exist. (#709628)
+
+  * Updated translations:
+       Tajik
+
 2.38.0
 ======
   * New stable release. (No changes since 2.37.5)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/configure 
new/glib-networking-2.38.1/configure
--- old/glib-networking-2.38.0/configure        2013-09-24 00:20:45.000000000 
+0200
+++ new/glib-networking-2.38.1/configure        2013-10-15 15:29:28.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.38.0.
+# Generated by GNU Autoconf 2.69 for glib-networking 2.38.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.38.0'
-PACKAGE_STRING='glib-networking 2.38.0'
+PACKAGE_VERSION='2.38.1'
+PACKAGE_STRING='glib-networking 2.38.1'
 
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network'
 PACKAGE_URL=''
 
@@ -680,11 +680,11 @@
 INTLLIBS
 INSTOBJEXT
 GMOFILES
+DATADIRNAME
 CATOBJEXT
 CATALOGS
 MSGFMT_OPTS
 GETTEXT_PACKAGE
-DATADIRNAME
 ALL_LINGUAS
 INTLTOOL_PERL
 GMSGFMT
@@ -1420,7 +1420,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.38.0 to adapt to many kinds of 
systems.
+\`configure' configures glib-networking 2.38.1 to adapt to many kinds of 
systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1490,7 +1490,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of glib-networking 2.38.0:";;
+     short | recursive ) echo "Configuration of glib-networking 2.38.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1634,7 +1634,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-glib-networking configure 2.38.0
+glib-networking configure 2.38.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2003,7 +2003,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.38.0, which was
+It was created by glib-networking $as_me 2.38.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2871,7 +2871,7 @@
 
 # Define the identity of the package.
  PACKAGE='glib-networking'
- VERSION='2.38.0'
+ VERSION='2.38.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13022,44 +13022,6 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" 
"ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
 
 
 
@@ -15415,7 +15377,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.38.0, which was
+This file was extended by glib-networking $as_me 2.38.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15481,7 +15443,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.38.0
+glib-networking config.status 2.38.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.38.0/configure.ac 
new/glib-networking-2.38.1/configure.ac
--- old/glib-networking-2.38.0/configure.ac     2013-09-24 00:18:25.000000000 
+0200
+++ new/glib-networking-2.38.1/configure.ac     2013-10-15 15:26:16.000000000 
+0200
@@ -1,7 +1,7 @@
 AC_PREREQ(2.65)
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([glib-networking],[2.38.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
+AC_INIT([glib-networking],[2.38.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
 
 AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h])
 AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/m4/intltool.m4 
new/glib-networking-2.38.1/m4/intltool.m4
--- old/glib-networking-2.38.0/m4/intltool.m4   2013-09-24 00:20:41.000000000 
+0200
+++ new/glib-networking-2.38.1/m4/intltool.m4   2013-10-15 15:29:24.000000000 
+0200
@@ -155,31 +155,6 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
 IT_PO_SUBDIR([po])
 
 ])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/po/Makefile.in.in 
new/glib-networking-2.38.1/po/Makefile.in.in
--- old/glib-networking-2.38.0/po/Makefile.in.in        2013-09-24 
00:20:41.000000000 +0200
+++ new/glib-networking-2.38.1/po/Makefile.in.in        2013-10-15 
15:29:24.000000000 +0200
@@ -33,8 +33,7 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
 
 .po.pox:
        $(MAKE) $(GETTEXT_PACKAGE).pot
-       $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+       $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
        $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
 install-data-yes: all
        linguas="$(USE_LINGUAS)"; \
        for lang in $$linguas; do \
-         dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+         dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
          $(mkdir_p) $$dir; \
          if test -r $$lang.gmo; then \
            $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
 uninstall:
        linguas="$(USE_LINGUAS)"; \
        for lang in $$linguas; do \
-         rm -f 
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-         rm -f 
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+         rm -f 
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+         rm -f 
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
        done
 
 check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/po/tg.po 
new/glib-networking-2.38.1/po/tg.po
--- old/glib-networking-2.38.0/po/tg.po 2013-06-08 17:42:18.000000000 +0200
+++ new/glib-networking-2.38.1/po/tg.po 2013-10-09 16:07:11.000000000 +0200
@@ -8,39 +8,39 @@
 "Project-Id-Version: Tajik Gnome\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=glib&keywords=I18N+L10N&component=network\n"
-"POT-Creation-Date: 2013-03-05 15:28+0000\n"
-"PO-Revision-Date: 2013-01-21 18:03+0500\n"
+"POT-Creation-Date: 2013-07-22 13:02+0000\n"
+"PO-Revision-Date: 2013-10-09 14:52+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragi...@gmail.com>\n"
 "Language-Team: \n"
 "Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
-#: ../proxy/libproxy/glibproxyresolver.c:150
+#: ../proxy/libproxy/glibproxyresolver.c:157
 msgid "Proxy resolver internal error."
-msgstr ""
+msgstr "Хатои дарунии ислоҳкунандаи Proxy."
 
 #: ../tls/gnutls/gtlscertificate-gnutls.c:173
 #, c-format
 msgid "Could not parse DER certificate: %s"
-msgstr ""
+msgstr "Гувоҳиномаи DER таҷзия карда нашуд: %s"
 
 #: ../tls/gnutls/gtlscertificate-gnutls.c:194
 #, c-format
 msgid "Could not parse PEM certificate: %s"
-msgstr ""
+msgstr "Гувоҳиномаи PEM таҷзия карда нашуд: %s"
 
 #: ../tls/gnutls/gtlscertificate-gnutls.c:225
 #, c-format
 msgid "Could not parse DER private key: %s"
-msgstr ""
+msgstr "Калиди шахсии DER таҷзия карда нашуд: %s"
 
 #: ../tls/gnutls/gtlscertificate-gnutls.c:256
 #, c-format
 msgid "Could not parse PEM private key: %s"
-msgstr ""
+msgstr "Калиди шахсии PEM таҷзия карда нашуд: %s"
 
 #: ../tls/gnutls/gtlscertificate-gnutls.c:296
 msgid "No certificate data provided"
@@ -50,89 +50,93 @@
 msgid "Server required TLS certificate"
 msgstr "Сервер гувоҳиномаи TLS-ро дархост кардааст"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:258
+#: ../tls/gnutls/gtlsconnection-gnutls.c:266
 #, c-format
 msgid "Could not create TLS connection: %s"
-msgstr ""
+msgstr "Пайвасти TLS эҷод карда нашуд: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:520
+#: ../tls/gnutls/gtlsconnection-gnutls.c:530
 msgid "Connection is closed"
-msgstr ""
+msgstr "Пайваст пӯшонида шудааст"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:582
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1425
+#: ../tls/gnutls/gtlsconnection-gnutls.c:593
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1445
 msgid "Operation would block"
-msgstr ""
+msgstr "Амалиёт баста мешавад"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:712
-#: ../tls/gnutls/gtlsconnection-gnutls.c:755
+#: ../tls/gnutls/gtlsconnection-gnutls.c:723
+#: ../tls/gnutls/gtlsconnection-gnutls.c:761
 msgid "Peer failed to perform TLS handshake"
-msgstr ""
+msgstr "Ҳамсон даъвати TLS-ро иҷро карда натавонист"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:729
+#: ../tls/gnutls/gtlsconnection-gnutls.c:740
 msgid "Peer requested illegal TLS rehandshake"
-msgstr ""
+msgstr "Ҳамсон даъвати дастнораси TLS-ро дархост кард"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:761
+#: ../tls/gnutls/gtlsconnection-gnutls.c:767
 msgid "TLS connection closed unexpectedly"
-msgstr ""
+msgstr "Пайвасти TLS ногаҳон пӯшида шудааст"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:771
+#: ../tls/gnutls/gtlsconnection-gnutls.c:777
 msgid "TLS connection peer did not send a certificate"
-msgstr ""
+msgstr "Ҳамсони пайвати TLS гувоҳиномаро фиристода накард"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1152
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1171
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1158
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1191
 #, c-format
 msgid "Error performing TLS handshake: %s"
-msgstr ""
+msgstr "Даъвати TLS бо хато иҷро карда шуд: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1181
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1201
 msgid "Server did not return a valid TLS certificate"
-msgstr ""
+msgstr "Сервер бо гувоҳиномаи TLS-и боэътибор ҷавоб надод"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1256
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1276
 msgid "Unacceptable TLS certificate"
-msgstr ""
+msgstr "Гувоҳиномаи TLS-и нораво"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1448
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1479
 #, c-format
 msgid "Error reading data from TLS socket: %s"
-msgstr ""
+msgstr "Хатои хониши маълумот аз бастагоҳи TLS: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1477
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1508
 #, c-format
 msgid "Error writing data to TLS socket: %s"
-msgstr ""
+msgstr "Хатои навишти маълумот ба бастагоҳи TLS: %s"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1521
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1552
 msgid "Connection is already closed"
-msgstr ""
+msgstr "Пайваст аллакай пӯшида шудааст"
 
-#: ../tls/gnutls/gtlsconnection-gnutls.c:1531
+#: ../tls/gnutls/gtlsconnection-gnutls.c:1562
 #, c-format
 msgid "Error performing TLS close: %s"
-msgstr ""
+msgstr "Пӯшидани TLS бо хато иҷро карда шудааст: %s"
 
 #: ../tls/gnutls/gtlsserverconnection-gnutls.c:103
 msgid "Certificate has no private key"
-msgstr ""
+msgstr "Гувоҳинома калиди шахсӣ надрад"
 
 #: ../tls/pkcs11/gpkcs11pin.c:108
 msgid ""
 "This is the last chance to enter the PIN correctly before the token is "
 "locked."
 msgstr ""
+"Ин маротибаи охирин барои вориди рамзи PIN-и дуруст пеш аз қулфи вуруд "
+"мебошад."
 
 #: ../tls/pkcs11/gpkcs11pin.c:110
 msgid ""
 "Several PIN attempts have been incorrect, and the token will be locked after "
 "further failures."
 msgstr ""
+"Баъзе кӯшишҳои вориди PIN бо хато иҷро шудаанд ва вуруд баъд аз кӯшишҳои "
+"нокомии навбатӣ қулф мешавад."
 
 #: ../tls/pkcs11/gpkcs11pin.c:112
 msgid "The PIN entered is incorrect."
-msgstr ""
+msgstr "Рамзи PIN-и воридшуда нодуруст аст."
 
 #: ../tls/pkcs11/gpkcs11slot.c:446
 msgid "Module"
@@ -140,12 +144,12 @@
 
 #: ../tls/pkcs11/gpkcs11slot.c:447
 msgid "PKCS#11 Module Pointer"
-msgstr ""
+msgstr "Нишондиҳандаи модули PKCS#11"
 
 #: ../tls/pkcs11/gpkcs11slot.c:454
 msgid "Slot ID"
-msgstr ""
+msgstr "Ковокии рамзи ID"
 
 #: ../tls/pkcs11/gpkcs11slot.c:455
 msgid "PKCS#11 Slot Identifier"
-msgstr ""
+msgstr "Идентификатори ковокии PKCS#11"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/glib-networking-2.38.0/proxy/libproxy/glibpacrunner.c 
new/glib-networking-2.38.1/proxy/libproxy/glibpacrunner.c
--- old/glib-networking-2.38.0/proxy/libproxy/glibpacrunner.c   2013-05-28 
14:44:30.000000000 +0200
+++ new/glib-networking-2.38.1/proxy/libproxy/glibpacrunner.c   2013-09-29 
18:43:23.000000000 +0200
@@ -48,11 +48,14 @@
   GError *error = NULL;
 
   proxies = g_proxy_resolver_lookup_finish (resolver, result, &error);
-  g_assert (!error);
-
-  g_dbus_method_invocation_return_value (invocation,
-                                        g_variant_new ("(^as)", proxies));
-  g_strfreev (proxies);
+  if (error)
+    g_dbus_method_invocation_take_error (invocation, error);
+  else
+    {
+      g_dbus_method_invocation_return_value (invocation,
+                                            g_variant_new ("(^as)", proxies));
+      g_strfreev (proxies);
+    }
 }
 
 static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/tls/tests/Makefile.am 
new/glib-networking-2.38.1/tls/tests/Makefile.am
--- old/glib-networking-2.38.0/tls/tests/Makefile.am    2013-07-13 
22:37:52.000000000 +0200
+++ new/glib-networking-2.38.1/tls/tests/Makefile.am    2013-10-15 
15:25:27.000000000 +0200
@@ -35,6 +35,23 @@
 
 endif
 
-EXTRA_DIST += \
-       files \
+testfilesdir = $(installed_testdir)/files
+testfiles_DATA =                               \
+       files/ca.pem                            \
+       files/ca-roots.pem                      \
+       files/ca-verisign-sha1.pem              \
+       files/chain-with-verisign-md2.pem       \
+       files/client-and-key.pem                \
+       files/client-future.pem                 \
+       files/client-past.pem                   \
+       files/client.pem                        \
+       files/non-ca.pem                        \
+       files/server-and-key.pem                \
+       files/server.der                        \
+       files/server-key.der                    \
+       files/server-key.pem                    \
+       files/server.pem                        \
+       files/server-self.pem                   \
        $(NULL)
+
+EXTRA_DIST += $(testfiles_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/tls/tests/Makefile.in 
new/glib-networking-2.38.1/tls/tests/Makefile.in
--- old/glib-networking-2.38.0/tls/tests/Makefile.in    2013-09-24 
00:20:46.000000000 +0200
+++ new/glib-networking-2.38.1/tls/tests/Makefile.in    2013-10-15 
15:29:29.000000000 +0200
@@ -172,7 +172,7 @@
        "$(DESTDIR)$(installed_testdir)" \
        "$(DESTDIR)$(installed_testdir)" \
        "$(DESTDIR)$(installed_test_metadir)" \
-       "$(DESTDIR)$(installed_testdir)"
+       "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(testfilesdir)"
 LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__EXEEXT_1 =
 @HAVE_PKCS11_TRUE@am__EXEEXT_2 = pkcs11-util$(EXEEXT) \
@@ -273,7 +273,7 @@
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(installed_test_meta_DATA) $(nobase_installed_test_DATA) \
-       $(noinst_DATA)
+       $(noinst_DATA) $(testfiles_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -654,8 +654,8 @@
 CLEANFILES = *.log *.trs $(am__append_13)
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
-EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) files \
-       $(NULL)
+EXTRA_DIST = $(all_dist_test_scripts) $(all_dist_test_data) \
+       $(testfiles_DATA)
 
 # We support a fairly large range of possible variables.  It is expected that 
all types of files in a test suite
 # will belong in exactly one of the following variables.
@@ -741,6 +741,25 @@
 @HAVE_PKCS11_TRUE@     mock-pkcs11.c mock-pkcs11.h \
 @HAVE_PKCS11_TRUE@     mock-interaction.c mock-interaction.h
 
+testfilesdir = $(installed_testdir)/files
+testfiles_DATA = \
+       files/ca.pem                            \
+       files/ca-roots.pem                      \
+       files/ca-verisign-sha1.pem              \
+       files/chain-with-verisign-md2.pem       \
+       files/client-and-key.pem                \
+       files/client-future.pem                 \
+       files/client-past.pem                   \
+       files/client.pem                        \
+       files/non-ca.pem                        \
+       files/server-and-key.pem                \
+       files/server.der                        \
+       files/server-key.der                    \
+       files/server-key.pem                    \
+       files/server.pem                        \
+       files/server-self.pem                   \
+       $(NULL)
+
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1052,6 +1071,27 @@
        @list='$(nobase_installed_test_DATA)'; test -n "$(installed_testdir)" 
|| list=; \
        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
        dir='$(DESTDIR)$(installed_testdir)'; $(am__uninstall_files_from_dir)
+install-testfilesDATA: $(testfiles_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(testfiles_DATA)'; test -n "$(testfilesdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(testfilesdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(testfilesdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(testfilesdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(testfilesdir)" || exit $$?; \
+       done
+
+uninstall-testfilesDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(testfiles_DATA)'; test -n "$(testfilesdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(testfilesdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1299,7 +1339,7 @@
        $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs:
-       for dir in "$(DESTDIR)$(installed_testdir)" 
"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" 
"$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)"; do \
+       for dir in "$(DESTDIR)$(installed_testdir)" 
"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" 
"$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)" 
"$(DESTDIR)$(testfilesdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -1368,7 +1408,7 @@
 install-data-am: install-installed_testLTLIBRARIES \
        install-installed_testPROGRAMS install-installed_testSCRIPTS \
        install-installed_test_metaDATA \
-       install-nobase_installed_testDATA
+       install-nobase_installed_testDATA install-testfilesDATA
 
 install-dvi: install-dvi-am
 
@@ -1418,7 +1458,7 @@
        uninstall-installed_testPROGRAMS \
        uninstall-installed_testSCRIPTS \
        uninstall-installed_test_metaDATA \
-       uninstall-nobase_installed_testDATA
+       uninstall-nobase_installed_testDATA uninstall-testfilesDATA
 
 .MAKE: all check check-am install install-am install-strip
 
@@ -1436,8 +1476,8 @@
        install-installed_testPROGRAMS install-installed_testSCRIPTS \
        install-installed_test_metaDATA install-man \
        install-nobase_installed_testDATA install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
+       install-ps install-ps-am install-strip install-testfilesDATA \
+       installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-compile \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
        recheck tags tags-am uninstall uninstall-am \
@@ -1445,7 +1485,7 @@
        uninstall-installed_testPROGRAMS \
        uninstall-installed_testSCRIPTS \
        uninstall-installed_test_metaDATA \
-       uninstall-nobase_installed_testDATA
+       uninstall-nobase_installed_testDATA uninstall-testfilesDATA
 
 
 ### testing rules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/tls/tests/certificate.c 
new/glib-networking-2.38.1/tls/tests/certificate.c
--- old/glib-networking-2.38.0/tls/tests/certificate.c  2013-06-24 
18:09:18.000000000 +0200
+++ new/glib-networking-2.38.1/tls/tests/certificate.c  2013-10-09 
16:07:11.000000000 +0200
@@ -24,7 +24,28 @@
 #include <sys/types.h>
 #include <string.h>
 
-#define TEST_FILE(name) (SRCDIR "/files/" name)
+static const gchar *
+tls_test_file_path (const char *name)
+{
+  const gchar *const_path;
+  gchar *path;
+
+  path = g_test_build_filename (G_TEST_DIST, "files", name, NULL);
+  if (!g_path_is_absolute (path))
+    {
+      gchar *cwd, *abs;
+
+      cwd = g_get_current_dir ();
+      abs = g_build_filename (cwd, path, NULL);
+      g_free (cwd);
+      g_free (path);
+      path = abs;
+    }
+
+  const_path = g_intern_string (path);
+  g_free (path);
+  return const_path;
+}
 
 typedef struct {
   GTlsBackend *backend;
@@ -47,11 +68,11 @@
   test->backend = g_tls_backend_get_default ();
   test->cert_gtype = g_tls_backend_get_certificate_type (test->backend);
 
-  g_file_get_contents (TEST_FILE ("server.pem"), &test->cert_pem,
+  g_file_get_contents (tls_test_file_path ("server.pem"), &test->cert_pem,
                        &test->cert_pem_length, &error);
   g_assert_no_error (error);
 
-  g_file_get_contents (TEST_FILE ("server.der"),
+  g_file_get_contents (tls_test_file_path ("server.der"),
                       &contents, &length, &error);
   g_assert_no_error (error);
 
@@ -59,11 +80,11 @@
   g_byte_array_append (test->cert_der, (guint8 *)contents, length);
   g_free (contents);
 
-  g_file_get_contents (TEST_FILE ("server-key.pem"), &test->key_pem,
+  g_file_get_contents (tls_test_file_path ("server-key.pem"), &test->key_pem,
                        &test->key_pem_length, &error);
   g_assert_no_error (error);
 
-  g_file_get_contents (TEST_FILE ("server-key.der"),
+  g_file_get_contents (tls_test_file_path ("server-key.der"),
                        &contents, &length, &error);
   g_assert_no_error (error);
 
@@ -175,7 +196,7 @@
   GTlsCertificate *cert, *issuer, *check;
   GError *error = NULL;
 
-  issuer = g_tls_certificate_new_from_file (TEST_FILE ("ca.pem"), &error);
+  issuer = g_tls_certificate_new_from_file (tls_test_file_path ("ca.pem"), 
&error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (issuer));
 
@@ -216,16 +237,16 @@
 {
   GError *error = NULL;
 
-  test->cert = g_tls_certificate_new_from_file (TEST_FILE ("server.pem"), 
&error);
+  test->cert = g_tls_certificate_new_from_file (tls_test_file_path 
("server.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (test->cert));
 
   test->identity = g_network_address_new ("server.example.com", 80);
 
-  test->anchor = g_tls_certificate_new_from_file (TEST_FILE ("ca.pem"), 
&error);
+  test->anchor = g_tls_certificate_new_from_file (tls_test_file_path 
("ca.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (test->anchor));
-  test->database = g_tls_file_database_new (TEST_FILE ("ca.pem"), &error);
+  test->database = g_tls_file_database_new (tls_test_file_path ("ca.pem"), 
&error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_DATABASE (test->database));
 }
@@ -295,7 +316,7 @@
   GError *error = NULL;
 
   /* Use a client certificate as the CA, which is wrong */
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client.pem"), &error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path ("client.pem"), 
&error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -314,7 +335,7 @@
   GError *error = NULL;
 
   /* This is a certificate in the future */
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client-future.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("client-future.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -333,7 +354,7 @@
   GError *error = NULL;
 
   /* This is a certificate in the future */
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client-past.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("client-past.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -353,12 +374,12 @@
   GTlsCertificateFlags errors;
   GError *error = NULL;
 
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client-past.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("client-past.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
   /* Unrelated cert used as certificate authority */
-  cacert = g_tls_certificate_new_from_file (TEST_FILE ("server-self.pem"), 
&error);
+  cacert = g_tls_certificate_new_from_file (tls_test_file_path 
("server-self.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cacert));
 
@@ -387,13 +408,13 @@
   GTlsCertificate *three;
   GError *error = NULL;
 
-  one = g_tls_certificate_new_from_file (TEST_FILE ("client.pem"), &error);
+  one = g_tls_certificate_new_from_file (tls_test_file_path ("client.pem"), 
&error);
   g_assert_no_error (error);
 
-  two = g_tls_certificate_new_from_file (TEST_FILE ("client-and-key.pem"), 
&error);
+  two = g_tls_certificate_new_from_file (tls_test_file_path 
("client-and-key.pem"), &error);
   g_assert_no_error (error);
 
-  three = g_tls_certificate_new_from_file (TEST_FILE ("server.pem"), &error);
+  three = g_tls_certificate_new_from_file (tls_test_file_path ("server.pem"), 
&error);
   g_assert_no_error (error);
 
   g_assert (g_tls_certificate_is_same (one, two) == TRUE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/tls/tests/connection.c 
new/glib-networking-2.38.1/tls/tests/connection.c
--- old/glib-networking-2.38.0/tls/tests/connection.c   2013-06-24 
18:09:18.000000000 +0200
+++ new/glib-networking-2.38.1/tls/tests/connection.c   2013-10-15 
15:25:27.000000000 +0200
@@ -24,7 +24,28 @@
 #include <sys/types.h>
 #include <string.h>
 
-#define TEST_FILE(name) (SRCDIR "/files/" name)
+static const gchar *
+tls_test_file_path (const char *name)
+{
+  const gchar *const_path;
+  gchar *path;
+
+  path = g_test_build_filename (G_TEST_DIST, "files", name, NULL);
+  if (!g_path_is_absolute (path))
+    {
+      gchar *cwd, *abs;
+
+      cwd = g_get_current_dir ();
+      abs = g_build_filename (cwd, path, NULL);
+      g_free (cwd);
+      g_free (path);
+      path = abs;
+    }
+
+  const_path = g_intern_string (path);
+  g_free (path);
+  return const_path;
+}
 
 #define TEST_DATA "You win again, gravity!\n"
 #define TEST_DATA_LENGTH 24
@@ -205,7 +226,7 @@
   GTlsCertificate *cert;
   GError *error = NULL;
 
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("server-and-key.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("server-and-key.pem"), &error);
   g_assert_no_error (error);
 
   test->server_connection = g_tls_server_connection_new (G_IO_STREAM 
(connection),
@@ -278,7 +299,7 @@
   gssize nread, nwrote, total;
   gchar buf[128];
 
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("server-and-key.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("server-and-key.pem"), &error);
   g_assert_no_error (error);
 
   test->server_connection = g_tls_server_connection_new (G_IO_STREAM 
(connection),
@@ -436,7 +457,7 @@
   GIOStream *connection;
   GError *error = NULL;
 
-  test->database = g_tls_file_database_new (TEST_FILE ("ca-roots.pem"), 
&error);
+  test->database = g_tls_file_database_new (tls_test_file_path 
("ca-roots.pem"), &error);
   g_assert_no_error (error);
   g_assert (test->database);
 
@@ -479,7 +500,7 @@
   GTlsCertificate *peer;
   gboolean cas_changed;
 
-  test->database = g_tls_file_database_new (TEST_FILE ("ca-roots.pem"), 
&error);
+  test->database = g_tls_file_database_new (tls_test_file_path 
("ca-roots.pem"), &error);
   g_assert_no_error (error);
   g_assert (test->database);
 
@@ -491,7 +512,7 @@
 
   g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), 
test->database);
 
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client-and-key.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("client-and-key.pem"), &error);
   g_assert_no_error (error);
 
   g_tls_connection_set_certificate (G_TLS_CONNECTION 
(test->client_connection), cert);
@@ -534,7 +555,7 @@
   GError *error = NULL;
   gboolean accepted_changed;
 
-  test->database = g_tls_file_database_new (TEST_FILE ("ca-roots.pem"), 
&error);
+  test->database = g_tls_file_database_new (tls_test_file_path 
("ca-roots.pem"), &error);
   g_assert_no_error (error);
   g_assert (test->database);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.38.0/tls/tests/file-database.c 
new/glib-networking-2.38.1/tls/tests/file-database.c
--- old/glib-networking-2.38.0/tls/tests/file-database.c        2013-06-24 
18:09:18.000000000 +0200
+++ new/glib-networking-2.38.1/tls/tests/file-database.c        2013-10-09 
16:07:11.000000000 +0200
@@ -28,7 +28,28 @@
 #include <sys/types.h>
 #include <string.h>
 
-#define TEST_FILE(name) (SRCDIR "/files/" name)
+static const gchar *
+tls_test_file_path (const char *name)
+{
+  const gchar *const_path;
+  gchar *path;
+
+  path = g_test_build_filename (G_TEST_DIST, "files", name, NULL);
+  if (!g_path_is_absolute (path))
+    {
+      gchar *cwd, *abs;
+
+      cwd = g_get_current_dir ();
+      abs = g_build_filename (cwd, path, NULL);
+      g_free (cwd);
+      g_free (path);
+      path = abs;
+    }
+
+  const_path = g_intern_string (path);
+  g_free (path);
+  return const_path;
+}
 
 /* 
-----------------------------------------------------------------------------
  * CERTIFICATE VERIFY
@@ -46,13 +67,13 @@
 {
   GError *error = NULL;
 
-  test->cert = g_tls_certificate_new_from_file (TEST_FILE ("server.pem"), 
&error);
+  test->cert = g_tls_certificate_new_from_file (tls_test_file_path 
("server.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (test->cert));
 
   test->identity = g_network_address_new ("server.example.com", 80);
 
-  test->database = g_tls_file_database_new (TEST_FILE ("ca.pem"), &error);
+  test->database = g_tls_file_database_new (tls_test_file_path ("ca.pem"), 
&error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_DATABASE (test->database));
 }
@@ -126,7 +147,7 @@
   GError *error = NULL;
 
   /* Use another certificate which isn't in our CA list */
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("server-self.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("server-self.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -148,7 +169,7 @@
   GError *error = NULL;
 
   /* This is a certificate in the future */
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client-future.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("client-future.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -170,7 +191,7 @@
   GError *error = NULL;
 
   /* This is a certificate in the future */
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("client-past.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("client-past.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -192,7 +213,7 @@
   GTlsCertificateFlags errors;
   GError *error = NULL;
 
-  cert = g_tls_certificate_new_from_file (TEST_FILE ("server-self.pem"), 
&error);
+  cert = g_tls_certificate_new_from_file (tls_test_file_path 
("server-self.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (cert));
 
@@ -272,11 +293,11 @@
    * This database contains a single anchor certificate of:
    * C = US, O = "VeriSign, Inc.", OU = Class 3 Public Primary Certification 
Authority
    */
-  database = g_tls_file_database_new (TEST_FILE ("ca-verisign-sha1.pem"), 
&error);
+  database = g_tls_file_database_new (tls_test_file_path 
("ca-verisign-sha1.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_DATABASE (database));
 
-  ca_verisign_sha1 = g_tls_certificate_new_from_file (TEST_FILE 
("ca-verisign-sha1.pem"), &error);
+  ca_verisign_sha1 = g_tls_certificate_new_from_file (tls_test_file_path 
("ca-verisign-sha1.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (ca_verisign_sha1));
 
@@ -288,7 +309,7 @@
    * verify this chain as valid, since the issuer fields and signatures should 
chain up
    * to the certificate in our database.
    */
-  chain = load_certificate_chain (TEST_FILE ("chain-with-verisign-md2.pem"), 
&error);
+  chain = load_certificate_chain (tls_test_file_path 
("chain-with-verisign-md2.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (chain));
 
@@ -328,7 +349,7 @@
 {
   GError *error = NULL;
 
-  test->path = TEST_FILE ("ca-roots.pem");
+  test->path = tls_test_file_path ("ca-roots.pem");
   test->database = g_tls_file_database_new (test->path, &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_DATABASE (test->database));
@@ -360,7 +381,7 @@
    * is 'in' the database.
    */
 
-  certificate = g_tls_certificate_new_from_file (TEST_FILE ("ca.pem"), &error);
+  certificate = g_tls_certificate_new_from_file (tls_test_file_path 
("ca.pem"), &error);
   g_assert_no_error (error);
   g_assert (G_IS_TLS_CERTIFICATE (certificate));
 
@@ -404,11 +425,11 @@
   gchar *anchor_filename = NULL;
   GError *error = NULL;
 
-  database = g_tls_file_database_new (TEST_FILE ("ca.pem"), &error);
+  database = g_tls_file_database_new (tls_test_file_path ("ca.pem"), &error);
   g_assert_no_error (error);
 
   g_object_get (database, "anchors", &anchor_filename, NULL);
-  g_assert_cmpstr (anchor_filename, ==, TEST_FILE ("ca.pem"));
+  g_assert_cmpstr (anchor_filename, ==, tls_test_file_path ("ca.pem"));
   g_free (anchor_filename);
 
   g_object_unref (database);
@@ -457,7 +478,7 @@
   GTlsDatabase *database;
   GError *error = NULL;
 
-  database = g_tls_file_database_new (TEST_FILE ("non-ca.pem"), &error);
+  database = g_tls_file_database_new (tls_test_file_path ("non-ca.pem"), 
&error);
   g_assert_no_error (error);
 
   issuer_dn = g_byte_array_new ();
@@ -472,11 +493,11 @@
 
   g_assert_cmpuint (g_list_length (certificates), ==, 4);
 
-  g_assert (certificate_is_in_list (certificates, TEST_FILE ("client.pem")));
-  g_assert (certificate_is_in_list (certificates, TEST_FILE 
("client-future.pem")));
-  g_assert (certificate_is_in_list (certificates, TEST_FILE 
("client-past.pem")));
-  g_assert (certificate_is_in_list (certificates, TEST_FILE ("server.pem")));
-  g_assert (!certificate_is_in_list (certificates, TEST_FILE 
("server-self.pem")));
+  g_assert (certificate_is_in_list (certificates, tls_test_file_path 
("client.pem")));
+  g_assert (certificate_is_in_list (certificates, tls_test_file_path 
("client-future.pem")));
+  g_assert (certificate_is_in_list (certificates, tls_test_file_path 
("client-past.pem")));
+  g_assert (certificate_is_in_list (certificates, tls_test_file_path 
("server.pem")));
+  g_assert (!certificate_is_in_list (certificates, tls_test_file_path 
("server-self.pem")));
 
   g_list_free_full (certificates, g_object_unref);
   g_object_unref (database);

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to