Compare commits

...

6 Commits
master ... f26

Author SHA1 Message Date
Petr Lautrbach f7a286ba5d setroubleshoot-3.3.14-1.fc26
- Increase the space for suggested solutions in sealert
- Highlight suggestions with the highest confidence
- Remove additional "If " string from plugin messages
- Fix sealert message for process2 (#1507909)
- Do not change if_string[0] to lowercase
- Update translations
2017-11-23 13:35:43 +01:00
Petr Lautrbach 40f0194dee setroubleshoot-3.3.12-3
- Install style.css file (rhbz#1492761)
2017-09-19 08:14:12 +02:00
Petr Lautrbach bedf0d4f2a Install style.css into the right location
Resolves: rhbz#1492761
Fixes:
Traceback (most recent call last):
  File "/usr/lib/python3.6/site-packages/setroubleshoot/browser.py", line 821, in on_previous_button_clicked
    self.show_current_alert()
  File "/usr/lib/python3.6/site-packages/setroubleshoot/browser.py", line 794, in show_current_alert
    rb = self.add_row(p, alert, args)
  File "/usr/lib/python3.6/site-packages/setroubleshoot/browser.py", line 456, in add_row
    cssProvider.load_from_path('/usr/share/setroubleshoot/gui/style.css')
GLib.GError: gtk-css-provider-error-quark: <broken file>:1:0Failed to import: Error opening file /usr/share/setroubleshoot/gui/style.css: No such file or directory (2)
2017-09-19 08:12:58 +02:00
Petr Lautrbach 5bc197c4d4 setroubleshoot-3.3.12-2
- Don't stop when the plugin directory is empty
- Fix missing margins on Troubleshoot window
- Resize all solutions panels horizontally
- Fix missing priority color for proposed solutions
- Set translation domain for Gtk.Builder() object to have strings
  correctly translated
- Make labels on GtkButtons translatable
- Handla all exceptions from do_analyze_logfile()
- Fix semi-translated messages
- Do not catch POSIX signals (rhbz#1366004, rhbz#1419245)
2017-09-15 11:56:49 +02:00
Petr Lautrbach d9da4bfafa Backport fixes from 3.3.12
Do not backport string changes since we are after string freeze phase

- Don't stop when the plugin directory is empty
- Fix missing margins on Troubleshoot window
- Resize all solutions panels horizontally
- Fix missing priority color for proposed solutions
- Set translation domain for Gtk.Builder() object to have strings
  correctly translated
- Make labels on GtkButtons translatable
- Handla all exceptions from do_analyze_logfile()
- Fix semi-translated messages
- Do not catch POSIX signals (rhbz#1366004, rhbz#1419245)
2017-09-15 11:56:04 +02:00
Petr Lautrbach 12d0eb118b Remove unused patches 2017-09-15 11:55:47 +02:00
7 changed files with 14384 additions and 60 deletions

2
.gitignore vendored
View File

@ -197,3 +197,5 @@ setroubleshoot-2.2.93.tar.gz
/setroubleshoot-3.3.10.tar.gz
/setroubleshoot-3.3.11.tar.gz
/setroubleshoot-3.3.12.tar.gz
/setroubleshoot-3.3.13.tar.gz
/setroubleshoot-3.3.14.tar.gz

View File

@ -0,0 +1,391 @@
From af1192a503bac60d02328243d8b57caec14b0e0a Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Sat, 18 Nov 2017 23:16:33 +0100
Subject: [PATCH] framework: Update translations
---
framework/po/ca.po | 18 +++++++++---------
framework/po/cs.po | 8 ++++----
framework/po/da.po | 19 ++++++++++++-------
framework/po/de.po | 22 +++++++++++++++-------
framework/po/fr.po | 22 ++++++++++++++--------
5 files changed, 54 insertions(+), 35 deletions(-)
diff --git a/framework/po/ca.po b/framework/po/ca.po
index 9019908..1cb74b6 100644
--- a/framework/po/ca.po
+++ b/framework/po/ca.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-08-22 07:26-0400\n"
+"PO-Revision-Date: 2017-09-19 06:40-0400\n"
"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/fedora/language/"
"ca/)\n"
@@ -205,7 +205,7 @@ msgstr "<b>aleshores aquesta és la solució.</b>"
msgid "Plugin\n"
"Details"
msgstr "Detalls del\n"
-"complement"
+"connector"
#: ../src/setroubleshoot/browser.py:533
msgid "Report\n"
@@ -216,7 +216,7 @@ msgstr "Informa de l'error\n"
#: ../src/setroubleshoot/browser.py:562
#, python-format
msgid "Plugin: %s "
-msgstr "Complement: %s "
+msgstr "Connector: %s "
#: ../src/setroubleshoot/browser.py:629
msgid "Unable to grant access."
@@ -489,7 +489,7 @@ msgstr "capacitat"
#: ../src/setroubleshoot/signature.py:218
msgid "capability2"
-msgstr ""
+msgstr "capacitat2"
#: ../src/setroubleshoot/signature.py:395
#, python-format
@@ -634,7 +634,7 @@ msgid "\n"
"***** Plugin %s (%.4s confidence) suggests "
msgstr "\n"
"\n"
-"***** El complement %s (amb confiança del %.4s) suggereix "
+"***** El connector %s (amb confiança del %.4s) suggereix "
#: ../src/setroubleshoot/signature.py:594
msgid "*"
@@ -717,7 +717,7 @@ msgstr "Es van executar amb èxit %s"
#: ../src/sealert:173
#, c-format
msgid "Plugin %s not valid for %s id"
-msgstr "El complement %s no és vàlid per a l'id %s"
+msgstr "El connector %s no és vàlid per a l'id %s"
#: ../src/setroubleshootd:78
msgid "SELinux not enabled, setroubleshootd exiting..."
@@ -752,7 +752,7 @@ msgstr "Suprimeix"
#: ../gui/browser.glade.h:11
msgid "Delete Selected Alerts"
-msgstr "Elimina les alertes seleccionades"
+msgstr "Suprimeix les alertes seleccionades"
#: ../gui/browser.glade.h:13
msgid "Close"
@@ -784,7 +784,7 @@ msgid ""
"to remedy."
msgstr ""
"Llegiu la informació per solucionar el problema de l'alerta. Pot requerir "
-"privilegis d'administració per a remeiar-ho."
+"privilegis d'administració per a solucionar-ho."
#: ../gui/browser.glade.h:27
msgid "Email alert to system administrator."
@@ -792,7 +792,7 @@ msgstr "Missatge de correu electrònic d'alerta a l'administrador del sistema."
#: ../gui/browser.glade.h:31
msgid "Delete current alert from the database."
-msgstr "Elimina l'alerta actual de la base de dades."
+msgstr "Suprimeix l'alerta actual de la base de dades."
#: ../gui/browser.glade.h:32
msgid "Previous"
diff --git a/framework/po/cs.po b/framework/po/cs.po
index fe44ca5..ff26761 100644
--- a/framework/po/cs.po
+++ b/framework/po/cs.po
@@ -19,8 +19,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-08-29 03:47-0400\n"
-"Last-Translator: Zdenek <chmelarz@gmail.com>\n"
+"PO-Revision-Date: 2017-09-15 05:44-0400\n"
+"Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/fedora/language/cs/"
")\n"
"Language: cs\n"
@@ -167,7 +167,7 @@ msgstr "Pokus o přístup"
#: ../src/setroubleshoot/browser.py:296
msgid "On this"
-msgstr "Na tomto"
+msgstr "Na"
#: ../src/setroubleshoot/browser.py:296
msgid "Occurred"
@@ -232,7 +232,7 @@ msgstr "Výstraha %d z %d"
#: ../src/setroubleshoot/browser.py:785
#, python-format
msgid "On this %s:"
-msgstr "Na tomto %s:"
+msgstr "Na %s:"
#: ../src/setroubleshoot/browser.py:833 ../src/setroubleshoot/browser.py:839
#: ../src/setroubleshoot/signature.py:411
diff --git a/framework/po/da.po b/framework/po/da.po
index 2d17e09..344ae62 100644
--- a/framework/po/da.po
+++ b/framework/po/da.po
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-04-24 11:07-0400\n"
+"PO-Revision-Date: 2017-09-15 08:22-0400\n"
"Last-Translator: scootergrisen <scootergrisen@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/fedora/language/"
"da/)\n"
@@ -410,7 +410,7 @@ msgstr "Færdig: "
#: ../src/setroubleshoot/server.py:212
#, python-format
msgid " For complete SELinux messages run: sealert -l %s"
-msgstr ""
+msgstr " For komplette SELinux-meddelelser kør: sealert -l %s"
#: ../src/setroubleshoot/server.py:399
#, python-format
@@ -487,7 +487,7 @@ msgstr "mulighed"
#: ../src/setroubleshoot/signature.py:218
msgid "capability2"
-msgstr ""
+msgstr "capability2"
#: ../src/setroubleshoot/signature.py:395
#, python-format
@@ -732,6 +732,11 @@ msgid ""
"Daniel Walsh <dwalsh@redhat.com>\n"
"John Dennis <jdennis@redhat.com>\n"
msgstr ""
+"Ophavsret (c) 2010\n"
+"Thomas Liu <tliu@redhat.com>\n"
+"Máirín Duffy <duffy@redhat.com>\n"
+"Daniel Walsh <dwalsh@redhat.com>\n"
+"John Dennis <jdennis@redhat.com>\n"
#: ../gui/browser.glade.h:9
msgid "Troubleshoot selected alert"
@@ -739,7 +744,7 @@ msgstr "Fejlsøg valgte advarsler"
#: ../gui/browser.glade.h:10
msgid "Delete"
-msgstr ""
+msgstr "Slet"
#: ../gui/browser.glade.h:11
msgid "Delete Selected Alerts"
@@ -747,7 +752,7 @@ msgstr "Slet valgte advarsler"
#: ../gui/browser.glade.h:13
msgid "Close"
-msgstr ""
+msgstr "Luk"
#: ../gui/browser.glade.h:15
msgid "<b>SELinux has detected a problem.</b>"
@@ -787,7 +792,7 @@ msgstr "Slet nuværende advarsel fra databasen."
#: ../gui/browser.glade.h:32
msgid "Previous"
-msgstr ""
+msgstr "Forrige"
#: ../gui/browser.glade.h:33
msgid "Show previous alert."
@@ -795,7 +800,7 @@ msgstr "Vis forrige advarsel."
#: ../gui/browser.glade.h:35
msgid "Next"
-msgstr ""
+msgstr "Næste"
#: ../gui/browser.glade.h:36
msgid "Show next alert."
diff --git a/framework/po/de.po b/framework/po/de.po
index bc84922..b787a14 100644
--- a/framework/po/de.po
+++ b/framework/po/de.po
@@ -19,6 +19,7 @@
# Thomas Spura <tomspur@fedoraproject.org>, 2008, 2009
# Timo Trinks <ttrinks@redhat.com>, 2006, 2007
# Roman Spirgi <rspirgi@gmail.com>, 2015. #zanata
+# Thomas Eichhorn <tomislav@posteo.de>, 2017. #zanata
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -27,8 +28,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-05-15 04:18-0400\n"
-"Last-Translator: Roman Spirgi <rspirgi@gmail.com>\n"
+"PO-Revision-Date: 2017-11-12 07:53-0500\n"
+"Last-Translator: Thomas Eichhorn <tomislav@posteo.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/fedora/language/"
"de/)\n"
"Language: de\n"
@@ -422,6 +423,8 @@ msgstr "Fertig: "
#, python-format
msgid " For complete SELinux messages run: sealert -l %s"
msgstr ""
+"Zum Anzeigen der kompletten SELinux-Benachrichtigung führen Sie folgenden "
+"Befehl aus: sealert -l %s"
#: ../src/setroubleshoot/server.py:399
#, python-format
@@ -498,7 +501,7 @@ msgstr "Fähigkeit"
#: ../src/setroubleshoot/signature.py:218
msgid "capability2"
-msgstr ""
+msgstr "capability2"
#: ../src/setroubleshoot/signature.py:395
#, python-format
@@ -751,6 +754,11 @@ msgid ""
"Daniel Walsh <dwalsh@redhat.com>\n"
"John Dennis <jdennis@redhat.com>\n"
msgstr ""
+"Copyright (c) 2010\n"
+"Thomas Liu <tliu@redhat.com>\n"
+"Máirín Duffy <duffy@redhat.com>\n"
+"Daniel Walsh <dwalsh@redhat.com>\n"
+"John Dennis <jdennis@redhat.com>\n"
#: ../gui/browser.glade.h:9
msgid "Troubleshoot selected alert"
@@ -758,7 +766,7 @@ msgstr "Fehlersuche für die ausgewählte Warnung"
#: ../gui/browser.glade.h:10
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
#: ../gui/browser.glade.h:11
msgid "Delete Selected Alerts"
@@ -766,7 +774,7 @@ msgstr "Lösche die ausgewählten Meldungen"
#: ../gui/browser.glade.h:13
msgid "Close"
-msgstr ""
+msgstr "Schließen"
#: ../gui/browser.glade.h:15
msgid "<b>SELinux has detected a problem.</b>"
@@ -806,7 +814,7 @@ msgstr "Lösche die aktuelle Meldung aus der Datenbank."
#: ../gui/browser.glade.h:32
msgid "Previous"
-msgstr ""
+msgstr "Zurück"
#: ../gui/browser.glade.h:33
msgid "Show previous alert."
@@ -814,7 +822,7 @@ msgstr "zeige die vorherige Meldung."
#: ../gui/browser.glade.h:35
msgid "Next"
-msgstr ""
+msgstr "Weiter"
#: ../gui/browser.glade.h:36
msgid "Show next alert."
diff --git a/framework/po/fr.po b/framework/po/fr.po
index c7071cc..0991881 100644
--- a/framework/po/fr.po
+++ b/framework/po/fr.po
@@ -18,6 +18,7 @@
# Sam Friedmann <sam.friedmann@redhat.com>, 2009
# Thomas Canniot <mrtom@fedoraproject.org>, 2007,2010
# Thomas Canniot <thomas.canniot@laposte.net>, 2007
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017. #zanata
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -26,8 +27,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-02-20 02:14-0500\n"
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"PO-Revision-Date: 2017-10-05 09:01-0400\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/fedora/language/"
"fr/)\n"
"Language: fr\n"
@@ -420,7 +421,7 @@ msgstr "Terminé :"
#: ../src/setroubleshoot/server.py:212
#, python-format
msgid " For complete SELinux messages run: sealert -l %s"
-msgstr ""
+msgstr "Pour des messages SELinux exhaustifs, lancez sealert -l %s"
#: ../src/setroubleshoot/server.py:399
#, python-format
@@ -497,7 +498,7 @@ msgstr "capacité"
#: ../src/setroubleshoot/signature.py:218
msgid "capability2"
-msgstr ""
+msgstr "capability2"
#: ../src/setroubleshoot/signature.py:395
#, python-format
@@ -745,6 +746,11 @@ msgid ""
"Daniel Walsh <dwalsh@redhat.com>\n"
"John Dennis <jdennis@redhat.com>\n"
msgstr ""
+"Copyright (c) 2010\n"
+"Thomas Liu <tliu@redhat.com>\n"
+"Máirín Duffy <duffy@redhat.com>\n"
+"Daniel Walsh <dwalsh@redhat.com>\n"
+"John Dennis <jdennis@redhat.com>\n"
#: ../gui/browser.glade.h:9
msgid "Troubleshoot selected alert"
@@ -752,7 +758,7 @@ msgstr "Alerte Troubleshoot sélectionnée"
#: ../gui/browser.glade.h:10
msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
#: ../gui/browser.glade.h:11
msgid "Delete Selected Alerts"
@@ -760,7 +766,7 @@ msgstr "Supprimer les alertes sélectionnées"
#: ../gui/browser.glade.h:13
msgid "Close"
-msgstr ""
+msgstr "Fermer"
#: ../gui/browser.glade.h:15
msgid "<b>SELinux has detected a problem.</b>"
@@ -800,7 +806,7 @@ msgstr "Supprime l'alerte courante de la base de donner."
#: ../gui/browser.glade.h:32
msgid "Previous"
-msgstr ""
+msgstr "Précédent"
#: ../gui/browser.glade.h:33
msgid "Show previous alert."
@@ -808,7 +814,7 @@ msgstr "Afficher les alertes précédentes."
#: ../gui/browser.glade.h:35
msgid "Next"
-msgstr ""
+msgstr "Suivant"
#: ../gui/browser.glade.h:36
msgid "Show next alert."
--
2.15.0

View File

@ -1,26 +0,0 @@
From a1d303150b341d6cfdc1f7d36c38004cee01fdb7 Mon Sep 17 00:00:00 2001
From: Dominik Perpeet <dperpeet@redhat.com>
Date: Wed, 6 Apr 2016 10:09:55 +0200
Subject: [PATCH] setroubleshoot: Ensure that dbus string param isn't null
An alert's level can be None, but DBUS doesn't allow that for string parameters.
---
framework/src/setroubleshoot/server.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/framework/src/setroubleshoot/server.py b/framework/src/setroubleshoot/server.py
index 87722c9..e788d41 100755
--- a/framework/src/setroubleshoot/server.py
+++ b/framework/src/setroubleshoot/server.py
@@ -579,7 +579,7 @@ Return an alert with summary, audit events, fix suggestions
return (alert.local_id, alert.summary(), alert.report_count,
audit_events, plugins,
- str(alert.first_seen_date), str(alert.last_seen_date), alert.level
+ str(alert.first_seen_date), str(alert.last_seen_date), alert.level or ''
)
--
2.7.3

View File

@ -1,30 +0,0 @@
From 4271b72e879ca25ba244036c0c2b6b9dbf7b2edf Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Thu, 14 Apr 2016 10:36:14 +0200
Subject: [PATCH 2/2] framework: Drop unwanted debug message in sedispatch
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1326985
---
framework/src/sedispatch.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/framework/src/sedispatch.c b/framework/src/sedispatch.c
index 6417a10..bec3aa9 100644
--- a/framework/src/sedispatch.c
+++ b/framework/src/sedispatch.c
@@ -147,10 +147,9 @@ int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused)))
FD_SET(0, &rfds);
tv.tv_sec = 3;
tv.tv_usec = 0;
- if (select(1, &rfds, NULL, NULL, &tv) == 0) {
- syslog(LOG_ERR, "timeout flush");
+ if (select(1, &rfds, NULL, NULL, &tv) == 0)
+ /* The timeout occurred, the event is probably complete */
auparse_flush_feed(au);
- }
}
if (feof(stdin))
break;
--
2.7.3

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +1,14 @@
Summary: Helps troubleshoot SELinux problems
Name: setroubleshoot
Version: 3.3.12
Version: 3.3.14
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://pagure.io/setroubleshoot
Source0: https://releases.pagure.org/setroubleshoot/%{name}-%{version}.tar.gz
Source1: %{name}.tmpfiles
Patch1: 0001-framework-Update-translations.patch
Patch2: 0002-framework-Update-translations.patch
BuildRequires: perl-XML-Parser
BuildRequires: libcap-ng-devel
BuildRequires: intltool gettext python3 python3-devel
@ -80,7 +82,7 @@ make
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
make DESTDIR=%{buildroot} PREFIX=/usr install
desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}%{pkgvardatadir}
mkdir -p %{buildroot}%{_rundir}/setroubleshoot
@ -97,7 +99,7 @@ install -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
Summary: SELinux troubleshoot server
Group: Applications/System
Requires: %{name}-plugins >= 3.3.4
Requires: %{name}-plugins >= 3.3.9
Requires: audit >= 1.2.6-3
Requires: audit-libs-python3 >= 1.2.6-3
Requires: libxml2-python3
@ -202,6 +204,31 @@ rm -rf %{buildroot}
%changelog
* Sat Nov 18 2017 Petr Lautrbach <plautrba@redhat.com> - 3.3.14-1
- Increase the space for suggested solutions in sealert
- Highlight suggestions with the highest confidence
- Remove additional "If " string from plugin messages
- Fix sealert message for process2 (#1507909)
- Do not change if_string[0] to lowercase
- Do not split If sentences to framework and plugins - requires
setroubleshoot-plugins 3.3.8 at least (rhbz#1210243, rhbz#1322734, rhbz#1115510)
- Update translations
* Tue Sep 19 2017 Petr Lautrbach <plautrba@redhat.com> - 3.3.12-3
- Install style.css file (rhbz#1492761)
* Fri Sep 15 2017 Petr Lautrbach <plautrba@redhat.com> - 3.3.12-2
- Don't stop when the plugin directory is empty
- Fix missing margins on Troubleshoot window
- Resize all solutions panels horizontally
- Fix missing priority color for proposed solutions
- Set translation domain for Gtk.Builder() object to have strings
correctly translated
- Make labels on GtkButtons translatable
- Handla all exceptions from do_analyze_logfile()
- Fix semi-translated messages
- Do not catch POSIX signals (rhbz#1366004, rhbz#1419245)
* Tue Jun 13 2017 Petr Lautrbach <plautrba@redhat.com> - 3.3.12-1
- Remove "Report bug" button when mozplugger plugin is used (#1290135)
- Change "check_for_man" return value upon failure (#1431191)

View File

@ -1 +1 @@
SHA512 (setroubleshoot-3.3.12.tar.gz) = 4538b5924b7564ca7d1543c39556042c42d605489cd158170f3c823ea0bc8d04c8a40d8048abc190962165e2f541ccdad9ebacde8087077d1fcd0ed7002665df
SHA512 (setroubleshoot-3.3.14.tar.gz) = 388c62e468e4ccecf67ea83eeafc6b0a5f09972f1b6b3158dc2a1c5c0186c2139dab46e8c4bf57d7af660ae9b200c4574b5763573a067dff8c6e88f83b654689