Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package glib-networking for openSUSE:Factory 
checked in at 2022-07-09 16:59:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glib-networking (Old)
 and      /work/SRC/openSUSE:Factory/.glib-networking.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "glib-networking"

Sat Jul  9 16:59:13 2022 rev:79 rq:987345 version:2.72.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/glib-networking/glib-networking.changes  
2022-03-23 20:18:47.710476908 +0100
+++ 
/work/SRC/openSUSE:Factory/.glib-networking.new.1523/glib-networking.changes    
    2022-07-09 16:59:19.636462238 +0200
@@ -1,0 +2,6 @@
+Mon Jul  4 00:14:22 UTC 2022 - Emily Gonyer <[email protected]>
+
+- Update to version 2.72.1
+  + Discard empty proxy environment variables.
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ glib-networking.spec ++++++
--- /var/tmp/diff_new_pack.23xbqP/_old  2022-07-09 16:59:20.044462852 +0200
+++ /var/tmp/diff_new_pack.23xbqP/_new  2022-07-09 16:59:20.048462857 +0200
@@ -18,7 +18,7 @@
 
 %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
 Name:           glib-networking
-Version:        2.72.0
+Version:        2.72.1
 Release:        0
 Summary:        Network-related GIO modules for glib
 License:        LGPL-2.1-or-later

