Hello community, here is the log from the commit of package glib-networking for openSUSE:Factory checked in at Sun Oct 2 10:03:57 CEST 2011.
-------- --- openSUSE:Factory/glib-networking/glib-networking.changes 2011-09-23 02:00:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/glib-networking/glib-networking.changes 2011-09-27 00:23:18.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Sep 26 22:22:55 UTC 2011 - [email protected] + +- Update to version 2.30.0: + + Updated translations. + +------------------------------------------------------------------- +Tue Sep 20 07:08:59 UTC 2011 - [email protected] + +- Update to version 2.29.92: + + gnutls: + - Fixed a problem when linking against GNUTLS 3.0, where + connections would sometimes return the error "The TLS + connection was non-properly terminated". (bgo#659233) + - Plugged a few memory leaks + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- glib-networking-2.29.18.tar.bz2 New: ---- glib-networking-2.30.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib-networking.spec ++++++ --- /var/tmp/diff_new_pack.TBaQUe/_old 2011-10-02 10:03:52.000000000 +0200 +++ /var/tmp/diff_new_pack.TBaQUe/_new 2011-10-02 10:03:52.000000000 +0200 @@ -18,12 +18,12 @@ Name: glib-networking -Version: 2.29.18 +Version: 2.30.0 Release: 1 License: LGPLv2+ Summary: Network-related GIO modules for glib Group: System/Libraries -Source: http://download.gnome.org/sources/glib-networking/2.29/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/glib-networking/2.30/%{name}-%{version}.tar.bz2 Source99: baselibs.conf # For directory ownership BuildRequires: dbus-1 ++++++ glib-networking-2.29.18.tar.bz2 -> glib-networking-2.30.0.tar.bz2 ++++++ ++++ 10291 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/NEWS new/glib-networking-2.30.0/NEWS --- old/glib-networking-2.29.18/NEWS 2011-08-30 18:54:53.000000000 +0200 +++ new/glib-networking-2.30.0/NEWS 2011-09-27 00:03:21.000000000 +0200 @@ -1,3 +1,19 @@ +2.30.0 +====== + * Updated translation: + Thai + +2.29.92 +======= + * New/updated translations: + Belarusian, Tamil, Japanese + + * gnutls: Fixed a problem when linking against GNUTLS 3.0, where + connections would sometimes return the error "The TLS connection + was non-properly terminated". (Dan Winship, #659233) + + * gnutls: Plugged a few memory leaks (Dan Winship) + 2.29.18 ======= * gnutls: fixed two rehandshaking bugs; one in which a client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/configure.ac new/glib-networking-2.30.0/configure.ac --- old/glib-networking-2.29.18/configure.ac 2011-08-30 18:54:53.000000000 +0200 +++ new/glib-networking-2.30.0/configure.ac 2011-09-27 00:03:05.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([glib-networking],[2.29.18],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) +AC_INIT([glib-networking],[2.30.0],[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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/po/LINGUAS new/glib-networking-2.30.0/po/LINGUAS --- old/glib-networking-2.29.18/po/LINGUAS 2011-08-25 23:46:51.000000000 +0200 +++ new/glib-networking-2.30.0/po/LINGUAS 2011-09-27 00:02:23.000000000 +0200 @@ -43,6 +43,8 @@ sr sr@latin sv +ta +th tr ug uk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/po/be.po new/glib-networking-2.30.0/po/be.po --- old/glib-networking-2.29.18/po/be.po 2011-07-05 03:15:06.000000000 +0200 +++ new/glib-networking-2.30.0/po/be.po 2011-09-06 15:53:41.000000000 +0200 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-25 20:25+0300\n" -"PO-Revision-Date: 2011-04-23 16:14+0200\n" +"POT-Creation-Date: 2011-09-04 18:52+0300\n" +"PO-Revision-Date: 2011-09-04 18:53+0300\n" "Last-Translator: Ігар <[email protected]>\n" "Language-Team: LANGUAGE <[email protected]>\n" "Language: be\n" @@ -42,48 +42,48 @@ msgid "No certificate data provided" msgstr "Даныя сертыфіката не пададзеныя" -#: ../tls/gnutls/gtlsclientconnection-gnutls.c:357 +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:386 msgid "Server required TLS certificate" msgstr "Сервер запатрабаваў TLS-сертыфікат" -#: ../tls/gnutls/gtlsconnection-gnutls.c:241 +#: ../tls/gnutls/gtlsconnection-gnutls.c:251 #, c-format msgid "Could not create TLS connection: %s" msgstr "Не ўдалося стварыць TLS-злучэнне: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:478 +#: ../tls/gnutls/gtlsconnection-gnutls.c:526 msgid "Peer failed to perform TLS handshake" msgstr "" -#: ../tls/gnutls/gtlsconnection-gnutls.c:496 +#: ../tls/gnutls/gtlsconnection-gnutls.c:544 msgid "Peer requested illegal TLS rehandshake" msgstr "" -#: ../tls/gnutls/gtlsconnection-gnutls.c:510 +#: ../tls/gnutls/gtlsconnection-gnutls.c:558 msgid "TLS connection closed unexpectedly" -msgstr "TLS-злучэнне нечакана зачынілася" +msgstr "TLS-злучэнне нечакана закрылася" -#: ../tls/gnutls/gtlsconnection-gnutls.c:802 -#: ../tls/gnutls/gtlsconnection-gnutls.c:828 +#: ../tls/gnutls/gtlsconnection-gnutls.c:851 +#: ../tls/gnutls/gtlsconnection-gnutls.c:877 #, c-format msgid "Error performing TLS handshake: %s" msgstr "" -#: ../tls/gnutls/gtlsconnection-gnutls.c:881 +#: ../tls/gnutls/gtlsconnection-gnutls.c:916 msgid "Unacceptable TLS certificate" msgstr "Непрымальны TLS-сертыфікат" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1028 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1063 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "Памылка чытання даных з TLS-сокета: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1054 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1089 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "Памылка запісу даных у TLS-сокет: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1100 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1135 #, c-format msgid "Error performing TLS close: %s" -msgstr "Памылка зачынення TLS-злучэння: %s" +msgstr "Памылка закрыцця TLS-злучэння: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/po/ja.po new/glib-networking-2.30.0/po/ja.po --- old/glib-networking-2.29.18/po/ja.po 2011-03-16 15:08:09.000000000 +0100 +++ new/glib-networking-2.30.0/po/ja.po 2011-09-19 23:45:53.000000000 +0200 @@ -8,9 +8,9 @@ "Project-Id-Version: glib-networking master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=glib&keywords=I18N+L10N&component=network\n" -"POT-Creation-Date: 2011-03-13 17:14+0000\n" -"PO-Revision-Date: 2011-03-08 00:34+0900\n" -"Last-Translator: Takayuki KUSANO <[email protected]>\n" +"POT-Creation-Date: 2011-09-16 17:52+0000\n" +"PO-Revision-Date: 2011-09-11 00:28+0900\n" +"Last-Translator: Jiro Matsuzawa <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../proxy/libproxy/glibproxyresolver.c:142 +#: ../proxy/libproxy/glibproxyresolver.c:151 msgid "Proxy resolver internal error." msgstr "プロキシ・レゾルバの内部エラー。" @@ -46,48 +46,48 @@ msgid "No certificate data provided" msgstr "証明書のデータが与えられていません" -#: ../tls/gnutls/gtlsclientconnection-gnutls.c:356 +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:386 msgid "Server required TLS certificate" -msgstr "サーバが TLS 証明書を要求しました" +msgstr "サーバーが TLS 証明書を要求しました" -#: ../tls/gnutls/gtlsconnection-gnutls.c:241 +#: ../tls/gnutls/gtlsconnection-gnutls.c:254 #, c-format msgid "Could not create TLS connection: %s" msgstr "TLS の接続を確立できませんでした: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:479 +#: ../tls/gnutls/gtlsconnection-gnutls.c:529 msgid "Peer failed to perform TLS handshake" msgstr "通信相手が TLS ハンドシェイクの実行に失敗しました" -#: ../tls/gnutls/gtlsconnection-gnutls.c:497 +#: ../tls/gnutls/gtlsconnection-gnutls.c:547 msgid "Peer requested illegal TLS rehandshake" msgstr "通信相手が不当な TLS の再ハンドシェイクを要求しました" -#: ../tls/gnutls/gtlsconnection-gnutls.c:511 +#: ../tls/gnutls/gtlsconnection-gnutls.c:565 msgid "TLS connection closed unexpectedly" msgstr "TLS の接続が突然、閉じられました" -#: ../tls/gnutls/gtlsconnection-gnutls.c:799 -#: ../tls/gnutls/gtlsconnection-gnutls.c:825 +#: ../tls/gnutls/gtlsconnection-gnutls.c:859 +#: ../tls/gnutls/gtlsconnection-gnutls.c:885 #, c-format msgid "Error performing TLS handshake: %s" msgstr "TLS のハンドシェイクの実行中にエラー: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:876 +#: ../tls/gnutls/gtlsconnection-gnutls.c:924 msgid "Unacceptable TLS certificate" msgstr "受け付けられない TLS 証明書です" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1023 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1071 #, c-format msgid "Error reading data from TLS socket: %s" msgstr "TLS socket からのデータの読み込み中にエラー: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1049 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1097 #, c-format msgid "Error writing data to TLS socket: %s" msgstr "TLS socket へのデータの書き出し中にエラー: %s" -#: ../tls/gnutls/gtlsconnection-gnutls.c:1095 +#: ../tls/gnutls/gtlsconnection-gnutls.c:1143 #, c-format msgid "Error performing TLS close: %s" msgstr "TLS の close 中にエラー: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/po/ta.po new/glib-networking-2.30.0/po/ta.po --- old/glib-networking-2.29.18/po/ta.po 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.30.0/po/ta.po 2011-09-16 17:23:42.000000000 +0200 @@ -0,0 +1,95 @@ +# Tamil translation for glib-networking. +# Copyright (C) 2011 glib-networking's COPYRIGHT HOLDER +# This file is distributed under the same license as the glib-networking package. +# +# I Felix <[email protected]>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: glib-networking master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; +"product=glib&keywords=I18N+L10N&component=network\n" +"POT-Creation-Date: 2011-09-04 15:53+0000\n" +"PO-Revision-Date: 2011-09-09 12:18+0530\n" +"Last-Translator: I Felix <[email protected]>\n" +"Language-Team: Tamil <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ta\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: ../proxy/libproxy/glibproxyresolver.c:151 +msgid "Proxy resolver internal error." +msgstr "ப்ராக்ஸி ரிசால்வர் உள்ளார்ந்த பிழை." + +#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#, c-format +msgid "Could not parse DER certificate: %s" +msgstr "DER சான்றிதழை பிரிக்க முடியவில்லை: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#, c-format +msgid "Could not parse PEM certificate: %s" +msgstr "PEM சான்றிதழை பிரிக்க முடியவில்லை: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:214 +#, c-format +msgid "Could not parse DER private key: %s" +msgstr "DER தனிபட்ட விசையை பிரிக்க முடியவில்லை: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:234 +#, c-format +msgid "Could not parse PEM private key: %s" +msgstr "PEM தனிபட்ட விசையை பிரிக்க முடியவில்லை:% s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:275 +msgid "No certificate data provided" +msgstr "சான்றிதழ் தரவு எதுவும் வழங்கப்படவில்லை" + +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:386 +msgid "Server required TLS certificate" +msgstr "சேவையகத்திற்கு TLS சான்றிதழ் தேவைப்படுகிறது" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:251 +#, c-format +msgid "Could not create TLS connection: %s" +msgstr "TLS இணைப்பை உருவாக்க முடியவில்லை: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:526 +msgid "Peer failed to perform TLS handshake" +msgstr "TLS கைகுலுக்கலில் பீரால் செயற்படுத்த முடியவில்லை" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:544 +msgid "Peer requested illegal TLS rehandshake" +msgstr "பீரானது சட்ட விரோதமான TLS மீண்டும் கைகுலுக்கலை கோருகிறது" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:558 +msgid "TLS connection closed unexpectedly" +msgstr "எதிர்பாராதவிதமாக TLS இணைப்பு மூடப்பட்டது" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:851 +#: ../tls/gnutls/gtlsconnection-gnutls.c:877 +#, c-format +msgid "Error performing TLS handshake: %s" +msgstr "TLS கைக்குலுக்கலில் பிழையை செயற்படுத்துகிறது: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:916 +msgid "Unacceptable TLS certificate" +msgstr "ஏற்றுக்கொள்ள முடியாத TLS சான்றிதழ்" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1063 +#, c-format +msgid "Error reading data from TLS socket: %s" +msgstr "TLS சாக்கெட்டிலிருந்து பிழை வாசிக்கும் தரவு: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1089 +#, c-format +msgid "Error writing data to TLS socket: %s" +msgstr "TLS சாக்கெட்டிற்கு பிழை எழுதும் தரவு: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1135 +#, c-format +msgid "Error performing TLS close: %s" +msgstr "TLS மூடுவதில் பிழையை செயற்படுத்துகிறது: %s" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/po/th.po new/glib-networking-2.30.0/po/th.po --- old/glib-networking-2.29.18/po/th.po 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.30.0/po/th.po 2011-09-27 00:02:23.000000000 +0200 @@ -0,0 +1,92 @@ +# Thai translation for glib-networking. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the glib-networking package. +# Unticha Pramgoed <[email protected]>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: glib-networking master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; +"product=glib&keywords=I18N+L10N&component=network\n" +"POT-Creation-Date: 2011-09-23 07:39+0000\n" +"PO-Revision-Date: 2011-09-24 13:17+0700\n" +"Last-Translator: Unticha Pramgoed <[email protected]>\n" +"Language-Team: th <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: UTF-8\n" +"\n" + +#: ../proxy/libproxy/glibproxyresolver.c:151 +msgid "Proxy resolver internal error." +msgstr "เกิดข้อผิดพลาดภายในของบริการเปิดหาพร็อกซี" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:173 +#, c-format +msgid "Could not parse DER certificate: %s" +msgstr "ไม่สามารถแจงใบรับรอง DER: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:194 +#, c-format +msgid "Could not parse PEM certificate: %s" +msgstr "ไม่สามารถแจงใบรับรอง PEM: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:214 +#, c-format +msgid "Could not parse DER private key: %s" +msgstr "ไม่สามารถแจงกุญแจส่วนตัว DER: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:234 +#, c-format +msgid "Could not parse PEM private key: %s" +msgstr "ไม่สามารถแจงกุญแจส่วนตัว PEM: %s" + +#: ../tls/gnutls/gtlscertificate-gnutls.c:275 +msgid "No certificate data provided" +msgstr "ไม่มีข้อมูลใบรับรอง" + +#: ../tls/gnutls/gtlsclientconnection-gnutls.c:386 +msgid "Server required TLS certificate" +msgstr "เซิร์ฟเวอร์ต้องการใบรับรอง TLS" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:254 +#, c-format +msgid "Could not create TLS connection: %s" +msgstr "ไม่สามารถสร้างการเชื่อมต่อ TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:529 +msgid "Peer failed to perform TLS handshake" +msgstr "อีกฝ่ายหนึ่งดำเนินการ TLS handshake ไม่สำเร็จ" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:547 +msgid "Peer requested illegal TLS rehandshake" +msgstr "อีกฝ่ายหนึ่งร้องขอ TLS rehandshake ไม่ถูกต้อง" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:565 +msgid "TLS connection closed unexpectedly" +msgstr "การเชื่อมต่อ TLS ปิดอย่างกะทันหัน" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:859 +#: ../tls/gnutls/gtlsconnection-gnutls.c:885 +#, c-format +msgid "Error performing TLS handshake: %s" +msgstr "เกิดข้อผิดพลาดขณะดำเนินการ TLS handshake: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:924 +msgid "Unacceptable TLS certificate" +msgstr "ใบรับรอง TLS ไม่เป็นที่ยอมรับ" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1073 +#, c-format +msgid "Error reading data from TLS socket: %s" +msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากซ็อกเก็ต TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1099 +#, c-format +msgid "Error writing data to TLS socket: %s" +msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลลงซ็อกเก็ต TLS: %s" + +#: ../tls/gnutls/gtlsconnection-gnutls.c:1145 +#, c-format +msgid "Error performing TLS close: %s" +msgstr "เกิดข้อผิดพลาดขณะดำเนินการปิด TLS: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/tls/gnutls/gtlsconnection-gnutls.c new/glib-networking-2.30.0/tls/gnutls/gtlsconnection-gnutls.c --- old/glib-networking-2.29.18/tls/gnutls/gtlsconnection-gnutls.c 2011-08-29 20:29:42.000000000 +0200 +++ new/glib-networking-2.30.0/tls/gnutls/gtlsconnection-gnutls.c 2011-09-27 00:02:48.000000000 +0200 @@ -132,7 +132,10 @@ GError *error; GCancellable *cancellable; - gboolean blocking, eof; + gboolean blocking; +#ifndef GNUTLS_E_PREMATURE_TERMINATION + gboolean eof; +#endif GIOCondition internal_direction; }; @@ -548,19 +551,22 @@ gnutls->priv->need_handshake = TRUE; return status; } - else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) + else if ( +#ifdef GNUTLS_E_PREMATURE_TERMINATION + status == GNUTLS_E_PREMATURE_TERMINATION +#else + status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof +#endif + ) { - if (gnutls->priv->eof) + if (gnutls->priv->require_close_notify) { - if (gnutls->priv->require_close_notify) - { - g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, - _("TLS connection closed unexpectedly")); - return status; - } - else - return 0; + g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, + _("TLS connection closed unexpectedly")); + return status; } + else + return 0; } return status; @@ -795,8 +801,10 @@ if (ret < 0) set_gnutls_error (gnutls, G_IO_IN); +#ifndef GNUTLS_E_PREMATURE_TERMINATION else if (ret == 0) gnutls->priv->eof = TRUE; +#endif return ret; } @@ -1017,6 +1025,8 @@ g_simple_async_result_complete_in_idle (simple); g_object_unref (simple); } + else if (error) + g_error_free (error); source = g_tls_connection_gnutls_create_source (gnutls, 0, cancellable); g_source_set_callback (source, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/tls/gnutls/gtlsdatabase-gnutls.c new/glib-networking-2.30.0/tls/gnutls/gtlsdatabase-gnutls.c --- old/glib-networking-2.29.18/tls/gnutls/gtlsdatabase-gnutls.c 2011-08-27 19:23:55.000000000 +0200 +++ new/glib-networking-2.30.0/tls/gnutls/gtlsdatabase-gnutls.c 2011-09-19 23:45:53.000000000 +0200 @@ -130,6 +130,7 @@ return STATUS_INCOMPLETE; g_return_val_if_fail (G_IS_TLS_CERTIFICATE_GNUTLS (issuer), STATUS_FAILURE); g_tls_certificate_gnutls_set_issuer (certificate, G_TLS_CERTIFICATE_GNUTLS (issuer)); + g_object_unref (issuer); } g_assert (issuer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/tls/gnutls/gtlsfiledatabase-gnutls.c new/glib-networking-2.30.0/tls/gnutls/gtlsfiledatabase-gnutls.c --- old/glib-networking-2.29.18/tls/gnutls/gtlsfiledatabase-gnutls.c 2011-08-27 19:23:55.000000000 +0200 +++ new/glib-networking-2.30.0/tls/gnutls/gtlsfiledatabase-gnutls.c 2011-09-19 23:45:53.000000000 +0200 @@ -228,8 +228,7 @@ if (*error) return FALSE; - - for (l = list; l; l = g_list_next (l)) + for (l = list; l; l = l->next) { cert = g_tls_certificate_gnutls_get_cert (l->data); gerr = gnutls_x509_crt_get_raw_dn (cert, &dn); @@ -271,7 +270,10 @@ g_byte_array_unref (der); g_byte_array_unref (subject); g_byte_array_unref (issuer); + + g_object_unref (l->data); } + g_list_free (list); return TRUE; } @@ -560,7 +562,7 @@ { if (g_cancellable_set_error_if_cancelled (cancellable, error)) { - for (l = issued; l != NULL; l = g_list_next (l)) + for (l = issued; l != NULL; l = l->next) g_object_unref (l->data); g_list_free (issued); issued = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/tls/gnutls/gtlsinputstream-gnutls.c new/glib-networking-2.30.0/tls/gnutls/gtlsinputstream-gnutls.c --- old/glib-networking-2.29.18/tls/gnutls/gtlsinputstream-gnutls.c 2011-04-14 15:01:37.000000000 +0200 +++ new/glib-networking-2.30.0/tls/gnutls/gtlsinputstream-gnutls.c 2011-09-19 23:45:53.000000000 +0200 @@ -146,6 +146,9 @@ return; } + if (error) + g_error_free (error); + tls_stream->priv->cancellable = cancellable ? g_object_ref (cancellable) : NULL; tls_stream->priv->buffer = buffer; tls_stream->priv->count = count; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/tls/gnutls/gtlsoutputstream-gnutls.c new/glib-networking-2.30.0/tls/gnutls/gtlsoutputstream-gnutls.c --- old/glib-networking-2.29.18/tls/gnutls/gtlsoutputstream-gnutls.c 2011-04-14 15:01:37.000000000 +0200 +++ new/glib-networking-2.30.0/tls/gnutls/gtlsoutputstream-gnutls.c 2011-09-19 23:45:53.000000000 +0200 @@ -146,6 +146,9 @@ return; } + if (error) + g_error_free (error); + tls_stream->priv->cancellable = cancellable ? g_object_ref (cancellable) : NULL; tls_stream->priv->buffer = buffer; tls_stream->priv->count = count; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.29.18/tls/tests/tls.c new/glib-networking-2.30.0/tls/tests/tls.c --- old/glib-networking-2.29.18/tls/tests/tls.c 2011-08-26 00:53:29.000000000 +0200 +++ new/glib-networking-2.30.0/tls/tests/tls.c 2011-09-27 00:02:48.000000000 +0200 @@ -71,7 +71,16 @@ teardown_connection (TestConnection *test, gconstpointer data) { if (test->service) - g_object_unref (test->service); + { + g_socket_service_stop (test->service); + /* The outstanding accept_async will hold a ref on test->service, + * which we want to wait for it to release if we're valgrinding. + */ + g_object_add_weak_pointer (G_OBJECT (test->service), (gpointer *)&test->service); + g_object_unref (test->service); + while (test->service) + g_main_context_iteration (NULL, TRUE); + } if (test->server_connection) { @@ -316,6 +325,7 @@ test->client_connection = g_tls_client_connection_new (connection, test->identity, &error); g_assert_no_error (error); g_assert (test->client_connection); + g_object_unref (connection); g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), test->database); @@ -346,6 +356,7 @@ test->client_connection = g_tls_client_connection_new (connection, test->identity, &error); g_assert_no_error (error); g_assert (test->client_connection); + g_object_unref (connection); g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), test->database); @@ -384,6 +395,7 @@ test->client_connection = g_tls_client_connection_new (connection, test->identity, &error); g_assert_no_error (error); g_assert (test->client_connection); + g_object_unref (connection); /* Overrides loading of the default database */ g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), NULL); @@ -400,6 +412,93 @@ g_main_loop_run (test->loop); } +static void +socket_client_connected (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TestConnection *test = user_data; + GSocketConnection *connection; + GError *error = NULL; + + connection = g_socket_client_connect_finish (G_SOCKET_CLIENT (source), + result, &error); + g_assert_no_error (error); + test->client_connection = G_IO_STREAM (connection); + + g_main_loop_quit (test->loop); +} + +static void +test_connection_socket_client (TestConnection *test, + gconstpointer data) +{ + GSocketClient *client; + GTlsCertificateFlags flags; + GSocketConnection *connection; + GIOStream *base; + GError *error = NULL; + + start_server_service (test, G_TLS_AUTHENTICATION_NONE); + client = g_socket_client_new (); + g_socket_client_set_tls (client, TRUE); + flags = G_TLS_CERTIFICATE_VALIDATE_ALL & ~G_TLS_CERTIFICATE_UNKNOWN_CA; + /* test->address doesn't match the server's cert */ + flags = flags & ~G_TLS_CERTIFICATE_BAD_IDENTITY; + g_socket_client_set_tls_validation_flags (client, flags); + + g_socket_client_connect_async (client, G_SOCKET_CONNECTABLE (test->address), + NULL, socket_client_connected, test); + g_main_loop_run (test->loop); + + connection = (GSocketConnection *)test->client_connection; + test->client_connection = NULL; + + g_assert (G_IS_TCP_WRAPPER_CONNECTION (connection)); + base = g_tcp_wrapper_connection_get_base_io_stream (G_TCP_WRAPPER_CONNECTION (connection)); + g_assert (G_IS_TLS_CONNECTION (base)); + + g_io_stream_close (G_IO_STREAM (connection), NULL, &error); + g_assert_no_error (error); + g_object_unref (connection); + + g_object_unref (client); +} + +static void +socket_client_failed (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TestConnection *test = user_data; + GError *error = NULL; + + g_socket_client_connect_finish (G_SOCKET_CLIENT (source), + result, &error); + g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE); + g_clear_error (&error); + + g_main_loop_quit (test->loop); +} + +static void +test_connection_socket_client_failed (TestConnection *test, + gconstpointer data) +{ + GSocketClient *client; + + start_server_service (test, G_TLS_AUTHENTICATION_NONE); + client = g_socket_client_new (); + g_socket_client_set_tls (client, TRUE); + /* this time we don't adjust the validation flags */ + + g_socket_client_connect_async (client, G_SOCKET_CONNECTABLE (test->address), + NULL, socket_client_failed, test); + g_main_loop_run (test->loop); + + g_object_unref (client); +} + /* ----------------------------------------------------------------------------- * CERTIFICATE TESTS */ @@ -581,6 +680,11 @@ (gpointer *)&test->database); g_object_unref (test->database); g_assert (test->database == NULL); + + g_object_add_weak_pointer (G_OBJECT (test->identity), + (gpointer *)&test->identity); + g_object_unref (test->identity); + g_assert (test->identity == NULL); } static void @@ -1010,6 +1114,10 @@ setup_connection, test_client_auth_rehandshake, teardown_connection); g_test_add ("/tls/connection/no-database", TestConnection, NULL, setup_connection, test_connection_no_database, teardown_connection); + g_test_add ("/tls/connection/socket-client", TestConnection, NULL, + setup_connection, test_connection_socket_client, teardown_connection); + g_test_add ("/tls/connection/socket-client-failed", TestConnection, NULL, + setup_connection, test_connection_socket_client_failed, teardown_connection); g_test_add_func ("/tls/backend/default-database-is-singleton", test_default_database_is_singleton); @@ -1054,5 +1162,9 @@ ret = g_test_run(); g_free (source_dir); + + /* for valgrinding */ + g_main_context_unref (g_main_context_default ()); + return ret; } continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