++++++ glib-networking-2.72.0.tar.xz -> glib-networking-2.72.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.72.0/NEWS 
new/glib-networking-2.72.1/NEWS
--- old/glib-networking-2.72.0/NEWS     2022-03-22 19:43:09.000000000 +0100
+++ new/glib-networking-2.72.1/NEWS     2022-06-29 16:40:23.000000000 +0200
@@ -1,3 +1,8 @@
+2.72.1 - June 29, 2022
+======================
+
+ - Discard empty proxy environment variables (#189)
+
 2.72.0 - March 22, 2022
 =======================
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.72.0/meson.build 
new/glib-networking-2.72.1/meson.build
--- old/glib-networking-2.72.0/meson.build      2022-03-22 19:43:09.000000000 
+0100
+++ new/glib-networking-2.72.1/meson.build      2022-06-29 16:40:23.000000000 
+0200
@@ -1,6 +1,6 @@
 project(
   'glib-networking', 'c',
-  version: '2.72.0',
+  version: '2.72.1',
   license: 'LGPL2.1+',
   meson_version: '>= 0.50.0',
   default_options: ['c_std=gnu99']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.72.0/po/lv.po 
new/glib-networking-2.72.1/po/lv.po
--- old/glib-networking-2.72.0/po/lv.po 2022-03-22 19:43:09.000000000 +0100
+++ new/glib-networking-2.72.1/po/lv.po 2022-06-29 16:40:23.000000000 +0200
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# R??dolfs Mazurs <[email protected]>, 2012, 2013, 2017, 2018, 2019, 
2020, 2021.
+# R??dolfs Mazurs <[email protected]>, 2012, 2013, 2017, 2018, 2019, 
2020, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib-networking/issues\n";
-"POT-Creation-Date: 2021-06-25 16:32+0000\n"
-"PO-Revision-Date: 2021-10-26 20:38+0300\n"
+"POT-Creation-Date: 2021-12-18 16:29+0000\n"
+"PO-Revision-Date: 2022-03-24 23:23+0200\n"
 "Last-Translator: R??dolfs Mazurs <[email protected]>\n"
 "Language-Team: Latvian <[email protected]>\n"
 "Language: lv\n"
@@ -48,113 +48,111 @@
 msgid "Server required TLS certificate"
 msgstr "Serveris pieprasa TLS sertifik??tu"
 
-#: tls/base/gtlsconnection-base.c:1451
+#: tls/base/gtlsconnection-base.c:1454
 #, c-format
 msgid "Handshake is not finished, no channel binding information yet"
 msgstr "Rokasspiediens nav pabeigts, v??l nav kan??lu sasaistes inform??cija"
 
-#: tls/base/gtlsconnection-base.c:1530
+#: tls/base/gtlsconnection-base.c:1533
 msgid "Peer does not support safe renegotiation"
 msgstr "Biedrs neatbalsta dro??as atk??rtotas p??rrunas"
 
-#: tls/base/gtlsconnection-base.c:1678 tls/gnutls/gtlsconnection-gnutls.c:482
+#: tls/base/gtlsconnection-base.c:1681 tls/gnutls/gtlsconnection-gnutls.c:491
 #: tls/openssl/gtlsconnection-openssl.c:209
-#: tls/openssl/gtlsconnection-openssl.c:834
+#: tls/openssl/gtlsconnection-openssl.c:839
 #, c-format
 msgid "Unacceptable TLS certificate"
 msgstr "Nepie??emams TLS sertifik??ts"
 
-#: tls/base/gtlsconnection-base.c:2152
+#: tls/base/gtlsconnection-base.c:2153
 #, c-format
 msgid "Receive flags are not supported"
 msgstr "Sa??em??anas sl??d??i nav atbalst??ti"
 
-#: tls/base/gtlsconnection-base.c:2299
+#: tls/base/gtlsconnection-base.c:2300
 #, c-format
 msgid "Send flags are not supported"
 msgstr "S??t????anas sl??d??i nav atbalst??ti"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:361
-#: tls/openssl/gtlscertificate-openssl.c:362
+#: tls/openssl/gtlscertificate-openssl.c:363
 #, c-format
 msgid "Could not parse DER certificate: %s"
 msgstr "Nevar??ju nopars??t DER sertifik??tu ??? %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:382
-#: tls/openssl/gtlscertificate-openssl.c:382
+#: tls/openssl/gtlscertificate-openssl.c:384
 #, c-format
 msgid "Could not parse PEM certificate: %s"
 msgstr "Nevar??ju nopars??t PEM sertifik??tu ??? %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:405
-#: tls/openssl/gtlscertificate-openssl.c:401
+#: tls/openssl/gtlscertificate-openssl.c:404
 #, c-format
 msgid "Could not parse DER private key: %s"
 msgstr "Nevar??ju nopars??t DER priv??to atsl??gu ??? %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:428
-#: tls/openssl/gtlscertificate-openssl.c:420
+#: tls/openssl/gtlscertificate-openssl.c:424
 #, c-format
 msgid "Could not parse PEM private key: %s"
 msgstr "Nevar??ju nopars??t PEM priv??to atsl??gu ??? %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:455
 #, c-format
-#| msgid "Could not parse PEM certificate: %s"
 msgid "Could not import PKCS #11 certificate URI: %s"
 msgstr "Nevar??ja import??t PKCS #11 sertifik??ta URI ??? %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:497
-#: tls/openssl/gtlscertificate-openssl.c:455
+#: tls/openssl/gtlscertificate-openssl.c:459
 msgid "No certificate data provided"
 msgstr "Nav nor??d??ti sertifik??ta dati"
 
-#: tls/gnutls/gtlscertificate-gnutls.c:806
-#: tls/gnutls/gtlsconnection-gnutls.c:1033
+#: tls/gnutls/gtlscertificate-gnutls.c:807
+#: tls/gnutls/gtlsconnection-gnutls.c:1058
 #, c-format
 msgid "Cannot verify peer identity of unexpected type %s"
 msgstr "Nevar p??rbaud??t biedra identit??ti, kam ir nezin??ms tips %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:198
-#| msgid "Could not create TLS connection: %s"
+#: tls/gnutls/gtlsconnection-gnutls.c:204
 msgid "Could not create TLS connection:"
 msgstr "Neizdev??s izveidot TLS savienojumu:"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:208
-#: tls/gnutls/gtlsconnection-gnutls.c:228
-#: tls/openssl/gtlsclientconnection-openssl.c:458
-#: tls/openssl/gtlsserverconnection-openssl.c:503
+#: tls/gnutls/gtlsconnection-gnutls.c:214
+#: tls/gnutls/gtlsconnection-gnutls.c:234
+#: tls/openssl/gtlsclientconnection-openssl.c:512
+#: tls/openssl/gtlsserverconnection-openssl.c:456
 #, c-format
 msgid "Could not create TLS connection: %s"
 msgstr "Neizdev??s izveidot TLS savienojumu ??? %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:426
-#: tls/gnutls/gtlsconnection-gnutls.c:437
-#: tls/gnutls/gtlsconnection-gnutls.c:451
+#: tls/gnutls/gtlsconnection-gnutls.c:435
+#: tls/gnutls/gtlsconnection-gnutls.c:446
+#: tls/gnutls/gtlsconnection-gnutls.c:460
 #: tls/openssl/gtlsconnection-openssl.c:176
 #, c-format
 msgid "Peer failed to perform TLS handshake: %s"
 msgstr "Dal??bniekam neizdev??s veikt TLS izaicin??jumrokspiedienu: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:459
+#: tls/gnutls/gtlsconnection-gnutls.c:468
 msgid "TLS connection closed unexpectedly"
 msgstr "TLS savienojums aizv??r??s negaid??ti"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:474
+#: tls/gnutls/gtlsconnection-gnutls.c:483
 #: tls/openssl/gtlsconnection-openssl.c:201
 msgid "TLS connection peer did not send a certificate"
 msgstr "TLS savienojuma dal??bnieks neats??t??ja sertifik??tu"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:490
+#: tls/gnutls/gtlsconnection-gnutls.c:499
 #, c-format
 msgid "Peer sent fatal TLS alert: %s"
 msgstr "Biedrs nos??t??ja fat??lu TLS br??din??jumu: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:500
+#: tls/gnutls/gtlsconnection-gnutls.c:509
 msgid "Protocol version downgrade attack detected"
 msgstr "Atkl??ts protokola versijas pazemin????anas uzbrukums"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:509
+#: tls/gnutls/gtlsconnection-gnutls.c:518
 #, c-format
 msgid "Message is too large for DTLS connection; maximum is %u byte"
 msgid_plural "Message is too large for DTLS connection; maximum is %u bytes"
@@ -165,79 +163,88 @@
 msgstr[2] ""
 "Zi??ojums ir p??r??k gar?? DTLS savienojumam; maksim??lais izm??rs ir %u 
baitu"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:518
+#: tls/gnutls/gtlsconnection-gnutls.c:527
 msgid "The operation timed out"
 msgstr "Darb??bai iest??j??s noildze"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:870
+#: tls/gnutls/gtlsconnection-gnutls.c:879
 #, c-format
 msgid "Error performing TLS handshake: %s"
 msgstr "K????da, veicot TLS izaicin??jumrokspiedienu ??? %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:973
-#: tls/openssl/gtlsconnection-openssl.c:618
+#: tls/gnutls/gtlsconnection-gnutls.c:982
+#: tls/openssl/gtlsconnection-openssl.c:614
 msgid "Error performing TLS handshake"
 msgstr "K????da, veicot TLS izaicin??jumrokspiedienu"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1152
+#: tls/gnutls/gtlsconnection-gnutls.c:1181
+#, c-format
+#| msgid "Channel binding type is not implemented in the TLS library"
+msgid ""
+"Empty channel binding data indicates a bug in the TLS library implementation"
+msgstr ""
+"Tuk??i kan??la sasaistes dati liecina, ka ir k????da TLS bibliot??kas"
+" implement??cij??"
+
+#: tls/gnutls/gtlsconnection-gnutls.c:1199
 #, c-format
 msgid "Channel binding type is not implemented in the TLS library"
 msgstr "Kan??la sasaistes tips nav atbalst??ts ??aj?? TLS bibliot??k??"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1156
+#: tls/gnutls/gtlsconnection-gnutls.c:1203
 #, c-format
 msgid "Channel binding data is not yet available"
 msgstr "Kan??la sasaistes dati v??l nav pieejami"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1194
-#: tls/gnutls/gtlsconnection-gnutls.c:1206
+#: tls/gnutls/gtlsconnection-gnutls.c:1241
+#: tls/gnutls/gtlsconnection-gnutls.c:1253
 #, c-format
 msgid "X.509 certificate is not available on the connection"
 msgstr "X.509 sertifik??ts nav pieejams uz savienojuma"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1219
+#: tls/gnutls/gtlsconnection-gnutls.c:1266
 #, c-format
 msgid "X.509 certificate is not available or is of unknown format: %s"
 msgstr ""
-"X.509 sertifik??ts nav pieejams uz savienojuma vai tam ir nezin??ms form??ts 
??? %s"
+"X.509 sertifik??ts nav pieejams uz savienojuma vai tam ir nezin??ms form??ts 
??? "
+"%s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1230
-#: tls/openssl/gtlsconnection-openssl.c:709
+#: tls/gnutls/gtlsconnection-gnutls.c:1277
+#: tls/openssl/gtlsconnection-openssl.c:714
 #, c-format
-#| msgid "Unacceptable TLS certificate authority"
 msgid "Unable to obtain certificate signature algorithm"
 msgstr "Nevar sa??emt sertifik??ta paraksta algoritmu"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1246
-#: tls/openssl/gtlsconnection-openssl.c:729
+#: tls/gnutls/gtlsconnection-gnutls.c:1293
+#: tls/openssl/gtlsconnection-openssl.c:734
 #, c-format
 msgid ""
 "Current X.509 certificate uses unknown or unsupported signature algorithm"
 msgstr ""
-"Pa??reiz??jais X.509 sertifik??ts izmanto nezin??mu vai neatbalst??tu 
paraksta"
-" algoritmu"
+"Pa??reiz??jais X.509 sertifik??ts izmanto nezin??mu vai neatbalst??tu 
paraksta "
+"algoritmu"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1340
-#: tls/openssl/gtlsconnection-openssl.c:809
+#: tls/gnutls/gtlsconnection-gnutls.c:1387
+#: tls/openssl/gtlsconnection-openssl.c:814
 #, c-format
 msgid "Requested channel binding type is not implemented"
 msgstr "Piepras??tais kan??la sasaistes tips nav implement??ts"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1361
-#: tls/gnutls/gtlsconnection-gnutls.c:1421
-#: tls/openssl/gtlsconnection-openssl.c:827
-#: tls/openssl/gtlsconnection-openssl.c:923
+#: tls/gnutls/gtlsconnection-gnutls.c:1408
+#: tls/gnutls/gtlsconnection-gnutls.c:1468
+#: tls/openssl/gtlsconnection-openssl.c:832
+#: tls/openssl/gtlsconnection-openssl.c:928
 msgid "Error reading data from TLS socket"
 msgstr "K????da, lasot datus no TLS ligzdas"
 
 #. flags
-#: tls/gnutls/gtlsconnection-gnutls.c:1443
-#: tls/gnutls/gtlsconnection-gnutls.c:1506
-#: tls/openssl/gtlsconnection-openssl.c:1002
+#: tls/gnutls/gtlsconnection-gnutls.c:1490
+#: tls/gnutls/gtlsconnection-gnutls.c:1553
+#: tls/openssl/gtlsconnection-openssl.c:1007
 msgid "Error writing data to TLS socket"
 msgstr "K????da, rakstot datus TLS ligzd??"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1476
+#: tls/gnutls/gtlsconnection-gnutls.c:1523
 #, c-format
 msgid "Message of size %lu byte is too large for DTLS connection"
 msgid_plural "Message of size %lu bytes is too large for DTLS connection"
@@ -245,7 +252,7 @@
 msgstr[1] "Zi??ojums ar izm??ru %lu baiti ir p??r??k gar?? DTLS savienojumam"
 msgstr[2] "Zi??ojums ar izm??ru %lu baiti ir p??r??k gar?? DTLS savienojumam"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1478
+#: tls/gnutls/gtlsconnection-gnutls.c:1525
 #, c-format
 msgid "(maximum is %u byte)"
 msgid_plural "(maximum is %u bytes)"
@@ -253,12 +260,12 @@
 msgstr[1] "(maksimums ir %u baiti)"
 msgstr[2] "(maksimums ir %u baitu)"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1525
+#: tls/gnutls/gtlsconnection-gnutls.c:1572
 #, c-format
 msgid "Error performing TLS close: %s"
 msgstr "K????da, veicot TLS aizv??r??anu ??? %s"
 
-#: tls/gnutls/gtlsdatabase-gnutls.c:688
+#: tls/gnutls/gtlsdatabase-gnutls.c:556
 msgid ""
 "Failed to load system trust store: GnuTLS was not configured with a system "
 "trust"
@@ -266,39 +273,36 @@
 "Neizdev??s iel??d??t sist??mas uztic??bas kr??tuvi: GnuTLS nav konfigur??ts 
ar "
 "sist??mas uztic??bu"
 
-#: tls/gnutls/gtlsdatabase-gnutls.c:693 tls/openssl/gtlsdatabase-openssl.c:229
+#: tls/gnutls/gtlsdatabase-gnutls.c:561 tls/openssl/gtlsdatabase-openssl.c:255
 #, c-format
 msgid "Failed to load system trust store: %s"
 msgstr "Neizdev??s iel??d??t sist??mas uztic??bas kr??tuvi: %s"
 
 #: tls/gnutls/gtlsfiledatabase-gnutls.c:153
-#: tls/openssl/gtlsfiledatabase-openssl.c:454
+#: tls/openssl/gtlsfiledatabase-openssl.c:456
 #, c-format
 msgid "Failed to populate trust list from %s: %s"
 msgstr "Neizdev??s aizpild??t uztic??bas sarakstu no %s: %s"
 
 #: tls/gnutls/gtlsserverconnection-gnutls.c:124
 #: tls/openssl/gtlsserverconnection-openssl.c:172
-#: tls/openssl/gtlsserverconnection-openssl.c:228
 msgid "Certificate has no private key"
 msgstr "Sertifik??tam nav priv??t??s atsl??gas"
 
-#: tls/openssl/gtlsclientconnection-openssl.c:317
-#: tls/openssl/gtlsserverconnection-openssl.c:346
+#: tls/openssl/gtlsclientconnection-openssl.c:368
+#: tls/openssl/gtlsserverconnection-openssl.c:299
 #, c-format
-#| msgid "Could not create TLS context: %s"
 msgid "Could not set TLS cipher list: %s"
 msgstr "Neizdev??s iestat??t TLS ??ifr??t??ja sarakstu ??? %s"
 
-#: tls/openssl/gtlsclientconnection-openssl.c:343
-#: tls/openssl/gtlsserverconnection-openssl.c:372
+#: tls/openssl/gtlsclientconnection-openssl.c:396
+#: tls/openssl/gtlsserverconnection-openssl.c:327
 #, c-format
-#| msgid "Could not set MAX protocol to %ld: %s"
 msgid "Could not set MAX protocol to %d: %s"
 msgstr "Nevar??ja iestat??t MAX protokolu uz %d ??? %s"
 
-#: tls/openssl/gtlsclientconnection-openssl.c:404
-#: tls/openssl/gtlsserverconnection-openssl.c:433
+#: tls/openssl/gtlsclientconnection-openssl.c:459
+#: tls/openssl/gtlsserverconnection-openssl.c:390
 #, c-format
 msgid "Could not create TLS context: %s"
 msgstr "Neizdev??s izveidot TLS kontekstu ??? %s"
@@ -321,55 +325,68 @@
 msgid "%s: The connection is broken"
 msgstr "%s: Savienojums ir salauzts"
 
-#: tls/openssl/gtlsconnection-openssl.c:678
+#: tls/openssl/gtlsconnection-openssl.c:660
+#, c-format
+msgid "The request is invalid."
+msgstr "Piepras??jums ir neder??gs."
+
+#: tls/openssl/gtlsconnection-openssl.c:683
 #, c-format
 msgid "Channel binding data tls-unique is not available"
 msgstr "Kan??la sasaistes datu tls-unique nav pieejams"
 
-#: tls/openssl/gtlsconnection-openssl.c:701
+#: tls/openssl/gtlsconnection-openssl.c:706
 #, c-format
 msgid "X.509 Certificate is not available on the connection"
 msgstr "X.509 sertifik??ts nav pieejams uz savienojuma"
 
-#: tls/openssl/gtlsconnection-openssl.c:747
+#: tls/openssl/gtlsconnection-openssl.c:752
 #, c-format
 msgid "Failed to generate X.509 certificate digest"
 msgstr "Neizdev??s izveidot X.509 sertifik??ta izkl??sta"
 
-#: tls/openssl/gtlsconnection-openssl.c:778
+#: tls/openssl/gtlsconnection-openssl.c:783
 #, c-format
 msgid "TLS Connection does not support TLS-Exporter feature"
 msgstr "TLS savienojums neatbalsta TLS-Exporter iesp??ju"
 
-#: tls/openssl/gtlsconnection-openssl.c:781
+#: tls/openssl/gtlsconnection-openssl.c:786
 #, c-format
 msgid "Unexpected error while exporting keying data"
 msgstr "Negaid??ta k????da, eksport??jot atsl??gu datus"
 
-#: tls/openssl/gtlsconnection-openssl.c:1063
+#: tls/openssl/gtlsconnection-openssl.c:1068
 msgid "Error performing TLS close"
 msgstr "K????da, veicot TLS aizv??r??anu"
 
-#: tls/openssl/gtlsdatabase-openssl.c:197
+#: tls/openssl/gtlsdatabase-openssl.c:167
 msgid "Could not get trusted anchors from Keychain"
 msgstr "Nevar??ja sa??emt uzticamus enkurus no Keychain"
 
-#: tls/openssl/gtlsdatabase-openssl.c:269
+#: tls/openssl/gtlsdatabase-openssl.c:232
+#| msgid "Could not parse DER certificate: %s"
+msgid "Could not get root certificate store"
+msgstr "Nevar??ja sa??emt saknes sertifik??ta kr??tuvi"
+
+#: tls/openssl/gtlsdatabase-openssl.c:239
+#| msgid "Could not parse DER certificate: %s"
+msgid "Could not get CA certificate store"
+msgstr "Nevar??ja sa??emt CA sertifik??ta kr??tuvi"
+
+#: tls/openssl/gtlsdatabase-openssl.c:304
 msgid "Could not create CA store"
 msgstr "Neizdev??s izveidot CA kr??tuvi"
 
-#: tls/openssl/gtlsserverconnection-openssl.c:179
-#: tls/openssl/gtlsserverconnection-openssl.c:247
-#, c-format
-msgid "There is a problem with the certificate private key: %s"
-msgstr "Ir probl??ma ar sertifik??ta priv??to atsl??gu ??? %s"
-
-#: tls/openssl/gtlsserverconnection-openssl.c:188
-#: tls/openssl/gtlsserverconnection-openssl.c:239
+#: tls/openssl/gtlsserverconnection-openssl.c:184
 #, c-format
 msgid "There is a problem with the certificate: %s"
 msgstr "Ir probl??ma ar sertifik??tu ??? %s"
 
+#: tls/openssl/gtlsserverconnection-openssl.c:193
+#, c-format
+msgid "There is a problem with the certificate private key: %s"
+msgstr "Ir probl??ma ar sertifik??ta priv??to atsl??gu ??? %s"
+
 #~ msgid "Peer requested illegal TLS rehandshake"
 #~ msgstr "Dal??bnieks piepras??ja neat??autu TLS izaicin??jumrokspiedienu"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.72.0/po/nl.po 
new/glib-networking-2.72.1/po/nl.po
--- old/glib-networking-2.72.0/po/nl.po 2022-03-22 19:43:09.000000000 +0100
+++ new/glib-networking-2.72.1/po/nl.po 2022-06-29 16:40:23.000000000 +0200
@@ -3,15 +3,15 @@
 #
 # Wouter Bolsterlee <[email protected]>, 2011???2013
 # Rachid <[email protected]>, 2012.
-# Nathan Follens <[email protected]>, 2017, 2019, 2021.
+# Nathan Follens <[email protected]>, 2017, 2019, 2021-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib-networking/";
 "issues\n"
-"POT-Creation-Date: 2021-06-25 16:32+0000\n"
-"PO-Revision-Date: 2021-09-13 17:12+0200\n"
+"POT-Creation-Date: 2021-12-18 16:29+0000\n"
+"PO-Revision-Date: 2022-03-25 15:32+0100\n"
 "Last-Translator: Nathan Follens <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
 "Language: nl\n"
@@ -19,7 +19,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: proxy/libproxy/glibproxyresolver.c:164
 msgid "Proxy resolver internal error."
@@ -51,52 +51,52 @@
 msgid "Server required TLS certificate"
 msgstr "Server vereiste een TLS-certificaat"
 
-#: tls/base/gtlsconnection-base.c:1451
+#: tls/base/gtlsconnection-base.c:1454
 #, c-format
 msgid "Handshake is not finished, no channel binding information yet"
 msgstr "Handshake is niet voltooid, nog geen kanaalbindingsinformatie"
 
-#: tls/base/gtlsconnection-base.c:1530
+#: tls/base/gtlsconnection-base.c:1533
 msgid "Peer does not support safe renegotiation"
 msgstr "Peer ondersteunt geen veilige heronderhandeling"
 
-#: tls/base/gtlsconnection-base.c:1678 tls/gnutls/gtlsconnection-gnutls.c:482
+#: tls/base/gtlsconnection-base.c:1681 tls/gnutls/gtlsconnection-gnutls.c:491
 #: tls/openssl/gtlsconnection-openssl.c:209
-#: tls/openssl/gtlsconnection-openssl.c:834
+#: tls/openssl/gtlsconnection-openssl.c:839
 #, c-format
 msgid "Unacceptable TLS certificate"
 msgstr "Onacceptabel TLS-certificaat"
 
-#: tls/base/gtlsconnection-base.c:2152
+#: tls/base/gtlsconnection-base.c:2153
 #, c-format
 msgid "Receive flags are not supported"
 msgstr "Ontvangstvlaggen worden niet ondersteund"
 
-#: tls/base/gtlsconnection-base.c:2299
+#: tls/base/gtlsconnection-base.c:2300
 #, c-format
 msgid "Send flags are not supported"
 msgstr "Verstuurvlaggen worden niet ondersteund"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:361
-#: tls/openssl/gtlscertificate-openssl.c:362
+#: tls/openssl/gtlscertificate-openssl.c:363
 #, c-format
 msgid "Could not parse DER certificate: %s"
 msgstr "Kon DER-certificaat niet parseren: %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:382
-#: tls/openssl/gtlscertificate-openssl.c:382
+#: tls/openssl/gtlscertificate-openssl.c:384
 #, c-format
 msgid "Could not parse PEM certificate: %s"
 msgstr "Kon PEM-certificaat niet parseren: %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:405
-#: tls/openssl/gtlscertificate-openssl.c:401
+#: tls/openssl/gtlscertificate-openssl.c:404
 #, c-format
 msgid "Could not parse DER private key: %s"
 msgstr "Kon DER-priv??sleutel niet parseren: %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:428
-#: tls/openssl/gtlscertificate-openssl.c:420
+#: tls/openssl/gtlscertificate-openssl.c:424
 #, c-format
 msgid "Could not parse PEM private key: %s"
 msgstr "Kon PEM-priv??sleutel niet parseren: %s"
@@ -107,104 +107,112 @@
 msgstr "Kon PKCS#11-certificaat-URL niet importeren: %s"
 
 #: tls/gnutls/gtlscertificate-gnutls.c:497
-#: tls/openssl/gtlscertificate-openssl.c:455
+#: tls/openssl/gtlscertificate-openssl.c:459
 msgid "No certificate data provided"
 msgstr "Geen certificaatgegevens opgegeven"
 
-#: tls/gnutls/gtlscertificate-gnutls.c:806
-#: tls/gnutls/gtlsconnection-gnutls.c:1033
+#: tls/gnutls/gtlscertificate-gnutls.c:807
+#: tls/gnutls/gtlsconnection-gnutls.c:1058
 #, c-format
 msgid "Cannot verify peer identity of unexpected type %s"
 msgstr "Kan peeridentiteit van onverwacht type %s niet verifi??ren"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:198
+#: tls/gnutls/gtlsconnection-gnutls.c:204
 msgid "Could not create TLS connection:"
 msgstr "Kon geen TLS-verbinding maken:"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:208
-#: tls/gnutls/gtlsconnection-gnutls.c:228
-#: tls/openssl/gtlsclientconnection-openssl.c:458
-#: tls/openssl/gtlsserverconnection-openssl.c:503
+#: tls/gnutls/gtlsconnection-gnutls.c:214
+#: tls/gnutls/gtlsconnection-gnutls.c:234
+#: tls/openssl/gtlsclientconnection-openssl.c:512
+#: tls/openssl/gtlsserverconnection-openssl.c:456
 #, c-format
 msgid "Could not create TLS connection: %s"
 msgstr "Kon geen TLS-verbinding maken: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:426
-#: tls/gnutls/gtlsconnection-gnutls.c:437
-#: tls/gnutls/gtlsconnection-gnutls.c:451
+#: tls/gnutls/gtlsconnection-gnutls.c:435
+#: tls/gnutls/gtlsconnection-gnutls.c:446
+#: tls/gnutls/gtlsconnection-gnutls.c:460
 #: tls/openssl/gtlsconnection-openssl.c:176
 #, c-format
 msgid "Peer failed to perform TLS handshake: %s"
 msgstr "Andere kant van de verbinding gaf geen TLS-handshake: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:459
+#: tls/gnutls/gtlsconnection-gnutls.c:468
 msgid "TLS connection closed unexpectedly"
 msgstr "TLS-verbinding onverwachts afgebroken"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:474
+#: tls/gnutls/gtlsconnection-gnutls.c:483
 #: tls/openssl/gtlsconnection-openssl.c:201
 msgid "TLS connection peer did not send a certificate"
 msgstr "TLS-verbinding van andere kant stuurde geen certificaat"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:490
+#: tls/gnutls/gtlsconnection-gnutls.c:499
 #, c-format
 msgid "Peer sent fatal TLS alert: %s"
 msgstr "Andere kant van de verbinding stuurde fatale TLS-waarschuwing: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:500
+#: tls/gnutls/gtlsconnection-gnutls.c:509
 msgid "Protocol version downgrade attack detected"
 msgstr "Downgrade-aanval op de protocolversie gedetecteerd"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:509
+#: tls/gnutls/gtlsconnection-gnutls.c:518
 #, c-format
 msgid "Message is too large for DTLS connection; maximum is %u byte"
 msgid_plural "Message is too large for DTLS connection; maximum is %u bytes"
 msgstr[0] "Bericht is te groot voor DTLS-verbinding; maximaal %u byte"
 msgstr[1] "Bericht is te groot voor DTLS-verbinding, maximaal %u bytes"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:518
+#: tls/gnutls/gtlsconnection-gnutls.c:527
 msgid "The operation timed out"
 msgstr "Time-out bij bewerking"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:870
+#: tls/gnutls/gtlsconnection-gnutls.c:879
 #, c-format
 msgid "Error performing TLS handshake: %s"
 msgstr "Fout bij uitvoeren van TLS-handshake: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:973
-#: tls/openssl/gtlsconnection-openssl.c:618
+#: tls/gnutls/gtlsconnection-gnutls.c:982
+#: tls/openssl/gtlsconnection-openssl.c:614
 msgid "Error performing TLS handshake"
 msgstr "Fout bij uitvoeren van TLS-handshake"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1152
+#: tls/gnutls/gtlsconnection-gnutls.c:1181
+#, c-format
+msgid ""
+"Empty channel binding data indicates a bug in the TLS library implementation"
+msgstr ""
+"Lege kanaalbindingsgegevens wijzen op een bug in de TLS-"
+"bibliotheekimplementatie"
+
+#: tls/gnutls/gtlsconnection-gnutls.c:1199
 #, c-format
 msgid "Channel binding type is not implemented in the TLS library"
 msgstr "Kanaalbindingstype is niet ge??mplementeerd in de TLS-bibliotheek"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1156
+#: tls/gnutls/gtlsconnection-gnutls.c:1203
 #, c-format
 msgid "Channel binding data is not yet available"
 msgstr "Kanaalbindingsgegevens zijn nog niet beschikbaar"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1194
-#: tls/gnutls/gtlsconnection-gnutls.c:1206
+#: tls/gnutls/gtlsconnection-gnutls.c:1241
+#: tls/gnutls/gtlsconnection-gnutls.c:1253
 #, c-format
 msgid "X.509 certificate is not available on the connection"
 msgstr "X.509-certificaat is niet beschikbaar op de verbinding"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1219
+#: tls/gnutls/gtlsconnection-gnutls.c:1266
 #, c-format
 msgid "X.509 certificate is not available or is of unknown format: %s"
 msgstr "X.509-certificaat is niet beschikbaar of van een onbekend formaat: %s"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1230
-#: tls/openssl/gtlsconnection-openssl.c:709
+#: tls/gnutls/gtlsconnection-gnutls.c:1277
+#: tls/openssl/gtlsconnection-openssl.c:714
 #, c-format
 msgid "Unable to obtain certificate signature algorithm"
 msgstr "Kon certificaatondertekeningsalgoritme niet verkrijgen"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1246
-#: tls/openssl/gtlsconnection-openssl.c:729
+#: tls/gnutls/gtlsconnection-gnutls.c:1293
+#: tls/openssl/gtlsconnection-openssl.c:734
 #, c-format
 msgid ""
 "Current X.509 certificate uses unknown or unsupported signature algorithm"
@@ -212,46 +220,46 @@
 "Huidig X.509-certificaat gebruikt een onbekend of niet-ondersteund "
 "ondertekeningsalgoritme"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1340
-#: tls/openssl/gtlsconnection-openssl.c:809
+#: tls/gnutls/gtlsconnection-gnutls.c:1387
+#: tls/openssl/gtlsconnection-openssl.c:814
 #, c-format
 msgid "Requested channel binding type is not implemented"
 msgstr "Gevraagd kanaalbindingstype is niet ge??mplementeerd"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1361
-#: tls/gnutls/gtlsconnection-gnutls.c:1421
-#: tls/openssl/gtlsconnection-openssl.c:827
-#: tls/openssl/gtlsconnection-openssl.c:923
+#: tls/gnutls/gtlsconnection-gnutls.c:1408
+#: tls/gnutls/gtlsconnection-gnutls.c:1468
+#: tls/openssl/gtlsconnection-openssl.c:832
+#: tls/openssl/gtlsconnection-openssl.c:928
 msgid "Error reading data from TLS socket"
 msgstr "Fout bij het lezen van de TLS-socket"
 
 #. flags
-#: tls/gnutls/gtlsconnection-gnutls.c:1443
-#: tls/gnutls/gtlsconnection-gnutls.c:1506
-#: tls/openssl/gtlsconnection-openssl.c:1002
+#: tls/gnutls/gtlsconnection-gnutls.c:1490
+#: tls/gnutls/gtlsconnection-gnutls.c:1553
+#: tls/openssl/gtlsconnection-openssl.c:1007
 msgid "Error writing data to TLS socket"
 msgstr "Fout bij het schrijven naar de TLS-socket"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1476
+#: tls/gnutls/gtlsconnection-gnutls.c:1523
 #, c-format
 msgid "Message of size %lu byte is too large for DTLS connection"
 msgid_plural "Message of size %lu bytes is too large for DTLS connection"
 msgstr[0] "Bericht van grootte %lu byte is te groot voor DTLS-verbinding"
 msgstr[1] "Bericht van grootte %lu bytes is te groot voor DTLS-verbinding"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1478
+#: tls/gnutls/gtlsconnection-gnutls.c:1525
 #, c-format
 msgid "(maximum is %u byte)"
 msgid_plural "(maximum is %u bytes)"
 msgstr[0] "(maximaal %u byte)"
 msgstr[1] "(maximaal %u bytes)"
 
-#: tls/gnutls/gtlsconnection-gnutls.c:1525
+#: tls/gnutls/gtlsconnection-gnutls.c:1572
 #, c-format
 msgid "Error performing TLS close: %s"
 msgstr "Fout bij sluiten van TLS: %s"
 
-#: tls/gnutls/gtlsdatabase-gnutls.c:688
+#: tls/gnutls/gtlsdatabase-gnutls.c:556
 msgid ""
 "Failed to load system trust store: GnuTLS was not configured with a system "
 "trust"
@@ -259,37 +267,36 @@
 "Laden van vertrouwensopslag van systeem mislukt: GnuTLS is niet "
 "geconfigureerd met een systeemvertrouwen"
 
-#: tls/gnutls/gtlsdatabase-gnutls.c:693 tls/openssl/gtlsdatabase-openssl.c:229
+#: tls/gnutls/gtlsdatabase-gnutls.c:561 tls/openssl/gtlsdatabase-openssl.c:255
 #, c-format
 msgid "Failed to load system trust store: %s"
 msgstr "Laden van vertrouwensopslag van systeem mislukt: %s"
 
 #: tls/gnutls/gtlsfiledatabase-gnutls.c:153
-#: tls/openssl/gtlsfiledatabase-openssl.c:454
+#: tls/openssl/gtlsfiledatabase-openssl.c:456
 #, c-format
 msgid "Failed to populate trust list from %s: %s"
 msgstr "Vertrouwenslijst van %s invullen mislukt: %s"
 
 #: tls/gnutls/gtlsserverconnection-gnutls.c:124
 #: tls/openssl/gtlsserverconnection-openssl.c:172
-#: tls/openssl/gtlsserverconnection-openssl.c:228
 msgid "Certificate has no private key"
 msgstr "Certificaat heeft geen priv??sleutel"
 
-#: tls/openssl/gtlsclientconnection-openssl.c:317
-#: tls/openssl/gtlsserverconnection-openssl.c:346
+#: tls/openssl/gtlsclientconnection-openssl.c:368
+#: tls/openssl/gtlsserverconnection-openssl.c:299
 #, c-format
 msgid "Could not set TLS cipher list: %s"
 msgstr "Kon TLS-cipherlijst niet verkrijgen: %s"
 
-#: tls/openssl/gtlsclientconnection-openssl.c:343
-#: tls/openssl/gtlsserverconnection-openssl.c:372
+#: tls/openssl/gtlsclientconnection-openssl.c:396
+#: tls/openssl/gtlsserverconnection-openssl.c:327
 #, c-format
 msgid "Could not set MAX protocol to %d: %s"
 msgstr "Kon MAX-protocol niet instellen op %d: %s"
 
-#: tls/openssl/gtlsclientconnection-openssl.c:404
-#: tls/openssl/gtlsserverconnection-openssl.c:433
+#: tls/openssl/gtlsclientconnection-openssl.c:459
+#: tls/openssl/gtlsserverconnection-openssl.c:390
 #, c-format
 msgid "Could not create TLS context: %s"
 msgstr "Kon geen TLS-context maken: %s"
@@ -312,55 +319,66 @@
 msgid "%s: The connection is broken"
 msgstr "%s: de verbinding is verbroken"
 
-#: tls/openssl/gtlsconnection-openssl.c:678
+#: tls/openssl/gtlsconnection-openssl.c:660
+#, c-format
+msgid "The request is invalid."
+msgstr "Het verzoek is ongeldig."
+
+#: tls/openssl/gtlsconnection-openssl.c:683
 #, c-format
 msgid "Channel binding data tls-unique is not available"
 msgstr "Kanaalbindingsgegevens van tls-unique zijn niet beschikbaar"
 
-#: tls/openssl/gtlsconnection-openssl.c:701
+#: tls/openssl/gtlsconnection-openssl.c:706
 #, c-format
 msgid "X.509 Certificate is not available on the connection"
 msgstr "X.509-certificaat is niet beschikbaar op de verbinding"
 
-#: tls/openssl/gtlsconnection-openssl.c:747
+#: tls/openssl/gtlsconnection-openssl.c:752
 #, c-format
 msgid "Failed to generate X.509 certificate digest"
 msgstr "Aanmaken van X.509-certificaatsdigest mislukt"
 
-#: tls/openssl/gtlsconnection-openssl.c:778
+#: tls/openssl/gtlsconnection-openssl.c:783
 #, c-format
 msgid "TLS Connection does not support TLS-Exporter feature"
 msgstr "TLS-verbinding biedt geen ondersteuning voor TLS-Exporter-functie"
 
-#: tls/openssl/gtlsconnection-openssl.c:781
+#: tls/openssl/gtlsconnection-openssl.c:786
 #, c-format
 msgid "Unexpected error while exporting keying data"
 msgstr "Onverwachte fout bij exporteren van sleutelgegevens"
 
-#: tls/openssl/gtlsconnection-openssl.c:1063
+#: tls/openssl/gtlsconnection-openssl.c:1068
 msgid "Error performing TLS close"
 msgstr "Fout bij sluiten van TLS"
 
-#: tls/openssl/gtlsdatabase-openssl.c:197
+#: tls/openssl/gtlsdatabase-openssl.c:167
 msgid "Could not get trusted anchors from Keychain"
 msgstr "Kon geen vertrouwde ankers ophalen uit sleutelbos"
 
-#: tls/openssl/gtlsdatabase-openssl.c:269
+#: tls/openssl/gtlsdatabase-openssl.c:232
+msgid "Could not get root certificate store"
+msgstr "Kon rootcertificaatopslag niet ophalen"
+
+#: tls/openssl/gtlsdatabase-openssl.c:239
+msgid "Could not get CA certificate store"
+msgstr "Kon CA-certificaatopslag niet ophalen"
+
+#: tls/openssl/gtlsdatabase-openssl.c:304
 msgid "Could not create CA store"
 msgstr "Kon geen CA-opslag aanmaken"
 
-#: tls/openssl/gtlsserverconnection-openssl.c:179
-#: tls/openssl/gtlsserverconnection-openssl.c:247
-#, c-format
-msgid "There is a problem with the certificate private key: %s"
-msgstr "Probleem met priv??sleutel van certificaat: %s"
-
-#: tls/openssl/gtlsserverconnection-openssl.c:188
-#: tls/openssl/gtlsserverconnection-openssl.c:239
+#: tls/openssl/gtlsserverconnection-openssl.c:184
 #, c-format
 msgid "There is a problem with the certificate: %s"
 msgstr "Probleem met certificaat: %s"
 
+#: tls/openssl/gtlsserverconnection-openssl.c:193
+#, c-format
+msgid "There is a problem with the certificate private key: %s"
+msgstr "Probleem met priv??sleutel van certificaat: %s"
+
 #~ msgid "Peer requested illegal TLS rehandshake"
 #~ msgstr ""
 #~ "Andere kant van de verbinding verzocht een ongeldige TLS-rehandshake"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/glib-networking-2.72.0/proxy/environment/genvironmentproxyresolver.c 
new/glib-networking-2.72.1/proxy/environment/genvironmentproxyresolver.c
--- old/glib-networking-2.72.0/proxy/environment/genvironmentproxyresolver.c    
2022-03-22 19:43:09.000000000 +0100
+++ new/glib-networking-2.72.1/proxy/environment/genvironmentproxyresolver.c    
2022-06-29 16:40:23.000000000 +0200
@@ -118,11 +118,34 @@
   G_OBJECT_CLASS (g_environment_proxy_resolver_parent_class)->finalize 
(object);
 }
 
+static const char *
+validate_proxy_envvar (const char *var)
+{
+  const char *url;
+  GError *error = NULL;
+
+  if ((url = g_getenv (var)))
+    {
+      /* Empty strings mean no proxy. */
+      if (*url == '\0')
+        return NULL;
+
+      if (g_uri_is_valid (url, G_URI_FLAGS_NONE, &error))
+        return url;
+
+      g_warning ("Environment variable %s specifies invalid proxy URL %s: %s", 
var, url, error->message);
+      g_error_free (error);
+    }
+
+  return NULL;
+}
+
 static void
 g_environment_proxy_resolver_init (GEnvironmentProxyResolver *resolver)
 {
   char **ignore_hosts = NULL;
   const char *default_proxy = NULL;
+  const char *url;
 
   if (g_getenv ("no_proxy"))
     ignore_hosts = g_strsplit (g_getenv ("no_proxy"), ",", -1);
@@ -134,24 +157,23 @@
    * This matches the behavior of libproxy's environment variable module, or
    * GNOME's use-same-proxy setting.
    */
-  if (g_getenv ("http_proxy"))
-    default_proxy = g_getenv ("http_proxy");
-  else if (g_getenv ("HTTP_PROXY"))
-    default_proxy = g_getenv ("HTTP_PROXY");
+  if ((url = validate_proxy_envvar ("http_proxy")))
+    default_proxy = url;
+  else if ((url = validate_proxy_envvar ("HTTP_PROXY")))
+    default_proxy = url;
 
   resolver->base_resolver = g_simple_proxy_resolver_new (default_proxy, 
ignore_hosts);
-
-  if (g_getenv ("ftp_proxy"))
-    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "ftp", g_getenv ("ftp_proxy"));
-  else if (g_getenv ("FTP_PROXY"))
-    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "ftp", g_getenv ("FTP_PROXY"));
-
-  if (g_getenv ("https_proxy"))
-    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "https", g_getenv ("https_proxy"));
-  else if (g_getenv ("HTTPS_PROXY"))
-    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "https", g_getenv ("HTTPS_PROXY"));
-
   g_strfreev (ignore_hosts);
+
+  if ((url = validate_proxy_envvar ("ftp_proxy")))
+    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "ftp", url);
+  else if ((url = validate_proxy_envvar ("FTP_PROXY")))
+    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "ftp", url);
+
+  if ((url = validate_proxy_envvar ("https_proxy")))
+    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "https", url);
+  else if ((url = validate_proxy_envvar ("HTTPS_PROXY")))
+    g_simple_proxy_resolver_set_uri_proxy (G_SIMPLE_PROXY_RESOLVER 
(resolver->base_resolver), "https", url);
 }
 
 static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/glib-networking-2.72.0/tls/tests/meson.build 
new/glib-networking-2.72.1/tls/tests/meson.build
--- old/glib-networking-2.72.0/tls/tests/meson.build    2022-03-22 
19:43:09.000000000 +0100
+++ new/glib-networking-2.72.1/tls/tests/meson.build    2022-06-29 
16:40:23.000000000 +0200
@@ -8,7 +8,8 @@
   glib_dep,
   gmodule_dep,
   gobject_dep,
-  gnutls_dep
+  gnutls_dep,
+  openssl_dep
 ]
 
 cflags = [

Reply via email to