Packman Build Service PMBS

Changes of Revision 102

_service:download_files:master.tar.gz/.github/FUNDING.yml Changed

_service:download_files:master.tar.gz/.gitignore Changed

_service:download_files:master.tar.gz/CMakeLists.txt Changed

_service:download_files:master.tar.gz/addons/repository.xbmc.org/addon.xml Changed

_service:download_files:master.tar.gz/addons/resource.language.en_gb/resources/strings.po Changed

@@ -2392,8 +2392,8 @@
 
 #empty string with id 520
 
-#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 #. Node title for compilation albums, plural of #204
+#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
 #: system/library/music/compilations.xml
 msgctxt "#521"
 msgid "Compilations"
@@ -3465,7 +3465,7 @@
 msgid "Dark Grey"
 msgstr ""
 
-#empty string id 769
+#empty string with id 769
 #string 769 reserved for more subtitle colours
 
 msgctxt "#770"
@@ -5730,7 +5730,7 @@
 #: xbmc/dialogs/GUIDialogGamepad.cpp
 #: xbmc/dialogs/GUIDialogNumeric.cpp
 msgctxt "#12343"
-msgid "retries left "
+msgid "retries left"
 msgstr ""
 
 #: xbmc/dialogs/GUIDialogGamepad.cpp
@@ -5839,7 +5839,12 @@
 msgid "Use pan and zoom effects"
 msgstr ""
 
-#empty strings from id 12380 to 12381
+#empty string with id 12380
+
+#: system/settings/settings.xml
+msgctxt "#12381"
+msgid "Switch to visualisation on playback"
+msgstr ""
 
 #. time format with meridiem (xx) e.g. "HH:mm:ss xx"
 #: xbmc/LangInfo.cpp
@@ -9538,11 +9543,7 @@
 msgid "Update interval"
 msgstr ""
 
-#. pvr settings "store epg data in database" setting label
-#: system/settings/settings.xml
-msgctxt "#19072"
-msgid "Store data in database"
-msgstr ""
+#empty string with id 19072
 
 #. pvr settings "delay channel switch" setting label
 #: system/settings/settings.xml
@@ -10598,11 +10599,7 @@
 msgid "Filter channels"
 msgstr ""
 
-#. label 'loading epg data from database' for progress dialog text
-#: xbmc/pvr/epg/EpgContainer.cpp
-msgctxt "#19250"
-msgid "Loading guide from database"
-msgstr ""
+#empty string with id 19250
 
 #. label for 'update epg' context menu item and 'update epg' confirmation dialog header
 #: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
@@ -12583,7 +12580,13 @@
 msgid "Where no local album cover exists, online art will be used. Where neither is available, cover images embedded in music files will be used"
 msgstr ""
 
-#empty strings from id 20226 to 20227
+#: system/settings/settings.xml
+#: xbmc/music/dialogs/GUIDialogVideoInfo.cpp
+msgctxt "#20226"
+msgid "Movie set information folder"
+msgstr ""
+
+#empty string with id 20227
 
 #: system/settings/settings.xml
 msgctxt "#20228"
@@ -15596,7 +15599,61 @@
 msgid "The add-on is not compatible with this version of Kodi."
 msgstr ""
 
-#empty strings from id 24153 to 24990
+#: apple remote
+msgctxt "#24153"
+msgid "Enable to make the Siri remote match the normal Apple tvOS behavior"
+msgstr ""
+
+#: apple remote
+msgctxt "#24154"
+msgid "Idle remote handling after N seconds"
+msgstr ""
+
+#: apple remote
+msgctxt "#24155"
+msgid "After remote idles, the first tap/swipe received will wake it"
+msgstr ""
+
+#: apple remote
+msgctxt "#24156"
+msgid "30 Seconds"
+msgstr ""
+
+#: apple remote
+msgctxt "#24157"
+msgid "60 Seconds"
+msgstr ""
+
+#: apple remote
+msgctxt "#24158"
+msgid "90 Seconds"
+msgstr ""
+
+#: apple remote
+msgctxt "#24159"
+msgid "120 Seconds"
+msgstr ""
+
+#: apple remote
+msgctxt "#24160"
+msgid "Enable Siri remote timeout"
+msgstr ""
+
+#: apple remote
+msgctxt "#24161"
+msgid "Enable remote input timeout for tap/swipe"
+msgstr ""
+
+msgctxt "#24162"
+msgid "Use Kodi virtual keyboard"
+msgstr ""
+
+#: apple remote
+msgctxt "#24163"
+msgid "Match Apple tvOS Standard (Siri remote)"
+msgstr ""
+
+#empty strings from id 24164 to 24990
 
 #. Used as error message in add-on browser when add-on repository data could not be downloaded
 #: xbmc/filesystem/AddonsDirectory.cpp
@@ -18743,10 +18800,7 @@
 msgid "Don't import the guide data while playing TV to minimise CPU usage."
 msgstr ""
 
-#: system/settings/settings.xml
-msgctxt "#36223"
-msgid "Activate to store epg data in a database. This may speedup importing epg data on startup."
-msgstr ""
+#empty string with id 36223
 
 #: system/settings/settings.xml
 msgctxt "#36224"
@@ -19172,7 +19226,16 @@
 msgid "Switch display into HDR mode if media with HDR information is played.\nIf disabled, HDR information are applied using Kodi's internal HDR path."
 msgstr ""
 
-#empty strings from id 36300 to 36301
+#. Description of setting with label #20226 "Movie set information folder"
+#: system/settings/settings.xml
+msgctxt "#36300"
+msgid "Select the folder where movie set information (images) are saved locally."
+msgstr ""
+
+#: xbmc/interfaces/builtins/LibraryBuiltins.cpp
+msgctxt "#36301"
+msgid "No 'Movie set information folder' is configured to store movie set images so they will not be exported. Do you want to proceed?"
+msgstr ""
 
 #: system/settings/settings.xml
 msgctxt "#36302"
@@ -20600,6 +20663,7 @@
 
 #. Values for setting with label #36621 and #36628 "Minimum/Maximum protocol version" - none means "no protocol version is forced"
 #: system/settings/settings.xml
+#: addons/skin.estuary/xml/View_50_List.xml
 msgctxt "#36623"
 msgid "None"
 msgstr ""
@@ -21361,7 +21425,13 @@
 msgid "This category contains other settings for the GUI interface"
 msgstr ""
 
-#empty strings from id 38112 to 38189
+#. Description of setting with label #12381 "Switch to visualisation on playback"
+#: system/settings/settings.xml
+msgctxt "#38112"
+msgid "Automatically go to the visualisation window when audio playback starts"
+msgstr ""
+
+#empty strings from id 38113 to 38189
 
 msgctxt "#38190"
 msgid "Extract thumbnails from video files"

_service:download_files:master.tar.gz/addons/screensaver.xbmc.builtin.black/addon.xml Changed

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="screensaver.xbmc.builtin.black"
        name="Black"
-       version="1.0.32"
+       version="1.0.33"
        provider-name="Team Kodi">
   <extension point="xbmc.ui.screensaver" library="dummy.so"/>
   <extension point="xbmc.addon.metadata">
     <summary lang="af_ZA">Sluimerskerm wat jou skerm swart maak.</summary>
     <summary lang="am_ET">መመልከቻ ማዳኛ የእርስዎን መመልከቻ ጥቁር ያደርገዋል </summary>
     <summary lang="ar_SA">شاشة التوقف التي تحول شاشتك لأسود</summary>
-    <summary lang="be_BY">Ахоўнік экрану што робіць экран чорным</summary>
+    <summary lang="be_BY">Ахоўнік экрана, што робіць экран чорным</summary>
     <summary lang="bg_BG">Скрийнсейвър, който прави екрана черен</summary>
     <summary lang="ca_ES">Estalvi de pantalla que posa la pantalla en negre</summary>
     <summary lang="cs_CZ">Spořič obrazovky, který začerní vaši obrazovku</summary>
@@ -66,7 +66,7 @@
     <description lang="af_ZA">Die is 'n eenvoudige sluimerskerm wat jou skerm swart maak.</description>
     <description lang="am_ET">ጥቁር ቀላል መመልከቻ ማዳኛ የእርስዎን መመልከቻ ጥቁር ያደርገዋል </description>
     <description lang="ar_SA">بلاك شاشة توقف بسيطة تحول شاشتك لأسود</description>
-    <description lang="be_BY">Black - просты ахоўнік экрану, які робіць ваш экран чорным.</description>
+    <description lang="be_BY">Black - просты ахоўнік экрана, які робіць ваш экран чорным.</description>
     <description lang="bg_BG">"Black" е просто скрийнсейвър, който ще направи екрана Ви черен.</description>
     <description lang="ca_ES">Black és un estalvi de pantalla simple que posarà la teva pantalla en negre.</description>
     <description lang="cs_CZ">Black je jednoduchý spořič obrazovky, který začerní vaši obrazovku.</description>

_service:download_files:master.tar.gz/addons/screensaver.xbmc.builtin.dim/addon.xml Changed

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="screensaver.xbmc.builtin.dim"
        name="Dim"
-       version="1.0.56"
+       version="1.0.57"
        provider-name="Team Kodi">
   <extension point="xbmc.ui.screensaver" library="dummy.so"/>
   <extension point="xbmc.addon.metadata">
     <summary lang="af_ZA">Sluimerskerm wat jou skerm verdof</summary>
     <summary lang="am_ET">መመልከቻ ማዳኛ የ እርስዎን መመልከቻ ፈዘዝ ያደርገዋል </summary>
     <summary lang="ar_SA">شاشة توقف تمكن من تظليم الشاشة</summary>
-    <summary lang="be_BY">Ахоўнік экрану што зацямняе экран</summary>
+    <summary lang="be_BY">Ахоўнік экрана, што паступова зацямняе ваш экран</summary>
     <summary lang="bg_BG">Скрийнсейвър, който затъмнява екрана</summary>
     <summary lang="ca_ES">Estalvi de pantalla que enfosqueix la pantalla</summary>
     <summary lang="cs_CZ">Spořič obrazovky, který ztmaví vaši obrazovku</summary>
@@ -68,7 +68,7 @@
     <description lang="af_ZA">Die Verdof sluimerskerm is 'n eenvoudige sluimerskerm wat jou skerm verdof (uit vaag) tot 'n stelbare waarde tussen 20 en 100%</description>
     <description lang="am_ET">የ መመልከቻ ማዳኛ ማደብዘዣ የ እርስዎን መመልከቻ ያፈዘዋል (ማፍዘዣ) የ እርስዎን መመልከቻ ዋጋ በ 20 እና በ 100% መካከል</description>
     <description lang="ar_SA">Dim عبارة عن شاشة توقف  تمكن من  تظليم (صورة خافتة) الشاشة إلى قيمة قابلة للتحديد بين 20 و 100%</description>
-    <description lang="be_BY">Dim - просты ахоўнік экрану , які будзе зацямняць экран. Значэнне зацямнення можа змяняцца ад 20 да 100%.</description>
+    <description lang="be_BY">Dim - просты ахоўнік экрана, які будзе паступова зацямняць экран. Значэнне зацямнення можа змяняцца ад 20 да 100%.</description>
     <description lang="bg_BG">Скрийнсейвърът "Dim" затъмнява екрана, до стойност, която Вие определяте предварително (между 20 и 100%).</description>
     <description lang="ca_ES">L'estalvi de pantalla Dim és un estalvi de pantalla simple que enfosquirà (fos en negre) la seva pantalla a un valor que es pot configurar entre 20 i 100%.</description>
     <description lang="cs_CZ">Spořič obrazovky Dim je jednoduchý spořič obrazovky, který ztmaví (posupně) vaši obrazovku podle nastavitelné hodnoty mezi 20 a 100 %.</description>

_service:download_files:master.tar.gz/addons/skin.estouchy/addon.xml Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estouchy" version="2.0.23" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="2.0.24" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.14.0"/>
 	</requires>
@@ -33,6 +33,7 @@
 		<summary lang="hu_HU">Felület érintőképernyős eszközöknek</summary>
 		<summary lang="is_IS">Skinn fyrir tæki með snertiskjá</summary>
 		<summary lang="it_IT">Skin per dispositivi touchscreen</summary>
+		<summary lang="ja_JP">スキンはタッチスクリーンデバイス向けです</summary>
 		<summary lang="ko_KR">터치 스크린 기기를 위한 스킨</summary>
 		<summary lang="lt_LT">Teminė išvaizda liečiamiesiems įrenginiams</summary>
 		<summary lang="lv_LV">Apvalks skārienekrāna ierīcēm</summary>
@@ -59,7 +60,7 @@
 		<description lang="bg_BG">Обликът е разработен за ползване на устройства със сензорен екран, като таблети и телефони.</description>
 		<description lang="ca_ES">Aparença dissenyada perquè s'utilitzi en dispositius amb pantalla tàctil com taules i telèfons intel·ligents</description>
 		<description lang="cs_CZ">Vzhled navržený pro použití na zařízeních s dotykovou obrazovkou, jako jsou tablety a chytré telefony</description>
-		<description lang="da_DK">Skins som er designet til brug på touchscreen enheder som tablets og smartphones</description>
+		<description lang="da_DK">Skin der er designet til brug på touchscreen enheder som f.eks. tablets og smartphones</description>
 		<description lang="de_DE">Dieses Skin wurde für die Benutzung mit Touchscreen-Geräten wie Tablets und Handys entworfen</description>
 		<description lang="el_GR">Κέλυφος σχεδιασμένο για να χρησιμοποιηθεί σε συσκευές με οθόνη αφής όπως ταμπλέτες και έξυπνα κινητά.</description>
 		<description lang="en_GB">Skin designed to be used on touchscreen devices like tablets and smartphones</description>
@@ -77,6 +78,7 @@
 		<description lang="hu_HU">Egy érintőképernyős eszközökre, például táblagépekre és okostelefonokra tervezett felület</description>
 		<description lang="is_IS">Skinn sem er hannað til notkunar á tækjum með snertiskjá, eins og til dæmis spjaldtölvum og snjallsímum.</description>
 		<description lang="it_IT">Skin progettata per essere usata su dispositivi touchscreen come tablet e smartphone</description>
+		<description lang="ja_JP">スキンのデザインは、タッチスクリーンデバイスであるタブレットやスマホなどでの使用を想定されています</description>
 		<description lang="ko_KR">태블릿이나 스마트폰과 같은 터치 스크린 기기에서 사용할 수 있게 디자인한 스킨</description>
 		<description lang="lt_LT">Teminė išvaizda pritaikyta naudojimui įrenginiuose su liečiamaisiais ekranais, tokiuose kaip planšetiniai kompiuteriai ar išmanieji telefonai</description>
 		<description lang="ms_MY">Kulit direka untuk digunakan pada peranti berskrin sentuh seperti tablet dan telefon pintar</description>

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.af_za/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.am_et/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ar_sa/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.be_by/strings.po Changed

@@ -64,6 +64,10 @@
 msgid "PVR info"
 msgstr "Звесткі PVR"
 
+msgctxt "#31018"
+msgid "Player process info"
+msgstr "Інфармацыя пра прайгравальнік"
+
 msgctxt "#31024"
 msgid "Page"
 msgstr "Page"
@@ -76,6 +80,10 @@
 msgid "Login"
 msgstr "Login"
 
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "ПРЫПЫНЕНА"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "FAST FORWARD"
@@ -114,7 +122,7 @@
 
 msgctxt "#31059"
 msgid "Current playlist"
-msgstr "Current playlist"
+msgstr "Бягучы спіс прайгравання"
 
 msgctxt "#31200"
 msgid "Back"
@@ -126,7 +134,7 @@
 
 msgctxt "#31202"
 msgid "View"
-msgstr "View"
+msgstr "Выгляд"
 
 msgctxt "#31300"
 msgid "Current Temp"
@@ -156,9 +164,13 @@
 msgid "Download Subtitles"
 msgstr "Download Subtitles"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Тэлетэкст"
+
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Skin default"
+msgstr "Прадвызначаная абалонка"
 
 msgctxt "#31391"
 msgid "Arial based"
@@ -174,7 +186,7 @@
 
 msgctxt "#31550"
 msgid "Backgrounds"
-msgstr "Backgrounds"
+msgstr "Фоны"
 
 msgctxt "#31551"
 msgid "Add-on Shortcut"

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.bg_bg/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ca_es/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.cs_cz/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.cy_gb/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.da_dk/strings.po Changed

@@ -34,7 +34,7 @@
 
 msgctxt "#31006"
 msgid "Visualization Presets"
-msgstr "Forudindstillinger til Visualisering"
+msgstr "Forudindstillinger til visualisering"
 
 msgctxt "#31007"
 msgid "Context Menu"
@@ -56,6 +56,10 @@
 msgid "Episodes"
 msgstr "Afsnit"
 
+msgctxt "#31015"
+msgid "Player info"
+msgstr "Information for afspiller"
+
 msgctxt "#31016"
 msgid "Albums"
 msgstr "Albummer"
@@ -78,7 +82,7 @@
 
 msgctxt "#31021"
 msgid "System memory usage"
-msgstr "Hukommelsesforbrug"
+msgstr "Systemets hukommelsesforbrug"
 
 msgctxt "#31024"
 msgid "Page"
@@ -90,12 +94,16 @@
 
 msgctxt "#31038"
 msgid "Login"
-msgstr "Brugernavn"
+msgstr "Login"
 
 msgctxt "#31039"
 msgid "Updated:"
 msgstr "Opdateret:"
 
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "PAUSE"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "SPOL FREM"
@@ -114,11 +122,11 @@
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "Sorter: Stigende"
+msgstr "Sorter: stigende"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "Sorter: Faldende"
+msgstr "Sorter: faldende"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -126,7 +134,7 @@
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Gem afspilningsliste"
+msgstr "Gem playliste"
 
 msgctxt "#31057"
 msgid "Close playlist"
@@ -146,7 +154,7 @@
 
 msgctxt "#31201"
 msgid "Location"
-msgstr "Lokalitet"
+msgstr "Placering"
 
 msgctxt "#31202"
 msgid "View"
@@ -154,11 +162,11 @@
 
 msgctxt "#31300"
 msgid "Current Temp"
-msgstr "Temperatur Nu"
+msgstr "Nuværende temperatur"
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Sidst Opdateret"
+msgstr "Sidst opdateret"
 
 msgctxt "#31303"
 msgid "Data provider"
@@ -166,7 +174,7 @@
 
 msgctxt "#31309"
 msgid "System Memory Used:"
-msgstr "System hukommelse ibrug:"
+msgstr "Systemets hukommelsesforbrug:"
 
 msgctxt "#31320"
 msgid "Last Logged In"
@@ -182,7 +190,7 @@
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr "Hent Undertekster"
+msgstr "Hent undertekster"
 
 msgctxt "#31358"
 msgid "Teletext"
@@ -194,47 +202,83 @@
 
 msgctxt "#31391"
 msgid "Arial based"
-msgstr "Arialbaseret"
+msgstr "Baseret på Arial"
 
 msgctxt "#31400"
 msgid "Change the skin · Set language and region · Change file listing options · Set up a screensaver"
 msgstr "Skift skin · Vælg sprog og region · Skift indstillinger for filvisning · Opsæt en pauseskærm"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Administrer dine installerede add-ons · Gennemse og installer add-ons fra kodi.tv · Tilpas indstillinger for add-ons"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Vælg din Kodi brugerprofil[CR]for at logge ind og fortsætte"
 
+msgctxt "#31548"
+msgid "Home menu"
+msgstr "Hovedmenu"
+
+msgctxt "#31549"
+msgid "Home Add-ons"
+msgstr "Hovedmenuens add-ons"
+
 msgctxt "#31550"
 msgid "Backgrounds"
 msgstr "Baggrunde"
 
 msgctxt "#31551"
 msgid "Add-on Shortcut"
-msgstr "Genvej til Addon"
+msgstr "Genvej til add-on"
+
+msgctxt "#31552"
+msgid "SYNC"
+msgstr "SYNC"
+
+msgctxt "#31553"
+msgid "Use Custom Background"
+msgstr "Anvend brugerdefineret baggrund"
+
+msgctxt "#31554"
+msgid "Background:"
+msgstr "Baggrund:"
+
+msgctxt "#31555"
+msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
+msgstr "Konfigurer tv-indstillinger · Skift fuldskærmsinfo · Administrer dataindstillinger for EPG"
 
 msgctxt "#31556"
 msgid "Live TV"
-msgstr "Live TV"
+msgstr "Direkte tv"
 
 msgctxt "#31557"
 msgid "Hide video background"
 msgstr "Skjul videobaggrund"
 
+msgctxt "#31558"
+msgid "Hide visualization background"
+msgstr "Skjul visualiseringens baggrund"
+
+msgctxt "#31559"
+msgid "Channel settings"
+msgstr "Kanalindstillinger"
+
 msgctxt "#31560"
 msgid "Available groups"
 msgstr "Tilgængelig grupper"
 
 msgctxt "#31561"
 msgid "Add Group"
-msgstr "Tilføj Gruppe"
+msgstr "Tilføj gruppe"
 
 msgctxt "#31562"
 msgid "Rename Group"
-msgstr "Omdøb Gruppe"
+msgstr "Omdøb gruppe"
 
 msgctxt "#31563"
 msgid "Delete Group"
-msgstr "Slet Gruppe"
+msgstr "Slet gruppe"
 
 msgctxt "#31564"
 msgid "Show hidden"
@@ -243,3 +287,15 @@
 msgctxt "#31565"
 msgid "Show deleted"
 msgstr "Vis slettede"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Der er to ting at vide omkring navigeringen i Estouchy"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Kodi-logoet fungerer som en 'HOME' -knap. Hver gang du trykker på den, føres du tilbage til startskærmen."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Når du afspiller lyd eller video, vises titlen øverst på skærmen. Hvis du trykker på den, kommer du til visualiseringen eller videovinduet i fuld skærm."

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.de_de/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.el_gr/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.en_au/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.en_nz/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.en_us/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.es_ar/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.es_es/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.es_mx/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.et_ee/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.eu_es/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.fa_ir/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.fi_fi/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.fo_fo/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.fr_ca/strings.po Changed

@@ -56,6 +56,10 @@
 msgid "Episodes"
 msgstr "Épisodes"
 
+msgctxt "#31015"
+msgid "Player info"
+msgstr "Informations sur le lecteur"
+
 msgctxt "#31016"
 msgid "Albums"
 msgstr "Albums"
@@ -94,7 +98,11 @@
 
 msgctxt "#31039"
 msgid "Updated:"
-msgstr "Mis à jour :"
+msgstr "Mis à jour :"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "EN PAUSE"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
@@ -114,11 +122,11 @@
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "Trier : croissant"
+msgstr "Trier : croissant"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "Trier : décroissant"
+msgstr "Trier : décroissant"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -166,7 +174,7 @@
 
 msgctxt "#31309"
 msgid "System Memory Used:"
-msgstr "Mémoire système utilisée :"
+msgstr "Mémoire système utilisée :"
 
 msgctxt "#31320"
 msgid "Last Logged In"
@@ -262,7 +270,7 @@
 
 msgctxt "#31554"
 msgid "Background:"
-msgstr "Arrière-plan : "
+msgstr "Arrière-plan : "
 
 msgctxt "#31555"
 msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
@@ -318,7 +326,7 @@
 
 msgctxt "#31902"
 msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
-msgstr "Le logo Kodi fonctionne comme un bouton « ACCUEIL ». Lorsque vous le touchez, vous retournerez à l’écran d’accueil."
+msgstr "Le logo Kodi fonctionne comme un bouton «  ACCUEIL ». Lorsque vous le touchez, vous retournerez à l’écran d’accueil."
 
 msgctxt "#31903"
 msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.fr_fr/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.gl_es/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.he_il/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.hr_hr/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.hu_hu/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.hy_am/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.id_id/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.is_is/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.it_it/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ja_jp/strings.po Changed

@@ -30,11 +30,11 @@
 
 msgctxt "#31005"
 msgid "Visualization Options"
-msgstr "ビジュアライザーオプション"
+msgstr "ビジュアライザオプション"
 
 msgctxt "#31006"
 msgid "Visualization Presets"
-msgstr "ビジュアライザーのプリセット"
+msgstr "ビジュアライザプリセット"
 
 msgctxt "#31007"
 msgid "Context Menu"
@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "処理中..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "最近"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "映画"
@@ -52,10 +56,34 @@
 msgid "Episodes"
 msgstr "エピソード"
 
+msgctxt "#31015"
+msgid "Player info"
+msgstr "プレイヤー詳細"
+
 msgctxt "#31016"
 msgid "Albums"
 msgstr "アルバム"
 
+msgctxt "#31017"
+msgid "PVR info"
+msgstr "PVR詳細"
+
+msgctxt "#31018"
+msgid "Player process info"
+msgstr "プレイヤーのプロセス詳細"
+
+msgctxt "#31019"
+msgid "Video decoder"
+msgstr "ビデオデコーダー"
+
+msgctxt "#31020"
+msgid "Pixel format"
+msgstr "ピクセルの形式"
+
+msgctxt "#31021"
+msgid "System memory usage"
+msgstr "システムメモリ使用量"
+
 msgctxt "#31024"
 msgid "Page"
 msgstr "ページ"
@@ -68,6 +96,14 @@
 msgid "Login"
 msgstr "ログイン"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "更新:"
+
+msgctxt "#31043"
+msgid "PAUSED"
+msgstr "静止中"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "早送り"
@@ -76,17 +112,21 @@
 msgid "REWIND"
 msgstr "巻戻し"
 
+msgctxt "#31046"
+msgid "Play speed"
+msgstr "再生速度"
+
 msgctxt "#31049"
 msgid "End Time"
 msgstr "終了時間"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
-msgstr "ソート: 昇順"
+msgstr "並べ替え: 昇順"
 
 msgctxt "#31051"
 msgid "Sort: Descending"
-msgstr "ソート: 降順"
+msgstr "並べ替え: 降順"
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -94,7 +134,7 @@
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "プレイリストを保存"
+msgstr "プレイリスト保存"
 
 msgctxt "#31057"
 msgid "Close playlist"
@@ -102,7 +142,7 @@
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "システム音楽ファイル"
+msgstr "システムミュージックファイル"
 
 msgctxt "#31059"
 msgid "Current playlist"
@@ -114,7 +154,7 @@
 
 msgctxt "#31201"
 msgid "Location"
-msgstr "地域"
+msgstr "場所"
 
 msgctxt "#31202"
 msgid "View"
@@ -130,7 +170,11 @@
 
 msgctxt "#31303"
 msgid "Data provider"
-msgstr "気象データ提供元"
+msgstr "気象データプロバイダー"
+
+msgctxt "#31309"
+msgid "System Memory Used:"
+msgstr "システムメモリ使用量:"
 
 msgctxt "#31320"
 msgid "Last Logged In"
@@ -146,7 +190,7 @@
 
 msgctxt "#31356"
 msgid "Download Subtitles"
-msgstr "字幕をダウンロード"
+msgstr "字幕ダウンロード"
 
 msgctxt "#31358"
 msgid "Teletext"
@@ -154,19 +198,59 @@
 
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "スキンのデフォルト"
+msgstr "スキンデフォルト"
 
 msgctxt "#31391"
 msgid "Arial based"
-msgstr "Arial ベース"
+msgstr "Arialベース"
 
 msgctxt "#31400"
 msgid "Change the skin · Set language and region · Change file listing options · Set up a screensaver"
 msgstr "スキン変更 · 言語と地域の設定 · ファイルリストオプション · スクリーンセーバー設定"
 
+msgctxt "#31405"
+msgid "Configure & manage media sharing services · Configure & manage the weather service"
+msgstr "設定 & メディア共有サービス · 設定 & 天気予報サービス"
+
+msgctxt "#31406"
+msgid "Configure display · Configure audio · Configure internet access · Configure power saving· Configure logging"
+msgstr "設定の表示 · オーディオの設定 · インターネット アクセスの設定 · 省電力の設定· ログの設定"
+
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "インストールしたアドオンの管理 · kodi.tvからインストールしたアドオンの閲覧 · アドオンの変更と設定"
+
+msgctxt "#31408"
+msgid "Configure actions that can be used during playback · Configure how media content is played"
+msgstr "再生中に使用できるアクションを設定する · メディアコンテンツの再生方法を設定"
+
+msgctxt "#31409"
+msgid "Configure library sources · Show the media lists display content · Configure how library lists are navigated"
+msgstr "ライブラリソースの設定 · メディアリストの表示内容の表示 · ライブラリリストの移動方法の設定"
+
+msgctxt "#31410"
+msgid "Configure skin · Configure region · Configure control · Configure screensaver · Configure master lock"
+msgstr "設定 スキン · 設定 地域 · 設定 コントロール · 設定 スクリーンセーバー · 設定 マスターロック"
+
+msgctxt "#31411"
+msgid "Configure your profiles · Set locking options · Enable login screen"
+msgstr "設定 あなたのプロファイル · セット ロックオプション · 有効 ログインスクリーン"
+
+msgctxt "#31412"
+msgid "Display system information · Hardware statistics · Check storage availability · View network configuration"
+msgstr "システム情報を表示 · ハードウェアの使用量 · ストレージの利用可能量 · ネットワークの設定を表示"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Kodi ユーザープロファイルを選択して[CR]ログインしてください"
+msgstr "Kodiユーザープロファイルを選択して[CR]ログインしてください"
+
+msgctxt "#31548"
+msgid "Home menu"
+msgstr "ホームメニュー"
+
+msgctxt "#31549"
+msgid "Home Add-ons"
+msgstr "ホームアドオン"
 
 msgctxt "#31550"
 msgid "Backgrounds"
@@ -176,22 +260,78 @@
 msgid "Add-on Shortcut"
 msgstr "アドオンショートカット"
 
+msgctxt "#31552"
+msgid "SYNC"
+msgstr "同期"
+
+msgctxt "#31553"
+msgid "Use Custom Background"
+msgstr "カスタムバックグラウンドを使用"
+
+msgctxt "#31554"
+msgid "Background:"
+msgstr "背景:"
+
+msgctxt "#31555"
+msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
+msgstr "設定 TV設定 · 変更 全画面時の詳細 · 管理 EPG データ設定"
+
 msgctxt "#31556"
 msgid "Live TV"
 msgstr "ライブTV"
 
+msgctxt "#31557"
+msgid "Hide video background"
+msgstr "背景のビデオを隠す"
+
+msgctxt "#31558"
+msgid "Hide visualization background"
+msgstr "背景のビジュアライザを隠す"
+
+msgctxt "#31559"
+msgid "Channel settings"
+msgstr "チャンネルの設定"
+
 msgctxt "#31560"
 msgid "Available groups"
 msgstr "利用可能なグループ"
 
 msgctxt "#31561"
 msgid "Add Group"
-msgstr "グループの追加"
+msgstr "グループ追加"
 
 msgctxt "#31562"
 msgid "Rename Group"
-msgstr "グループの名称変更"
+msgstr "グループ名称変更"
 
 msgctxt "#31563"
 msgid "Delete Group"
-msgstr "グループの削除"
+msgstr "グループ削除"
+
+msgctxt "#31564"
+msgid "Show hidden"
+msgstr "表示しない"
+
+msgctxt "#31565"
+msgid "Show deleted"
+msgstr "表示を削除しました"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "初回起動時"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Estouchyの操作で2つ知っておくべきことがあります"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Kodiのロゴは 'ホーム' ボタンになっています。どんなときでもタッチすればホーム画面に戻れます。"
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "オーディオかビデオの再生中、トップ画面にアイテムのタイトルを表示します。タッチして全画面でビジュアライザやビオデ画面も。"
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "現在再生中のタイトル..."

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ko_kr/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.lt_lt/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.lv_lv/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.mk_mk/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.mn_mn/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ms_my/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.mt_mt/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.my_mm/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.nb_no/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.nl_nl/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.pl_pl/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.pt_br/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.pt_pt/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ro_ro/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ru_ru/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.sk_sk/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.sl_si/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.sq_al/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.sr_rs/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.sr_rs@latin/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.sv_se/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.szl/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.ta_in/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.tg_tj/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.th_th/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.tr_tr/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.uk_ua/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.vi_vn/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.zh_cn/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/language/resource.language.zh_tw/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/addon.xml Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estuary" version="2.0.22" name="Estuary" provider-name="phil65, Ichabod Fletchman">
+<addon id="skin.estuary" version="2.0.23" name="Estuary" provider-name="phil65, Ichabod Fletchman">
 	<requires>
 		<import addon="xbmc.gui" version="5.14.0"/>
 	</requires>
@@ -18,7 +18,7 @@
 		<summary lang="bg_BG">Estuary облик от phil65 и Piers. (стандартния облик на Kodi)</summary>
 		<summary lang="ca_ES">Aparença Estuary per phil65 i Piers. (aparença predeterminada de Kodi)</summary>
 		<summary lang="cs_CZ">Vzhled Estuary od autora phil65. (Výchozí vzhled Kodi)</summary>
-		<summary lang="da_DK">Estuary skin. Kodi's standard brugerflade lavet af phil65.</summary>
+		<summary lang="da_DK">Estuary skin af phil65 (Kodi's standard brugerflade).</summary>
 		<summary lang="de_DE">Estuary Skin von phil65 und Piers. (Kodi Standardskin)</summary>
 		<summary lang="el_GR">Το κέλυφος Estuary από τον phil65 και τον Pier. (προεπιλεγμένο κέλυφος του Kodi)</summary>
 		<summary lang="en_GB">Estuary skin by phil65. (Kodi's default skin)</summary>
@@ -38,7 +38,7 @@
 		<summary lang="hu_HU">Estuary felszín. Készítette phil65 és Piers. (Kodi alapértelmezett felszín)</summary>
 		<summary lang="is_IS">Estuary-skinnið eftir phil65. (sjálfgefið útlit Kodi)</summary>
 		<summary lang="it_IT">Skin Estuary da phil65 e Piers. (Skin predefinita di Kodi)</summary>
-		<summary lang="ja_JP">Estuary スキン by phil65 and Piers (Kodi デフォルトスキン)</summary>
+		<summary lang="ja_JP">Estuaryスキン by phil65 and Piers (Kodi デフォルトスキン)</summary>
 		<summary lang="ko_KR">phil65가 만든 Estuary 스킨. (Kodi 기본 스킨)</summary>
 		<summary lang="lt_LT">Estuary teminė išvaizda, kurią sukūrė phil65 ir Piers. (Numatytoji Kodi teminė išvaizda)</summary>
 		<summary lang="lv_LV">Estuary apvalks no phil65. (Kodi noklusējuma apvalks)</summary>
@@ -51,7 +51,7 @@
 		<summary lang="pt_PT">Visual Estuary de phil65 e Piers. (Visual por omissão do Kodi)</summary>
 		<summary lang="ro_RO">Tema Estuary de phil65. (Temă implicită pentru Kodi)</summary>
 		<summary lang="ru_RU">Обложка Estuary (стандартная обложка Kodi). Авторы: phil65 and Piers.</summary>
-		<summary lang="sk_SK">Vzhľad Estuary, vytvorili phil65 a Piers. (predvolený vzhľad pre Kodi)</summary>
+		<summary lang="sk_SK">Vzhľad Estuary, vytvorili phil65. (predvolený vzhľad pre Kodi)</summary>
 		<summary lang="sr_RS">Маска Estuary аутора phil65 и Piers. (Подразумевана Коди маска)</summary>
 		<summary lang="sr_RS@latin">Maska Estuary autora phil65 i Piers. (Podrazumevana Kodi maska)</summary>
 		<summary lang="sv_SE">Estuary, ett skal av phil65. (Kodi's standardskal)</summary>
@@ -84,7 +84,7 @@
 		<description lang="hu_HU">Az Estuary az alapértelmezett felszín a 17.0 és újabb Kodi kiadásokban.  Megpróbál könnyen kezelhető és használható lenni, az újonc Kodi felhasználóknak is.</description>
 		<description lang="is_IS">Estuary er sjálfgefið skinn fyrir Kodi 17.0 og nýrri. Með því á að vera auðvelt fyrir fyrsta-skiptis Kodi-notendur að skilja og nota viðmótið.</description>
 		<description lang="it_IT">Estuary è la skin predefinita di Kodi 17.0 e successivi. Cerca di essere facile da capire e usare per i nuovi utenti di Kodi.</description>
-		<description lang="ja_JP">Estuary は Kodi 17.0 およびそれ以上のバージョンで標準のスキンです。ユーザが初めて Kodi に触れる際にわかりやすく使えるようにしてあります。</description>
+		<description lang="ja_JP">EstuaryはKodi 17.0およびそれ以上のバージョンで標準のスキンです。ユーザーが初めてKodiに触れる際にわかりやすく使えるようにしてあります。</description>
 		<description lang="ko_KR">Estuary는 Kodi 17.0이상의 기본 스킨입니다. 처음 Kodi를 접하는 사용자가 쉽게 이해하고 사용할 수 있도록 만들었습니다.</description>
 		<description lang="lt_LT">Estuary yra numatytoji Kodi 17.0 ir aukštesnių versijų teminė išvaizda. Jos tikslas yra būti lengvai perprantama naujiems Kodi vartotojams.</description>
 		<description lang="ms_MY">Estuary ialah kulit lalai untuk Kodi 17.0 dan ke atas. Kulit yang mudah digunakan buat pengguna Kodi kali pertama untuk memahami dan menggunakannya.</description>
@@ -105,7 +105,7 @@
 		<description lang="uk_UA">Estuary є стандартною обкладинкою Kodi 17.0 і подальших версій. Її основна ідея — простота використання для нових користувачів Kodi.</description>
 		<description lang="zh_CN">Estuary 是 Kodi 17.0 的默认皮肤。它力求使首次使用 Kodi 的用户易于上手。</description>
 		<description lang="zh_TW">Estuary是Kodi 17.0開始搭載的預設佈景主題。主要在讓第一次使用 Kodi 的使用者可以簡單地上手。</description>
-		<disclaimer lang="af_ZA">Confluence is die bestek oortreksel vir Kodi, verwydering mag probleme veroorsaak</disclaimer>
+		<disclaimer lang="af_ZA">Estuary is die bestek oortreksel vir Kodi, verwydering mag probleme veroorsaak</disclaimer>
 		<disclaimer lang="bg_BG">Estuary е стандартният облик на Kodi. Премахването му може да предизвика проблеми</disclaimer>
 		<disclaimer lang="ca_ES">Estuary és l'aparença predeterminada de Kodi, si s'elimina pot causar problemes.</disclaimer>
 		<disclaimer lang="cs_CZ">Estuary je výchozí vzhled pro Kodi, jeho odebrání může způsobit problémy</disclaimer>
@@ -129,7 +129,7 @@
 		<disclaimer lang="hu_HU">Az Estuary az alapértelmezett Kodi felszín. Eltávolítása problémákat okozhat.</disclaimer>
 		<disclaimer lang="is_IS">Estuary er sjálfgefið skinn fyrir Kodi, ef það er fjarlægt gætu komið upp ýmis vandamál</disclaimer>
 		<disclaimer lang="it_IT">Estuary è la skin predefinita di Kodi, rimuoverla potrebbe causare problemi</disclaimer>
-		<disclaimer lang="ja_JP">Estuary は Kodi のデフォルトスキンですので、これを削除するとうまく動かなくなる可能性があります</disclaimer>
+		<disclaimer lang="ja_JP">EstuaryはKodiのデフォルトスキンなので、これを削除するとうまく動かなくなる可能性があります</disclaimer>
 		<disclaimer lang="ko_KR">Estuary는 Kodi의 기본스킨으로 제거시 문제가 생길 수 있습니다.</disclaimer>
 		<disclaimer lang="lt_LT">Estuary yra numatytoji Kodi teminė išvaizda, jos pašalinimas gali sukelti problemų</disclaimer>
 		<disclaimer lang="ms_MY">Estuary ialah kulit lalai Kodi, mengubahnya boleh menimbulkan isu.</disclaimer>

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.af_za/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Jou gradering"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Uitgebreide info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Bladsye"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Krag Opsies"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Totale tydsduur"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Fliek stelle"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Beskikbare groepe"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Soek lokprent"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Video kieslys"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Deursoek YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Deursoek TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Verwyder hierdie hoof kieslys item"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Selfde direkteur"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Wys beelde op kaart"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Druk op vir akteur info"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.be_by/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.bg_bg/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Моята оценка"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Разширена инф."
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Страници"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Захранване"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Общо времетраене"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Поредици"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Налични групи"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Търси трейлър"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Видео меню"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Търси в YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Търси в TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Премахни елемента от менюто"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Още от режисьора"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Показване на изображения на картата"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Натиснете [B]Нагоре[/B] за информация за актьора"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.ca_es/strings.po Changed

@@ -144,10 +144,6 @@
 msgid "Your rating"
 msgstr "La vostra valoració"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Info estesa"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pàgines"
@@ -260,6 +256,10 @@
 msgid "Power Options"
 msgstr "Opcions d'energia"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duració total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Col·leccions de pel·lícules"
@@ -288,10 +288,6 @@
 msgid "Available groups"
 msgstr "Grups disponibles"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Cerca el tràiler"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menú del vídeo"
@@ -372,10 +368,6 @@
 msgid "Search YouTube"
 msgstr "Cerca de YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Cerca de TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Suprimeix aquest element de menú principal"
@@ -408,10 +400,6 @@
 msgid "Same director"
 msgstr "Mateix director"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostra les imatges al mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Premeu amunt per a la informació de l'actor"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.cs_cz/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Vaše hodnocení"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Rozšířené informace"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Stránky"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Možnosti napájení"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Celková doba trvání"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Sbírky filmů"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Dostupné skupiny"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Vyhledat upoutávku"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Nabídka videa"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Vyhledat na YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Vyhledat na TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Odebrat tuto položku hlavní nabídky"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Stejný režisér"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Zobrazit obrázky na mapě"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Stiskněte nahoru pro zobrazení informací o herci"
@@ -526,7 +514,7 @@
 
 msgctxt "#31155"
 msgid "No bookmarks created yet."
-msgstr "Zatím nebyly vytvořeny žádné záložky"
+msgstr "Zatím nebyly vytvořeny žádné záložky."
 
 msgctxt "#31156"
 msgid "Choose background pattern"
@@ -542,7 +530,7 @@
 
 msgctxt "#31159"
 msgid "Artwork"
-msgstr "Umělecké dílo"
+msgstr "Obrázek"
 
 msgctxt "#31160"
 msgid "Show media flags"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.cy_gb/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.da_dk/strings.po Changed

@@ -18,7 +18,7 @@
 
 msgctxt "#31000"
 msgid "Now playing"
-msgstr "Spiller nu"
+msgstr "Afpiller nu"
 
 msgctxt "#31001"
 msgid "Search..."
@@ -26,7 +26,7 @@
 
 msgctxt "#31002"
 msgid "Show media fanart as background"
-msgstr "Vis mediefanart som baggrund"
+msgstr "Vis mediefankunst som baggrund"
 
 msgctxt "#31003"
 msgid "Cinema mode"
@@ -50,7 +50,7 @@
 
 msgctxt "#31008"
 msgid "Enable category widgets"
-msgstr "Aktiver kategorikontroller"
+msgstr "Aktiver kategoriernes widgets"
 
 msgctxt "#31009"
 msgid "Download icons"
@@ -74,15 +74,15 @@
 
 msgctxt "#31014"
 msgid "Unplayed albums"
-msgstr "Uafspillede album"
+msgstr "Uafspillede albums"
 
 msgctxt "#31015"
 msgid "Recent recordings"
-msgstr "Nylig optagelser"
+msgstr "Nylige optagelser"
 
 msgctxt "#31016"
 msgid "Recently played channels"
-msgstr "Nylig sete kanaler"
+msgstr "Nyligt afspillede kanaler"
 
 msgctxt "#31017"
 msgid "Rated"
@@ -90,7 +90,7 @@
 
 msgctxt "#31018"
 msgid "Recently played channels"
-msgstr "Nylig sete kanaler"
+msgstr "Nyligt afspillede kanaler"
 
 msgctxt "#31019"
 msgid "Forecast"
@@ -102,7 +102,7 @@
 
 msgctxt "#31021"
 msgid "Misc options"
-msgstr "Andre indstillinger"
+msgstr "Diverse indstillinger"
 
 msgctxt "#31022"
 msgid "Sort by"
@@ -114,7 +114,7 @@
 
 msgctxt "#31024"
 msgid "Choose rating to display for media items"
-msgstr "Vælg bedømmelse at vise for medieelementer"
+msgstr "Vælg bedømmelse der vises for medieelementer"
 
 msgctxt "#31025"
 msgid "No favourites found. You can add any item from media views to this list by using the context menu."
@@ -134,11 +134,11 @@
 
 msgctxt "#31030"
 msgid "System memory usage"
-msgstr "Hukommelsesforbrug"
+msgstr "System hukommelsesforbrug"
 
 msgctxt "#31031"
 msgid "Version info"
-msgstr "Version"
+msgstr "Versionsinformation"
 
 msgctxt "#31032"
 msgid "Order"
@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Din vurdering"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Udvidet info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Sider"
@@ -162,11 +158,11 @@
 
 msgctxt "#31038"
 msgid "Rewind"
-msgstr "Spol Tilbage"
+msgstr "Spol tilbage"
 
 msgctxt "#31039"
 msgid "Fast forward"
-msgstr "Spol Frem"
+msgstr "Spol frem"
 
 msgctxt "#31041"
 msgid "Camera manufacturer"
@@ -176,17 +172,21 @@
 msgid "Playlist options"
 msgstr "Playlisteindstillinger"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Indstil typen og tilføj regler for at oprette en smart playliste. Disse spillelister er dynamiske og inkluderer alle medieelementer fra din database, der gælder for dine valgte regler."
+
 msgctxt "#31044"
 msgid "Add group"
-msgstr "Tilføj Gruppe"
+msgstr "Tilføj gruppe"
 
 msgctxt "#31045"
 msgid "Rename group"
-msgstr "Omdøb Gruppe"
+msgstr "Omdøb gruppe"
 
 msgctxt "#31046"
 msgid "Delete group"
-msgstr "Slet Gruppe"
+msgstr "Slet gruppe"
 
 msgctxt "#31048"
 msgid "Available"
@@ -206,7 +206,7 @@
 
 msgctxt "#31054"
 msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
-msgstr "Tryk {B]Venstre[/B] for tilbagespoling, eller [B]Højre[/B] for at spole fremad"
+msgstr "Tryk [B]Venstre[/B] for tilbagespoling, eller [B]Højre[/B] for at spole fremad"
 
 msgctxt "#31056"
 msgid "Go to playlist"
@@ -222,11 +222,11 @@
 
 msgctxt "#31061"
 msgid "Main menu items"
-msgstr "Hovedmenu emner"
+msgstr "Hovedmenuens emner"
 
 msgctxt "#31062"
 msgid "Choose weather fanart pack"
-msgstr "Vælg vejr fanart pakke"
+msgstr "Vælg fankunst vejrpakke"
 
 msgctxt "#31063"
 msgid "Sections"
@@ -244,9 +244,13 @@
 msgid "Event log"
 msgstr "Hændelseslog"
 
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Vælg forudindstillinger"
+
 msgctxt "#31069"
 msgid "Last Updated"
-msgstr "Sidst Opdateret"
+msgstr "Sidst opdateret"
 
 msgctxt "#31071"
 msgid "by"
@@ -256,6 +260,10 @@
 msgid "Power Options"
 msgstr "Strømstyring"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Total varighed"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmsæt"
@@ -270,24 +278,20 @@
 
 msgctxt "#31082"
 msgid "Lyrics add-on"
-msgstr "Add-on til Sangtekster"
+msgstr "Add-on til sangtekster"
 
 msgctxt "#31083"
 msgid "Lyrics add-on settings"
-msgstr "Indstillinger for sangtekst"
+msgstr "Indstillinger for add-on til sangtekst"
 
 msgctxt "#31084"
 msgid "Visualisation settings"
-msgstr "Visualisering indstillinger"
+msgstr "Indstillinger for visualisering"
 
 msgctxt "#31089"
 msgid "Available groups"
 msgstr "Tilgængelig grupper"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Søg efter trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Videomenu"
@@ -334,19 +338,31 @@
 
 msgctxt "#31104"
 msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
-msgstr "Biblioteket er tomt. Tilføj medie i File sektionen, tilføj mediekilde og konfigurer den. Efter en kilde er tilføjet og indeksere kan indholdet ses i biblioteket."
+msgstr "Dit bibliotek er i øjeblikket tomt. For at benytte dine personlige medier skal du gå til filsektionen, tilføje en mediekilde og konfigurere den. Efter kilden er tilføjet og indekseret, kan indholdet ses i biblioteket."
 
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
-msgstr "Tilføj en videokilde med korrekt indhold for at se det i videobiblioteket."
+msgstr "Tilføj videokilder og indstil korrekt indholdstype for at se det i videobiblioteket."
 
 msgctxt "#31106"
 msgid "Teletext"
 msgstr "Tekst-tv"
 
+msgctxt "#31107"
+msgid "WideList"
+msgstr "BredListe"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Gå til filsektionen"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Se dine personlige billeder eller hent et af de mange billed-add-ons fra det officielle fjernlager."
+
 msgctxt "#31112"
 msgid "Toggle audio stream"
-msgstr "Lydspor"
+msgstr "Skift lydspor"
 
 msgctxt "#31113"
 msgid "Search local library"
@@ -356,17 +372,25 @@
 msgid "Search YouTube"
 msgstr "Søg på YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Søg på TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
-msgstr "Fjern dette menupunkt"
+msgstr "Fjern dette hovedmenupunkt"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Rediger noder"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Gå til add-on browseren"
 
 msgctxt "#31119"
 msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
-msgstr "Du har ikke add-ons installeret. Besøg add-on for se gennemse mulighederne for at forbedre din Kodi oplevelse."
+msgstr "Du har ikke installeret nogen add-ons endnu. Besøg vores add-on browser for at gennemse vores samling og forbedre din Kodi-oplevelse."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Du har ikke valgt en vejrudbyder endnu. For at se vejrinformation skal du vælge en vejrudbyder og indstille din placering."
 
 msgctxt "#31121"
 msgid "Set weather provider"
@@ -374,16 +398,12 @@
 
 msgctxt "#31122"
 msgid "Unwatched TV Shows"
-msgstr "Usete TV-shows"
+msgstr "Usete tv-serier"
 
 msgctxt "#31123"
 msgid "Same director"
 msgstr "Samme instruktør"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Vis billeder på kort"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Tryk op for skuespillerinformationer"
@@ -402,11 +422,15 @@
 
 msgctxt "#31129"
 msgid "General settings applying to all areas of the skin."
-msgstr "Generelle indstillinger, som påvirker alle områder af skinnet."
+msgstr "Generelle indstillinger, der gælder alle områder af skinnet."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Indstillinger for hovedmenuen: konfigurer hovedskærmen efter din egen smag."
 
 msgctxt "#31131"
 msgid "Choose skin fanart pack"
-msgstr "Vælg skin fanart pakke"
+msgstr "Vælg fankunst-pakke til skinnet"
 
 msgctxt "#31132"
 msgid "Select Program"
@@ -448,9 +472,17 @@
 msgid "Play speed"
 msgstr "Afspilningshastighed"
 
+msgctxt "#31143"
+msgid "You did not set up PVR yet. In order to use PVR, choose a PVR client addon and configure it. Please visit http://kodi.wiki/view/PVR to learn more."
+msgstr "Du har endnu ikke konfigureret PVR. For at benytte PVR skal du vælge et PVR-add-on og indstille det. Besøg venligst http://kodi.wiki/view/PVR for at lære mere."
+
+msgctxt "#31144"
+msgid "Enter add-on browser"
+msgstr "Gå til add-on browseren"
+
 msgctxt "#31145"
 msgid "Search add-ons"
-msgstr "Søg efter Add-ons"
+msgstr "Søg efter add-ons"
 
 msgctxt "#31148"
 msgid "Categories"
@@ -470,7 +502,11 @@
 
 msgctxt "#31152"
 msgid "Random music videos"
-msgstr "Tilfældig musikvideo"
+msgstr "Tilfældige musikvideoer"
+
+msgctxt "#31153"
+msgid "You do not have any add-ons of this type installed. Enter the add-on browser to download add-ons created by our community."
+msgstr "Du har ikke installeret nogen add-ons af denne type. Gå til add-on-browseren for at downloade add-ons skabt af vores community."
 
 msgctxt "#31154"
 msgid "Press OK to switch between locations"
@@ -478,11 +514,11 @@
 
 msgctxt "#31155"
 msgid "No bookmarks created yet."
-msgstr "Ingen bogmærker oprettet endnu"
+msgstr "Ingen bogmærker oprettet endnu."
 
 msgctxt "#31156"
 msgid "Choose background pattern"
-msgstr "Vælg baggrunds mønster"
+msgstr "Vælg baggrundsmønster"
 
 msgctxt "#31157"
 msgid "Edit categories"
@@ -502,11 +538,19 @@
 
 msgctxt "#31161"
 msgid "Numeric pad"
-msgstr "Numerisk tastetur"
+msgstr "Numerisk tastatur"
+
+msgctxt "#31162"
+msgid "Play your personal games or download one of the many game add-ons from the official repository."
+msgstr "Spil dine personlige spil eller hent et af de mange spil add-ons fra det officielle fjernlager."
 
 msgctxt "#31163"
 msgid "Show Fanart background"
-msgstr "Vis fanart baggrund"
+msgstr "Vis fankunst baggrund"
+
+msgctxt "#31164"
+msgid "Choose kind of profile identification"
+msgstr "Vælg typen af profilidentifikation"
 
 msgctxt "#31165"
 msgid "Profile name"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.de_de/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Persönliche Bewertung"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Erweiterte Infos"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Seiten"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Ausschalten"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Gesamtdauer"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmkollektionen"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Verfügbare Gruppen"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Trailer suchen"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Videomenü"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "YouTube durchsuchen"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "TheMovieDB durchsuchen"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Diesen Hauptmenüeintrag entfernen"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Filme dieses Regisseurs"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Bilder auf Karte zeigen"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "[B]Hoch[/B] für Schauspieler-Infos drücken"
@@ -454,7 +442,7 @@
 
 msgctxt "#31134"
 msgid "Remaining"
-msgstr "Verbleibend"
+msgstr "Restzeit"
 
 msgctxt "#31136"
 msgid "Click here to see latest changes..."
@@ -571,3 +559,7 @@
 msgctxt "#31166"
 msgid "Profile avatar"
 msgstr "Profil-Avatar"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "Hintergrund animieren"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.el_gr/strings.po Changed

@@ -140,10 +140,6 @@
 msgid "Your rating"
 msgstr "Αξιολόγηση"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Εκτεταμένες πληροφορίες"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Σελίδες"
@@ -256,6 +252,10 @@
 msgid "Power Options"
 msgstr "Επιλογές Ενέργειας"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Συνολική διάρκεια"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Ομάδες ταινιών"
@@ -284,10 +284,6 @@
 msgid "Available groups"
 msgstr "Διαθέσιμες ομάδες"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Αναζήτηση τρέιλερ"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Μενού βίντεο"
@@ -364,10 +360,6 @@
 msgid "Search YouTube"
 msgstr "Αναζήτηση στο Youtube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Αναζήτηση στο TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Αφαίρεση αυτού του αντικειμένου"
@@ -400,10 +392,6 @@
 msgid "Same director"
 msgstr "Ίδιος σκηνοθέτης"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Προβολή εικόνων στο χάρτη"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Πατήστε το Επάνω βέλος για πληροφορίες ηθοποιού"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.en_gb/strings.po Changed

@@ -186,10 +186,7 @@
 msgid "Your rating"
 msgstr ""
 
-#: /xml/DialogVideoInfo.xml
-msgctxt "#31034"
-msgid "Extended info"
-msgstr ""
+#empty string with id 31034
 
 #: /xml/DialogPVRChannelManager.xml /xml/DialogPVRChannelsOSD.xml /xml/DialogPVRGuideOSD.xml /xml/Variables.xml /xml/FileBrowser.xml
 msgctxt "#31035"
@@ -201,7 +198,10 @@
 msgid "items"
 msgstr ""
 
-#empty string with id 31037
+#: /xml/Includes.xml
+msgctxt "#31037"
+msgid "Selected track"
+msgstr ""
 
 #: /xml/Variables.xml
 msgctxt "#31038"
@@ -349,7 +349,15 @@
 msgid "Power Options"
 msgstr ""
 
-#empty strings from id 31073 to 31074
+#: /xml/MyPlaylist.xml
+msgctxt "#31073"
+msgid "Total length"
+msgstr ""
+
+#: /xml/MyPlaylist.xml
+msgctxt "#31074"
+msgid "Total duration"
+msgstr ""
 
 #: /xml/Home.xml
 msgctxt "#31075"
@@ -392,12 +400,7 @@
 msgid "Available groups"
 msgstr ""
 
-#: /xml/DialogVideoInfo.xml
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr ""
-
-#empty string with id 31091
+#empty strings from id 31090 to 31091
 
 #: /xml/VideoOSD.xml /xml/Variables.xml
 msgctxt "#31092"
@@ -503,15 +506,12 @@
 msgid "Search local library"
 msgstr ""
 
-#: /xml/Custom_1107_SearchDialog.xml /xml/DialogMusicInfo.xml
+#: /xml/Custom_1107_SearchDialog.xml
 msgctxt "#31114"
 msgid "Search YouTube"
 msgstr ""
 
-#: /xml/Custom_1107_SearchDialog.xml
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr ""
+#empty string with id 31115
 
 #: /xml/Includes_Home.xml
 msgctxt "#31116"
@@ -553,10 +553,7 @@
 msgid "Same director"
 msgstr ""
 
-#: /xml/MyPics.xml
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr ""
+#empty string with id 31124
 
 #: /xml/DialogVideoInfo.xml
 msgctxt "#31125"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.en_nz/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Your rating"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Extended info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pages"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Power Options"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Total duration"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Movie sets"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Available groups"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Search trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Video menu"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Search YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Search TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Remove this main menu item"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Same director"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Show images on map"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Press up for actor info"
@@ -444,6 +432,14 @@
 msgid "Choose skin fanart pack"
 msgstr "Choose skin fanart pack"
 
+msgctxt "#31132"
+msgid "Select Program"
+msgstr "Select Program"
+
+msgctxt "#31133"
+msgid "Select Resolution"
+msgstr "Select Resolution"
+
 msgctxt "#31134"
 msgid "Remaining"
 msgstr "Remaining"
@@ -552,6 +548,18 @@
 msgid "Show Fanart background"
 msgstr "Show Fanart background"
 
+msgctxt "#31164"
+msgid "Choose kind of profile identification"
+msgstr "Choose kind of profile identification"
+
 msgctxt "#31165"
 msgid "Profile name"
 msgstr "Profile name"
+
+msgctxt "#31166"
+msgid "Profile avatar"
+msgstr "Profile avatar"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "Animate background"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.en_us/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.es_ar/strings.po Changed

@@ -140,10 +140,6 @@
 msgid "Your rating"
 msgstr "Su valoración"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Información extendida"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Páginas"
@@ -256,6 +252,10 @@
 msgid "Power Options"
 msgstr "Opciones de energía"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duración total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "'Sets' de películas"
@@ -284,10 +284,6 @@
 msgid "Available groups"
 msgstr "Grupos disponibles"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Buscar trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menú de Video"
@@ -368,10 +364,6 @@
 msgid "Search YouTube"
 msgstr "Buscar en YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Buscar en TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Eliminar este elemento del menú principal"
@@ -404,10 +396,6 @@
 msgid "Same director"
 msgstr "Mismo director"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostrar imágenes en mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Pulse 'arriba' para ver información del actor"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.es_es/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Su puntuación"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Información extendida"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Páginas"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opciones de energía"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duración total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Sagas de películas"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Grupos disponibles"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Buscar trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menú de video"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Buscar en YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Buscar en TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Eliminar este elemento del menú principal"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Mismo director"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostrar imágenes en un mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Pulse Arriba para ver información del actor"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.es_mx/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Tu votación"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Información extendida"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Páginas"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opciones de Energía"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duración total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "conjunto de películas"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Grupos disponibles"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Buscar tráiler"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menú de vídeo"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Buscar en YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Buscar en TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Eliminar este elemento del menú principal"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Mismo director"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostrar imágenes en el mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Presione para arriba para información del actor"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.et_ee/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.eu_es/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Zure balorazioa"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Informazio zabaldua"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Orriak"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Energia-aukerak"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Iraupen osoa"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Pelikula sortak"
@@ -274,7 +274,7 @@
 
 msgctxt "#31080"
 msgid "Ends at"
-msgstr "Amaiera ordua:"
+msgstr "Amaiera ordua"
 
 msgctxt "#31082"
 msgid "Lyrics add-on"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Eskuragarri dauden taldeak"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Bilatu trailerra"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Bideoaren menua"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Bilatu YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Bilatu TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Kendu menu nagusiko elementu hau"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Zuzendari bera"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Erakutsi irudiak mapan"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Sakatu gora aktorearen informazioa ikusteko"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.fa_ir/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.fi_fi/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Oma arvosana"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Lisätiedot"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Sivut"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Virta-asetukset"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Kokonaiskesto"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Elokuvaryhmät"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Kanavaryhmät"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Etsi traileria"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Elokuvavalikko"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Etsi YouTubesta"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Etsi TheMovieDB:stä"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Poista tämä kohde päävalikosta"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Ohjaajahaku"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Näytä kuvat kartalla"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Näyttelijätiedot (Paina YLÖS)"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.fr_ca/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Votre évaluation"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Informations complémentaires"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pages"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Options de fermeture"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Durée totale"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Sagas"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Groupes proposés"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Chercher la bande-annonce"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menu vidéo"
@@ -342,7 +338,7 @@
 
 msgctxt "#31104"
 msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
-msgstr "Votre médiathèque est actuellement vide. Afin de la remplir avec vos médias personnels, allez à la section « Fichiers », ajoutez une source de médias et configurez-la. Une fois que la source aura été ajoutée et indexée, vous pourrez parcourir votre médiathèque."
+msgstr "Votre médiathèque est actuellement vide. Afin de la remplir avec vos médias personnels, allez à la section «  Fichiers », ajoutez une source de médias et configurez-la. Une fois que la source aura été ajoutée et indexée, vous pourrez parcourir votre médiathèque."
 
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Rechercher sur YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Rechercher sur TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Retirer cet élément du menu principal"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Même réalisateur"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Afficher les images sur la carte"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Peser sur haut pour les informations sur les acteurs"
@@ -438,7 +426,7 @@
 
 msgctxt "#31130"
 msgid "Main menu-related settings: Configure the home screen to your likings."
-msgstr "Paramètres concernant le menu principal : configurez l’écran d’accueil selon vos goûts."
+msgstr "Paramètres concernant le menu principal : configurez l’écran d’accueil selon vos goûts."
 
 msgctxt "#31131"
 msgid "Choose skin fanart pack"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.fr_fr/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Ma notation"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Infos étendues"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pages"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Options d'alimentation"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Durée totale"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Sagas"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Groupes disponibles"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Rechercher une bande-annonce"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menu vidéo"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Rechercher sur YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Rechercher sur TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Retirer cet élément du menu principal"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Même réalisateur"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Afficher les images sur la carte"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Appuyer pour les infos d'acteur"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.gl_es/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "A túa valoración"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Información extendida"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Páxinas"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opcións de enerxía"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duración total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Conxuntos de filmes"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Grupos dispoñíbeis"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Buscar tráiler"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menú de vídeo"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Buscar no YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Buscar en TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Eliminar este elemento do menú principal"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "O mesmo director"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Amosar as imaxes no mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Premer arriba para info. do actor"
@@ -448,6 +436,10 @@
 msgid "Select Program"
 msgstr "Seleccionar programa"
 
+msgctxt "#31133"
+msgid "Select Resolution"
+msgstr "Seleccionar resolución"
+
 msgctxt "#31134"
 msgid "Remaining"
 msgstr "Restante"
@@ -556,6 +548,18 @@
 msgid "Show Fanart background"
 msgstr "Amosar Fanart como fondo"
 
+msgctxt "#31164"
+msgid "Choose kind of profile identification"
+msgstr "Seleccionar o tipo de identificación do perfil"
+
 msgctxt "#31165"
 msgid "Profile name"
 msgstr "Nome do perfíl"
+
+msgctxt "#31166"
+msgid "Profile avatar"
+msgstr "Avatar do perfil"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "Animar o fondo"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.he_il/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "הדירוג שלך"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "מידע מורחב"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "‎דפים"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "אפשרויות כיבוי"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "אורך כולל"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "מארז סרטים"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "קבוצות זמינות"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "חפש קדימון"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "תפריט ווידאו"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "חפש ביו-טיוב"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "חיפוש ב-TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "מחק את פריט התפריט הראשי הזה"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "אותו במאי"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "הראה תמונות על מפה"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "לחץ על למעלה לקבלת מידע על השחקן"
@@ -448,6 +436,10 @@
 msgid "Select Program"
 msgstr "בחר תוכנית"
 
+msgctxt "#31133"
+msgid "Select Resolution"
+msgstr "בחירת רזולוציה"
+
 msgctxt "#31134"
 msgid "Remaining"
 msgstr "נותר"
@@ -556,6 +548,18 @@
 msgid "Show Fanart background"
 msgstr "הצג רקע פאנארט"
 
+msgctxt "#31164"
+msgid "Choose kind of profile identification"
+msgstr "לבחור סוג של זיהוי פרופיל"
+
 msgctxt "#31165"
 msgid "Profile name"
 msgstr "שם משתמש"
+
+msgctxt "#31166"
+msgid "Profile avatar"
+msgstr "דמות מייצגת לפרופיל"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "הנפשת הרקע"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.hr_hr/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Vaša ocjena"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Proširene informacije"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Stranice"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Mogućnosti energije"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Ukupno trajanje"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmske kolekcije"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Dostupne grupe"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Pretraži najave"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Video izbornik"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Pretraži YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Pretraži TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Ukloni ovu stavku glavnog izbornika"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Isti redatelj"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Prikaži slike na karti"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Pritisni gornju strelicu za informacije o glumcu"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.hu_hu/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Értékelés"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Bővített információ"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Oldalak"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Kikapcsolási lehetőségek"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Teljes időtartam"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Film gyűjtemények"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Elérhető csoportok"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Filmajánló keresése"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Videó menü"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "YouTube keresés"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr " TheMovieDB keresés"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Főmenü elem eltávolítása"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Egyazon rendező"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Képek megjelenítése a térképen"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Nyomja meg a fel gombot a színész információkhoz"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.id_id/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.is_is/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Einkunnin þín"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Ítarlegar upplýsingar"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Síður"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Valkostir orkustýringar"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Heildar tímalengd"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Kvikmyndasett"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Tiltækir hópar"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Leita að stiklu"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Myndefnisvalmynd"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Leita á YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Leita á TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Fjarlægja þetta atriði úr aðalvalmynd"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Sami Lleikstjóri"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Birta myndir á landakorti"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Ýttu á upp fyrir upplýsingar um leikara"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.it_it/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Tuo voto"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Info estese"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pagine"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opzioni Alimentazione"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Durata totale"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Raccolte di Film"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Gruppi disponibili"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Cerca trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menù Video"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Cerca su Youtube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Cerca su TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Rimuovi questo elemento menù principale"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Stesso regista"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostra immagini sulla mappa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Premi Su per info attore"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.ja_jp/strings.po Changed

@@ -34,27 +34,31 @@
 
 msgctxt "#31004"
 msgid "Change mode"
-msgstr "モードを変更"
+msgstr "モード変更"
 
 msgctxt "#31005"
 msgid "Watch as 2D"
-msgstr "2D で観る"
+msgstr "2Dで観る"
 
 msgctxt "#31006"
 msgid "Random movies"
-msgstr "ランダムの映画"
+msgstr "ランダムムービー"
 
 msgctxt "#31007"
 msgid "Unwatched movies"
 msgstr "未視聴の映画"
 
+msgctxt "#31008"
+msgid "Enable category widgets"
+msgstr "カテゴリーウィジェット有効"
+
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "ダウンロードアイコン"
 
 msgctxt "#31010"
 msgid "In progress movies"
-msgstr "進行中の映画"
+msgstr "進行中のムービー"
 
 msgctxt "#31011"
 msgid "Most played albums"
@@ -70,7 +74,7 @@
 
 msgctxt "#31014"
 msgid "Unplayed albums"
-msgstr "未再生アルバム"
+msgstr "再生していないアルバム"
 
 msgctxt "#31015"
 msgid "Recent recordings"
@@ -108,10 +112,18 @@
 msgid "Viewtype"
 msgstr "表示タイプ"
 
+msgctxt "#31024"
+msgid "Choose rating to display for media items"
+msgstr "メディアアイテムへ表示する評価を選択"
+
 msgctxt "#31025"
 msgid "No favourites found. You can add any item from media views to this list by using the context menu."
 msgstr "お気に入りは見つかりませんでした。メディアビューでコンテキストメニューを使用してこのリストにアイテムを追加できます。"
 
+msgctxt "#31026"
+msgid "Timeshift"
+msgstr "タイムシフト"
+
 msgctxt "#31028"
 msgid "Show fanart"
 msgstr "ファンアートを見る"
@@ -120,6 +132,10 @@
 msgid "Last logged in"
 msgstr "最終ログイン"
 
+msgctxt "#31030"
+msgid "System memory usage"
+msgstr "システムメモリ使用量"
+
 msgctxt "#31031"
 msgid "Version info"
 msgstr "バージョン情報"
@@ -132,10 +148,6 @@
 msgid "Your rating"
 msgstr "評価"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "メディア情報"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "ページ"
@@ -154,7 +166,7 @@
 
 msgctxt "#31041"
 msgid "Camera manufacturer"
-msgstr "カメラのメーカー"
+msgstr "カメラメーカー"
 
 msgctxt "#31042"
 msgid "Playlist options"
@@ -166,7 +178,7 @@
 
 msgctxt "#31044"
 msgid "Add group"
-msgstr "グループの追加"
+msgstr "グループ追加"
 
 msgctxt "#31045"
 msgid "Rename group"
@@ -174,7 +186,7 @@
 
 msgctxt "#31046"
 msgid "Delete group"
-msgstr "グループの削除"
+msgstr "グループ削除"
 
 msgctxt "#31048"
 msgid "Available"
@@ -186,15 +198,15 @@
 
 msgctxt "#31052"
 msgid "filtered"
-msgstr "フィルタ済"
+msgstr "フィルター済み"
 
 msgctxt "#31053"
 msgid "Arial based"
-msgstr "Arial ベース"
+msgstr "Arialベース"
 
 msgctxt "#31054"
 msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
-msgstr "[B]左[/B]を押して早戻し、または[B]右[/B]で早送り"
+msgstr "[B]左[/B]を押して巻き戻し、または[B]右[/B]で早送り"
 
 msgctxt "#31056"
 msgid "Go to playlist"
@@ -212,6 +224,10 @@
 msgid "Main menu items"
 msgstr "メインメニューアイテム"
 
+msgctxt "#31062"
+msgid "Choose weather fanart pack"
+msgstr "天気のファンアートパック選択"
+
 msgctxt "#31063"
 msgid "Sections"
 msgstr "セクション"
@@ -230,7 +246,7 @@
 
 msgctxt "#31068"
 msgid "Choose presets"
-msgstr "プリセットを選択"
+msgstr "プリセット選択"
 
 msgctxt "#31069"
 msgid "Last Updated"
@@ -244,6 +260,10 @@
 msgid "Power Options"
 msgstr "電源オプション"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "総時間"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "ムービーセット"
@@ -266,16 +286,12 @@
 
 msgctxt "#31084"
 msgid "Visualisation settings"
-msgstr "ビジュアライザー設定"
+msgstr "ビジュアライザ設定"
 
 msgctxt "#31089"
 msgid "Available groups"
 msgstr "利用可能なグループ"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "予告編を検索"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "ビデオメニュー"
@@ -286,11 +302,11 @@
 
 msgctxt "#31095"
 msgid "Use slide animations"
-msgstr "スライドアニメーションを使用"
+msgstr "スライドアニメーション使用"
 
 msgctxt "#31096"
 msgid "Local subtitle available"
-msgstr "ローカルの字幕を利用できます"
+msgstr "ローカルの字幕が利用可能"
 
 msgctxt "#31097"
 msgid "Channel options"
@@ -298,11 +314,15 @@
 
 msgctxt "#31098"
 msgid "Select your Kodi user profile[CR]to login and continue"
-msgstr "Kodi ユーザープロファイルを選択して[CR]ログインしてください"
+msgstr "Kodiユーザープロファイルを選択して[CR]ログインしてください"
+
+msgctxt "#31099"
+msgid "IconWall"
+msgstr "アイコン壁紙"
 
 msgctxt "#31100"
 msgid "Shift"
-msgstr "Shift"
+msgstr "シフト"
 
 msgctxt "#31101"
 msgid "InfoWall"
@@ -314,7 +334,7 @@
 
 msgctxt "#31103"
 msgid "Enter text here..."
-msgstr "テキストを入力..."
+msgstr "テキスト入力..."
 
 msgctxt "#31104"
 msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
@@ -338,11 +358,11 @@
 
 msgctxt "#31111"
 msgid "View your personal pictures or download one of the many image add-ons from the official repository."
-msgstr "個人的な写真を表示またはオフィシャルリポジトリから画像アドオンをダウンロードする。"
+msgstr "個人的な写真を表示またはオフィシャルリポジトリから画像アドオンをダウンロード。"
 
 msgctxt "#31112"
 msgid "Toggle audio stream"
-msgstr "オーディオストリーム切替"
+msgstr "オーディオストリームをトグル"
 
 msgctxt "#31113"
 msgid "Search local library"
@@ -350,11 +370,7 @@
 
 msgctxt "#31114"
 msgid "Search YouTube"
-msgstr "YouTubeを検索"
-
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "TheMovieDBを検索"
+msgstr "YouTube検索"
 
 msgctxt "#31116"
 msgid "Remove this main menu item"
@@ -362,7 +378,7 @@
 
 msgctxt "#31117"
 msgid "Edit nodes"
-msgstr "ノードを編集"
+msgstr "ノード編集"
 
 msgctxt "#31118"
 msgid "Enter add-on browser"
@@ -388,10 +404,6 @@
 msgid "Same director"
 msgstr "同じ監督"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "地図上の画像を表示"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "上を押して出演者情報"
@@ -402,7 +414,7 @@
 
 msgctxt "#31127"
 msgid "Show icons"
-msgstr "アイコンを表示"
+msgstr "アイコン表示"
 
 msgctxt "#31128"
 msgid "Contributors"
@@ -410,20 +422,144 @@
 
 msgctxt "#31129"
 msgid "General settings applying to all areas of the skin."
-msgstr "このスキンのすべてのエリアに一般設定を適用する"
+msgstr "このスキンのすべての範囲に一般設定を適用する。"
 
 msgctxt "#31130"
 msgid "Main menu-related settings: Configure the home screen to your likings."
-msgstr "メインメニュー関連設定: 好きなようにホームスクリーンを設定できます。"
+msgstr "メインメニュー関連設定: 好きなようにホーム画面を設定できます。"
+
+msgctxt "#31131"
+msgid "Choose skin fanart pack"
+msgstr "スキンのファンアートパック選択"
+
+msgctxt "#31132"
+msgid "Select Program"
+msgstr "プログラム選択"
+
+msgctxt "#31133"
+msgid "Select Resolution"
+msgstr "解像度選択"
 
 msgctxt "#31134"
 msgid "Remaining"
 msgstr "残り"
 
+msgctxt "#31136"
+msgid "Click here to see latest changes..."
+msgstr "ここをクリックして最近の変更を見る..."
+
+msgctxt "#31137"
+msgid "PVR info"
+msgstr "PVR詳細"
+
+msgctxt "#31138"
+msgid "Player process info"
+msgstr "プレイヤーのプロセス詳細"
+
+msgctxt "#31139"
+msgid "Video decoder"
+msgstr "ビデオデコーダー"
+
+msgctxt "#31140"
+msgid "Pixel format"
+msgstr "ピクセル形式"
+
+msgctxt "#31141"
+msgid "Changes for version"
+msgstr "バージョン変更"
+
+msgctxt "#31142"
+msgid "Play speed"
+msgstr "再生速度"
+
+msgctxt "#31143"
+msgid "You did not set up PVR yet. In order to use PVR, choose a PVR client addon and configure it. Please visit http://kodi.wiki/view/PVR to learn more."
+msgstr "まだPVRを設定していません。PVRを使用するには、PVRクライアントアドオンを選択して設定します。詳細については、http://kodi.wiki/view/PVR をご覧ください。"
+
 msgctxt "#31144"
 msgid "Enter add-on browser"
 msgstr "アドオンブラウザー"
 
+msgctxt "#31145"
+msgid "Search add-ons"
+msgstr "アドオン選択"
+
+msgctxt "#31148"
+msgid "Categories"
+msgstr "カテゴリー"
+
+msgctxt "#31149"
+msgid "Select genre fanart pack"
+msgstr "ジャンルのファンアートパック選択"
+
+msgctxt "#31150"
+msgid "Repository"
+msgstr "リポジトリ"
+
+msgctxt "#31151"
+msgid "Unwatched music videos"
+msgstr "未視聴なミュージックビデオ"
+
+msgctxt "#31152"
+msgid "Random music videos"
+msgstr "ランダムミュージックビデオ"
+
+msgctxt "#31153"
+msgid "You do not have any add-ons of this type installed. Enter the add-on browser to download add-ons created by our community."
+msgstr "この種類のアドオンはインストールされていません。アドオンブラウザを使用して、私たちのコミュニティによって作成されたアドオンをダウンロードしてください。"
+
+msgctxt "#31154"
+msgid "Press OK to switch between locations"
+msgstr "OKを押して場所を切り替える"
+
+msgctxt "#31155"
+msgid "No bookmarks created yet."
+msgstr "ブックマークをまだ作成していません。"
+
+msgctxt "#31156"
+msgid "Choose background pattern"
+msgstr "背景のパターン選択"
+
+msgctxt "#31157"
+msgid "Edit categories"
+msgstr "カテゴリー編集"
+
+msgctxt "#31158"
+msgid "Touch mode"
+msgstr "タッチモード"
+
+msgctxt "#31159"
+msgid "Artwork"
+msgstr "アートワーク"
+
+msgctxt "#31160"
+msgid "Show media flags"
+msgstr "メディアのフラグを表示"
+
+msgctxt "#31161"
+msgid "Numeric pad"
+msgstr "テンキー"
+
+msgctxt "#31162"
+msgid "Play your personal games or download one of the many game add-ons from the official repository."
+msgstr "ゲームで遊ぶ、[CR]もしくは公式レポジトリからたくさんあるゲームのアドオンをダウンロードしてみる。"
+
+msgctxt "#31163"
+msgid "Show Fanart background"
+msgstr "背景にファンアートを表示"
+
+msgctxt "#31164"
+msgid "Choose kind of profile identification"
+msgstr "プロファイルの確認と種類を選択"
+
 msgctxt "#31165"
 msgid "Profile name"
 msgstr "プロファイル名"
+
+msgctxt "#31166"
+msgid "Profile avatar"
+msgstr "プロファイルアバター"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "アニメーション背景"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.ko_kr/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "내 평점"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Extended info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "페이지"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "전원 옵션"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "총 재생시간"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "시리즈 영화"
@@ -274,7 +274,7 @@
 
 msgctxt "#31080"
 msgid "Ends at"
-msgstr "종료:"
+msgstr "종료"
 
 msgctxt "#31082"
 msgid "Lyrics add-on"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "사용 가능한 그룹"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "예고편 찾기"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "비디오 메뉴"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "YouTube 찾기"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "TheMovieDB 찾기"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "이 메인 메뉴 항목 삭제"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "같은 감독"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "지도에 이미지 표시"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "배우 정보를 보려면 UP을(를) 누르세요"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.lt_lt/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Jūsų reitingas"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Išplėstinė informacija"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Puslapis"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Maitinimo parinktys"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Bendra trukmė"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmų rinkiniai"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Galimos grupės"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Ieškoti anonso"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Vaizdo meniu"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Ieškoti YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Ieškoti TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Pašalinti šį pagrindinio meniu elementą"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Tas pats režisierius"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Rodyti atvaizdus žemėlapyje"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Paspauskite aukštyn norėdami atidaryti aktoriaus informaciją"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.lv_lv/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.mk_mk/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.ms_my/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Penarafan anda"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Maklumat lanjut"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Halaman"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opsyen Kuasa"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Tempoh keseluruhan"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Set cereka"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Kumpulan tersedia"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Gelintar treler"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menu video"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Gelintar YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Gelintar TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Buang item menu utama ini"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Pengarah yang sama"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Tunjuk imej pada peta"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Tekan ke atas untuk maklumat pelakon"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.mt_mt/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.nb_no/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Din rangering"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Utvidet informasjon"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Sider"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Strømalternativer"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Total varighet"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmsamlinger"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Tilgjengelige grupper"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Søk trailere"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Videomeny"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Søk på YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Søk i TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Fjern dette fra hovedmenyen"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Samme regissør"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Vis bilder på kart"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Trykk opp for skuespillerinformasjon"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.nl_nl/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Uw waardering"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Uitgebreide info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pagina's"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Energiebeheer"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Totale duur"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmsets"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Beschikbare groepen"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Zoek trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Videomenu"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Zoek in YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Zoek in TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Verwijder dit hoofdmenu-item"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Zelfde regisseur"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Toon afbeeldingen op kaart"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Kies 'Omhoog' voor acteursinformatie"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.pl_pl/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Twoja ocena"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Dodatkowe"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Strony"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opcje zasilania"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Całkowity czas trwania"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Serie filmowe"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Dostępne grupy"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Szukaj zwiastuna"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menu wideo"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Szukaj w serwisie YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Szukaj w serwisie TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Usuń tę pozycję z menu startowego"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Filmy reżysera"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Pokazuj obrazy na mapie"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Naciśnij Góra, aby zobaczyć notkę o aktorze"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.pt_br/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Sua nota"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Extended info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Páginas"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opções de Energia"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duração total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Coletânea de Filmes"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Grupos disponíveis"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Procurar trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menu Vídeo"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Procurar no YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Procurar no TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Remover este item do menu principal"
@@ -398,7 +390,7 @@
 
 msgctxt "#31120"
 msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
-msgstr "Você não configurou um provedor de clima ainda. Para obeter informações de clima, escolha um provedor de clima e informa sua localização"
+msgstr "Você ainda não configurou um provedor de clima. Para obter informações sobre o clima, escolha um provedor de clima e informe sua localização."
 
 msgctxt "#31121"
 msgid "Set weather provider"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Mesmo diretor"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostrar imagens no mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Pressione acima para informação do ator"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.pt_pt/strings.po Changed

@@ -48,6 +48,10 @@
 msgid "Unwatched movies"
 msgstr "Filmes não vistos"
 
+msgctxt "#31008"
+msgid "Enable category widgets"
+msgstr "Ativar widgets de categorias"
+
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "Descarregar ícones"
@@ -108,6 +112,10 @@
 msgid "Viewtype"
 msgstr "Tipo de visualização"
 
+msgctxt "#31024"
+msgid "Choose rating to display for media items"
+msgstr "Escolher classificação a mostrar nos itens de média"
+
 msgctxt "#31025"
 msgid "No favourites found. You can add any item from media views to this list by using the context menu."
 msgstr "Não há favoritos. Pode adicionar qualquer item a esta lista, usando o menu de contexto."
@@ -140,10 +148,6 @@
 msgid "Your rating"
 msgstr "A sua avaliação"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Info detalhada"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Páginas"
@@ -220,6 +224,10 @@
 msgid "Main menu items"
 msgstr "Itens do menu principal"
 
+msgctxt "#31062"
+msgid "Choose weather fanart pack"
+msgstr "Escolher o pacote de fanart de meteorologia"
+
 msgctxt "#31063"
 msgid "Sections"
 msgstr "Secções"
@@ -252,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opções de Energia"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Duração total"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Conjuntos de filmes"
@@ -280,10 +292,6 @@
 msgid "Available groups"
 msgstr "Grupos disponíveis"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Pesquisa por trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Menu de vídeo"
@@ -354,7 +362,7 @@
 
 msgctxt "#31112"
 msgid "Toggle audio stream"
-msgstr "Comutar a transmissão de áudio"
+msgstr "Comutar a emissão de áudio"
 
 msgctxt "#31113"
 msgid "Search local library"
@@ -364,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Pesquisa no YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Pesquisa no TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Remover este item do menu principal"
@@ -400,10 +404,6 @@
 msgid "Same director"
 msgstr "Mesmo realizador"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Mostrar as imagens no mapa"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Carregue em Cima para ver os dados do ator"
@@ -428,6 +428,10 @@
 msgid "Main menu-related settings: Configure the home screen to your likings."
 msgstr "Definições do menu principal: Configure o ecrã inicial ao seu gosto."
 
+msgctxt "#31131"
+msgid "Choose skin fanart pack"
+msgstr "Escolher pacote de fanart do tema"
+
 msgctxt "#31132"
 msgid "Select Program"
 msgstr "Seleccione Programa"
@@ -468,6 +472,10 @@
 msgid "Play speed"
 msgstr "Velocidade de reprodução"
 
+msgctxt "#31143"
+msgid "You did not set up PVR yet. In order to use PVR, choose a PVR client addon and configure it. Please visit http://kodi.wiki/view/PVR to learn more."
+msgstr "Ainda não configurou o PVR. Para usar o PVR, escolha um add-on cliente de PVR e configure-o. Por favor visite http://kodi.wiki/view/PVR para saber mais."
+
 msgctxt "#31144"
 msgid "Enter add-on browser"
 msgstr "Entrar no navegador de add-ons"
@@ -480,6 +488,10 @@
 msgid "Categories"
 msgstr "Categorias"
 
+msgctxt "#31149"
+msgid "Select genre fanart pack"
+msgstr "Escolher o pacote de fanart do género"
+
 msgctxt "#31150"
 msgid "Repository"
 msgstr "Repositório"
@@ -492,6 +504,10 @@
 msgid "Random music videos"
 msgstr "Vídeos de música aleatórios"
 
+msgctxt "#31153"
+msgid "You do not have any add-ons of this type installed. Enter the add-on browser to download add-ons created by our community."
+msgstr "Não existem add-ons deste tipo instalados. Entre no navegador de add-ons para descarregar add-ons criados pela nossa comunidade."
+
 msgctxt "#31154"
 msgid "Press OK to switch between locations"
 msgstr "Pressione OK para mudar entre as localizações"
@@ -512,6 +528,38 @@
 msgid "Touch mode"
 msgstr "Modo de toque"
 
+msgctxt "#31159"
+msgid "Artwork"
+msgstr "Imagens"
+
+msgctxt "#31160"
+msgid "Show media flags"
+msgstr "Mostrar emblemas de média"
+
+msgctxt "#31161"
+msgid "Numeric pad"
+msgstr "Teclado numérico"
+
+msgctxt "#31162"
+msgid "Play your personal games or download one of the many game add-ons from the official repository."
+msgstr "Jogue os seus jogos pessoais ou descarregue um dos vários add-ons de jogos presentes no repositório oficial."
+
+msgctxt "#31163"
+msgid "Show Fanart background"
+msgstr "Mostrar fundo de fanart"
+
+msgctxt "#31164"
+msgid "Choose kind of profile identification"
+msgstr "Escolha tipo de identificação do perfil"
+
 msgctxt "#31165"
 msgid "Profile name"
 msgstr "Nome do perfil"
+
+msgctxt "#31166"
+msgid "Profile avatar"
+msgstr "Avatar do perfil"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "Fundo animado"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.ro_ro/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Nota dvs."
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Mai multe informații"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Pagini"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Opțiuni de alimentare"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Durata totală"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Colecție de filme"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Grupuri disponibile"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Caută secvențe"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Meniu video"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Caută pe YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Caută pe TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Elimină acest element din meniul principal"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Același regizor"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Arată imaginile pe hartă"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Apasă în sus pentru informații despre actori"
@@ -554,7 +542,7 @@
 
 msgctxt "#31162"
 msgid "Play your personal games or download one of the many game add-ons from the official repository."
-msgstr "Redați-vă jocurile personale sau descărcați unul din multele add-on-uri de jocuri din depozitul oficial."
+msgstr "Rulati jocurile personale sau descărcați unul din multele add-on-uri de jocuri din libraria oficiala."
 
 msgctxt "#31163"
 msgid "Show Fanart background"
@@ -571,3 +559,7 @@
 msgctxt "#31166"
 msgid "Profile avatar"
 msgstr "Avatar profil"
+
+msgctxt "#31167"
+msgid "Animate background"
+msgstr "Animați fundalul"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.ru_ru/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Ваш рейтинг"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Дополнительная информация"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Страницы"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Настройки питания"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Общая длительность"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Киноциклы"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Доступные группы"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Искать трейлер"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Видео меню"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Искать в YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Искать в TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Убрать этот элемент главного меню"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Тот же режиссер "
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Показывать изображения на карте"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Нажмите вверх для получения информации об актере"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.sk_sk/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Vaše hodnotenie"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Rozšírené informácie"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Stránky"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Možnosti napájania"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Celkové trvanie"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmové kolekcie"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Dostupné skupiny"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Hľadať upútavku"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Ponuka videa"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Hľadať na YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Hľadať na TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Odobrať túto položku hlavnej ponuky"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Rovnaký režisér"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Zobraziť obrázky na mape"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Stlačte nahor pre zobrazenie informácií o hercovi"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.sl_si/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.sr_rs/strings.po Changed

@@ -140,10 +140,6 @@
 msgid "Your rating"
 msgstr "Ваша оцена"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Додатне информације"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Странице"
@@ -256,6 +252,10 @@
 msgid "Power Options"
 msgstr "Опције напајања"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Укупно трајање"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Филмски комплети"
@@ -284,10 +284,6 @@
 msgid "Available groups"
 msgstr "Доступне групе"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Тражи најаву"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Видео мени"
@@ -368,10 +364,6 @@
 msgid "Search YouTube"
 msgstr "Претражи YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Претражи TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Уклони ову ставку из главног менија"
@@ -404,10 +396,6 @@
 msgid "Same director"
 msgstr "Исти режисер"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Прикажи слике на мапи"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Притисните на горе за информације о глумцу"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.sr_rs@latin/strings.po Changed

@@ -140,10 +140,6 @@
 msgid "Your rating"
 msgstr "Vaša ocena"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Dodatne informacije"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Stranice"
@@ -256,6 +252,10 @@
 msgid "Power Options"
 msgstr "Opcije napajanja"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Ukupno trajanje"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmski kompleti"
@@ -284,10 +284,6 @@
 msgid "Available groups"
 msgstr "Dostupne grupe"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Traži najavu"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Video meni"
@@ -368,10 +364,6 @@
 msgid "Search YouTube"
 msgstr "Pretraži YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Pretraži TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Ukloni ovu stavku iz glavnog menija"
@@ -404,10 +396,6 @@
 msgid "Same director"
 msgstr "Isti režiser"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Prikaži slike na mapi"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Pritisnite na gore za informacije o glumcu"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.sv_se/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Ditt betyg"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Utökad info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Sidor"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Energialternativ"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Total längd"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmsamlingar"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Tillgängliga grupper"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Sök efter trailer"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Videomeny"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Sök på Youtube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Sök på TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Ta bort det här objektet från huvudmenyn"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Samma regissör"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Visa bilder på kartan"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Tryck upp för skådespelarinformation"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.szl/strings.po Changed

@@ -136,10 +136,6 @@
 msgid "Your rating"
 msgstr "Twoja ôcyna"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Ekstra info"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Zajty"
@@ -248,6 +244,10 @@
 msgid "Power Options"
 msgstr "Sztelōnki zasiylaniŏ"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Cołki czŏs trwaniŏ"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Seryje filmowe"
@@ -276,10 +276,6 @@
 msgid "Available groups"
 msgstr "Dostympne skupiny"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Szukej trailera"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Myni wideo"
@@ -356,10 +352,6 @@
 msgid "Search YouTube"
 msgstr "Szukej w YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Szukej w TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Uchrōń pozycyjõ przodnigo myni"
@@ -392,10 +384,6 @@
 msgid "Same director"
 msgstr "Filmy ôd reżysyra"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Pokŏż ôbrŏzy na karcie"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Naciś Gōra, coby ujzdrzić ino ô aktōrze"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.th_th/strings.po Changed

@@ -136,10 +136,6 @@
 msgid "Your rating"
 msgstr "เรตติ้งของคุณ"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "ข้อมูลเพิ่มเติม"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "หน้า"
@@ -252,6 +248,10 @@
 msgid "Power Options"
 msgstr "ตัวเลือก ด้านพลังงาน"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "รวมระยะเวลา"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "ภาพยนตร์ชุด"
@@ -280,10 +280,6 @@
 msgid "Available groups"
 msgstr "กลุ่มที่พบ"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "ค้นหาตัวอย่างหนัง"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "เมนูวิดีโอ"
@@ -364,10 +360,6 @@
 msgid "Search YouTube"
 msgstr "ค้นหาจากยูทูป"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "ค้นหาจาก TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "ลบรายการเมนูหลักนี้"
@@ -400,10 +392,6 @@
 msgid "Same director"
 msgstr "ผู้กำกับเดียวกัน"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "แสดงภาพบนแผนที่"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "กด ขึ้น สำหรับข้อมูลนักแสดง"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.tr_tr/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Derecelendirmeniz"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Genişletilmiş bilgi"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Sayfa"
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Güç Seçenekleri"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Toplam süre"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Film kümeleri"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Kullanılabilir gruplar"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Fragman ara"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Video menüsü"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "YouTube'da ara"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "TheMovieDB'de ara"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Bu ana menü öğesini kaldır"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Aynı yönetmen"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Haritada resimleri göster"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Aktör bilgisi için yukarı tuşuna basın"
@@ -450,7 +438,7 @@
 
 msgctxt "#31133"
 msgid "Select Resolution"
-msgstr "Çözünürlük seç"
+msgstr "Çözünürlük Seç"
 
 msgctxt "#31134"
 msgid "Remaining"
@@ -562,7 +550,7 @@
 
 msgctxt "#31164"
 msgid "Choose kind of profile identification"
-msgstr "Profil kimliği türünü seçin"
+msgstr "Profil kimliğini görüntüleme türünü seçin"
 
 msgctxt "#31165"
 msgid "Profile name"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.uk_ua/strings.po Changed

@@ -148,10 +148,6 @@
 msgid "Your rating"
 msgstr "Ваш рейтинг"
 
-msgctxt "#31034"
-msgid "Extended info"
-msgstr "Додаткові відомості"
-
 msgctxt "#31035"
 msgid "Pages"
 msgstr "Стор."
@@ -264,6 +260,10 @@
 msgid "Power Options"
 msgstr "Налаштування живлення"
 
+msgctxt "#31074"
+msgid "Total duration"
+msgstr "Загальна тривалість"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Кіноцикли"
@@ -292,10 +292,6 @@
 msgid "Available groups"
 msgstr "Доступні групи"
 
-msgctxt "#31090"
-msgid "Search trailer"
-msgstr "Шукати трейлер"
-
 msgctxt "#31092"
 msgid "Video menu"
 msgstr "Меню відео"
@@ -376,10 +372,6 @@
 msgid "Search YouTube"
 msgstr "Пошук на YouTube"
 
-msgctxt "#31115"
-msgid "Search TheMovieDB"
-msgstr "Пошук на TheMovieDB"
-
 msgctxt "#31116"
 msgid "Remove this main menu item"
 msgstr "Видалити цей елемент головного меню"
@@ -412,10 +404,6 @@
 msgid "Same director"
 msgstr "Той же режисер"
 
-msgctxt "#31124"
-msgid "Show images on map"
-msgstr "Показувати зображення на карті"
-
 msgctxt "#31125"
 msgid "Press up for actor info"
 msgstr "Натисніть стрілку вгору для перегляду відомостей про актора"

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.zh_cn/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/language/resource.language.zh_tw/strings.po Changed

_service:download_files:master.tar.gz/addons/skin.estuary/media/icons/infodialogs/trailer_search.png Deleted

_service:download_files:master.tar.gz/addons/skin.estuary/media/icons/infodialogs/youtube.png Deleted

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Custom_1107_SearchDialog.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/DialogKeyboard.xml Changed

@@ -577,67 +577,6 @@
 					<param name="width" value="350" />
 				</include>
 			</control>
-			<control type="panel" id="9010">
-				<centerleft>50%</centerleft>
-				<bottom>490</bottom>
-				<width>1500</width>
-				<height>200</height>
-				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<orientation>vertical</orientation>
-				<onleft>9010</onleft>
-				<onright>9010</onright>
-				<onup>noop</onup>
-				<ondown>105</ondown>
-				<visible>!Control.IsVisible(313)</visible>
-				<itemlayout width="500" height="60">
-					<control type="image">
-						<left>10</left>
-						<top>0</top>
-						<width>480</width>
-						<height>50</height>
-						<texture colordiffuse="dialog_tint">colors/white.png</texture>
-					</control>
-					<control type="label">
-						<textoffsetx>30</textoffsetx>
-						<top>0</top>
-						<width>500</width>
-						<height>50</height>
-						<label>$INFO[ListItem.Label]</label>
-						<font>font12</font>
-						<shadowcolor>text_shadow</shadowcolor>
-						<aligny>center</aligny>
-					</control>
-				</itemlayout>
-				<focusedlayout width="500" height="60">
-					<control type="group">
-						<control type="image">
-							<left>10</left>
-							<top>0</top>
-							<width>480</width>
-							<height>50</height>
-							<texture colordiffuse="dialog_tint">colors/white.png</texture>
-						</control>
-						<control type="image">
-							<left>10</left>
-							<width>480</width>
-							<height>50</height>
-							<texture colordiffuse="button_focus">colors/grey.png</texture>
-							<include>Animation_FocusTextureFade</include>
-						</control>
-						<control type="label">
-							<textoffsetx>30</textoffsetx>
-							<top>0</top>
-							<width>500</width>
-							<height>50</height>
-							<label>$INFO[ListItem.Label]</label>
-							<font>font12</font>
-							<shadowcolor>text_shadow</shadowcolor>
-							<aligny>center</aligny>
-						</control>
-					</control>
-				</focusedlayout>
-				<content>$VAR[AutoCompletionContentVar]</content>
-			</control>
 			<control type="label" id="313">
 				<centerleft>50%</centerleft>
 				<top>290</top>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/DialogMusicInfo.xml Changed

@@ -417,16 +417,6 @@
 						<onclick>ActivateWindow(1104)</onclick>
 						<visible>String.IsEqual(ListItem.DBType,artist) | String.IsEqual(ListItem.DBType,album)</visible>
 					</control>
-					<control type="radiobutton" id="440">
-						<label>$LOCALIZE[31114]</label>
-						<include content="VideoInfoButtonsCommon">
-							<param name="icon" value="icons/infodialogs/youtube.png" />
-						</include>
-						<onclick>Action(close)</onclick>
-						<visible>System.hasAddon(script.extendedinfo)</visible>
-						<onclick condition="!String.IsEqual(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Album])</onclick>
-						<onclick condition="String.IsEqual(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Title])</onclick>
-					</control>
 					<include content="InfoDialogButton">
 						<param name="id" value="6" />
 						<param name="icon" value="icons/infodialogs/update.png" />

_service:download_files:master.tar.gz/addons/skin.estuary/xml/DialogPVRInfo.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/DialogSeekBar.xml Changed

@@ -22,7 +22,7 @@
 				<visible>!Window.IsVisible(videoosd) + !Window.IsVisible(musicosd)</visible>
 				<animation effect="fade" time="200">VisibleChange</animation>
 				<control type="image">
-					<left>200</left>
+					<left>20</left>
 					<top>120</top>
 					<width>264</width>
 					<height>40</height>
@@ -79,12 +79,60 @@
 					<visible>Player.ShowInfo + !Player.ChannelPreviewActive + Window.IsActive(visualisation)</visible>
 					<animation effect="fade" start="0" end="100" time="200" delay="1000">Visible</animation>
 					<include content="MediaFlag">
+						<param name="texture" value="flags/rds/rds.png" />
+						<param name="visible" value="RDS.HasRDS" />
+					</include>
+					<include content="MediaFlag">
 						<param name="texture" value="$INFO[MusicPlayer.Codec,flags/audiocodec/,.png]" />
 					</include>
 					<include content="MediaFlag">
-						<param name="texture" value="flags/rds/rds.png" />
-						<param name="visible" value="RDS.HasRDS" />
+						<param name="texture" value="$INFO[MusicPlayer.Channels,flags/audiochannel/,.png]" />
 					</include>
+					<control type="group">
+						<visible>!String.IsEmpty(MusicPlayer.SampleRate)</visible>
+						<width>115</width>
+						<control type="label">
+							<width>115</width>
+							<height>60</height>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[MusicPlayer.SampleRate, ,kHz]</label>
+							<font>font_flag</font>
+						</control>
+						<include content="MediaFlag">
+							<param name="texture" value="flags/flag.png" />
+						</include>
+					</control>
+					<control type="group">
+						<visible>!String.IsEmpty(MusicPlayer.BitRate)</visible>
+						<width>115</width>
+						<control type="label">
+							<width>115</width>
+							<height>60</height>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[MusicPlayer.BitRate, ,kbps ]</label>
+							<font>font_flag</font>
+						</control>
+						<include content="MediaFlag">
+							<param name="texture" value="flags/flag.png" />
+						</include>
+					</control>
+					<control type="group">
+						<visible>!String.IsEmpty(MusicPlayer.BitsPerSample)</visible>
+						<width>115</width>
+						<control type="label">
+							<width>115</width>
+							<height>60</height>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[MusicPlayer.BitsPerSample, ,bit]</label>
+							<font>font_flag</font>
+						</control>
+						<include content="MediaFlag">
+							<param name="texture" value="flags/flag.png" />
+						</include>
+					</control>
 				</control>
 				<control type="group">
 					<visible>[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording</visible>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/DialogVideoInfo.xml Changed

@@ -9,7 +9,7 @@
 			<height>1080</height>
 			<centerleft>50%</centerleft>
 			<width>1920</width>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-embuary-video.xml) | Window.IsVisible(script-embuary-person.xml) | Window.IsVisible(script-embuary-image.xml)">Conditional</animation>
 			<control type="group">
 				<top>150</top>
 				<left>66</left>
@@ -157,12 +157,20 @@
 						<param name="control_id" value="147" />
 						<param name="label" value="$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR]]" />
 						<param name="altlabel" value="$INFO[ListItem.Director,$LOCALIZE[20339]: ]" />
+						<param name="onclick_condition" value="System.hasAddon(script.embuary.info)" />
+						<param name="onclick" value="RunScript(script.embuary.info,call=person,query='$ESCINFO[ListItem.Director]')" />
+						<param name="altclick_condition" value="System.hasAddon(script.embuary.info)" />
+						<param name="altclick" value="RunScript(script.embuary.info,call=person,query='$ESCINFO[ListItem.Director]')" />
 						<param name="visible" value="!String.IsEmpty(ListItem.Director)" />
 					</include>
 					<include content="InfoDialogMetadata">
 						<param name="control_id" value="148" />
 						<param name="label" value="$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]: [/COLOR]]" />
 						<param name="altlabel" value="$INFO[ListItem.Writer,$LOCALIZE[20417]: ]" />
+						<param name="onclick_condition" value="System.hasAddon(script.embuary.info)" />
+						<param name="onclick" value="RunScript(script.embuary.info,call=person,query='$ESCINFO[ListItem.Writer]')" />
+						<param name="altclick_condition" value="System.hasAddon(script.embuary.info)" />
+						<param name="altclick" value="RunScript(script.embuary.info,call=person,query='$ESCINFO[ListItem.Writer]')" />
 						<param name="visible" value="!String.IsEmpty(ListItem.Writer)" />
 					</include>
 					<include content="InfoDialogMetadata">
@@ -225,6 +233,30 @@
 						<param name="altlabel" value="$LOCALIZE[126]: $INFO[ListItem.Status]" />
 						<param name="visible" value="!String.IsEmpty(ListItem.Status)" />
 					</include>
+					<include content="InfoDialogMetadata">
+						<param name="control_id" value="161" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[570]: [/COLOR]$INFO[ListItem.DateAdded]" />
+						<param name="altlabel" value="$LOCALIZE[570]: $INFO[ListItem.DateAdded]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.DateAdded) + [String.IsEqual(ListItem.DBType,episode) | String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,musicvideo) | String.IsEqual(ListItem.DBType,video)]" />
+					</include>
+					<include content="InfoDialogMetadata">
+						<param name="control_id" value="163" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[576]: [/COLOR]$INFO[ListItem.PlayCount]" />
+						<param name="altlabel" value="$LOCALIZE[576]: $INFO[ListItem.PlayCount]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.PlayCount)" />
+					</include>
+					<include content="InfoDialogMetadata">
+						<param name="control_id" value="164" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[568]: [/COLOR]$INFO[ListItem.LastPlayed]" />
+						<param name="altlabel" value="$LOCALIZE[568]: $INFO[ListItem.LastPlayed]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.LastPlayed)" />
+					</include>
+					<include content="InfoDialogMetadata">
+						<param name="control_id" value="165" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[564]: [/COLOR]$INFO[ListItem.DBType]" />
+						<param name="altlabel" value="$LOCALIZE[564]: $INFO[ListItem.DBType]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.DBType)" />
+					</include>
 				</control>
 				<control type="group">
 					<visible>Integer.IsEqual(Container(50).NumItems,0) + String.IsEmpty(ListItem.Art(tvshow.banner)) + String.IsEmpty(ListItem.Art(banner))</visible>
@@ -260,10 +292,10 @@
 					<top>158</top>
 					<width>1235</width>
 					<height>370</height>
+					<onup condition="System.hasAddon(script.embuary.info) + Control.HasFocus(50) + !String.IsEqual(ListItem.DBType,set)">RunScript(script.embuary.info,call=person,query='$ESCINFO[Container(50).ListItem.Label]')</onup>
+					<onup condition="!System.hasAddon(script.embuary.info) + !String.IsEqual(ListItem.DBType,set)">InstallAddon(script.embuary.info)</onup>
 					<onleft>50</onleft>
 					<onright>50</onright>
-					<onup condition="System.hasAddon(script.extendedinfo) + Control.HasFocus(50) + !String.IsEqual(ListItem.DBType,set)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[Container(50).ListItem.Label])</onup>
-					<onup condition="!System.hasAddon(script.extendedinfo) + !String.IsEqual(ListItem.DBType,set)">InstallAddon(script.extendedinfo)</onup>
 					<ondown>140</ondown>
 					<scrolltime>200</scrolltime>
 					<orientation>horizontal</orientation>
@@ -497,14 +529,6 @@
 						<param name="visible" value="!String.IsEmpty(ListItem.Trailer) + ![String.StartsWith(Container.FolderPath,plugin://) + String.Contains(Container.FolderPath,trailer)]" />
 					</include>
 					<include content="InfoDialogButton">
-						<param name="id" value="440" />
-						<param name="icon" value="icons/infodialogs/trailer_search.png" />
-						<param name="label" value="$LOCALIZE[31090]" />
-						<param name="onclick_1" value="Action(close)" />
-						<param name="onclick_2" value="RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Title] $INFO[ListItem.Year])" />
-						<param name="visible" value="System.hasAddon(script.extendedinfo) + String.IsEqual(ListItem.DBType,movie) + !Control.IsVisible(11)" />
-					</include>
-					<include content="InfoDialogButton">
 						<param name="id" value="441" />
 						<param name="icon" value="icons/infodialogs/cinema.png" />
 						<param name="onclick_1" value="Dialog.Close(MovieInformation)" />
@@ -552,8 +576,13 @@
 						<param name="id" value="101" />
 						<param name="icon" value="icons/infodialogs/info.png" />
 						<param name="label" value="$LOCALIZE[31034]" />
-						<param name="onclick_1" value="RunScript(script.extendedinfo,info=openinfodialog)" />
-						<param name="visible" value="System.hasAddon(script.extendedinfo) + [String.IsEqual(ListItem.DbType,movie) | String.IsEqual(ListItem.DbType,tvshow) | String.IsEqual(ListItem.DbType,season) | String.IsEqual(ListItem.DbType,episode)]" />
+						<param name="onclick_1_condition" value="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)" />
+						<param name="onclick_1" value="RunScript(script.embuary.info,call=movie,dbid=$INFO[ListItem.DBID])" />
+						<param name="onclick_2_condition" value="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,tvshow)" />
+						<param name="onclick_2" value="RunScript(script.embuary.info,call=tv,dbid=$INFO[ListItem.DBID])" />
+						<param name="onclick_3_condition" value="!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,episode)" />
+						<param name="onclick_3" value="RunScript(script.embuary.info,call=tv,query='$ESCINFO[ListItem.TVShowTitle]',year=$INFO[ListItem.Year])" />
+						<param name="visible" value="System.hasAddon(script.embuary.info) + !String.IsEmpty(ListItem.DBID) + [String.IsEqual(ListItem.DbType,movie) | String.IsEqual(ListItem.DbType,tvshow) | String.IsEqual(ListItem.DbType,episode)]" />
 					</include>
 					<include content="InfoDialogButton">
 						<param name="id" value="102" />
@@ -629,9 +658,9 @@
 		<control type="group">
 			<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
 			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-embuary-video.xml) | Window.IsVisible(script-embuary-person.xml) | Window.IsVisible(script-embuary-image.xml)">Conditional</animation>
 			<centerleft>50%</centerleft>
 			<width>1920</width>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">Conditional</animation>
 			<bottom>0</bottom>
 			<height>70</height>
 			<include>MediaFlags</include>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes.xml Changed

@@ -14,6 +14,7 @@
 	<include file="View_53_Shift.xml" />
 	<include file="View_54_InfoWall.xml" />
 	<include file="View_55_WideList.xml" />
+	<include file="View_503_NowPlaying.xml" />
 	<include file="View_500_Wall.xml" />
 	<include file="View_501_Banner.xml" />
 	<include file="View_502_FanArt.xml" />
@@ -33,8 +34,8 @@
 	<constant name="dialogbuttons_itemgap">-20</constant>
 	<constant name="list_y_offset">0</constant>
 	<constant name="list_item_height">80</constant>
-	<expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)</expression>
-	<expression name="sidebar_visible">ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Control.HasFocus(6131) | Window.IsActive(MyPlaylist.xml)</expression>
+	<expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(songinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-embuary-video.xml) | Window.IsVisible(script-embuary-person.xml) | Window.IsVisible(script-embuary-image.xml)</expression>
+	<expression name="sidebar_visible">ControlGroup(9000).HasFocus | Control.HasFocus(6130) | Control.HasFocus(6131)</expression>
 	<include name="CommonScrollbars">
 		<control type="group">
 			<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
@@ -50,8 +51,10 @@
 					<top>0</top>
 					<bottom>0</bottom>
 					<width>13</width>
-					<onleft>50</onleft>
-					<onright>50</onright>
+					<onleft condition="![Window.IsVisible(musicplaylist) | Window.IsVisible(videoplaylist)]">50</onleft>
+					<onleft condition="Window.IsVisible(musicplaylist) | Window.IsVisible(videoplaylist)">55</onleft>
+					<onright condition="![Window.IsVisible(musicplaylist) | Window.IsVisible(videoplaylist)]">50</onright>
+					<onright condition="Window.IsVisible(musicplaylist) | Window.IsVisible(videoplaylist)">55</onright>
 					<orientation>vertical</orientation>
 					<texturesliderbackground />
 					<animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation>
@@ -859,7 +862,7 @@
 					<animation effect="fade" time="150">VisibleChange</animation>
 					<control type="group">
 						<width>600</width>
-						<visible>Player.HasMedia + String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))</visible>
+						<visible>!Control.IsVisible(503) + Player.HasMedia + String.IsEmpty(Window(Videos).Property(PlayingBackgroundMedia))</visible>
 						<animation effect="fade" time="200">VisibleChange</animation>
 						<control type="grouplist">
 							<left>-75</left>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes_Buttons.xml Changed

@@ -19,23 +19,31 @@
 		<radioposy>0</radioposy>
 	</include>
 	<include name="InfoDialogMetadata">
-		<control type="togglebutton" id="$PARAM[control_id]">
-			<width>472</width>
-			<height>49</height>
-			<textoffsetx>16</textoffsetx>
-			<aligny>center</aligny>
-			<font>font12</font>
-			<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
-			<alttexturefocus colordiffuse="button_focus">lists/focus.png</alttexturefocus>
-			<texturenofocus />
-			<alttexturenofocus />
-			<onclick>noop</onclick>
-			<altclick>noop</altclick>
-			<label>$PARAM[label]</label>
-			<altlabel>$PARAM[altlabel]</altlabel>
-			<usealttexture>Control.HasFocus($PARAM[control_id])</usealttexture>
-			<visible>$PARAM[visible]</visible>
-		</control>
+		<param name="onclick_condition">false</param>
+		<param name="onclick">noop</param>
+		<param name="altclick_condition">false</param>
+		<param name="altclick">noop</param>
+		<definition>
+			<control type="togglebutton" id="$PARAM[control_id]">
+				<width>472</width>
+				<height>49</height>
+				<textoffsetx>16</textoffsetx>
+				<aligny>center</aligny>
+				<font>font12</font>
+				<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
+				<alttexturefocus colordiffuse="button_focus">lists/focus.png</alttexturefocus>
+				<texturenofocus />
+				<alttexturenofocus />
+				<onclick>noop</onclick>
+				<onclick condition="$PARAM[onclick_condition]">$PARAM[onclick]</onclick>
+				<altclick>noop</altclick>
+				<altclick condition="$PARAM[altclick_condition]">$PARAM[altclick]</altclick>
+				<label>$PARAM[label]</label>
+				<altlabel>$PARAM[altlabel]</altlabel>
+				<usealttexture>Control.HasFocus($PARAM[control_id])</usealttexture>
+				<visible>$PARAM[visible]</visible>
+			</control>
+		</definition>
 	</include>
 	<include name="DefaultSettingButton">
 		<param name="height">70</param>
@@ -219,6 +227,9 @@
 	</include>
 	<include name="InfoDialogButton">
 		<param name="width">262</param>
+		<param name="onclick_1_condition">true</param>
+		<param name="onclick_2_condition">true</param>
+		<param name="onclick_3_condition">true</param>
 		<definition>
 			<control type="radiobutton" id="$PARAM[id]">
 				<width>$PARAM[width]</width>
@@ -240,8 +251,9 @@
 				<textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled>
 				<textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled>
 				<label>$PARAM[label]</label>
-				<onclick>$PARAM[onclick_1]</onclick>
-				<onclick>$PARAM[onclick_2]</onclick>
+				<onclick condition="$PARAM[onclick_1_condition]">$PARAM[onclick_1]</onclick>
+				<onclick condition="$PARAM[onclick_2_condition]">$PARAM[onclick_2]</onclick>
+				<onclick condition="$PARAM[onclick_3_condition]">$PARAM[onclick_3]</onclick>
 				<visible>$PARAM[visible]</visible>
 				<animation effect="fade" start="100" end="0" time="300" delay="300">Hidden</animation>
 			</control>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes_Home.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes_MediaMenu.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MusicVisualisation.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MyPics.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MyPlaylist.xml Changed

@@ -1,163 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol always="true">50</defaultcontrol>
+	<defaultcontrol always="true">55</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
-	<views>50</views>
+	<menucontrol>9000</menucontrol>
+	<views>55,503</views>
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
 			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
+			<include>View_55_WideList</include>
+			<include condition="Window.IsActive(musicplaylist)">View_503_NowPlaying</include>
+			<include>CommonScrollbars</include>
 			<control type="group">
 				<include>OpenClose_Left</include>
-				<control type="fixedlist" id="50">
-					<left>410</left>
-					<top>list_y_offset</top>
-					<right>586</right>
-					<bottom>list_y_offset</bottom>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<orientation>vertical</orientation>
-					<onleft>700</onleft>
-					<onright>60</onright>
-					<movement>5</movement>
-					<focusposition>6</focusposition>
-					<onup>50</onup>
-					<ondown>50</ondown>
-					<pagecontrol>60</pagecontrol>
-					<viewtype label="535">list</viewtype>
-					<preloaditems>1</preloaditems>
-					<focusedlayout height="list_item_height">
-						<control type="image">
-							<left>0</left>
-							<right>0</right>
-							<bottom>0</bottom>
-							<texture colordiffuse="button_focus">lists/focus.png</texture>
-							<visible>Control.HasFocus(50)</visible>
-						</control>
-						<control type="label">
-							<left>30</left>
-							<bottom>0</bottom>
-							<right>30</right>
-							<aligny>center</aligny>
-							<font>font12</font>
-							<label>$VAR[PlaylistLabelVar]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-						<control type="label">
-							<left>30</left>
-							<bottom>0</bottom>
-							<right>30</right>
-							<align>right</align>
-							<aligny>center</aligny>
-							<font>font12</font>
-							<label>$VAR[PlaylistLabel2Var]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-					</focusedlayout>
-					<itemlayout height="list_item_height">
-						<control type="label">
-							<left>30</left>
-							<bottom>0</bottom>
-							<right>30</right>
-							<aligny>center</aligny>
-							<font>font12</font>
-							<label>$VAR[PlaylistLabelVar]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-						<control type="label">
-							<left>30</left>
-							<bottom>0</bottom>
-							<right>30</right>
-							<align>right</align>
-							<aligny>center</aligny>
-							<font>font12</font>
-							<label>$VAR[PlaylistLabel2Var]</label>
-							<textcolor>grey</textcolor>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-					</itemlayout>
-				</control>
-				<control type="group">
-					<depth>DepthContentPanel</depth>
-					<include content="ContentPanel">
-						<param name="width" value="470" />
-					</include>
-					<control type="grouplist" id="700">
-						<orientation>vertical</orientation>
-						<itemgap>0</itemgap>
-						<left>0</left>
-						<top>120</top>
-						<onup>700</onup>
-						<ondown>700</ondown>
-						<onleft>50</onleft>
-						<onright>50</onright>
-						<width>410</width>
-						<control type="radiobutton" id="20">
-							<width>410</width>
-							<height>110</height>
-							<align>left</align>
-							<aligny>top</aligny>
-							<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
-							<texturenofocus />
-							<radioposx>300</radioposx>
-							<textoffsetx>40</textoffsetx>
-							<textoffsety>35</textoffsety>
-							<label>$LOCALIZE[191]</label>
-						</control>
-						<include content="PlaylistWindowButton">
-							<param name="control_id" value="26" />
-							<param name="label" value="" />
-						</include>
-						<include content="PlaylistWindowButton">
-							<param name="control_id" value="21" />
-							<param name="label" value="$LOCALIZE[190]" />
-						</include>
-						<include content="PlaylistWindowButton">
-							<param name="control_id" value="22" />
-							<param name="label" value="$LOCALIZE[192]" />
-						</include>
-						<include content="MediaMenuNowPlaying">
-							<param name="left" value="-5" />
-						</include>
-					</control>
-				</control>
+				<include>Visible_Left</include>
+				<include>ListThumbInfoPanel</include>
 			</control>
+			<include content="TopBar" condition="Window.IsActive(videoplaylist)">
+				<param name="breadcrumbs_label" value="$LOCALIZE[31065]" />
+				<param name="sublabel">$LOCALIZE[31073] - $INFO[Container.TotalTime,,  ∙  ]$INFO[Container.CurrentItem,,/]$INFO[Container.NumItems]</param>
+			</include>
+			<include content="TopBar" condition="Window.IsActive(musicplaylist)">
+				<param name="breadcrumbs_label" value="$LOCALIZE[31066]" />
+				<param name="sublabel">$LOCALIZE[31074] - $INFO[Container.TotalTime]</param>
+			</include>
+			<include content="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 			<control type="group">
-				<depth>DepthContentPanel</depth>
-				<right>0</right>
-				<width>593</width>
-				<include>OpenClose_Right</include>
-				<include content="ListThumbInfoPanel">
-					<param name="flip_bg" value="true" />
-				</include>
-				<control type="scrollbar" id="60">
-					<left>-20</left>
-					<top>0</top>
-					<width>12</width>
-					<bottom>0</bottom>
-					<onleft>50</onleft>
-					<texturesliderbackground />
-					<onright>700</onright>
-					<animation effect="zoom" end="50,100" time="300" tween="sine" center="-20,0" easing="inout" condition="!Control.HasFocus(60)">conditional</animation>
-					<orientation>vertical</orientation>
+				<visible>!Container.Content(songs)</visible>
+				<depth>DepthBars</depth>
+				<bottom>0</bottom>
+				<height>70</height>
+				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+				<include condition="!Skin.HasSetting(hide_mediaflags)">MediaFlags</include>
+			</control>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<control type="grouplist" id="9000">
+					<top>50</top>
+					<include>MediaMenuListCommon</include>
+					<control type="label" id="203">
+						<description>Actions</description>
+						<include>MediaMenuLabelCommon</include>
+						<label>$LOCALIZE[31020]</label>
+					</control>
+					<control type="radiobutton" id="20">
+						<height>80</height>
+						<align>left</align>
+						<aligny>center</aligny>
+						<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
+						<texturenofocus />
+						<radioposx>280</radioposx>
+						<textoffsetx>20</textoffsetx>
+						<label>$LOCALIZE[191]</label>
+					</control>
+					<control type="button" id="26">
+						<height>80</height>
+						<align>left</align>
+						<aligny>center</aligny>
+						<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
+						<texturenofocus />
+						<radioposx>280</radioposx>
+						<textoffsetx>20</textoffsetx>
+						<label></label>
+					</control>
+					<control type="button" id="21">
+						<height>80</height>
+						<align>left</align>
+						<aligny>center</aligny>
+						<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
+						<texturenofocus />
+						<radioposx>280</radioposx>
+						<textoffsetx>20</textoffsetx>
+						<label>$LOCALIZE[190]</label>
+					</control>
+					<control type="button" id="22">
+						<height>80</height>
+						<align>left</align>
+						<aligny>center</aligny>
+						<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
+						<texturenofocus />
+						<radioposx>280</radioposx>
+						<textoffsetx>20</textoffsetx>
+						<label>$LOCALIZE[192]</label>
+					</control>
+					<include>MediaMenuNowPlaying</include>
 				</control>
 			</control>
 		</control>
-		<include content="TopBar" condition="Window.IsActive(videoplaylist)">
-			<param name="breadcrumbs_label" value="$LOCALIZE[31065]" />
-			<param name="sublabel">$INFO[Container.TotalTime,, - ] $INFO[Playlist.Position(video),, / ]$INFO[Playlist.Length(video)]</param>
-		</include>
-		<include content="TopBar" condition="Window.IsActive(musicplaylist)">
-			<param name="breadcrumbs_label" value="$LOCALIZE[31066]" />
-			<param name="sublabel">$INFO[Container.TotalTime,, - ] $INFO[Playlist.Position(music),, / ]$INFO[Playlist.Length(music)]</param>
-		</include>
-		<include>BottomBar</include>
-		<control type="group">
-			<depth>DepthBars</depth>
-			<bottom>0</bottom>
-			<height>70</height>
-			<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
-			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-			<include condition="!Skin.HasSetting(hide_mediaflags)">MediaFlags</include>
-		</control>
 	</controls>
 </window>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Variables.xml Changed

@@ -5,18 +5,6 @@
 		<value condition="ListItem.HasTimer | ListItem.HasTimerSchedule">windows/pvr/timer.png</value>
 		<value condition="ListItem.HasArchive">windows/pvr/archive.png</value>
 	</variable>
-	<variable name="AutoCompletionContentVar">
-		<value condition="System.HasAddon(plugin.program.autocompletion) + !System.HasHiddenInput">plugin://plugin.program.autocompletion?info=autocomplete&amp;&amp;id=$INFO[Control.GetLabel(312).index(1)]&amp;&amp;limit=9</value>
-	</variable>
-	<variable name="PlaylistLabelVar">
-		<value condition="String.IsEqual(ListItem.DbType,episode)">$INFO[ListItem.TVShowtitle,,: ]$INFO[ListItem.Season,,x]$INFO[ListItem.Episode,,. ]$INFO[ListItem.Title]</value>
-		<value condition="String.IsEqual(ListItem.DbType,musicvideo)">$INFO[ListItem.Artist,, - ]$INFO[ListItem.Title]</value>
-		<value>$INFO[ListItem.Label]</value>
-	</variable>
-	<variable name="PlaylistLabel2Var">
-		<value condition="Window.IsActive(musicplaylist)">$INFO[ListItem.Duration]</value>
-		<value>$INFO[ListItem.Duration,, $LOCALIZE[12391]]</value>
-	</variable>
 	<variable name="InfoListPathVar">
 		<value condition="String.IsEmpty(Container.PluginName)">$INFO[ListItem.FolderPath]</value>
 		<value></value>
@@ -72,6 +60,11 @@
 		<value condition="!String.IsEqual(listitem.dbtype,musicvideo) + !String.IsEmpty(Listitem.Art(poster))">$INFO[Listitem.Art(poster)]</value>
 		<value>$INFO[ListItem.Icon]</value>
 	</variable>
+	<variable name="PosterThumbVar">
+		<value condition="!String.IsEmpty(Listitem.Art(poster))">$INFO[Listitem.Art(poster)]</value>
+		<value condition="ListItem.IsParentFolder">DefaultFolderBackPoster.png</value>
+		<value>$INFO[ListItem.Icon]</value>
+	</variable>
 	<variable name="IconWallThumbVar">
 		<value condition="String.IsEqual(listitem.dbtype,genre) + System.HasAddon(resource.images.moviegenreicons.transparent)">$INFO[ListItem.Label,resource://resource.images.moviegenreicons.transparent/,.png]</value>
 		<value condition="String.IsEqual(listitem.dbtype,studio) + System.HasAddon(resource.images.studios.white)">$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]</value>
@@ -79,10 +72,16 @@
 		<value condition="!String.isempty(ListItem.Thumb)">$INFO[ListItem.Thumb]</value>
 		<value>$INFO[ListItem.Icon]</value>
 	</variable>
+	<variable name="ListLabelVar">
+		<value condition="String.IsEqual(ListItem.DbType,episode) + Window.IsActive(videoplaylist)">$INFO[ListItem.TVShowtitle,,: ]$INFO[ListItem.Season,,x]$INFO[ListItem.Episode,,. ]$INFO[ListItem.Title]</value>
+		<value condition="String.IsEqual(ListItem.DbType,musicvideo) + Window.IsActive(videoplaylist)">$INFO[ListItem.Artist,, - ]$INFO[ListItem.Title]</value>
+		<value>$INFO[ListItem.Label]</value>
+	</variable>
 	<variable name="ListLabel2Var">
 		<value condition="String.IsEmpty(Container.PluginName) + Container.Content(tvshows) + String.IsEqual(Container.SortMethod,$LOCALIZE[556])">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value>
 		<value condition="String.IsEqual(Container.SortMethod,$LOCALIZE[556])">$INFO[ListItem.Year]</value>
 		<value condition="!String.isempty(ListItem.Appearances)">$LOCALIZE[38026]: $INFO[ListItem.Appearances]</value>
+		<value condition="Window.IsActive(musicplaylist) | Window.IsActive(videoplaylist)">$INFO[ListItem.Duration]</value>
 		<value>$INFO[ListItem.Label2]</value>
 	</variable>
 	<variable name="ShiftLeftTextBoxVar">
@@ -123,12 +122,15 @@
 		<value condition="String.IsEqual(listitem.dbtype,musicvideo) | String.IsEqual(listitem.dbtype,video)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Plot]</value>
 		<value condition="String.IsEqual(listitem.dbtype,artist)">$INFO[ListItem.Property(artist_description)]</value>
 		<value condition="!String.IsEmpty(ListItem.Plot)">$INFO[ListItem.Plot]</value>
-		<value condition="String.IsEqual(listitem.dbtype,song)">$VAR[MusicTrackInfo,[COLOR button_focus]$LOCALIZE[554]:[/COLOR],[CR]]$INFO[ListItem.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[listitem.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$INFO[ListItem.DiscNumber,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],[CR]]$INFO[ListItem.Playcount,[COLOR button_focus]$LOCALIZE[567]: [/COLOR],[CR]]</value>
+		<value condition="String.IsEqual(ListItem.DBType,song)">$VAR[MusicTrackInfo,[COLOR button_focus]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[ListItem.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[listitem.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$INFO[ListItem.DiscNumber,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],[CR]]$INFO[ListItem.Playcount,[COLOR button_focus]$LOCALIZE[567]: [/COLOR],[CR]]$INFO[ListItem.LastPlayed,[COLOR button_focus]$LOCALIZE[568]: [/COLOR],]</value>
 		<value>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]</value>
 	</variable>
+	<variable name="NowPlayingInfoVar">
+		<value>$INFO[MusicPlayer.Title,[COLOR button_focus]$LOCALIZE[554]: [/COLOR],[CR]]$INFO[MusicPlayer.Artist,[COLOR button_focus]$LOCALIZE[557]: [/COLOR],[CR]]$INFO[MusicPlayer.Album,[COLOR button_focus]$LOCALIZE[558]: [/COLOR],[CR]]$INFO[MusicPlayer.DiscNumber,[COLOR button_focus]$LOCALIZE[427]: [/COLOR],[CR]]$INFO[MusicPlayer.Year,[COLOR button_focus]$LOCALIZE[345]: [/COLOR],[CR]]$INFO[MusicPlayer.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR],[CR]]$INFO[MusicPlayer.Time,[COLOR button_focus]$LOCALIZE[180]: [/COLOR],/]$INFO[MusicPlayer.Duration,,[CR]]</value>
+	</variable>
 	<variable name="MusicTrackInfo">
-		<value condition="String.IsEmpty(listitem.Title)">$INFO[listitem.TrackNumber, ]</value>
-		<value>$INFO[listitem.TrackNumber, ,.]$INFO[listitem.Title, ]</value>
+		<value condition="String.IsEmpty(listitem.Title)">$INFO[listitem.TrackNumber]</value>
+		<value>$INFO[listitem.TrackNumber,,.]$INFO[listitem.Title, ]</value>
 	</variable>
 	<variable name="WidgetGenreIconVar">
 		<value condition="System.HasAddon(resource.images.moviegenreicons.transparent)">$INFO[ListItem.Label,resource://resource.images.moviegenreicons.transparent/,.png]</value>
@@ -318,13 +320,13 @@
 	</variable>
 	<variable name="AddonsFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></value>
-		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="!String.IsEmpty(Container.ListItem.Art(fanart))">$INFO[Container.ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value>
 	</variable>
 	<variable name="HomeFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></value>
-		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="!String.IsEmpty(Container.ListItem.Art(fanart))">$INFO[Container.ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItem.Property(FanartCode))">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container.ListItem.Property(FanartCode)]$INFO[Skin.String(WeatherFanart.ext)]</value>
 		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path)) + Control.HasFocus(804)">$INFO[Skin.String(HomeFanart.path)]power$INFO[Skin.String(HomeFanart.ext)]</value>
@@ -335,7 +337,7 @@
 	</variable>
 	<variable name="MediaFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)"></value>
-		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) | Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) | Window.IsVisible(script-script.extendedinfo-VideoList.xml)">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo)">$INFO[Window(home).Property(infobackground)]</value>
 		<value condition="Container.Content(genres) + Window.IsActive(videos)">$INFO[Skin.String(MovieGenreFanart.path)]$INFO[ListItem.Label]$INFO[Skin.String(MovieGenreFanart.ext)]</value>
 		<value condition="Window.IsActive(pictures) + String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.FolderPath]</value>
 		<value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_503_NowPlaying.xml Added

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+	<include name="View_503_NowPlaying">
+		<control type="group">
+			<include>OpenClose_Right</include>
+			<left>596</left>
+			<visible>Control.IsVisible(503)</visible>
+			<include>Visible_Right</include>
+			<include content="ListContainer">
+				<param name="list_id" value="503" />
+				<param name="right" value="594" />
+				<param name="viewtype_label" value="$LOCALIZE[31000]" />
+			</include>
+			<control type="group">
+				<depth>DepthContentPanel</depth>
+				<control type="group">
+					<right>-20</right>
+					<width>634</width>
+					<include content="ContentPanel">
+						<param name="left" value="0" />
+						<param name="top" value="-20" />
+						<param name="width" value="656" />
+						<param name="flipx" value="true" />
+					</include>
+					<include content="RightListPanel">
+						<param name="list_id" value="503" />
+					</include>
+				</control>
+			</control>
+		</control>
+	</include>
+</includes>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_50_List.xml Changed

@@ -22,36 +22,100 @@
 						<param name="width" value="656" />
 						<param name="flipx" value="true" />
 					</include>
-					<control type="scrollbar" id="50600">
-						<left>20</left>
-						<top>list_y_offset</top>
-						<width>12</width>
-						<bottom>list_y_offset</bottom>
-						<onleft>50</onleft>
-						<onright>50</onright>
-						<orientation>vertical</orientation>
-						<animation effect="zoom" end="50,100" time="300" tween="sine" center="20,0" easing="inout" condition="!Control.HasFocus(50600)">conditional</animation>
-					</control>
+					<include content="RightListPanel">
+						<param name="list_id" value="50" />
+					</include>
+				</control>
+			</control>
+		</control>
+	</include>
+	<include name="RightListPanel">
+		<control type="group">
+			<depth>DepthContentPanel</depth>
+			<control type="group">
+				<right>-32</right>
+				<include content="ContentPanel">
+					<param name="left" value="0" />
+					<param name="top" value="-20" />
+					<param name="width" value="656" />
+					<param name="flipx" value="true" />
+				</include>
+				<control type="group">
+					<visible>!Container.Content(songs)</visible>
 					<control type="image">
 						<depth>DepthContentPopout</depth>
-						<left>38</left>
-						<right>36</right>
+						<left>48</left>
 						<top>120</top>
+						<width>540</width>
+						<height>850</height>
 						<bottom>124</bottom>
 						<fadetime>200</fadetime>
-						<aspectratio aligny="center">keep</aspectratio>
+						<aspectratio aligny="bottom">keep</aspectratio>
 						<texture fallback="DefaultVideo.png" background="true">$VAR[InfoWallThumbVar]</texture>
 					</control>
 					<control type="group">
-						<left>310</left>
-						<top>936</top>
+						<left>291</left>
+						<top>950</top>
 						<include content="RatingCircle">
 							<param name="animation" value="True" />
 						</include>
 					</control>
 				</control>
+				<control type="group">
+					<visible>Control.IsVisible(503) + Window.IsActive(musicplaylist)</visible>
+					<control type="image">
+						<left>58</left>
+						<top>110</top>
+						<width>540</width>
+						<height>470</height>
+						<aspectratio aligny="bottom">keep</aspectratio>
+						<fadetime>300</fadetime>
+						<texture fallback="DefaultAudio.png" background="true">$INFO[Player.Icon]</texture>
+					</control>
+					<control type="group">
+						<left>301</left>
+						<top>560</top>
+						<control type="group">
+							<animation effect="fade" time="0" condition="$PARAM[animation]">VisibleChange</animation>
+							<include content="UserRatingContent" condition="Skin.HasSetting(circle_userrating)">
+								<param name="infolabel" value="MusicPlayer.UserRating" />
+							</include>
+							<include content="UserRatingContent" condition="Skin.HasSetting(circle_rating)">
+								<param name="infolabel" value="MusicPlayer.Rating" />
+							</include>
+						</control>
+					</control>
+					<control type="textbox" id="15599">
+						<visible>Player.HasAudio + Window.IsActive(musicplaylist)</visible>
+						<left>58</left>
+						<top>600</top>
+						<width>540</width>
+						<bottom>70</bottom>
+						<autoscroll time="3000" delay="7000" repeat="5000">!System.HasModalDialog + Skin.HasSetting(AutoScroll)</autoscroll>
+						<label>[COLOR button_focus][B]$LOCALIZE[31000]: [/COLOR]$INFO[musicplayer.Playlistposition,]$INFO[musicplayer.Playlistlength,/][/B][CR]$VAR[NowPlayingInfoVar]</label>
+					</control>
+					<control type="textbox" id="15599">
+						<visible>!Player.HasAudio + Window.IsActive(musicplaylist)</visible>
+						<left>58</left>
+						<top>640</top>
+						<width>540</width>
+						<bottom>70</bottom>
+						<autoscroll time="3000" delay="7000" repeat="5000">!System.HasModalDialog + Skin.HasSetting(AutoScroll)</autoscroll>
+						<label>[COLOR button_focus][B]$LOCALIZE[31000]: [/COLOR]$LOCALIZE[36623][/B]</label>
+					</control>
+				</control>
 			</control>
 		</control>
+		<control type="scrollbar" id="$PARAM[list_id]600">
+			<left>20</left>
+			<top>list_y_offset</top>
+			<width>12</width>
+			<bottom>list_y_offset</bottom>
+			<onleft>$PARAM[list_id]</onleft>
+			<onright>$PARAM[list_id]</onright>
+			<orientation>vertical</orientation>
+			<animation effect="zoom" end="50,100" time="300" tween="sine" center="20,0" easing="inout" condition="!Control.HasFocus($PARAM[list_id]600)">conditional</animation>
+		</control>
 	</include>
 	<include name="ListContainer">
 		<param name="left">0</param>
@@ -72,7 +136,7 @@
 				<onup>$PARAM[list_id]</onup>
 				<ondown>$PARAM[list_id]</ondown>
 				<viewtype label="$PARAM[viewtype_label]">list</viewtype>
-				<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(games) | Window.IsActive(MyPlaylist.xml)</visible>
+				<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(games) | Window.IsActive(videoplaylist) | Window.IsActive(musicplaylist)</visible>
 				<focusedlayout height="list_item_height">
 					<control type="image">
 						<left>0</left>
@@ -90,7 +154,7 @@
 						<aligny>center</aligny>
 						<scroll>true</scroll>
 						<font>font27</font>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ListLabelVar]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
@@ -132,7 +196,7 @@
 						<bottom>0</bottom>
 						<aligny>center</aligny>
 						<font>font27</font>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ListLabelVar]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
@@ -165,32 +229,42 @@
 			<control type="group">
 				<depth>DepthContentPanel</depth>
 				<include content="ContentPanel">
-					<param name="width" value="654" />
+					<param name="width" value="656" />
 					<param name="flipx" value="$PARAM[flip_bg]" />
 				</include>
 				<control type="image">
 					<left>30</left>
-					<top>140</top>
-					<width>530</width>
+					<top>110</top>
+					<width>540</width>
 					<height>470</height>
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<fadetime>300</fadetime>
 					<texture fallback="$PARAM[fallback_image]" background="true">$VAR[IconWallThumbVar]</texture>
-					<visible>!String.IsEqual(ListItem.DbType,episode)</visible>
+					<visible>!String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song)</visible>
 				</control>
 				<control type="image">
 					<left>30</left>
-					<top>140</top>
-					<width>530</width>
+					<top>110</top>
+					<width>540</width>
 					<height>330</height>
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<fadetime>300</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
 					<visible>String.IsEqual(ListItem.DbType,episode)</visible>
 				</control>
+				<control type="image">
+					<left>30</left>
+					<top>110</top>
+					<width>540</width>
+					<height>470</height>
+					<aspectratio aligny="bottom">keep</aspectratio>
+					<fadetime>300</fadetime>
+					<texture fallback="DefaultAudio.png" background="true">$VAR[IconWallThumbVar]</texture>
+					<visible>String.IsEqual(ListItem.DBType,song)</visible>
+				</control>
 				<control type="group">
 					<left>273</left>
-					<top>590</top>
+					<top>560</top>
 					<include condition="Skin.HasSetting(circle_rating) | Skin.HasSetting(circle_userrating)">RatingCircle</include>
 					<animation effect="slide" end="0,-140" time="0" condition="String.IsEqual(ListItem.DbType,episode)">conditional</animation>
 				</control>
@@ -198,21 +272,29 @@
 					<visible>!Container.Content() | !String.isempty(ListItem.Plot)</visible>
 					<left>30</left>
 					<control type="textbox" id="15500">
-						<top>640</top>
-						<width>525</width>
-						<bottom>117</bottom>
+						<top>600</top>
+						<width>540</width>
+						<bottom>70</bottom>
 						<autoscroll time="3000" delay="7000" repeat="5000">!System.HasModalDialog + Skin.HasSetting(AutoScroll)</autoscroll>
 						<label>$VAR[ListBoxInfoVar]</label>
-						<visible>!String.IsEqual(ListItem.DbType,episode)</visible>
+						<visible>!String.IsEqual(ListItem.DbType,episode) + !String.IsEqual(ListItem.DBType,song)</visible>
 					</control>
 					<control type="textbox" id="15501">
-						<top>485</top>
-						<width>525</width>
-						<bottom>96</bottom>
+						<top>465</top>
+						<width>540</width>
+						<bottom>70</bottom>
 						<autoscroll time="3000" delay="7000" repeat="5000">!System.HasModalDialog + Skin.HasSetting(AutoScroll)</autoscroll>
 						<label>$INFO[ListItem.Plot]</label>
 						<visible>String.IsEqual(ListItem.DbType,episode)</visible>
 					</control>
+					<control type="textbox" id="15502">
+						<top>600</top>
+						<width>540</width>
+						<bottom>70</bottom>
+						<autoscroll time="3000" delay="3000" repeat="5000">!System.HasModalDialog + Skin.HasSetting(AutoScroll)</autoscroll>
+						<label>[COLOR button_focus][B]$LOCALIZE[31037]: [/COLOR]$INFO[Container.CurrentItem,,/]$INFO[Container.NumItems][/B][CR]$VAR[ListBoxInfoVar]</label>
+						<visible>String.IsEqual(ListItem.DBType,song)</visible>
+					</control>
 				</control>
 				<control type="group">
 					<left>20</left>
@@ -231,7 +313,7 @@
 					<control type="textbox">
 						<left>30</left>
 						<top>460</top>
-						<width>530</width>
+						<width>540</width>
 						<height>413</height>
 						<align>center</align>
 						<aligny>center</aligny>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_51_Poster.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_55_WideList.xml Changed

@@ -20,7 +20,7 @@
 				<onup>55</onup>
 				<ondown>55</ondown>
 				<viewtype label="$LOCALIZE[31107]">list</viewtype>
-				<focusedlayout height="list_item_height" condition="Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content(games)">
+				<focusedlayout height="list_item_height" condition="Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content(games) | Window.IsActive(videoplaylist) | Window.IsActive(musicplaylist)">
 					<control type="image">
 						<left>0</left>
 						<right>0</right>
@@ -42,7 +42,7 @@
 						<right>40</right>
 						<aligny>center</aligny>
 						<scroll>true</scroll>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ListLabelVar]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
@@ -56,7 +56,7 @@
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 				</focusedlayout>
-				<itemlayout height="list_item_height" condition="Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content(games)">
+				<itemlayout height="list_item_height" condition="Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content(games) | Window.IsActive(videoplaylist) | Window.IsActive(musicplaylist)">
 					<control type="image">
 						<left>35</left>
 						<centertop>50%</centertop>
@@ -70,7 +70,7 @@
 						<bottom>0</bottom>
 						<right>40</right>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ListLabelVar]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
@@ -134,7 +134,7 @@
 						<bottom>0</bottom>
 						<right>40</right>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ListLabelVar]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
@@ -148,7 +148,6 @@
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 				</itemlayout>
-
 				<focusedlayout height="list_item_height" condition="Container.Content(playlists) | Container.Content()">
 					<control type="image">
 						<left>0</left>
@@ -215,7 +214,7 @@
 				<right>40</right>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ListLabelVar]</label>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 			<control type="label">
@@ -224,7 +223,7 @@
 				<right>40</right>
 				<align>right</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label2]</label>
+				<label>$VAR[ListLabel2Var]</label>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 		</focusedlayout>
@@ -234,7 +233,7 @@
 				<height>80</height>
 				<right>40</right>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ListLabelVar]</label>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 			<control type="label">
@@ -243,7 +242,7 @@
 				<right>40</right>
 				<align>right</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label2]</label>
+				<label>$VAR[ListLabel2Var]</label>
 				<textcolor>grey</textcolor>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>

_service:download_files:master.tar.gz/addons/xbmc.addon/metadata.xsd Changed

_service:download_files:master.tar.gz/cmake/installdata/common/certificates.txt Changed

_service:download_files:master.tar.gz/cmake/modules/FindCrossGUID.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindEpollShim.cmake Added

_service:download_files:master.tar.gz/cmake/modules/FindFFMPEG.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindFmt.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindGIF.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindLibDvd.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindMariaDBClient.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindSmbClient.cmake Changed

_service:download_files:master.tar.gz/cmake/platform/darwin_embedded/tvos.cmake Added

_service:download_files:master.tar.gz/cmake/platform/freebsd/gbm.cmake Changed

_service:download_files:master.tar.gz/cmake/platform/linux/gbm.cmake Changed

_service:download_files:master.tar.gz/cmake/platform/linux/x11.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/android/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/common/AddonHelpers.cmake Changed

@@ -92,6 +92,7 @@
       endforeach()
     endif()
 
+    message(STATUS "Addon dependency check ...")
     # Set defines used in addon.xml.in and read from versions.h to set add-on
     # version parts automatically
     file(STRINGS ${KODI_INCLUDE_DIR}/versions.h BIN_ADDON_PARTS)
@@ -121,16 +122,14 @@
             foreach(src_file ${USED_SOURCES})
               file(STRINGS ${src_file} BIN_ADDON_SRC_PARTS)
               foreach(loop_var ${BIN_ADDON_SRC_PARTS})
-                string(FIND "${loop_var}" "#include" matchres)
-                if("${matchres}" EQUAL 0)
-                  string(REPLACE " " ";" loop_var "${loop_var}")
-                  list(GET loop_var 1 include_name)
-                  string(REGEX REPLACE "[<>\"]|kodi/" "" include_name "${include_name}")
-                  if(include_name MATCHES ${depend_header})
+                string(REGEX MATCH "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"](kodi\/)?(.+)[\">]" include_name "${loop_var}")
+                if(include_name AND CMAKE_MATCH_3 MATCHES ^${depend_header})
+                  get_directory_property(CURRENT_DEFS COMPILE_DEFINITIONS)
+                  if(NOT used_type_name IN_LIST CURRENT_DEFS)
                     set(ADDON_DEPENDS "${ADDON_DEPENDS}\n<import addon=\"${${xml_entry_name}}\" minversion=\"${${depends_minver}}\" version=\"${${depends_ver}}\"/>")
-                    # Inform with them the addon header about used type
+                    # Inform with them the addon header about used type, if not present before
                     add_definitions(-D${used_type_name})
-                    message(STATUS "Added usage definition: ${used_type_name}")
+                    message(STATUS " - Added API usage definition: ${used_type_name} (Version: \"${${depends_ver}}\", Min. Version: \"${${depends_minver}}\")")
                     set(FOUND_HEADER_USAGE 1)
                   endif()
                 endif()

_service:download_files:master.tar.gz/cmake/scripts/common/CheckTargetPlatform.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/common/HandleDepends.cmake Changed

@@ -78,8 +78,10 @@
           # make sure we create strings, not lists
           set(TMP_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_DEFINES}")
           set(TMP_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_DEFINES}")
+          set(TMP_EXE_LINKER_FLAGS "-L${OUTPUT_DIR}/lib ${CMAKE_EXE_LINKER_FLAGS}")
           list(APPEND BUILD_ARGS -DCMAKE_C_FLAGS=${TMP_C_FLAGS}
-                                 -DCMAKE_CXX_FLAGS=${TMP_CXX_FLAGS})
+                                 -DCMAKE_CXX_FLAGS=${TMP_CXX_FLAGS}
+                                 -DCMAKE_EXE_LINKER_FLAGS=${TMP_EXE_LINKER_FLAGS})
         endif()
 
         if(CMAKE_TOOLCHAIN_FILE)
@@ -226,7 +228,6 @@
                                     -DOUTPUT_DIR=${OUTPUT_DIR}
                                     -DCMAKE_PREFIX_PATH=${OUTPUT_DIR}
                                     -DCMAKE_INSTALL_PREFIX=${OUTPUT_DIR}
-                                    -DCMAKE_EXE_LINKER_FLAGS=-L${OUTPUT_DIR}/lib
                                     -DCMAKE_INCLUDE_PATH=${OUTPUT_DIR}/include)
             endif()

_service:download_files:master.tar.gz/cmake/scripts/common/PrepareEnv.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/darwin_embedded/ArchSetup.cmake Changed

@@ -38,10 +38,15 @@
                     "-framework CFNetwork" "-framework CoreGraphics"
                     "-framework Foundation" "-framework UIKit"
                     "-framework CoreMedia" "-framework AVFoundation"
-                    "-framework VideoToolbox" "-lresolv")
+                    "-framework VideoToolbox" "-lresolv" "-ObjC"
+                    "-framework AVKit")
 
 set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
 
+# AppleTV already has built-in AirPlay support
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  set(ENABLE_AIRTUNES OFF CACHE BOOL "" FORCE)
+endif()
 set(CMAKE_XCODE_ATTRIBUTE_INLINES_ARE_PRIVATE_EXTERN OFF)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN OFF)
 set(CMAKE_XCODE_ATTRIBUTE_COPY_PHASE_STRIP OFF)
@@ -52,6 +57,8 @@
 # Xcode strips dead code by default which breaks wrapping
 set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING OFF)
 
+option(ENABLE_XCODE_ADDONBUILD "Enable Xcode automatic addon building?" OFF)
+
 # Unify output directories for iOS/tvOS packaging scripts
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CORE_BUILD_DIR}/${CORE_BUILD_CONFIG})
 foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})

_service:download_files:master.tar.gz/cmake/scripts/darwin_embedded/ExtraTargets.cmake Added

@@ -0,0 +1,25 @@
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  # top shelf extension
+  set(TOPSHELF_EXTENSION_NAME "${APP_NAME_LC}-topshelf")
+  set(TOPSHELF_BUNDLE_EXTENSION appex)
+  set(TOPSHELF_DIR "${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/tvos/TopShelf")
+  # same path as the output Info.plist, taken from cmGlobalXCodeGenerator::ComputeInfoPListLocation()
+  set(ENTITLEMENTS_OUT_PATH "${CMAKE_BINARY_DIR}/CMakeFiles/${TOPSHELF_EXTENSION_NAME}.dir/TopShelf.entitlements")
+
+  set(SOURCES
+        ${TOPSHELF_DIR}/ServiceProvider.m
+        ${TOPSHELF_DIR}/../tvosShared.m)
+  set(HEADERS
+        ${TOPSHELF_DIR}/ServiceProvider.h
+        ${TOPSHELF_DIR}/../tvosShared.h)
+  add_executable(${TOPSHELF_EXTENSION_NAME} MACOSX_BUNDLE ${SOURCES} ${HEADERS})
+
+  configure_file(${TOPSHELF_DIR}/TopShelf.entitlements.in ${ENTITLEMENTS_OUT_PATH} @ONLY)
+  set_target_properties(${TOPSHELF_EXTENSION_NAME} PROPERTIES BUNDLE_EXTENSION ${TOPSHELF_BUNDLE_EXTENSION}
+                                                              MACOSX_BUNDLE_INFO_PLIST ${TOPSHELF_DIR}/Info.plist.in
+                                                              XCODE_PRODUCT_TYPE com.apple.product-type.tv-app-extension
+                                                              XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH})
+  target_link_libraries(${TOPSHELF_EXTENSION_NAME} "-framework TVServices" "-framework Foundation")
+
+  add_dependencies(${APP_NAME_LC} ${TOPSHELF_EXTENSION_NAME})
+endif()

_service:download_files:master.tar.gz/cmake/scripts/darwin_embedded/Install.cmake Changed

@@ -1,31 +1,52 @@
-# IOS packaging
-
-set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/media/splash.jpg
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png)
-
-target_sources(${APP_NAME_LC} PRIVATE ${BUNDLE_RESOURCES})
-foreach(file IN LISTS BUNDLE_RESOURCES)
-  set_source_files_properties(${file} PROPERTIES MACOSX_PACKAGE_LOCATION .)
-endforeach()
-
-target_sources(${APP_NAME_LC} PRIVATE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchScreen.storyboard)
-set_source_files_properties(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchScreen.storyboard PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+# IOS/TVOS packaging
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  # asset catalog
+  set(ASSET_CATALOG "${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/tvos/Assets.xcassets")
+  set(ASSET_CATALOG_ASSETS Assets)
+  set(ASSET_CATALOG_LAUNCH_IMAGE LaunchImage)
 
-# setup code signing
+  message("generating missing asset catalog images...")
+  execute_process(COMMAND ${CMAKE_SOURCE_DIR}/tools/darwin/Support/GenerateMissingImages-tvos.py "${ASSET_CATALOG}" ${ASSET_CATALOG_ASSETS} ${ASSET_CATALOG_LAUNCH_IMAGE})
+
+  target_sources(${APP_NAME_LC} PRIVATE "${ASSET_CATALOG}")
+  set_source_files_properties("${ASSET_CATALOG}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") # adds to Copy Bundle Resources build phase
+
+  # entitlements
+  set(ENTITLEMENTS_OUT_PATH "${CMAKE_BINARY_DIR}/CMakeFiles/${APP_NAME_LC}.dir/Kodi.entitlements")
+  configure_file(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/tvos/Kodi.entitlements.in ${ENTITLEMENTS_OUT_PATH} @ONLY)
+
+  set_target_properties(${APP_NAME_LC} PROPERTIES XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME ${ASSET_CATALOG_ASSETS}
+                                                  XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME ${ASSET_CATALOG_LAUNCH_IMAGE}
+                                                  XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH})
+
+else()
+  set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/media/splash.jpg
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png)
+
+  target_sources(${APP_NAME_LC} PRIVATE ${BUNDLE_RESOURCES})
+  foreach(file IN LISTS BUNDLE_RESOURCES)
+    set_source_files_properties(${file} PROPERTIES MACOSX_PACKAGE_LOCATION .)
+  endforeach()
+
+  target_sources(${APP_NAME_LC} PRIVATE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchScreen.storyboard)
+  set_source_files_properties(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchScreen.storyboard PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
+endif()
 
+# setup code signing
 # dev team ID / identity (certificate)
 set(DEVELOPMENT_TEAM "" CACHE STRING "Development Team")
 set(CODE_SIGN_IDENTITY $<IF:$<BOOL:${DEVELOPMENT_TEAM}>,iPhone\ Developer,> CACHE STRING "Code Sign Identity")
@@ -36,11 +57,44 @@
 if(PROVISIONING_PROFILE_APP)
   set(CODE_SIGN_STYLE_APP Manual)
 endif()
+
+# top shelf provisioning profile
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  set(CODE_SIGN_STYLE_TOPSHELF Automatic)
+  set(PROVISIONING_PROFILE_TOPSHELF "" CACHE STRING "Provisioning profile name for the Top Shelf")
+  if(PROVISIONING_PROFILE_TOPSHELF)
+    set(CODE_SIGN_STYLE_TOPSHELF Manual)
+  endif()
+  set_target_properties(${TOPSHELF_EXTENSION_NAME} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${CODE_SIGN_IDENTITY}"
+                                                              XCODE_ATTRIBUTE_CODE_SIGN_STYLE ${CODE_SIGN_STYLE_TOPSHELF}
+                                                              XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM}"
+                                                              XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "${PROVISIONING_PROFILE_TOPSHELF}")
+  # copy extension inside PlugIns dir of the app bundle
+  add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory $<TARGET_BUNDLE_DIR:${TOPSHELF_EXTENSION_NAME}>
+                                                      $<TARGET_BUNDLE_DIR:${APP_NAME_LC}>/PlugIns/${TOPSHELF_EXTENSION_NAME}.${TOPSHELF_BUNDLE_EXTENSION}
+                                                      MAIN_DEPENDENCY ${TOPSHELF_EXTENSION_NAME})
+endif()
 set_target_properties(${APP_NAME_LC} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${CODE_SIGN_IDENTITY}"
                                                 XCODE_ATTRIBUTE_CODE_SIGN_STYLE ${CODE_SIGN_STYLE_APP}
                                                 XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM}"
                                                 XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "${PROVISIONING_PROFILE_APP}")
 
+# Create xcode target that allows to build binary-addons.
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  if(ADDONS_TO_BUILD)
+    set(_addons "ADDONS=${ADDONS_TO_BUILD}")
+  endif()
+  add_custom_target(binary-addons
+    COMMAND $(MAKE) -C ${CMAKE_SOURCE_DIR}/tools/depends/target/binary-addons clean
+    COMMAND $(MAKE) -C ${CMAKE_SOURCE_DIR}/tools/depends/target/binary-addons VERBOSE=1 V=99
+          INSTALL_PREFIX="${CMAKE_BINARY_DIR}/addons" CROSS_COMPILING=yes ${_addons})
+  if(ENABLE_XCODE_ADDONBUILD)
+    add_dependencies(${APP_NAME_LC} binary-addons)
+  endif()
+  unset(_addons)
+endif()
+
 add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
     # TODO: Remove in sync with CopyRootFiles-darwin_embedded expecting the ".bin" file
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}>
@@ -53,16 +107,26 @@
     COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
             "PYTHON_VERSION=${PYTHON_VERSION}"
             ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-darwin_embedded.command
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-dylibs2frameworks.command
     COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
             "NATIVEPREFIX=${NATIVEPREFIX}"
             ${CMAKE_SOURCE_DIR}/tools/darwin/Support/Codesign.command
 )
 
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/share/${APP_NAME_LC} $<TARGET_FILE_DIR:${APP_NAME_LC}>/AppData/AppHome
+  )
+endif()
+
 set(DEPENDS_ROOT_FOR_XCODE ${NATIVEPREFIX}/..)
 configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in
                ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh.in
-               ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh @ONLY)
+               
+if(CORE_PLATFORM_NAME_LC STREQUAL ios)
+  configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh.in
+                 ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh @ONLY)
+endif()
 
 add_custom_target(deb
     COMMAND sh ./mkdeb-darwin_embedded.sh ${CORE_BUILD_CONFIG}

_service:download_files:master.tar.gz/cmake/scripts/darwin_embedded/Macros.cmake Changed

-(symlink to ../osx/Macros.cmake)
@@ -0,0 +1,118 @@
+function(core_link_library lib wraplib)
+  if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL Ninja)
+    set(wrapper_obj cores/dll-loader/exports/CMakeFiles/wrapper.dir/wrapper.c.o)
+  elseif(CMAKE_GENERATOR MATCHES "Xcode")
+    set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/wrapper.o)
+  else()
+    message(FATAL_ERROR "Unsupported generator in core_link_library")
+  endif()
+
+  set(export -bundle -undefined dynamic_lookup
+             -Wl,-alias_list,${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cores/dll-loader/exports/wrapper.def
+             ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${wrapper_obj})
+  set(extension ${CMAKE_SHARED_MODULE_SUFFIX})
+  set(check_arg "")
+  if(TARGET ${lib})
+    set(target ${lib})
+    set(link_lib $<TARGET_FILE:${lib}>)
+    set(check_arg ${ARGV2})
+    set(data_arg  ${ARGV3})
+
+    # iOS: EFFECTIVE_PLATFORM_NAME is not resolved
+    # http://public.kitware.com/pipermail/cmake/2016-March/063049.html
+    if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+      get_target_property(dir ${lib} BINARY_DIR)
+      set(link_lib ${dir}/${CORE_BUILD_CONFIG}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    endif()
+  else()
+    set(target ${ARGV2})
+    set(link_lib ${lib})
+    set(check_arg ${ARGV3})
+    set(data_arg ${ARGV4})
+  endif()
+  if(check_arg STREQUAL export)
+    set(export ${export}
+        -Wl,--version-script=${ARGV3})
+  elseif(check_arg STREQUAL extras)
+    foreach(arg ${data_arg})
+      list(APPEND export ${arg})
+    endforeach()
+  elseif(check_arg STREQUAL archives)
+    set(extra_libs ${data_arg})
+  endif()
+  get_filename_component(dir ${wraplib} DIRECTORY)
+
+  # We can't simply pass the linker flags to the args section of the custom command
+  # because cmake will add quotes around it (and the linker will fail due to those).
+  # We need to do this handstand first ...
+  string(REPLACE " " ";" CUSTOM_COMMAND_ARGS_LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS})
+
+  add_custom_command(OUTPUT ${wraplib}-${ARCH}${extension}
+                     COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
+                     COMMAND ${CMAKE_C_COMPILER}
+                     ARGS    ${CUSTOM_COMMAND_ARGS_LDFLAGS} ${export} -Wl,-force_load ${link_lib} ${extra_libs}
+                             -o ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension}
+                     DEPENDS ${target} wrapper.def wrapper
+                     VERBATIM)
+
+  get_filename_component(libname ${wraplib} NAME_WE)
+  add_custom_target(wrap_${libname} ALL DEPENDS ${wraplib}-${ARCH}${extension})
+  set_target_properties(wrap_${libname} PROPERTIES FOLDER lib/wrapped)
+  add_dependencies(${APP_NAME_LC}-libraries wrap_${libname})
+
+  set(LIBRARY_FILES ${LIBRARY_FILES} ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension} CACHE STRING "" FORCE)
+endfunction()
+
+function(find_soname lib)
+  cmake_parse_arguments(arg "REQUIRED" "" "" ${ARGN})
+
+  string(TOLOWER ${lib} liblow)
+  if(${lib}_LDFLAGS)
+    set(link_lib "${${lib}_LDFLAGS}")
+  else()
+    set(link_lib "${${lib}_LIBRARIES}")
+  endif()
+
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -print-search-dirs
+                  COMMAND fgrep libraries:
+                  COMMAND sed "s/[^=]*=\$.*\$/\\1/"
+                  COMMAND sed "s/:/ /g"
+                  ERROR_QUIET
+                  OUTPUT_VARIABLE cc_lib_path
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND echo ${link_lib}
+                  COMMAND sed "s/-L[ ]*//g"
+                  COMMAND sed "s/-l[^ ]*//g"
+                  ERROR_QUIET
+                  OUTPUT_VARIABLE env_lib_path
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  foreach(path ${cc_lib_path} ${env_lib_path})
+    if(IS_DIRECTORY ${path})
+      execute_process(COMMAND ls -- ${path}/lib${liblow}.dylib
+                      ERROR_QUIET
+                      OUTPUT_VARIABLE lib_file
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    else()
+      set(lib_file ${path})
+    endif()
+    if(lib_file)
+      # we want the path/name that is embedded in the dylib
+      execute_process(COMMAND otool -L ${lib_file}
+                      COMMAND grep -v lib${liblow}.dylib
+                      COMMAND grep ${liblow}
+                      COMMAND awk "{V=1; print $V}"
+                      ERROR_QUIET
+                      OUTPUT_VARIABLE filename
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      get_filename_component(${lib}_SONAME "${filename}" NAME)
+      if(VERBOSE)
+        message(STATUS "${lib} soname: ${${lib}_SONAME}")
+      endif()
+    endif()
+  endforeach()
+  if(arg_REQUIRED AND NOT ${lib}_SONAME)
+    message(FATAL_ERROR "Could not find dynamically loadable library ${lib}")
+  endif()
+  set(${lib}_SONAME ${${lib}_SONAME} PARENT_SCOPE)
+endfunction()

_service:download_files:master.tar.gz/cmake/scripts/darwin_embedded/PathSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/freebsd/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/linux/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/osx/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/windows/ArchSetup.cmake Changed

@@ -45,12 +45,9 @@
                    -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi"
                    -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi"
                    -DUNICODE -D_UNICODE
+                   -DFRIBIDI_STATIC
                    $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
 
-if(${ARCH} STREQUAL win32)
-  list(APPEND SYSTEM_DEFINES $<$<CONFIG:Debug>:-D_ITERATOR_DEBUG_LEVEL=0>)
-endif()
-
 # Additional SYSTEM_DEFINES
 list(APPEND SYSTEM_DEFINES -DHAS_WIN32_NETWORK -DHAS_FILESYSTEM_SMB)
 
@@ -73,7 +70,8 @@
 
 # Additional libraries
 list(APPEND DEPLIBS bcrypt.lib d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib
-                    PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib Mincore.lib)
+                    PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib version.lib
+                    crypt32.lib)
 
 # NODEFAULTLIB option
 set(_nodefaultlibs_RELEASE libcmt)
@@ -86,7 +84,7 @@
 endforeach()
 
 # DELAYLOAD option
-set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll
+set(_delayloadlibs zlib.dll libmariadb.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll
                    d3dcompiler_47.dll)
 foreach(_lib ${_delayloadlibs})
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"")

_service:download_files:master.tar.gz/cmake/scripts/windowsstore/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/windowsstore/Macros.cmake Changed

_service:download_files:master.tar.gz/cmake/treedata/common/subdirs.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/darwin_embedded/ios/ios.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/darwin_embedded/subdirs.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/darwin_embedded/tvos Added

_service:download_files:master.tar.gz/cmake/treedata/darwin_embedded/tvos/tvos.txt Added

_service:download_files:master.tar.gz/cmake/treedata/freebsd/subdirs.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/linux/tests.txt Added

_service:download_files:master.tar.gz/cmake/treedata/optional/common/avahi.txt Added

_service:download_files:master.tar.gz/cmake/treedata/osx/subdirs.txt Changed

_service:download_files:master.tar.gz/docs/README.Android.md Changed

_service:download_files:master.tar.gz/docs/README.Linux.md Changed

_service:download_files:master.tar.gz/docs/README.iOS.md Changed

_service:download_files:master.tar.gz/docs/README.macOS.md Changed

@@ -55,11 +55,9 @@
 ## 2. Prerequisites
 * **[Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html)**
 * **[Xcode](https://developer.apple.com/xcode/)**. Install it from the AppStore or from the **[Apple Developer Homepage](https://developer.apple.com/)**.
-* Device with **OSX 10.9 or newer** to run Kodi after build.
+* Device with **OSX 10.13 or newer** to run Kodi after build.
 
 Building for OSX/macOS should work with the following constellations of Xcode and OSX/macOS versions:
-  * Xcode 8.x on OSX 10.11.x (El Capitan)
-  * Xcode 9.x on OSX 10.12.x (Sierra)
   * Xcode 9.x on macOS 10.13.x (High Sierra)
 
 **WARNING:** Start Xcode after installation finishes. You need to accept the licenses and install missing components.
@@ -84,20 +82,13 @@
 
 **TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
 
-Configure build for 64bit (**recommended**):
+Configure build:
 ```
 cd $HOME/kodi/tools/depends
 ./bootstrap
 ./configure --host=x86_64-apple-darwin
 ```
 
-Or configure build for 32bit:
-```
-cd $HOME/kodi/tools/depends
-./bootstrap
-./configure --host=i386-apple-darwin
-```
-
 Build tools and dependencies:
 ```
 make -j$(getconf _NPROCESSORS_ONLN)
@@ -107,9 +98,9 @@
 
 **WARNING:** Look for the `Dependencies built successfully.` success message. If in doubt run a single threaded `make` command until the message appears. If the single make fails, clean the specific library by issuing `make -C target/<name_of_failed_lib> distclean` and run `make`again.
 
-**NOTE:** **Advanced developers** may want to specify an SDK version (if multiple versions are installed) in the configure line(s) shown above. The example below would use SDK 10.9:
+**NOTE:** **Advanced developers** may want to specify an SDK version (if multiple versions are installed) in the configure line(s) shown above. The example below would use SDK 10.13:
 ```
-./configure --host=x86_64-apple-darwin --with-sdk=10.9
+./configure --host=x86_64-apple-darwin --with-sdk=10.13
 ```
 
 **[back to top](#table-of-contents)** | **[back to section top](#4-configure-and-build-tools-and-dependencies)**
@@ -168,17 +159,12 @@
 cd $HOME/kodi-build
 ```
 
-Generate Xcode project for 64bit (**recommended**):
+Generate Xcode project:
 ```
 /Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.13_x86_64-target-debug/share/Toolchain.cmake ../kodi
 ```
 
-Or generate Xcode project for 32bit:
-```
-/Users/Shared/xbmc-depends/x86_64-darwin17.5.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/macosx10.13_i386-target-debug/share/Toolchain.cmake ../kodi
-```
-
-**WARNING:** The toolchain file location differs depending on SDK version. You have to replace `x86_64-darwin17.5.0-native` and `macosx10.13_x86_64-target-debug` or `macosx10.13_i386-target-debug` in the paths above with the correct ones on your system.
+**WARNING:** The toolchain file location differs depending on SDK version. You have to replace `x86_64-darwin17.5.0-native` and `macosx10.13_x86_64-target-debug` in the paths above with the correct ones on your system.
 
 You can check `Users/Shared/xbmc-depends` directory content with:
 ```

_service:download_files:master.tar.gz/docs/README.md Changed

_service:download_files:master.tar.gz/docs/README.tvOS.md Changed

@@ -8,13 +8,21 @@
 2. **[Prerequisites](#2-prerequisites)**
 3. **[Get the source code](#3-get-the-source-code)**
 4. **[Configure and build tools and dependencies](#4-configure-and-build-tools-and-dependencies)**
-5. **[Build binary add-ons](#5-build-binary-add-ons)**
-6. **[Build Kodi](#6-build-kodi)**
-  6.1. **[Generate Project Files](#61-Generate-Project-Files)**  
-  6.2. **[Build with Xcode](#62-build)**  
-7. **[Package](#7-package)**
-8. **[Install](#8-install)**
-9. **[Gesture Handling](#9-gesture-handling)**
+5. **[Generate Kodi Build files](#5-Generate-Kodi-Build-files)**  
+  5.1. **[Generate XCode Project Files](#51-Generate-Xcode-Project-Files)**  
+  5.2. **[Build with Xcode](#62-build)**  
+6. **[Build Kodi](#6-build-kodi)**  
+  6.1. **[Build with Xcode](#61-Build-with-Xcode)**  
+  6.2. **[Build with xcodebuild](#62-Build-with-xcodebuild)**  
+7. **[Packaging to distribute as deb](#7-Packaging-to-distribute-as-deb)**  
+  7.1. **[Package via Xcode](#71-Package-via-Xcode)**  
+  7.2. **[Package via Xcodebuild](#72-Package-via-Xcodebuild)**  
+8. **[Signing](#8-Signing)**  
+  8.1. **[Signing using a developer account](#81-Signing-using-a-developer-account)**  
+  8.2. **[Using iOS App Signer to install](#82-Using-iOS-App-Signer-to-install)**  
+9. **[Install](#9-Install)**  
+  9.1. **[Jailbroken devices](#91-Jailbroken-devices)**  
+  9.2. **[Using Xcode to install](#92-Using-Xcode-to-install)**  
 
 ## 1. Document conventions
 This guide assumes you are using `terminal`, also known as `console`, `command-line` or simply `cli`. Commands need to be run at the terminal, one at a time and in the provided order.
@@ -54,8 +62,7 @@
 * **[Xcode](https://developer.apple.com/xcode/)**. Install it from the AppStore or from the **[Apple Developer Homepage](https://developer.apple.com/)**.
 * Device with **tvOS 11.0 or newer** to install Kodi after build.
 
-Building for tvOS should work with the following constellations of Xcode and macOS versions:
-  * Xcode 9.x against tvOS SDK 11.x on 10.12.x (Sierra)
+Building for tvOS should work with the following combinations of Xcode and macOS versions:
   * Xcode 9.x against tvOS SDK 11.x on 10.13.x (High Sierra)(recommended)
   * Xcode 9.x against tvOS SDK 11.x on 10.14.x (Mojave)(recommended)
   * Xcode 10.x against tvOS SDK 12.x on 10.14.x (Mojave)(recommended)
@@ -80,9 +87,7 @@
 ## 4. Configure and build tools and dependencies
 Kodi can be built as a 64bit program only for tvOS. The dependencies are built in `$HOME/kodi/tools/depends` and installed into `/Users/Shared/xbmc-depends`.
 
-**TIP:** Look for comments starting with `Or ...` and only execute the command(s) you need.
-
-Configure build for 64bit:
+Configure build:
 ```
 cd $HOME/kodi/tools/depends
 ./bootstrap
@@ -103,140 +108,141 @@
 ./configure --host=arm-apple-darwin --with-platform=tvos --with-sdk=11.0
 ```
 
-**[back to top](#table-of-contents)** | **[back to section top](#4-configure-and-build-tools-and-dependencies)**
+**[back to top](#table-of-contents)**
 
-## 5. Build binary add-ons
+## 5. Generate Kodi Build files
+Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. CMake is built as part of the dependencies and doesn't have to be installed separately. A toolchain file is also generated and is used to configure CMake.
+Default behaviour will not build binary addons. To add addons to your build go to **[Add Binary Addons to Project](#52-Add-Binary-Addons-to-Project)**
 
-**NOTE:** The below is not currently possible in Kodi master repo
+## 5.1. Generate XCode Project Files
 
-You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
+Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. CMake is built as part of the dependencies and doesn't have to be installed separately. A toolchain file is also generated and is used to configure CMake.
 
-Change to Kodi's source code directory:
+Create an out-of-source build directory:
 ```
-cd $HOME/kodi
+mkdir $HOME/kodi-build
 ```
 
-Build all add-ons:
+Generate Xcode project for TVOS:
 ```
-make -C tools/depends/target/binary-addons
+make -C tools/depends/target/cmakebuildsys BUILD_DIR=$HOME/kodi-build
 ```
 
-Build specific add-ons:
-```
-make -C tools/depends/target/binary-addons ADDONS="audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu"
-```
+**TIP:** BUILD_DIR can be omitted, and project will be created in $HOME/kodi/build
+Change all relevant paths onwards if omitted.
 
-Build a specific group of add-ons:
-```
-make -j$(getconf _NPROCESSORS_ONLN) -C tools/depends/target/binary-addons ADDONS="pvr.*"
-```
+Additional cmake arguments can be supplied via the CMAKE_EXTRA_ARGUMENTS command line variable
 
-**[back to top](#table-of-contents)**
+An example to set signing settings in xcode project:
+````
+make -C tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-DPLATFORM_BUNDLE_IDENTIFIER='tv.kodi.kodi' -DCODE_SIGN_IDENTITY='iPhone Developer: *** (**********)' -DPROVISIONING_PROFILE_APP='tv.kodi.kodi' -DPROVISIONING_PROFILE_TOPSHELF='tv.kodi.kodi.Topshelf'"
+````
+Available Signing arguments
 
-## 6. Build Kodi
+PLATFORM_BUNDLE_IDENTIFIER - bundle ID (used for the app, top shelf and entitlements)  
+DEVELOPMENT_TEAM - dev team ID  **OR** CODE_SIGN_IDENTITY - certificate name  
+PROVISIONING_PROFILE_APP - provprofile name for the app  
+PROVISIONING_PROFILE_TOPSHELF - provprofile name for the top shelf  
 
-**NOTE:** The below is not currently possible in Kodi master repo
+## 5.2. Add Binary Addons to Project
 
-## 6.1. Generate Project Files
+**TIP:** If you wish to add signing settings automatically, look at **[Generate XCode Project Files](#51-Generate-XCode-Project-Files)** for the additional `CMAKE_EXTRA_ARGUMENTS`
 
-Before you can use Xcode to build Kodi, the Xcode project has to be generated with CMake. CMake is built as part of the dependencies and doesn't have to be installed separately. A toolchain file is also generated and is used to configure CMake.
+You can find a complete list of available binary add-ons **[here](https://github.com/xbmc/repo-binary-addons)**.
 
-Create an out-of-source build directory:
+Binary addons will be built as a dependency in the Xcode project. You can choose the addons you wish to build during the Xcode project generation step
+
+Generate Xcode project to build specific add-ons:
 ```
-mkdir $HOME/kodi-build
+make -C tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-DENABLE_XCODE_ADDONBUILD=ON -DADDONS_TO_BUILD='audioencoder.flac pvr.vdr.vnsi audiodecoder.snesapu'"
 ```
 
-Generate Xcode project as per configure command in **[Configure and build tools and dependencies](#4-configure-and-build-tools-and-dependencies)**:
+Generate Xcode project to build a specific group of add-ons:
 ```
-make -C tools/depends/target/cmakebuildsys BUILD_DIR=$HOME/kodi-build
+make -C tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-DENABLE_XCODE_ADDONBUILD=ON -DADDONS_TO_BUILD='pvr.*'"
 ```
 
-**TIP:** BUILD_DIR can be omitted, and project will be created in $HOME/kodi/build
-Change all relevant paths onwards if omitted.
-
-Additional cmake arguments can be supplied via the CMAKE_EXTRA_ARGUMENTS command line variable
-
-Alternatively:
-`
-Generate Xcode project for ARM 64bit (**recommended**):
+Generate Xcode project to build all add-ons automatically:
 ```
-/Users/Shared/xbmc-depends/x86_64-darwin18.5.0-native/bin/cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=/Users/Shared/xbmc-depends/appletvos12.2_arm64-target-debug/share/Toolchain.cmake $HOME/kodi
+make -C tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-DENABLE_XCODE_ADDONBUILD=ON"
 ```
 
-**WARNING:** The toolchain file location differs depending on your tvOS and SDK version. You have to replace `x86_64-darwin18.5.0-native` and `appletvos12.2_arm64-target-debug` in the paths above with the correct ones on your system.
-
-You can check `Users/Shared/xbmc-depends` directory content with:
+**TIP:** If you wish to not automatically build addons added to your xcode project, omit `-DENABLE_XCODE_ADDONBUILD=ON`. The target will be added to the project, but the dependency will not be set to automatically build
+**TIP:** Binary add-ons added to the generated Xcode project can be built independently of the Kodi app by selecting the scheme/target `binary-addons` in the Xcode project.
+You can also build the binary-addons target via xcodebuild. This will not build the Kodi App, but will build any/all binary addons added for the project Generation.
 ```
-ls -l /Users/Shared/xbmc-depends
+xcodebuild -config "Debug" -target binary-addons
 ```
-## 6.2 Build 
+**[back to top](#table-of-contents)** | **[back to section top](#5-Generate-Kodi-Build-files)**
+
+## 6. Build
+
+### 6.1. Build with Xcode
 
-**Start Xcode, open the Kodi project file** (`kodi.xcodeproj`) located in `$HOME/kodi-build` and hit `Build`.
+Start Xcode, open the Kodi project file created in **[Generate Kodi Build files](#5-Generate-Kodi-Build-files)**
 
-**WARNING:** If you have selected a specific tvOS SDK Version in step 4 then you might need to adapt the active target to use the same tvOS SDK version, otherwise build will fail. Be sure to select a device configuration. Building for simulator is not supported.
+**TIP:** (`kodi.xcodeproj`) is located in `$HOME/kodi-build`
 
-**Alternatively**, you can also build via Xcode from the command-line with `xcodebuild`:
+Once the project has loaded, select `Generic TvOs Device` (or your actual connected device if you have it connected) and hit `Build`.
 
-Build Kodi:
+This will create a `Kodi.app` file located in `$HOME/kodi-build/build/Debug-appletvos`. This App can be deployed via Xcode to an AppleTV via `Window -> Devices and Simulators -> Select device and click +`
+
+**TIP:** If you build as a release target, the location of the `Kodi.app` will be `$HOME/kodi-build/build/Release-appletvos`
+
+**WARNING:** If you have selected a specific tvOS SDK Version in step 4 then you might need to adapt the active target to use the same tvOS SDK version, otherwise build will fail. Be sure to select a device configuration.
+**WARNING:** Building for simulator is NOT supported.
+
+### 6.2. Build with xcodebuild
+Alternatively, you can also build via Xcode from the command-line with `xcodebuild`, triggered by CMake:
+
+Change to build directory:
 ```
 cd $HOME/kodi-build
 xcodebuild -config "Debug" -jobs $(getconf _NPROCESSORS_ONLN)
 ```
 
+This will create a `Kodi.app` file located in `$HOME/kodi-build/build/Debug-appletvos`. This App can be deployed via Xcode to an AppleTV via `Window -> Devices and Simulators -> Select device and click +`
+
 **TIP:** You can specify Release instead of Debug as -config parameter.
+**TIP:** If you build as a release target, the location of the `Kodi.app` will be `$HOME/kodi-build/build/Release-appletvos`
 
-**[back to top](#table-of-contents)** | **[back to section top](#6-build-kodi)**
+**[back to top](#table-of-contents)** | **[back to section top](#6-Build)**
 
-## 7. Package
+## 7. Packaging to distribute as deb
 CMake generates a target called `deb` which will package Kodi ready for distribution. After Kodi has been built, the target can be triggered by selecting it in Xcode active scheme or manually running
 
-```
-cd $HOME/kodi-build
-xcodebuild -target deb
-```
+## 7.1. Package via Xcode
 
-**Alternatively**
+Start Xcode, open the Kodi project file created in **[Generate XCode Project Files](#51-Generate-Project-Files)**
 
-```
-cd $HOME/kodi-build
-/Users/Shared/xbmc-depends/x86_64-darwin18.5.0-native/bin/cmake --build . --target "deb" --config "Debug"
-```
+**TIP:** (`kodi.xcodeproj`) is located in `$HOME/kodi-build`
 
-The generated package will be located at $HOME/kodi-build/tools/darwin/packaging/tvos.
+Click on `Product` in the top menu bar, and then go to `Scheme`, then select `deb`
 
-**[back to top](#table-of-contents)**
+Hit `Build`
 
-## 8. Install
+**TIP:** The generated package will be located at $HOME/kodi-build/tools/darwin/packaging/tvos.
 
-There are a few different methods that can be used to install kodi on an AppleTV 4/4K.
+## 7.2. Package via Xcodebuild
 
-### Jailbroken devices
-On jailbroken devices the resulting deb file can be copied to the tvOS device via *ssh/scp* and installed manually. You need to SSH into the tvOS device and issue:
+Change to build directory:
 ```
-dpkg -i <name of the deb file>
+cd $HOME/kodi-build
+xcodebuild -target deb
 ```
 
-### Using Code Signing instead
-
-Whether you have paid or free developer account you can deploy Kodi via Xcode to work on a non-jailbroken devices.
-
-#### Wirelessly connecting to AppleTV 4/4K
-The Apple TV 4K cannot be connected to mac via a cable so the connection must be wireless to XCode to add the application.
+**TIP:** The generated package will be located at $HOME/kodi-build/tools/darwin/packaging/tvos.
 
-  1. Make sure your Mac and your Apple TV are on the same network.
-  2. Choose `Window->Devices and Simulators`, then in the window that appears, click Devices.
-  3. On your Apple TV, open the Settings app and choose `Remotes and Devices->Remote App and Devices`.
-  4. The Apple TV searches for possible devices including the Mac. (If you have any Firewall or Internet security, disable/turn off to allow searching.)
-  5. On your Mac, select the Apple TV in the Devices pane. The pane for the Apple TV is displayed and shows the current status of the connection request.
-  6. Enter the verification code displayed on your AppleTV into the Device window pane for the device and click Connect.
+**[back to top](#table-of-contents)**
 
-Xcode sets up the Apple TV for wireless debugging and pairs with the device.
+## 8. Signing
 
-#### Signing using a paid developer accounts
-For this to work you need to alter the Xcode project by setting your codesign identity.
+**TIP:** If your device is jailbroken, you can go direct to **[Installing on Jailbroken Device](#91-Jailbroken-devices)**
 
-#### Signing using a free developer account
+## 8.1. Signing using a developer account
 
+For this to work you need to alter the Xcode project by setting your codesign identity or supplying credentials during
+xcode generation.
 Note that using a free developer account the signing will need to be reapplied every 7 days.
 
   1. Open the Xcode project in Xcode as above (requires Xcode 7 or later)
@@ -246,23 +252,53 @@
   3. Under the `General` tab, enter a unique bundle identifer and check the box to `Automatically Manage Signing`.
   4. Select your team under `Automatically Manage Signing`.
 
-#### An important note on Code Signing
+## An important note on Code Signing
 It's also important that you select the signing on all 4 spots in the project settings. After the last buildstep, our support script will do a full sign of all binaries and bundle them with the given identity, including all the `*.viz`, `*.pvr`, `*.so`, etc. files Xcode doesn't know anything about. This should allow you to deploy Kodi to all non-jailbroken devices the same way you deploy normal apps to.
 In that case Kodi will be sandboxed like any other app. All Kodi files are then located in the sandboxed *Documents* folder and can be easily accessed via iTunes file sharing.
 
-### Installing on AppleTV
-There are two options for deplying to your AppleTV 4/4K. The first is just by using Run in XCode for a debugging sessions.
+## 8.2. Using iOS App Signer to install
 
-Note that if you get a App Verification Failed error message when trying to to use `Run` you can delete two files in the created Kodi.app.
+  1. Build the deb target via xcodebuild or Xcode as per **[Build Kodi](#6-build-kodi)**
+  2. Open iOS Appsigner
+  3. Browse to $HOME/kodi/build/tools/darwin/packaging/tvos for your input file
+  4. Select your signing certificate
+  5. Select your provisioning profile
+  6. Click start and select save location for the ipa file
+  7. Run Xcode -> Window -> Devices and Simulators
+  8. Select your Apple TV you setup in earlier for Wireless connecting press the +
+  9. Find your ipa file and click open.
+
+**[back to top](#table-of-contents)**
 
- * `rm -rf $HOME/kodi-build/build/Debug-appletvos/Kodi.app/_CodeSignature`
- * `rm -f $HOME/kodi-build/build/Debug-appletvos/Kodi.app/embedded.*provision`
+## 9. Install
 
-The alternative is to deploy the output of the `deb` target. To do this:
+There are a number of different methods that can be used to install kodi on an AppleTV 4/4K.
+
+## 9.1. Jailbroken devices
+On jailbroken devices the resulting deb file created from **[Packaging to distribute as deb](#7-Packaging-to-distribute-as-deb)** can be copied to the tvOS device via *ssh/scp* and installed manually. You need to SSH into the tvOS device and issue:
+```
+dpkg -i <name of the deb file>
+```
+
+## 9.2. Using Xcode to install
+
+Whether you have paid or free developer account you can deploy Kodi via Xcode to work on a non-jailbroken devices.
+
+## Wirelessly connecting to AppleTV 4/4K
+The Apple TV 4K cannot be connected to mac via a cable so the connection must be wireless to XCode to add the application.
+
+  1. Make sure your Mac and your Apple TV are on the same network.
+  2. Choose `Window->Devices and Simulators`, then in the window that appears, click Devices.
+  3. On your Apple TV, open the Settings app and choose `Remotes and Devices->Remote App and Devices`.
+  4. The Apple TV searches for possible devices including the Mac. (If you have any Firewall or Internet security, disable/turn off to allow searching.)
+  5. On your Mac, select the Apple TV in the Devices pane. The pane for the Apple TV is displayed and shows the current status of the connection request.
+  6. Enter the verification code displayed on your AppleTV into the Device window pane for the device and click Connect.
+
+Xcode sets up the Apple TV for wireless debugging and pairs with the device.
+Once your Apple TV has been connected in Xcode, you can deploy either the **[Deb](#7-Packaging-to-distribute-as-deb)** or **[App](#6-Build file)** file.
 
   1. Choose Window > Devices and Simulators, then in the window that appears, click Devices.
   2. On your Mac, select the Apple TV in the Devices pane.
   3. Click the + symbol under `installed apps` and navigate to and select: `$HOME/kodi-build/build/Debug-appletvos/Kodi.app` and then `Open`.
 
 **[back to top](#table-of-contents)**
-

_service:download_files:master.tar.gz/docs/resources/TvOS.svg Added

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100pt" height="100pt" viewBox="0 0 100 100" version="1.1">
+<defs>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<mask id="mask0">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="100" height="100" style="fill:rgb(0%,0%,0%);fill-opacity:0.4;stroke:none;"/>
+  </g>
+</mask>
+<image id="image6" width="693" height="408" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArUAAAGYCAYAAABceho0AAAABmJLR0QA/wD/AP+gvaeTAAAQ5UlEQVR4nO3daXccx3mG4QfgAu6kZFNR4liy/P9/U+KFUmJGogiSEAFwgT9UF7umMcRGAPELXNc5fWYwxAzm432Kb1dt5OJtXMLfAADgX9fBRf+BiwjOjcXzjTWvAwBw9R0MjwdrXj835xmaY7xuDo/9+Ri4AABcbQfD9XG6+vP+7+PjF7l5Dp8xBmuP2BvTZ/frRlbjFgCAq2uM2Q9J3g9Xf20M3P6eM/uSqF3G7I0kt6Zra3Hdnv6WsAUAuNrGoH2fZH+6dpPsTc/fTf/2Ybq+OG7PGrU9TG9kjtmtJHeT3EtyP8mD6bo3vX5r+ntmbAEArqZxpOB9Wry+TfJbkp0kb6bnb3M4cvuIwvg5J3aWqF2uzN5JC9eHSR4leZLk8fD4IC1qtzKPIQAAcHX1EYO9tIB9k+RVku0kr6fnr6bXd6bf2cu8epucMmxPu1rag/ZmWqTeSwvZr5L8brp+n+Tr6bUxam9H1AIAXAc9avfTgnUnLWJfpoXti8W1nRa4u9N7+kjCicP2NFHbg7avzj5IC9enSf4tybfT49O0qF2u0vYbxowdAABcbQeZbxDbS4vVN2mrtD1qf07yPMk/pscetzuZV21PHLYnHT9YBu3DtBXZb5P853T9R5JvMgft/el33SQGAHC9rLtZbBxF2E7yS1pPPsl8H1b/n/2+attnbY8N25NE7TJoH01f4A9Jvkvyp7So/TZt/ODh8KVuxXZeAADX0bptvd5lvveqX49yOGrHZjxR2B4XteuC9mla0P4pyQ9Jvk9bpe1B21dnlzEraAEArpcetjcz75Z1J6s7Zt2fno8NubH4jGNHEY6K2vGmsHHkoAftn6fHP0yv96Dtq7OOyAUAuN42Mofo5vS8H9J1Ky1i+5kGy+1fx5Xe8ZjdtWH7uagd96HdSlsSXgbtD5mD9lHmoDVqAABANy5yHmT1BNoeuP153yWr32g2Hs7QX+v/vmJd1I5BezttSfjrJP+eNmrwQ+YV2qeZg9bNYAAAHKU34nJEdezH5Ulk+5n3rx3DdsXnVmr72MHdtGHeb9JuBvt+uo5aoQUAgKOMcXsrqyMHH9JuDttN2y2hH8xw5KljN9b8gY3Mc7SP0/ae/S5t5ODPSf6YFrmPMx9/K2gBADiN5SptH0noIwj98IbdzIcy9BvGPi4/bF3U3kwbOxjnaH9IC9rv0iL3SeagdaACAABntW4kIWnhOq7YjmF7aKZ2jNpxt4O7aaeFfZv5xrDvp5+/yryPWB/0BQCAL7Fcue2ztf3Qht8yh+2h1dp1UXs78/Zdf0xbpR13OniQtiPCctsuAAA4i401z/t87V7a0bk7aWE7HqH7yebiA26kjRTcTRsxeJo2btCPMBtXaAUtAADnZZyr3UrbgetJ2gFfv5ue38+8uLoyLbA5fMh4eti9tBvBvkrbzqt/yPKkMAAAOC/Lw78epHVo79E+MdAPafjUo+tWam+nRe3DtLB9lLmKx71oAQDgvI0LrXczN+njzCfY9ib9ZHPx5jFqH0xvvJ/DhysAAMBFWbfY+iitT5dbym4kh1dqb6atyN6d3jS+8dDsAgAAnLNxLLaPIdzP3Kb94K+VbWU3F28ci/heWtAuTwyzUgsAwEUao3acIrifeeOClfu8PjdTeyctaO8u3gQAAJdhOVt7f7ruZvVmsSTrdz/o23rdzurYgVVaAAAuw3Jnrj4e26cJliu1G8uV2r5au7wELQAAl20cj+1TBHcyR+3aLb2Sw8eTjRcAAFyWU00SfG5OVswCAPD/7cSTBG7+AgDgX9mJJglELQAAFRw5SSBqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAChP1AIAUJ6oBQCgPFELAEB5ohYAgPJELQAA5YlaAADKE7UAAJQnagEAKE/UAgBQnqgFAKA8UQsAQHmiFgCA8kQtAADliVoAAMoTtQAAlCdqAQAoT9QCAFCeqAUAoDxRCwBAeaIWAIDyRC0AAOWJWgAAyhO1AACUJ2oBAKjgYLgO+VzUHvkmAAC4JAdHXJ8so/ZEbwIAgEvQO/TDmmulUTfP8iYAALhgvT8/pvXouyT70+OH6fVPjbp5ljcBAMAl6G26n+TtdO1OP/eF1ySHV2r7m3aHN/Y3fbyELw4AAOOC67vMbfrbdI19epDkYDOHV2n3hzf0Gn4Xq7UAAFyevuDao/ZNkp20Pt1L8j5HrNS+n37p7fSmN5mjdmWJFwAALkhfcH2f1qK9S19n/UrtykztcqX2deYi3p0+9NMbAQDgAvTJgPeZu/RVku20Nv0taxZc183Uvpt++c305leZi7gv8wpbAAAuwtikb9MWWl9O13bme76O3f2g3122PXzA6+m1sYqFLQAA52k5dvA6yYskPyf5JfNi63i/V5LDK7X9DrO+zPvL9CEvpg8dbxoDAIDzMo7D7qWNwP6a5P+SPM8cteNY7Cc3hucbw+NmkptJtpLcSXJvuraS3J7etzn97kYAAODsxqmBvbQx2J+T/JTkL9P10/TaTtas1I5Rm6wP29tpYXsnc9TezGrUClsAAM5qOTHwa5L/TfLXJP+d5O9J/pE2HrubNbtyLaN21GP1Rua43ZquW5nDdnP4fQAAOI3lIQvbaeMGf0sL2r+krdK+yGfmaZP1UbsuTsdV237dmt6/ESu2AACczjhy0G8Me5U2Q/ssc9A+m157nTWHLnSfW6ldt7tBD9tbmVdql7O14/gCAACss+4Y3FdpM7M/psXscuzgbY44N+Go8YPxD/Y39nGEHrPjJWwBADhKb8qPOT5o/5rkf9LGDsabw9Y6Lmr7H+8lPX6Zbl3MLoNW4AIAXE8Hw2M/WGE8LWw7bbygB+1/pQXtT2nbeL1JGzs48qyE424U61/gY1b3DnufxXm7i/cAAMC4OPoh80lhu2mx+mvaTWHPsrpC+2Payu2brO528NnDv24e8yUy/PGdxc97abMNv02Pb5N8neRh2p62481k9rQFALhelkH7PnND7qSt0P6StnXXs7T52WdpIwc/Zz7467NztKOjorZ/mUwf1n8el4x306J2J20W4pu0sH2c5H7a3rbr9rUFAODqWu5ssJ95QfRN5qB9njZm8GNa3D5Pm6HtK7Rrt+9a57io7V8qmbdPGL/g+OVeTl/uaeawfZDkbtretn23BFELAHC1jQuhe5nHDV6nBe2LtNXY52m7G/SY3U5bLO1bd50oaJOTRW3/Ysk8z9CXkceZiJdpQ76/T4var7IatuPxugAAXF29FffTFkD7/+q/zBy147WdeXV2P+vv3TrSaVdN++9vpgVqP2XsXtos7aMkT9Jitj+Oq7WiFgDg6utRO/6v/qu0eH09PX81vb4z/U5fnT32prB1zjoKMB6heyPthrCttHi9lzZP+2C67k2v9wMb7GMLAHA1jdt39RvD+sYCO2kR2zcZ2E0L2f3Ms7N9dfZUQZt8WViO+9P2ldt+2tjW4nKzGADA9bDuJrG+wcAYsX1VdjlqcOqgTc4nLpdx2wP35nDZ1gsA4PpYt51Xv/pr41kIyRljtjvPwBzHCjazGrnLU8cAALjaDrIat+NhXv3fx8cvchGRubF4boYWAOB6Wh6Ru3z93FxGaIpZAIDr7dwjdumf15wp/DIn9PwAAAAASUVORK5CYII="/>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="100" height="100"/>
+</clipPath>
+<g id="surface7" clip-path="url(#clip1)">
+<use xlink:href="#image6" transform="matrix(0.139318,0,0,0.227543,1.753349,3.958401)"/>
+</g>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="358.6949" y1="418.2712" x2="358.6949" y2="22.5782" gradientTransform="matrix(0.139318,0,0,0.227543,0.0272365,0)">
+<stop offset="0" style="stop-color:rgb(94.901961%,94.901961%,94.901961%);stop-opacity:1;"/>
+<stop offset="0.5955" style="stop-color:rgb(96.862745%,96.862745%,96.862745%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(99.607843%,99.607843%,99.607843%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface2">
+<use xlink:href="#surface7" mask="url(#mask0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 93.921875 5.136719 L 6.078125 5.148438 C 4.183594 5.148438 2.632812 7.679688 2.632812 10.773438 L 2.632812 89.546875 C 2.632812 92.640625 4.183594 95.175781 6.078125 95.175781 L 93.921875 95.167969 C 95.816406 95.167969 97.367188 92.632812 97.367188 89.539062 L 97.367188 10.765625 C 97.367188 7.667969 95.816406 5.136719 93.921875 5.136719 Z M 93.921875 5.136719 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.823529%,18.823529%,18.823529%);fill-opacity:1;" d="M 54.601562 37.304688 C 49.191406 37.304688 45.789062 43.632812 45.789062 53.675781 C 45.789062 63.722656 49.191406 70.03125 54.601562 70.03125 C 60.027344 70.03125 63.429688 63.722656 63.429688 53.675781 C 63.429688 43.632812 60.011719 37.304688 54.601562 37.304688 Z M 54.601562 67.242188 C 50.351562 67.242188 47.671875 61.988281 47.671875 53.679688 C 47.671875 45.351562 50.347656 40.097656 54.601562 40.097656 C 58.855469 40.097656 61.546875 45.351562 61.546875 53.679688 C 61.546875 61.988281 58.851562 67.242188 54.601562 67.242188 Z M 54.601562 67.242188 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.823529%,18.823529%,18.823529%);fill-opacity:1;" d="M 29.4375 69.503906 C 29.25 69.59375 28.496094 69.636719 28.121094 69.636719 C 25.777344 69.636719 24.835938 68.011719 24.835938 63.902344 L 24.835938 49.085938 L 22.75 49.085938 L 22.75 46.667969 L 24.835938 46.667969 L 24.835938 40.957031 L 26.613281 40.957031 L 26.613281 46.667969 L 29.371094 46.667969 L 29.371094 49.085938 L 26.613281 49.085938 L 26.613281 63.746094 C 26.613281 66.121094 27.175781 67.109375 28.46875 67.109375 C 28.65625 67.109375 29.332031 67.0625 29.4375 67.042969 Z M 29.4375 69.503906 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.823529%,18.823529%,18.823529%);fill-opacity:1;" d="M 38.238281 69.527344 L 36.339844 69.527344 L 31.132812 46.667969 L 33.019531 46.667969 L 37.273438 66.472656 L 37.3125 66.472656 L 41.578125 46.667969 L 43.433594 46.667969 Z M 38.238281 69.527344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(18.823529%,18.823529%,18.823529%);fill-opacity:1;" d="M 72.460938 70.03125 C 68.398438 70.03125 65.542969 66.359375 65.339844 60.910156 L 67.183594 60.910156 C 67.386719 64.714844 69.582031 67.304688 72.621094 67.304688 C 75.527344 67.304688 77.613281 64.710938 77.613281 61.148438 C 77.613281 58.183594 76.359375 56.421875 73.480469 55.234375 L 71.074219 54.226562 C 67.480469 52.730469 65.878906 50.25 65.878906 46.074219 C 65.878906 40.953125 68.707031 37.304688 72.527344 37.304688 C 76.308594 37.304688 79.082031 40.953125 79.1875 45.984375 L 77.34375 45.984375 C 77.167969 42.40625 75.230469 40.03125 72.472656 40.03125 C 69.78125 40.03125 67.789062 42.46875 67.789062 45.964844 C 67.789062 48.691406 69 50.292969 71.851562 51.480469 L 73.953125 52.359375 C 77.855469 53.964844 79.496094 56.40625 79.496094 60.824219 C 79.5 66.382812 76.753906 70.03125 72.460938 70.03125 Z M 72.460938 70.03125 "/>
+</g>
+</svg>

_service:download_files:master.tar.gz/lib/win32/Effects11/.gitignore Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Binary/EffectBinaryFormat.h Changed

_service:download_files:master.tar.gz/lib/win32/Effects11/Binary/EffectStateBase11.h Changed

_service:download_files:master.tar.gz/lib/win32/Effects11/Binary/EffectStates11.h Changed

_service:download_files:master.tar.gz/lib/win32/Effects11/Binary/SOParser.h Changed

_service:download_files:master.tar.gz/lib/win32/Effects11/Effect.h Changed

@@ -3,12 +3,8 @@
 //
 //  Direct3D 11 Effects Header for ID3DX11Effect Implementation
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -66,7 +62,7 @@
 class CEffect;
 class CEffectLoader;
 
-enum ELhsType;
+enum ELhsType : int;
 
 // Allows the use of 32-bit and 64-bit timers depending on platform type
 typedef size_t Timer;
@@ -201,18 +197,18 @@
     };
 
 
-    SType() :
+    SType() noexcept :
        VarType(EVT_Invalid),
        Elements(0),
        pTypeName(nullptr),
        TotalSize(0),
        Stride(0),
-       PackedSize(0)
+       PackedSize(0),
+       StructType{}
     {
-        C_ASSERT( sizeof(NumericType) <= sizeof(StructType) );
-        C_ASSERT( sizeof(ObjectType) <= sizeof(StructType) );
-        C_ASSERT( sizeof(InterfaceType) <= sizeof(StructType) );
-        ZeroMemory( &StructType, sizeof(StructType) );
+        static_assert(sizeof(NumericType) <= sizeof(StructType), "SType union issue");
+        static_assert(sizeof(ObjectType) <= sizeof(StructType), "SType union issue");
+        static_assert(sizeof(InterfaceType) <= sizeof(StructType), "SType union issue");
     }
 
     bool IsEqual(SType *pOtherType) const;
@@ -293,6 +289,11 @@
     STDMETHOD_(LPCSTR, GetMemberSemantic)(uint32_t Index) override { return ((SType*)pType)->GetMemberSemantic(Index); }
 
     IUNKNOWN_IMP(SSingleElementType, ID3DX11EffectType, IUnknown);
+
+    SSingleElementType() noexcept :
+        pType(nullptr)
+    {
+    }
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -310,7 +311,7 @@
     uint32_t        AssignmentCount;
     SAssignment     *pAssignments;
 
-    SBaseBlock();
+    SBaseBlock() noexcept;
 
     bool ApplyAssignments(CEffect *pEffect);
 
@@ -358,7 +359,7 @@
     bool        InitiallyValid;
     bool        HasDependencies;
 
-    STechnique();
+    STechnique() noexcept;
 
     STDMETHOD_(bool, IsValid)() override;
     STDMETHOD(GetDesc)(_Out_ D3DX11_TECHNIQUE_DESC *pDesc) override;
@@ -387,7 +388,7 @@
     bool        InitiallyValid;
     bool        HasDependencies;
 
-    SGroup();
+    SGroup() noexcept;
 
     STDMETHOD_(bool, IsValid)() override;
     STDMETHOD(GetDesc)(_Out_ D3DX11_GROUP_DESC *pDesc) override;
@@ -441,7 +442,7 @@
     bool        InitiallyValid;         // validity of all state objects and shaders in pass upon BindToDevice
     bool        HasDependencies;        // if pass expressions or pass state blocks have dependencies on variables (if true, IsValid != InitiallyValid possibly)
 
-    SPassBlock();
+    SPassBlock() noexcept;
 
     void ApplyPassAssignments();
     bool CheckShaderDependencies( _In_ const SShaderBlock* pBlock );
@@ -476,7 +477,7 @@
     D3D11_DEPTH_STENCIL_DESC BackingStore;
     bool                     IsValid;
 
-    SDepthStencilBlock();
+    SDepthStencilBlock() noexcept;
 };
 
 struct SBlendBlock : SBaseBlock
@@ -485,7 +486,7 @@
     D3D11_BLEND_DESC        BackingStore;
     bool                    IsValid;
 
-    SBlendBlock();
+    SBlendBlock() noexcept;
 };
 
 struct SRasterizerBlock : SBaseBlock
@@ -494,7 +495,7 @@
     D3D11_RASTERIZER_DESC   BackingStore;
     bool                    IsValid;
 
-    SRasterizerBlock();
+    SRasterizerBlock() noexcept;
 };
 
 struct SSamplerBlock : SBaseBlock
@@ -507,16 +508,16 @@
         SShaderResource     *pTexture;
     } BackingStore;
 
-    SSamplerBlock();
+    SSamplerBlock() noexcept;
 };
 
 struct SInterface
 {
     SClassInstanceGlobalVariable* pClassInstance;
 
-    SInterface()
+    SInterface() noexcept :
+        pClassInstance(nullptr)
     {
-        pClassInstance = nullptr;
     }
 };
 
@@ -524,36 +525,40 @@
 {
     ID3D11ShaderResourceView *pShaderResource;
 
-    SShaderResource() 
+    SShaderResource() noexcept :
+        pShaderResource(nullptr)
     {
-        pShaderResource = nullptr;
     }
-
 };
 
 struct SUnorderedAccessView
 {
     ID3D11UnorderedAccessView *pUnorderedAccessView;
 
-    SUnorderedAccessView() 
+    SUnorderedAccessView() noexcept :
+        pUnorderedAccessView(nullptr)
     {
-        pUnorderedAccessView = nullptr;
     }
-
 };
 
 struct SRenderTargetView
 {
     ID3D11RenderTargetView *pRenderTargetView;
 
-    SRenderTargetView();
+    SRenderTargetView() noexcept :
+        pRenderTargetView(nullptr)
+    {
+    }
 };
 
 struct SDepthStencilView
 {
     ID3D11DepthStencilView *pDepthStencilView;
 
-    SDepthStencilView();
+    SDepthStencilView() noexcept :
+        pDepthStencilView(nullptr)
+    {
+    }
 };
 
 
@@ -565,12 +570,12 @@
     T       *ppFXPointers;              // Array of ptrs to FX objects (CBs, SShaderResources, etc)
     D3DTYPE *ppD3DObjects;              // Array of ptrs to matching D3D objects
 
-    SShaderDependency()
+    SShaderDependency() noexcept :
+        StartIndex(0),
+        Count(0),
+        ppFXPointers(nullptr),
+        ppD3DObjects(nullptr)
     {
-        StartIndex = Count = 0;
-
-        ppD3DObjects = nullptr;
-        ppFXPointers = nullptr;
     }
 };
 
@@ -649,7 +654,7 @@
     ID3DBlob                        *pInputSignatureBlob;   // The input signature is separated from the bytecode because it 
                                                             // is always available, even after Optimize() has been called.
 
-    SShaderBlock(SD3DShaderVTable *pVirtualTable = nullptr);
+    SShaderBlock(SD3DShaderVTable *pVirtualTable = nullptr) noexcept;
 
     EObjectType GetShaderType();
 
@@ -676,7 +681,10 @@
 {
     char *pString;
 
-    SString();
+    SString() noexcept :
+        pString(nullptr)
+    {
+    }
 };
 
 
@@ -713,7 +721,7 @@
     char                    *pSemantic;
     uint32_t                ExplicitBindPoint;
 
-    SVariable()
+    SVariable() noexcept
     {
         ZeroMemory(this, sizeof(*this));
         ExplicitBindPoint = uint32_t(-1);
@@ -732,7 +740,7 @@
 {
     SShaderBlock    *pShaderBlock;
 
-    SAnonymousShader(_In_opt_ SShaderBlock *pBlock = nullptr);
+    SAnonymousShader(_In_opt_ SShaderBlock *pBlock = nullptr) noexcept;
 
     // ID3DX11EffectShaderVariable interface
     STDMETHOD_(bool, IsValid)() override;
@@ -820,27 +828,28 @@
 
     CEffect                 *pEffect;
 
-    SConstantBuffer()
+    SConstantBuffer() noexcept :
+        pD3DObject(nullptr),
+        TBuffer{},
+        pBackingStore(nullptr),
+        Size(0),
+        pName(nullptr),
+        AnnotationCount(0),
+        pAnnotations(nullptr),
+        VariableCount(0),
+        pVariables(nullptr),
+        ExplicitBindPoint(uint32_t(-1)),
+        IsDirty(false),
+        IsTBuffer(false),
+        IsUserManaged(false),
+        IsEffectOptimized(false),
+        IsUsedByExpression(false),
+        IsUserPacked(false),
+        IsSingle(false),
+        IsNonUpdatable(false),
+        pMemberData(nullptr),
+        pEffect(nullptr)
     {
-        pD3DObject = nullptr;
-        ZeroMemory(&TBuffer, sizeof(TBuffer));
-        ExplicitBindPoint = uint32_t(-1);
-        pBackingStore = nullptr;
-        Size = 0;
-        pName = nullptr;
-        VariableCount = 0;
-        pVariables = nullptr;
-        AnnotationCount = 0;
-        pAnnotations = nullptr;
-        IsDirty = false;
-        IsTBuffer = false;
-        IsUserManaged = false;
-        IsEffectOptimized = false;
-        IsUsedByExpression = false;
-        IsUserPacked = false;
-        IsSingle = false;
-        IsNonUpdatable = false;
-        pEffect = nullptr;
     }
 
     bool ClonedSingle() const;
@@ -927,9 +936,9 @@
     {
         SGlobalVariable *pVariable;
 
-        SDependency()
+        SDependency() noexcept :
+            pVariable(nullptr)
         {
-            pVariable = nullptr;
         }
     };
 
@@ -958,19 +967,17 @@
         return IsObjectAssignmentHelper(LhsType);
     }
 
-    SAssignment()
+    SAssignment() noexcept :
+        LhsType(ELHS_Invalid),
+        AssignmentType(ERAT_Invalid),
+        LastRecomputedTime(0),
+        DependencyCount(0),
+        pDependencies(nullptr),
+        Destination{0},
+        Source{0},
+        DataSize(0),
+        MaxElements(0)
     {
-        LhsType = ELHS_Invalid;
-        AssignmentType = ERAT_Invalid;
-
-        Destination.pGeneric = nullptr;
-        Source.pGeneric = nullptr;
-
-        LastRecomputedTime = 0;
-        DependencyCount = 0;
-        pDependencies = nullptr;
-
-        DataSize = 0;
     }
 };
 
@@ -1039,7 +1046,7 @@
         return (pData >= m_pData && pData < (m_pData + m_dwBufferSize));
     }
 
-    CEffectHeap();
+    CEffectHeap() noexcept;
     ~CEffectHeap();
 };
 
@@ -1201,7 +1208,7 @@
     friend struct SConstantBuffer;
 
 public:
-    CEffect( uint32_t Flags = 0 );
+    CEffect( uint32_t Flags = 0 ) noexcept;
     virtual ~CEffect();
     void ReleaseShaderRefection();

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectAPI.cpp Changed

@@ -3,12 +3,8 @@
 //
 // Effect API entry point
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -23,9 +19,9 @@
 
 struct handle_closer { void operator()(HANDLE h) { if (h) CloseHandle(h); } };
 
-typedef public std::unique_ptr<void, handle_closer> ScopedHandle;
+typedef std::unique_ptr<void, handle_closer> ScopedHandle;
 
-inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? 0 : h; }
+inline HANDLE safe_handle( HANDLE h ) { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }
 
 //-------------------------------------------------------------------------------------
 
@@ -54,27 +50,20 @@
     }
 
     // Get the file size
-    LARGE_INTEGER FileSize = { 0 };
-
-#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
     FILE_STANDARD_INFO fileInfo;
     if ( !GetFileInformationByHandleEx( hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo) ) )
     {
         return HRESULT_FROM_WIN32( GetLastError() );
     }
-    FileSize = fileInfo.EndOfFile;
-#else
-    GetFileSizeEx( hFile.get(), &FileSize );
-#endif
 
     // File is too big for 32-bit allocation or contains no data, so reject read
-    if ( !FileSize.LowPart || FileSize.HighPart > 0)
+    if ( !fileInfo.EndOfFile.LowPart || fileInfo.EndOfFile.HighPart > 0 )
     {
         return E_FAIL;
     }
 
     // create enough space for the file data
-    data.reset( new uint8_t[ FileSize.LowPart ] );
+    data.reset( new uint8_t[ fileInfo.EndOfFile.LowPart ] );
     if (!data)
     {
         return E_OUTOFMEMORY;
@@ -84,7 +73,7 @@
     DWORD BytesRead = 0;
     if (!ReadFile( hFile.get(),
                    data.get(),
-                   FileSize.LowPart,
+                   fileInfo.EndOfFile.LowPart,
                    &BytesRead,
                    nullptr
                  ))
@@ -92,7 +81,7 @@
         return HRESULT_FROM_WIN32( GetLastError() );
     }
 
-    if (BytesRead < FileSize.LowPart)
+    if (BytesRead < fileInfo.EndOfFile.LowPart)
     {
         return E_FAIL;
     }
@@ -111,10 +100,8 @@
     if ( !pData || !DataLength || !pDevice || !ppEffect )
         return E_INVALIDARG;
 
-#ifdef _M_X64
-    if ( DataLength > 0xFFFFFFFF )
+    if ( DataLength > UINT32_MAX )
         return E_INVALIDARG;
-#endif
 
     HRESULT hr = S_OK;
 
@@ -288,13 +275,11 @@
 
 #endif // D3D_COMPILER_VERSION
 
-#ifdef _M_X64
-    if ( blob->GetBufferSize() > 0xFFFFFFFF )
+    if ( blob->GetBufferSize() > UINT32_MAX)
     {
         SAFE_RELEASE( blob );
         return E_FAIL;
     }
-#endif // _M_X64
 
     hr = S_OK;

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectLoad.cpp Changed

@@ -3,12 +3,8 @@
 //
 // Direct3D Effects file loading code
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -186,7 +182,10 @@
 // A simple class which assists in adding data to a block of memory
 //////////////////////////////////////////////////////////////////////////
 
-CEffectHeap::CEffectHeap() : m_pData(nullptr), m_dwSize(0), m_dwBufferSize(0)
+CEffectHeap::CEffectHeap() noexcept :
+    m_pData(nullptr),
+    m_dwSize(0),
+    m_dwBufferSize(0)
 {
 }
 
@@ -394,6 +393,35 @@
 // A helper class which loads an effect
 //////////////////////////////////////////////////////////////////////////
 
+CEffectLoader::CEffectLoader() noexcept :
+    m_pData(nullptr),
+    m_pHeader(nullptr),
+    m_Version(0),
+    m_pEffect(nullptr),
+    m_pReflection(nullptr),
+    m_dwBufferSize(0),
+    m_pOldVars(nullptr),
+    m_pOldShaders(nullptr),
+    m_pOldDS(nullptr),
+    m_pOldAB(nullptr),
+    m_pOldRS(nullptr),
+    m_pOldCBs(nullptr),
+    m_pOldSamplers(nullptr),
+    m_OldInterfaceCount(0),
+    m_pOldInterfaces(nullptr),
+    m_pOldShaderResources(nullptr),
+    m_pOldUnorderedAccessViews(nullptr),
+    m_pOldRenderTargetViews(nullptr),
+    m_pOldDepthStencilViews(nullptr),
+    m_pOldStrings(nullptr),
+    m_pOldMemberDataBlocks(nullptr),
+    m_pvOldMemberInterfaces(nullptr),
+    m_pOldGroups(nullptr),
+    m_EffectMemory(0),
+    m_ReflectionMemory(0)
+{
+}
+
 _Use_decl_annotations_
 HRESULT CEffectLoader::GetUnstructuredDataBlock(uint32_t offset, uint32_t  *pdwSize, void **ppData)
 {
@@ -1787,8 +1815,8 @@
             // Inline shader assignments must be object types
             assert(pAssignment->IsObjectAssignment());
 
-            C_ASSERT( offsetof(SBinaryAssignment::SInlineShader,oShader) == offsetof(SBinaryShaderData5,oShader) );
-            C_ASSERT( offsetof(SBinaryAssignment::SInlineShader,oSODecl) == offsetof(SBinaryShaderData5,oSODecls) );
+            static_assert(offsetof(SBinaryAssignment::SInlineShader, oShader) == offsetof(SBinaryShaderData5, oShader), "ECAT_InlineShader issue");
+            static_assert(offsetof(SBinaryAssignment::SInlineShader, oSODecl) == offsetof(SBinaryShaderData5, oSODecls), "ECAT_InlineShader5 issue");
             if( psAssignments[i].AssignmentType == ECAT_InlineShader )
             {
                 VHD( m_msUnstructured.ReadAtOffset(psAssignments[i].oInitializer, sizeof(*psInlineShader), (void**) &psInlineShader),
@@ -2045,8 +2073,8 @@
                     SBinaryShaderData5 *psInlineShader5;
                 };
 
-                C_ASSERT( offsetof(SBinaryGSSOInitializer,oShader) == 0 );
-                C_ASSERT( offsetof(SBinaryShaderData5,oShader) == 0 );
+                static_assert(offsetof(SBinaryGSSOInitializer, oShader) == 0, "Union issue");
+                static_assert(offsetof(SBinaryShaderData5, oShader) == 0, "Union issue");
 
 
                 pShaderBlock = &m_pEffect->m_pShaderBlocks[m_pEffect->m_ShaderBlockCount];
@@ -2622,7 +2650,7 @@
                             }
                             else
                             {
-                                DPF(0, "%s: Sampler %s[%u] does not have a texture bound to it, even though the sampler array is used in a DX9-style texture load instruction", g_szEffectLoadArea, pName, j);
+                                DPF(0, "%s: Sampler %s[%zu] does not have a texture bound to it, even though the sampler array is used in a DX9-style texture load instruction", g_szEffectLoadArea, pName, j);
                             }
                         
                             VH( E_FAIL );

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectLoad.h Changed

@@ -4,12 +4,8 @@
 // Direct3D 11 Effects header for the FX file loader 
 // A CEffectLoader is created at load time to facilitate loading
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -36,6 +32,12 @@
     uint32_t              start;
     uint32_t              last;
     CEffectVector<void *> vResources; // should be (last - start) in length, resource type depends on the range type
+
+    SRange() noexcept :
+        start(0),
+        last(0)
+    {
+    }
 };
 
 // Used during load to validate assignments
@@ -77,7 +79,7 @@
     SRasterizerBlock            *m_pOldRS;
     SConstantBuffer             *m_pOldCBs;
     SSamplerBlock               *m_pOldSamplers;
-    uint32_t                        m_OldInterfaceCount;
+    uint32_t                     m_OldInterfaceCount;
     SInterface                  *m_pOldInterfaces;
     SShaderResource             *m_pOldShaderResources;
     SUnorderedAccessView        *m_pOldUnorderedAccessViews;
@@ -147,10 +149,11 @@
     HRESULT GetUnstructuredDataBlock(_In_ uint32_t offset, _Out_ uint32_t *pdwSize, _Outptr_result_buffer_(*pdwSize) void **ppData);
     // This function makes a copy of the array of SInterfaceParameters, but not a copy of the strings
     HRESULT GetInterfaceParametersAndAddToReflection( _In_ uint32_t InterfaceCount, _In_ uint32_t offset, _Outptr_result_buffer_all_maybenull_(InterfaceCount) SShaderBlock::SInterfaceParameter **ppInterfaces );
+
 public:
+    CEffectLoader() noexcept;
 
     HRESULT LoadEffect(_In_ CEffect *pEffect, _In_reads_bytes_(cbEffectBuffer) const void *pEffectBuffer, _In_ uint32_t cbEffectBuffer);
 };
 
-
-}
\ No newline at end of file
+}

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectNonRuntime.cpp Changed

@@ -6,12 +6,8 @@
 // are typically called when creating, cloning, or optimizing an 
 // Effect, or reflecting a variable.
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -24,53 +20,52 @@
 
 extern SUnorderedAccessView g_NullUnorderedAccessView;
 
-SBaseBlock::SBaseBlock()
-: BlockType(EBT_Invalid)
-, IsUserManaged(false)
-, AssignmentCount(0)
-, pAssignments(nullptr)
+SBaseBlock::SBaseBlock() noexcept :
+    BlockType(EBT_Invalid),
+    IsUserManaged(false),
+    AssignmentCount(0),
+    pAssignments(nullptr)
 {
-
 }
 
-SPassBlock::SPassBlock()
+SPassBlock::SPassBlock() noexcept :
+    BackingStore{},
+    pName(nullptr),
+    AnnotationCount(0),
+    pAnnotations(nullptr),
+    pEffect(nullptr),
+    InitiallyValid(true),
+    HasDependencies(false)
 {
-    pName = nullptr;
-    AnnotationCount = 0;
-    pAnnotations = nullptr;
-    InitiallyValid = true;
-    HasDependencies = false;
-    ZeroMemory(&BackingStore, sizeof(BackingStore));
 }
 
-STechnique::STechnique()
-: pName(nullptr)
-, PassCount(0)
-, pPasses(nullptr)
-, AnnotationCount(0)
-, pAnnotations(nullptr)
-, InitiallyValid( true )
-, HasDependencies( false )
+STechnique::STechnique() noexcept :
+    pName(nullptr),
+    PassCount(0),
+    pPasses(nullptr),
+    AnnotationCount(0),
+    pAnnotations(nullptr),
+    InitiallyValid( true ),
+    HasDependencies( false )
 {
 }
 
-SGroup::SGroup()
-: pName(nullptr)
-, TechniqueCount(0)
-, pTechniques(nullptr)
-, AnnotationCount(0)
-, pAnnotations(nullptr)
-, InitiallyValid( true )
-, HasDependencies( false )
+SGroup::SGroup() noexcept :
+    pName(nullptr),
+    TechniqueCount(0),
+    pTechniques(nullptr),
+    AnnotationCount(0),
+    pAnnotations(nullptr),
+    InitiallyValid( true ),
+    HasDependencies( false )
 {
 }
 
-SDepthStencilBlock::SDepthStencilBlock()
+SDepthStencilBlock::SDepthStencilBlock() noexcept :
+    pDSObject(nullptr),
+    BackingStore{},
+    IsValid(true)
 {
-    pDSObject = nullptr;
-    ZeroMemory(&BackingStore, sizeof(BackingStore));
-    IsValid = true;
-
     BackingStore.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP;
     BackingStore.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS;
     BackingStore.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP;
@@ -87,12 +82,11 @@
     BackingStore.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
 }
 
-SBlendBlock::SBlendBlock()
+SBlendBlock::SBlendBlock() noexcept :
+    pBlendObject(nullptr),
+    BackingStore{},
+    IsValid(true)
 {
-    pBlendObject = nullptr;
-    ZeroMemory(&BackingStore, sizeof(BackingStore));
-    IsValid = true;
-
     BackingStore.AlphaToCoverageEnable = false;
     BackingStore.IndependentBlendEnable = true;
     for( size_t i=0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++ )
@@ -107,12 +101,11 @@
     }
 }
 
-SRasterizerBlock::SRasterizerBlock()
+SRasterizerBlock::SRasterizerBlock() noexcept :
+    pRasterizerObject(nullptr),
+    BackingStore{},
+    IsValid(true)
 {
-    pRasterizerObject = nullptr;
-    ZeroMemory(&BackingStore, sizeof(BackingStore));
-    IsValid = true;
-
     BackingStore.AntialiasedLineEnable = false;
     BackingStore.CullMode = D3D11_CULL_BACK;
     BackingStore.DepthBias = D3D11_DEFAULT_DEPTH_BIAS;
@@ -125,11 +118,10 @@
     BackingStore.DepthClipEnable = true;
 }
 
-SSamplerBlock::SSamplerBlock()
+SSamplerBlock::SSamplerBlock() noexcept :
+    pD3DObject(nullptr),
+    BackingStore{}
 {
-    pD3DObject = nullptr;
-    ZeroMemory(&BackingStore, sizeof(BackingStore));
-
     BackingStore.SamplerDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
     BackingStore.SamplerDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
     BackingStore.SamplerDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
@@ -145,35 +137,25 @@
     BackingStore.SamplerDesc.MaxLOD = FLT_MAX;
 }
 
-SShaderBlock::SShaderBlock(SD3DShaderVTable *pVirtualTable)
+SShaderBlock::SShaderBlock(SD3DShaderVTable *pVirtualTable) noexcept :
+    IsValid(true),
+    pVT(pVirtualTable),
+    pReflectionData(nullptr),
+    pD3DObject(nullptr),
+    CBDepCount(0),
+    pCBDeps(nullptr),
+    SampDepCount(0),
+    pSampDeps(nullptr),
+    InterfaceDepCount(0),
+    pInterfaceDeps(nullptr),
+    ResourceDepCount(0),
+    pResourceDeps(nullptr),
+    UAVDepCount(0),
+    pUAVDeps(nullptr),
+    TBufferDepCount(0),
+    ppTbufDeps(nullptr),
+    pInputSignatureBlob(nullptr)
 {
-    IsValid = true;
-
-    pVT = pVirtualTable;
-
-    pReflectionData = nullptr;
-    
-    pD3DObject = nullptr;
-
-    CBDepCount = 0;
-    pCBDeps = nullptr;
-
-    SampDepCount = 0;
-    pSampDeps = nullptr;
-
-    InterfaceDepCount = 0;
-    pInterfaceDeps = nullptr;
-
-    ResourceDepCount = 0;
-    pResourceDeps = nullptr;
-
-    UAVDepCount = 0;
-    pUAVDeps = nullptr;
-
-    TBufferDepCount = 0;
-    ppTbufDeps = nullptr;
-
-    pInputSignatureBlob = nullptr;
 }
 
 HRESULT SShaderBlock::OnDeviceBind()
@@ -540,7 +522,7 @@
         D3D11_SHADER_DESC ShaderDesc;
         VH( pReflectionData->pReflection->GetDesc( &ShaderDesc ) );
 
-        D3D11_SIGNATURE_PARAMETER_DESC ParamDesc ={0};
+        D3D11_SIGNATURE_PARAMETER_DESC ParamDesc ={};
         if( pReflectionData->IsNullGS )
         {
             switch( SigType )
@@ -619,21 +601,6 @@
     return hr;
 }
 
-SString::SString()
-{
-    pString = nullptr;
-}
-
-SRenderTargetView::SRenderTargetView()
-{
-    pRenderTargetView = nullptr;
-}
-
-SDepthStencilView::SDepthStencilView()
-{
-    pDepthStencilView = nullptr;
-}
-
 void * GetBlockByIndex(EVarType VarType, EObjectType ObjectType, void *pBaseBlock, uint32_t Index)
 {
     switch( VarType )
@@ -709,58 +676,54 @@
 // CEffect
 //--------------------------------------------------------------------------------------
 
-CEffect::CEffect( uint32_t Flags )
+CEffect::CEffect( uint32_t Flags ) noexcept :
+    m_RefCount(1),
+    m_Flags(Flags),
+    m_pReflection(nullptr),
+    m_VariableCount(0),
+    m_pVariables(nullptr),
+    m_AnonymousShaderCount(0),
+    m_pAnonymousShaders(nullptr),
+    m_TechniqueCount(0),
+    m_GroupCount(0),
+    m_pGroups(nullptr),
+    m_pNullGroup(nullptr),
+    m_ShaderBlockCount(0),
+    m_pShaderBlocks(nullptr),
+    m_DepthStencilBlockCount(0),
+    m_pDepthStencilBlocks(nullptr),
+    m_BlendBlockCount(0),
+    m_pBlendBlocks(nullptr),
+    m_RasterizerBlockCount(0),
+    m_pRasterizerBlocks(nullptr),
+    m_SamplerBlockCount(0),
+    m_pSamplerBlocks(nullptr),
+    m_MemberDataCount(0),
+    m_pMemberDataBlocks(nullptr),
+    m_InterfaceCount(0),
+    m_pInterfaces(nullptr),
+    m_CBCount(0),
+    m_pCBs(nullptr),
+    m_StringCount(0),
+    m_pStrings(nullptr),
+    m_ShaderResourceCount(0),
+    m_pShaderResources(nullptr),
+    m_UnorderedAccessViewCount(0),
+    m_pUnorderedAccessViews(nullptr),
+    m_RenderTargetViewCount(0),
+    m_pRenderTargetViews(nullptr),
+    m_DepthStencilViewCount(0),
+    m_pDepthStencilViews(nullptr),
+    m_LocalTimer(1),
+    m_FXLIndex(0),
+    m_pDevice(nullptr),
+    m_pContext(nullptr),
+    m_pClassLinkage(nullptr),
+    m_pTypePool(nullptr),
+    m_pStringPool(nullptr),
+    m_pPooledHeap(nullptr),
+    m_pOptimizedTypeHeap(nullptr)
 {
-    m_RefCount = 1;
-
-    m_pVariables = nullptr;
-    m_pAnonymousShaders = nullptr;
-    m_pGroups = nullptr;
-    m_pNullGroup = nullptr;
-    m_pShaderBlocks = nullptr;
-    m_pDepthStencilBlocks = nullptr;
-    m_pBlendBlocks = nullptr;
-    m_pRasterizerBlocks = nullptr;
-    m_pSamplerBlocks = nullptr;
-    m_pCBs = nullptr;
-    m_pStrings = nullptr;
-    m_pMemberDataBlocks = nullptr;
-    m_pInterfaces = nullptr;
-    m_pShaderResources = nullptr;
-    m_pUnorderedAccessViews = nullptr;
-    m_pRenderTargetViews = nullptr;
-    m_pDepthStencilViews = nullptr;
-    m_pDevice = nullptr;
-    m_pClassLinkage = nullptr;
-    m_pContext = nullptr;
-
-    m_VariableCount = 0;
-    m_AnonymousShaderCount = 0;
-    m_ShaderBlockCount = 0;
-    m_DepthStencilBlockCount = 0;
-    m_BlendBlockCount = 0;
-    m_RasterizerBlockCount = 0;
-    m_SamplerBlockCount = 0;
-    m_StringCount = 0;
-    m_MemberDataCount = 0;
-    m_InterfaceCount = 0;
-    m_ShaderResourceCount = 0;
-    m_UnorderedAccessViewCount = 0;
-    m_RenderTargetViewCount = 0;
-    m_DepthStencilViewCount = 0;
-    m_CBCount = 0;
-    m_TechniqueCount = 0;
-    m_GroupCount = 0;
-
-    m_pReflection = nullptr;
-    m_LocalTimer = 1;
-    m_Flags = Flags;
-    m_FXLIndex = 0;
-
-    m_pTypePool = nullptr;
-    m_pStringPool = nullptr;
-    m_pPooledHeap = nullptr;
-    m_pOptimizedTypeHeap = nullptr;
 }
 
 void CEffect::ReleaseShaderRefection()
@@ -789,9 +752,8 @@
 
     if (pInfoQueue)
     {
-        D3D11_INFO_QUEUE_FILTER filter;
+        D3D11_INFO_QUEUE_FILTER filter = {};
         D3D11_MESSAGE_CATEGORY messageCategory = D3D11_MESSAGE_CATEGORY_STATE_SETTING;
-        ZeroMemory(&filter, sizeof(filter));
 
         filter.DenyList.NumCategories = 1;
         filter.DenyList.pCategoryList = &messageCategory;

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectReflection.cpp Changed

@@ -3,13 +3,8 @@
 //
 // Direct3D 11 Effects public reflection APIs
 //
-//
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -601,7 +596,8 @@
 // ID3DX11EffectShaderVariable (SAnonymousShader implementation)
 ////////////////////////////////////////////////////////////////////////////////
 
-SAnonymousShader::SAnonymousShader(_In_opt_ SShaderBlock *pBlock) : pShaderBlock(pBlock)
+SAnonymousShader::SAnonymousShader(_In_opt_ SShaderBlock *pBlock) noexcept :
+    pShaderBlock(pBlock)
 {
 }
 
@@ -2107,7 +2103,7 @@
 
     if( FAILED( strcpy_s( NameCopy, MAX_GROUP_TECHNIQUE_SIZE, Name ) ) )
     {
-        DPF( 0, "Group|Technique name has a length greater than %u.", MAX_GROUP_TECHNIQUE_SIZE );
+        DPF( 0, "Group|Technique name has a length greater than %zu.", MAX_GROUP_TECHNIQUE_SIZE );
         return &g_InvalidTechnique;
     }

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectRuntime.cpp Changed

@@ -5,12 +5,8 @@
 // These functions are expected to be called at high frequency
 // (when applying a pass).
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -643,11 +639,11 @@
 {
     m_LocalTimer++;
 
-#ifndef _M_X64
+#if !defined(_M_X64) && !defined(_M_ARM64)
 #if _DEBUG
     if (m_LocalTimer > g_TimerRolloverCount)
     {
-        DPF(0, "Rolling over timer (current time: %u, rollover cap: %u).", m_LocalTimer, g_TimerRolloverCount);
+        DPF(0, "Rolling over timer (current time: %zu, rollover cap: %u).", m_LocalTimer, g_TimerRolloverCount);
 #else
     if (m_LocalTimer >= 0x80000000) // check to see if we've exceeded ~2 billion
     {

_service:download_files:master.tar.gz/lib/win32/Effects11/EffectVariable.inl Changed

@@ -4,12 +4,8 @@
 // Direct3D 11 Effects Variable reflection template
 // These templates define the many Effect variable types.
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -1185,7 +1181,8 @@
         return pEffect;
     }
 
-    TTopLevelVariable() : pEffect (nullptr)
+    TTopLevelVariable() noexcept :
+        pEffect(nullptr)
     {
     }
 
@@ -1224,10 +1221,10 @@
     // Required to create member/element variable interfaces
     TTopLevelVariable<ID3DX11EffectVariable>    *pTopLevelEntity;
 
-    TMember()
+    TMember() noexcept :
+        IsSingleElement(false),
+        pTopLevelEntity(nullptr)
     {
-        IsSingleElement = false;
-        pTopLevelEntity = nullptr;
     }
 
     CEffect* GetEffect()
@@ -1394,10 +1391,10 @@
     // if numeric, pointer to the constant buffer where this variable lives
     SConstantBuffer *pCB;
 
-    uint32_t            AnnotationCount;
+    uint32_t        AnnotationCount;
     SAnnotation     *pAnnotations;
 
-    TGlobalVariable() :
+    TGlobalVariable() noexcept :
         LastModifiedTime(0),
         pCB(nullptr),
         AnnotationCount(0),

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2010_DXSDK.sln Deleted

@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2010_DXSDK.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj Deleted

@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<ItemGroup Label="ProjectConfigurations">
-<ProjectConfiguration Include="Debug|Win32">
-<Configuration>Debug</Configuration>
-<Platform>Win32</Platform>
-</ProjectConfiguration>
-<ProjectConfiguration Include="Debug|x64">
-<Configuration>Debug</Configuration>
-<Platform>x64</Platform>
-</ProjectConfiguration>
-<ProjectConfiguration Include="Profile|Win32">
-<Configuration>Profile</Configuration>
-<Platform>Win32</Platform>
-</ProjectConfiguration>
-<ProjectConfiguration Include="Profile|x64">
-<Configuration>Profile</Configuration>
-<Platform>x64</Platform>
-</ProjectConfiguration>
-<ProjectConfiguration Include="Release|Win32">
-<Configuration>Release</Configuration>
-<Platform>Win32</Platform>
-</ProjectConfiguration>
-<ProjectConfiguration Include="Release|x64">
-<Configuration>Release</Configuration>
-<Platform>x64</Platform>
-</ProjectConfiguration>
-</ItemGroup>
-<PropertyGroup Label="Globals">
-<ProjectName>Effects11</ProjectName>
-<ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
-<RootNamespace>Effects11</RootNamespace>
-<Keyword>Win32Proj</Keyword>
-</PropertyGroup>
-<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-<ConfigurationType>StaticLibrary</ConfigurationType>
-<CharacterSet>Unicode</CharacterSet>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-<ConfigurationType>StaticLibrary</ConfigurationType>
-<CharacterSet>Unicode</CharacterSet>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-<ConfigurationType>StaticLibrary</ConfigurationType>
-<WholeProgramOptimization>true</WholeProgramOptimization>
-<CharacterSet>Unicode</CharacterSet>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-<ConfigurationType>StaticLibrary</ConfigurationType>
-<WholeProgramOptimization>true</WholeProgramOptimization>
-<CharacterSet>Unicode</CharacterSet>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-<ConfigurationType>StaticLibrary</ConfigurationType>
-<WholeProgramOptimization>true</WholeProgramOptimization>
-<CharacterSet>Unicode</CharacterSet>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
-<ConfigurationType>StaticLibrary</ConfigurationType>
-<WholeProgramOptimization>true</WholeProgramOptimization>
-<CharacterSet>Unicode</CharacterSet>
-</PropertyGroup>
-<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-<ImportGroup Label="ExtensionSettings" />
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-</ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-</ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-</ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-</ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-</ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-</ImportGroup>
-<PropertyGroup Label="UserMacros" />
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
-<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
-<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
-<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
-<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
-<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
-<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
-<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
-<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
-<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
-<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
-</PropertyGroup>
-<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <OutDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_DXSDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-<ExecutablePath>$(DXSDK_DIR)Utilities\bin\x64;$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
-<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
-<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
-</PropertyGroup>
-<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-<ClCompile>
-<WarningLevel>Level4</WarningLevel>
-<Optimization>Disabled</Optimization>
-<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-<OpenMPSupport>false</OpenMPSupport>
-<IntrinsicFunctions>true</IntrinsicFunctions>
-<FloatingPointModel>Fast</FloatingPointModel>
-<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-<ExceptionHandling>Sync</ExceptionHandling>
-<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-<PrecompiledHeader>Use</PrecompiledHeader>
-</ClCompile>
-<Link>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-<SubSystem>Windows</SubSystem>
-<GenerateDebugInformation>true</GenerateDebugInformation>
-<LargeAddressAware>true</LargeAddressAware>
-<RandomizedBaseAddress>true</RandomizedBaseAddress>
-<DataExecutionPrevention>true</DataExecutionPrevention>
-<TargetMachine>MachineX86</TargetMachine>
-<UACExecutionLevel>AsInvoker</UACExecutionLevel>
-<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-</Link>
-<Manifest>
-<EnableDPIAwareness>false</EnableDPIAwareness>
-</Manifest>
-<PreBuildEvent>
-<Command></Command>
-</PreBuildEvent>
-<PostBuildEvent>
-<Command></Command>
-</PostBuildEvent>
-</ItemDefinitionGroup>
-<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-<ClCompile>
-<WarningLevel>Level4</WarningLevel>
-<Optimization>Disabled</Optimization>
-<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-<OpenMPSupport>false</OpenMPSupport>
-<IntrinsicFunctions>true</IntrinsicFunctions>
-<FloatingPointModel>Fast</FloatingPointModel>
-<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-<ExceptionHandling>Sync</ExceptionHandling>
-<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-<PrecompiledHeader>Use</PrecompiledHeader>
-</ClCompile>
-<Link>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-<SubSystem>Windows</SubSystem>
-<GenerateDebugInformation>true</GenerateDebugInformation>
-<LargeAddressAware>true</LargeAddressAware>
-<RandomizedBaseAddress>true</RandomizedBaseAddress>
-<DataExecutionPrevention>true</DataExecutionPrevention>
-<TargetMachine>MachineX64</TargetMachine>
-<UACExecutionLevel>AsInvoker</UACExecutionLevel>
-<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-</Link>
-<Manifest>
-<EnableDPIAwareness>false</EnableDPIAwareness>
-</Manifest>
-<PreBuildEvent>
-<Command></Command>
-</PreBuildEvent>
-<PostBuildEvent>
-<Command></Command>
-</PostBuildEvent>
-</ItemDefinitionGroup>
-<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-<ClCompile>
-<WarningLevel>Level4</WarningLevel>
-<Optimization>MaxSpeed</Optimization>
-<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-<OpenMPSupport>false</OpenMPSupport>
-<FunctionLevelLinking>true</FunctionLevelLinking>
-<IntrinsicFunctions>true</IntrinsicFunctions>
-<FloatingPointModel>Fast</FloatingPointModel>
-<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-<ExceptionHandling>Sync</ExceptionHandling>
-<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<PrecompiledHeader>Use</PrecompiledHeader>
-</ClCompile>
-<Link>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-<GenerateDebugInformation>true</GenerateDebugInformation>
-<SubSystem>Windows</SubSystem>
-<OptimizeReferences>true</OptimizeReferences>
-<EnableCOMDATFolding>true</EnableCOMDATFolding>
-<LargeAddressAware>true</LargeAddressAware>
-<RandomizedBaseAddress>true</RandomizedBaseAddress>
-<DataExecutionPrevention>true</DataExecutionPrevention>
-<TargetMachine>MachineX86</TargetMachine>
-<UACExecutionLevel>AsInvoker</UACExecutionLevel>
-<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-</Link>
-<Manifest>
-<EnableDPIAwareness>false</EnableDPIAwareness>
-</Manifest>
-<PreBuildEvent>
-<Command></Command>
-</PreBuildEvent>
-<PostBuildEvent>
-<Command></Command>
-</PostBuildEvent>
-</ItemDefinitionGroup>
-<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-<ClCompile>
-<WarningLevel>Level4</WarningLevel>
-<Optimization>MaxSpeed</Optimization>
-<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-<OpenMPSupport>false</OpenMPSupport>
-<FunctionLevelLinking>true</FunctionLevelLinking>
-<IntrinsicFunctions>true</IntrinsicFunctions>
-<FloatingPointModel>Fast</FloatingPointModel>
-<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-<ExceptionHandling>Sync</ExceptionHandling>
-<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<PrecompiledHeader>Use</PrecompiledHeader>
-</ClCompile>
-<Link>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-<GenerateDebugInformation>true</GenerateDebugInformation>
-<SubSystem>Windows</SubSystem>
-<OptimizeReferences>true</OptimizeReferences>
-<EnableCOMDATFolding>true</EnableCOMDATFolding>
-<LargeAddressAware>true</LargeAddressAware>
-<RandomizedBaseAddress>true</RandomizedBaseAddress>
-<DataExecutionPrevention>true</DataExecutionPrevention>
-<TargetMachine>MachineX64</TargetMachine>
-<UACExecutionLevel>AsInvoker</UACExecutionLevel>
-<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-</Link>
-<Manifest>
-<EnableDPIAwareness>false</EnableDPIAwareness>
-</Manifest>
-<PreBuildEvent>
-<Command></Command>
-</PreBuildEvent>
-<PostBuildEvent>
-<Command></Command>
-</PostBuildEvent>
-</ItemDefinitionGroup>
-<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-<ClCompile>
-<WarningLevel>Level4</WarningLevel>
-<Optimization>MaxSpeed</Optimization>
-<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-<OpenMPSupport>false</OpenMPSupport>
-<FunctionLevelLinking>true</FunctionLevelLinking>
-<IntrinsicFunctions>true</IntrinsicFunctions>
-<FloatingPointModel>Fast</FloatingPointModel>
-<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-<ExceptionHandling>Sync</ExceptionHandling>
-<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<PrecompiledHeader>Use</PrecompiledHeader>
-</ClCompile>
-<Link>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-<GenerateDebugInformation>true</GenerateDebugInformation>
-<SubSystem>Windows</SubSystem>
-<OptimizeReferences>true</OptimizeReferences>
-<EnableCOMDATFolding>true</EnableCOMDATFolding>
-<LargeAddressAware>true</LargeAddressAware>
-<RandomizedBaseAddress>true</RandomizedBaseAddress>
-<DataExecutionPrevention>true</DataExecutionPrevention>
-<TargetMachine>MachineX86</TargetMachine>
-<UACExecutionLevel>AsInvoker</UACExecutionLevel>
-<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-</Link>
-<Manifest>
-<EnableDPIAwareness>false</EnableDPIAwareness>
-</Manifest>
-<PreBuildEvent>
-<Command></Command>
-</PreBuildEvent>
-<PostBuildEvent>
-<Command></Command>
-</PostBuildEvent>
-</ItemDefinitionGroup>
-<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-<ClCompile>
-<WarningLevel>Level4</WarningLevel>
-<Optimization>MaxSpeed</Optimization>
-<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-<OpenMPSupport>false</OpenMPSupport>
-<FunctionLevelLinking>true</FunctionLevelLinking>
-<IntrinsicFunctions>true</IntrinsicFunctions>
-<FloatingPointModel>Fast</FloatingPointModel>
-<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-<ExceptionHandling>Sync</ExceptionHandling>
-<AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-<PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<PrecompiledHeader>Use</PrecompiledHeader>
-</ClCompile>
-<Link>
-<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-<GenerateDebugInformation>true</GenerateDebugInformation>
-<SubSystem>Windows</SubSystem>
-<OptimizeReferences>true</OptimizeReferences>
-<EnableCOMDATFolding>true</EnableCOMDATFolding>
-<LargeAddressAware>true</LargeAddressAware>
-<RandomizedBaseAddress>true</RandomizedBaseAddress>
-<DataExecutionPrevention>true</DataExecutionPrevention>
-<TargetMachine>MachineX64</TargetMachine>
-<UACExecutionLevel>AsInvoker</UACExecutionLevel>
-<DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-</Link>
-<Manifest>
-<EnableDPIAwareness>false</EnableDPIAwareness>
-</Manifest>
-<PreBuildEvent>
-<Command></Command>
-</PreBuildEvent>
-<PostBuildEvent>
-<Command></Command>
-</PostBuildEvent>
-</ItemDefinitionGroup>
-<ItemGroup />
-<ItemGroup>
-      <CLInclude Include="pchfx.h" />
-      <CLInclude Include=".\Inc\d3dx11effect.h" />
-      <CLInclude Include=".\Inc\d3dxglobal.h" />
-      <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-      <CLInclude Include=".\Binary\EffectStateBase11.h" />
-      <CLInclude Include=".\Binary\EffectStates11.h" />
-      <CLInclude Include=".\Binary\SOParser.h" />
-      <ClCompile Include="d3dxGlobal.cpp">
-         <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-         <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-         <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
-         <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-         <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-         <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
-      </ClCompile>
-      <CLInclude Include="Effect.h" />
-      <ClCompile Include="EffectAPI.cpp" />
-      <ClCompile Include="EffectLoad.cpp" />
-      <CLInclude Include="EffectLoad.h" />
-      <ClCompile Include="EffectNonRuntime.cpp" />
-      <ClCompile Include="EffectReflection.cpp" />
-      <ClCompile Include="EffectRuntime.cpp" />
-      <None Include="EffectVariable.inl" />
-      <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-<ImportGroup Label="ExtensionTargets" />
-</Project>

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2010_DXSDK.vcxproj.filters Deleted

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<ItemGroup>
-<Filter Include="Resource Files">
-<UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier>
-<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-</Filter>
-</ItemGroup>
-<ItemGroup />
-<ItemGroup>
-      <CLInclude Include="pchfx.h" />
-      <CLInclude Include=".\Inc\d3dx11effect.h" />
-      <CLInclude Include=".\Inc\d3dxglobal.h" />
-      <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-      <CLInclude Include=".\Binary\EffectStateBase11.h" />
-      <CLInclude Include=".\Binary\EffectStates11.h" />
-      <CLInclude Include=".\Binary\SOParser.h" />
-      <ClCompile Include="d3dxGlobal.cpp" />
-      <CLInclude Include="Effect.h" />
-      <ClCompile Include="EffectAPI.cpp" />
-      <ClCompile Include="EffectLoad.cpp" />
-      <CLInclude Include="EffectLoad.h" />
-      <ClCompile Include="EffectNonRuntime.cpp" />
-      <ClCompile Include="EffectReflection.cpp" />
-      <ClCompile Include="EffectRuntime.cpp" />
-      <None Include="EffectVariable.inl" />
-      <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-</Project>

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2010_SDK81.sln Deleted

@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2010_SDK81.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj Deleted

@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Win32">
-      <Configuration>Profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|x64">
-      <Configuration>Profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Effects11</ProjectName>
-    <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
-    <RootNamespace>Effects11</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Windows81SDK_x86.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Windows81SDK_x86.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Windows81SDK_x86.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Windows81SDK_x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Windows81SDK_x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Windows81SDK_x64.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <OutDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2010\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <CLInclude Include="pchfx.h" />
-    <CLInclude Include=".\Inc\d3dx11effect.h" />
-    <CLInclude Include=".\Inc\d3dxglobal.h" />
-    <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-    <CLInclude Include=".\Binary\EffectStateBase11.h" />
-    <CLInclude Include=".\Binary\EffectStates11.h" />
-    <CLInclude Include=".\Binary\SOParser.h" />
-    <ClCompile Include="d3dxGlobal.cpp">
-       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
-       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <CLInclude Include="Effect.h" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <CLInclude Include="EffectLoad.h" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-    <None Include="EffectVariable.inl" />
-    <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2010_SDK81.vcxproj.filters Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2012.sln Deleted

@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2012.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2012.vcxproj Deleted

@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Win32">
-      <Configuration>Profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|x64">
-      <Configuration>Profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Effects11</ProjectName>
-    <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
-    <RootNamespace>Effects11</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <OutDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2012\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <CLInclude Include="pchfx.h" />
-    <CLInclude Include=".\Inc\d3dx11effect.h" />
-    <CLInclude Include=".\Inc\d3dxglobal.h" />
-    <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-    <CLInclude Include=".\Binary\EffectStateBase11.h" />
-    <CLInclude Include=".\Binary\EffectStates11.h" />
-    <CLInclude Include=".\Binary\SOParser.h" />
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <CLInclude Include="Effect.h" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <CLInclude Include="EffectLoad.h" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-    <None Include="EffectVariable.inl" />
-    <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2012.vcxproj.filters Deleted

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <CLInclude Include="pchfx.h" />
-    <CLInclude Include=".\Inc\d3dx11effect.h" />
-    <CLInclude Include=".\Inc\d3dxglobal.h" />
-    <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-    <CLInclude Include=".\Binary\EffectStateBase11.h" />
-    <CLInclude Include=".\Binary\EffectStates11.h" />
-    <CLInclude Include=".\Binary\SOParser.h" />
-    <ClCompile Include="d3dxGlobal.cpp" />
-    <CLInclude Include="Effect.h" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <CLInclude Include="EffectLoad.h" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-    <None Include="EffectVariable.inl" />
-    <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2013.sln Deleted

@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2013.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2013.vcxproj Deleted

@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Win32">
-      <Configuration>Profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|x64">
-      <Configuration>Profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Effects11</ProjectName>
-    <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
-    <RootNamespace>Effects11</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <CLInclude Include="pchfx.h" />
-    <CLInclude Include=".\Inc\d3dx11effect.h" />
-    <CLInclude Include=".\Inc\d3dxglobal.h" />
-    <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-    <CLInclude Include=".\Binary\EffectStateBase11.h" />
-    <CLInclude Include=".\Binary\EffectStates11.h" />
-    <CLInclude Include=".\Binary\SOParser.h" />
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <CLInclude Include="Effect.h" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <CLInclude Include="EffectLoad.h" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-    <None Include="EffectVariable.inl" />
-    <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2013.vcxproj.filters Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2015.sln Deleted

@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2015.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2015.vcxproj Deleted

@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Win32">
-      <Configuration>Profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|x64">
-      <Configuration>Profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Effects11</ProjectName>
-    <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
-    <RootNamespace>Effects11</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <CLInclude Include="pchfx.h" />
-    <CLInclude Include=".\Inc\d3dx11effect.h" />
-    <CLInclude Include=".\Inc\d3dxglobal.h" />
-    <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-    <CLInclude Include=".\Binary\EffectStateBase11.h" />
-    <CLInclude Include=".\Binary\EffectStates11.h" />
-    <CLInclude Include=".\Binary\SOParser.h" />
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <CLInclude Include="Effect.h" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <CLInclude Include="EffectLoad.h" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-    <None Include="EffectVariable.inl" />
-    <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2015.vcxproj.filters Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2015_Win10.sln Deleted

@@ -1,31 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2015_Win10.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Profile|Win32 = Profile|Win32
-		Profile|x64 = Profile|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64
-		{DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2015_Win10.vcxproj Deleted

@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Win32">
-      <Configuration>Profile</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|x64">
-      <Configuration>Profile</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Effects11</ProjectName>
-    <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid>
-    <RootNamespace>Effects11</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <OpenMPSupport>false</OpenMPSupport>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LargeAddressAware>true</LargeAddressAware>
-      <RandomizedBaseAddress>true</RandomizedBaseAddress>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
-      <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <Manifest>
-      <EnableDPIAwareness>false</EnableDPIAwareness>
-    </Manifest>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <CLInclude Include="pchfx.h" />
-    <CLInclude Include=".\Inc\d3dx11effect.h" />
-    <CLInclude Include=".\Inc\d3dxglobal.h" />
-    <CLInclude Include=".\Binary\EffectBinaryFormat.h" />
-    <CLInclude Include=".\Binary\EffectStateBase11.h" />
-    <CLInclude Include=".\Binary\EffectStates11.h" />
-    <CLInclude Include=".\Binary\SOParser.h" />
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <CLInclude Include="Effect.h" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <CLInclude Include="EffectLoad.h" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-    <None Include="EffectVariable.inl" />
-    <CLInclude Include="IUnknownImp.h" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_Windows10.sln Deleted

@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22609.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_Windows10.vcxproj", "{9188BD60-F60C-4A40-98CF-F704E467D775}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|ARM.ActiveCfg = Debug|ARM
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|ARM.Build.0 = Debug|ARM
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x64.ActiveCfg = Debug|x64
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x64.Build.0 = Debug|x64
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x86.ActiveCfg = Debug|Win32
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x86.Build.0 = Debug|Win32
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Release|ARM.ActiveCfg = Release|ARM
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Release|ARM.Build.0 = Release|ARM
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x64.ActiveCfg = Release|x64
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x64.Build.0 = Release|x64
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x86.ActiveCfg = Release|Win32
-		{9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_Windows10.vcxproj Deleted

@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9188bd60-f60c-4a40-98cf-f704e467d775}</ProjectGuid>
-    <Keyword>StaticLibrary</Keyword>
-    <ProjectName>Effects11</ProjectName>
-    <RootNamespace>Effects11</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_Windows81.sln Deleted

@@ -1,34 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11_Windows81", "Effects11_Windows81.vcxproj", "{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|ARM = Release|ARM
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|ARM.ActiveCfg = Debug|ARM
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|ARM.Build.0 = Debug|ARM
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|Win32.Build.0 = Debug|Win32
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|x64.ActiveCfg = Debug|x64
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|x64.Build.0 = Debug|x64
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|ARM.ActiveCfg = Release|ARM
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|ARM.Build.0 = Release|ARM
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|Win32.ActiveCfg = Release|Win32
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|Win32.Build.0 = Release|Win32
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|x64.ActiveCfg = Release|x64
-		{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_Windows81.vcxproj Deleted

@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3218b7f0-abb8-47c3-8036-b61756e8acc3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>Effects11_Windows81</ProjectName>
-    <RootNamespace>Effects11_Windows81</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters Deleted

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_WindowsPhone81.sln Deleted

@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11_WindowsPhone81", "Effects11_WindowsPhone81.vcxproj", "{961262DB-696C-48AF-BD8C-A080FC64C3F1}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|Win32 = Debug|Win32
-		Release|ARM = Release|ARM
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|ARM.ActiveCfg = Debug|ARM
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|ARM.Build.0 = Debug|ARM
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|Win32.Build.0 = Debug|Win32
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|ARM.ActiveCfg = Release|ARM
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|ARM.Build.0 = Release|ARM
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|Win32.ActiveCfg = Release|Win32
-		{961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj Deleted

@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{961262db-696c-48af-bd8c-a080fc64c3f1}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>Effects11</ProjectName>
-    <RootNamespace>Effects11</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Phone</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir>
-    <TargetName>Effects11d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln Deleted

@@ -1,23 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_XboxOneXDK_2015.vcxproj", "{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Durango = Debug|Durango
-		Profile|Durango = Profile|Durango
-		Release|Durango = Release|Durango
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Debug|Durango.ActiveCfg = Debug|Durango
-		{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Debug|Durango.Build.0 = Debug|Durango
-		{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Profile|Durango.ActiveCfg = Profile|Durango
-		{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Profile|Durango.Build.0 = Profile|Durango
-		{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Release|Durango.ActiveCfg = Release|Durango
-		{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Release|Durango.Build.0 = Release|Durango
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj Deleted

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Durango">
-      <Configuration>Release</Configuration>
-      <Platform>Durango</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Profile|Durango">
-      <Configuration>Profile</Configuration>
-      <Platform>Durango</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Durango">
-      <Configuration>Debug</Configuration>
-      <Platform>Durango</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <RootNamespace>Effects11</RootNamespace>
-    <ProjectGuid>{a2d70d23-3516-40ec-b831-2fad3dafd8b7}</ProjectGuid>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <Keyword>Win32Proj</Keyword>
-    <ApplicationEnvironment>title</ApplicationEnvironment>
-    <ProjectName>Effects11</ProjectName>
-    
-    <PlatformToolset>v110</PlatformToolset>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <TargetRuntime>Native</TargetRuntime>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <EmbedManifest>false</EmbedManifest>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <EmbedManifest>false</EmbedManifest>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <EmbedManifest>false</EmbedManifest>
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
-    <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath>
-    <LibraryPath>$(Console_SdkLibPath)</LibraryPath>
-    <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath>
-    <IncludePath>$(Console_SdkIncludeRoot)</IncludePath>
-    <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath>
-    <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'">
-    <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath>
-    <LibraryPath>$(Console_SdkLibPath)</LibraryPath>
-    <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath>
-    <IncludePath>$(Console_SdkIncludeRoot)</IncludePath>
-    <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath>
-    <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
-    <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath>
-    <LibraryPath>$(Console_SdkLibPath)</LibraryPath>
-    <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath>
-    <IncludePath>$(Console_SdkIncludeRoot)</IncludePath>
-    <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath>
-    <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>Effects11d</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
-    <Link>
-      <AdditionalDependencies>d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'">
-    <Link>
-      <AdditionalDependencies>pixEvt.lib;d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
-    <Link>
-      <AdditionalDependencies>d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile>
-      <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="Binary\EffectBinaryFormat.h" />
-    <ClInclude Include="Binary\EffectStateBase11.h" />
-    <ClInclude Include="Binary\EffectStates11.h" />
-    <ClInclude Include="Binary\SOParser.h" />
-    <ClInclude Include="inc\d3dx11effect.h" />
-    <ClInclude Include="inc\d3dxGlobal.h" />
-    <ClInclude Include="Effect.h" />
-    <ClInclude Include="EffectLoad.h" />
-    <ClInclude Include="IUnknownImp.h" />
-    <ClInclude Include="pchfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="EffectVariable.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3dxGlobal.cpp" />
-    <ClCompile Include="EffectAPI.cpp" />
-    <ClCompile Include="EffectLoad.cpp" />
-    <ClCompile Include="EffectNonRuntime.cpp" />
-    <ClCompile Include="EffectReflection.cpp" />
-    <ClCompile Include="EffectRuntime.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/IUnknownImp.h Changed

@@ -6,12 +6,8 @@
 // Lifetime for most Effects objects is based on the the lifetime of the master
 // effect, so the reference count is not used.
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -20,7 +16,7 @@
 
 #define IUNKNOWN_IMP(Class, Interface, BaseInterface) \
  \
-HRESULT STDMETHODCALLTYPE Class##::QueryInterface(REFIID iid, _COM_Outptr_ LPVOID *ppv) override \
+HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, _COM_Outptr_ LPVOID *ppv) override \
 { \
     if( !ppv ) \
         return E_INVALIDARG; \
@@ -46,12 +42,12 @@
     return S_OK; \
 } \
  \
-ULONG STDMETHODCALLTYPE Class##::AddRef() override \
+ULONG STDMETHODCALLTYPE AddRef() override \
 { \
     return 1; \
 } \
  \
-ULONG STDMETHODCALLTYPE Class##::Release() override \
+ULONG STDMETHODCALLTYPE Release() override \
 { \
     return 0; \
 }

_service:download_files:master.tar.gz/lib/win32/Effects11/LICENSE Added

@@ -0,0 +1,21 @@
+                               The MIT License (MIT)
+
+Copyright (c) 2009-2019 Microsoft Corp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+software and associated documentation files (the "Software"), to deal in the Software 
+without restriction, including without limitation the rights to use, copy, modify, 
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to the following 
+conditions: 
+
+The above copyright notice and this permission notice shall be included in all copies 
+or substantial portions of the Software.  
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

_service:download_files:master.tar.gz/lib/win32/Effects11/MIT.txt Deleted

@@ -1,21 +0,0 @@
-                               The MIT License (MIT)
-
-Copyright (c) 2016 Microsoft Corp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this 
-software and associated documentation files (the "Software"), to deal in the Software 
-without restriction, including without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
-permit persons to whom the Software is furnished to do so, subject to the following 
-conditions: 
-
-The above copyright notice and this permission notice shall be included in all copies 
-or substantial portions of the Software.  
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

_service:download_files:master.tar.gz/lib/win32/Effects11/Microsoft Public License.rtf Deleted

@@ -1,234 +0,0 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
-{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f36\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
-{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Verdana;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}
-{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f50\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f51\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;}
-{\f53\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f54\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f55\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f56\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);}
-{\f57\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f58\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f380\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f381\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
-{\f383\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f384\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f387\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f388\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
-{\f400\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\f401\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f403\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\f404\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
-{\f407\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\f408\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\f420\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f421\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}
-{\f423\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f424\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f425\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f426\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}
-{\f427\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f428\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f429\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f430\fbidi \fswiss\fcharset238\fprq2 Verdana CE;}
-{\f431\fbidi \fswiss\fcharset204\fprq2 Verdana Cyr;}{\f433\fbidi \fswiss\fcharset161\fprq2 Verdana Greek;}{\f434\fbidi \fswiss\fcharset162\fprq2 Verdana Tur;}{\f437\fbidi \fswiss\fcharset186\fprq2 Verdana Baltic;}
-{\f438\fbidi \fswiss\fcharset163\fprq2 Verdana (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}
-{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
-{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
-{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
-{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
-\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp }{\*\defpap 
-\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 
-\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\s1\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel0\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 
-\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink15 \sqformat \spriority9 heading 1;}{\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 
-\f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink16 \sqformat \spriority9 heading 2;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
-\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive 
-\rtlch\fcs1 \ab\af0\afs32 \ltrch\fcs0 \b\f36\fs32\kerning32 \sbasedon10 \slink1 \slocked \spriority9 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\ai\af0\afs28 \ltrch\fcs0 \b\i\f36\fs28 \sbasedon10 \slink2 \slocked \spriority9 Heading 2 Char;}{
-\s17\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs16\alang1025 \ltrch\fcs0 \f38\fs16\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext17 \slink18 \ssemihidden \sunhideused \styrsid7424395 Balloon Text;}
-{\*\cs18 \additive \rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16 \sbasedon10 \slink17 \slocked \ssemihidden \styrsid7424395 Balloon Text Char;}{\*\cs19 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 
-\sbasedon10 \ssemihidden \sunhideused \styrsid4538388 annotation reference;}{\s20\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
-\sbasedon0 \snext20 \slink21 \ssemihidden \sunhideused \styrsid4538388 annotation text;}{\*\cs21 \additive \rtlch\fcs1 \af1 \ltrch\fcs0 \f1 \sbasedon10 \slink20 \slocked \ssemihidden \styrsid4538388 Comment Text Char;}{
-\s22\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \ab\af1\afs20\alang1025 \ltrch\fcs0 \b\f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon20 \snext20 \slink23 \ssemihidden \sunhideused \styrsid4538388 
-annotation subject;}{\*\cs23 \additive \rtlch\fcs1 \ab\af1 \ltrch\fcs0 \b\f1 \sbasedon21 \slink22 \slocked \ssemihidden \styrsid4538388 Comment Subject Char;}}{\*\rsidtbl \rsid213160\rsid284417\rsid417145\rsid481196\rsid551334\rsid723397\rsid786968
-\rsid1382437\rsid1390003\rsid1521043\rsid1530955\rsid1708989\rsid1783212\rsid1903779\rsid2431884\rsid3165084\rsid3416120\rsid3419781\rsid3754103\rsid3768194\rsid3831520\rsid4538130\rsid4538388\rsid4552277\rsid4680449\rsid4729674\rsid4865270\rsid4987534
-\rsid5128131\rsid5186068\rsid5601121\rsid5864350\rsid6186044\rsid6311778\rsid6384507\rsid6434687\rsid6561471\rsid6910344\rsid6947552\rsid7033180\rsid7424395\rsid7682010\rsid7690850\rsid7744081\rsid8151618\rsid8196281\rsid8198206\rsid8342723\rsid8350925
-\rsid8722561\rsid8852349\rsid8934457\rsid8944153\rsid9573035\rsid9635349\rsid9638545\rsid9724918\rsid10044820\rsid10095979\rsid10228618\rsid10449644\rsid10494075\rsid11166278\rsid11166751\rsid11285353\rsid11366513\rsid11494815\rsid11932529\rsid12061202
-\rsid12533699\rsid12536400\rsid12916885\rsid13264736\rsid13322831\rsid13440556\rsid13455614\rsid13597357\rsid13768671\rsid14097590\rsid14157399\rsid14229900\rsid14305025\rsid14314735\rsid14436896\rsid14565916\rsid14572556\rsid14688892\rsid14752433
-\rsid14904394\rsid15086147\rsid15749945\rsid15814398\rsid15927751\rsid16071312\rsid16126175\rsid16279402\rsid16391569\rsid16404661\rsid16452939\rsid16537688\rsid16606866\rsid16674896}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1
-\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title Microsoft Permissive License (Ms-PL)}{\author Jonr}{\operator Chuck Walbourn}{\creatim\yr2007\mo2\dy23\hr15\min10}{\revtim\yr2011\mo8\dy15\hr15\min2}
-{\printim\yr2006\mo9\dy28\hr8\min46}{\version3}{\edmins1}{\nofpages1}{\nofwords391}{\nofchars2230}{\*\company Microsoft}{\nofcharsws2616}{\vern49273}}{\*\userprops {\propname _NewReviewCycle}\proptype30{\staticval }}{\*\xmlnstbl {\xmlns1 http://schemas.mi
-crosoft.com/office/word/2003/wordml}{\xmlns2 urn:schemas-microsoft-com:office:smarttags}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
-\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\hyphcaps0\horzdoc\dghspace120\dgvspace120
-\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\splytwnine\ftnlytwnine\htmautsp\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct\asianbrkrule\rsidroot10494075
-\newtblstyruls\nogrowautofit\utinl \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
-{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
-{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
-\s1\ql \li0\ri0\sb180\nowidctlpar\wrapdefault\faauto\outlinelevel0\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 
-\fs31\cf1\kerning36\insrsid10494075\charrsid14688892 Microsoft}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid10494075  }{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid5601121 Public}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 
-\fs31\cf1\kerning36\insrsid14688892  }{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid10494075 License (Ms-PL}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 \fs31\cf1\kerning36\insrsid4552277 )}{\rtlch\fcs1 \af1\afs31 \ltrch\fcs0 
-\fs31\cf1\kerning36\insrsid10494075 
-\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs17 \ltrch\fcs0 
-\b\f39\fs17\insrsid10494075 
-\par This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
-\par }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6910344 
-\par }\pard\plain \ltrpar\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 
-\b\f39\fs23\insrsid10494075 1. Definitions
-\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075 The terms \'93reproduce,\'94 \'93reproduction}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7744081 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 \'94 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid551334 \'93derivative works,\'94}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7744081\charrsid7744081  }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 and \'93distribution\'94 have the same meaning here as under 
-{\*\xmlopen\xmlns2{\factoidname place}}{\*\xmlopen\xmlns2{\factoidname country-region}}U.S.{\*\xmlclose}{\*\xmlclose} copyright law.
-\par }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 A \'93contribution\'94 is the original software}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid4865270 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400  }{\rtlch\fcs1 
-\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid11932529 or}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400  any additions or changes to the software.
-\par }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid551334 A \'93c}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid551334\charrsid551334 ontributor\'94 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 is}{\rtlch\fcs1 \af39\afs17 
-\ltrch\fcs0 \f39\fs17\insrsid12536400\charrsid551334  }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid551334\charrsid551334 any person that }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 
-distributes its contribution under this license.}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14229900 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid4729674\delrsid4729674  }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 \'93Licensed patents
-\'94 }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 are }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3831520 a contributor\rquote s }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 patent claims }{\rtlch\fcs1 
-\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3831520 that }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 read directly on }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3831520 its contribution.}{\rtlch\fcs1 \af1 \ltrch\fcs0 
-\insrsid14229900\charrsid14229900 
-\par }\pard\plain \ltrpar\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 
-\b\f39\fs23\insrsid5186068 
-\par }{\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 \b\f39\fs23\insrsid10494075 2. Grant of Rights
-\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075 (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 each contributor }{\rtlch\fcs1 \af39\afs17 
-\ltrch\fcs0 \f39\fs17\insrsid10494075 grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 its contribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075 , prepare derivative works of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 its contribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid12536400 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075  and distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3754103 its contribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075  or any derivative works that you create.
-\par (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid9724918 each contributor }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075 grants you a non-exclusive, worldwide, royalty-free license under }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid15814398 its }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 
-licensed patents to make, have made, use, sell, offer for sale, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid1390003 import, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 and/or otherwise dispose of }{\rtlch\fcs1 \af39\afs17 
-\ltrch\fcs0 \f39\fs17\insrsid8944153 its contribution in }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software or derivative works of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid8944153 the contribution in }{\rtlch\fcs1 
-\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software.
-\par }\pard\plain \ltrpar\s2\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\outlinelevel1\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 
-\b\f39\fs23\insrsid5186068 
-\par }{\rtlch\fcs1 \ab\af39\afs23 \ltrch\fcs0 \b\f39\fs23\insrsid10494075 3. Conditions and Limitations
-\par }\pard\plain \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs24\alang1025 \ltrch\fcs0 \f1\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid1530955  }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 (A) No Trademark License- This license does not grant you rights to use }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid1708989 any contributors\rquote  }{
-\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 name, logo, or trademarks.
-\par (B) If you }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid8934457 bring a patent claim against }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10095979 any contributor}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 
- over patents that you }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6947552 claim }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 are }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6947552 infringe}{\rtlch\fcs1 
-\af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 d by}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075  the software, your }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010 patent }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075 license}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid7682010  from such contributor}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075  to the software ends automatically.
-\par (C) If you distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid3165084 any portion of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 
-the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
-\par (D) If you distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid15749945 any portion of the }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 software in source code form}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid14904394 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075  you may do so only under this license}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6384507  }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid14904394 by including }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 a complete copy of this license with your distribution}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6384507 .}{\rtlch\fcs1 \af39\afs17 
-\ltrch\fcs0 \f39\fs17\insrsid10494075  }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid6384507 I}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 f you distribute }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid15749945 
-any portion of }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 the software in compiled or object code form}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid16452939 ,}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 
- you may only do so under a license that complies with this license.
-\par }\pard \ltrpar\ql \li0\ri0\sl336\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14572556 {\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 (E) The software is licensed \'93as-is.\'94 You bear the risk of using it. }{
-\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid284417 The contributors }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 
-give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid1783212 the contributors }{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 \f39\fs17\insrsid10494075 exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.}{\rtlch\fcs1 \af39\afs17 \ltrch\fcs0 
-\f39\fs17\insrsid10494075\charrsid14572556 
-\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
-9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
-5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
-b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
-0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
-a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
-c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
-0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
-a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
-4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
-4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210096b5ade296060000501b0000160000007468656d652f7468656d652f
-7468656d65312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87
-615b8116d8a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad
-79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b
-5d8a314d3c94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab
-999fb7b4717509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9
-699640f6719e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd586
-8b37a088d1e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d6
-0cf03ac1a5193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f
-9e7ef3f2d117d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be
-15c308d3f28acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a9979
-3849c26ae66252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d
-32a423279a668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2a
-f074481847bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86
-e877f0034e16bafb0e258ebb4faf06b769e888340b103d3311da9750aa9d0a1cd3e4efca31a3508f6d0c5c5c398602f8e2ebc71591f5b616e24dd893aa3261fb
-44f95d843b5974bb5c04f4edafb95b7892ec1108f3f98de75dc97d5772bdff7cc95d94cf672db4b3da0a6557f70db629362d72bcb0431e53c6066acac80d699a
-6409fb44d08741bdce9c0e4971624a2378cceaba830b05366b90e0ea23aaa241845368b0eb9e2612ca8c742851ca251ceccc70256d8d87265dd96361531f186c
-3d9058edf2c00eafe8e1fc5c509031bb4d680e9f39a3154de0accc56ae644441edd76156d7429d995bdd88664a9dc3ad50197c38af1a0c16d684060441db0256
-5e85f3b9660d0713cc48a0ed6ef7dedc2dc60b17e92219e180643ed27acffba86e9c94c78ab90980d8a9f0913ee49d62b512b79626fb06dccee2a432bbc60276
-b9f7dec44b7904cfbca4f3f6443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc399161ee314bc2e75cf8759081743be1236ec4f4d6693e5336fb672c5dc24a8
-c33585b5fb9cc24e1d4885545b58463634cc5416022cd19cacfccb4d30eb45296023fd35a458598360f8d7a4003bbaae25e331f155d9d9a5116d3bfb9a95523e
-51440ca2e0088dd844ec6370bf0e55d027a012ae264c45d02f708fa6ad6da6dce29c255df9f6cae0ec38666984b372ab5334cf640b37795cc860de4ae2816e95
-b21be5ceaf8a49f90b52a51cc6ff3355f47e0237052b81f6800fd7b802239daf6d8f0b1571a8426944fdbe80c6c1d40e8816b88b8569082ab84c36ff0539d4ff
-6dce591a26ade1c0a7f669880485fd484582903d284b26fa4e2156cff62e4b9265844c4495c495a9157b440e091bea1ab8aaf7760f4510eaa69a6465c0e04ec6
-9ffb9e65d028d44d4e39df9c1a52ecbd3607fee9cec7263328e5d661d3d0e4f62f44acd855ed7ab33cdf7bcb8ae889599bd5c8b3029895b6825696f6af29c239
-b75a5bb1e6345e6ee6c28117e73586c1a2214ae1be07e93fb0ff51e133fb65426fa843be0fb515c187064d0cc206a2fa926d3c902e907670048d931db4c1a449
-59d366ad93b65abe595f70a75bf03d616c2dd959fc7d4e6317cd99cbcec9c58b34766661c7d6766ca1a9c1b327531486c6f941c638c67cd22a7f75e2a37be0e8
-2db8df9f30254d30c1372581a1f51c983c80e4b71ccdd28dbf000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468
-656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4
-350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d2624
-52282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe5141
-73d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000
-0000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000
-000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019
-0200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210096b5ade296060000501b00001600000000
-000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027
-00000000000000000000000000a00900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d0100009b0a00000000}
-{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
-617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
-6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
-656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
-{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;
-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;
-\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;
-\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 1;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 2;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 3;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 4;
-\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 5;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 6;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 7;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 8;\lsdqformat1 \lsdpriority39 \lsdlocked0 toc 9;
-\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;
-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid;
-\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;
-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
-\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;
-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;
-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;
-\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 0105000002000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
-d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000808a
-33fc965bcc01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/ReadMe.txt Changed

@@ -3,16 +3,19 @@
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-August 1, 2016
+April 26, 2019
 
 Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render
 state, and runtime variables together.
 
-The source is written for Visual Studio 2013 or 2015. It is recommended that you
-make use of VS 2013 Update 5, VS 2015 Update 2, and Windows 7 Service Pack 1 or later.
+This code is designed to build with Visual Studio 2015 Update 3, Visual Studio 2017,
+or Visual Studio 2019. It is recommended that you make use of VS 2015 Update 3,
+Windows Tools 1.4.1, and the Windows 10 Anniversary Update SDK (14393) -or-
+VS 2017 (15.9 update) / VS 2019 with the Windows 10 October 2018 Update SDK (17763).
 
-These components are designed to work without requiring any content from the DirectX SDK. For details,
-see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>.
+These components are designed to work without requiring any content from the
+legacy DirectX SDK. For details, see "Where is the DirectX SDK?"
+<https://aka.ms/dxsdk>.
 
 All content and source code for this package are subject to the terms of the MIT License.
 <http://opensource.org/licenses/MIT>.
@@ -60,6 +63,38 @@
 RELEASE HISTORY
 ---------------
 
+April 26, 2019 (11.26)
+    Added VS 2019 desktop projects
+    VS 2017 updated for Windows 10 October 2018 Update SDK (17763)
+    Minor code cleanup
+
+July 12, 2018 (11.25)
+    Added D3DX11DebugMute function
+    Minor project and code cleanup
+
+May 31, 2018 (11.24)
+    VS 2017 updated for Windows 10 April 2018 Update SDK (17134)
+
+May 11, 2018 (11.23)
+    Retired VS 2013 projects
+    Code cleanup
+
+February 27, 2018 (11.22)
+    Minor code update
+
+November 2, 2017 (11.21)
+    VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)
+
+October 13, 2017 (11.20)
+    Updated for VS 2017 update 15.1 - 15.3 and Windows 10 SDK (15063)    
+
+March 10, 2017 (11.19)
+    Add VS 2017 projects
+    Minor code cleanup    
+
+September 15, 2016 (11.18)
+    Minor code cleanup
+
 August 2, 2016 (11.17)
     Updated for VS 2015 Update 3 and Windows 10 SDK (14393)
     Added 'D' suffix to debug libraries per request

_service:download_files:master.tar.gz/lib/win32/Effects11/Windows81SDKVS12_x64.props Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Windows81SDKVS12_x86.props Deleted

_service:download_files:master.tar.gz/lib/win32/Effects11/Windows81SDK_x64.props Deleted

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExecutablePath>$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH)</ExecutablePath>
-    <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(FrameworkSDKDir)\include;</IncludePath>
-    <LibraryPath>$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x64;$(FrameworkSDKDir)\lib\x64</LibraryPath>
-    <ExcludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(FrameworkSDKDir)\include;$(MSBuildToolsPath32);$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;</ExcludePath>
-  </PropertyGroup>
-<ItemDefinitionGroup />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/Windows81SDK_x86.props Deleted

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExecutablePath>$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH)</ExecutablePath>
-    <IncludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(FrameworkSDKDir)\include;</IncludePath>
-    <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x86;$(FrameworkSDKDir)\lib</LibraryPath>
-    <ExcludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ProgramFiles)\Windows Kits\8.1\Include\winrt;$(FrameworkSDKDir)\include;$(MSBuildToolsPath32);$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;</ExcludePath>
-  </PropertyGroup>
-<ItemDefinitionGroup />
-</Project>
\ No newline at end of file

_service:download_files:master.tar.gz/lib/win32/Effects11/d3dxGlobal.cpp Changed

@@ -3,12 +3,8 @@
 //
 // Direct3D 11 Effects implementation for helper data structures
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -27,7 +23,10 @@
 // CMemoryStream - A class to simplify reading binary data
 //////////////////////////////////////////////////////////////////////////
 
-CMemoryStream::CMemoryStream() : m_pData(nullptr), m_cbData(0), m_readPtr(0)
+CMemoryStream::CMemoryStream() noexcept :
+    m_pData(nullptr),
+    m_cbData(0),
+    m_readPtr(0)
 {
 }
 
@@ -128,7 +127,7 @@
 // CDataBlock - used to dynamically build up the effect file in memory
 //////////////////////////////////////////////////////////////////////////
 
-CDataBlock::CDataBlock() :
+CDataBlock::CDataBlock() noexcept :
     m_size(0),
     m_maxSize(0),
     m_pData(nullptr),
@@ -255,7 +254,7 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-CDataBlockStore::CDataBlockStore() :
+CDataBlockStore::CDataBlockStore() noexcept :
     m_pFirst(nullptr),
     m_pLast(nullptr),
     m_Size(0),
@@ -368,14 +367,26 @@
 
 //////////////////////////////////////////////////////////////////////////
 
+static bool s_mute = false;
+
+bool D3DX11DebugMute(bool mute)
+{
+    bool previous = s_mute;
+    s_mute = mute;
+    return previous;
+}
+
 #ifdef _DEBUG
 _Use_decl_annotations_
 void __cdecl D3DXDebugPrintf(UINT lvl, LPCSTR szFormat, ...)
 {
+    if (s_mute)
+        return;
+
     UNREFERENCED_PARAMETER(lvl);
 
-    char strA[4096];
-    char strB[4096];
+    char strA[4096] = {};
+    char strB[4096] = {};
 
     va_list ap;
     va_start(ap, szFormat);

_service:download_files:master.tar.gz/lib/win32/Effects11/inc/d3dx11effect.h Changed

@@ -3,23 +3,18 @@
 //
 // Direct3D 11 Effect Types & APIs Header
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
 
 #pragma once
 
-#define D3DX11_EFFECTS_VERSION 1117
+#define D3DX11_EFFECTS_VERSION 1126
 
 #if defined(_XBOX_ONE) && defined(_TITLE)
 #include <d3d11_x.h>
-#define DCOMMON_H_INCLUDED
 #define NO_D3D11_DEBUG_NAME
 #else
 #include <d3d11_1.h>
@@ -1195,6 +1190,23 @@
                                      _Out_ ID3DX11Effect **ppEffect,
                                      _Outptr_opt_result_maybenull_ ID3DBlob **ppErrors );
 
+
+//----------------------------------------------------------------------------
+// D3DX11DebugMute
+//
+// Controls the output of diagnostic information in DEBUG builds. No effect
+// in RELEASE builds.
+//
+// Returns the previous state so you can do temporary suppression like:
+//
+//    bool oldmute = D3DX11DebugMute(true);
+//    ...
+//    D3DX11DebugMute(oldmute);
+//
+//----------------------------------------------------------------------------
+
+bool D3DX11DebugMute(bool mute);
+
 #ifdef __cplusplus
 }
 #endif //__cplusplus

_service:download_files:master.tar.gz/lib/win32/Effects11/inc/d3dxGlobal.h Changed

@@ -3,12 +3,8 @@
 //
 // Direct3D 11 Effects helper defines and data structures
 //
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
 // Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 //
 // http://go.microsoft.com/fwlink/p/?LinkId=271568
 //--------------------------------------------------------------------------------------
@@ -118,13 +114,13 @@
     size_t  GetPosition();
     HRESULT Seek(_In_ size_t offset);
 
-    CMemoryStream();
+    CMemoryStream() noexcept;
     ~CMemoryStream();
 };
 
 }
 
-#if defined(_DEBUG) && !defined(_M_X64)
+#if defined(_DEBUG) && !defined(_M_X64) && !defined(_M_ARM64)
 
 namespace D3DX11Debug
 {
@@ -200,7 +196,11 @@
 public:
     HRESULT m_hLastError;
 
-    CEffectVector<T>() : m_hLastError(S_OK), m_pData(nullptr), m_CurSize(0), m_MaxSize(0)
+    CEffectVector<T>() noexcept :
+        m_hLastError(S_OK),
+        m_pData(nullptr),
+        m_CurSize(0),
+        m_MaxSize(0)
     {
 #if _DEBUG
         m_pCastData = nullptr;
@@ -477,7 +477,9 @@
     bool    m_bValid;
 
 public:
-    CheckedNumber<T, MaxValue>() : m_Value(0), m_bValid(true)
+    CheckedNumber<T, MaxValue>() noexcept :
+        m_Value(0),
+        m_bValid(true)
     {
     }
 
@@ -580,7 +582,7 @@
 
     void    EnableAlignment();
 
-    CDataBlock();
+    CDataBlock() noexcept;
     ~CDataBlock();
 
     friend class CDataBlockStore;
@@ -613,7 +615,7 @@
     uint32_t GetSize();
     void    EnableAlignment();
 
-    CDataBlockStore();
+    CDataBlockStore() noexcept;
     ~CDataBlockStore();
 };
 
@@ -838,7 +840,11 @@
         }
     };
 
-    CEffectHashTable() : m_rgpHashEntries(nullptr), m_NumHashSlots(0), m_NumEntries(0), m_bOwnHashEntryArray(false)
+    CEffectHashTable() noexcept :
+        m_rgpHashEntries(nullptr),
+        m_NumHashSlots(0),
+        m_NumEntries(0),
+        m_bOwnHashEntryArray(false)
     {
     }
 
@@ -1234,9 +1240,9 @@
     CDataBlockStore *m_pPrivateHeap;
 
 public:
-    CEffectHashTableWithPrivateHeap()
+    CEffectHashTableWithPrivateHeap() noexcept :
+        m_pPrivateHeap(nullptr)
     {
-        m_pPrivateHeap = nullptr;
     }
 
     void Cleanup()

_service:download_files:master.tar.gz/lib/win32/Effects11/pchfx.h Changed

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.native-win32.list Changed

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win10-arm.list Changed

@@ -1,37 +1,39 @@
 ; package.list should contain all file names of packages which are already in the "new" package format (the package contains the paths to the libraries
 ; and headers relative to the XBMC root directory, stored in a zip container)
-; example sqlite-3.7.12.1-win32.7z:
+; example sqlite-3.7.12.1-arm.7z:
 ; -> (package name)\(relative path to file)
-; -> sqlite-3.7.12.1-win32\project\BuildDependencies\lib\sqlite3.lib
-; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
+; -> sqlite-3.7.12.1-arm\project\BuildDependencies\lib\sqlite3.lib
+; -> sqlite-3.7.12.1-arm\system\sqlite3.dll
 ; -> ...
 ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
-crossguid-fef89a4-win10-ARM-v140.7z
-curl-7.59.0-win10-ARM-v141.7z
-flatbuffers-1.9.0.7z
-fmt-3.0.1-win10-ARM-v140.7z
-freetype-2.8-win10-ARM-v140.7z
-fstrcmp-0.7-win10-ARM-v141.7z
-lcms2-2.8-win10-ARM-v140.7z
-libaacs-0.9.0-win10-ARM-v141.7z
-libass-0.13.6-win10-ARM-v140.7z
-libbluray-1.0.2-win10-ARM-v141.7z
-libcdio-0.94-win10-ARM-v140.7z
-libfribidi-0.19.7-win10-ARM-v140.7z
-libiconv-1.15-win10-ARM-v141.7z
-libmicrohttpd-0.9.55-win10-ARM-v140.7z
-libnfs-3.0.0-win10-ARM-v141.7z
-libplist-1.12-win10-ARM-v140.7z
-libxml2-2.9.4-win10-ARM-v141.7z
-libxslt-1.1.29-win10-ARM-v140.7z
-lzo2-2.09-win10-ARM-v140.7z
-mini_wdk-10.0.14393.0-win32.7z
-mysql-connector-c-6.1.9-win10-ARM-v141.7z
-openssl-1.0.2o-win10-ARM-v141.7z
-pcre-8.40-win10-ARM-v141.7z
-rapidjson-1.1.0-win32.7z
-shairplay-ce80e00-win10-ARM-v140.7z
-sqlite-3170000-win10-ARM-v140.7z
-taglib-1.11.1-win10-ARM-v140.7z
-tinyxml-2.6.2-win10-ARM-v140.7z
-zlib-1.2.11-win10-ARM-v140.7z
+crossguid-0.2.2-win10-arm-v141-20200105.7z
+curl-7.67.0-win10-arm-v141-20200105.7z
+flatbuffers-1.11.0-20200105.7z
+fmt-6.1.2-win10-arm-v141-20200105.7z
+freetype-2.10.1-win10-arm-v141-20200105.7z
+fstrcmp-0.7-win10-arm-v141-20200105.7z
+lcms2-2.9-win10-arm-v141-20200105.7z
+libaacs-0.9.0-win10-arm-v141-20200203.7z
+libass-0.14.0-win10-arm-v141-20200105.7z
+libbdplus-0.1.2-win10-arm-v141-20200105.7z
+libbluray-1.1.2-win10-arm-v141-20200105.7z
+libcdio-2.1.0-win10-arm-v141-20200112.7z
+libfribidi-1.0.8-win10-arm-v141-20200105.7z
+libiconv-1.16-win10-arm-v141-20200105.7z
+libmicrohttpd-0.9.69-win10-arm-v141-20200105.7z
+libnfs-4.0.0-win10-arm-v141-20200105.7z
+libxml2-2.9.9-win10-arm-v141-20200105.7z
+libxslt-1.1.34-win10-arm-v141-20200105.7z
+lzo2-2.10-win10-arm-v141-20200105.7z
+mariadb-connector-c-3.1.6-win10-arm-v141-20200105.7z
+miniwdk-10.0.17763-20200106.7z
+openssl-1.1.1d-win10-arm-v141-20200105.7z
+pcre-8.43-win10-arm-v141-20200105.7z
+pillow-6.2.1-win10-arm-v141-20200105.7z
+pycryptodome-3.9.4-win10-arm-v141-20200110.7z
+python-3.7.5-win10-arm-v141-20200105.7z
+rapidjson-1.1.0-20200105.7z
+sqlite-3300100-win10-arm-v141-20200105.7z
+taglib-1.11.1-win10-arm-v141-20200105.7z
+tinyxml-2.6.2-win10-arm-v141-20200105.7z
+zlib-1.2.11-win10-arm-v141-20200105.7z

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win10-win32.list Changed

@@ -6,33 +6,34 @@
 ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
 ; -> ...
 ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
-crossguid-fef89a4-win10-Win32-v140.7z
-curl-7.59.0-win10-Win32-v141.7z
-flatbuffers-1.9.0.7z
-fmt-3.0.1-win10-Win32-v140.7z
-freetype-2.8-win10-Win32-v140.7z
-fstrcmp-0.7-win10-Win32-v141.7z
-lcms2-2.8-win10-Win32-v140.7z
-libaacs-0.9.0-win10-Win32-v141.7z
-libass-0.13.6-win10-Win32-v140.7z
-libbluray-1.0.2-win10-Win32-v141.7z
-libcdio-0.94-win10-Win32-v140.7z
-libfribidi-0.19.7-win10-Win32-v140.7z
-libiconv-1.15-win10-Win32-v141.7z
-libmicrohttpd-0.9.55-win10-Win32-v140.7z
-libnfs-3.0.0-win10-Win32-v141.7z
-libplist-1.12-win10-Win32-v140.7z
-libxml2-2.9.4-win10-Win32-v141.7z
-libxslt-1.1.29-win10-Win32-v140.7z
-lzo2-2.09-win10-Win32-v140.7z
-mini_wdk-10.0.14393.0-win32.7z
-mysql-connector-c-6.1.9-win10-Win32-v141.7z
-openssl-1.1.1b-win10-Win32-v141.7z
-pcre-8.40-win10-Win32-v141.7z
-python3-3.7.2-win10-Win32-v141.7z
-rapidjson-1.1.0-win32.7z
-shairplay-ce80e00-win10-Win32-v140.7z
-sqlite-3170000-win10-Win32-v140.7z
-taglib-1.11.1-win10-Win32-v140.7z
-tinyxml-2.6.2-win10-Win32-v140.7z
-zlib-1.2.11-win10-Win32-v140.7z
+crossguid-0.2.2-win10-win32-v141-20200105.7z
+curl-7.67.0-win10-win32-v141-20200105.7z
+flatbuffers-1.11.0-20200105.7z
+fmt-6.1.2-win10-win32-v141-20200105.7z
+freetype-2.10.1-win10-win32-v141-20200105.7z
+fstrcmp-0.7-win10-win32-v141-20200105.7z
+lcms2-2.9-win10-win32-v141-20200105.7z
+libaacs-0.9.0-win10-win32-v141-20200203.7z
+libass-0.14.0-win10-win32-v141-20200105.7z
+libbdplus-0.1.2-win10-win32-v141-20200105.7z
+libbluray-1.1.2-win10-win32-v141-20200105.7z
+libcdio-2.1.0-win10-win32-v141-20200112.7z
+libfribidi-1.0.8-win10-win32-v141-20200105.7z
+libiconv-1.16-win10-win32-v141-20200105.7z
+libmicrohttpd-0.9.69-win10-win32-v141-20200105.7z
+libnfs-4.0.0-win10-win32-v141-20200105.7z
+libxml2-2.9.9-win10-win32-v141-20200105.7z
+libxslt-1.1.34-win10-win32-v141-20200105.7z
+lzo2-2.10-win10-win32-v141-20200105.7z
+mariadb-connector-c-3.1.6-win10-win32-v141-20200105.7z
+miniwdk-10.0.17763-20200106.7z
+openssl-1.1.1d-win10-win32-v141-20200105.7z
+pcre-8.43-win10-win32-v141-20200105.7z
+pillow-6.2.1-win10-win32-v141-20200105.7z
+pycryptodome-3.9.4-win10-win32-v141-20200110.7z
+python-3.7.5-win10-win32-v141-20200105.7z
+rapidjson-1.1.0-20200105.7z
+sqlite-3300100-win10-win32-v141-20200105.7z
+taglib-1.11.1-win10-win32-v141-20200105.7z
+tinyxml-2.6.2-win10-win32-v141-20200105.7z
+zlib-1.2.11-win10-win32-v141-20200105.7z

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win10-x64.list Changed

@@ -6,33 +6,34 @@
 ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
 ; -> ...
 ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
-crossguid-fef89a4-win10-x64-v140.7z
-curl-7.59.0-win10-x64-v141.7z
-flatbuffers-1.9.0.7z
-fmt-3.0.1-win10-x64-v140.7z
-freetype-2.8-win10-x64-v140.7z
-fstrcmp-0.7-win10-x64-v141.7z
-lcms2-2.8-win10-x64-v140.7z
-libaacs-0.9.0-win10-x64-v141.7z
-libass-0.13.6-win10-x64-v140.7z
-libbluray-1.0.2-win10-x64-v141.7z
-libcdio-0.94-win10-x64-v140.7z
-libfribidi-0.19.7-win10-x64-v140.7z
-libiconv-1.15-win10-x64-v141.7z
-libmicrohttpd-0.9.55-win10-x64-v140.7z
-libnfs-3.0.0-win10-x64-v141.7z
-libplist-1.12-win10-x64-v140.7z
-libxml2-2.9.4-win10-x64-v141.7z
-libxslt-1.1.29-win10-x64-v140.7z
-lzo2-2.09-win10-x64-v140.7z
-mini_wdk-10.0.14393.0-win32.7z
-mysql-connector-c-6.1.9-win10-x64-v141.7z
-openssl-1.1.1b-win10-x64-v141.7z
-pcre-8.40-win10-x64-v141.7z
-python3-3.7.2-win10-x64-v141.7z
-rapidjson-1.1.0-win32.7z
-shairplay-ce80e00-win10-x64-v140.7z
-sqlite-3170000-win10-x64-v140.7z
-taglib-1.11.1-win10-x64-v140.7z
-tinyxml-2.6.2-win10-x64-v140.7z
-zlib-1.2.11-win10-x64-v140.7z
+crossguid-0.2.2-win10-x64-v141-20200105.7z
+curl-7.67.0-win10-x64-v141-20200105.7z
+flatbuffers-1.11.0-20200105.7z
+fmt-6.1.2-win10-x64-v141-20200105.7z
+freetype-2.10.1-win10-x64-v141-20200105.7z
+fstrcmp-0.7-win10-x64-v141-20200105.7z
+lcms2-2.9-win10-x64-v141-20200105.7z
+libaacs-0.9.0-win10-x64-v141-20200203.7z
+libass-0.14.0-win10-x64-v141-20200105.7z
+libbdplus-0.1.2-win10-x64-v141-20200105.7z
+libbluray-1.1.2-win10-x64-v141-20200105.7z
+libcdio-2.1.0-win10-x64-v141-20200112.7z
+libfribidi-1.0.8-win10-x64-v141-20200105.7z
+libiconv-1.16-win10-x64-v141-20200105.7z
+libmicrohttpd-0.9.69-win10-x64-v141-20200105.7z
+libnfs-4.0.0-win10-x64-v141-20200105.7z
+libxml2-2.9.9-win10-x64-v141-20200105.7z
+libxslt-1.1.34-win10-x64-v141-20200105.7z
+lzo2-2.10-win10-x64-v141-20200105.7z
+mariadb-connector-c-3.1.6-win10-x64-v141-20200105.7z
+miniwdk-10.0.17763-20200106.7z
+openssl-1.1.1d-win10-x64-v141-20200105.7z
+pcre-8.43-win10-x64-v141-20200105.7z
+pillow-6.2.1-win10-x64-v141-20200105.7z
+pycryptodome-3.9.4-win10-x64-v141-20200110.7z
+python-3.7.5-win10-x64-v141-20200105.7z
+rapidjson-1.1.0-20200105.7z
+sqlite-3300100-win10-x64-v141-20200105.7z
+taglib-1.11.1-win10-x64-v141-20200105.7z
+tinyxml-2.6.2-win10-x64-v141-20200105.7z
+zlib-1.2.11-win10-x64-v141-20200105.7z

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win32.list Changed

@@ -6,39 +6,42 @@
 ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
 ; -> ...
 ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
-crossguid-8f399e-win32-vc140-v3.7z
-curl-7.59.0-Win32-v140.7z
-dnssd-765.50.9-win32-vc140-v2.7z
-easyhook-2.7.5870.0-win32-vc140-v2.7z
-flatbuffers-1.9.0.7z
-fmt-3.0.1-win32-vc140.7z
-freetype-db5a22-win32-vc140.7z
-fstrcmp-0.7-Win32-v141.7z
-giflib-5.1.4-win32-vc140.7z
-lcms2-2.8-win32-vc140.7z
-libaacs-0.9.0-win32-vc140.7z
-libass-d18a5f1-win32-vc140.7z
-libbluray-1.0.2-win32-vc140.7z
-libcdio-0.9.3-win32-vc140.7z
-libcec-4.0.2-Win32-v141.7z
-libfribidi-0.19.2-win32.7z
-libiconv-1.14-win32-vc140-v2.7z
-libjpeg-turbo-1.4.90-win32-vc140.7z
-libmicrohttpd-0.9.55-win32-vc140.7z
-libnfs-3.0.0-Win32-v141.7z
-libplist-1.13.0-win32-vc140.7z
-libpng-1.6.21-win32-vc140.7z
-libxml2-2.9.4-win32-vc140-v2.7z
-libxslt-1.1.29-win32-vc140.7z
-lzo-2.09-win32-vc140-v3.7z
-mini_wdk-10.0.14393.0-win32.7z
-mysql-connector-c-6.1.6-win32-vc140-v2.7z
-openssl-1.1.1b-win10-Win32-v141.7z
-pcre-8.37-win32-vc140-v3.7z
-python3-3.7.1-Win32-v141.7z
-rapidjson-1.1.0-win32.7z
-shairplay-0.9.0-win32-vc140-v2.7z
-sqlite-3.10.2-win32-vc140.7z
-taglib-1.11.1_80df30-win32-vc140.7z
-tinyxmlstl-2.6.2-win32-vc140-v2.7z
-zlib-1.2.8-win32-vc140-v3.7z
+crossguid-0.2.2-win32-v141-20200105.7z
+curl-7.67.0-win32-v141-20200105.7z
+detours-64ec13-win32-v141-20200105.7z
+dnssd-878.260.1-win32-v141-20200105.7z
+flatbuffers-1.11.0-20200105.7z
+fmt-6.1.2-win32-v141-20200105.7z
+freetype-2.10.1-win32-v141-20200105.7z
+fstrcmp-0.7-win32-v141-20200105.7z
+giflib-5.2.1-win32-v141-20200105.7z
+lcms2-2.9-win32-v141-20200105.7z
+libaacs-0.9.0-win32-v141-20200203.7z
+libass-0.14.0-win32-v141-20200105.7z
+libbdplus-0.1.2-win32-v141-20200105.7z
+libbluray-1.1.2-win32-v141-20200105.7z
+libcdio-2.1.0-win32-v141-20200112.7z
+libcec-4.0.4-win32-v141-20200105.7z
+libfribidi-1.0.8-win32-v141-20200105.7z
+libiconv-1.16-win10-win32-v141-20200105.7z
+libjpeg-turbo-2.0.3-win32-v141-20200105.7z
+libmicrohttpd-0.9.69-win32-v141-20200105.7z
+libnfs-4.0.0-win32-v141-20200105.7z
+libplist-2.1.0-win32-v141-20200105.7z
+libpng-1.6.37-win32-v141-20200105.7z
+libxml2-2.9.9-win32-v141-20200105.7z
+libxslt-1.1.34-win32-v141-20200105.7z
+lzo2-2.10-win32-v141-20200105.7z
+mariadb-connector-c-3.1.6-win32-v141-20200105.7z
+miniwdk-10.0.17763-20200106.7z
+openssl-1.1.1d-win10-win32-v141-20200105.7z
+pcre-8.43-win32-v141-20200105.7z
+pillow-6.2.1-win32-v141-20200105.7z
+pycryptodome-3.9.4-win32-v141-20200110.7z
+python-3.7.5-win32-v141-20200105.7z
+rapidjson-1.1.0-20200105.7z
+shairplay-ce80e00-win32-v141-20200105.7z
+sqlite-3300100-win32-v141-20200105.7z
+taglib-1.11.1-win32-v141-20200105.7z
+tinyxml-2.6.2-win32-v141-20200105.7z
+zlib-1.2.11-win32-v141-20200105.7z

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-x64.list Changed

@@ -6,36 +6,39 @@
 ; -> sqlite-3.7.12.1-win32\system\sqlite3.dll
 ; -> ...
 ;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
-crossguid-fef89a4-x64-vc140.7z
-curl-7.61.1-x64-v141.7z
-dnssd-765.50.9-x64-vc140-v2.7z
-easyhook-2.7.6035.0-x64-vc140.7z
-flatbuffers-1.9.0.7z
-fmt-3.0.1-x64-vc140.7z
-freetype-db5a224-x64-vc140.7z
-fstrcmp-0.7-x64-v141.7z
-lcms2-2.8-x64-vc140.7z
-libaacs-0.9.0-x64-vc140.7z
-libass-d18a5f1-x64-vc140.7z
-libbluray-1.0.2-x64-vc140.7z
-libcdio-0.94-x64-vc140.7z
-libcec-4.0.2-x64-vc140.7z
-libfribidi-0.19.7-x64-vc140.7z
-libiconv-1.15-x64-vc140.7z
-libmicrohttpd-0.9.55-x64-vc140.7z
-libnfs-3.0.0-x64-v141.7z
-libplist-1.12-x64-vc140.7z
-libxml2-2.9.4-x64-vc140.7z
-libxslt-1.1.29-x64-vc140.7z
-lzo-2.09-x64-vc140.7z
-mini_wdk-10.0.14393.0-x64.7z
-mariadb-connector-c-3.0.6-x64-v141.7z
-openssl-1.1.1-x64-v141.7z
-pcre-8.40-x64-vc140.7z
-python3-3.7.1-x64-v141.7z
-rapidjson-1.1.0-win32.7z
-shairplay-ce80e00-x64-vc140.7z
-sqlite-3.17.0-x64-vc140.7z
-taglib-1.11.1-x64-vc140.7z
-tinyxmlstl-2.6.2-x64-vc140.7z
-zlib-1.2.11-x64-v141.7z
+crossguid-0.2.2-x64-v141-20200105.7z
+curl-7.67.0-x64-v141-20200105.7z
+detours-64ec13-x64-v141-20200105.7z
+dnssd-878.260.1-x64-v141-20200105.7z
+flatbuffers-1.11.0-20200105.7z
+fmt-6.1.2-x64-v141-20200105.7z
+freetype-2.10.1-x64-v141-20200105.7z
+fstrcmp-0.7-x64-v141-20200105.7z
+lcms2-2.9-x64-v141-20200105.7z
+libaacs-0.9.0-x64-v141-20200203.7z
+libass-0.14.0-x64-v141-20200105.7z
+libbdplus-0.1.2-x64-v141-20200105.7z
+libbluray-1.1.2-x64-v141-20200105.7z
+libcdio-2.1.0-x64-v141-20200112.7z
+libcec-4.0.4-x64-v141-20200105.7z
+libfribidi-1.0.8-x64-v141-20200105.7z
+libiconv-1.16-x64-v141-20200105.7z
+libmicrohttpd-0.9.69-x64-v141-20200105.7z
+libnfs-4.0.0-x64-v141-20200105.7z
+libplist-2.1.0-x64-v141-20200105.7z
+libxml2-2.9.9-x64-v141-20200105.7z
+libxslt-1.1.34-x64-v141-20200105.7z
+lzo2-2.10-x64-v141-20200105.7z
+mariadb-connector-c-3.1.6-x64-v141-20200105.7z
+miniwdk-10.0.17763-20200106.7z
+openssl-1.1.1d-x64-v141-20200105.7z
+pcre-8.43-x64-v141-20200105.7z
+pillow-6.2.1-x64-v141-20200105.7z
+pycryptodome-3.9.4-x64-v141-20200110.7z
+python-3.7.5-x64-v141-20200105.7z
+rapidjson-1.1.0-20200105.7z
+shairplay-ce80e00-x64-v141-20200105.7z
+sqlite-3300100-x64-v141-20200105.7z
+taglib-1.11.1-x64-v141-20200105.7z
+tinyxml-2.6.2-x64-v141-20200105.7z
+zlib-1.2.11-x64-v141-20200105.7z

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/get_formed.cmd Changed

_service:download_files:master.tar.gz/system/certs Added

_service:download_files:master.tar.gz/system/certs/cacert.pem Added

@@ -0,0 +1,3466 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Thu Feb 13 00:00:00 2020 GMT
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R6
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GC CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
+9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
+aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
+r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
+LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
+4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
+06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
+3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
+JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
+BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
+d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
+fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
+ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
+gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
+4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
+tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
+pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
+sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
+CFF1pkgl
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
+k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
+7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
+m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
+dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
+ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
+cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
+aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
+5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
+BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
+vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
++YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
+c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
+WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
+n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
+Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
+7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
+gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
+o/DUhgkC
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
+Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
+0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
+glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
+KaqW04MjyaR7YbPMAuhd
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
+6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
+2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
+N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
+zPKwTdb+mciUqXWi4w==
+-----END CERTIFICATE-----
+
+UCA Global G2 Root
+==================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
+
+UCA Extended Validation Root
+============================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
+
+Certigna Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
+
+emSign Root CA - G1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJJTjET
+MBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
+ZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgx
+ODMwMDBaMGcxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVk
+aHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQzf2N4aLTN
+LnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO8oG0x5ZOrRkVUkr+PHB1
+cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aqd7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHW
+DV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhMtTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ
+6DqS0hdW5TUaQBw+jSztOd9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrH
+hQIDAQABo0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31xPaOfG1vR2vjTnGs2
+vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjMwiI/aTvFthUvozXGaCocV685743Q
+NcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6dGNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q
++Mri/Tm3R7nrft8EI6/6nAYH6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeih
+U80Bv2noWgbyRQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
+iN66zB+Afko=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQGEwJJTjETMBEG
+A1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
+MB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4
+MTgzMDAwWjBrMQswCQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11
+ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
+RzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0WXTsuwYc
+58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xySfvalY8L1X44uT6EYGQIr
+MgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuBzhccLikenEhjQjAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+D
+CBeQyh+KTOgNG3qxrdWBCUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7
+jHvrZQnD+JbNR6iC8hZVdyR+EhCVBCyj
+-----END CERTIFICATE-----
+
+emSign Root CA - C1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCVVMx
+EzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNp
+Z24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQD
+ExNlbVNpZ24gUm9vdCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+up
+ufGZBczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZHdPIWoU/
+Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH3DspVpNqs8FqOp099cGX
+OFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvHGPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4V
+I5b2P/AgNBbeCsbEBEV5f6f9vtKppa+cxSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleooms
+lMuoaJuvimUnzYnu3Yy1aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+
+XJGFehiqTbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87/kOXSTKZEhVb3xEp
+/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4kqNPEjE2NuLe/gDEo2APJ62gsIq1
+NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrGYQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9
+wC68AivTxEDkigcxHpvOJpkT+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQ
+BmIMMMAVSKeoWXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - C3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQGEwJVUzETMBEG
+A1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMxIDAeBgNVBAMTF2VtU2lnbiBF
+Q0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQD
+ExdlbVNpZ24gRUNDIFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd
+6bciMK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4OjavtisIGJAnB9
+SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0OBBYEFPtaSNCAIEDyqOkA
+B2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gA
+MGUCMQC02C8Cif22TGK6Q04ThHK1rt0c3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwU
+ZOR8loMRnLDRWmFLpg9J0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQELBQAwbzELMAkG
+A1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJSG9uZyBLb25nMRYwFAYDVQQK
+Ew1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25na29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2
+MDMwMjI5NDZaFw00MjA2MDMwMjI5NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtv
+bmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMX
+SG9uZ2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz
+iNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFOdem1p+/l6TWZ5Mwc50tf
+jTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mIVoBc+L0sPOFMV4i707mV78vH9toxdCim
+5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOe
+sL4jpNrcyCse2m5FHomY2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj
+0mRiikKYvLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+TtbNe/
+JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZbx39ri1UbSsUgYT2u
+y1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+l2oBlKN8W4UdKjk60FSh0Tlxnf0h
++bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YKTE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsG
+xVd7GYYKecsAyVKvQv83j+GjHno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwID
+AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
+i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEwDQYJKoZIhvcN
+AQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG7BJ8dNVI0lkUmcDrudHr9Egw
+W62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCkMpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWld
+y8joRTnU+kLBEUx3XZL7av9YROXrgZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov
++BS5gLNdTaqX4fnkGMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDc
+eqFS3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJmOzj/2ZQw
+9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+l6mc1X5VTMbeRRAc6uk7
+nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6cJfTzPV4e0hz5sy229zdcxsshTrD3mUcY
+hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
+60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq
+dBb9HxEGmpv0
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G4
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAwgb4xCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu
+bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1
+dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eSAtIEc0MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYT
+AlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
+L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEc0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3D
+umSXbcr3DbVZwbPLqGgZ2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV
+3imz/f3ET+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j5pds
+8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAMC1rlLAHGVK/XqsEQ
+e9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73TDtTUXm6Hnmo9RR3RXRv06QqsYJn7
+ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNXwbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5X
+xNMhIWNlUpEbsZmOeX7m640A2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV
+7rtNOzK+mndmnqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
+dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwlN4y6mACXi0mW
+Hv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNjc0kCAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9n
+MA0GCSqGSIb3DQEBCwUAA4ICAQAS5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4Q
+jbRaZIxowLByQzTSGwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht
+7LGrhFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/B7NTeLUK
+YvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uIAeV8KEsD+UmDfLJ/fOPt
+jqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbwH5Lk6rWS02FREAutp9lfx1/cH6NcjKF+
+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKW
+RGhXxNUzzxkvFMSUHHuk2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjA
+JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G
++TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT
+kcpG2om3PVODLAgfi49T3f+sHw==
+-----END CERTIFICATE-----

_service:download_files:master.tar.gz/system/keymaps/customcontroller.SiriRemote.xml Added

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<keymap>
+  <global>
+    <customcontroller name="SiriRemote">
+            <button id="1">Up</button>
+            <button id="2">Down</button>
+            <button id="3">Left</button>
+            <button id="4">Right</button>
+            <button id="5">Select</button>
+            <button id="6">Back</button>
+            <button id="7">ContextMenu</button>
+              <button id="8">Up</button>
+            <button id="9">Down</button>
+            <button id="10">Left</button>
+           <button id="11">Right</button>
+            <button id="12">PlayPause</button>
+               <button id="13">Play</button>
+              <button id="14">Pause</button>
+               <button id="15">Stop</button>
+         <button id="16">SkipNext</button>
+         <button id="17">SkipPrevious</button>
+       <button id="18">FastForward</button>
+             <button id="19">Rewind</button>
+    </customcontroller>
+  </global>
+  <Home>
+    <customcontroller name="SiriRemote">
+      <button id="6">ActivateWindow(Favourites)</button>
+    </customcontroller>
+  </Home>
+  <FullscreenVideo>
+    <customcontroller name="SiriRemote">
+      <button id="1">VolumeUp</button>
+      <button id="2">VolumeDown</button>
+      <button id="3">StepBack</button>
+      <button id="4">StepForward</button>
+      <button id="5">Pause</button>
+      <button id="6">Stop</button>
+      <button id="7">OSD</button>
+      <button id="8">noop</button>
+      <button id="9">noop</button>
+      <button id="10">noop</button>
+      <button id="11">noop</button>
+    </customcontroller>
+  </FullscreenVideo>
+  <FullscreenLiveTV>
+    <customcontroller name="SiriRemote">
+      <button id="3">ChannelDown</button>
+      <button id="4">ChannelUp</button>
+      <button id="8">noop</button>
+      <button id="9">noop</button>                                
+      <button id="10">noop</button>
+      <button id="11">noop</button>
+    </customcontroller>
+  </FullscreenLiveTV>
+  <FullscreenRadio>
+    <customcontroller name="SiriRemote">
+      <button id="3">ChannelDown</button>
+      <button id="4">ChannelUp</button>
+    </customcontroller>
+  </FullscreenRadio>
+  <Visualisation>
+    <customcontroller name="SiriRemote">
+      <button id="1">VolumeUp</button>
+      <button id="2">VolumeDown</button>
+      <button id="3">SkipPrevious</button>
+      <button id="4">SkipNext</button>
+      <button id="5">Pause</button>
+      <button id="6">Fullscreen</button>
+      <button id="7">OSD</button>
+    </customcontroller>
+  </Visualisation>
+  <SlideShow>
+    <customcontroller name="SiriRemote">
+      <button id="1">ZoomIn</button>
+      <button id="2">ZoomOut</button>
+      <button id="3">PreviousPicture</button>
+      <button id="4">NextPicture</button>
+      <button id="6">Stop</button>
+      <button id="7">Info</button>
+    </customcontroller>
+  </SlideShow>
+  <ScreenCalibration>
+    <customcontroller name="SiriRemote">
+      <button id="5">NextCalibration</button>
+    </customcontroller>
+  </ScreenCalibration>
+  <VideoOSD>
+    <customcontroller name="SiriRemote">
+      <button id="7">Back</button>
+    </customcontroller>
+  </VideoOSD>
+  <VideoMenu>
+    <customcontroller name="SiriRemote">
+      <button id="5">Select</button>
+      <button id="6">Stop</button>
+      <button id="7">OSD</button>
+    </customcontroller>
+  </VideoMenu>
+  <Videos>
+    <customcontroller name="SiriRemote">
+      <button id="7">Info</button>
+    </customcontroller>
+  </Videos>
+  <PictureInfo>
+    <customcontroller name="SiriRemote">
+      <button id="3">Left</button>
+      <button id="4">Right</button>
+    </customcontroller>
+  </PictureInfo>
+</keymap>

_service:download_files:master.tar.gz/system/playercorefactory.xml Changed

_service:download_files:master.tar.gz/system/settings/darwin_tvos.xml Added

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings>
+  <section id="interface">
+    <category id="screensaver">
+      <visible>false</visible>
+      <group id="1">
+        <setting id="screensaver.mode">
+          <default></default>
+        </setting>
+        <setting id="screensaver.usemusicvisinstead">
+          <default>false</default>
+        </setting>
+        <setting id="screensaver.usedimonpause">
+          <default>false</default>
+        </setting>
+      </group>
+    </category>
+    <category id="masterlock">
+      <visible>false</visible>
+    </category>
+  </section>
+  <section id="system">
+    <category id="input">
+      <group id="1">
+        <setting id="input.peripherals">
+          <visible>false</visible>
+        </setting>
+      </group>
+      <group id="2">
+        <setting id="input.enablemouse">
+          <default>false</default>
+          <visible>false</visible>
+        </setting>
+        <setting id="input.controllerconfig">
+          <visible>false</visible>
+        </setting>
+      </group>
+      <group id="3">
+        <setting id="input.appleremotemode">
+          <visible>false</visible>
+        </setting>
+        <setting id="input.appleremotesequencetime">
+          <visible>false</visible>
+        </setting>
+        <setting id="input.applesiri" type="boolean" label="24163" help="24153">
+          <level>1</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="input.applesiritimeoutenabled" type="boolean" label="24160" help="24161">
+          <level>1</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="input.applesiritimeout" type="integer" label="24154" help="24155">
+          <level>1</level>
+          <default>60</default>
+          <constraints>
+            <options>
+              <option label="24156">30</option>
+              <option label="24157">60</option>
+              <option label="24158">90</option>
+              <option label="24159">120</option>
+            </options>
+          </constraints>
+          <control type="list" format="integer" />
+          <dependencies>
+            <dependency type="enable" setting="input.applesiritimeoutenabled">true</dependency>
+          </dependencies>
+        </setting>
+        <setting id="input.appleusekodikeyboard" type="boolean" label="24162">
+          <level>1</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
+      </group>
+    </category>
+  </section>
+  <section id="player">
+    <category id="videoplayer">
+      <group id="3">
+        <setting id="videoplayer.hqscalers">
+          <visible>false</visible>
+        </setting>
+      </group>
+    </category>
+    <category id="discs">
+      <group id="3" label="620">
+        <visible>false</visible>
+      </group>
+    </category>
+  </section>
+  <section id="services" label="14036" help="36319">
+    <category id="airplay" label="1273" help="36602">
+      <visible>false</visible>
+    </category>
+  </section>
+  <section id="system">
+    <category id="display">
+      <group id="1">
+        <setting id="videoscreen.fakefullscreen">
+          <visible>false</visible>
+        </setting>
+        <setting id="videoscreen.blankdisplays">
+          <visible>false</visible>
+        </setting>
+        <setting id="videoscreen.resolution" type="integer" parent="videoscreen.screen" label="169" help="36352">
+          <visible>false</visible>
+        </setting>
+        <setting id="videoscreen.vsync" type="integer" label="13105" help="36356">
+          <default>2</default> 
+          <visible>false</visible>
+        </setting>
+      </group>
+    </category>
+    <category id="audio">
+      <group id="1">
+        <setting id="audiooutput.audiodevice" type="string">
+          <default>Default</default>
+          <visible>false</visible>
+        </setting>
+      </group>
+      <group id="3">
+        <setting id="audiooutput.passthroughdevice" type="string">
+          <default>Default</default>
+          <visible>false</visible>
+        </setting>
+        <setting id="audiooutput.supportdtshdcpudecoding" type="boolean">
+            <default>false</default>
+            <visible>false</visible>
+        </setting>
+      </group>
+    </category>
+    <category id="powermanagement">
+      <group id="1">
+        <visible>false</visible>
+      </group>
+    </category>
+  </section>
+</settings>

_service:download_files:master.tar.gz/system/settings/settings.xml Changed

@@ -989,10 +989,25 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
+        <setting id="videolibrary.moviesetsfolder" type="path" label="20226" help="36300">
+          <level>1</level>
+          <default></default>
+          <constraints>
+            <allowempty>true</allowempty>
+          </constraints>
+          <control type="button" format="path">
+            <heading>657</heading>
+          </control>
+        </setting>
       </group>
     </category>
     <category id="music" label="14216" help="38108">
       <group id="1" label="593">
+        <setting id="musicfiles.selectaction" type="boolean" label="12381" help="38112">
+          <level>0</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
         <setting id="musicfiles.trackformat" type="string" label="13307" help="36275">
           <level>3</level>
           <default>[%N. ]%A - %T</default>
@@ -1342,11 +1357,6 @@
           <level>2</level>
           <default>false</default>
           <control type="toggle" />
-        </setting>
-        <setting id="epg.storeepgindatabase" type="boolean" label="19072" help="36223">
-          <level>2</level>
-          <default>false</default>
-          <control type="toggle" />
         </setting>
         <setting id="epg.resetepg" type="action" label="19185" help="36225">
           <level>1</level>

_service:download_files:master.tar.gz/tools/EventClients/icons/bluetooth.png Changed

_service:download_files:master.tar.gz/tools/android/packaging/Makefile.in Changed

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64 Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/configure-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/configure-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/make-binary-addons Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/make-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/make-native-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/make-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/package Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/prepare-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/android-x86_64/prepare-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/defaultenv Changed

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/configure-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/configure-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/make-binary-addons Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/make-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/make-native-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/make-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/package Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/prepare-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/prepare-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aarch64-gbm/run-tests Added

_service:download_files:master.tar.gz/tools/buildsteps/tvos/configure-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/tvos/make-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/tvos/package Added

_service:download_files:master.tar.gz/tools/buildsteps/windows/download-dependencies.bat Changed

_service:download_files:master.tar.gz/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch Changed

@@ -1,26 +1,13 @@
-From 18de5c60ae0a987680681d5a0602009b428504fa Mon Sep 17 00:00:00 2001
-From: Gilles Khouzam <gillesk@microsoft.com>
-Date: Mon, 19 Jun 2017 16:33:38 -0700
-Subject: [PATCH] Add better detection for Openssl on Windows.
-
-Look for libeay32 and ssleay32 as another detection mechanism
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/configure b/configure
-index a1818dc..1cf2a7c 100755
+index 34c2adb4a4..160884d8f9 100755
 --- a/configure
 +++ b/configure
-@@ -6147,6 +6147,8 @@
+@@ -6358,6 +6358,8 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
 +                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -ladvapi32 -luser32 ||
 +                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
                                 die "ERROR: openssl not found"; }
+ enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
  enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
-                                require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create &&
--- 
-2.10.1.windows.1
-

_service:download_files:master.tar.gz/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch Changed

@@ -1,6 +1,17 @@
+diff --git a/configure b/configure
+index 34c2adb4a4..a2a2515525 100755
 --- a/configure
 +++ b/configure
-@@ -7197,6 +7197,9 @@
+@@ -6358,6 +6358,8 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
++                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -ladvapi32 -luser32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
+                                die "ERROR: openssl not found"; }
+ enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
+ enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
+@@ -7437,6 +7439,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
                                       $CONFIG_EXTRA      \
                                       $ALL_COMPONENTS    \

_service:download_files:master.tar.gz/tools/buildsteps/windows/patches/0003-ffmpeg-static.patch Changed

@@ -1,6 +1,8 @@
+diff --git a/configure b/configure
+index 34c2adb4a4..9c0ff0cd88 100755
 --- a/configure
 +++ b/configure
-@@ -5131,6 +5131,8 @@
+@@ -5312,6 +5312,8 @@ case $target_os in
          enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
          enabled x86_32 && check_ldflags -Wl,--large-address-aware
          shlibdir_default="$bindir_default"
@@ -9,7 +11,7 @@
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
-@@ -5180,6 +5182,8 @@
+@@ -5361,6 +5363,8 @@ case $target_os in
          fi
          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
          shlibdir_default="$bindir_default"
@@ -18,3 +20,22 @@
          SLIBPREF=""
          SLIBSUF=".dll"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
+@@ -6358,6 +6362,8 @@ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OP
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
++                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -ladvapi32 -luser32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
+                                die "ERROR: openssl not found"; }
+ enabled pocketsphinx      && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
+ enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
+@@ -7437,6 +7443,9 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
+                                      $CONFIG_EXTRA      \
+                                      $ALL_COMPONENTS    \
+ 
++echo "#if defined(HAVE_UNISTD_H) && HAVE_UNISTD_H == 0" >> $TMPH
++echo "#undef HAVE_UNISTD_H" >> $TMPH
++echo "#endif" >> $TMPH
+ echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
+ echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
+

_service:download_files:master.tar.gz/tools/darwin/Support/Codesign.command Changed

@@ -3,9 +3,7 @@
 set -x
 
 #this is the list of binaries we have to sign for being able to run un-jailbroken
-LIST_BINARY_EXTENSIONS="dylib so"
-
-export CODESIGN_ALLOCATE=`xcodebuild -find codesign_allocate`
+LIST_BINARY_EXTENSIONS="dylib so 0 vis pvr app"
 
 GEN_ENTITLEMENTS="$NATIVEPREFIX/bin/gen_entitlements.py"
 IOS11_ENTITLEMENTS="$XBMC_DEPENDS/share/ios11_entitlements.xml"
@@ -25,29 +23,31 @@
   exit -1
 fi
 
-
 if [ "${PLATFORM_NAME}" == "iphoneos" ] || [ "${PLATFORM_NAME}" == "appletvos" ]; then
   if [ -f "/Users/Shared/buildslave/keychain_unlock.sh" ]; then
     /Users/Shared/buildslave/keychain_unlock.sh
   fi
 
-  #do fake sign - needed for jailbroken ios5.1 devices for some reason
-  if [ -f ${LDID} ]; then
-    find ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/ -name "*.dylib" | xargs ${LDID} -S${IOS11_ENTITLEMENTS}
-    find ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/ -name "*.so" | xargs ${LDID} -S${IOS11_ENTITLEMENTS}
-    ${LDID} -S${IOS11_ENTITLEMENTS} ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/${EXECUTABLE_NAME}
+  # todo: is this required anymore?
+  if [ "${PLATFORM_NAME}" == "iphoneos" ]; then
+    #do fake sign - needed for jailbroken ios5.1 devices for some reason
+    if [ -f ${LDID} ]; then
+      find ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/ -name "*.dylib" | xargs ${LDID} -S${IOS11_ENTITLEMENTS}
+      find ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/ -name "*.so" | xargs ${LDID} -S${IOS11_ENTITLEMENTS}
+      ${LDID} -S${IOS11_ENTITLEMENTS} ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/${EXECUTABLE_NAME}
     
-    #repackage python eggs
-    EGGS=`find ${CODESIGNING_FOLDER_PATH} -name "*.egg" -type f`
+      #repackage python eggs
+      EGGS=`find ${CODESIGNING_FOLDER_PATH} -name "*.egg" -type f`
         for i in $EGGS; do
           echo $i
           mkdir del
-          unzip $i -d del
-          find ./del/ -name "*.so" -type f |  xargs ${LDID} -S${IOS11_ENTITLEMENTS}
+          unzip -q $i -d del
+          find ./del/ -name "*.so" -type f | xargs ${LDID} -S${IOS11_ENTITLEMENTS}
           rm $i
-          cd del && zip -r $i ./* &&  cd ..
+          cd del && zip -qr $i ./* &&  cd ..
           rm -r ./del/
         done
+    fi
   fi
 
   # pull the CFBundleIdentifier out of the built xxx.app
@@ -58,37 +58,71 @@
 
   echo "CFBundleIdentifier is ${BUNDLEID}"
 
-
   # Prefer the expanded name, if available.
   CODE_SIGN_IDENTITY_FOR_ITEMS="${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
- if [ "${CODE_SIGN_IDENTITY_FOR_ITEMS}" = "" ] ; then
-   # Fall back to old behavior.
-   CODE_SIGN_IDENTITY_FOR_ITEMS="${CODE_SIGN_IDENTITY}"
- fi
- echo "${CODE_SIGN_IDENTITY_FOR_ITEMS}"
+  if [ "${CODE_SIGN_IDENTITY_FOR_ITEMS}" = "" ] ; then
+    # Fall back to old behavior.
+    CODE_SIGN_IDENTITY_FOR_ITEMS="${CODE_SIGN_IDENTITY}"
+  fi
+  echo "${CODE_SIGN_IDENTITY_FOR_ITEMS}"
 
   ${GEN_ENTITLEMENTS} "${BUNDLEID}" "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/${EXECUTABLE_NAME}.xcent";
-  codesign -v -f -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" --entitlements "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/${EXECUTABLE_NAME}.xcent" "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/"
 
-  #if user has set a code_sign_identity different from iPhone Developer we do a real codesign (for deployment on non-jailbroken devices)
-  if ! [ -z "${CODE_SIGN_IDENTITY}" ] && [ "${CODE_SIGN_IDENTITY}" == "iPhone Developer" ] && [ "${CODE_SIGN_IDENTITY}" != "Don't Code Sign"  ]; then
-    echo "Doing a full bundle sign using genuine identity ${CODE_SIGN_IDENTITY}"
-    for binext in $LIST_BINARY_EXTENSIONS
-    do
-      codesign --deep -fvvv -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" -i "${BUNDLEID}" `find ${CODESIGNING_FOLDER_PATH} -name "*.$binext" -type f` ${CODESIGNING_FOLDER_PATH}
-    done
-    echo "In case your app crashes with SIG_SIGN check the variable LIST_BINARY_EXTENSIONS in tools/darwin/Support/Codesign.command"
+  # delete existing codesigning
+  if [ -d "${CODESIGNING_FOLDER_PATH}/_CodeSignature" ]; then
+    rm -r ${CODESIGNING_FOLDER_PATH}/_CodeSignature
+  fi
+  if [ -f "${CODESIGNING_FOLDER_PATH}/embedded.mobileprovision" ]; then
+    rm -f ${CODESIGNING_FOLDER_PATH}/embedded.mobileprovision
+  fi
 
-    #repackage python eggs
-    EGGS=`find ${CODESIGNING_FOLDER_PATH} -name "*.egg" -type f`
-    for i in $EGGS; do
-      echo $i
-      mkdir del
-      unzip $i -d del
-      codesign --deep -fvvv -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" -i "${BUNDLEID}" `find ./del/ -name "*.$binext" -type f` ./del/
-      rm $i
-      cd del && zip -r $i ./* &&  cd ..
-      rm -r ./del/
-    done
+  #if user has set a code_sign_identity different from iPhone Developer we do a real codesign (for deployment on non-jailbroken devices)
+  if ! [ -z "${CODE_SIGN_IDENTITY}" ]; then
+    if echo ${CODE_SIGN_IDENTITY} | grep -cim1 "iPhone Developer" &>/dev/null || echo ${CODE_SIGN_IDENTITY} | grep -cim1 "Apple Development" &>/dev/null; then
+      echo "Doing a full bundle sign using genuine identity ${CODE_SIGN_IDENTITY}"
+      for binext in $LIST_BINARY_EXTENSIONS
+      do
+        echo "Signing binary: $binext"
+        # check if at least 1 file with the extension exists to sign, otherwise do nothing
+        FINDOUTPUT=`find ${CODESIGNING_FOLDER_PATH} -name "*.$binext" -type f`
+        if [ `echo $FINDOUTPUT | wc -l` != 0 ]; then
+          for singlefile in $FINDOUTPUT; do
+            codesign -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" -fvvv -i "${BUNDLEID}" "${singlefile}"
+          done
+        fi
+      done
+      echo "In case your app crashes with SIG_SIGN check the variable LIST_BINARY_EXTENSIONS in tools/darwin/Support/Codesign.command"
+
+      for FRAMEWORK_PATH in `find ${CODESIGNING_FOLDER_PATH} -name "*.framework" -type d`
+      do
+        DYLIB_BASENAME=$(basename "${FRAMEWORK_PATH%.framework}")
+        echo "Signing Framework: ${DYLIB_BASENAME}.framework"
+        FRAMEWORKBUNDLEID="${BUNDLEID}.framework.${DYLIB_BASENAME}"
+        codesign -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" -fvvv -i "${FRAMEWORKBUNDLEID}" ${FRAMEWORK_PATH}/${DYLIB_BASENAME}
+        codesign -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" -fvvv -i "${FRAMEWORKBUNDLEID}" ${FRAMEWORK_PATH}
+      done
+
+      #repackage python eggs
+      EGGS=`find ${CODESIGNING_FOLDER_PATH} -name "*.egg" -type f`
+      echo "Signing Eggs"
+      for i in $EGGS; do
+        echo $i
+        mkdir del
+        unzip -q $i -d del
+        for binext in $LIST_BINARY_EXTENSIONS
+        do
+          # check if at least 1 file with the extension exists to sign, otherwise do nothing
+          FINDOUTPUT=`find ./del/ -name "*.$binext" -type f`
+          if [ `echo $FINDOUTPUT | wc -l` != 0 ]; then
+            for singlefile in $FINDOUTPUT; do
+              codesign -s "${CODE_SIGN_IDENTITY_FOR_ITEMS}" -fvvv -i "${BUNDLEID}" "${singlefile}"
+            done
+          fi
+        done
+        rm $i
+        cd del && zip -qr $i ./* &&  cd ..
+        rm -r ./del/
+      done
+    fi
   fi
 fi

_service:download_files:master.tar.gz/tools/darwin/Support/CopyRootFiles-darwin_embedded.command Changed

_service:download_files:master.tar.gz/tools/darwin/Support/CopyRootFiles-osx.command Changed

@@ -19,38 +19,41 @@
 # rsync command for including everything but the skins
 ADDONSYNC="rsync -aq --no-links --exclude .git* --exclude .DS_Store* --exclude addons/skin.estuary --exclude addons/skin.estouchy"
 
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/media"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/system"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/userdata"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/media"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin/runtime"
-mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
-
-${SYNC} "$SRCROOT/LICENSE.md" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
-${SYNC} "$SRCROOT/privacy-policy.txt" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
-${SYNC} "$SRCROOT/tools/darwin/runtime"	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin"
-${ADDONSYNC} "$SRCROOT/addons"		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNC} "$SRCROOT/media" 		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNCSKIN} "$SRCROOT/addons/skin.estuary" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
-${SYNC} "$SRCROOT/addons/skin.estuary/extras" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estuary"
-${SYNC} "$SRCROOT/addons/skin.estuary/resources"   "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.estuary"
-${SYNCSKIN} "$SRCROOT/addons/skin.estouchy" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons"
-${SYNC} "$SRCROOT/addons/skin.estouchy/background" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy"
-${SYNC} "$SRCROOT/addons/skin.estouchy/resources" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.estouchy"
-${SYNC} "$SRCROOT/system" 		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-${SYNC} "$SRCROOT/userdata" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
+BASE_TARGET_PATH="$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources"
+TARGET_PATH="$BASE_TARGET_PATH/$APP_NAME"
+
+mkdir -p "$TARGET_PATH"
+mkdir -p "$TARGET_PATH/addons"
+mkdir -p "$TARGET_PATH/media"
+mkdir -p "$TARGET_PATH/system"
+mkdir -p "$TARGET_PATH/userdata"
+mkdir -p "$TARGET_PATH/media"
+mkdir -p "$TARGET_PATH/tools/darwin/runtime"
+mkdir -p "$TARGET_PATH/extras/user"
+
+${SYNC} "$SRCROOT/LICENSE.md" "$BASE_TARGET_PATH"
+${SYNC} "$SRCROOT/privacy-policy.txt" "$TARGET_PATH"
+${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" "$BASE_TARGET_PATH"
+${SYNC} "$SRCROOT/tools/darwin/runtime" "$TARGET_PATH/tools/darwin"
+${ADDONSYNC} "$SRCROOT/addons" "$TARGET_PATH"
+${SYNC} "$SRCROOT/media" "$TARGET_PATH"
+${SYNCSKIN} "$SRCROOT/addons/skin.estuary" "$TARGET_PATH/addons"
+${SYNC} "$SRCROOT/addons/skin.estuary/extras" "$TARGET_PATH/addons/skin.estuary"
+${SYNC} "$SRCROOT/addons/skin.estuary/resources" "$TARGET_PATH/addons/skin.estuary"
+${SYNCSKIN} "$SRCROOT/addons/skin.estouchy" "$TARGET_PATH/addons"
+${SYNC} "$SRCROOT/addons/skin.estouchy/background" "$TARGET_PATH/addons/skin.estouchy"
+${SYNC} "$SRCROOT/addons/skin.estouchy/resources" "$TARGET_PATH/addons/skin.estouchy"
+${SYNC} "$SRCROOT/system" "$TARGET_PATH"
+${SYNC} "$SRCROOT/userdata" "$TARGET_PATH"
 
 # copy extra packages if applicable
 if [ -d "$SRCROOT/extras/system" ]; then
-	${SYNC} "$SRCROOT/extras/system/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
+  ${SYNC} "$SRCROOT/extras/system/" "$TARGET_PATH"
 fi
 
 # copy extra user packages if applicable
 if [ -d "$SRCROOT/extras/user" ]; then
-	${SYNC} "$SRCROOT/extras/user/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
+  ${SYNC} "$SRCROOT/extras/user/" "$TARGET_PATH/extras/user"
 fi

_service:download_files:master.tar.gz/tools/darwin/Support/GenerateMissingImages-tvos.py Added

@@ -0,0 +1,29 @@
+#!/usr/bin/python
+
+import sys, os, json
+from subprocess import call
+
+assetCatalogPath = sys.argv[1]
+brandAssetsDir = sys.argv[2] + '.brandassets'
+
+def generateImage(contentsRelativeDir, isBaseImage1x, newWidth, newHeight):
+    contentsDir = os.path.join(assetCatalogPath, contentsRelativeDir)
+    if isBaseImage1x:
+        existingImageIndex = 0
+        newImageIndex = 1
+    else:
+        existingImageIndex = 1
+        newImageIndex = 0
+    with open(os.path.join(contentsDir, 'Contents.json')) as jsonFile:
+        jsonContents = json.load(jsonFile)
+        existingImageRelativePath = jsonContents['images'][existingImageIndex]['filename']
+        existingImagePath = os.path.join(contentsDir, existingImageRelativePath)
+        call(['sips', '--resampleHeightWidth', str(newHeight), str(newWidth), existingImagePath, '--out', os.path.join(contentsDir, jsonContents['images'][newImageIndex]['filename'])])
+
+
+generateImage(sys.argv[3] + '.launchimage', True, 3840, 2160)
+generateImage(os.path.join(brandAssetsDir, 'topshelf_wide.imageset'), True, 4640, 1440)
+
+appIconSmall = os.path.join(brandAssetsDir, 'icon.imagestack')
+for i in xrange(1, 5):
+    generateImage(os.path.join(appIconSmall, 'Layer{}.imagestacklayer'.format(i), 'Content.imageset'), False, 400, 240)

_service:download_files:master.tar.gz/tools/darwin/Support/copyframeworks-darwin_embedded.command Changed

_service:download_files:master.tar.gz/tools/darwin/Support/copyframeworks-dylibs2frameworks.command Added

@@ -0,0 +1,106 @@
+#!/bin/bash
+
+#      Copyright (C) 2015 Team MrMC
+#      https://github.com/MrMC
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with MrMC; see the file COPYING.  If not, see
+#  <http://www.gnu.org/licenses/>.
+
+#set -x
+
+TARGET_CONTENTS="${TARGET_BUILD_DIR}/${EXECUTABLE_FOLDER_PATH}"
+TARGET_FRAMEWORKS=$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH
+
+# use the same date/time stamp format for all CFBundleVersions
+BUNDLE_REVISION=$(date -u +%y%m%d.%H%M)
+
+# ios/tvos use different framework plists
+if [ "${PLATFORM_NAME}" == "appletvos" ]; then
+  SEEDFRAMEWORKPLIST="${SRCROOT}/xbmc/platform/darwin/tvos/FrameworkSeed_Info.plist"
+# todo: implement soft frameworks for ios
+#elif [ "$PLATFORM_NAME" == "iphoneos" ]; then
+#  SEEDFRAMEWORKPLIST="${SRCROOT}/xbmc/platform/darwin/ios/FrameworkSeed_Info.plist"
+fi
+
+function convert2framework
+{
+  DYLIB="${1}"
+  # typical darwin dylib name format is lib<name>.<version>.dylib
+  DYLIB_BASENAME=$(basename "${DYLIB}")
+  # strip .<version>.dylib
+  DYLIB_LIBBASENAME="${DYLIB_BASENAME%%.[0-9]*}"
+  # make sure .dylib is stripped
+  DYLIB_LIBNAME="${DYLIB_LIBBASENAME%.dylib}"
+
+  # Update main bundle executable to new location of frameworks
+  install_name_tool -change  @executable_path/Frameworks/${DYLIB_BASENAME} @executable_path/Frameworks/${DYLIB_LIBNAME}.framework/${DYLIB_LIBNAME} ${TARGET_BUILD_DIR}/${EXECUTABLE_FOLDER_PATH}/${EXECUTABLE_NAME}
+  install_name_tool -add_rpath @executable_path/Frameworks/${DYLIB_LIBNAME}.framework ${TARGET_BUILD_DIR}/${EXECUTABLE_FOLDER_PATH}/${EXECUTABLE_NAME}
+
+  BUNDLEID=`mdls -raw -name kMDItemCFBundleIdentifier ${TARGET_BUILD_DIR}/${EXECUTABLE_FOLDER_PATH}`
+  if [ "${BUNDLEID}" == "(null)" ] ; then
+    BUNDLEID=`/usr/libexec/PlistBuddy -c 'Print CFBundleIdentifier' ${TARGET_BUILD_DIR}/${EXECUTABLE_FOLDER_PATH}/Info.plist`
+  fi
+
+  FRAMEWORKBUNDLEID="${BUNDLEID}.framework.${DYLIB_LIBNAME}"
+  echo "CFBundleIdentifier is ${FRAMEWORKBUNDLEID}"
+  echo "convert ${DYLIB_BASENAME} to ${DYLIB_LIBNAME}.framework"
+
+  DEST_FRAMEWORK="${TARGET_FRAMEWORKS}/${DYLIB_LIBNAME}.framework"
+  mkdir -p "${DEST_FRAMEWORK}"
+  mkdir -p "${DEST_FRAMEWORK}/Headers"
+  mkdir -p "${DEST_FRAMEWORK}/Modules"
+
+  # framework plists are binary
+  plutil -convert binary1 "${SEEDFRAMEWORKPLIST}" -o "${DEST_FRAMEWORK}/Info.plist"
+  # set real CFBundleName
+  plutil -replace CFBundleName -string "${DYLIB_LIBNAME}" "${DEST_FRAMEWORK}/Info.plist"
+  # set real CFBundleVersion
+  plutil -replace CFBundleVersion -string "${BUNDLE_REVISION}" "${DEST_FRAMEWORK}/Info.plist"
+  # set real CFBundleIdentifier
+  plutil -replace CFBundleIdentifier -string "${FRAMEWORKBUNDLEID}" "${DEST_FRAMEWORK}/Info.plist"
+  # set real CFBundleExecutable
+  plutil -replace CFBundleExecutable -string "${DYLIB_LIBNAME}" "${DEST_FRAMEWORK}/Info.plist"
+  # move it (not copy)
+  mv -f "${DYLIB}" "${DEST_FRAMEWORK}/${DYLIB_LIBNAME}"
+
+  # fixup loader id/paths
+  LC_ID_DYLIB="@rpath/${DYLIB_LIBNAME}.framework/${DYLIB_LIBNAME}"
+  LC_RPATH1="@executable_path/Frameworks/${DYLIB_LIBNAME}.framework"
+  LC_RPATH2="@loader_path/Frameworks/${DYLIB_LIBNAME}.framework"
+  install_name_tool -id "${LC_ID_DYLIB}" "${DEST_FRAMEWORK}/${DYLIB_LIBNAME}"
+  install_name_tool -add_rpath "${LC_RPATH1}" "${DEST_FRAMEWORK}/${DYLIB_LIBNAME}"
+  install_name_tool -add_rpath "${LC_RPATH2}" "${DEST_FRAMEWORK}/${DYLIB_LIBNAME}"
+
+  if [ "$STRIP_INSTALLED_PRODUCT" == "YES" ]; then
+    strip -x "${DEST_FRAMEWORK}/${DYLIB_LIBNAME}"
+  fi
+
+  if [ "$ACTION" == install ]; then
+    # extract the uuid and use it to find the matching bcsymbolmap (needed for crashlog symbolizing)
+    UUID=$(otool -l "${DEST_FRAMEWORK}/${DYLIB_LIBNAME}" | grep uuid | awk '{ print $2}')
+    echo "bcsymbolmap is ${UUID}"
+    if [ -f "${XBMC_DEPENDS}/bcsymbolmaps/${UUID}.bcsymbolmap" ]; then
+      echo "bcsymbolmap is ${UUID}.bcsymbolmap"
+      cp -f "${XBMC_DEPENDS}/bcsymbolmaps/${UUID}.bcsymbolmap" "${BUILT_PRODUCTS_DIR}/"
+    fi
+  fi
+}
+
+# todo: convert ios to soft frameworks as well to remove this if guard
+if [ "$PLATFORM_NAME" == "appletvos" ]; then
+  # loop over all xxx.dylibs in xxx.app/Frameworks
+  for dylib in $(find "${TARGET_FRAMEWORKS}" -name "*.dylib" -type f); do
+    convert2framework "${dylib}"
+  done
+fi

_service:download_files:master.tar.gz/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in Changed

@@ -10,15 +10,19 @@
 DSYM_TARGET_DIR=/Users/Shared/xbmc-depends/dSyms
 DSYM_FILENAME=@APP_NAME@.app.dSYM
 ARM64=false
+PP_DEVICE=iOS
+if [ "@PLATFORM@" == "appletvos" ]; then
+  PP_DEVICE=tvOS
+fi
 
 if [ "${SWITCH#*debug}" != "${SWITCH}" ]; then
-  echo "Packaging Debug target for iOS"
-  APP="$DIRNAME/../../../../build/Debug-iphoneos/@APP_NAME@.app"
-  DSYM="$DIRNAME/../../../../build/Debug-iphoneos/$DSYM_FILENAME"
+  echo "Packaging Debug target for ${PP_DEVICE}"
+  APP="$DIRNAME/../../../../build/Debug-@PLATFORM@/@APP_NAME@.app"
+  DSYM="$DIRNAME/../../../../build/Debug-@PLATFORM@/$DSYM_FILENAME"
 elif [ "${SWITCH#*release}" != "${SWITCH}" ]; then
-  echo "Packaging Release target for iOS"
-  APP="$DIRNAME/../../../../build/Release-iphoneos/@APP_NAME@.app"
-  DSYM="$DIRNAME/../../../../build/Release-iphoneos/$DSYM_FILENAME"
+  echo "Packaging Release target for ${PP_DEVICE}"
+  APP="$DIRNAME/../../../../build/Release-@PLATFORM@/@APP_NAME@.app"
+  DSYM="$DIRNAME/../../../../build/Release-@PLATFORM@/$DSYM_FILENAME"
 else
   echo "You need to specify the build target"
   exit 1
@@ -48,7 +52,7 @@
   export PATH=${bin_path}:${PATH}
 fi
 
-PACKAGE=org.xbmc.@APP_NAME_LC@-ios
+PACKAGE="@PLATFORM_BUNDLE_IDENTIFIER@"
 PACKAGE_ARM64="${PACKAGE}64"
 
 VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
@@ -60,10 +64,10 @@
 # customize revision string
 [ ! -z "$2" ] && REVISION="$2"
 
-ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
+ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_@PLATFORM@-arm.deb
 
 # package identifier for arm64
-$ARM64 && ARCHIVE=${PACKAGE_ARM64}_${VERSION}-${REVISION}_iphoneos-arm.deb
+$ARM64 && ARCHIVE=${PACKAGE_ARM64}_${VERSION}-${REVISION}_@PLATFORM@-arm.deb
 
 SIZE="$(du -s -k ${APP} | awk '{print $1}')"
 
@@ -75,22 +79,21 @@
 mkdir -p $DIRNAME/$PACKAGE/DEBIAN
 if $ARM64; then
   echo "Package: $PACKAGE_ARM64"                  >  $DIRNAME/$PACKAGE/DEBIAN/control
-  echo "Name: @APP_NAME@-iOS (64-bit)"            >> $DIRNAME/$PACKAGE/DEBIAN/control
+  echo "Name: @APP_NAME@-${PP_DEVICE} (64-bit)"   >> $DIRNAME/$PACKAGE/DEBIAN/control
   echo "Pre-Depends: cy+cpu.arm64"                >> $DIRNAME/$PACKAGE/DEBIAN/control
   echo "Conflicts: $PACKAGE"                      >> $DIRNAME/$PACKAGE/DEBIAN/control
   echo "Replaces: $PACKAGE"                       >> $DIRNAME/$PACKAGE/DEBIAN/control
 else
   echo "Package: $PACKAGE"                        >  $DIRNAME/$PACKAGE/DEBIAN/control
-  echo "Name: @APP_NAME@-iOS"                     >> $DIRNAME/$PACKAGE/DEBIAN/control
+  echo "Name: @APP_NAME@-${PP_DEVICE}"            >> $DIRNAME/$PACKAGE/DEBIAN/control
 fi
 echo "Priority: Extra"                            >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Depends: firmware (>= @CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET@)" >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Version: $VERSION-$REVISION"                >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Architecture: iphoneos-arm"                 >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Architecture: @CMAKE_SYSTEM_NAME@-@CPU@"                 >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Installed-Size: $SIZE"                      >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Description: @APP_NAME@ Entertainment Center for iOS" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Homepage: http://kodi.tv/"                 >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Maintainer: Memphiz"                        >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Homepage: @APP_WEBSITE@"                    >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Maintainer: Memphiz et al."                 >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Author: Team-@APP_NAME@"                    >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Section: Multimedia"                        >> $DIRNAME/$PACKAGE/DEBIAN/control
 echo "Icon: file:///Applications/@APP_NAME@.app/AppIcon57x57.png" >> $DIRNAME/$PACKAGE/DEBIAN/control
@@ -103,7 +106,9 @@
 # postinst: nothing for now.
 echo "#!/bin/sh"                                  >  $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "chown -R mobile:mobile /Applications/@APP_NAME@.app" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-cat $DIRNAME/migrate_to_kodi.sh            >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+if [ "@PLATFORM@" != "appletvos" ]; then
+  cat $DIRNAME/migrate_to_kodi.sh            >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+fi
 echo "/usr/bin/uicache"                           >>  $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "echo 'finish:respringing ...'"              >>  $DIRNAME/$PACKAGE/DEBIAN/postinst
 chmod +x $DIRNAME/$PACKAGE/DEBIAN/postinst

_service:download_files:master.tar.gz/tools/darwin/packaging/osx/dmgmaker.pl Changed

_service:download_files:master.tar.gz/tools/depends/.gitignore Changed

_service:download_files:master.tar.gz/tools/depends/Makefile.include.in Changed

_service:download_files:master.tar.gz/tools/depends/README.md Changed

_service:download_files:master.tar.gz/tools/depends/configure.ac Changed

@@ -152,6 +152,9 @@
 cross_compiling="yes"
 
 case $build in
+  aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
+    build_os="linux"
+  ;;
   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
     build_os="linux"
   ;;
@@ -259,7 +262,7 @@
           platform_cflags+=" -march=armv8-a -mtune=cortex-a53"
         fi
       ;;
-      i*86*-linux-android*)
+      i*86*-linux-android*|x86_64*-linux-android*)
         if test "x$use_cpu" = "xauto"; then
           use_cpu=$host_cpu
         fi
@@ -310,25 +313,13 @@
     platform_cxxflags="-no-cpp-precomp"
 
     case $host in
-      *86*-apple-darwin)
+      x86_64-apple-darwin)
         MC_CHECK_NOT_CPU([$use_cpu], "arm")
 
         # setup which cpu to use
-        case $host in
-          x86_64-apple-darwin*)
-            if test "x$use_cpu" = "xauto"; then
-              use_cpu=x86_64
-            fi
-          ;;
-          i*86-apple-darwin*)
-            if test "x$use_cpu" = "xauto"; then
-              use_cpu=i386
-            fi
-            platform_ldflags+=" -read_only_relocs suppress"
-         ;;
-          *)
-            AC_MSG_ERROR(error in configure of --with-arch=$use_cpu)
-        esac
+        if test "x$use_cpu" = "xauto"; then
+          use_cpu=x86_64
+        fi
 
         # setup which sdk to use
         target_platform=macosx
@@ -337,10 +328,6 @@
 
         # now that we know which sdk, error check sdk_name
         case $use_sdk in
-          10.9);;
-          10.10);;
-          10.11);;
-          10.12);;
           10.13);;
           10.14);;
           10.15);;
@@ -348,7 +335,7 @@
             AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk)
         esac
         sdk_name=$target_platform$use_sdk
-        platform_min_version="macosx-version-min=10.9"
+        platform_min_version="macosx-version-min=10.13"
 
         use_sdk_path=[`$use_xcodebuild -version -sdk $sdk_name Path`]
         platform_os="osx"

_service:download_files:master.tar.gz/tools/depends/m4/xbmc_arch.m4 Changed

@@ -14,7 +14,7 @@
   amd64-*-freebsd*)
      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD")
      ;;
-  *86*-apple-darwin*)
+  x86_64-apple-darwin*)
      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX")
      ;;
   powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
@@ -23,7 +23,7 @@
   powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_POWERPC64")
      ;;
-  arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+  arm*-*-linux-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX")
      ;;
   *)
@@ -48,10 +48,7 @@
   arm-apple-darwin*)
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_EMBEDDED")
      ;;
-  *86*-apple-darwin*)
-     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX")
-     ;;
-  powerpc-apple-darwin*)
+  x86_64-apple-darwin*)
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX")
      ;;
   powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)

_service:download_files:master.tar.gz/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,18 +14,21 @@
     <ProjectGuid>{6D4C9949-FF2B-4B14-83BB-D86AB27B855A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>JsonSchemaBuilder</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

_service:download_files:master.tar.gz/tools/depends/native/Makefile Changed

@@ -4,12 +4,12 @@
   $(error Error: $(NATIVEPREFIX)/share/config.site  is missing. Please reconfigure depends to generate it)
 endif
 
-NATIVE= m4 gettext autoconf automake \
+NATIVE= m4 gettext heimdal autoconf automake \
         libtool pkg-config yasm cmake \
         gas-preprocessor libffi python3 zlib \
         pcre swig \
         libpng libjpeg-turbo liblzo2 giflib \
-        distribute distutilscross JsonSchemaBuilder TexturePacker \
+        setuptools distutilscross JsonSchemaBuilder TexturePacker \
         flatbuffers
 
 
@@ -23,7 +23,7 @@
 
 ifeq ($(OS),linux)
   ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),raspberry-pi gbm))
-    NATIVE += meson ninja setuptools
+    NATIVE += meson ninja
   endif
 endif
 
@@ -42,13 +42,14 @@
 automake: autoconf
 dpkg: automake gettext libtool pkg-config tar
 flatbuffers: cmake
+heimdal: libtool
 libtool: automake
+libjpeg-turbo: cmake yasm
 libpng: zlib
 meson: python3 setuptools
 ninja: python3
 swig: pcre
-distribute: python3
-distutilscross: python3 distribute
+distutilscross: python3
 tar: xz automake
 python3: $(EXPAT) libffi pkg-config zlib
 setuptools: python3

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/Win32/TexturePacker.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,18 +14,19 @@
     <ProjectGuid>{57EC0A84-7E0C-4EEA-9E63-BB4EBF2310D7}</ProjectGuid>
     <RootNamespace>TexturePacker</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -57,7 +58,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\..\..\..\xbmc;..\..\..\..\..\..\project\BuildDependencies\win32\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;TARGET_WINDOWS;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -69,12 +70,12 @@
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>jpeg-staticd.lib;libpng16_staticd.lib;giflibd.lib;zlibstaticd.lib;lzo2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>jpeg-staticd.lib;libpng16_staticd.lib;gifd.lib;zlibstaticd.lib;lzo2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\..\..\project\BuildDependencies\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
@@ -82,7 +83,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\..\..\..\xbmc;..\..\..\..\..\..\project\BuildDependencies\win32\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;TARGET_WINDOWS;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -93,14 +94,14 @@
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>jpeg-static.lib;libpng16_static.lib;giflib.lib;zlibstatic.lib;lzo2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>jpeg-static.lib;libpng16_static.lib;gif.lib;zlibstatic.lib;lzo2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\..\..\project\BuildDependencies\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/Win32/version.rc Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp Changed

@@ -30,11 +30,11 @@
 class Gifreader
 {
 public:
-  unsigned char* buffer;
-  unsigned int buffSize;
-  unsigned int readPosition;
+  unsigned char* buffer = nullptr;
+  unsigned int buffSize = 0;
+  unsigned int readPosition = 0;
 
-  Gifreader() : buffer(nullptr), buffSize(0), readPosition(0) {}
+  Gifreader() = default;
 };
 
 int ReadFromVfs(GifFileType* gif, GifByteType* gifbyte, int len)
@@ -43,14 +43,7 @@
   return gifFile->Read(gifbyte, len);
 }
 
-GifHelper::GifHelper() :
-  m_imageSize(0),
-  m_pitch(0),
-  m_loops(0),
-  m_numFrames(0),
-  m_filename(""),
-  m_gif(nullptr),
-  m_pTemplate(nullptr)
+GifHelper::GifHelper()
 {
   m_gifFile = new CFile();
 }
@@ -472,27 +465,14 @@
   }
 }
 
-GifFrame::GifFrame() :
-  m_pImage(nullptr),
-  m_delay(0),
-  m_top(0),
-  m_left(0),
-  m_disposal(0),
-  m_height(0),
-  m_width(0),
-  m_imageSize(0)
-{}
-
-
-GifFrame::GifFrame(const GifFrame& src) :
-  m_pImage(nullptr),
-  m_delay(src.m_delay),
-  m_top(src.m_top),
-  m_left(src.m_left),
-  m_disposal(src.m_disposal),
-  m_height(src.m_height),
-  m_width(src.m_width),
-  m_imageSize(src.m_imageSize)
+GifFrame::GifFrame(const GifFrame& src)
+  : m_delay(src.m_delay),
+    m_top(src.m_top),
+    m_left(src.m_left),
+    m_disposal(src.m_disposal),
+    m_height(src.m_height),
+    m_width(src.m_width),
+    m_imageSize(src.m_imageSize)
 {
   if (src.m_pImage)
   {

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/decoder/GifHelper.h Changed

@@ -60,21 +60,21 @@
   friend class GifHelper;
 public:
 
-  GifFrame();
+  GifFrame() = default;
   virtual ~GifFrame();
 
-  unsigned char*  m_pImage;
-  unsigned int    m_delay;
+  unsigned char* m_pImage = nullptr;
+  unsigned int m_delay = 0;
 
 private:
   GifFrame(const GifFrame& src);
 
-  unsigned int    m_top;
-  unsigned int    m_left;
-  unsigned int    m_disposal;
-  unsigned int    m_height;
-  unsigned int    m_width;
-  unsigned int    m_imageSize;
+  unsigned int m_top = 0;
+  unsigned int m_left = 0;
+  unsigned int m_disposal = 0;
+  unsigned int m_height = 0;
+  unsigned int m_width = 0;
+  unsigned int m_imageSize = 0;
   std::vector<GifColor>   m_palette;
 };
 
@@ -101,15 +101,15 @@
 
 private:
   std::vector<FramePtr> m_frames;
-  unsigned int    m_imageSize;
-  unsigned int    m_pitch;
-  unsigned int    m_loops;
-  unsigned int    m_numFrames;
+  unsigned int m_imageSize = 0;
+  unsigned int m_pitch = 0;
+  unsigned int m_loops = 0;
+  unsigned int m_numFrames = 0;
 
   std::string     m_filename;
-  GifFileType*    m_gif;
+  GifFileType* m_gif = nullptr;
   std::vector<GifColor> m_globalPalette;
-  unsigned char*  m_pTemplate;
+  unsigned char* m_pTemplate = nullptr;
   CFile*          m_gifFile;
 
   unsigned int m_width;

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/decoder/IDecoder.h Changed

@@ -26,30 +26,30 @@
 class RGBAImage
 {
 public:
-  RGBAImage() : pixels(NULL), width(0), height(0), bbp(0), pitch(0) {}
+  RGBAImage() = default;
 
-  char *pixels;//image data
-  int width;// width
-  int height;// height
-  int bbp;// bits per pixel
-  int pitch;// rowsize in bytes
+  char* pixels = nullptr; // image data
+  int width = 0; // width
+  int height = 0; // height
+  int bbp = 0; // bits per pixel
+  int pitch = 0; // rowsize in bytes
 };
 
 class DecodedFrame
 {
-  public:
-   DecodedFrame() : delay(0) { }
-   RGBAImage	rgbaImage;				/* rgbaimage for this frame */
-   int				delay;					/* Frame delay in ms */
+public:
+  DecodedFrame() = default;
+  RGBAImage rgbaImage; /* rgbaimage for this frame */
+  int delay = 0; /* Frame delay in ms */
 };
 
 class DecodedFrames
 {
   public:
-    DecodedFrames(): user(NULL), destroyFN(nullptr) {}
+    DecodedFrames() = default;
     std::vector<DecodedFrame> frameList;
-    void     *user;         /* used internally*/
-    void (*destroyFN)(void *);
+    void* user = nullptr; /* used internally*/
+    void (*destroyFN)(void*) = nullptr;
 
     void clear()
     {

_service:download_files:master.tar.gz/tools/depends/native/config.site.native.in Changed

_service:download_files:master.tar.gz/tools/depends/native/distribute Deleted

_service:download_files:master.tar.gz/tools/depends/native/distribute/Makefile Deleted

_service:download_files:master.tar.gz/tools/depends/native/heimdal Added

_service:download_files:master.tar.gz/tools/depends/native/heimdal/01-disable-libedit.patch Added

_service:download_files:master.tar.gz/tools/depends/native/heimdal/Makefile Added

@@ -0,0 +1,42 @@
+include ../../Makefile.include
+PREFIX=$(NATIVEPREFIX)
+PLATFORM=$(NATIVEPLATFORM)
+DEPS= ../../Makefile.include Makefile 01-disable-libedit.patch
+
+# lib name, version
+LIBNAME=heimdal
+VERSION=7.7.0
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+APP=$(PLATFORM)/lib/asn1/asn1_compile
+
+all: .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM); patch -p1 -i ../01-disable-libedit.patch
+	cd $(PLATFORM); $(AUTORECONF) -vif
+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) --disable-shared
+
+$(APP): $(PLATFORM)
+	make -C $(PLATFORM)/include
+	make -C $(PLATFORM)/lib/roken
+	make -C $(PLATFORM)/lib/vers
+	make -C $(PLATFORM)/lib/com_err
+	make -C $(PLATFORM)/lib/asn1
+
+.installed-$(PLATFORM): $(APP)
+	install $(PLATFORM)/lib/asn1/asn1_compile $(PLATFORM)/lib/com_err/compile_et $(PREFIX)/bin
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM) clean
+	rm -f .installed-$(PLATFORM)
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)

_service:download_files:master.tar.gz/tools/depends/native/libjpeg-turbo/01-disable-executables.patch Added

@@ -0,0 +1,130 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -592,18 +592,6 @@
+       set_target_properties(turbojpeg PROPERTIES
+         LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
+     endif()
+-
+-    add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
+-    target_link_libraries(tjunittest turbojpeg)
+-
+-    add_executable(tjbench tjbench.c tjutil.c)
+-    target_link_libraries(tjbench turbojpeg)
+-    if(UNIX)
+-      target_link_libraries(tjbench m)
+-    endif()
+-
+-    add_executable(tjexample tjexample.c)
+-    target_link_libraries(tjexample turbojpeg)
+   endif()
+ 
+   if(ENABLE_STATIC)
+@@ -615,16 +603,6 @@
+     if(NOT MSVC)
+       set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
+     endif()
+-
+-    add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
+-      md5/md5hl.c)
+-    target_link_libraries(tjunittest-static turbojpeg-static)
+-
+-    add_executable(tjbench-static tjbench.c tjutil.c)
+-    target_link_libraries(tjbench-static turbojpeg-static)
+-    if(UNIX)
+-      target_link_libraries(tjbench-static m)
+-    endif()
+   endif()
+ endif()
+ 
+@@ -639,33 +617,11 @@
+   set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
+ endif()
+ 
+-if(ENABLE_STATIC)
+-  add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
+-    ${CJPEG_BMP_SOURCES})
+-  set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
+-  target_link_libraries(cjpeg-static jpeg-static)
+-
+-  add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c
+-    wrppm.c ${DJPEG_BMP_SOURCES})
+-  set_property(TARGET djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
+-  target_link_libraries(djpeg-static jpeg-static)
+-
+-  add_executable(jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c)
+-  target_link_libraries(jpegtran-static jpeg-static)
+-  set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
+-endif()
+-
+-add_executable(rdjpgcom rdjpgcom.c)
+-
+-add_executable(wrjpgcom wrjpgcom.c)
+-
+ 
+ ###############################################################################
+ # TESTS
+ ###############################################################################
+ 
+-add_subdirectory(md5)
+-
+ if(MSVC_IDE OR XCODE)
+   set(OBJDIR "\${CTEST_CONFIGURATION_TYPE}/")
+ else()
+@@ -1337,7 +1293,7 @@
+ 
+ if(WITH_TURBOJPEG)
+   if(ENABLE_SHARED)
+-    install(TARGETS turbojpeg tjbench
++    install(TARGETS turbojpeg
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -1350,15 +1306,6 @@
+   if(ENABLE_STATIC)
+     install(TARGETS turbojpeg-static ARCHIVE
+       DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-    if(NOT ENABLE_SHARED)
+-      if(MSVC_IDE OR XCODE)
+-        set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+-      else()
+-        set(DIR ${CMAKE_CURRENT_BINARY_DIR})
+-      endif()
+-      install(PROGRAMS ${DIR}/tjbench-static${EXE}
+-        DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
+-    endif()
+   endif()
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+@@ -1366,23 +1313,8 @@
+ 
+ if(ENABLE_STATIC)
+   install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-  if(NOT ENABLE_SHARED)
+-    if(MSVC_IDE OR XCODE)
+-      set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+-    else()
+-      set(DIR ${CMAKE_CURRENT_BINARY_DIR})
+-    endif()
+-    install(PROGRAMS ${DIR}/cjpeg-static${EXE}
+-      DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME cjpeg${EXE})
+-    install(PROGRAMS ${DIR}/djpeg-static${EXE}
+-      DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME djpeg${EXE})
+-    install(PROGRAMS ${DIR}/jpegtran-static${EXE}
+-      DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME jpegtran${EXE})
+-  endif()
+ endif()
+ 
+-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
+   ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
+   ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
+@@ -1398,8 +1330,6 @@
+ if(UNIX OR MINGW)
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
+     ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
+-    ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
+-    ${CMAKE_CURRENT_SOURCE_DIR}/wrjpgcom.1
+     DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ endif()
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc

_service:download_files:master.tar.gz/tools/depends/native/libjpeg-turbo/Makefile Changed

@@ -1,20 +1,15 @@
 include ../../Makefile.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include Makefile
+DEPS= ../../Makefile.include Makefile 01-disable-executables.patch
 
 # lib name, version
 LIBNAME=libjpeg-turbo
-VERSION=1.5.1
+VERSION=2.0.4
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) --with-jpeg8 --without-simd
 
-CFLAGS+=-O3
-
-LIBDYLIB=$(PLATFORM)/.libs/libjpeg.a
+LIBDYLIB=$(PLATFORM)/build/libjpeg.a
 
 all: .installed-$(PLATFORM)
 
@@ -24,14 +19,14 @@
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); patch -p1 -i ../01-disable-executables.patch
+	cd $(PLATFORM); $(CMAKE) -B build -DCMAKE_TOOLCHAIN_FILE= -DCMAKE_ASM_NASM_COMPILER:FILEPATH=$(NATIVEPREFIX)/bin/yasm -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=ON
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -j 1 -C $(PLATFORM)
-	touch $@
+	$(MAKE) -C $(PLATFORM)/build
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
+	$(MAKE) -C $(PLATFORM)/build install
 	touch $@
 
 clean:

_service:download_files:master.tar.gz/tools/depends/native/tar/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/Toolchain.cmake.in Changed

_service:download_files:master.tar.gz/tools/depends/target/Toolchain_binaddons.cmake.in Changed

_service:download_files:master.tar.gz/tools/depends/target/config-binaddons.site.in Changed

@@ -59,55 +59,7 @@
 gl_cv_func_gettimeofday_clobber=no
 
 
-#samba
-SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes
-samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
-libreplace_cv_HAVE_C99_VSNPRINTF=yes
-samba_cv_HAVE_C99_VSNPRINTF=yes
-ac_cv_header_standards_h=no
-
-ac_cv_file__proc_sys_kernel_core_pattern=no
-samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
-libreplace_cv_HAVE_GETADDRINFO=no
-
-if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "darwin_embedded"; then
-  # disable python support
-  export PYTHON_VER=0.0
-  # ios/osx-10.6 issue with collision of _MD5 exported from a system lib
-  export LDFLAGS="${LDFLAGS} -Wl,-unexported_symbol,_MD5* -lc"
-fi
-
-if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "osx"; then
-  # disable python support
-  export PYTHON_VER=0.0
-  # ios/osx-10.6 issue with collision of _MD5 exported from a system lib
-  export LDFLAGS="${LDFLAGS} -Wl,-unexported_symbol,_MD5* -lc"
-  # uses OPT instead of CFLAGS
-  export OPT="${CFLAGS}"
-  # various configure overrides
-  ac_cv_header_libunwind_h=no
-  ac_cv_header_execinfo_h=no
-fi
-
 if test "@platform_os@" = "android"; then
-  #samba
-  SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes
-  libreplace_cv_READDIR_GETDIRENTRIES=no
-  libreplace_cv_READDIR_GETDENTS=no
-  samba_cv_REPLACE_READDIR=no
-  samba_cv_HAVE_WRFILE_KEYTAB=yes
-  samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
-  samba_cv_USE_SETREUID=yes
-  samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes
-  samba_cv_HAVE_IFACE_IFCONF=yes
-  samba_cv_HAVE_MMAP=yes
-  samba_cv_HAVE_FCNTL_LOCK=yes
-  samba_cv_HAVE_SECURE_MKSTEMP=yes
-  samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
-  samba_cv_fpie=no
-  samba_cv_have_longlong=yes
-  samba_cv_HAVE_OFF64_T=yes
-  samba_cv_HAVE_UT_UT_TYPE=no
   ac_cv_func_srand=yes
   ac_cv_func_rand=yes
 
@@ -116,18 +68,7 @@
 
 fi
 
-if test "@platform_os@" = "osx" ; then
-  # Xcode 8 + 10.11, clock_gettime getentropy is present
-  # in 10.12 but will get wrongly detected if building on 10.11
-  ac_cv_search_clock_gettime=no
-  ac_cv_func_clock_gettime=no
-  ac_cv_func_getentropy=no
-fi
-
-
 if test "@platform_os@" = "darwin_embedded"; then
-  # Xcode 8 + 10.11, clock_gettime getentropy is present
-  # in 10.12 but will get wrongly detected if building on 10.11
   ac_cv_search_clock_gettime=no
   ac_cv_func_clock_gettime=no
   ac_cv_func_getentropy=no

_service:download_files:master.tar.gz/tools/depends/target/config.site.in Changed

@@ -21,7 +21,7 @@
 fi
 
 CFLAGS="@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include $CFLAGS"
-LDFLAGS="-L@prefix@/@deps_dir@/lib -L@prefix@/@deps_dir@/lib64 @platform_ldflags@ $LDFLAGS"
+LDFLAGS="-L@prefix@/@deps_dir@/lib @platform_ldflags@ $LDFLAGS"
 CXXFLAGS="@platform_cxxflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include $CXXFLAGS"
 CPPFLAGS="@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include $CPPFLAGS"
 
@@ -35,7 +35,7 @@
 LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH
 
 PYTHON_VERSION=3.7
-PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -L@prefix@/@deps_dir@/lib64 -lpython${PYTHON_VERSION} -lc -ldl -lm -lexpat -lffi -lintl -lutil -lssl -lcrypto"
+PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -lpython${PYTHON_VERSION} -lc -ldl -lm -lexpat -lffi -lintl -lutil -lssl -lcrypto"
 PYTHON_CPPFLAGS=-I@prefix@/@deps_dir@/include/python${PYTHON_VERSION}
 PYTHON_SITE_PKG=@prefix@/@deps_dir@/lib/python${PYTHON_VERSION}/site-packages
 PYTHON_NOVERSIONCHECK=no-check
@@ -71,86 +71,16 @@
 gl_cv_func_gettimeofday_clobber=no
 
 
-#samba
-SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes
-samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
-libreplace_cv_HAVE_C99_VSNPRINTF=yes
-samba_cv_HAVE_C99_VSNPRINTF=yes
-ac_cv_header_standards_h=no
-
-ac_cv_file__proc_sys_kernel_core_pattern=no
-samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
-libreplace_cv_HAVE_GETADDRINFO=no
-
-if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "darwin_embedded"; then
-  # disable python support
-  export PYTHON_VER=0.0
-  if test "@use_cpu@" != "arm64"; then
-    # ios/osx-10.6 issue with collision of _MD5 exported from a system lib
-    export LDFLAGS="${LDFLAGS} -Wl,-unexported_symbol,_MD5* -lc"
-  fi
-  samba_cv_HAVE_IFACE_GETIFADDRS=yes
-fi
-
-if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "osx"; then
-  # disable python support
-  export PYTHON_VER=0.0
-  # ios/osx-10.6 issue with collision of _MD5 exported from a system lib
-  export LDFLAGS="${LDFLAGS} -Wl,-unexported_symbol,_MD5* -lc"
-  # uses OPT instead of CFLAGS
-  export OPT="${CFLAGS}"
-  # various configure overrides
-  ac_cv_header_libunwind_h=no
-  ac_cv_header_execinfo_h=no
-  samba_cv_HAVE_IFACE_GETIFADDRS=yes
-fi
-
 if test "@platform_os@" = "android"; then
-  #samba
-  SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes
-  libreplace_cv_READDIR_GETDIRENTRIES=no
-  libreplace_cv_READDIR_GETDENTS=no
-  libreplace_cv_HAVE_IFACE_IFCONF=yes
-  libreplace_cv_HAVE_MMAP=yes
-  libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes
-  libreplace_cv_HAVE_SECURE_MKSTEMP=yes
-
-  samba_cv_REPLACE_READDIR=no
-  samba_cv_HAVE_WRFILE_KEYTAB=yes
-  samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
-  samba_cv_USE_SETREUID=yes
-  samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes
-  samba_cv_HAVE_IFACE_IFCONF=yes
-  samba_cv_HAVE_MMAP=yes
-  samba_cv_HAVE_FCNTL_LOCK=yes
-  samba_cv_HAVE_SECURE_MKSTEMP=yes
-  samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
-  samba_cv_fpie=no
-  samba_cv_have_longlong=yes
-  samba_cv_HAVE_OFF64_T=yes
-  samba_cv_HAVE_UT_UT_TYPE=no
   ac_cv_func_srand=yes
   ac_cv_func_rand=yes
 
   #python: android doesn't have libutil
-  PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -L@prefix@/@deps_dir@/lib64 -lpython${PYTHON_VERSION} -lc -ldl -lm -lexpat -lffi -lintl -lssl -lcrypto"
+  PYTHON_LDFLAGS="-L@prefix@/@deps_dir@/lib -lpython${PYTHON_VERSION} -lc -ldl -lm -lexpat -lffi -lintl -lssl -lcrypto"
 
 fi
 
-if test "@platform_os@" = "osx" ; then
-  # Xcode 8 + 10.11, clock_gettime and getentropy is present
-  # in 10.12 but will get wrongly detected if building on 10.11
-  ac_cv_search_clock_gettime=no
-  ac_cv_func_clock_gettime=no
-  ac_cv_func_futimens=no
-  ac_cv_func_getentropy=no
-  ac_cv_func_utimensat=no
-fi
-
-
 if test "@platform_os@" = "darwin_embedded"; then
-  # Xcode 8 + 10.11, clock_gettime and getentropy is present
-  # in 10.12 but will get wrongly detected if building on 10.11
   ac_cv_search_clock_gettime=no
   ac_cv_func_clock_gettime=no
   ac_cv_func_clock_settime=no

_service:download_files:master.tar.gz/tools/depends/target/cross-file.meson.in Changed

_service:download_files:master.tar.gz/tools/depends/target/curl/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/ffmpeg/CMakeLists.txt Changed

_service:download_files:master.tar.gz/tools/depends/target/ffmpeg/FFMPEG-VERSION Changed

_service:download_files:master.tar.gz/tools/depends/target/ffmpeg/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/gnutls/02-darwin-getentropy.patch Deleted

_service:download_files:master.tar.gz/tools/depends/target/gnutls/Makefile Changed

@@ -1,9 +1,9 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile size-max.patch 02-darwin-getentropy.patch
+DEPS= ../../Makefile.include Makefile size-max.patch add-dl-as-private-lib.patch
 
 # lib name, version
 LIBNAME=gnutls
-VERSION=3.5.10
+VERSION=3.6.11.1
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
 
@@ -15,10 +15,9 @@
 endif
 
 # configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) --disable-shared --without-p11-kit --disable-nls --with-included-unistring \
+CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared --without-p11-kit --disable-nls --with-included-unistring \
                       --with-included-libtasn1 --enable-local-libopts --disable-doc --disable-tests --disable-guile \
-                      $(CONFIGURE_HACKS)
+                      --disable-tools $(CONFIGURE_HACKS)
 
 LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a
 
@@ -31,7 +30,7 @@
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(PLATFORM); patch -p1 -i ../size-max.patch
-	cd $(PLATFORM); patch -p1 -i ../02-darwin-getentropy.patch
+	cd $(PLATFORM); patch -p1 -i ../add-dl-as-private-lib.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)

_service:download_files:master.tar.gz/tools/depends/target/gnutls/add-dl-as-private-lib.patch Added

@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index db1ce841f..264712b56 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -512,6 +512,9 @@ LT_INIT([disable-static,win32-dll,shared])
+ 
+ 
+ AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dladdr (0, 0);])
++if test "x$HAVE_LIBDL" = "xyes"; then
++      AC_SUBST([LIBDL], [-ldl])
++fi
+ 
+ AC_ARG_ENABLE(fips140-mode,
+   AS_HELP_STRING([--enable-fips140-mode], [enable FIPS140-2 mode]),
+diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
+index ffad3e168..15b990764 100644
+--- a/lib/gnutls.pc.in
++++ b/lib/gnutls.pc.in
+@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
+ URL: https://www.gnutls.org/
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
++Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ @LIBDL@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}

_service:download_files:master.tar.gz/tools/depends/target/libcdio-gplv3/Makefile Changed

@@ -1,11 +1,12 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile osx.patch osx2.patch
+DEPS= ../../Makefile.include Makefile osx.patch
 
 # lib name, version
 LIBNAME=libcdio
-VERSION=0.94
+VERSION=2.1.0
 SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
+ARCHIVE=$(SOURCE).tar.bz2
+
 # configuration settings
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
           ./configure --prefix=$(PREFIX)  --with-cd-drive=no --with-cd-info=no \
@@ -23,7 +24,6 @@
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(PLATFORM); patch -p1 -i ../osx.patch
-	cd $(PLATFORM); patch -p1 -i ../osx2.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)
 
@@ -34,7 +34,6 @@
 	$(MAKE) -C $(PLATFORM)/lib install
 	$(MAKE) -C $(PLATFORM)/include install
 	$(MAKE) -C $(PLATFORM) install-data-am
-	cp $(PLATFORM)/include/cdio/cdtext.h $(PREFIX)/include/cdio/
 	touch $@
 
 clean:

_service:download_files:master.tar.gz/tools/depends/target/libcdio-gplv3/osx.patch Changed

_service:download_files:master.tar.gz/tools/depends/target/libcdio-gplv3/osx2.patch Deleted

@@ -1,1637 +0,0 @@
-From 09eb9abcf3cf4322984f6072fb656116dc59a8b0 Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky@gnu.org>
-Date: Fri, 15 Sep 2017 22:08:08 -0400
-Subject: [PATCH] (High) Sierra compatiablity...
-
-osx.c: Use libcdio version of assert, not OSX's.
-check_cdtext.sh: return should only be used inside functions
----
- lib/driver/osx.c     | 572 +++++++++++++++++++++++++--------------------------
- test/check_cdtext.sh |  10 +-
- 2 files changed, 291 insertions(+), 291 deletions(-)
-
---- a/lib/driver/osx.c
-+++ b/lib/driver/osx.c
-@@ -1,7 +1,7 @@
- /*
-   Copyright (C) 2003-2006, 2008, 2010-2012, 2014-2015
--   Rocky Bernstein <rocky@gnu.org> 
--  from vcdimager code: 
-+   Rocky Bernstein <rocky@gnu.org>
-+  from vcdimager code:
-   Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-   and VideoLAN code Copyright (C) 1998-2001 VideoLAN
-       Authors: Johan Bilien <jobi@via.ecp.fr>
-@@ -24,7 +24,7 @@
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
--/* This file contains OSX-specific code and implements low-level 
-+/* This file contains OSX-specific code and implements low-level
-    control of the CD drive.
- */
- &#xc;
-@@ -34,7 +34,7 @@
- 
- #ifdef HAVE_STDBOOL_H
- # include <stdbool.h>
--#endif 
-+#endif
- 
- #include <cdio/logging.h>
- #include <cdio/sector.h>
-@@ -55,14 +55,14 @@
-   TR_UNKNOWN =      10  /**< Unspecified error */,
-   TR_STREAMING =    11  /**< loss of streaming */,
- } transport_error_t;
--  
-+
- #include "cdio_assert.h"
- #include "cdio_private.h"
- 
- #include <string.h>
- 
- #ifdef HAVE_DARWIN_CDROM
--#undef VERSION 
-+#undef VERSION
- 
- #include <CoreFoundation/CoreFoundation.h>
- #include <IOKit/IOKitLib.h>
-@@ -141,9 +141,9 @@
- 
- #define MAX_SERVICE_NAME 1000
- typedef struct {
--  /* Things common to all drivers like this. 
-+  /* Things common to all drivers like this.
-      This must be first. */
--  generic_img_private_t gen; 
-+  generic_img_private_t gen;
- 
-   access_mode_t access_mode;
- 
-@@ -163,7 +163,7 @@
-   SCSITaskInterface **scsi_task;
-   MMCDeviceInterface **mmc;
-   IOCFPlugInInterface **plugin;
--  
-+
-   SCSI_Sense_Data sense;
-   SCSITaskStatus status;
-   UInt64 realized_len;
-@@ -172,7 +172,7 @@
- } _img_private_t;
- 
- static bool read_toc_osx (void *p_user_data);
--static track_format_t get_track_format_osx(void *p_user_data, 
-+static track_format_t get_track_format_osx(void *p_user_data,
-                                            track_t i_track);
- 
- /**
-@@ -185,9 +185,9 @@
- {
-   IOReturn                      err     = kIOReturnSuccess;
-   CFMutableDictionaryRef        dict    = 0;
--  
--  err = IORegistryEntryCreateCFProperties (service, &dict, 
--                                           kCFAllocatorDefault, 0); 
-+
-+  err = IORegistryEntryCreateCFProperties (service, &dict,
-+                                           kCFAllocatorDefault, 0);
-   if ( err != kIOReturnSuccess )
-     cdio_warn( "IORegistryEntryCreateCFProperties: 0x%08x", err );
- 
-@@ -205,27 +205,27 @@
-   kern_return_t kern_result;
-   io_iterator_t service_iterator;
-   CFMutableDictionaryRef classes_to_match;
--  
-+
-   kern_result = IOMasterPort( MACH_PORT_NULL, &master_port );
-   if( kern_result != KERN_SUCCESS )
-     {
-       return false;
-     }
--  
-+
-   classes_to_match = IOServiceMatching( kIOBlockStorageDeviceClass );
-   if( classes_to_match == NULL )
-     {
-       return false;
-     }
--  
--  kern_result = IOServiceGetMatchingServices( master_port, 
-+
-+  kern_result = IOServiceGetMatchingServices( master_port,
-                                               classes_to_match,
-                                               &service_iterator );
-   if( kern_result != KERN_SUCCESS )
-     {
-       return false;
-     }
--  
-+
-   next_service = IOIteratorNext( service_iterator );
-   if( next_service != 0 )
-     {
-@@ -234,7 +234,7 @@
-           IOServiceRequestProbe( next_service, 0 );
- 
-           IOObjectRelease( next_service );
--          
-+
-         } while( ( next_service = IOIteratorNext( service_iterator ) ) != 0 );
-     }
-   IOObjectRelease( service_iterator );
-@@ -248,11 +248,11 @@
-   SInt32 score;
-   kern_return_t err;
-   HRESULT herr;
--  
--  err = IOCreatePlugInInterfaceForService(p_env->MediaClass_service, 
-+
-+  err = IOCreatePlugInInterfaceForService(p_env->MediaClass_service,
-                                           kIOMMCDeviceUserClientTypeID,
-                                           kIOCFPlugInInterfaceID,
--                                          &p_env->plugin, 
-+                                          &p_env->plugin,
-                                           &score);
- 
-   if (err != noErr) {
-@@ -269,24 +269,24 @@
-     IODestroyPlugInInterface(p_env->plugin);
-     return false;
-   }
--  
--  p_env->pp_scsiTaskDeviceInterface = 
-+
-+  p_env->pp_scsiTaskDeviceInterface =
-     (*p_env->mmc)->GetSCSITaskDeviceInterface(p_env->mmc);
--  
-+
-   if (!p_env->pp_scsiTaskDeviceInterface) {
--    fprintf(stderr, 
-+    fprintf(stderr,
-             "Could not get SCSITaskkDevice interface from MMC interface.\n");
-     (*p_env->mmc)->Release(p_env->mmc);
-     IODestroyPlugInInterface(p_env->plugin);
-     return false;
-   }
--  
-+
-   err = (*p_env->pp_scsiTaskDeviceInterface)->
-     ObtainExclusiveAccess(p_env->pp_scsiTaskDeviceInterface);
-   if (err != kIOReturnSuccess) {
-     fprintf(stderr, "Could not obtain exclusive access to the device (%x).\n",
-             err);
--    
-+
-     if (err == kIOReturnBusy)
-       fprintf(stderr, "The volume is already mounted.\n");
-     else if (err == kIOReturnExclusiveAccess)
-@@ -294,18 +294,18 @@
-               "to this device.\n");
-     else
-       fprintf(stderr, "I don't know why.\n");
--    
-+
-     (*p_env->pp_scsiTaskDeviceInterface)->
-       Release(p_env->pp_scsiTaskDeviceInterface);
-     (*p_env->mmc)->Release(p_env->mmc);
-     IODestroyPlugInInterface(p_env->plugin);
-     return false;
-   }
--  
--  p_env->scsi_task = 
--    (*p_env->pp_scsiTaskDeviceInterface) -> 
-+
-+  p_env->scsi_task =
-+    (*p_env->pp_scsiTaskDeviceInterface) ->
-     CreateSCSITask(p_env->pp_scsiTaskDeviceInterface);
--  
-+
-   if (!p_env->scsi_task) {
-     fprintf(stderr, "Could not create a SCSITask interface.\n");
-     (*p_env->pp_scsiTaskDeviceInterface)->
-@@ -316,12 +316,12 @@
-     IODestroyPlugInInterface(p_env->plugin);
-     return false;
-   }
--  
-+
-   return true;
- }
- #endif
- 
--static bool 
-+static bool
- init_osx(_img_private_t *p_env) {
-   char *psz_devname;
-   kern_return_t ret;
-@@ -344,36 +344,36 @@
-     ++psz_devname;
-   else
-     psz_devname = p_env->gen.source_name;
--  
-+
-   /* Unraw the device name. */
-   if( *psz_devname == 'r' )
-     ++psz_devname;
--  
--  ret = IOServiceGetMatchingServices( kIOMasterPortDefault, 
--                                      IOBSDNameMatching(kIOMasterPortDefault, 
-+
-+  ret = IOServiceGetMatchingServices( kIOMasterPortDefault,
-+                                      IOBSDNameMatching(kIOMasterPortDefault,
-                                                         0, psz_devname),
-                                       &iterator );
--  
-+
-   /* Get service iterator for the device. */
-   if( ret != KERN_SUCCESS )
-     {
-         cdio_warn( "IOServiceGetMatchingServices: 0x%08x", ret );
-         return false;
-     }
--  
-+
-   /* first service */
-   p_env->MediaClass_service = IOIteratorNext( iterator );
-   IOObjectRelease( iterator );
- 
--  /* search for kIOCDMediaClass or kIODVDMediaClass or kIOBDMediaClass */ 
--  while( p_env->MediaClass_service && 
-+  /* search for kIOCDMediaClass or kIODVDMediaClass or kIOBDMediaClass */
-+  while( p_env->MediaClass_service &&
-          (!IOObjectConformsTo(p_env->MediaClass_service, kIOCDMediaClass)) &&
-          (!IOObjectConformsTo(p_env->MediaClass_service, kIODVDMediaClass)) &&
-          (!IOObjectConformsTo(p_env->MediaClass_service, kIOBDMediaClass)) )
-     {
- 
--      ret = IORegistryEntryGetParentIterator( p_env->MediaClass_service, 
--                                              kIOServicePlane, 
-+      ret = IORegistryEntryGetParentIterator( p_env->MediaClass_service,
-+                                              kIOServicePlane,
-                                               &iterator );
-       if( ret != KERN_SUCCESS )
-         {
-@@ -381,13 +381,13 @@
-           IOObjectRelease( p_env->MediaClass_service );
-           return false;
-         }
--      
-+
-       IOObjectRelease( p_env->MediaClass_service );
- 
-       p_env->MediaClass_service = IOIteratorNext( iterator );
-       IOObjectRelease( iterator );
-     }
--  
-+
-   if ( 0 == p_env->MediaClass_service )     {
-     cdio_warn( "search for kIOCDMediaClass/kIODVDMediaClass/kIOBDMediaClass came up empty" );
-     return false;
-@@ -397,26 +397,26 @@
-      another scan. FIXME: this is hoaky and there's got to be a better
-      variable to test or way to do.
-    */
--  IORegistryEntryGetPath(p_env->MediaClass_service, kIOServicePlane, 
-+  IORegistryEntryGetPath(p_env->MediaClass_service, kIOServicePlane,
-                          p_env->psz_MediaClass_service);
- #ifdef GET_SCSI_FIXED
-   return get_scsi(p_env);
--#else 
-+#else
-   return true;
- #endif
- }
- 
- /**
--  Run a SCSI MMC command. 
-- 
-+  Run a SCSI MMC command.
-+
-   cdio          CD structure set by cdio_open().
-   i_timeout     time in milliseconds we will wait for the command
--                to complete. If this value is -1, use the default 
-+                to complete. If this value is -1, use the default
-                 time-out value.
-   p_buf         Buffer for data, both sending and receiving
-   i_buf         Size of buffer
-   e_direction   direction the transfer is to go.
--  cdb           CDB bytes. All values that are needed should be set on 
-+  cdb           CDB bytes. All values that are needed should be set on
-                 input. We'll figure out what the right CDB length should be.
- 
-   We return true if command completed successfully and false if not.
-@@ -424,11 +424,11 @@
- #if 1
- 
- /* process a complete scsi command. */
--static int 
--run_mmc_cmd_osx( void *p_user_data, 
-+static int
-+run_mmc_cmd_osx( void *p_user_data,
-                  unsigned int i_timeout_ms,
--                 unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
--                 cdio_mmc_direction_t e_direction, 
-+                 unsigned int i_cdb, const mmc_cdb_t *p_cdb,
-+                 cdio_mmc_direction_t e_direction,
-                  unsigned int i_buf, /*in/out*/ void *p_buf )
- {
-   _img_private_t *p_env = p_user_data;
-@@ -442,13 +442,13 @@
-   p_env->gen.scsi_mmc_sense_valid = 0;
-   memcpy(cmdbuf, p_cdb, i_cdb);
- 
--  dir = 
--      (SCSI_MMC_DATA_READ == e_direction) 
-+  dir =
-+      (SCSI_MMC_DATA_READ == e_direction)
-       ? kSCSIDataTransfer_FromTargetToInitiator :
--      (SCSI_MMC_DATA_WRITE == e_direction) 
-+      (SCSI_MMC_DATA_WRITE == e_direction)
-       ? kSCSIDataTransfer_FromInitiatorToTarget
-       : kSCSIDataTransfer_NoDataTransfer;
--  
-+
-   if (!i_buf)
-     dir = kSCSIDataTransfer_NoDataTransfer;
- 
-@@ -460,51 +460,51 @@
-   buf.address = (IOVirtualAddress)p_buf;
-   buf.length = i_buf;
- 
--  ret = (*p_env->scsi_task)->SetCommandDescriptorBlock(p_env->scsi_task, 
-+  ret = (*p_env->scsi_task)->SetCommandDescriptorBlock(p_env->scsi_task,
-                                                        cmdbuf, i_cdb);
-   if (ret != kIOReturnSuccess) {
-     fprintf(stderr, "SetCommandDescriptorBlock: %x\n", ret);
-     return TR_UNKNOWN;
-   }
--  
-+
-   ret = (*p_env->scsi_task)->SetScatterGatherEntries(p_env->scsi_task, &buf, 1,
-                                                      i_buf, dir);
-   if (ret != kIOReturnSuccess) {
-     fprintf(stderr, "SetScatterGatherEntries: %x\n", ret);
-     return TR_UNKNOWN;
-   }
--  
--  ret = (*p_env->scsi_task)->ExecuteTaskSync(p_env->scsi_task, &p_env->sense, 
--                                             &p_env->status, 
-+
-+  ret = (*p_env->scsi_task)->ExecuteTaskSync(p_env->scsi_task, &p_env->sense,
-+                                             &p_env->status,
-                                              &p_env->realized_len);
-   if (ret != kIOReturnSuccess) {
-     fprintf(stderr, "ExecuteTaskSync: %x\n", ret);
-     return TR_UNKNOWN;
-   }
--  
-+
-   if (p_env->status != kSCSITaskStatus_GOOD) {
-     int i;
--    
-+
-     fprintf(stderr, "SCSI status: %x\n", p_env->status);
-     fprintf(stderr, "Sense: %x %x %x\n",
-             p_env->sense.SENSE_KEY,
-             p_env->sense.ADDITIONAL_SENSE_CODE,
-             p_env->sense.ADDITIONAL_SENSE_CODE_QUALIFIER);
--    
-+
-     for (i = 0; i < i_cdb; i++)
-       fprintf(stderr, "%02x ", cmdbuf[i]);
--    
-+
-     fprintf(stderr, "\n");
-     memcpy((void *) p_env->gen.scsi_mmc_sense, &p_env->sense, kSenseDefaultSize);
- 
-     return TR_UNKNOWN;
-   }
--  
-+
-   if (p_env->sense.VALID_RESPONSE_CODE) {
-     char key = p_env->sense.SENSE_KEY & 0xf;
-     char ASC = p_env->sense.ADDITIONAL_SENSE_CODE;
-     char ASCQ = p_env->sense.ADDITIONAL_SENSE_CODE_QUALIFIER;
--    
-+
-     switch (key) {
-     case 0:
-       if (errno == 0)
-@@ -549,31 +549,31 @@
- 
- #if 0
- /**
--  Run a SCSI MMC command. 
-- 
-+  Run a SCSI MMC command.
-+
-   cdio          CD structure set by cdio_open().
-   i_timeout     time in milliseconds we will wait for the command
--                to complete. If this value is -1, use the default 
-+                to complete. If this value is -1, use the default
-                 time-out value.
-   p_buf         Buffer for data, both sending and receiving
-   i_buf         Size of buffer
-   e_direction   direction the transfer is to go.
--  cdb           CDB bytes. All values that are needed should be set on 
-+  cdb           CDB bytes. All values that are needed should be set on
-                 input. We'll figure out what the right CDB length should be.
- 
-   We return true if command completed successfully and false if not.
-  */
- static int
--run_mmc_cmd_osx( const void *p_user_data, 
-+run_mmc_cmd_osx( const void *p_user_data,
-                  unsigned int i_timeout_ms,
--                 unsigned int i_cdb, const mmc_cdb_t *p_cdb, 
--                 cdio_mmc_direction_t e_direction, 
-+                 unsigned int i_cdb, const mmc_cdb_t *p_cdb,
-+                 cdio_mmc_direction_t e_direction,
-                  unsigned int i_buf, /*in/out*/ void *p_buf )
- {
- 
- #ifndef SCSI_MMC_FIXED
-   return DRIVER_OP_UNSUPPORTED;
--#else 
-+#else
-   const _img_private_t *p_env = p_user_data;
-   SCSITaskDeviceInterface **sc;
-   SCSITaskInterface **cmd = NULL;
-@@ -603,16 +603,16 @@
-   iov.address = (IOVirtualAddress) p_buf;
-   iov.length = i_buf;
- 
--  ioReturnValue = (*cmd)->SetCommandDescriptorBlock(cmd, (UInt8 *) p_cdb, 
-+  ioReturnValue = (*cmd)->SetCommandDescriptorBlock(cmd, (UInt8 *) p_cdb,
-                                                     i_cdb);
-   if (ioReturnValue != kIOReturnSuccess) {
--    cdio_warn("SetCommandDescriptorBlock failed with status %x", 
-+    cdio_warn("SetCommandDescriptorBlock failed with status %x",
-               ioReturnValue);
-     return -1;
-   }
- 
-   ioReturnValue = (*cmd)->SetScatterGatherEntries(cmd, &iov, 1, i_buf,
--                                                  (SCSI_MMC_DATA_READ == e_direction ) ? 
-+                                                  (SCSI_MMC_DATA_READ == e_direction ) ?
-                                                   kSCSIDataTransfer_FromTargetToInitiator :
-                                                   kSCSIDataTransfer_FromInitiatorToTarget);
-   if (ioReturnValue != kIOReturnSuccess) {
-@@ -652,17 +652,17 @@
- static io_iterator_t
- GetDeviceIterator ( const char * deviceClass )
- {
--  
-+
-   IOReturn      err      = kIOReturnSuccess;
-   io_iterator_t iterator = MACH_PORT_NULL;
--  
-+
-   err = IOServiceGetMatchingServices ( kIOMasterPortDefault,
-                                        IOServiceMatching ( deviceClass ),
-                                        &iterator );
--  check ( err == kIOReturnSuccess );
--  
-+  cdio_assert ( err == kIOReturnSuccess );
-+
-   return iterator;
--  
-+
- }
- 
- /***************************************************************************
-@@ -677,27 +677,27 @@
- {
-   CFDictionaryRef propertiesDict = 0;
-   CFNumberRef     flagsNumberRef = 0;
--  
-+
-   *i_cdFlags = 0;
-   *i_dvdFlags= 0;
--  
--  propertiesDict = ( CFDictionaryRef ) 
--    CFDictionaryGetValue ( dict, 
-+
-+  propertiesDict = ( CFDictionaryRef )
-+    CFDictionaryGetValue ( dict,
-                            CFSTR ( kIOPropertyDeviceCharacteristicsKey ) );
- 
-   if ( propertiesDict == 0 ) return false;
--  
-+
-   /* Get the CD features */
--  flagsNumberRef = ( CFNumberRef ) 
--    CFDictionaryGetValue ( propertiesDict, 
-+  flagsNumberRef = ( CFNumberRef )
-+    CFDictionaryGetValue ( propertiesDict,
-                            CFSTR ( kIOPropertySupportedCDFeatures ) );
-   if ( flagsNumberRef != 0 ) {
-     CFNumberGetValue ( flagsNumberRef, kCFNumberLongType, i_cdFlags );
-   }
--  
-+
-   /* Get the DVD features */
--  flagsNumberRef = ( CFNumberRef ) 
--    CFDictionaryGetValue ( propertiesDict, 
-+  flagsNumberRef = ( CFNumberRef )
-+    CFDictionaryGetValue ( propertiesDict,
-                            CFSTR ( kIOPropertySupportedDVDFeatures ) );
-   if ( flagsNumberRef != 0 ) {
-     CFNumberGetValue ( flagsNumberRef, kCFNumberLongType, i_dvdFlags );
-@@ -722,32 +722,32 @@
- 
-   if ( propertiesDict == 0 ) return i_discmode;
- 
--  data = ( CFStringRef ) 
-+  data = ( CFStringRef )
-     CFDictionaryGetValue ( propertiesDict, CFSTR ( kIODVDMediaTypeKey ) );
- 
-   if( CFStringGetCString( data, str, sizeof(str),
-                           kCFStringEncodingASCII ) ) {
-     if (0 == strncmp(str, "DVD+R", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_DVD_PR;
--    else if (0 == strncmp(str, "DVD+RW", strlen(str)) ) 
-+    else if (0 == strncmp(str, "DVD+RW", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_DVD_PRW;
--    else if (0 == strncmp(str, "DVD-R", strlen(str)) ) 
-+    else if (0 == strncmp(str, "DVD-R", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_DVD_R;
--    else if (0 == strncmp(str, "DVD-RW", strlen(str)) ) 
-+    else if (0 == strncmp(str, "DVD-RW", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_DVD_RW;
--    else if (0 == strncmp(str, "DVD-ROM", strlen(str)) ) 
-+    else if (0 == strncmp(str, "DVD-ROM", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_DVD_ROM;
--    else if (0 == strncmp(str, "DVD-RAM", strlen(str)) ) 
-+    else if (0 == strncmp(str, "DVD-RAM", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_DVD_RAM;
-     else if (0 == strncmp(str, "CD-ROM", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_CD_DATA;
--    else if (0 == strncmp(str, "CDR", strlen(str)) ) 
-+    else if (0 == strncmp(str, "CDR", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_CD_DATA;
--    else if (0 == strncmp(str, "CDRW", strlen(str)) ) 
-+    else if (0 == strncmp(str, "CDRW", strlen(str)) )
-       i_discmode = CDIO_DISC_MODE_CD_DATA;
-     //??  Handled by below? CFRelease( data );
-   }
--  CFRelease( propertiesDict );    
-+  CFRelease( propertiesDict );
-   if (CDIO_DISC_MODE_CD_DATA == i_discmode) {
-     /* Need to do more classification */
-     return get_discmode_cd_generic(p_user_data);
-@@ -761,11 +761,11 @@
- {
-   io_service_t  service;
-   io_iterator_t service_iterator;
--  
-+
-   service_iterator = GetDeviceIterator ( kIOCDBlockStorageDeviceClassString );
- 
-   if( service_iterator == MACH_PORT_NULL ) return 0;
--  
-+
-   service = IOIteratorNext( service_iterator );
-   if( service == 0 ) return 0;
- 
-@@ -774,21 +774,21 @@
-       char psz_service[MAX_SERVICE_NAME];
-       IORegistryEntryGetPath(service, kIOServicePlane, psz_service);
-       psz_service[MAX_SERVICE_NAME-1] = '\0';
--      
-+
-       /* FIXME: This is all hoaky. Here we need info from a parent class,
-          psz_service of what we opened above. We are relying on the
-          fact that the name  will be a substring of the name we
-          openned with.
-       */
--      if (0 == strncmp(psz_service, p_env->psz_MediaClass_service, 
-+      if (0 == strncmp(psz_service, p_env->psz_MediaClass_service,
-                        strlen(psz_service))) {
-         /* Found our device */
-         IOObjectRelease( service_iterator );
-         return service;
-       }
--      
-+
-       IOObjectRelease( service );
--      
-+
-     } while( ( service = IOIteratorNext( service_iterator ) ) != 0 );
- 
-   IOObjectRelease( service_iterator );
-@@ -806,56 +806,56 @@
-   uint32_t i_dvdFlags;
- 
-   io_service_t  service = get_drive_service_osx(p_env);
--  
-+
-   if( service == 0 ) goto err_exit;
- 
-   /* Found our device */
-   {
-     CFDictionaryRef  properties = GetRegistryEntryProperties ( service );
--    
--    if (! GetFeaturesFlagsForDrive ( properties, &i_cdFlags, 
-+
-+    if (! GetFeaturesFlagsForDrive ( properties, &i_cdFlags,
-                                      &i_dvdFlags ) ) {
-       IOObjectRelease( service );
-       goto err_exit;
-     }
--    
-+
-     /* Reader */
--    
-+
-     if ( 0 != (i_cdFlags & kCDFeaturesAnalogAudioMask) )
--      *p_read_cap  |= CDIO_DRIVE_CAP_READ_AUDIO;      
--    
--    if ( 0 != (i_cdFlags & kCDFeaturesWriteOnceMask) ) 
-+      *p_read_cap  |= CDIO_DRIVE_CAP_READ_AUDIO;
-+
-+    if ( 0 != (i_cdFlags & kCDFeaturesWriteOnceMask) )
-       *p_write_cap |= CDIO_DRIVE_CAP_WRITE_CD_R;
--    
-+
-     if ( 0 != (i_cdFlags & kCDFeaturesCDDAStreamAccurateMask) )
-       *p_read_cap  |= CDIO_DRIVE_CAP_READ_CD_DA;
--    
-+
-     if ( 0 != (i_dvdFlags & kDVDFeaturesReadStructuresMask) )
-       *p_read_cap  |= CDIO_DRIVE_CAP_READ_DVD_ROM;
--    
-+
-     if ( 0 != (i_cdFlags & kCDFeaturesReWriteableMask) )
-       *p_write_cap |= CDIO_DRIVE_CAP_WRITE_CD_RW;
--    
--    if ( 0 != (i_dvdFlags & kDVDFeaturesWriteOnceMask) ) 
-+
-+    if ( 0 != (i_dvdFlags & kDVDFeaturesWriteOnceMask) )
-       *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_R;
--    
-+
-     if ( 0 != (i_dvdFlags & kDVDFeaturesRandomWriteableMask) )
-       *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_RAM;
--    
-+
-     if ( 0 != (i_dvdFlags & kDVDFeaturesReWriteableMask) )
-       *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_RW;
--    
-+
-     /***
-         if ( 0 != (i_dvdFlags & kDVDFeaturesPlusRMask) )
-         *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_PR;
--        
-+
-         if ( 0 != (i_dvdFlags & kDVDFeaturesPlusRWMask )
-         *p_write_cap |= CDIO_DRIVE_CAP_WRITE_DVD_PRW;
-         ***/
- 
-     /* FIXME: fill out. For now assume CD-ROM is relatively modern. */
-       *p_misc_cap = (
--                     CDIO_DRIVE_CAP_MISC_CLOSE_TRAY 
-+                     CDIO_DRIVE_CAP_MISC_CLOSE_TRAY
-                      | CDIO_DRIVE_CAP_MISC_EJECT
-                      | CDIO_DRIVE_CAP_MISC_LOCK
-                      | CDIO_DRIVE_CAP_MISC_SELECT_SPEED
-@@ -868,7 +868,7 @@
- 
-     IOObjectRelease( service );
-   }
--  
-+
-   return;
- 
-  err_exit:
-@@ -878,7 +878,7 @@
- 
- #if 1
- /****************************************************************************
-- * GetDriveDescription - Gets drive description. 
-+ * GetDriveDescription - Gets drive description.
-  ****************************************************************************/
- 
- static bool
-@@ -888,42 +888,42 @@
-   io_service_t  service = get_drive_service_osx(p_env);
- 
-   if ( service == 0 ) return false;
--  
-+
-   /* Found our device */
-   {
-     CFStringRef      vendor      = NULL;
-     CFStringRef      product     = NULL;
-     CFStringRef      revision    = NULL;
--  
-+
-     CFDictionaryRef  properties  = GetRegistryEntryProperties ( service );
--    CFDictionaryRef  deviceDict  = ( CFDictionaryRef ) 
--      CFDictionaryGetValue ( properties, 
-+    CFDictionaryRef  deviceDict  = ( CFDictionaryRef )
-+      CFDictionaryGetValue ( properties,
-                              CFSTR ( kIOPropertyDeviceCharacteristicsKey ) );
--    
-+
-     if ( deviceDict == 0 ) return false;
--    
--    vendor = ( CFStringRef ) 
-+
-+    vendor = ( CFStringRef )
-       CFDictionaryGetValue ( deviceDict, CFSTR ( kIOPropertyVendorNameKey ) );
--    
-+
-     if ( CFStringGetCString( vendor,
-                              (char *) &(hw_info->psz_vendor),
-                              sizeof(hw_info->psz_vendor),
-                              kCFStringEncodingASCII ) )
-       CFRelease( vendor );
--    
--    product = ( CFStringRef ) 
-+
-+    product = ( CFStringRef )
-       CFDictionaryGetValue ( deviceDict, CFSTR ( kIOPropertyProductNameKey ) );
--    
-+
-     if ( CFStringGetCString( product,
-                              (char *) &(hw_info->psz_model),
-                              sizeof(hw_info->psz_model),
-                              kCFStringEncodingASCII ) )
-       CFRelease( product );
--    
--    revision = ( CFStringRef ) 
--      CFDictionaryGetValue ( deviceDict, 
-+
-+    revision = ( CFStringRef )
-+      CFDictionaryGetValue ( deviceDict,
-                              CFSTR ( kIOPropertyProductRevisionLevelKey ) );
--    
-+
-     if ( CFStringGetCString( revision,
-                              (char *) &(hw_info->psz_revision),
-                              sizeof(hw_info->psz_revision),
-@@ -931,11 +931,11 @@
-       CFRelease( revision );
-   }
-   return true;
--  
-+
- }
- #endif
- 
--static void 
-+static void
- _free_osx (void *p_user_data) {
-   _img_private_t *p_env = p_user_data;
-   if (NULL == p_env) return;
-@@ -950,17 +950,17 @@
-   if (p_env->scsi_task)
-     (*p_env->scsi_task)->Release(p_env->scsi_task);
- 
--  if (p_env->pp_scsiTaskDeviceInterface) 
--    (*p_env->pp_scsiTaskDeviceInterface) -> 
-+  if (p_env->pp_scsiTaskDeviceInterface)
-+    (*p_env->pp_scsiTaskDeviceInterface) ->
-       ReleaseExclusiveAccess(p_env->pp_scsiTaskDeviceInterface);
--  if (p_env->pp_scsiTaskDeviceInterface) 
-+  if (p_env->pp_scsiTaskDeviceInterface)
-     (*p_env->pp_scsiTaskDeviceInterface) ->
-       Release ( p_env->pp_scsiTaskDeviceInterface );
- 
--  if (p_env->mmc) 
-+  if (p_env->mmc)
-     (*p_env->mmc)->Release(p_env->mmc);
- 
--  if (p_env->plugin) 
-+  if (p_env->plugin)
-     IODestroyPlugInInterface(p_env->plugin);
- 
- }
-@@ -968,10 +968,10 @@
- /**
-    Reads i_blocks of data sectors from cd device into p_data starting
-    from i_lsn.
--   Returns DRIVER_OP_SUCCESS if no error. 
-+   Returns DRIVER_OP_SUCCESS if no error.
-  */
- static driver_return_code_t
--read_data_sectors_osx (void *p_user_data, void *p_data, lsn_t i_lsn, 
-+read_data_sectors_osx (void *p_user_data, void *p_data, lsn_t i_lsn,
-                        uint16_t i_blocksize, uint32_t i_blocks)
- {
-   _img_private_t *p_env = p_user_data;
-@@ -981,9 +981,9 @@
-   {
-     dk_cd_read_t cd_read;
-     track_t i_track = cdio_get_track(p_env->gen.cdio, i_lsn);
--    
-+
-     memset( &cd_read, 0, sizeof(cd_read) );
--    
-+
-     cd_read.sectorArea  = kCDSectorAreaUser;
-     cd_read.buffer      = p_data;
- 
-@@ -1001,9 +1001,9 @@
-     default:
-       return DRIVER_OP_ERROR;
-     }
--    
-+
-     cd_read.bufferLength = i_blocksize * i_blocks;
--    
-+
-     if( ioctl( p_env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
-       {
-         cdio_info( "could not read block %d, %s", i_lsn, strerror(errno) );
-@@ -1013,25 +1013,25 @@
-   }
- }
- 
--  
-+
- /**
-    Reads i_blocks of mode2 form2 sectors from cd device into data starting
-    from i_lsn.
--   Returns 0 if no error. 
-+   Returns 0 if no error.
-  */
- static driver_return_code_t
--read_mode1_sectors_osx (void *p_user_data, void *p_data, lsn_t i_lsn, 
-+read_mode1_sectors_osx (void *p_user_data, void *p_data, lsn_t i_lsn,
-                         bool b_form2, uint32_t i_blocks)
- {
-   _img_private_t *p_env = p_user_data;
-   dk_cd_read_t cd_read;
--  
-+
-   memset( &cd_read, 0, sizeof(cd_read) );
--  
-+
-   cd_read.sectorArea  = kCDSectorAreaUser;
-   cd_read.buffer      = p_data;
-   cd_read.sectorType  = kCDSectorTypeMode1;
--  
-+
-   if (b_form2) {
-     cd_read.offset       = i_lsn * kCDSectorSizeMode2;
-     cd_read.bufferLength = kCDSectorSizeMode2 * i_blocks;
-@@ -1039,7 +1039,7 @@
-     cd_read.offset       = i_lsn * kCDSectorSizeMode1;
-     cd_read.bufferLength = kCDSectorSizeMode1 * i_blocks;
-   }
--  
-+
-    if( ioctl( p_env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
-   {
-     cdio_info( "could not read block %d, %s", i_lsn, strerror(errno) );
-@@ -1051,7 +1051,7 @@
- /**
-    Reads i_blocks of mode2 form2 sectors from cd device into data starting
-    from lsn.
--   Returns DRIVER_OP_SUCCESS if no error. 
-+   Returns DRIVER_OP_SUCCESS if no error.
-  */
- static driver_return_code_t
- read_mode2_sectors_osx (void *p_user_data, void *p_data, lsn_t i_lsn,
-@@ -1059,12 +1059,12 @@
- {
-   _img_private_t *p_env = p_user_data;
-   dk_cd_read_t cd_read;
--  
-+
-   memset( &cd_read, 0, sizeof(cd_read) );
--  
-+
-   cd_read.sectorArea = kCDSectorAreaUser;
-   cd_read.buffer = p_data;
--  
-+
-   if (b_form2) {
-     cd_read.offset       = i_lsn * kCDSectorSizeMode2Form2;
-     cd_read.sectorType   = kCDSectorTypeMode2Form2;
-@@ -1074,7 +1074,7 @@
-     cd_read.sectorType   = kCDSectorTypeMode2Form1;
-     cd_read.bufferLength = kCDSectorSizeMode2Form1 * i_blocks;
-   }
--  
-+
-   if( ioctl( p_env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
-   {
-     cdio_info( "could not read block %d, %s", i_lsn, strerror(errno) );
-@@ -1083,27 +1083,27 @@
-   return DRIVER_OP_SUCCESS;
- }
- 
--  
-+
- /**
-    Reads a single audio sector from CD device into p_data starting from lsn.
--   Returns 0 if no error. 
-+   Returns 0 if no error.
-  */
- static int
--read_audio_sectors_osx (void *user_data, void *p_data, lsn_t lsn, 
-+read_audio_sectors_osx (void *user_data, void *p_data, lsn_t lsn,
-                              unsigned int i_blocks)
- {
-   _img_private_t *env = user_data;
-   dk_cd_read_t cd_read;
--  
-+
-   memset( &cd_read, 0, sizeof(cd_read) );
--  
-+
-   cd_read.offset       = lsn * kCDSectorSizeCDDA;
-   cd_read.sectorArea   = kCDSectorAreaUser;
-   cd_read.sectorType   = kCDSectorTypeCDDA;
--  
-+
-   cd_read.buffer       = p_data;
-   cd_read.bufferLength = kCDSectorSizeCDDA * i_blocks;
--  
-+
-   if( ioctl( env->gen.fd, DKIOCCDREAD, &cd_read ) == -1 )
-   {
-     cdio_info( "could not read block %d\n%s", lsn,
-@@ -1115,10 +1115,10 @@
- 
- /**
-    Reads a single mode2 sector from cd device into p_data starting
--   from lsn. Returns 0 if no error. 
-+   from lsn. Returns 0 if no error.
-  */
- static driver_return_code_t
--read_mode1_sector_osx (void *p_user_data, void *p_data, lsn_t i_lsn, 
-+read_mode1_sector_osx (void *p_user_data, void *p_data, lsn_t i_lsn,
-                        bool b_form2)
- {
-   return read_mode1_sectors_osx(p_user_data, p_data, i_lsn, b_form2, 1);
-@@ -1126,7 +1126,7 @@
- 
- /**
-    Reads a single mode2 sector from cd device into p_data starting
--   from lsn. Returns 0 if no error. 
-+   from lsn. Returns 0 if no error.
-  */
- static driver_return_code_t
- read_mode2_sector_osx (void *p_user_data, void *p_data, lsn_t i_lsn,
-@@ -1162,7 +1162,7 @@
- }
- 
- #if 0
--static void 
-+static void
- TestDevice(_img_private_t *p_env, io_service_t service)
- {
-   SInt32                          score;
-@@ -1182,26 +1182,26 @@
-     printf("IOCreatePlugInInterfaceForService returned %d\n", err);
-     return;
-   }
--  
-+
-   /* Query the interface for the MMCDeviceInterface. */
--  
-+
-   herr = ( *plugInInterface )->QueryInterface ( plugInInterface,
-                                                 CFUUIDGetUUIDBytes ( kIOMMCDeviceInterfaceID ),
-                                                 ( LPVOID ) &mmcInterface );
--  
-+
-   if ( herr != S_OK )     {
-     printf("QueryInterface returned %ld\n", herr);
-     return;
-   }
--  
--  p_env->pp_scsiTaskDeviceInterface = 
-+
-+  p_env->pp_scsiTaskDeviceInterface =
-     ( *mmcInterface )->GetSCSITaskDeviceInterface ( mmcInterface );
--  
-+
-   if ( NULL == p_env->pp_scsiTaskDeviceInterface )  {
-     printf("GetSCSITaskDeviceInterface returned NULL\n");
-     return;
-   }
--  
-+
-   ( *mmcInterface )->Release ( mmcInterface );
-   IODestroyPlugInInterface ( plugInInterface );
- }
-@@ -1212,7 +1212,7 @@
-   Return false if successful or true if an error.
- */
- static bool
--read_toc_osx (void *p_user_data) 
-+read_toc_osx (void *p_user_data)
- {
-   _img_private_t *p_env = p_user_data;
-   CFDictionaryRef propertiesDict = 0;
-@@ -1231,25 +1231,25 @@
-   if ( data  != NULL ) {
-     CFRange range;
-     CFIndex buf_len;
--    
-+
-     buf_len = CFDataGetLength( data ) + 1;
-     range = CFRangeMake( 0, buf_len );
--    
-+
-     if( ( p_env->pTOC = (CDTOC *)malloc( buf_len ) ) != NULL ) {
-       CFDataGetBytes( data, range, (u_char *) p_env->pTOC );
-     } else {
-       cdio_warn( "Trouble allocating CDROM TOC" );
--      CFRelease( propertiesDict );    
-+      CFRelease( propertiesDict );
-       return false;
-     }
-   } else     {
-     cdio_warn( "Trouble reading TOC" );
--    CFRelease( propertiesDict );    
-+    CFRelease( propertiesDict );
-     return false;
-   }
- 
-   /* TestDevice(p_env, service); */
--  CFRelease( propertiesDict );    
-+  CFRelease( propertiesDict );
- 
-   p_env->i_descriptors = CDTOCGetDescriptorCount ( p_env->pTOC );
- 
-@@ -1259,9 +1259,9 @@
-    */
-   {
-     int i, i_leadout = -1;
--    
-+
-     CDTOCDescriptor *pTrackDescriptors;
--    
-+
-     p_env->pp_lba = malloc( p_env->i_descriptors * sizeof(int) );
-     if( p_env->pp_lba == NULL )
-       {
-@@ -1269,33 +1269,33 @@
-         free( p_env->pTOC );
-         return false;
-       }
--    
-+
-     pTrackDescriptors = p_env->pTOC->descriptors;
- 
-     p_env->gen.i_first_track = CDIO_CD_MAX_TRACKS+1;
-     p_env->i_last_track      = CDIO_CD_MIN_TRACK_NO;
-     p_env->i_first_session   = CDIO_CD_MAX_TRACKS+1;
-     p_env->i_last_session    = CDIO_CD_MIN_TRACK_NO;
--    
-+
-     for( i = 0; i < p_env->i_descriptors; i++ )
-       {
-         track_t i_track     = pTrackDescriptors[i].point;
-         session_t i_session = pTrackDescriptors[i].session;
- 
-         cdio_debug( "point: %d, tno: %d, session: %d, adr: %d, control:%d, "
--                    "address: %d:%d:%d, p: %d:%d:%d", 
-+                    "address: %d:%d:%d, p: %d:%d:%d",
-                     i_track,
-                     pTrackDescriptors[i].tno, i_session,
-                     pTrackDescriptors[i].adr, pTrackDescriptors[i].control,
-                     pTrackDescriptors[i].address.minute,
-                     pTrackDescriptors[i].address.second,
--                    pTrackDescriptors[i].address.frame, 
-+                    pTrackDescriptors[i].address.frame,
-                     pTrackDescriptors[i].p.minute,
--                    pTrackDescriptors[i].p.second, 
-+                    pTrackDescriptors[i].p.second,
-                     pTrackDescriptors[i].p.frame );
- 
-         /* track information has adr = 1 */
--        if ( 0x01 != pTrackDescriptors[i].adr ) 
-+        if ( 0x01 != pTrackDescriptors[i].adr )
-           continue;
- 
-         if( i_track == OSX_CDROM_LEADOUT_TRACK )
-@@ -1304,16 +1304,16 @@
-         if( i_track > CDIO_CD_MAX_TRACKS || i_track < CDIO_CD_MIN_TRACK_NO )
-           continue;
- 
--        if (p_env->gen.i_first_track > i_track) 
-+        if (p_env->gen.i_first_track > i_track)
-           p_env->gen.i_first_track = i_track;
--        
--        if (p_env->i_last_track < i_track) 
-+
-+        if (p_env->i_last_track < i_track)
-           p_env->i_last_track = i_track;
--        
--        if (p_env->i_first_session > i_session) 
-+
-+        if (p_env->i_first_session > i_session)
-           p_env->i_first_session = i_session;
--        
--        if (p_env->i_last_session < i_session) 
-+
-+        if (p_env->i_last_session < i_session)
-           p_env->i_last_session = i_session;
-       }
- 
-@@ -1327,15 +1327,15 @@
-         if( i_track > CDIO_CD_MAX_TRACKS || i_track < CDIO_CD_MIN_TRACK_NO )
-           continue;
- 
--        /* Note what OSX calls a LBA we call an LSN. So below re we 
-+        /* Note what OSX calls a LBA we call an LSN. So below re we
-            really have have MSF -> LSN -> LBA.
-          */
-         p_env->pp_lba[i_track - p_env->gen.i_first_track] =
-           cdio_lsn_to_lba(CDConvertMSFToLBA( pTrackDescriptors[i].p ));
--        set_track_flags(&(p_env->gen.track_flags[i_track]), 
-+        set_track_flags(&(p_env->gen.track_flags[i_track]),
-                         pTrackDescriptors[i].control);
-       }
--    
-+
-     if( i_leadout == -1 )
-       {
-         cdio_warn( "CD leadout not found" );
-@@ -1343,9 +1343,9 @@
-         free( (void *) p_env->pTOC );
-         return false;
-       }
--    
--    /* Set leadout sector. 
--       Note what OSX calls a LBA we call an LSN. So below re we 
-+
-+    /* Set leadout sector.
-+       Note what OSX calls a LBA we call an LSN. So below re we
-        really have have MSF -> LSN -> LBA.
-     */
-     p_env->pp_lba[TOTAL_TRACKS] =
-@@ -1355,7 +1355,7 @@
- 
-   p_env->gen.toc_init   = true;
- 
--  return( true ); 
-+  return( true );
- 
- }
- 
-@@ -1412,29 +1412,29 @@
- #define EJECT_CMD "/usr/sbin/hdiutil eject %s"
-       snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_drive );
- #undef EJECT_CMD
--      
-+
-       if( ( p_file = popen( sz_cmd, "r" ) ) != NULL )
-         {
-           char psz_result[0x200];
-           int i_ret = fread( psz_result, 1, sizeof(psz_result) - 1, p_file );
--          
-+
-           if( i_ret == 0 && ferror( p_file ) != 0 )
-             {
-               pclose( p_file );
-               return DRIVER_OP_ERROR;
-             }
--          
-+
-           pclose( p_file );
--          
-+
-           psz_result[ i_ret ] = 0;
--          
-+
-           if( strstr( psz_result, "Disk Ejected" ) != NULL )
-             {
-               return DRIVER_OP_SUCCESS;
-             }
-         }
-     }
--  
-+
-   return DRIVER_OP_ERROR;
- }
- #else /* HAVE_DISKARBITRATION */
-@@ -1460,7 +1460,7 @@
-       {
-         CFStringRef status = DADissenterGetStatusString(dissenter);
-         if (status)
--        { 
-+        {
-                 size_t cstr_size = CFStringGetLength(status);
-                 char *cstr = malloc(cstr_size);
-                 if ( CFStringGetCString( status,
-@@ -1520,18 +1520,18 @@
-   dacontext.completed = FALSE;
-   dacontext.runloop   = CFRunLoopGetCurrent();
-   dacontext.cancel    = CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &cancelRunLoopSourceContext);
--  
-+
-   if (!dacontext.cancel)
-     {
-       return DRIVER_OP_ERROR;
-     }
--  
-+
-   if (!(dacontext.session = DASessionCreate(kCFAllocatorDefault)))
-     {
-       CFRelease(dacontext.cancel);
-       return DRIVER_OP_ERROR;
-     }
--  
-+
-   if ((disk = DADiskCreateFromBSDName(kCFAllocatorDefault, dacontext.session, psz_drive)) != NULL)
-     {
-       if ((description = DADiskCopyDescription(disk)) != NULL)
-@@ -1559,7 +1559,7 @@
-         }
-       CFRelease(disk);
-     }
--  
-+
-   CFRunLoopSourceInvalidate(dacontext.cancel);
-   CFRelease(dacontext.cancel);
-   CFRelease(dacontext.session);
-@@ -1593,7 +1593,7 @@
-     case _AM_NONE:
-       return "no access method";
-     }
--  } 
-+  }
-   return NULL;
- }
- 
-@@ -1636,10 +1636,10 @@
- }
- 
- /**
--  Get format of track. 
-+  Get format of track.
- */
- static track_format_t
--get_track_format_osx(void *p_user_data, track_t i_track) 
-+get_track_format_osx(void *p_user_data, track_t i_track)
- {
-   _img_private_t *p_env = p_user_data;
-   dk_cd_read_track_info_t cd_read;
-@@ -1649,15 +1649,15 @@
- 
-   if (i_track > p_env->i_last_track || i_track < p_env->gen.i_first_track)
-     return TRACK_FORMAT_ERROR;
--    
-+
-   memset( &cd_read, 0, sizeof(cd_read) );
- 
-   cd_read.address = i_track;
-   cd_read.addressType = kCDTrackInfoAddressTypeTrackNumber;
--  
-+
-   cd_read.buffer = &a_track;
-   cd_read.bufferLength = sizeof(CDTrackInfo);
--  
-+
-   if( ioctl( p_env->gen.fd, DKIOCCDREADTRACKINFO, &cd_read ) == -1 )
-   {
-     cdio_warn( "could not read trackinfo for track %d:\n%s", i_track,
-@@ -1665,7 +1665,7 @@
-     return TRACK_FORMAT_ERROR;
-   }
- 
--  cdio_debug( "%d: trackinfo trackMode: %x dataMode: %x", i_track, 
-+  cdio_debug( "%d: trackinfo trackMode: %x dataMode: %x", i_track,
-               a_track.trackMode, a_track.dataMode );
- 
-   if (a_track.trackMode == CDIO_CDROM_DATA_TRACK) {
-@@ -1691,7 +1691,7 @@
-   FIXME: there's gotta be a better design for this and get_track_format?
- */
- static bool
--get_track_green_osx(void *p_user_data, track_t i_track) 
-+get_track_green_osx(void *p_user_data, track_t i_track)
- {
-   _img_private_t *p_env = p_user_data;
-   CDTrackInfo a_track;
-@@ -1704,15 +1704,15 @@
-   else {
- 
-     dk_cd_read_track_info_t cd_read;
--    
-+
-     memset( &cd_read, 0, sizeof(cd_read) );
--    
-+
-     cd_read.address      = i_track;
-     cd_read.addressType  = kCDTrackInfoAddressTypeTrackNumber;
--    
-+
-     cd_read.buffer       = &a_track;
-     cd_read.bufferLength = sizeof(CDTrackInfo);
--    
-+
-     if( ioctl( p_env->gen.fd, DKIOCCDREADTRACKINFO, &cd_read ) == -1 ) {
-       cdio_warn( "could not read trackinfo for track %d:\n%s", i_track,
-                  strerror(errno));
-@@ -1723,7 +1723,7 @@
- }
- 
- /* Set CD-ROM drive speed */
--static int 
-+static int
- set_speed_osx (void *p_user_data, int i_speed)
- {
-   const _img_private_t *p_env = p_user_data;
-@@ -1736,16 +1736,16 @@
- 
- /**
-   Close tray on CD-ROM.
--  
-+
-   @param psz_drive the CD-ROM drive to be closed.
--  
-+
- */
- 
--/* FIXME: We don't use the device name because we don't how 
-+/* FIXME: We don't use the device name because we don't how
-    to.
-  */
- #define CLOSE_TRAY_CMD "/usr/sbin/drutil tray close"
--driver_return_code_t 
-+driver_return_code_t
- close_tray_osx (const char *psz_drive)
- {
- #ifdef HAVE_DARWIN_CDROM
-@@ -1754,7 +1754,7 @@
- 
-   if ( !psz_drive) return DRIVER_OP_UNINIT;
- 
--  /* Right now we really aren't making use of snprintf, but 
-+  /* Right now we really aren't making use of snprintf, but
-      possibly someday we will.
-    */
-   snprintf( sz_cmd, sizeof(sz_cmd), CLOSE_TRAY_CMD );
-@@ -1763,25 +1763,25 @@
-     {
-       char psz_result[0x200];
-       int i_ret = fread( psz_result, 1, sizeof(psz_result) - 1, p_file );
--      
-+
-       if( i_ret == 0 && ferror( p_file ) != 0 )
-         {
-           pclose( p_file );
-           return DRIVER_OP_ERROR;
-         }
--      
-+
-       pclose( p_file );
--      
-+
-       psz_result[ i_ret ] = 0;
--      
-+
-       if( 0 == i_ret )
-         {
-           return DRIVER_OP_SUCCESS;
-         }
-     }
--  
-+
-   return DRIVER_OP_ERROR;
--#else 
-+#else
-   return DRIVER_OP_NO_DRIVER;
- #endif /*HAVE_DARWIN_CDROM*/
- }
-@@ -1802,46 +1802,46 @@
-   CFMutableDictionaryRef classes_to_match;
-   char        **drives = NULL;
-   unsigned int  num_drives=0;
--  
-+
-   /* Probe devices to get up to date information. */
-   ProbeStorageDevices();
--  
-+
-   kern_result = IOMasterPort( MACH_PORT_NULL, &master_port );
-   if( kern_result != KERN_SUCCESS )
-     {
-       return( NULL );
-     }
--  
-+
-   classes_to_match = IOServiceMatching( kIOMediaClass );
-   if( classes_to_match == NULL )
-     {
-       return( NULL );
-     }
--  
-+
-   CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
-                         kCFBooleanTrue );
--  
-+
-   CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaWholeKey),
-                         kCFBooleanTrue );
--  
--  kern_result = IOServiceGetMatchingServices( master_port, 
-+
-+  kern_result = IOServiceGetMatchingServices( master_port,
-                                               classes_to_match,
-                                               &media_iterator );
-   if( kern_result != KERN_SUCCESS )
-     {
-       return( NULL );
-     }
--  
-+
-   next_media = IOIteratorNext( media_iterator );
-   if( next_media != 0 )
-     {
-       char psz_buf[0x32];
-       size_t dev_path_length;
-       CFTypeRef str_bsd_path;
--      
-+
-       do
-         {
--          str_bsd_path = 
-+          str_bsd_path =
-             IORegistryEntryCreateCFProperty( next_media,
-                                              CFSTR( kIOBSDNameKey ),
-                                              kCFAllocatorDefault,
-@@ -1851,13 +1851,13 @@
-               IOObjectRelease( next_media );
-               continue;
-             }
--          
-+
-           /* Below, by appending 'r' to the BSD node name, we indicate
-              a raw disk. Raw disks receive I/O requests directly and
--             don't go through a buffer cache. */        
-+             don't go through a buffer cache. */
-           snprintf( psz_buf, sizeof(psz_buf), "%s%c", _PATH_DEV, 'r' );
-           dev_path_length = strlen( psz_buf );
--          
-+
-           if( CFStringGetCString( str_bsd_path,
-                                   (char*)&psz_buf + dev_path_length,
-                                   sizeof(psz_buf) - dev_path_length,
-@@ -1867,7 +1867,7 @@
-             }
-           CFRelease( str_bsd_path );
-           IOObjectRelease( next_media );
--          
-+
-         } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
-     }
-   IOObjectRelease( media_iterator );
-@@ -1889,37 +1889,37 @@
-   kern_return_t kern_result;
-   io_iterator_t media_iterator;
-   CFMutableDictionaryRef classes_to_match;
--  
-+
-   /* Probe devices to get up to date information. */
-   ProbeStorageDevices();
--  
-+
-   classes_to_match = IOServiceMatching( kIOMediaClass );
-   if( classes_to_match == NULL )
-     {
-       return( NULL );
-     }
--  
-+
-   CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey),
-                         kCFBooleanTrue );
--  
-+
-   CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaWholeKey),
-                         kCFBooleanTrue );
--  
--  kern_result = IOServiceGetMatchingServices( kIOMasterPortDefault, 
-+
-+  kern_result = IOServiceGetMatchingServices( kIOMasterPortDefault,
-                                               classes_to_match,
-                                               &media_iterator );
-   if( kern_result != KERN_SUCCESS )
-     {
-       return( NULL );
-     }
--  
-+
-   next_media = IOIteratorNext( media_iterator );
-   if( next_media != 0 )
-     {
-       char psz_buf[0x32];
-       size_t dev_path_length;
-       CFTypeRef str_bsd_path;
--      
-+
-       do
-         {
-           /* Skip other removable media, like USB flash memory keys:  */
-@@ -1937,10 +1937,10 @@
-               IOObjectRelease( next_media );
-               continue;
-             }
--          
-+
-           snprintf( psz_buf, sizeof(psz_buf), "%s%c", _PATH_DEV, 'r' );
-           dev_path_length = strlen( psz_buf );
--          
-+
-           if( CFStringGetCString( str_bsd_path,
-                                   (char*)&psz_buf + dev_path_length,
-                                   sizeof(psz_buf) - dev_path_length,
-@@ -1951,10 +1951,10 @@
-               IOObjectRelease( media_iterator );
-               return strdup( psz_buf );
-             }
--          
-+
-           CFRelease( str_bsd_path );
-           IOObjectRelease( next_media );
--          
-+
-         } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
-     }
-   IOObjectRelease( media_iterator );
-@@ -2039,10 +2039,10 @@
- 
-   if (NULL == psz_orig_source) {
-     psz_source=cdio_get_default_device_osx();
--    if (NULL == psz_source) { 
-+    if (NULL == psz_source) {
-         free(_data);
--        return NULL; 
--    } 
-+        return NULL;
-+    }
- 
-     _set_arg_osx(_data, "source", psz_source);
-     free(psz_source);
-@@ -2071,8 +2071,8 @@
-     free(ret);
-     return NULL;
-   }
--  
--#else 
-+
-+#else
-   return NULL;
- #endif /* HAVE_DARWIN_CDROM */
- 
-@@ -2083,7 +2083,7 @@
- {
- #ifdef HAVE_DARWIN_CDROM
-   return true;
--#else 
-+#else
-   return false;
- #endif /* HAVE_DARWIN_CDROM */
- }
---- a/test/check_cdtext.sh
-+++ b/test/check_cdtext.sh
-@@ -17,7 +17,7 @@
- #
- 
- if test "X$srcdir" = "X" ; then
--  return $SKIP_TEST_EXITCODE
-+  exit $SKIP_TEST_EXITCODE
- fi
- 
- . $srcdir/check_common_fn
-@@ -25,16 +25,16 @@
- CDTEXT_RAW=$srcdir/../example/cdtext-raw
- 
- if test ! -x $CDTEXT_RAW ; then
--  return $SKIP_TEST_EXITCODE
-+  exit $SKIP_TEST_EXITCODE
- fi
- 
- if test "X$DIFF" = "X" ; then
--  return $SKIP_TEST_EXITCODE
-+  exit $SKIP_TEST_EXITCODE
- fi
- 
- if test "$DIFF" = "no"; then
-   echo "$0: No diff(1) or cmp(1) found - cannot test ${cmdname}"
--  return $SKIP_TEST_EXITCODE
-+  exit $SKIP_TEST_EXITCODE
- fi
- 
- 
-@@ -43,7 +43,7 @@
-   outfile="$2"
-   rightfile="$3"
- 
--  if "${CDTEXT_RAW}" ${opts} >"${outfile}" 2>&1 ; then 
-+  if "${CDTEXT_RAW}" ${opts} >"${outfile}" 2>&1 ; then
-     if $DIFF $DIFF_OPTS "${outfile}" "${rightfile}" ; then
-       $RM "${outfile}"
-       return 0

_service:download_files:master.tar.gz/tools/depends/target/libfmt/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/libgpg-error/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/libgpg-error/libgpg-error-1.36-gawk5-support.patch Added

@@ -0,0 +1,155 @@
+From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ lang/cl/mkerrcodes.awk |  2 +-
+ src/Makefile.am        |  2 +-
+ src/mkerrcodes.awk     |  2 +-
+ src/mkerrcodes1.awk    |  2 +-
+ src/mkerrcodes2.awk    |  2 +-
+ src/mkerrnos.awk       |  2 +-
+ src/mkstrtable.awk     | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ce1b882..f2590cb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-		-v prefix=GPG_ERR_ -v namespace=errnos_ \
++		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ 		$(srcdir)/errnos.in >$@
+ 
+ 
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+       print "/* The purpose of this complex string table is to produce";
+       print "   optimal code with a minimum of relocations.  */";
+       print "";
+-      print "static const char " namespace "msgstr[] = ";
++      print "static const char " pkg_namespace "msgstr[] = ";
+       header = 0;
+     }
+   else
+@@ -110,7 +110,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,7 +150,7 @@ END {
+   else
+     print "  gettext_noop (\"" last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+     print "    " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+   print "  };";
+   print "";
+   print "static GPG_ERR_INLINE int";
+-  print namespace "msgidxof (int code)";
++  print pkg_namespace "msgidxof (int code)";
+   print "{";
+   print "  return (0 ? 0";
+

_service:download_files:master.tar.gz/tools/depends/target/libgpg-error/tvos_remove-fork.patch Added

@@ -0,0 +1,47 @@
+--- a/src/spawn-posix.c
++++ b/src/spawn-posix.c
+@@ -314,7 +314,7 @@
+ 
+   if (preexec)
+     preexec ();
+-  execv (pgmname, arg_list);
++//  execv (pgmname, arg_list);
+   /* No way to print anything, as we have may have closed all streams. */
+   _exit (127);
+ }
+@@ -464,7 +464,7 @@
+     }
+ 
+   _gpgrt_pre_syscall ();
+-  *pid = fork ();
++  *pid = -1;
+   _gpgrt_post_syscall ();
+   if (*pid == (pid_t)(-1))
+     {
+@@ -534,7 +534,7 @@
+   gpg_error_t err;
+ 
+   _gpgrt_pre_syscall ();
+-  *pid = fork ();
++  *pid = -1;
+   _gpgrt_post_syscall ();
+   if (*pid == (pid_t)(-1))
+     {
+@@ -813,7 +813,7 @@
+     return _gpg_err_code_from_syserror ();
+ 
+   _gpgrt_pre_syscall ();
+-  pid = fork ();
++  pid = -1;
+   _gpgrt_post_syscall ();
+   if (pid == (pid_t)(-1))
+     {
+@@ -830,7 +830,7 @@
+       if (setsid() == -1 || chdir ("/"))
+         _exit (1);
+ 
+-      pid2 = fork (); /* Double fork to let init take over the new child. */
++      pid2 = -1; /* Double fork to let init take over the new child. */
+       if (pid2 == (pid_t)(-1))
+         _exit (1);
+       if (pid2)

_service:download_files:master.tar.gz/tools/depends/target/libjpeg-turbo/01-disable-executables.patch Added

_service:download_files:master.tar.gz/tools/depends/target/libjpeg-turbo/02-fix-gas-preprocessor-with-ccache.patch Added

_service:download_files:master.tar.gz/tools/depends/target/libjpeg-turbo/Makefile Changed

@@ -1,18 +1,13 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile
+DEPS= ../../Makefile.include Makefile 01-disable-executables.patch 02-fix-gas-preprocessor-with-ccache.patch
 
 # lib name, version
 LIBNAME=libjpeg-turbo
-VERSION=1.5.1
+VERSION=2.0.4
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) --with-jpeg8 --disable-shared
 
-export CFLAGS=-O3
-
-LIBDYLIB=$(PLATFORM)/.libs/libjpeg.a
+LIBDYLIB=$(PLATFORM)/build/libjpeg.a
 
 all: .installed-$(PLATFORM)
 
@@ -22,13 +17,15 @@
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); patch -p1 -i ../01-disable-executables.patch
+	cd $(PLATFORM); patch -p1 -i ../02-fix-gas-preprocessor-with-ccache.patch
+	cd $(PLATFORM); $(CMAKE) -B build -DCMAKE_ASM_NASM_COMPILER:FILEPATH=$(NATIVEPREFIX)/bin/yasm -DENABLE_SHARED:BOOL=OFF -DWITH_JPEG8:BOOL=ON
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -j 1 -C $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)/build
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
+	$(MAKE) -C $(PLATFORM)/build install
 	touch $@
 
 clean:

_service:download_files:master.tar.gz/tools/depends/target/nettle/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/openssl/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/openssl/cacert.pem Deleted

@@ -1,3401 +0,0 @@
-##
-## Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Wed Feb  6 10:00:00 2019 GMT
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: 18372117493b5b7ec006c31d966143fc95a9464a2b5f8d5188e23c5557b2292d
-##
-
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
-KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
-T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
-J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
-nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-========================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
-Actalis Authentication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
-BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
-AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
-MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
-IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
-wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
-by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
-zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
-YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
-oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
-EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
-hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
-EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
-jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
-iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
-WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
-JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
-K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
-Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
-4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
-2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
-lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
-OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
-vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
-Buypass Class 2 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
-DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
-g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
-9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
-/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
-CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
-awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
-zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
-Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
-Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
-M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
-osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
-aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
-DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
-LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
-oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
-wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
-CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
-rJgWVqA=
------END CERTIFICATE-----
-
-Buypass Class 3 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
-DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
-sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
-5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
-7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
-ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
-2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
-/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
-RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
-Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
-j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
-uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
-Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
-ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
-KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
-6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
-UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
-eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
-Cp/HuZc=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 3
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
-MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
-9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
-NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
-iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
-0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
-AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
-fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
-ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
-P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
------END CERTIFICATE-----
-
-EE Certification Centre Root CA
-===============================
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
-dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
-MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
-UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
-ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
-TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
-rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
-93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
-P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
-MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
-BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
-xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
-lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
-3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
-dcGWxZ0=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
-Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
-LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
-ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
-BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
-KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
-p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
-AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
-4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
-eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
-MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
-PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
-OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
-2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
-dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
-X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 EV 2009
-=================================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
-egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
-zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
-7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
-sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
-11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
-cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
-ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
-MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
-b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
-c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
-PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
-ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
-NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
-w9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-CA Disig Root R2
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
-w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
-xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
-A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
-GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
-g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
-5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
-koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
-Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
-Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
-Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
-sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
-dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
-1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
-mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
-utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
-sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
-UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
-7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-ACCVRAIZ1
-=========
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
-SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
-MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
-UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
-jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
-RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
-aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
-0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
-WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
-8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
-5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
-9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
-Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
-Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
-Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
-Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
-QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
-AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
-YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
-AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
-IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
-aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
-dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
-MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
-hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
-R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
-YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
-nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
-TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
-sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
-Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
-3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
-EfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-TWCA Global Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
-CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
-QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
-EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
-nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
-r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
-Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
-tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
-KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
-sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
-yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
-kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
-zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
-cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
-8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
-/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
-lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
-A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
-i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
-EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
-zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
------END CERTIFICATE-----
-
-TeliaSonera Root CA v1
-======================
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
-CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
-MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
-VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
-6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
-3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
-B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
-Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
-oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
-F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
-oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
-gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
-TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
-AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
-DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
-zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
-pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
-G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
-c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
-JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
-qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
-Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
-WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
-
-E-Tugra Certification Authority
-===============================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
-DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
-ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
-ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
-NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
-QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
-cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
-DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
-hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
-CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
-ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
-BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
-E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
-rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
-jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
-rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
-dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
-kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
-XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
-VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
-a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
-dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
-KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
-Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
-8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
-C7TbO6Orb1wdtn7os4I07QZcJA==
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 2
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
-MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
-SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
-vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
-2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
-WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
-YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
-r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
-vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
-3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
------END CERTIFICATE-----
-
-Atos TrustedRoot 2011
-=====================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
-cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
-MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
-A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
-hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
-54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
-DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
-HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
-z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
-l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
-bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
-k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
-TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
-61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
-3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
-
-QuoVadis Root CA 1 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
-PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
-PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
-Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
-ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
-g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
-7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
-9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
-iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
-t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
-hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
-GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
-Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
-+V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
-3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
-wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
-O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
-FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
-hMJKzRwuJIczYOXD
------END CERTIFICATE-----
-
-QuoVadis Root CA 2 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
-ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
-NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
-oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
-MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
-V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
-L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
-sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
-6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
-lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
-hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
-pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
-x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
-dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
-U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
-mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
-zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
-JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
-O3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-QuoVadis Root CA 3 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
-IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
-Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
-6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
-I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
-VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
-5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
-Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
-dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
-rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
-hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
-t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
-TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
-DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
-Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
-hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
-0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
-dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
-PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G2
-===========================
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
-MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
-35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
-bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
-VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
-YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
-lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
-w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
-0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
-d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
-hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
-jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G3
-===========================
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
-VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
-RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
-KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
-UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
-YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
-1vUhZscv6pZjamVFkpUBtA==
------END CERTIFICATE-----
-
-DigiCert Global Root G2
-=======================
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
-MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
-kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
-3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
-BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
-UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
-o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
-5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
-F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
-WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
-QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
-iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
-
-DigiCert Global Root G3
-=======================
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
-VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
-MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
-aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
-AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
-YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
-Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
-3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
-VOKa5Vt8sycX
------END CERTIFICATE-----
-
-DigiCert Trusted Root G4
-========================
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
-HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
-pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
-k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
-vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
-QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
-MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
-mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
-f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
-dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
-oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
-ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
-yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
-7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
-ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
-5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
-/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
-5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
-G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
-82Z+
------END CERTIFICATE-----
-
-COMODO RSA Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
-dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
-FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
-5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
-x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
-2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
-OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
-sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
-GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
-WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
-rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
-nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
-tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
-sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
-pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
-zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
-ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
-7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
-LaZRfyHBNVOFBkpdn627G190
------END CERTIFICATE-----
-
-USERTrust RSA Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
-ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
-0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
-Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
-RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
-+T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
-/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
-Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
-lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
-yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
-eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
-FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
-7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
-Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
-8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
-FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
-yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
-J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
-sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
-Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
-
-USERTrust ECC Certification Authority
-=====================================
------BEGIN CERTIFICATE-----
-MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
-0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
-nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
-HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
-HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
-9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R4
-===========================
------BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
-OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
-AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
-MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
-JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
------END CERTIFICATE-----
-
-GlobalSign ECC Root CA - R5
-===========================
------BEGIN CERTIFICATE-----
-MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
-R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
-EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
-SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
-h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
-uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
-yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G3
-==================================
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
-olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
-x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
-EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
-Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
-mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
-1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
-07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
-FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
-41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
-AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
-yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
-U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
-KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
-v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
-8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
-8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
-mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
-1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
-JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
-tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
------END CERTIFICATE-----
-
-Staat der Nederlanden EV Root CA
-================================
------BEGIN CERTIFICATE-----
-MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
-MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
-cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
-SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
-O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
-0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
-Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
-XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
-08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
-0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
-74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
-fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
-ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
-eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
-c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
-5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
-b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
-f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
-5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
-WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
-DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
-eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
------END CERTIFICATE-----
-
-IdenTrust Commercial Root CA 1
-==============================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
-b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
-IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
-hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
-mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
-1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
-XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
-3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
-NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
-WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
-xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
-uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
-hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
-6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
-ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
-ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
-YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
-feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
-kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
-2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
-Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
-cGzM7vRX+Bi6hG6H
------END CERTIFICATE-----
-
-IdenTrust Public Sector Root CA 1
-=================================
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
-EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
-ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
-UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
-b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
-P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
-Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
-rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
-qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
-mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
-ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
-LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
-iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
-4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
-Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
-DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
-t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
-mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
-GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
-m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
-NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
-Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
-ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
-ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
-3Wl9af0AVqW3rLatt8o+Ae+c
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
-bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
-HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
-DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
-OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
-/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
-HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
-s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
-TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
-AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
-0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
-iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
-nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
-vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
-e4pIb4tF9g==
------END CERTIFICATE-----
-
-Entrust Root Certification Authority - EC1
-==========================================
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
-FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
-YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
-FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
-LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
-dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
-AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
-9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
-vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
-kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
-CFCA EV ROOT
-============
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
-CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
-IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
-MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
-DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
-BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
-7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
-uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
-ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
-xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
-py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
-gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
-hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
-tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
-BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
-ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
-ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
-4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
-E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
-BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
-aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
-PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
-kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
-ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
------END CERTIFICATE-----
-
-Certinomis - Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
-LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
-EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
-ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
-P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
-d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
-z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
-8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
-RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
-6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
-FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
-PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
-i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
-YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
-6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
-WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
-Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
-lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
-y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
-Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
-DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
-I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
-cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
-hkIGuUE=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GB CA
-===============================
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
-EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
-MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
-b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
-scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
-rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
-9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
-Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
-GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
-hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
-dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
-VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
-HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
-Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
------END CERTIFICATE-----
-
-SZAFIR ROOT CA2
-===============
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
-A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
-BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
-BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
-VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
-qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
-DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
-2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
-ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
-ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
-AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
-O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
-oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
-4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
-+/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
------END CERTIFICATE-----
-
-Certum Trusted Network CA 2
-===========================
------BEGIN CERTIFICATE-----
-MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
-BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
-bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
-ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
-TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
-IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
-7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
-CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
-Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
-uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
-GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
-9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
-Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
-hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
-BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
-hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
-Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
-L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
-clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
-pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
-w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
-J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
-ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
-is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
-zAYspsbiDrW5viSP
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2015
-=======================================================
------BEGIN CERTIFICATE-----
-MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
-BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
-aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
-YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
-MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
-QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
-BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
-MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
-bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
-iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
-6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
-FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
-i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
-GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
-fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
-iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
-Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
-hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
-D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
-d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
-d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
-82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
-davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
-Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
-J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
-JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
-p/UsQu0yrbYhnr68
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions ECC RootCA 2015
-===========================================================
------BEGIN CERTIFICATE-----
-MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
-aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
-cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
-aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
-MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
-IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
-VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
-Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
-dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
-Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
-GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
-dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
------END CERTIFICATE-----
-
-ISRG Root X1
-============
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
-BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
-EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
-EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
-DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
-Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
-3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
-b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
-Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
-4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
-1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
-hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
-usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
-OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
-A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
-9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
-0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
-hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
-TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
-e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
-JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
-YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
-JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
-m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----
-
-AC RAIZ FNMT-RCM
-================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
-AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
-MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
-TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
-qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
-btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
-j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
-08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
-WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
-tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
-47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
-ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
-i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
-dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
-nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
-D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
-j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
-Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
-+YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
-Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
-8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
-5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
-rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
------END CERTIFICATE-----
-
-Amazon Root CA 1
-================
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
-MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
-FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
-gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
-dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
-VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
-DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
-CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
-8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
-2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
-xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
------END CERTIFICATE-----
-
-Amazon Root CA 2
-================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
-VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
-MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
-bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
-kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
-N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
-AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
-fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
-kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
-btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
-Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
-c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
-3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
-DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
-A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
-+gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
-YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
-xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
-gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
-aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
-Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
-KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
-JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
------END CERTIFICATE-----
-
-Amazon Root CA 3
-================
------BEGIN CERTIFICATE-----
-MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
-f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
-Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
-rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
-eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
------END CERTIFICATE-----
-
-Amazon Root CA 4
-================
------BEGIN CERTIFICATE-----
-MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
-EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
-NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
-MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
-/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
-83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
-MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
-AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
------END CERTIFICATE-----
-
-LuxTrust Global Root 2
-======================
------BEGIN CERTIFICATE-----
-MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
-A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
-bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
-MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
-Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
-xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
-wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
-1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
-FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
-wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
-a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
-ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
-MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
-/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
-Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
-+Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
-FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
-H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
-7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
-ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
-VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
-TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
-/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
-7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
-iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
------END CERTIFICATE-----
-
-TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
-D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
-IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
-TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
-ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
-VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
-c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
-bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
-IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
-6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
-wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
-3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
-WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
-ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
-KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
-AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
-lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
-e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
-q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
------END CERTIFICATE-----
-
-GDCA TrustAUTH R5 ROOT
-======================
------BEGIN CERTIFICATE-----
-MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
-BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
-DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
-YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
-IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
-AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
-OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
-pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
-9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
-xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
-R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
-D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
-oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
-9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
-p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
-H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
-6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
-+PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
-HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
-F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
-8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
-/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
-aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
------END CERTIFICATE-----
-
-TrustCor RootCert CA-1
-======================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
-MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
-YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
-VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
-dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
-jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
-pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
-JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
-gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
-/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
-BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
-mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
-ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
-qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
-3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
------END CERTIFICATE-----
-
-TrustCor RootCert CA-2
-======================
------BEGIN CERTIFICATE-----
-MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
-DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
-eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
-eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
-MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
-bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
-IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
-ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
-RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
-oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
-XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
-/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
-jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
-eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
-rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
-8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
-2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
-Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
-kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
-2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
-S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
-PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
-DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
-RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
-xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
-RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
------END CERTIFICATE-----
-
-TrustCor ECA-1
-==============
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
-MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
-U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
-N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
-MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
-IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
-MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
-xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
-p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
-fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
-YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
-f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
-AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
-/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
-hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
-J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
-jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority RSA
-========================================
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
-BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
-MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
-MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
-LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
-Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
-P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
-oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
-k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
-fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
-gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
-UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
-1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
-bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
-dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
-ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
-u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
-erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
-MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
-vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
-Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
-wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
-WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
------END CERTIFICATE-----
-
-SSL.com Root Certification Authority ECC
-========================================
------BEGIN CERTIFICATE-----
-MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
-BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
-MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
-BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
-bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
-BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
-8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
-hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
-jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
-e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
-5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority RSA R2
-==============================================
------BEGIN CERTIFICATE-----
-MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
-DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
-MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
-MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
-DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
-VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
-hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
-cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
-Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
-B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
-CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
-9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
-RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
-JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
-+qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
-HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
-qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
-++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
-Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
-guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
-OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
-CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
-lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
-rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
-hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
-9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
------END CERTIFICATE-----
-
-SSL.com EV Root Certification Authority ECC
-===========================================
------BEGIN CERTIFICATE-----
-MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
-BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
-BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
-MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
-EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
-LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
-3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
-BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
-5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
-N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
-m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R6
-=======================
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
-R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
-b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
-YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
-U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
-grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
-3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
-vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
-PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
-azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
-WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
-CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
-0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
-b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
-HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
-nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
-lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
-BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
-Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
-3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
-0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
-uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
-oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
-JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GC CA
-===============================
------BEGIN CERTIFICATE-----
-MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
-SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
-MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
-Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
-ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
-bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
-VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
-NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
-AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
-AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
------END CERTIFICATE-----
-
-GTS Root R1
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
-9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
-aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
-r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
-LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
-4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
-06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
-wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
-3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
-JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
-BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
-d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
-fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
-ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
-gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
-4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
-tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
-pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
-sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
-CFF1pkgl
------END CERTIFICATE-----
-
-GTS Root R2
-===========
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
-EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
-b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
-A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
-k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
-7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
-m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
-dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
-ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
-cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
-Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
-aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
-5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
-BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
-vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
-+YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
-c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
-WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
-n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
-Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
-7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
-gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
-o/DUhgkC
------END CERTIFICATE-----
-
-GTS Root R3
-===========
------BEGIN CERTIFICATE-----
-MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
-Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
-0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
-glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
-KaqW04MjyaR7YbPMAuhd
------END CERTIFICATE-----
-
-GTS Root R4
-===========
------BEGIN CERTIFICATE-----
-MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
-UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
-UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
-ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
-6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
-QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
-2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
-N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
-zPKwTdb+mciUqXWi4w==
------END CERTIFICATE-----
-
-UCA Global G2 Root
-==================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
-NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
-cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
-oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
-8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
-h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
-LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
-R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
-KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
-4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
-OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
-8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
-5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
-1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
-Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
-yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
-c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
-jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
-bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
-ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
-RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
------END CERTIFICATE-----
-
-UCA Extended Validation Root
-============================
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
-EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
-IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
-A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
-iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
-Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
-eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
-59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
-0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
-el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
-B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
-WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
-NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
-3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
-BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
-ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
-aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
-dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
-+7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
-F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
-GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
-GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
-djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
-dhh2n1ax
------END CERTIFICATE-----
-
-Certigna Root CA
-================
------BEGIN CERTIFICATE-----
-MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
-BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
-MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
-MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
-MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
-stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
-KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
-JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
-XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
-4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
-wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
-lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
-jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
-/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
-1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
-dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
-LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
-cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
-OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
-TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
-7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
-4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
-8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
-6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
-tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
-aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
-E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
------END CERTIFICATE-----

_service:download_files:master.tar.gz/tools/depends/target/python3/darwin_embedded.patch Changed

@@ -214,7 +214,7 @@
          wchar_t *path = Py_DecodeLocale(execpath, &len);
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
-@@ -197,6 +197,20 @@
+@@ -197,6 +197,19 @@
  #endif  /* _MSC_VER */
  #endif  /* ! __WATCOMC__ || __QNX__ */
  
@@ -231,11 +231,10 @@
 +#  undef HAVE_WAIT
 +#  undef HAVE_WAIT3
 +#  undef HAVE_WAIT4
-+#  undef HAVE_WAITPID
  
  /*[clinic input]
  # one of the few times we lie about this name!
-@@ -475,6 +489,10 @@
+@@ -475,6 +488,10 @@
  }
  #endif
  
@@ -246,7 +245,7 @@
  /* Legacy wrapper */
  void
  PyOS_AfterFork(void)
-@@ -5040,6 +5058,8 @@
+@@ -5040,6 +5057,8 @@
  #endif
      _Py_END_SUPPRESS_IPH
  
@@ -255,7 +254,7 @@
      /* If we get here it's definitely an error */
  
      free_string_array(argvlist, argc);
-@@ -5116,6 +5136,12 @@
+@@ -5116,6 +5135,12 @@
  #endif
      _Py_END_SUPPRESS_IPH
  
@@ -268,7 +267,7 @@
      /* If we get here it's definitely an error */
  
      posix_path_error(path);
-@@ -5416,7 +5442,7 @@
+@@ -5416,7 +5441,7 @@
      pid_t pid;
  
      PyOS_BeforeFork();
@@ -277,7 +276,7 @@
      if (pid == 0) {
          /* child: this clobbers and resets the import lock. */
          PyOS_AfterFork_Child();
-@@ -5447,7 +5473,7 @@
+@@ -5447,7 +5472,7 @@
      pid_t pid;
  
      PyOS_BeforeFork();

_service:download_files:master.tar.gz/tools/depends/target/pythonmodule-pil/Makefile Changed

@@ -19,10 +19,11 @@
 ifeq (darwin, $(findstring darwin, $(HOST)))
 ifeq ($(OS),darwin_embedded)
 PYTHON_O=$(abs_top_srcdir)/target/python3/$(PLATFORM)/Programs/python.o
+PILPATH=$(PREFIX)/share/$(APP_NAME)/addons/script.module.pil
 endif
 #ensure that only our target ldflags are passed to the python build
 LDSHARED:=$(CC) -bundle -undefined dynamic_lookup $(LDFLAGS)
-CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python3.7/site-packages/" LDSHARED="$(LDSHARED)"
+CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PILPATH):$(PREFIX)/lib/python3.7/site-packages/" LDSHARED="$(LDSHARED)"
 endif
 
 LIBDYLIB=$(PLATFORM)/dist/Pillow-$(VERSION)-py3.7-$(OS)-$(CPU).egg
@@ -52,6 +53,11 @@
 	cd $(PLATFORM); $(CROSSFLAGS) $(NATIVEPREFIX)/bin/python3 setup.py install --install-lib  $(PREFIX)/share/$(APP_NAME)/addons/script.module.pil
 	cd $(PREFIX)/share/$(APP_NAME)/addons/script.module.pil/lib && unzip -o ../Pillow-*.egg
 	cd $(PREFIX)/share/$(APP_NAME)/addons/script.module.pil && rm -rf Pillow-*.egg
+else ifeq ($(TARGET_PLATFORM),appletvos)
+	mkdir -p $(PILPATH)/lib
+	cd $(PLATFORM); $(CROSSFLAGS) $(NATIVEPREFIX)/bin/python3 setup.py install --install-lib  $(PILPATH)
+	cd $(PILPATH)/lib && unzip -o ../Pillow-*.egg
+	cd $(PILPATH) && rm -rf Pillow-*.egg
 else
 	cd $(PLATFORM); $(CROSSFLAGS) $(NATIVEPREFIX)/bin/python3 setup.py install --prefix=$(PREFIX)
 endif

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/01-fix-dependencies.patch Added

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/02-cross_compile.patch Added

@@ -0,0 +1,302 @@
+--- a/buildtools/wafsamba/samba_autoconf.py
++++ b/buildtools/wafsamba/samba_autoconf.py
+@@ -319,7 +319,7 @@
+ 
+ 
+ @conf
+-def CHECK_SIZEOF(conf, vars, headers=None, define=None, critical=True):
++def CHECK_SIZEOF(conf, vars, headers=None, define=None, cflags='', critical=True):
+     '''check the size of a type'''
+     for v in TO_LIST(vars):
+         v_define = define
+@@ -332,6 +332,7 @@
+                       define=v_define,
+                       quote=False,
+                       headers=headers,
++                      cflags=cflags,
+                       local_include=False,
+                       msg="Checking if size of %s == %d" % (v, size)):
+                 conf.DEFINE(v_define, size)
+@@ -828,7 +829,6 @@
+     for key in conf.env.define_key:
+         conf.undefine(key, from_env=False)
+     conf.env.define_key = []
+-    conf.SAMBA_CROSS_CHECK_COMPLETE()
+ 
+ 
+ @conf
+--- a/buildtools/wafsamba/samba_conftests.py
++++ b/buildtools/wafsamba/samba_conftests.py
+@@ -101,25 +101,24 @@
+                     else:
+                         conf.DEFINE(flag_split[0], flag_split[1])
+ 
+-    if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
+-                       define,
+-                       execute=True,
+-                       msg='Checking for large file support without additional flags'):
++    conf.undefine("SIZEOF_OFF_T")
++    conf.CHECK_SIZEOF("off_t")
++    if int(conf.get_define("SIZEOF_OFF_T")) >= 8:
++        conf.undefine("SIZEOF_OFF_T")
++        conf.DEFINE(define, 1)
+         return True
+ 
+-    if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
+-                       define,
+-                       execute=True,
+-                       cflags='-D_FILE_OFFSET_BITS=64',
+-                       msg='Checking for -D_FILE_OFFSET_BITS=64'):
++    conf.undefine("SIZEOF_OFF_T")
++    conf.CHECK_SIZEOF("off_t", cflags='-D_FILE_OFFSET_BITS=64')
++    if int(conf.get_define("SIZEOF_OFF_T")) >= 8:
++        conf.undefine("SIZEOF_OFF_T")
+         conf.DEFINE('_FILE_OFFSET_BITS', 64)
+         return True
+ 
+-    if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
+-                       define,
+-                       execute=True,
+-                       cflags='-D_LARGE_FILES',
+-                       msg='Checking for -D_LARGE_FILES'):
++    conf.undefine("SIZEOF_OFF_T")
++    conf.CHECK_SIZEOF("off_t", cflags='-D_LARGE_FILES')
++    if int(conf.get_define("SIZEOF_OFF_T")) >= 8:
++        conf.undefine("SIZEOF_OFF_T")
+         conf.DEFINE('_LARGE_FILES', 1)
+         return True
+     return False
+--- a/buildtools/wafsamba/wscript
++++ b/buildtools/wafsamba/wscript
+@@ -302,7 +302,7 @@
+     conf.CHECK_CODE('printf("hello world")',
+                     define='HAVE_SIMPLE_C_PROG',
+                     mandatory=True,
+-                    execute=True,
++                    execute=False,
+                     headers='stdio.h',
+                     msg='Checking simple C program')
+ 
+--- a/lib/replace/system/time.h
++++ b/lib/replace/system/time.h
+@@ -74,9 +74,6 @@
+ #endif
+ 
+ #ifndef HAVE_CLOCK_GETTIME
+-/* CLOCK_REALTIME is required by POSIX */
+-#define CLOCK_REALTIME 0
+-typedef int clockid_t;
+ int rep_clock_gettime(clockid_t clk_id, struct timespec *tp);
+ #endif
+ /* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on.
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -37,6 +37,7 @@
+     conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
+     conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
+     conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
++    conf.CHECK_FUNCS('nl_langinfo', headers='langinfo.h')
+     conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
+     conf.CHECK_HEADERS('shadow.h sys/acl.h')
+     conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
+@@ -679,7 +680,7 @@
+     conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
+                        #include "tests/strptime.c"''',
+                        define='HAVE_WORKING_STRPTIME',
+-                       execute=True,
++                       execute=False,
+                        addmain=False,
+                        msg='Checking for working strptime')
+ 
+@@ -694,7 +695,7 @@
+ 
+     conf.CHECK_CODE('#include "tests/snprintf.c"',
+                     define="HAVE_C99_VSNPRINTF",
+-                    execute=True,
++                    execute=False,
+                     addmain=False,
+                     msg="Checking for C99 vsnprintf")
+ 
+@@ -791,7 +792,7 @@
+                     exit(0);
+                     ''',
+                     define='HAVE_SECURE_MKSTEMP',
+-                    execute=True,
++                    execute=False,
+                     mandatory=True) # lets see if we get a mandatory failure for this one
+ 
+     # look for a method of finding the list of network interfaces
+@@ -803,6 +804,7 @@
+                            #define %s 1
+                            #define NO_CONFIG_H 1
+                            #define AUTOCONF_TEST 1
++                           #define __STDC_WANT_LIB_EXT1__ 1
+                            #include "replace.c"
+                            #include "inet_ntop.c"
+                            #include "snprintf.c"
+@@ -813,7 +815,7 @@
+                            method,
+                            lib='nsl socket' + bsd_for_strlcpy,
+                            addmain=False,
+-                           execute=True):
++                           execute=False):
+             break
+ 
+     conf.RECURSE('system')
+--- a/lib/socket/wscript
++++ b/lib/socket/wscript
+@@ -4,4 +4,5 @@
+     conf.CHECK_HEADERS('linux/sockios.h linux/ethtool.h')
+     if (conf.CONFIG_SET('HAVE_LINUX_SOCKIOS_H') and \
+                     conf.CONFIG_SET('HAVE_LINUX_ETHTOOL_H')):
+-        conf.DEFINE('HAVE_ETHTOOL', 1)
++        if conf.CHECK_FUNCS('ethtool_cmd_speed', headers='linux/sockios.h linux/ethtool.h'):
++            conf.DEFINE('HAVE_ETHTOOL', 1)
+--- a/source3/lib/util.c
++++ b/source3/lib/util.c
+@@ -82,6 +82,10 @@
+ #endif /* WITH_NISPLUS_HOME */
+ #endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */
+ 
++#ifndef YPERR_KEY
++#define YPERR_KEY 5
++#endif
++
+ static enum protocol_types Protocol = PROTOCOL_COREPLUS;
+ 
+ enum protocol_types get_Protocol(void)
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -137,7 +137,7 @@
+ 
+     # Check for inotify support (Skip if we are SunOS)
+     #NOTE: illumos provides sys/inotify.h but is not an exact match for linux
+-    host_os = sys.platform
++    host_os = os.getenv('HOST', sys.platform)
+     if host_os.rfind('sunos') == -1:
+         conf.CHECK_HEADERS('sys/inotify.h')
+         if conf.env.HAVE_SYS_INOTIFY_H:
+@@ -416,8 +416,8 @@
+ 
+     # FIXME: these should be tests for features, but the old build system just
+     # checks for OSes.
+-    host_os = sys.platform
+-    Logs.info("building on %s" % host_os)
++    host_os = os.getenv('HOST', sys.platform)
++    Logs.info("building for %s" % host_os)
+ 
+     # Python doesn't have case switches... :/
+     # FIXME: original was *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
+@@ -989,7 +989,7 @@
+                                 ''',
+                                 'USE_SETREUID',
+                                 addmain=False,
+-                                execute=True,
++                                execute=False,
+                                 msg="Checking whether setreuid is available")
+     if not seteuid:
+         seteuid = conf.CHECK_CODE('''
+@@ -1055,7 +1055,7 @@
+ ''',
+                 'HAVE_FCNTL_LOCK',
+                 addmain=False,
+-                execute=True,
++                execute=False,
+                 msg='Checking whether fcntl locking is available')
+ 
+     conf.CHECK_CODE('''
+--- a/tests/summary.c
++++ b/tests/summary.c
+@@ -9,7 +9,7 @@
+ #endif
+ 
+ #if !(defined(HAVE_IFACE_GETIFADDRS) || defined(HAVE_IFACE_IFCONF) || defined(HAVE_IFACE_IFREQ) || defined(HAVE_IFACE_AIX))
+-#warning "WARNING: No automated network interface determination"
++#error "ERROR: No automated network interface determination"
+ #endif
+ 
+ #if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX) || defined(HAVE_LINUX_THREAD_CREDENTIALS))
+--- a/third_party/popt/poptconfig.c
++++ b/third_party/popt/poptconfig.c
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_GLOB_H)
+ #include <glob.h>
+ 
+-#if defined(__LCLINT__)
++#if defined(HAVE_GLOB) && defined(__LCLINT__)
+ /*@-declundef -exportheader -incondefs -protoparammatch -redecl -type @*/
+ extern int glob (const char *__pattern, int __flags,
+ 		/*@null@*/ int (*__errfunc) (const char *, int),
+@@ -104,7 +104,7 @@
+     if (pat[0] == '@' && pat[1] != '(')
+ 	pat++;
+ 
+-#if defined(HAVE_GLOB_H)
++#if defined(HAVE_GLOB)
+     if (glob_pattern_p(pat, 0)) {
+ 	glob_t _g, *pglob = &_g;
+ 
+@@ -125,7 +125,7 @@
+ 	} else
+ 	    rc = POPT_ERROR_ERRNO;
+     } else
+-#endif	/* HAVE_GLOB_H */
++#endif	/* HAVE_GLOB */
+     {
+ 	if (acp)
+ 	    *acp = 1;
+--- a/third_party/popt/poptint.c
++++ b/third_party/popt/poptint.c
+@@ -86,7 +86,7 @@
+     if (istr == NULL)
+ 	return NULL;
+ 
+-#ifdef HAVE_LANGINFO_H
++#ifdef HAVE_NL_LANGINFO
+     codeset = nl_langinfo ((nl_item)CODESET);
+ #endif
+ 
+--- a/third_party/popt/poptint.h
++++ b/third_party/popt/poptint.h
+@@ -174,7 +174,7 @@
+ 
+ #ifdef HAVE_LANGINFO_H
+ #include <langinfo.h>
+-#if defined(__LCLINT__)
++#if defined(HAVE_NL_LANGINFO) && defined(__LCLINT__)
+ /*@-declundef -incondefs @*/
+ extern char *nl_langinfo (nl_item __item)
+ 	/*@*/;
+--- a/wscript
++++ b/wscript
+@@ -153,7 +153,7 @@
+     conf.SAMBA_CHECK_PYTHON()
+     conf.SAMBA_CHECK_PYTHON_HEADERS()
+ 
+-    if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
++    if os.getenv('HOST', sys.platform).find('darwin') > -1 and not conf.env['HAVE_ENVIRON_DECL']:
+         # Mac OSX needs to have this and it's also needed that the python is compiled with this
+         # otherwise you face errors about common symbols
+         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
+@@ -161,7 +161,7 @@
+         if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
+             conf.env.append_value('cshlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
+ 
+-    if sys.platform == 'darwin':
++    if os.getenv('HOST', sys.platform).find('darwin') > -1:
+         conf.ADD_LDFLAGS('-framework CoreFoundation')
+ 
+     conf.RECURSE('dynconfig')
+--- a/wscript_configure_embedded_heimdal
++++ b/wscript_configure_embedded_heimdal
+@@ -1 +1,10 @@
+ conf.RECURSE('source4/heimdal_build')
++
++def check_system_heimdal_binary(name):
++    if not conf.find_program(name, var=name.upper()):
++        raise Exception("not conf.find_program(%s, var=%s)" % (name, name.upper()))
++    conf.define('USING_SYSTEM_%s' % name.upper(), 1)
++    return True
++
++check_system_heimdal_binary("compile_et")
++check_system_heimdal_binary("asn1_compile")

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch Added

@@ -0,0 +1,45 @@
+--- a/lib/ldb/wscript
++++ b/lib/ldb/wscript
+@@ -518,10 +518,6 @@
+                          install=False)
+ 
+         bld.SAMBA_BINARY('ldb_key_value_sub_txn_tdb_test',
+-                         bld.SUBDIR('ldb_key_value',
+-                             '''ldb_kv_search.c
+-                                ldb_kv_index.c
+-                                ldb_kv_cache.c''') +
+                          'tests/ldb_key_value_sub_txn_test.c',
+                          cflags='-DTEST_BE=\"tdb\"',
+                          deps='cmocka ldb ldb_tdb_err_map',
+--- a/source4/heimdal_build/wscript_build
++++ b/source4/heimdal_build/wscript_build
+@@ -4,6 +4,7 @@
+ from waflib import Context
+ from samba_utils import SET_TARGET_TYPE
+ from samba_autoconf import CURRENT_CFLAGS
++from samba_bundled import BUILTIN_LIBRARY
+ from samba_utils import LOAD_ENVIRONMENT
+ 
+ def to_list(str):
+@@ -223,7 +224,10 @@
+ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
+     '''define a Heimdal library'''
+ 
+-    obj_target = libname + '.objlist'
++    if BUILTIN_LIBRARY(bld, libname):
++        obj_target = libname
++    else:
++        obj_target = libname + '.objlist'
+ 
+     # first create a target for building the object files for this library
+     # by separating in this way, we avoid recompiling the C files
+@@ -234,6 +238,9 @@
+                         includes       = includes,
+                         group          = 'main')
+ 
++    if BUILTIN_LIBRARY(bld, libname):
++        return
++
+     if not SET_TARGET_TYPE(bld, libname, "LIBRARY"):
+         return
+

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/04-built-static.patch Added

@@ -0,0 +1,52 @@
+--- a/buildtools/wafsamba/pkgconfig.py
++++ b/buildtools/wafsamba/pkgconfig.py
+@@ -60,6 +60,15 @@
+             t.env.LIB_RPATH = ''
+         if vnum:
+             t.env.PACKAGE_VERSION = vnum
++        LIBS_PRIVATE = []
++        REQUIRES_PRIVATE = []
++        for _target, _type in t.env['TARGET_TYPE'].items():
++            if _type == "SYSLIB" and 'LIB_' + _target.upper() in t.env:
++                LIBS_PRIVATE.append('-l%s' % _target)
++                if 'INCLUDES_' + _target.upper() in t.env and 'LIBPATH_' + _target.upper() in t.env and _target not in ['z']:
++                    REQUIRES_PRIVATE.append(_target)
++        t.env.LIBS_PRIVATE = ' '.join(LIBS_PRIVATE)
++        t.env.REQUIRES_PRIVATE = ' '.join(REQUIRES_PRIVATE)
+         for v in [ 'PREFIX', 'EXEC_PREFIX', 'LIB_RPATH' ]:
+             t.vars.append(t.env[v])
+         bld.INSTALL_FILES(dest, target, flat=True, destname=base)
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -241,7 +241,7 @@
+     if bld.env['ENABLE_RELRO'] is True:
+         ldflags.extend(TO_LIST('-Wl,-z,relro,-z,now'))
+ 
+-    features = 'c cshlib symlink_lib install_lib'
++    features = 'c cstlib'
+     if pyext:
+         features += ' pyext'
+     if pyembed:
+--- a/source3/libsmb/smbclient.pc.in
++++ b/source3/libsmb/smbclient.pc.in
+@@ -7,5 +7,7 @@
+ Description: A SMB library interface
+ Version: @PACKAGE_VERSION@
+ Libs: @LIB_RPATH@ -L${libdir} -lsmbclient
++Libs.private: @LIBS_PRIVATE@
++Requires.private: @REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+ URL: http://www.samba.org/
+--- a/source4/heimdal/lib/hcrypto/camellia-ntt.h
++++ b/source4/heimdal/lib/hcrypto/camellia-ntt.h
+@@ -35,6 +35,10 @@
+ 
+ typedef u32 KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN];
+ 
++/* symbol renaming */
++#define Camellia_Ekeygen hc_Camellia_Ekeygen
++#define Camellia_EncryptBlock hc_Camellia_EncryptBlock
++#define Camellia_DecryptBlock hc_Camellia_DecryptBlock
+ 
+ void Camellia_Ekeygen(const int keyBitLength,
+ 		      const unsigned char *rawKey,

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/Makefile Changed

@@ -1,41 +1,35 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile autotools41.patch configureEndian.patch samba_android.patch samba_off64_t.patch no_fork_and_exec.patch crt_extensions.patch
+DEPS= ../../Makefile.include Makefile 01-fix-dependencies.patch 02-cross_compile.patch 03-builtin-heimdal.patch 04-built-static.patch samba_android.patch no_fork_and_exec.patch crt_extensions.patch
 
 # lib name, version
 LIBNAME=samba
-VERSION=4.1.23
+VERSION=4.11.6
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
-ifeq ($(OS), darwin_embedded)
-ifeq ($(CPU), arm64)
-# clang issue with optimizing out functions
-CONFIGURE_EXTRAS= --without-libmsrpc samba_cv_optimize_out_funcation_calls=no ac_cv_func_yp_get_default_domain=no
-endif
-endif
-
-CONFIGURE= cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) \
+CONFIGURE=./configure --prefix=$(PREFIX) \
+          --cross-compile --cross-answers=cross-answers.txt \
           --without-cluster-support --without-ldap \
-          --without-pam --without-pam_smbpass --enable-fhs \
+          --without-pam --enable-fhs \
           --without-winbind --disable-cups --without-ads \
-          --disable-avahi \
+          --disable-avahi --without-gettext \
           --without-dnsupdate \
-          --without-acl-support \
-          --with-libiconv=$(STAGING_DIR)
+          --without-ad-dc --without-acl-support \
+          --without-utmp --disable-iprint \
+          --nopyc --nopyo \
+          --builtin-libraries=!smbclient,!smbd_base,!smbstatus,ALL \
+          --disable-python \
+          --disable-symbol-versions \
+          --without-json \
+          --without-libarchive \
+          --without-regedit
 
-# configuration settings
-# android does not really support LFS but we can force it
-# in libsmbclient by defining off_t to off64_t and changing
-# libsmbclient.h to match. Defining _OFF_T_DEFINED_ allows
-# us to change the typedef of off_t in android's sys/type.h.
-# Then xbmc will correctly access smb shares with LFS enabled
-# using the altered libsmbclient.h.
-ifeq ($(OS),android)
-export CFLAGS+=-DHAVE_BZERO
-endif
+LIBDYLIB=$(PLATFORM)/bin/default/source3/libsmb/libsmbclient.a
 
-LIBDYLIB=$(PLATFORM)/source3/bin/libsmbclient.a
+export CC CXX CPP AR RANLIB LD AS NM STRIP TOOLCHAIN
+export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+export HOST
+export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig
 
 all: .installed-$(PLATFORM)
 
@@ -45,38 +39,36 @@
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 -i ../autotools41.patch
-	cd $(PLATFORM); patch -p1 -i ../configureEndian.patch
-	cd $(PLATFORM); chmod +x source3/autogen.sh source3/script/*.sh librpc/build_idl.sh
-	cd $(PLATFORM)/source3; ./autogen.sh
+	cd $(PLATFORM); patch -p1 -i ../01-fix-dependencies.patch
+	cd $(PLATFORM); patch -p1 -i ../02-cross_compile.patch
+	cd $(PLATFORM); patch -p1 -i ../03-builtin-heimdal.patch
+	cd $(PLATFORM); patch -p1 -i ../04-built-static.patch
 ifeq ($(OS),android)
 	cd $(PLATFORM); patch -p1 -i ../samba_android.patch
-	cd $(PLATFORM); patch -p1 -i ../samba_off64_t.patch
 endif
 ifeq ($(OS), darwin_embedded)
 	cd $(PLATFORM); patch -p1 -i ../no_fork_and_exec.patch
 	cd $(PLATFORM); patch -p1 -i ../crt_extensions.patch
 endif
-ifeq (darwin, $(findstring darwin, $(HOST)))
-	sed -ie "s|ifndef HAVE_CLOCK_GETTIME|if !defined(HAVE_CLOCK_GETTIME) \&\& !defined(CLOCK_REALTIME)|" "$(PLATFORM)/lib/replace/system/time.h"
+	cd $(PLATFORM); $(CONFIGURE)
+ifeq ($(TARGET_PLATFORM), iphoneos)
+	# clock_gettime is only available since macOS 10.12, iOS 10.0 and tvOS 10.0
+	# build sytem doesn't include time.h for the check,
+	# so the version guards have no effect
+	sed -ie -E "s/#define (HAVE_(CLOCK_GETTIME|CLOCK_MONOTONIC|CLOCK_PROCESS_CPUTIME_ID|CLOCK_REALTIME)) 1/\/* #undef \1 *\//g" $(PLATFORM)/bin/default/include/config.h
 endif
-	cd $(PLATFORM)/source3; $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)/source3 libsmbclient
+	cd $(PLATFORM); WAF_MAKE=1 ./buildtools/bin/waf --targets=smbclient
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM)/source3 installlibsmbclient
-ifeq (darwin, $(findstring darwin, $(HOST)))
-	mv $(PREFIX)/lib/libsmbclient.dylib.0 $(PREFIX)/lib/libsmbclient.dylib
-	install_name_tool -id $(PREFIX)/lib/libsmbclient.dylib $(PREFIX)/lib/libsmbclient.dylib
-endif
+	cd $(PLATFORM); WAF_MAKE=1 ./buildtools/bin/waf install --targets=smbclient
+	install $(LIBDYLIB) $(PREFIX)/lib
 	touch $@
 
 clean:
-	$(MAKE) -C $(PLATFORM)/source3 clean
+	cd $(PLATFORM); WAF_MAKE=1 ./buildtools/bin/waf uninstall --targets=smbclient
 	rm -f .installed-$(PLATFORM)
 
 distclean::
 	rm -rf $(PLATFORM) .installed-$(PLATFORM)
-

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/autotools41.patch Deleted

@@ -1,36370 +0,0 @@
-From a5e3c1adf14742d87e794267968dd156ff1eaa32 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:19 +0200
-Subject: [PATCH 01/19] Revert "build: Build with system md5.h on OpenIndiana"
-
-This reverts commit fc13489c91e790ff8952aff1e7db1e6189894e30.
----
- auth/credentials/credentials_ntlm.c            | 2 +-
- auth/ntlmssp/ntlmssp_server.c                  | 2 +-
- auth/ntlmssp/ntlmssp_sign.c                    | 2 +-
- lib/crypto/hmacmd5.c                           | 4 ++--
- lib/crypto/hmacmd5.h                           | 2 +-
- lib/crypto/md5.c                               | 6 +++---
- lib/crypto/md5test.c                           | 2 +-
- lib/crypto/wscript_build                       | 2 +-
- libcli/auth/credentials.c                      | 2 +-
- libcli/auth/schannel_sign.c                    | 2 +-
- libcli/auth/smbencrypt.c                       | 8 ++++----
- libcli/drsuapi/repl_decrypt.c                  | 4 ++--
- libcli/smb/smb_signing.c                       | 2 +-
- source3/libsmb/ntlmssp.c                       | 2 +-
- source3/modules/vfs_streams_xattr.c            | 2 +-
- source3/rpc_client/init_samr.c                 | 2 +-
- source4/dsdb/samdb/ldb_modules/password_hash.c | 2 +-
- source4/libcli/raw/smb_signing.c               | 4 ++--
- source4/libnet/libnet_passwd.c                 | 4 ++--
- source4/ntp_signd/ntp_signd.c                  | 2 +-
- source4/rpc_server/samr/samr_password.c        | 2 +-
- source4/torture/ntp/ntp_signd.c                | 2 +-
- source4/torture/rpc/samba3rpc.c                | 2 +-
- source4/torture/rpc/samlogon.c                 | 2 +-
- source4/torture/rpc/samr.c                     | 8 ++++----
- 25 files changed, 37 insertions(+), 37 deletions(-)
-
-diff --git a/auth/credentials/credentials_ntlm.c b/auth/credentials/credentials_ntlm.c
-index 8f143bf..2d6d6f6 100644
---- a/auth/credentials/credentials_ntlm.c
-+++ b/auth/credentials/credentials_ntlm.c
-@@ -110,7 +110,7 @@ _PUBLIC_ NTSTATUS cli_credentials_get_ntlm_response(struct cli_credentials *cred
- 		/* LM Key is incompatible... */
- 		*flags &= ~CLI_CRED_LANMAN_AUTH;
- 	} else if (*flags & CLI_CRED_NTLM2) {
--		MD5_CTX md5_session_nonce_ctx;
-+		struct MD5Context md5_session_nonce_ctx;
- 		uint8_t session_nonce[16];
- 		uint8_t session_nonce_hash[16];
- 		uint8_t user_session_key[16];
-diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c
-index 57179e1..442bd5d 100644
---- a/auth/ntlmssp/ntlmssp_server.c
-+++ b/auth/ntlmssp/ntlmssp_server.c
-@@ -369,7 +369,7 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_security *gensec_security,
- 	*/
- 	if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
- 		if (ntlmssp_state->nt_resp.length == 24 && ntlmssp_state->lm_resp.length == 24) {
--			MD5_CTX md5_session_nonce_ctx;
-+			struct MD5Context md5_session_nonce_ctx;
- 			state->doing_ntlm2 = true;
- 
- 			memcpy(state->session_nonce, ntlmssp_state->internal_chal.data, 8);
-diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c
-index c0be914..4d07a81 100644
---- a/auth/ntlmssp/ntlmssp_sign.c
-+++ b/auth/ntlmssp/ntlmssp_sign.c
-@@ -51,7 +51,7 @@ static void calc_ntlmv2_key(uint8_t subkey[16],
- 			    DATA_BLOB session_key,
- 			    const char *constant)
- {
--	MD5_CTX ctx3;
-+	struct MD5Context ctx3;
- 	MD5Init(&ctx3);
- 	MD5Update(&ctx3, session_key.data, session_key.length);
- 	MD5Update(&ctx3, (const uint8_t *)constant, strlen(constant)+1);
-diff --git a/lib/crypto/hmacmd5.c b/lib/crypto/hmacmd5.c
-index 882788c..cfbd428 100644
---- a/lib/crypto/hmacmd5.c
-+++ b/lib/crypto/hmacmd5.c
-@@ -36,7 +36,7 @@ _PUBLIC_ void hmac_md5_init_rfc2104(const uint8_t *key, int key_len, HMACMD5Cont
-         /* if key is longer than 64 bytes reset it to key=MD5(key) */
-         if (key_len > 64)
- 	{
--                MD5_CTX tctx;
-+                struct MD5Context tctx;
- 
-                 MD5Init(&tctx);
-                 MD5Update(&tctx, key, key_len);
-@@ -91,7 +91,7 @@ _PUBLIC_ void hmac_md5_update(const uint8_t *text, int text_len, HMACMD5Context
- ***********************************************************************/
- _PUBLIC_ void hmac_md5_final(uint8_t *digest, HMACMD5Context *ctx)
- {
--        MD5_CTX ctx_o;
-+        struct MD5Context ctx_o;
- 
-         MD5Final(digest, &ctx->ctx);          
- 
-diff --git a/lib/crypto/hmacmd5.h b/lib/crypto/hmacmd5.h
-index aa43d24..91b8ca5 100644
---- a/lib/crypto/hmacmd5.h
-+++ b/lib/crypto/hmacmd5.h
-@@ -25,7 +25,7 @@
- 
- typedef struct 
- {
--        MD5_CTX ctx;
-+        struct MD5Context ctx;
-         uint8_t k_ipad[65];    
-         uint8_t k_opad[65];
- 
-diff --git a/lib/crypto/md5.c b/lib/crypto/md5.c
-index 352f80f..3af7f07 100644
---- a/lib/crypto/md5.c
-+++ b/lib/crypto/md5.c
-@@ -43,7 +43,7 @@ static void byteReverse(uint8_t *buf, unsigned int longs)
-  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-  * initialization constants.
-  */
--_PUBLIC_ void MD5Init(MD5_CTX *ctx)
-+_PUBLIC_ void MD5Init(struct MD5Context *ctx)
- {
-     ctx->buf[0] = 0x67452301;
-     ctx->buf[1] = 0xefcdab89;
-@@ -58,7 +58,7 @@ _PUBLIC_ void MD5Init(MD5_CTX *ctx)
-  * Update context to reflect the concatenation of another buffer full
-  * of bytes.
-  */
--_PUBLIC_ void MD5Update(MD5_CTX *ctx, const uint8_t *buf, size_t len)
-+_PUBLIC_ void MD5Update(struct MD5Context *ctx, const uint8_t *buf, size_t len)
- {
-     register uint32_t t;
- 
-@@ -106,7 +106,7 @@ _PUBLIC_ void MD5Update(MD5_CTX *ctx, const uint8_t *buf, size_t len)
-  * Final wrapup - pad to 64-byte boundary with the bit pattern 
-  * 1 0* (64-bit count of bits processed, MSB-first)
-  */
--_PUBLIC_ void MD5Final(uint8_t digest[16], MD5_CTX *ctx)
-+_PUBLIC_ void MD5Final(uint8_t digest[16], struct MD5Context *ctx)
- {
-     unsigned int count;
-     uint8_t *p;
-diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
-index f58e131..38626c3 100644
---- a/lib/crypto/md5test.c
-+++ b/lib/crypto/md5test.c
-@@ -65,7 +65,7 @@ bool torture_local_crypto_md5(struct torture_context *torture)
- 	};
- 
- 	for (i=0; i < ARRAY_SIZE(testarray); i++) {
--		MD5_CTX ctx;
-+		struct MD5Context ctx;
- 		uint8_t md5[16];
- 		int e;
- 
-diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
-index a1f29ae..e056f65 100644
---- a/lib/crypto/wscript_build
-+++ b/lib/crypto/wscript_build
-@@ -8,7 +8,7 @@ elif bld.CONFIG_SET('HAVE_SYS_MD5_H') and bld.CONFIG_SET('HAVE_LIBMD5'):
- 	extra_deps += ' md5'
- elif bld.CONFIG_SET('HAVE_SYS_MD5_H') and bld.CONFIG_SET('HAVE_LIBMD'):
- 	extra_deps += ' md'
--elif not bld.CONFIG_SET('HAVE_SYS_MD5_H') and not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'):
-+elif not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'):
- 	extra_source += ' md5.c'
- 
- bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
-diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c
-index fb77ede..cd098c9 100644
---- a/libcli/auth/credentials.c
-+++ b/libcli/auth/credentials.c
-@@ -79,7 +79,7 @@ static void netlogon_creds_init_128bit(struct netlogon_creds_CredentialState *cr
- {
- 	unsigned char zero[4], tmp[16];
- 	HMACMD5Context ctx;
--	MD5_CTX md5;
-+	struct MD5Context md5;
- 
- 	ZERO_STRUCT(creds->session_key);
- 
-diff --git a/libcli/auth/schannel_sign.c b/libcli/auth/schannel_sign.c
-index 1871da2..ebd8f1c 100644
---- a/libcli/auth/schannel_sign.c
-+++ b/libcli/auth/schannel_sign.c
-@@ -193,7 +193,7 @@ static void netsec_do_sign(struct schannel_state *state,
- 	} else {
- 		uint8_t packet_digest[16];
- 		static const uint8_t zeros[4];
--		MD5_CTX ctx;
-+		struct MD5Context ctx;
- 
- 		MD5Init(&ctx);
- 		MD5Update(&ctx, zeros, 4);
-diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
-index ec819cd..372ef01 100644
---- a/libcli/auth/smbencrypt.c
-+++ b/libcli/auth/smbencrypt.c
-@@ -99,7 +99,7 @@ bool E_md4hash(const char *passwd, uint8_t p16[16])
- 
- void E_md5hash(const uint8_t salt[16], const uint8_t nthash[16], uint8_t hash_out[16])
- {
--	MD5_CTX tctx;
-+	struct MD5Context tctx;
- 	MD5Init(&tctx);
- 	MD5Update(&tctx, salt, 16);
- 	MD5Update(&tctx, nthash, 16);
-@@ -637,7 +637,7 @@ bool decode_pw_buffer(TALLOC_CTX *ctx,
- 
- void encode_or_decode_arc4_passwd_buffer(unsigned char pw_buf[532], const DATA_BLOB *psession_key)
- {
--	MD5_CTX tctx;
-+	struct MD5Context tctx;
- 	unsigned char key_out[16];
- 
- 	/* Confounder is last 16 bytes. */
-@@ -717,7 +717,7 @@ void encode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
- 					struct wkssvc_PasswordBuffer **pwd_buf)
- {
- 	uint8_t buffer[516];
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	struct wkssvc_PasswordBuffer *my_pwd_buf = NULL;
- 	DATA_BLOB confounded_session_key;
- 	int confounder_len = 8;
-@@ -755,7 +755,7 @@ WERROR decode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
- 					  char **pwd)
- {
- 	uint8_t buffer[516];
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	size_t pwd_len;
- 
- 	DATA_BLOB confounded_session_key;
-diff --git a/libcli/drsuapi/repl_decrypt.c b/libcli/drsuapi/repl_decrypt.c
-index 00b8db8..6fff2fe 100644
---- a/libcli/drsuapi/repl_decrypt.c
-+++ b/libcli/drsuapi/repl_decrypt.c
-@@ -39,7 +39,7 @@ WERROR drsuapi_decrypt_attribute_value(TALLOC_CTX *mem_ctx,
- 	DATA_BLOB confounder;
- 	DATA_BLOB enc_buffer;
- 
--	MD5_CTX md5;
-+	struct MD5Context md5;
- 	uint8_t _enc_key[16];
- 	DATA_BLOB enc_key;
- 
-@@ -198,7 +198,7 @@ static WERROR drsuapi_encrypt_attribute_value(TALLOC_CTX *mem_ctx,
- 	DATA_BLOB rid_crypt_out = data_blob(NULL, 0);
- 	DATA_BLOB confounder;
- 
--	MD5_CTX md5;
-+	struct MD5Context md5;
- 	uint8_t _enc_key[16];
- 	DATA_BLOB enc_key;
- 
-diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
-index fa61aa8..95c9c27 100644
---- a/libcli/smb/smb_signing.c
-+++ b/libcli/smb/smb_signing.c
-@@ -146,7 +146,7 @@ static void smb_signing_md5(const DATA_BLOB *mac_key,
- {
- 	const size_t offset_end_of_sig = (HDR_SS_FIELD + 8);
- 	uint8_t sequence_buf[8];
--	MD5_CTX md5_ctx;
-+	struct MD5Context md5_ctx;
- 
- 	/*
- 	 * Firstly put the sequence number into the first 4 bytes.
-diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
-index e661aeb..48d1bcd 100644
---- a/source3/libsmb/ntlmssp.c
-+++ b/source3/libsmb/ntlmssp.c
-@@ -581,7 +581,7 @@ static NTSTATUS ntlmssp3_client_challenge(struct ntlmssp_state *ntlmssp_state,
- 			return NT_STATUS_NO_MEMORY;
- 		}
- 	} else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
--		MD5_CTX md5_session_nonce_ctx;
-+		struct MD5Context md5_session_nonce_ctx;
- 		uint8_t session_nonce[16];
- 		uint8_t session_nonce_hash[16];
- 		uint8_t user_session_key[16];
-diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
-index 0409c05..512fbfa 100644
---- a/source3/modules/vfs_streams_xattr.c
-+++ b/source3/modules/vfs_streams_xattr.c
-@@ -39,7 +39,7 @@ struct stream_io {
- 
- static SMB_INO_T stream_inode(const SMB_STRUCT_STAT *sbuf, const char *sname)
- {
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
-         unsigned char hash[16];
- 	SMB_INO_T result;
- 	char *upper_sname;
-diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
-index 7f1a229..e3bb301 100644
---- a/source3/rpc_client/init_samr.c
-+++ b/source3/rpc_client/init_samr.c
-@@ -34,7 +34,7 @@ void init_samr_CryptPasswordEx(const char *pwd,
- 	/* samr_CryptPasswordEx */
- 
- 	uchar pwbuf[532];
--	MD5_CTX md5_ctx;
-+	struct MD5Context md5_ctx;
- 	uint8_t confounder[16];
- 	DATA_BLOB confounded_session_key = data_blob(NULL, 16);
- 
-diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
-index 78311c6..fb71ebc 100644
---- a/source4/dsdb/samdb/ldb_modules/password_hash.c
-+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
-@@ -1368,7 +1368,7 @@ static int setup_primary_wdigest(struct setup_password_fields_io *io,
- 	}
- 
- 	for (i=0; i < ARRAY_SIZE(wdigest); i++) {
--		MD5_CTX md5;
-+		struct MD5Context md5;
- 		MD5Init(&md5);
- 		if (wdigest[i].nt4dom) {
- 			MD5Update(&md5, wdigest[i].nt4dom->data, wdigest[i].nt4dom->length);
-diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
-index 405efab..5d2f928 100644
---- a/source4/libcli/raw/smb_signing.c
-+++ b/source4/libcli/raw/smb_signing.c
-@@ -81,7 +81,7 @@ bool signing_good(struct smb_signing_context *sign_info,
- void sign_outgoing_message(struct smb_request_buffer *out, DATA_BLOB *mac_key, unsigned int seq_num) 
- {
- 	uint8_t calc_md5_mac[16];
--	MD5_CTX md5_ctx;
-+	struct MD5Context md5_ctx;
- 
- 	/*
- 	 * Firstly put the sequence number into the first 4 bytes.
-@@ -116,7 +116,7 @@ bool check_signed_incoming_message(struct smb_request_buffer *in, DATA_BLOB *mac
- 	uint8_t calc_md5_mac[16];
- 	uint8_t *server_sent_mac;
- 	uint8_t sequence_buf[8];
--	MD5_CTX md5_ctx;
-+	struct MD5Context md5_ctx;
- 	const size_t offset_end_of_sig = (HDR_SS_FIELD + 8);
- 	int i;
- 	const int sign_range = 0;
-diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
-index 77176bc..4b5b0f8 100644
---- a/source4/libnet/libnet_passwd.c
-+++ b/source4/libnet/libnet_passwd.c
-@@ -274,7 +274,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_26(struct libnet_context *ctx, TA
- 	DATA_BLOB session_key;
- 	DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
- 	uint8_t confounder[16];	
--	MD5_CTX md5;
-+	struct MD5Context md5;
- 
- 	if (r->samr_handle.in.info21) {
- 		return NT_STATUS_INVALID_PARAMETER_MIX;
-@@ -330,7 +330,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_25(struct libnet_context *ctx, TA
- 	DATA_BLOB session_key;
- 	DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
- 	uint8_t confounder[16];	
--	MD5_CTX md5;
-+	struct MD5Context md5;
- 
- 	if (!r->samr_handle.in.info21) {
- 		return NT_STATUS_INVALID_PARAMETER_MIX;
-diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
-index 53c34ed..d1d8483 100644
---- a/source4/ntp_signd/ntp_signd.c
-+++ b/source4/ntp_signd/ntp_signd.c
-@@ -109,7 +109,7 @@ static NTSTATUS ntp_signd_process(struct ntp_signd_connection *ntp_signd_conn,
- 	enum ndr_err_code ndr_err;
- 	struct ldb_result *res;
- 	const char *attrs[] = { "unicodePwd", "userAccountControl", "cn", NULL };
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	struct samr_Password *nt_hash;
- 	uint32_t user_account_control;
- 	int ret;
-diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
-index 685a8e7..ac7d473 100644
---- a/source4/rpc_server/samr/samr_password.c
-+++ b/source4/rpc_server/samr/samr_password.c
-@@ -434,7 +434,7 @@ NTSTATUS samr_set_password_ex(struct dcesrv_call_state *dce_call,
- 	DATA_BLOB new_password;
- 	DATA_BLOB co_session_key;
- 	DATA_BLOB session_key = data_blob(NULL, 0);
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 
- 	nt_status = dcesrv_fetch_session_key(dce_call->conn, &session_key);
- 	if (!NT_STATUS_IS_OK(nt_status)) {
-diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c
-index 5f097fe..86a5d69 100644
---- a/source4/torture/ntp/ntp_signd.c
-+++ b/source4/torture/ntp/ntp_signd.c
-@@ -78,7 +78,7 @@ static bool test_ntp_signd(struct torture_context *tctx,
- 	char *unix_address;
- 	int sys_errno;
- 
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	uint8_t sig[16];
- 	enum ndr_err_code ndr_err;
- 	bool ok;
-diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
-index 6b9666b..3760050 100644
---- a/source4/torture/rpc/samba3rpc.c
-+++ b/source4/torture/rpc/samba3rpc.c
-@@ -780,7 +780,7 @@ static bool join3(struct torture_context *tctx,
- 		DATA_BLOB session_key;
- 		DATA_BLOB confounded_session_key = data_blob_talloc(
- 			mem_ctx, NULL, 16);
--		MD5_CTX ctx;
-+		struct MD5Context ctx;
- 		uint8_t confounder[16];
- 
- 		ZERO_STRUCT(u_info);
-diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
-index 4861038..bd85c22 100644
---- a/source4/torture/rpc/samlogon.c
-+++ b/source4/torture/rpc/samlogon.c
-@@ -1083,7 +1083,7 @@ static bool test_ntlm2(struct samlogon_state *samlogon_state, char **error_strin
- 	uint8_t session_nonce_hash[16];
- 	uint8_t client_chall[8];
- 
--	MD5_CTX md5_session_nonce_ctx;
-+	struct MD5Context md5_session_nonce_ctx;
- 	HMACMD5Context hmac_ctx;
- 
- 	ZERO_STRUCT(user_session_key);
-diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
-index e7e98a5..4e736d7 100644
---- a/source4/torture/rpc/samr.c
-+++ b/source4/torture/rpc/samr.c
-@@ -781,7 +781,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc
- 	uint8_t confounder[16];
- 	char *newpass;
- 	struct dcerpc_binding_handle *b = p->binding_handle;
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	struct samr_GetUserPwInfo pwp;
- 	struct samr_PwInfo info;
- 	int policy_min_pw_len = 0;
-@@ -872,7 +872,7 @@ static bool test_SetUserPass_25(struct dcerpc_pipe *p, struct torture_context *t
- 	bool ret = true;
- 	DATA_BLOB session_key;
- 	DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	uint8_t confounder[16];
- 	char *newpass;
- 	struct dcerpc_binding_handle *b = p->binding_handle;
-@@ -1162,7 +1162,7 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
- 	bool ret = true;
- 	DATA_BLOB session_key;
- 	DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 	uint8_t confounder[16];
- 	char *newpass;
- 	struct dcerpc_binding_handle *b = p->binding_handle;
-@@ -2569,7 +2569,7 @@ bool test_ChangePasswordRandomBytes(struct dcerpc_pipe *p, struct torture_contex
- 	DATA_BLOB session_key;
- 	DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
- 	uint8_t confounder[16];
--	MD5_CTX ctx;
-+	struct MD5Context ctx;
- 
- 	bool ret = true;
- 	struct lsa_String server, account;
-
-From ef0c113004c85ae501ab6be7186050fa53487f91 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:19 +0200
-Subject: [PATCH 02/19] Revert "build: Remove unused mkbuildoptions.awk"
-
-This reverts commit 667651132b9136e1ad9d7dc5f44dd86c66907e70.
----
- source3/script/mkbuildoptions.awk | 275 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 275 insertions(+)
- create mode 100644 source3/script/mkbuildoptions.awk
-
-diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
-new file mode 100644
-index 0000000..1a32d7a
---- /dev/null
-+++ b/source3/script/mkbuildoptions.awk
-@@ -0,0 +1,275 @@
-+BEGIN {
-+	print "/* ";
-+	print "   Unix SMB/CIFS implementation.";
-+	print "   Build Options for Samba Suite";
-+	print "   Copyright (C) Vance Lankhaar <vlankhaar@linux.ca> 2003";
-+	print "   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2001";
-+	print "   ";
-+	print "   This program is free software; you can redistribute it and/or modify";
-+	print "   it under the terms of the GNU General Public License as published by";
-+	print "   the Free Software Foundation; either version 3 of the License, or";
-+	print "   (at your option) any later version.";
-+	print "   ";
-+	print "   This program is distributed in the hope that it will be useful,";
-+	print "   but WITHOUT ANY WARRANTY; without even the implied warranty of";
-+	print "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the";
-+	print "   GNU General Public License for more details.";
-+	print "   ";
-+	print "   You should have received a copy of the GNU General Public License";
-+	print "   along with this program; if not, see <http://www.gnu.org/licenses/>."
-+	print "*/";
-+	print "";
-+	print "#include \"includes.h\"";
-+	print "#include \"build_env.h\"";
-+	print "#include \"dynconfig/dynconfig.h\"";
-+	print "";
-+	print "static int output(bool screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);";
-+	print "void build_options(bool screen);";
-+	print "";
-+	print "";
-+	print "/****************************************************************************";
-+	print "helper function for build_options";
-+	print "****************************************************************************/";
-+	print "static int output(bool screen, const char *format, ...)";
-+	print "{";
-+	print "       char *ptr = NULL;";
-+	print "       int ret = 0;";
-+	print "       va_list ap;";
-+	print "       ";
-+	print "       va_start(ap, format);";
-+	print "       ret = vasprintf(&ptr,format,ap);";
-+	print "       va_end(ap);";
-+	print "";
-+	print "       if (screen) {";
-+	print "              d_printf(\"%s\", ptr ? ptr : \"\");";
-+	print "       } else {";
-+	print "	       DEBUG(4,(\"%s\", ptr ? ptr : \"\"));";
-+	print "       }";
-+	print "       ";
-+	print "       SAFE_FREE(ptr);";
-+	print "       return ret;";
-+	print "}";
-+	print "";
-+	print "/****************************************************************************";
-+	print "options set at build time for the samba suite";
-+	print "****************************************************************************/";
-+	print "void build_options(bool screen)";
-+	print "{";
-+	print "       if ((DEBUGLEVEL < 4) && (!screen)) {";
-+	print "	       return;";
-+	print "       }";
-+	print "";
-+	print "#ifdef _BUILD_ENV_H";
-+	print "       /* Output information about the build environment */";
-+	print "       output(screen,\"Build environment:\\n\");";
-+	print "       output(screen,\"   Built by:    %s@%s\\n\",BUILD_ENV_USER,BUILD_ENV_HOST);";
-+	print "       output(screen,\"   Built on:    %s\\n\",BUILD_ENV_DATE);";
-+	print "";
-+	print "       output(screen,\"   Built using: %s\\n\",BUILD_ENV_COMPILER);";
-+	print "       output(screen,\"   Build host:  %s\\n\",BUILD_ENV_UNAME);";
-+	print "       output(screen,\"   SRCDIR:      %s\\n\",BUILD_ENV_SRCDIR);";
-+	print "       output(screen,\"   BUILDDIR:    %s\\n\",BUILD_ENV_BUILDDIR);";
-+	print "";
-+	print "     ";  
-+	print "#endif";
-+	print "";
-+
-+	print "       /* Output various paths to files and directories */";
-+	print "       output(screen,\"\\nPaths:\\n\");";
-+
-+	print "       output(screen,\"   SBINDIR: %s\\n\", get_dyn_SBINDIR());";
-+	print "       output(screen,\"   BINDIR: %s\\n\", get_dyn_BINDIR());";
-+
-+	print "       output(screen,\"   CONFIGFILE: %s\\n\", get_dyn_CONFIGFILE());";
-+	print "       output(screen,\"   LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());";
-+	print "       output(screen,\"   LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());";
-+
-+	print "       output(screen,\"   LIBDIR: %s\\n\",get_dyn_LIBDIR());";
-+	print "       output(screen,\"   MODULESDIR: %s\\n\",get_dyn_MODULESDIR());";
-+	print "       output(screen,\"   SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());";
-+
-+	print "       output(screen,\"   LOCKDIR: %s\\n\",get_dyn_LOCKDIR());";
-+	print "       output(screen,\"   STATEDIR: %s\\n\",get_dyn_STATEDIR());";
-+	print "       output(screen,\"   CACHEDIR: %s\\n\",get_dyn_CACHEDIR());";
-+	print "       output(screen,\"   PIDDIR: %s\\n\", get_dyn_PIDDIR());";
-+
-+	print "       output(screen,\"   SMB_PASSWD_FILE: %s\\n\",get_dyn_SMB_PASSWD_FILE());";
-+	print "       output(screen,\"   PRIVATE_DIR: %s\\n\",get_dyn_PRIVATE_DIR());";
-+	print "       output(screen,\"   NCALRPCDIR: %s\\n\",get_dyn_NCALRPCDIR());";
-+	print "       output(screen,\"   NMBDSOCKETDIR: %s\\n\",get_dyn_NMBDSOCKETDIR());";
-+	print "";
-+
-+
-+##################################################
-+# predefine first element of *_ary
-+# predefine *_i (num of elements in *_ary)
-+	with_ary[0]="";
-+	with_i=0;
-+	have_ary[0]="";
-+	have_i=0;
-+	utmp_ary[0]="";
-+	utmp_i=0;
-+	misc_ary[0]="";
-+	misc_i=0;
-+	sys_ary[0]="";
-+	sys_i=0;
-+	headers_ary[0]="";
-+	headers_i=0;
-+	in_comment = 0;
-+}
-+
-+# capture single line comments
-+/^\/\* (.*?)\*\// {
-+	last_comment = $0;
-+	next;
-+}
-+
-+# end capture multi-line comments
-+/(.*?)\*\// {
-+	last_comment = last_comment $0; 
-+	in_comment = 0;
-+	next;
-+}
-+
-+# capture middle lines of multi-line comments
-+in_comment {
-+	last_comment = last_comment $0; 
-+	next;
-+}
-+
-+# begin capture multi-line comments
-+/^\/\* (.*?)/ {
-+	last_comment = $0;
-+	in_comment = 1;
-+	next
-+}
-+
-+##################################################
-+# if we have an #undef and a last_comment, store it
-+/^\#undef/ {
-+	split($0,a);
-+	comments_ary[a[2]] = last_comment;
-+	last_comment = "";
-+}
-+
-+##################################################
-+# for each line, sort into appropriate section
-+# then move on
-+
-+/^\#undef WITH/ {
-+	with_ary[with_i++] = a[2];
-+	# we want (I think) to allow --with to show up in more than one place, so no next
-+}
-+
-+
-+/^\#undef HAVE_UT_UT_/ || /^\#undef .*UTMP/ {
-+	utmp_ary[utmp_i++] = a[2];
-+	next;
-+}
-+
-+/^\#undef HAVE_SYS_.*?_H$/ {
-+	sys_ary[sys_i++] = a[2];
-+	next;
-+}
-+
-+/^\#undef HAVE_.*?_H$/ {
-+	headers_ary[headers_i++] = a[2];
-+	next;
-+}
-+
-+/^\#undef HAVE_/ {
-+	have_ary[have_i++] = a[2];
-+	next;
-+}
-+
-+/^\#undef/ {
-+	misc_ary[misc_i++] = a[2];
-+	next;
-+}
-+
-+
-+##################################################
-+# simple sort function
-+function sort(ARRAY, ELEMENTS) {
-+        for (i = 1; i <= ELEMENTS; ++i) {
-+                for (j = i; (j-1) in ARRAY && (j) in ARRAY && ARRAY[j-1] > ARRAY[j]; --j) {
-+                        temp = ARRAY[j];
-+			ARRAY[j] = ARRAY[j-1];
-+			ARRAY[j-1] = temp;
-+		}
-+        }
-+	return;
-+}    
-+
-+
-+##################################################
-+# output code from list of defined
-+# expects: ARRAY     an array of things defined
-+#          ELEMENTS  number of elements in ARRAY
-+#          TITLE     title for section
-+# returns: nothing 
-+function output(ARRAY, ELEMENTS, TITLE) {
-+	
-+	# add section header
-+	print "\n\t/* Show " TITLE " */";
-+	print "\toutput(screen, \"\\n " TITLE ":\\n\");\n";
-+	
-+
-+	# sort element using bubble sort (slow, but easy)
-+	sort(ARRAY, ELEMENTS);
-+
-+	# loop through array of defines, outputting code
-+	for (i = 0; i < ELEMENTS; i++) {
-+		print "#ifdef " ARRAY[i];
-+		
-+		# I don't know which one to use....
-+		
-+		print "\toutput(screen, \"   " ARRAY[i] "\\n\");";
-+		#printf "\toutput(screen, \"   %s\\n   %s\\n\\n\");\n", comments_ary[ARRAY[i]], ARRAY[i];
-+		#printf "\toutput(screen, \"   %-35s   %s\\n\");\n", ARRAY[i], comments_ary[ARRAY[i]];
-+
-+		print "#endif";
-+	}
-+	return;
-+}
-+
-+END {
-+	##################################################
-+	# add code to show various options
-+	print "/* Output various other options (as gleaned from include/autoconf/config.h.in) */";
-+	output(sys_ary,     sys_i,     "System Headers");
-+	output(headers_ary, headers_i, "Headers");
-+	output(utmp_ary,    utmp_i,    "UTMP Options");
-+	output(have_ary,    have_i,    "HAVE_* Defines");
-+	output(with_ary,    with_i,    "--with Options");
-+	output(misc_ary,    misc_i,    "Build Options");
-+
-+	##################################################
-+	# add code to display the various type sizes
-+	print "       /* Output the sizes of the various types */";
-+	print "       output(screen, \"\\nType sizes:\\n\");";
-+	print "       output(screen, \"   sizeof(char):         %lu\\n\",(unsigned long)sizeof(char));";
-+	print "       output(screen, \"   sizeof(int):          %lu\\n\",(unsigned long)sizeof(int));";
-+	print "       output(screen, \"   sizeof(long):         %lu\\n\",(unsigned long)sizeof(long));";
-+	print "#if HAVE_LONGLONG"
-+	print "       output(screen, \"   sizeof(long long):    %lu\\n\",(unsigned long)sizeof(long long));";
-+	print "#endif"
-+	print "       output(screen, \"   sizeof(uint8):        %lu\\n\",(unsigned long)sizeof(uint8));";
-+	print "       output(screen, \"   sizeof(uint16):       %lu\\n\",(unsigned long)sizeof(uint16));";
-+	print "       output(screen, \"   sizeof(uint32):       %lu\\n\",(unsigned long)sizeof(uint32));";
-+	print "       output(screen, \"   sizeof(short):        %lu\\n\",(unsigned long)sizeof(short));";
-+	print "       output(screen, \"   sizeof(void*):        %lu\\n\",(unsigned long)sizeof(void*));";
-+	print "       output(screen, \"   sizeof(size_t):       %lu\\n\",(unsigned long)sizeof(size_t));";
-+	print "       output(screen, \"   sizeof(off_t):        %lu\\n\",(unsigned long)sizeof(off_t));";
-+	print "       output(screen, \"   sizeof(ino_t):        %lu\\n\",(unsigned long)sizeof(ino_t));";
-+	print "       output(screen, \"   sizeof(dev_t):        %lu\\n\",(unsigned long)sizeof(dev_t));";
-+
-+	##################################################
-+	# add code to give information about modules
-+	print "       output(screen, \"\\nBuiltin modules:\\n\");";
-+	print "       output(screen, \"   %s\\n\", STRING_STATIC_MODULES);";
-+
-+	print "}";
-+
-+}
-+
-
-From d121957c56aeaf77fc2956faf803be78305b7de3 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 03/19] Revert "build: Remove feature tests for variables now
- always provided"
-
-This reverts commit 4c4520ac3794f917c831255d6598945712bcfb5c.
----
- dynconfig/dynconfig.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
-index 5f67278..9fd7108 100644
---- a/dynconfig/dynconfig.c
-+++ b/dynconfig/dynconfig.c
-@@ -106,8 +106,19 @@ DEFINE_DYN_CONFIG_PARAM(DATADIR)
- DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
- DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */
- 
-+/* these are not used in s3 */
-+#ifdef WINBINDD_PRIVILEGED_SOCKET_DIR
- DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
-+#endif
-+#ifdef NTP_SIGND_SOCKET_DIR
- DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
-+#endif
-+#ifdef PYTHONDIR
- DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
-+#endif
-+#ifdef PYTHONARCHDIR
- DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
-+#endif
-+#ifdef SCRIPTSBINDIR
- DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
-+#endif
-
-From 2bbf3c204cfbbcad66b2888436bf068781991f76 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 04/19] Revert "build: Remove unused credentials_samba3.c"
-
-This reverts commit dc6b03ffa55968708576cb527f1b52a37d8e5317.
----
- auth/credentials/credentials_samba3.c | 49 +++++++++++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
- create mode 100644 auth/credentials/credentials_samba3.c
-
-diff --git a/auth/credentials/credentials_samba3.c b/auth/credentials/credentials_samba3.c
-new file mode 100644
-index 0000000..d742a0a
---- /dev/null
-+++ b/auth/credentials/credentials_samba3.c
-@@ -0,0 +1,49 @@
-+/*
-+   Unix SMB/CIFS implementation.
-+
-+   Handle user credentials (shim to allow samba3 to build)
-+
-+   Copyright (C) Andrew Bartlett <abartlet@samba.org> 2011
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include "includes.h"
-+#include "auth/credentials/credentials.h"
-+
-+/* These dummy functions are required only to allow the rest of the
-+ * code to compile when we are in the s3 autoconf build system */
-+
-+_PUBLIC_ void cli_credentials_invalidate_ccache(struct cli_credentials *cred,
-+				       enum credentials_obtained obtained)
-+{
-+	return;
-+}
-+
-+_PUBLIC_ int cli_credentials_set_ccache(struct cli_credentials *cred,
-+					struct loadparm_context *lp_ctx,
-+					const char *name,
-+					enum credentials_obtained obtained,
-+					const char **error_string)
-+{
-+	DEBUG(0, ("cli_credentials_set_ccache is unimplemented in the autoconf build\n"));
-+	return EINVAL;
-+}
-+
-+_PUBLIC_ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred,
-+						      struct loadparm_context *lp_ctx)
-+{
-+	DEBUG(0, ("cli_credentials_set_machine_account is unimplemented in the autoconf build\n"));
-+	return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-+}
-
-From 6b2b6b356fcc21ae98ac4263356989c5f6e09d73 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 05/19] Revert "build: Remove autoconf build system from
- examples/VFS"
-
-This reverts commit cbddf9e2efd856a25c6405f6893ad3a9cda1b181.
----
- examples/VFS/Makefile.in  |   72 ++
- examples/VFS/autogen.sh   |   63 ++
- examples/VFS/config.guess | 1561 +++++++++++++++++++++++++++++++++++++++++
- examples/VFS/config.sub   | 1686 +++++++++++++++++++++++++++++++++++++++++++++
- examples/VFS/configure.in |  357 ++++++++++
- examples/VFS/install-sh   |  238 +++++++
- 6 files changed, 3977 insertions(+)
- create mode 100644 examples/VFS/Makefile.in
- create mode 100755 examples/VFS/autogen.sh
- create mode 100755 examples/VFS/config.guess
- create mode 100755 examples/VFS/config.sub
- create mode 100644 examples/VFS/configure.in
- create mode 100644 examples/VFS/install-sh
-
-diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in
-new file mode 100644
-index 0000000..ba41923
---- /dev/null
-+++ b/examples/VFS/Makefile.in
-@@ -0,0 +1,72 @@
-+CC		= @CC@
-+CFLAGS		= @CFLAGS@
-+CPPFLAGS	= @CPPFLAGS@
-+LDFLAGS		= @LDFLAGS@
-+LDSHFLAGS	= @LDSHFLAGS@
-+INSTALLCMD	= @INSTALL@
-+SAMBA_SOURCE	= @SAMBA_SOURCE@
-+SHLIBEXT	= @SHLIBEXT@
-+OBJEXT		= @OBJEXT@ 
-+FLAGS		=  $(CFLAGS) $(CPPFLAGS) -fPIC \
-+		-Iinclude -I$(SAMBA_SOURCE)/include \
-+		-I$(SAMBA_SOURCE)/include/autoconf \
-+		-I$(SAMBA_SOURCE)/autoconf \
-+		-I$(SAMBA_SOURCE)/../popt  \
-+		-I$(SAMBA_SOURCE)/../lib/replace  \
-+		-I$(SAMBA_SOURCE)/../lib/talloc  \
-+		-I$(SAMBA_SOURCE)/../lib/tevent  \
-+		-I$(SAMBA_SOURCE)/../lib/tdb/include  \
-+		-I$(SAMBA_SOURCE)/librpc \
-+		-I$(SAMBA_SOURCE)/../librpc \
-+		-I$(SAMBA_SOURCE)/../ \
-+		-I$(SAMBA_SOURCE) -I.
-+
-+
-+prefix		= @prefix@
-+libdir		= @libdir@
-+
-+VFS_LIBDIR	= $(libdir)/vfs
-+
-+# Note, if make fails, it might be because your version of make does not
-+# support what we need. Try installing GNU make and rerun make.
-+#
-+# Note also, that if your module requires more than one object file to be
-+# linked in you will have to modify Makefile.in to accommodate your needs and
-+# then rerun configure before you can build.
-+
-+# Change these targets to the names of your modules if building out of tree
-+MODULES		= skel_opaque.@SHLIBEXT@ shadow_copy_test.@SHLIBEXT@ \
-+		skel_transparent.@SHLIBEXT@
-+
-+all: $(MODULES)
-+
-+# Pattern rules
-+
-+.SUFFIXES: .@SHLIBEXT@
-+
-+# You might need to create an explicit rule for your shared object if your
-+# shared object is built from multiple .c files.
-+
-+.c.@SHLIBEXT@:
-+	@echo "Compiling $<"
-+	@$(CC) $(FLAGS) -c $< -D$*_init=samba_init_module
-+	@echo "Linking $@"
-+	@$(CC) $(LDSHFLAGS) $(LDFLAGS) $*.@OBJEXT@ -o $*.@SHLIBEXT@
-+
-+# You might need to uncomment this if you have other .c files to compile
-+#.c.@OBJEXT@:
-+#	@echo "Compiling $<"
-+#	@$(CC) $(FLAGS) -c $< -D$*_init=samba_init_module
-+
-+install: default
-+	$(INSTALLCMD) -d $(VFS_LIBDIR)
-+	$(INSTALLCMD) -m 755 *.$(SHLIBEXT) $(VFS_LIBDIR)
-+
-+# Misc targets
-+clean:
-+	rm -rf .libs
-+	rm -f core *~ *% *.bak *.o *.$(SHLIBEXT)
-+
-+distclean: clean
-+	rm -f config.status config.cache Makefile
-+
-diff --git a/examples/VFS/autogen.sh b/examples/VFS/autogen.sh
-new file mode 100755
-index 0000000..8c6c909
---- /dev/null
-+++ b/examples/VFS/autogen.sh
-@@ -0,0 +1,63 @@
-+#!/bin/sh
-+
-+# Run this script to build samba from SVN.
-+
-+## insert all possible names (only works with 
-+## autoconf 2.x
-+TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253"
-+TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253"
-+
-+
-+AUTOHEADERFOUND="0"
-+AUTOCONFFOUND="0"
-+
-+
-+##
-+## Look for autoheader 
-+##
-+for i in $TESTAUTOHEADER; do
-+	if which $i > /dev/null 2>&1; then
-+		if [ `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53 ]; then
-+			AUTOHEADER=$i
-+			AUTOHEADERFOUND="1"
-+			break
-+		fi
-+	fi
-+done
-+
-+## 
-+## Look for autoconf
-+##
-+
-+for i in $TESTAUTOCONF; do
-+	if which $i > /dev/null 2>&1; then
-+		if [ `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53 ]; then
-+			AUTOCONF=$i
-+			AUTOCONFFOUND="1"
-+			break
-+		fi
-+	fi
-+done
-+
-+
-+## 
-+## do we have it?
-+##
-+if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then
-+	echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2
-+	exit 1
-+fi
-+
-+rm -rf autom4te*.cache
-+
-+echo "$0: running $AUTOHEADER"
-+$AUTOHEADER || exit 1
-+
-+echo "$0: running $AUTOCONF"
-+$AUTOCONF || exit 1
-+
-+rm -rf autom4te*.cache
-+
-+echo "Now run ./configure and then make."
-+exit 0
-+
-diff --git a/examples/VFS/config.guess b/examples/VFS/config.guess
-new file mode 100755
-index 0000000..da83314
---- /dev/null
-+++ b/examples/VFS/config.guess
-@@ -0,0 +1,1561 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   Free Software Foundation, Inc.
-+
-+timestamp='2009-04-27'
-+
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub.  If it succeeds, it prints the system name on stdout, and
-+# exits with 0.  Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help" >&2
-+       exit 1 ;;
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+if test $# != 0; then
-+  echo "$me: too many arguments$help" >&2
-+  exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	     CC_FOR_BUILD="$c"; break ;
-+	  fi ;
-+	done ;
-+	if test x"$CC_FOR_BUILD" = x ; then
-+	  CC_FOR_BUILD=no_compiler_found ;
-+	fi
-+	;;
-+ ,,*)   CC_FOR_BUILD=$CC ;;
-+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-+esac ; set_cc_for_build= ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+	PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+    *:NetBSD:*:*)
-+	# NetBSD (nbsd) targets should (where applicable) match one or
-+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-+	# switched to ELF, *-*-netbsd* would select the old
-+	# object file format.  This provides both forward
-+	# compatibility and a consistent mechanism for selecting the
-+	# object file format.
-+	#
-+	# Note: NetBSD doesn't particularly care about the vendor
-+	# portion of the name.  We always set it to "unknown".
-+	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
-+	    arm*) machine=arm-unknown ;;
-+	    sh3el) machine=shl-unknown ;;
-+	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+	esac
-+	# The Operating System including object format, if it has switched
-+	# to ELF recently, or will in the future.
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
-+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+			| grep __ELF__ >/dev/null
-+		then
-+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+		    # Return netbsd for either.  FIX?
-+		    os=netbsd
-+		else
-+		    os=netbsdelf
-+		fi
-+		;;
-+	    *)
-+	        os=netbsd
-+		;;
-+	esac
-+	# The OS release
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
-+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+	# contains redundant information, the shorter form:
-+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+	echo "${machine}-${os}${release}"
-+	exit ;;
-+    *:OpenBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    alpha:OSF1:*:*)
-+	case $UNAME_RELEASE in
-+	*4.0)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
-+	# A Vn.n version is a released version.
-+	# A Tn.n version is a released field test version.
-+	# A Xn.n version is an unreleased experimental baselevel.
-+	# 1.2 uses "1.2" for uname -r.
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-+    Alpha\ *:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# Should we change UNAME_MACHINE based on the output of uname instead
-+	# of the specific Alpha model?
-+	echo alpha-pc-interix
-+	exit ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit ;;
-+    Amiga*:UNIX_System_V:4.0:*)
-+	echo m68k-unknown-sysv4
-+	exit ;;
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit ;;
-+    *:OS/390:*:*)
-+	echo i370-ibm-openedition
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+	echo hppa1.1-hitachi-hiuxmpp
-+	exit ;;
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+		echo pyramid-pyramid-sysv3
-+	else
-+		echo pyramid-pyramid-bsd
-+	fi
-+	exit ;;
-+    NILE*:*:*:dcosx)
-+	echo pyramid-pyramid-svr4
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7; exit ;;
-+	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:6*:*)
-+	# According to config.sub, this is the proper way to canonicalize
-+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-+	# it's likely to be more like Solaris than SunOS4.
-+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:*:*)
-+	case "`/usr/bin/arch -k`" in
-+	    Series*|S4*)
-+		UNAME_RELEASE=`uname -v`
-+		;;
-+	esac
-+	# Japanese Language versions have a version number like `4.1.3-JL'.
-+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+	exit ;;
-+    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit ;;
-+    sun*:*:4.2BSD:*)
-+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+	case "`/bin/arch`" in
-+	    sun3)
-+		echo m68k-sun-sunos${UNAME_RELEASE}
-+		;;
-+	    sun4)
-+		echo sparc-sun-sunos${UNAME_RELEASE}
-+		;;
-+	esac
-+	exit ;;
-+    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit ;;
-+    # The situation for MiNT is a little confusing.  The machine name
-+    # can be virtually everything (everything which is not
-+    # "atarist" or "atariste" at least should have a processor
-+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-+    # to the lowercase version "mint" (or "freemint").  Finally
-+    # the system name "TOS" denotes a system which is actually not
-+    # MiNT.  But MiNT is downward compatible to TOS, so this should
-+    # be no problem.
-+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit ;;
-+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit ;;
-+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit ;;
-+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    RISC*:Mach:*:*)
-+	echo mips-dec-mach_bsd4.3
-+	exit ;;
-+    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit ;;
-+    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+	#if defined (host_mips) && defined (MIPSEB)
-+	#if defined (SYSTYPE_SYSV)
-+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_SVR4)
-+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+	#endif
-+	#endif
-+	  exit (-1);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
-+	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit ;;
-+    Motorola:PowerMAX_OS:*:*)
-+	echo powerpc-motorola-powermax
-+	exit ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:Power_UNIX:*:*)
-+	echo powerpc-harris-powerunix
-+	exit ;;
-+    m88k:CX/UX:7*:*)
-+	echo m88k-harris-cxux7
-+	exit ;;
-+    m88k:*:4*:R4*)
-+	echo m88k-motorola-sysv4
-+	exit ;;
-+    m88k:*:3*:R3*)
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    AViiON:dgux:*:*)
-+        # DG/UX returns AViiON for all architectures
-+        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+	then
-+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-+	    then
-+		echo m88k-dg-dgux${UNAME_RELEASE}
-+	    else
-+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+	    fi
-+	else
-+	    echo i586-dg-dgux${UNAME_RELEASE}
-+	fi
-+ 	exit ;;
-+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-+	echo m88k-dolphin-sysv3
-+	exit ;;
-+    M88*:*:R3*:*)
-+	# Delta 88k system running SVR3
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+	echo m88k-tektronix-sysv3
-+	exit ;;
-+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+	echo m68k-tektronix-bsd
-+	exit ;;
-+    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit ;;
-+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i*86:AIX:*:*)
-+	echo i386-ibm-aix
-+	exit ;;
-+    ia64:AIX:*:*)
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:2:3)
-+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
-+		sed 's/^		//' << EOF >$dummy.c
-+		#include <sys/systemcfg.h>
-+
-+		main()
-+			{
-+			if (!__power_pc())
-+				exit(1);
-+			puts("powerpc-ibm-aix3.2.5");
-+			exit(0);
-+			}
-+EOF
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
-+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+		echo rs6000-ibm-aix3.2.4
-+	else
-+		echo rs6000-ibm-aix3.2
-+	fi
-+	exit ;;
-+    *:AIX:*:[456])
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+		IBM_ARCH=rs6000
-+	else
-+		IBM_ARCH=powerpc
-+	fi
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:*:*)
-+	echo rs6000-ibm-aix
-+	exit ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+	echo romp-ibm-bsd4.4
-+	exit ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit ;;                             # report: romp-ibm BSD 4.3
-+    *:BOSX:*:*)
-+	echo rs6000-bull-bosx
-+	exit ;;
-+    DPX/2?00:B.O.S.:*:*)
-+	echo m68k-bull-sysv3
-+	exit ;;
-+    9000/[34]??:4.3bsd:1.*:*)
-+	echo m68k-hp-bsd
-+	exit ;;
-+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+	echo m68k-hp-bsd4.4
-+	exit ;;
-+    9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	    9000/[678][0-9][0-9])
-+		if [ -x /usr/bin/getconf ]; then
-+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+                    case "${sc_cpu_version}" in
-+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+                      532)                      # CPU_PA_RISC2_0
-+                        case "${sc_kernel_bits}" in
-+                          32) HP_ARCH="hppa2.0n" ;;
-+                          64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-+                        esac ;;
-+                    esac
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^              //' << EOF >$dummy.c
-+
-+              #define _HPUX_SOURCE
-+              #include <stdlib.h>
-+              #include <unistd.h>
-+
-+              int main ()
-+              {
-+              #if defined(_SC_KERNEL_BITS)
-+                  long bits = sysconf(_SC_KERNEL_BITS);
-+              #endif
-+                  long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+                  switch (cpu)
-+              	{
-+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+              	case CPU_PA_RISC2_0:
-+              #if defined(_SC_KERNEL_BITS)
-+              	    switch (bits)
-+              		{
-+              		case 64: puts ("hppa2.0w"); break;
-+              		case 32: puts ("hppa2.0n"); break;
-+              		default: puts ("hppa2.0"); break;
-+              		} break;
-+              #else  /* !defined(_SC_KERNEL_BITS) */
-+              	    puts ("hppa2.0"); break;
-+              #endif
-+              	default: puts ("hppa1.0"); break;
-+              	}
-+                  exit (0);
-+              }
-+EOF
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
-+	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit ;;
-+    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
-+	exit ;;
-+    3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <unistd.h>
-+	int
-+	main ()
-+	{
-+	  long cpu = sysconf (_SC_CPU_VERSION);
-+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-+	     results, however.  */
-+	  if (CPU_IS_PA_RISC (cpu))
-+	    {
-+	      switch (cpu)
-+		{
-+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-+		}
-+	    }
-+	  else if (CPU_IS_HP_MC68K (cpu))
-+	    puts ("m68k-hitachi-hiuxwe2");
-+	  else puts ("unknown-hitachi-hiuxwe2");
-+	  exit (0);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
-+	echo unknown-hitachi-hiuxwe2
-+	exit ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+	echo hppa1.1-hp-bsd
-+	exit ;;
-+    9000/8??:4.3bsd:*:*)
-+	echo hppa1.0-hp-bsd
-+	exit ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+	echo hppa1.0-hp-mpeix
-+	exit ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+	echo hppa1.1-hp-osf
-+	exit ;;
-+    hp8??:OSF1:*:*)
-+	echo hppa1.0-hp-osf
-+	exit ;;
-+    i*86:OSF1:*:*)
-+	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
-+	fi
-+	exit ;;
-+    parisc*:Lites*:*:*)
-+	echo hppa1.1-hp-lites
-+	exit ;;
-+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+	echo c1-convex-bsd
-+        exit ;;
-+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+        exit ;;
-+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+	echo c34-convex-bsd
-+        exit ;;
-+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+	echo c38-convex-bsd
-+        exit ;;
-+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+	echo c4-convex-bsd
-+        exit ;;
-+    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*T3E:*:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:FreeBSD:*:*)
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit ;;
-+    *:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit ;;
-+    *:Interix*:[3456]*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    EM64T | authenticamd | genuineintel)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit ;;
-+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+	# UNAME_MACHINE based on the output of uname instead of i386?
-+	echo i586-pc-interix
-+	exit ;;
-+    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit ;;
-+    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    *:GNU:*:*)
-+	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-+    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
-+	exit ;;
-+    arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    mips:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips
-+	#undef mipsel
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mipsel
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc:Linux:*:* | hppa:Linux:*:*)
-+	# Look for CPU level
-+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
-+	esac
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-+    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	# The BFD linker knows what the default object file format is, so
-+	# first see if it will tell us. cd to the root directory to prevent
-+	# problems with other programs or directories called `ld' in the path.
-+	# Set LC_ALL=C to ensure ld outputs messages in English.
-+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+			 | sed -ne '/supported targets:/!d
-+				    s/[ 	][ 	]*/ /g
-+				    s/.*supported targets: *//
-+				    s/ .*//
-+				    p'`
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		;;
-+	  a.out-i386-linux)
-+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		exit ;;
-+	  "")
-+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-+		# one that does not give us useful --help.
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit ;;
-+	esac
-+	# Determine whether the default compiler is a.out or elf
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <features.h>
-+	#ifdef __ELF__
-+	# ifdef __GLIBC__
-+	#  if __GLIBC__ >= 2
-+	LIBC=gnu
-+	#  else
-+	LIBC=gnulibc1
-+	#  endif
-+	# else
-+	LIBC=gnulibc1
-+	# endif
-+	#else
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^LIBC/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+	;;
-+    i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
-+	echo i386-sequent-sysv4
-+	exit ;;
-+    i*86:UNIX_SV:4.2MP:2.*)
-+        # Unixware is an offshoot of SVR4, but it has its own version
-+        # number series starting with 2...
-+        # I am not positive that other SVR4 systems won't match this,
-+	# I just have to hope.  -- rms.
-+        # Use sysv4.2uw... so that sysv4* matches it.
-+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	exit ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+	fi
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit ;;
-+    i*86:*:3.2:*)
-+	if test -f /usr/options/cb.name; then
-+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+			&& UNAME_MACHINE=i586
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
-+	fi
-+	exit ;;
-+    pc:*:*:*)
-+	# Left here for compatibility:
-+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-+    Intel:Mach:3*:*)
-+	echo i386-pc-mach3
-+	exit ;;
-+    paragon:*:*:*)
-+	echo i860-intel-osf1
-+	exit ;;
-+    i860:*:4.*:*) # i860-SVR4
-+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+	else # Add other i860-SVR4 vendors below as they are discovered.
-+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-+	fi
-+	exit ;;
-+    mini*:CTIX:SYS*5:*)
-+	# "miniframe"
-+	echo m68010-convergent-sysv
-+	exit ;;
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-+	OS_REL=''
-+	test -r /etc/.relid \
-+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    mc68030:UNIX_System_V:4.*:*)
-+	echo m68k-atari-sysv4
-+	exit ;;
-+    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    rs6000:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit ;;
-+    RM*:ReliantUNIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    RM*:SINIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    *:SINIX-*:*:*)
-+	if uname -p 2>/dev/null >/dev/null ; then
-+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		echo ${UNAME_MACHINE}-sni-sysv4
-+	else
-+		echo ns32k-sni-sysv
-+	fi
-+	exit ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-+        echo i586-unisys-sysv4
-+        exit ;;
-+    *:UNIX_System_V:4*:FTX*)
-+	# From Gerald Hewes <hewes@openmarket.com>.
-+	# How about differentiating between stratus architectures? -djm
-+	echo hppa1.1-stratus-sysv4
-+	exit ;;
-+    *:*:*:FTX*)
-+	# From seanf@swdc.stratus.com.
-+	echo i860-stratus-sysv4
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-+    *:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit ;;
-+    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit ;;
-+    news*:NEWS-OS:6*:*)
-+	echo mips-sony-newsos6
-+	exit ;;
-+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+	if [ -d /usr/nec ]; then
-+	        echo mips-nec-sysv${UNAME_RELEASE}
-+	else
-+	        echo mips-unknown-sysv${UNAME_RELEASE}
-+	fi
-+        exit ;;
-+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-+	echo powerpc-be-beos
-+	exit ;;
-+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-+	echo powerpc-apple-beos
-+	exit ;;
-+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-beos
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-+    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Darwin:*:*)
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
-+		UNAME_MACHINE=pc
-+	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	exit ;;
-+    *:QNX:*:4*)
-+	echo i386-pc-qnx
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    *:NonStop-UX:*:*)
-+	echo mips-compaq-nonstopux
-+	exit ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit ;;
-+    *:Plan9:*:*)
-+	# "uname -m" is not consistent, so use $cputype instead. 386
-+	# is converted to i386 for consistency with other x86
-+	# operating systems.
-+	if test "$cputype" = "386"; then
-+	    UNAME_MACHINE=i386
-+	else
-+	    UNAME_MACHINE="$cputype"
-+	fi
-+	echo ${UNAME_MACHINE}-unknown-plan9
-+	exit ;;
-+    *:TOPS-10:*:*)
-+	echo pdp10-unknown-tops10
-+	exit ;;
-+    *:TENEX:*:*)
-+	echo pdp10-unknown-tenex
-+	exit ;;
-+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+	echo pdp10-dec-tops20
-+	exit ;;
-+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+	echo pdp10-xkl-tops20
-+	exit ;;
-+    *:TOPS-20:*:*)
-+	echo pdp10-unknown-tops20
-+	exit ;;
-+    *:ITS:*:*)
-+	echo pdp10-unknown-its
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+          "4"
-+#else
-+	  ""
-+#endif
-+         ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix\n"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+  printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+    struct utsname un;
-+
-+    uname(&un);
-+
-+    if (strncmp(un.version, "V2", 2) == 0) {
-+	printf ("i386-sequent-ptx2\n"); exit (0);
-+    }
-+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+	printf ("i386-sequent-ptx1\n"); exit (0);
-+    }
-+    printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+#  include <sys/param.h>
-+#  if defined (BSD)
-+#   if BSD == 43
-+      printf ("vax-dec-bsd4.3\n"); exit (0);
-+#   else
-+#    if BSD == 199006
-+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#    else
-+      printf ("vax-dec-bsd\n"); exit (0);
-+#    endif
-+#   endif
-+#  else
-+    printf ("vax-dec-bsd\n"); exit (0);
-+#  endif
-+# else
-+    printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+  exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+    case `getsysinfo -f cpu_type` in
-+    c1*)
-+	echo c1-convex-bsd
-+	exit ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit ;;
-+    esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo               = `(hostinfo) 2>/dev/null`
-+/bin/universe          = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch              = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff --git a/examples/VFS/config.sub b/examples/VFS/config.sub
-new file mode 100755
-index 0000000..a39437d
---- /dev/null
-+++ b/examples/VFS/config.sub
-@@ -0,0 +1,1686 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   Free Software Foundation, Inc.
-+
-+timestamp='2009-04-17'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine.  It does not imply ALL GNU software can.
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support.  The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit ;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
-+case $maybe_os in
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-+    os=-$maybe_os
-+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
-+    ;;
-+  *)
-+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+    if [ $basic_machine != $1 ]
-+    then os=`echo $1 | sed 's/.*-/-/'`
-+    else os=; fi
-+    ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work.  We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+	-sun*os*)
-+		# Prevent following clause from handling this invalid input.
-+		;;
-+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+	-apple | -axis | -knuth | -cray)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
-+	-hiux*)
-+		os=-hiuxwe2
-+		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5)
-+		os=-sco3.2v5
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco4)
-+		os=-sco3.2v4
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2.[4-9]*)
-+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2v[4-9]*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco*)
-+		os=-sco3.2v2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-isc)
-+		os=-isc2.2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-clix*)
-+		basic_machine=clipper-intergraph
-+		;;
-+	-isc*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-lynx*)
-+		os=-lynxos
-+		;;
-+	-ptx*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+		;;
-+	-windowsnt*)
-+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+		;;
-+	-psos*)
-+		os=-psos
-+		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+	# Recognize the basic CPU types without company name.
-+	# Some are omitted here because they have special meanings below.
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fido | fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64octeon | mips64octeonel \
-+	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
-+	| msp430 \
-+	| nios | nios2 \
-+	| ns16k | ns32k \
-+	| or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
-+
-+	# We use `pc' rather than `unknown'
-+	# because (1) that's what they normally are, and
-+	# (2) the word "unknown" tends to confuse beginning users.
-+	i*86 | x86_64)
-+	  basic_machine=$basic_machine-pc
-+	  ;;
-+	# Object if more than one company name word.
-+	*-*-*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+	# Recognize the basic CPU types with company name.
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64octeon-* | mips64octeonel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
-+	| msp430-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
-+	| ymp-* \
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	# Recognize the various machine names and aliases which stand
-+	# for a CPU type and a company and sometimes even an OS.
-+	386bsd)
-+		basic_machine=i386-unknown
-+		os=-bsd
-+		;;
-+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+		basic_machine=m68000-att
-+		;;
-+	3b*)
-+		basic_machine=we32k-att
-+		;;
-+	a29khif)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
-+	adobe68k)
-+		basic_machine=m68010-adobe
-+		os=-scout
-+		;;
-+	alliant | fx80)
-+		basic_machine=fx80-alliant
-+		;;
-+	altos | altos3068)
-+		basic_machine=m68k-altos
-+		;;
-+	am29k)
-+		basic_machine=a29k-none
-+		os=-bsd
-+		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	amdahl)
-+		basic_machine=580-amdahl
-+		os=-sysv
-+		;;
-+	amiga | amiga-*)
-+		basic_machine=m68k-unknown
-+		;;
-+	amigaos | amigados)
-+		basic_machine=m68k-unknown
-+		os=-amigaos
-+		;;
-+	amigaunix | amix)
-+		basic_machine=m68k-unknown
-+		os=-sysv4
-+		;;
-+	apollo68)
-+		basic_machine=m68k-apollo
-+		os=-sysv
-+		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
-+	aux)
-+		basic_machine=m68k-apple
-+		os=-aux
-+		;;
-+	balance)
-+		basic_machine=ns32k-sequent
-+		os=-dynix
-+		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
-+	convex-c1)
-+		basic_machine=c1-convex
-+		os=-bsd
-+		;;
-+	convex-c2)
-+		basic_machine=c2-convex
-+		os=-bsd
-+		;;
-+	convex-c32)
-+		basic_machine=c32-convex
-+		os=-bsd
-+		;;
-+	convex-c34)
-+		basic_machine=c34-convex
-+		os=-bsd
-+		;;
-+	convex-c38)
-+		basic_machine=c38-convex
-+		os=-bsd
-+		;;
-+	cray | j90)
-+		basic_machine=j90-cray
-+		os=-unicos
-+		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
-+	crds | unos)
-+		basic_machine=m68k-crds
-+		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
-+	da30 | da30-*)
-+		basic_machine=m68k-da30
-+		;;
-+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+		basic_machine=mips-dec
-+		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
-+	delta | 3300 | motorola-3300 | motorola-delta \
-+	      | 3300-motorola | delta-motorola)
-+		basic_machine=m68k-motorola
-+		;;
-+	delta88)
-+		basic_machine=m88k-motorola
-+		os=-sysv3
-+		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
-+	dpx20 | dpx20-*)
-+		basic_machine=rs6000-bull
-+		os=-bosx
-+		;;
-+	dpx2* | dpx2*-bull)
-+		basic_machine=m68k-bull
-+		os=-sysv3
-+		;;
-+	ebmon29k)
-+		basic_machine=a29k-amd
-+		os=-ebmon
-+		;;
-+	elxsi)
-+		basic_machine=elxsi-elxsi
-+		os=-bsd
-+		;;
-+	encore | umax | mmax)
-+		basic_machine=ns32k-encore
-+		;;
-+	es1800 | OSE68k | ose68k | ose | OSE)
-+		basic_machine=m68k-ericsson
-+		os=-ose
-+		;;
-+	fx2800)
-+		basic_machine=i860-alliant
-+		;;
-+	genix)
-+		basic_machine=ns32k-ns
-+		;;
-+	gmicro)
-+		basic_machine=tron-gmicro
-+		os=-sysv
-+		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
-+	h3050r* | hiux*)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	h8300hms)
-+		basic_machine=h8300-hitachi
-+		os=-hms
-+		;;
-+	h8300xray)
-+		basic_machine=h8300-hitachi
-+		os=-xray
-+		;;
-+	h8500hms)
-+		basic_machine=h8500-hitachi
-+		os=-hms
-+		;;
-+	harris)
-+		basic_machine=m88k-harris
-+		os=-sysv3
-+		;;
-+	hp300-*)
-+		basic_machine=m68k-hp
-+		;;
-+	hp300bsd)
-+		basic_machine=m68k-hp
-+		os=-bsd
-+		;;
-+	hp300hpux)
-+		basic_machine=m68k-hp
-+		os=-hpux
-+		;;
-+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k2[0-9][0-9] | hp9k31[0-9])
-+		basic_machine=m68000-hp
-+		;;
-+	hp9k3[2-9][0-9])
-+		basic_machine=m68k-hp
-+		;;
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k78[0-9] | hp78[0-9])
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hppa-next)
-+		os=-nextstep3
-+		;;
-+	hppaosf)
-+		basic_machine=hppa1.1-hp
-+		os=-osf
-+		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
-+	i370-ibm* | ibm*)
-+		basic_machine=i370-ibm
-+		;;
-+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-+	i*86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv32
-+		;;
-+	i*86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv4
-+		;;
-+	i*86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv
-+		;;
-+	i*86sol2)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-solaris2
-+		;;
-+	i386mach)
-+		basic_machine=i386-mach
-+		os=-mach
-+		;;
-+	i386-vsta | vsta)
-+		basic_machine=i386-unknown
-+		os=-vsta
-+		;;
-+	iris | iris4d)
-+		basic_machine=mips-sgi
-+		case $os in
-+		    -irix*)
-+			;;
-+		    *)
-+			os=-irix4
-+			;;
-+		esac
-+		;;
-+	isi68 | isi)
-+		basic_machine=m68k-isi
-+		os=-sysv
-+		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
-+	magnum | m3230)
-+		basic_machine=mips-mips
-+		os=-sysv
-+		;;
-+	merlin)
-+		basic_machine=ns32k-utek
-+		os=-sysv
-+		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
-+	miniframe)
-+		basic_machine=m68000-convergent
-+		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		;;
-+	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
-+		os=-msdos
-+		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
-+	ncr3000)
-+		basic_machine=i486-ncr
-+		os=-sysv4
-+		;;
-+	netbsd386)
-+		basic_machine=i386-unknown
-+		os=-netbsd
-+		;;
-+	netwinder)
-+		basic_machine=armv4l-rebel
-+		os=-linux
-+		;;
-+	news | news700 | news800 | news900)
-+		basic_machine=m68k-sony
-+		os=-newsos
-+		;;
-+	news1000)
-+		basic_machine=m68030-sony
-+		os=-newsos
-+		;;
-+	news-3600 | risc-news)
-+		basic_machine=mips-sony
-+		os=-newsos
-+		;;
-+	necv70)
-+		basic_machine=v70-nec
-+		os=-sysv
-+		;;
-+	next | m*-next )
-+		basic_machine=m68k-next
-+		case $os in
-+		    -nextstep* )
-+			;;
-+		    -ns2*)
-+		      os=-nextstep2
-+			;;
-+		    *)
-+		      os=-nextstep3
-+			;;
-+		esac
-+		;;
-+	nh3000)
-+		basic_machine=m68k-harris
-+		os=-cxux
-+		;;
-+	nh[45]000)
-+		basic_machine=m88k-harris
-+		os=-cxux
-+		;;
-+	nindy960)
-+		basic_machine=i960-intel
-+		os=-nindy
-+		;;
-+	mon960)
-+		basic_machine=i960-intel
-+		os=-mon960
-+		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
-+	np1)
-+		basic_machine=np1-gould
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	openrisc | openrisc-*)
-+		basic_machine=or32-unknown
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
-+	OSE68000 | ose68000)
-+		basic_machine=m68000-ericsson
-+		os=-ose
-+		;;
-+	os68k)
-+		basic_machine=m68k-none
-+		os=-os68k
-+		;;
-+	pa-hitachi)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	paragon)
-+		basic_machine=i860-intel
-+		os=-osf
-+		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	pbd)
-+		basic_machine=sparc-tti
-+		;;
-+	pbb)
-+		basic_machine=m68k-tti
-+		;;
-+	pc532 | pc532-*)
-+		basic_machine=ns32k-pc532
-+		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pn)
-+		basic_machine=pn-gould
-+		;;
-+	power)	basic_machine=power-ibm
-+		;;
-+	ppc)	basic_machine=powerpc-unknown
-+		;;
-+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppcle | powerpclittle | ppc-le | powerpc-little)
-+		basic_machine=powerpcle-unknown
-+		;;
-+	ppcle-* | powerpclittle-*)
-+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ps2)
-+		basic_machine=i386-ibm
-+		;;
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	rm[46]00)
-+		basic_machine=mips-siemens
-+		;;
-+	rtpc | rtpc-*)
-+		basic_machine=romp-ibm
-+		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
-+	sequent)
-+		basic_machine=i386-sequent
-+		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
-+		basic_machine=sparclite-wrs
-+		os=-vxworks
-+		;;
-+	sps7)
-+		basic_machine=m68k-bull
-+		os=-sysv2
-+		;;
-+	spur)
-+		basic_machine=spur-unknown
-+		;;
-+	st2000)
-+		basic_machine=m68k-tandem
-+		;;
-+	stratus)
-+		basic_machine=i860-stratus
-+		os=-sysv4
-+		;;
-+	sun2)
-+		basic_machine=m68000-sun
-+		;;
-+	sun2os3)
-+		basic_machine=m68000-sun
-+		os=-sunos3
-+		;;
-+	sun2os4)
-+		basic_machine=m68000-sun
-+		os=-sunos4
-+		;;
-+	sun3os3)
-+		basic_machine=m68k-sun
-+		os=-sunos3
-+		;;
-+	sun3os4)
-+		basic_machine=m68k-sun
-+		os=-sunos4
-+		;;
-+	sun4os3)
-+		basic_machine=sparc-sun
-+		os=-sunos3
-+		;;
-+	sun4os4)
-+		basic_machine=sparc-sun
-+		os=-sunos4
-+		;;
-+	sun4sol2)
-+		basic_machine=sparc-sun
-+		os=-solaris2
-+		;;
-+	sun3 | sun3-*)
-+		basic_machine=m68k-sun
-+		;;
-+	sun4)
-+		basic_machine=sparc-sun
-+		;;
-+	sun386 | sun386i | roadrunner)
-+		basic_machine=i386-sun
-+		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
-+	symmetry)
-+		basic_machine=i386-sequent
-+		os=-dynix
-+		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
-+	tower | tower-32)
-+		basic_machine=m68k-ncr
-+		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
-+	udi29k)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	ultra3)
-+		basic_machine=a29k-nyu
-+		os=-sym1
-+		;;
-+	v810 | necv810)
-+		basic_machine=v810-nec
-+		os=-none
-+		;;
-+	vaxv)
-+		basic_machine=vax-dec
-+		os=-sysv
-+		;;
-+	vms)
-+		basic_machine=vax-dec
-+		os=-vms
-+		;;
-+	vpp*|vx|vx-*)
-+		basic_machine=f301-fujitsu
-+		;;
-+	vxworks960)
-+		basic_machine=i960-wrs
-+		os=-vxworks
-+		;;
-+	vxworks68)
-+		basic_machine=m68k-wrs
-+		os=-vxworks
-+		;;
-+	vxworks29k)
-+		basic_machine=a29k-wrs
-+		os=-vxworks
-+		;;
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
-+		;;
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
-+		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
-+	xps | xps100)
-+		basic_machine=xps100-honeywell
-+		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
-+	none)
-+		basic_machine=none-none
-+		os=-none
-+		;;
-+
-+# Here we handle the default manufacturer of certain CPU types.  It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+	w89k)
-+		basic_machine=hppa1.1-winbond
-+		;;
-+	op50n)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	op60c)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	romp)
-+		basic_machine=romp-ibm
-+		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
-+	rs6000)
-+		basic_machine=rs6000-ibm
-+		;;
-+	vax)
-+		basic_machine=vax-dec
-+		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
-+	pdp11)
-+		basic_machine=pdp11-dec
-+		;;
-+	we32k)
-+		basic_machine=we32k-att
-+		;;
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-+		basic_machine=sparc-sun
-+		;;
-+	cydra)
-+		basic_machine=cydra-cydrome
-+		;;
-+	orion)
-+		basic_machine=orion-highlevel
-+		;;
-+	orion105)
-+		basic_machine=clipper-highlevel
-+		;;
-+	mac | mpw | mac-mpw)
-+		basic_machine=m68k-apple
-+		;;
-+	pmac | pmac-mpw)
-+		basic_machine=powerpc-apple
-+		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
-+	*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+	*-digital*)
-+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+		;;
-+	*-commodore*)
-+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+		;;
-+	*)
-+		;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+        # First match some system type aliases
-+        # that might get confused with valid system types.
-+	# -solaris* is a basic system type, with this one exception.
-+	-solaris1 | -solaris1.*)
-+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+		;;
-+	-solaris)
-+		os=-solaris2
-+		;;
-+	-svr4*)
-+		os=-sysv4
-+		;;
-+	-unixware*)
-+		os=-sysv4.2uw
-+		;;
-+	-gnu/linux*)
-+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+		;;
-+	# First accept the basic system types.
-+	# The portable systems comes first.
-+	# Each alternative MUST END IN A *, to match a version number.
-+	# -sysv* is not here because it comes later, after sysvr4.
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -kopensolaris* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* | -aros* \
-+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	# Remember, each alternative MUST END IN *, to match a version number.
-+		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
-+	-linux*)
-+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+		;;
-+	-sunos5*)
-+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+		;;
-+	-sunos6*)
-+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
-+	-utek*)
-+		os=-bsd
-+		;;
-+	-dynix*)
-+		os=-bsd
-+		;;
-+	-acis*)
-+		os=-aos
-+		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
-+	-ctix* | -uts*)
-+		os=-sysv
-+		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
-+	-ns2 )
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
-+		;;
-+	# Preserve the version number of sinix5.
-+	-sinix5.*)
-+		os=`echo $os | sed -e 's|sinix|sysv|'`
-+		;;
-+	-sinix*)
-+		os=-sysv4
-+		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
-+	-triton*)
-+		os=-sysv3
-+		;;
-+	-oss*)
-+		os=-sysv3
-+		;;
-+	-svr4)
-+		os=-sysv4
-+		;;
-+	-svr3)
-+		os=-sysv3
-+		;;
-+	-sysvr4)
-+		os=-sysv4
-+		;;
-+	# This must come after -sysvr4.
-+	-sysv*)
-+		;;
-+	-ose*)
-+		os=-ose
-+		;;
-+	-es1800*)
-+		os=-ose
-+		;;
-+	-xenix)
-+		os=-xenix
-+		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+	-none)
-+		;;
-+	*)
-+		# Get rid of the `-' at the beginning of $os.
-+		os=`echo $os | sed 's/[^-]*-//'`
-+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system.  Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
-+	*-acorn)
-+		os=-riscix1.2
-+		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
-+	arm*-semi)
-+		os=-aout
-+		;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
-+		os=-none
-+		;;
-+	*-dec | vax-*)
-+		os=-ultrix4.2
-+		;;
-+	m68*-apollo)
-+		os=-domain
-+		;;
-+	i386-sun)
-+		os=-sunos4.0.2
-+		;;
-+	m68000-sun)
-+		os=-sunos3
-+		# This also exists in the configure program, but was not the
-+		# default.
-+		# os=-sunos4
-+		;;
-+	m68*-cisco)
-+		os=-aout
-+		;;
-+        mep-*)
-+		os=-elf
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
-+	*-tti)	# must be before sparc entry or we get the wrong os.
-+		os=-sysv3
-+		;;
-+	sparc-* | *-sun)
-+		os=-sunos4.1.1
-+		;;
-+	*-be)
-+		os=-beos
-+		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
-+	*-ibm)
-+		os=-aix
-+		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
-+	*-wec)
-+		os=-proelf
-+		;;
-+	*-winbond)
-+		os=-proelf
-+		;;
-+	*-oki)
-+		os=-proelf
-+		;;
-+	*-hp)
-+		os=-hpux
-+		;;
-+	*-hitachi)
-+		os=-hiux
-+		;;
-+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+		os=-sysv
-+		;;
-+	*-cbm)
-+		os=-amigaos
-+		;;
-+	*-dg)
-+		os=-dgux
-+		;;
-+	*-dolphin)
-+		os=-sysv3
-+		;;
-+	m68k-ccur)
-+		os=-rtu
-+		;;
-+	m88k-omron*)
-+		os=-luna
-+		;;
-+	*-next )
-+		os=-nextstep
-+		;;
-+	*-sequent)
-+		os=-ptx
-+		;;
-+	*-crds)
-+		os=-unos
-+		;;
-+	*-ns)
-+		os=-genix
-+		;;
-+	i370-*)
-+		os=-mvs
-+		;;
-+	*-next)
-+		os=-nextstep3
-+		;;
-+	*-gould)
-+		os=-sysv
-+		;;
-+	*-highlevel)
-+		os=-bsd
-+		;;
-+	*-encore)
-+		os=-bsd
-+		;;
-+	*-sgi)
-+		os=-irix
-+		;;
-+	*-siemens)
-+		os=-sysv4
-+		;;
-+	*-masscomp)
-+		os=-rtu
-+		;;
-+	f30[01]-fujitsu | f700-fujitsu)
-+		os=-uxpv
-+		;;
-+	*-rom68k)
-+		os=-coff
-+		;;
-+	*-*bug)
-+		os=-coff
-+		;;
-+	*-apple)
-+		os=-macos
-+		;;
-+	*-atari*)
-+		os=-mint
-+		;;
-+	*)
-+		os=-none
-+		;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer.  We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+	*-unknown)
-+		case $os in
-+			-riscix*)
-+				vendor=acorn
-+				;;
-+			-sunos*)
-+				vendor=sun
-+				;;
-+			-aix*)
-+				vendor=ibm
-+				;;
-+			-beos*)
-+				vendor=be
-+				;;
-+			-hpux*)
-+				vendor=hp
-+				;;
-+			-mpeix*)
-+				vendor=hp
-+				;;
-+			-hiux*)
-+				vendor=hitachi
-+				;;
-+			-unos*)
-+				vendor=crds
-+				;;
-+			-dgux*)
-+				vendor=dg
-+				;;
-+			-luna*)
-+				vendor=omron
-+				;;
-+			-genix*)
-+				vendor=ns
-+				;;
-+			-mvs* | -opened*)
-+				vendor=ibm
-+				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
-+			-ptx*)
-+				vendor=sequent
-+				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
-+				vendor=wrs
-+				;;
-+			-aux*)
-+				vendor=apple
-+				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
-+		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		;;
-+esac
-+
-+echo $basic_machine$os
-+exit
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff --git a/examples/VFS/configure.in b/examples/VFS/configure.in
-new file mode 100644
-index 0000000..1c61853
---- /dev/null
-+++ b/examples/VFS/configure.in
-@@ -0,0 +1,357 @@
-+dnl -*- mode: m4-mode -*-
-+dnl Process this file with autoconf to produce a configure script.
-+
-+dnl We must use autotools 2.53 or above
-+AC_PREREQ(2.53)
-+AC_INIT(Makefile.in)
-+
-+AC_CONFIG_HEADER(module_config.h)
-+#dnl To make sure that didn't get #define PACKAGE_* in modules_config.h
-+#echo "" > confdefs.h
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_CANONICAL_HOST
-+
-+#################################################
-+# Directory handling stuff to support both the
-+# legacy SAMBA directories and FHS compliant
-+# ones...
-+AC_PREFIX_DEFAULT(/usr/local/samba)
-+
-+AC_ARG_WITH(fhs, 
-+[  --with-fhs              Use FHS-compliant paths (default=no)],
-+    libdir="\${prefix}/lib/samba",
-+    libdir="\${prefix}/lib")
-+
-+AC_SUBST(libdir)
-+
-+SAMBA_SOURCE="../../source3"
-+####################################################
-+# set the location location of the samba source tree
-+AC_ARG_WITH(samba-source,
-+[  --with-samba-source=DIR Where is the samba source tree (../../source3)],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-samba-source called without argument - will use default])
-+  ;;
-+  * )
-+    SAMBA_SOURCE="$withval"
-+    ;;
-+  esac])
-+
-+AC_SUBST(SAMBA_SOURCE)
-+
-+dnl Unique-to-Samba variables we'll be playing with.
-+AC_SUBST(CC)
-+AC_SUBST(SHELL)
-+AC_SUBST(LDSHFLAGS)
-+AC_SUBST(SONAMEFLAG)
-+AC_SUBST(SHLD)
-+AC_SUBST(HOST_OS)
-+AC_SUBST(PICFLAGS)
-+AC_SUBST(PICSUFFIX)
-+AC_SUBST(SHLIBEXT)
-+AC_SUBST(INSTALLCLIENTCMD_SH)
-+AC_SUBST(INSTALLCLIENTCMD_A)
-+AC_SUBST(SHLIB_PROGS)
-+AC_SUBST(EXTRA_BIN_PROGS)
-+AC_SUBST(EXTRA_SBIN_PROGS)
-+AC_SUBST(EXTRA_ALL_TARGETS)
-+
-+AC_ARG_ENABLE(debug, 
-+[  --enable-debug          Turn on compiler debugging information (default=no)],
-+    [if eval "test x$enable_debug = xyes"; then
-+	CFLAGS="${CFLAGS} -g"
-+    fi])
-+
-+AC_ARG_ENABLE(developer, [  --enable-developer      Turn on developer warnings and debugging (default=no)],
-+    [if eval "test x$enable_developer = xyes"; then
-+        developer=yes
-+    	CFLAGS="${CFLAGS} -g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
-+    fi])
-+
-+# compile with optimization and without debugging by default, but
-+# allow people to set their own preference.
-+if test "x$CFLAGS" = x
-+then
-+  CFLAGS="-O ${CFLAGS}"
-+fi
-+
-+  #################################################
-+  # check for krb5-config from recent MIT and Heimdal kerberos 5
-+  AC_PATH_PROG(KRB5CONFIG, krb5-config)
-+  AC_MSG_CHECKING(for working krb5-config)
-+  if test -x "$KRB5CONFIG"; then
-+    CFLAGS="$CFLAGS `$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" 
-+    CPPFLAGS="$CPPFLAGS `$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+    FOUND_KRB5=yes
-+    AC_MSG_RESULT(yes)
-+  else
-+    AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
-+  fi
-+  
-+  if test x$FOUND_KRB5 = x"no"; then
-+  #################################################
-+  # check for location of Kerberos 5 install
-+  AC_MSG_CHECKING(for kerberos 5 install path)
-+  AC_ARG_WITH(krb5,
-+  [  --with-krb5=base-dir    Locate Kerberos 5 support (default=/usr)],
-+  [ case "$withval" in
-+    no)
-+      AC_MSG_RESULT(no)
-+      ;;
-+    *)
-+      AC_MSG_RESULT(yes)
-+      CFLAGS="$CFLAGS -I$withval/include"
-+      CPPFLAGS="$CPPFLAGS -I$withval/include"
-+      FOUND_KRB5=yes
-+      ;;
-+    esac ],
-+    AC_MSG_RESULT(no)
-+  )
-+  fi
-+
-+if test x$FOUND_KRB5 = x"no"; then
-+#################################################
-+# see if this box has the SuSE location for the heimdal kerberos implementation
-+AC_MSG_CHECKING(for /usr/include/heimdal)
-+if test -d /usr/include/heimdal; then
-+    if test -f /usr/lib/heimdal/lib/libkrb5.a; then
-+        CFLAGS="$CFLAGS -I/usr/include/heimdal"
-+        CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
-+        AC_MSG_RESULT(yes)
-+    else
-+        CFLAGS="$CFLAGS -I/usr/include/heimdal"
-+        CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
-+        AC_MSG_RESULT(yes)
-+ 
-+    fi
-+else
-+    AC_MSG_RESULT(no)
-+fi
-+fi
-+
-+
-+if test x$FOUND_KRB5 = x"no"; then
-+#################################################
-+# see if this box has the RedHat location for kerberos
-+AC_MSG_CHECKING(for /usr/kerberos)
-+if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then
-+    LDFLAGS="$LDFLAGS -L/usr/kerberos/lib"
-+    CFLAGS="$CFLAGS -I/usr/kerberos/include"
-+    CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-+    AC_MSG_RESULT(yes)
-+else
-+    AC_MSG_RESULT(no)
-+fi
-+fi
-+
-+  # now check for krb5.h. Some systems have the libraries without the headers!
-+  # note that this check is done here to allow for different kerberos
-+  # include paths
-+  AC_CHECK_HEADERS(krb5.h)
-+
-+  # now check for gssapi headers.  This is also done here to allow for
-+  # different kerberos include paths
-+  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h)
-+
-+#dnl Check if we use GNU ld
-+#LD=ld
-+#AC_PROG_LD_GNU
-+
-+builddir=`pwd`
-+AC_SUBST(builddir)
-+
-+# Assume non-shared by default and override below
-+BLDSHARED="false"
-+
-+# these are the defaults, good for lots of systems
-+HOST_OS="$host_os"
-+LDSHFLAGS="-shared"
-+SONAMEFLAG="#"
-+SHLD="\${CC}"
-+PICFLAGS=""
-+PICSUFFIX="po"
-+SHLIBEXT="so"
-+
-+# Since we are not embedded in the Samba tree, building shared modules is
-+# really the only option.
-+enable_shared=yes
-+
-+if test "$enable_shared" = "yes"; then
-+  # this bit needs to be modified for each OS that is suported by
-+  # smbwrapper. You need to specify how to created a shared library and
-+  # how to compile C code to produce PIC object files
-+
-+  AC_MSG_CHECKING([ability to build shared libraries])
-+
-+  # and these are for particular systems
-+  case "$host_os" in
-+		*linux*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-shared" 
-+			DYNEXP="-Wl,--export-dynamic"
-+			PICFLAGS="-fPIC"
-+			SONAMEFLAG="-Wl,-soname="
-+			;;
-+		*solaris*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-G"
-+			SONAMEFLAG="-h "
-+			if test "${GCC}" = "yes"; then
-+				PICFLAGS="-fPIC"
-+				if test "${ac_cv_prog_gnu_ld}" = "yes"; then
-+					DYNEXP="-Wl,-E"
-+				fi
-+			else
-+				PICFLAGS="-KPIC"
-+				## ${CFLAGS} added for building 64-bit shared 
-+				## libs using Sun's Compiler
-+				LDSHFLAGS="-G \${CFLAGS}"
-+				PICSUFFIX="po.o"
-+			fi
-+			;;
-+		*sunos*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-G"
-+			SONAMEFLAG="-Wl,-h,"
-+			PICFLAGS="-KPIC"   # Is this correct for SunOS
-+			;;
-+		*netbsd* | *freebsd*)  BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			DYNEXP="-Wl,--export-dynamic"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAGS="-fPIC -DPIC"
-+			;;
-+		*openbsd*)  BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			DYNEXP="-Wl,-Bdynamic"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAGS="-fPIC"
-+			;;
-+		*irix*)
-+			case "$host_os" in
-+			*irix6*)
-+			;;
-+			esac
-+			ATTEMPT_WRAP32_BUILD=yes
-+			BLDSHARED="true"
-+			LDSHFLAGS="-set_version sgi1.0 -shared"
-+			SONAMEFLAG="-soname "
-+			SHLD="\${LD}"
-+			if test "${GCC}" = "yes"; then
-+				PICFLAGS="-fPIC"
-+			else 
-+				PICFLAGS="-KPIC"
-+			fi
-+			;;
-+		*aix*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-Wl,-bexpall,-bM:SRE,-bnoentry,-berok"
-+			DYNEXP="-Wl,-brtl,-bexpall"
-+			PICFLAGS="-O2"
-+			if test "${GCC}" != "yes"; then
-+				## for funky AIX compiler using strncpy()
-+				CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000"
-+			fi
-+			;;
-+		*hpux*)
-+			SHLIBEXT="sl"
-+			# Use special PIC flags for the native HP-UX compiler.
-+			if test $ac_cv_prog_cc_Ae = yes; then
-+				BLDSHARED="true"
-+				SHLD="/usr/bin/ld"
-+				LDSHFLAGS="-B symbolic -b -z"
-+				SONAMEFLAG="+h "
-+				PICFLAGS="+z"
-+			fi
-+			DYNEXP="-Wl,-E"
-+			;;
-+		*qnx*)
-+			;;
-+		*osf*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAGS="-fPIC"
-+			;;
-+		*sco*)
-+			;;
-+		*unixware*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAGS="-KPIC"
-+			;;
-+		*next2*)
-+			;;
-+		*dgux*) AC_CHECK_PROG( ROFF, groff, [groff -etpsR -Tascii -man])
-+			;;
-+		*sysv4*)
-+			case "$host" in
-+				*-univel-*)
-+					LDSHFLAGS="-G"
-+                             		DYNEXP="-Bexport"
-+				;;
-+				*mips-sni-sysv4*) 
-+				;;
-+			esac
-+			;;
-+
-+		*sysv5*)
-+			LDSHFLAGS="-G"
-+			;;
-+		*vos*)
-+			BLDSHARED="false"
-+			LDSHFLAGS=""
-+			;;
-+		*darwin*)
-+			BLDSHARED="true"
-+			LDSHFLAGS="-bundle -flat_namespace -undefined suppress"
-+			SHLIBEXT="dylib"
-+			;;
-+		*)
-+			;;
-+  esac
-+  AC_SUBST(DYNEXP)
-+  AC_MSG_RESULT($BLDSHARED)
-+  AC_MSG_CHECKING([linker flags for shared libraries])
-+  AC_MSG_RESULT([$LDSHFLAGS])
-+  AC_MSG_CHECKING([compiler flags for position-independent code])
-+  AC_MSG_RESULT([$PICFLAGS])
-+fi
-+
-+#######################################################
-+# test whether building a shared library actually works
-+if test $BLDSHARED = true; then
-+AC_CACHE_CHECK([whether building shared libraries actually works], 
-+               [ac_cv_shlib_works],[
-+   ac_cv_shlib_works=no
-+   # try building a trivial shared library
-+   if test "$PICSUFFIX" = "po"; then
-+     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${SAMBA_SOURCE}/../tests/shlib.c &&
-+       $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
-+       ac_cv_shlib_works=yes
-+   else
-+     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${SAMBA_SOURCE}/../tests/shlib.c &&
-+       mv shlib.$PICSUFFIX shlib.po &&
-+       $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
-+       ac_cv_shlib_works=yes
-+   fi
-+   rm -f "shlib.$SHLIBEXT" shlib.po
-+])
-+if test $ac_cv_shlib_works = no; then
-+   BLDSHARED=false
-+   AC_MSG_WARN([[Did you forget to specify --with-samba-source=/path/to/samba?]])
-+fi
-+fi
-+
-+
-+
-+
-+AC_OUTPUT(Makefile)
-diff --git a/examples/VFS/install-sh b/examples/VFS/install-sh
-new file mode 100644
-index 0000000..5871924
---- /dev/null
-+++ b/examples/VFS/install-sh
-@@ -0,0 +1,238 @@
-+#! /bin/sh
-+#
-+# install - install a program, script, or datafile
-+# This comes from X11R5.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.
-+#
-+
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit="${DOITPROG-}"
-+
-+
-+# put in absolute paths if you don't have them in your path; or use env. vars.
-+
-+mvprog="${MVPROG-mv}"
-+cpprog="${CPPROG-cp}"
-+chmodprog="${CHMODPROG-chmod}"
-+chownprog="${CHOWNPROG-chown}"
-+chgrpprog="${CHGRPPROG-chgrp}"
-+stripprog="${STRIPPROG-strip}"
-+rmprog="${RMPROG-rm}"
-+mkdirprog="${MKDIRPROG-mkdir}"
-+
-+transformbasename=""
-+transform_arg=""
-+instcmd="$mvprog"
-+chmodcmd="$chmodprog 0755"
-+chowncmd=""
-+chgrpcmd=""
-+stripcmd=""
-+rmcmd="$rmprog -f"
-+mvcmd="$mvprog"
-+src=""
-+dst=""
-+dir_arg=""
-+
-+while [ x"$1" != x ]; do
-+    case $1 in
-+	-c) instcmd="$cpprog"
-+	    shift
-+	    continue;;
-+
-+	-d) dir_arg=true
-+	    shift
-+	    continue;;
-+
-+	-m) chmodcmd="$chmodprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-o) chowncmd="$chownprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-g) chgrpcmd="$chgrpprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-s) stripcmd="$stripprog"
-+	    shift
-+	    continue;;
-+
-+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-+	    shift
-+	    continue;;
-+
-+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-+	    shift
-+	    continue;;
-+
-+	*)  if [ x"$src" = x ]
-+	    then
-+		src=$1
-+	    else
-+		# this colon is to work around a 386BSD /bin/sh bug
-+		:
-+		dst=$1
-+	    fi
-+	    shift
-+	    continue;;
-+    esac
-+done
-+
-+if [ x"$src" = x ]
-+then
-+	echo "install:	no input file specified"
-+	exit 1
-+else
-+	true
-+fi
-+
-+if [ x"$dir_arg" != x ]; then
-+	dst=$src
-+	src=""
-+	
-+	if [ -d $dst ]; then
-+		instcmd=:
-+	else
-+		instcmd=mkdir
-+	fi
-+else
-+
-+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-+# might cause directories to be created, which would be especially bad 
-+# if $src (and thus $dsttmp) contains '*'.
-+
-+	if [ -f $src -o -d $src ]
-+	then
-+		true
-+	else
-+		echo "install:  $src does not exist"
-+		exit 1
-+	fi
-+	
-+	if [ x"$dst" = x ]
-+	then
-+		echo "install:	no destination specified"
-+		exit 1
-+	else
-+		true
-+	fi
-+
-+# If destination is a directory, append the input filename; if your system
-+# does not like double slashes in filenames, you may need to add some logic
-+
-+	if [ -d $dst ]
-+	then
-+		dst="$dst"/`basename $src`
-+	else
-+		true
-+	fi
-+fi
-+
-+## this sed command emulates the dirname command
-+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+
-+# Make sure that the destination directory exists.
-+#  this part is taken from Noah Friedman's mkinstalldirs script
-+
-+# Skip lots of stat calls in the usual case.
-+if [ ! -d "$dstdir" ]; then
-+defaultIFS='	
-+'
-+IFS="${IFS-${defaultIFS}}"
-+
-+oIFS="${IFS}"
-+# Some sh's can't handle IFS=/ for some reason.
-+IFS='%'
-+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS="${oIFS}"
-+
-+pathcomp=''
-+
-+while [ $# -ne 0 ] ; do
-+	pathcomp="${pathcomp}${1}"
-+	shift
-+
-+	if [ ! -d "${pathcomp}" ] ;
-+        then
-+		$mkdirprog "${pathcomp}"
-+	else
-+		true
-+	fi
-+
-+	pathcomp="${pathcomp}/"
-+done
-+fi
-+
-+if [ x"$dir_arg" != x ]
-+then
-+	$doit $instcmd $dst &&
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-+else
-+
-+# If we're going to rename the final executable, determine the name now.
-+
-+	if [ x"$transformarg" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		dstfile=`basename $dst $transformbasename | 
-+			sed $transformarg`$transformbasename
-+	fi
-+
-+# don't allow the sed command to completely eliminate the filename
-+
-+	if [ x"$dstfile" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		true
-+	fi
-+
-+# Make a temp file name in the proper directory.
-+
-+	dsttmp=$dstdir/#inst.$$#
-+
-+# Move or copy the file name to the temp name
-+
-+	$doit $instcmd $src $dsttmp &&
-+
-+	trap "rm -f ${dsttmp}" 0 &&
-+
-+# and set any options; do chmod last to preserve setuid bits
-+
-+# If any of these fail, we abort the whole thing.  If we want to
-+# ignore errors from any of these, just make sure not to ignore
-+# errors from the above "$doit $instcmd $src $dsttmp" command.
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+
-+# Now rename the file to the real destination.
-+
-+	$doit $rmcmd -f $dstdir/$dstfile &&
-+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+
-+fi &&
-+
-+
-+exit 0
-
-From a7d3ee22801bf2e9578c7c0f6409699322cb65ef Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 06/19] Revert "build: Remove unused preproc-dummy.c"
-
-This reverts commit 11aab8a348af6ae825756f199ff592beb51f241c.
----
- source3/tests/preproc-dummy.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 source3/tests/preproc-dummy.c
-
-diff --git a/source3/tests/preproc-dummy.c b/source3/tests/preproc-dummy.c
-new file mode 100644
-index 0000000..78f2de1
---- /dev/null
-+++ b/source3/tests/preproc-dummy.c
-@@ -0,0 +1 @@
-+int main(void) { return 0; }
-
-From cb8f1bfe2dcedb9b62556d803ee50e860ba273a5 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 07/19] Revert "build: Remove unused uninstall*.sh scripts"
-
-This reverts commit 26ff1f2167c8f326c3ea17bc69ee927d58b5baf8.
----
- source3/script/uninstallbin.sh.in  | 41 ++++++++++++++++++++++++++++++++++++++
- source3/script/uninstalldat.sh     |  1 +
- source3/script/uninstallman.sh     | 37 ++++++++++++++++++++++++++++++++++
- source3/script/uninstallmo.sh      |  2 ++
- source3/script/uninstallmodules.sh | 39 ++++++++++++++++++++++++++++++++++++
- source3/script/uninstallmsg.sh     |  1 +
- source3/script/uninstallscripts.sh | 36 +++++++++++++++++++++++++++++++++
- source3/script/uninstallswat.sh    |  1 +
- 8 files changed, 158 insertions(+)
- create mode 100755 source3/script/uninstallbin.sh.in
- create mode 120000 source3/script/uninstalldat.sh
- create mode 100755 source3/script/uninstallman.sh
- create mode 100755 source3/script/uninstallmo.sh
- create mode 100755 source3/script/uninstallmodules.sh
- create mode 120000 source3/script/uninstallmsg.sh
- create mode 100755 source3/script/uninstallscripts.sh
- create mode 120000 source3/script/uninstallswat.sh
-
-diff --git a/source3/script/uninstallbin.sh.in b/source3/script/uninstallbin.sh.in
-new file mode 100755
-index 0000000..8064db8d
---- /dev/null
-+++ b/source3/script/uninstallbin.sh.in
-@@ -0,0 +1,41 @@
-+#!/bin/sh
-+#4 July 96 Dan.Shearer@UniSA.edu.au   
-+
-+INSTALLPERMS=$1
-+DESTDIR=$2
-+prefix=`echo $3 | sed 's/\/\//\//g'`
-+BINDIR=`echo $4 | sed 's/\/\//\//g'`
-+SBINDIR=@sbindir@
-+shift
-+shift
-+shift
-+shift
-+
-+if [ ! -d $DESTDIR/$BINDIR ]; then
-+  echo "Directory $DESTDIR/$BINDIR does not exist! "
-+  echo "Do a "make installbin" or "make install" first. "
-+  exit 1
-+fi
-+
-+for p in $*; do
-+  p2=`basename $p`
-+  if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-+    echo "Removing $DESTDIR/$BINDIR/$p2 "
-+    rm -f $DESTDIR/$BINDIR/$p2
-+    if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-+      echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? "
-+    fi
-+  fi
-+done
-+
-+
-+cat << EOF
-+======================================================================
-+The binaries have been uninstalled. You may restore the binaries using
-+the command "make installbin" or "make install" to install binaries, 
-+man pages, modules and shell scripts. You can restore a previous
-+version of the binaries (if there were any) using "make revert".
-+======================================================================
-+EOF
-+
-+exit 0
-diff --git a/source3/script/uninstalldat.sh b/source3/script/uninstalldat.sh
-new file mode 120000
-index 0000000..6561427
---- /dev/null
-+++ b/source3/script/uninstalldat.sh
-@@ -0,0 +1 @@
-+installdat.sh
-\ No newline at end of file
-diff --git a/source3/script/uninstallman.sh b/source3/script/uninstallman.sh
-new file mode 100755
-index 0000000..0fea11c
---- /dev/null
-+++ b/source3/script/uninstallman.sh
-@@ -0,0 +1,37 @@
-+#!/bin/sh
-+#4 July 96 Dan.Shearer@UniSA.edu.au
-+#
-+# 13 Aug 2001  Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>
-+#   modified to accomodate international man pages (inspired
-+#   by Japanese edition's approach)
-+
-+
-+MANDIR=`echo $1 | sed 's/\/\//\//g'`
-+SRCDIR=$2
-+langs=$3
-+
-+for lang in $langs; do
-+  echo Uninstalling \"$lang\" man pages from $MANDIR/$lang
-+
-+  for sect in 1 5 7 8 ; do
-+    for m in $MANDIR/$lang/man$sect ; do
-+      for s in $SRCDIR/../docs/manpages/$lang/*$sect; do
-+        FNAME=$m/`basename $s`
-+	if test -f $FNAME; then
-+	  echo Deleting $FNAME
-+	  rm -f $FNAME 
-+	  test -f $FNAME && echo Cannot remove $FNAME... does $USER have privileges?   
-+        fi
-+      done
-+    done
-+  done
-+done
-+
-+cat << EOF
-+======================================================================
-+The man pages have been uninstalled. You may install them again using 
-+the command "make installman" or make "install" to install binaries,
-+man pages and shell scripts.
-+======================================================================
-+EOF
-+exit 0
-diff --git a/source3/script/uninstallmo.sh b/source3/script/uninstallmo.sh
-new file mode 100755
-index 0000000..663c6b1
---- /dev/null
-+++ b/source3/script/uninstallmo.sh
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+script/installmo.sh
-diff --git a/source3/script/uninstallmodules.sh b/source3/script/uninstallmodules.sh
-new file mode 100755
-index 0000000..fc80565
---- /dev/null
-+++ b/source3/script/uninstallmodules.sh
-@@ -0,0 +1,39 @@
-+#!/bin/sh
-+#4 July 96 Dan.Shearer@UniSA.edu.au   
-+
-+INSTALLPERMS=$1
-+DESTDIR=$2
-+prefix=`echo $3 | sed 's/\/\//\//g'`
-+LIBDIR=`echo $4 | sed 's/\/\//\//g'`
-+shift
-+shift
-+shift
-+shift
-+
-+if [ ! -d $DESTDIR/$LIBDIR ]; then
-+  echo "Directory $DESTDIR/$LIBDIR does not exist! "
-+  echo "Do a "make installmodules" or "make install" first. "
-+  exit 1
-+fi
-+
-+for p in $*; do
-+  p2=`basename $p`
-+  if [ -f $DESTDIR/$LIBDIR/$p2 ]; then
-+    echo "Removing $DESTDIR/$LIBDIR/$p2 "
-+    rm -f $DESTDIR/$LIBDIR/$p2
-+    if [ -f $DESTDIR/$LIBDIR/$p2 ]; then
-+      echo "Cannot remove $DESTDIR/$LIBDIR/$p2 ... does $USER have privileges? "
-+    fi
-+  fi
-+done
-+
-+
-+cat << EOF
-+======================================================================
-+The modules have been uninstalled. You may restore the modules using
-+the command "make installmodules" or "make install" to install 
-+binaries, modules, man pages and shell scripts. 
-+======================================================================
-+EOF
-+
-+exit 0
-diff --git a/source3/script/uninstallmsg.sh b/source3/script/uninstallmsg.sh
-new file mode 120000
-index 0000000..c108fa4
---- /dev/null
-+++ b/source3/script/uninstallmsg.sh
-@@ -0,0 +1 @@
-+installmsg.sh
-\ No newline at end of file
-diff --git a/source3/script/uninstallscripts.sh b/source3/script/uninstallscripts.sh
-new file mode 100755
-index 0000000..cf7fd71
---- /dev/null
-+++ b/source3/script/uninstallscripts.sh
-@@ -0,0 +1,36 @@
-+#!/bin/sh
-+# 5 July 96 Dan.Shearer@UniSA.Edu.Au  - almost identical to uninstallbin.sh
-+
-+INSTALLPERMS=$1
-+BINDIR=`echo $2 | sed 's/\/\//\//g'`
-+
-+shift
-+shift
-+
-+if [ ! -d $BINDIR ]; then
-+  echo Directory $BINDIR does not exist!
-+  echo Do a "make installscripts" or "make install" first.
-+  exit 1
-+fi
-+
-+for p in $*; do
-+  p2=`basename $p`
-+  if [ -f $BINDIR/$p2 ]; then
-+    echo Removing $BINDIR/$p2
-+    rm -f $BINDIR/$p2
-+    if [ -f $BINDIR/$p2 ]; then
-+      echo Cannot remove $BINDIR/$p2 ... does $USER have privileges?
-+    fi
-+  fi
-+done
-+
-+cat << EOF
-+======================================================================
-+The scripts have been uninstalled. You may reinstall them using
-+the command "make installscripts" or "make install" to install binaries,
-+man pages and shell scripts. You may recover a previous version (if any
-+with "make revert".
-+======================================================================
-+EOF
-+
-+exit 0
-diff --git a/source3/script/uninstallswat.sh b/source3/script/uninstallswat.sh
-new file mode 120000
-index 0000000..0dffe64
---- /dev/null
-+++ b/source3/script/uninstallswat.sh
-@@ -0,0 +1 @@
-+installswat.sh
-\ No newline at end of file
-
-From d368380888bd511e9e8cd20ff9c530a16205be97 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 08/19] Revert "build: Remove unused install*.sh scripts"
-
-This reverts commit d98f1075443b7feedab0212e75366d502b20e17a.
----
- source3/script/installbin.sh.in  | 34 ++++++++++++++++
- source3/script/installdat.sh     | 65 ++++++++++++++++++++++++++++++
- source3/script/installdirs.sh    | 18 +++++++++
- source3/script/installman.sh     | 87 ++++++++++++++++++++++++++++++++++++++++
- source3/script/installmo.sh      | 87 ++++++++++++++++++++++++++++++++++++++++
- source3/script/installmodules.sh | 42 +++++++++++++++++++
- source3/script/installscripts.sh | 47 ++++++++++++++++++++++
- 7 files changed, 380 insertions(+)
- create mode 100755 source3/script/installbin.sh.in
- create mode 100755 source3/script/installdat.sh
- create mode 100755 source3/script/installdirs.sh
- create mode 100755 source3/script/installman.sh
- create mode 100755 source3/script/installmo.sh
- create mode 100755 source3/script/installmodules.sh
- create mode 100755 source3/script/installscripts.sh
-
-diff --git a/source3/script/installbin.sh.in b/source3/script/installbin.sh.in
-new file mode 100755
-index 0000000..c607d9e
---- /dev/null
-+++ b/source3/script/installbin.sh.in
-@@ -0,0 +1,34 @@
-+#!/bin/sh
-+
-+INSTALLPERMS=$1
-+DESTDIR=$2
-+prefix=`echo $3 | sed 's/\/\//\//g'`
-+BINDIR=`echo $4 | sed 's/\/\//\//g'`
-+SBINDIR=@sbindir@
-+shift
-+shift
-+shift
-+shift
-+
-+for p in $*; do
-+ p2=`basename $p`
-+ echo "Installing $p as $DESTDIR/$BINDIR/$p2 "
-+ if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-+   rm -f $DESTDIR/$BINDIR/$p2.old
-+   mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old
-+ fi
-+ cp $p $DESTDIR/$BINDIR/
-+ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
-+done
-+
-+
-+cat << EOF
-+======================================================================
-+The binaries are installed. You may restore the old binaries (if there
-+were any) using the command "make revert". You may uninstall the binaries
-+using the command "make uninstallbin" or "make uninstall" to uninstall
-+binaries, man pages and shell scripts.
-+======================================================================
-+EOF
-+
-+exit 0
-diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh
-new file mode 100755
-index 0000000..2cc3677
---- /dev/null
-+++ b/source3/script/installdat.sh
-@@ -0,0 +1,65 @@
-+#!/bin/sh
-+#fist version March 2002, Herb  Lewis
-+
-+DESTDIR=$1
-+DATDIR=`echo $2 | sed 's/\/\//\//g'`
-+SRCDIR=$3/
-+shift
-+shift
-+shift
-+
-+case $0 in
-+	*uninstall*)
-+		if test ! -d "$DESTDIR/$DATDIR"; then
-+			echo "Directory $DESTDIR/$DATDIR does not exist! "
-+			echo "Do a "make installmsg" or "make install" first. "
-+			exit 1
-+		fi
-+		mode='uninstall'
-+		;;
-+	*) mode='install' ;;    
-+esac
-+
-+for f in $SRCDIR/../codepages/*.dat; do
-+	FNAME="$DESTDIR/$DATDIR/`basename $f`"
-+	if test "$mode" = 'install'; then
-+		echo "Installing $f as $FNAME "
-+		cp "$f" "$FNAME"
-+		if test ! -f "$FNAME"; then
-+			echo "Cannot install $FNAME.  Does $USER have privileges? "
-+			exit 1
-+		fi
-+		chmod 0644 "$FNAME"
-+	elif test "$mode" = 'uninstall'; then
-+		echo "Removing $FNAME "
-+		rm -f "$FNAME"
-+		if test -f "$FNAME"; then
-+			echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+			exit 1
-+		fi
-+	else
-+		echo "Unknown mode, $mode.  Script called as $0 "
-+		exit 1
-+	fi
-+done
-+
-+if test "$mode" = 'install'; then
-+	cat << EOF
-+======================================================================
-+The dat files have been installed.  You may uninstall the dat files
-+using the command "make uninstalldat" or "make uninstall" to uninstall
-+binaries, man pages, dat files, and shell scripts.
-+======================================================================
-+EOF
-+else
-+	cat << EOF
-+======================================================================
-+The dat files have been removed.  You may restore these files using
-+the command "make installdat" or "make install" to install binaries, 
-+man pages, modules, dat files, and shell scripts.
-+======================================================================
-+EOF
-+fi
-+
-+exit 0
-+
-diff --git a/source3/script/installdirs.sh b/source3/script/installdirs.sh
-new file mode 100755
-index 0000000..062b34b
---- /dev/null
-+++ b/source3/script/installdirs.sh
-@@ -0,0 +1,18 @@
-+#!/bin/sh
-+
-+INSTALLPERMS=$1
-+DESTDIR=`echo $2 | sed 's/\/\//\//g'`
-+shift
-+shift
-+
-+for dir in $@; do
-+	DIRNAME=`echo $dir | sed 's/\/\//\//g'`
-+	if [ ! -d $DESTDIR/$DIRNAME ]; then
-+		mkdir -m $INSTALLPERMS -p $DESTDIR/$DIRNAME
-+	fi
-+
-+	if [ ! -d $DESTDIR/$DIRNAME ]; then
-+		echo "Failed to make directory $DESTDIR/$DIRNAME "
-+		exit 1
-+	fi
-+done
-diff --git a/source3/script/installman.sh b/source3/script/installman.sh
-new file mode 100755
-index 0000000..b029089
---- /dev/null
-+++ b/source3/script/installman.sh
-@@ -0,0 +1,87 @@
-+#!/bin/sh
-+#5 July 96 Dan.Shearer@unisa.edu.au  removed hardcoded values
-+#
-+# 13 Aug 2001  Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>
-+#   modified to accomodate international man pages (inspired
-+#   by Japanese edition's approach)
-+
-+MANDIR=`echo $1 | sed 's/\/\//\//g'`
-+SRCDIR=$2/
-+langs=$3
-+
-+if [ $# -ge 4 ] ; then
-+  GROFF=$4                    # sh cmd line, including options 
-+fi
-+
-+if test ! -d $SRCDIR../bin/docs/manpages; then
-+	echo "No manpages present.  Development version maybe?"
-+	exit 0
-+fi
-+
-+# Get the configured feature set
-+test -f "${SRCDIR}/config.log" && \
-+	eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log" |
-+	      grep -v ^MANDIR | grep -v ^SRCDIR`
-+
-+for lang in $langs; do
-+    if [ "X$lang" = XC ]; then
-+	echo Installing default man pages in $MANDIR/
-+	lang=.
-+    else
-+	echo Installing \"$lang\" man pages in $MANDIR/lang/$lang
-+    fi
-+
-+    langdir=$MANDIR/$lang
-+    for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
-+	if [ ! -d $d ]; then
-+	    mkdir $d
-+	    if [ ! -d $d ]; then
-+		echo Failed to make directory $d, does $USER have privileges?
-+		exit 1
-+	    fi
-+	fi
-+    done
-+
-+    for sect in 1 5 7 8 ; do
-+	for m in $langdir/man$sect ; do
-+	    for s in $SRCDIR../bin/docs/manpages/$lang/*$sect; do
-+	    MP_BASENAME=`basename $s`
-+
-+	    # Check if this man page if required by the configured feature set
-+	    case "${MP_BASENAME}" in
-+	    	smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
-+		*) ;;
-+	    esac
-+
-+	    FNAME="$m/${MP_BASENAME}"
-+
-+	    # Test for writability.  Involves 
-+	    # blowing away existing files.
-+ 
-+	    if (rm -f $FNAME && touch $FNAME); then
-+		if [ "x$GROFF" = x ] ; then
-+		    cp $s $m            # Copy raw nroff 
-+		else
-+		    echo "\t$FNAME"     # groff'ing can be slow, give the user
-+					#   a warm fuzzy.
-+		    $GROFF $s > $FNAME  # Process nroff, because man(1) (on
-+					#   this system) doesn't .
-+		fi
-+		chmod 0644 $FNAME
-+	    else
-+		echo Cannot create $FNAME... does $USER have privileges?
-+	    fi
-+	    done
-+	done
-+    done
-+done
-+cat << EOF
-+======================================================================
-+The man pages have been installed. You may uninstall them using the command
-+the command "make uninstallman" or make "uninstall" to uninstall binaries,
-+man pages and shell scripts.
-+======================================================================
-+EOF
-+
-+exit 0
-+
-diff --git a/source3/script/installmo.sh b/source3/script/installmo.sh
-new file mode 100755
-index 0000000..5ca3371
---- /dev/null
-+++ b/source3/script/installmo.sh
-@@ -0,0 +1,87 @@
-+#!/bin/sh
-+
-+DESTDIR=$1
-+LOCALEDIR=`echo $2 | sed 's/\/\//\//g'`
-+SRCDIR=$3/
-+MSGFMT=msgfmt
-+
-+case $0 in
-+	*uninstall*)
-+		if test ! -d "$DESTDIR/$LOCALEDIR"; then
-+			echo "Directory $DESTDIR/$LOCALEDIR doesn't exist!"
-+			echo "Do a \"make installmo\" or \"make install\" first."
-+			exit 1
-+		fi
-+		mode='uninstall'
-+	;;
-+	*)
-+		mode='install'
-+	;;
-+esac
-+
-+for dir in $SRCDIR/locale/*; do
-+	MODULE=`basename $dir`
-+	for f in $SRCDIR/locale/$MODULE/*.po; do
-+		BASE=`basename $f`
-+		LANGUAGE=`echo $BASE | sed 's/\.po//g'`
-+		if test "$LANGUAGE" = '*'; then
-+			echo "No .po file exists!"
-+			exit 0
-+		fi
-+		FNAME="$DESTDIR/$LOCALEDIR/$LANGUAGE/LC_MESSAGES/$MODULE.mo"
-+		if test ! -d "$DESTDIR/$LOCALEDIR/$LANGUAGE/LC_MESSAGES/"; then
-+			mkdir -p "$DESTDIR/$LOCALEDIR/$LANGUAGE/LC_MESSAGES/"
-+		fi
-+		if test "$mode" = 'install'; then
-+			echo "Installing $f as $FNAME"
-+			touch "$FNAME"
-+			$MSGFMT -f -o "$FNAME" "$f"
-+			if test ! -f "$FNAME"; then
-+				echo "Cannot install $FNAME. Does $USER have privileges?"
-+				exit 1
-+			fi
-+			chmod 0644 "$FNAME"
-+		elif test "$mode" = 'uninstall'; then
-+			echo "removing $FNAME"
-+			rm -f "$FNAME"
-+			if test -f "$FNAME"; then
-+				echo "Cannot remove $FNAME. Does $USER have privileges?"
-+				exit 1
-+			fi
-+		else
-+			echo "Unknown mode $mode. script called as $0."
-+			exit 1
-+		fi
-+	done
-+	if test "$mode" = 'install'; then
-+		cat << EOF
-+==============================================================
-+MO files for $MODULE are installed.
-+==============================================================
-+EOF
-+	else
-+		cat << EOF
-+==============================================================
-+MO files for $MODULE are removed.
-+==============================================================
-+EOF
-+	fi
-+done
-+
-+if test "$mode" = 'install'; then
-+	cat << EOF
-+==============================================================
-+All MO files for Samba are installed. You can use "make uninstall"
-+or "make uninstallmo" to remove them.
-+==============================================================
-+EOF
-+else
-+	cat << EOF
-+==============================================================
-+All MO files for Samba are removed. you can use "make install"
-+or "make installmo" to install them.
-+==============================================================
-+EOF
-+fi
-+
-+exit 0
-diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh
-new file mode 100755
-index 0000000..127091d
---- /dev/null
-+++ b/source3/script/installmodules.sh
-@@ -0,0 +1,42 @@
-+#!/bin/sh
-+
-+INSTALLPERMS=$1
-+DESTDIR=$2
-+prefix=`echo $3 | sed 's/\/\//\//g'`
-+LIBDIR=`echo $4 | sed 's/\/\//\//g'`
-+shift
-+shift
-+shift
-+shift
-+
-+for d in $prefix $LIBDIR; do
-+if [ ! -d $DESTDIR/$d ]; then
-+mkdir $DESTDIR/$d
-+if [ ! -d $DESTDIR/$d ]; then
-+  echo Failed to make directory $DESTDIR/$d
-+  exit 1
-+fi
-+fi
-+done
-+
-+# We expect the last component of LIBDIR to be the module type, eg. idmap,
-+# pdb. By stripping this from the installation name, you can have multiple
-+# modules of the same name but different types by creating eg. idmap_foo
-+# and pdb_foo. This makes the most sense for idmap and pdb module, where
-+# they need to be consistent.
-+mtype=`basename $LIBDIR`
-+
-+for p in $*; do
-+ p2=`basename $p`
-+ name=`echo $p2 | sed -es/${mtype}_//`
-+ echo Preserving old module as $DESTDIR/$LIBDIR/$name.old
-+ if [ -f $DESTDIR/$LIBDIR/$name ]; then
-+   rm -f $DESTDIR/$LIBDIR/$name.old
-+   mv $DESTDIR/$LIBDIR/$name $DESTDIR/$LIBDIR/$name.old
-+ fi
-+ echo Installing $p as $DESTDIR/$LIBDIR/$name
-+ cp -f $p $DESTDIR/$LIBDIR/$name
-+ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$name
-+done
-+
-+exit 0
-diff --git a/source3/script/installscripts.sh b/source3/script/installscripts.sh
-new file mode 100755
-index 0000000..81608c3
---- /dev/null
-+++ b/source3/script/installscripts.sh
-@@ -0,0 +1,47 @@
-+#!/bin/sh
-+# this script courtesy of James_K._Foote.PARC@xerox.com
-+# 5 July 96 Dan.Shearer@UniSA.Edu.Au  Don't hardcode script names, get from Make
-+
-+INSTALLPERMS=$1
-+BINDIR=`echo $2 | sed 's/\/\//\//g'`
-+
-+shift
-+shift
-+
-+echo Installing scripts in $BINDIR
-+
-+for d in $BINDIR; do
-+ if [ ! -d $d ]; then
-+  mkdir $d
-+  if [ ! -d $d ]; then
-+    echo Failed to make directory $d
-+    echo Have you run installbin first?
-+    exit 1
-+  fi
-+ fi
-+done
-+
-+for p in $*; do
-+  p2=`basename $p`
-+  echo Installing $BINDIR/$p2
-+  if [ -f $BINDIR/$p2 ]; then
-+    rm -f $BINDIR/$p2.old
-+    mv $BINDIR/$p2 $BINDIR/$p2.old
-+  fi
-+  cp $p $BINDIR/
-+  chmod $INSTALLPERMS $BINDIR/$p2
-+  if [ ! -f $BINDIR/$p2 ]; then
-+    echo Cannot copy $p2... does $USER have privileges?
-+  fi
-+done
-+
-+cat << EOF
-+======================================================================
-+The scripts have been installed. You may uninstall them using
-+the command "make uninstallscripts" or "make install" to install binaries,
-+man pages and shell scripts. You may recover the previous version (if any
-+by "make revert".
-+======================================================================
-+EOF
-+
-+exit 0
-
-From ea6354d5b1d39f01bbf105ce6eb1b69fb3429a14 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 09/19] Revert "build: Remove unused build_idl.sh"
-
-This reverts commit 167b8bddad24421a2e8fcf0e7647ef3296b1665c.
----
- source3/script/build_idl.sh | 60 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
- create mode 100755 source3/script/build_idl.sh
-
-diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
-new file mode 100755
-index 0000000..97e813e
---- /dev/null
-+++ b/source3/script/build_idl.sh
-@@ -0,0 +1,60 @@
-+#!/bin/sh
-+
-+if [ "$1" = "--full" ]; then
-+	FULL=1
-+	shift 1
-+else
-+	FULL=0
-+fi
-+
-+ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --client --samba3-ndr-server $PIDL_ARGS --"
-+IDL_FILES="$*"
-+
-+oldpwd=`pwd`
-+cd ${srcdir}
-+
-+[ -d $PIDL_OUTPUTDIR ] || mkdir -p $PIDL_OUTPUTDIR || exit 1
-+
-+PIDL="$PIDL $ARGS"
-+
-+if [ $FULL = 1 ]; then
-+	echo "Rebuilding all idl files"
-+	$PIDL $IDL_FILES || exit 1
-+	exit 0
-+fi
-+
-+##
-+## Find newer files rather than rebuild all of them
-+##
-+
-+list=""
-+for f in ${IDL_FILES}; do
-+        b=`basename $f .idl`
-+	outfiles="$b.h ndr_$b.h srv_$b.c"
-+	outfiles="$outfiles ndr_$b.c srv_$b.h"
-+
-+	for o in $outfiles; do
-+	    [ -f $PIDL_OUTPUTDIR/$o ] || {
-+		list="$list $f"
-+		break
-+	    }
-+	    test "`find $f -newer $PIDL_OUTPUTDIR/$o`" != "" && {
-+		list="$list $f"
-+		break
-+	    }
-+	done
-+done
-+
-+##
-+## generate the ndr stubs
-+##
-+
-+if [ "x$list" != x ]; then
-+	# echo "${PIDL} ${list}"
-+	$PIDL $list || exit 1
-+fi
-+
-+cd ${oldpwd}
-+
-+exit 0
-+
-
-From 259f0fcc84c2531bddf8af794e243007174d62f4 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 10/19] Revert "Remove lib/netapi autoconf build system, this
- is now build with waf"
-
-This reverts commit c5bde695683be4af68cf8eb876f88a307bf2fcd3.
----
- source3/lib/netapi/examples/Makefile.in | 364 ++++++++++++++++++++++++++++++++
- source3/lib/netapi/tests/Makefile.in    |  57 +++++
- 2 files changed, 421 insertions(+)
- create mode 100644 source3/lib/netapi/examples/Makefile.in
- create mode 100644 source3/lib/netapi/tests/Makefile.in
-
-diff --git a/source3/lib/netapi/examples/Makefile.in b/source3/lib/netapi/examples/Makefile.in
-new file mode 100644
-index 0000000..83a6754
---- /dev/null
-+++ b/source3/lib/netapi/examples/Makefile.in
-@@ -0,0 +1,364 @@
-+GTK_FLAGS=`pkg-config gtk+-2.0 --cflags`
-+GTK_LIBS=`pkg-config gtk+-2.0 --libs`
-+
-+KRB5LIBS=@KRB5_LIBS@
-+LDAP_LIBS=@LDAP_LIBS@
-+LIBS=@LIBS@ -lnetapi -ltdb -ltalloc
-+DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
-+CCFLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS)
-+CC=@CC@
-+PICFLAG=@PICFLAG@
-+LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
-+DYNEXP=@DYNEXP@
-+NETAPI_LIBS=$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+CMDLINE_LIBS=$(NETAPI_LIBS) @POPTLIBS@
-+
-+# Compile a source file.
-+COMPILE_CC = $(CC) -I. $(CCFLAGS) $(PICFLAG) -c $< -o $@
-+COMPILE = $(COMPILE_CC)
-+
-+PROGS = bin/getdc \
-+	bin/dsgetdc \
-+	bin/netdomjoin \
-+	bin/netdomjoin-gui \
-+	bin/getjoinableous \
-+	bin/getjoininformation \
-+	bin/rename_machine \
-+	bin/user_add \
-+	bin/user_del \
-+	bin/user_enum \
-+	bin/user_dispinfo \
-+	bin/user_chgpwd \
-+	bin/user_getinfo \
-+	bin/user_setinfo \
-+	bin/user_modalsget \
-+	bin/user_modalsset \
-+	bin/user_getgroups \
-+	bin/user_setgroups \
-+	bin/user_getlocalgroups \
-+	bin/group_add \
-+	bin/group_del \
-+	bin/group_enum \
-+	bin/group_setinfo \
-+	bin/group_getinfo \
-+	bin/group_adduser \
-+	bin/group_deluser \
-+	bin/group_getusers \
-+	bin/group_setusers \
-+	bin/localgroup_add \
-+	bin/localgroup_del \
-+	bin/localgroup_getinfo \
-+	bin/localgroup_setinfo \
-+	bin/localgroup_enum \
-+	bin/localgroup_addmembers \
-+	bin/localgroup_delmembers \
-+	bin/localgroup_setmembers \
-+	bin/localgroup_getmembers \
-+	bin/remote_tod \
-+	bin/server_getinfo \
-+	bin/share_add \
-+	bin/share_del \
-+	bin/share_enum \
-+	bin/share_getinfo \
-+	bin/share_setinfo \
-+	bin/file_close \
-+	bin/file_getinfo \
-+	bin/file_enum \
-+	bin/shutdown_init \
-+	bin/shutdown_abort \
-+	bin/netlogon_control \
-+	bin/netlogon_control2 \
-+	bin/nltest
-+
-+all: $(PROGS)
-+
-+MAKEDIR = || exec false; \
-+	  if test -d "$$dir"; then :; else \
-+	  echo mkdir "$$dir"; \
-+	  mkdir -p "$$dir" >/dev/null 2>&1 || \
-+	  test -d "$$dir" || \
-+	  mkdir "$$dir" || \
-+	  exec false; fi || exec false
-+
-+BINARY_PREREQS = bin/.dummy
-+
-+bin/.dummy:
-+	@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
-+	  dir=bin $(MAKEDIR); fi
-+	@: >> $@ || : > $@ # what a fancy emoticon!
-+
-+.c.o:
-+	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
-+	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
-+	@echo Compiling $*.c
-+	@$(COMPILE) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC)" 1>&2;\
-+		$(COMPILE_CC) >/dev/null 2>&1
-+
-+CMDLINE_OBJ = common.o
-+GETDC_OBJ = getdc/getdc.o $(CMDLINE_OBJ)
-+DSGETDC_OBJ = dsgetdc/dsgetdc.o $(CMDLINE_OBJ)
-+NETDOMJOIN_OBJ = join/netdomjoin.o $(CMDLINE_OBJ)
-+NETDOMJOIN_GUI_OBJ = netdomjoin-gui/netdomjoin-gui.o
-+GETJOINABLEOUS_OBJ = join/getjoinableous.o $(CMDLINE_OBJ)
-+GETJOININFORMATION_OBJ = join/getjoininformation.o $(CMDLINE_OBJ)
-+RENAMEMACHINE_OBJ = join/rename_machine.o $(CMDLINE_OBJ)
-+USERADD_OBJ = user/user_add.o $(CMDLINE_OBJ)
-+USERDEL_OBJ = user/user_del.o $(CMDLINE_OBJ)
-+USERENUM_OBJ = user/user_enum.o $(CMDLINE_OBJ)
-+USERDISPINFO_OBJ = user/user_dispinfo.o $(CMDLINE_OBJ)
-+USERCHGPWD_OBJ = user/user_chgpwd.o $(CMDLINE_OBJ)
-+USERGETINFO_OBJ = user/user_getinfo.o $(CMDLINE_OBJ)
-+USERSETINFO_OBJ = user/user_setinfo.o $(CMDLINE_OBJ)
-+USERMODALSGET_OBJ = user/user_modalsget.o $(CMDLINE_OBJ)
-+USERMODALSSET_OBJ = user/user_modalsset.o $(CMDLINE_OBJ)
-+USERGETGROUPS_OBJ = user/user_getgroups.o $(CMDLINE_OBJ)
-+USERSETGROUPS_OBJ = user/user_setgroups.o $(CMDLINE_OBJ)
-+USERGETLOCALGROUPS_OBJ = user/user_getlocalgroups.o $(CMDLINE_OBJ)
-+GROUPADD_OBJ = group/group_add.o $(CMDLINE_OBJ)
-+GROUPDEL_OBJ = group/group_del.o $(CMDLINE_OBJ)
-+GROUPENUM_OBJ = group/group_enum.o $(CMDLINE_OBJ)
-+GROUPSETINFO_OBJ = group/group_setinfo.o $(CMDLINE_OBJ)
-+GROUPGETINFO_OBJ = group/group_getinfo.o $(CMDLINE_OBJ)
-+GROUPADDUSER_OBJ = group/group_adduser.o $(CMDLINE_OBJ)
-+GROUPDELUSER_OBJ = group/group_deluser.o $(CMDLINE_OBJ)
-+GROUPGETUSERS_OBJ = group/group_getusers.o $(CMDLINE_OBJ)
-+GROUPSETUSERS_OBJ = group/group_setusers.o $(CMDLINE_OBJ)
-+LOCALGROUPADD_OBJ = localgroup/localgroup_add.o $(CMDLINE_OBJ)
-+LOCALGROUPDEL_OBJ = localgroup/localgroup_del.o $(CMDLINE_OBJ)
-+LOCALGROUPGETINFO_OBJ = localgroup/localgroup_getinfo.o $(CMDLINE_OBJ)
-+LOCALGROUPSETINFO_OBJ = localgroup/localgroup_setinfo.o $(CMDLINE_OBJ)
-+LOCALGROUPENUM_OBJ = localgroup/localgroup_enum.o $(CMDLINE_OBJ)
-+LOCALGROUPADDMEMBERS_OBJ = localgroup/localgroup_addmembers.o $(CMDLINE_OBJ)
-+LOCALGROUPDELMEMBERS_OBJ = localgroup/localgroup_delmembers.o $(CMDLINE_OBJ)
-+LOCALGROUPSETMEMBERS_OBJ = localgroup/localgroup_setmembers.o $(CMDLINE_OBJ)
-+LOCALGROUPGETMEMBERS_OBJ = localgroup/localgroup_getmembers.o $(CMDLINE_OBJ)
-+REMOTETOD_OBJ = server/remote_tod.o $(CMDLINE_OBJ)
-+SERVERGETINFO_OBJ = server/server_getinfo.o $(CMDLINE_OBJ)
-+SHAREADD_OBJ = share/share_add.o $(CMDLINE_OBJ)
-+SHAREDEL_OBJ = share/share_del.o $(CMDLINE_OBJ)
-+SHAREENUM_OBJ = share/share_enum.o $(CMDLINE_OBJ)
-+SHAREGETINFO_OBJ = share/share_getinfo.o $(CMDLINE_OBJ)
-+SHARESETINFO_OBJ = share/share_setinfo.o $(CMDLINE_OBJ)
-+FILECLOSE_OBJ = file/file_close.o $(CMDLINE_OBJ)
-+FILEGETINFO_OBJ = file/file_getinfo.o $(CMDLINE_OBJ)
-+FILEENUM_OBJ = file/file_enum.o $(CMDLINE_OBJ)
-+SHUTDOWNINIT_OBJ = shutdown/shutdown_init.o $(CMDLINE_OBJ)
-+SHUTDOWNABORT_OBJ = shutdown/shutdown_abort.o $(CMDLINE_OBJ)
-+NETLOGONCONTROL_OBJ = netlogon/netlogon_control.o $(CMDLINE_OBJ)
-+NETLOGONCONTROL2_OBJ = netlogon/netlogon_control2.o $(CMDLINE_OBJ)
-+NLTEST_OBJ = netlogon/nltest.o $(CMDLINE_OBJ)
-+
-+bin/getdc: $(BINARY_PREREQS) $(GETDC_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GETDC_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/dsgetdc: $(BINARY_PREREQS) $(DSGETDC_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(DSGETDC_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/getjoinableous: $(BINARY_PREREQS) $(GETJOINABLEOUS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GETJOINABLEOUS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/getjoininformation: $(BINARY_PREREQS) $(GETJOININFORMATION_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GETJOININFORMATION_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/rename_machine: $(BINARY_PREREQS) $(RENAMEMACHINE_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(RENAMEMACHINE_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/netdomjoin: $(BINARY_PREREQS) $(NETDOMJOIN_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(NETDOMJOIN_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/netdomjoin-gui: $(BINARY_PREREQS) $(NETDOMJOIN_GUI_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) $(GTK_FLAGS) -o $@ $(NETDOMJOIN_GUI_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(GTK_LIBS)
-+
-+bin/user_add: $(BINARY_PREREQS) $(USERADD_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERADD_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_del: $(BINARY_PREREQS) $(USERDEL_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERDEL_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_enum: $(BINARY_PREREQS) $(USERENUM_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERENUM_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_dispinfo: $(BINARY_PREREQS) $(USERDISPINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERDISPINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_chgpwd: $(BINARY_PREREQS) $(USERCHGPWD_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERCHGPWD_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_getinfo: $(BINARY_PREREQS) $(USERGETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERGETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_setinfo: $(BINARY_PREREQS) $(USERSETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERSETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_modalsget: $(BINARY_PREREQS) $(USERMODALSGET_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERMODALSGET_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_modalsset: $(BINARY_PREREQS) $(USERMODALSSET_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERMODALSSET_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_getgroups: $(BINARY_PREREQS) $(USERGETGROUPS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERGETGROUPS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_setgroups: $(BINARY_PREREQS) $(USERSETGROUPS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERSETGROUPS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/user_getlocalgroups: $(BINARY_PREREQS) $(USERGETLOCALGROUPS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(USERGETLOCALGROUPS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_add: $(BINARY_PREREQS) $(GROUPADD_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPADD_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_del: $(BINARY_PREREQS) $(GROUPDEL_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPDEL_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_enum: $(BINARY_PREREQS) $(GROUPENUM_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPENUM_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_setinfo: $(BINARY_PREREQS) $(GROUPSETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPSETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_getinfo: $(BINARY_PREREQS) $(GROUPGETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPGETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_adduser: $(BINARY_PREREQS) $(GROUPADDUSER_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPADDUSER_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_deluser: $(BINARY_PREREQS) $(GROUPDELUSER_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPDELUSER_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_getusers: $(BINARY_PREREQS) $(GROUPGETUSERS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPGETUSERS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/group_setusers: $(BINARY_PREREQS) $(GROUPSETUSERS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(GROUPSETUSERS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_add: $(BINARY_PREREQS) $(LOCALGROUPADD_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPADD_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_del: $(BINARY_PREREQS) $(LOCALGROUPDEL_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPDEL_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_getinfo: $(BINARY_PREREQS) $(LOCALGROUPGETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPGETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_setinfo: $(BINARY_PREREQS) $(LOCALGROUPSETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPSETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_enum: $(BINARY_PREREQS) $(LOCALGROUPENUM_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPENUM_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_addmembers: $(BINARY_PREREQS) $(LOCALGROUPADDMEMBERS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPADDMEMBERS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_delmembers: $(BINARY_PREREQS) $(LOCALGROUPDELMEMBERS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPDELMEMBERS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_setmembers: $(BINARY_PREREQS) $(LOCALGROUPSETMEMBERS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPSETMEMBERS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/localgroup_getmembers: $(BINARY_PREREQS) $(LOCALGROUPGETMEMBERS_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(LOCALGROUPGETMEMBERS_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/remote_tod: $(BINARY_PREREQS) $(REMOTETOD_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(REMOTETOD_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/server_getinfo: $(BINARY_PREREQS) $(SERVERGETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SERVERGETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/share_add: $(BINARY_PREREQS) $(SHAREADD_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHAREADD_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/share_del: $(BINARY_PREREQS) $(SHAREDEL_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHAREDEL_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/share_enum: $(BINARY_PREREQS) $(SHAREENUM_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHAREENUM_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/share_getinfo: $(BINARY_PREREQS) $(SHAREGETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHAREGETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/share_setinfo: $(BINARY_PREREQS) $(SHARESETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHARESETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/file_close: $(BINARY_PREREQS) $(FILECLOSE_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(FILECLOSE_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/file_getinfo: $(BINARY_PREREQS) $(FILEGETINFO_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(FILEGETINFO_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/file_enum: $(BINARY_PREREQS) $(FILEENUM_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(FILEENUM_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/shutdown_init: $(BINARY_PREREQS) $(SHUTDOWNINIT_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHUTDOWNINIT_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/shutdown_abort: $(BINARY_PREREQS) $(SHUTDOWNABORT_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(SHUTDOWNABORT_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/netlogon_control: $(BINARY_PREREQS) $(NETLOGONCONTROL_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(NETLOGONCONTROL_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/netlogon_control2: $(BINARY_PREREQS) $(NETLOGONCONTROL2_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(NETLOGONCONTROL2_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+bin/nltest: $(BINARY_PREREQS) $(NLTEST_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(NLTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+clean:
-+	-rm -f $(PROGS)
-+	-rm -f core */*~ *~ \
-+		*/*.o */*/*.o */*/*/*.o
-diff --git a/source3/lib/netapi/tests/Makefile.in b/source3/lib/netapi/tests/Makefile.in
-new file mode 100644
-index 0000000..298d09c
---- /dev/null
-+++ b/source3/lib/netapi/tests/Makefile.in
-@@ -0,0 +1,57 @@
-+KRB5LIBS=@KRB5_LIBS@
-+LDAP_LIBS=@LDAP_LIBS@
-+LIBS=@LIBS@ -lnetapi -ltdb -ltalloc
-+DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
-+CCFLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS)
-+CC=@CC@
-+PICFLAG=@PICFLAG@
-+LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
-+DYNEXP=@DYNEXP@
-+NETAPI_LIBS=$(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-+CMDLINE_LIBS=$(NETAPI_LIBS) @POPTLIBS@
-+
-+# Compile a source file.
-+COMPILE_CC = $(CC) -I. $(CCFLAGS) $(PICFLAG) -c $< -o $@
-+COMPILE = $(COMPILE_CC)
-+
-+PROGS = bin/netapitest
-+
-+all: $(PROGS)
-+
-+MAKEDIR = || exec false; \
-+	  if test -d "$$dir"; then :; else \
-+	  echo mkdir "$$dir"; \
-+	  mkdir -p "$$dir" >/dev/null 2>&1 || \
-+	  test -d "$$dir" || \
-+	  mkdir "$$dir" || \
-+	  exec false; fi || exec false
-+
-+BINARY_PREREQS = bin/.dummy
-+
-+bin/.dummy:
-+	@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
-+	  dir=bin $(MAKEDIR); fi
-+	@: >> $@ || : > $@ # what a fancy emoticon!
-+
-+.c.o:
-+	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
-+	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
-+	@echo Compiling $*.c
-+	@$(COMPILE) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC)" 1>&2;\
-+		$(COMPILE_CC) >/dev/null 2>&1
-+
-+CMDLINE_OBJ = common.o
-+NETAPIBUFFER_OBJ = netapibuffer.o
-+NETAPITEST_OBJ = netapitest.o netlocalgroup.o netuser.o netgroup.o netdisplay.o netshare.o netfile.o netserver.o $(CMDLINE_OBJ)
-+
-+bin/netapitest: $(BINARY_PREREQS) $(NETAPITEST_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(CCFLAGS) -o $@ $(NETAPITEST_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS)
-+
-+clean:
-+	-rm -f $(PROGS)
-+	-rm -f core */*~ *~ \
-+		*/*.o */*/*.o */*/*/*.o
-+
-
-From d48ecdcd4ddd29931cf36dccc53a4120bf5c99fa Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 11/19] Revert "build: Remove unused build_idl.sh"
-
-This reverts commit 87049bf32fa069916800316366cc577116b9d703.
----
- librpc/build_idl.sh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 67 insertions(+)
- create mode 100755 librpc/build_idl.sh
-
-diff --git a/librpc/build_idl.sh b/librpc/build_idl.sh
-new file mode 100755
-index 0000000..f5901db
---- /dev/null
-+++ b/librpc/build_idl.sh
-@@ -0,0 +1,67 @@
-+#!/bin/sh
-+
-+if [ "$1" = "--full" ]; then
-+	FULL=1
-+	shift 1
-+else
-+	FULL=0
-+fi
-+
-+ARGS="--outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --server --client --python --dcom-proxy --com-header $PIDL_ARGS --"
-+IDL_FILES="$*"
-+
-+oldpwd=`pwd`
-+cd ${srcdir}
-+
-+[ -d $PIDL_OUTPUTDIR ] || mkdir -p $PIDL_OUTPUTDIR || exit 1
-+
-+PIDL_DIR=`dirname $PIDL`
-+PIDL_CMD="$PIDL $ARGS"
-+
-+if [ $FULL = 1 ]; then
-+	echo "Rebuilding all idl files"
-+	$PIDL_CMD $IDL_FILES || exit 1
-+	exit 0
-+fi
-+
-+##
-+## Find newer files rather than rebuild all of them. Also handle the case
-+## where the pidl compiler itself is newer.
-+##
-+PIDL_NEWEST=`find $PIDL_DIR -type f -print | xargs ls -rt | tail -1`
-+echo "jfyi: PIDL_NEWEST is $PIDL_NEWEST"
-+
-+list=""
-+for f in ${IDL_FILES}; do
-+        b=`basename $f .idl`
-+	outfiles="$b.h ndr_${b}_c.c ndr_$b.h ndr_${b}_s.c srv_$b.c"
-+	outfiles="$outfiles ndr_$b.c ndr_${b}_c.h py_$b.c srv_$b.h"
-+
-+	for o in $outfiles; do
-+	    [ -f $PIDL_OUTPUTDIR/$o ] || {
-+		list="$list $f"
-+		break
-+	    }
-+	    test "`find $f -newer $PIDL_OUTPUTDIR/$o`" != "" && {
-+		list="$list $f"
-+		break
-+	    }
-+	    test "`find $PIDL_NEWEST -newer $PIDL_OUTPUTDIR/$o`" != "" && {
-+		list="$list $f"
-+		break
-+	    }
-+	done
-+done
-+
-+##
-+## generate the ndr stubs
-+##
-+
-+if [ "x$list" != x ]; then
-+	# echo "${PIDL_CMD} ${list}"
-+	$PIDL_CMD $list || exit 1
-+fi
-+
-+cd ${oldpwd}
-+
-+exit 0
-
-From 9ed86b598d6672989cfeac700fbff8fdfd761602 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 12/19] Revert "Remove stub ldb_version.h and
- source3/include/autoconf as no longer needed"
-
-This reverts commit 8bcaa145f23e606f4b850fe7147192a6fec11c2d.
----
- source3/include/autoconf/README        | 5 +++++
- source3/include/autoconf/ldb_version.h | 4 ++++
- 2 files changed, 9 insertions(+)
- create mode 100644 source3/include/autoconf/README
- create mode 100644 source3/include/autoconf/ldb_version.h
-
-diff --git a/source3/include/autoconf/README b/source3/include/autoconf/README
-new file mode 100644
-index 0000000..21afbc7
---- /dev/null
-+++ b/source3/include/autoconf/README
-@@ -0,0 +1,5 @@
-+This directory added so that the autoconf build can generate a
-+config.h in a location that the recursive waf build for smbtorture
-+won't find.
-+
-+Andrew Bartlett
-\ No newline at end of file
-diff --git a/source3/include/autoconf/ldb_version.h b/source3/include/autoconf/ldb_version.h
-new file mode 100644
-index 0000000..e1c1afc
---- /dev/null
-+++ b/source3/include/autoconf/ldb_version.h
-@@ -0,0 +1,4 @@
-+
-+/* This define and header file is needed so we can include ldb.h
-+ * without building ldb properly */
-+#define LDB_VERSION "dummy ldb version for ldb.h without ldb"
-
-From fd577e8ec222f7e10823c8f3b64a3de8401bae61 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 13/19] Revert "build: Remove autoconf directory no longer
- needed"
-
-This reverts commit 8b2590c311ad24f809a5b27d2a408b6e9338db1d.
----
- source3/autoconf/lib/param/README      | 3 +++
- source3/autoconf/librpc/gen_ndr/README | 7 +++++++
- source3/autoconf/source3/param/README  | 3 +++
- 3 files changed, 13 insertions(+)
- create mode 100644 source3/autoconf/lib/param/README
- create mode 100644 source3/autoconf/librpc/gen_ndr/README
- create mode 100644 source3/autoconf/source3/param/README
-
-diff --git a/source3/autoconf/lib/param/README b/source3/autoconf/lib/param/README
-new file mode 100644
-index 0000000..2d7cf01
---- /dev/null
-+++ b/source3/autoconf/lib/param/README
-@@ -0,0 +1,3 @@
-+This file denoates the output location of perl-generated files that we need for loadparm.
-+
-+To ensure no conflict between waf and autoconf, we generate the files here.
-\ No newline at end of file
-diff --git a/source3/autoconf/librpc/gen_ndr/README b/source3/autoconf/librpc/gen_ndr/README
-new file mode 100644
-index 0000000..7406284
---- /dev/null
-+++ b/source3/autoconf/librpc/gen_ndr/README
-@@ -0,0 +1,7 @@
-+This is the output directory for PIDL generated files in the autoconf
-+build.  This is a directory that WAF does not know about, and so will
-+not cause problems when we make a release that must also have
-+source3/autogen.sh pre-run.
-+
-+(Waf doesn't like files it expects to generate to already be in the
-+build tree).
-\ No newline at end of file
-diff --git a/source3/autoconf/source3/param/README b/source3/autoconf/source3/param/README
-new file mode 100644
-index 0000000..2d7cf01
---- /dev/null
-+++ b/source3/autoconf/source3/param/README
-@@ -0,0 +1,3 @@
-+This file denoates the output location of perl-generated files that we need for loadparm.
-+
-+To ensure no conflict between waf and autoconf, we generate the files here.
-\ No newline at end of file
-
-From 9557b98f0821a6f7c0eb81368a29885aaf5f1598 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 14/19] Revert "build: Remove unused script/mkversion.sh"
-
-This reverts commit 0b5c23b5220faaf7d04e70773a0f74746486068b.
----
- source3/script/mkversion.sh | 150 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 150 insertions(+)
- create mode 100755 source3/script/mkversion.sh
-
-diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
-new file mode 100755
-index 0000000..eba8f9e
---- /dev/null
-+++ b/source3/script/mkversion.sh
-@@ -0,0 +1,150 @@
-+#!/bin/sh
-+
-+VERSION_FILE=$1
-+OUTPUT_FILE=$2
-+
-+if test -z "$VERSION_FILE";then
-+	VERSION_FILE="../VERSION"
-+fi
-+
-+if test -z "$OUTPUT_FILE";then
-+	OUTPUT_FILE="include/autoconf/version.h"
-+fi
-+
-+SOURCE_DIR=$3
-+
-+SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_BETA_RELEASE=`sed -n 's/^SAMBA_VERSION_BETA_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+SAMBA_VERSION_IS_GIT_SNAPSHOT=`sed -n 's/^SAMBA_VERSION_IS_GIT_SNAPSHOT=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+SAMBA_VERSION_RELEASE_NICKNAME=`sed -n 's/^SAMBA_VERSION_RELEASE_NICKNAME=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+SAMBA_VERSION_VENDOR_SUFFIX=`sed -n 's/^SAMBA_VERSION_VENDOR_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE`
-+SAMBA_VERSION_VENDOR_PATCH=`sed -n 's/^SAMBA_VERSION_VENDOR_PATCH=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+SAMBA_VERSION_VENDOR_FUNCTION=`sed -n 's/^SAMBA_VERSION_VENDOR_FUNCTION=//p' $SOURCE_DIR$VERSION_FILE`
-+
-+echo "/* Autogenerated by script/mkversion.sh */" > $OUTPUT_FILE
-+
-+echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE
-+echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE
-+echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
-+
-+
-+##
-+## start with "3.0.22"
-+##
-+SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
-+
-+
-+##
-+## maybe add "3.0.22a" or "4.0.0tp11" or "3.0.22pre1" or "3.0.22rc1"
-+## We do not do pre or rc version on patch/letter releases
-+##
-+if test -n "${SAMBA_VERSION_REVISION}";then
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
-+    echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >> $OUTPUT_FILE
-+elif test -n "${SAMBA_VERSION_TP_RELEASE}";then
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}tp${SAMBA_VERSION_TP_RELEASE}"
-+    echo "#define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}" >> $OUTPUT_FILE
-+elif test -n "${SAMBA_VERSION_BETA_RELEASE}";then
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}beta${SAMBA_VERSION_BETA_RELEASE}"
-+    echo "#define SAMBA_VERSION_BETA_RELEASE ${SAMBA_VERSION_BETA_RELEASE}" >> $OUTPUT_FILE
-+elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
-+    ## maybe add "3.0.22pre2"
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"
-+    echo "#define SAMBA_VERSION_PRE_RELEASE ${SAMBA_VERSION_PRE_RELEASE}" >> $OUTPUT_FILE
-+elif test -n "${SAMBA_VERSION_RC_RELEASE}";then
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}rc${SAMBA_VERSION_RC_RELEASE}"
-+    echo "#define SAMBA_VERSION_RC_RELEASE ${SAMBA_VERSION_RC_RELEASE}" >> $OUTPUT_FILE
-+fi
-+
-+##
-+## GIT commit details
-+##
-+if test x"${SAMBA_VERSION_IS_GIT_SNAPSHOT}" = x"yes";then
-+    _SAVE_LANG=${LANG}
-+    LANG="C"
-+    HAVEVER="no"
-+
-+    if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.git";then
-+	HAVEGIT=no
-+	GIT_INFO=`git show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD 2>/dev/null`
-+	GIT_COMMIT_ABBREV=`printf "%s" "${GIT_INFO}" | sed -n 1p`
-+	COMMIT_TIME=`printf "%s" "${GIT_INFO}" | sed -n 2p`
-+	GIT_COMMIT_FULLREV=`printf "%s" "${GIT_INFO}" | sed -n 3p`
-+	COMMIT_DATE=`printf "%s" "${GIT_INFO}" | sed -n 4p`
-+	if test -n "${GIT_COMMIT_ABBREV}";then
-+	    HAVEGIT=yes
-+            HAVEVER=yes
-+	fi
-+    fi
-+
-+    if test x"${HAVEGIT}" = x"yes";then
-+	SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-GIT-${GIT_COMMIT_ABBREV}"
-+
-+	echo "#define SAMBA_VERSION_GIT_COMMIT_ABBREV \"${GIT_COMMIT_ABBREV}\"" >> $OUTPUT_FILE
-+	echo "#define SAMBA_VERSION_COMMIT_TIME ${COMMIT_TIME}" >> $OUTPUT_FILE
-+	echo "#define SAMBA_VERSION_GIT_COMMIT_FULLREV \"${GIT_COMMIT_FULLREV}\"" >> $OUTPUT_FILE
-+	echo "#define SAMBA_VERSION_COMMIT_DATE \"${COMMIT_DATE}\"" >> $OUTPUT_FILE
-+    else
-+	SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-GIT-UNKNOWN"
-+    fi
-+    LANG=${_SAVE_LANG}
-+fi
-+
-+echo "#define SAMBA_VERSION_OFFICIAL_STRING \"${SAMBA_VERSION_STRING}\"" >> $OUTPUT_FILE
-+
-+##
-+## Add the vendor string if present
-+##
-+if test -n "${SAMBA_VERSION_VENDOR_FUNCTION}"; then
-+  echo "#define SAMBA_VERSION_VENDOR_FUNCTION ${SAMBA_VERSION_VENDOR_FUNCTION}" >> $OUTPUT_FILE
-+fi
-+
-+if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-+    echo "#define SAMBA_VERSION_VENDOR_SUFFIX \"${SAMBA_VERSION_VENDOR_SUFFIX}\"" >> $OUTPUT_FILE
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}"
-+    if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then
-+        echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE
-+        echo "#define SAMBA_VERSION_VENDOR_PATCH_STRING \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE
-+        SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}"
-+    fi
-+fi
-+
-+##
-+## Add a release nickname
-+##
-+if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
-+    echo "#define SAMBA_VERSION_RELEASE_NICKNAME \"${SAMBA_VERSION_RELEASE_NICKNAME}\"" >> $OUTPUT_FILE
-+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING} (${SAMBA_VERSION_RELEASE_NICKNAME})"
-+fi
-+
-+cat >>$OUTPUT_FILE<<CEOF
-+#ifdef SAMBA_VERSION_VENDOR_FUNCTION
-+#  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
-+#else /* SAMBA_VERSION_VENDOR_FUNCTION */
-+#  ifdef SAMBA_VERSION_VENDOR_SUFFIX
-+#    ifdef SAMBA_VERSION_VENDOR_PATCH
-+#      define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX "-" SAMBA_VERSION_VENDOR_PATCH_STRING
-+#    else /* SAMBA_VERSION_VENDOR_PATCH */
-+#      define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX
-+#    endif /* SAMBA_VERSION_VENDOR_SUFFIX */
-+#  else /* SAMBA_VERSION_VENDOR_FUNCTION */
-+#    define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING
-+#  endif
-+#endif
-+CEOF
-+
-+echo "$0: '$OUTPUT_FILE' created for Samba(\"${SAMBA_VERSION_STRING}\")"
-+
-+exit 0
-
-From 92f1f9b5887f433865b8694bded469d8bbd73e16 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 15/19] Revert "build: Remove unused install-sh"
-
-This reverts commit a768e6b0f89a1395dbce1dde73c001c2bde1fc99.
----
- source3/install-sh | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 238 insertions(+)
- create mode 100755 source3/install-sh
-
-diff --git a/source3/install-sh b/source3/install-sh
-new file mode 100755
-index 0000000..5871924
---- /dev/null
-+++ b/source3/install-sh
-@@ -0,0 +1,238 @@
-+#! /bin/sh
-+#
-+# install - install a program, script, or datafile
-+# This comes from X11R5.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.
-+#
-+
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit="${DOITPROG-}"
-+
-+
-+# put in absolute paths if you don't have them in your path; or use env. vars.
-+
-+mvprog="${MVPROG-mv}"
-+cpprog="${CPPROG-cp}"
-+chmodprog="${CHMODPROG-chmod}"
-+chownprog="${CHOWNPROG-chown}"
-+chgrpprog="${CHGRPPROG-chgrp}"
-+stripprog="${STRIPPROG-strip}"
-+rmprog="${RMPROG-rm}"
-+mkdirprog="${MKDIRPROG-mkdir}"
-+
-+transformbasename=""
-+transform_arg=""
-+instcmd="$mvprog"
-+chmodcmd="$chmodprog 0755"
-+chowncmd=""
-+chgrpcmd=""
-+stripcmd=""
-+rmcmd="$rmprog -f"
-+mvcmd="$mvprog"
-+src=""
-+dst=""
-+dir_arg=""
-+
-+while [ x"$1" != x ]; do
-+    case $1 in
-+	-c) instcmd="$cpprog"
-+	    shift
-+	    continue;;
-+
-+	-d) dir_arg=true
-+	    shift
-+	    continue;;
-+
-+	-m) chmodcmd="$chmodprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-o) chowncmd="$chownprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-g) chgrpcmd="$chgrpprog $2"
-+	    shift
-+	    shift
-+	    continue;;
-+
-+	-s) stripcmd="$stripprog"
-+	    shift
-+	    continue;;
-+
-+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-+	    shift
-+	    continue;;
-+
-+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-+	    shift
-+	    continue;;
-+
-+	*)  if [ x"$src" = x ]
-+	    then
-+		src=$1
-+	    else
-+		# this colon is to work around a 386BSD /bin/sh bug
-+		:
-+		dst=$1
-+	    fi
-+	    shift
-+	    continue;;
-+    esac
-+done
-+
-+if [ x"$src" = x ]
-+then
-+	echo "install:	no input file specified"
-+	exit 1
-+else
-+	true
-+fi
-+
-+if [ x"$dir_arg" != x ]; then
-+	dst=$src
-+	src=""
-+	
-+	if [ -d $dst ]; then
-+		instcmd=:
-+	else
-+		instcmd=mkdir
-+	fi
-+else
-+
-+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-+# might cause directories to be created, which would be especially bad 
-+# if $src (and thus $dsttmp) contains '*'.
-+
-+	if [ -f $src -o -d $src ]
-+	then
-+		true
-+	else
-+		echo "install:  $src does not exist"
-+		exit 1
-+	fi
-+	
-+	if [ x"$dst" = x ]
-+	then
-+		echo "install:	no destination specified"
-+		exit 1
-+	else
-+		true
-+	fi
-+
-+# If destination is a directory, append the input filename; if your system
-+# does not like double slashes in filenames, you may need to add some logic
-+
-+	if [ -d $dst ]
-+	then
-+		dst="$dst"/`basename $src`
-+	else
-+		true
-+	fi
-+fi
-+
-+## this sed command emulates the dirname command
-+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+
-+# Make sure that the destination directory exists.
-+#  this part is taken from Noah Friedman's mkinstalldirs script
-+
-+# Skip lots of stat calls in the usual case.
-+if [ ! -d "$dstdir" ]; then
-+defaultIFS='	
-+'
-+IFS="${IFS-${defaultIFS}}"
-+
-+oIFS="${IFS}"
-+# Some sh's can't handle IFS=/ for some reason.
-+IFS='%'
-+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS="${oIFS}"
-+
-+pathcomp=''
-+
-+while [ $# -ne 0 ] ; do
-+	pathcomp="${pathcomp}${1}"
-+	shift
-+
-+	if [ ! -d "${pathcomp}" ] ;
-+        then
-+		$mkdirprog "${pathcomp}"
-+	else
-+		true
-+	fi
-+
-+	pathcomp="${pathcomp}/"
-+done
-+fi
-+
-+if [ x"$dir_arg" != x ]
-+then
-+	$doit $instcmd $dst &&
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-+else
-+
-+# If we're going to rename the final executable, determine the name now.
-+
-+	if [ x"$transformarg" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		dstfile=`basename $dst $transformbasename | 
-+			sed $transformarg`$transformbasename
-+	fi
-+
-+# don't allow the sed command to completely eliminate the filename
-+
-+	if [ x"$dstfile" = x ] 
-+	then
-+		dstfile=`basename $dst`
-+	else
-+		true
-+	fi
-+
-+# Make a temp file name in the proper directory.
-+
-+	dsttmp=$dstdir/#inst.$$#
-+
-+# Move or copy the file name to the temp name
-+
-+	$doit $instcmd $src $dsttmp &&
-+
-+	trap "rm -f ${dsttmp}" 0 &&
-+
-+# and set any options; do chmod last to preserve setuid bits
-+
-+# If any of these fail, we abort the whole thing.  If we want to
-+# ignore errors from any of these, just make sure not to ignore
-+# errors from the above "$doit $instcmd $src $dsttmp" command.
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+
-+# Now rename the file to the real destination.
-+
-+	$doit $rmcmd -f $dstdir/$dstfile &&
-+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+
-+fi &&
-+
-+
-+exit 0
-
-From 803b0468150d87ccc90441a90c25c277305ba7b7 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 16/19] Revert "build: Remove autoconf build system"
-
-This reverts commit cd4b413cb0574c459c1c24cf07f8d6b44f5fc077.
----
- dynconfig/config.m4                 |  299 ++
- lib/ccan/libccan.m4                 |  363 ++
- lib/iniparser_build/config.m4       |   45 +
- lib/nss_wrapper/config.m4           |   19 +
- lib/ntdb/libntdb.m4                 |   41 +
- lib/popt/libpopt.m4                 |   43 +
- lib/popt/samba.m4                   |    8 +
- lib/replace/crypt.m4                |    6 +
- lib/replace/dlfcn.m4                |   31 +
- lib/replace/libreplace.m4           |  490 +++
- lib/replace/libreplace_cc.m4        |  197 ++
- lib/replace/libreplace_ld.m4        |  337 ++
- lib/replace/libreplace_macros.m4    |  347 ++
- lib/replace/libreplace_network.m4   |  503 +++
- lib/replace/repdir.m4               |   81 +
- lib/replace/strptime.m4             |   16 +
- lib/replace/system/config.m4        |  145 +
- lib/replace/timegm.m4               |    1 +
- lib/replace/win32.m4                |   20 +
- lib/socket_wrapper/config.m4        |   22 +
- lib/talloc/compat/talloc_compat1.m4 |   14 +
- lib/talloc/libtalloc.m4             |   38 +
- lib/tdb/libtdb.m4                   |   41 +
- lib/tevent/libtevent.m4             |   75 +
- lib/uid_wrapper/config.m4           |   19 +
- lib/zlib/zlib.m4                    |   29 +
- m4/check_make.m4                    |   33 +
- m4/check_perl.m4                    |   32 +
- m4/check_python.m4                  |  111 +
- m4/pkg.m4                           |  156 +
- source3/Makefile-smbtorture         |   24 +
- source3/Makefile.in                 | 3405 ++++++++++++++++++
- source3/autogen.sh                  |  121 +
- source3/config.guess                | 1561 ++++++++
- source3/config.sub                  | 1686 +++++++++
- source3/configure.developer         |    7 +
- source3/configure.in                | 6693 +++++++++++++++++++++++++++++++++++
- source3/m4/aclocal.m4               |  899 +++++
- source3/m4/autoconf-2.60.m4         |  236 ++
- source3/m4/check_path.m4            |   89 +
- source3/m4/samba_version.m4         |   29 +
- 41 files changed, 18312 insertions(+)
- create mode 100644 dynconfig/config.m4
- create mode 100644 lib/ccan/libccan.m4
- create mode 100644 lib/iniparser_build/config.m4
- create mode 100644 lib/nss_wrapper/config.m4
- create mode 100644 lib/ntdb/libntdb.m4
- create mode 100644 lib/popt/libpopt.m4
- create mode 100644 lib/popt/samba.m4
- create mode 100644 lib/replace/crypt.m4
- create mode 100644 lib/replace/dlfcn.m4
- create mode 100644 lib/replace/libreplace.m4
- create mode 100644 lib/replace/libreplace_cc.m4
- create mode 100644 lib/replace/libreplace_ld.m4
- create mode 100644 lib/replace/libreplace_macros.m4
- create mode 100644 lib/replace/libreplace_network.m4
- create mode 100644 lib/replace/repdir.m4
- create mode 100644 lib/replace/strptime.m4
- create mode 100644 lib/replace/system/config.m4
- create mode 100644 lib/replace/timegm.m4
- create mode 100644 lib/replace/win32.m4
- create mode 100644 lib/socket_wrapper/config.m4
- create mode 100644 lib/talloc/compat/talloc_compat1.m4
- create mode 100644 lib/talloc/libtalloc.m4
- create mode 100644 lib/tdb/libtdb.m4
- create mode 100644 lib/tevent/libtevent.m4
- create mode 100644 lib/uid_wrapper/config.m4
- create mode 100644 lib/zlib/zlib.m4
- create mode 100644 m4/check_make.m4
- create mode 100644 m4/check_perl.m4
- create mode 100644 m4/check_python.m4
- create mode 100644 m4/pkg.m4
- create mode 100644 source3/Makefile-smbtorture
- create mode 100644 source3/Makefile.in
- create mode 100755 source3/autogen.sh
- create mode 100755 source3/config.guess
- create mode 100755 source3/config.sub
- create mode 100755 source3/configure.developer
- create mode 100644 source3/configure.in
- create mode 100644 source3/m4/aclocal.m4
- create mode 100644 source3/m4/autoconf-2.60.m4
- create mode 100644 source3/m4/check_path.m4
- create mode 100644 source3/m4/samba_version.m4
-
-diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
-new file mode 100644
-index 0000000..fe69abe
---- /dev/null
-+++ b/dynconfig/config.m4
-@@ -0,0 +1,299 @@
-+#################################################
-+# Directory handling stuff to support both the
-+# legacy SAMBA directories and FHS compliant
-+# ones...
-+AC_PREFIX_DEFAULT(/usr/local/samba)
-+
-+BINDIR="${bindir}"
-+SBINDIR="${sbindir}"
-+LIBDIR="${libdir}"
-+LIBEXECDIR="${libexecdir}"
-+MANDIR="${mandir}"
-+DATADIR="${datadir}"
-+LOCALEDIR="${localedir}"
-+SCRIPTSBINDIR="${sbindir}"
-+#PYTHONDIR
-+#PYTHONARCHDIR
-+
-+AC_ARG_ENABLE(fhs,
-+[AS_HELP_STRING([--enable-fhs], [Turn on FHS support (default=no)])])
-+
-+if test x$enable_fhs != xyes; then
-+	if test x"$prefix" = x"/usr" -o x"$prefix" = x"/usr/local"; then
-+		AC_MSG_WARN([Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)])
-+		AC_MSG_ERROR([invalid --prefix=$prefix])
-+	fi
-+	MODULESDIR="${libdir}"
-+	INCLUDEDIR="${includedir}"
-+	SETUPDIR="${datadir}/setup"
-+	PKGCONFIGDIR="${libdir}/pkgconfig"
-+	CODEPAGEDIR="${datadir}/codepages"
-+	PAMMODULESDIR="${libdir}/security"
-+	CONFIGDIR="\${sysconfdir}"
-+	PRIVATE_DIR="\${prefix}/private"
-+	LOCKDIR="\${localstatedir}/lock"
-+	PIDDIR="\${localstatedir}/run"
-+	STATEDIR="\${localstatedir}/locks"
-+	CACHEDIR="\${localstatedir}/cache"
-+	LOGFILEBASE="\${localstatedir}"
-+	SOCKET_DIR="\${localstatedir}/run"
-+	PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib"
-+else
-+	AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
-+
-+	MODULESDIR="${libdir}/samba"
-+	INCLUDEDIR="${includedir}/samba-4.0"
-+	SETUPDIR="${datadir}/samba/setup"
-+	PKGCONFIGDIR="${libdir}/pkgconfig"
-+	CODEPAGEDIR="${datadir}/samba/codepages"
-+	PAMMODULESDIR="${libdir}/security"
-+	CONFIGDIR="\${sysconfdir}/samba"
-+	PRIVATE_DIR="\${localstatedir}/lib/samba/private"
-+	LOCKDIR="\${localstatedir}/lock/samba"
-+	PIDDIR="\${localstatedir}/run/samba"
-+	STATEDIR="\${localstatedir}/lib/samba"
-+	CACHEDIR="\${localstatedir}/cache/samba"
-+	LOGFILEBASE="\${localstatedir}/log/samba"
-+	SOCKET_DIR="\${localstatedir}/run/samba"
-+	PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba"
-+fi
-+
-+AC_ARG_WITH(modulesdir,
-+[AS_HELP_STRING([--with-modulesdir=DIR],
-+ [Which directory to use for modules ($exec_prefix/modules)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-modulesdir called without argument - will use default])
-+  ;;
-+  * )
-+    MODULESDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(pammodulesdir,
-+[AS_HELP_STRING([--with-pammodulesdir=DIR],
-+ [Which directory to use for PAM modules ($libdir/security)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-pammodulesdir called without argument - will use default])
-+  ;;
-+  * )
-+    PAMMODULESDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(configdir,
-+[AS_HELP_STRING([--with-configdir=DIR],
-+ [Where to put configuration files ($sysconfdir)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-configdir called without argument - will use default])
-+  ;;
-+  * )
-+    CONFIGDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(privatedir,
-+[AS_HELP_STRING([--with-privatedir=DIR],
-+ [Where to put passdb.tdb and other private files ($prefix/private)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-privatedir called without argument - will use default])
-+  ;;
-+  * )
-+    PRIVATE_DIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(lockdir,
-+[AS_HELP_STRING([--with-lockdir=DIR],
-+ [Where to put short term disposable state files ($localstatedir/lock)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-lockdir called without argument - will use default])
-+  ;;
-+  * )
-+    LOCKDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(piddir,
-+[AS_HELP_STRING([--with-piddir=DIR],
-+ [Where to put pid files ($localstatedir/run)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-piddir called without argument - will use default])
-+  ;;
-+  * )
-+    PIDDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(statedir,
-+[AS_HELP_STRING([--with-statedir=DIR],
-+ [Where to put persistent state files ($localstatedir/locks)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-statedir called without argument - will use default])
-+  ;;
-+  * )
-+    STATEDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(cachedir,
-+[AS_HELP_STRING([--with-cachedir=DIR],
-+ [Where to put temporary cache files ($localstatedir/cache)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-cachedir called without argument - will use default])
-+  ;;
-+  * )
-+    CACHEDIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(logfilebase,
-+[AS_HELP_STRING([--with-logfilebase=DIR],
-+ [Where to put log files ($localstatedir)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-logfilebase called without argument - will use default])
-+  ;;
-+  * )
-+    LOGFILEBASE="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(sockets-dir,
-+[AS_HELP_STRING([--with-sockets-dir=DIR],
-+ [socket directory ($localstatedir/run)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-sockets-dir called without argument - will use default])
-+  ;;
-+  * )
-+    SOCKET_DIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(privileged-socket-dir,
-+[AS_HELP_STRING([--with-privileged-socket-dir=DIR],
-+ [privileged socket directory ($localstatedir/lib)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-sockets-dir called without argument - will use default])
-+  ;;
-+  * )
-+    PRIVILEGED_SOCKET_DIR="$withval"
-+  ;;
-+  esac])
-+
-+WINBINDD_SOCKET_DIR="${SOCKET_DIR}/winbindd"
-+WINBINDD_PRIVILEGED_SOCKET_DIR="${PRIVILEGED_SOCKET_DIR}/winbindd_privileged"
-+
-+AC_ARG_WITH(winbind-socket-dir,
-+[AS_HELP_STRING([--with-winbind-socket-dir=DIR],
-+ [winbnd socket directory ($localstatedir/run/winbindd)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-winbind-socket-dir called without argument - will use default])
-+  ;;
-+  * )
-+    WINBINDD_SOCKET_DIR="$withval"
-+  ;;
-+  esac])
-+
-+AC_ARG_WITH(winbind-privileged-socket-dir,
-+[AS_HELP_STRING([--with-winbind-privileged-socket-dir=DIR],
-+ [winbind privileged socket directory ($localstatedir/lib/winbindd)])],
-+[ case "$withval" in
-+  yes|no)
-+  #
-+  # Just in case anybody calls it without argument
-+  #
-+    AC_MSG_WARN([--with-winbind-privileged-socket-dir called without argument - will use default])
-+  ;;
-+  * )
-+    WINBINDD_PRIVILEGED_SOCKET_DIR="$withval"
-+  ;;
-+  esac])
-+
-+NMBDSOCKETDIR="${SOCKET_DIR}/nmbd"
-+NTP_SIGND_SOCKET_DIR="${SOCKET_DIR}/ntp_signd"
-+NCALRPCDIR="${SOCKET_DIR}/ncalrpc"
-+CONFIGFILE="${CONFIGDIR}/smb.conf"
-+LMHOSTSFILE="${CONFIGDIR}/lmhosts"
-+SMB_PASSWD_FILE="${PRIVATE_DIR}/smbpasswd"
-+
-+AC_SUBST(BINDIR)
-+AC_SUBST(SBINDIR)
-+AC_SUBST(LIBDIR)
-+AC_SUBST(LIBEXECDIR)
-+AC_SUBST(MANDIR)
-+AC_SUBST(DATADIR)
-+AC_SUBST(LOCALEDIR)
-+AC_SUBST(SCRIPTSBINDIR)
-+dnl AC_SUBST(PYTHONDIR)
-+dnl AC_SUBST(PYTHONARCHDIR)
-+AC_SUBST(MODULESDIR)
-+AC_SUBST(INCLUDEDIR)
-+AC_SUBST(SETUPDIR)
-+AC_SUBST(PKGCONFIGDIR)
-+AC_SUBST(CODEPAGEDIR)
-+AC_SUBST(PAMMODULESDIR)
-+AC_SUBST(CONFIGDIR)
-+AC_SUBST(PRIVATE_DIR)
-+AC_SUBST(LOCKDIR)
-+AC_SUBST(PIDDIR)
-+AC_SUBST(STATEDIR)
-+AC_SUBST(CACHEDIR)
-+AC_SUBST(LOGFILEBASE)
-+AC_SUBST(SOCKET_DIR)
-+AC_SUBST(PRIVILEGED_SOCKET_DIR)
-+AC_SUBST(WINBINDD_SOCKET_DIR)
-+AC_SUBST(WINBINDD_PRIVILEGED_SOCKET_DIR)
-+AC_SUBST(NMBDSOCKETDIR)
-+AC_SUBST(NTP_SIGND_SOCKET_DIR)
-+AC_SUBST(NCALRPCDIR)
-+AC_SUBST(CONFIGFILE)
-+AC_SUBST(LMHOSTSFILE)
-+AC_SUBST(SMB_PASSWD_FILE)
-+
-diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4
-new file mode 100644
-index 0000000..c573215
---- /dev/null
-+++ b/lib/ccan/libccan.m4
-@@ -0,0 +1,363 @@
-+dnl find the ccan sources.
-+ccandir="../lib/ccan"
-+for d in $ccanpaths; do
-+	if test -f "$srcdir/$d/str/str.c"; then
-+		ccandir="$d"
-+		AC_SUBST(ccandir)
-+		break
-+	fi
-+done
-+if test -f "$ccandir/str/str.c"; then :; else
-+   AC_MSG_ERROR([cannot find ccan source in $ccandir])
-+fi
-+CCAN_OBJ="$ccandir/hash/hash.o $ccandir/htable/htable.o $ccandir/ilog/ilog.o $ccandir/likely/likely.o $ccandir/str/debug.o $ccandir/str/str.o $ccandir/tally/tally.o"
-+
-+AC_SUBST(CCAN_OBJ)
-+
-+# Preferred method for including ccan modules is #include <ccan/module/...>.
-+CCAN_CFLAGS="-I$ccandir/.. -DHAVE_CCAN"
-+AC_SUBST(CCAN_CFLAGS)
-+
-+# All the configuration checks.  Regrettably, the __attribute__ checks will
-+# give false positives on old GCCs, since they just cause warnings.  But that's
-+# fairly harmless.
-+AC_CHECK_HEADERS(err.h)
-+
-+AC_CHECK_HEADERS(byteswap.h)
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((cold))],
-+	       samba_cv_attribute_cold,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				static void __attribute__((cold))
-+				cleanup(void) { }
-+			])],
-+			samba_cv_attribute_cold=yes)
-+		])
-+
-+if test x"$samba_cv_attribute_cold" = xyes ; then
-+   AC_DEFINE(HAVE_ATTRIBUTE_COLD, 1,
-+	     [whether we can compile with __attribute__((cold))])
-+fi
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((const))],
-+	       samba_cv_attribute_const,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				static void __attribute__((const))
-+				cleanup(void) { }
-+			])],
-+			samba_cv_attribute_const=yes)
-+		])
-+
-+if test x"$samba_cv_attribute_const" = xyes ; then
-+   AC_DEFINE(HAVE_ATTRIBUTE_CONST, 1,
-+	     [whether we can compile with __attribute__((const))])
-+fi
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((noreturn))],
-+	       samba_cv_attribute_noreturn,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				static void __attribute__((noreturn))
-+				cleanup(void) { exit(1); }
-+			])],
-+			samba_cv_attribute_noreturn=yes)
-+		])
-+
-+if test x"$samba_cv_attribute_noreturn" = xyes ; then
-+   AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1,
-+	     [whether we can compile with __attribute__((noreturn))])
-+fi
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((printf))],
-+	       samba_cv_attribute_printf,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				static void __attribute__((format(__printf__, 1, 2)))
-+				cleanup(const char *fmt, ...) { }
-+			])],
-+			samba_cv_attribute_printf=yes)
-+		])
-+
-+if test x"$samba_cv_attribute_printf" = xyes ; then
-+   AC_DEFINE(HAVE_ATTRIBUTE_PRINTF, 1,
-+	     [whether we can compile with __attribute__((format(printf)))])
-+fi
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((unused))],
-+	       samba_cv_attribute_unused,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				static void __attribute__((unused))
-+				cleanup(void) { }
-+			])],
-+			samba_cv_attribute_unused=yes)
-+		])
-+
-+if test x"$samba_cv_attribute_unused" = xyes ; then
-+   AC_DEFINE(HAVE_ATTRIBUTE_UNUSED, 1,
-+	     [whether we can compile with __attribute__((unused))])
-+fi
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((used))],
-+	       samba_cv_attribute_used,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				static void __attribute__((used))
-+				cleanup(void) { }
-+			])],
-+			samba_cv_attribute_used=yes)
-+		])
-+
-+if test x"$samba_cv_attribute_used" = xyes ; then
-+   AC_DEFINE(HAVE_ATTRIBUTE_USED, 1,
-+	     [whether we can compile with __attribute__((used))])
-+fi
-+
-+# FIXME: We could use endian.h or sys/endian.h here, and __BYTE_ORDER for
-+# cross-compiling.
-+AC_CACHE_CHECK([whether we are big endian],samba_cv_big_endian,[
-+AC_TRY_RUN([int main(void) {
-+union { int i; char c[sizeof(int)]; } u;
-+	  u.i = 0x01020304;
-+	  return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;
-+}],
-+samba_cv_big_endian=yes,
-+samba_cv_big_endian=no)])
-+if test x"$samba_cv_big_endian" = xyes ; then
-+   AC_DEFINE(HAVE_BIG_ENDIAN, 1,
-+	     [whether we are big endian])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_clz],
-+	       samba_cv_builtin_clz,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;
-+			}])],
-+			samba_cv_builtin_clz=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_clz" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_CLZ, 1,
-+	     [whether we have __builtin_clz])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_clzl],
-+	       samba_cv_builtin_clzl,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_clzl(1) == (sizeof(int)*8 - 1) ? 0 : 1;
-+			}])],
-+			samba_cv_builtin_clzl=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_clzl" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_CLZL, 1,
-+	     [whether we have __builtin_clzl])
-+fi
-+AC_CACHE_CHECK([whether we have __builtin_clzll],
-+	       samba_cv_builtin_clzll,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_clzll(1) == (sizeof(int)*8 - 1) ? 0 : 1;
-+			}])],
-+			samba_cv_builtin_clzll=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_clzll" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_CLZLL, 1,
-+	     [whether we have __builtin_clzll])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_constant_p],
-+	       samba_cv_builtin_constant_p,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_constant_p(1) ? 0 : 1;
-+			}])],
-+			samba_cv_builtin_constant_p=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_constant_p" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_CONSTANT_P, 1,
-+	     [whether we have __builtin_constant_p])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_expect],
-+	       samba_cv_builtin_expect,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_expect(main != 0, 1) ? 0 : 1;
-+			}])],
-+			samba_cv_builtin_expect=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_expect" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_EXPECT, 1,
-+	     [whether we have __builtin_expect])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_popcountl],
-+	       samba_cv_builtin_popcountl,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_popcountl(255L) == 8 ? 0 : 1;
-+			}])],
-+			samba_cv_builtin_popcountl=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_popcountl" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_POPCOUNTL, 1,
-+	     [whether we have __builtin_popcountl])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_types_compatible_p],
-+	       samba_cv_builtin_types_compatible_p,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_types_compatible_p(char *, int) ? 1 : 0;
-+			}])],
-+			samba_cv_builtin_types_compatible_p=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_types_compatible_p" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_TYPES_COMPATIBLE_P, 1,
-+	     [whether we have __builtin_types_compatible_p])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __builtin_choose_expr],
-+	       samba_cv_builtin_choose_expr,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				return __builtin_choose_expr(1, 0, "garbage");
-+			}])],
-+			samba_cv_builtin_choose_expr=yes)
-+		])
-+
-+if test x"$samba_cv_builtin_choose_expr" = xyes ; then
-+   AC_DEFINE(HAVE_BUILTIN_CHOOSE_EXPR, 1,
-+	     [whether we have __builtin_choose_expr])
-+fi
-+
-+# We use @<:@ and @:>@ here for embedded [ and ].
-+AC_CACHE_CHECK([whether we have compound literals],
-+	       samba_cv_compound_literals,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				int *foo = (int@<:@@:>@) { 1, 2, 3, 4 };
-+				return foo@<:@0@:>@ == 1 ? 0 : 1;
-+			}])],
-+			samba_cv_compound_literals=yes)
-+		])
-+
-+if test x"$samba_cv_compound_literals" = xyes ; then
-+   AC_DEFINE(HAVE_COMPOUND_LITERALS, 1,
-+	     [whether we have compound literals])
-+fi
-+
-+AC_CACHE_CHECK([whether we have flexible array members],
-+	       samba_cv_have_flex_arr_member,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[struct foo { unsigned int x; int arr@<:@@:>@; }; ])],
-+			samba_cv_have_flex_arr_member=yes)
-+		])
-+
-+if test x"$samba_cv_have_flex_arr_member" = xyes ; then
-+   AC_DEFINE(HAVE_FLEXIBLE_ARRAY_MEMBER, 1,
-+	     [whether we have flexible array member support])
-+fi
-+
-+AC_CACHE_CHECK([whether we have isblank],
-+	       samba_cv_have_isblank,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[#include <ctype.h>
-+			 int main(void) { return isblank(' ') ? 0 : 1; }
-+			])],
-+			samba_cv_have_isblank=yes)
-+		])
-+
-+if test x"$samba_cv_have_isblank" = xyes ; then
-+   AC_DEFINE(HAVE_ISBLANK, 1,
-+	     [whether we have isblank])
-+fi
-+
-+# FIXME: We could use endian.h or sys/endian.h here, and __BYTE_ORDER for
-+# cross-compiling.
-+AC_CACHE_CHECK([whether we are little endian],samba_cv_little_endian,[
-+AC_TRY_RUN([int main(void) {
-+union { int i; char c[sizeof(int)]; } u;
-+	  u.i = 0x01020304;
-+	  return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;
-+}],
-+samba_cv_little_endian=yes,
-+samba_cv_little_endian=no)])
-+if test x"$samba_cv_little_endian" = xyes ; then
-+   AC_DEFINE(HAVE_LITTLE_ENDIAN, 1,
-+	     [whether we are little endian])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __typeof__],
-+	       samba_cv_typeof,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[int main(void) {
-+				int x = 1;
-+				__typeof__(x) i;
-+				i = x;
-+				return i == x ? 0 : 1;
-+			}])],
-+			samba_cv_typeof=yes)
-+		])
-+
-+if test x"$samba_cv_typeof" = xyes ; then
-+   AC_DEFINE(HAVE_TYPEOF, 1,
-+	     [whether we have __typeof__])
-+fi
-+
-+AC_CACHE_CHECK([whether we have __attribute__((warn_unused_result))],
-+	       samba_cv_warn_unused_result,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[int __attribute__((warn_unused_result)) func(int x)
-+			    { return x; }])],
-+			samba_cv_warn_unused_result=yes)
-+		])
-+
-+if test x"$samba_cv_warn_unused_result" = xyes ; then
-+   AC_DEFINE(HAVE_WARN_UNUSED_RESULT, 1,
-+	     [whether we have __attribute__((warn_unused_result))])
-+fi
-+
-+AC_CACHE_CHECK([whether we have bswap_64],
-+	       samba_cv_have_bswap_64,
-+	       [
-+	         AC_LINK_IFELSE([AC_LANG_SOURCE(
-+			[#include <byteswap.h>
-+			 int main(void) { return bswap_64(1) ? 0 : 1; }
-+			])],
-+			samba_cv_have_bswap_64=yes)
-+		])
-+
-+if test x"$samba_cv_have_bswap_64" = xyes ; then
-+   AC_DEFINE(HAVE_BSWAP_64, 1,
-+	     [whether we have bswap_64])
-+fi
-diff --git a/lib/iniparser_build/config.m4 b/lib/iniparser_build/config.m4
-new file mode 100644
-index 0000000..282c977
---- /dev/null
-+++ b/lib/iniparser_build/config.m4
-@@ -0,0 +1,45 @@
-+AC_ARG_WITH(included-iniparser,
-+[AS_HELP_STRING([--with-included-iniparser], [use bundled iniparser library, not from system])],
-+[
-+  case "$withval" in
-+  yes)
-+    INCLUDED_INIPARSER=yes
-+    ;;
-+  no)
-+    INCLUDED_INIPARSER=no
-+    ;;
-+  esac ],
-+)
-+if test x"$INCLUDED_INIPARSER" != x"yes"; then
-+    AC_CHECK_LIB_EXT(iniparser, LIBINIPARSER_LIBS, iniparser_load)
-+
-+fi
-+
-+AC_MSG_CHECKING(whether to use included iniparser)
-+if test x"$ac_cv_lib_ext_iniparser" != x"yes"; then
-+
-+  iniparserpaths="../iniparser ../lib/iniparser"
-+  for d in $iniparserpaths; do
-+    if test -f "$srcdir/$d/src/iniparser.c"; then
-+      iniparserdir="$d"
-+      break;
-+    fi
-+  done
-+  if test x"$iniparserdir" = "x"; then
-+     AC_MSG_ERROR([cannot find iniparser source in $iniparserpaths])
-+  fi
-+  INIPARSER_CFLAGS="-I$srcdir/$iniparserdir/src"
-+  AC_MSG_RESULT(yes)
-+
-+  INIPARSER_OBJS=""
-+  INIPARSER_OBJS="$INIPARSER_OBJS $srcdir/$iniparserdir/../iniparser_build/iniparser.o"
-+  INIPARSER_OBJS="$INIPARSER_OBJS $srcdir/$iniparserdir/../iniparser_build/dictionary.o"
-+  INIPARSER_OBJS="$INIPARSER_OBJS $srcdir/$iniparserdir/../iniparser_build/strlib.o"
-+
-+  SMB_SUBSYSTEM(LIBINIPARSER,[$INIPARSER_OBJS],[],[$INIPARSER_CFLAGS])
-+else
-+  AC_MSG_RESULT(no)
-+  SMB_EXT_LIB(LIBINIPARSER,,,,${LIBINIPARSER_LIBS})
-+  SMB_ENABLE(LIBINIPARSER,YES)
-+fi
-+
-diff --git a/lib/nss_wrapper/config.m4 b/lib/nss_wrapper/config.m4
-new file mode 100644
-index 0000000..1e864bf
---- /dev/null
-+++ b/lib/nss_wrapper/config.m4
-@@ -0,0 +1,19 @@
-+AC_ARG_ENABLE(nss-wrapper,
-+AS_HELP_STRING([--enable-nss-wrapper], [Turn on nss wrapper library (default=no)]))
-+
-+HAVE_NSS_WRAPPER=no
-+
-+if eval "test x$developer = xyes -o x$selftest = xyes"; then
-+	enable_nss_wrapper=yes
-+fi
-+
-+if eval "test x$enable_nss_wrapper = xyes"; then
-+        AC_DEFINE(NSS_WRAPPER,1,[Use nss wrapper library])
-+	HAVE_NSS_WRAPPER=yes
-+
-+	# this is only used for samba3
-+	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
-+fi
-+
-+AC_SUBST(HAVE_NSS_WRAPPER)
-+AC_SUBST(NSS_WRAPPER_OBJS)
-diff --git a/lib/ntdb/libntdb.m4 b/lib/ntdb/libntdb.m4
-new file mode 100644
-index 0000000..847dc64
---- /dev/null
-+++ b/lib/ntdb/libntdb.m4
-@@ -0,0 +1,41 @@
-+dnl find the ntdb sources. This is meant to work both for
-+dnl ntdb standalone builds, and builds of packages using ntdb
-+ntdbdir=""
-+ntdbpaths=". lib/ntdb ntdb ../ntdb ../lib/ntdb"
-+for d in $ntdbpaths; do
-+	if test -f "$srcdir/$d/ntdb.c"; then
-+		ntdbdir="$d"
-+		AC_SUBST(ntdbdir)
-+		break;
-+	fi
-+done
-+if test x"$ntdbdir" = "x"; then
-+   AC_MSG_ERROR([cannot find ntdb source in $ntdbpaths])
-+fi
-+NTDB_OBJ="check.o free.o hash.o io.o lock.o ntdb.o open.o summary.o transaction.o traverse.o"
-+AC_SUBST(NTDB_OBJ)
-+AC_SUBST(LIBREPLACEOBJ)
-+AC_SUBST(CCAN_OBJ)
-+
-+NTDB_LIBS=""
-+AC_SUBST(NTDB_LIBS)
-+
-+NTDB_DEPS=""
-+if test x$libreplace_cv_HAVE_FDATASYNC_IN_LIBRT = xyes ; then
-+	NTDB_DEPS="$NTDB_DEPS -lrt"
-+fi
-+AC_SUBST(NTDB_DEPS)
-+
-+NTDB_CFLAGS="-I$ntdbdir"
-+AC_SUBST(NTDB_CFLAGS)
-+
-+AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime)
-+AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h)
-+
-+AC_HAVE_DECL(pread, [#include <unistd.h>])
-+AC_HAVE_DECL(pwrite, [#include <unistd.h>])
-+
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=ntdb.exports
-+    AC_SUBST(EXPORTSFILE)
-+fi
-diff --git a/lib/popt/libpopt.m4 b/lib/popt/libpopt.m4
-new file mode 100644
-index 0000000..cfa2eaa
---- /dev/null
-+++ b/lib/popt/libpopt.m4
-@@ -0,0 +1,43 @@
-+dnl Check to see if we should use the included popt
-+
-+INCLUDED_POPT=auto
-+AC_ARG_WITH(included-popt,
-+[  --with-included-popt    use bundled popt library, not from system],
-+[ INCLUDED_POPT=$withval ])
-+
-+AC_SUBST(POPT_LIBS)
-+AC_SUBST(POPT_CFLAGS)
-+
-+if test x"$INCLUDED_POPT" != x"yes"; then
-+	AC_CHECK_HEADERS(popt.h)
-+	AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
-+	if test x"$ac_cv_header_popt_h" = x"no" -o x"$ac_cv_lib_popt_poptGetContext" = x"no"; then
-+		INCLUDED_POPT=yes
-+		POPT_CFLAGS=""
-+	else
-+		INCLUDED_POPT=no
-+	fi
-+fi
-+
-+AC_MSG_CHECKING(whether to use included popt)
-+AC_MSG_RESULT($INCLUDED_POPT)
-+if test x"$INCLUDED_POPT" != x"no"; then
-+	dnl find the popt sources. This is meant to work both for 
-+	dnl popt standalone builds, and builds of packages using popt
-+	poptdir=""
-+	poptpaths="$srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt $srcdir/../lib/popt"
-+	for d in $poptpaths; do
-+		if test -f "$d/popt.c"; then
-+			poptdir="$d"		
-+			POPT_CFLAGS="-I$d"
-+			AC_SUBST(poptdir)
-+			break
-+		fi
-+	done
-+        if test x"$poptdir" = "x"; then
-+		AC_MSG_ERROR([cannot find popt source in $poptpaths])
-+	fi
-+	POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
-+	AC_SUBST(POPT_OBJ)
-+	AC_CHECK_HEADERS([float.h alloca.h])
-+fi
-diff --git a/lib/popt/samba.m4 b/lib/popt/samba.m4
-new file mode 100644
-index 0000000..627dd85
---- /dev/null
-+++ b/lib/popt/samba.m4
-@@ -0,0 +1,8 @@
-+m4_include(../lib/popt/libpopt.m4)
-+
-+if test x"$POPT_OBJ" = "x"; then
-+	SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
-+else
-+	SMB_INCLUDE_MK(../lib/popt/config.mk)
-+fi
-+
-diff --git a/lib/replace/crypt.m4 b/lib/replace/crypt.m4
-new file mode 100644
-index 0000000..fae2a58
---- /dev/null
-+++ b/lib/replace/crypt.m4
-@@ -0,0 +1,6 @@
-+###############################################
-+# test for where we get crypt() from
-+AC_CHECK_HEADERS(crypt.h)
-+AC_SEARCH_LIBS_EXT(crypt, [crypt], CRYPT_LIBS,
-+  [ AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function]) ],
-+  [ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o" ])
-diff --git a/lib/replace/dlfcn.m4 b/lib/replace/dlfcn.m4
-new file mode 100644
-index 0000000..722e024
---- /dev/null
-+++ b/lib/replace/dlfcn.m4
-@@ -0,0 +1,31 @@
-+dnl dummies provided by dlfcn.c if not available
-+save_LIBS="$LIBS"
-+LIBS=""
-+
-+libreplace_cv_dlfcn=no
-+AC_SEARCH_LIBS(dlopen, dl)
-+
-+AC_CHECK_HEADERS(dlfcn.h)
-+AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
-+
-+libreplace_cv_shl=no
-+AC_SEARCH_LIBS(shl_load, sl)
-+AC_CHECK_HEADERS(dl.h)
-+AC_CHECK_FUNCS([shl_load shl_unload shl_findsym],[],[libreplace_cv_shl=yes])
-+
-+AC_VERIFY_C_PROTOTYPE([void *dlopen(const char* filename, unsigned int flags)],
-+	[
-+	return 0;
-+	],[
-+	AC_DEFINE(DLOPEN_TAKES_UNSIGNED_FLAGS, 1, [Whether dlopen takes unsigned int flags])
-+	],[],[
-+	#include <dlfcn.h>
-+	])
-+
-+if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
-+fi
-+
-+LIBDL="$LIBS"
-+AC_SUBST(LIBDL)
-+LIBS="$save_LIBS"
-diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
-new file mode 100644
-index 0000000..f4ae715
---- /dev/null
-+++ b/lib/replace/libreplace.m4
-@@ -0,0 +1,490 @@
-+AC_DEFUN_ONCE(AC_LIBREPLACE_LOCATION_CHECKS,
-+[
-+echo "LIBREPLACE_LOCATION_CHECKS: START"
-+
-+dnl find the libreplace sources. This is meant to work both for 
-+dnl libreplace standalone builds, and builds of packages using libreplace
-+libreplacedir=""
-+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
-+for d in $libreplacepaths; do
-+	if test -f "$d/replace.c"; then
-+		libreplacedir="$d"		
-+		AC_SUBST(libreplacedir)
-+		break;
-+	fi
-+done
-+if test x"$libreplacedir" = "x"; then
-+	AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
-+fi
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
-+AC_SUBST(LIBREPLACEOBJ)
-+
-+AC_CANONICAL_BUILD
-+AC_CANONICAL_HOST
-+AC_CANONICAL_TARGET
-+
-+echo "LIBREPLACE_LOCATION_CHECKS: END"
-+]) dnl end AC_LIBREPLACE_LOCATION_CHECKS
-+
-+
-+AC_DEFUN_ONCE(AC_LIBREPLACE_BROKEN_CHECKS,
-+[
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
-+
-+dnl find the libreplace sources. This is meant to work both for 
-+dnl libreplace standalone builds, and builds of packages using libreplace
-+libreplacedir=""
-+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
-+for d in $libreplacepaths; do
-+	if test -f "$d/replace.c"; then
-+		libreplacedir="$d"		
-+		AC_SUBST(libreplacedir)
-+		break;
-+	fi
-+done
-+if test x"$libreplacedir" = "x"; then
-+	AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
-+fi
-+
-+LIBREPLACEOBJ="$libreplacedir/replace.o"
-+AC_SUBST(LIBREPLACEOBJ)
-+
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o  $libreplacedir/xattr.o"
-+
-+AC_TYPE_UID_T
-+AC_TYPE_MODE_T
-+AC_TYPE_OFF_T
-+AC_TYPE_SIZE_T
-+AC_TYPE_PID_T
-+AC_STRUCT_ST_RDEV
-+AC_CHECK_TYPE(ino_t,unsigned)
-+AC_CHECK_TYPE(loff_t,off_t)
-+AC_CHECK_TYPE(offset_t,loff_t)
-+AC_CHECK_TYPE(blksize_t,long)
-+AC_CHECK_TYPE(blkcnt_t,long)
-+
-+AC_FUNC_MEMCMP
-+
-+AC_CHECK_FUNCS([pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes])
-+
-+AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h)
-+AC_CHECK_HEADERS(setjmp.h utime.h sys/wait.h)
-+
-+LIBREPLACE_PROVIDE_HEADER([stdint.h])
-+LIBREPLACE_PROVIDE_HEADER([stdbool.h])
-+
-+AC_DEFINE(HAVE_LIBREPLACE, 1, [We have libreplace])
-+
-+AC_CHECK_TYPE(bool, 
-+[AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
-+[
-+AC_INCLUDES_DEFAULT
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif]
-+)
-+
-+AC_CHECK_TYPE(_Bool, 
-+[AC_DEFINE(HAVE__Bool, 1, [Whether the _Bool type is available])],,
-+[
-+AC_INCLUDES_DEFAULT
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif]
-+)
-+
-+AC_CHECK_HEADERS(linux/types.h)
-+
-+AC_CACHE_CHECK([for working mmap],libreplace_cv_HAVE_MMAP,[
-+AC_TRY_RUN([#include "$libreplacedir/test/shared_mmap.c"],
-+           libreplace_cv_HAVE_MMAP=yes,libreplace_cv_HAVE_MMAP=no,libreplace_cv_HAVE_MMAP=cross)])
-+if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then
-+    AC_DEFINE(HAVE_MMAP,1,[Whether mmap works])
-+fi
-+
-+AC_CACHE_CHECK([for working mremap],libreplace_cv_HAVE_MREMAP,[
-+AC_TRY_RUN([#include "$libreplacedir/test/shared_mremap.c"],
-+           libreplace_cv_HAVE_MREMAP=yes,libreplace_cv_HAVE_MREMAP=no,libreplace_cv_HAVE_MREMAP=cross)])
-+if test x"$libreplace_cv_HAVE_MREMAP" = x"yes"; then
-+    AC_DEFINE(HAVE_MREMAP,1,[Whether mremap works])
-+fi
-+
-+AC_CACHE_CHECK([for incoherent mmap],libreplace_cv_HAVE_INCOHERENT_MMAP,[
-+AC_TRY_RUN([#include "$libreplacedir/test/incoherent_mmap.c"],
-+           libreplace_cv_HAVE_INCOHERENT_MMAP=yes,libreplace_cv_HAVE_INCOHERENT_MMAP=no,libreplace_cv_HAVE_INCOHERENT_MMAP=cross)])
-+if test x"$libreplace_cv_HAVE_INCOHERENT_MMAP" = x"yes"; then
-+    AC_DEFINE(HAVE_INCOHERENT_MMAP,1,[Whether mmap is incoherent against write])
-+fi
-+
-+
-+AC_CHECK_HEADERS(sys/syslog.h syslog.h)
-+AC_CHECK_HEADERS(sys/time.h time.h)
-+AC_CHECK_HEADERS(stdarg.h vararg.h)
-+AC_CHECK_HEADERS(sys/mount.h mntent.h)
-+AC_CHECK_HEADERS(stropts.h)
-+AC_CHECK_HEADERS(unix.h)
-+AC_CHECK_HEADERS(malloc.h)
-+AC_CHECK_HEADERS(syscall.h)
-+AC_CHECK_HEADERS(sys/syscall.h)
-+AC_CHECK_HEADERS(sys/ucontext.h)
-+
-+AC_CHECK_FUNCS(syscall setuid seteuid setreuid setresuid setgid setegid setregid setresgid setgroups)
-+AC_CHECK_FUNCS(chroot bzero strerror strerror_r memalign posix_memalign getpagesize)
-+AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
-+AC_CHECK_FUNCS(waitpid wait4 strlcpy strlcat initgroups memmove strdup)
-+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp dup2 dprintf vdprintf)
-+AC_CHECK_FUNCS(isatty chown lchown link readlink symlink realpath)
-+AC_CHECK_FUNCS(fdatasync,,[
-+	# if we didn't find it, look in librt (Solaris hides it there...)
-+	AC_CHECK_LIB(rt, fdatasync,
-+		[libreplace_cv_HAVE_FDATASYNC_IN_LIBRT=yes
-+		AC_DEFINE(HAVE_FDATASYNC, 1, Define to 1 if there is support for fdatasync)])
-+])
-+AC_HAVE_DECL(fdatasync, [#include <unistd.h>])
-+AC_CHECK_FUNCS(clock_gettime,libreplace_cv_have_clock_gettime=yes,[
-+	AC_CHECK_LIB(rt, clock_gettime,
-+		[libreplace_cv_HAVE_CLOCK_GETTIME_IN_LIBRT=yes
-+		libreplace_cv_have_clock_gettime=yes
-+		AC_DEFINE(HAVE_CLOCK_GETTIME, 1, Define to 1 if there is support for clock_gettime)])
-+])
-+
-+AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
-+AC_CHECK_HEADERS(sys/ea.h sys/proplist.h)
-+
-+LIBREPLACE_FILESYS_LIBS=""
-+
-+############################################
-+# Check for EA implementations
-+case "$host_os" in
-+  *freebsd4* | *dragonfly* )
-+	AC_DEFINE(BROKEN_EXTATTR, 1, [Does extattr API work])
-+  ;;
-+  *)
-+	AC_SEARCH_LIBS(getxattr, [attr])
-+	AC_CHECK_FUNCS(attr_get attr_getf attr_list attr_listf attropen attr_remove)
-+	AC_CHECK_FUNCS(attr_removef attr_set attr_setf extattr_delete_fd extattr_delete_file)
-+	AC_CHECK_FUNCS(extattr_get_fd extattr_get_file extattr_list_fd extattr_list_file)
-+	AC_CHECK_FUNCS(extattr_set_fd extattr_set_file fgetea fgetxattr flistea flistxattr)
-+	AC_CHECK_FUNCS(fremoveea fremovexattr fsetea fsetxattr getea getxattr listea)
-+	AC_CHECK_FUNCS(listxattr removeea removexattr setea setxattr)
-+
-+	AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, flistea)
-+	AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, flistxattr)
-+	AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, attr_listf)
-+	AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, extattr_list_fd)
-+
-+  ;;
-+esac
-+
-+
-+########################################################
-+# Do xattr functions take additional options like on Darwin?
-+if test x"$ac_cv_func_getxattr" = x"yes" ; then
-+	AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt, [
-+		old_LIBS=$LIBS
-+		LIBS="$LIBS $LIBREPLACE_FILESYS_LIBS"
-+		AC_TRY_COMPILE([
-+			#include <sys/types.h>
-+			#if HAVE_ATTR_XATTR_H
-+			#include <attr/xattr.h>
-+			#elif HAVE_SYS_XATTR_H
-+			#include <sys/xattr.h>
-+			#endif
-+		],[
-+			getxattr(0, 0, 0, 0, 0, 0);
-+		],
-+	        [smb_attr_cv_xattr_add_opt=yes],
-+		[smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS])
-+	])
-+	if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
-+		AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [xattr functions have additional options])
-+	fi
-+fi
-+
-+AC_CHECK_FUNCS(get_current_dir_name)
-+AC_HAVE_DECL(setresuid, [#include <unistd.h>])
-+AC_HAVE_DECL(setresgid, [#include <unistd.h>])
-+AC_HAVE_DECL(errno, [#include <errno.h>])
-+
-+AC_CACHE_CHECK([for secure mkstemp],libreplace_cv_HAVE_SECURE_MKSTEMP,[
-+AC_TRY_RUN([#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+main() { 
-+  struct stat st;
-+  char tpl[20]="/tmp/test.XXXXXX";
-+  char tpl2[20]="/tmp/test.XXXXXX";
-+  int fd = mkstemp(tpl);
-+  int fd2 = mkstemp(tpl2);
-+  if (fd == -1) {
-+        if (fd2 != -1) {
-+                unlink(tpl2);
-+        }
-+        exit(1);
-+  }
-+  if (fd2 == -1) exit(1);
-+  unlink(tpl);
-+  unlink(tpl2);
-+  if (fstat(fd, &st) != 0) exit(1);
-+  if ((st.st_mode & 0777) != 0600) exit(1);
-+  if (strcmp(tpl, "/tmp/test.XXXXXX") == 0) {
-+        exit(1);
-+  }
-+  if (strcmp(tpl, tpl2) == 0) {
-+        exit(1);
-+  }
-+  exit(0);
-+}],
-+libreplace_cv_HAVE_SECURE_MKSTEMP=yes,
-+libreplace_cv_HAVE_SECURE_MKSTEMP=no,
-+libreplace_cv_HAVE_SECURE_MKSTEMP=cross)])
-+if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
-+    AC_DEFINE(HAVE_SECURE_MKSTEMP,1,[Whether mkstemp is secure])
-+fi
-+
-+dnl Provided by snprintf.c:
-+AC_CHECK_HEADERS(stdio.h strings.h)
-+AC_CHECK_DECLS([snprintf, vsnprintf, asprintf, vasprintf])
-+AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf)
-+
-+AC_CACHE_CHECK([for C99 vsnprintf],libreplace_cv_HAVE_C99_VSNPRINTF,[
-+AC_TRY_RUN([
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+void foo(const char *format, ...) { 
-+       va_list ap;
-+       int len;
-+       char buf[20];
-+       long long l = 1234567890;
-+       l *= 100;
-+
-+       va_start(ap, format);
-+       len = vsnprintf(buf, 0, format, ap);
-+       va_end(ap);
-+       if (len != 5) exit(1);
-+
-+       va_start(ap, format);
-+       len = vsnprintf(0, 0, format, ap);
-+       va_end(ap);
-+       if (len != 5) exit(2);
-+
-+       if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
-+
-+       if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4);
-+       if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5);
-+       if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6);
-+       if (snprintf(buf, 20, "%s", 0) < 3) exit(7);
-+
-+       exit(0);
-+}
-+main() { foo("hello"); }
-+],
-+libreplace_cv_HAVE_C99_VSNPRINTF=yes,libreplace_cv_HAVE_C99_VSNPRINTF=no,libreplace_cv_HAVE_C99_VSNPRINTF=cross)])
-+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
-+    AC_DEFINE(HAVE_C99_VSNPRINTF,1,[Whether there is a C99 compliant vsnprintf])
-+fi
-+
-+
-+dnl VA_COPY
-+AC_CACHE_CHECK([for va_copy],libreplace_cv_HAVE_VA_COPY,[
-+AC_TRY_LINK([#include <stdarg.h>
-+va_list ap1,ap2;], [va_copy(ap1,ap2);],
-+libreplace_cv_HAVE_VA_COPY=yes,libreplace_cv_HAVE_VA_COPY=no)])
-+if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then
-+    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
-+fi
-+
-+if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
-+AC_CACHE_CHECK([for __va_copy],libreplace_cv_HAVE___VA_COPY,[
-+AC_TRY_LINK([#include <stdarg.h>
-+va_list ap1,ap2;], [__va_copy(ap1,ap2);],
-+libreplace_cv_HAVE___VA_COPY=yes,libreplace_cv_HAVE___VA_COPY=no)])
-+if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then
-+    AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
-+fi
-+fi
-+
-+dnl __FUNCTION__ macro
-+AC_CACHE_CHECK([for __FUNCTION__ macro],libreplace_cv_HAVE_FUNCTION_MACRO,[
-+AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
-+libreplace_cv_HAVE_FUNCTION_MACRO=yes,libreplace_cv_HAVE_FUNCTION_MACRO=no)])
-+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
-+    AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
-+else
-+    dnl __func__ macro
-+    AC_CACHE_CHECK([for __func__ macro],libreplace_cv_HAVE_func_MACRO,[
-+    AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __func__);],
-+    libreplace_cv_HAVE_func_MACRO=yes,libreplace_cv_HAVE_func_MACRO=no)])
-+    if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then
-+       AC_DEFINE(HAVE_func_MACRO,1,[Whether there is a __func__ macro])
-+    fi
-+fi
-+
-+AC_CHECK_HEADERS([sys/param.h limits.h])
-+
-+AC_CHECK_TYPE(comparison_fn_t, 
-+[AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
-+
-+AC_HAVE_DECL(setenv, [#include <stdlib.h>])
-+AC_CHECK_FUNCS(setenv unsetenv)
-+AC_HAVE_DECL(environ, [#include <unistd.h>])
-+
-+AC_CHECK_FUNCS(strnlen)
-+AC_CHECK_FUNCS(strtoull __strtoull strtouq strtoll __strtoll strtoq)
-+
-+AC_CHECK_FUNCS(memmem)
-+
-+# this test disabled as we don't actually need __VA_ARGS__ yet
-+AC_TRY_CPP([
-+#define eprintf(...) fprintf(stderr, __VA_ARGS__)
-+eprintf("bla", "bar");
-+], AC_DEFINE(HAVE__VA_ARGS__MACRO, 1, [Whether the __VA_ARGS__ macro is available]))
-+
-+
-+AC_CACHE_CHECK([for sig_atomic_t type],libreplace_cv_sig_atomic_t, [
-+    AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#include <signal.h>],[sig_atomic_t i = 0],
-+	libreplace_cv_sig_atomic_t=yes,libreplace_cv_sig_atomic_t=no)])
-+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
-+   AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type])
-+fi
-+
-+
-+dnl Check if the C compiler understands volatile (it should, being ANSI).
-+AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [
-+	AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0],
-+		libreplace_cv_volatile=yes,libreplace_cv_volatile=no)])
-+if test x"$libreplace_cv_volatile" = x"yes"; then
-+	AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
-+fi
-+
-+m4_include(system/config.m4)
-+
-+AC_CACHE_CHECK([for O_DIRECT flag to open(2)],libreplace_cv_HAVE_OPEN_O_DIRECT,[
-+AC_TRY_COMPILE([
-+#include <unistd.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
-+#endif],
-+[int fd = open("/dev/null", O_DIRECT);],
-+libreplace_cv_HAVE_OPEN_O_DIRECT=yes,libreplace_cv_HAVE_OPEN_O_DIRECT=no)])
-+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
-+    AC_DEFINE(HAVE_OPEN_O_DIRECT,1,[Whether the open(2) accepts O_DIRECT])
-+fi
-+
-+m4_include(dlfcn.m4)
-+m4_include(strptime.m4)
-+m4_include(win32.m4)
-+m4_include(timegm.m4)
-+m4_include(repdir.m4)
-+m4_include(crypt.m4)
-+
-+if test x$libreplace_cv_have_clock_gettime = xyes ; then
-+	SMB_CHECK_CLOCK_ID(CLOCK_MONOTONIC)
-+	SMB_CHECK_CLOCK_ID(CLOCK_PROCESS_CPUTIME_ID)
-+	SMB_CHECK_CLOCK_ID(CLOCK_REALTIME)
-+fi
-+
-+AC_CACHE_CHECK([for struct timespec type],libreplace_cv_struct_timespec, [
-+    AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+],[struct timespec ts;],
-+	libreplace_cv_struct_timespec=yes,libreplace_cv_struct_timespec=no)])
-+if test x"$libreplace_cv_struct_timespec" = x"yes"; then
-+   AC_DEFINE(HAVE_STRUCT_TIMESPEC,1,[Whether we have struct timespec])
-+fi
-+
-+AC_CACHE_CHECK([for ucontext_t type],libreplace_cv_ucontext_t, [
-+    AC_TRY_COMPILE([
-+#include <signal.h>
-+#if HAVE_SYS_UCONTEXT_H
-+#include <sys/ucontext.h>
-+# endif
-+],[ucontext_t uc; sigaddset(&uc.uc_sigmask, SIGUSR1);],
-+	libreplace_cv_ucontext_t=yes,libreplace_cv_ucontext_t=no)])
-+if test x"$libreplace_cv_ucontext_t" = x"yes"; then
-+   AC_DEFINE(HAVE_UCONTEXT_T,1,[Whether we have ucontext_t])
-+fi
-+
-+AC_CHECK_FUNCS([printf memset memcpy],,[AC_MSG_ERROR([Required function not found])])
-+
-+echo "LIBREPLACE_BROKEN_CHECKS: END"
-+]) dnl end AC_LIBREPLACE_BROKEN_CHECKS
-+
-+AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_START,
-+[
-+#LIBREPLACE_ALL_CHECKS: START"
-+])
-+AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_END,
-+[
-+#LIBREPLACE_ALL_CHECKS: END"
-+])
-+m4_define(AC_LIBREPLACE_ALL_CHECKS,
-+[
-+AC__LIBREPLACE_ALL_CHECKS_START
-+AC_LIBREPLACE_LOCATION_CHECKS
-+AC_LIBREPLACE_CC_CHECKS
-+AC_LIBREPLACE_BROKEN_CHECKS
-+AC__LIBREPLACE_ALL_CHECKS_END
-+CFLAGS="$CFLAGS -I$libreplacedir"
-+])
-+
-+m4_include(libreplace_cc.m4)
-+m4_include(libreplace_ld.m4)
-+m4_include(libreplace_network.m4)
-+m4_include(libreplace_macros.m4)
-+
-+
-+dnl SMB_CHECK_CLOCK_ID(clockid)
-+dnl Test whether the specified clock_gettime clock ID is available. If it
-+dnl is, we define HAVE_clockid
-+AC_DEFUN([SMB_CHECK_CLOCK_ID],
-+[
-+    AC_MSG_CHECKING(for $1)
-+    AC_TRY_LINK([
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+    ],
-+    [
-+clockid_t clk = $1;
-+    ],
-+    [
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(HAVE_$1, 1,
-+	    [Whether the clock_gettime clock ID $1 is available])
-+    ],
-+    [
-+	AC_MSG_RESULT(no)
-+    ])
-+])
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[m4_include(autoconf-2.60.m4)])
-diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
-new file mode 100644
-index 0000000..50cb735
---- /dev/null
-+++ b/lib/replace/libreplace_cc.m4
-@@ -0,0 +1,197 @@
-+
-+AC_DEFUN_ONCE(AC__LIBREPLACE_ONLY_CC_CHECKS_START,
-+[
-+echo "LIBREPLACE_CC_CHECKS: START"
-+])
-+
-+AC_DEFUN_ONCE(AC__LIBREPLACE_ONLY_CC_CHECKS_END,
-+[
-+echo "LIBREPLACE_CC_CHECKS: END"
-+])
-+
-+dnl
-+dnl
-+dnl AC_LIBREPLACE_CC_CHECKS
-+dnl
-+dnl Note: we need to use m4_define instead of AC_DEFUN because
-+dnl       of the ordering of tests
-+dnl       
-+dnl 
-+m4_define(AC_LIBREPLACE_CC_CHECKS,
-+[
-+AC__LIBREPLACE_ONLY_CC_CHECKS_START
-+
-+dnl stop the C89 attempt by autoconf - if autoconf detects -Ae it will enable it
-+dnl which conflicts with C99 on HPUX
-+ac_cv_prog_cc_Ae=no
-+
-+savedCFLAGS=$CFLAGS
-+AC_PROG_CC
-+CFLAGS=$savedCFLAGS
-+
-+dnl don't try for C99 if we are using gcc, as otherwise we 
-+dnl lose immediate structure constants
-+if test x"$GCC" != x"yes" ; then
-+AC_PROG_CC_C99
-+fi
-+
-+if test x"$GCC" = x"yes" ; then
-+	AC_MSG_CHECKING([for version of gcc])
-+	GCC_VERSION=`$CC -dumpversion`
-+	AC_MSG_RESULT(${GCC_VERSION})
-+fi
-+AC_USE_SYSTEM_EXTENSIONS
-+AC_C_BIGENDIAN
-+AC_C_INLINE
-+LIBREPLACE_C99_STRUCT_INIT([],[AC_MSG_WARN([c99 structure initializer are not supported])])
-+
-+AC_PROG_INSTALL
-+
-+AC_ISC_POSIX
-+AC_N_DEFINE(_XOPEN_SOURCE_EXTENDED)
-+
-+AC_MSG_CHECKING(checking getconf LFS_CFLAGS for large file support flags)
-+LFS_CFLAGS=`(getconf LFS_CFLAGS) 2>/dev/null` || LFS_CFLAGS=""
-+
-+AC_MSG_RESULT(${LFS_CFLAGS})
-+if test "x$LFS_CFLAGS" != 'x-1' || test "x$LFS_CFLAGS" != "xundefined"; then
-+   CFLAGS="$CFLAGS $LFS_CFLAGS"
-+fi
-+
-+AC_SYS_LARGEFILE
-+
-+dnl Add #include for broken IRIX header files
-+case "$host_os" in
-+	*irix6*) AC_ADD_INCLUDE(<standards.h>)
-+		AC_N_DEFINE(_XOPEN_SOURCE,600)
-+		AC_N_DEFINE(_BSD_TYPES)
-+		;;
-+	*hpux*)
-+		# mmap on HPUX is completely broken...
-+		AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken])
-+		if test "`uname -r`" = "B.11.00" -o "`uname -r`" = "B.11.11"; then
-+			AC_MSG_WARN([Enabling HPUX 11.00/11.11 header bug workaround])
-+			CFLAGS="$CFLAGS -Dpread=pread64 -Dpwrite=pwrite64"
-+		fi
-+		if test "`uname -r`" = "B.11.23"; then
-+			AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround])
-+			CFLAGS="$CFLAGS -D_MACHINE_SYS_GETPPDP_INCLUDED"
-+		fi
-+		;;
-+	*aix*)
-+		AC_DEFINE(BROKEN_STRNDUP, 1, [Whether strndup is broken])
-+		AC_DEFINE(BROKEN_STRNLEN, 1, [Whether strnlen is broken])
-+		if test "${GCC}" != "yes"; then
-+			## for funky AIX compiler using strncpy()
-+			CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000"
-+		fi
-+		;;
-+	*osf*)
-+		# this brings in socklen_t
-+		AC_N_DEFINE(_XOPEN_SOURCE,600)
-+		AC_N_DEFINE(_OSF_SOURCE)
-+		;;
-+	#
-+	# VOS may need to have POSIX support and System V compatibility enabled.
-+	#
-+	*vos*)
-+		case "$CFLAGS" in
-+			*-D_POSIX_C_SOURCE*);;
-+			*)
-+				CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L"
-+				AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Whether to enable POSIX support])
-+				;;
-+		esac
-+		case "$CFLAGS" in
-+			*-D_SYSV*|*-D_SVID_SOURCE*);;
-+			*)
-+				CFLAGS="$CFLAGS -D_SYSV"
-+				AC_DEFINE(_SYSV, 1, [Whether to enable System V compatibility])
-+				;;
-+		esac
-+		;;
-+esac
-+
-+# Do not check for standards.h on darwin, we get nasty warnings on
-+# OS/X Lion. Probably a positive-list of OS'es like IRIX and AIX
-+# would be the better choice, but this seems to work fine
-+
-+case "$host_os" in
-+     *darwin*)
-+	;;
-+     *)
-+        AC_CHECK_HEADERS([standards.h])
-+	;;
-+esac
-+
-+# Solaris needs HAVE_LONG_LONG defined
-+AC_CHECK_TYPES(long long)
-+
-+AC_CHECK_SIZEOF(int)
-+AC_CHECK_SIZEOF(char)
-+AC_CHECK_SIZEOF(short)
-+AC_CHECK_SIZEOF(long)
-+AC_CHECK_SIZEOF(long long)
-+
-+AC_CHECK_TYPE(int8_t, char)
-+AC_CHECK_TYPE(uint8_t, unsigned char)
-+AC_CHECK_TYPE(int16_t, short)
-+AC_CHECK_TYPE(uint16_t, unsigned short)
-+
-+if test $ac_cv_sizeof_int -eq 4 ; then
-+AC_CHECK_TYPE(int32_t, int)
-+AC_CHECK_TYPE(uint32_t, unsigned int)
-+elif test $ac_cv_size_long -eq 4 ; then
-+AC_CHECK_TYPE(int32_t, long)
-+AC_CHECK_TYPE(uint32_t, unsigned long)
-+else
-+AC_MSG_ERROR([LIBREPLACE no 32-bit type found])
-+fi
-+
-+AC_CHECK_TYPE(int64_t, long long)
-+AC_CHECK_TYPE(uint64_t, unsigned long long)
-+
-+AC_CHECK_TYPE(size_t, unsigned int)
-+AC_CHECK_TYPE(ssize_t, int)
-+
-+AC_CHECK_SIZEOF(off_t)
-+AC_CHECK_SIZEOF(size_t)
-+AC_CHECK_SIZEOF(ssize_t)
-+
-+AC_CHECK_TYPES([intptr_t, uintptr_t, ptrdiff_t])
-+
-+if test x"$ac_cv_type_long_long" != x"yes";then
-+	AC_MSG_ERROR([LIBREPLACE needs type 'long long'])
-+fi
-+if test $ac_cv_sizeof_long_long -lt 8;then
-+	AC_MSG_ERROR([LIBREPLACE needs sizeof(long long) >= 8])
-+fi
-+
-+############################################
-+# check if the compiler can do immediate structures
-+AC_SUBST(libreplace_cv_immediate_structures)
-+AC_CACHE_CHECK([for immediate structures],libreplace_cv_immediate_structures,[
-+	AC_TRY_COMPILE([
-+		#include <stdio.h>
-+	],[
-+		typedef struct {unsigned x;} FOOBAR;
-+		#define X_FOOBAR(x) ((FOOBAR) { x })
-+		#define FOO_ONE X_FOOBAR(1)
-+		FOOBAR f = FOO_ONE;   
-+		static const struct {
-+			FOOBAR y; 
-+		} f2[] = {
-+			{FOO_ONE}
-+		};
-+		static const FOOBAR f3[] = {FOO_ONE};
-+	],
-+	libreplace_cv_immediate_structures=yes,
-+	libreplace_cv_immediate_structures=no,
-+	libreplace_cv_immediate_structures=cross)
-+])
-+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
-+	AC_DEFINE(HAVE_IMMEDIATE_STRUCTURES,1,[Whether the compiler supports immediate structures])
-+fi
-+
-+AC__LIBREPLACE_ONLY_CC_CHECKS_END
-+]) dnl end AC_LIBREPLACE_CC_CHECKS
-diff --git a/lib/replace/libreplace_ld.m4 b/lib/replace/libreplace_ld.m4
-new file mode 100644
-index 0000000..bf0df61
---- /dev/null
-+++ b/lib/replace/libreplace_ld.m4
-@@ -0,0 +1,337 @@
-+#
-+# This offers a nice overview how to build shared libraries on all platforms
-+#        http://www.fortran-2000.com/ArnaudRecipes/sharedlib.html
-+#
-+
-+AC_DEFUN([AC_LIBREPLACE_STLD],
-+[
-+	AC_PATH_PROG(PROG_AR, ar)
-+
-+	STLD=${PROG_AR}
-+
-+	AC_SUBST(STLD)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_STLD_FLAGS],
-+[
-+	STLD_FLAGS="-rcs"
-+	AC_SUBST(STLD_FLAGS)
-+])
-+
-+AC_DEFUN([AC_LD_EXPORT_DYNAMIC],
-+[
-+saved_LDFLAGS="$LDFLAGS"
-+if AC_TRY_COMMAND([${CC-cc} $CFLAGS -Wl,--version 2>&1 | grep "GNU ld" >/dev/null]); then
-+	LD_EXPORT_DYNAMIC="-Wl,-export-dynamic"
-+else
-+	case "$host_os" in
-+		hpux* )
-+		  LD_EXPORT_DYNAMIC="-Wl,-E"
-+		  ;;
-+		*)
-+		  LD_EXPORT_DYNAMIC=""
-+		  ;;
-+	  esac
-+fi
-+AC_SUBST(LD_EXPORT_DYNAMIC)
-+LDFLAGS="$saved_LDFLAGS"
-+])
-+
-+AC_DEFUN([AC_LD_PICFLAG],
-+[
-+case "$host_os" in
-+	*linux*|*gnu*)
-+		PICFLAG="-fPIC" 
-+		;;
-+	*solaris*)
-+		if test "${GCC}" = "yes"; then
-+			PICFLAG="-fPIC"
-+		else
-+			PICFLAG="-KPIC"
-+		fi
-+		;;
-+	*sunos*)
-+		PICFLAG="-KPIC"   # Is this correct for SunOS
-+		;;
-+	*netbsd* | *freebsd* | *dragonfly* )  
-+		PICFLAG="-fPIC -DPIC"
-+		;;
-+	*openbsd*)
-+		PICFLAG="-fPIC"
-+		;;
-+	*irix*)
-+		if test "${GCC}" = "yes"; then
-+			PICFLAG="-fPIC"
-+		else 
-+			PICFLAG="-KPIC"
-+		fi
-+		;;
-+	*aix*)
-+		# as AIX code is always position independent...
-+		PICFLAG="-O2"
-+		;;
-+	*hpux*)
-+		if test "${GCC}" = "yes"; then
-+			PICFLAG="-fPIC"
-+		elif test "$host_cpu" = "ia64"; then
-+		        PICFLAG="+z"
-+		elif test $ac_cv_prog_cc_Ae = yes; then
-+			PICFLAG="+z +ESnolit"
-+		fi
-+		;;
-+	*osf*)
-+		PICFLAG="-fPIC"
-+		;;
-+	*unixware*)
-+		PICFLAG="-KPIC"
-+		;;
-+	*darwin*)
-+		PICFLAG="-fno-common"
-+		;;
-+esac
-+AC_SUBST(PICFLAG)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_LINKER],
-+[
-+	LD_SHLIB_LINKER="${CC}"
-+
-+	case "$host_os" in
-+		*irix*)
-+			LD_SHLIB_LINKER="${PROG_LD}"
-+			;;
-+	esac
-+
-+	AC_SUBST(LD_SHLIB_LINKER)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_FLAGS],
-+[
-+	LD_SHLIB_FLAGS="-shared"
-+
-+	case "$host_os" in
-+		*linux*|*gnu*)
-+			LD_SHLIB_FLAGS="-shared -Wl,-Bsymbolic"
-+			;;
-+		*solaris*)
-+			LD_SHLIB_FLAGS="-G"
-+			if test "${GCC}" = "no"; then
-+				## ${CFLAGS} added for building 64-bit shared 
-+				## libs using Sun's Compiler
-+				LD_SHLIB_FLAGS="-G \${CFLAGS}"
-+			fi
-+			;;
-+		*sunos*)
-+			LD_SHLIB_FLAGS="-G"
-+			;;
-+		*irix*)
-+			LD_SHLIB_FLAGS="-shared"
-+			;;
-+		*aix*)
-+			LD_SHLIB_FLAGS="-Wl,-G,-bexpall,-bbigtoc"
-+			;;
-+		*hpux*)
-+			if test "${GCC}" = "yes"; then
-+				LD_SHLIB_FLAGS="-shared"
-+			else
-+				LD_SHLIB_FLAGS="-b"
-+			fi
-+			;;
-+		*osf*)
-+			LD_SHLIB_FLAGS="-shared"
-+			;;
-+		*darwin*)
-+			LD_SHLIB_FLAGS="-dynamiclib -Wl,-search_paths_first"
-+			;;
-+	esac
-+
-+	AC_SUBST(LD_SHLIB_FLAGS)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_DISALLOW_UNDEF_FLAG],
-+[
-+	LD_SHLIB_DISALLOW_UNDEF_FLAG=""
-+
-+	#
-+	# TODO: enforce error not only warnings
-+	#
-+	# NOTE: -Wl,--no-allow-shlib-undefined isn't what we want...
-+	#       as it bails out on broken system libraries
-+	#
-+	case "$host_os" in
-+		*osf*)
-+			LD_SHLIB_DISALLOW_UNDEF_FLAG="-warning_unresolved"
-+			;;
-+		*darwin*)
-+			LD_SHLIB_DISALLOW_UNDEF_FLAG="-undefined error"
-+			;;
-+	esac
-+
-+	AC_SUBST(LD_SHLIB_DISALLOW_UNDEF_FLAG)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_SHLD],
-+[
-+	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_LINKER])
-+	SHLD="$LD_SHLIB_LINKER"
-+	AC_SUBST(SHLD)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_SHLD_FLAGS],
-+[
-+	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_FLAGS])
-+	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_DISALLOW_UNDEF_FLAG])
-+	SHLD_FLAGS="$LD_SHLIB_FLAGS $LD_SHLIB_DISALLOW_UNDEF_FLAG"
-+	AC_SUBST(SHLD_FLAGS)
-+])
-+
-+AC_DEFUN([AC_LD_SHLIBEXT],
-+[
-+	SHLIBEXT="so"
-+	case "$host_os" in
-+		*hpux*)
-+			if test "$host_cpu" = "ia64"; then
-+				SHLIBEXT="so"
-+			else
-+				SHLIBEXT="sl"
-+			fi
-+		;;
-+		*darwin*)
-+			SHLIBEXT="dylib"
-+		;;
-+	esac
-+	AC_SUBST(SHLIBEXT)
-+])
-+
-+AC_DEFUN([AC_LD_SONAMEFLAG],
-+[
-+	AC_SUBST(SONAMEFLAG)
-+	SONAMEFLAG=""
-+	case "$host_os" in 
-+		*linux*|*gnu*|*qnx*)
-+			SONAMEFLAG="-Wl,-soname="
-+			;;
-+		*solaris*)
-+			SONAMEFLAG="-h "
-+			if test "${GCC}" = "yes"; then
-+				SONAMEFLAG="-Wl,-soname="
-+			fi
-+			;;
-+		*sunos*)
-+			SONAMEFLAG="-Wl,-h,"
-+			;;
-+		*netbsd* | *freebsd* | *dragonfly* )
-+			SONAMEFLAG="-Wl,-soname,"
-+			;;
-+		*openbsd*)
-+			SONAMEFLAG="-Wl,-soname,"
-+			;;
-+		*irix*)
-+			SONAMEFLAG="-Wl,-soname,"
-+			;;
-+		*hpux*)
-+			SONAMEFLAG="-Wl,+h,"
-+			;;
-+		*osf*)
-+			SONAMEFLAG="-Wl,-soname,"
-+			;;
-+		*unixware*)
-+			SONAMEFLAG="-Wl,-soname,"
-+			;;
-+		*darwin*)
-+			SONAMEFLAG="#"
-+			;;
-+		*aix*)
-+			# Not supported
-+			SONAMEFLAG="#"
-+			;;
-+		esac
-+])
-+
-+AC_DEFUN([AC_LD_VERSIONSCRIPT],
-+[
-+	AC_SUBST(VERSIONSCRIPT)
-+	VERSIONSCRIPT=""
-+	case "$host_os" in 
-+		*linux*|*gnu*)
-+			VERSIONSCRIPT="-Wl,--version-script"
-+			;;
-+		*solaris*)
-+			if test "${GCC}" = "yes"; then
-+				VERSIONSCRIPT="-Wl,--version-script"
-+			fi
-+			;;
-+		esac
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_MDLD],
-+[
-+	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_LINKER])
-+	MDLD="$LD_SHLIB_LINKER"
-+	AC_SUBST(MDLD)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_LD_SHLIB_ALLOW_UNDEF_FLAG],
-+[
-+	LD_ALLOW_SHLIB_UNDEF_FLAG=""
-+
-+	case "$host_os" in
-+		*linux*|*gnu*)
-+			LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,--allow-shlib-undefined"
-+			;;
-+		*osf*)
-+			LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,-expect_unresolved,\"*\""
-+			;;
-+		*darwin*)
-+			LD_SHLIB_ALLOW_UNDEF_FLAG="-undefined dynamic_lookup"
-+			;;
-+		*aix*)
-+			LD_SHLIB_ALLOW_UNDEF_FLAG="-Wl,-bnoentry"
-+			;;
-+	esac
-+
-+	AC_SUBST(LD_SHLIB_ALLOW_UNDEF_FLAG)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_MDLD_FLAGS],
-+[
-+	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_FLAGS])
-+	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_ALLOW_UNDEF_FLAG])
-+	MDLD_FLAGS="$LD_SHLIB_FLAGS $LD_SHLIB_ALLOW_UNDEF_FLAG"
-+	AC_SUBST(MDLD_FLAGS)
-+])
-+
-+AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR],
-+[
-+	case "$host_os" in
-+		*linux*|*gnu*)
-+			LIB_PATH_VAR=LD_LIBRARY_PATH
-+		;;
-+		*bsd*)
-+			LIB_PATH_VAR=LD_LIBRARY_PATH
-+		;;
-+		*solaris*)
-+			LIB_PATH_VAR=LD_LIBRARY_PATH
-+		;;
-+		*hpux*)
-+			LIB_PATH_VAR=SHLIB_PATH
-+		;;
-+		*osf*)
-+			LIB_PATH_VAR=LD_LIBRARY_PATH
-+		;;
-+		*aix*)
-+			LIB_PATH_VAR=LIBPATH
-+			;;
-+		*irix*)
-+			LIB_PATH_VAR=LD_LIBRARY_PATH
-+			;;
-+		*darwin*)
-+			LIB_PATH_VAR=DYLD_LIBRARY_PATH
-+			;;
-+		*)
-+			LIB_PATH_VAR=LD_LIBRARY_PATH
-+			;;
-+	esac
-+
-+	AC_SUBST(LIB_PATH_VAR)
-+])
-diff --git a/lib/replace/libreplace_macros.m4 b/lib/replace/libreplace_macros.m4
-new file mode 100644
-index 0000000..f3753c4
---- /dev/null
-+++ b/lib/replace/libreplace_macros.m4
-@@ -0,0 +1,347 @@
-+#
-+# This is a collection of useful autoconf macros
-+#
-+
-+############################################
-+# Check if the compiler handles c99 struct initialization, and if not try -AC99 and -c99 flags
-+# Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
-+# changes CFLAGS to add -AC99 or -c99 if needed
-+AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
-+[
-+saved_CFLAGS="$CFLAGS";
-+c99_init=no
-+if test x"$c99_init" = x"no"; then
-+    AC_MSG_CHECKING(for C99 designated initializers)
-+    CFLAGS="$saved_CFLAGS";
-+    AC_TRY_COMPILE([#include <stdio.h>],
-+     [ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };	 
-+     ],
-+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-+fi
-+if test x"$c99_init" = x"no"; then
-+    AC_MSG_CHECKING(for C99 designated initializers with -AC99)
-+    CFLAGS="$saved_CFLAGS -AC99";
-+    AC_TRY_COMPILE([#include <stdio.h>],
-+     [ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };	 
-+     ],
-+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-+fi
-+if test x"$c99_init" = x"no"; then
-+    AC_MSG_CHECKING(for C99 designated initializers with -qlanglvl=extc99)
-+    CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
-+    AC_TRY_COMPILE([#include <stdio.h>],
-+     [ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };	 
-+     ],
-+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-+fi
-+if test x"$c99_init" = x"no"; then
-+    AC_MSG_CHECKING(for C99 designated initializers with -qlanglvl=stdc99)
-+    CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
-+    AC_TRY_COMPILE([#include <stdio.h>],
-+     [ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };	 
-+     ],
-+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-+fi
-+if test x"$c99_init" = x"no"; then
-+    AC_MSG_CHECKING(for C99 designated initializers with -c99)
-+    CFLAGS="$saved_CFLAGS -c99"
-+    AC_TRY_COMPILE([#include <stdio.h>],
-+     [ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };	 
-+     ],
-+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-+fi
-+
-+if test "`uname`" = "HP-UX"; then
-+  if test "$ac_cv_c_compiler_gnu" = no; then
-+	# special override for broken HP-UX compiler - I can't find a way to test
-+	# this properly (its a compiler bug)
-+	CFLAGS="$CFLAGS -AC99";
-+	c99_init=yes;
-+  fi
-+fi
-+
-+if test x"$c99_init" = x"yes"; then
-+    saved_CFLAGS=""
-+    $1
-+else
-+    CFLAGS="$saved_CFLAGS"
-+    saved_CFLAGS=""
-+    $2
-+fi
-+])
-+
-+dnl AC_PROG_CC_FLAG(flag)
-+AC_DEFUN(AC_PROG_CC_FLAG,
-+[AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
-+[echo 'void f(){}' > conftest.c
-+if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
-+  ac_cv_prog_cc_$1=yes
-+else
-+  ac_cv_prog_cc_$1=no
-+fi
-+rm -f conftest*
-+])])
-+
-+dnl see if a declaration exists for a function or variable
-+dnl defines HAVE_function_DECL if it exists
-+dnl AC_HAVE_DECL(var, includes)
-+AC_DEFUN(AC_HAVE_DECL,
-+[
-+ AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
-+    AC_TRY_COMPILE([$2],[int i = (int)$1],
-+        ac_cv_have_$1_decl=yes,ac_cv_have_$1_decl=no)])
-+ if test x"$ac_cv_have_$1_decl" = x"yes"; then
-+    AC_DEFINE([HAVE_]translit([$1], [a-z], [A-Z])[_DECL],1,[Whether $1() is available])
-+ fi
-+])
-+
-+
-+# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
-+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-+#              [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES])
-+# ------------------------------------------------------
-+#
-+# Use a cache variable name containing both the library and function name,
-+# because the test really is for library $1 defining function $3, not
-+# just for library $1.  Separate tests with the same $1 and different $3s
-+# may have different results.
-+#
-+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3])
-+# is asking for trouble, since AC_CHECK_LIB($lib, fun) would give
-+# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
-+# the AS_LITERAL_IF indirection.
-+#
-+# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
-+# whatever the FUNCTION, in addition to not being a *S macro.  Note
-+# that the cache does depend upon the function we are looking for.
-+#
-+# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just
-+# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
-+# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'.
-+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
-+# freedom.
-+AC_DEFUN([AC_CHECK_LIB_EXT],
-+[
-+AH_CHECK_LIB_EXT([$1])
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-l$1 $$2 $7 $LIBS"
-+AS_LITERAL_IF([$1],
-+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])],
-+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl
-+
-+m4_ifval([$3],
-+ [
-+    AH_CHECK_FUNC_EXT([$3])
-+    AS_LITERAL_IF([$1],
-+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])],
-+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl
-+    AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func,
-+	[AC_TRY_LINK_FUNC($3,
-+                 [AS_VAR_SET(ac_Lib_func, yes);
-+		  AS_VAR_SET(ac_Lib_ext, yes)],
-+                 [AS_VAR_SET(ac_Lib_func, no);
-+		  AS_VAR_SET(ac_Lib_ext, no)])
-+	])
-+    AS_IF([test AS_VAR_GET(ac_Lib_func) = yes],
-+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl
-+    AS_VAR_POPDEF([ac_Lib_func])dnl
-+ ],[
-+    AC_CACHE_CHECK([for -l$1], ac_Lib_ext,
-+	[AC_TRY_LINK_FUNC([main],
-+                 [AS_VAR_SET(ac_Lib_ext, yes)],
-+                 [AS_VAR_SET(ac_Lib_ext, no)])
-+	])
-+ ])
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes],
-+    [m4_default([$4], 
-+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-+		case "$$2" in
-+		    *-l$1*)
-+			;;
-+		    *)
-+			$2="-l$1 $$2"
-+			;;
-+		esac])
-+		[$6]
-+	    ],
-+	    [$5])dnl
-+AS_VAR_POPDEF([ac_Lib_ext])dnl
-+])# AC_CHECK_LIB_EXT
-+
-+# AH_CHECK_LIB_EXT(LIBNAME)
-+# ---------------------
-+m4_define([AH_CHECK_LIB_EXT],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-+             [Define to 1 if you have the `]$1[' library (-l]$1[).])])
-+
-+dnl AC_SEARCH_LIBS_EXT(FUNCTION, SEARCH-LIBS, EXT_LIBS,
-+dnl                    [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-+dnl                    [OTHER-LIBRARIES])
-+dnl --------------------------------------------------------
-+dnl Search for a library defining FUNC, if it's not already available.
-+AC_DEFUN([AC_SEARCH_LIBS_EXT],
-+[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_ext_$1],
-+[
-+ac_func_search_ext_save_LIBS=$LIBS
-+ac_cv_search_ext_$1=no
-+AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-+	       [ac_cv_search_ext_$1="none required"])
-+if test "$ac_cv_search_ext_$1" = no; then
-+  for ac_lib in $2; do
-+    LIBS="-l$ac_lib $$3 $6 $ac_func_search_save_ext_LIBS"
-+    AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
-+		   [ac_cv_search_ext_$1="-l$ac_lib"
-+break])
-+  done
-+fi
-+LIBS=$ac_func_search_ext_save_LIBS])
-+AS_IF([test "$ac_cv_search_ext_$1" != no],
-+  [test "$ac_cv_search_ext_$1" = "none required" || $3="$ac_cv_search_ext_$1 $$3"
-+  $4],
-+      [$5])dnl
-+])
-+
-+dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable.
-+dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE)
-+AC_DEFUN([AC_CHECK_FUNC_EXT],
-+[
-+    AH_CHECK_FUNC_EXT($1)	
-+    ac_check_func_ext_save_LIBS=$LIBS
-+    LIBS="$2 $LIBS"
-+    AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl
-+    AC_CACHE_CHECK([for $1], ac_var,
-+	[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
-+                [AS_VAR_SET(ac_var, yes)],
-+                [AS_VAR_SET(ac_var, no)])])
-+    LIBS=$ac_check_func_ext_save_LIBS
-+    AS_IF([test AS_VAR_GET(ac_var) = yes], 
-+	    [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], 
-+	    [$4])dnl
-+AS_VAR_POPDEF([ac_var])dnl
-+])# AC_CHECK_FUNC
-+
-+# AH_CHECK_FUNC_EXT(FUNCNAME)
-+# ---------------------
-+m4_define([AH_CHECK_FUNC_EXT],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_$1),
-+             [Define to 1 if you have the `]$1[' function.])])
-+
-+dnl Define an AC_DEFINE with ifndef guard.
-+dnl AC_N_DEFINE(VARIABLE [, VALUE])
-+AC_DEFUN([AC_N_DEFINE],
-+[
-+AH_VERBATIM([$1], [
-+#ifndef $1
-+# undef $1
-+#endif
-+])
-+
-+ cat >>confdefs.h <<\EOF
-+#ifndef $1
-+[#define] $1 m4_if($#, 1, 1, [$2])
-+#endif
-+EOF
-+])
-+
-+dnl Add an #include
-+dnl AC_ADD_INCLUDE(VARIABLE)
-+define(AC_ADD_INCLUDE,
-+[cat >> confdefs.h <<\EOF
-+[#include] $1
-+EOF
-+])
-+
-+dnl remove an #include
-+dnl AC_REMOVE_INCLUDE(VARIABLE)
-+define(AC_REMOVE_INCLUDE,
-+[
-+grep -v '[#include] $1' confdefs.h >confdefs.h.tmp
-+cat confdefs.h.tmp > confdefs.h
-+rm confdefs.h.tmp
-+])
-+
-+dnl remove an #define
-+dnl AC_REMOVE_DEFINE(VARIABLE)
-+define(AC_REMOVE_DEFINE,
-+[
-+grep -v '[#define] $1 ' confdefs.h |grep -v '[#define] $1[$]'>confdefs.h.tmp
-+cat confdefs.h.tmp > confdefs.h
-+rm confdefs.h.tmp
-+])
-+
-+dnl AS_HELP_STRING is not available in autoconf 2.57, and AC_HELP_STRING is deprecated
-+dnl in autoconf 2.59, so define AS_HELP_STRING to be AC_HELP_STRING unless it is already
-+dnl defined.
-+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-+
-+dnl check if the prototype in the header matches the given one
-+dnl AC_VERIFY_C_PROTOTYPE(prototype,functionbody,[IF-TRUE].[IF-FALSE],[extraheaders])
-+AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
-+[AC_CACHE_CHECK([for prototype $1], AS_TR_SH([ac_cv_c_prototype_$1]),
-+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+		AC_INCLUDES_DEFAULT
-+		$5
-+		$1
-+		{
-+			$2
-+		}
-+	])],[
-+		eval AS_TR_SH([ac_cv_c_prototype_$1])=yes
-+	],[
-+		eval AS_TR_SH([ac_cv_c_prototype_$1])=no
-+	])
-+)
-+AS_IF([eval test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
-+])
-+
-+AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, 
-+[AC_CHECK_HEADER([$1], 
-+		[ AC_CONFIG_COMMANDS(rm-$1, [rm -f $libreplacedir/$1], [libreplacedir=$libreplacedir]) ],
-+		[ AC_CONFIG_COMMANDS(mk-$1, [echo "#include \"replace.h\"" > $libreplacedir/$1], [libreplacedir=$libreplacedir]) ]
-+	)
-+])
-+
-+dnl AC_HAVE_TYPE(TYPE,INCLUDES)
-+AC_DEFUN([AC_HAVE_TYPE], [
-+AC_REQUIRE([AC_HEADER_STDC])
-+cv=`echo "$1" | sed 'y%./+- %__p__%'`
-+AC_MSG_CHECKING(for $1)
-+AC_CACHE_VAL([ac_cv_type_$cv],
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+AC_INCLUDES_DEFAULT
-+$2]],
-+[[$1 foo;]])],
-+[eval "ac_cv_type_$cv=yes"],
-+[eval "ac_cv_type_$cv=no"]))dnl
-+ac_foo=`eval echo \\$ac_cv_type_$cv`
-+AC_MSG_RESULT($ac_foo)
-+if test "$ac_foo" = yes; then
-+  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+	AC_CHECK_TYPES($1)
-+fi
-+  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
-+fi
-+])
-+
-+# AC_CHECK_VALUEOF(TYPE, [INCLUDES = DEFAULT-INCLUDES])
-+# ---------------------------------------------------------------
-+AC_DEFUN([AC_CHECK_VALUEOF],
-+[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [],
-+	       [m4_fatal([$0: requires literal arguments])])]dnl
-+[
-+_AC_CACHE_CHECK_INT([value of $1], [AS_TR_SH([ac_cv_valueof_$1])],
-+  [(long int) ($1)],
-+  [AC_INCLUDES_DEFAULT([$2])],
-+  [])
-+
-+AC_DEFINE_UNQUOTED(AS_TR_CPP(valueof_$1), $AS_TR_SH([ac_cv_valueof_$1]),
-+		   [The value of `$1'.])
-+])# AC_CHECK_VALUEOF
-diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
-new file mode 100644
-index 0000000..bb2a843
---- /dev/null
-+++ b/lib/replace/libreplace_network.m4
-@@ -0,0 +1,503 @@
-+AC_DEFUN_ONCE(AC_LIBREPLACE_NETWORK_CHECKS,
-+[
-+echo "LIBREPLACE_NETWORK_CHECKS: START"
-+
-+AC_DEFINE(LIBREPLACE_NETWORK_CHECKS, 1, [LIBREPLACE_NETWORK_CHECKS were used])
-+LIBREPLACE_NETWORK_OBJS=""
-+LIBREPLACE_NETWORK_LIBS=""
-+
-+AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
-+AC_CHECK_HEADERS(netinet/in_systm.h)
-+AC_CHECK_HEADERS([netinet/ip.h], [], [],[
-+	#include <sys/types.h>
-+	#ifdef HAVE_NETINET_IN_H
-+	#include <netinet/in.h>
-+	#endif
-+	#ifdef HAVE_NETINET_IN_SYSTM_H
-+	#include <netinet/in_systm.h>
-+	#endif
-+])
-+AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
-+AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
-+AC_CHECK_HEADERS(sys/uio.h)
-+
-+dnl we need to check that net/if.h really can be used, to cope with hpux
-+dnl where including it always fails
-+AC_CACHE_CHECK([for usable net/if.h],libreplace_cv_USABLE_NET_IF_H,[
-+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+		AC_INCLUDES_DEFAULT
-+		#if HAVE_SYS_SOCKET_H
-+		# include <sys/socket.h>
-+		#endif
-+		#include <net/if.h>
-+		int main(void) {return 0;}])],
-+		[libreplace_cv_USABLE_NET_IF_H=yes],
-+		[libreplace_cv_USABLE_NET_IF_H=no]
-+	)
-+])
-+if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then
-+	AC_DEFINE(HAVE_NET_IF_H, 1, usability of net/if.h)
-+fi
-+
-+AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>])
-+AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>])
-+AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
-+AC_HAVE_TYPE([struct sockaddr], [#include <sys/socket.h>])
-+AC_HAVE_TYPE([struct sockaddr_storage], [
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+])
-+AC_HAVE_TYPE([struct sockaddr_in6], [
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+])
-+
-+if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then
-+AC_CHECK_MEMBER(struct sockaddr_storage.ss_family,
-+                AC_DEFINE(HAVE_SS_FAMILY, 1, [Defined if struct sockaddr_storage has ss_family field]),,
-+                [
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+		])
-+
-+if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then
-+AC_CHECK_MEMBER(struct sockaddr_storage.__ss_family,
-+                AC_DEFINE(HAVE___SS_FAMILY, 1, [Defined if struct sockaddr_storage has __ss_family field]),,
-+                [
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+		])
-+fi
-+fi
-+
-+AC_CACHE_CHECK([for sin_len in sock],libreplace_cv_HAVE_SOCK_SIN_LEN,[
-+	AC_TRY_COMPILE(
-+		[
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+		],[
-+struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-+		],[
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
-+		],[
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=no
-+		])
-+])
-+if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
-+	AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property])
-+fi
-+
-+############################################
-+# check for unix domain sockets
-+AC_CACHE_CHECK([for unix domain sockets],libreplace_cv_HAVE_UNIXSOCKET,[
-+	AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+		],[
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
-+		],[
-+		libreplace_cv_HAVE_UNIXSOCKET=yes
-+		],[
-+		libreplace_cv_HAVE_UNIXSOCKET=no
-+		])
-+])
-+if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then
-+	AC_DEFINE(HAVE_UNIXSOCKET,1,[If we need to build with unixscoket support])
-+fi
-+
-+dnl The following test is roughly taken from the cvs sources.
-+dnl
-+dnl If we can't find connect, try looking in -lsocket, -lnsl, and -linet.
-+dnl The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has
-+dnl libsocket.so which has a bad implementation of gethostbyname (it
-+dnl only looks in /etc/hosts), so we only look for -lsocket if we need
-+dnl it.
-+AC_CHECK_FUNCS(connect)
-+if test x"$ac_cv_func_connect" = x"no"; then
-+	AC_CHECK_LIB_EXT(nsl_s, LIBREPLACE_NETWORK_LIBS, connect)
-+	AC_CHECK_LIB_EXT(nsl, LIBREPLACE_NETWORK_LIBS, connect)
-+	AC_CHECK_LIB_EXT(socket, LIBREPLACE_NETWORK_LIBS, connect)
-+	AC_CHECK_LIB_EXT(inet, LIBREPLACE_NETWORK_LIBS, connect)
-+	dnl We can't just call AC_CHECK_FUNCS(connect) here,
-+	dnl because the value has been cached.
-+	if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" ||
-+		test x"$ac_cv_lib_ext_nsl_connect" = x"yes" ||
-+		test x"$ac_cv_lib_ext_socket_connect" = x"yes" ||
-+		test x"$ac_cv_lib_ext_inet_connect" = x"yes"
-+	then
-+		AC_DEFINE(HAVE_CONNECT,1,[Whether the system has connect()])
-+	fi
-+fi
-+
-+AC_CHECK_FUNCS(gethostbyname)
-+if test x"$ac_cv_func_gethostbyname" = x"no"; then
-+	AC_CHECK_LIB_EXT(nsl_s, LIBREPLACE_NETWORK_LIBS, gethostbyname)
-+	AC_CHECK_LIB_EXT(nsl, LIBREPLACE_NETWORK_LIBS, gethostbyname)
-+	AC_CHECK_LIB_EXT(socket, LIBREPLACE_NETWORK_LIBS, gethostbyname)
-+	dnl We can't just call AC_CHECK_FUNCS(gethostbyname) here,
-+	dnl because the value has been cached.
-+	if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" ||
-+		test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" ||
-+		test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes"
-+	then
-+		AC_DEFINE(HAVE_GETHOSTBYNAME,1,
-+			  [Whether the system has gethostbyname()])
-+	fi
-+fi
-+
-+dnl HP-UX has if_nametoindex in -lipv6
-+AC_CHECK_FUNCS(if_nametoindex)
-+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
-+	AC_CHECK_LIB_EXT(ipv6, LIBREPLACE_NETWORK_LIBS, if_nametoindex)
-+	dnl We can't just call AC_CHECK_FUNCS(if_nametoindex) here,
-+	dnl because the value has been cached.
-+	if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
-+	then
-+		AC_DEFINE(HAVE_IF_NAMETOINDEX, 1,
-+			  [Whether the system has if_nametoindex()])
-+	fi
-+fi
-+
-+# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}"
-+old_LIBS=$LIBS
-+LIBS="${LIBREPLACE_NETWORK_LIBS}"
-+libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
-+
-+AC_CHECK_FUNCS(socketpair,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"])
-+
-+AC_CACHE_CHECK([for broken inet_ntoa],libreplace_cv_REPLACE_INET_NTOA,[
-+AC_TRY_RUN([
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
-+#endif
-+main() { struct in_addr ip; ip.s_addr = 0x12345678;
-+if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
-+    strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
-+exit(1);}],
-+           libreplace_cv_REPLACE_INET_NTOA=yes,libreplace_cv_REPLACE_INET_NTOA=no,libreplace_cv_REPLACE_INET_NTOA=cross)])
-+
-+AC_CHECK_FUNCS(inet_ntoa,[],[libreplace_cv_REPLACE_INET_NTOA=yes])
-+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
-+    AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced])
-+    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
-+fi
-+
-+AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"])
-+
-+AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"])
-+
-+AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"])
-+
-+dnl test for getaddrinfo/getnameinfo
-+AC_CACHE_CHECK([for getaddrinfo],libreplace_cv_HAVE_GETADDRINFO,[
-+AC_TRY_LINK([
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#include <sys/socket.h>
-+#include <netdb.h>],
-+[
-+struct sockaddr sa;
-+struct addrinfo *ai = NULL;
-+int ret = getaddrinfo(NULL, NULL, NULL, &ai);
-+if (ret != 0) {
-+	const char *es = gai_strerror(ret);
-+}
-+freeaddrinfo(ai);
-+ret = getnameinfo(&sa, sizeof(sa),
-+		NULL, 0,
-+		NULL, 0, 0);
-+
-+],
-+libreplace_cv_HAVE_GETADDRINFO=yes,libreplace_cv_HAVE_GETADDRINFO=no)])
-+
-+if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
-+	# getaddrinfo is broken on some AIX systems
-+	# see bug 5910, use our replacements if we detect
-+	# a broken system.
-+	AC_TRY_RUN([
-+		#include <stddef.h>
-+		#include <sys/types.h>
-+		#include <sys/socket.h>
-+		#include <netdb.h>
-+		int main(int argc, const char *argv[])
-+		{
-+			struct addrinfo hints = {0,};
-+			struct addrinfo *ppres;
-+			const char hostname1[] = "0.0.0.0";
-+			const char hostname2[] = "127.0.0.1";
-+			const char hostname3[] = "::";
-+			hints.ai_socktype = SOCK_STREAM;
-+			hints.ai_family = AF_UNSPEC;
-+			hints.ai_flags =
-+				AI_NUMERICHOST|AI_PASSIVE|AI_ADDRCONFIG;
-+			/* Test for broken flag combination on AIX. */
-+			if (getaddrinfo(hostname1, NULL, &hints, &ppres) == EAI_BADFLAGS) {
-+				/* This fails on an IPv6-only box, but not with
-+				   the EAI_BADFLAGS error. */
-+				return 1;
-+			}
-+			if (getaddrinfo(hostname2, NULL, &hints, &ppres) == 0) {
-+				/* IPv4 lookup works - good enough. */
-+				return 0;
-+			}
-+			/* Uh-oh, no IPv4. Are we IPv6-only ? */
-+			return getaddrinfo(hostname3, NULL, &hints, &ppres) != 0 ? 1 : 0;
-+		}],
-+		libreplace_cv_HAVE_GETADDRINFO=yes,
-+		libreplace_cv_HAVE_GETADDRINFO=no)
-+fi
-+
-+if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
-+	AC_DEFINE(HAVE_GETADDRINFO,1,[Whether the system has getaddrinfo])
-+	AC_DEFINE(HAVE_GETNAMEINFO,1,[Whether the system has getnameinfo])
-+	AC_DEFINE(HAVE_FREEADDRINFO,1,[Whether the system has freeaddrinfo])
-+	AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether the system has gai_strerror])
-+else
-+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
-+fi
-+
-+AC_CHECK_HEADERS([ifaddrs.h])
-+
-+dnl Used when getifaddrs is not available
-+AC_CHECK_MEMBERS([struct sockaddr.sa_len], 
-+	 [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Whether struct sockaddr has a sa_len member])],
-+	 [],
-+	 [#include <sys/socket.h>])
-+
-+dnl test for getifaddrs and freeifaddrs
-+AC_CACHE_CHECK([for getifaddrs and freeifaddrs],libreplace_cv_HAVE_GETIFADDRS,[
-+AC_TRY_LINK([
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <ifaddrs.h>
-+#include <netdb.h>],
-+[
-+struct ifaddrs *ifp = NULL;
-+int ret = getifaddrs (&ifp);
-+freeifaddrs(ifp);
-+],
-+libreplace_cv_HAVE_GETIFADDRS=yes,libreplace_cv_HAVE_GETIFADDRS=no)])
-+if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then
-+    AC_DEFINE(HAVE_GETIFADDRS,1,[Whether the system has getifaddrs])
-+    AC_DEFINE(HAVE_FREEIFADDRS,1,[Whether the system has freeifaddrs])
-+	AC_DEFINE(HAVE_STRUCT_IFADDRS,1,[Whether struct ifaddrs is available])
-+fi
-+
-+##################
-+# look for a method of finding the list of network interfaces
-+iface=no;
-+AC_CACHE_CHECK([for iface getifaddrs],libreplace_cv_HAVE_IFACE_GETIFADDRS,[
-+AC_TRY_RUN([
-+#define HAVE_IFACE_GETIFADDRS 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"],
-+           libreplace_cv_HAVE_IFACE_GETIFADDRS=yes,libreplace_cv_HAVE_IFACE_GETIFADDRS=no,libreplace_cv_HAVE_IFACE_GETIFADDRS=cross)])
-+if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
-+    iface=yes;AC_DEFINE(HAVE_IFACE_GETIFADDRS,1,[Whether iface getifaddrs is available])
-+else
-+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
-+fi
-+
-+
-+if test $iface = no; then
-+AC_CACHE_CHECK([for iface AIX],libreplace_cv_HAVE_IFACE_AIX,[
-+AC_TRY_RUN([
-+#define HAVE_IFACE_AIX 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#undef _XOPEN_SOURCE_EXTENDED
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"],
-+           libreplace_cv_HAVE_IFACE_AIX=yes,libreplace_cv_HAVE_IFACE_AIX=no,libreplace_cv_HAVE_IFACE_AIX=cross)])
-+if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
-+    iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available])
-+fi
-+fi
-+
-+
-+if test $iface = no; then
-+AC_CACHE_CHECK([for iface ifconf],libreplace_cv_HAVE_IFACE_IFCONF,[
-+AC_TRY_RUN([
-+#define HAVE_IFACE_IFCONF 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"],
-+           libreplace_cv_HAVE_IFACE_IFCONF=yes,libreplace_cv_HAVE_IFACE_IFCONF=no,libreplace_cv_HAVE_IFACE_IFCONF=cross)])
-+if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
-+    iface=yes;AC_DEFINE(HAVE_IFACE_IFCONF,1,[Whether iface ifconf is available])
-+fi
-+fi
-+
-+if test $iface = no; then
-+AC_CACHE_CHECK([for iface ifreq],libreplace_cv_HAVE_IFACE_IFREQ,[
-+AC_TRY_RUN([
-+#define HAVE_IFACE_IFREQ 1
-+#define NO_CONFIG_H 1
-+#define AUTOCONF_TEST 1
-+#define SOCKET_WRAPPER_NOT_REPLACE
-+#include "$libreplacedir/replace.c"
-+#include "$libreplacedir/inet_ntop.c"
-+#include "$libreplacedir/snprintf.c"
-+#include "$libreplacedir/getifaddrs.c"
-+#define getifaddrs_test main
-+#include "$libreplacedir/test/getifaddrs.c"],
-+           libreplace_cv_HAVE_IFACE_IFREQ=yes,libreplace_cv_HAVE_IFACE_IFREQ=no,libreplace_cv_HAVE_IFACE_IFREQ=cross)])
-+if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
-+    iface=yes;AC_DEFINE(HAVE_IFACE_IFREQ,1,[Whether iface ifreq is available])
-+fi
-+fi
-+
-+dnl Some old Linux systems have broken header files and
-+dnl miss the IPV6_V6ONLY define in netinet/in.h,
-+dnl but have it in linux/in6.h.
-+dnl We can't include both files so we just check if the value
-+dnl if defined and do the replacement in system/network.h
-+AC_CACHE_CHECK([for IPV6_V6ONLY support],libreplace_cv_HAVE_IPV6_V6ONLY,[
-+	AC_TRY_COMPILE([
-+#include <stdlib.h> /* for NULL */
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netdb.h>
-+#include <netinet/in.h>
-+		],
-+		[
-+#ifndef IPV6_V6ONLY
-+#error no IPV6_V6ONLY
-+#endif
-+		],[
-+		libreplace_cv_HAVE_IPV6_V6ONLY=yes
-+		],[
-+		libreplace_cv_HAVE_IPV6_V6ONLY=no
-+		])
-+])
-+if test x"$libreplace_cv_HAVE_IPV6_V6ONLY" != x"yes"; then
-+   dnl test for IPV6_V6ONLY
-+   AC_CACHE_CHECK([for IPV6_V6ONLY in linux/in6.h],libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26,[
-+	AC_TRY_COMPILE([
-+	#include <linux/in6.h>
-+		],
-+		[
-+	#if (IPV6_V6ONLY != 26)
-+	#error no linux IPV6_V6ONLY
-+	#endif
-+		],[
-+		libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=yes
-+		],[
-+		libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=no
-+		])
-+	])
-+	if test x"$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" = x"yes"; then
-+		AC_DEFINE(HAVE_LINUX_IPV6_V6ONLY_26,1,[Whether the system has IPV6_V6ONLY in linux/in6.h])
-+	fi
-+fi
-+
-+dnl test for ipv6
-+AC_CACHE_CHECK([for ipv6 support],libreplace_cv_HAVE_IPV6,[
-+	AC_TRY_LINK([
-+#include <stdlib.h> /* for NULL */
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netdb.h>
-+#include <netinet/in.h>
-+		],
-+		[
-+struct sockaddr_storage sa_store;
-+struct addrinfo *ai = NULL;
-+struct in6_addr in6addr;
-+int idx = if_nametoindex("iface1");
-+int s = socket(AF_INET6, SOCK_STREAM, 0);
-+int ret = getaddrinfo(NULL, NULL, NULL, &ai);
-+if (ret != 0) {
-+	const char *es = gai_strerror(ret);
-+}
-+freeaddrinfo(ai);
-+{
-+	int val = 1;
-+	#ifdef HAVE_LINUX_IPV6_V6ONLY_26
-+	#define IPV6_V6ONLY 26
-+	#endif
-+	ret = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
-+			 (const void *)&val, sizeof(val));
-+}
-+		],[
-+		libreplace_cv_HAVE_IPV6=yes
-+		],[
-+		libreplace_cv_HAVE_IPV6=no
-+		])
-+])
-+if test x"$libreplace_cv_HAVE_IPV6" = x"yes"; then
-+    AC_DEFINE(HAVE_IPV6,1,[Whether the system has IPv6 support])
-+fi
-+
-+LIBS=$old_LIBS
-+CPPFLAGS="$libreplace_SAVE_CPPFLAGS"
-+
-+AC_CACHE_CHECK([for SO_PEERCRED],libreplace_cv_HAVE_PEERCRED,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/socket.h>],
-+[struct ucred cred;
-+ socklen_t cred_len;
-+ int ret = getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len);
-+],
-+libreplace_cv_HAVE_PEERCRED=yes,libreplace_cv_HAVE_PEERCRED=no,libreplace_cv_HAVE_PEERCRED=cross)])
-+if test x"$libreplace_cv_HAVE_PEERCRED" = x"yes"; then
-+    AC_DEFINE(HAVE_PEERCRED,1,[Whether we can use SO_PEERCRED to get socket credentials])
-+fi
-+
-+AC_CACHE_CHECK([for getpeereid],libreplace_cv_HAVE_GETPEEREID,[
-+AC_TRY_LINK([#include <sys/types.h>
-+#include <unistd.h>],
-+[uid_t uid; gid_t gid; int ret;
-+ ret = getpeereid(0, &uid, &gid);
-+],
-+libreplace_cv_HAVE_GETPEEREID=yes,libreplace_cv_HAVE_GETPEEREID=no)])
-+if test x"$libreplace_cv_HAVE_GETPEEREID" = xyes; then
-+   AC_DEFINE(HAVE_GETPEEREID,1,
-+	     [Whether we have getpeereid to get socket credentials])
-+fi
-+
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} ${LIBREPLACE_NETWORK_OBJS}"
-+
-+echo "LIBREPLACE_NETWORK_CHECKS: END"
-+]) dnl end AC_LIBREPLACE_NETWORK_CHECKS
-diff --git a/lib/replace/repdir.m4 b/lib/replace/repdir.m4
-new file mode 100644
-index 0000000..682ab44
---- /dev/null
-+++ b/lib/replace/repdir.m4
-@@ -0,0 +1,81 @@
-+AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
-+	AC_TRY_RUN([
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"],
-+	[libreplace_cv_READDIR_NEEDED=no],
-+	[libreplace_cv_READDIR_NEEDED=yes],
-+	[libreplace_cv_READDIR_NEEDED="assuming not"])
-+])
-+
-+AC_CHECK_FUNCS(dirfd)
-+AC_HAVE_DECL(dirfd, [#include <dirent.h>])
-+
-+#
-+# try to replace with getdirentries() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+AC_CHECK_FUNCS(getdirentries)
-+AC_VERIFY_C_PROTOTYPE([long telldir(const DIR *dir)],
-+	[
-+	return 0;
-+	],[
-+	AC_DEFINE(TELLDIR_TAKES_CONST_DIR, 1, [Whether telldir takes a const pointer])
-+	],[],[
-+	#include <dirent.h>
-+	])
-+
-+AC_VERIFY_C_PROTOTYPE([int seekdir(DIR *dir, long ofs)],
-+	[
-+	return 0;
-+	],[
-+	AC_DEFINE(SEEKDIR_RETURNS_INT, 1, [Whether seekdir returns an int])
-+	],[],[
-+	#include <dirent.h>
-+	])
-+AC_CACHE_CHECK([for replacing readdir using getdirentries()],libreplace_cv_READDIR_GETDIRENTRIES,[
-+	AC_TRY_RUN([
-+#define _LIBREPLACE_REPLACE_H
-+#include "$libreplacedir/repdir_getdirentries.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"],
-+	[libreplace_cv_READDIR_GETDIRENTRIES=yes],
-+	[libreplace_cv_READDIR_GETDIRENTRIES=no])
-+])
-+fi
-+if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
-+	AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
-+	AC_DEFINE(REPLACE_READDIR_GETDIRENTRIES,1,[replace readdir using getdirentries()])
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
-+	libreplace_cv_READDIR_NEEDED=no
-+fi
-+
-+#
-+# try to replace with getdents() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+AC_CHECK_FUNCS(getdents)
-+AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_cv_READDIR_GETDENTS,[
-+	AC_TRY_RUN([
-+#define _LIBREPLACE_REPLACE_H
-+#error _donot_use_getdents_replacement_anymore
-+#include "$libreplacedir/repdir_getdents.c"
-+#define test_readdir_os2_delete main
-+#include "$libreplacedir/test/os2_delete.c"],
-+	[libreplace_cv_READDIR_GETDENTS=yes],
-+	[libreplace_cv_READDIR_GETDENTS=no])
-+])
-+fi
-+if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
-+	AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
-+	AC_DEFINE(REPLACE_READDIR_GETDENTS,1,[replace readdir using getdents()])
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
-+	libreplace_cv_READDIR_NEEDED=no
-+fi
-+
-+AC_MSG_CHECKING([a usable readdir()])
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+	AC_MSG_RESULT(no)
-+	AC_MSG_WARN([the provided readdir() is broken])
-+else
-+	AC_MSG_RESULT(yes)
-+fi
-diff --git a/lib/replace/strptime.m4 b/lib/replace/strptime.m4
-new file mode 100644
-index 0000000..8ac22f6
---- /dev/null
-+++ b/lib/replace/strptime.m4
-@@ -0,0 +1,16 @@
-+AC_CHECK_FUNCS(strptime)
-+AC_CHECK_DECLS(strptime, [], [], [#include <time.h>])
-+AC_CACHE_CHECK([whether strptime is available and works],libreplace_cv_STRPTIME_OK,[
-+	AC_TRY_RUN([
-+		#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
-+		#include "$libreplacedir/test/strptime.c"
-+		],
-+		[libreplace_cv_STRPTIME_OK=yes],
-+		[libreplace_cv_STRPTIME_OK=no],
-+		[libreplace_cv_STRPTIME_OK="assuming not"])
-+])
-+if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
-+        LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
-+else
-+        AC_DEFINE(HAVE_WORKING_STRPTIME,1,[Whether strptime is working correct])
-+fi
-diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
-new file mode 100644
-index 0000000..b7cdf14
---- /dev/null
-+++ b/lib/replace/system/config.m4
-@@ -0,0 +1,145 @@
-+# filesys
-+AC_HEADER_DIRENT 
-+AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
-+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h)
-+
-+# select
-+AC_CHECK_HEADERS(sys/select.h)
-+
-+# poll
-+AC_CHECK_HEADERS(poll.h)
-+AC_CHECK_FUNCS(poll,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/poll.o"])
-+
-+# time
-+AC_CHECK_HEADERS(sys/time.h utime.h)
-+AC_HEADER_TIME
-+AC_CHECK_FUNCS(utime utimes)
-+
-+AC_CACHE_CHECK([if gettimeofday takes TZ argument],libreplace_cv_HAVE_GETTIMEOFDAY_TZ,[
-+AC_TRY_RUN([
-+#include <sys/time.h>
-+#include <unistd.h>
-+main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}],
-+           libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes,libreplace_cv_HAVE_GETTIMEOFDAY_TZ=no,libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes)])
-+if test x"$libreplace_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
-+    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
-+fi
-+
-+# wait
-+AC_HEADER_SYS_WAIT
-+
-+# capability
-+AC_CHECK_HEADERS(sys/capability.h)
-+
-+case "$host_os" in
-+*linux*)
-+AC_CACHE_CHECK([for broken RedHat 7.2 system header files],libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS,[
-+AC_TRY_COMPILE([
-+	#ifdef HAVE_SYS_VFS_H
-+	#include <sys/vfs.h>
-+	#endif
-+	#ifdef HAVE_SYS_CAPABILITY_H
-+	#include <sys/capability.h>
-+	#endif
-+	],[
-+	int i;
-+	],
-+	libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no,
-+	libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes
-+)])
-+if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then
-+	AC_DEFINE(BROKEN_REDHAT_7_SYSTEM_HEADERS,1,[Broken RedHat 7.2 system header files])
-+fi
-+
-+AC_CACHE_CHECK([for broken RHEL5 sys/capability.h],libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER,[
-+AC_TRY_COMPILE([
-+	#ifdef HAVE_SYS_CAPABILITY_H
-+	#include <sys/capability.h>
-+	#endif
-+	#include <linux/types.h>
-+	],[
-+	__s8 i;
-+	],
-+	libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=no,
-+	libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=yes
-+)])
-+if test x"$libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" = x"yes"; then
-+	AC_DEFINE(BROKEN_RHEL5_SYS_CAP_HEADER,1,[Broken RHEL5 sys/capability.h])
-+fi
-+;;
-+esac
-+
-+# passwd
-+AC_CHECK_HEADERS(grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h)
-+AC_CHECK_FUNCS(getpwnam_r getpwuid_r getpwent_r)
-+AC_HAVE_DECL(getpwent_r, [
-+	#include <unistd.h>
-+	#include <pwd.h>
-+	])
-+AC_VERIFY_C_PROTOTYPE([struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)],
-+	[
-+	#ifndef HAVE_GETPWENT_R_DECL
-+	#error missing getpwent_r prototype
-+	#endif
-+	return NULL;
-+	],[
-+	AC_DEFINE(SOLARIS_GETPWENT_R, 1, [getpwent_r solaris function prototype])
-+	],[],[
-+	#include <unistd.h>
-+	#include <pwd.h>
-+	])
-+AC_VERIFY_C_PROTOTYPE([struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)],
-+	[
-+	#ifndef HAVE_GETPWENT_R_DECL
-+	#error missing getpwent_r prototype
-+	#endif
-+	return NULL;
-+	],[
-+	AC_DEFINE(SOLARIS_GETPWENT_R, 1, [getpwent_r irix (similar to solaris) function prototype])
-+	],[],[
-+	#include <unistd.h>
-+	#include <pwd.h>
-+	])
-+AC_CHECK_FUNCS(getgrnam_r getgrgid_r getgrent_r)
-+AC_HAVE_DECL(getgrent_r, [
-+	#include <unistd.h>
-+	#include <grp.h>
-+	])
-+AC_VERIFY_C_PROTOTYPE([struct group *getgrent_r(struct group *src, char *buf, int buflen)],
-+	[
-+	#ifndef HAVE_GETGRENT_R_DECL
-+	#error missing getgrent_r prototype
-+	#endif
-+	return NULL;
-+	],[
-+	AC_DEFINE(SOLARIS_GETGRENT_R, 1, [getgrent_r solaris function prototype])
-+	],[],[
-+	#include <unistd.h>
-+	#include <grp.h>
-+	])
-+
-+AC_VERIFY_C_PROTOTYPE([struct group *getgrent_r(struct group *src, char *buf, size_t buflen)],
-+	[
-+	#ifndef HAVE_GETGRENT_R_DECL
-+	#error missing getgrent_r prototype
-+	#endif
-+	return NULL;
-+	],[
-+	AC_DEFINE(SOLARIS_GETGRENT_R, 1, [getgrent_r irix (similar to solaris)  function prototype])
-+	],[],[
-+	#include <unistd.h>
-+	#include <grp.h>
-+	])
-+AC_CHECK_FUNCS(getgrouplist)
-+
-+# locale
-+AC_CHECK_HEADERS(ctype.h locale.h langinfo.h)
-+
-+# glob
-+AC_CHECK_HEADERS(fnmatch.h)
-+
-+# shmem
-+AC_CHECK_HEADERS(sys/ipc.h sys/mman.h sys/shm.h )
-+
-+# terminal
-+AC_CHECK_HEADERS(termios.h termio.h sys/termio.h )
-diff --git a/lib/replace/timegm.m4 b/lib/replace/timegm.m4
-new file mode 100644
-index 0000000..9b76d0c
---- /dev/null
-+++ b/lib/replace/timegm.m4
-@@ -0,0 +1 @@
-+AC_CHECK_FUNCS(timegm,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"])
-diff --git a/lib/replace/win32.m4 b/lib/replace/win32.m4
-new file mode 100644
-index 0000000..eb364e2
---- /dev/null
-+++ b/lib/replace/win32.m4
-@@ -0,0 +1,20 @@
-+AC_CHECK_HEADERS(direct.h windows.h winsock2.h ws2tcpip.h)
-+
-+#######################################
-+# Check for mkdir mode
-+AC_CACHE_CHECK( [whether mkdir supports mode], libreplace_cv_mkdir_has_mode,
-+	AC_TRY_COMPILE([
-+		#include <stdio.h>
-+		#ifdef HAVE_DIRECT_H
-+		#include <direct.h>
-+		#endif],[
-+			mkdir("foo",0777);
-+			return 0;
-+	],
-+    libreplace_cv_mkdir_has_mode="yes",
-+    libreplace_cv_mkdir_has_mode="no") )
-+
-+if test "$libreplace_cv_mkdir_has_mode" = "yes"
-+then
-+    AC_DEFINE(HAVE_MKDIR_MODE, 1, [Define if target mkdir supports mode option])
-+fi
-diff --git a/lib/socket_wrapper/config.m4 b/lib/socket_wrapper/config.m4
-new file mode 100644
-index 0000000..ff6b67b
---- /dev/null
-+++ b/lib/socket_wrapper/config.m4
-@@ -0,0 +1,22 @@
-+AC_ARG_ENABLE(socket-wrapper, 
-+AS_HELP_STRING([--enable-socket-wrapper], [Turn on socket wrapper library (default=no)]))
-+
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
-+
-+if eval "test x$developer = xyes -o x$selftest = xyes"; then
-+	enable_socket_wrapper=yes
-+fi
-+    
-+if eval "test x$enable_socket_wrapper = xyes"; then
-+        AC_DEFINE(SOCKET_WRAPPER,1,[Use socket wrapper library])
-+	DEFAULT_TEST_OPTIONS=--socket-wrapper
-+	HAVE_SOCKET_WRAPPER=yes
-+
-+	# this is only used for samba3
-+	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
-+fi
-+
-+AC_SUBST(DEFAULT_TEST_OPTIONS)
-+AC_SUBST(HAVE_SOCKET_WRAPPER)
-+AC_SUBST(SOCKET_WRAPPER_OBJS)
-diff --git a/lib/talloc/compat/talloc_compat1.m4 b/lib/talloc/compat/talloc_compat1.m4
-new file mode 100644
-index 0000000..2ec530e
---- /dev/null
-+++ b/lib/talloc/compat/talloc_compat1.m4
-@@ -0,0 +1,14 @@
-+TALLOC_COMPAT1_MK=""
-+AC_SUBST(TALLOC_COMPAT1_MK)
-+
-+AC_ARG_ENABLE(talloc-compat1,
-+	[AS_HELP_STRING([--enable-talloc-compat1],
-+		[Build talloc 1.x.x compat library [default=no]])],
-+	[ enable_talloc_compat1=$enableval ],
-+	[ enable_talloc_compat1=no ]
-+)
-+
-+if test "x$enable_talloc_compat1" = x"yes"; then
-+	TALLOC_COMPAT1_MK='include $(tallocdir)/compat/talloc_compat1.mk'
-+fi
-+
-diff --git a/lib/talloc/libtalloc.m4 b/lib/talloc/libtalloc.m4
-new file mode 100644
-index 0000000..4b22c8e
---- /dev/null
-+++ b/lib/talloc/libtalloc.m4
-@@ -0,0 +1,38 @@
-+dnl find the talloc sources. This is meant to work both for 
-+dnl talloc standalone builds, and builds of packages using talloc
-+tallocdir=""
-+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
-+for d in $tallocpaths; do
-+	if test -f "$srcdir/$d/talloc.c"; then
-+		tallocdir="$d"
-+		AC_SUBST(tallocdir)
-+		break;
-+	fi
-+done
-+if test x"$tallocdir" = "x"; then
-+   AC_MSG_ERROR([cannot find talloc source in $tallocpaths])
-+fi
-+TALLOC_OBJ="talloc.o"
-+AC_SUBST(TALLOC_OBJ)
-+
-+TALLOC_CFLAGS="-I$srcdir/$tallocdir"
-+AC_SUBST(TALLOC_CFLAGS)
-+
-+TALLOC_LIBS=""
-+AC_SUBST(TALLOC_LIBS)
-+
-+AC_CHECK_SIZEOF(size_t,cross)
-+AC_CHECK_SIZEOF(void *,cross)
-+
-+if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-+	AC_WARN([size_t cannot represent the amount of used memory of a process])
-+	AC_WARN([please report this to <samba-technical@samba.org>])
-+	AC_WARN([sizeof(size_t) = $ac_cv_sizeof_size_t])
-+	AC_WARN([sizeof(void *) = $ac_cv_sizeof_void_p])
-+	AC_ERROR([sizeof(size_t) < sizeof(void *)])
-+fi
-+
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=talloc.exports
-+    AC_SUBST(EXPORTSFILE)
-+fi
-diff --git a/lib/tdb/libtdb.m4 b/lib/tdb/libtdb.m4
-new file mode 100644
-index 0000000..47f098e
---- /dev/null
-+++ b/lib/tdb/libtdb.m4
-@@ -0,0 +1,41 @@
-+dnl find the tdb sources. This is meant to work both for 
-+dnl tdb standalone builds, and builds of packages using tdb
-+tdbdir=""
-+tdbpaths=". lib/tdb tdb ../tdb ../lib/tdb"
-+for d in $tdbpaths; do
-+	if test -f "$srcdir/$d/common/tdb.c"; then
-+		tdbdir="$d"		
-+		AC_SUBST(tdbdir)
-+		break;
-+	fi
-+done
-+if test x"$tdbdir" = "x"; then
-+   AC_MSG_ERROR([cannot find tdb source in $tdbpaths])
-+fi
-+TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
-+TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o common/hash.o common/summary.o common/rescue.o"
-+AC_SUBST(TDB_OBJ)
-+AC_SUBST(LIBREPLACEOBJ)
-+
-+TDB_LIBS=""
-+AC_SUBST(TDB_LIBS)
-+
-+TDB_DEPS=""
-+if test x$libreplace_cv_HAVE_FDATASYNC_IN_LIBRT = xyes ; then
-+	TDB_DEPS="$TDB_DEPS -lrt"
-+fi
-+AC_SUBST(TDB_DEPS)
-+
-+TDB_CFLAGS="-I$tdbdir/include"
-+AC_SUBST(TDB_CFLAGS)
-+
-+AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime)
-+AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h)
-+
-+AC_HAVE_DECL(pread, [#include <unistd.h>])
-+AC_HAVE_DECL(pwrite, [#include <unistd.h>])
-+
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=tdb.exports
-+    AC_SUBST(EXPORTSFILE)
-+fi
-diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
-new file mode 100644
-index 0000000..4d4fd2b
---- /dev/null
-+++ b/lib/tevent/libtevent.m4
-@@ -0,0 +1,75 @@
-+dnl find the tevent sources. This is meant to work both for
-+dnl standalone builds, and builds of packages using libtevent
-+
-+AC_SUBST(teventdir)
-+
-+if test x"$teventdir" = "x"; then
-+	teventdir=""
-+	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
-+	for d in $teventpaths; do
-+		if test -f "$d/tevent.c"; then
-+			teventdir="$d"
-+			break;
-+		fi
-+	done
-+	if test x"$teventdir" = "x"; then
-+	   AC_MSG_ERROR([cannot find libtevent source in $teventpaths])
-+	fi
-+fi
-+
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
-+AC_SUBST(TEVENT_OBJ)
-+AC_SUBST(TEVENT_CFLAGS)
-+AC_SUBST(TEVENT_LIBS)
-+
-+TEVENT_CFLAGS="-I$teventdir"
-+
-+TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_poll.o"
-+
-+AC_CHECK_HEADERS(sys/epoll.h)
-+AC_CHECK_FUNCS(epoll_create)
-+if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then
-+   TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o"
-+   AC_DEFINE(HAVE_EPOLL, 1, [Whether epoll available])
-+fi
-+
-+tevent_num_signals_includes="$ac_includes_default
-+#include <signal.h>
-+"
-+tevent_num_signals=64
-+AC_CHECK_VALUEOF(NSIG, [$tevent_num_signals_includes])
-+v=$ac_cv_valueof_NSIG
-+test -n "$v" && test "$v" -gt "$tevent_num_signals" && {
-+	tevent_num_signals=$v
-+}
-+AC_CHECK_VALUEOF(_NSIG, [$tevent_num_signals_includes])
-+v=$ac_cv_valueof__NSIG
-+test -n "$v" && test "$v" -gt "$tevent_num_signals" && {
-+	tevent_num_signals=$v
-+}
-+AC_CHECK_VALUEOF(SIGRTMAX, [$tevent_num_signals_includes])
-+v=$ac_cv_valueof_SIGRTMAX
-+test -n "$v" && test "$v" -gt "$tevent_num_signals" && {
-+	tevent_num_signals=$v
-+}
-+AC_CHECK_VALUEOF(SIGRTMIN, [$tevent_num_signals_includes])
-+v=$ac_cv_valueof_SIGRTMIN
-+test -n "$v" && {
-+	v=`expr $v + $v`
-+}
-+test -n "$v" && test "$v" -gt "$tevent_num_signals" && {
-+	tevent_num_signals=$v
-+}
-+AC_DEFINE_UNQUOTED(TEVENT_NUM_SIGNALS, $tevent_num_signals, [Max signal number value])
-+
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=tevent.exports
-+    AC_SUBST(EXPORTSFILE)
-+fi
-+
-diff --git a/lib/uid_wrapper/config.m4 b/lib/uid_wrapper/config.m4
-new file mode 100644
-index 0000000..a565233
---- /dev/null
-+++ b/lib/uid_wrapper/config.m4
-@@ -0,0 +1,19 @@
-+AC_ARG_ENABLE(uid-wrapper,
-+AS_HELP_STRING([--enable-uid-wrapper], [Turn on uid wrapper library (default=no)]))
-+
-+HAVE_UID_WRAPPER=no
-+
-+if eval "test x$developer = xyes -o x$selftest = xyes"; then
-+	enable_uid_wrapper=yes
-+fi
-+
-+if eval "test x$enable_uid_wrapper = xyes"; then
-+        AC_DEFINE(UID_WRAPPER,1,[Use uid wrapper library])
-+	HAVE_UID_WRAPPER=yes
-+
-+	# this is only used for samba3
-+	UID_WRAPPER_OBJS="../lib/uid_wrapper/uid_wrapper.o"
-+fi
-+
-+AC_SUBST(HAVE_UID_WRAPPER)
-+AC_SUBST(UID_WRAPPER_OBJS)
-diff --git a/lib/zlib/zlib.m4 b/lib/zlib/zlib.m4
-new file mode 100644
-index 0000000..32d747c
---- /dev/null
-+++ b/lib/zlib/zlib.m4
-@@ -0,0 +1,29 @@
-+AC_DEFUN([AC_ZLIB],[
-+AC_CHECK_HEADERS(zlib.h)
-+
-+AC_CHECK_LIB_EXT(z, ZLIB_LIBS, zlibVersion)
-+
-+AC_CACHE_CHECK([for zlib >= 1.2.3], samba_cv_zlib_1_2_3, [
-+	AC_TRY_COMPILE([
-+		#include <zlib.h>
-+		],[
-+		#if (ZLIB_VERNUM >= 0x1230)
-+		#else
-+		#error "ZLIB_VERNUM < 0x1230"
-+		#endif
-+		],[
-+		samba_cv_zlib_1_2_3=yes
-+		],[
-+		samba_cv_zlib_1_2_3=no
-+		])
-+])
-+
-+if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-+	x"$ac_cv_lib_ext_z_zlibVersion" = x"yes" -a \
-+	x"$samba_cv_zlib_1_2_3" = x"yes"; then
-+	$1
-+else
-+	$2
-+fi
-+])
-+
-diff --git a/m4/check_make.m4 b/m4/check_make.m4
-new file mode 100644
-index 0000000..343913f
---- /dev/null
-+++ b/m4/check_make.m4
-@@ -0,0 +1,33 @@
-+dnl SMB Build Environment make Checks
-+dnl -------------------------------------------------------
-+dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-+dnl  Copyright (C) Jelmer Vernooij 2005
-+dnl  Released under the GNU GPL
-+dnl -------------------------------------------------------
-+dnl
-+
-+AC_DEFUN([AC_SAMBA_GNU_MAKE],
-+[
-+AC_PATH_PROGS(MAKE,gmake make)
-+
-+AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
-+if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
-+then
-+	samba_cv_gnu_make=no
-+else
-+	samba_cv_gnu_make=yes
-+fi
-+])
-+if test x$samba_cv_gnu_make = xyes; then
-+	$1
-+else
-+	$2
-+fi
-+])
-+
-+AC_DEFUN([AC_SAMBA_GNU_MAKE_VERSION], 
-+[
-+AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[
-+		samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null`
-+	])
-+])
-diff --git a/m4/check_perl.m4 b/m4/check_perl.m4
-new file mode 100644
-index 0000000..aaec9cf
---- /dev/null
-+++ b/m4/check_perl.m4
-@@ -0,0 +1,32 @@
-+dnl SMB Build Environment Perl Checks
-+dnl -------------------------------------------------------
-+dnl  Copyright (C) Stefan (metze) Metzmacher 2004
-+dnl  Released under the GNU GPL
-+dnl -------------------------------------------------------
-+dnl
-+
-+AC_DEFUN([AC_SAMBA_PERL],
-+[
-+case "$host_os" in
-+	*irix*)
-+		# On IRIX, we prefer Freeware or Nekoware Perl, because the
-+		# system perl is so ancient.
-+		AC_PATH_PROG(PERL, perl, "", "/usr/freeware/bin:/usr/nekoware/bin:$PATH")
-+		;;
-+	*)
-+		AC_PATH_PROG(PERL, perl)
-+		;;
-+esac
-+
-+if test x"$PERL" = x""; then
-+	AC_MSG_WARN([No version of perl was found!])
-+	$2
-+else
-+	if test x"$debug" = x"yes";then
-+		PERL="$PERL -W"
-+	fi
-+	export PERL
-+	$1
-+fi
-+])
-+
-diff --git a/m4/check_python.m4 b/m4/check_python.m4
-new file mode 100644
-index 0000000..66dadbd
---- /dev/null
-+++ b/m4/check_python.m4
-@@ -0,0 +1,111 @@
-+dnl Autoconf macros for finding a Python development environment
-+dnl
-+dnl Copyright (C) 2007-2008 Jelmer Vernooij <jelmer@samba.org>
-+dnl Published under the GNU GPL, v3 or later
-+dnl
-+AC_ARG_VAR([PYTHON_VER],[The installed Python
-+	version to use, for example '2.3'. This string 
-+	will be appended to the Python interpreter
-+	canonical name.])
-+
-+AC_DEFUN([TRY_LINK_PYTHON],
-+[
-+	if test $working_python = no; then
-+		ac_save_LIBS="$LIBS"
-+		ac_save_CFLAGS="$CFLAGS"
-+		LIBS="$LIBS $1"
-+		CFLAGS="$CFLAGS $2"
-+
-+		AC_TRY_LINK([
-+                                #undef HAVE_UINTPTR_T
-+				/* we have our own configure tests */
-+				#include <Python.h>
-+			],[
-+				Py_InitModule(NULL, NULL);
-+			],[
-+				PYTHON_LDFLAGS="$1"
-+				PYTHON_CFLAGS="$2"
-+				working_python=yes
-+			])
-+		LIBS="$ac_save_LIBS"
-+		CFLAGS="$ac_save_CFLAGS"
-+	fi
-+])
-+
-+dnl Try to find a Python implementation including header files
-+dnl AC_SAMBA_PYTHON_DEVEL(RUN-IF-FOUND, RUN-IF-NOT-FOUND)
-+dnl
-+dnl Will set the following variables:
-+dnl $PYTHON
-+dnl $PYTHON_CONFIG (if found)
-+dnl $PYTHON_CFLAGS
-+dnl $PYTHON_LDFLAGS
-+AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
-+[
-+	if test -z "$PYTHON_VER"; then
-+		AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python])
-+	else
-+		AC_PATH_PROG([PYTHON],[python[$PYTHON_VER]])
-+	fi
-+	if test -z "$PYTHON"; then
-+		working_python=no
-+		AC_MSG_WARN([No python found])
-+	fi
-+
-+	dnl assume no working python
-+	working_python=no
-+
-+	if test -z "$PYTHON_VER"; then 
-+		AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
-+	else 
-+		AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VER]-config])
-+	fi
-+
-+	if test -z "$PYTHON_CONFIG"; then
-+		AC_MSG_WARN([No python-config found])
-+	else
-+		TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-+		TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
-+		if test x$working_python = xno; then
-+			# It seems the library path isn't included on some systems
-+			base=`$PYTHON_CONFIG --prefix`
-+			TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-+			TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
-+		fi
-+	fi
-+
-+	if test x$PYTHON != x
-+	then
-+		DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; \
-+					      print '-I%s -I%s %s' % ( \
-+							sysconfig.get_python_inc(), \
-+							sysconfig.get_python_inc(plat_specific=1), \
-+							sysconfig.get_config_var('CFLAGS'))"`
-+		DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; \
-+					       print '%s %s -lpython%s -L%s %s -L%s' % ( \
-+							sysconfig.get_config_var('LIBS'), \
-+							sysconfig.get_config_var('SYSLIBS'), \
-+							sysconfig.get_config_var('VERSION'), \
-+							sysconfig.get_config_var('LIBDIR'), \
-+							sysconfig.get_config_var('LDFLAGS'), \
-+							sysconfig.get_config_var('LIBPL'))"`
-+		TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
-+
-+		if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 5))"`
-+		then
-+			AC_MSG_WARN([Python ($PYTHON) is too old. At least version 2.5 is required])
-+			working_python=no
-+		fi
-+	fi
-+
-+	AC_MSG_CHECKING(working python module support)
-+	if test $working_python = yes; then
-+		AC_MSG_RESULT([yes])
-+		$1
-+	else
-+		AC_MSG_RESULT([no])
-+		$2
-+	fi
-+])
-+
-+
-diff --git a/m4/pkg.m4 b/m4/pkg.m4
-new file mode 100644
-index 0000000..a8b3d06
---- /dev/null
-+++ b/m4/pkg.m4
-@@ -0,0 +1,156 @@
-+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-+# 
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=m4_default([$1], [0.9.0])
-+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		AC_MSG_RESULT([yes])
-+	else
-+		AC_MSG_RESULT([no])
-+		PKG_CONFIG=""
-+	fi
-+		
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+#
-+# Check to see whether a particular set of modules exists.  Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+  m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+  $3])dnl
-+fi])
-+
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+    if test -n "$$1"; then
-+        pkg_cv_[]$1="$$1"
-+    else
-+        PKG_CHECK_EXISTS([$3],
-+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+			 [pkg_failed=yes])
-+    fi
-+else
-+	pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+        _PKG_SHORT_ERRORS_SUPPORTED
-+        if test $_pkg_short_errors_supported = yes; then
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+        else 
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+	ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT
-+])],
-+		[AC_MSG_RESULT([no])
-+                $4])
-+elif test $pkg_failed = untried; then
-+	ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+		[$4])
-+else
-+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+        AC_MSG_RESULT([yes])
-+	ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
-diff --git a/source3/Makefile-smbtorture b/source3/Makefile-smbtorture
-new file mode 100644
-index 0000000..d93e8ad
---- /dev/null
-+++ b/source3/Makefile-smbtorture
-@@ -0,0 +1,24 @@
-+WAF_BINARY=buildtools/bin/waf
-+WAF=$(WAF_BINARY)
-+WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
-+SAMBA4_BINARIES="smbtorture"
-+
-+samba4-configure:
-+	@(cd .. && \
-+		CFLAGS='' $(WAF) reconfigure || \
-+		CFLAGS='' $(WAF) configure --enable-selftest --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-debug)
-+
-+.PHONY: samba4-configure
-+
-+bin/smbtorture: $(BINARY_PREREQS) samba4-configure samba4-config-compare
-+	cd .. && $(WAF_BUILD)
-+	cp ../bin/smbtorture bin/smbtorture
-+
-+.PHONY: bin/smbtorture
-+
-+samba4-config-compare: samba4-configure
-+	@echo "Comparing config.h from autoconf and waf"
-+	@echo "Configure results missing from WAF are:"
-+	../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h
-+	@echo "Configure results additionaly found by WAF are:"
-+	DIFF="comm -13" ../buildtools/compare_config_h3.sh include/autoconf/config.h ../bin/default/include/config.h
-diff --git a/source3/Makefile.in b/source3/Makefile.in
-new file mode 100644
-index 0000000..efe0694
---- /dev/null
-+++ b/source3/Makefile.in
-@@ -0,0 +1,3405 @@
-+#########################################################################
-+# Makefile.in for Samba - rewritten for autoconf support
-+# Copyright Andrew Tridgell 1992-1998
-+# Copyright (C) 2001 by Martin Pool <mbp@samba.org>
-+# Copyright Andrew Bartlett 2002
-+# Copyright (C) 2003 Jim McDonough <jmcd@us.ibm.com>
-+# Copyright (C) 2002-2003 Jelmer Vernooij <jelmer@samba.org>
-+# Copyright (C) 2006 Lars Mueller <lars@samba.org>
-+# Copyright (C) 2007 James Peach <jpeach@samba.org>
-+# Copyright (C) 2008 Michael Adam <obnox@samba.org>
-+###########################################################################
-+
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+sysconfdir=@sysconfdir@
-+localstatedir=@localstatedir@
-+datarootdir=@datarootdir@
-+
-+# the following vars come from ../dynconfig/config.m4
-+BINDIR=@BINDIR@
-+SBINDIR=@SBINDIR@
-+LIBDIR=@LIBDIR@
-+#LIBEXECDIR=@LIBEXECDIR@
-+MANDIR=@MANDIR@
-+DATADIR=@DATADIR@
-+LOCALEDIR=@LOCALEDIR@
-+#SCRIPTSBINDIR=@SCRIPTSBINDIR@
-+#PYTHONDIR=@PYTHONDIR@
-+#PYTHONARCHDIR=@PYTHONARCHDIR@
-+MODULESDIR=@MODULESDIR@
-+INCLUDEDIR=@INCLUDEDIR@
-+SETUPDIR=@SETUPDIR@
-+#PKGCONFIGDIR=@PKGCONFIGDIR@
-+CODEPAGEDIR=@CODEPAGEDIR@
-+PAMMODULESDIR=@PAMMODULESDIR@
-+CONFIGDIR=@CONFIGDIR@
-+PRIVATE_DIR=@PRIVATE_DIR@
-+LOCKDIR=@LOCKDIR@
-+PIDDIR=@PIDDIR@
-+STATEDIR=@STATEDIR@
-+CACHEDIR=@CACHEDIR@
-+LOGFILEBASE=@LOGFILEBASE@
-+SOCKET_DIR=@SOCKET_DIR@
-+PRIVILEGED_SOCKET_DIR=@PRIVILEGED_SOCKET_DIR@
-+WINBINDD_SOCKET_DIR=@WINBINDD_SOCKET_DIR@
-+WINBINDD_PRIVILEGED_SOCKET_DIR=@WINBINDD_PRIVILEGED_SOCKET_DIR@
-+NMBDSOCKETDIR=@NMBDSOCKETDIR@
-+#NTP_SIGND_SOCKET_DIR=@NTP_SIGND_SOCKET_DIR@
-+NCALRPCDIR=@NCALRPCDIR@
-+CONFIGFILE=@CONFIGFILE@
-+LMHOSTSFILE=@LMHOSTSFILE@
-+SMB_PASSWD_FILE=@SMB_PASSWD_FILE@
-+
-+selftest_prefix=@selftest_prefix@
-+
-+LIBS=@LIBS@
-+CC=@CC@
-+SHLD=@SHLD@
-+LIB_PATH_VAR=@LIB_PATH_VAR@
-+
-+## Dynamic shared libraries build settings
-+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
-+DSO_EXPORTS=@DSO_EXPORTS@
-+SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
-+
-+# The MODULE_EXPORTS variable contains the platform-specific linker flags
-+# needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
-+MODULE_EXPORTS=@MODULE_EXPORTS@
-+
-+# Add $(DEVELOPER_CFLAGS) to $(CFLAGS) to enable extra compiler
-+# (GCC) warnings. This is done automatically for --enable-developer,
-+# --enable-picky-developer and --enable-krb5developer.
-+DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
-+CFLAGS=@CFLAGS@
-+CPP=@CPP@
-+CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
-+PICFLAG=@PICFLAG@
-+
-+AR=@AR@
-+LDSHFLAGS=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
-+LDSHFLAGS_MODULES=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
-+LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
-+
-+WINBIND_NSS_LDSHFLAGS=$(PICFLAG) @WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
-+AWK=@AWK@
-+DYNEXP=@DYNEXP@
-+PERL=@PERL@
-+PYTHON=@PYTHON@
-+LIBDL=@LIBDL@
-+
-+PIDL_ARGS=@PIDL_ARGS@
-+
-+TERMLDFLAGS=@TERMLDFLAGS@
-+TERMLIBS=@TERMLIBS@
-+PRINT_LIBS=@PRINT_LIBS@
-+ZLIB_LIBS=@ZLIB_LIBS@
-+AUTH_LIBS=@AUTH_LIBS@
-+ACL_LIBS=@ACL_LIBS@
-+PASSDB_LIBS=@PASSDB_LIBS@
-+IDMAP_LIBS=@IDMAP_LIBS@
-+KRB5LIBS=@KRB5_LIBS@
-+LDAP_LIBS=@LDAP_LIBS@
-+NSCD_LIBS=@NSCD_LIBS@
-+LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
-+LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@
-+PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
-+PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
-+DNSSD_LIBS=@DNSSD_LIBS@
-+AVAHI_LIBS=@AVAHI_LIBS@
-+POPT_LIBS=@POPTLIBS@
-+LIBTALLOC=@LIBTALLOC_STATIC@
-+LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
-+LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
-+LIBTDB=@LIBTDB_STATIC@
-+LIBTDB_LIBS=@LIBTDB_LIBS@
-+TDB_DEPS=@TDB_DEPS@
-+LIBNTDB=@LIBNTDB_STATIC@
-+LIBNTDB_LIBS=@LIBNTDB_LIBS@
-+NTDB_DEPS=@NTDB_DEPS@
-+LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
-+LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
-+LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
-+LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
-+
-+TALLOCTORT = @TALLOCTORT@
-+
-+TDBBACKUP = @TDBBACKUP@
-+TDBTOOL = @TDBTOOL@
-+TDBDUMP = @TDBDUMP@
-+TDBRESTORE = @TDBRESTORE@
-+TDBTORTURE = @TDBTORTURE@
-+NTDBBACKUP = @NTDBBACKUP@
-+NTDBTOOL = @NTDBTOOL@
-+NTDBDUMP = @NTDBDUMP@
-+NTDBRESTORE = @NTDBRESTORE@
-+NTDBTORTURE = @NTDBTORTURE@
-+PTHREADPOOLTEST = @PTHREADPOOLTEST@
-+
-+INSTALLCMD=@INSTALL@
-+INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@
-+INSTALLLIBCMD_A=@INSTALLLIBCMD_A@
-+UNINSTALLLIBCMD_SH=@UNINSTALLLIBCMD_SH@
-+UNINSTALLLIBCMD_A=@UNINSTALLLIBCMD_A@
-+
-+VPATH=@srcdir@
-+srcdir=@abs_srcdir@
-+builddir=@abs_builddir@
-+# XXX: Perhaps this should be @SHELL@ instead -- apparently autoconf
-+# will search for a POSIX-compliant shell, and that might not be
-+# /bin/sh on some platforms.  I guess it's not a big problem -- mbp
-+SHELL=/bin/sh
-+DESTDIR=/
-+
-+# See the autoconf manual "Installation Directory Variables" for a
-+# discussion of the subtle use of these variables.
-+
-+VFSLIBDIR = $(MODULESDIR)/vfs
-+PERFCOUNTLIBDIR = $(MODULESDIR)/perfcount
-+PDBLIBDIR = $(MODULESDIR)/pdb
-+RPCLIBDIR = $(MODULESDIR)/rpc
-+IDMAPLIBDIR = $(MODULESDIR)/idmap
-+NSSINFOLIBDIR = $(MODULESDIR)/nss_info
-+AUTHLIBDIR = $(MODULESDIR)/auth
-+CONFIGLIBDIR = $(MODULESDIR)/config
-+GPEXTLIBDIR = $(MODULESDIR)/gpext
-+VARDIR = @localstatedir@
-+
-+# The permissions to give the executables and other data
-+INSTALLPERMS_BIN = 0755
-+INSTALLPERMS_DATA = 0644
-+
-+FLAGS = -I. \
-+	-I$(srcdir) \
-+	@FLAGS1@ \
-+	@SAMBA_CPPFLAGS@ \
-+	$(CPPFLAGS) \
-+	$(ISA) \
-+	-I$(srcdir)/lib \
-+	-I.. \
-+	-I./../lib/ldb/include \
-+	-D_SAMBA_BUILD_=3
-+
-+PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
-+	-DPRIVATE_DIR=\"$(PRIVATE_DIR)\" \
-+	-DCONFIGFILE=\"$(CONFIGFILE)\" \
-+	-DSBINDIR=\"$(SBINDIR)\" \
-+	-DBINDIR=\"$(BINDIR)\" \
-+	-DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
-+	-DLOCKDIR=\"$(LOCKDIR)\" \
-+	-DPIDDIR=\"$(PIDDIR)\" \
-+	-DLIBDIR=\"$(LIBDIR)\" \
-+	-DMODULESDIR=\"$(MODULESDIR)\" \
-+	-DLOGFILEBASE=\"$(LOGFILEBASE)\" \
-+	-DSHLIBEXT=\"@SHLIBEXT@\" \
-+	-DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-+	-DCONFIGDIR=\"$(CONFIGDIR)\" \
-+	-DCODEPAGEDIR=\"$(CODEPAGEDIR)\" \
-+	-DCACHEDIR=\"$(CACHEDIR)\" \
-+	-DSTATEDIR=\"$(STATEDIR)\" \
-+	-DNMBDSOCKETDIR=\"$(NMBDSOCKETDIR)\" \
-+	-DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" \
-+	-DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(WINBINDD_PRIVILEGED_SOCKET_DIR)\" \
-+	-DLOCALEDIR=\"$(LOCALEDIR)\" \
-+	-DDATADIR=\"$(DATADIR)\" \
-+	-DSETUPDIR=\"$(SETUPDIR)\"
-+
-+# You usually want both TDB and NTDB.
-+LIBTDBS=$(LIBTDB) $(LIBNTDB)
-+LIBTDBS_LIBS=$(LIBTDB_LIBS) $(LIBNTDB_LIBS)
-+TDBS_DEPS=$(TDB_DEPS) $(NTDB_DEPS)
-+
-+# Note that all executable programs now provide for an optional executable suffix.
-+
-+SBIN_PROGS = bin/smbd bin/nmbd @EXTRA_SBIN_PROGS@
-+
-+BIN_PROGS1 = bin/smbclient bin/net bin/smbspool \
-+	bin/testparm bin/smbstatus bin/smbget \
-+	bin/smbta-util
-+BIN_PROGS2 = bin/smbcontrol bin/smbtree $(TDBBACKUP) \
-+	bin/nmblookup bin/pdbedit $(TDBDUMP) \
-+	$(TDBRESTORE) $(TDBTOOL) bin/dbwrap_tool
-+BIN_PROGS3 = bin/smbpasswd bin/rpcclient bin/smbcacls \
-+	bin/profiles bin/ntlm_auth bin/sharesec \
-+	bin/smbcquotas bin/eventlogadm 
-+
-+TORTURE_PROGS = bin/smbtorture3 bin/msgtest \
-+	bin/locktest2 bin/nsstest bin/vfstest \
-+	$(TALLOCTORT) bin/replacetort \
-+	$(TDBTORTURE) $(PTHREADPOOLTEST) \
-+	bin/smbconftort bin/vlp
-+
-+BIN_PROGS = @EXTRA_BIN_PROGS@ \
-+	$(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3)
-+
-+EVERYTHING_PROGS = bin/debug2html bin/smbfilter \
-+	$(TALLOCTORT) bin/replacetort \
-+	bin/log2pcap \
-+	bin/vlp \
-+	bin/dbwrap_tool \
-+	bin/dbwrap_torture
-+
-+PAM_MODULES = @PAM_MODULES@
-+
-+NSS_MODULES = @NSS_MODULES@
-+
-+SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
-+
-+VFS_MODULES = @VFS_MODULES@
-+PERFCOUNT_MODULES = @PERFCOUNT_MODULES@
-+PDB_MODULES = @PDB_MODULES@
-+IDMAP_MODULES = @IDMAP_MODULES@
-+AUTH_MODULES = @AUTH_MODULES@
-+NSS_INFO_MODULES = @NSS_INFO_MODULES@
-+GPEXT_MODULES = @GPEXT_MODULES@
-+MODULES = $(VFS_MODULES) $(PDB_MODULES) $(IDMAP_MODULES) \
-+          $(AUTH_MODULES) $(NSS_INFO_MODULES) \
-+	  $(GPEXT_MODULES) $(PERFCOUNT_MODULES)
-+
-+EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
-+
-+######################################################################
-+# object file lists
-+######################################################################
-+
-+TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
-+	  ../lib/tdb_wrap/tdb_wrap.o \
-+	  ../lib/dbwrap/dbwrap.o \
-+	  ../lib/dbwrap/dbwrap_local_open.o \
-+	  lib/dbwrap/dbwrap_open.o \
-+	  ../lib/dbwrap/dbwrap_tdb.o \
-+	  ../lib/util/util_ntdb.o \
-+	  ../lib/dbwrap/dbwrap_ntdb.o \
-+	  lib/dbwrap/dbwrap_ctdb.o \
-+	  lib/g_lock.o \
-+	  ../lib/dbwrap/dbwrap_cache.o \
-+	  lib/dbwrap/dbwrap_watch.o \
-+	  ../lib/dbwrap/dbwrap_rbt.o \
-+	  ../lib/dbwrap/dbwrap_util.o
-+
-+TDB_VALIDATE_OBJ = lib/tdb_validate.o
-+
-+SMBLDAP_OBJ = @SMBLDAP@
-+
-+VERSION_OBJ = lib/version.o
-+
-+WBCOMMON_OBJ = ../nsswitch/wb_common.o
-+
-+AFS_OBJ = lib/afs.o
-+
-+AFS_SETTOKEN_OBJ = lib/afs_settoken.o
-+
-+AVAHI_OBJ = @AVAHI_OBJ@
-+
-+SERVER_MUTEX_OBJ = lib/server_mutex.o
-+
-+PASSCHANGE_OBJ = libsmb/passchange.o
-+
-+LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \
-+		     ../librpc/ndr/ndr_compression.o \
-+		     autoconf/librpc/gen_ndr/ndr_drsuapi.o \
-+		     ../librpc/ndr/ndr_drsblobs.o \
-+		     autoconf/librpc/gen_ndr/ndr_drsblobs.o
-+
-+ZLIB_OBJ = @ZLIB_OBJS@
-+
-+COMPRESSION_OBJ = ../lib/compression/lzxpress.o \
-+		  $(ZLIB_OBJ)
-+
-+DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
-+	      $(COMPRESSION_OBJ)
-+
-+LIBNDR_NTLMSSP_OBJ = autoconf/librpc/gen_ndr/ndr_ntlmssp.o \
-+		     ../librpc/ndr/ndr_ntlmssp.o
-+
-+LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
-+	     ../librpc/ndr/ndr.o \
-+	     ../librpc/ndr/ndr_misc.o \
-+	     autoconf/librpc/gen_ndr/ndr_misc.o \
-+	     autoconf/librpc/gen_ndr/ndr_security.o \
-+	     ../librpc/ndr/ndr_sec_helper.o \
-+	     ../librpc/ndr/ndr_string.o \
-+	     ../librpc/ndr/uuid.o \
-+	     ../librpc/ndr/util.o \
-+	     autoconf/librpc/gen_ndr/ndr_server_id.o \
-+	     autoconf/librpc/gen_ndr/ndr_file_id.o \
-+	     autoconf/librpc/gen_ndr/ndr_dcerpc.o
-+
-+LIBNDR_GEN_OBJ0 = autoconf/librpc/gen_ndr/ndr_samr.o \
-+		  autoconf/librpc/gen_ndr/ndr_lsa.o
-+
-+LIBNDR_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon.o \
-+		  ../librpc/ndr/ndr_netlogon.o
-+
-+LIBNDR_SCHANNEL_OBJ = autoconf/librpc/gen_ndr/ndr_schannel.o \
-+		      ../librpc/ndr/ndr_schannel.o
-+
-+LIBNDR_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss.o \
-+		  ../librpc/ndr/ndr_spoolss_buf.o
-+
-+LIBNDR_NTPRINTING_OBJ = autoconf/librpc/gen_ndr/ndr_ntprinting.o \
-+			../librpc/ndr/ndr_ntprinting.o
-+
-+LIBNDR_PREG_OBJ = autoconf/librpc/gen_ndr/ndr_preg.o \
-+		  ../librpc/ndr/ndr_preg.o
-+
-+LIBNDR_XATTR_OBJ = autoconf/librpc/gen_ndr/ndr_xattr.o \
-+		   ../librpc/ndr/ndr_xattr.o
-+
-+LIBNDR_NFS4ACL_OBJ = autoconf/librpc/gen_ndr/ndr_nfs4acl.o
-+
-+LIBCLI_SPOOLSS_OBJ = autoconf/librpc/gen_ndr/ndr_spoolss_c.o \
-+		     rpc_client/cli_spoolss.o \
-+		     rpc_client/init_spoolss.o \
-+		     rpc_client/cli_winreg_spoolss.o \
-+		     printing/nt_printing_os2.o
-+
-+LIBCLI_EVENTLOG_OBJ = autoconf/librpc/gen_ndr/ndr_eventlog_c.o
-+
-+LIBCLI_WINREG_OBJ = autoconf/librpc/gen_ndr/ndr_winreg_c.o \
-+		    rpc_client/cli_winreg.o
-+
-+LIBCLI_WINREG_INT_OBJ = $(LIBCLI_WINREG_OBJ) \
-+			rpc_client/cli_winreg_int.o
-+
-+LIBCLI_NTSVCS_OBJ = autoconf/librpc/gen_ndr/ndr_ntsvcs_c.o
-+
-+LIBCLI_DRSUAPI_OBJ = autoconf/librpc/gen_ndr/ndr_drsuapi_c.o
-+
-+LIBCLI_DFS_OBJ = autoconf/librpc/gen_ndr/ndr_dfs_c.o
-+
-+LIBCLI_ECHO_OBJ = autoconf/librpc/gen_ndr/ndr_echo_c.o
-+
-+LIBCLI_INITSHUTDOWN_OBJ = autoconf/librpc/gen_ndr/ndr_initshutdown_c.o
-+
-+LIBCLI_DSSETUP_OBJ = autoconf/librpc/gen_ndr/ndr_dssetup_c.o
-+
-+LIBCLI_SVCCTL_OBJ = autoconf/librpc/gen_ndr/ndr_svcctl_c.o
-+
-+LIBCLI_WKSSVC_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc_c.o
-+
-+LIBCLI_SRVSVC_OBJ = autoconf/librpc/gen_ndr/ndr_srvsvc_c.o
-+
-+LIBCLI_LSA_OBJ = autoconf/librpc/gen_ndr/ndr_lsa_c.o \
-+		 rpc_client/cli_lsarpc.o \
-+		 rpc_client/init_lsa.o
-+
-+LIBCLI_SAMR_OBJ = autoconf/librpc/gen_ndr/ndr_samr_c.o \
-+		  rpc_client/cli_samr.o
-+
-+LIBCLI_NETLOGON_OBJ = autoconf/librpc/gen_ndr/ndr_netlogon_c.o \
-+		      rpc_client/cli_netlogon.o \
-+		      rpc_client/util_netlogon.o \
-+		      rpc_client/init_netlogon.o
-+
-+LIBCLI_EPMAPPER_OBJ = autoconf/librpc/gen_ndr/ndr_epmapper_c.o
-+
-+LIBCLI_FSRVP_OBJ = autoconf/librpc/gen_ndr/ndr_fsrvp_c.o
-+
-+LIBNDR_GEN_OBJ = autoconf/librpc/gen_ndr/ndr_wkssvc.o \
-+		 $(LIBNDR_GEN_OBJ0) \
-+		 autoconf/librpc/gen_ndr/ndr_dfs.o \
-+		 autoconf/librpc/gen_ndr/ndr_dfsblobs.o \
-+		 autoconf/librpc/gen_ndr/ndr_echo.o \
-+		 autoconf/librpc/gen_ndr/ndr_winreg.o \
-+		 autoconf/librpc/gen_ndr/ndr_initshutdown.o \
-+		 autoconf/librpc/gen_ndr/ndr_srvsvc.o \
-+		 autoconf/librpc/gen_ndr/ndr_eventlog.o \
-+		 $(LIBNDR_NETLOGON_OBJ) \
-+		 autoconf/librpc/gen_ndr/ndr_dssetup.o \
-+		 autoconf/librpc/gen_ndr/ndr_epmapper.o \
-+		 autoconf/librpc/gen_ndr/ndr_ntsvcs.o \
-+		 $(LIBNDR_SPOOLSS_OBJ) \
-+		 autoconf/librpc/gen_ndr/ndr_fsrvp.o
-+
-+# this includes only the low level parse code, not stuff
-+# that requires knowledge of security contexts
-+REG_PARSE_PRS_OBJ = registry/reg_parse_prs.o
-+
-+LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
-+
-+SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
-+NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
-+UID_WRAPPER_OBJ = @UID_WRAPPER_OBJS@
-+
-+LIBSAMBAUTIL_OBJ = \
-+		$(LIBREPLACE_OBJ) \
-+		$(SOCKET_WRAPPER_OBJ) \
-+		$(UID_WRAPPER_OBJ) \
-+		$(NSS_WRAPPER_OBJ)
-+
-+UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
-+		   ../lib/util/xfile.o ../lib/util/util_strlist.o  \
-+		   ../lib/util/util_file.o ../lib/util/data_blob.o \
-+		   ../lib/util/util.o ../lib/util/util_paths.o ../lib/util/fsusage.o \
-+		   ../lib/util/params.o ../lib/util/talloc_stack.o \
-+		   ../lib/util/genrand.o ../lib/util/util_net.o \
-+		   ../lib/util/become_daemon.o ../lib/util/system.o \
-+		   ../lib/util/tevent_unix.o ../lib/util/tevent_ntstatus.o \
-+		   ../lib/util/tevent_werror.o ../lib/util/util_process.o\
-+		   lib/tevent_barrier.o \
-+		   ../lib/util/smb_threads.o ../lib/util/util_id.o \
-+		   ../lib/util/blocking.o ../lib/util/rfc1738.o \
-+		   ../lib/util/select.o ../lib/util/util_pw.o ../lib/util/server_id.o \
-+		   ../lib/util/setid.o ../lib/util/pidfile.o ../lib/util/getpass.o
-+
-+CRYPTO_OBJ = ../lib/crypto/crc32.o @CRYPTO_MD5_OBJ@ \
-+			 ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
-+			 ../lib/crypto/md4.o \
-+			 ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o \
-+			 ../lib/crypto/aes.o ../lib/crypto/rijndael-alg-fst.o \
-+			 ../lib/crypto/aes_cmac_128.o ../lib/crypto/aes_ccm_128.o
-+
-+LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
-+	  lib/messages.o autoconf/librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
-+	  lib/messages_ctdbd.o lib/ctdb_packet.o lib/ctdbd_conn.o \
-+	  lib/ctdb_conn.o \
-+	  lib/msg_channel.o \
-+	  lib/id_cache.o \
-+	  ../lib/socket/interfaces.o lib/memcache.o \
-+	  lib/talloc_dict.o \
-+	  lib/serverid.o \
-+	  lib/asys/asys.o \
-+	  lib/util_transfer_file.o ../lib/async_req/async_sock.o \
-+	  lib/addrchange.o \
-+	  $(TDB_LIB_OBJ) \
-+	  $(VERSION_OBJ) lib/charcnv.o ../lib/util/charset/convert_string.o \
-+	  ../lib/util/charset/pull_push.o \
-+	  lib/fstring.o ../lib/util/debug.o ../lib/util/debug_s3.o ../lib/util/fault.o \
-+	  lib/interface.o lib/dumpcore.o \
-+	  lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
-+	  lib/username.o \
-+	  ../libds/common/flag_mapping.o \
-+	  lib/access.o lib/smbrun.o \
-+	  ../lib/util/bitmap.o ../lib/util/dprintf.o $(UTIL_REG_OBJ) \
-+	  lib/wins_srv.o \
-+	  lib/util_str.o ../lib/util/util_str_common.o \
-+	  ../lib/util/util_str.o \
-+	  ../lib/util/base64.o lib/util_sid.o \
-+	  ../lib/util/charset/util_unistr.o \
-+	  ../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
-+	  lib/util.o lib/util_malloc.o lib/namearray.o lib/util_cmdline.o lib/util_names.o \
-+	  lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
-+	  lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o \
-+	  lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
-+	  lib/tallocmsg.o lib/dmallocmsg.o \
-+	  ../libcli/smb/smb_signing.o \
-+	  ../lib/util/charset/iconv.o ../lib/util/charset/weird.o \
-+	  ../lib/util/charset/charset_macosxfs.o intl/lang_tdb.o \
-+	  lib/adt_tree.o lib/gencache.o \
-+	  ../lib/util/modules.o lib/events.o ../lib/util/tevent_debug.o @LIBTEVENT_OBJ0@ \
-+	  @CCAN_OBJ@ \
-+	  lib/server_contexts.o \
-+	  lib/server_prefork.o \
-+	  lib/server_prefork_util.o \
-+	  lib/ldap_escape.o \
-+	  ../libcli/security/secdesc.o ../libcli/security/access_check.o \
-+	  ../libcli/security/secace.o ../libcli/security/object_tree.o \
-+	  ../libcli/security/sddl.o ../libcli/security/session.o \
-+	  ../libcli/security/secacl.o @PTHREADPOOL_OBJ@ \
-+	  lib/fncall.o \
-+	  libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \
-+	  lib/file_id.o lib/idmap_cache.o \
-+	  lib/tevent_wait.o \
-+	  ../libcli/security/dom_sid.o ../libcli/security/security_descriptor.o \
-+	  ../libcli/security/security_token.o ../libcli/security/util_sid.o \
-+	  ../libcli/smb/util.o ../lib/util/idtree.o
-+
-+LIB_DUMMY_OBJ = lib/smbd_shim.o lib/dummyparam.o
-+LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
-+
-+READLINE_OBJ = ../libcli/smbreadline/smbreadline.o
-+
-+# Also depends on  $(SECRETS_OBJ) $(LIBSAMBA_OBJ)
-+# Be sure to include them into your application
-+POPT_LIB_OBJ = lib/popt_common.o
-+
-+PARAM_WITHOUT_REG_OBJ = ../dynconfig/dynconfig.o param/loadparm.o param/loadparm_ctx.o ../lib/param/loadparm_server_role.o param/util.o lib/sharesec.o lib/ldap_debug_handler.o ../lib/param/loadparm.o ../lib/param/util.o
-+PARAM_REG_ADD_OBJ = $(REG_SMBCONF_OBJ) $(LIBSMBCONF_OBJ) $(PRIVILEGES_BASIC_OBJ)
-+PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ)
-+
-+KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
-+
-+LIBADDNS_OBJ0 = ../lib/addns/dnsrecord.o ../lib/addns/dnsutils.o  ../lib/addns/dnssock.o \
-+	       ../lib/addns/dnsgss.o ../lib/addns/dnsmarshall.o ../lib/addns/error.o
-+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
-+
-+GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
-+
-+LIBGPO_OBJ0 = ../libgpo/gpo_ldap.o ../libgpo/gpo_ini.o ../libgpo/gpo_util.o \
-+	      ../libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
-+	      libgpo/gpo_reg.o \
-+	      $(GPEXT_OBJ)
-+LIBGPO_OBJ = $(LIBGPO_OBJ0)
-+
-+LIBADS_OBJ = libads/ldap.o \
-+	     libads/sasl.o libads/sasl_wrapping.o \
-+	     libads/krb5_setpw.o \
-+	     libads/kerberos_util.o \
-+	     libads/ldap_user.o \
-+	     libads/ads_struct.o libads/kerberos_keytab.o \
-+             libads/disp_sec.o libads/ldap_utils.o \
-+	     libads/ldap_schema.o libads/util.o libads/ndr.o
-+
-+LIBADS_SERVER_OBJ = libads/authdata.o ../auth/kerberos/kerberos_pac.o \
-+		    ../librpc/ndr/ndr_krb5pac.o \
-+		    autoconf/librpc/gen_ndr/ndr_krb5pac.o
-+
-+LIBADS_PRINTER_OBJ = libads/ldap_printer.o
-+
-+SECRETS_OBJ = passdb/secrets.o passdb/machine_account_secrets.o passdb/machine_sid.o \
-+	      autoconf/librpc/gen_ndr/ndr_secrets.o \
-+	      passdb/secrets_lsa.o
-+
-+LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
-+	     ../libcli/netlogon/netlogon.o \
-+	     autoconf/librpc/gen_ndr/ndr_nbt.o \
-+	     ../librpc/ndr/ndr_nbt.o \
-+	     autoconf/librpc/gen_ndr/ndr_svcctl.o \
-+	     ../librpc/ndr/ndr_svcctl.o
-+
-+LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
-+	     libsmb/namequery.o ../libcli/nbt/lmhosts.o ../libcli/dns/dns_hosts_file.o libsmb/conncache.o \
-+	     ../lib/addns/dnsquery.o libads/sitename_cache.o
-+
-+NTERR_OBJ = ../libcli/util/nterr.o libsmb/smberr.o
-+DOSERR_OBJ = ../libcli/util/doserr.o
-+ERRORMAP_OBJ = ../libcli/util/errormap.o libsmb/errormap.o
-+DCE_RPC_ERR_OBJ = ../librpc/rpc/dcerpc_error.o
-+
-+LIBSMB_ERR_OBJ0 = $(NTERR_OBJ) $(DOSERR_OBJ) $(ERRORMAP_OBJ) $(DCE_RPC_ERR_OBJ)
-+
-+LIBSMB_ERR_OBJ1 = ../libcli/auth/smbdes.o ../libcli/auth/smbencrypt.o ../libcli/auth/msrpc_parse.o ../libcli/auth/session.o
-+
-+LIBSMB_ERR_OBJ = $(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) \
-+		 $(SECRETS_OBJ)
-+
-+LIBSMB_OBJ0 = \
-+	       ../lib/util/asn1.o \
-+	       ../libcli/auth/spnego_parse.o \
-+	       ../libcli/auth/ntlm_check.o \
-+	       libsmb/ntlmssp.o \
-+	       libsmb/ntlmssp_wrap.o \
-+	       libsmb/auth_generic.o \
-+	       ../lib/krb5_wrap/krb5_samba.o \
-+	       libsmb/clispnego.o \
-+	       ../auth/gensec/gensec.o \
-+	       ../auth/gensec/gensec_start.o \
-+	       ../auth/gensec/gensec_util.o \
-+	       ../auth/gensec/spnego.o \
-+	       ../auth/credentials/credentials.o \
-+	       ../auth/credentials/credentials_ntlm.o \
-+	       ../auth/credentials/credentials_samba3.o \
-+	       ../auth/ntlmssp/ntlmssp.o \
-+	       ../auth/ntlmssp/ntlmssp_util.o \
-+	       ../auth/ntlmssp/ntlmssp_sign.o \
-+	       ../auth/ntlmssp/ntlmssp_client.o \
-+	       ../auth/ntlmssp/gensec_ntlmssp.o \
-+	       ../auth/ntlmssp/gensec_ntlmssp_server.o \
-+	       $(LIBNDR_NTLMSSP_OBJ) \
-+	       ../auth/ntlmssp/ntlmssp_ndr.o \
-+	       ../auth/ntlmssp/ntlmssp_server.o
-+
-+LIBSAMBA_OBJ = $(LIBSMB_OBJ0) \
-+	       $(LIBSMB_ERR_OBJ)
-+
-+LIBCLI_LDAP_MESSAGE_OBJ = ../libcli/ldap/ldap_message.o
-+LIBCLI_LDAP_NDR_OBJ = ../libcli/ldap/ldap_ndr.o ../lib/ldb/common/ldb_parse.o
-+
-+LIBTSOCKET_OBJ = ../lib/tsocket/tsocket.o \
-+		../lib/tsocket/tsocket_helpers.o \
-+		../lib/tsocket/tsocket_bsd.o
-+
-+CLDAP_OBJ = libads/cldap.o \
-+	../libcli/cldap/cldap.o \
-+	$(LIBCLI_LDAP_MESSAGE_OBJ) $(LIBCLI_LDAP_NDR_OBJ)
-+
-+TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o
-+
-+SCHANNEL_OBJ = ../libcli/auth/credentials.o \
-+	       ../libcli/auth/schannel_sign.o \
-+	       ../libcli/auth/schannel_state_tdb.o \
-+	       $(LIBNDR_SCHANNEL_OBJ)
-+
-+LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
-+	     libsmb/reparse_symlink.o \
-+	     libsmb/clisymlink.o \
-+	     libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
-+	     libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
-+	     libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
-+	     libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
-+	     libsmb/clioplock.o libsmb/clirap2.o \
-+	     libsmb/async_smb.o \
-+	     ../libcli/smb/smb_seal.o \
-+	     ../libcli/smb/read_smb.o \
-+	     ../libcli/smb/smbXcli_base.o \
-+	     ../libcli/smb/smb1cli_trans.o \
-+	     ../libcli/smb/smb1cli_echo.o \
-+	     ../libcli/smb/smb2cli_session.o \
-+	     libsmb/smb2cli_tcon.o \
-+	     ../libcli/smb/smb2cli_create.o \
-+	     ../libcli/smb/smb2_create_blob.o \
-+	     ../libcli/smb/smb2_signing.o \
-+	     ../libcli/smb/smb2cli_close.o \
-+	     ../libcli/smb/smb2cli_flush.o \
-+	     ../libcli/smb/smb2cli_read.o \
-+	     ../libcli/smb/smb2cli_write.o \
-+	     ../libcli/smb/smb2cli_query_directory.o \
-+	     ../libcli/smb/smb2cli_ioctl.o \
-+	     ../libcli/smb/smb2cli_query_info.o \
-+	     ../libcli/smb/smb2cli_set_info.o \
-+	     ../libcli/smb/smb2cli_echo.o \
-+	     libsmb/cli_np_tstream.o \
-+	     libsmb/smbsock_connect.o \
-+	     $(LIBSAMBA_OBJ) \
-+	     $(LIBNMB_OBJ) \
-+	     $(LIBNBT_OBJ) \
-+	     $(CLDAP_OBJ) \
-+	     $(DRSUAPI_OBJ)
-+
-+LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
-+	       rpc_client/cli_pipe.o \
-+	       $(LIBCLI_NETLOGON_OBJ) \
-+	       librpc/crypto/gse_krb5.o \
-+	       librpc/crypto/gse.o \
-+	       ../auth/kerberos/gssapi_pac.o \
-+	       ../lib/krb5_wrap/gss_samba.o \
-+	       librpc/rpc/rpc_common.o \
-+	       rpc_client/rpc_transport_np.o \
-+	       rpc_client/rpc_transport_sock.o \
-+	       rpc_client/rpc_transport_tstream.o \
-+	       ../librpc/rpc/binding.o \
-+	       ../librpc/rpc/dcerpc_util.o \
-+	       ../librpc/rpc/binding_handle.o \
-+	       librpc/rpc/dcerpc_helpers.o \
-+	       $(LIBCLI_EPMAPPER_OBJ)
-+
-+LIBMSRPC_GEN_OBJ = $(LIBNDR_GEN_OBJ)
-+
-+#
-+# registry-related objects
-+#
-+UTIL_REG_OBJ = ../libcli/registry/util_reg.o
-+
-+REG_INIT_BASIC_OBJ = registry/reg_init_basic.o
-+REG_INIT_SMBCONF_OBJ = registry/reg_init_smbconf.o
-+REG_INIT_FULL_OBJ = registry/reg_init_full.o
-+
-+REGFIO_OBJ = registry/regfio.o \
-+	     $(REG_PARSE_PRS_OBJ)
-+
-+REG_API_REGF_OBJ = registry/reg_api_regf.o
-+
-+REGOBJS_OBJ = registry/reg_objects.o
-+
-+REG_BACKENDS_BASE_OBJ = registry/reg_backend_db.o
-+
-+REG_BACKENDS_SMBCONF_OBJ = registry/reg_backend_smbconf.o
-+
-+REG_BACKENDS_EXTRA_OBJ = registry/reg_backend_printing.o \
-+			 registry/reg_backend_shares.o \
-+			 registry/reg_backend_netlogon_params.o \
-+			 registry/reg_backend_prod_options.o \
-+			 registry/reg_backend_tcpip_params.o \
-+			 registry/reg_backend_hkpt_params.o \
-+			 registry/reg_backend_current_version.o \
-+			 registry/reg_backend_perflib.o
-+
-+REG_BASE_OBJ = registry/reg_api.o \
-+	       registry/reg_dispatcher.o \
-+	       registry/reg_cachehook.o \
-+	       $(REGOBJS_OBJ) \
-+	       registry/reg_util_internal.o \
-+	       lib/util_nttoken.o \
-+	       $(REG_BACKENDS_BASE_OBJ) \
-+	       registry/reg_parse_internal.o \
-+	       lib/cbuf.o lib/srprs.o \
-+	       $(REG_INIT_BASIC_OBJ)
-+
-+REG_SMBCONF_OBJ = $(REG_BASE_OBJ) \
-+		  registry/reg_util_token.o \
-+		  registry/reg_api_util.o \
-+		  $(REG_BACKENDS_SMBCONF_OBJ) \
-+		  $(REG_INIT_SMBCONF_OBJ)
-+
-+REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
-+	       $(REG_BACKENDS_EXTRA_OBJ) \
-+	       $(REG_INIT_FULL_OBJ) \
-+	       registry/reg_perfcount.o \
-+	       autoconf/librpc/gen_ndr/ndr_perfcount.o
-+
-+LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
-+
-+DCE_RPC_EP_OBJ = librpc/rpc/dcerpc_ep.o
-+
-+RPC_LSARPC_OBJ = rpc_server/lsa/srv_lsa_nt.o \
-+		 autoconf/librpc/gen_ndr/srv_lsa.o \
-+		 ../libcli/lsarpc/util_lsarpc.o
-+
-+RPC_NETLOGON_OBJ = rpc_server/netlogon/srv_netlog_nt.o \
-+		   autoconf/librpc/gen_ndr/srv_netlogon.o
-+
-+RPC_SAMR_OBJ = rpc_server/samr/srv_samr_nt.o \
-+               rpc_server/samr/srv_samr_util.o \
-+               rpc_server/samr/srv_samr_chgpasswd.o \
-+	       autoconf/librpc/gen_ndr/srv_samr.o
-+
-+RPC_INITSHUTDOWN_OBJ =  autoconf/librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o
-+
-+RPC_WINREG_OBJ =  rpc_server/winreg/srv_winreg_nt.o \
-+		  autoconf/librpc/gen_ndr/srv_winreg.o
-+
-+RPC_DSSETUP_OBJ =  rpc_server/dssetup/srv_dssetup_nt.o autoconf/librpc/gen_ndr/srv_dssetup.o
-+
-+RPC_SRVSVC_OBJ = rpc_server/srvsvc/srv_srvsvc_nt.o \
-+		 autoconf/librpc/gen_ndr/srv_srvsvc.o
-+
-+RPC_WKSSVC_OBJ =  autoconf/librpc/gen_ndr/srv_wkssvc.o \
-+		  rpc_server/wkssvc/srv_wkssvc_nt.o
-+
-+RPC_SVCCTL_OBJ =  rpc_server/svcctl/srv_svcctl_nt.o \
-+		  rpc_server/svcctl/srv_svcctl_reg.o \
-+		  autoconf/librpc/gen_ndr/srv_svcctl.o \
-+		  services/svc_winreg_glue.o \
-+                  services/svc_spoolss.o services/svc_rcinit.o  \
-+                  services/svc_netlogon.o services/svc_winreg.o \
-+                  services/svc_wins.o
-+
-+RPC_NTSVCS_OBJ = rpc_server/ntsvcs/srv_ntsvcs_nt.o \
-+		 autoconf/librpc/gen_ndr/srv_ntsvcs.o
-+
-+RPC_NETDFS_OBJ =  autoconf/librpc/gen_ndr/srv_dfs.o \
-+		  rpc_server/dfs/srv_dfs_nt.o
-+
-+RPC_SPOOLSS_OBJ = rpc_server/spoolss/srv_spoolss_nt.o \
-+		  rpc_server/spoolss/srv_spoolss_util.o \
-+		  autoconf/librpc/gen_ndr/srv_spoolss.o
-+
-+RPC_EVENTLOG_OBJ = rpc_server/eventlog/srv_eventlog_nt.o \
-+		   rpc_server/eventlog/srv_eventlog_reg.o \
-+		   $(LIB_EVENTLOG_OBJ) autoconf/librpc/gen_ndr/srv_eventlog.o
-+
-+NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
-+		  autoconf/librpc/gen_ndr/ndr_named_pipe_auth.o \
-+		  ../auth/auth_sam_reply.o autoconf/librpc/gen_ndr/ndr_auth.o ../librpc/ndr/ndr_auth.o
-+
-+RPC_NCACN_NP = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np.o \
-+	       rpc_server/rpc_handles.o rpc_server/rpc_contexts.o \
-+	       rpc_server/srv_access_check.o
-+
-+RPC_CONFIG = rpc_server/rpc_config.o
-+
-+RPC_SERVICE = rpc_server/rpc_server.o
-+
-+RPC_CRYPTO = rpc_server/dcesrv_auth_generic.o
-+
-+RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
-+	       $(RPC_CONFIG) $(RPC_NCACN_NP) $(RPC_SERVICE) $(RPC_CRYPTO)
-+
-+RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o autoconf/librpc/gen_ndr/srv_echo.o
-+
-+RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o autoconf/librpc/gen_ndr/srv_epmapper.o
-+
-+RPC_SERVER_REGISTER_OBJ = rpc_server/rpc_ep_register.o $(DCE_RPC_EP_OBJ)
-+
-+RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
-+		 $(RPC_DSSETUP_OBJ) $(RPC_WKSSVC_OBJ) $(RPC_SVCCTL_OBJ) \
-+		 $(RPC_NTSVCS_OBJ) $(RPC_NETLOGON_OBJ) $(RPC_NETDFS_OBJ) \
-+		 $(RPC_SRVSVC_OBJ) $(RPC_SPOOLSS_OBJ) $(RPC_EVENTLOG_OBJ) \
-+		 $(RPC_SAMR_OBJ) $(RPC_RPCECHO_OBJ) $(RPC_EPMAPPER_OBJ) \
-+		 $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
-+		 $(LIBCLI_SPOOLSS_OBJ) \
-+		 $(LIBCLI_WINREG_INT_OBJ) \
-+		 $(LIBCLI_SRVSVC_OBJ) \
-+		 $(LIBCLI_LSA_OBJ) \
-+		 $(LIBCLI_SAMR_OBJ) \
-+		 $(RPC_SERVER_REGISTER_OBJ) \
-+		 $(RPC_CLIENT_SCHANNEL_OBJ) \
-+		 rpc_server/rpc_sock_helper.o \
-+		 rpc_server/rpc_service_setup.o \
-+		 rpc_client/init_samr.o
-+
-+RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
-+
-+LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o \
-+		autoconf/librpc/gen_ndr/ndr_open_files.o locking/share_mode_lock.o
-+
-+PRIVILEGES_BASIC_OBJ = ../libcli/security/privileges.o
-+
-+PRIVILEGES_OBJ = lib/privileges.o
-+
-+PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
-+
-+PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
-+		lib/util_wellknown.o lib/util_builtin.o passdb/pdb_compat.o \
-+		lib/util_sid_passdb.o \
-+		lib/util_unixsids.o passdb/lookup_sid.o \
-+		passdb/login_cache.o @PDB_STATIC@ \
-+		passdb/account_pol.o $(PRIVILEGES_OBJ) \
-+		lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ) \
-+		passdb/pdb_util.o passdb/pdb_ldap_schema.o \
-+		passdb/pdb_secrets.o
-+
-+DEVEL_HELP_WEIRD_OBJ = ../lib/util/charset/weird.o
-+CHARSET_MACOSXFS_OBJ = ../lib/util/charset/charset_macosxfs.o
-+
-+GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o
-+
-+PROFILE_OBJ = profile/profile.o
-+PROFILES_OBJ = utils/profiles.o \
-+	       $(LIBSMB_ERR_OBJ) \
-+	       $(PARAM_OBJ) \
-+               $(LIB_OBJ) $(LIB_DUMMY_OBJ) \
-+               $(POPT_LIB_OBJ) \
-+	       $(REGFIO_OBJ)
-+
-+OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o
-+
-+NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
-+	     autoconf/librpc/gen_ndr/ndr_notify.o
-+
-+FNAME_UTIL_OBJ = lib/filename_util.o
-+
-+NFS4ACL_OBJ = modules/nfs4_acls.o modules/non_posix_acls.o
-+
-+VFS_DEFAULT_OBJ = modules/vfs_default.o
-+VFS_AUDIT_OBJ = modules/vfs_audit.o
-+VFS_EXTD_AUDIT_OBJ = modules/vfs_extd_audit.o
-+VFS_FULL_AUDIT_OBJ = modules/vfs_full_audit.o
-+VFS_FAKE_PERMS_OBJ = modules/vfs_fake_perms.o
-+VFS_FAKE_ACLS_OBJ = modules/vfs_fake_acls.o autoconf/librpc/gen_ndr/ndr_smb_acl.o
-+VFS_RECYCLE_OBJ = modules/vfs_recycle.o
-+VFS_NETATALK_OBJ = modules/vfs_netatalk.o
-+VFS_DEFAULT_QUOTA_OBJ = modules/vfs_default_quota.o
-+VFS_READONLY_OBJ = modules/vfs_readonly.o modules/getdate.o
-+VFS_CAP_OBJ = modules/vfs_cap.o
-+VFS_EXPAND_MSDFS_OBJ = modules/vfs_expand_msdfs.o
-+VFS_SHADOW_COPY_OBJ = modules/vfs_shadow_copy.o
-+VFS_SHADOW_COPY2_OBJ = modules/vfs_shadow_copy2.o
-+VFS_AFSACL_OBJ = modules/vfs_afsacl.o
-+VFS_XATTR_TDB_OBJ = modules/vfs_xattr_tdb.o lib/xattr_tdb.o
-+VFS_POSIXACL_OBJ = modules/vfs_posixacl.o
-+VFS_AIXACL_OBJ = modules/vfs_aixacl.o modules/vfs_aixacl_util.o
-+VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o $(NFS4ACL_OBJ)
-+VFS_SOLARISACL_OBJ = modules/vfs_solarisacl.o
-+VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o $(NFS4ACL_OBJ)
-+VFS_NFS4ACL_XATTR_OBJ = modules/vfs_nfs4acl_xattr.o $(LIBNDR_NFS4ACL_OBJ) $(NFS4ACL_OBJ)
-+VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
-+VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o
-+VFS_CATIA_OBJ = modules/vfs_catia.o
-+VFS_STREAMS_XATTR_OBJ = modules/vfs_streams_xattr.o
-+VFS_STREAMS_DEPOT_OBJ = modules/vfs_streams_depot.o
-+VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
-+VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
-+VFS_COMMIT_OBJ = modules/vfs_commit.o
-+VFS_GPFS_OBJ = modules/vfs_gpfs.o modules/gpfs.o $(NFS4ACL_OBJ)
-+VFS_NOTIFY_FAM_OBJ = modules/vfs_notify_fam.o
-+VFS_READAHEAD_OBJ = modules/vfs_readahead.o
-+VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
-+VFS_FILEID_OBJ = modules/vfs_fileid.o
-+VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
-+VFS_AIO_PTHREAD_OBJ = modules/vfs_aio_pthread.o
-+VFS_AIO_POSIX_OBJ = modules/vfs_aio_posix.o
-+VFS_AIO_LINUX_OBJ = modules/vfs_aio_linux.o
-+VFS_PREOPEN_OBJ = modules/vfs_preopen.o
-+VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
-+VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
-+VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
-+VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
-+PERFCOUNT_TEST_OBJ = modules/perfcount_test.o
-+VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
-+VFS_SCANNEDONLY_OBJ = modules/vfs_scannedonly.o
-+VFS_CROSSRENAME_OBJ = modules/vfs_crossrename.o
-+VFS_LINUX_XFS_SGID_OBJ = modules/vfs_linux_xfs_sgid.o
-+VFS_TIME_AUDIT_OBJ = modules/vfs_time_audit.o
-+VFS_MEDIA_HARMONY_OBJ = modules/vfs_media_harmony.o
-+VFS_BTRFS_OBJ = modules/vfs_btrfs.o
-+VFS_CEPH_OBJ = modules/vfs_ceph.o
-+
-+PAM_ERRORS_OBJ = ../libcli/auth/pam_errors.o
-+PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o $(PAM_ERRORS_OBJ)
-+
-+SLCACHE_OBJ = libsmb/samlogon_cache.o
-+
-+DCUTIL_OBJ  = libsmb/namequery_dc.o libsmb/trustdom_cache.o libsmb/trusts_util.o libsmb/dsgetdcname.o
-+
-+AUTH_BUILTIN_OBJ = auth/auth_builtin.o
-+AUTH_DOMAIN_OBJ = auth/auth_domain.o
-+AUTH_SAM_OBJ = auth/auth_sam.o auth/check_samsec.o
-+AUTH_UNIX_OBJ = auth/auth_unix.o
-+AUTH_WINBIND_OBJ = auth/auth_winbind.o
-+AUTH_WBC_OBJ = auth/auth_wbc.o
-+AUTH_SCRIPT_OBJ = auth/auth_script.o
-+
-+AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \
-+	   auth/server_info.o \
-+	   auth/server_info_sam.o \
-+	   auth/user_info.o \
-+	   auth/user_util.o \
-+	   auth/user_krb5.o \
-+	   auth/auth_ntlmssp.o auth/auth_generic.o \
-+	   $(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ)
-+
-+MANGLE_OBJ = smbd/mangle.o smbd/mangle_hash.o smbd/mangle_hash2.o
-+
-+SMBD_OBJ_MAIN = smbd/server.o smbd/server_exit.o
-+
-+BUILDOPT_OBJ = smbd/build_options.o
-+
-+SMBD_OBJ_SRV = smbd/server_reload.o \
-+	       smbd/files.o smbd/connection.o \
-+	       smbd/utmp.o smbd/session.o \
-+               smbd/dfree.o smbd/dir.o smbd/password.o smbd/conn.o smbd/conn_idle.o smbd/conn_msg.o \
-+	       smbd/share_access.o smbd/fileio.o \
-+               smbd/ipc.o smbd/lanman.o smbd/negprot.o \
-+               smbd/message.o smbd/nttrans.o smbd/pipes.o \
-+               smbd/reply.o smbd/sesssetup.o smbd/trans2.o smbd/uid.o \
-+	       smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o \
-+	       smbd/blocking.o smbd/sec_ctx.o smbd/srvstr.o \
-+	       smbd/vfs.o smbd/perfcount.o smbd/statcache.o smbd/seal.o \
-+               smbd/posix_acls.o lib/sysacls.o autoconf/librpc/gen_ndr/ndr_smb_acl.o\
-+	       smbd/process.o smbd/service.o param/service.o smbd/error.o \
-+	       rpc_server/epmd.o \
-+	       rpc_server/lsasd.o \
-+	       printing/printspoolss.o printing/spoolssd.o \
-+	       lib/sysquotas.o lib/sysquotas_linux.o \
-+	       lib/sysquotas_xfs.o lib/sysquotas_4A.o lib/sysquotas_4B.o \
-+	       lib/sysquotas_nfs.o \
-+	       lib/smbd_shim.o \
-+	       lib/background.o \
-+	       smbd/fake_file.o \
-+	       smbd/quotas.o smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
-+	       $(AFS_SETTOKEN_OBJ) smbd/aio.o smbd/statvfs.o \
-+	       smbd/dmapi.o smbd/signing.o \
-+	       smbd/file_access.o \
-+	       smbd/dnsregister.o smbd/globals.o \
-+	       smbd/smb2_server.o \
-+	       smbd/smb2_glue.o \
-+	       smbd/smb2_negprot.o \
-+	       smbd/smb2_sesssetup.o \
-+	       smbd/smb2_tcon.o \
-+	       smbd/smb2_create.o \
-+	       smbd/smb2_close.o \
-+	       smbd/smb2_flush.o \
-+	       smbd/smb2_read.o \
-+	       smbd/smb2_write.o \
-+	       smbd/smb2_lock.o \
-+	       smbd/smb2_ioctl.o \
-+               smbd/smb2_ioctl_dfs.o \
-+               smbd/smb2_ioctl_filesys.o \
-+               smbd/smb2_ioctl_named_pipe.o \
-+               smbd/smb2_ioctl_network_fs.o \
-+	       smbd/smb2_keepalive.o \
-+	       smbd/smb2_find.o \
-+	       smbd/smb2_notify.o \
-+	       smbd/smb2_getinfo.o \
-+	       smbd/smb2_setinfo.o \
-+	       smbd/smb2_break.o \
-+	       autoconf/librpc/gen_ndr/ndr_smbXsrv.o \
-+	       smbd/smbXsrv_version.o \
-+	       smbd/smbXsrv_session.o \
-+	       smbd/smbXsrv_tcon.o \
-+	       smbd/smbXsrv_open.o \
-+	       smbd/durable.o \
-+	       smbd/scavenger.o \
-+	       autoconf/librpc/gen_ndr/ndr_ioctl.o \
-+	       $(MANGLE_OBJ) @VFS_STATIC@
-+
-+SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
-+		$(RPC_SERVER_OBJ) \
-+		$(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) \
-+		$(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
-+		$(NOTIFY_OBJ) $(FNAME_UTIL_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
-+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(AVAHI_OBJ) \
-+		$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) $(LIBADS_PRINTER_OBJ) \
-+		$(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
-+		$(SMBLDAP_OBJ) $(LIBNET_OBJ) \
-+		$(LIBSMBCONF_OBJ) \
-+		$(PRIVILEGES_BASIC_OBJ) \
-+		$(REGFIO_OBJ) \
-+		$(REG_API_REGF_OBJ) \
-+		$(LIBNDR_XATTR_OBJ) \
-+		lib/conn_tdb.o lib/sessionid_tdb.o
-+
-+
-+PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
-+               printing/print_cups.o printing/print_generic.o \
-+               printing/lpq_parse.o printing/load.o \
-+               printing/print_iprint.o printing/print_standard.o \
-+               printing/printer_list.o autoconf/librpc/gen_ndr/ndr_printcap.o
-+
-+PRINTBASE_OBJ = printing/notify.o printing/printing_db.o
-+PRINTBACKEND_OBJ = printing/printing.o \
-+		   printing/nt_printing.o \
-+		   printing/nt_printing_tdb.o \
-+		   printing/nt_printing_migrate.o \
-+		   printing/nt_printing_migrate_internal.o \
-+		   printing/nt_printing_ads.o \
-+		   autoconf/librpc/gen_ndr/ndr_ntprinting.o \
-+		    ../librpc/ndr/ndr_ntprinting.o \
-+		   printing/queue_process.o \
-+		   $(PRINTBASE_OBJ)
-+
-+SMBD_OBJ = $(SMBD_OBJ_BASE) $(SMBD_OBJ_MAIN)
-+
-+NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
-+            nmbd/nmbd_become_lmb.o nmbd/nmbd_browserdb.o \
-+            nmbd/nmbd_browsesync.o nmbd/nmbd_elections.o \
-+            nmbd/nmbd_incomingdgrams.o nmbd/nmbd_incomingrequests.o \
-+            nmbd/nmbd_lmhosts.o nmbd/nmbd_logonnames.o nmbd/nmbd_mynames.o \
-+            nmbd/nmbd_namelistdb.o nmbd/nmbd_namequery.o \
-+            nmbd/nmbd_nameregister.o nmbd/nmbd_namerelease.o \
-+            nmbd/nmbd_nodestatus.o nmbd/nmbd_packets.o \
-+            nmbd/nmbd_processlogon.o nmbd/nmbd_responserecordsdb.o \
-+            nmbd/nmbd_sendannounce.o nmbd/nmbd_serverlistdb.o \
-+            nmbd/nmbd_subnetdb.o nmbd/nmbd_winsproxy.o nmbd/nmbd_winsserver.o \
-+            nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
-+
-+NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-+           $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
-+	   $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
-+
-+
-+STATUS_OBJ = utils/status.o utils/status_profile.o $(SMBD_OBJ_BASE)
-+
-+
-+SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+	$(LIBSMB_ERR_OBJ) $(POPT_LIB_OBJ) $(PRINTBASE_OBJ)
-+
-+SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
-+             $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
-+	     $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-+	     $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-+	     $(LIBMSRPC_GEN_OBJ) \
-+	     $(LIBMSRPC_OBJ) \
-+	     $(LIBCLI_SRVSVC_OBJ)
-+
-+TESTPARM_OBJ = utils/testparm.o \
-+               $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
-+	       $(LIBSMB_ERR_OBJ)
-+
-+SMBTA_UTIL_OBJ = utils/smbta-util.o $(PARAM_OBJ) $(POPT_LIB_OBJ) \
-+	$(LIB_NONSMBD_OBJ) \
-+	$(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
-+
-+TEST_LP_LOAD_OBJ = param/test_lp_load.o \
-+		   $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		   $(POPT_LIB_OBJ) $(LIBSAMBA_OBJ)
-+
-+PASSWD_UTIL_OBJ = utils/passwd_util.o
-+
-+SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
-+		$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
-+		$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
-+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
-+		$(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-+		$(LIBCLI_SAMR_OBJ) \
-+		rpc_client/init_lsa.o
-+
-+PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
-+		$(AFS_SETTOKEN_OBJ) \
-+		$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
-+		$(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) $(SECRETS_OBJ) \
-+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
-+		../lib/util/asn1.o $(LIBCLI_LDAP_NDR_OBJ) \
-+		$(LIBNDR_DRSUAPI_OBJ) $(LIBNDR_GEN_OBJ0) $(COMPRESSION_OBJ)
-+
-+SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1)
-+
-+DISPLAY_SEC_OBJ= ../libcli/security/display_sec.o
-+
-+RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
-+	         rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \
-+		 rpcclient/cmd_netlogon.o rpcclient/cmd_srvsvc.o \
-+		 rpcclient/cmd_dfs.o rpcclient/cmd_epmapper.o \
-+		 rpcclient/cmd_dssetup.o rpcclient/cmd_echo.o \
-+		 rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \
-+		 rpcclient/cmd_wkssvc.o rpcclient/cmd_ntsvcs.o \
-+		 rpcclient/cmd_drsuapi.o rpcclient/cmd_eventlog.o \
-+		 rpcclient/cmd_winreg.o rpcclient/cmd_fss.o \
-+		 $(DISPLAY_SEC_OBJ)
-+
-+RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
-+             $(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
-+             $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-+             $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
-+	     $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
-+	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
-+	     $(LIBCLI_SPOOLSS_OBJ) \
-+	     $(LIBCLI_EVENTLOG_OBJ) \
-+	     $(LIBCLI_NTSVCS_OBJ) \
-+	     $(LIBCLI_DRSUAPI_OBJ) \
-+	     $(LIBCLI_DFS_OBJ) \
-+	     $(LIBCLI_ECHO_OBJ) \
-+	     $(LIBCLI_DSSETUP_OBJ) \
-+	     $(LIBCLI_WKSSVC_OBJ) \
-+	     $(LIBCLI_SRVSVC_OBJ) \
-+	     $(LIBCLI_LSA_OBJ) \
-+	     $(LIBCLI_SAMR_OBJ) \
-+	     $(LIBCLI_WINREG_OBJ) \
-+	     $(LIBCLI_FSRVP_OBJ) \
-+	     $(RPC_CLIENT_SCHANNEL_OBJ) \
-+	     rpc_client/init_samr.o
-+
-+PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
-+		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
-+
-+LIBSMBCLIENT_THREAD_OBJ = \
-+			libsmb/libsmb_thread_impl.o \
-+			libsmb/libsmb_thread_posix.o
-+
-+LIBSMBCLIENT_OBJ0 = \
-+		    libsmb/libsmb_cache.o \
-+		    libsmb/libsmb_compat.o \
-+		    libsmb/libsmb_context.o \
-+		    libsmb/libsmb_dir.o \
-+		    libsmb/libsmb_file.o \
-+		    libsmb/libsmb_misc.o \
-+		    libsmb/libsmb_path.o \
-+		    libsmb/libsmb_printjob.o \
-+		    libsmb/libsmb_server.o \
-+		    libsmb/libsmb_stat.o \
-+		    libsmb/libsmb_xattr.o \
-+		    libsmb/libsmb_setget.o
-+
-+LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
-+		    $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		    $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-+		    $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+		    $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-+		    $(LIBCLI_SRVSVC_OBJ) \
-+		    $(LIBCLI_LSA_OBJ)
-+
-+LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
-+
-+CLIENT_OBJ1 = client/client.o client/clitar.o \
-+	      client/dnsbrowse.o \
-+	      $(LIBMSRPC_OBJ)
-+
-+CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-+	     $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+             $(READLINE_OBJ) $(POPT_LIB_OBJ) \
-+             $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-+	     $(DISPLAY_SEC_OBJ) \
-+	     $(LIBCLI_SRVSVC_OBJ)
-+
-+LIBSMBCONF_OBJ = ../lib/smbconf/smbconf.o \
-+		 ../lib/smbconf/smbconf_util.o \
-+		 ../lib/smbconf/smbconf_txt.o \
-+		 lib/smbconf/smbconf_reg.o \
-+		 lib/smbconf/smbconf_init.o
-+
-+SMBCONFTORT_OBJ0 = lib/smbconf/testsuite.o
-+
-+SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
-+		  $(LIB_NONSMBD_OBJ) \
-+		  $(PARAM_OBJ) \
-+		  $(LIBSMB_ERR_OBJ) \
-+		  $(POPT_LIB_OBJ)
-+
-+PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \
-+		lib/pthreadpool/tests.o $(LIBREPLACE_OBJ)
-+
-+LIBNET_OBJ = libnet/libnet_join.o \
-+	     libnet/libnet_keytab.o \
-+	     autoconf/librpc/gen_ndr/ndr_libnet_join.o
-+
-+LIBNET_DSSYNC_OBJ = libnet/libnet_dssync.o \
-+		    libnet/libnet_dssync_passdb.o \
-+		    libnet/libnet_dssync_keytab.o \
-+		    ../libcli/drsuapi/repl_decrypt.o
-+
-+LIBNET_SAMSYNC_OBJ = libnet/libnet_samsync.o \
-+		     libnet/libnet_samsync_ldif.o \
-+		     libnet/libnet_samsync_passdb.o \
-+		     libnet/libnet_samsync_display.o \
-+		     libnet/libnet_samsync_keytab.o \
-+		     ../libcli/samsync/decrypt.o
-+
-+NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
-+	   utils/net_rap.o utils/net_rpc.o utils/net_rpc_samsync.o \
-+	   utils/net_rpc_join.o utils/net_time.o utils/net_lookup.o \
-+	   utils/net_cache.o utils/net_groupmap.o utils/net_idmap.o \
-+	   utils/net_idmap_check.o utils/interact.o \
-+	   utils/net_status.o utils/net_rpc_printer.o utils/net_rpc_rights.o \
-+	   utils/net_rpc_service.o utils/net_rpc_registry.o utils/net_usershare.o \
-+	   utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
-+	   utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
-+	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
-+	   utils/net_conf.o utils/net_join.o utils/net_user.o \
-+	   utils/net_group.o utils/net_file.o utils/net_registry.o utils/net_registry_check.o\
-+	   utils/net_dom.o utils/net_share.o \
-+	   utils/net_g_lock.o \
-+	   utils/net_serverid.o \
-+	   utils/net_eventlog.o \
-+	   utils/net_printing.o \
-+	   utils/net_rpc_trust.o \
-+	   utils/net_rpc_conf.o\
-+	   $(LIBNDR_PREG_OBJ) \
-+	   $(LIBCLI_DRSUAPI_OBJ) \
-+	   $(LIBCLI_INITSHUTDOWN_OBJ) \
-+	   $(LIBCLI_DSSETUP_OBJ) \
-+	   $(LIBCLI_SVCCTL_OBJ) \
-+	   $(LIBCLI_WKSSVC_OBJ) \
-+	   registry/reg_parse.o registry/reg_format.o \
-+	   registry/reg_import.o
-+
-+# these are not processed by make proto
-+NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
-+
-+NET_OBJ = $(NET_OBJ1) \
-+	  $(NET_OBJ2) @FAKE_KASERVER_OBJ@ \
-+	  $(LIBADDNS_OBJ0) \
-+	  $(READLINE_OBJ) \
-+	  $(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) \
-+	  $(LIBNET_DSSYNC_OBJ) $(LIBNET_SAMSYNC_OBJ) \
-+	  $(SMBD_OBJ_BASE)
-+
-+CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-+		$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-+		$(AFS_SETTOKEN_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
-+
-+NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \
-+               $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ)
-+
-+SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/utable.o \
-+		torture/denytest.o torture/mangle_test.o \
-+		torture/nbench.o \
-+		torture/test_async_echo.o \
-+		torture/test_smbsock_any_connect.o \
-+		torture/test_nttrans_create.o \
-+		torture/test_nttrans_fsctl.o \
-+		torture/test_notify_online.o \
-+		torture/test_addrchange.o \
-+		torture/test_case_insensitive.o \
-+		torture/test_posix_append.o \
-+		torture/test_smb2.o \
-+		torture/test_chain3.o \
-+		torture/test_authinfo_structs.o \
-+		torture/test_cleanup.o \
-+		torture/test_ctdbconn.o \
-+		torture/test_msg.o \
-+		torture/test_notify.o \
-+		torture/test_dbwrap_watch.o \
-+		torture/test_idmap_tdb_common.o \
-+		torture/test_dbwrap_ctdb.o \
-+		torture/t_strappend.o
-+
-+SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
-+	$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LOCKING_OBJ) \
-+	@LIBWBCLIENT_STATIC@ \
-+        torture/wbc_async.o \
-+        ../nsswitch/wb_reqtrans.o \
-+	../libcli/lsarpc/util_lsarpc.o \
-+	lib/filename_util.o \
-+	$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ)
-+
-+MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_ERR_OBJ) \
-+                 $(LIB_NONSMBD_OBJ) \
-+		 $(LIBNDR_GEN_OBJ0)
-+
-+NSSTEST_OBJ = ../nsswitch/nsstest.o ../lib/util/setid.o $(LIBSAMBAUTIL_OBJ)
-+
-+VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) \
-+		torture/vfstest_chain.o
-+
-+LOG2PCAP_OBJ = utils/log2pcaphex.o
-+
-+LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
-+		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
-+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(FNAME_UTIL_OBJ)
-+
-+SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-+		$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
-+		$(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
-+		$(LIBCLI_LSA_OBJ)
-+
-+SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-+		$(PARAM_OBJ) \
-+		$(LIB_NONSMBD_OBJ) \
-+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
-+		$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-+		$(LIBCLI_LSA_OBJ)
-+
-+EVTLOGADM_OBJ0	= utils/eventlogadm.o
-+
-+EVTLOGADM_OBJ	= $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		$(LIBSMB_ERR_OBJ) $(LIB_EVENTLOG_OBJ) \
-+		autoconf/librpc/gen_ndr/ndr_eventlog.o \
-+		autoconf/librpc/gen_ndr/ndr_lsa.o
-+
-+SHARESEC_OBJ0 = utils/sharesec.o
-+SHARESEC_OBJ  = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		$(LIBSMB_ERR_OBJ) \
-+                $(POPT_LIB_OBJ)
-+
-+TALLOCTORT_OBJ = @tallocdir@/testsuite.o @tallocdir@/testsuite_main.o \
-+		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ)
-+
-+REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
-+		@libreplacedir@/test/getifaddrs.o \
-+		@libreplacedir@/test/os2_delete.o \
-+		@libreplacedir@/test/strptime.o \
-+		@libreplacedir@/test/main.o \
-+		$(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
-+
-+DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
-+
-+SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
-+		$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
-+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
-+
-+WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
-+	$(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
-+
-+PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
-+		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
-+PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-+		$(SMBLDAP_OBJ) \
-+		$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-+		$(AFS_SETTOKEN_OBJ) \
-+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+		$(PAM_ERRORS_OBJ)
-+
-+IDMAP_RW_OBJ = winbindd/idmap_rw.o
-+
-+IDMAP_TDB_COMMON_OBJ = winbindd/idmap_tdb_common.o
-+
-+IDMAP_UTIL_OBJ = winbindd/idmap_util.o $(IDMAP_RW_OBJ) \
-+		 $(IDMAP_TDB_COMMON_OBJ)
-+
-+IDMAP_OBJ     =  winbindd/idmap.o $(IDMAP_UTIL_OBJ) @IDMAP_STATIC@
-+
-+NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
-+
-+IDMAP_HASH_OBJ = \
-+		winbindd/idmap_hash/idmap_hash.o \
-+		winbindd/idmap_hash/mapfile.o
-+
-+WINBINDD_OBJ1 = \
-+		winbindd/winbindd.o       \
-+		winbindd/winbindd_group.o \
-+		winbindd/winbindd_util.o  \
-+		winbindd/winbindd_cache.o \
-+		winbindd/winbindd_pam.o   \
-+		winbindd/winbindd_misc.o  \
-+		winbindd/winbindd_cm.o    \
-+		winbindd/winbindd_wins_byip.o  \
-+		winbindd/winbindd_wins_byname.o  \
-+		winbindd/winbindd_msrpc.o \
-+		winbindd/winbindd_rpc.o   \
-+		winbindd/winbindd_reconnect.o \
-+		winbindd/winbindd_ads.o   \
-+		winbindd/winbindd_samr.o \
-+		winbindd/winbindd_dual.o  \
-+		winbindd/winbindd_dual_ndr.o  \
-+		winbindd/winbindd_dual_srv.o  \
-+		autoconf/librpc/gen_ndr/ndr_wbint_c.o \
-+		autoconf/librpc/gen_ndr/srv_wbint.o \
-+		autoconf/librpc/gen_ndr/ndr_wbint.o \
-+		autoconf/librpc/gen_ndr/ndr_idmap.o \
-+		winbindd/winbindd_async.o \
-+		winbindd/winbindd_creds.o \
-+		winbindd/winbindd_cred_cache.o \
-+		winbindd/winbindd_ccache_access.o \
-+		winbindd/winbindd_domain.o \
-+		winbindd/winbindd_idmap.o \
-+		winbindd/winbindd_locator.o \
-+		winbindd/winbindd_ndr.o \
-+		winbindd/wb_ping.o \
-+		winbindd/wb_lookupsid.o \
-+		winbindd/wb_lookupsids.o \
-+		winbindd/wb_lookupname.o \
-+		winbindd/wb_uid2sid.o \
-+		winbindd/wb_gid2sid.o \
-+		winbindd/wb_sids2xids.o \
-+		winbindd/wb_queryuser.o \
-+		winbindd/wb_lookupuseraliases.o \
-+		winbindd/wb_lookupusergroups.o \
-+		winbindd/wb_getpwsid.o \
-+		winbindd/wb_gettoken.o \
-+		winbindd/wb_seqnum.o \
-+		winbindd/wb_seqnums.o \
-+		winbindd/wb_group_members.o \
-+		winbindd/wb_getgrsid.o \
-+		winbindd/wb_query_user_list.o \
-+		winbindd/wb_fill_pwent.o \
-+		winbindd/wb_next_pwent.o \
-+		winbindd/wb_next_grent.o \
-+		winbindd/wb_dsgetdcname.o \
-+		winbindd/winbindd_lookupsid.o \
-+		winbindd/winbindd_lookupsids.o \
-+		winbindd/winbindd_lookupname.o \
-+		winbindd/winbindd_sid_to_uid.o \
-+		winbindd/winbindd_sid_to_gid.o \
-+		winbindd/winbindd_uid_to_sid.o \
-+		winbindd/winbindd_gid_to_sid.o \
-+		winbindd/winbindd_sids_to_xids.o \
-+		winbindd/winbindd_allocate_uid.o \
-+		winbindd/winbindd_allocate_gid.o \
-+		winbindd/winbindd_getpwsid.o \
-+		winbindd/winbindd_getpwnam.o \
-+		winbindd/winbindd_getpwuid.o \
-+		winbindd/winbindd_getsidaliases.o \
-+		winbindd/winbindd_getuserdomgroups.o \
-+		winbindd/winbindd_getgroups.o \
-+		winbindd/winbindd_show_sequence.o \
-+		winbindd/winbindd_getgrgid.o \
-+		winbindd/winbindd_getgrnam.o \
-+		winbindd/winbindd_getusersids.o \
-+		winbindd/winbindd_lookuprids.o \
-+		winbindd/winbindd_setpwent.o \
-+		winbindd/winbindd_getpwent.o \
-+		winbindd/winbindd_endpwent.o \
-+		winbindd/winbindd_setgrent.o \
-+		winbindd/winbindd_getgrent.o \
-+		winbindd/winbindd_endgrent.o \
-+		winbindd/winbindd_dsgetdcname.o \
-+		winbindd/winbindd_getdcname.o \
-+		winbindd/winbindd_list_users.o \
-+		winbindd/winbindd_list_groups.o \
-+		winbindd/winbindd_check_machine_acct.o \
-+		winbindd/winbindd_change_machine_acct.o \
-+		winbindd/winbindd_ping_dc.o \
-+		winbindd/winbindd_pam_auth.o \
-+		winbindd/winbindd_pam_auth_crap.o \
-+		winbindd/winbindd_pam_chauthtok.o \
-+		winbindd/winbindd_pam_chng_pswd_auth_crap.o \
-+		winbindd/winbindd_pam_logoff.o \
-+		auth/auth_util.o \
-+		auth/token_util.o \
-+		auth/user_util.o \
-+		auth/check_samsec.o \
-+		auth/server_info.o \
-+		auth/server_info_sam.o \
-+		auth/user_info.o \
-+		auth/pampass.o \
-+		../nsswitch/wb_reqtrans.o
-+
-+WINBINDD_OBJ = \
-+		$(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-+		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+		$(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
-+		$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-+		$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
-+		$(RPC_CONFIG) $(RPC_NCACN_NP) \
-+		$(RPC_SAMR_OBJ) $(RPC_LSARPC_OBJ) \
-+		$(NPA_TSTREAM_OBJ) \
-+		$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
-+		$(LIBADS_SERVER_OBJ) \
-+		$(TDB_VALIDATE_OBJ) \
-+		$(LIBCLI_DSSETUP_OBJ) \
-+		$(LIBCLI_LSA_OBJ) \
-+		$(LIBCLI_SAMR_OBJ) \
-+		rpc_client/init_samr.o \
-+		$(PAM_ERRORS_OBJ)
-+
-+WBINFO_OBJ = ../nsswitch/wbinfo.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-+		$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
-+		lib/winbind_util.o $(WBCOMMON_OBJ) \
-+		$(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) $(SECRETS_OBJ)
-+
-+WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) @WINBIND_NSS_EXTRA_OBJS@
-+
-+WINBIND_KRB5_LOCATOR_OBJ1 = ../nsswitch/winbind_krb5_locator.o
-+WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(LIBREPLACE_OBJ)
-+
-+POPT_OBJ=../lib/popt/findme.o ../lib/popt/popt.o ../lib/popt/poptconfig.o \
-+          ../lib/popt/popthelp.o ../lib/popt/poptparse.o
-+
-+INIPARSER_OBJ = ../lib/iniparser_build/iniparser.o ../lib/iniparser_build/dictionary.o \
-+		../lib/iniparser_build/strlib.o
-+
-+TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
-+	$(SOCKET_WRAPPER_OBJ)
-+
-+TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o $(LIBREPLACE_OBJ) \
-+	$(SOCKET_WRAPPER_OBJ)
-+
-+TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o $(LIBREPLACE_OBJ) \
-+	$(SOCKET_WRAPPER_OBJ)
-+
-+TDBRESTORE_OBJ = @tdbdir@/tools/tdbrestore.o $(LIBREPLACE_OBJ) \
-+	$(SOCKET_WRAPPER_OBJ)
-+
-+TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \
-+	$(SOCKET_WRAPPER_OBJ)
-+
-+
-+NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
-+
-+NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} \
-+	        ${LIBADS_SERVER_OBJ} \
-+		$(PASSDB_OBJ) $(GROUPDB_OBJ) \
-+		$(WBCOMMON_OBJ) \
-+		$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-+		$(AFS_SETTOKEN_OBJ) \
-+		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) @BUILD_INIPARSER@
-+
-+
-+VLP_OBJ = printing/tests/vlp.o \
-+          ../lib/util/util_tdb.o \
-+          ../lib/util/signal.o \
-+          ../lib/util/debug.o \
-+          ../lib/util/util_strlist.o \
-+          ../lib/util/fault.o \
-+          ../lib/util/become_daemon.o \
-+          ../lib/util/substitute.o \
-+          lib/util_sec.o \
-+          ../lib/util/time.o \
-+          ../lib/util/charset/util_str.o \
-+          ../lib/util/charset/pull_push.o \
-+          ../lib/util/charset/util_unistr_w.o \
-+          ../lib/util/charset/codepoints.o \
-+          ../lib/util/charset/iconv.o \
-+          ../lib/util/charset/weird.o \
-+          ../lib/util/charset/convert_string.o \
-+          $(CHARSET_MACOSXFS_OBJ) \
-+          ../lib/util/talloc_stack.o \
-+          ../lib/util/smb_threads.o \
-+          ../lib/util/xfile.o \
-+          ../lib/util/util_file.o \
-+          ../lib/util/util.o \
-+          ../lib/util/util_str_common.o \
-+          ../lib/util/data_blob.o \
-+          ../dynconfig/dynconfig.o \
-+	  ../lib/util/setid.o \
-+	  $(LIBSAMBAUTIL_OBJ) \
-+	  param/util.o
-+
-+RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
-+		   $(LIBSMB_OBJ) \
-+		   $(PARAM_OBJ) \
-+		   $(PASSDB_OBJ) \
-+		   $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-+		   $(LIB_NONSMBD_OBJ) \
-+		   $(KRBCLIENT_OBJ) \
-+		   $(LIBMSRPC_OBJ) \
-+		   $(LIBMSRPC_GEN_OBJ)
-+
-+DBWRAP_TOOL_OBJ = utils/dbwrap_tool.o \
-+		  $(PARAM_OBJ) \
-+		  $(LIB_NONSMBD_OBJ) \
-+		  $(LIBSMB_ERR_OBJ) \
-+		  $(POPT_LIB_OBJ)
-+
-+DBWRAP_TORTURE_OBJ = utils/dbwrap_torture.o \
-+		     $(PARAM_OBJ) \
-+		     $(LIB_NONSMBD_OBJ) \
-+		     $(LIBSMB_ERR_OBJ) \
-+		     $(POPT_LIB_OBJ)
-+
-+SPLIT_TOKENS_OBJ = utils/split_tokens.o \
-+                   $(PARAM_OBJ) \
-+		   $(LIB_NONSMBD_OBJ) \
-+		   $(POPT_LIB_OBJ) \
-+	           $(LIBSAMBA_OBJ)
-+
-+######################################################################
-+# now the rules...
-+######################################################################
-+all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) \
-+	$(MODULES) $(NSS_MODULES) $(PAM_MODULES) \
-+	$(EXTRA_ALL_TARGETS)
-+
-+basics:: samba3-idl mkparam
-+
-+nss_modules:: $(NSS_MODULES)
-+
-+pam_modules:: $(PAM_MODULES)
-+
-+pam_smbpass: SHOWFLAGS bin/pam_smbpass.@SHLIBEXT@
-+
-+pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@
-+
-+gpext_modules:: $(GPEXT_MODULES)
-+
-+torture:: SHOWFLAGS basics $(TORTURE_PROGS)
-+
-+smbtorture3 : SHOWFLAGS bin/smbtorture3
-+
-+masktest : SHOWFLAGS bin/masktest
-+
-+msgtest : SHOWFLAGS bin/msgtest
-+
-+locktest : SHOWFLAGS bin/locktest
-+
-+smbcacls : SHOWFLAGS bin/smbcacls
-+
-+smbcquotas : SHOWFLAGS bin/smbcquotas
-+
-+locktest2 : SHOWFLAGS bin/locktest2
-+
-+debug2html : SHOWFLAGS bin/debug2html
-+
-+smbfilter : SHOWFLAGS bin/smbfilter
-+
-+eventlogadm: SHOWFLAGS bin/eventlogadm
-+
-+sharesec: SHOWFLAGS bin/sharesec
-+
-+talloctort : SHOWFLAGS $(TALLOCTORT)
-+
-+replacetort : SHOWFLAGS bin/replacetort
-+
-+smbconftort : SHOWFLAGS bin/smbconftort
-+
-+pthreadpooltest : SHOWFLAGS bin/pthreadpooltest
-+
-+timelimit : SHOWFLAGS bin/timelimit
-+
-+nsswitch : SHOWFLAGS bin/winbindd bin/wbinfo @WINBIND_NSS@ \
-+	@WINBIND_WINS_NSS@ @WINBIND_KRB5_LOCATOR@ \
-+	bin/pam_winbind.@SHLIBEXT@ bin/smbcontrol
-+
-+wins : SHOWFLAGS @WINBIND_WINS_NSS@
-+
-+modules:: SHOWFLAGS $(MODULES)
-+
-+
-+#####################################################################
-+## Perl IDL Compiler
-+
-+IDL_FILES = librpc/idl/messaging.idl \
-+	    librpc/idl/libnetapi.idl \
-+	    librpc/idl/wbint.idl \
-+	    librpc/idl/perfcount.idl \
-+	    librpc/idl/secrets.idl \
-+	    librpc/idl/open_files.idl \
-+	    librpc/idl/libnet_join.idl
-+
-+samba3-idl::
-+	@PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
-+	 srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/*.idl
-+	@PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
-+	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(IDL_FILES)
-+
-+idl_full::
-+	@PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
-+	 srcdir="$(srcdir)" ../librpc/build_idl.sh --full ../librpc/idl/*.idl
-+	@PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
-+	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES)
-+
-+mkparam: autoconf/lib/param/param_local.h autoconf/lib/param/param_global.h autoconf/source3/param/param_global.h autoconf/lib/param/param_proto.h autoconf/lib/param/s3_param.h
-+
-+autoconf/lib/param/param_local.h:
-+	 $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL
-+autoconf/lib/param/param_global.h:
-+	 $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL
-+autoconf/source3/param/param_global.h:
-+	 $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL
-+autoconf/lib/param/param_proto.h:
-+	 $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public autoconf/lib/param/param_proto.h  --private autoconf/lib/param/param_proto.h
-+autoconf/lib/param/s3_param.h:
-+	 $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/s3_param.h
-+
-+
-+#####################################################################
-+
-+
-+everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
-+	$(EVERYTHING_PROGS) \
-+	vfs_examples
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .o .lo
-+
-+.PHONY: showflags SHOWFLAGS
-+
-+showflags: SHOWFLAGS
-+
-+SHOWFLAGS::
-+	@echo "Using CFLAGS     = $(CFLAGS)"
-+	@echo "      PICFLAG    = $(PICFLAG)"
-+	@echo "      LIBS       = $(LIBS)"
-+	@echo "      LDFLAGS    = $(LDFLAGS)"
-+	@echo "      DYNEXP     = $(DYNEXP)"
-+	@echo "      LDSHFLAGS  = $(LDSHFLAGS)"
-+	@echo "      SHLIBEXT   = @SHLIBEXT@"
-+	@echo "      SONAMEFLAG = @SONAMEFLAG@"
-+
-+# "showcflags" target for debuggin how CFLAGS are composed:
-+
-+.PHONY: showcflags SHOWCFLAGS
-+
-+showcflags: SHOWCFLAGS
-+
-+SHOWCFLAGS::
-+	@echo "CFLAGS         = $(CFLAGS)"
-+	@echo "FLAGS          = $(FLAGS)"
-+	@echo ""
-+	@echo "FLAGS1         = @FLAGS1@"
-+	@echo "SAMBA_CPPFLAGS = @SAMBA_CPPFLAGS@"
-+	@echo "CPPFLAGS       = $(CPPFLAGS)"
-+	@echo "ISA            = $(ISA)"
-+
-+MAKEDIR = || exec false; \
-+	  if test -d "$$dir"; then :; else \
-+	  echo mkdir "$$dir"; \
-+	  mkdir -p "$$dir" >/dev/null 2>&1 || \
-+	  test -d "$$dir" || \
-+	  mkdir "$$dir" || \
-+	  exec false; fi || exec false
-+
-+# Run a static checker.
-+CHECK_CC = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) -c $< -o $@
-+# Compile a source file.
-+COMPILE_CC = $(CC) $(CFLAGS) $(PICFLAG) -c $< -o $@
-+# Compile a source file with the installation paths defined.
-+COMPILE_CC_PATH = $(CC) $(PATH_FLAGS) $(CFLAGS) $(PICFLAG) -c $< -o $@
-+
-+COMPILE = $(COMPILE_CC)
-+
-+.c.o:
-+	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
-+	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
-+	@if test -n "$(CC_CHECKER)"; then \
-+	  echo "Checking  $*.c with '$(CC_CHECKER)'";\
-+	  $(CHECK_CC); \
-+	 fi
-+	@echo Compiling $*.c
-+	@$(COMPILE) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(subst ",\",$(COMPILE_CC))" 1>&2;\
-+		$(COMPILE_CC) >/dev/null 2>&1
-+@BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
-+
-+PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
-+
-+# this adds support for precompiled headers. To use it, install a snapshot
-+# of gcc-3.4 and run 'make pch' before you do the main build.
-+pch::
-+	rm -f $(PRECOMPILED_HEADER)
-+	$(MAKE) $(PRECOMPILED_HEADER)
-+
-+$(PRECOMPILED_HEADER): $(srcdir)/include/includes.h
-+	$(COMPILE)
-+
-+BINARY_PREREQS = bin/.dummy
-+
-+# These dependencies are only approximately correct: we want to make
-+# sure Samba's paths are updated if ./configure is re-run.  Really it
-+# would be nice if "make prefix=/opt/samba all" also rebuilt things,
-+# but since we also require "make install prefix=/opt/samba" *not* to
-+# rebuild it's a bit hard.
-+
-+../dynconfig/dynconfig.o: ../dynconfig/dynconfig.c Makefile
-+	@echo Compiling $*.c
-+	@$(COMPILE_CC_PATH) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC_PATH)" 1>&2;\
-+		$(COMPILE_CC_PATH) >/dev/null 2>&1
-+
-+../nsswitch/pam_winbind.o: ../nsswitch/pam_winbind.c Makefile
-+	@echo Compiling $*.c
-+	@$(COMPILE_CC_PATH) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC_PATH)" 1>&2;\
-+		$(COMPILE_CC_PATH) >/dev/null 2>&1
-+
-+../nsswitch/wb_common.o: ../nsswitch/wb_common.c Makefile
-+	@echo Compiling $*.c
-+	@$(COMPILE_CC_PATH) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC_PATH)" 1>&2;\
-+		$(COMPILE_CC_PATH) >/dev/null 2>&1
-+
-+### Start section of object files that require PTHREAD_CFLAGS
-+../nsswitch/wins.o: ../nsswitch/wins.c
-+	@echo Compiling $*.c
-+	@$(COMPILE) $(PTHREAD_CFLAGS) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
-+		$(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
-+
-+../nsswitch/winbind_nss_linux.o: ../nsswitch/winbind_nss_linux.c
-+	@echo Compiling $*.c
-+	@$(COMPILE_CC) $(PTHREAD_CFLAGS) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
-+		$(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
-+
-+libsmb/libsmb_thread_impl.o: libsmb/libsmb_thread_impl.c
-+	@echo Compiling $*.c
-+	@$(COMPILE) $(PTHREAD_CFLAGS) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
-+		$(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
-+
-+libsmb/libsmb_thread_posix.o: libsmb/libsmb_thread_posix.c
-+	@echo Compiling $*.c
-+	@$(COMPILE) $(PTHREAD_CFLAGS) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC) $(PTHREAD_CFLAGS)" 1>&2;\
-+		$(COMPILE_CC) $(PTHREAD_CFLAGS) >/dev/null 2>&1
-+### End section of object files that require PTHREAD_CFLAGS
-+
-+lib/version.o: lib/version.c include/autoconf/version.h
-+	@echo Compiling $*.c
-+	@$(COMPILE_CC_PATH) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC_PATH)" 1>&2;\
-+		$(COMPILE_CC_PATH) >/dev/null 2>&1
-+
-+smbd/build_options.o: smbd/build_options.c Makefile include/autoconf/config.h include/build_env.h include/proto.h
-+	@echo Compiling $*.c
-+	@$(COMPILE_CC_PATH) && exit 0;\
-+		echo "The following command failed:" 1>&2;\
-+		echo "$(COMPILE_CC_PATH)" 1>&2;\
-+		$(COMPILE_CC_PATH) >/dev/null 2>&1
-+
-+smbd/build_options.c: include/autoconf/config.h.in script/mkbuildoptions.awk
-+	@echo Generating $@
-+	@dir=smbd $(MAKEDIR) && $(AWK) -f $(srcdir)/script/mkbuildoptions.awk > $(builddir)/smbd/build_options.c < $(srcdir)/include/autoconf/config.h.in
-+
-+bin/.dummy:
-+	@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
-+	  dir=bin $(MAKEDIR); fi
-+	@: >> $@ || : > $@ # what a fancy emoticon!
-+
-+bin/smbd: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT) @BUILD_POPT@
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
-+		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-+		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
-+		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/nmbd: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(POPT_LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(ZLIB_LIBS)
-+
-+bin/rpcclient: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
-+		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
-+
-+bin/smbclient: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/net: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT) $(LIBNETAPI)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(NET_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
-+		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-+		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
-+		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(LIBNETAPI_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
-+
-+bin/profiles: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-+		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/smbspool: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-+		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS)
-+
-+bin/testparm: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/smbta-util: $(BINARY_PREREQS) $(SMBTA_UTIL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBTA_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/smbstatus: $(BINARY_PREREQS) $(STATUS_OBJ) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT) @BUILD_POPT@
-+	@echo Linking $@
-+	@$(CC) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
-+		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-+		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
-+		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/smbcontrol: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -DUSING_SMBCONTROL -o $@ \
-+		$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
-+		$(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/smbtree: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/smbpasswd: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
-+		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/pdbedit: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
-+		$(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/smbget: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(POPT_LIBS)  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/smbtorture3: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
-+		$(LIBTDBS_LIBS) $(ZLIB_LIBS) $(LIBWBCLIENT_LIBS)
-+
-+bin/talloctort: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
-+		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/replacetort: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
-+		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
-+
-+bin/smbconftort: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
-+		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/pthreadpooltest: $(PTHREADPOOLTEST_OBJ)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(PTHREADPOOLTEST_OBJ) $(LDFLAGS) $(LIBS) $(PTHREAD_LDFLAGS)
-+
-+bin/masktest: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS)
-+
-+bin/msgtest: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS)
-+
-+bin/smbcacls: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
-+		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/smbcquotas: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
-+		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/eventlogadm: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
-+		$(LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/sharesec: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
-+		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/locktest: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS)
-+
-+bin/nsstest: $(BINARY_PREREQS) $(NSSTEST_OBJ) $(LIBTALLOC)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(LIBTALLOC_LIBS)
-+
-+bin/vfstest: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
-+		$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
-+		$(ACL_LIBS) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
-+		@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
-+bin/log2pcap: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ $(LIBTALLOC)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
-+
-+bin/locktest2: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
-+		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS)
-+
-+bin/debug2html: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ $(LIBTALLOC)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(LIBTALLOC_LIBS)
-+
-+bin/smbfilter: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
-+		@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS)
-+
-+bin/versiontest: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ)
-+	@echo Linking $@
-+	@$(CC) $(FLAGS) -o $@ $(VERSION_OBJ) lib/version_test.o
-+
-+
-+#####################################################################
-+#
-+# libraries
-+#
-+#####################################################################
-+
-+MKSYMS_SH = $(srcdir)/script/mksyms.sh
-+
-+
-+#-------------------------------------------------------------------
-+#
-+# libtalloc
-+#
-+#-------------------------------------------------------------------
-+
-+
-+LIBTALLOC_OBJ0 = @LIBTALLOC_OBJ0@
-+LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
-+
-+LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
-+
-+$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBTALLOC_OBJ0)
-+libtalloc: $(LIBTALLOC)
-+
-+cleanlibtalloc::
-+	-rm -f \
-+		$(LIBTALLOC_STATIC_TARGET)
-+
-+libs:: libtalloc
-+cleanlibs:: cleanlibtalloc
-+
-+showlibtalloc:
-+	@echo  ""
-+	@echo "LIBTALLOC_STATIC                = @LIBTALLOC_STATIC@"
-+	@echo "LIBTALLOC_STATIC_TARGET         = $(LIBTALLOC_STATIC_TARGET)"
-+	@echo "LIBTALLOC                       = $(LIBTALLOC)"
-+
-+showlibs:: showlibtalloc
-+
-+#-------------------------------------------------------------------
-+#
-+# libtdb
-+#
-+#-------------------------------------------------------------------
-+
-+LIBTDB_OBJ0 = @LIBTDB_OBJ0@
-+LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
-+
-+LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
-+
-+$(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBTDB_OBJ0)
-+
-+libtdb: $(LIBTDB)
-+
-+cleanlibtdb::
-+	-rm -f \
-+		$(LIBTDB_STATIC_TARGET)
-+
-+libs:: libtdb
-+cleanlibs:: cleanlibtdb
-+
-+showlibtdb:
-+	@echo  ""
-+	@echo "LIBTDB_STATIC                = @LIBTDB_STATIC@"
-+	@echo "LIBTDB_STATIC_TARGET         = $(LIBTDB_STATIC_TARGET)"
-+	@echo "LIBTDB                       = $(LIBTDB)"
-+
-+showlibs:: showlibtdb
-+
-+#-------------------------------------------------------------------
-+#
-+# libntdb
-+#
-+#-------------------------------------------------------------------
-+
-+LIBNTDB_OBJ0 = @LIBNTDB_OBJ0@
-+LIBNTDB_OBJ = $(LIBNTDB_OBJ0) $(LIBREPLACE_OBJ)
-+
-+LIBNTDB_STATIC_TARGET=@LIBNTDB_STATIC_TARGET@
-+
-+$(LIBNTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNTDB_OBJ0)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBNTDB_OBJ0)
-+
-+libntdb: $(LIBNTDB)
-+
-+cleanlibntdb::
-+	-rm -f \
-+		$(LIBNTDB_STATIC_TARGET)
-+
-+libs:: libntdb
-+cleanlibs:: cleanlibntdb
-+
-+showlibntdb:
-+	@echo  ""
-+	@echo "LIBNTDB_STATIC                = @LIBNTDB_STATIC@"
-+	@echo "LIBNTDB_STATIC_TARGET         = $(LIBNTDB_STATIC_TARGET)"
-+	@echo "LIBNTDB                       = $(LIBNTDB)"
-+
-+showlibs:: showlibntdb
-+
-+#-------------------------------------------------------------------
-+#
-+# libwbclient
-+#
-+#-------------------------------------------------------------------
-+
-+LIBWBCLIENT_OBJ0 = ../nsswitch/libwbclient/wbclient.o \
-+		  ../nsswitch/libwbclient/wbc_util.o \
-+		  ../nsswitch/libwbclient/wbc_pwd.o \
-+		  ../nsswitch/libwbclient/wbc_idmap.o \
-+		  ../nsswitch/libwbclient/wbc_sid.o \
-+		  ../nsswitch/libwbclient/wbc_guid.o \
-+		  ../nsswitch/libwbclient/wbc_pam.o
-+
-+LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
-+		  $(WBCOMMON_OBJ) \
-+		  $(LIBREPLACE_OBJ) \
-+		  ../lib/util/blocking.o \
-+		  $(SOCKET_WRAPPER_OBJ)
-+
-+LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
-+LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
-+LIBWBCLIENT_FULLVER=@LIBWBCLIENT_FULLVER@
-+LIBWBCLIENT_SHARED_TARGET_SONAME=@LIBWBCLIENT_SHARED_TARGET_SOVER@
-+LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
-+LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
-+LIBWBCLIENT_HEADERS=$(srcdir)/../nsswitch/libwbclient/wbclient.h
-+
-+$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
-+	@$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
-+
-+$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS)
-+	@echo Linking shared library $@
-+	@$(SHLD_DSO) $(LIBWBCLIENT_OBJ) $(LIBREPLACE_LIBS) \
-+		@SONAMEFLAG@`basename $@`
-+
-+$(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
-+	@rm -f $@
-+	@ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
-+
-+$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
-+
-+libwbclient: $(LIBWBCLIENT)
-+
-+cleanlibwbclient::
-+	-rm -f \
-+		$(LIBWBCLIENT_SYMS) \
-+		$(LIBWBCLIENT_STATIC_TARGET) \
-+		$(LIBWBCLIENT_SHARED_TARGET) \
-+		$(LIBWBCLIENT_SHARED_TARGET_SONAME)
-+
-+installlibwbclient:: installdirs libwbclient
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-+	-$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
-+	-if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
-+		ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
-+			$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
-+	fi
-+	-$(INSTALLLIBCMD_A) bin/libwbclient.a $(DESTDIR)$(LIBDIR)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
-+
-+uninstalllibwbclient::
-+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
-+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)`
-+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_STATIC_TARGET)`
-+	-rm -f $(DESTDIR)${prefix}/include/wbclient.h
-+
-+libs:: libwbclient
-+installlibs:: @INSTALL_LIBWBCLIENT@
-+uninstalllibs:: uninstalllibwbclient
-+cleanlibs:: cleanlibwbclient
-+shlibs test_shlibs: @LIBWBCLIENT_SHARED@
-+
-+showlibwbclient:
-+	@echo  ""
-+	@echo "LIBWBCLIENT_SHARED               = @LIBWBCLIENT_SHARED@"
-+	@echo "LIBWBCLIENT_STATIC               = @LIBWBCLIENT_STATIC@"
-+	@echo "LIBWBCLIENT_LIBS                 = $(LIBWBCLIENT_LIBS)"
-+	@echo ""
-+	@echo "LIBWBCLIENT_SHARED_TARGET        = $(LIBWBCLIENT_SHARED_TARGET)"
-+	@echo "LIBWBCLIENT_SOVER                = $(LIBWBCLIENT_SOVER)"
-+	@echo "LIBWBCLIENT_FULLVER              = $(LIBWBCLIENT_FULLVER)"
-+	@echo "LIBWBCLIENT_SHARED TARGET_SONAME = $(LIBWBCLIENT_SHARED_TARGET_SONAME)"
-+	@echo "LIBWBCLIENT_STATIC_TARGET        = $(LIBWBCLIENT_STATIC_TARGET)"
-+	@echo "LIBWBCLIENT                      = $(LIBWBCLIENT)"
-+
-+showlibs:: showlibwbclient
-+
-+
-+#-------------------------------------------------------------------
-+#
-+# libnetapi
-+#
-+#-------------------------------------------------------------------
-+
-+LIBNETAPI_OBJ0 = lib/netapi/netapi.o \
-+		 lib/netapi/cm.o \
-+		 autoconf/librpc/gen_ndr/ndr_libnetapi.o \
-+		 lib/netapi/libnetapi.o \
-+		 lib/netapi/joindomain.o \
-+		 lib/netapi/serverinfo.o \
-+		 lib/netapi/getdc.o \
-+		 lib/netapi/user.o \
-+		 lib/netapi/group.o \
-+		 lib/netapi/localgroup.o \
-+		 lib/netapi/samr.o \
-+		 lib/netapi/sid.o \
-+		 lib/netapi/share.o \
-+		 lib/netapi/file.o \
-+		 lib/netapi/shutdown.o \
-+		 lib/netapi/netlogon.o
-+
-+LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
-+		 $(LIBSMBCONF_OBJ) \
-+		 $(REG_SMBCONF_OBJ) \
-+		 $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
-+		 $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-+		 $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
-+		 $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-+		 $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
-+		 auth/token_util.o \
-+		 $(LIBCLI_INITSHUTDOWN_OBJ) \
-+		 $(LIBCLI_WKSSVC_OBJ) \
-+		 $(LIBCLI_SRVSVC_OBJ) \
-+		 $(LIBCLI_LSA_OBJ) \
-+		 $(LIBCLI_SAMR_OBJ) \
-+		 $(RPC_CLIENT_SCHANNEL_OBJ) \
-+		 rpc_client/init_samr.o
-+
-+LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
-+LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
-+LIBNETAPI_FULLVER=@LIBNETAPI_FULLVER@
-+LIBNETAPI_SHARED_TARGET_SONAME=@LIBNETAPI_SHARED_TARGET_SOVER@
-+LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
-+LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@
-+LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
-+
-+$(LIBNETAPI_SYMS): $(LIBNETAPI_HEADERS)
-+	@$(MKSYMS_SH) $(AWK) $@ $(LIBNETAPI_HEADERS)
-+
-+$(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking shared library $@
-+	@$(SHLD_DSO) $(LIBNETAPI_OBJ) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
-+		$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
-+		@SONAMEFLAG@`basename $@`
-+
-+$(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
-+	@rm -f $@
-+	@ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
-+
-+$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBNETAPI_OBJ0)
-+
-+libnetapi: $(LIBNETAPI)
-+
-+cleanlibnetapi::
-+	-rm -f \
-+		$(LIBNETAPI_SYMS) \
-+		$(LIBNETAPI_STATIC_TARGET) \
-+		$(LIBNETAPI_SHARED_TARGET) \
-+		$(LIBNETAPI_SHARED_TARGET_SONAME)
-+
-+installlibnetapi:: installdirs libnetapi
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-+	-$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
-+	-if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
-+		ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
-+			$(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
-+	fi
-+	-$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include
-+
-+uninstalllibnetapi::
-+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
-+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET_SONAME)`
-+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_STATIC_TARGET)`
-+	-rm -f $(DESTDIR)${prefix}/include/netapi.h
-+
-+libs:: libnetapi
-+installlibs:: @INSTALL_LIBNETAPI@
-+uninstalllibs:: @UNINSTALL_LIBNETAPI@
-+cleanlibs:: cleanlibnetapi
-+shlibs test_shlibs: @LIBNETAPI_SHARED@
-+
-+showlibnetapi:
-+	@echo  ""
-+	@echo "LIBNETAPI_SHARED               = @LIBNETAPI_SHARED@"
-+	@echo "LIBNETAPI_STATIC               = @LIBNETAPI_STATIC@"
-+	@echo "LIBNETAPI_LIBS                 = $(LIBNETAPI_LIBS)"
-+	@echo ""
-+	@echo "LIBNETAPI_SHARED_TARGET        = $(LIBNETAPI_SHARED_TARGET)"
-+	@echo "LIBNETAPI_SOVER                = $(LIBNETAPI_SOVER)"
-+	@echo "LIBNETAPI_FULLVER              = $(LIBNETAPI_FULLVER)"
-+	@echo "LIBNETAPI_SHARED TARGET_SONAME = $(LIBNETAPI_SHARED_TARGET_SONAME)"
-+	@echo "LIBNETAPI_STATIC_TARGET        = $(LIBNETAPI_STATIC_TARGET)"
-+	@echo "LIBNETAPI                      = $(LIBNETAPI)"
-+
-+showlibs:: showlibnetapi
-+
-+#-------------------------------------------------------------------
-+#
-+# libsmbclient
-+#
-+#-------------------------------------------------------------------
-+
-+LIBSMBCLIENT_SHARED_TARGET=@LIBSMBCLIENT_SHARED_TARGET@
-+LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@
-+LIBSMBCLIENT_FULLVER=@LIBSMBCLIENT_FULLVER@
-+LIBSMBCLIENT_SHARED_TARGET_SONAME=@LIBSMBCLIENT_SHARED_TARGET_SOVER@
-+LIBSMBCLIENT_STATIC_TARGET=@LIBSMBCLIENT_STATIC_TARGET@
-+LIBSMBCLIENT=@LIBSMBCLIENT_STATIC@ @LIBSMBCLIENT_SHARED@
-+LIBSMBCLIENT_SYMS=$(srcdir)/exports/libsmbclient.@SYMSEXT@
-+LIBSMBCLIENT_HEADERS=$(srcdir)/include/libsmbclient.h
-+
-+$(LIBSMBCLIENT_SYMS): $(LIBSMBCLIENT_HEADERS)
-+	@$(MKSYMS_SH) $(AWK) $@ $(LIBSMBCLIENT_HEADERS)
-+
-+$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking shared library $@
-+	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
-+		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS) \
-+		@SONAMEFLAG@`basename $@`
-+
-+$(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
-+	@rm -f $@
-+	@ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@
-+
-+$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ1)
-+
-+libsmbclient: $(LIBSMBCLIENT)
-+
-+cleanlibsmbclient::
-+	-rm -f \
-+		$(LIBSMBCLIENT_SHARED_TARGET) \
-+		$(LIBSMBCLIENT_SHARED_TARGET_SONAME) \
-+		$(LIBSMBCLIENT_STATIC_TARGET)
-+
-+installlibsmbclient:: installdirs libsmbclient
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-+	-$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
-+	-if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
-+		ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
-+			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
-+	fi
-+	-$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
-+
-+installclientlib:: installlibsmbclient
-+
-+uninstalllibsmbclient::
-+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
-+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)`
-+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_STATIC_TARGET)`
-+	-rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
-+
-+uninstallclientlib:: uninstalllibsmbclient
-+
-+libs:: libsmbclient
-+installlibs:: @INSTALL_LIBSMBCLIENT@
-+uninstalllibs:: @UNINSTALL_LIBSMBCLIENT@
-+cleanlibs:: cleanlibsmbclient
-+shlibs test_shlibs: @LIBSMBCLIENT_SHARED@
-+
-+showlibsmbclient:
-+	@echo  ""
-+	@echo "LIBSMBCLIENT_SHARED               = @LIBSMBCLIENT_SHARED@"
-+	@echo "LIBSMBCLIENT_STATIC               = @LIBSMBCLIENT_STATIC@"
-+	@echo "LIBSMBCLIENT_LIBS                 = $(LIBSMBCLIENT_LIBS)"
-+	@echo ""
-+	@echo "LIBSMBCLIENT_SHARED_TARGET        = $(LIBSMBCLIENT_SHARED_TARGET)"
-+	@echo "LIBSMBCLIENT_SOVER                = $(LIBSMBCLIENT_SOVER)"
-+	@echo "LIBSMBCLIENT_FULLVER              = $(LIBSMBCLIENT_FULLVER)"
-+	@echo "LIBSMBCLIENT_SHARED TARGET_SONAME = $(LIBSMBCLIENT_SHARED_TARGET_SONAME)"
-+	@echo "LIBSMBCLIENT_STATIC_TARGET        = $(LIBSMBCLIENT_STATIC_TARGET)"
-+	@echo "LIBSMBCLIENT                      = $(LIBSMBCLIENT)"
-+
-+showlibs:: showlibsmbclient
-+
-+#-------------------------------------------------------------------
-+#
-+# libsmbsharemodes
-+#
-+#-------------------------------------------------------------------
-+
-+LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o ../lib/ccan/hash/hash.o
-+
-+LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0)
-+
-+LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
-+LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
-+LIBSMBSHAREMODES_FULLVER=@LIBSMBSHAREMODES_FULLVER@
-+LIBSMBSHAREMODES_SHARED_TARGET_SONAME=@LIBSMBSHAREMODES_SHARED_TARGET_SOVER@
-+LIBSMBSHAREMODES_STATIC_TARGET=@LIBSMBSHAREMODES_STATIC_TARGET@
-+LIBSMBSHAREMODES=@LIBSMBSHAREMODES_STATIC@ @LIBSMBSHAREMODES_SHARED@
-+LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/libsmbsharemodes.@SYMSEXT@
-+LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h
-+
-+$(LIBSMBSHAREMODES_SYMS): $(LIBSMBSHAREMODES_HEADERS)
-+	@$(MKSYMS_SH) $(AWK) $@ $(LIBSMBSHAREMODES_HEADERS)
-+
-+$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) $(LIBSMBSHAREMODES_SYMS) $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking shared library $@
-+	@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
-+		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		@SONAMEFLAG@`basename $@`
-+
-+$(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
-+	@rm -f $@
-+	@ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
-+
-+$(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
-+	@echo Linking non-shared library $@
-+	@-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ0)
-+
-+libsmbsharemodes: $(LIBSMBSHAREMODES)
-+
-+cleanlibsmbsharemodes::
-+	-rm -f \
-+		$(LIBSMBSHAREMODES_SHARED_TARGET) \
-+		$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) \
-+		$(LIBSMBSHAREMODES_STATIC_TARGET)
-+
-+installlibsmbsharemodes:: installdirs libsmbsharemodes
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-+	-$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
-+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
-+	-if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
-+		ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
-+			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
-+	fi
-+	-$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBSHAREMODES_HEADERS) $(DESTDIR)${prefix}/include
-+
-+uninstalllibsmbsharemodes::
-+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
-+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)`
-+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_STATIC_TARGET)`
-+	-rm -f $(DESTDIR)${prefix}/include/smb_share_modes.h
-+
-+libs:: libsmbsharemodes
-+installlibs:: @INSTALL_LIBSMBSHAREMODES@
-+uninstalllibs:: @UNINSTALL_LIBSMBSHAREMODES@
-+cleanlibs:: cleanlibsmbsharemodes
-+shlibs test_shlibs: @LIBSMBSHAREMODES_SHARED@
-+
-+showlibsmbsharemodes:
-+	@echo  ""
-+	@echo "LIBSMBSHAREMODES_SHARED               = @LIBSMBSHAREMODES_SHARED@"
-+	@echo "LIBSMBSHAREMODES_STATIC               = @LIBSMBSHAREMODES_STATIC@"
-+	@echo "LIBSMBSHAREMODES_TARGET               = @LIBSMBSHAREMODES_TARGET@"
-+	@echo "LIBSMBSHAREMODES_LIBS                 = $(LIBSMBSHAREMODES_LIBS)"
-+	@echo ""
-+	@echo "LIBSMBSHAREMODES_SHARED_TARGET        = $(LIBSMBSHAREMODES_SHARED_TARGET)"
-+	@echo "LIBSMBSHAREMODES_SOVER                = $(LIBSMBSHAREMODES_SOVER)"
-+	@echo "LIBSMBSHAREMODES_FULLVER              = $(LIBSMBSHAREMODES_FULLVER)"
-+	@echo "LIBSMBSHAREMODES_SHARED TARGET_SONAME = $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)"
-+	@echo "LIBSMBSHAREMODES_STATIC_TARGET        = $(LIBSMBSHAREMODES_STATIC_TARGET)"
-+	@echo "LIBSMBSHAREMODES                      = $(LIBSMBSHAREMODES)"
-+
-+showlibs:: showlibsmbsharemodes
-+
-+#####################################################################
-+#
-+# shared modules
-+#
-+#####################################################################
-+
-+# Linker command to link our shared libraries:
-+SHLD_LIBRARY = $(SHLD) $(LDSHFLAGS) $(MODULE_EXPORTS) \
-+	      -o $@ @SONAMEFLAG@`basename $@`
-+# Linker command to link samba internal plugin modules:
-+SHLD_MODULE = $(SHLD) $(LDSHFLAGS_MODULES) $(MODULE_EXPORTS) \
-+	-o $@ @SONAMEFLAG@`basename $@`
-+
-+bin/librpc_lsarpc.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_LSARPC_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_LSARPC_OBJ)
-+
-+bin/librpc_samr.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SAMR_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_SAMR_OBJ)
-+
-+bin/librpc_srvsvc.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SRVSVC_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_SRVSVC_OBJ)
-+
-+bin/librpc_svcctl.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SVCCTL_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_SVCCTL_OBJ)
-+
-+bin/librpc_ntsvcs.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NTSVCS_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_NTSVCS_OBJ)
-+
-+bin/librpc_wkssvc.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_WKSSVC_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_WKSSVC_OBJ)
-+
-+bin/librpc_NETLOGON.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NETLOGON_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_NETLOGON_OBJ)
-+
-+bin/librpc_winreg.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_WINREG_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_WINREG_OBJ)
-+
-+bin/librpc_initshutdown.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_INITSHUTDOWN_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_INITSHUTDOWN_OBJ)
-+
-+bin/librpc_dssetup.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_DSSETUP_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_DSSETUP_OBJ)
-+
-+bin/librpc_spoolss.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SPOOLSS_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_SPOOLSS_OBJ)
-+
-+bin/librpc_eventlog.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_EVENTLOG_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_EVENTLOG_OBJ)
-+
-+bin/librpc_netdfs.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NETDFS_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_NETDFS_OBJ)
-+
-+bin/librpc_rpcecho.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_RPCECHO_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD_LIBRARY) $(RPC_RPCECHO_OBJ)
-+
-+bin/winbindd: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(AUTH_LIBS) \
-+		$(PASSDB_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) \
-+		$(ZLIB_LIBS)
-+
-+bin/vlp: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDBS) $(LIBTALLOC)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) \
-+		$(LIBTDBS_LIBS)
-+
-+@WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
-+	@echo "Linking $@"
-+	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \
-+		$(LIBREPLACE_LIBS) $(PTHREAD_LDFLAGS) \
-+		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-+
-+@WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) $(LIBTALLOC) $(LIBTDBS)
-+	@echo "Linking $@"
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
-+		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(ZLIB_LIBS) \
-+		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-+
-+bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
-+	@echo "Linking $@"
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
-+		$(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
-+
-+bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT)
-+	@echo "Linking shared library $@"
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
-+		$(LIBREPLACE_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) @SONAMEFLAG@`basename $@`
-+
-+##########
-+# Plugins:
-+##########
-+
-+bin/builtin.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_BUILTIN_OBJ)
-+
-+bin/domain.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_DOMAIN_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_DOMAIN_OBJ)
-+
-+bin/script.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SCRIPT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_SCRIPT_OBJ)
-+
-+bin/winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_WINBIND_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_WINBIND_OBJ)
-+
-+bin/wbc.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_WBC_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_WBC_OBJ)
-+
-+bin/unix.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_UNIX_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_UNIX_OBJ)
-+
-+bin/sam.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SAM_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(AUTH_SAM_OBJ)
-+
-+bin/ldapsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ldap.o passdb/pdb_nds.o \
-+			passdb/pdb_ipa.o passdb/pdb_ldap_util.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o \
-+			passdb/pdb_ldap_util.o $(LDAP_LIBS)
-+
-+bin/tdbsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_tdb.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) passdb/pdb_tdb.o
-+
-+bin/wbc_sam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_wbc_sam.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) passdb/pdb_wbc_sam.o
-+
-+bin/smbpasswd.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_smbpasswd.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) passdb/pdb_smbpasswd.o
-+
-+bin/rid.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_rid.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_rid.o
-+
-+bin/passdb.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_passdb.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_passdb.o
-+
-+bin/autorid.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_autorid.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_autorid.o
-+
-+bin/ad.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ad.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_ad.o
-+
-+bin/rfc2307.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_rfc2307.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_rfc2307.o
-+
-+bin/hash.@SHLIBEXT@: $(BINARY_PREREQS) $(IDMAP_HASH_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(IDMAP_HASH_OBJ)
-+
-+bin/tdb2.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
-+
-+bin/ldap.@SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ)
-+
-+# NOTE, there is no build rule for a dynamic default VFS module because
-+# this one MUST MUST MUST be built statically.
-+
-+bin/audit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AUDIT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AUDIT_OBJ)
-+
-+bin/extd_audit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_EXTD_AUDIT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_EXTD_AUDIT_OBJ)
-+
-+bin/full_audit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_FULL_AUDIT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_FULL_AUDIT_OBJ)
-+
-+bin/recycle.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_RECYCLE_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_RECYCLE_OBJ)
-+
-+bin/netatalk.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_NETATALK_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_NETATALK_OBJ)
-+
-+bin/fake_perms.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_FAKE_PERMS_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_FAKE_PERMS_OBJ)
-+
-+bin/fake_acls.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_FAKE_ACLS_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_FAKE_ACLS_OBJ)
-+
-+bin/default_quota.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_DEFAULT_QUOTA_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_DEFAULT_QUOTA_OBJ)
-+
-+bin/readonly.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_READONLY_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_READONLY_OBJ)
-+
-+bin/shadow_copy.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SHADOW_COPY_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_SHADOW_COPY_OBJ)
-+
-+bin/shadow_copy2.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SHADOW_COPY2_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_SHADOW_COPY2_OBJ)
-+
-+bin/syncops.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SYNCOPS_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_SYNCOPS_OBJ)
-+
-+bin/cap.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CAP_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_CAP_OBJ)
-+
-+bin/expand_msdfs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_EXPAND_MSDFS_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_EXPAND_MSDFS_OBJ)
-+
-+bin/afsacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AFSACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AFSACL_OBJ)
-+
-+bin/xattr_tdb.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_XATTR_TDB_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_XATTR_TDB_OBJ)
-+
-+bin/posixacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_POSIXACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_POSIXACL_OBJ)
-+
-+bin/aixacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIXACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AIXACL_OBJ)
-+
-+bin/aixacl2.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIXACL2_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AIXACL2_OBJ)
-+
-+bin/solarisacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SOLARISACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_SOLARISACL_OBJ)
-+
-+bin/zfsacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ZFSACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) @ZFSACL_LIBS@
-+
-+bin/nfs4acl_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_NFS4ACL_XATTR_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_NFS4ACL_XATTR_OBJ)
-+
-+bin/hpuxacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_HPUXACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_HPUXACL_OBJ)
-+
-+bin/tru64acl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_TRU64ACL_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_TRU64ACL_OBJ)
-+
-+bin/catia.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CATIA_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_CATIA_OBJ)
-+
-+bin/streams_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_STREAMS_XATTR_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_STREAMS_XATTR_OBJ)
-+
-+bin/streams_depot.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_STREAMS_DEPOT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_STREAMS_DEPOT_OBJ)
-+
-+bin/cacheprime.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CACHEPRIME_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_CACHEPRIME_OBJ)
-+
-+bin/prealloc.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_PREALLOC_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_PREALLOC_OBJ)
-+
-+bin/commit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_COMMIT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_COMMIT_OBJ)
-+
-+bin/gpfs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_GPFS_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_GPFS_OBJ)
-+
-+bin/notify_fam.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_NOTIFY_FAM_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ) @SMB_FAM_LIBS@
-+
-+bin/readahead.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_READAHEAD_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_READAHEAD_OBJ)
-+
-+bin/tsmsm.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_TSMSM_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_TSMSM_OBJ)
-+
-+bin/fileid.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_FILEID_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_FILEID_OBJ)
-+
-+bin/aio_fork.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_FORK_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
-+
-+bin/aio_pthread.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_PTHREAD_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AIO_PTHREAD_OBJ)
-+
-+bin/aio_posix.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_POSIX_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AIO_POSIX_OBJ)
-+
-+bin/aio_linux.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_LINUX_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_AIO_LINUX_OBJ)
-+
-+bin/preopen.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_PREOPEN_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_PREOPEN_OBJ)
-+
-+bin/acl_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ACL_XATTR_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_ACL_XATTR_OBJ)
-+
-+bin/smb_traffic_analyzer.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
-+
-+bin/acl_tdb.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ACL_TDB_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_ACL_TDB_OBJ)
-+
-+bin/pc_test.@SHLIBEXT@: $(BINARY_PREREQS) $(PERFCOUNT_TEST_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(PERFCOUNT_TEST_OBJ)
-+
-+bin/registry.@SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/registry.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) libgpo/gpext/registry.o
-+
-+bin/scripts.@SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/scripts.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) libgpo/gpext/scripts.o
-+
-+bin/security.@SHLIBEXT@: $(BINARY_PREREQS) libgpo/gpext/security.o
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) libgpo/gpext/security.o
-+
-+bin/dirsort.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_DIRSORT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_DIRSORT_OBJ)
-+
-+bin/scannedonly.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SCANNEDONLY_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_SCANNEDONLY_OBJ)
-+
-+bin/crossrename.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CROSSRENAME_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_CROSSRENAME_OBJ)
-+
-+bin/linux_xfs_sgid.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_LINUX_XFS_SGID_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_LINUX_XFS_SGID_OBJ)
-+
-+bin/time_audit.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_TIME_AUDIT_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_TIME_AUDIT_OBJ)
-+
-+bin/media_harmony.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_MEDIA_HARMONY_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_MEDIA_HARMONY_OBJ)
-+
-+bin/btrfs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_BTRFS_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_BTRFS_OBJ)
-+
-+bin/ceph.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CEPH_OBJ)
-+	@echo "Building plugin $@"
-+	@$(SHLD_MODULE) $(VFS_CEPH_OBJ)
-+
-+#########################################################
-+## IdMap NSS plugins
-+
-+## None here right now
-+#########################################################
-+
-+bin/wbinfo: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
-+		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS)
-+
-+bin/ntlm_auth: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
-+	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
-+		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) $(ZLIB_LIBS) \
-+		$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS) @INIPARSERLIBS@
-+
-+bin/pam_smbpass.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) $(LIBTDBS)
-+	@echo "Linking shared library $@"
-+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
-+		$(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(KRB5LIBS) $(ZLIB_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(LIBWBCLIENT_LIBS)
-+
-+bin/tdbbackup: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
-+		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/tdbtool: $(BINARY_PREREQS) $(TDBTOOL_OBJ) $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
-+		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/tdbdump: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBTDBS_LIBS) $(LIBREPLACE_LIBS)
-+
-+bin/tdbrestore: $(BINARY_PREREQS) $(TDBRESTORE_OBJ) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(TDBRESTORE_OBJ) $(DYNEXP) $(LIBTDBS_LIBS) $(LIBREPLACE_LIBS)
-+
-+bin/tdbtorture: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTDBS)
-+	@echo Linking $@
-+	@$(CC) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
-+		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/timelimit: script/tests/timelimit.o
-+	@echo Linking $@
-+	@$(CC) -o $@ $(DYNEXP) script/tests/timelimit.o $(LDFLAGS)
-+
-+bin/rpc_open_tcp: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(RPC_OPEN_TCP_OBJ) $(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
-+		$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
-+
-+bin/test_lp_load: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(TEST_LP_LOAD_OBJ) \
-+		$(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
-+		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+bin/dbwrap_tool: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDBS)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(DBWRAP_TOOL_OBJ)\
-+		$(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(LDAP_LIBS) \
-+		$(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+install-dbwrap_tool:: bin/dbwrap_tool
-+	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
-+
-+bin/dbwrap_torture: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDBS) $(POPT_LIBS)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(DBWRAP_TORTURE_OBJ)\
-+		$(LDFLAGS) $(DYNEXP) $(LIBS) \
-+		$(LDAP_LIBS) \
-+		$(POPT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+install-dbwrap_torture:: bin/dbwrap_torture
-+	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
-+
-+bin/split_tokens: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
-+	@echo "Linking $@"
-+	@$(CC) -o $@ $(SPLIT_TOKENS_OBJ) \
-+		$(LDFLAGS) $(DYNEXP) \
-+		$(LIBS) $(POPT_LIBS) \
-+		$(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
-+		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
-+
-+install:: installservers installbin installman \
-+		installscripts installdat installmodules \
-+		@INSTALL_PAM_MODULES@ installlibs installmo
-+
-+install-everything:: install installmodules
-+
-+# DESTDIR is used here to prevent packagers wasting their time
-+# duplicating the Makefile. Remove it and you will have the privelege
-+# of package each samba release for muliple versions of multiple
-+# distributions and operating systems, or at least supplying patches
-+# to all the packaging files required for this, prior to committing
-+# the removal of DESTDIR. Do not remove it even though you think it
-+# is not used
-+
-+installdirs::
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) \
-+		$(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) \
-+		$(VARDIR) $(PRIVATE_DIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \
-+		$(NMBDSOCKETDIR) $(WINBINDD_SOCKET_DIR) $(WINBINDD_PRIVILEGED_SOCKET_DIR) \
-+		$(CACHEDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR)
-+
-+installservers:: all installdirs
-+	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
-+
-+installbin:: all installdirs
-+	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS)
-+
-+# Some symlinks are required for the 'probing' of modules.
-+# This mechanism should go at some point..
-+installmodules:: modules installdirs
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(NSSINFOLIBDIR) $(NSS_INFO_MODULES)
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
-+	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(PDBLIBDIR) ldapsam.@SHLIBEXT@ NDS_ldapsam.@SHLIBEXT@
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) rhosts.@SHLIBEXT@ hostsequiv.@SHLIBEXT@
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) sam.@SHLIBEXT@ sam_ignoredomain.@SHLIBEXT@
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) domain.@SHLIBEXT@ trustdomain.@SHLIBEXT@ ntdomain.@SHLIBEXT@
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(AUTHLIBDIR) builtin.@SHLIBEXT@ guest.@SHLIBEXT@ fixed_challenge.@SHLIBEXT@ name_to_ntstatus.@SHLIBEXT@
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.@SHLIBEXT@ rfc2307.@SHLIBEXT@ sfu.@SHLIBEXT@ sfu20.@SHLIBEXT@
-+	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/hash.@SHLIBEXT@ hash.@SHLIBEXT@
-+
-+installscripts:: installdirs
-+	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS)
-+
-+installdat:: installdirs
-+	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
-+
-+installpammodules:: $(PAM_MODULES)
-+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR)
-+	@for module in $(PAM_MODULES); do \
-+		echo "Installing module $${module} as $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \
-+		$(INSTALLCMD) -m $(INSTALLPERMS_BIN) bin/$${module}.@SHLIBEXT@ \
-+			"$(DESTDIR)/$(PAMMODULESDIR)"; \
-+	done
-+
-+# revert to the previously installed version
-+revert::
-+	@$(SHELL) $(srcdir)/script/revert.sh $(SBINDIR) $(SBIN_PROGS)
-+	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
-+
-+installman:: installdirs
-+	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
-+
-+installmo:: all installdirs
-+	@$(SHELL) $(srcdir)/script/installmo.sh $(DESTDIR) $(LOCALEDIR) $(srcdir)
-+
-+.PHONY: showlayout
-+
-+showlayout::
-+	@echo "Samba will be installed into:"
-+	@echo " prefix:                $(prefix)"
-+	@echo " exec_prefix:           $(exec_prefix)"
-+	@echo " sysconfdir:            $(sysconfdir)"
-+	@echo " localstatedir:         $(localstatedir)"
-+	@echo " datarootdir:           $(datarootdir)"
-+	@echo " BINDIR:                $(BINDIR)"
-+	@echo " SBINDIR:               $(SBINDIR)"
-+	@echo " LIBDIR:                $(LIBDIR)"
-+#	@echo " LIBEXECDIR:            $(LIBEXECDIR)"
-+	@echo " MANDIR:                $(MANDIR)"
-+	@echo " DATADIR:               $(DATADIR)"
-+	@echo " LOCALEDIR:             $(LOCALEDIR)"
-+#	@echo " SCRIPTSBINDIR:         $(SCRIPTSBINDIR)"
-+#	@echo " PYTHONDIR:             $(PYTHONDIR)"
-+#	@echo " PYTHONARCHDIR:         $(PYTHONARCHDIR)"
-+	@echo " MODULESDIR:            $(MODULESDIR)"
-+	@echo " INCLUDEDIR:            $(INCLUDEDIR)"
-+	@echo " SETUPDIR:              $(SETUPDIR)"
-+#	@echo " PKGCONFIGDIR:          $(PKGCONFIGDIR)"
-+	@echo " CODEPAGEDIR:           $(CODEPAGEDIR)"
-+	@echo " PAMMODULESDIR:         $(PAMMODULESDIR)"
-+	@echo " CONFIGDIR:             $(CONFIGDIR)"
-+	@echo " PRIVATE_DIR:           $(PRIVATE_DIR)"
-+	@echo " LOCKDIR:               $(LOCKDIR)"
-+	@echo " PIDDIR:                $(PIDDIR)"
-+	@echo " STATEDIR:              $(STATEDIR)"
-+	@echo " CACHEDIR:              $(CACHEDIR)"
-+	@echo " LOGFILEBASE:           $(LOGFILEBASE)"
-+	@echo " SOCKET_DIR:            $(SOCKET_DIR)"
-+	@echo " PRIVILEGED_SOCKET_DIR: $(PRIVILEGED_SOCKET_DIR)"
-+	@echo " WINBINDD_SOCKET_DIR:   $(WINBINDD_SOCKET_DIR)"
-+	@echo " WINBINDD_PRIVILEGED_SOCKET_DIR: $(WINBINDD_PRIVILEGED_SOCKET_DIR)"
-+	@echo " NMBDSOCKETDIR:         $(NMBDSOCKETDIR)"
-+#	@echo " NTP_SIGND_SOCKET_DIR:  $(NTP_SIGND_SOCKET_DIR)"
-+	@echo " NCALRPCDIR:            $(NCALRPCDIR)"
-+	@echo " CONFIGFILE:            $(CONFIGFILE)"
-+	@echo " LMHOSTSFILE:           $(LMHOSTSFILE)"
-+	@echo " SMB_PASSWD_FILE:       $(SMB_PASSWD_FILE)"
-+
-+
-+uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
-+
-+uninstallmo::
-+	@$(SHELL) $(srcdir)/script/uninstallmo.sh $(DESTDIR) $(LOCALEDIR) $(srcdir)
-+
-+uninstallman::
-+	@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
-+
-+uninstallservers::
-+	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
-+
-+uninstallbin::
-+	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS)
-+
-+uninstallmodules::
-+	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
-+	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
-+	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(IDMAPLIBDIR) $(IDMAP_MODULES)
-+	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
-+	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(GPEXTLIBDIR) $(GPEXT_MODULES)
-+	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PERFCOUNTLIBDIR) $(PERFCOUNT_MODULES)
-+
-+uninstallscripts::
-+	@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS)
-+
-+uninstalldat::
-+	@$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
-+
-+uninstallpammodules::
-+	@for module in $(PAM_MODULES); do \
-+		echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \
-+		rm -f "$(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@"; \
-+	done
-+
-+cleanlibs::
-+	-rm -f ../lib/*/*.o ../lib/*/*/*.o \
-+		../lib/*/*.ho \
-+		../libcli/*.o ../libcli/*/*.o ../libcli/*/*/*.o \
-+		../librpc/*/*.o \
-+		../libgpo/*.o ../libgpo/*/*.o \
-+		../libds/*.o ../libds/*/*.o ../dynconfig/*.o ../auth/*.o ../auth/*/*.o
-+
-+clean:: cleanlibs
-+	-rm -f include/build_env.h
-+	-rm -f smbd/build_options.c
-+	-rm -f autoconf/lib/param/param_local.h
-+	-rm -f autoconf/lib/param/param_global.h
-+	-rm -f autoconf/lib/param/param_proto.h
-+	-rm -f autoconf/lib/param/s3_param.h
-+	-rm -f autoconf/source3/param/param_global.h
-+	-rm -f $(PRECOMPILED_HEADER)
-+	-rm -f core */*~ *~ \
-+		*/*.o */*/*.o */*/*/*.o */*/*/*/*.o \
-+		../testsuite/*/*.o \
-+		../nsswitch/*.o ../nsswitch/*/*.o ../nsswitch/*/*/*.o ../nsswitch/*.@SHLIBEXT@ \
-+		../client/*.o \
-+		*/*.@SHLIBEXT@ */*/*.@SHLIBEXT@ */*/*/*.@SHLIBEXT@ \
-+		$(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) \
-+		$(MODULES) $(TORTURE_PROGS) \
-+		$(EVERYTHING_PROGS) \
-+		bin/timelimit \
-+		.headers.stamp */src/*.o
-+	-rm -rf t_dir
-+
-+include/build_env.h: script/build_env.sh
-+	@echo Building include/build_env.h
-+	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
-+	  > $(builddir)/include/build_env.h
-+
-+proto::
-+
-+etags::
-+	rm -f TAGS
-+	find $(srcdir)/.. -name "*.[ch]" | xargs -n 100 etags --append $(ETAGS_OPTIONS)
-+
-+ctags::
-+	ctags $(CTAGS_OPTIONS) `find $(srcdir)/.. -name "*.[ch]" | grep -v proto\.h`
-+
-+realclean:: clean
-+	-rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh
-+	-rm -f script/installbin.sh script/uninstallbin.sh
-+
-+distclean:: realclean
-+	-rm -f smbadduser
-+	-rm -f include/autoconf/config.h Makefile
-+	-rm -f config.status config.cache so_locations
-+	-rm -rf .deps TAGS
-+
-+realdistclean:: distclean
-+	-rm -f include/autoconf/config.h.in
-+	-rm -f include/autoconf/version.h
-+	-rm -f autoconf/librpc/gen_ndr/*.[ch]
-+	-rm -f configure
-+
-+# when configure.in is updated, reconfigure
-+$(srcdir)/configure: $(srcdir)/configure.in
-+	@echo "WARNING: you need to rerun ./autogen.sh"
-+
-+config.status: $(srcdir)/configure
-+	@echo "WARNING: you need to run ./configure"
-+
-+Makefile: $(srcdir)/Makefile.in config.status
-+	@echo "WARNING: you need to run ./config.status"
-+
-+######################################################################
-+# Samba Testing Framework
-+
-+# Check shared libs for unresolved symbols
-+test_shlibs:
-+	@echo "Testing $? "
-+	@$(LIB_PATH_VAR)=./bin && \
-+	export $(LIB_PATH_VAR) && \
-+	for module in $?; do \
-+		./script/tests/dlopen.sh $(LIBDL) $${module} \
-+			|| exit 1; \
-+	done
-+
-+# Check for NSS module problems.
-+test_nss_modules:: nss_modules
-+	@echo "Testing $(NSS_MODULES) "
-+	@$(LIB_PATH_VAR)=./bin && \
-+	export $(LIB_PATH_VAR) && \
-+	for module in $(NSS_MODULES); do \
-+		./script/tests/dlopen.sh $(LIBDL) $${module} \
-+			|| exit 1; \
-+	done
-+
-+# Check for PAM module problems.  Specifically, check that every module we
-+# built can actually be loaded by a minimal PAM-aware application.
-+test_pam_modules:: pam_modules
-+	@echo "Testing $(PAM_MODULES) "
-+	@$(LIB_PATH_VAR)=./bin && \
-+	export $(LIB_PATH_VAR) && \
-+	for module in $(PAM_MODULES); do \
-+		./script/tests/dlopen.sh -lpam $(LIBDL) bin/$${module}.@SHLIBEXT@ \
-+			|| exit 1; \
-+	done
-+
-+
-+##
-+## Targets for 'make test'
-+##
-+
-+valgrindtest:: all torture timelimit bin/smbtorture
-+	@echo Running Test suite with valgrind
-+	@$(MAKE) test \
-+	 NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
-+	 WINBINDD_VALGRIND="xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
-+	 SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
-+	 VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log"
-+
-+selftestdir = ../selftest
-+
-+S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
-+
-+test:: all torture timelimit bin/smbtorture
-+	@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
-+		NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
-+		SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
-+		SOURCEDIR="$(srcdir)" \
-+		VFSLIBDIR="$(builddir)/bin" \
-+		RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
-+		SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
-+		PERL="$(PERL)" PYTHON="$(PYTHON)" PYTHONPATH="$(srcdir)/../bin/python" \
-+		$(srcdir)/selftest/s3-selftest.sh
-+
-+test-%:
-+	$(MAKE) test TESTS=$*
-+
-+buildfarm-test:
-+	$(MAKE) test RUN_FROM_BUILD_FARM=yes
-+
-+subunit-test:
-+	$(MAKE) test SUBUNIT_FORMATTER=cat
-+
-+SELFTEST_TESTENV = s3dc
-+
-+testenv:
-+	$(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) TESTS="--testenv"
-+
-+gdbtestenv:
-+	$(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) \
-+		NMBD_VALGRIND="xterm -n nmbd -title nmbd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
-+		WINBINDD_VALGRIND="xterm -n winbindd -title winbindd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
-+		SMBD_VALGRIND="xterm -n smbd -title smbd -e $(selftestdir)/gdb_run $(S3_LD_LIBPATH_OVERRIDE)" \
-+		TESTS="--testenv"
-+
-+valgrindtestenv:
-+	$(MAKE) test SELFTEST_TESTENV=$(SELFTEST_TESTENV) \
-+		NMBD_VALGRIND="xterm -n nmbd -title nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
-+		WINBINDD_VALGRIND="xterm -n winbindd -title winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
-+		SMBD_VALGRIND="xterm -n smbd -title smbd -e valgrind -q --db-attach=yes --num-callers=30" \
-+		TESTS="--testenv"
-+
-+
-+# Check for Winbind struct 32/64bit padding
-+test_wbpad:
-+	@echo "Testing winbind request/response structure for 32/64bit padding"
-+	@./script/tests/wb_pad.sh || exit 1;
-+
-+##
-+## Examples:
-+##
-+
-+libsmbclient_examples: libsmbclient
-+	$(MAKE) -C ../examples/libsmbclient -f Makefile.internal
-+
-+clean_libsmbclient_examples:
-+	$(MAKE) -C ../examples/libsmbclient -f Makefile.internal clean
-+
-+libnetapi_examples: libnetapi
-+	$(MAKE) -C lib/netapi/examples
-+
-+clean_libnetapi_examples:
-+	$(MAKE) -C lib/netapi/examples clean
-+
-+.PHONY: bin/smbtorture
-+
-+bin/smbtorture: $(BINARY_PREREQS)
-+	$(MAKE) -f Makefile-smbtorture bin/smbtorture
-+
-+.PHONY: vfs_examples
-+
-+vfs_examples:
-+	( \
-+	cd ../examples/VFS && \
-+	./configure && \
-+	$(MAKE) clean && \
-+	$(MAKE) \
-+	)
-diff --git a/source3/autogen.sh b/source3/autogen.sh
-new file mode 100755
-index 0000000..4f39e10
---- /dev/null
-+++ b/source3/autogen.sh
-@@ -0,0 +1,121 @@
-+#!/bin/sh
-+
-+# Run this script to build samba from GIT.
-+
-+
-+_exit() {
-+	echo $@ >&2
-+	cd ${OLD_DIR}
-+	exit 1
-+}
-+
-+OLD_DIR=$(pwd)
-+BASE_DIR=$(dirname $0)
-+SCRIPT_NAME=$(basename $0)
-+
-+cd ${BASE_DIR} || exit 1
-+
-+
-+while true; do
-+    case $1 in
-+	--version-file)
-+	    VERSION_FILE=$2
-+	    shift 2
-+	    ;;
-+	*)
-+	    break
-+	    ;;
-+    esac
-+done
-+
-+## insert all possible names (only works with 
-+## autoconf 2.x)
-+TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253"
-+TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253"
-+
-+AUTOHEADERFOUND="0"
-+AUTOCONFFOUND="0"
-+
-+
-+##
-+## Look for autoheader 
-+##
-+for i in $TESTAUTOHEADER; do
-+	if which $i > /dev/null 2>&1; then
-+		if test `$i --version | head -n 1 | cut -d.  -f 2 | sed "s/[^0-9]//g"` -ge 53; then
-+			AUTOHEADER=$i
-+			AUTOHEADERFOUND="1"
-+			break
-+		fi
-+	fi
-+done
-+
-+## 
-+## Look for autoconf
-+##
-+
-+for i in $TESTAUTOCONF; do
-+	if which $i > /dev/null 2>&1; then
-+		if test `$i --version | head -n 1 | cut -d.  -f 2 | sed "s/[^0-9]//g"` -ge 53; then
-+			AUTOCONF=$i
-+			AUTOCONFFOUND="1"
-+			break
-+		fi
-+	fi
-+done
-+
-+
-+## 
-+## do we have it?
-+##
-+if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
-+	_exit "$0: need autoconf 2.53 or later to build samba from GIT"
-+fi
-+
-+echo "$0: running script/mkversion.sh"
-+./script/mkversion.sh $VERSION_FILE || exit 1
-+
-+rm -rf autom4te*.cache
-+rm -f configure include/config.h*
-+
-+IPATHS="-Im4 -I../m4 -I../lib/replace"
-+
-+echo "$0: running $AUTOHEADER $IPATHS"
-+$AUTOHEADER $IPATHS || _exit "ERROR running autoheader"
-+
-+echo "$0: running $AUTOCONF $IPATHS"
-+$AUTOCONF $IPATHS || _exit "ERROR running autoconf"
-+
-+rm -rf autom4te*.cache
-+
-+( cd ../examples/VFS || exit 1
-+  echo "$0: running $AUTOHEADER in ../examples/VFS/"
-+  $AUTOHEADER || exit 1
-+  echo "$0: running $AUTOCONF in ../examples/VFS/"
-+  $AUTOCONF || exit 1
-+  rm -rf autom4te*.cache
-+) || _exit "ERROR running autoheader/autoconf in examples/VFS"
-+
-+
-+if gcc -E tests/preproc-dummy.c -o /dev/null ;
-+then
-+    PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" CPP="gcc -E" PIDL=../pidl/pidl \
-+	srcdir=. ../librpc/build_idl.sh ../librpc/idl/*.idl
-+    PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" CPP="gcc -E" PIDL=../pidl/pidl \
-+	srcdir=. script/build_idl.sh librpc/idl/*.idl
-+else
-+   echo "Warning: Could not compile idl files in autogen, "
-+   echo "some autconf tests might not work properly"
-+fi
-+
-+perl ../script/mkparamdefs.pl ../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL
-+perl ../script/mkparamdefs.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL
-+perl ../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL
-+perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public autoconf/lib/param/param_proto.h --private autoconf/lib/param/param_proto.h
-+perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/s3_param.h
-+
-+echo "Now run ./configure (or ./configure.developer) and then make."
-+
-+cd ${OLD_DIR}
-+exit 0
-+
-diff --git a/source3/config.guess b/source3/config.guess
-new file mode 100755
-index 0000000..da83314
---- /dev/null
-+++ b/source3/config.guess
-@@ -0,0 +1,1561 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   Free Software Foundation, Inc.
-+
-+timestamp='2009-04-27'
-+
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub.  If it succeeds, it prints the system name on stdout, and
-+# exits with 0.  Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help" >&2
-+       exit 1 ;;
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+if test $# != 0; then
-+  echo "$me: too many arguments$help" >&2
-+  exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	     CC_FOR_BUILD="$c"; break ;
-+	  fi ;
-+	done ;
-+	if test x"$CC_FOR_BUILD" = x ; then
-+	  CC_FOR_BUILD=no_compiler_found ;
-+	fi
-+	;;
-+ ,,*)   CC_FOR_BUILD=$CC ;;
-+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-+esac ; set_cc_for_build= ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+	PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+    *:NetBSD:*:*)
-+	# NetBSD (nbsd) targets should (where applicable) match one or
-+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-+	# switched to ELF, *-*-netbsd* would select the old
-+	# object file format.  This provides both forward
-+	# compatibility and a consistent mechanism for selecting the
-+	# object file format.
-+	#
-+	# Note: NetBSD doesn't particularly care about the vendor
-+	# portion of the name.  We always set it to "unknown".
-+	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
-+	    arm*) machine=arm-unknown ;;
-+	    sh3el) machine=shl-unknown ;;
-+	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+	esac
-+	# The Operating System including object format, if it has switched
-+	# to ELF recently, or will in the future.
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
-+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+			| grep __ELF__ >/dev/null
-+		then
-+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+		    # Return netbsd for either.  FIX?
-+		    os=netbsd
-+		else
-+		    os=netbsdelf
-+		fi
-+		;;
-+	    *)
-+	        os=netbsd
-+		;;
-+	esac
-+	# The OS release
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
-+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+	# contains redundant information, the shorter form:
-+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+	echo "${machine}-${os}${release}"
-+	exit ;;
-+    *:OpenBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    alpha:OSF1:*:*)
-+	case $UNAME_RELEASE in
-+	*4.0)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
-+	# A Vn.n version is a released version.
-+	# A Tn.n version is a released field test version.
-+	# A Xn.n version is an unreleased experimental baselevel.
-+	# 1.2 uses "1.2" for uname -r.
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-+    Alpha\ *:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# Should we change UNAME_MACHINE based on the output of uname instead
-+	# of the specific Alpha model?
-+	echo alpha-pc-interix
-+	exit ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit ;;
-+    Amiga*:UNIX_System_V:4.0:*)
-+	echo m68k-unknown-sysv4
-+	exit ;;
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit ;;
-+    *:OS/390:*:*)
-+	echo i370-ibm-openedition
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+	echo hppa1.1-hitachi-hiuxmpp
-+	exit ;;
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+		echo pyramid-pyramid-sysv3
-+	else
-+		echo pyramid-pyramid-bsd
-+	fi
-+	exit ;;
-+    NILE*:*:*:dcosx)
-+	echo pyramid-pyramid-svr4
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7; exit ;;
-+	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:6*:*)
-+	# According to config.sub, this is the proper way to canonicalize
-+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-+	# it's likely to be more like Solaris than SunOS4.
-+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:*:*)
-+	case "`/usr/bin/arch -k`" in
-+	    Series*|S4*)
-+		UNAME_RELEASE=`uname -v`
-+		;;
-+	esac
-+	# Japanese Language versions have a version number like `4.1.3-JL'.
-+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+	exit ;;
-+    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit ;;
-+    sun*:*:4.2BSD:*)
-+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+	case "`/bin/arch`" in
-+	    sun3)
-+		echo m68k-sun-sunos${UNAME_RELEASE}
-+		;;
-+	    sun4)
-+		echo sparc-sun-sunos${UNAME_RELEASE}
-+		;;
-+	esac
-+	exit ;;
-+    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit ;;
-+    # The situation for MiNT is a little confusing.  The machine name
-+    # can be virtually everything (everything which is not
-+    # "atarist" or "atariste" at least should have a processor
-+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-+    # to the lowercase version "mint" (or "freemint").  Finally
-+    # the system name "TOS" denotes a system which is actually not
-+    # MiNT.  But MiNT is downward compatible to TOS, so this should
-+    # be no problem.
-+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit ;;
-+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit ;;
-+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit ;;
-+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    RISC*:Mach:*:*)
-+	echo mips-dec-mach_bsd4.3
-+	exit ;;
-+    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit ;;
-+    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+	#if defined (host_mips) && defined (MIPSEB)
-+	#if defined (SYSTYPE_SYSV)
-+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_SVR4)
-+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+	#endif
-+	#endif
-+	  exit (-1);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
-+	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit ;;
-+    Motorola:PowerMAX_OS:*:*)
-+	echo powerpc-motorola-powermax
-+	exit ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:Power_UNIX:*:*)
-+	echo powerpc-harris-powerunix
-+	exit ;;
-+    m88k:CX/UX:7*:*)
-+	echo m88k-harris-cxux7
-+	exit ;;
-+    m88k:*:4*:R4*)
-+	echo m88k-motorola-sysv4
-+	exit ;;
-+    m88k:*:3*:R3*)
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    AViiON:dgux:*:*)
-+        # DG/UX returns AViiON for all architectures
-+        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+	then
-+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-+	    then
-+		echo m88k-dg-dgux${UNAME_RELEASE}
-+	    else
-+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+	    fi
-+	else
-+	    echo i586-dg-dgux${UNAME_RELEASE}
-+	fi
-+ 	exit ;;
-+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-+	echo m88k-dolphin-sysv3
-+	exit ;;
-+    M88*:*:R3*:*)
-+	# Delta 88k system running SVR3
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+	echo m88k-tektronix-sysv3
-+	exit ;;
-+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+	echo m68k-tektronix-bsd
-+	exit ;;
-+    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit ;;
-+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i*86:AIX:*:*)
-+	echo i386-ibm-aix
-+	exit ;;
-+    ia64:AIX:*:*)
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:2:3)
-+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
-+		sed 's/^		//' << EOF >$dummy.c
-+		#include <sys/systemcfg.h>
-+
-+		main()
-+			{
-+			if (!__power_pc())
-+				exit(1);
-+			puts("powerpc-ibm-aix3.2.5");
-+			exit(0);
-+			}
-+EOF
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
-+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+		echo rs6000-ibm-aix3.2.4
-+	else
-+		echo rs6000-ibm-aix3.2
-+	fi
-+	exit ;;
-+    *:AIX:*:[456])
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+		IBM_ARCH=rs6000
-+	else
-+		IBM_ARCH=powerpc
-+	fi
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:*:*)
-+	echo rs6000-ibm-aix
-+	exit ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+	echo romp-ibm-bsd4.4
-+	exit ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit ;;                             # report: romp-ibm BSD 4.3
-+    *:BOSX:*:*)
-+	echo rs6000-bull-bosx
-+	exit ;;
-+    DPX/2?00:B.O.S.:*:*)
-+	echo m68k-bull-sysv3
-+	exit ;;
-+    9000/[34]??:4.3bsd:1.*:*)
-+	echo m68k-hp-bsd
-+	exit ;;
-+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+	echo m68k-hp-bsd4.4
-+	exit ;;
-+    9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	    9000/[678][0-9][0-9])
-+		if [ -x /usr/bin/getconf ]; then
-+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+                    case "${sc_cpu_version}" in
-+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+                      532)                      # CPU_PA_RISC2_0
-+                        case "${sc_kernel_bits}" in
-+                          32) HP_ARCH="hppa2.0n" ;;
-+                          64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-+                        esac ;;
-+                    esac
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^              //' << EOF >$dummy.c
-+
-+              #define _HPUX_SOURCE
-+              #include <stdlib.h>
-+              #include <unistd.h>
-+
-+              int main ()
-+              {
-+              #if defined(_SC_KERNEL_BITS)
-+                  long bits = sysconf(_SC_KERNEL_BITS);
-+              #endif
-+                  long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+                  switch (cpu)
-+              	{
-+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+              	case CPU_PA_RISC2_0:
-+              #if defined(_SC_KERNEL_BITS)
-+              	    switch (bits)
-+              		{
-+              		case 64: puts ("hppa2.0w"); break;
-+              		case 32: puts ("hppa2.0n"); break;
-+              		default: puts ("hppa2.0"); break;
-+              		} break;
-+              #else  /* !defined(_SC_KERNEL_BITS) */
-+              	    puts ("hppa2.0"); break;
-+              #endif
-+              	default: puts ("hppa1.0"); break;
-+              	}
-+                  exit (0);
-+              }
-+EOF
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
-+	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit ;;
-+    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
-+	exit ;;
-+    3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <unistd.h>
-+	int
-+	main ()
-+	{
-+	  long cpu = sysconf (_SC_CPU_VERSION);
-+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-+	     results, however.  */
-+	  if (CPU_IS_PA_RISC (cpu))
-+	    {
-+	      switch (cpu)
-+		{
-+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-+		}
-+	    }
-+	  else if (CPU_IS_HP_MC68K (cpu))
-+	    puts ("m68k-hitachi-hiuxwe2");
-+	  else puts ("unknown-hitachi-hiuxwe2");
-+	  exit (0);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
-+	echo unknown-hitachi-hiuxwe2
-+	exit ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+	echo hppa1.1-hp-bsd
-+	exit ;;
-+    9000/8??:4.3bsd:*:*)
-+	echo hppa1.0-hp-bsd
-+	exit ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+	echo hppa1.0-hp-mpeix
-+	exit ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+	echo hppa1.1-hp-osf
-+	exit ;;
-+    hp8??:OSF1:*:*)
-+	echo hppa1.0-hp-osf
-+	exit ;;
-+    i*86:OSF1:*:*)
-+	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
-+	fi
-+	exit ;;
-+    parisc*:Lites*:*:*)
-+	echo hppa1.1-hp-lites
-+	exit ;;
-+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+	echo c1-convex-bsd
-+        exit ;;
-+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+        exit ;;
-+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+	echo c34-convex-bsd
-+        exit ;;
-+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+	echo c38-convex-bsd
-+        exit ;;
-+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+	echo c4-convex-bsd
-+        exit ;;
-+    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*T3E:*:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:FreeBSD:*:*)
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit ;;
-+    *:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit ;;
-+    *:Interix*:[3456]*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    EM64T | authenticamd | genuineintel)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit ;;
-+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+	# UNAME_MACHINE based on the output of uname instead of i386?
-+	echo i586-pc-interix
-+	exit ;;
-+    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit ;;
-+    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    *:GNU:*:*)
-+	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-+    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
-+	exit ;;
-+    arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    mips:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips
-+	#undef mipsel
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mipsel
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc:Linux:*:* | hppa:Linux:*:*)
-+	# Look for CPU level
-+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
-+	esac
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-+    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	# The BFD linker knows what the default object file format is, so
-+	# first see if it will tell us. cd to the root directory to prevent
-+	# problems with other programs or directories called `ld' in the path.
-+	# Set LC_ALL=C to ensure ld outputs messages in English.
-+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+			 | sed -ne '/supported targets:/!d
-+				    s/[ 	][ 	]*/ /g
-+				    s/.*supported targets: *//
-+				    s/ .*//
-+				    p'`
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		;;
-+	  a.out-i386-linux)
-+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		exit ;;
-+	  "")
-+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-+		# one that does not give us useful --help.
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit ;;
-+	esac
-+	# Determine whether the default compiler is a.out or elf
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <features.h>
-+	#ifdef __ELF__
-+	# ifdef __GLIBC__
-+	#  if __GLIBC__ >= 2
-+	LIBC=gnu
-+	#  else
-+	LIBC=gnulibc1
-+	#  endif
-+	# else
-+	LIBC=gnulibc1
-+	# endif
-+	#else
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^LIBC/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+	;;
-+    i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
-+	echo i386-sequent-sysv4
-+	exit ;;
-+    i*86:UNIX_SV:4.2MP:2.*)
-+        # Unixware is an offshoot of SVR4, but it has its own version
-+        # number series starting with 2...
-+        # I am not positive that other SVR4 systems won't match this,
-+	# I just have to hope.  -- rms.
-+        # Use sysv4.2uw... so that sysv4* matches it.
-+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	exit ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+	fi
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit ;;
-+    i*86:*:3.2:*)
-+	if test -f /usr/options/cb.name; then
-+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+			&& UNAME_MACHINE=i586
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
-+	fi
-+	exit ;;
-+    pc:*:*:*)
-+	# Left here for compatibility:
-+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-+    Intel:Mach:3*:*)
-+	echo i386-pc-mach3
-+	exit ;;
-+    paragon:*:*:*)
-+	echo i860-intel-osf1
-+	exit ;;
-+    i860:*:4.*:*) # i860-SVR4
-+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+	else # Add other i860-SVR4 vendors below as they are discovered.
-+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-+	fi
-+	exit ;;
-+    mini*:CTIX:SYS*5:*)
-+	# "miniframe"
-+	echo m68010-convergent-sysv
-+	exit ;;
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-+	OS_REL=''
-+	test -r /etc/.relid \
-+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    mc68030:UNIX_System_V:4.*:*)
-+	echo m68k-atari-sysv4
-+	exit ;;
-+    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    rs6000:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit ;;
-+    RM*:ReliantUNIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    RM*:SINIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    *:SINIX-*:*:*)
-+	if uname -p 2>/dev/null >/dev/null ; then
-+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		echo ${UNAME_MACHINE}-sni-sysv4
-+	else
-+		echo ns32k-sni-sysv
-+	fi
-+	exit ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-+        echo i586-unisys-sysv4
-+        exit ;;
-+    *:UNIX_System_V:4*:FTX*)
-+	# From Gerald Hewes <hewes@openmarket.com>.
-+	# How about differentiating between stratus architectures? -djm
-+	echo hppa1.1-stratus-sysv4
-+	exit ;;
-+    *:*:*:FTX*)
-+	# From seanf@swdc.stratus.com.
-+	echo i860-stratus-sysv4
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-+    *:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit ;;
-+    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit ;;
-+    news*:NEWS-OS:6*:*)
-+	echo mips-sony-newsos6
-+	exit ;;
-+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+	if [ -d /usr/nec ]; then
-+	        echo mips-nec-sysv${UNAME_RELEASE}
-+	else
-+	        echo mips-unknown-sysv${UNAME_RELEASE}
-+	fi
-+        exit ;;
-+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-+	echo powerpc-be-beos
-+	exit ;;
-+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-+	echo powerpc-apple-beos
-+	exit ;;
-+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-beos
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-+    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Darwin:*:*)
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
-+		UNAME_MACHINE=pc
-+	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	exit ;;
-+    *:QNX:*:4*)
-+	echo i386-pc-qnx
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    *:NonStop-UX:*:*)
-+	echo mips-compaq-nonstopux
-+	exit ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit ;;
-+    *:Plan9:*:*)
-+	# "uname -m" is not consistent, so use $cputype instead. 386
-+	# is converted to i386 for consistency with other x86
-+	# operating systems.
-+	if test "$cputype" = "386"; then
-+	    UNAME_MACHINE=i386
-+	else
-+	    UNAME_MACHINE="$cputype"
-+	fi
-+	echo ${UNAME_MACHINE}-unknown-plan9
-+	exit ;;
-+    *:TOPS-10:*:*)
-+	echo pdp10-unknown-tops10
-+	exit ;;
-+    *:TENEX:*:*)
-+	echo pdp10-unknown-tenex
-+	exit ;;
-+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+	echo pdp10-dec-tops20
-+	exit ;;
-+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+	echo pdp10-xkl-tops20
-+	exit ;;
-+    *:TOPS-20:*:*)
-+	echo pdp10-unknown-tops20
-+	exit ;;
-+    *:ITS:*:*)
-+	echo pdp10-unknown-its
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+          "4"
-+#else
-+	  ""
-+#endif
-+         ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix\n"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+  printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+    struct utsname un;
-+
-+    uname(&un);
-+
-+    if (strncmp(un.version, "V2", 2) == 0) {
-+	printf ("i386-sequent-ptx2\n"); exit (0);
-+    }
-+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+	printf ("i386-sequent-ptx1\n"); exit (0);
-+    }
-+    printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+#  include <sys/param.h>
-+#  if defined (BSD)
-+#   if BSD == 43
-+      printf ("vax-dec-bsd4.3\n"); exit (0);
-+#   else
-+#    if BSD == 199006
-+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#    else
-+      printf ("vax-dec-bsd\n"); exit (0);
-+#    endif
-+#   endif
-+#  else
-+    printf ("vax-dec-bsd\n"); exit (0);
-+#  endif
-+# else
-+    printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+  exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+    case `getsysinfo -f cpu_type` in
-+    c1*)
-+	echo c1-convex-bsd
-+	exit ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit ;;
-+    esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo               = `(hostinfo) 2>/dev/null`
-+/bin/universe          = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch              = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff --git a/source3/config.sub b/source3/config.sub
-new file mode 100755
-index 0000000..a39437d
---- /dev/null
-+++ b/source3/config.sub
-@@ -0,0 +1,1686 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   Free Software Foundation, Inc.
-+
-+timestamp='2009-04-17'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine.  It does not imply ALL GNU software can.
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support.  The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit ;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
-+case $maybe_os in
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-+    os=-$maybe_os
-+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
-+    ;;
-+  *)
-+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+    if [ $basic_machine != $1 ]
-+    then os=`echo $1 | sed 's/.*-/-/'`
-+    else os=; fi
-+    ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work.  We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+	-sun*os*)
-+		# Prevent following clause from handling this invalid input.
-+		;;
-+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+	-apple | -axis | -knuth | -cray)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
-+	-hiux*)
-+		os=-hiuxwe2
-+		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5)
-+		os=-sco3.2v5
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco4)
-+		os=-sco3.2v4
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2.[4-9]*)
-+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2v[4-9]*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco*)
-+		os=-sco3.2v2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-isc)
-+		os=-isc2.2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-clix*)
-+		basic_machine=clipper-intergraph
-+		;;
-+	-isc*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-lynx*)
-+		os=-lynxos
-+		;;
-+	-ptx*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+		;;
-+	-windowsnt*)
-+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+		;;
-+	-psos*)
-+		os=-psos
-+		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+	# Recognize the basic CPU types without company name.
-+	# Some are omitted here because they have special meanings below.
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fido | fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64octeon | mips64octeonel \
-+	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
-+	| msp430 \
-+	| nios | nios2 \
-+	| ns16k | ns32k \
-+	| or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
-+
-+	# We use `pc' rather than `unknown'
-+	# because (1) that's what they normally are, and
-+	# (2) the word "unknown" tends to confuse beginning users.
-+	i*86 | x86_64)
-+	  basic_machine=$basic_machine-pc
-+	  ;;
-+	# Object if more than one company name word.
-+	*-*-*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+	# Recognize the basic CPU types with company name.
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64octeon-* | mips64octeonel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
-+	| msp430-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
-+	| ymp-* \
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	# Recognize the various machine names and aliases which stand
-+	# for a CPU type and a company and sometimes even an OS.
-+	386bsd)
-+		basic_machine=i386-unknown
-+		os=-bsd
-+		;;
-+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+		basic_machine=m68000-att
-+		;;
-+	3b*)
-+		basic_machine=we32k-att
-+		;;
-+	a29khif)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
-+	adobe68k)
-+		basic_machine=m68010-adobe
-+		os=-scout
-+		;;
-+	alliant | fx80)
-+		basic_machine=fx80-alliant
-+		;;
-+	altos | altos3068)
-+		basic_machine=m68k-altos
-+		;;
-+	am29k)
-+		basic_machine=a29k-none
-+		os=-bsd
-+		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	amdahl)
-+		basic_machine=580-amdahl
-+		os=-sysv
-+		;;
-+	amiga | amiga-*)
-+		basic_machine=m68k-unknown
-+		;;
-+	amigaos | amigados)
-+		basic_machine=m68k-unknown
-+		os=-amigaos
-+		;;
-+	amigaunix | amix)
-+		basic_machine=m68k-unknown
-+		os=-sysv4
-+		;;
-+	apollo68)
-+		basic_machine=m68k-apollo
-+		os=-sysv
-+		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
-+	aux)
-+		basic_machine=m68k-apple
-+		os=-aux
-+		;;
-+	balance)
-+		basic_machine=ns32k-sequent
-+		os=-dynix
-+		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
-+	convex-c1)
-+		basic_machine=c1-convex
-+		os=-bsd
-+		;;
-+	convex-c2)
-+		basic_machine=c2-convex
-+		os=-bsd
-+		;;
-+	convex-c32)
-+		basic_machine=c32-convex
-+		os=-bsd
-+		;;
-+	convex-c34)
-+		basic_machine=c34-convex
-+		os=-bsd
-+		;;
-+	convex-c38)
-+		basic_machine=c38-convex
-+		os=-bsd
-+		;;
-+	cray | j90)
-+		basic_machine=j90-cray
-+		os=-unicos
-+		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
-+	crds | unos)
-+		basic_machine=m68k-crds
-+		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
-+	da30 | da30-*)
-+		basic_machine=m68k-da30
-+		;;
-+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+		basic_machine=mips-dec
-+		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
-+	delta | 3300 | motorola-3300 | motorola-delta \
-+	      | 3300-motorola | delta-motorola)
-+		basic_machine=m68k-motorola
-+		;;
-+	delta88)
-+		basic_machine=m88k-motorola
-+		os=-sysv3
-+		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
-+	dpx20 | dpx20-*)
-+		basic_machine=rs6000-bull
-+		os=-bosx
-+		;;
-+	dpx2* | dpx2*-bull)
-+		basic_machine=m68k-bull
-+		os=-sysv3
-+		;;
-+	ebmon29k)
-+		basic_machine=a29k-amd
-+		os=-ebmon
-+		;;
-+	elxsi)
-+		basic_machine=elxsi-elxsi
-+		os=-bsd
-+		;;
-+	encore | umax | mmax)
-+		basic_machine=ns32k-encore
-+		;;
-+	es1800 | OSE68k | ose68k | ose | OSE)
-+		basic_machine=m68k-ericsson
-+		os=-ose
-+		;;
-+	fx2800)
-+		basic_machine=i860-alliant
-+		;;
-+	genix)
-+		basic_machine=ns32k-ns
-+		;;
-+	gmicro)
-+		basic_machine=tron-gmicro
-+		os=-sysv
-+		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
-+	h3050r* | hiux*)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	h8300hms)
-+		basic_machine=h8300-hitachi
-+		os=-hms
-+		;;
-+	h8300xray)
-+		basic_machine=h8300-hitachi
-+		os=-xray
-+		;;
-+	h8500hms)
-+		basic_machine=h8500-hitachi
-+		os=-hms
-+		;;
-+	harris)
-+		basic_machine=m88k-harris
-+		os=-sysv3
-+		;;
-+	hp300-*)
-+		basic_machine=m68k-hp
-+		;;
-+	hp300bsd)
-+		basic_machine=m68k-hp
-+		os=-bsd
-+		;;
-+	hp300hpux)
-+		basic_machine=m68k-hp
-+		os=-hpux
-+		;;
-+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k2[0-9][0-9] | hp9k31[0-9])
-+		basic_machine=m68000-hp
-+		;;
-+	hp9k3[2-9][0-9])
-+		basic_machine=m68k-hp
-+		;;
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k78[0-9] | hp78[0-9])
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hppa-next)
-+		os=-nextstep3
-+		;;
-+	hppaosf)
-+		basic_machine=hppa1.1-hp
-+		os=-osf
-+		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
-+	i370-ibm* | ibm*)
-+		basic_machine=i370-ibm
-+		;;
-+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-+	i*86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv32
-+		;;
-+	i*86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv4
-+		;;
-+	i*86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv
-+		;;
-+	i*86sol2)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-solaris2
-+		;;
-+	i386mach)
-+		basic_machine=i386-mach
-+		os=-mach
-+		;;
-+	i386-vsta | vsta)
-+		basic_machine=i386-unknown
-+		os=-vsta
-+		;;
-+	iris | iris4d)
-+		basic_machine=mips-sgi
-+		case $os in
-+		    -irix*)
-+			;;
-+		    *)
-+			os=-irix4
-+			;;
-+		esac
-+		;;
-+	isi68 | isi)
-+		basic_machine=m68k-isi
-+		os=-sysv
-+		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
-+	magnum | m3230)
-+		basic_machine=mips-mips
-+		os=-sysv
-+		;;
-+	merlin)
-+		basic_machine=ns32k-utek
-+		os=-sysv
-+		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
-+	miniframe)
-+		basic_machine=m68000-convergent
-+		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		;;
-+	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
-+		os=-msdos
-+		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
-+	ncr3000)
-+		basic_machine=i486-ncr
-+		os=-sysv4
-+		;;
-+	netbsd386)
-+		basic_machine=i386-unknown
-+		os=-netbsd
-+		;;
-+	netwinder)
-+		basic_machine=armv4l-rebel
-+		os=-linux
-+		;;
-+	news | news700 | news800 | news900)
-+		basic_machine=m68k-sony
-+		os=-newsos
-+		;;
-+	news1000)
-+		basic_machine=m68030-sony
-+		os=-newsos
-+		;;
-+	news-3600 | risc-news)
-+		basic_machine=mips-sony
-+		os=-newsos
-+		;;
-+	necv70)
-+		basic_machine=v70-nec
-+		os=-sysv
-+		;;
-+	next | m*-next )
-+		basic_machine=m68k-next
-+		case $os in
-+		    -nextstep* )
-+			;;
-+		    -ns2*)
-+		      os=-nextstep2
-+			;;
-+		    *)
-+		      os=-nextstep3
-+			;;
-+		esac
-+		;;
-+	nh3000)
-+		basic_machine=m68k-harris
-+		os=-cxux
-+		;;
-+	nh[45]000)
-+		basic_machine=m88k-harris
-+		os=-cxux
-+		;;
-+	nindy960)
-+		basic_machine=i960-intel
-+		os=-nindy
-+		;;
-+	mon960)
-+		basic_machine=i960-intel
-+		os=-mon960
-+		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
-+	np1)
-+		basic_machine=np1-gould
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	openrisc | openrisc-*)
-+		basic_machine=or32-unknown
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
-+	OSE68000 | ose68000)
-+		basic_machine=m68000-ericsson
-+		os=-ose
-+		;;
-+	os68k)
-+		basic_machine=m68k-none
-+		os=-os68k
-+		;;
-+	pa-hitachi)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	paragon)
-+		basic_machine=i860-intel
-+		os=-osf
-+		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	pbd)
-+		basic_machine=sparc-tti
-+		;;
-+	pbb)
-+		basic_machine=m68k-tti
-+		;;
-+	pc532 | pc532-*)
-+		basic_machine=ns32k-pc532
-+		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pn)
-+		basic_machine=pn-gould
-+		;;
-+	power)	basic_machine=power-ibm
-+		;;
-+	ppc)	basic_machine=powerpc-unknown
-+		;;
-+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppcle | powerpclittle | ppc-le | powerpc-little)
-+		basic_machine=powerpcle-unknown
-+		;;
-+	ppcle-* | powerpclittle-*)
-+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ps2)
-+		basic_machine=i386-ibm
-+		;;
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	rm[46]00)
-+		basic_machine=mips-siemens
-+		;;
-+	rtpc | rtpc-*)
-+		basic_machine=romp-ibm
-+		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
-+	sequent)
-+		basic_machine=i386-sequent
-+		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
-+		basic_machine=sparclite-wrs
-+		os=-vxworks
-+		;;
-+	sps7)
-+		basic_machine=m68k-bull
-+		os=-sysv2
-+		;;
-+	spur)
-+		basic_machine=spur-unknown
-+		;;
-+	st2000)
-+		basic_machine=m68k-tandem
-+		;;
-+	stratus)
-+		basic_machine=i860-stratus
-+		os=-sysv4
-+		;;
-+	sun2)
-+		basic_machine=m68000-sun
-+		;;
-+	sun2os3)
-+		basic_machine=m68000-sun
-+		os=-sunos3
-+		;;
-+	sun2os4)
-+		basic_machine=m68000-sun
-+		os=-sunos4
-+		;;
-+	sun3os3)
-+		basic_machine=m68k-sun
-+		os=-sunos3
-+		;;
-+	sun3os4)
-+		basic_machine=m68k-sun
-+		os=-sunos4
-+		;;
-+	sun4os3)
-+		basic_machine=sparc-sun
-+		os=-sunos3
-+		;;
-+	sun4os4)
-+		basic_machine=sparc-sun
-+		os=-sunos4
-+		;;
-+	sun4sol2)
-+		basic_machine=sparc-sun
-+		os=-solaris2
-+		;;
-+	sun3 | sun3-*)
-+		basic_machine=m68k-sun
-+		;;
-+	sun4)
-+		basic_machine=sparc-sun
-+		;;
-+	sun386 | sun386i | roadrunner)
-+		basic_machine=i386-sun
-+		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
-+	symmetry)
-+		basic_machine=i386-sequent
-+		os=-dynix
-+		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
-+	tower | tower-32)
-+		basic_machine=m68k-ncr
-+		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
-+	udi29k)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	ultra3)
-+		basic_machine=a29k-nyu
-+		os=-sym1
-+		;;
-+	v810 | necv810)
-+		basic_machine=v810-nec
-+		os=-none
-+		;;
-+	vaxv)
-+		basic_machine=vax-dec
-+		os=-sysv
-+		;;
-+	vms)
-+		basic_machine=vax-dec
-+		os=-vms
-+		;;
-+	vpp*|vx|vx-*)
-+		basic_machine=f301-fujitsu
-+		;;
-+	vxworks960)
-+		basic_machine=i960-wrs
-+		os=-vxworks
-+		;;
-+	vxworks68)
-+		basic_machine=m68k-wrs
-+		os=-vxworks
-+		;;
-+	vxworks29k)
-+		basic_machine=a29k-wrs
-+		os=-vxworks
-+		;;
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
-+		;;
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
-+		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
-+	xps | xps100)
-+		basic_machine=xps100-honeywell
-+		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
-+	none)
-+		basic_machine=none-none
-+		os=-none
-+		;;
-+
-+# Here we handle the default manufacturer of certain CPU types.  It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+	w89k)
-+		basic_machine=hppa1.1-winbond
-+		;;
-+	op50n)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	op60c)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	romp)
-+		basic_machine=romp-ibm
-+		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
-+	rs6000)
-+		basic_machine=rs6000-ibm
-+		;;
-+	vax)
-+		basic_machine=vax-dec
-+		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
-+	pdp11)
-+		basic_machine=pdp11-dec
-+		;;
-+	we32k)
-+		basic_machine=we32k-att
-+		;;
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-+		basic_machine=sparc-sun
-+		;;
-+	cydra)
-+		basic_machine=cydra-cydrome
-+		;;
-+	orion)
-+		basic_machine=orion-highlevel
-+		;;
-+	orion105)
-+		basic_machine=clipper-highlevel
-+		;;
-+	mac | mpw | mac-mpw)
-+		basic_machine=m68k-apple
-+		;;
-+	pmac | pmac-mpw)
-+		basic_machine=powerpc-apple
-+		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
-+	*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+	*-digital*)
-+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+		;;
-+	*-commodore*)
-+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+		;;
-+	*)
-+		;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+        # First match some system type aliases
-+        # that might get confused with valid system types.
-+	# -solaris* is a basic system type, with this one exception.
-+	-solaris1 | -solaris1.*)
-+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+		;;
-+	-solaris)
-+		os=-solaris2
-+		;;
-+	-svr4*)
-+		os=-sysv4
-+		;;
-+	-unixware*)
-+		os=-sysv4.2uw
-+		;;
-+	-gnu/linux*)
-+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+		;;
-+	# First accept the basic system types.
-+	# The portable systems comes first.
-+	# Each alternative MUST END IN A *, to match a version number.
-+	# -sysv* is not here because it comes later, after sysvr4.
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -kopensolaris* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* | -aros* \
-+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	# Remember, each alternative MUST END IN *, to match a version number.
-+		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
-+	-linux*)
-+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+		;;
-+	-sunos5*)
-+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+		;;
-+	-sunos6*)
-+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
-+	-utek*)
-+		os=-bsd
-+		;;
-+	-dynix*)
-+		os=-bsd
-+		;;
-+	-acis*)
-+		os=-aos
-+		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
-+	-ctix* | -uts*)
-+		os=-sysv
-+		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
-+	-ns2 )
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
-+		;;
-+	# Preserve the version number of sinix5.
-+	-sinix5.*)
-+		os=`echo $os | sed -e 's|sinix|sysv|'`
-+		;;
-+	-sinix*)
-+		os=-sysv4
-+		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
-+	-triton*)
-+		os=-sysv3
-+		;;
-+	-oss*)
-+		os=-sysv3
-+		;;
-+	-svr4)
-+		os=-sysv4
-+		;;
-+	-svr3)
-+		os=-sysv3
-+		;;
-+	-sysvr4)
-+		os=-sysv4
-+		;;
-+	# This must come after -sysvr4.
-+	-sysv*)
-+		;;
-+	-ose*)
-+		os=-ose
-+		;;
-+	-es1800*)
-+		os=-ose
-+		;;
-+	-xenix)
-+		os=-xenix
-+		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+	-none)
-+		;;
-+	*)
-+		# Get rid of the `-' at the beginning of $os.
-+		os=`echo $os | sed 's/[^-]*-//'`
-+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system.  Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
-+	*-acorn)
-+		os=-riscix1.2
-+		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
-+	arm*-semi)
-+		os=-aout
-+		;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
-+		os=-none
-+		;;
-+	*-dec | vax-*)
-+		os=-ultrix4.2
-+		;;
-+	m68*-apollo)
-+		os=-domain
-+		;;
-+	i386-sun)
-+		os=-sunos4.0.2
-+		;;
-+	m68000-sun)
-+		os=-sunos3
-+		# This also exists in the configure program, but was not the
-+		# default.
-+		# os=-sunos4
-+		;;
-+	m68*-cisco)
-+		os=-aout
-+		;;
-+        mep-*)
-+		os=-elf
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
-+	*-tti)	# must be before sparc entry or we get the wrong os.
-+		os=-sysv3
-+		;;
-+	sparc-* | *-sun)
-+		os=-sunos4.1.1
-+		;;
-+	*-be)
-+		os=-beos
-+		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
-+	*-ibm)
-+		os=-aix
-+		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
-+	*-wec)
-+		os=-proelf
-+		;;
-+	*-winbond)
-+		os=-proelf
-+		;;
-+	*-oki)
-+		os=-proelf
-+		;;
-+	*-hp)
-+		os=-hpux
-+		;;
-+	*-hitachi)
-+		os=-hiux
-+		;;
-+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+		os=-sysv
-+		;;
-+	*-cbm)
-+		os=-amigaos
-+		;;
-+	*-dg)
-+		os=-dgux
-+		;;
-+	*-dolphin)
-+		os=-sysv3
-+		;;
-+	m68k-ccur)
-+		os=-rtu
-+		;;
-+	m88k-omron*)
-+		os=-luna
-+		;;
-+	*-next )
-+		os=-nextstep
-+		;;
-+	*-sequent)
-+		os=-ptx
-+		;;
-+	*-crds)
-+		os=-unos
-+		;;
-+	*-ns)
-+		os=-genix
-+		;;
-+	i370-*)
-+		os=-mvs
-+		;;
-+	*-next)
-+		os=-nextstep3
-+		;;
-+	*-gould)
-+		os=-sysv
-+		;;
-+	*-highlevel)
-+		os=-bsd
-+		;;
-+	*-encore)
-+		os=-bsd
-+		;;
-+	*-sgi)
-+		os=-irix
-+		;;
-+	*-siemens)
-+		os=-sysv4
-+		;;
-+	*-masscomp)
-+		os=-rtu
-+		;;
-+	f30[01]-fujitsu | f700-fujitsu)
-+		os=-uxpv
-+		;;
-+	*-rom68k)
-+		os=-coff
-+		;;
-+	*-*bug)
-+		os=-coff
-+		;;
-+	*-apple)
-+		os=-macos
-+		;;
-+	*-atari*)
-+		os=-mint
-+		;;
-+	*)
-+		os=-none
-+		;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer.  We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+	*-unknown)
-+		case $os in
-+			-riscix*)
-+				vendor=acorn
-+				;;
-+			-sunos*)
-+				vendor=sun
-+				;;
-+			-aix*)
-+				vendor=ibm
-+				;;
-+			-beos*)
-+				vendor=be
-+				;;
-+			-hpux*)
-+				vendor=hp
-+				;;
-+			-mpeix*)
-+				vendor=hp
-+				;;
-+			-hiux*)
-+				vendor=hitachi
-+				;;
-+			-unos*)
-+				vendor=crds
-+				;;
-+			-dgux*)
-+				vendor=dg
-+				;;
-+			-luna*)
-+				vendor=omron
-+				;;
-+			-genix*)
-+				vendor=ns
-+				;;
-+			-mvs* | -opened*)
-+				vendor=ibm
-+				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
-+			-ptx*)
-+				vendor=sequent
-+				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
-+				vendor=wrs
-+				;;
-+			-aux*)
-+				vendor=apple
-+				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
-+		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		;;
-+esac
-+
-+echo $basic_machine$os
-+exit
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff --git a/source3/configure.developer b/source3/configure.developer
-new file mode 100755
-index 0000000..ee8fa89
---- /dev/null
-+++ b/source3/configure.developer
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+`dirname $0`/configure -C \
-+	--enable-developer \
-+	--enable-socket-wrapper \
-+	--enable-nss-wrapper \
-+	--enable-uid-wrapper \
-+	"$@"
-diff --git a/source3/configure.in b/source3/configure.in
-new file mode 100644
-index 0000000..0e2f126
---- /dev/null
-+++ b/source3/configure.in
-@@ -0,0 +1,6693 @@
-+dnl Process this file with autoconf to produce a configure script.
-+
-+dnl We must use autotools 2.54 or above
-+AC_PREREQ(2.54)
-+
-+AC_INIT([Samba],[3],[samba-technical@samba.org])
-+
-+AC_CONFIG_SRCDIR([include/includes.h])
-+AC_CONFIG_HEADER(include/autoconf/config.h)
-+AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
-+
-+case "$PATH" in
-+    */usr/ucb*)
-+	AC_MSG_WARN([\$PATH contains /usr/ucb - build errors may follow])
-+	;;
-+esac 
-+
-+builddir=`pwd`
-+AC_SUBST(builddir)
-+
-+m4_include(m4/samba_version.m4)
-+m4_include(m4/check_path.m4)
-+m4_include(pkg.m4)
-+
-+AC_LIBREPLACE_CC_CHECKS
-+AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
-+
-+m4_include(../lib/tevent/libtevent.m4)
-+m4_include(../lib/ccan/libccan.m4)
-+
-+LIBTEVENT_OBJ0=""
-+for obj in ${TEVENT_OBJ}; do
-+	LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-+done
-+AC_SUBST(LIBTEVENT_OBJ0)
-+LIBS="${LIBS} ${TEVENT_LIBS}"
-+
-+SAMBA_CPPFLAGS="-Iinclude/autoconf -Iautoconf -Iautoconf/source3"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${CCAN_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/tdb_compat"
-+
-+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
-+
-+## cleanup the $(srcdir) in the Makefile if we are outside of the tree
-+if test "x${srcdir-.}" != "x."; then
-+	SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$$srcdir$;g"`
-+fi
-+
-+dnl Unique-to-Samba variables we'll be playing with.
-+AC_SUBST(SAMBA_CPPFLAGS)
-+AC_SUBST(SHELL)
-+AC_SUBST(LDSHFLAGS)
-+AC_SUBST(SONAMEFLAG)
-+AC_SUBST(SHLD)
-+AC_SUBST(MODULE_EXPORTS)
-+AC_SUBST(DSO_EXPORTS)
-+AC_SUBST(HOST_OS)
-+AC_SUBST(PICFLAG)
-+AC_SUBST(PIE_CFLAGS)
-+AC_SUBST(PIE_LDFLAGS)
-+AC_SUBST(RELRO_LDFLAGS)
-+AC_SUBST(SHLIBEXT)
-+AC_SUBST(INSTALLLIBCMD_SH)
-+AC_SUBST(INSTALLLIBCMD_A)
-+AC_SUBST(UNINSTALLLIBCMD_SH)
-+AC_SUBST(UNINSTALLLIBCMD_A)
-+
-+AC_SUBST(INSTALL_LIBWBCLIENT)
-+AC_SUBST(UNINSTALL_LIBWBCLIENT)
-+AC_SUBST(LIBWBCLIENT_SHARED_TARGET)
-+AC_SUBST(LIBWBCLIENT_SHARED_TARGET_SOVER)
-+AC_SUBST(LIBWBCLIENT_SHARED_TARGET_FULLVER)
-+AC_SUBST(LIBWBCLIENT_SHARED)
-+AC_SUBST(LIBWBCLIENT_STATIC_TARGET)
-+AC_SUBST(LIBWBCLIENT_STATIC)
-+AC_SUBST(LIBWBCLIENT_SOVER)
-+AC_SUBST(LIBWBCLIENT_FULLVER)
-+AC_SUBST(LIBWBCLIENT)
-+AC_SUBST(LIBWBCLIENT_LIBS)
-+
-+AC_SUBST(LIBSAMBAUTIL_SHARED)
-+
-+AC_SUBST(PRINT_LIBS)
-+AC_SUBST(AUTH_LIBS)
-+AC_SUBST(ACL_LIBS)
-+AC_SUBST(PASSDB_LIBS)
-+AC_SUBST(IDMAP_LIBS)
-+AC_SUBST(KRB5_LIBS)
-+AC_SUBST(LDAP_LIBS)
-+AC_SUBST(GPEXT_LIBS)
-+AC_SUBST(PAM_MODULES)
-+AC_SUBST(INSTALL_PAM_MODULES)
-+AC_SUBST(UNINSTALL_PAM_MODULES)
-+AC_SUBST(NSS_MODULES)
-+AC_SUBST(EXTRA_BIN_PROGS)
-+AC_SUBST(CIFSMOUNT_PROGS)
-+AC_SUBST(INSTALL_CIFSMOUNT)
-+AC_SUBST(UNINSTALL_CIFSMOUNT)
-+AC_SUBST(CIFSUMOUNT_PROGS)
-+AC_SUBST(INSTALL_CIFSUMOUNT)
-+AC_SUBST(UNINSTALL_CIFSUMOUNT)
-+AC_SUBST(CIFSUPCALL_PROGS)
-+AC_SUBST(INSTALL_CIFSUPCALL)
-+AC_SUBST(UNINSTALL_CIFSUPCALL)
-+AC_SUBST(EXTRA_SBIN_PROGS)
-+AC_SUBST(EXTRA_ALL_TARGETS)
-+AC_SUBST(CONFIG_LIBS)
-+AC_SUBST(NSCD_LIBS)
-+
-+# compile with optimization and without debugging by default, but
-+# allow people to set their own preference.
-+# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
-+# if it has no value.  This prevent *very* large debug binaries from occurring
-+# by default.
-+if test "x$debug" = "xyes" ; then
-+	CFLAGS="${CFLAGS} -g"
-+fi
-+if test "x$CFLAGS" = x; then
-+  CFLAGS="-O"
-+fi
-+
-+m4_include(../lib/socket_wrapper/config.m4)
-+m4_include(../lib/nss_wrapper/config.m4)
-+m4_include(../lib/uid_wrapper/config.m4)
-+
-+DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
-+
-+# Probe the gcc version for extra CFLAGS. We always stash these in
-+# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
-+# Makefile edit, avoiding the need to re-run configure.
-+if test x"$ac_cv_prog_gcc" = x"yes" ; then
-+	DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings"
-+	# Add -Wdeclaration-after-statement if compiler supports it
-+	AC_CACHE_CHECK(
-+          [that the C compiler understands -Wdeclaration-after-statement],
-+          samba_cv_HAVE_Wdeclaration_after_statement, [
-+	  AC_TRY_RUN_STRICT([
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }],[$CFLAGS -Wdeclaration-after-statement],[$CPPFLAGS],[$LDFLAGS],
-+	    samba_cv_HAVE_Wdeclaration_after_statement=yes,
-+	    samba_cv_HAVE_Wdeclaration_after_statement=no,
-+	    samba_cv_HAVE_Wdeclaration_after_statement=cross)
-+       ])
-+
-+	if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
-+	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
-+	fi
-+
-+	#-Werror-implicit-function-declaration
-+	AC_CACHE_CHECK(
-+          [that the C compiler understands -Werror-implicit-function-declaration],
-+          samba_cv_HAVE_Werror_implicit_function_declaration, [
-+	  AC_TRY_RUN_STRICT([
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }],[$CFLAGS -Werror-implicit-function-declaration],[$CPPFLAGS],[$LDFLAGS],
-+	    samba_cv_HAVE_Werror_implicit_function_declaration=yes,
-+	    samba_cv_HAVE_Werror_implicit_function_declaration=no,
-+	    samba_cv_HAVE_Werror_implicit_function_declaration=cross)
-+       ])
-+       if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
-+	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
-+       fi
-+
-+	# krb5developer is like developer, except we don't get
-+	# -Wstrict-prototypes.
-+       if test x"$krb5_developer" != x"$yes" ; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
-+       fi
-+
-+       if test x"$picky_developer" = x"yes"; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+       fi
-+fi
-+
-+#################################################
-+# check for a shared memory profiling support
-+AC_MSG_CHECKING(whether to use profiling)
-+AC_ARG_WITH(profiling-data,
-+[AS_HELP_STRING([--with-profiling-data], [Include gathering source code profile information (default=no)])],
-+[ case "$withval" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(WITH_PROFILE,1,[Whether to use profiling])
-+    samba_cv_WITH_PROFILE=yes
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    samba_cv_WITH_PROFILE=no
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+AC_PROG_INSTALL
-+AC_PROG_AWK
-+# Check for GNU make
-+m4_include(../m4/check_make.m4)
-+AC_SAMBA_GNU_MAKE([true], [true])
-+
-+selftest_possible="yes"
-+
-+# Check for perl
-+m4_include(../m4/check_perl.m4)
-+AC_SAMBA_PERL([true], [selftest_possible=no])
-+
-+# Check for python
-+m4_include(../m4/check_python.m4)
-+AC_SAMBA_PYTHON_DEVEL([true], [selftest_possible=no])
-+
-+AC_CHECK_TOOL(AR, ar)
-+
-+dnl Check if we (actually our C compiler!) use GNU ld
-+AC_PROG_LD_GNU
-+
-+dnl Certain versions of GNU ld the default is not to have the
-+dnl --allow-shlib-undefined flag defined.  This causes a stackload of
-+dnl warnings when building modules.
-+if test "$ac_cv_prog_gnu_ld" = "yes"; then
-+	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
-+	# we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
-+	if test -z "$ac_cv_gnu_ld_version" ; then
-+	  ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
-+	fi
-+	AC_MSG_CHECKING(GNU ld release date)
-+	changequote(,)dnl
-+	ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*$[2-9][0-9][0-9][0-9]$[-]*$[01][0-9]$[-]*$[0-3][0-9]$.*$,\1\2\3,p'`
-+	changequote([,])dnl
-+	AC_MSG_RESULT(${ac_cv_gnu_ld_date})
-+        if test -n "$ac_cv_gnu_ld_date"; then
-+ 	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
-+ 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+ 	fi
-+	if test "$ac_cv_gnu_ld_date" -gt 20030101; then
-+		ac_cv_gnu_ld_version_script=yes
-+	fi
-+        else
-+           AC_MSG_CHECKING(GNU ld release version)
-+           changequote(,)dnl
-+           ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | awk '{print $NF}' | sed -n 's,$[1-9][0-9]*\.[0-9][0-9]*$.*$,\1,p'`
-+           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
-+           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
-+           changequote([,])dnl
-+           AC_MSG_RESULT(${ac_cv_gnu_ld_vernr})
-+           AC_MSG_CHECKING(GNU ld release version major)
-+           AC_MSG_RESULT(${ac_cv_gnu_ld_vernr_major})
-+           AC_MSG_CHECKING(GNU ld release version minor)
-+           AC_MSG_RESULT(${ac_cv_gnu_ld_vernr_minor})
-+           if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
-+             ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+           fi
-+           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
-+             ac_cv_gnu_ld_version_script=yes
-+           fi
-+        fi
-+fi
-+
-+dnl Check if C compiler understands -c and -o at the same time
-+AC_PROG_CC_C_O
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+      BROKEN_CC=
-+else
-+      BROKEN_CC=#
-+fi
-+AC_SUBST(BROKEN_CC)
-+
-+dnl Check if the C compiler understands -Werror (GNU)
-+AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
-+ AC_TRY_RUN_STRICT([
-+  int main(void)
-+  {
-+  	return 0;
-+  }],[$CFLAGS -Werror],[$CPPFLAGS],[$LDFLAGS],
-+  samba_cv_HAVE_Werror=yes,samba_cv_HAVE_Werror=no,samba_cv_HAVE_Werror=cross)])
-+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
-+   Werror_FLAGS="-Werror"
-+else
-+dnl Check if the C compiler understands -w2
-+AC_CACHE_CHECK([that the C compiler understands -w2],samba_cv_HAVE_w2, [
-+ AC_TRY_RUN_STRICT([
-+  int main(void)
-+  {
-+  	return 0;
-+  }],[$CFLAGS -w2],[$CPPFLAGS],[$LDFLAGS],
-+  samba_cv_HAVE_w2=yes,samba_cv_HAVE_w2=no,samba_cv_HAVE_w2=cross)])
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+   Werror_FLAGS="-w2"
-+else
-+dnl Check if the C compiler understands -errwarn (Sun)
-+AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn, [
-+  AC_TRY_RUN_STRICT([
-+   int main(void)
-+   {
-+	return 0;
-+   }],[$CFLAGS -errwarn=%all],[$CPPFLAGS],[$LDFLAGS],
-+   samba_cv_HAVE_errwarn=yes,samba_cv_HAVE_errwarn=no,samba_cv_HAVE_errwarn=cross)])
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+   Werror_FLAGS="-errwarn=%all"
-+else
-+dnl Check if the C compiler understands -qhalt (IBM)
-+AC_CACHE_CHECK([that the C compiler understands -qhalt],samba_cv_HAVE_qhalt, [
-+  AC_TRY_RUN_STRICT([
-+   int main(void)
-+   {
-+	return 0;
-+   }],[$CFLAGS -qhalt=w],[$CPPFLAGS],[$LDFLAGS],
-+   samba_cv_HAVE_qhalt=yes,samba_cv_HAVE_qhalt=no,samba_cv_HAVE_qhalt=cross)])
-+if test x"$samba_cv_HAVE_qhalt" = x"yes"; then
-+   Werror_FLAGS="-qhalt=w"
-+fi
-+fi
-+fi
-+fi
-+
-+############################################
-+# check if the compiler can handle negative enum values
-+# and don't truncate the values to INT_MAX
-+# a runtime test is needed here
-+AC_SUBST(PIDL_ARGS)
-+AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
-+    AC_TRY_RUN(
-+[
-+	#include <stdio.h>
-+	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-+	int main(void) {
-+		enum negative_values v1 = NEGATIVE_VALUE;
-+		unsigned v2 = NEGATIVE_VALUE;
-+
-+		if (v1 != 0xFFFFFFFF) {
-+			printf("%u != 0xFFFFFFFF\n", v1);
-+			return 1;
-+		}
-+		if (v2 != 0xFFFFFFFF) {
-+			printf("%u != 0xFFFFFFFF\n", v2);
-+			return 1;
-+		}
-+
-+		return 0;
-+	}
-+],
-+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)])
-+if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-+	AC_MSG_WARN([using --uint-enums for pidl])
-+	PIDL_ARGS="$PIDL_ARGS --uint-enums"
-+fi
-+
-+dnl Figure out the flags to support named structure initializers
-+
-+LIBREPLACE_C99_STRUCT_INIT([],[AC_MSG_ERROR([c99 structure initializer are not supported])])
-+
-+UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
-+AC_MSG_CHECKING(uname -s)
-+AC_MSG_RESULT(${UNAME_S})
-+
-+UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
-+AC_MSG_CHECKING(uname -r)
-+AC_MSG_RESULT(${UNAME_R})
-+
-+UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
-+AC_MSG_CHECKING(uname -m)
-+AC_MSG_RESULT(${UNAME_M})
-+
-+UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
-+AC_MSG_CHECKING(uname -p)
-+AC_MSG_RESULT(${UNAME_P})
-+
-+UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
-+AC_MSG_CHECKING(uname -i)
-+AC_MSG_RESULT(${UNAME_I})
-+
-+dnl Add #include for broken IRIX header files
-+  case "$host_os" in
-+	*irix6*)
-+		#TODO add to libreplace
-+		if test x"$ac_cv_prog_gcc" != x"yes" ; then
-+			dnl Fix sensible defaults for MIPSPro compilers. The
-+			dnl error numbers are valid for the 7.3 compilers,
-+			dnl hopefully also valid for the 7.4 series.
-+			dnl
-+			dnl Bugzilla 3801. Force an error on warning 1035
-+			dnl so we don't incorrectly detect stdint.h. This
-+			dnl warning is emitted for #error directives.
-+			CFLAGS="$CFLAGS -diag_error 1035"
-+			dnl 1209: Controlling expression is constant
-+			dnl 1174: Function foo declared but never referenced
-+			dnl 3201: Parameter foo was never referenced
-+			CFLAGS="$CFLAGS -woff 1209,1174,3201"
-+		fi
-+	;;
-+esac
-+
-+DYNEXP=
-+AC_SUBST(DYNEXP)
-+LDSHFLAGS_Z_DEFS=
-+AC_SUBST(LDSHFLAGS_Z_DEFS)
-+LDSHFLAGS_Z_NODEFS=
-+AC_SUBST(LDSHFLAGS_Z_NODEFS)
-+
-+dnl Add modules that have to be built by default here
-+dnl These have to be built static:
-+default_static_modules=""
-+default_static_modules="$default_static_modules pdb_smbpasswd"
-+default_static_modules="$default_static_modules pdb_tdbsam"
-+default_static_modules="$default_static_modules pdb_wbc_sam"
-+default_static_modules="$default_static_modules rpc_lsarpc"
-+default_static_modules="$default_static_modules rpc_samr"
-+default_static_modules="$default_static_modules rpc_winreg"
-+default_static_modules="$default_static_modules rpc_initshutdown"
-+default_static_modules="$default_static_modules rpc_dssetup"
-+default_static_modules="$default_static_modules rpc_wkssvc"
-+default_static_modules="$default_static_modules rpc_svcctl"
-+default_static_modules="$default_static_modules rpc_ntsvcs"
-+default_static_modules="$default_static_modules rpc_netlogon"
-+default_static_modules="$default_static_modules rpc_netdfs"
-+default_static_modules="$default_static_modules rpc_srvsvc"
-+default_static_modules="$default_static_modules rpc_spoolss"
-+default_static_modules="$default_static_modules rpc_eventlog"
-+default_static_modules="$default_static_modules auth_sam"
-+default_static_modules="$default_static_modules auth_unix"
-+default_static_modules="$default_static_modules auth_winbind"
-+default_static_modules="$default_static_modules auth_wbc"
-+default_static_modules="$default_static_modules auth_domain"
-+default_static_modules="$default_static_modules auth_builtin"
-+default_static_modules="$default_static_modules vfs_default"
-+default_static_modules="$default_static_modules nss_info_template"
-+
-+dnl These are preferably build shared, and static if dlopen() is not available
-+default_shared_modules=""
-+default_shared_modules="$default_shared_modules vfs_recycle"
-+default_shared_modules="$default_shared_modules vfs_audit"
-+default_shared_modules="$default_shared_modules vfs_extd_audit"
-+default_shared_modules="$default_shared_modules vfs_full_audit"
-+default_shared_modules="$default_shared_modules vfs_netatalk"
-+default_shared_modules="$default_shared_modules vfs_fake_perms"
-+default_shared_modules="$default_shared_modules vfs_default_quota"
-+default_shared_modules="$default_shared_modules vfs_readonly"
-+default_shared_modules="$default_shared_modules vfs_cap"
-+default_shared_modules="$default_shared_modules vfs_expand_msdfs"
-+default_shared_modules="$default_shared_modules vfs_shadow_copy"
-+default_shared_modules="$default_shared_modules vfs_shadow_copy2"
-+default_shared_modules="$default_shared_modules auth_script"
-+default_shared_modules="$default_shared_modules vfs_readahead"
-+default_shared_modules="$default_shared_modules vfs_xattr_tdb"
-+default_shared_modules="$default_shared_modules vfs_streams_xattr"
-+default_shared_modules="$default_shared_modules vfs_streams_depot"
-+default_shared_modules="$default_shared_modules vfs_acl_xattr"
-+default_shared_modules="$default_shared_modules vfs_acl_tdb"
-+default_shared_modules="$default_shared_modules vfs_smb_traffic_analyzer"
-+default_shared_modules="$default_shared_modules vfs_preopen"
-+default_shared_modules="$default_shared_modules vfs_catia"
-+default_shared_modules="$default_shared_modules vfs_scannedonly"
-+default_shared_modules="$default_shared_modules vfs_crossrename"
-+default_shared_modules="$default_shared_modules vfs_linux_xfs_sgid"
-+default_shared_modules="$default_shared_modules vfs_time_audit"
-+default_shared_modules="$default_shared_modules vfs_media_harmony"
-+default_shared_modules="$default_shared_modules vfs_commit"
-+default_shared_modules="$default_shared_modules idmap_autorid"
-+default_shared_modules="$default_shared_modules idmap_tdb2"
-+default_shared_modules="$default_shared_modules idmap_rid"
-+default_shared_modules="$default_shared_modules idmap_hash"
-+
-+if test "x$developer" = xyes; then
-+   default_shared_modules="$default_shared_modules perfcount_test"
-+fi
-+
-+if test x"$selftest" = x"yes" -o "x$developer" = xyes; then
-+   default_shared_modules="$default_shared_modules vfs_fake_acls vfs_nfs4acl_xattr"
-+fi
-+
-+#
-+# Config CPPFLAG settings for strange OS's that must be set
-+# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
-+# case statement; its first reference must be unconditional.
-+#
-+case "$host_os" in
-+    *hpux*)
-+#
-+# Defines needed for HPUX support.
-+# HPUX has bigcrypt but (sometimes?) doesn't use it for
-+# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
-+#
-+      case `uname -r` in
-+		*9*|*10*|*11)
-+			AC_DEFINE(USE_BOTH_CRYPT_CALLS, 1, [Whether to use both of HPUX' crypt calls])
-+		;;
-+      esac
-+      ;;
-+
-+#
-+# AIX4.x doesn't even admit to having large
-+# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
-+#
-+    *aix4*)
-+	  AC_MSG_RESULT([enabling large file support])
-+	  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
-+	  AC_DEFINE(_LARGE_FILES, 1, [Whether to enable large file support])
-+      ;;
-+#
-+# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
-+# to the existance of large files..
-+#
-+# Solaris uses SYSV printing.  Make sure to set that here.  --jerry
-+#
-+	*solaris*)
-+		AC_DEFINE(SYSV, 1, [Whether to enable System V compatibility])
-+		LDFLAGS="$LDFLAGS -lthread"
-+		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-+		;;
-+#
-+# IRIX uses SYSV printing.  Make sure to set that here
-+#
-+	*irix*)
-+		AC_DEFINE(SYSV, 1, [Whether to enable System V compatibility])
-+		;;
-+	*freebsd*|*dragonfly*)
-+		AC_DEFINE(FREEBSD, 1, [Whether the host os is FreeBSD])
-+		;;
-+#
-+# VOS may need to have POSIX support and System V compatibility enabled.
-+#
-+    *vos*)
-+    case "$CPPFLAGS" in
-+	  *-D_POSIX_C_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
-+		AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Whether to enable POSIX support])
-+		;;
-+    esac
-+    case "$CPPFLAGS" in
-+	  *-D_SYSV*|*-D_SVID_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_SYSV"
-+		AC_DEFINE(_SYSV, 1, [Whether to enable System V compatibility])
-+    esac
-+    ;;
-+# GNU systems
-+#
-+    *linux* | *hurd* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+	CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-+	AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
-+	;;
-+
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+    *darwin*)
-+	AC_DEFINE(BROKEN_UNICODE_COMPOSE_CHARACTERS, 1, [Does this system use unicode compose characters])
-+
-+# Add a system specific charset module.
-+	default_shared_modules="$default_shared_modules"
-+
-+	;;
-+    *qnx*)
-+        ;;
-+
-+esac
-+
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
-+
-+AC_LIBREPLACE_BROKEN_CHECKS
-+AC_CHECK_FUNCS([syslog],[],[AC_MSG_ERROR([Required function not found])])
-+AC_LIBREPLACE_NETWORK_CHECKS
-+
-+CPPFLAGS="${SAVE_CPPFLAGS}"
-+
-+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
-+
-+LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
-+AC_SUBST(LIBREPLACE_OBJS)
-+
-+LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS} ${LIBREPLACE_FILESYS_LIBS}"
-+AC_SUBST(LIBREPLACE_LIBS)
-+
-+
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
-+
-+
-+AC_CHECK_HEADERS(aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h)
-+AC_CHECK_HEADERS(unistd.h grp.h sys/id.h memory.h alloca.h)
-+AC_CHECK_HEADERS(limits.h float.h libintl.h)
-+AC_CHECK_HEADERS(rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h)
-+AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.h)
-+AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
-+AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
-+AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
-+AC_CHECK_HEADERS(sys/sysmacros.h)
-+AC_CHECK_HEADERS(sys/syslog.h syslog.h)
-+AC_CHECK_HEADERS(langinfo.h locale.h)
-+AC_CHECK_HEADERS(xfs/libxfs.h)
-+AC_CHECK_HEADERS(netgroup.h)
-+AC_CHECK_HEADERS(linux/falloc.h)
-+AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h)
-+AC_CHECK_HEADERS(linux/ioctl.h)
-+
-+dnl check for OS implementation of md5 conformant to rfc1321
-+samba_cv_md5lib=none
-+
-+AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
-+
-+if test x"$samba_cv_md5lib" = x"none" ; then
-+	AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
-+fi
-+
-+if test x"$samba_cv_md5lib" = x"none" ; then
-+	AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
-+fi
-+
-+if test x"$samba_cv_md5lib" != x"none" ; then
-+	AC_CHECK_HEADERS(sys/md5.h)
-+fi
-+
-+CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
-+if test x"$ac_cv_header_sys_md5_h" = x"yes" -a \
-+        x"$samba_cv_md5lib" != x"none" ; then
-+	if test x"$samba_cv_md5lib" != x ; then
-+		LIBS="${LIBS} -l${samba_cv_md5lib}"
-+		AC_DEFINE(HAVE_LIBMD5, 1,
-+				  [Whether libmd5 conformant to rfc1321 is available.])
-+	fi
-+	CRYPTO_MD5_OBJ=
-+fi
-+
-+if test "x$ac_cv_header_CommonCrypto_CommonDigest_h" == "xyes"; then
-+	CRYPTO_MD5_OBJ=
-+fi
-+
-+AC_SUBST(CRYPTO_MD5_OBJ)
-+
-+AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
-+#if HAVE_RPC_RPC_H
-+#include <rpc/rpc.h>
-+#endif
-+]])
-+## These fail to compile on IRIX so just check for their presence
-+AC_CHECK_HEADERS(sys/mode.h,,,)
-+
-+# Look for Darwin headers
-+old_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-Iinclude $CPPFLAGS"
-+AC_CHECK_HEADERS([CoreFoundation/CFStringEncodingConverter.h], [], [AC_CHECK_HEADERS([CFStringEncodingConverter.h])])
-+CPPFLAGS="$old_CPPFLAGS"
-+
-+# To link lib/util/charset/charset_macosxfs.c, we need to tell the linker
-+# about CoreFoundation, at least on os X 10.4..10.7 resp. darwin8..12
-+case "$host_os" in
-+    *darwin*)
-+		LDFLAGS="$LDFLAGS -framework CoreFoundation"
-+	;;
-+esac
-+
-+# In valgrind 1.0.x, it's just valgrind.h.  In 1.9.x+ there's a
-+# subdirectory of headers.
-+AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h)
-+
-+if test x"$enable_developer" = x"yes" ; then
-+   if test x"$ac_cv_header_valgrind_h" = xyes -o \
-+           x"$ac_cv_header_valgrind_valgrind_h" = xyes ; then
-+      AC_DEFINE(VALGRIND,1,[Whether we have valgrind headers])
-+   fi
-+fi
-+
-+#
-+# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
-+# This causes configure to fail to detect it. Check for shadow separately on HPUX.
-+#
-+case "$host_os" in
-+    *hpux*)
-+		AC_TRY_COMPILE([#include <shadow.h>],[struct spwd testme],
-+			ac_cv_header_shadow_h=yes,ac_cv_header_shadow_h=no)
-+		if test x"$ac_cv_header_shadow_h" = x"yes"; then
-+		   AC_DEFINE(HAVE_SHADOW_H,1,[Whether we have shadow.h])
-+		fi
-+	;;
-+esac
-+AC_CHECK_HEADERS(shadow.h)
-+AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h)
-+AC_CHECK_HEADERS(syscall.h sys/syscall.h)
-+
-+AC_CHECK_HEADERS(sys/cdefs.h glob.h)
-+
-+# For experimental utmp support (lastlog on some BSD-like systems)
-+AC_CHECK_HEADERS(utmp.h utmpx.h lastlog.h)
-+
-+AC_CHECK_SIZEOF(int,cross)
-+AC_CHECK_SIZEOF(long,cross)
-+AC_CHECK_SIZEOF(long long,cross)
-+AC_CHECK_SIZEOF(short,cross)
-+
-+AC_C_CONST
-+AC_C_INLINE
-+AC_C_BIGENDIAN
-+AC_C_CHAR_UNSIGNED
-+
-+AC_TYPE_SIGNAL
-+AC_TYPE_UID_T
-+AC_TYPE_MODE_T
-+AC_TYPE_OFF_T
-+AC_TYPE_SIZE_T
-+AC_TYPE_PID_T
-+AC_STRUCT_ST_RDEV
-+AC_DIRENT_D_OFF
-+AC_CHECK_TYPE(ssize_t, int)
-+AC_CHECK_TYPE(wchar_t, unsigned short)
-+
-+############################################
-+# for cups support we need libcups, and a handful of header files
-+
-+AC_ARG_ENABLE(cups,
-+[AS_HELP_STRING([--enable-cups], [Turn on CUPS support (default=auto)])])
-+
-+if test x$enable_cups != xno; then
-+	AC_PATH_PROG(CUPS_CONFIG, cups-config)
-+
-+        if test "x$CUPS_CONFIG" != x; then
-+
-+		ac_save_LDFLAGS=$LDFLAGS
-+		ac_save_PRINT_LIBS=$PRINT_LIBS
-+		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
-+
-+		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-+		        x"$ac_cv_header_cups_language_h" = xyes; then
-+			# try linking with -lcups alone first. That should work unless libcups is
-+			# underlinked. With cups-config --libs we pull in unwanted and unneeded
-+			# dendencies including thread libraries - use cups-config only if really
-+			# required. 
-+			AC_CHECK_LIB_EXT(cups, ac_save_PRINT_LIBS , httpConnect,
-+				[PRINT_LIBS="$ac_save_PRINT_LIBS -lcups"],
-+				[AC_MSG_WARN([your cups library doesn't link with -lcups alone, it might be underlinked.]) ;
-+				 PRINT_LIBS="$ac_save_PRINT_LIBS `$CUPS_CONFIG --libs`"])
-+
-+			AC_DEFINE(HAVE_CUPS,1,[Whether we have CUPS])
-+			samba_cv_HAVE_CUPS=yes
-+			AC_CHECK_LIB_EXT(cups, PRINT_LIBS, httpConnectEncrypt)
-+		else
-+			AC_MSG_WARN([cups-config around but cups-devel not installed])
-+			CFLAGS=$ac_save_CFLAGS
-+			LDFLAGS=$ac_save_LDFLAGS
-+			PRINT_LIBS=$ac_save_PRINT_LIBS
-+		fi
-+
-+	elif test x"$enable_cups" = x"yes"; then
-+		AC_MSG_ERROR(Cups support required but cups-config not located.  Make sure cups-devel related files are installed.)
-+        fi
-+fi
-+
-+AC_ARG_ENABLE(iprint,
-+[AS_HELP_STRING([--enable-iprint], [Turn on iPrint support (default=yes if cups is yes)])])
-+
-+if test x$enable_iprint != xno; then
-+	if test x"$samba_cv_HAVE_CUPS" = xyes; then
-+                AC_DEFINE(HAVE_IPRINT,1,[Whether we have iPrint])
-+	elif test x"$enable_iprint" = x"yes"; then
-+		AC_MSG_ERROR(iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled.)
-+        fi
-+fi
-+
-+############################################
-+# check if the compiler will optimize out function calls
-+AC_CACHE_CHECK([if the compiler will optimize out function calls],samba_cv_optimize_out_funcation_calls, [
-+    AC_TRY_LINK([
-+#include <stdio.h>],
-+[
-+		if (0) {
-+		   this_function_does_not_exist();
-+		} else {
-+		  return 1;
-+		}
-+
-+],
-+	samba_cv_optimize_out_funcation_calls=yes,samba_cv_optimize_out_funcation_calls=no)])
-+if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
-+   AC_DEFINE(HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS,1,[Whether the compiler will optimize out function calls])
-+fi
-+
-+#############################################
-+# check for fd passing struct via msg_control
-+AC_CACHE_CHECK([for fd passing via msg_control],samba_cv_msghdr_msg_control, [
-+    AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>],
-+[
-+	struct msghdr msg;
-+	union {
-+	      struct cmsghdr cm;
-+	      char control[CMSG_SPACE(sizeof(int))];
-+	} control_un;
-+	msg.msg_control = control_un.control;
-+	msg.msg_controllen = sizeof(control_un.control);
-+],
-+	samba_cv_msghdr_msg_control=yes,samba_cv_msghdr_msg_control=no)])
-+if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
-+   AC_DEFINE(HAVE_MSGHDR_MSG_CONTROL,1,
-+	     [If we can use msg_control for passing file descriptors])
-+fi
-+
-+#############################################
-+# check for fd passing struct via msg_acctrights
-+AC_CACHE_CHECK([for fd passing via msg_acctrights],
-+		samba_cv_msghdr_msg_acctrights, [
-+    AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>],
-+[
-+	struct msghdr msg;
-+	int fd;
-+	msg.msg_acctrights = (caddr_t) &fd;
-+	msg.msg_acctrightslen = sizeof(fd);
-+],
-+	samba_cv_msghdr_msg_acctrights=yes,samba_cv_msghdr_msg_acctrights=no)])
-+if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then
-+   AC_DEFINE(HAVE_MSGHDR_MSG_ACCTRIGHTS,1,
-+	     [If we can use msg_acctrights for passing file descriptors])
-+fi
-+
-+AC_CHECK_FUNCS(dirfd)
-+if test x"$ac_cv_func_dirfd" = x"yes"; then
-+	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-+fi
-+
-+AC_CACHE_CHECK([for struct sigevent type],samba_cv_struct_sigevent, [
-+    AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
-+#endif
-+#include <signal.h>],[struct sigevent s;],
-+	samba_cv_struct_sigevent=yes,samba_cv_struct_sigevent=no)])
-+if test x"$samba_cv_struct_sigevent" = x"yes"; then
-+   AC_DEFINE(HAVE_STRUCT_SIGEVENT,1,[Whether we have the struct sigevent])
-+   AC_CHECK_MEMBERS([struct sigevent.sigev_value.sival_ptr,struct sigevent.sigev_value.sigval_ptr], , ,
-+	[#include <signal.h>])
-+fi
-+
-+# and glibc has setresuid under linux but the function does
-+# nothing until kernel 2.1.44! very dumb.
-+AC_CACHE_CHECK([for real setresuid],samba_cv_have_setresuid,[
-+    AC_TRY_RUN([#include <errno.h>
-+main() { setresuid(1,1,1); setresuid(2,2,2); return(errno==EPERM?0:1);}],
-+	samba_cv_have_setresuid=yes,samba_cv_have_setresuid=no,samba_cv_have_setresuid=cross)])
-+if test x"$samba_cv_have_setresuid" = x"yes"; then
-+    AC_DEFINE(HAVE_SETRESUID,1,[Whether the system has setresuid])
-+fi
-+
-+# Do the same check for setresguid...
-+#
-+AC_CACHE_CHECK([for real setresgid],samba_cv_have_setresgid,[
-+    AC_TRY_RUN([#include <unistd.h>
-+#include <errno.h>
-+main() { errno = 0; setresgid(1,1,1); return(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}],
-+	samba_cv_have_setresgid=yes,samba_cv_have_setresgid=no,samba_cv_have_setresgid=cross)])
-+if test x"$samba_cv_have_setresgid" = x"yes"; then
-+    AC_DEFINE(HAVE_SETRESGID,1,[Whether the system has setresgid])
-+fi
-+
-+AC_FUNC_MEMCMP
-+
-+###############################################
-+# Readline included by default unless explicitly asked not to
-+test "${with_readline+set}" != "set" && with_readline=yes
-+
-+# test for where we get readline() from
-+AC_MSG_CHECKING(whether to use readline)
-+AC_ARG_WITH(readline,
-+[AS_HELP_STRING([--with-readline[=DIR]], [Look for readline include/libs in DIR (default=auto)])],
-+[  case "$with_readline" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+
-+    AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-+    AC_CHECK_HEADERS(readline/history.h)
-+
-+    AC_CHECK_HEADERS(readline.h readline/readline.h,[
-+      for termlib in ncurses curses termcap terminfo termlib tinfo; do
-+       AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
-+      done
-+      AC_CHECK_LIB(readline, rl_callback_handler_install,
-+       [TERMLIBS="-lreadline $TERMLIBS"
-+       AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
-+       break], [TERMLIBS=], $TERMLIBS)])
-+    ;;
-+  no)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  *)
-+    AC_MSG_RESULT(yes)
-+
-+    # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-+    # alternate readline path
-+    _ldflags=${LDFLAGS}
-+    _cppflags=${CPPFLAGS}
-+
-+    # Add additional search path
-+    LDFLAGS="-L$with_readline/lib $LDFLAGS"
-+    CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+
-+    AC_CHECK_HEADERS(readline.h history.h readline/readline.h)
-+    AC_CHECK_HEADERS(readline/history.h)
-+
-+    AC_CHECK_HEADERS(readline.h readline/readline.h,[
-+      for termlib in ncurses curses termcap terminfo termlib; do
-+       AC_CHECK_LIB(${termlib}, tgetent, [TERMLIBS="-l${termlib}"; break])
-+      done
-+      AC_CHECK_LIB(readline, rl_callback_handler_install,
-+       [TERMLDFLAGS="-L$with_readline/lib"
-+       TERMCPPFLAGS="-I$with_readline/include"
-+       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+       TERMLIBS="-lreadline $TERMLIBS"
-+       AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline])
-+       break], [TERMLIBS= CPPFLAGS=$_cppflags], $TERMLIBS)])
-+
-+    LDFLAGS=$_ldflags
-+    ;;
-+  esac],
-+  AC_MSG_RESULT(no)
-+)
-+AC_SUBST(TERMLIBS)
-+AC_SUBST(TERMLDFLAGS)
-+
-+# The readline API changed slightly from readline3 to readline4, so
-+# code will generate warnings on one of them unless we have a few
-+# special cases.
-+AC_CHECK_LIB(readline, rl_completion_matches,
-+	     [AC_DEFINE(HAVE_NEW_LIBREADLINE, 1,
-+			[Do we have rl_completion_matches?])],
-+	     [],
-+	     [$TERMLIBS])
-+
-+# not all readline libs have rl_event_hook or history_list
-+AC_CHECK_DECLS(rl_event_hook, [], [], [#include <readline/readline.h>])
-+AC_CHECK_LIB(readline, history_list,
-+	     [AC_DEFINE(HAVE_HISTORY_LIST, 1, [Do we have history_list?])],
-+	     [],
-+	     [$TERMLIBS])
-+
-+###############################################
-+# test for where we get yp_get_default_domain() from
-+AC_SEARCH_LIBS(yp_get_default_domain, [nsl])
-+AC_CHECK_FUNCS(yp_get_default_domain)
-+
-+# Check if we have execl, if not we need to compile smbrun.
-+AC_CHECK_FUNCS(execl)
-+if test x"$ac_cv_func_execl" = x"no"; then
-+    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun"
-+fi
-+
-+AC_CHECK_FUNCS(getcwd fchown chmod fchmod mknod mknod64)
-+AC_CHECK_FUNCS(strtol)
-+AC_CHECK_FUNCS(strchr chflags)
-+AC_CHECK_FUNCS(getrlimit fsync setpgid)
-+AC_CHECK_FUNCS(fdatasync,,[AC_CHECK_LIB_EXT(rt, LIBS, fdatasync)])
-+AC_CHECK_FUNCS(setsid glob strpbrk crypt16 getauthuid)
-+AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent)
-+AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
-+AC_CHECK_FUNCS(getgrset)
-+AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups syscall sysconf)
-+AC_CHECK_FUNCS(atexit grantpt posix_openpt posix_fallocate)
-+AC_CHECK_FUNCS(fallocate)
-+AC_CHECK_FUNCS(fseeko setluid getpwanam)
-+AC_CHECK_FUNCS(fdopendir)
-+AC_CHECK_FUNCS(getpwent_r)
-+AC_CHECK_FUNCS(setenv strcasecmp fcvt fcvtl)
-+AC_CHECK_FUNCS(syslog vsyslog timegm)
-+AC_CHECK_FUNCS(setlocale)
-+AC_CHECK_FUNCS(nanosleep,,[AC_CHECK_LIB_EXT(rt, LIBS, nanosleep)])
-+AC_CHECK_FUNCS(lutimes futimes utimensat futimens)
-+AC_CHECK_FUNCS(mlock munlock mlockall munlockall)
-+AC_CHECK_FUNCS(memalign posix_memalign hstrerror)
-+AC_CHECK_HEADERS(sys/mman.h)
-+# setbuffer, shmget, shm_open are needed for smbtorture
-+AC_CHECK_FUNCS(shmget shm_open)
-+AC_CHECK_FUNCS(gettext dgettext)
-+AC_CHECK_FUNCS(bindtextdomain textdomain bind_textdomain_codeset)
-+AC_CHECK_FUNCS(strupr)
-+
-+# Find a method of generating a stack trace
-+AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
-+# libexecinfo provides backtrace_symbols on FreeBSD
-+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
-+AC_CHECK_FUNCS(backtrace_symbols)
-+AC_CHECK_LIB(exc, trace_back_stack)
-+
-+# check for sysctlbyname and sysctl for BSD systems
-+AC_CHECK_FUNCS(sysctlbyname)
-+AC_CHECK_FUNCS(sysctl)
-+
-+#################################################
-+# Check to see if core dump directory is defined in linux
-+# with /proc/sys/kernel/core_pattern
-+
-+AC_CHECK_FILE([/proc/sys/kernel/core_pattern],
-+	AC_DEFINE(HAVE_SYS_KERNEL_PROC_CORE_PATTERN, 1,
-+	[Whether Linux kernel uses core_pattern for core files]),
-+	 [])
-+
-+#############################
-+# check if building with gpfs
-+AC_CHECK_HEADERS(gpfs_gpl.h)
-+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
-+    AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL headers are available])
-+    default_shared_modules="$default_shared_modules vfs_gpfs"
-+fi
-+
-+#############################
-+# check if building with libcephfs
-+# fail if --with-libcephfs specified but no headers found
-+printf "%s" "checking for CephFS... "
-+AC_CHECK_HEADERS(cephfs/libcephfs.h)
-+
-+save_LIBS="$LIBS"
-+LIBS="$LIBS -lcephfs"
-+AC_TRY_LINK([#include <cephfs/libcephfs.h>],
-+	  [ceph_version(0, 0, 0)],
-+	  samba_cv_HAVE_CEPHFS=yes,
-+	  samba_cv_HAVE_CEPHFS=no
-+	  )
-+
-+if test x"$ac_cv_header_cephfs_libcephfs_h" = x"yes" && test x"$samba_cv_HAVE_CEPHFS" = x"yes"; then
-+    AC_DEFINE(HAVE_CEPH, 1, [Whether CEPH headers are available])
-+    default_shared_modules="$default_shared_modules vfs_ceph"
-+    save_CFLAGS="$CFLAGS"
-+    save_LDFLAGS="$LDFLAGS"
-+    save_LIBS="$save_LIBS -lcephfs"
-+else
-+    if test x"$CEPHFS_PATH_SPEC" = x"yes"; then
-+        AC_MSG_ERROR([No valid libcephfs found in ${CEPHFS_PATH}])
-+    fi
-+fi
-+
-+CFLAGS="$save_CFLAGS"
-+LDFLAGS="$save_LDFLAGS"
-+LIBS="$save_LIBS"
-+
-+# Note that all the libunwind symbols in the API are defined to internal
-+# platform-specific version, so we must include libunwind.h before checking
-+# any of them.
-+AC_MSG_CHECKING([for libunwind])
-+save_LIBS=$LIBS
-+
-+UNWIND_ARCH="unknown"
-+if test x"$UNAME_I" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_I"
-+elif test x"$UNAME_M" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_M"
-+elif test x"$UNAME_P" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_P"
-+fi
-+
-+case "$UNWIND_ARCH" in
-+	unknown)
-+		# This probably won't link without
-+		# the platform-specific libunwind.
-+		LIBS="$LIBS -lunwind"
-+		;;
-+	i386|i586|i686)
-+		# Add the platform-specific libunwind module.
-+		LIBS="$LIBS -lunwind -lunwind-x86"
-+		;;
-+	*)
-+		# Add the platform-specific libunwind module.
-+		# based on uname -i, uname -m or uname -p
-+		LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
-+		;;
-+esac
-+
-+AC_TRY_LINK(
-+    [
-+#ifdef HAVE_LIBUNWIND_H
-+#include <libunwind.h>
-+#endif
-+    ],
-+    [
-+	unw_context_t ctx; unw_cursor_t cur;
-+	char buf[256]; unw_word_t off;
-+	unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
-+	unw_get_proc_name(&cur, buf, sizeof(buf), &off);
-+    ],
-+    [
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(HAVE_LIBUNWIND, 1, [Whether libunwind is available])
-+
-+	# If we have libunwind, test whether we also have libunwind-ptrace
-+	# which would let us unwind arbitrary processes.
-+	save_LIBS=$LIBS
-+	AC_CHECK_HEADERS(libunwind-ptrace.h)
-+	AC_CHECK_LIB(unwind-ptrace, _UPT_create,
-+	    [
-+		LIBUNWIND_PTRACE="-lunwind-ptrace";
-+		AC_DEFINE(HAVE_LIBUNWIND_PTRACE, 1,
-+		    [Whether libunwind-ptrace.a is available.])
-+	    ],
-+	    [ LIBUNWIND_PTRACE="" ])
-+
-+	LIBS=$save_LIBS
-+    ],
-+    [
-+	AC_MSG_RESULT(no)
-+	LIBS=$save_LIBS
-+    ])
-+
-+# To use libunwind-ptrace, we also need to make some ptrace system calls.
-+if test x"$LIBUNWIND_PTRACE" != x"" ; then
-+    AC_CHECK_HEADERS(sys/ptrace.h)
-+    AC_MSG_CHECKING([for the Linux ptrace(2) interface])
-+    AC_TRY_LINK(
-+	    [
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_SYS_PTRACE_H
-+#include <sys/ptrace.h>
-+#endif
-+	    ],
-+	    [
-+		pid_t me = (pid_t)-1;
-+		ptrace(PTRACE_ATTACH, me, 0, 0);
-+		ptrace(PTRACE_DETACH, me, 0, 0);
-+		return 0;
-+	    ],
-+	    [
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_LINUX_PTRACE, 1,
-+		    [Whether the Linux ptrace(2) interface is available.])
-+	    ],
-+	    [
-+		AC_MSG_RESULT(no)
-+		LIBUNWIND_PTRACE=""
-+	    ])
-+fi
-+
-+AC_SUBST(LIBUNWIND_PTRACE)
-+
-+AC_CHECK_FUNCS(_dup _dup2 _opendir _readdir _seekdir _telldir _closedir)
-+AC_CHECK_FUNCS(__dup __dup2 __opendir __readdir __seekdir __telldir __closedir)
-+AC_CHECK_FUNCS(__getcwd _getcwd)
-+AC_CHECK_FUNCS(__xstat __fxstat __lxstat)
-+AC_CHECK_FUNCS(_stat _lstat _fstat __stat __lstat __fstat)
-+AC_CHECK_FUNCS(_acl __acl _facl __facl _open __open _chdir __chdir)
-+AC_CHECK_FUNCS(_close __close _fchdir __fchdir _fcntl __fcntl)
-+AC_CHECK_FUNCS(getdents __getdents _lseek __lseek _read __read)
-+AC_CHECK_FUNCS(getdirentries _write __write _fork __fork)
-+AC_CHECK_FUNCS(__sys_llseek llseek _llseek __llseek)
-+AC_CHECK_FUNCS(pread _pread __pread)
-+AC_CHECK_FUNCS(pwrite _pwrite __pwrite)
-+AC_CHECK_FUNCS(prctl)
-+
-+AC_TRY_COMPILE([
-+#ifdef HAVE_SYS_PRCTL_H
-+#include <sys/prctl.h>
-+#endif
-+],
-+[int i; i = prtcl(0); ],
-+AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
-+
-+#
-+#
-+#
-+case "$host_os" in
-+    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+       # glibc <= 2.3.2 has a broken getgrouplist
-+       AC_CACHE_CHECK([for good getgrouplist],samba_cv_linux_getgrouplist_ok,[AC_TRY_RUN([
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+main() {
-+       /* glibc up to 2.3 has a broken getgrouplist */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+       int libc_major = __GLIBC__;
-+       int libc_minor = __GLIBC_MINOR__;
-+
-+       if (libc_major < 2)
-+              return(1);
-+       if ((libc_major == 2) && (libc_minor <= 3))
-+              return(1);
-+#endif
-+       return(0);
-+}
-+], [samba_cv_linux_getgrouplist_ok=yes],
-+   [samba_cv_linux_getgrouplist_ok=no],
-+   [samba_cv_linux_getgrouplist_ok=cross])])
-+       if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
-+          AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
-+       fi
-+       ;;
-+    *)
-+       AC_CHECK_FUNCS(getgrouplist)
-+       ;;
-+esac
-+
-+#################################################
-+# Check whether struct stat has timestamps with sub-second resolution.
-+#
-+
-+samba_cv_stat_hires=no
-+AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec], # Linux, Solaris
-+	[samba_cv_stat_hires=yes])
-+AC_CHECK_MEMBERS([struct stat.st_mtimensec], # BSD, if defined _POSIX_SOURCE
-+	[samba_cv_stat_hires=yes])
-+AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec], # BSD, if not defined _POSIX_SOURCE
-+	[samba_cv_stat_hires=yes])
-+AC_CHECK_MEMBERS([struct stat.st_mtime_n], # AIX
-+	[samba_cv_stat_hires=yes])
-+AC_CHECK_MEMBERS([struct stat.st_umtime], # Tru64
-+	[samba_cv_stat_hires=yes])
-+
-+if test x"$samba_cv_stat_hires" = x"yes" ; then
-+    AC_DEFINE(HAVE_STAT_HIRES_TIMESTAMPS, 1,
-+	    [whether struct stat has sub-second timestamps])
-+fi
-+
-+# recent FreeBSD, NetBSD have creation timestamps called birthtime:
-+AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec])
-+AC_CHECK_MEMBERS([struct stat.st_birthtime], AC_CHECK_MEMBERS([struct stat.st_birthtimensec]))
-+
-+
-+AC_CACHE_CHECK([whether there is DOS flags support in the stat struct], samba_cv_stat_dos_flags,
-+    [
-+	AC_TRY_COMPILE(
-+	    [#include <sys/stat.h>],
-+	    [
-+		int a = UF_DOS_ARCHIVE;
-+		int h = UF_DOS_HIDDEN;
-+		int r = UF_DOS_RO;
-+		int s = UF_DOS_SYSTEM;
-+		int i = UF_DOS_NOINDEX;
-+		int f = UF_DOS_FLAGS;
-+	    ],
-+	    samba_cv_stat_dos_flags=yes, samba_cv_stat_dos_flags=no)
-+    ])
-+
-+if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
-+    AC_DEFINE(HAVE_STAT_DOS_FLAGS, 1, [whether there is DOS flags support in the stat struct])
-+fi
-+
-+AC_CACHE_CHECK([whether we can compile with __attribute__((destructor))],
-+	       samba_cv_function_attribute_destructor,
-+	       [
-+	         AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-+			[
-+				__attribute__((destructor))
-+				static void cleanup(void) { }
-+			])],
-+			samba_cv_function_attribute_destructor=yes)
-+		])
-+
-+if test x"$samba_cv_function_attribute_destructor" = xyes ; then
-+   AC_DEFINE(HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR, 1,
-+	     [whether we can compile with __attribute__((destructor))])
-+fi
-+
-+#####################################
-+# needed for SRV lookups
-+AC_CHECK_LIB(resolv, dn_expand)
-+AC_CHECK_LIB(resolv, _dn_expand)
-+AC_CHECK_LIB(resolv, __dn_expand)
-+AC_CHECK_LIB(inet, dn_expand)
-+
-+#
-+# Check for the functions putprpwnam, set_auth_parameters,
-+# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
-+# Needed for OSF1 and HPUX.
-+#
-+
-+AC_LIBTESTFUNC(security, putprpwnam)
-+AC_LIBTESTFUNC(sec, putprpwnam)
-+
-+AC_LIBTESTFUNC(security, set_auth_parameters)
-+AC_LIBTESTFUNC(sec, set_auth_parameters)
-+
-+# UnixWare 7.x has its getspnam in -lgen
-+AC_LIBTESTFUNC(gen, getspnam)
-+
-+AC_LIBTESTFUNC(security, getspnam)
-+AC_LIBTESTFUNC(sec, getspnam)
-+
-+AC_LIBTESTFUNC(security, bigcrypt)
-+AC_LIBTESTFUNC(sec, bigcrypt)
-+
-+AC_LIBTESTFUNC(security, getprpwnam)
-+AC_LIBTESTFUNC(sec, getprpwnam)
-+
-+AC_CHECK_FUNCS(strsignal)
-+
-+AC_DISABLE_STATIC
-+AC_ENABLE_SHARED
-+
-+# Set defaults
-+PIE_CFLAGS=""
-+PIE_LDFLAGS=""
-+AC_ARG_ENABLE(pie, [AS_HELP_STRING([--enable-pie], [Turn on pie support if available (default=yes)])])
-+
-+if test "x$enable_pie" != xno
-+then
-+	AC_CACHE_CHECK(for -pie and -fPIE, samba_cv_fpie,
-+	[
-+		cat > conftest.c <<EOF
-+int foo;
-+int main () { return 0;}
-+EOF
-+		if AC_TRY_COMMAND_NO_STDERR([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c])
-+		then
-+			samba_cv_fpie=yes
-+		else
-+			samba_cv_fpie=no
-+		fi
-+		rm -f conftest*
-+	])
-+	if test x"${samba_cv_fpie}" = x"yes"
-+	then
-+		PIE_CFLAGS="-fPIE"
-+		PIE_LDFLAGS="-pie"
-+	fi
-+fi
-+
-+# Set defaults
-+RELRO_LDFLAGS=""
-+AC_ARG_ENABLE(relro, [AS_HELP_STRING([--enable-relro], [Turn on Relocations Read-Only (relro) support if available (default=yes)])])
-+
-+if test "x$enable_relro" != xno
-+then
-+	AC_CACHE_CHECK([for -Wl,-z,relro], samba_cv_relro,
-+	[
-+		cat > conftest.c <<EOF
-+int foo;
-+main () { return 0;}
-+EOF
-+		if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
-+		then
-+			samba_cv_relro=yes
-+		else
-+			samba_cv_relro=no
-+		fi
-+		rm -f conftest*
-+	])
-+	if test x"${samba_cv_relro}" = x"yes"
-+	then
-+		RELRO_LDFLAGS="-Wl,-z,relro"
-+	fi
-+fi
-+
-+# Set defaults
-+SYMSEXT="syms"
-+AC_SUBST(SYMSEXT)
-+
-+# Assume non-shared by default and override below
-+BLDSHARED="false"
-+
-+# these are the defaults, good for lots of systems
-+HOST_OS="$host_os"
-+LDSHFLAGS="-shared"
-+MODULE_EXPORTS=""
-+SONAMEFLAG="#"
-+SHLD="\${CC} \${CFLAGS}"
-+PICFLAG="${PIE_CFLAGS}"
-+SHLIBEXT="so"
-+DSO_EXPORTS=""
-+
-+# this bit needs to be modified for each OS that supports share libs
-+# You need to specify how to create a shared library and
-+  # how to compile C code to produce PIC object files
-+
-+  AC_MSG_CHECKING([ability to build shared libraries])
-+
-+  # and these are for particular systems
-+  case "$host_os" in
-+		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
-+			case "$host_os" in
-+				*linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
-+				*qnx*) AC_DEFINE(QNX,1,[Whether the host os is qnx]) ;;
-+			esac
-+			BLDSHARED="true"
-+			LDSHFLAGS="-shared -Wl,-Bsymbolic"
-+			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
-+				LDSHFLAGS_Z_NODEFS="-Wl,--allow-shlib-undefined"
-+			fi
-+			DYNEXP="-Wl,--export-dynamic"
-+			PICFLAG="-fPIC"
-+			SONAMEFLAG="-Wl,-soname="
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
-+			BLDSHARED="true"
-+			if test "${GCC}" = "yes"; then
-+				PICFLAG="-fPIC"
-+				SONAMEFLAG="-Wl,-soname="
-+				if test "${ac_cv_prog_gnu_ld}" = "yes"; then
-+					DYNEXP="-Wl,-E"
-+				fi
-+				LDSHFLAGS="-shared"
-+			else
-+				PICFLAG="-KPIC"
-+				LDSHFLAGS="-G"
-+			fi
-+			if test "$ac_cv_prog_gnu_ld" = "yes"; then
-+				SONAMEFLAG="-Wl,-soname="
-+			else
-+				SONAMEFLAG="-Wl,-h,"
-+			fi
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
-+			;;
-+		*sunos*) AC_DEFINE(SUNOS4,1,[Whether the host os is sunos4])
-+			BLDSHARED="true"
-+			LDSHFLAGS="-G"
-+			SONAMEFLAG="-Wl,-h,"
-+			PICFLAG="-KPIC"   # Is this correct for SunOS
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*netbsd* | *freebsd* | *dragonfly* )
-+			BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			DYNEXP="-Wl,--export-dynamic"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAG="-fPIC -DPIC"
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
-+			;;
-+		*openbsd*)  BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			DYNEXP="-Wl,-Bdynamic"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAG="-fPIC"
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
-+			;;
-+		*irix*) BLDSHARED="true"
-+			LDSHFLAGS="-Wl,-set_version,sgi1.0 -shared"
-+			SONAMEFLAG="-Wl,-soname,"
-+			if test "${GCC}" = "yes"; then
-+				PICFLAG="-fPIC"
-+			else
-+				PICFLAG="-KPIC"
-+			fi
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
-+			;;
-+		*aix*) AC_DEFINE(AIX,1,[Whether the host os is aix])
-+			BLDSHARED="true"
-+			# use expfull to export underscored symbols
-+			# add rtl to remove /lib/crt0.o warning
-+			LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
-+			DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
-+			PICFLAG="-O2"
-+			# as AIX code is always position independent...
-+			# .po will just create compile warnings, use po.o:
-+			if test "${GCC}" != "yes"; then
-+				## for funky AIX compiler using strncpy()
-+				CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000 -qhalt=e"
-+			fi
-+
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,DEV_BSIZE,[The size of a block])
-+			AC_DEFINE(BROKEN_STRNLEN,1,[Does strnlen work correctly])
-+			AC_DEFINE(BROKEN_STRNDUP,1,[Does strndup work correctly])
-+			;;
-+		*hpux*) AC_DEFINE(HPUX,1,[Whether the host os is HPUX])
-+			# ia64: 64bit build using gcc with CFLAGS="-mpl64"
-+			#       64bit build using HP's cc with CFLAGS="+DD64"
-+			# hppa: 64bit build unsupported by gcc
-+			#       64bit build using HP's cc with CFLAGS="+DA2.0w"
-+			# HP-UX 11.00 ld needs PHSS_33034
-+			BLDSHARED="true"
-+			if test "${GCC}" = "yes"; then
-+				PICFLAG="-fPIC"
-+				LDSHFLAGS="-shared"
-+			else
-+				PICFLAG="+z"
-+				LDSHFLAGS="-b"
-+				# "Uses depth-first symbol resolution"
-+				LDSHFLAGS="$LDSHFLAGS -Wl,-B,symbolic,-b"
-+				if test "$host_cpu" != "ia64"; then
-+					# "don't store literals in read-only memory" (?):
-+					PICFLAG="$PICFLAG +ESnolit"
-+				fi
-+			fi
-+			if test "$host_cpu" = "ia64"; then
-+				SHLIBEXT="so"
-+				# TODO: does the linker find the right 32/64 bit version of the libs? :
-+				DYNEXP="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32:/usr/local/lib/hpux64:/usr/lib/hpux64"
-+			else
-+				SHLIBEXT="sl"
-+				DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
-+			fi
-+			if test "$ac_cv_prog_gnu_ld" = "yes"; then
-+				SONAMEFLAG="-Wl,-soname="
-+			else
-+				SONAMEFLAG="-Wl,+h,"
-+			fi
-+			# PIE/PIC flags at link time are required on HP-UX because
-+			# linking requires a temporary source file, which is being
-+			# compiled with the indicated flags - which need to contain
-+			# PIC flags when we don't support PIE flags:
-+			if test "$PIE_LDFLAGS" = "" ; then
-+				PIE_LDFLAGS=\${PICFLAG}
-+			fi
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,8192,[The size of a block])
-+			AC_DEFINE(POSIX_ACL_NEEDS_MASK,1,[Does a POSIX ACL need a mask element])
-+			;;
-+		*osf*) AC_DEFINE(OSF1,1,[Whether the host os is osf1])
-+			BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			SONAMEFLAG="-Wl,-soname,"
-+			if test "${GCC}" = "yes"; then
-+				PICFLAG="-fPIC"
-+			fi
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			for flags in "-expect_unresolved '*'" "-Wl,-expect_unresolved,'*'" ; do
-+				saved_ldflags="$LDFLAGS"
-+				AC_MSG_CHECKING([if $flags works])
-+				LDFLAGS="$flags $saved_ldflags"
-+				AC_TRY_LINK([],[],
-+					[AC_MSG_RESULT([yes])
-+					LDSHFLAGS_Z_NODEFS=$flags],
-+					AC_MSG_RESULT([no]))
-+				LDFLAGS="$saved_ldflags"
-+				test x"$LDSHFLAGS_Z_NODEFS" != x && break
-+			done
-+			;;
-+		*sco*) AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*unixware*) BLDSHARED="true"
-+			LDSHFLAGS="-shared"
-+			SONAMEFLAG="-Wl,-soname,"
-+			PICFLAG="-KPIC"
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*next2*) AC_DEFINE(NEXT2,1,[Whether the host os is NeXT v2])
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*dgux*) AC_CHECK_PROG( ROFF, groff, [groff -etpsR -Tascii -man])
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*sysv4*) AC_DEFINE(SYSV,1,[Whether this is a system V system])
-+			case "$host" in
-+				*-univel-*)     if [ test "$GCC" != yes ]; then
-+						AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available])
-+					fi
-+					LDSHFLAGS="-G"
-+                             		DYNEXP="-Bexport"
-+				;;
-+				*mips-sni-sysv4*) AC_DEFINE(RELIANTUNIX,1,[Whether the host os is reliantunix]);;
-+			esac
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+
-+		*sysv5*) AC_DEFINE(SYSV,1,[Whether this is a system V system])
-+			if [ test "$GCC" != yes ]; then
-+				AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available])
-+			fi
-+			LDSHFLAGS="-G"
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+		*vos*) AC_DEFINE(STAT_ST_BLOCKSIZE,4096)
-+			BLDSHARED="false"
-+			LDSHFLAGS=""
-+			;;
-+
-+		*darwin*)   AC_DEFINE(DARWINOS,1,[Whether the host os is Darwin/MacOSX])
-+			BLDSHARED="true"
-+			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-+			CFLAGS="$CFLAGS -fno-common"
-+			SHLD="\${CC}"
-+			SHLIBEXT="dylib"
-+                        MODULE_EXPORTS="-exported_symbols_list \$(srcdir)/exports/modules-darwin.syms"
-+                        SHLIBEXT="dylib"
-+                        # Since gcc doesn't fail on unrecognised options, the
-+                        # PIE test incorrectly succeeds. Darwin gcc does not
-+                        # actually support the PIE stuff.
-+                        PIE_LDFLAGS=
-+                        PIE_CFLAGS=
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+
-+		*)
-+			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-+			;;
-+  esac
-+
-+if test "$enable_shared" != "yes"; then
-+	BLDSHARED=false
-+fi
-+
-+if test "$enable_shared" = yes -a "${ac_cv_gnu_ld_version_script}" = yes; then
-+	DSO_EXPORTS=\$$DSO_EXPORTS_CMD$
-+fi
-+
-+if test x"$BLDSHARED" = x"true" ; then
-+	LDFLAGS="$LDFLAGS -L./bin"
-+fi
-+
-+AC_MSG_RESULT($BLDSHARED)
-+
-+if test x"$enable_developer" = x"yes" ; then
-+	default_as_needed=auto
-+else
-+	default_as_needed=no
-+fi
-+AC_ARG_ENABLE(as-needed,
-+	AS_HELP_STRING([--enable-as-needed],
-+	[Turn on as-needed support if available (default=no)]),
-+	[enable_as_needed=$enableval],
-+	[enable_as_needed=$default_as_needed])
-+if test "x$enable_as_needed" != xno; then
-+    saved_before_as_needed_ldflags="$LDFLAGS"
-+    for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
-+	saved_ldflags="$LDFLAGS"
-+	AC_MSG_CHECKING([if $flags works])
-+	LDFLAGS="$flags $saved_ldflags"
-+	AC_TRY_LINK([],[],
-+		[AC_MSG_RESULT([yes])
-+		LD_AS_NEEDED_FLAG=$flags
-+		ld_as_needed_flag_found=yes],
-+		AC_MSG_RESULT([no]))
-+	LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
-+	test x"$ld_as_needed_flag_found" = xyes && break
-+    done
-+fi
-+
-+if test x$ld_as_needed_flag_found = xyes -a x$enable_as_needed = xauto ; then
-+# check if ld has bug described in https://bugzilla.samba.org/show_bug.cgi?id=7209#c17
-+	AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG has explicit external libs bug])
-+cat > conftest_shb.c <<END
-+void b() {}
-+END
-+cat > conftest_sha.c <<END
-+extern void b();
-+void a() {
-+	b();
-+}
-+END
-+cat > conftest.c <<END
-+extern void a();
-+int main() {
-+	a();
-+	return 0;
-+}
-+END
-+
-+	rm -fr conftest
-+	AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o conftest_sha.o conftest_sha.c 1>&AS_MESSAGE_LOG_FD 2>&1])
-+	AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o conftest_shb.o conftest_shb.c 1>&AS_MESSAGE_LOG_FD 2>&1])
-+	TESTCMD="`eval echo \"$SHLD $LDSHFLAGS $PICFLAG\"`"
-+	AC_TRY_COMMAND([$TESTCMD -o libconftest_shb.$SHLIBEXT conftest_shb.o 1>&AS_MESSAGE_LOG_FD 2>&1])
-+	AC_TRY_COMMAND([$TESTCMD -o libconftest_sha.$SHLIBEXT conftest_sha.o 1>&AS_MESSAGE_LOG_FD 2>&1])
-+	AC_TRY_COMMAND([$CC -o conftest conftest.c $LDFLAGS -L. -lconftest_sha -lconftest_shb 1>&AS_MESSAGE_LOG_FD 2>&1])
-+	if AC_TRY_COMMAND([eval "$LIB_PATH_VAR=. ./conftest 1>&AS_MESSAGE_LOG_FD 2>&1"])
-+	then
-+		AC_MSG_RESULT([no])
-+	else
-+		ld_as_needed_flag_found=no
-+		LDFLAGS="$saved_before_as_needed_ldflags"
-+		AC_MSG_RESULT([yes])
-+	fi
-+	rm conftest* libconftest*
-+fi
-+
-+# check if we have to disable LD_AS_NEEDED_FLAG:
-+# On some systems for a veriety of reasons linking with
-+# -Wl,--as-needed -lreadline -lncurses fails
-+# we have to retest, if these combination is detected before.
-+# Bugzilla #7209
-+
-+if test x$ac_cv_lib_readline_rl_callback_handler_install = xyes ; then
-+	if test x$ld_as_needed_flag_found = xyes ; then
-+		AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG works with readline])
-+		# try if check no fails
-+		save_LIBS=$LIBS
-+		LIBS="$LIBS $TERMLIBS"
-+		AC_TRY_LINK([], [rl_callback_handler_install();], [AC_MSG_RESULT([yes])],[ AC_MSG_RESULT([no]); LDFLAGS="$saved_before_as_needed_ldflags"])
-+		LIBS="$save_LIBS"
-+        fi
-+fi
-+
-+
-+
-+# for historical reasons almost all linkers don't complain about unresolved
-+# symbols in shared libs. Except for the internal samba modules we want to get
-+# errors when we produce a shared lib with unresolved symbols. On some
-+# platforms unresolved symbols might be intended, so we might have to add
-+# platform specific exceptions here.
-+
-+for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
-+	saved_ldflags="$LDFLAGS"
-+	AC_MSG_CHECKING([if $flags works])
-+	LDFLAGS="$flags $saved_ldflags"
-+	AC_TRY_LINK([],[],
-+	[AC_MSG_RESULT([yes])
-+	LDSHFLAGS_Z_DEFS=$flags
-+	ldshflags_z_defs_found=yes],
-+	AC_MSG_RESULT([no]))
-+	LDFLAGS=$saved_ldflags
-+	test x"$ldshflags_z_defs_found" = xyes && break
-+done
-+
-+AC_MSG_CHECKING([LDSHFLAGS_Z_DEFS])
-+AC_MSG_RESULT([$LDSHFLAGS_Z_DEFS])
-+AC_MSG_CHECKING([LDFLAGS])
-+AC_MSG_RESULT([$LDFLAGS])
-+AC_MSG_CHECKING([DYNEXP])
-+AC_MSG_RESULT([$DYNEXP])
-+
-+#######################################################
-+# test whether building a shared library actually works
-+if test $BLDSHARED = true; then
-+
-+AC_MSG_CHECKING([SHLD])
-+AC_MSG_RESULT([$SHLD])
-+AC_MSG_CHECKING([LDSHFLAGS])
-+AC_MSG_RESULT([$LDSHFLAGS])
-+
-+AC_MSG_CHECKING([SHLIBEXT])
-+AC_MSG_RESULT([$SHLIBEXT])
-+AC_MSG_CHECKING([SONAMEFLAG])
-+AC_MSG_RESULT([$SONAMEFLAG])
-+
-+AC_MSG_CHECKING([PICFLAG])
-+AC_MSG_RESULT([$PICFLAG])
-+
-+AC_MSG_CHECKING([NSSSONAMEVERSIONSUFFIX])
-+AC_MSG_RESULT([$NSSSONAMEVERSIONSUFFIX])
-+
-+AC_CACHE_CHECK([whether building shared libraries actually works],
-+               [ac_cv_shlib_works],[
-+   # try building a trivial shared library
-+   ac_cv_shlib_works=no
-+   # The $SHLD and $LDSHFLAGS variables may contain references to other
-+   # variables so they need to be eval'ed.
-+   if AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.o ${srcdir-.}/../tests/shlib.c 1>&AS_MESSAGE_LOG_FD])
-+   then
-+     TESTCMD="`eval echo \"$SHLD $LDSHFLAGS $PICFLAG\"`"
-+     TESTCMD="$TESTCMD -o \"shlib.$SHLIBEXT\" shlib.o"
-+     if AC_TRY_COMMAND([eval $TESTCMD 1>&AS_MESSAGE_LOG_FD 2>&1])
-+     then
-+       ac_cv_shlib_works=yes
-+     fi
-+   fi
-+   rm -f "shlib.$SHLIBEXT" shlib.o
-+
-+])
-+if test $ac_cv_shlib_works = no; then
-+   BLDSHARED=false
-+fi
-+fi
-+
-+if test x"$BLDSHARED" != x"true"; then
-+	LDSHFLAGS="shared-libraries-disabled"
-+	SONAMEFLAG="shared-libraries-disabled"
-+	NSSSONAMEVERSIONSUFFIX="shared-libraries-disabled"
-+	SHLD="shared-libraries-disabled"
-+	PICFLAG="${PIE_CFLAGS}"
-+	SHLIBEXT="shared_libraries_disabled"
-+	smbtorture_possible=no
-+fi
-+
-+AC_MSG_CHECKING([used PICFLAG])
-+AC_MSG_RESULT([$PICFLAG])
-+
-+AC_DEFINE_UNQUOTED(SHLIBEXT, "$SHLIBEXT", [Shared library extension])
-+
-+
-+
-+###########################################################
-+#
-+# Configuration of subsystems / libraries
-+#
-+###########################################################
-+
-+INSTALLLIBCMD_SH=:
-+INSTALLLIBCMD_A=:
-+UNINSTALLLIBCMD_SH=:
-+UNINSTALLLIBCMD_A=:
-+
-+if test $BLDSHARED = true; then
-+	INSTALLLIBCMD_SH="\$(INSTALLCMD)"
-+	UNINSTALLLIBCMD_SH="rm -f"
-+fi
-+if test $enable_static = yes; then
-+	INSTALLLIBCMD_A="\$(INSTALLCMD)"
-+	UNINSTALLLIBCMD_A="rm -f"
-+fi
-+
-+#################################################
-+# --disable-shared-libs
-+# can be used to disable the internal use of shared libs altogether
-+# (this only has an effect when building shared libs is enabled)
-+#
-+USESHARED=false
-+AC_SUBST(USESHARED)
-+
-+AC_MSG_CHECKING(whether to use shared libraries internally)
-+AC_ARG_ENABLE([shared-libs],
-+	AS_HELP_STRING([--enable-shared-libs],
-+		[Use shared libraries internally (default=yes)]),
-+	[enable_shared_libs=$enableval],
-+	[enable_shared_libs=yes])
-+
-+if test x"$enable_shared_libs" != x"no" ; then
-+	USESHARED=$BLDSHARED
-+fi
-+
-+AC_MSG_RESULT([$USESHARED])
-+
-+if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then
-+	AC_MSG_WARN([--enable-shared-libs: no support for shared libraries])
-+fi
-+
-+#################################################
-+# --with-static-libs=LIBS:
-+#   link (internal) libs dynamically or statically?
-+#
-+# If a subsystem is built as a library then this controls whether they are
-+# linked into Samba targets statically or dynamically:
-+#
-+# * If we build the shared library at all, we link dynamically by default.
-+#
-+# * We only link statically if we don't build shared or if the library
-+#   appears in the --with-static-libs configure option.
-+#
-+# Example:
-+#   --with-static-libs=libtalloc makes use of libtalloc.a instead
-+#   of linking the dynamic variant with -ltalloc.
-+#
-+# NOTE: This option only affects libraries that we do not only build
-+# but that samba also links against as libraries (as opposed to linking
-+# the plain object files. - This has to be configured in Makefile.in.
-+# So in particular it does not harm to give invalid or unknown names here.
-+#
-+
-+AC_ARG_WITH([static-libs],
-+	[AS_HELP_STRING([--with-static-libs=LIBS],
-+		[Comma-separated list of names of (internal) libraries to link statically (instead of dynamically)])],
-+	[AS_IF([test $withval],
-+		[for lib in `echo $withval | sed -e 's/,/ /g'` ; do
-+			[lib=`echo $lib | tr '[a-z]' '[A-Z]'`]
-+			eval LINK_$lib=STATIC
-+		done], [])],
-+	[])
-+
-+#
-+# WORKAROUND:
-+#   until we have organized other internal subsystems (as util, registry
-+#   and smbconf) into shared libraries, we CAN NOT link libnetapi
-+#   dynamically to samba programs.
-+#
-+LINK_LIBNETAPI=STATIC
-+
-+LINK_LIBSMBCLIENT=STATIC
-+
-+#
-+#  The library versions are hardcoded here
-+#  and filled into the LIBFOO_SOVER variable.
-+#
-+#  TODO: for talloc and tdb (at least), these should
-+#  be extracted from their respective source directories
-+#
-+AC_ARG_ENABLE(external_libtalloc,
-+	[AS_HELP_STRING([--enable-external-libtalloc],
-+		[Enable external talloc [default=auto]])],
-+	[ enable_external_libtalloc=$enableval ],
-+	[ enable_external_libtalloc=auto ])
-+
-+if test "x$enable_external_libtalloc" != xno
-+then
-+	PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1,
-+		[ enable_external_libtalloc=yes ],
-+		[ if test x$enable_external_libtalloc = xyes; then
-+			AC_MSG_ERROR([Unable to find libtalloc])
-+		  else
-+			enable_external_libtalloc=no
-+		  fi
-+		])
-+fi
-+
-+if test "x$enable_external_libtalloc" = xno
-+then
-+	m4_include(../lib/talloc/libtalloc.m4)
-+	LINK_LIBTALLOC=STATIC
-+	LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
-+	SMB_LIBRARY(talloc, 2, ${LIBTALLOCVERSION})
-+	LIBTALLOC_OBJ0=""
-+	for obj in ${TALLOC_OBJ}; do
-+		LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
-+	done
-+	SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
-+	SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CONFIGURE_CPPFLAGS} ${TALLOC_CFLAGS}"
-+	AC_SUBST(LIBTALLOC_OBJ0)
-+
-+	TALLOCTORT="bin/talloctort"
-+	AC_SUBST(TALLOCTORT)
-+fi
-+
-+
-+AC_ARG_ENABLE(external_libtdb,
-+	[AS_HELP_STRING([--enable-external-libtdb],
-+		[Enable external tdb [default=auto]])],
-+		[ enable_external_libtdb=$enableval ],
-+		[ enable_external_libtdb=auto ])
-+
-+if test "x$enable_external_libtdb" != xno
-+then
-+	PKG_CHECK_MODULES(LIBTDB, tdb >= 1.2.6,
-+		[ enable_external_libtdb=yes ],
-+		[
-+		if test x$enable_external_libtdb = xyes; then
-+			AC_MSG_ERROR([Unable to find libtdb])
-+		else
-+			enable_external_libtdb=no
-+		fi
-+		])
-+fi
-+
-+AC_SUBST(LIBTDB_OBJ0)
-+if test "x$enable_external_libtdb" = xno
-+then
-+	m4_include(../lib/tdb/libtdb.m4)
-+	LINK_LIBTDB=STATIC
-+	LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
-+	SMB_LIBRARY(tdb, 1, ${LIBTDBVERSION})
-+	LIBTDB_OBJ0=""
-+	LIBTDB_LIBS="$LIBTDB_LIBS $TDB_DEPS"
-+	for obj in ${TDB_OBJ}; do
-+		LIBTDB_OBJ0="${LIBTDB_OBJ0} ${tdbdir}/${obj}"
-+	done
-+	AC_SUBST(LIBTDB_OBJ0)
-+	SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
-+	SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CONFIGURE_CPPFLAGS} ${TDB_CFLAGS}"
-+
-+	TDBBACKUP="bin/tdbbackup"
-+	AC_SUBST(TDBBACKUP)
-+	TDBDUMP="bin/tdbdump"
-+	AC_SUBST(TDBDUMP)
-+	TDBRESTORE="bin/tdbrestore"
-+	AC_SUBST(TDBRESTORE)
-+	TDBTOOL="bin/tdbtool"
-+	AC_SUBST(TDBTOOL)
-+	TDBTORTURE="bin/tdbtorture"
-+	AC_SUBST(TDBTORTURE)
-+fi
-+
-+AC_ARG_ENABLE(external_libntdb,
-+	[AS_HELP_STRING([--enable-external-libntdb],
-+		[Enable external ntdb [default=auto]])],
-+		[ enable_external_libntdb=$enableval ],
-+		[ enable_external_libntdb=auto ])
-+
-+if test "x$enable_external_libntdb" != xno
-+then
-+	PKG_CHECK_MODULES(LIBNTDB, ntdb >= 1.0,
-+		[ enable_external_libntdb=yes ],
-+		[
-+		if test x$enable_external_libntdb = xyes; then
-+			AC_MSG_ERROR([Unable to find libntdb])
-+		else
-+			enable_external_libntdb=no
-+		fi
-+		])
-+fi
-+
-+AC_SUBST(LIBNTDB_OBJ0)
-+if test "x$enable_external_libntdb" = xno
-+then
-+	m4_include(../lib/ntdb/libntdb.m4)
-+	LINK_LIBNTDB=STATIC
-+	LIBNTDBVERSION=`grep ^VERSION ${ntdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
-+	SMB_LIBRARY(ntdb, 1, ${LIBNTDBVERSION})
-+	LIBNTDB_OBJ0=""
-+	LIBNTDB_LIBS="$LIBNTDB_LIBS $NTDB_DEPS"
-+	for obj in ${NTDB_OBJ}; do
-+		LIBNTDB_OBJ0="${LIBNTDB_OBJ0} ${ntdbdir}/${obj}"
-+	done
-+	AC_SUBST(LIBNTDB_OBJ0)
-+	SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${NTDB_CFLAGS}"
-+	SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CONFIGURE_CPPFLAGS} ${NTDB_CFLAGS}"
-+
-+	NTDBBACKUP="bin/ntdbbackup"
-+	AC_SUBST(NTDBBACKUP)
-+	NTDBDUMP="bin/ntdbdump"
-+	AC_SUBST(NTDBDUMP)
-+	NTDBRESTORE="bin/ntdbrestore"
-+	AC_SUBST(NTDBRESTORE)
-+	NTDBTOOL="bin/ntdbtool"
-+	AC_SUBST(NTDBTOOL)
-+	NTDBTORTURE="bin/ntdbtorture"
-+	AC_SUBST(NTDBTORTURE)
-+fi
-+
-+SMB_LIBRARY(netapi, 0)
-+SMB_LIBRARY(smbclient, 0)
-+SMB_LIBRARY(smbsharemodes, 0)
-+
-+
-+################
-+
-+AC_CACHE_CHECK([for long long],samba_cv_have_longlong,[
-+AC_TRY_RUN([#include <stdio.h>
-+main() { long long x = 1000000; x *= x; return(((x/1000000) == 1000000)? 0: 1); }],
-+samba_cv_have_longlong=yes,samba_cv_have_longlong=no,samba_cv_have_longlong=cross)])
-+if test x"$samba_cv_have_longlong" = x"yes"; then
-+    AC_DEFINE(HAVE_LONGLONG,1,[Whether the host supports long long's])
-+    AC_CHECK_TYPE(intptr_t, unsigned long long)
-+else
-+    AC_CHECK_TYPE(intptr_t, unsigned long)
-+fi
-+
-+#
-+# Check if the compiler supports the LL prefix on long long integers.
-+# AIX needs this.
-+
-+AC_CACHE_CHECK([for LL suffix on long long integers],samba_cv_compiler_supports_ll, [
-+    AC_TRY_COMPILE([#include <stdio.h>],[long long i = 0x8000000000LL],
-+	samba_cv_compiler_supports_ll=yes,samba_cv_compiler_supports_ll=no)])
-+if test x"$samba_cv_compiler_supports_ll" = x"yes"; then
-+   AC_DEFINE(COMPILER_SUPPORTS_LL,1,[Whether the compiler supports the LL prefix on long long integers])
-+fi
-+
-+
-+AC_CACHE_CHECK([for 64 bit time_t],samba_cv_SIZEOF_TIME_T,[
-+AC_TRY_RUN([#include <time.h>
-+main() { return((sizeof(time_t) == 8) ? 0 : 1); }],
-+samba_cv_SIZEOF_TIME_T=yes,samba_cv_SIZEOF_TIME_T=no,samba_cv_SIZEOF_TIME_T=cross)])
-+if test x"$samba_cv_SIZEOF_TIME_T" = x"yes"; then
-+    AC_DEFINE(SIZEOF_TIME_T,8,[The size of the 'time_t' type])
-+fi
-+
-+AC_CACHE_CHECK([for TIME_T_MAX],samba_cv_TIME_T_MAX,[
-+AC_TRY_RUN([#include <time.h>
-+main() {
-+	struct tm *tm;
-+	if (sizeof(time_t) == 8) {
-+		time_t max_time = 0x7fffffffffffffffll;
-+		tm = gmtime(&max_time);
-+		/* This should fail with 32-bit tm_year. */
-+		if (tm == NULL) {
-+			/* Max time_t that works with 32-bit int tm_year in struct tm. */
-+			max_time = 67768036191676799ll;
-+			tm = gmtime(&max_time);
-+			if (tm) {
-+				return(0);
-+			}
-+		}
-+	}
-+	return(1);
-+}],
-+samba_cv_TIME_T_MAX=yes,samba_cv_TIME_T_MAX=no,samba_cv_TIME_T_MAX=cross)])
-+if test x"$samba_cv_TIME_T_MAX" = x"yes"; then
-+    AC_DEFINE(TIME_T_MAX,67768036191676799ll,[The maximum value of the 'time_t' type])
-+fi
-+
-+
-+#
-+# As a gating factor for large file support, in order to
-+# use >4GB files we must have the following minimal support
-+# available: a 64 bit off_t
-+# If we don't have all of these then fail the build
-+#
-+
-+AC_MSG_CHECKING([if large file support can be enabled])
-+AC_CACHE_CHECK([for 64 bit off_t],samba_cv_SIZEOF_OFF_T,[
-+AC_TRY_RUN([#include <stdio.h>
-+#include <sys/stat.h>
-+main() { return((sizeof(off_t) == 8) ? 0 : 1); }],
-+samba_cv_SIZEOF_OFF_T=yes,samba_cv_SIZEOF_OFF_T=no,samba_cv_SIZEOF_OFF_T=cross)])
-+if test x"$samba_cv_SIZEOF_OFF_T" = x"no"; then
-+    AC_MSG_ERROR(["large file support support not available: sizeof(off_t) != 8"])
-+fi
-+
-+AC_CACHE_CHECK([for 64 bit ino_t],samba_cv_SIZEOF_INO_T,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/stat.h>
-+main() { return((sizeof(ino_t) == 8) ? 0 : 1); }],
-+samba_cv_SIZEOF_INO_T=yes,samba_cv_SIZEOF_INO_T=no,samba_cv_SIZEOF_INO_T=cross)])
-+if test x"$samba_cv_SIZEOF_INO_T" = x"yes"; then
-+    AC_DEFINE(SIZEOF_INO_T,8,[The size of the 'ino_t' type])
-+fi
-+
-+AC_CACHE_CHECK([for 64 bit dev_t],samba_cv_SIZEOF_DEV_T,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/stat.h>
-+main() { return((sizeof(dev_t) == 8) ? 0 : 1); }],
-+samba_cv_SIZEOF_DEV_T=yes,samba_cv_SIZEOF_DEV_T=no,samba_cv_SIZEOF_DEV_T=cross)])
-+if test x"$samba_cv_SIZEOF_DEV_T" = x"yes"; then
-+    AC_DEFINE(SIZEOF_DEV_T,8,[The size of the 'dev_t' type])
-+fi
-+
-+AC_CACHE_CHECK([for major macro],samba_cv_HAVE_DEVICE_MAJOR_FN,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/types.h>
-+main() { dev_t dev; int i = major(dev); return 0; }],
-+samba_cv_HAVE_DEVICE_MAJOR_FN=yes,samba_cv_HAVE_DEVICE_MAJOR_FN=no,samba_cv_HAVE_DEVICE_MAJOR_FN=cross)])
-+if test x"$samba_cv_HAVE_DEVICE_MAJOR_FN" = x"yes"; then
-+    AC_DEFINE(HAVE_DEVICE_MAJOR_FN,1,[Whether the major macro for dev_t is available])
-+fi
-+
-+AC_CACHE_CHECK([for minor macro],samba_cv_HAVE_DEVICE_MINOR_FN,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/types.h>
-+main() { dev_t dev; int i = minor(dev); return 0; }],
-+samba_cv_HAVE_DEVICE_MINOR_FN=yes,samba_cv_HAVE_DEVICE_MINOR_FN=no,samba_cv_HAVE_DEVICE_MINOR_FN=cross)])
-+if test x"$samba_cv_HAVE_DEVICE_MINOR_FN" = x"yes"; then
-+    AC_DEFINE(HAVE_DEVICE_MINOR_FN,1,[Whether the minor macro for dev_t is available])
-+fi
-+
-+AC_CACHE_CHECK([for makedev macro],samba_cv_HAVE_MAKEDEV,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/types.h>
-+main() { dev_t dev = makedev(1,2); return 0; }],
-+samba_cv_HAVE_MAKEDEV=yes,samba_cv_HAVE_MAKEDEV=no,samba_cv_HAVE_MAKEDEV=cross)])
-+if test x"$samba_cv_HAVE_MAKEDEV" = x"yes"; then
-+    AC_DEFINE(HAVE_MAKEDEV,1,[Whether the macro for makedev is available])
-+fi
-+
-+AC_CACHE_CHECK([whether seekdir returns void],samba_cv_SEEKDIR_RETURNS_VOID,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <dirent.h>
-+void seekdir(DIR *d, long loc) { return; }],[return 0;],
-+samba_cv_SEEKDIR_RETURNS_VOID=yes,samba_cv_SEEKDIR_RETURNS_VOID=no)])
-+if test x"$samba_cv_SEEKDIR_RETURNS_VOID" = x"yes"; then
-+    AC_DEFINE(SEEKDIR_RETURNS_VOID,1,[Whether seekdir returns void])
-+fi
-+
-+AC_CACHE_CHECK([for __FUNCTION__ macro],samba_cv_HAVE_FUNCTION_MACRO,[
-+AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
-+samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)])
-+if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
-+    AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
-+fi
-+
-+if test x"$libreplace_cv_HAVE_CLOCK_GETTIME_IN_LIBRT" = xyes ; then
-+	LIBS="$LIBS -lrt"
-+fi
-+
-+AC_CACHE_CHECK([for broken readdir name],samba_cv_HAVE_BROKEN_READDIR_NAME,[
-+AC_TRY_RUN([#include <sys/types.h>
-+#include <dirent.h>
-+main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d);
-+if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
-+di->d_name[0] == 0) return(0); return(1);} ],
-+samba_cv_HAVE_BROKEN_READDIR_NAME=yes,samba_cv_HAVE_BROKEN_READDIR_NAME=no,samba_cv_HAVE_BROKEN_READDIR_NAME=cross)])
-+if test x"$samba_cv_HAVE_BROKEN_READDIR_NAME" = x"yes"; then
-+    AC_DEFINE(HAVE_BROKEN_READDIR_NAME,1,[Whether readdir() returns the wrong name offset])
-+fi
-+
-+AC_CACHE_CHECK([for utimbuf],samba_cv_HAVE_UTIMBUF,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utime.h>],
-+[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; return(utime("foo.c",&tbuf));],
-+samba_cv_HAVE_UTIMBUF=yes,samba_cv_HAVE_UTIMBUF=no,samba_cv_HAVE_UTIMBUF=cross)])
-+if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
-+    AC_DEFINE(HAVE_UTIMBUF,1,[Whether struct utimbuf is available])
-+fi
-+
-+##############
-+# Check utmp details, but only if our OS offers utmp.h
-+if test x"$ac_cv_header_utmp_h" = x"yes"; then
-+dnl  utmp and utmpx come in many flavours
-+dnl  We need to check for many of them
-+dnl  But we don't need to do each and every one, because our code uses
-+dnl  mostly just the utmp (not utmpx) fields.
-+
-+AC_CHECK_FUNCS(pututline pututxline updwtmp updwtmpx getutmpx getutxent)
-+
-+AC_CACHE_CHECK([for ut_name in utmp],samba_cv_HAVE_UT_UT_NAME,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_name[0] = 'a';],
-+samba_cv_HAVE_UT_UT_NAME=yes,samba_cv_HAVE_UT_UT_NAME=no,samba_cv_HAVE_UT_UT_NAME=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_NAME" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_NAME,1,[Whether the utmp struct has a property ut_name])
-+fi
-+
-+AC_CACHE_CHECK([for ut_user in utmp],samba_cv_HAVE_UT_UT_USER,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_user[0] = 'a';],
-+samba_cv_HAVE_UT_UT_USER=yes,samba_cv_HAVE_UT_UT_USER=no,samba_cv_HAVE_UT_UT_USER=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_USER" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_USER,1,[Whether the utmp struct has a property ut_user])
-+fi
-+
-+AC_CACHE_CHECK([for ut_id in utmp],samba_cv_HAVE_UT_UT_ID,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_id[0] = 'a';],
-+samba_cv_HAVE_UT_UT_ID=yes,samba_cv_HAVE_UT_UT_ID=no,samba_cv_HAVE_UT_UT_ID=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_ID" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_ID,1,[Whether the utmp struct has a property ut_id])
-+fi
-+
-+AC_CACHE_CHECK([for ut_host in utmp],samba_cv_HAVE_UT_UT_HOST,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_host[0] = 'a';],
-+samba_cv_HAVE_UT_UT_HOST=yes,samba_cv_HAVE_UT_UT_HOST=no,samba_cv_HAVE_UT_UT_HOST=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_HOST" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_HOST,1,[Whether the utmp struct has a property ut_host])
-+fi
-+
-+AC_CACHE_CHECK([for ut_time in utmp],samba_cv_HAVE_UT_UT_TIME,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  time_t t; ut.ut_time = t;],
-+samba_cv_HAVE_UT_UT_TIME=yes,samba_cv_HAVE_UT_UT_TIME=no,samba_cv_HAVE_UT_UT_TIME=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_TIME" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_TIME,1,[Whether the utmp struct has a property ut_time])
-+fi
-+
-+AC_CACHE_CHECK([for ut_tv in utmp],samba_cv_HAVE_UT_UT_TV,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  struct timeval tv; ut.ut_tv = tv;],
-+samba_cv_HAVE_UT_UT_TV=yes,samba_cv_HAVE_UT_UT_TV=no,samba_cv_HAVE_UT_UT_TV=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_TV" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_TV,1,[Whether the utmp struct has a property ut_tv])
-+fi
-+
-+AC_CACHE_CHECK([for ut_type in utmp],samba_cv_HAVE_UT_UT_TYPE,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_type = 0;],
-+samba_cv_HAVE_UT_UT_TYPE=yes,samba_cv_HAVE_UT_UT_TYPE=no,samba_cv_HAVE_UT_UT_TYPE=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_TYPE" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_TYPE,1,[Whether the utmp struct has a property ut_type])
-+fi
-+
-+AC_CACHE_CHECK([for ut_pid in utmp],samba_cv_HAVE_UT_UT_PID,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_pid = 0;],
-+samba_cv_HAVE_UT_UT_PID=yes,samba_cv_HAVE_UT_UT_PID=no,samba_cv_HAVE_UT_UT_PID=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_PID" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_PID,1,[Whether the utmp struct has a property ut_pid])
-+fi
-+
-+AC_CACHE_CHECK([for ut_exit in utmp],samba_cv_HAVE_UT_UT_EXIT,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+[struct utmp ut;  ut.ut_exit.e_exit = 0;],
-+samba_cv_HAVE_UT_UT_EXIT=yes,samba_cv_HAVE_UT_UT_EXIT=no,samba_cv_HAVE_UT_UT_EXIT=cross)])
-+if test x"$samba_cv_HAVE_UT_UT_EXIT" = x"yes"; then
-+    AC_DEFINE(HAVE_UT_UT_EXIT,1,[Whether the utmp struct has a property ut_exit])
-+fi
-+
-+if test x$ac_cv_func_pututline = xyes ; then
-+  AC_CACHE_CHECK([whether pututline returns pointer],samba_cv_PUTUTLINE_RETURNS_UTMP,[
-+  AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmp.h>],
-+  [struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);],
-+  samba_cv_PUTUTLINE_RETURNS_UTMP=yes,samba_cv_PUTUTLINE_RETURNS_UTMP=no)])
-+  if test x"$samba_cv_PUTUTLINE_RETURNS_UTMP" = x"yes"; then
-+      AC_DEFINE(PUTUTLINE_RETURNS_UTMP,1,[Whether pututline returns pointer])
-+  fi
-+fi
-+
-+AC_CACHE_CHECK([for ut_syslen in utmpx],samba_cv_HAVE_UX_UT_SYSLEN,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <utmpx.h>],
-+[struct utmpx ux;  ux.ut_syslen = 0;],
-+samba_cv_HAVE_UX_UT_SYSLEN=yes,samba_cv_HAVE_UX_UT_SYSLEN=no,samba_cv_HAVE_UX_UT_SYSLEN=cross)])
-+if test x"$samba_cv_HAVE_UX_UT_SYSLEN" = x"yes"; then
-+    AC_DEFINE(HAVE_UX_UT_SYSLEN,1,[Whether the utmpx struct has a property ut_syslen])
-+fi
-+
-+AC_CACHE_CHECK([whether sizeof ut_line in utmp is ok],samba_cv_HAVE_UX_UT_LINE,[
-+AC_TRY_RUN([#include <stdio.h>
-+#include <sys/types.h>
-+#include <utmp.h>
-+int main(void) {
-+ if (sizeof(((struct utmp *)NULL)->ut_line) < 15) {
-+     return 1;
-+ }
-+ return 0;
-+}
-+],
-+samba_cv_HAVE_UX_UT_LINE=yes,samba_cv_HAVE_UX_UT_LINE=no,samba_cv_HAVE_UX_UT_LINE=cross)])
-+
-+fi
-+# end utmp details
-+
-+AC_CACHE_CHECK([for linux fallocate],samba_cv_HAVE_LINUX_FALLOCATE,[
-+AC_TRY_COMPILE([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/types.h>
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#if defined(HAVE_LINUX_FALLOC_H)
-+#include <linux/falloc.h>
-+#endif],
-+[int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);],
-+samba_cv_HAVE_LINUX_FALLOCATE=yes,samba_cv_HAVE_LINUX_FALLOCATE=no)])
-+if test x"$samba_cv_HAVE_LINUX_FALLOCATE" = x"yes" && test x"$ac_cv_func_fallocate" = x"yes"; then
-+    AC_DEFINE(HAVE_LINUX_FALLOCATE,1,[Whether the Linux 'fallocate' function is available])
-+fi
-+
-+AC_CACHE_CHECK([for getcwd takes NULL],samba_cv_GETCWD_TAKES_NULL,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+main() { char *s = getcwd(NULL,0); if (s) return(0); return(1); }],
-+samba_cv_GETCWD_TAKES_NULL=yes,samba_cv_GETCWD_TAKES_NULL=no,samba_cv_GETCWD_TAKES_NULL=cross)])
-+if test x"$samba_cv_GETCWD_TAKES_NULL" = x"yes"; then
-+    AC_DEFINE(GETCWD_TAKES_NULL,1,[Whether the getcwd function takes NULL as an argument])
-+fi
-+
-+ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
-+AC_ARG_WITH(libiconv,
-+[AS_HELP_STRING([--with-libiconv=BASEDIR], [Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto)])],
-+[
-+  if test "$withval" = "no" ; then
-+    AC_MSG_ERROR([argument to --with-libiconv must be a directory])
-+  else
-+     if test "$withval" != "yes" ; then
-+	ICONV_PATH_SPEC=yes
-+        ICONV_LOOK_DIRS="$withval"
-+     fi
-+  fi
-+])
-+
-+for i in $ICONV_LOOK_DIRS ; do
-+
-+    save_LIBS="$LIBS"
-+    save_LDFLAGS="$LDFLAGS"
-+    save_CPPFLAGS="$CPPFLAGS"
-+
-+    iconv_current_LIBS=""
-+    iconv_current_LDFLAGS=""
-+    iconv_current_CPPFLAGS=""
-+
-+    ICONV_FOUND="no"
-+    unset libext
-+
-+    #  This is here to handle -withval stuff for --with-libiconv
-+    #  Perhaps we should always add a -L
-+    CPPFLAGS="$save_CPPFLAGS -I$i/include"
-+
-+    # Check lib and lib32 library variants to cater for IRIX ABI-specific
-+    # installation paths. This gets a little tricky since we might have iconv
-+    # in both libiconv and in libc. In this case the jm_ICONV test will always
-+    # succeed when the header is found. To counter this, make sure the
-+    # library directory is there and check the ABI directory first (which
-+    # should be harmless on other systems, but causes tons of linker warnings on
-+    # 64bit Ubuntu systems).
-+    # As the build farm doesn't seem to have any IRIX machines with iconv.h
-+    # installed, I've decided to fix the linker warnings.
-+    # -- Kai
-+    # For IA64 HPUX systems, the libs are located in lib/hpux32 instead of lib.
-+    for l in "lib" "lib32" "lib/hpux32"; do
-+        if test -d "$i/$l" ; then
-+                LDFLAGS="$save_LDFLAGS -L$i/$l"
-+		LIBS=
-+		export LDFLAGS LIBS CPPFLAGS
-+		# Try to find iconv(3)
-+                jm_ICONV($i/$l)
-+                if test x"$ICONV_FOUND" = "xyes" ; then
-+		    libext="$l"
-+		    break
-+		fi
-+        fi
-+    done
-+
-+    if test x"$ICONV_FOUND" = "xyes" ; then
-+	iconv_current_LDFLAGS="-L$i/$libext"
-+	iconv_current_CPPFLAGS="-I$i/include"
-+
-+        if test x"$jm_cv_lib_iconv" != x; then
-+	    iconv_current_LIBS="$LIBS -l$jm_cv_lib_iconv"
-+	else
-+	    # We found iconv in libc.
-+	    iconv_current_LIBS=""
-+        fi
-+
-+    fi
-+
-+    if test x"$ICONV_FOUND" = "xyes" ; then
-+
-+        LDFLAGS="$save_LDFLAGS $iconv_current_LDFLAGS"
-+        CPPFLAGS="$save_CPPFLAGS $iconv_current_CPPFLAGS"
-+	LIBS="$save_LIBS $iconv_current_LIBS"
-+        export LDFLAGS LIBS CPPFLAGS
-+
-+	default_dos_charset=no
-+	default_unix_charset=no
-+
-+	# check for default dos charset name
-+	for j in CP850 IBM850 ; do
-+	    rjs_CHARSET($j)
-+	    default_dos_charset="$ICONV_CHARSET"
-+	    if test x"$default_dos_charset" = x"$j"; then
-+		break
-+	    fi
-+	done
-+
-+	# check for default unix charset name
-+	for j in UTF-8 UTF8 ; do
-+	    rjs_CHARSET($j)
-+	    default_unix_charset="$ICONV_CHARSET"
-+	    if test x"$default_unix_charset" = x"$j"; then
-+		break
-+	    fi
-+	done
-+
-+	if test "$default_dos_charset" != "no" -a \
-+		"$default_dos_charset" != "cross" -a \
-+		"$default_unix_charset" != "no" -a \
-+		"$default_unix_charset" != "cross"
-+	then
-+		samba_cv_HAVE_NATIVE_ICONV=yes
-+	else
-+	    if test "$default_dos_charset" = "cross" -o \
-+		     "$default_unix_charset" = "cross"
-+	    then
-+		    samba_cv_HAVE_NATIVE_ICONV=cross
-+	    else
-+		    samba_cv_HAVE_NATIVE_ICONV=no
-+	    fi
-+	fi
-+
-+	# At this point, we have a libiconv candidate. We know that
-+	# we have the right headers and libraries, but we don't know
-+	# whether it does the conversions we want. We can't test this
-+	# because we are cross-compiling. This is not necessarily a big
-+	# deal, since we can't guarantee that the results we get now will
-+	# match the results we get at runtime anyway.
-+	if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"cross" ; then
-+	    default_dos_charset="CP850"
-+	    default_unix_charset="UTF-8"
-+	    samba_cv_HAVE_NATIVE_ICONV=yes
-+	    AC_MSG_WARN(assuming the libiconv in $iconv_current_LDFLAGS can convert)
-+	    AC_MSG_WARN([$default_dos_charset and $default_unix_charset to UCS-16LE])
-+	fi
-+
-+        if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes" ; then
-+
-+	    CPPFLAGS=$save_CPPFLAGS
-+	    LDFLAGS=$save_LDFLAGS
-+	    LIBS=$save_LIBS
-+
-+	    if test x"$iconv_current_LIBS" != x; then
-+		LIBS="$LIBS $iconv_current_LIBS"
-+	    fi
-+
-+	    # Add the flags we need to CPPFLAGS and LDFLAGS
-+	    CPPFLAGS="$CPPFLAGS $iconv_current_CPPFLAGS"
-+	    LDFLAGS="$LDFLAGS $iconv_current_LDFLAGS"
-+
-+	    # Turn the #defines into string literals
-+	    default_dos_charset="\"$default_dos_charset\""
-+	    default_unix_charset="\"$default_unix_charset\""
-+
-+	    AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
-+	    AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,$default_dos_charset,[Default dos charset name])
-+	    AC_DEFINE_UNQUOTED(DEFAULT_UNIX_CHARSET,$default_unix_charset,[Default unix charset name])
-+
-+           break
-+        fi
-+
-+    # We didn't find a working iconv, so keep going
-+    fi
-+
-+    #  We only need to clean these up here for the next pass through the loop
-+    CPPFLAGS=$save_CPPFLAGS
-+    LDFLAGS=$save_LDFLAGS
-+    LIBS=$save_LIBS
-+    export LDFLAGS LIBS CPPFLAGS
-+done
-+unset libext
-+
-+
-+if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
-+    AC_MSG_WARN([Sufficient support for iconv function was not found.
-+    Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!])
-+   AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,"ASCII",[Default dos charset name])
-+   AC_DEFINE_UNQUOTED(DEFAULT_UNIX_CHARSET,"UTF8",[Default unix charset name])
-+fi
-+
-+
-+AC_CACHE_CHECK([for Linux kernel oplocks],samba_cv_HAVE_KERNEL_OPLOCKS_LINUX,[
-+AC_TRY_RUN([
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#ifndef F_GETLEASE
-+#define F_GETLEASE	1025
-+#endif
-+main() {
-+       int fd = open("/dev/null", O_RDONLY);
-+       return fcntl(fd, F_GETLEASE, 0) == -1;
-+}
-+],
-+samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes,samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=no,samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=cross)])
-+if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" = x"yes"; then
-+    AC_DEFINE(HAVE_KERNEL_OPLOCKS_LINUX,1,[Whether to use linux kernel oplocks])
-+fi
-+
-+AC_CACHE_CHECK([for kernel change notify support],samba_cv_HAVE_KERNEL_CHANGE_NOTIFY,[
-+AC_TRY_RUN([
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <signal.h>
-+#ifndef F_NOTIFY
-+#define F_NOTIFY 1026
-+#endif
-+main() {
-+	return(fcntl(open("/tmp", O_RDONLY), F_NOTIFY, 0) == -1 ?  1 : 0);
-+}
-+],
-+samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes,samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no,samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=cross)])
-+if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
-+    AC_DEFINE(HAVE_KERNEL_CHANGE_NOTIFY,1,[Whether kernel notifies changes])
-+fi
-+
-+AC_CHECK_HEADER(sys/inotify.h)
-+
-+if test x"$ac_cv_header_sys_inotify_h" = x"yes"; then
-+    AC_DEFINE(HAVE_INOTIFY,1,[For inotify support])
-+fi
-+
-+#################################################
-+# Check if FAM notifications are available. For FAM info, see
-+#	http://oss.sgi.com/projects/fam/
-+#	http://savannah.nongnu.org/projects/fam/
-+AC_ARG_ENABLE(fam,
-+[AS_HELP_STRING([--enable-fam], [Turn on FAM support (default=auto)])])
-+
-+if test x$enable_fam != xno; then
-+    AC_CHECK_HEADERS(fam.h, [samba_cv_HAVE_FAM_H=yes], [samba_cv_HAVE_FAM_H=no])
-+    if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then
-+        # On IRIX, libfam requires libC, but other FAM implementations
-+	# might not need it.
-+        AC_CHECK_LIB(fam, FAMOpen2,
-+	    [samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam";
-+	    AC_DEFINE(HAVE_FAMOPEN2, 1, Define to 1 if there is support for FAMOpen2)],
-+	    [samba_cv_HAVE_LIBFAM=no])
-+
-+        if test x"$samba_cv_HAVE_LIBFAM" = x"no" ; then
-+            samba_fam_xtra=-lC
-+            AC_CHECK_LIB_EXT(fam, samba_fam_xtra, FAMOpen2,
-+		[samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam -lC";
-+		AC_DEFINE(HAVE_FAMOPEN2, 1, Define to 1 if there is support for FAMOpen2)],
-+		[samba_cv_HAVE_LIBFAM=no])
-+            unset samba_fam_xtra
-+        fi
-+    fi
-+    if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
-+        default_shared_modules="$default_shared_modules vfs_notify_fam"
-+        AC_TRY_COMPILE([#include <fam.h>],
-+                    [enum FAMCodes code = FAMChanged;],
-+                    AC_DEFINE(HAVE_FAM_H_FAMCODES_TYPEDEF, 1,
-+                        [Whether fam.h contains a typedef for enum FAMCodes]),
-+                    [])
-+    fi
-+
-+    if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
-+	AC_CHECK_LIB(fam, FAMNoExists,
-+	    [AC_DEFINE(HAVE_FAMNOEXISTS, 1, Define to 1 if there is support for FAMNoExists)])
-+    fi
-+
-+    if test x$enable_fam = xyes && test x"$samba_cv_HAVE_LIBFAM" != xyes ; then
-+        AC_MSG_ERROR(FAM support requested but FAM library not available )
-+    fi
-+fi
-+
-+AC_SUBST(SMB_FAM_LIBS)
-+
-+#################################################
-+# Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
-+
-+
-+with_dmapi_support=auto
-+AC_MSG_CHECKING(whether to use DMAPI support)
-+AC_ARG_WITH(dmapi,
-+[AS_HELP_STRING([--with-dmapi], [Include DMAPI/XDSM support (default=auto)])],
-+[ case "$withval" in
-+  yes|no)
-+    with_dmapi_support=$withval
-+    ;;
-+  esac ]
-+)
-+AC_MSG_RESULT([$with_dmapi_support])
-+
-+if test x"$with_dmapi_support" != xno ; then
-+	SMB_CHECK_DMAPI([], [
-+		AC_MSG_NOTICE(DMAPI support not present)
-+		if test x"$with_dmapi_support" = xyes ; then
-+			AC_MSG_ERROR(no DMAPI support found but requested!)
-+		fi
-+		]
-+	)
-+fi
-+
-+# Add TSM SM VFS module only if there are both GPFS and DMAPI support
-+# Theoretically it should work with AIX JFS2 too but this needs testing
-+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
-+    default_shared_modules="$default_shared_modules vfs_tsmsm"
-+fi
-+
-+AC_CACHE_CHECK([for kernel share modes],samba_cv_HAVE_KERNEL_SHARE_MODES,[
-+AC_TRY_RUN([
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <signal.h>
-+#include <sys/file.h>
-+#ifndef LOCK_MAND
-+#define LOCK_MAND	32
-+#define LOCK_READ	64
-+#endif
-+main() {
-+	return(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
-+}
-+],
-+samba_cv_HAVE_KERNEL_SHARE_MODES=yes,samba_cv_HAVE_KERNEL_SHARE_MODES=no,samba_cv_HAVE_KERNEL_SHARE_MODES=cross)])
-+if test x"$samba_cv_HAVE_KERNEL_SHARE_MODES" = x"yes"; then
-+    AC_DEFINE(HAVE_KERNEL_SHARE_MODES,1,[Whether the kernel supports share modes])
-+fi
-+
-+
-+AC_CACHE_CHECK([for IRIX kernel oplock type definitions],samba_cv_HAVE_KERNEL_OPLOCKS_IRIX,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <fcntl.h>],
-+[oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;],
-+samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes,samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no)])
-+if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_IRIX" = x"yes"; then
-+    AC_DEFINE(HAVE_KERNEL_OPLOCKS_IRIX,1,[Whether IRIX kernel oplock type definitions are available])
-+fi
-+
-+#################################################
-+# Check for POSIX capability support
-+
-+AC_CHECK_HEADER(sys/capability.h, [samba_cv_HAVE_SYS_CAPABILITY_H=yes;
-+    AC_DEFINE(HAVE_SYS_CAPABILITY_H, 1, Whether sys/capability.h is present)],
-+    [], [])
-+
-+if test x"$samba_cv_HAVE_SYS_CAPABILITY_H" = x"yes"; then
-+
-+    ac_save_LIBS=$LIBS
-+    AC_LIBTESTFUNC(cap, cap_get_proc)
-+
-+    AC_CACHE_CHECK([for POSIX capabilities],
-+	    samba_cv_HAVE_POSIX_CAPABILITIES,
-+	    [
-+		AC_TRY_RUN([
-+#include <sys/types.h>
-+#include <sys/capability.h>
-+main() {
-+ cap_t cap;
-+ cap_value_t vals[1];
-+ if (!(cap = cap_get_proc()))
-+   return(1);
-+ vals[0] = CAP_CHOWN;
-+ cap_set_flag(cap, CAP_INHERITABLE, 1, vals, CAP_CLEAR);
-+ cap_set_proc(cap);
-+ return(0);
-+}],
-+		samba_cv_HAVE_POSIX_CAPABILITIES=yes,
-+		samba_cv_HAVE_POSIX_CAPABILITIES=no,
-+		samba_cv_HAVE_POSIX_CAPABILITIES=cross)
-+	    ])
-+
-+if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
-+    AC_DEFINE(HAVE_POSIX_CAPABILITIES, 1,
-+	    [Whether POSIX capabilities are available])
-+else
-+    LIBS=$ac_save_LIBS
-+fi
-+
-+fi
-+
-+#
-+# Check for int16, uint16, int32 and uint32 in rpc/types.h included from rpc/rpc.h
-+# This is *really* broken but some systems (DEC OSF1) do this.... JRA.
-+#
-+
-+AC_CACHE_CHECK([for int16 typedef included by rpc/rpc.h],samba_cv_HAVE_INT16_FROM_RPC_RPC_H,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#if defined(HAVE_RPC_RPC_H)
-+#include <rpc/rpc.h>
-+#endif],
-+[int16 testvar;],
-+samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes,samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no)])
-+if test x"$samba_cv_HAVE_INT16_FROM_RPC_RPC_H" = x"yes"; then
-+    AC_DEFINE(HAVE_INT16_FROM_RPC_RPC_H,1,[Whether int16 typedef is included by rpc/rpc.h])
-+fi
-+
-+AC_CACHE_CHECK([for uint16 typedef included by rpc/rpc.h],samba_cv_HAVE_UINT16_FROM_RPC_RPC_H,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#if defined(HAVE_RPC_RPC_H)
-+#include <rpc/rpc.h>
-+#endif],
-+[uint16 testvar;],
-+samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes,samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=no)])
-+if test x"$samba_cv_HAVE_UINT16_FROM_RPC_RPC_H" = x"yes"; then
-+    AC_DEFINE(HAVE_UINT16_FROM_RPC_RPC_H,1,[Whether uint16 typedef is included by rpc/rpc.h])
-+fi
-+
-+AC_CACHE_CHECK([for int32 typedef included by rpc/rpc.h],samba_cv_HAVE_INT32_FROM_RPC_RPC_H,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#if defined(HAVE_RPC_RPC_H)
-+#include <rpc/rpc.h>
-+#endif],
-+[int32 testvar;],
-+samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes,samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no)])
-+if test x"$samba_cv_HAVE_INT32_FROM_RPC_RPC_H" = x"yes"; then
-+    AC_DEFINE(HAVE_INT32_FROM_RPC_RPC_H,1,[Whether int32 typedef is included by rpc/rpc.h])
-+fi
-+
-+AC_CACHE_CHECK([for uint32 typedef included by rpc/rpc.h],samba_cv_HAVE_UINT32_FROM_RPC_RPC_H,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#if defined(HAVE_RPC_RPC_H)
-+#include <rpc/rpc.h>
-+#endif],
-+[uint32 testvar;],
-+samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes,samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=no)])
-+if test x"$samba_cv_HAVE_UINT32_FROM_RPC_RPC_H" = x"yes"; then
-+    AC_DEFINE(HAVE_UINT32_FROM_RPC_RPC_H,1,[Whether uint32 typedef is included by rpc/rpc.h])
-+fi
-+
-+dnl
-+dnl Some systems (SCO) have a problem including
-+dnl <prot.h> and <rpc/rpc.h> due to AUTH_ERROR being defined
-+dnl as a #define in <prot.h> and as part of an enum
-+dnl in <rpc/rpc.h>.
-+dnl
-+
-+AC_CACHE_CHECK([for conflicting AUTH_ERROR define in rpc/rpc.h],samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#ifdef HAVE_SYS_SECURITY_H
-+#include <sys/security.h>
-+#include <prot.h>
-+#endif  /* HAVE_SYS_SECURITY_H */
-+#if defined(HAVE_RPC_RPC_H)
-+#include <rpc/rpc.h>
-+#endif],
-+[int testvar;],
-+samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no,samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=yes)])
-+if test x"$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" = x"yes"; then
-+    AC_DEFINE(HAVE_RPC_AUTH_ERROR_CONFLICT,1,[Whether there is a conflicting AUTH_ERROR define in rpc/rpc.h])
-+fi
-+
-+AC_MSG_CHECKING([for test routines])
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/trivial.c"],
-+           AC_MSG_RESULT(yes),
-+	   AC_MSG_ERROR([cant find test code. Aborting config]),
-+	   AC_MSG_WARN([cannot run when cross-compiling]))
-+
-+AC_CACHE_CHECK([for ftruncate extend],samba_cv_HAVE_FTRUNCATE_EXTEND,[
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/ftruncate.c"],
-+           samba_cv_HAVE_FTRUNCATE_EXTEND=yes,samba_cv_HAVE_FTRUNCATE_EXTEND=no,samba_cv_HAVE_FTRUNCATE_EXTEND=cross)])
-+if test x"$samba_cv_HAVE_FTRUNCATE_EXTEND" = x"yes"; then
-+    AC_DEFINE(HAVE_FTRUNCATE_EXTEND,1,[Truncate extend])
-+fi
-+
-+AC_CACHE_CHECK([for broken getgroups],samba_cv_HAVE_BROKEN_GETGROUPS,[
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/getgroups.c"],
-+           samba_cv_HAVE_BROKEN_GETGROUPS=yes,samba_cv_HAVE_BROKEN_GETGROUPS=no,samba_cv_HAVE_BROKEN_GETGROUPS=cross)])
-+if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then
-+    AC_DEFINE(HAVE_BROKEN_GETGROUPS,1,[Whether getgroups is broken])
-+fi
-+
-+SMB_CHECK_SYSCONF(_SC_NGROUPS_MAX)
-+SMB_CHECK_SYSCONF(_SC_NPROC_ONLN)
-+SMB_CHECK_SYSCONF(_SC_NPROCESSORS_ONLN)
-+SMB_CHECK_SYSCONF(_SC_PAGESIZE)
-+AC_CHECK_FUNCS(getpagesize)
-+
-+################################################
-+# look for a method of setting the effective uid
-+seteuid=no;
-+
-+################################################
-+# Start by checking for 32-bit system call definitions on Linux.
-+
-+case "$host_os" in
-+*linux*)
-+AC_CACHE_CHECK([for Linux 32-bit system calls],samba_cv_USE_LINUX_32BIT_SYSCALLS,[
-+AC_TRY_COMPILE([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+
-+#ifdef HAVE_SYS_PRIV_H
-+#include <sys/priv.h>
-+#endif
-+#ifdef HAVE_SYS_ID_H
-+#include <sys/id.h>
-+#endif
-+
-+#if defined(HAVE_SYSCALL_H)
-+#include <syscall.h>
-+#endif
-+
-+#if defined(HAVE_SYS_SYSCALL_H)
-+#include <sys/syscall.h>
-+#endif
-+],
-+[
-+syscall(SYS_setresuid32, -1, -1, -1);
-+syscall(SYS_setresgid32, -1, -1, -1);
-+syscall(SYS_setreuid32, -1, -1);
-+syscall(SYS_setregid32, -1, -1);
-+syscall(SYS_setuid32, -1);
-+syscall(SYS_setgid32, -1);
-+syscall(SYS_setgroups32, 0, NULL);
-+], samba_cv_USE_LINUX_32BIT_SYSCALLS=yes,samba_cv_USE_LINUX_32BIT_SYSCALLS=no,samba_cv_USE_LINUX_32BIT_SYSCALLS=cross)])
-+
-+if test x"$samba_cv_USE_LINUX_32BIT_SYSCALLS" = x"yes"; then
-+    AC_DEFINE(USE_LINUX_32BIT_SYSCALLS,1,[Use Linux 32-bit system calls])
-+    AC_CACHE_CHECK([for Linux thread-specific credentials with 32-bit system calls],samba_cv_USE_LINUX_THREAD_CREDENTIALS,[
-+    AC_TRY_RUN([
-+#define AUTOCONF_TEST 1
-+#define USE_LINUX_THREAD_CREDENTIALS 1
-+#define USE_LINUX_32BIT_SYSCALLS 1
-+#include "${srcdir-.}/../lib/util/setid.c"
-+#include "${srcdir-.}/lib/util_sec.c"],
-+           samba_cv_USE_LINUX_THREAD_CREDENTIALS=yes,samba_cv_USE_LINUX_THREAD_CREDENTIALS=no,samba_cv_USE_LINUX_THREAD_CREDENTIALS=cross)])
-+if test x"$samba_cv_USE_LINUX_THREAD_CREDENTIALS" = x"yes"; then
-+    seteuid=yes;
-+    AC_DEFINE(USE_LINUX_THREAD_CREDENTIALS,1,[Whether we can use Linux thread-specific credentials with 32-bit system calls])
-+fi
-+fi
-+
-+if test $seteuid = no; then
-+AC_CACHE_CHECK([for Linux thread-specific credentials],samba_cv_USE_LINUX_THREAD_CREDENTIALS,[
-+AC_TRY_RUN([
-+#define AUTOCONF_TEST 1
-+#define USE_LINUX_THREAD_CREDENTIALS 1
-+#include "${srcdir-.}/../lib/util/setid.c"
-+#include "${srcdir-.}/lib/util_sec.c"],
-+           samba_cv_USE_LINUX_THREAD_CREDENTIALS=yes,samba_cv_USE_LINUX_THREAD_CREDENTIALS=no,samba_cv_USE_LINUX_THREAD_CREDENTIALS=cross)])
-+if test x"$samba_cv_USE_LINUX_THREAD_CREDENTIALS" = x"yes"; then
-+    seteuid=yes;AC_DEFINE(USE_LINUX_THREAD_CREDENTIALS,1,[Whether we can use Linux thread-specific credentials])
-+fi
-+fi
-+
-+;;
-+esac
-+
-+if test $seteuid = no; then
-+AC_CACHE_CHECK([for setreuid],samba_cv_USE_SETREUID,[
-+AC_TRY_RUN([
-+#define AUTOCONF_TEST 1
-+#define USE_SETREUID 1
-+#include "confdefs.h"
-+#include "${srcdir-.}/../lib/util/setid.c"
-+#include "${srcdir-.}/lib/util_sec.c"],
-+           samba_cv_USE_SETREUID=yes,samba_cv_USE_SETREUID=no,samba_cv_USE_SETREUID=cross)])
-+if test x"$samba_cv_USE_SETREUID" = x"yes"; then
-+    seteuid=yes;AC_DEFINE(USE_SETREUID,1,[Whether setreuid() is available])
-+fi
-+fi
-+
-+# we check for setresuid second as it conflicts with AIO on Linux. 
-+# see http://samba.org/~tridge/junkcode/aio_uid.c
-+if test $seteuid = no; then
-+AC_CACHE_CHECK([for setresuid],samba_cv_USE_SETRESUID,[
-+AC_TRY_RUN([
-+#define AUTOCONF_TEST 1
-+#define USE_SETRESUID 1
-+#include "confdefs.h"
-+#include "${srcdir-.}/../lib/util/setid.c"
-+#include "${srcdir-.}/lib/util_sec.c"],
-+           samba_cv_USE_SETRESUID=yes,samba_cv_USE_SETRESUID=no,samba_cv_USE_SETRESUID=cross)])
-+if test x"$samba_cv_USE_SETRESUID" = x"yes"; then
-+    seteuid=yes;AC_DEFINE(USE_SETRESUID,1,[Whether setresuid() is available])
-+fi
-+fi
-+
-+if test $seteuid = no; then
-+AC_CACHE_CHECK([for seteuid],samba_cv_USE_SETEUID,[
-+AC_TRY_RUN([
-+#define AUTOCONF_TEST 1
-+#define USE_SETEUID 1
-+#include "confdefs.h"
-+#include "${srcdir-.}/../lib/util/setid.c"
-+#include "${srcdir-.}/lib/util_sec.c"],
-+           samba_cv_USE_SETEUID=yes,samba_cv_USE_SETEUID=no,samba_cv_USE_SETEUID=cross)])
-+if test x"$samba_cv_USE_SETEUID" = x"yes"; then
-+    seteuid=yes;AC_DEFINE(USE_SETEUID,1,[Whether seteuid() is available])
-+fi
-+fi
-+
-+if test $seteuid = no; then
-+AC_CACHE_CHECK([for setuidx],samba_cv_USE_SETUIDX,[
-+AC_TRY_RUN([
-+#define AUTOCONF_TEST 1
-+#define USE_SETUIDX 1
-+#include "confdefs.h"
-+#include "${srcdir-.}/../lib/util/setid.c"
-+#include "${srcdir-.}/lib/util_sec.c"],
-+           samba_cv_USE_SETUIDX=yes,samba_cv_USE_SETUIDX=no,samba_cv_USE_SETUIDX=cross)])
-+if test x"$samba_cv_USE_SETUIDX" = x"yes"; then
-+    seteuid=yes;AC_DEFINE(USE_SETUIDX,1,[Whether setuidx() is available])
-+fi
-+fi
-+
-+AC_CACHE_CHECK([for the Darwin initgroups system call],
-+	samba_cv_DARWIN_INITGROUPS,
-+	AC_TRY_LINK([
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+	],
-+	[ syscall(SYS_initgroups, 16, NULL, NULL, 0); ],
-+	samba_cv_DARWIN_INITGROUPS=yes,
-+	samba_cv_DARWIN_INITGROUPS=no)
-+)
-+
-+if test x"$samba_cv_DARWIN_INITGROUPS" = x"yes" ; then
-+    AC_DEFINE(HAVE_DARWIN_INITGROUPS, 1,
-+	[Whether to use the Darwin-specific initgroups system call])
-+fi
-+
-+AC_CACHE_CHECK([for fcntl locking],samba_cv_HAVE_FCNTL_LOCK,[
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/fcntl_lock.c"],
-+           samba_cv_HAVE_FCNTL_LOCK=yes,samba_cv_HAVE_FCNTL_LOCK=no,samba_cv_HAVE_FCNTL_LOCK=cross)])
-+if test x"$samba_cv_HAVE_FCNTL_LOCK" = x"yes"; then
-+    AC_DEFINE(HAVE_FCNTL_LOCK,1,[Whether fcntl locking is available])
-+fi
-+
-+# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
-+AC_CACHE_CHECK([for broken posix_fallocate],samba_cv_HAVE_BROKEN_POSIX_FALLOCATE,[
-+AC_TRY_COMPILE([
-+  #define _XOPEN_SOURCE 600
-+  #include <stdlib.h>
-+  #if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4))
-+  #error probably broken posix_fallocate
-+  #endif
-+], [
-+], 
-+samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no,samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes)])
-+if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
-+	AC_DEFINE(HAVE_BROKEN_POSIX_FALLOCATE, 1, Whether we have a broken posix_fallocate)
-+fi
-+
-+
-+AC_CACHE_CHECK([for st_blocks in struct stat],samba_cv_HAVE_STAT_ST_BLOCKS,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>],
-+[struct stat st;  st.st_blocks = 0;],
-+samba_cv_HAVE_STAT_ST_BLOCKS=yes,samba_cv_HAVE_STAT_ST_BLOCKS=no,samba_cv_HAVE_STAT_ST_BLOCKS=cross)])
-+if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
-+    AC_DEFINE(HAVE_STAT_ST_BLOCKS,1,[Whether the stat struct has a st_block property])
-+fi
-+
-+AC_CACHE_CHECK([for 32 bit blkcnt_t],samba_cv_SIZEOF_BLKCNT_T_4,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+main() { return((sizeof(blkcnt_t) == 4) ? 0 : 1); }],
-+samba_cv_SIZEOF_BLKCNT_T_4=yes,samba_cv_SIZEOF_BLKCNT_T_4=no,samba_cv_SIZEOF_BLKCNT_T_4=cross)])
-+if test x"$samba_cv_SIZEOF_BLKCNT_T_4" = x"yes"; then
-+    AC_DEFINE(SIZEOF_BLKCNT_T_4,1,[The size of the 'blkcnt_t' type])
-+fi
-+
-+AC_CACHE_CHECK([for 64 bit blkcnt_t],samba_cv_SIZEOF_BLKCNT_T_8,[
-+AC_TRY_RUN([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+main() { return((sizeof(blkcnt_t) == 8) ? 0 : 1); }],
-+samba_cv_SIZEOF_BLKCNT_T_8=yes,samba_cv_SIZEOF_BLKCNT_T_8=no,samba_cv_SIZEOF_BLKCNT_T_8=cross)])
-+if test x"$samba_cv_SIZEOF_BLKCNT_T_8" = x"yes"; then
-+    AC_DEFINE(SIZEOF_BLKCNT_T_8,1,[The size of the 'blkcnt_t' type])
-+fi
-+
-+AC_CACHE_CHECK([for st_blksize in struct stat],samba_cv_HAVE_STAT_ST_BLKSIZE,[
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>],
-+[struct stat st;  st.st_blksize = 0;],
-+samba_cv_HAVE_STAT_ST_BLKSIZE=yes,samba_cv_HAVE_STAT_ST_BLKSIZE=no,samba_cv_HAVE_STAT_ST_BLKSIZE=cross)])
-+if test x"$samba_cv_HAVE_STAT_ST_BLKSIZE" = x"yes"; then
-+    AC_DEFINE(HAVE_STAT_ST_BLKSIZE,1,[Whether the stat struct has a st_blksize property])
-+fi
-+
-+AC_CACHE_CHECK([for st_flags in struct stat],
-+	samba_cv_HAVE_STAT_ST_FLAGS,
-+	[
-+	    AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>],
-+	    [struct stat st;  st.st_flags = 0;],
-+	    samba_cv_HAVE_STAT_ST_FLAGS=yes,
-+	    samba_cv_HAVE_STAT_ST_FLAGS=no,
-+	    samba_cv_HAVE_STAT_ST_FLAGS=cross)
-+	])
-+
-+if test x"$samba_cv_HAVE_STAT_ST_FLAGS" = x"yes"; then
-+    AC_DEFINE(HAVE_STAT_ST_FLAGS, 1,
-+		[Whether the stat struct has a st_flags member])
-+fi
-+
-+AC_CACHE_CHECK([for broken nisplus include files],samba_cv_BROKEN_NISPLUS_INCLUDE_FILES,[
-+AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <sys/acl.h>
-+#if defined(HAVE_RPCSVC_NIS_H)
-+#include <rpcsvc/nis.h>
-+#endif],
-+[int i;],
-+samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no,samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes)])
-+if test x"$samba_cv_BROKEN_NISPLUS_INCLUDE_FILES" = x"yes"; then
-+	AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES,1,[Whether the nisplus include files are broken])
-+fi
-+
-+AC_CACHE_CHECK([if the realpath function allows a NULL argument],samba_cv_REALPATH_TAKES_NULL,[
-+AC_TRY_RUN([
-+#include <stdio.h>
-+#include <limits.h>
-+#include <signal.h>
-+
-+void exit_on_core(int ignored) {
-+	exit(1);
-+}
-+
-+main() {
-+	char *newpath;
-+	signal(SIGSEGV, exit_on_core);
-+	newpath = realpath("/tmp", NULL);
-+	return((newpath != NULL) ? 0 : 1);
-+}
-+],
-+samba_cv_REALPATH_TAKES_NULL=yes,samba_cv_REALPATH_TAKES_NULL=no,samba_cv_REALPATH_TAKES_NULL=cross)])
-+if test x"$samba_cv_REALPATH_TAKES_NULL" = x"yes"; then
-+    AC_DEFINE(REALPATH_TAKES_NULL,1,[Whether the realpath function allows NULL])
-+fi
-+
-+#################################################
-+# check for AFS clear-text auth support
-+samba_cv_WITH_AFS=no
-+AC_MSG_CHECKING(whether to use AFS clear-text auth)
-+AC_ARG_WITH(afs,
-+[AS_HELP_STRING([--with-afs], [Include AFS clear-text auth support (default=no)])],
-+[ case "$withval" in
-+  yes|auto)
-+    AC_MSG_RESULT($withval)
-+    samba_cv_WITH_AFS=$withval
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+####################################################
-+# check for Linux-specific AFS fake-kaserver support
-+samba_cv_WITH_FAKE_KASERVER=no
-+AC_MSG_CHECKING(whether to use AFS fake-kaserver)
-+AC_ARG_WITH(fake-kaserver,
-+[AS_HELP_STRING([--with-fake-kaserver], [Include AFS fake-kaserver support (default=no)])],
-+[ case "$withval" in
-+  yes|auto)
-+    AC_MSG_RESULT($withval)
-+    samba_cv_WITH_FAKE_KASERVER=$withval
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+#################################################
-+# decide whether we can support WITH_AFS and / or WITH_FAKE_KASERVER
-+if test x"$samba_cv_WITH_AFS" != x"no" ||
-+   test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
-+
-+    # see if this box has the OpenSSL DES libraries
-+    AC_CHECK_LIB( crypto, DES_pcbc_encrypt, LIBS="$LIBS -lcrypto" , [AC_ERROR(OpenSSL library: libcrypto ot found!)] )
-+
-+    # see if this box has the afs-headers in /usr/include/afs
-+    AC_MSG_CHECKING(for /usr/include/afs)
-+    if test -d /usr/include/afs; then
-+          AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+
-+    # check for afs.h
-+    have_afs_headers=no
-+    AC_CHECK_HEADERS(afs.h afs/afs.h)
-+    if test x"$ac_cv_header_afs_h" = x"no" && test x"$ac_cv_header_afs_afs_h" = x"no"; then
-+    	if test x"$samba_cv_WITH_FAKE_KASERVER" = x"auto" ||
-+	   test x"$samba_cv_WITH_AFS" = x"auto"; then
-+	    	AC_MSG_WARN([AFS cannot be supported without afs.h])
-+	else
-+	    	AC_MSG_ERROR([AFS cannot be supported without afs.h])
-+	fi
-+    else
-+    	have_afs_headers=yes
-+    fi
-+fi
-+
-+FAKE_KASERVER_OBJ=""
-+if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
-+    AC_DEFINE(WITH_FAKE_KASERVER,1,[Whether to include AFS fake-kaserver support])
-+    FAKE_KASERVER_OBJ="utils/net_afs.o"
-+fi
-+AC_SUBST(FAKE_KASERVER_OBJ)
-+
-+#################################################
-+# check whether to compile AFS/NT ACL mapping module
-+samba_cv_WITH_VFS_AFSACL=no
-+AC_MSG_CHECKING(whether to use AFS ACL mapping module)
-+AC_ARG_WITH(vfs-afsacl,
-+[AS_HELP_STRING([--with-vfs-afsacl], [Include AFS to NT ACL mapping module (default=no)])],
-+[ case "$withval" in
-+  yes|auto)
-+    AC_MSG_RESULT($withval)
-+    samba_cv_WITH_VFS_AFSACL=yes
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+if test x"$samba_cv_WITH_VFS_AFSACL" = x"yes"; then
-+   default_shared_modules="$default_shared_modules vfs_afsacl"
-+fi
-+	
-+if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
-+    AC_DEFINE(WITH_AFS,1,[Whether to include AFS clear-text auth support])
-+fi
-+
-+#################################################
-+# check for the DFS clear-text auth system
-+AC_MSG_CHECKING(whether to use DFS clear-text auth)
-+AC_ARG_WITH(dfs,
-+[AS_HELP_STRING([--with-dce-dfs], [Include DCE/DFS clear-text auth support (default=no)])],
-+[ case "$withval" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(WITH_DFS,1,[Whether to include DFS support])
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+########################################################
-+# Compile with LDAP support?
-+
-+with_ldap_support=auto
-+AC_MSG_CHECKING([for LDAP support])
-+
-+AC_ARG_WITH(ldap,
-+[AS_HELP_STRING([--with-ldap], [LDAP support (default=auto)])],
-+[ case "$withval" in
-+    yes|no)
-+	with_ldap_support=$withval
-+	;;
-+  esac ])
-+
-+AC_MSG_RESULT($with_ldap_support)
-+
-+SMBLDAP=""
-+AC_SUBST(SMBLDAP)
-+
-+if test x"$with_ldap_support" != x"no"; then
-+
-+  ##################################################################
-+  # first test for ldap.h and lber.h
-+  # (ldap.h is required for this test)
-+  AC_CHECK_HEADERS(ldap.h lber.h)
-+
-+  if test x"$ac_cv_header_ldap_h" != x"yes"; then
-+	if test x"$with_ldap_support" = x"yes"; then
-+	 AC_MSG_ERROR(ldap.h is needed for LDAP support)
-+	else
-+	 AC_MSG_WARN(ldap.h is needed for LDAP support)
-+	fi
-+	
-+	with_ldap_support=no
-+  fi
-+
-+  ##################################################################
-+  # HP/UX does not have ber_tag_t in lber.h - it must be configured as
-+  # unsigned int in include/includes.h
-+  case $host_os in
-+	*hpux*)
-+	 AC_MSG_WARN(ber_tag_t is needed for LDAP support)
-+	 AC_MSG_WARN(ber_tag_t must be configured in includes.h for hpux)
-+	with_ldap_support=yes
-+  	;;
-+	*)
-+  	AC_CHECK_TYPE(ber_tag_t,,,[#include <lber.h>])
-+  	if test x"$ac_cv_type_ber_tag_t" != x"yes"; then
-+		if test x"$with_ldap_support" = x"yes"; then
-+	 	AC_MSG_ERROR(ber_tag_t is needed for LDAP support)
-+		else
-+	 	AC_MSG_WARN(ber_tag_t is needed for LDAP support)
-+		fi
-+		with_ldap_support=no
-+  	fi
-+  	;;
-+  esac
-+fi
-+
-+if test x"$with_ldap_support" != x"no"; then
-+  ac_save_LIBS=$LIBS
-+
-+  ##################################################################
-+  # we might need the lber lib on some systems. To avoid link errors
-+  # this test must be before the libldap test
-+  AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
-+
-+  ########################################################
-+  # If ber_sockbuf_add_io() is available we can add
-+  # SASL wrapping hooks
-+  AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
-+
-+  AC_CACHE_CHECK([for LDAP_OPT_SOCKBUF],samba_cv_HAVE_LDAP_OPT_SOCKBUF,[
-+		 AC_TRY_COMPILE([#include <ldap.h>],
-+				[int val = LDAP_OPT_SOCKBUF;],
-+      			samba_cv_HAVE_LDAP_OPT_SOCKBUF=yes,
-+			samba_cv_HAVE_LDAP_OPT_SOCKBUF=no)])
-+
-+  if test x"$ac_cv_func_ext_ber_sockbuf_add_io" = x"yes" -a \
-+  	  x"$samba_cv_HAVE_LDAP_OPT_SOCKBUF" = x"yes"; then
-+  	AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping])
-+  fi
-+
-+  #######################################################
-+  # if we have LBER_OPT_LOG_PRINT_FN, we can intercept
-+  # ldap logging and print it out in the samba logs
-+  AC_CACHE_CHECK([for LBER_OPT_LOG_PRINT_FN],
-+		 samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN,
-+		 [AC_TRY_COMPILE([#include <lber.h>],
-+				 [int val = LBER_OPT_LOG_PRINT_FN;],
-+				 samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=yes,
-+				 samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN=no)])
-+
-+  if test x"$samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN" = x"yes"; then
-+	AC_DEFINE(HAVE_LBER_LOG_PRINT_FN, 1,
-+		  [Support for LDAP/LBER logging interception])
-+  fi
-+
-+  ########################################################
-+  # now see if we can find the ldap libs in standard paths
-+  AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init)
-+
-+  ########################################################
-+  # If we have LDAP, does it's rebind procedure take 2 or 3 arguments?
-+  # Check found in pam_ldap 145.
-+  AC_CHECK_FUNC_EXT(ldap_set_rebind_proc,$LDAP_LIBS)
-+
-+  LIBS="$LIBS $LDAP_LIBS"
-+  AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, smb_ldap_cv_ldap_set_rebind_proc, [
-+    AC_TRY_COMPILE([
-+	#include <lber.h>
-+	#include <ldap.h>],
-+	[ldap_set_rebind_proc(0, 0, 0);],
-+	[smb_ldap_cv_ldap_set_rebind_proc=3],
-+	[smb_ldap_cv_ldap_set_rebind_proc=2]
-+    )
-+  ])
-+
-+  AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $smb_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc])
-+
-+  AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
-+
-+  if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes"; then
-+    AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
-+    CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
-+    default_static_modules="$default_static_modules pdb_ldapsam idmap_ldap";
-+    default_shared_modules="$default_shared_modules";
-+    SMBLDAP="lib/smbldap.o"
-+    with_ldap_support=yes
-+    AC_MSG_CHECKING(whether LDAP support is used)
-+    AC_MSG_RESULT(yes)
-+  else
-+    if test x"$with_ldap_support" = x"yes"; then
-+	AC_MSG_ERROR(libldap is needed for LDAP support)
-+    else
-+	AC_MSG_WARN(libldap is needed for LDAP support)
-+    fi
-+
-+    LDAP_LIBS=""
-+    with_ldap_support=no
-+  fi
-+  LIBS=$ac_save_LIBS
-+fi
-+
-+
-+#################################################
-+# active directory support
-+
-+with_ads_support=auto
-+AC_MSG_CHECKING([for Active Directory and krb5 support])
-+
-+AC_ARG_WITH(ads,
-+[AS_HELP_STRING([--with-ads], [Active Directory support (default=auto)])],
-+[ case "$withval" in
-+    yes|no)
-+	with_ads_support="$withval"
-+	;;
-+  esac ])
-+
-+AC_MSG_RESULT($with_ads_support)
-+
-+FOUND_KRB5=no
-+KRB5_LIBS=""
-+
-+if test x"$with_ldap_support" != x"yes"; then
-+
-+    if test x"$with_ads_support" = x"yes"; then
-+	AC_MSG_ERROR(Active Directory Support requires LDAP support)
-+    elif test x"$with_ads_support" = x"auto"; then
-+	AC_MSG_WARN(Disabling Active Directory support (requires LDAP support))
-+	with_ads_support=no
-+    fi
-+
-+else
-+
-+    # Check to see whether there is enough LDAP functionality to be able
-+    # to build AD support.
-+
-+# HPUX and Solaris only has ldap_init; ok, we take care of this in smbldap.c
-+case "$host_os" in
-+	*hpux* | *solaris*)
-+    AC_CHECK_FUNC_EXT(ldap_init,$LDAP_LIBS)
-+
-+    if test x"$ac_cv_func_ext_ldap_init" != x"yes"; then
-+	if test x"$with_ads_support" = x"yes"; then
-+	    AC_MSG_ERROR(Active Directory support on HPUX or Solaris requires ldap_init)
-+	elif test x"$with_ads_support" = x"auto"; then
-+	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_init on HPUX or Solaris))
-+	    with_ads_support=no
-+	fi
-+    fi
-+    ;;
-+	*)
-+    AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)
-+
-+    if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
-+	if test x"$with_ads_support" = x"yes"; then
-+	    AC_MSG_ERROR(Active Directory support requires ldap_initialize)
-+	elif test x"$with_ads_support" = x"auto"; then
-+	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize))
-+	    with_ads_support=no
-+	fi
-+    fi
-+    ;;
-+esac
-+
-+
-+    AC_CHECK_FUNC_EXT(ldap_add_result_entry,$LDAP_LIBS)
-+
-+    if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
-+	if test x"$with_ads_support" = x"yes"; then
-+	    AC_MSG_ERROR(Active Directory support requires ldap_add_result_entry)
-+	elif test x"$with_ads_support" = x"auto"; then
-+	    AC_MSG_WARN(Disabling Active Directory support (requires ldap_add_result_entry))
-+	    with_ads_support=no
-+	fi
-+    fi
-+
-+fi
-+
-+if test x"$with_ads_support" != x"no"; then
-+
-+  # Do no harm to the values of CFLAGS and LIBS while testing for
-+  # Kerberos support.
-+
-+  if test x$FOUND_KRB5 = x"no"; then
-+    #################################################
-+    # check for location of Kerberos 5 install
-+    AC_MSG_CHECKING(for kerberos 5 install path)
-+    AC_ARG_WITH(krb5,
-+    [AS_HELP_STRING([--with-krb5=base-dir], [Locate Kerberos 5 support (default=/usr)])],
-+    [ case "$withval" in
-+      no)
-+        AC_MSG_RESULT(no krb5-path given)
-+        ;;
-+      yes)
-+        AC_MSG_RESULT(/usr)
-+        ;;
-+      *)
-+        AC_MSG_RESULT($withval)
-+        KRB5_CFLAGS="-I$withval/include"
-+        KRB5_CPPFLAGS="-I$withval/include"
-+        KRB5_LDFLAGS="-L$withval/lib"
-+        FOUND_KRB5=yes
-+	if test -x "$withval/bin/krb5-config"; then
-+		KRB5CONFIG=$withval/bin/krb5-config
-+	fi
-+        ;;
-+      esac ],
-+      AC_MSG_RESULT(no krb5-path given)
-+    )
-+  fi
-+
-+  #################################################
-+  # check for krb5-config from recent MIT and Heimdal kerberos 5
-+  AC_PATH_PROG(KRB5CONFIG, krb5-config)
-+  AC_MSG_CHECKING(for working krb5-config)
-+  if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then
-+    ac_save_CFLAGS=$CFLAGS
-+    CFLAGS="";export CFLAGS
-+    ac_save_LDFLAGS=$LDFLAGS
-+    LDFLAGS="";export LDFLAGS
-+    KRB5_LIBS="`$KRB5CONFIG --libs gssapi`"
-+    KRB5_LDFLAGS="`$KRB5CONFIG --libs gssapi | sed s/-lgss.*//`"
-+    KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+    KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`"
-+    CFLAGS=$ac_save_CFLAGS;export CFLAGS
-+    LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
-+    FOUND_KRB5=yes
-+    AC_MSG_RESULT(yes)
-+  else
-+    AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
-+  fi
-+
-+  if test x$FOUND_KRB5 = x"no"; then
-+    #################################################
-+    # see if this box has the SuSE location for the heimdal krb implementation
-+    AC_MSG_CHECKING(for /usr/include/heimdal)
-+    if test -d /usr/include/heimdal; then
-+      if test -f /usr/lib/heimdal/lib/libkrb5.a; then
-+          KRB5_CFLAGS="-I/usr/include/heimdal"
-+          KRB5_CPPFLAGS="-I/usr/include/heimdal"
-+          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
-+	  FOUND_KRB5=yes
-+          AC_MSG_RESULT(yes)
-+      else
-+          KRB5_CFLAGS="-I/usr/include/heimdal"
-+          KRB5_CPPFLAGS="-I/usr/include/heimdal"
-+	  FOUND_KRB5=yes
-+          AC_MSG_RESULT(yes)
-+      fi
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  fi
-+
-+  if test x$FOUND_KRB5 = x"no"; then
-+    #################################################
-+    # see if this box has the RedHat location for kerberos
-+    AC_MSG_CHECKING(for /usr/kerberos)
-+    if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then
-+      KRB5_LDFLAGS="-L/usr/kerberos/lib"
-+      KRB5_CFLAGS="-I/usr/kerberos/include"
-+      KRB5_CPPFLAGS="-I/usr/kerberos/include"
-+      FOUND_KRB5=yes
-+      AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  fi
-+
-+  if test x$FOUND_KRB5 = x"no"; then
-+    #################################################
-+    # see if this box has the OpenBSD location for heimdal krb5
-+    AC_MSG_CHECKING(for /usr/include/kerberosV)
-+    if test -d /usr/include/kerberosV; then
-+      KRB5_CPPFLAGS="-I/usr/include/kerberosV"
-+      KRB5_LIBS="-lcrypto"
-+      FOUND_KRB5=yes
-+      AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  fi
-+
-+  if test x$FOUND_KRB5 = x"no"; then
-+    #################################################
-+    # see if this box has Solaris MIT kerberos implementation
-+    AC_MSG_CHECKING(for Solaris MIT kerberos)
-+    if test -x "$KRB5CONFIG" && $KRB5CONFIG --version | grep -s Solaris | grep -s MIT > /dev/null ; then
-+       FOUND_KRB5=yes
-+       KRB5_LIBS="-lgss -lkrb5"
-+       KRB5_CFLAGS="`$KRB5CONFIG --cflags`"
-+       KRB5_CPPFLAGS="`$KRB5CONFIG --cflags`"
-+       AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  fi
-+
-+  ac_save_CFLAGS=$CFLAGS
-+  ac_save_CPPFLAGS=$CPPFLAGS
-+  ac_save_LDFLAGS=$LDFLAGS
-+
-+  # remove needless evil rpath stuff as early as possible:
-+  LIB_REMOVE_USR_LIB(KRB5_LIBS)
-+  LIB_REMOVE_USR_LIB(KRB5_LDFLAGS)
-+  CFLAGS="$KRB5_CFLAGS $CFLAGS"
-+  CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
-+  LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
-+
-+  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
-+
-+  # now check for krb5.h. Some systems have the libraries without the headers!
-+  # note that this check is done here to allow for different kerberos
-+  # include paths
-+  AC_CHECK_HEADERS(krb5.h)
-+
-+  if test x"$ac_cv_header_krb5_h" = x"no"; then
-+
-+    # Give a warning if AD support was not explicitly requested,
-+    # i.e with_ads_support = auto, otherwise die with an error.
-+
-+    if test x"$with_ads_support" = x"yes"; then
-+      AC_MSG_ERROR([Active Directory cannot be supported without krb5.h])
-+    else
-+      AC_MSG_WARN([Active Directory cannot be supported without krb5.h])
-+    fi
-+
-+    # Turn off AD support and restore CFLAGS and LIBS variables
-+
-+    with_ads_support="no"
-+
-+    CFLAGS=$ac_save_CFLAGS
-+    CPPFLAGS=$ac_save_CPPFLAGS
-+    LDFLAGS=$ac_save_LDFLAGS
-+  fi
-+
-+  # check for new heimdal KRB5_DEPRECATED handling
-+
-+  AC_CACHE_CHECK([for KRB5_DEPRECATED define taking an identifier],
-+                samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER,[
-+    AC_TRY_COMPILE(
-+      [#define KRB5_DEPRECATED 1
-+      #include <krb5.h>],
-+      [],
-+      samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=yes,
-+      samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER, 1,
-+	       [Whether to use deprecated krb5 interfaces])
-+  fi
-+fi
-+
-+# Now we have determined whether we really want ADS support
-+use_ads=no
-+if test x"$with_ads_support" != x"no"; then
-+  use_ads=yes
-+  have_gssapi=no
-+  ac_save_LIBS=$LIBS
-+
-+  # now check for gssapi headers.  This is also done here to allow for
-+  # different kerberos include paths
-+  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h)
-+
-+  ##################################################################
-+  # we might need the k5crypto and com_err libraries on some systems
-+  AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
-+  AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
-+
-+  # Heimdal checks.
-+  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
-+  AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
-+  AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
-+
-+  # Heimdal checks. On static Heimdal gssapi must be linked before krb5.
-+  AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status,[],[],have_gssapi=yes)
-+
-+  ########################################################
-+  # now see if we can find the krb5 libs in standard paths
-+  # or as specified above
-+  AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended)
-+  AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_kt_compare)
-+
-+  ########################################################
-+  # now see if we can find the gssapi libs in standard paths
-+  if test x"$have_gssapi" != x"yes"; then
-+     AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)
-+     AC_CHECK_LIB_EXT(gss, KRB5_LIBS,gss_display_status,[],[],have_gssapi=yes)
-+  fi
-+  ################################################################
-+  # test for AD / GSSAPI support being enabled
-+  if test x"$have_gssapi" != xyes ; then
-+  	AC_MSG_WARN([Samba cannot be supported without GSSAPI])
-+	use_ads=no
-+  else
-+	AC_DEFINE(HAVE_GSSAPI, , [Whether the platform has GSSAPI support])
-+  fi
-+
-+  # This is for FreeBSD (and possibly others). gss_mech_krb5 is a
-+  # #define to GSS_KRB5_MECHANISM, which is defined in -lgssapi_krb5
-+  # Also, gsskrb5_extract_authz_data_from_sec_context is in -lgssapi_krb5
-+  AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS, GSS_KRB5_MECHANISM,
-+  		   [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5"])
-+
-+  AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_set_default_tgs_enctypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_c_string_to_key, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_data_contents, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_unparsed_name, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_keytab_entry_contents, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_krbhst_init, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_crypto_init, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_crypto_destroy, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_c_verify_checksum, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_principal_compare_any_realm, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_parse_name_norealm, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_princ_size, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_make_principal, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_principal_get_num_comp, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_init_creds_opt_set_pac_request, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_renewed_creds, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_error_contents, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(initialize_krb5_error_table, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_init_creds_opt_alloc, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_init_creds_opt_free, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_init_creds_opt_get_error, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_enctype_to_string, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_fwd_tgt_creds, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_auth_con_set_req_cksumtype, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_creds_opt_alloc, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_creds_opt_set_impersonate, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_creds, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_credentials_for_user, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_host_realm, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_host_realm, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_get_init_creds_keytab, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_build_principal_alloc_va, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_cc_get_lifetime, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_cc_retrieve_cred, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_free_checksum_contents, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_create_checksum, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(krb5_c_make_checksum, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gss_krb5_import_cred, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gss_get_name_attribute, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gsskrb5_extract_authz_data_from_sec_context, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gss_mech_krb5, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gss_oid_equal, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gss_inquire_sec_context_by_oid, $KRB5_LIBS)
-+  AC_CHECK_FUNC_EXT(gss_wrap_iov, $KRB5_LIBS)
-+
-+  # MIT krb5 1.8 does not expose this call (yet)
-+  AC_CHECK_DECLS(krb5_get_credentials_for_user, [], [], [#include <krb5.h>])
-+
-+  # MIT krb5 1.7beta3 (in Ubuntu Karmic) does not have this declaration
-+  # but does have the symbol
-+  AC_CHECK_DECLS(krb5_auth_con_set_req_cksumtype, [], [], [#include <krb5.h>])
-+
-+  LIBS="$KRB5_LIBS $LIBS"
-+
-+  AC_CACHE_CHECK(whether krb5_get_init_creds_opt_free takes a context argument,
-+	  smb_krb5_cv_creds_opt_free_context,
-+	  [
-+		AC_TRY_COMPILE([
-+		    #include <krb5.h>],
-+		    [
-+			krb5_context ctx;
-+			krb5_get_init_creds_opt *opt = NULL;
-+			krb5_get_init_creds_opt_free(ctx, opt);
-+		    ],
-+		    [smb_krb5_cv_creds_opt_free_context=yes],
-+		    [smb_krb5_cv_creds_opt_free_context=no]
-+		)
-+	  ])
-+
-+  if test x"$smb_krb5_cv_creds_opt_free_context" = x"yes" ; then
-+	AC_DEFINE(KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT, 1,
-+	    [Whether krb5_get_init_creds_opt_free takes a context argument])
-+  fi
-+
-+  AC_CACHE_CHECK([for checksum in krb5_checksum],
-+                samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_checksum cksum; cksum.checksum.length = 0;],
-+      samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM=yes,
-+      samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM=no)])
-+
-+  if test x"$samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM" = x"yes"; then
-+    AC_DEFINE(HAVE_CHECKSUM_IN_KRB5_CHECKSUM,1,
-+               [Whether the krb5_checksum struct has a checksum property])
-+  fi
-+
-+  AC_CACHE_CHECK([for etype in EncryptedData],
-+                samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [EncryptedData edata; edata.etype = 0;],
-+      samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA=yes,
-+      samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA=no)])
-+
-+  if test x"$samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA" = x"yes"; then
-+    AC_DEFINE(HAVE_ETYPE_IN_ENCRYPTEDDATA,1,
-+               [Whether the EncryptedData struct has a etype property])
-+  fi
-+
-+  AC_CACHE_CHECK([for ticket pointer in krb5_ap_req],
-+                samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_ap_req *ap_req; ap_req->ticket = NULL;],
-+      samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ=yes,
-+      samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ=no)])
-+
-+  if test x"$samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ" = x"yes"; then
-+    AC_DEFINE(HAVE_TICKET_POINTER_IN_KRB5_AP_REQ,1,
-+               [Whether the krb5_ap_req struct has a ticket pointer])
-+  fi
-+
-+  AC_CACHE_CHECK([for e_data pointer in krb5_error],
-+                samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_error err; err.e_data = NULL;],
-+      samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR=yes,
-+      samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR=no)])
-+
-+  if test x"$samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR" = x"yes"; then
-+    AC_DEFINE(HAVE_E_DATA_POINTER_IN_KRB5_ERROR,1,
-+               [Whether the krb5_error struct has a e_data pointer])
-+  fi
-+
-+  AC_CACHE_CHECK([for krb5_crypto type],
-+                samba_cv_HAVE_KRB5_CRYPTO,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_crypto crypto;],
-+      samba_cv_HAVE_KRB5_CRYPTO=yes,
-+      samba_cv_HAVE_KRB5_CRYPTO=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_CRYPTO" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_CRYPTO,1,
-+               [Whether the type krb5_crypto exists])
-+  fi
-+
-+  AC_CACHE_CHECK([for addrtype in krb5_address],
-+                samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_address kaddr; kaddr.addrtype = ADDRTYPE_INET;],
-+      samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=yes,
-+      samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=no)])
-+
-+  if test x"$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" = x"yes"; then
-+    AC_DEFINE(HAVE_ADDRTYPE_IN_KRB5_ADDRESS,1,
-+               [Whether the krb5_address struct has a addrtype property])
-+  fi
-+
-+  AC_CACHE_CHECK([for addr_type in krb5_address],
-+                 samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_address kaddr; kaddr.addr_type = KRB5_ADDRESS_INET;],
-+      samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=yes,
-+      samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=no)])
-+
-+  if test x"$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" = x"yes"; then
-+    AC_DEFINE(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS,1,
-+              [Whether the krb5_address struct has a addr_type property])
-+  fi
-+
-+  AC_CACHE_CHECK([for keyvalue in krb5_keyblock],
-+                 samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keyblock key; key.keyvalue.data = NULL;],
-+      samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes,
-+      samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_KEYBLOCK_KEYVALUE,1,
-+              [Whether the krb5_keyblock struct has a keyvalue property])
-+  fi
-+
-+  found_arcfour_hmac=no
-+  AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC_MD5],
-+                 samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_enctype enctype; enctype = ENCTYPE_ARCFOUR_HMAC_MD5;],
-+      samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=yes,
-+      samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=no)])
-+  AC_CACHE_CHECK([for KEYTYPE_ARCFOUR_56],
-+                 samba_cv_HAVE_KEYTYPE_ARCFOUR_56,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keytype keytype; keytype = KEYTYPE_ARCFOUR_56;],
-+      samba_cv_HAVE_KEYTYPE_ARCFOUR_56=yes,
-+      samba_cv_HAVE_KEYTYPE_ARCFOUR_56=no)])
-+# Heimdals with KEYTYPE_ARCFOUR but not KEYTYPE_ARCFOUR_56 are broken
-+# w.r.t. arcfour and windows, so we must not enable it here
-+  if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" = x"yes" -a\
-+          x"$samba_cv_HAVE_KEYTYPE_ARCFOUR_56" = x"yes"; then
-+    AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,1,
-+              [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type definition is available])
-+    found_arcfour_hmac=yes
-+  fi
-+  AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC],
-+                 samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_enctype enctype; enctype = ENCTYPE_ARCFOUR_HMAC;],
-+      samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC=yes,
-+      samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC=no)])
-+  if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC" = x"yes"; then
-+    AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC,1,
-+              [Whether the ENCTYPE_ARCFOUR_HMAC key type definition is available])
-+    found_arcfour_hmac=yes
-+  fi
-+
-+  AC_CACHE_CHECK([for ENCTYPE_AES128_CTS_HMAC_SHA1_96],
-+                 samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_enctype enctype; enctype = ENCTYPE_AES128_CTS_HMAC_SHA1_96;],
-+      samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=yes,
-+      samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=no)])
-+  if test x"$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" = x"yes"; then
-+    AC_DEFINE(HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,1,
-+              [Whether the ENCTYPE_AES128_CTS_HMAC_SHA1_96 key type definition is available])
-+  fi
-+  AC_CACHE_CHECK([for ENCTYPE_AES256_CTS_HMAC_SHA1_96],
-+                 samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_enctype enctype; enctype = ENCTYPE_AES256_CTS_HMAC_SHA1_96;],
-+      samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=yes,
-+      samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=no)])
-+  if test x"$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" = x"yes"; then
-+    AC_DEFINE(HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,1,
-+              [Whether the ENCTYPE_AES256_CTS_HMAC_SHA1_96 key type definition is available])
-+  fi
-+
-+  AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY],
-+                 samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_flags ap_options; ap_options = AP_OPTS_USE_SUBKEY;],
-+      samba_cv_HAVE_AP_OPTS_USE_SUBKEY=yes,
-+      samba_cv_HAVE_AP_OPTS_USE_SUBKEY=no)])
-+
-+  if test x"$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" = x"yes"; then
-+    AC_DEFINE(HAVE_AP_OPTS_USE_SUBKEY,1,
-+              [Whether the AP_OPTS_USE_SUBKEY ap option is available])
-+  fi
-+
-+  AC_CACHE_CHECK([for KV5M_KEYTAB],
-+                 samba_cv_HAVE_KV5M_KEYTAB,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keytab_entry entry; entry.magic = KV5M_KEYTAB;],
-+      samba_cv_HAVE_KV5M_KEYTAB=yes,
-+      samba_cv_HAVE_KV5M_KEYTAB=no)])
-+
-+  if test x"$samba_cv_HAVE_KV5M_KEYTAB" = x"yes"; then
-+      AC_DEFINE(HAVE_KV5M_KEYTAB,1,
-+             [Whether the KV5M_KEYTAB option is available])
-+  fi
-+
-+  AC_CACHE_CHECK([for KRB5_KU_OTHER_CKSUM],
-+                 samba_cv_HAVE_KRB5_KU_OTHER_CKSUM,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keyusage usage = KRB5_KU_OTHER_CKSUM;],
-+      samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=yes,
-+      samba_cv_HAVE_KRB5_KU_OTHER_CKSUM=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_KU_OTHER_CKSUM" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_KU_OTHER_CKSUM,1,
-+              [Whether KRB5_KU_OTHER_CKSUM is available])
-+  fi
-+
-+  AC_CACHE_CHECK([for KRB5_KEYUSAGE_APP_DATA_CKSUM],
-+                 samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keyusage usage = KRB5_KEYUSAGE_APP_DATA_CKSUM;],
-+      samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM=yes,
-+      samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM,1,
-+              [Whether KRB5_KEYUSAGE_APP_DATA_CKSUM is available])
-+  fi
-+
-+  AC_CACHE_CHECK([for the krb5_princ_component macro],
-+                samba_cv_HAVE_KRB5_PRINC_COMPONENT,[
-+    AC_TRY_LINK([#include <krb5.h>],
-+      [const krb5_data *pkdata; krb5_context context; krb5_principal principal; pkdata = krb5_princ_component(context, principal, 0);],
-+      samba_cv_HAVE_KRB5_PRINC_COMPONENT=yes,
-+      samba_cv_HAVE_KRB5_PRINC_COMPONENT=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_PRINC_COMPONENT" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_PRINC_COMPONENT,1,
-+               [Whether krb5_princ_component is available])
-+  fi
-+
-+  AC_CACHE_CHECK([for key in krb5_keytab_entry],
-+                 samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keytab_entry entry; krb5_keyblock e; entry.key = e;],
-+      samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=yes,
-+      samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEY,1,
-+              [Whether krb5_keytab_entry has key member])
-+  fi
-+
-+  AC_CACHE_CHECK([for keyblock in krb5_keytab_entry],
-+                 samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_keytab_entry entry; entry.keyblock.keytype = 0;],
-+      samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=yes,
-+      samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK,1,
-+              [Whether krb5_keytab_entry has keyblock member])
-+  fi
-+
-+  AC_CACHE_CHECK([for magic in krb5_address],
-+                 samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_address addr; addr.magic = 0;],
-+      samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS=yes,
-+      samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS=no)])
-+
-+  if test x"$samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS" = x"yes"; then
-+    AC_DEFINE(HAVE_MAGIC_IN_KRB5_ADDRESS,1,
-+              [Whether the krb5_address struct has a magic property])
-+  fi
-+
-+  AC_CACHE_CHECK([for WRFILE: keytab support],
-+                samba_cv_HAVE_WRFILE_KEYTAB,[
-+    AC_TRY_RUN([
-+#include<krb5.h>
-+  main()
-+  {
-+    krb5_context context;
-+    krb5_keytab keytab;
-+
-+    krb5_init_context(&context);
-+    return krb5_kt_resolve(context, "WRFILE:api", &keytab);
-+  }],
-+  samba_cv_HAVE_WRFILE_KEYTAB=yes,
-+  samba_cv_HAVE_WRFILE_KEYTAB=no)])
-+
-+  if test x"$samba_cv_HAVE_WRFILE_KEYTAB" = x"yes"; then
-+      AC_DEFINE(HAVE_WRFILE_KEYTAB,1,
-+               [Whether the WRFILE:-keytab is supported])
-+  fi
-+
-+  AC_CACHE_CHECK([for krb5_realm type],
-+                samba_cv_HAVE_KRB5_REALM_TYPE,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_realm realm;],
-+      samba_cv_HAVE_KRB5_REALM_TYPE=yes,
-+      samba_cv_HAVE_KRB5_REALM_TYPE=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_REALM_TYPE" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_REALM_TYPE,1,
-+               [Whether the type krb5_realm exists])
-+  fi
-+
-+  AC_CACHE_CHECK([for krb5_princ_realm returns krb5_realm or krb5_data],
-+               samba_cv_KRB5_PRINC_REALM_RETURNS_REALM,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+    [
-+    krb5_context context;
-+    krb5_principal principal;
-+    krb5_realm realm; realm = *krb5_princ_realm(context, principal);],
-+    samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=yes,
-+    samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=no)])
-+
-+  if test x"$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" = x"yes"; then
-+    AC_DEFINE(KRB5_PRINC_REALM_RETURNS_REALM,1,
-+              [Whether krb5_princ_realm returns krb5_realm or krb5_data])
-+  fi
-+
-+  AC_CACHE_CHECK([for krb5_addresses type],
-+                samba_cv_HAVE_KRB5_ADDRESSES,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_addresses addr;],
-+      samba_cv_HAVE_KRB5_ADDRESSES=yes,
-+      samba_cv_HAVE_KRB5_ADDRESSES=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_ADDRESSES" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_ADDRESSES,1,
-+               [Whether the type krb5_addresses type exists])
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_enctype_to_string" = x"yes"; then
-+    AC_CACHE_CHECK([for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)],
-+        smb_krb5_cv_enctype_to_string_takes_krb5_context_arg,[
-+	AC_TRY_RUN_STRICT([
-+		#include <stdlib.h>
-+		#include <krb5.h>
-+		int main(void) {
-+			krb5_context context = NULL;
-+			char *str = NULL;
-+			krb5_enctype_to_string(context, 1, &str);
-+			if (str) free (str); 
-+			return 0;
-+		}
-+		],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
-+		smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes,
-+		smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=no)])
-+
-+    if test x"$smb_krb5_cv_enctype_to_string_takes_krb5_context_arg" = x"yes"; then
-+      AC_DEFINE(HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG,1,
-+                [whether krb5_enctype_to_string takes krb5_context argument])
-+    fi
-+
-+    AC_CACHE_CHECK([for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)],
-+        smb_krb5_cv_enctype_to_string_takes_size_t_arg,[
-+	AC_TRY_RUN_STRICT([
-+		#include <krb5.h>
-+		int main(void) {
-+			char buf[256];
-+			krb5_enctype_to_string(1, buf, 256);
-+			return 0;
-+		}
-+		],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
-+		smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes,
-+		smb_krb5_cv_enctype_to_string_takes_size_t_arg=no)])
-+
-+    if test x"$smb_krb5_cv_enctype_to_string_takes_size_t_arg" = x"yes"; then
-+      AC_DEFINE(HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG,1,
-+                [whether krb5_enctype_to_string takes size_t argument])
-+    fi
-+  fi
-+
-+  AC_CACHE_CHECK([for krb5_principal_get_realm],
-+                samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM,[
-+    AC_TRY_LINK([#include <krb5.h>],
-+      [krb5_context ctx = NULL; krb5_principal princ = NULL; const char *str = krb5_principal_get_realm(ctx, princ);],
-+      samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM=yes,
-+      samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_PRINCIPAL_GET_REALM,1,
-+               [Whether the function krb5_principal_get_realm is defined])
-+  fi
-+
-+  AC_CACHE_CHECK([for krb5_princ_realm],
-+                samba_cv_HAVE_KRB5_PRINC_REALM,[
-+    AC_TRY_LINK([#include <krb5.h>],
-+      [krb5_context ctx = NULL; krb5_principal princ = NULL; const char *str = krb5_princ_realm(ctx, princ)->data;],
-+      samba_cv_HAVE_KRB5_PRINC_REALM=yes,
-+      samba_cv_HAVE_KRB5_PRINC_REALM=no)])
-+
-+  if test x"$samba_cv_HAVE_KRB5_PRINC_REALM" = x"yes"; then
-+    AC_DEFINE(HAVE_KRB5_PRINC_REALM,1,
-+               [Whether the macro krb5_princ_realm is defined])
-+  fi
-+
-+  AC_HAVE_DECL(KRB5_PDU_NONE,[#include <krb5.h>])
-+
-+  AC_CACHE_CHECK([for flags in krb5_creds],
-+                samba_cv_HAVE_FLAGS_IN_KRB5_CREDS,[
-+    AC_TRY_COMPILE([#include <krb5.h>],
-+      [krb5_creds creds; creds.flags.b.initial = 0;],
-+      samba_cv_HAVE_FLAGS_IN_KRB5_CREDS=yes,
-+      samba_cv_HAVE_FLAGS_IN_KRB5_CREDS=no)])
-+
-+  if test x"$samba_cv_HAVE_FLAGS_IN_KRB5_CREDS" = x"yes"; then
-+    AC_DEFINE(HAVE_FLAGS_IN_KRB5_CREDS,1,
-+               [Whether the krb5_creds struct has a flags property])
-+  fi
-+  #
-+  #
-+  # Now the decisions whether we can support krb5
-+  #
-+  # NOTE: all tests should be done before this block!
-+  #
-+  #
-+  if test x"$found_arcfour_hmac" != x"yes"; then
-+    AC_MSG_WARN(arcfour-hmac-md5 encryption type not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_set_real_time" != x"yes"; then
-+    AC_MSG_WARN(krb5_set_real_time encryption type not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
-+    AC_MSG_WARN(krb5_mk_req_extended not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_get_host_realm" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_get_host_realm not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_free_host_realm" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_free_host_realm not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_fwd_tgt_creds" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_fwd_tgt_creds not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_get_init_creds_opt_alloc" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_get_init_creds_opt_alloc found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$smb_krb5_cv_creds_opt_free_context" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_get_init_creds_opt_free not found or was too old in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_get_renewed_creds" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_get_renewed_creds not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_principal_compare_any_realm" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_principal_compare_any_realm not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -o \
-+     	  x"$ac_cv_func_ext_krb5_c_string_to_key" != x"yes"
-+  then
-+	if test x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes" -o \
-+     	     x"$ac_cv_func_ext_krb5_string_to_key_salt" != x"yes"
-+	then
-+	      AC_MSG_WARN(no CREATE_KEY_FUNCTIONS detected)
-+	      use_ads=no
-+	fi
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_get_permitted_enctypes" != x"yes" -a \
-+          x"$ac_cv_func_ext_krb5_get_default_in_tkt_etypes" != x"yes"
-+  then
-+    AC_MSG_WARN(no GET_ENCTYPES_FUNCTIONS detected)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_kt_free_entry" != x"yes" -a \
-+          x"$ac_cv_func_ext_krb5_free_keytab_entry_contents" != x"yes"
-+  then
-+    AC_MSG_WARN(no KT_FREE_FUNCTION detected)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_krb5_c_verify_checksum" != x"yes"
-+  then
-+    AC_MSG_WARN(krb5_c_verify_checksum not found in -lkrb5)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_gss_wrap_iov" != x"yes" ; then
-+    AC_MSG_WARN(gss_wrap_iov not found in -lgssapi)
-+    use_ads=no
-+  fi
-+
-+  if test x"$ac_cv_func_ext_gss_get_name_attribute" != x"yes" ; then
-+    if test x"$ac_cv_func_ext_gsskrb5_extract_authz_data_from_sec_context" != x"yes" -o \
-+            x"$ac_cv_func_ext_gss_inquire_sec_context_by_oid" != x"yes"
-+    then
-+      AC_MSG_WARN(need either gss_get_name_attribute or gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid in -lgssapi for PAC support)
-+      use_ads=no
-+    fi
-+  fi
-+
-+  if test x"$use_ads" = x"yes"; then
-+    AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
-+    AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
-+  else
-+    if test x"$with_ads_support" = x"yes"; then
-+	AC_MSG_ERROR(krb5 libs don't have all features required for Active Directory support)
-+    else
-+	AC_MSG_WARN(krb5 libs don't have all features required for Active Directory support)
-+    fi
-+    AC_REMOVE_DEFINE(HAVE_KRB5_H)
-+    AC_REMOVE_DEFINE(HAVE_GSSAPI_H)
-+    AC_REMOVE_DEFINE(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-+    AC_REMOVE_DEFINE(HAVE_GSSAPI_GSSAPI_H)
-+    AC_REMOVE_DEFINE(HAVE_GSSAPI)
-+    KRB5_LIBS=""
-+    with_ads_support=no
-+  fi
-+  AC_MSG_CHECKING(whether Active Directory and krb5 support is used)
-+  AC_MSG_RESULT([$use_ads])
-+
-+LIBS="$ac_save_LIBS"
-+fi
-+
-+AC_CHECK_LIB_EXT(nscd, NSCD_LIBS, nscd_flush_cache)
-+PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
-+
-+
-+########################################################
-+# Compile with DNS Updates support?
-+
-+with_dnsupdate_support=auto
-+AC_MSG_CHECKING([whether to enable DNS Updates support])
-+
-+AC_ARG_WITH(dnsupdate,
-+[AS_HELP_STRING([--with-dnsupdate], [Enable DNS Updates support (default=auto)])],
-+[ case "$withval" in
-+    yes|no)
-+	with_dnsupdate_support=$withval
-+	;;
-+  esac ])
-+
-+AC_MSG_RESULT($with_dnsupdate_support)
-+
-+if test x"$with_dnsupdate_support" != x"no"; then
-+
-+  ################################################################
-+  # first test for AD / GSSAPI support being enabled
-+	if test x"$have_gssapi" != xyes -o x"$use_ads" != xyes ; then
-+		if test x"$with_dnsupdate_support" = x"yes" ; then
-+			AC_MSG_ERROR(DNS Updates support only possible with AD and GSSAPI support)
-+		else
-+			AC_MSG_NOTICE(DNS Updates support only possible with AD and GSSAPI support)
-+			with_dnsupdate_support=no
-+		fi
-+	fi
-+fi
-+
-+if test x"$with_dnsupdate_support" != x"no"; then
-+      AC_DEFINE(WITH_DNS_UPDATES,1,[Whether to enable DNS Update support])
-+fi
-+
-+  # finally print out the result:
-+AC_MSG_CHECKING(whether DNS Updates support is used)
-+AC_MSG_RESULT([$with_dnsupdate_support])
-+
-+
-+#################################################
-+# check for automount support
-+AC_MSG_CHECKING(whether to use automount)
-+AC_ARG_WITH(automount,
-+[AS_HELP_STRING([--with-automount], [Include automount support (default=no)])],
-+[ case "$withval" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(WITH_AUTOMOUNT,1,[Whether to include automount support])
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+#################################################
-+# Check for a PAM clear-text auth, accounts, password
-+# and session support. Most PAM implementations keep their
-+# headers in /usr/include/security. Darwin keeps its in
-+# /usr/include/pam.
-+
-+with_pam_for_crypt=no
-+try_pam=auto
-+AC_MSG_CHECKING(whether to try PAM support)
-+AC_ARG_WITH(pam,
-+[AS_HELP_STRING([--with-pam], [Include PAM support (default=auto)])],
-+[ case "$withval" in
-+  yes|no|auto)
-+    try_pam=$withval
-+    ;;
-+  esac
-+])
-+AC_MSG_RESULT([$try_pam])
-+
-+use_pam=no
-+create_pam_modules=no
-+if test x"${try_pam}" != x"no";then
-+	use_pam=yes
-+	create_pam_modules=yes
-+
-+	# Most systems have PAM headers in /usr/include/security, but Darwin
-+	# has them in /usr/include/pam.
-+	AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
-+	if test x"$ac_cv_header_security_pam_appl_h" != x"yes" -a \
-+		x"$ac_cv_header_pam_pam_appl_h" != x"yes"; then
-+		if test x"${try_pam}" = x"yes";then
-+			AC_MSG_ERROR([--with-pam=yes but pam_appl.h not found])
-+		fi
-+		use_pam=no
-+		create_pam_modules=no
-+	fi
-+
-+	AC_CHECK_LIB_EXT(pam, PAM_LIBS, pam_get_data)
-+	if test x"$ac_cv_lib_ext_pam_pam_get_data" != x"yes"; then
-+		if test x"${try_pam}" = x"yes";then
-+			AC_MSG_ERROR([--with-pam=yes but libpam not found])
-+		fi
-+		use_pam=no
-+		create_pam_modules=no
-+	fi
-+
-+	AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h,,,[[
-+		#if HAVE_SECURITY_PAM_APPL_H
-+		#include <security/pam_appl.h>
-+		#endif
-+		#if HAVE_PAM_PAM_APPL_H
-+		#include <pam/pam_appl.h>
-+		#endif
-+	]])
-+	if test x"$ac_cv_header_security_pam_modules_h" = x"no" -a \
-+		x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
-+		if test x"${try_pam}" = x"yes";then
-+			AC_MSG_ERROR([--with-pam=yes but pam_modules.h not found])
-+       fi
-+		create_pam_modules=no
-+    fi
-+
-+	if test x"$use_pam" = x"yes"; then
-+    AC_DEFINE(WITH_PAM,1,[Whether to include PAM support])
-+		AC_DEFINE(HAVE_LIBPAM,1,[Whether libpam is available])
-+		AUTH_LIBS="$AUTH_LIBS $PAM_LIBS"
-+    with_pam_for_crypt=yes
-+
-+		if test x"$create_pam_modules" = x"yes"; then
-+			AC_DEFINE(WITH_PAM_MODULES,1,[Whether to include PAM MODULES support])
-+			# this checks are optional,
-+			# we don't care about the results here
-+			AC_CHECK_HEADERS(security/pam_ext.h security/_pam_macros.h)
-+			AC_CHECK_HEADERS(pam/pam_ext.h pam/_pam_macros.h)
-+			AC_CHECK_FUNC_EXT(pam_vsyslog,$PAM_LIBS)
-+		else
-+			AC_MSG_WARN([PAM support detected but PAM MODULES support is missing])		
-+		fi
-+	fi
-+	AC_MSG_CHECKING(whether to use PAM support)
-+	AC_MSG_RESULT([$use_pam])
-+
-+	AC_MSG_CHECKING(whether to have PAM MODULES support)
-+	AC_MSG_RESULT([$create_pam_modules])
-+
-+	AC_TRY_COMPILE([
-+		#if defined(HAVE_SECURITY_PAM_APPL_H)
-+		#include <security/pam_appl.h>
-+		#elif defined(HAVE_PAM_PAM_APPL_H)
-+		#include <pam/pam_appl.h>
-+		#endif],[
-+		pam_set_item(0, PAM_RHOST, 0);
-+		],
-+		AC_DEFINE(HAVE_PAM_RHOST, 1,
-+			  [Define to 1 if PAM_RHOST is available]),[])
-+
-+	AC_TRY_COMPILE([
-+		#if defined(HAVE_SECURITY_PAM_APPL_H)
-+		#include <security/pam_appl.h>
-+		#elif defined(HAVE_PAM_PAM_APPL_H)
-+		#include <pam/pam_appl.h>
-+		#endif],[
-+		pam_set_item(0, PAM_TTY, 0);
-+		],
-+		AC_DEFINE(HAVE_PAM_TTY, 1,
-+			  [Define to 1 if PAM_TTY is available]),[])
-+
-+fi # try_pam != no
-+
-+#################################################
-+# check for PAM_RADIO_TYPE
-+AC_TRY_COMPILE([
-+#if (!defined(LINUX))
-+
-+#define PAM_EXTERN extern
-+#if defined(HAVE_SECURITY_PAM_APPL_H)
-+#include <security/pam_appl.h>
-+#elif defined(HAVE_PAM_PAM_APPL_H)
-+#include <pam/pam_appl.h>
-+#endif
-+
-+#endif
-+
-+#if defined(HAVE_SECURITY_PAM_MODULES_H)
-+#include <security/pam_modules.h>
-+#elif defined(HAVE_PAM_PAM_MODULES_H)
-+#include <pam/pam_modules.h>
-+#endif
-+
-+#if defined(HAVE_SECURITY__PAM_MACROS_H)
-+#include <security/_pam_macros.h>
-+#elif defined(HAVE_PAM__PAM_MACROS_H)
-+#include <pam/_pam_macros.h>
-+#endif
-+
-+#ifdef HAVE_SECURITY_PAM_EXT_H
-+#include <security/pam_ext.h>
-+#endif
-+],
-+[int i; i = PAM_RADIO_TYPE; ],
-+AC_DEFINE(HAVE_PAM_RADIO_TYPE, 1, [Define to 1 if PAM_RADIO_TYPE is available]),[])
-+
-+#################################################
-+# check for pam_smbpass support
-+PAM_MODULES=""
-+INSTALL_PAM_MODULES=""
-+UNINSTALL_PAM_MODULES=""
-+
-+try_pam_smbpass=auto
-+AC_MSG_CHECKING(whether to use pam_smbpass)
-+AC_ARG_WITH(pam_smbpass,
-+[AS_HELP_STRING([--with-pam_smbpass], [Build PAM module for authenticating against passdb backends (default=auto)])],
-+[ case "$withval" in
-+  yes|no|auto)
-+    try_pam_smbpass=$withval
-+  ;;
-+  *)
-+    AC_MSG_ERROR([valid options are yes,no,auto])
-+  ;;
-+  esac
-+])
-+
-+if test x"${try_pam_smbpass}" = xno ; then
-+	use_pam_smbpass=no
-+else
-+	use_pam_smbpass=yes
-+	# Conditions under which pam_smbpass can't be built.
-+	if test x"$BLDSHARED" != xtrue ; then
-+		if test x"${try_pam_smbpass}" = xyes ; then
-+			AC_MSG_ERROR([No support for shared modules])
-+		fi
-+		use_pam_smbpass=no
-+	elif test x"$create_pam_modules" != xyes ; then
-+		if test x"${try_pam_smbpass}" = xyes ; then
-+			AC_MSG_ERROR([No support for PAM MODULES])
-+		fi
-+		use_pam_smbpass=no
-+	fi
-+
-+	if test x"${use_pam_smbpass}" = xyes ; then 
-+		PAM_MODULES="pam_smbpass"
-+		INSTALL_PAM_MODULES="installpammodules"
-+		UNINSTALL_PAM_MODULES="uninstallpammodules"
-+	fi
-+fi
-+AC_MSG_RESULT([$use_pam_smbpass])
-+
-+
-+##
-+## moved after the check for -lcrypt in order to
-+## ensure that the necessary libraries are included
-+## check checking for truncated salt.  Wrapped by the
-+## $with_pam_for_crypt variable as above   --jerry
-+##
-+if test $with_pam_for_crypt = no; then
-+AC_CACHE_CHECK([for a crypt that needs truncated salt],samba_cv_HAVE_TRUNCATED_SALT,[
-+crypt_LIBS="$LIBS"
-+LIBS="$AUTH_LIBS $LIBS"
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/crypttest.c"],
-+	samba_cv_HAVE_TRUNCATED_SALT=no,samba_cv_HAVE_TRUNCATED_SALT=yes,samba_cv_HAVE_TRUNCATED_SALT=cross)
-+LIBS="$crypt_LIBS"])
-+if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then
-+	AC_DEFINE(HAVE_TRUNCATED_SALT,1,[Whether crypt needs truncated salt])
-+fi
-+fi
-+
-+#################################################
-+# check for a NISPLUS_HOME support
-+AC_MSG_CHECKING(whether to use NISPLUS_HOME)
-+AC_ARG_WITH(nisplus-home,
-+[AS_HELP_STRING([--with-nisplus-home], [Include NISPLUS_HOME support (default=no)])],
-+[ case "$withval" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(WITH_NISPLUS_HOME,1,[Whether to include nisplus_home support])
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+#################################################
-+# check for syslog logging
-+AC_MSG_CHECKING(whether to use syslog logging)
-+AC_ARG_WITH(syslog,
-+[AS_HELP_STRING([--with-syslog], [Include experimental SYSLOG support (default=no)])],
-+[ case "$withval" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(WITH_SYSLOG,1,[Whether to include experimental syslog support])
-+    ;;
-+  *)
-+    AC_MSG_RESULT(no)
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(no)
-+)
-+
-+#################################################
-+# check for custom syslog facility
-+AC_MSG_CHECKING(whether to use a custom syslog facility)
-+AC_ARG_WITH(syslog-facility,
-+[AS_HELP_STRING([--with-syslog-facility], [Use a custom syslog facility (default=none)])],
-+[
-+  if test "$withval" = "no" ; then
-+    AC_MSG_ERROR([argument to --with-syslog-facility must be a string])
-+  else
-+     AC_MSG_RESULT([$withval])
-+     if test "$withval" != "yes" ; then
-+        syslog_facility="$withval"
-+	AC_DEFINE_UNQUOTED(SYSLOG_FACILITY,$syslog_facility, [syslog facility to log to])
-+     fi
-+  fi
-+],
-+AC_MSG_RESULT(no)
-+)
-+
-+#################################################
-+# check for experimental disk-quotas support
-+
-+samba_cv_WITH_QUOTAS=auto
-+samba_cv_SYSQUOTA_FOUND=no
-+
-+AC_MSG_CHECKING(whether to try disk-quotas support)
-+AC_ARG_WITH(quotas,
-+[AS_HELP_STRING([--with-quotas], [Include disk-quota support (default=no)])],
-+[ case "$withval" in
-+  yes)
-+    AC_MSG_RESULT(yes)
-+    samba_cv_WITH_QUOTAS=yes
-+    ;;
-+  auto)
-+    AC_MSG_RESULT(auto)
-+    samba_cv_WITH_QUOTAS=auto
-+    ;;
-+  no)
-+    AC_MSG_RESULT(no)
-+    samba_cv_WITH_QUOTAS=no
-+    ;;
-+  *)
-+    AC_MSG_RESULT(${samba_cv_WITH_QUOTAS})
-+    ;;
-+  esac ],
-+  AC_MSG_RESULT(${samba_cv_WITH_QUOTAS})
-+)
-+
-+#############################################
-+# only check for quota stuff if --with-quotas
-+if test x"$samba_cv_WITH_QUOTAS" != x"no"; then
-+
-+case "$host_os" in
-+	# on linux we didn't need to test we have builtin support
-+	*linux*)
-+	    samba_cv_SYSQUOTA_FOUND=yes
-+	    AC_DEFINE(HAVE_QUOTACTL_LINUX,1,[Whether Linux quota support is available])
-+	    AC_MSG_CHECKING(whether to use the lib/sysquotas_linux.c builtin support)
-+	    AC_MSG_RESULT(yes)
-+
-+	    AC_MSG_CHECKING(whether to use the lib/sysquotas_xfs.c builtin support)
-+	    AC_MSG_RESULT(yes)
-+	    ;;
-+	*solaris*)
-+	    # need to set this define when using static linking (BUG 1473)
-+	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
-+	    ;;
-+	*)
-+	    ;;
-+esac
-+
-+# some broken header files need this
-+AC_CHECK_HEADER(asm/types.h,[
-+	    AC_DEFINE(HAVE_ASM_TYPES_H,1,[check for <asm/types.h>])
-+	    AC_ADD_INCLUDE(<asm/types.h>)
-+	    ])
-+
-+# For quotas on Veritas VxFS filesystems
-+AC_CHECK_HEADERS(sys/fs/vx_quota.h)
-+
-+# For quotas on XFS filesystems, Linux style
-+AC_CHECK_HEADERS(xfs/xqm.h,[
-+	    AC_DEFINE(HAVE_XFS_QUOTAS,1,[Whether xfs quota support is available])
-+	])
-+
-+# For sys/quota.h and linux/quota.h
-+AC_CHECK_HEADERS(sys/quota.h)
-+
-+# For quotas on BSD systems
-+AC_CHECK_HEADERS(ufs/ufs/quota.h)
-+
-+
-+if test x"$ac_cv_header_xfs_xqm_h" != x"yes"; then
-+# if we have xfs quota support <sys/quota.h> (IRIX) we should use it
-+AC_CACHE_CHECK([for XFS QUOTA in <sys/quota.h>],samba_cv_HAVE_SYS_QUOTA_XFS, [
-+AC_TRY_COMPILE([
-+#include "confdefs.h"
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_ASM_TYPES_H
-+#include <asm/types.h>
-+#endif
-+#include <sys/quota.h>
-+],[int i = Q_XGETQUOTA;],
-+samba_cv_HAVE_SYS_QUOTA_XFS=yes,samba_cv_HAVE_SYS_QUOTA_XFS=no)])
-+if test "$samba_cv_HAVE_SYS_QUOTA_XFS"x = "yes"x; then
-+	AC_DEFINE(HAVE_XFS_QUOTAS,1,[Whether xfs quota support is available])
-+fi
-+fi
-+
-+# if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
-+AC_CACHE_CHECK([if struct dqblk has .dqb_fsoftlimit],samba_cv_HAVE_DQB_FSOFTLIMIT, [
-+AC_TRY_COMPILE([
-+#include "confdefs.h"
-+#ifdef HAVE_SYS_QUOTA_H
-+#include <sys/quota.h>
-+#endif
-+],[
-+struct dqblk D;
-+D.dqb_fsoftlimit = 0;],
-+samba_cv_HAVE_DQB_FSOFTLIMIT=yes,samba_cv_HAVE_DQB_FSOFTLIMIT=no)])
-+if test "$samba_cv_HAVE_DQB_FSOFTLIMIT"x = "yes"x; then
-+	AC_DEFINE(HAVE_DQB_FSOFTLIMIT,1,[struct dqblk .dqb_fsoftlimit])
-+fi
-+
-+##################
-+# look for a working quota system
-+
-+if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
-+AC_CACHE_CHECK([for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)],samba_cv_HAVE_QUOTACTL_4A,[
-+AC_TRY_RUN_STRICT([
-+#define HAVE_QUOTACTL_4A 1
-+#define AUTOCONF_TEST 1
-+#include "confdefs.h"
-+#include "${srcdir-.}/../../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
-+           samba_cv_HAVE_QUOTACTL_4A=yes,samba_cv_HAVE_QUOTACTL_4A=no,samba_cv_HAVE_QUOTACTL_4A=cross)])
-+if test x"$samba_cv_HAVE_QUOTACTL_4A" = x"yes"; then
-+    samba_cv_SYSQUOTA_FOUND=yes;
-+    AC_DEFINE(HAVE_QUOTACTL_4A,1,[Whether long quotactl(int cmd, char *special, qid_t id, caddr_t addr) is available])
-+fi
-+fi
-+
-+if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
-+AC_CACHE_CHECK([for int quotactl(const char *path, int cmd, int id, char *addr)],samba_cv_HAVE_QUOTACTL_4B,[
-+AC_TRY_RUN_STRICT([
-+#define HAVE_QUOTACTL_4B 1
-+#define AUTOCONF_TEST 1
-+#include "confdefs.h"
-+#include "${srcdir-.}/../../tests/sysquotas.c"],[$CFLAGS $Werror_FLAGS],[$CPPFLAGS],[$LDFLAGS],
-+           samba_cv_HAVE_QUOTACTL_4B=yes,samba_cv_HAVE_QUOTACTL_4B=no,samba_cv_HAVE_QUOTACTL_4B=cross)])
-+if test x"$samba_cv_HAVE_QUOTACTL_4B" = x"yes"; then
-+    samba_cv_SYSQUOTA_FOUND=yes;
-+    AC_DEFINE(HAVE_QUOTACTL_4B,1,[Whether int quotactl(const char *path, int cmd, int id, char *addr) is available])
-+    AC_CHECK_MEMBERS([struct dqblk.dqb_curbytes], # Darwin bytecount style
-+	[ AC_DEFINE([HAVE_STRUCT_DQBLK_DQB_CURBYTES],[1],[darwin style quota bytecount])],,
-+	[#include <sys/types.h>
-+	#include <sys/quota.h>])
-+
-+fi
-+fi
-+
-+AC_CACHE_CHECK([for NFS QUOTAS],samba_cv_HAVE_NFS_QUOTAS,[
-+AC_TRY_COMPILE([
-+#include <rpc/rpc.h>
-+#include <rpc/types.h>
-+#include <rpcsvc/rquota.h>
-+#ifdef HAVE_RPC_NETTYPE_H
-+#include <rpc/nettype.h>
-+#endif
-+#include <rpc/xdr.h>
-+],[clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp");],
-+		   samba_cv_HAVE_NFS_QUOTAS=yes, samba_cv_HAVE_NFS_QUOTAS=no)])
-+
-+if test x"$samba_cv_HAVE_NFS_QUOTAS" = x"yes"; then
-+    AC_DEFINE(HAVE_NFS_QUOTAS,1,[NFS quota support is available])
-+    AC_CHECK_MEMBER(struct getquota_rslt.getquota_rslt_u,
-+		AC_DEFINE(HAVE_GETQUOTA_RSLT_GETQUOTA_RSLT_U, 1, [Defined if struct getquota_rslt has getquota_rslt_u]),,
-+		[#include <rpcsvc/rquota.h>])
-+fi
-+
-+#################################################
-+# check for mntent.h and struct mntent
-+AC_CHECK_HEADERS(mntent.h)
-+#################################################
-+# check for setmntent,getmntent,endmntent
-+AC_CHECK_FUNCS(setmntent getmntent endmntent)
-+
-+#################################################
-+# check for devnm.h and struct mntent
-+AC_CHECK_HEADERS(devnm.h)
-+#################################################
-+# check for devnm
-+AC_CHECK_FUNCS(devnm)
-+
-+AC_MSG_CHECKING(whether to use the new lib/sysquotas.c interface)
-+if test x"$samba_cv_SYSQUOTA_FOUND" = x"yes"; then
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(WITH_QUOTAS,1,[Whether to use disk quota support])
-+	AC_DEFINE(HAVE_SYS_QUOTAS,1,[Whether the new lib/sysquotas.c interface can be used])
-+else
-+    AC_MSG_RESULT(no)
-+    AC_MSG_CHECKING(whether to use the old quota support)
-+    if test x"$samba_cv_WITH_QUOTAS" = x"yes"; then
-+        AC_DEFINE(WITH_QUOTAS,1,[Whether to use old quota support])
-+	AC_MSG_RESULT(yes)
-+    else
-+	AC_MSG_RESULT(no)
-+    fi
-+fi
-+
-+####################
-+# End of quota check samba_cv_WITH_QUOTAS
-+fi
-+
-+#################################################
-+# check for experimental utmp accounting
-+
-+AC_MSG_CHECKING(whether to support utmp accounting)
-+WITH_UTMP=yes
-+AC_ARG_WITH(utmp,
-+[AS_HELP_STRING([--with-utmp], [Include utmp accounting (default, if supported by OS)])],
-+[ case "$withval" in
-+  no)
-+		WITH_UTMP=no
-+		;;
-+  *)
-+		WITH_UTMP=yes
-+                ;;
-+  esac ],
-+)
-+
-+# utmp requires utmp.h
-+# Note similar check earlier, when checking utmp details.
-+
-+if test x"$WITH_UTMP" = x"yes" -a x"$ac_cv_header_utmp_h" = x"no"; then
-+	utmp_no_reason=", no utmp.h on $host_os"
-+	WITH_UTMP=no
-+fi
-+
-+if test x"$WITH_UTMP" = x"yes" -a x"$samba_cv_HAVE_UX_UT_LINE" != x"yes"; then
-+	utmp_no_reason=", sizeof ut_line not ok"
-+	WITH_UTMP=no
-+fi
-+
-+# Display test results
-+
-+if test x"$WITH_UTMP" = x"yes"; then
-+        AC_MSG_RESULT(yes)
-+	AC_DEFINE(WITH_UTMP,1,[Whether to include experimental utmp accounting])
-+else
-+        AC_MSG_RESULT(no$utmp_no_reason)
-+fi
-+
-+
-+#################################################
-+# these tests are taken from the GNU fileutils package
-+AC_CHECKING(how to get filesystem space usage)
-+space=no
-+
-+# Perform only the link test since it seems there are no variants of the
-+# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
-+# because that got a false positive on SCO OSR5.  Adding the declaration
-+# of a `struct statvfs' causes this test to fail (as it should) on such
-+# systems.  That system is reported to work fine with STAT_STATFS4 which
-+# is what it gets when this test fails.
-+if test $space = no; then
-+  # SVR4
-+  AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-+		 [AC_TRY_LINK([#include <sys/types.h>
-+#include <sys/statvfs.h>],
-+			      [struct statvfs fsd; statvfs (0, &fsd);],
-+			      fu_cv_sys_stat_statvfs=yes,
-+			      fu_cv_sys_stat_statvfs=no)])
-+  if test $fu_cv_sys_stat_statvfs = yes; then
-+    space=yes
-+    AC_DEFINE(STAT_STATVFS,1,[Whether statvfs() is available])
-+  fi
-+fi
-+
-+# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
-+# This is not the case on ancient Linux systems.
-+
-+AC_CACHE_CHECK([that statvfs.f_fsid is an integer],samba_cv_fsid_int, [
-+    AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/statvfs.h>],[struct statvfs buf; buf.f_fsid = 0],
-+	samba_cv_fsid_int=yes,samba_cv_fsid_int=no)])
-+if test x"$samba_cv_fsid_int" = x"yes"; then
-+    AC_DEFINE(HAVE_FSID_INT, 1, [Whether statvfs.f_fsid is an integer])
-+fi
-+
-+# fsusage.c assumes that statvfs has an f_frsize entry. Some weird
-+# systems use f_bsize.
-+AC_CACHE_CHECK([that statvfs.f_frsize works],samba_cv_frsize, [
-+    AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/statvfs.h>],[struct statvfs buf; buf.f_frsize = 0],
-+	samba_cv_frsize=yes,samba_cv_frsize=no)])
-+if test x"$samba_cv_frsize" = x"yes"; then
-+    AC_DEFINE(HAVE_FRSIZE, 1, [Whether statvfs.f_frsize exists])
-+fi
-+
-+# Some systems use f_flag in struct statvfs while others use f_flags
-+AC_CACHE_CHECK([that statvfs.statvfs_f_flag works],samba_cv_statvfs_f_flag, [
-+    AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/statvfs.h>],[struct statvfs buf; buf.f_flag = 0],
-+	samba_cv_statvfs_f_flag=yes,samba_cv_statvfs_f_flag=no)])
-+if test x"$samba_cv_statvfs_f_flag" = x"yes"; then
-+    AC_DEFINE(HAVE_STATVFS_F_FLAG, 1, [Whether statvfs.f_flag exists])
-+fi
-+
-+AC_CACHE_CHECK([that statvfs.statvfs_f_flags works],samba_cv_statvfs_f_flags, [
-+    AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/statvfs.h>],[struct statvfs buf; buf.f_flags = 0],
-+	samba_cv_statvfs_f_flags=yes,samba_cv_statvfs_f_flags=no)])
-+if test x"$samba_cv_statvfs_f_flags" = x"yes"; then
-+    AC_DEFINE(HAVE_STATVFS_F_FLAGS, 1, [Whether statvfs.f_flags exists])
-+fi
-+
-+if test $space = no; then
-+  # DEC Alpha running OSF/1
-+  AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-+  AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-+  [AC_TRY_RUN([
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/mount.h>
-+  main ()
-+  {
-+    struct statfs fsd;
-+    fsd.f_fsize = 0;
-+    return (statfs (".", &fsd, sizeof (struct statfs)));
-+  }],
-+  fu_cv_sys_stat_statfs3_osf1=yes,
-+  fu_cv_sys_stat_statfs3_osf1=no,
-+  fu_cv_sys_stat_statfs3_osf1=no)])
-+  AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-+  if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-+    space=yes
-+    AC_DEFINE(STAT_STATFS3_OSF1,1,[Whether statfs requires 3 arguments])
-+  fi
-+fi
-+
-+if test $space = no; then
-+# AIX
-+  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
-+member (AIX, 4.3BSD)])
-+  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-+  [AC_TRY_RUN([
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
-+#ifdef HAVE_SYS_VFS_H
-+#include <sys/vfs.h>
-+#endif
-+  main ()
-+  {
-+  struct statfs fsd;
-+  fsd.f_bsize = 0;
-+  return (statfs (".", &fsd));
-+  }],
-+  fu_cv_sys_stat_statfs2_bsize=yes,
-+  fu_cv_sys_stat_statfs2_bsize=no,
-+  fu_cv_sys_stat_statfs2_bsize=no)])
-+  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-+  if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-+    space=yes
-+    AC_DEFINE(STAT_STATFS2_BSIZE,1,[Whether statfs requires two arguments and struct statfs has bsize property])
-+  fi
-+fi
-+
-+if test $space = no; then
-+# SVR3
-+  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-+  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-+  [AC_TRY_RUN([#include <sys/types.h>
-+#include <sys/statfs.h>
-+  main ()
-+  {
-+  struct statfs fsd;
-+  return (statfs (".", &fsd, sizeof fsd, 0));
-+  }],
-+    fu_cv_sys_stat_statfs4=yes,
-+    fu_cv_sys_stat_statfs4=no,
-+    fu_cv_sys_stat_statfs4=no)])
-+  AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-+  if test $fu_cv_sys_stat_statfs4 = yes; then
-+    space=yes
-+    AC_DEFINE(STAT_STATFS4,1,[Whether statfs requires 4 arguments])
-+  fi
-+fi
-+
-+if test $space = no; then
-+# 4.4BSD and NetBSD
-+  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
-+member (4.4BSD and NetBSD)])
-+  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-+  [AC_TRY_RUN([#include <sys/types.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
-+  main ()
-+  {
-+  struct statfs fsd;
-+  fsd.f_fsize = 0;
-+  return (statfs (".", &fsd));
-+  }],
-+  fu_cv_sys_stat_statfs2_fsize=yes,
-+  fu_cv_sys_stat_statfs2_fsize=no,
-+  fu_cv_sys_stat_statfs2_fsize=no)])
-+  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-+  if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-+    space=yes
-+	AC_DEFINE(STAT_STATFS2_FSIZE,1,[Whether statfs requires 2 arguments and struct statfs has fsize])
-+  fi
-+fi
-+
-+if test $space = no; then
-+  # Ultrix
-+  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-+  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-+  [AC_TRY_RUN([#include <sys/types.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
-+#ifdef HAVE_SYS_FS_TYPES_H
-+#include <sys/fs_types.h>
-+#endif
-+  main ()
-+  {
-+  struct fs_data fsd;
-+  /* Ultrix's statfs returns 1 for success,
-+     0 for not mounted, -1 for failure.  */
-+  return (statfs (".", &fsd) != 1);
-+  }],
-+  fu_cv_sys_stat_fs_data=yes,
-+  fu_cv_sys_stat_fs_data=no,
-+  fu_cv_sys_stat_fs_data=no)])
-+  AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-+  if test $fu_cv_sys_stat_fs_data = yes; then
-+    space=yes
-+    AC_DEFINE(STAT_STATFS2_FS_DATA,1,[Whether statfs requires 2 arguments and struct fs_data is available])
-+  fi
-+fi
-+
-+#################################################
-+# check for cluster extensions
-+
-+AC_MSG_CHECKING(cluster support)
-+AC_ARG_WITH(cluster-support,
-+[AS_HELP_STRING([--with-cluster-support], [Enable cluster extensions (default=auto)])])
-+
-+if test x"$with_cluster_support" = x ; then
-+	with_cluster_support="auto"
-+fi
-+
-+AC_MSG_RESULT($with_cluster_support)
-+
-+AC_ARG_WITH(ctdb,
-+[AS_HELP_STRING([--with-ctdb=DIR], [Where to find ctdb sources])],
-+[ case "$withval" in
-+  yes|no)
-+    AC_MSG_WARN([--with-ctdb called without argument])
-+    ;;
-+  *)
-+    CTDB_CPPFLAGS="-I$withval/include"
-+    ;;
-+  esac])
-+
-+AC_ARG_ENABLE(old-ctdb,
-+	[AS_HELP_STRING([--enable-old-ctdb],
-+		[Enable build against (too) old ctdb version (default=no)])],,
-+		[enable_old_ctdb=no])
-+
-+
-+if test "$with_cluster_support" != "no" ; then
-+
-+AC_MSG_NOTICE(checking whether cluster support is available)
-+
-+have_cluster_support="yes"
-+ctdb_broken="no"
-+
-+SAVED_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
-+
-+AC_CHECK_HEADERS(ctdb.h ctdb_private.h ctdb_protocol.h ,,,[
-+#include "confdefs.h"
-+#define NO_CONFIG_H
-+#include "replace.h"
-+#include "system/wait.h"
-+#include "system/network.h"
-+#define private #error __USED_RESERVED_WORD_private__
-+#include <talloc.h>
-+#include <tdb.h>
-+#include <ctdb.h>
-+])
-+
-+if test "x$have_cluster_support" = "xyes" -a \
-+	"x$ac_cv_header_ctdb_h" != "xyes"
-+then
-+	have_cluster_support=no
-+	ctdb_broken="ctdb.h is required for cluster support"
-+fi
-+
-+if test "x$have_cluster_support" = "xyes" -a \
-+	"x$ac_cv_header_ctdb_private_h" != "xyes"
-+then
-+	have_cluster_support=no
-+	ctdb_broken="ctdb_private.h is required for cluster support"
-+fi
-+
-+
-+if test "x$have_cluster_support" = "xyes" ; then
-+	AC_HAVE_DECL(CTDB_CONTROL_TRANS3_COMMIT,[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	#include <ctdb_private.h>
-+	])
-+	if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" != x"yes"; then
-+		ctdb_broken="ctdb transaction support missing or too old"
-+		have_cluster_support=no
-+	fi
-+fi
-+
-+if test "x$have_cluster_support" = "xyes" ; then
-+	AC_HAVE_DECL(CTDB_CONTROL_SCHEDULE_FOR_DELETION,[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	#include <ctdb_private.h>
-+	])
-+	if test x"$ac_cv_have_CTDB_CONTROL_SCHEDULE_FOR_DELETION_decl" != x"yes"
-+	then
-+		if test "x$enable_old_ctdb" = "xyes" ; then
-+			AC_MSG_WARN([ignoring missing SCHEDULE_FOR_DELETION (--enable-old-ctdb)])
-+		else
-+			ctdb_broken="support for SCHEDULE_FOR_DELETION control missing"
-+			have_cluster_support=no
-+		fi
-+	fi
-+fi
-+
-+if test "x$have_cluster_support" = "xyes" ; then
-+	AC_HAVE_DECL(CTDB_CONTROL_CHECK_SRVIDS,[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	#include <ctdb_private.h>
-+	])
-+	if test x"$ac_cv_have_CTDB_CONTROL_CHECK_SRVIDS_decl" != x"yes"
-+	then
-+		if test "x$enable_old_ctdb" = "xyes" ; then
-+			AC_MSG_WARN([ignoring missing CHECK_SRVIDS (--enable-old-ctdb)])
-+		else
-+			ctdb_broken="support for CHECK_SRVIDS control missing"
-+			have_cluster_support=no
-+		fi
-+	fi
-+fi
-+
-+AC_ARG_ENABLE([ctdb-readonly-records],
-+	AS_HELP_STRING([--enable-ctdb-readonly-records],
-+		[Turn on CTDB readonly records support (default=yes)]),
-+	[want_ctdb_readonly=$enableval],
-+	[want_ctdb_readonly=yes])
-+
-+if test "x$have_cluster_support" = "xyes" -a "x$want_ctdb_readonly" = "xyes" ; then
-+	AC_HAVE_DECL(CTDB_WANT_READONLY,[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	])
-+
-+	if test "x$ac_cv_have_CTDB_WANT_READONLY_decl" != "xyes" ; then
-+		if test "x$enable_old_ctdb" = "xyes" ; then
-+			AC_MSG_WARN([ignoring missing READONLY support (--enable-old-ctdb)])
-+		else
-+			ctdb_broken="support for CTDB readonly records missing"
-+			have_cluster_support=no
-+		fi
-+	fi
-+fi
-+
-+if test "x$have_cluster_support" = "xyes" ; then
-+	# In ctdb 1.0.57, ctdb_control_tcp was temporarily renamed
-+	# to ctdb_tcp_client.
-+	AC_CHECK_TYPE(struct ctdb_tcp_client,[
-+		AC_DEFINE([ctdb_control_tcp],[ctdb_tcp_client],[ctdb ipv4 support])
-+	],,[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	#include <ctdb_private.h>
-+	])
-+fi
-+
-+if test "x$have_cluster_support" = "xyes" ; then
-+	AC_CHECK_TYPE(struct ctdb_control_tcp,[
-+		AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP],[1],[ctdb ipv4 support])
-+	],[
-+		ctdb_broken="missing struct ctdb_control_tcp"
-+		have_cluster_support=no
-+	],[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	#include <ctdb_private.h>
-+	])
-+fi
-+
-+# test for optional ipv6 support in ctdb:
-+if test "x$have_cluster_support" = "xyes" ; then
-+	AC_CHECK_TYPE(struct ctdb_control_tcp_addr,[
-+		AC_DEFINE([HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR],[1],[ctdb ipv6 support])
-+	],,[
-+	#include "confdefs.h"
-+	#define NO_CONFIG_H
-+	#include "replace.h"
-+	#include "system/wait.h"
-+	#include "system/network.h"
-+	#include <talloc.h>
-+	#include <tdb.h>
-+	#include <ctdb.h>
-+	#include <ctdb_private.h>
-+	])
-+fi
-+
-+CPPFLAGS="$SAVED_CPPFLAGS"
-+
-+fi # (if test "$with_cluster_support" != "no")
-+
-+if test x"$have_cluster_support" = "xno" ; then
-+	case "$with_cluster_support" in
-+	yes)
-+		AC_MSG_ERROR(["cluster support not available: $ctdb_broken"])
-+		;;
-+	auto)
-+		AC_MSG_WARN(["cluster support not available: $ctdb_broken"])
-+		;;
-+	esac
-+	with_cluster_support=no
-+fi
-+
-+if test "x$with_cluster_support" != "xno"; then
-+    AC_DEFINE(CLUSTER_SUPPORT,1,[Whether to enable cluster extensions])
-+    SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${CTDB_CPPFLAGS}"
-+    AC_MSG_NOTICE(Building with cluster support)
-+else
-+    AC_MSG_NOTICE(Building without cluster support)
-+fi
-+
-+
-+#################################################
-+# check for rtnetlink
-+
-+AC_CHECK_HEADERS([linux/netlink.h],
-+  AC_CHECK_HEADERS([linux/rtnetlink.h],[],[],
-+                   [#include <bits/sockaddr.h>
-+                    #include <linux/netlink.h>]),
-+  [],[#include <bits/sockaddr.h>])
-+
-+#################################################
-+# check for ACL support
-+
-+AC_MSG_CHECKING(whether to support ACLs)
-+AC_ARG_WITH(acl-support,
-+[AS_HELP_STRING([--with-acl-support], [Include ACL support (default=auto)])],
-+[ case "$withval" in
-+	yes|no)
-+		with_acl_support="$withval"
-+		;;
-+  esac ])
-+
-+if test x"$with_acl_support" = x ; then
-+	with_acl_support="auto"
-+fi
-+
-+AC_MSG_RESULT($with_acl_support)
-+
-+if test x"$with_acl_support" = x"no"; then
-+	AC_MSG_RESULT(Disabling ACL support)
-+else
-+	AC_MSG_NOTICE(checking whether ACL support is available:)
-+	case "$host_os" in
-+	*sysv5*)
-+		AC_MSG_NOTICE(Using UnixWare ACLs)
-+		AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available])
-+		default_static_modules="$default_static_modules vfs_solarisacl"
-+		;;
-+	*solaris*)
-+		AC_MSG_NOTICE(Using solaris ACLs)
-+		AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available])
-+		ACL_LIBS="$ACL_LIBS -lsec"
-+		default_static_modules="$default_static_modules vfs_solarisacl"
-+		;;
-+	*hpux*)
-+		AC_MSG_NOTICE(Using HPUX ACLs)
-+		AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available])
-+		default_static_modules="$default_static_modules vfs_hpuxacl"
-+		;;
-+	*aix*)
-+		AC_MSG_NOTICE(Using AIX ACLs)
-+		AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available])
-+		default_static_modules="$default_static_modules vfs_aixacl"
-+		;;
-+	*osf*)
-+		AC_MSG_NOTICE(Using Tru64 ACLs)
-+		AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available])
-+		ACL_LIBS="$ACL_LIBS -lpacl"
-+		default_static_modules="$default_static_modules vfs_tru64acl"
-+		;;
-+	*darwin*)
-+		AC_MSG_NOTICE(ACLs on Darwin currently not supported)
-+		;;
-+	*)
-+		AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
-+		case "$host_os" in
-+		*linux*)
-+			AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
-+			;;
-+		esac
-+		AC_CACHE_CHECK([for POSIX ACL support],samba_cv_HAVE_POSIX_ACLS,[
-+			acl_LIBS=$LIBS
-+			LIBS="$LIBS $ACL_LIBS"
-+			AC_TRY_LINK([
-+				#include <sys/types.h>
-+				#include <sys/acl.h>
-+			],[
-+				acl_t acl;
-+				int entry_id;
-+				acl_entry_t *entry_p;
-+				return acl_get_entry(acl, entry_id, entry_p);
-+			],
-+			[samba_cv_HAVE_POSIX_ACLS=yes],
-+			[samba_cv_HAVE_POSIX_ACLS=no])
-+			LIBS=$acl_LIBS
-+		])
-+		if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
-+			AC_MSG_NOTICE(Using posix ACLs)
-+			AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available])
-+			AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
-+				acl_LIBS=$LIBS
-+				LIBS="$LIBS $ACL_LIBS"
-+				AC_TRY_LINK([
-+					#include <sys/types.h>
-+					#include <sys/acl.h>
-+				],[
-+					acl_permset_t permset_d;
-+					acl_perm_t perm;
-+					return acl_get_perm_np(permset_d, perm);
-+				],
-+				[samba_cv_HAVE_ACL_GET_PERM_NP=yes],
-+				[samba_cv_HAVE_ACL_GET_PERM_NP=no])
-+				LIBS=$acl_LIBS
-+			])
-+			if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
-+				AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available])
-+			fi
-+   			default_static_modules="$default_static_modules vfs_posixacl"
-+		else
-+			AC_MSG_NOTICE(ACL support is not avaliable)
-+		fi
-+		;;
-+        esac
-+fi # with_acl_support
-+
-+#################################################
-+# check if we have FreeBSD sunacl
-+case "$host_os" in
-+*freebsd*)
-+    AC_CHECK_HEADER(sunacl.h)
-+    if test x"$ac_cv_header_sunacl_h" = xyes ; then
-+       AC_DEFINE(HAVE_FREEBSD_SUNACL_H,1,[Whether we have FreeBSD sunacl around])
-+       ZFSACL_LIBS=-lsunacl
-+       AC_SUBST(ZFSACL_LIBS)
-+       default_shared_modules="$default_shared_modules vfs_zfsacl"
-+    fi
-+    ;;
-+esac
-+
-+#################################################
-+# check for AIO support
-+
-+with_aio=auto
-+AC_MSG_CHECKING(whether to support asynchronous io)
-+AC_ARG_WITH(aio-support,
-+[AS_HELP_STRING([--with-aio-support], [Include asynchronous io support (default=auto)])],
-+[  case "$withval" in
-+    yes|no)
-+	with_aio=$withval
-+	;;
-+   esac ])
-+
-+AC_MSG_RESULT($with_aio)
-+
-+if test x"$with_aio" = x"no"; then
-+    AC_DEFINE(HAVE_NO_AIO,1,[Whether no asynchronous io support should be built in])
-+else
-+		AIO_LIBS=$LIBS
-+		no_rt_LIBS=$LIBS
-+		AC_CHECK_LIB(rt,aio_read,[AIO_LIBS="$LIBS -lrt"])
-+		LIBS=$no_rt_LIBS
-+		AC_CHECK_LIB(aio,aio_read,[AIO_LIBS="$LIBS -laio"])
-+		AC_CACHE_CHECK([for asynchronous io support],samba_cv_HAVE_AIO,[
-+		aio_LIBS=$LIBS
-+		LIBS=$AIO_LIBS
-+		AC_TRY_LINK([#include <sys/types.h>
-+#include <aio.h>],
-+[ struct aiocb a; return aio_read(&a);],
-+samba_cv_HAVE_AIO=yes,samba_cv_HAVE_AIO=no)
-+		LIBS=$aio_LIBS])
-+		if test x"$samba_cv_HAVE_AIO" = x"yes"; then
-+			AC_DEFINE(HAVE_AIO, 1, [Using asynchronous io])
-+			LIBS=$AIO_LIBS
-+			AC_MSG_CHECKING(for aio_read)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { struct aiocb a; return aio_read(&a); }])],
-+[AC_DEFINE(HAVE_AIO_READ, 1, [Have aio_read]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+
-+			AC_MSG_CHECKING(for aio_write)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { struct aiocb a; return aio_write(&a); }])],
-+[AC_DEFINE(HAVE_AIO_WRITE, 1, [Have aio_write]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+
-+			AC_MSG_CHECKING(for aio_fsync)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { struct aiocb a; return aio_fsync(1, &a); }])],
-+[AC_DEFINE(HAVE_AIO_FSYNC, 1, [Have aio_fsync]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+
-+			AC_MSG_CHECKING(for aio_return)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { struct aiocb a; return aio_return(&a); }])],
-+[AC_DEFINE(HAVE_AIO_RETURN, 1, [Have aio_return]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+
-+			AC_MSG_CHECKING(for aio_error)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { struct aiocb a; return aio_error(&a); }])],
-+[AC_DEFINE(HAVE_AIO_ERROR, 1, [Have aio_error]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+
-+			AC_MSG_CHECKING(for aio_cancel)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { struct aiocb a; return aio_cancel(1, &a); }])],
-+[AC_DEFINE(HAVE_AIO_CANCEL, 1, [Have aio_cancel]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+
-+			AC_MSG_CHECKING(for aio_suspend)
-+			AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h>
-+int main() { const struct aiocb * const [a[1]]; struct timespec t; return aio_suspend(a, 1, &t); }])],
-+[AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)],
-+[AC_MSG_RESULT(no)])
-+		else
-+			AC_DEFINE(HAVE_NO_AIO,1,[Whether no asynchronous io support is available])
-+			AC_MSG_RESULT(no)
-+		fi
-+fi
-+
-+if test x"$samba_cv_msghdr_msg_control" = x"yes" -o \
-+	x"$samba_cv_msghdr_msg_acctright" = x"yes"; then
-+	default_shared_modules="$default_shared_modules vfs_aio_fork"
-+fi
-+
-+# Check for Linux kernel aio support.
-+case "$host_os" in
-+*linux*)
-+    AC_CHECK_LIB(aio,io_submit,[AIO_LIBS="$LIBS -laio"])
-+    AC_CACHE_CHECK([for Linux kernel asynchronous io support],samba_cv_HAVE_LINUX_KERNEL_AIO,[
-+    aio_LIBS=$LIBS
-+    LIBS=$AIO_LIBS
-+    AC_TRY_LINK([#include <unistd.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <sys/eventfd.h>
-+#include <libaio.h>],
-+[ struct io_event ioev;
-+struct iocb *ioc;
-+io_context_t ctx;
-+struct timespec ts;
-+int fd;
-+char *buf;
-+fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
-+io_queue_init(128,&ctx);
-+io_prep_pwrite(ioc, 1, buf, 1, 0);
-+io_prep_pread(ioc, 1, buf, 1, 0);
-+io_set_eventfd(ioc, fd);
-+io_set_callback(ioc, (io_callback_t)(0));
-+io_submit(ctx, 1, &ioc);
-+io_getevents(ctx, 1, 1, &ioev, &ts);],
-+samba_cv_HAVE_LINUX_KERNEL_AIO=yes,samba_cv_HAVE_LINUX_KERNEL_AIO=no)
-+		LIBS=$aio_LIBS])
-+    if test x"$samba_cv_HAVE_LINUX_KERNEL_AIO" = x"yes"; then
-+	default_shared_modules="$default_shared_modules vfs_aio_linux"
-+    fi
-+    ;;
-+esac
-+
-+if test x"$samba_cv_HAVE_AIO" = x"yes"; then
-+  default_shared_modules="$default_shared_modules vfs_aio_posix"
-+fi
-+
-+#################################################
-+# check for sendfile support
-+
-+AC_MSG_CHECKING(whether sendfile support should be built in)
-+AC_ARG_WITH(sendfile-support,
-+[AS_HELP_STRING([--with-sendfile-support], [Whether sendfile support should be built in (default=auto)])],
-+[ case "$withval" in
-+  yes|no)
-+	AC_MSG_RESULT($withval);
-+	with_sendfile_support=$withval
-+	;;
-+  *)
-+	AC_MSG_RESULT(yes)
-+	with_sendfile_support=auto
-+	;;
-+  esac ],
-+)
-+
-+if test x$with_sendfile_support != xno ; then
-+    case "$host_os" in
-+	*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+		AC_CACHE_CHECK([for linux sendfile support],samba_cv_HAVE_SENDFILE,[
-+		AC_TRY_LINK([#include <sys/sendfile.h>],
-+[\
-+int tofd, fromfd;
-+off_t offset;
-+size_t total;
-+ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
-+],
-+samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
-+
-+        if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
-+    		AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
-+		AC_DEFINE(LINUX_SENDFILE_API,1,[Whether linux sendfile() API is available])
-+		AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used])
-+	else
-+		AC_MSG_RESULT(no);
-+	fi
-+
-+	;;
-+	*freebsd* | *dragonfly* )
-+		AC_CACHE_CHECK([for freebsd sendfile support],samba_cv_HAVE_SENDFILE,[
-+		AC_TRY_LINK([\
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <sys/socket.h>
-+#include <sys/uio.h>],
-+[\
-+	int fromfd, tofd, ret, total=0;
-+	off_t offset, nwritten;
-+	struct sf_hdtr hdr;
-+	struct iovec hdtrl;
-+	hdr.headers = &hdtrl;
-+	hdr.hdr_cnt = 1;
-+	hdr.trailers = NULL;
-+	hdr.trl_cnt = 0;
-+	hdtrl.iov_base = NULL;
-+	hdtrl.iov_len = 0;
-+	ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
-+],
-+samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
-+
-+	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
-+    		AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() support is available])
-+		AC_DEFINE(FREEBSD_SENDFILE_API,1,[Whether the FreeBSD sendfile() API is available])
-+		AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included])
-+	else
-+		AC_MSG_RESULT(no);
-+	fi
-+	;;
-+	*darwin*)
-+		AC_CACHE_CHECK([for Darwin sendfile support],
-+			samba_cv_HAVE_SENDFILE,
-+			[
-+			AC_TRY_LINK([
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/uio.h>
-+			],
-+			[
-+	int fromfd, tofd, ret;
-+	off_t offset, nwritten;
-+	struct sf_hdtr hdr;
-+	struct iovec hdtrl;
-+	hdr.headers = &hdtrl;
-+	hdr.hdr_cnt = 1;
-+	hdr.trailers = (void *)0;
-+	hdr.trl_cnt = 0;
-+	hdtrl.iov_base = (void *)0;
-+	hdtrl.iov_len = 0;
-+	ret = sendfile(fromfd, tofd, offset, &nwritten, &hdr, 0);
-+			],
-+			samba_cv_HAVE_SENDFILE=yes,
-+			samba_cv_HAVE_SENDFILE=no)])
-+
-+	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
-+		AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() support is available])
-+		AC_DEFINE(DARWIN_SENDFILE_API,1,[Whether the Darwin sendfile() API is available])
-+		AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included])
-+	else
-+		AC_MSG_RESULT(no);
-+	fi
-+	;;
-+	*hpux*|*osf*)
-+		AC_CACHE_CHECK([for osf/hpux sendfile support],samba_cv_HAVE_SENDFILE,[
-+		AC_TRY_LINK([\
-+#include <sys/socket.h>
-+#include <sys/uio.h>],
-+[\
-+	int fromfd, tofd;
-+	size_t total=0;
-+	struct iovec hdtrl[2];
-+	ssize_t nwritten;
-+	off_t offset;
-+
-+	hdtrl[0].iov_base = 0;
-+	hdtrl[0].iov_len = 0;
-+
-+	nwritten = sendfile(tofd, fromfd, offset, total, &hdtrl[0], 0);
-+],
-+samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
-+	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
-+    		AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
-+		AC_DEFINE(HPUX_SENDFILE_API,1,[Whether the osf/hpux sendfile() API is available])
-+		AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() support should be included])
-+	else
-+		AC_MSG_RESULT(no);
-+	fi
-+	;;
-+
-+	*solaris*)
-+		AC_CHECK_LIB(sendfile,sendfilev)
-+		AC_CACHE_CHECK([for solaris sendfilev support],samba_cv_HAVE_SENDFILEV,[
-+		AC_TRY_LINK([\
-+#include <sys/sendfile.h>],
-+[\
-+        int sfvcnt;
-+        size_t xferred;
-+        struct sendfilevec vec[2];
-+	ssize_t nwritten;
-+	int tofd;
-+
-+	sfvcnt = 2;
-+
-+	vec[0].sfv_fd = SFV_FD_SELF;
-+	vec[0].sfv_flag = 0;
-+	vec[0].sfv_off = 0;
-+	vec[0].sfv_len = 0;
-+
-+	vec[1].sfv_fd = 0;
-+	vec[1].sfv_flag = 0;
-+	vec[1].sfv_off = 0;
-+	vec[1].sfv_len = 0;
-+	nwritten = sendfilev(tofd, vec, sfvcnt, &xferred);
-+],
-+samba_cv_HAVE_SENDFILEV=yes,samba_cv_HAVE_SENDFILEV=no)])
-+
-+	if test x"$samba_cv_HAVE_SENDFILEV" = x"yes"; then
-+    		AC_DEFINE(HAVE_SENDFILEV,1,[Whether sendfilev() is available])
-+		AC_DEFINE(SOLARIS_SENDFILE_API,1,[Whether the solaris sendfile() API is available])
-+		AC_DEFINE(WITH_SENDFILE,1,[Whether to include sendfile() support])
-+	else
-+		AC_MSG_RESULT(no);
-+	fi
-+	;;
-+	*aix*)
-+		AC_CACHE_CHECK([for AIX send_file support],samba_cv_HAVE_SENDFILE,[
-+		AC_TRY_LINK([\
-+#include <sys/socket.h>],
-+[\
-+	int fromfd, tofd;
-+	size_t total=0;
-+	struct sf_parms hdtrl;
-+	ssize_t nwritten;
-+
-+	hdtrl.header_data = 0;
-+	hdtrl.header_length = 0;
-+	hdtrl.file_descriptor = fromfd;
-+	hdtrl.file_offset = 0;
-+	hdtrl.file_bytes = 0;
-+	hdtrl.trailer_data = 0;
-+	hdtrl.trailer_length = 0;
-+
-+	nwritten = send_file(&tofd, &hdtrl, 0);
-+],
-+samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
-+	if test x"$samba_cv_HAVE_SENDFILE" = x"yes"; then
-+		AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
-+		AC_DEFINE(AIX_SENDFILE_API,1,[Whether the AIX send_file() API is available])
-+		AC_DEFINE(WITH_SENDFILE,1,[Whether to include sendfile() support])
-+	else
-+		AC_MSG_RESULT(no);
-+	fi
-+	;;
-+	*)
-+	;;
-+    esac
-+fi
-+
-+if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ; then
-+	AC_MSG_ERROR(sendfile support requested but sendfile not available )
-+fi
-+
-+############################################
-+# See if we have the Linux readahead syscall.
-+
-+AC_CACHE_CHECK([for Linux readahead],
-+                samba_cv_HAVE_LINUX_READAHEAD,[
-+    AC_TRY_LINK([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>],
-+    [ssize_t err = readahead(0,0,0x80000);],
-+    samba_cv_HAVE_LINUX_READAHEAD=yes,
-+    samba_cv_HAVE_LINUX_READAHEAD=no)])
-+
-+if test x"$samba_cv_HAVE_LINUX_READAHEAD" = x"yes"; then
-+  AC_DEFINE(HAVE_LINUX_READAHEAD,1,
-+             [Whether Linux readahead is available])
-+fi
-+
-+AC_HAVE_DECL(readahead, [#include <fcntl.h>])
-+
-+############################################
-+# See if we have the posix_fadvise syscall.
-+
-+AC_CACHE_CHECK([for posix_fadvise],
-+                samba_cv_HAVE_POSIX_FADVISE,[
-+    AC_TRY_LINK([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>],
-+    [ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);],
-+    samba_cv_HAVE_POSIX_FADVISE=yes,
-+    samba_cv_HAVE_POSIX_FADVISE=no)])
-+
-+if test x"$samba_cv_HAVE_POSIX_FADVISE" = x"yes"; then
-+  AC_DEFINE(HAVE_POSIX_FADVISE,1,
-+             [Whether posix_fadvise is available])
-+fi
-+
-+############################################
-+# See if we have the openat syscall.
-+
-+AC_CACHE_CHECK([for openat],
-+		samba_cv_HAVE_OPENAT,[
-+    AC_TRY_LINK([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>],
-+    [int fd = openat(AT_FDCWD, ".", O_RDONLY);],
-+    samba_cv_HAVE_OPENAT=yes,
-+    samba_cv_HAVE_OPENAT=no)])
-+
-+if test x"$samba_cv_HAVE_OPENAT" = x"yes"; then
-+    AC_DEFINE(HAVE_OPENAT,1, [Whether openat is available])
-+fi
-+
-+############################################
-+# See if we have the Linux splice syscall.
-+
-+case "$host_os" in
-+*linux*)
-+AC_CACHE_CHECK([for Linux splice],
-+                samba_cv_HAVE_LINUX_SPLICE,[
-+    AC_TRY_LINK([
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>],
-+    [long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);],
-+    samba_cv_HAVE_LINUX_SPLICE=yes,
-+    samba_cv_HAVE_LINUX_SPLICE=no)])
-+;;
-+*)
-+samba_cv_HAVE_LINUX_SPLICE=no
-+;;
-+esac
-+
-+if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
-+  AC_DEFINE(HAVE_LINUX_SPLICE,1,
-+             [Whether Linux splice is available])
-+fi
-+
-+AC_HAVE_DECL(splice, [#include <fcntl.h>])
-+
-+############################################
-+# See if we have the a broken readlink syscall.
-+
-+AC_CACHE_CHECK([for a broken readlink syscall],samba_cv_HAVE_BROKEN_READLINK,[
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/readlink.c"],
-+	samba_cv_HAVE_BROKEN_READLINK=no,samba_cv_HAVE_BROKEN_READLINK=yes,samba_cv_HAVE_BROKEN_READLINK=cross)
-+])
-+if test x"$samba_cv_HAVE_BROKEN_READLINK" = x"yes"; then
-+	AC_DEFINE(HAVE_BROKEN_READLINK,1,[Whether the readlink syscall is broken])
-+fi
-+
-+#################################################
-+# Check whether winbind is supported on this platform.  If so we need to
-+# build and install client programs, sbin programs and shared libraries
-+
-+AC_MSG_CHECKING(whether to build winbind)
-+
-+# Initially, the value of $host_os decides whether winbind is supported
-+
-+HAVE_WINBIND=yes
-+HAVE_WBCLIENT=no
-+
-+# Define external wbclient library to link against.  This disables winbind.
-+# We define this here so --with-winbind can override it.
-+AC_ARG_WITH(wbclient,
-+[AS_HELP_STRING([--with-wbclient], [Use external wbclient (optional)])],
-+[
-+  case "$withval" in
-+        no)
-+		HAVE_WBCLIENT=no
-+		;;
-+	yes)
-+		HAVE_WBCLIENT=yes
-+		HAVE_WINBIND=no
-+		;;
-+        *)
-+		HAVE_WBCLIENT=yes
-+		HAVE_WINBIND=no
-+		WBCLIENT_INCLUDES="-I$withval/include"
-+		WBCLIENT_LDFLAGS="-L$withval/lib"
-+		;;
-+  esac ],
-+)
-+
-+AC_SUBST(WBCLIENT_INCLUDES)
-+AC_SUBST(WBCLIENT_LDFLAGS)
-+AC_SUBST(WBCLIENT_LIBS)
-+
-+
-+# Define the winbind shared library name and any specific linker flags
-+# it needs to be built with.
-+
-+WINBIND_NSS="../nsswitch/libnss_winbind.$SHLIBEXT"
-+WINBIND_WINS_NSS="../nsswitch/libnss_wins.$SHLIBEXT"
-+WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
-+NSSSONAMEVERSIONSUFFIX=""
-+
-+case "$host_os" in
-+	*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+		NSSSONAMEVERSIONSUFFIX=".2"
-+		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
-+		;;
-+	*freebsd[[5-9]]* | *freebsd1[[0-9]]*)
-+		# FreeBSD winbind client is implemented as a wrapper around
-+		# the Linux version.
-+		NSSSONAMEVERSIONSUFFIX=".1"
-+		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_freebsd.o \
-+		    ../nsswitch/winbind_nss_linux.o"
-+		WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
-+		WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
-+		;;
-+
-+	*netbsd*[[3-9]]* | *netbsd1[[0-9]]*)
-+		# NetBSD winbind client is implemented as a wrapper
-+		# around the Linux version. It needs getpwent_r() to
-+		# indicate libc's use of the correct nsdispatch API.
-+		#
-+		if test x"$ac_cv_func_getpwent_r" = x"yes"; then
-+			WINBIND_NSS_EXTRA_OBJS="\
-+			    ../nsswitch/winbind_nss_netbsd.o \
-+			    ../nsswitch/winbind_nss_linux.o"
-+			WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT"
-+			WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT"
-+		else
-+			HAVE_WINBIND=no
-+			winbind_no_reason=", getpwent_r is missing on $host_os so winbind is unsupported"
-+		fi
-+		;;
-+	*irix*)
-+		# IRIX has differently named shared libraries
-+		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_irix.o"
-+		WINBIND_NSS="../nsswitch/libns_winbind.$SHLIBEXT"
-+		WINBIND_WINS_NSS="../nsswitch/libns_wins.$SHLIBEXT"
-+		;;
-+	*solaris*)
-+		# Solaris winbind client is implemented as a wrapper around
-+		# the Linux version.
-+		NSSSONAMEVERSIONSUFFIX=".1"
-+		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o \
-+		    ../nsswitch/winbind_nss_linux.o"
-+		;;
-+	*hpux11*)
-+		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o"
-+		;;
-+	*aix*)
-+		# AIX has even differently named shared libraries.  No
-+		# WINS support has been implemented yet.
-+		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_aix.o"
-+		WINBIND_NSS_LDSHFLAGS="-Wl,-bexpall,-bM:SRE,-ewb_aix_init"
-+		WINBIND_NSS="../nsswitch/WINBIND"
-+		WINBIND_WINS_NSS=""
-+		;;
-+	*darwin*)
-+		;;
-+	*)
-+		HAVE_WINBIND=no
-+		winbind_no_reason=", unsupported on $host_os"
-+		;;
-+esac
-+
-+# Check the setting of --with-winbind
-+
-+AC_ARG_WITH(winbind,
-+[AS_HELP_STRING([--with-winbind], [Build winbind (default, if supported by OS)])],
-+[
-+  case "$withval" in
-+	yes)
-+		HAVE_WINBIND=yes
-+		HAVE_WBCLIENT=no
-+		;;
-+        no)
-+		HAVE_WINBIND=no
-+                winbind_reason=""
-+                ;;
-+  esac ],
-+)
-+
-+# We need unix domain sockets for winbind
-+
-+if test x"$HAVE_WINBIND" = x"yes"; then
-+	if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"no"; then
-+		winbind_no_reason=", no unix domain socket support on $host_os"
-+		HAVE_WINBIND=no
-+	fi
-+fi
-+
-+# Display test results
-+
-+if test x"$HAVE_WINBIND" = x"no"; then
-+	WINBIND_NSS=""
-+	WINBIND_WINS_NSS=""
-+fi
-+if test x"$HAVE_WBCLIENT" = x"yes"; then
-+        AC_CHECK_LIB(wbclient, wbcInterfaceDetails,
-+		     [LIBWBCLIENT_LIBS="-lwbclient"], AC_MSG_ERROR([Could not find wbclient]), [$WBCLIENT_LDFLAGS])
-+	LIBWBCLIENT_LIBS="$LIBWBCLIENT_LIBS $WBCLIENT_LDFLAGS"
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(WITH_WINBIND,1,[Whether to link to wbclient])
-+	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo"
-+else
-+	if test x"$enable_developer" = x"yes" -a x"$LINK_LIBWBCLIENT" = x"STATIC" ; then
-+		BUILD_LIBWBCLIENT_SHARED=no
-+	else
-+		BUILD_LIBWBCLIENT_SHARED=yes
-+	fi
-+
-+	LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
-+	LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
-+	LIBWBCLIENT_SOVER=0
-+	LIBWBCLIENT_FULLVER=0
-+	LIBWBCLIENT_SHARED_TARGET_SOVER=$LIBWBCLIENT_SHARED_TARGET.$LIBWBCLIENT_SOVER
-+	LIBWBCLIENT_SHARED_TARGET_FULLVER=$LIBWBCLIENT_SHARED_TARGET.$LIBWBCLIENT_FULLVER
-+	if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
-+		NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
-+		## Only worry about libwbclient if we have shared
-+		# library support
-+		LIBWBCLIENT_SHARED=$LIBWBCLIENT_SHARED_TARGET
-+		LIBWBCLIENT=libwbclient
-+		INSTALL_LIBWBCLIENT=installlibwbclient
-+		UNINSTALL_LIBWBCLIENT=uninstalllibwbclient
-+		LIBWBCLIENT_LIBS="-lwbclient"
-+	else
-+		LIBWBCLIENT_STATIC=$LIBWBCLIENT_STATIC_TARGET
-+		LIBWBCLIENT_LIBS=$LIBWBCLIENT_STATIC_TARGET
-+	fi
-+fi
-+
-+if test x"$HAVE_WINBIND" = x"yes"; then
-+        AC_MSG_RESULT(yes)
-+	AC_DEFINE(WITH_WINBIND,1,[Whether to build winbind])
-+
-+	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo"
-+	EXTRA_SBIN_PROGS="$EXTRA_SBIN_PROGS bin/winbindd"
-+        if test $BLDSHARED = true -a x"$create_pam_modules" = x"yes"; then
-+		PAM_MODULES="$PAM_MODULES pam_winbind"
-+		INSTALL_PAM_MODULES="installpammodules"
-+		UNINSTALL_PAM_MODULES="uninstallpammodules"
-+	fi
-+
-+	# we use winbind, check for krb5 locate_plugin support:
-+	AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
-+		[[#ifdef HAVE_KRB5_H
-+		 #include <krb5.h>
-+		 #endif
-+	]])
-+	if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
-+		WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
-+		if test x"$BLDSHARED" = x"true" ; then
-+			EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
-+		fi
-+	fi
-+	# end of krb5 locate_plugin check
-+else
-+        AC_MSG_RESULT(no$winbind_no_reason)
-+fi
-+
-+AC_SUBST(WINBIND_NSS)
-+AC_SUBST(WINBIND_WINS_NSS)
-+AC_SUBST(WINBIND_NSS_LDSHFLAGS)
-+AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
-+AC_SUBST(NSSSONAMEVERSIONSUFFIX)
-+
-+AC_SUBST(WINBIND_KRB5_LOCATOR)
-+
-+# Solaris 10 does have new member in nss_XbyY_key
-+AC_CHECK_MEMBER(union nss_XbyY_key.ipnode.af_family,
-+		AC_DEFINE(HAVE_NSS_XBYY_KEY_IPNODE, 1, [Defined if union nss_XbyY_key has ipnode field]),,
-+		[#include <nss_dbdefs.h>])
-+
-+# Solaris has some extra fields in struct passwd that need to be
-+# initialised otherwise nscd crashes.
-+
-+AC_CHECK_MEMBER(struct passwd.pw_comment,
-+		AC_DEFINE(HAVE_PASSWD_PW_COMMENT, 1, [Defined if struct passwd has pw_comment field]),,
-+		[#include <pwd.h>])
-+
-+AC_CHECK_MEMBER(struct passwd.pw_age,
-+		AC_DEFINE(HAVE_PASSWD_PW_AGE, 1, [Defined if struct passwd has pw_age field]),,
-+		[#include <pwd.h>])
-+
-+# AIX 4.3.x and 5.1 do not have as many members in
-+# struct secmethod_table as AIX 5.2
-+AC_CHECK_MEMBERS([struct secmethod_table.method_attrlist], , ,
-+       [#include <usersec.h>])
-+AC_CHECK_MEMBERS([struct secmethod_table.method_version], , ,
-+       [#include <usersec.h>])
-+
-+#################################################
-+# Check to see if we should use the included popt
-+
-+AC_ARG_WITH(included-popt,
-+[AS_HELP_STRING([--with-included-popt], [use bundled popt library, not from system])],
-+[
-+  case "$withval" in
-+	yes)
-+		INCLUDED_POPT=yes
-+		;;
-+        no)
-+		INCLUDED_POPT=no
-+                ;;
-+  esac ],
-+)
-+if test x"$INCLUDED_POPT" != x"yes"; then
-+    AC_CHECK_LIB(popt, poptGetContext,
-+	         INCLUDED_POPT=no, INCLUDED_POPT=yes)
-+fi
-+
-+AC_MSG_CHECKING(whether to use included popt)
-+if test x"$INCLUDED_POPT" = x"yes"; then
-+    AC_MSG_RESULT(yes)
-+    BUILD_POPT='$(POPT_OBJ)'
-+    POPTLIBS='$(POPT_OBJ)'
-+    FLAGS1="-I\$(srcdir)/../lib/popt"
-+else
-+    AC_MSG_RESULT(no)
-+	BUILD_POPT=""
-+    POPTLIBS="-lpopt"
-+fi
-+AC_SUBST(BUILD_POPT)
-+AC_SUBST(POPTLIBS)
-+AC_SUBST(FLAGS1)
-+
-+#################################################
-+# Check if user wants DNS service discovery support
-+
-+AC_ARG_ENABLE(dnssd,
-+[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=no)])])
-+
-+AC_SUBST(DNSSD_LIBS)
-+if test x"$enable_dnssd" = x"yes"; then
-+    have_dnssd_support=yes
-+
-+    AC_CHECK_HEADERS(dns_sd.h)
-+    if test x"$ac_cv_header_dns_sd_h" != x"yes"; then
-+	have_dnssd_support=no
-+    fi
-+
-+    # On Darwin the DNSSD API is in libc, but on other platforms it's
-+    # probably in -ldns_sd
-+    AC_CHECK_FUNCS(DNSServiceRegister)
-+    AC_CHECK_LIB_EXT(dns_sd, DNSSD_LIBS, DNSServiceRegister)
-+    if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \
-+            x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then
-+	have_dnssd_support=no
-+    fi
-+
-+    if test x"$have_dnssd_support" = x"yes"; then
-+	AC_DEFINE(WITH_DNSSD_SUPPORT, 1,
-+		[Whether to enable DNS service discovery support])
-+    else
-+    	if test x"$enable_dnssd" = x"yes"; then
-+	    AC_MSG_ERROR(DNS service discovery support not available)
-+	fi
-+    fi
-+
-+fi
-+
-+#################################################
-+# Check if user wants avahi support
-+
-+AC_ARG_ENABLE(avahi,
-+[AS_HELP_STRING([--enable-avahi], [Enable Avahi support (default=auto)])])
-+
-+if test x"$enable_avahi" != x"no"; then
-+    have_avahi_support=yes
-+
-+    AC_CHECK_HEADERS(avahi-common/watch.h)
-+    if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
-+	have_avahi_support=no
-+    fi
-+
-+    AC_CHECK_HEADERS(avahi-client/client.h)
-+    if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then
-+	have_avahi_support=no
-+    fi
-+
-+    save_LIBS="$LIBS"
-+    AC_CHECK_LIB(avahi-client, avahi_client_new,[have_avahi_client_new=yes])
-+    AC_CHECK_LIB(avahi-common, avahi_strerror,[have_avahi_strerror=yes])
-+    LIBS="$save_LIBS"
-+
-+    if test x"$have_avahi_client_new" != x"yes" -o \
-+       x"$have_avahi_strerror" != x"yes" ; then
-+	have_avahi_support=no
-+    fi
-+
-+    if test x"$have_avahi_support" = x"yes"; then
-+        AC_SUBST(AVAHI_LIBS, "-lavahi-client -lavahi-common")
-+	AC_DEFINE(WITH_AVAHI_SUPPORT, 1,
-+		[Whether to enable avahi support])
-+	AC_SUBST(AVAHI_OBJ, "lib/avahi.o smbd/avahi_register.o")
-+    else
-+	if test x"$enable_avahi" = x"yes"; then
-+	    AC_MSG_ERROR(avahi support not available)
-+	fi
-+    fi
-+fi
-+
-+
-+#################################################
-+# Set pthread stuff
-+
-+PTHREAD_CFLAGS=error
-+PTHREAD_LDFLAGS=error
-+
-+# If it's error, then the user didn't 
-+# define it.
-+if test "x$PTHREAD_LDFLAGS" = xerror; then
-+  AC_CHECK_LIB(pthread, pthread_attr_init, [
-+	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
-+	     PTHREAD_LDFLAGS="-lpthread" ])
-+fi
-+
-+if test "x$PTHREAD_LDFLAGS" = xerror; then
-+  AC_CHECK_LIB(pthreads, pthread_attr_init, [
-+	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+	     PTHREAD_LDFLAGS="-lpthreads" ])
-+fi
-+
-+if test "x$PTHREAD_LDFLAGS" = xerror; then
-+   AC_CHECK_LIB(c_r, pthread_attr_init, [
-+		PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
-+		PTHREAD_LDFLAGS="-pthread" ])
-+fi
-+
-+if test "x$PTHREAD_LDFLAGS" = xerror; then
-+   AC_CHECK_FUNC(pthread_attr_init, [
-+		 PTHREAD_CFLAGS="-D_REENTRANT"
-+		 PTHREAD_LDFLAGS="-lpthread" ])
-+fi
-+
-+# especially for HP-UX, where the AC_CHECK_FUNC macro fails to test for
-+# pthread_attr_init. On pthread_mutex_lock it works there...
-+if test "x$PTHREAD_LDFLAGS" = xerror; then
-+   AC_CHECK_LIB(pthread, pthread_mutex_lock, [
-+		PTHREAD_CFLAGS="-D_REENTRANT"
-+		PTHREAD_LDFLAGS="-lpthread" ])
-+fi
-+
-+AC_SUBST(PTHREAD_CFLAGS)
-+AC_SUBST(PTHREAD_LDFLAGS)
-+
-+samba_cv_HAVE_PTHREAD=no
-+if test x"$PTHREAD_CFLAGS" != xerror -a x"$PTHREAD_LDFLAGS" != xerror; then
-+	samba_cv_HAVE_PTHREAD=yes
-+	# now check for pthread.h with pthread-correct CFLAGS and LDFLAGS:
-+	ac_save_CFLAGS=$CFLAGS
-+	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+	ac_save_LDFLAGS=$LDFLAGS
-+	LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
-+	AC_CHECK_HEADERS(pthread.h)
-+	CFLAGS=$ac_save_CFLAGS
-+	LDFLAGS=$ac_save_LDFLAGS
-+	AC_DEFINE(HAVE_PTHREAD, 1, [Do we have pthreads around?])
-+fi
-+
-+#################################################
-+# Check if user wants pthreadpool support
-+
-+AC_ARG_ENABLE(pthreadpool,
-+[AS_HELP_STRING([--enable-pthreadpool], [Enable pthreads pool helper support (default=yes)])])
-+
-+if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
-+	AC_MSG_ERROR([pthreadpool support cannot be enabled when pthread support was not found])
-+fi
-+
-+if test x"$enable_pthreadpool" != x"no" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
-+    LIBS="$LIBS $PTHREAD_LDFLAGS"
-+    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+    AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool.o")
-+    default_shared_modules="$default_shared_modules vfs_aio_pthread"
-+else
-+    AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool_sync.o")
-+fi
-+
-+PTHREADPOOLTEST="bin/pthreadpooltest"
-+AC_SUBST(PTHREADPOOLTEST)
-+
-+
-+#################################################
-+# Check to see if we should use the included iniparser
-+
-+AC_ARG_WITH(included-iniparser,
-+[AS_HELP_STRING([--with-included-iniparser], [use bundled iniparser library, not from system])],
-+[
-+  case "$withval" in
-+	yes)
-+		INCLUDED_INIPARSER=yes
-+		;;
-+        no)
-+		INCLUDED_INIPARSER=no
-+                ;;
-+  esac ],
-+)
-+if test x"$INCLUDED_INIPARSER" != x"yes"; then
-+    AC_CHECK_LIB(iniparser, iniparser_load,
-+	         INCLUDED_INIPARSER=no, INCLUDED_INIPARSER=yes)
-+fi
-+
-+AC_MSG_CHECKING(whether to use included iniparser)
-+if test x"$INCLUDED_INIPARSER" = x"yes"; then
-+    AC_MSG_RESULT(yes)
-+    BUILD_INIPARSER='$(INIPARSER_OBJ)'
-+	INIPARSERLIBS=""
-+    FLAGS1="$FLAGS1 -I\$(srcdir)/../lib/iniparser/src"
-+else
-+    AC_MSG_RESULT(no)
-+	BUILD_INIPARSER=""
-+    INIPARSERLIBS="-liniparser"
-+fi
-+AC_SUBST(BUILD_INIPARSER)
-+AC_SUBST(INIPARSERLIBS)
-+AC_SUBST(FLAGS1)
-+
-+AC_ARG_ENABLE(fault-handler,[AS_HELP_STRING([--disable-fault-handler], [Disable the default handler])])
-+
-+if test x"$enable_fault_handler" = x"no"; then
-+	AC_DEFINE(HAVE_DISABLE_FAULT_HANDLER, 1, [Disable the default signal handler])
-+fi
-+
-+###################################################
-+# Check for different/missing (set|get|end)netgrent prototypes
-+CFLAGS_SAVE=$CFLAGS
-+if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
-+	CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-+fi
-+AC_CACHE_CHECK([for setnetgrent prototype],samba_cv_setnetgrent_prototype, [
-+    AC_TRY_COMPILE([#include<netdb.h>
-+                    #ifdef HAVE_NETGROUP_H
-+                    #include<netgroup.h>
-+                    #endif],[setnetgrent("foo")],
-+                    samba_cv_setnetgrent_prototype=yes, samba_cv_setnetgrent_prototype=no)])
-+if test x"$samba_cv_setnetgrent_prototype" = x"yes"; then
-+    AC_DEFINE(HAVE_SETNETGRENT_PROTOTYPE, 1, [If setnetgrent prototype is defined])
-+fi
-+AC_CACHE_CHECK([for getnetgrent prototype],samba_cv_getnetgrent_prototype, [
-+    AC_TRY_COMPILE([#include<netdb.h>
-+                    #ifdef HAVE_NETGROUP_H
-+                    #include<netgroup.h>
-+                    #endif],[char *dom, *user,*host; getnetgrent(&dom,&user,&host)],
-+                    samba_cv_getnetgrent_prototype=yes, samba_cv_getnetgrent_prototype=no)])
-+if test x"$samba_cv_getnetgrent_prototype" = x"yes"; then
-+    AC_DEFINE(HAVE_GETNETGRENT_PROTOTYPE, 1, [If getnetgrent prototype is defined])
-+fi
-+AC_CACHE_CHECK([for endnetgrent prototype],samba_cv_endnetgrent_prototype, [
-+    AC_TRY_COMPILE([#include<netdb.h>
-+                    #ifdef HAVE_NETGROUP_H
-+                    #include<netgroup.h>
-+                    #endif],[endnetgrent()],
-+                    samba_cv_endnetgrent_prototype=yes, samba_cv_endnetgrent_prototype=no)])
-+if test x"$samba_cv_endnetgrent_prototype" = x"yes"; then
-+    AC_DEFINE(HAVE_ENDNETGRENT_PROTOTYPE, 1, [If endnetgrent prototype is defined])
-+fi
-+
-+CFLAGS=$CFLAGS_SAVE
-+
-+# Checks for POSIX ignorant BSD style statvfs() function
-+# Start
-+AC_CHECK_HEADERS(sys/param.h sys/mount.h)
-+
-+AC_MSG_CHECKING([checking for posix ignorant *bsd style statfs struct])
-+AC_CACHE_VAL(bsdstatvfs_cv_statfs,[
-+	     AC_TRY_RUN([
-+		#ifdef HAVE_SYS_PARAM_H
-+		#include <sys/param.h>
-+		#endif
-+		#ifdef HAVE_SYS_MOUNT_H
-+		#include <sys/mount.h>
-+		#endif
-+		int main (void)
-+		{
-+			struct statfs fsd;
-+			fsd.f_bsize = 0;
-+			fsd.f_iosize = 0;
-+			return (statfs (".", &fsd));
-+		}],
-+		bsdstatvfs_cv_statfs=yes,
-+		bsdstatvfs_cv_statfs=no,
-+		bsdstatvfs_cv_statfs=no)])
-+AC_MSG_RESULT($bsdstatvfs_cv_statfs)
-+
-+if test $bsdstatvfs_cv_statfs = yes; then
-+  AC_DEFINE(BSD_STYLE_STATVFS,1,[Whether statfs struct is *bsd style])
-+fi
-+# End of checks POSIX ignorant BSD style statvfs() function
-+
-+# Checks for the vfs_fileid module
-+# Start
-+AC_CHECK_FUNC(getmntent)
-+
-+AC_CHECK_HEADERS(sys/statfs.h)
-+
-+AC_MSG_CHECKING([vfs_fileid: checking for statfs() and struct statfs.f_fsid])
-+AC_CACHE_VAL(vfsfileid_cv_statfs,[
-+	     AC_TRY_RUN([
-+		#include <sys/types.h>
-+		#include <sys/statfs.h>
-+		int main(void)
-+		{
-+			struct statfs fsd;
-+			fsid_t fsid = fsd.f_fsid;
-+			return statfs (".", &fsd);
-+		}],
-+		vfsfileid_cv_statfs=yes,
-+		vfsfileid_cv_statfs=no,
-+		vfsfileid_cv_statfs=cross)
-+])
-+AC_MSG_RESULT($vfsfileid_cv_statfs)
-+
-+if test x"$ac_cv_func_getmntent" = x"yes" -a \
-+	x"$vfsfileid_cv_statfs" = x"yes"; then
-+	default_shared_modules="$default_shared_modules vfs_fileid"
-+fi
-+# End
-+# Checks for the vfs_fileid module
-+
-+# btrfs features are dependent on Linux ioctl headers
-+if test x"$ac_cv_header_sys_ioctl_h" = xyes -a \
-+        x"$ac_cv_header_linux_ioctl_h" = xyes; then
-+    default_shared_modules="$default_shared_modules vfs_btrfs"
-+fi
-+# End btrfs
-+
-+for i in `echo $default_static_modules | sed -e 's/,/ /g'`
-+do
-+	eval MODULE_DEFAULT_$i=STATIC
-+done
-+
-+for i in `echo $default_shared_modules | sed -e 's/,/ /g'`
-+do
-+	dnl Fall back to static if we cannot build shared libraries
-+	eval MODULE_DEFAULT_$i=STATIC
-+
-+	if test $BLDSHARED = true; then
-+		eval MODULE_DEFAULT_$i=SHARED
-+	fi
-+done
-+
-+dnl Always build these modules static
-+MODULE_rpc_spoolss=STATIC
-+MODULE_rpc_srvsvc=STATIC
-+MODULE_idmap_tdb=STATIC
-+MODULE_idmap_passdb=STATIC
-+MODULE_idmap_nss=STATIC
-+
-+MODULE_nss_info_template=STATIC
-+
-+AC_ARG_WITH(static-modules,
-+[AS_HELP_STRING([--with-static-modules=MODULES], [Comma-separated list of names of modules to statically link in])],
-+[ if test $withval; then
-+	for i in `echo $withval | sed -e 's/,/ /g'`
-+	do
-+		eval MODULE_$i=STATIC
-+	done
-+fi ])
-+
-+AC_ARG_WITH(shared-modules,
-+[AS_HELP_STRING([--with-shared-modules=MODULES], [Comma-separated list of names of modules to build shared])],
-+[ if test $withval; then
-+	for i in `echo $withval | sed -e 's/,/ /g'`
-+	do
-+			eval MODULE_$i=SHARED
-+	done
-+fi ])
-+
-+# additionally, support pdb_ldap -> pdb_ldapsam replacement
-+if test x"$MODULE_pdb_ldap" != x ; then
-+	MODULE_pdb_ldapsam="$MODULE_pdb_ldap"
-+fi
-+
-+if test x"$MODULE_DEFAULT_vfs_notify_fam" = xSTATIC -o \
-+		x"$MODULE_vfs_notify_fam" = xSTATIC ; then
-+	SMBD_FAM_LIBS="$SMB_FAM_LIBS"
-+	AC_SUBST(SMBD_FAM_LIBS)
-+fi
-+
-+SMB_MODULE(pdb_ldapsam, passdb/pdb_ldap.o passdb/pdb_nds.o passdb/pdb_ipa.o passdb/pdb_ldap_util.o,
-+		   "bin/ldapsam.$SHLIBEXT", PDB,
-+		   [ PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS" ] )
-+SMB_MODULE(pdb_smbpasswd, passdb/pdb_smbpasswd.o, "bin/smbpasswd.$SHLIBEXT", PDB)
-+SMB_MODULE(pdb_tdbsam, passdb/pdb_tdb.o, "bin/tdbsam.$SHLIBEXT", PDB)
-+SMB_MODULE(pdb_wbc_sam, passdb/pdb_wbc_sam.o, "bin/wbc_sam.$SHLIBEXT", PDB)
-+SMB_SUBSYSTEM(PDB,passdb/pdb_interface.o)
-+
-+SMB_MODULE(idmap_ldap, winbindd/idmap_ldap.o, "bin/ldap.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_tdb, winbindd/idmap_tdb.o, "bin/tdb.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_tdb2, winbindd/idmap_tdb2.o, "bin/tdb2.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_passdb, winbindd/idmap_passdb.o, "bin/passdb.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_nss, winbindd/idmap_nss.o, "bin/nss.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_rid, winbindd/idmap_rid.o, "bin/rid.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_autorid, winbindd/idmap_autorid.o, "bin/autorid.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_ad, winbindd/idmap_ad.o, "bin/ad.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_rfc2307, winbindd/idmap_rfc2307.o, "bin/rfc2307.$SHLIBEXT", IDMAP)
-+SMB_MODULE(idmap_hash, \$(IDMAP_HASH_OBJ), "bin/hash.$SHLIBEXT", IDMAP)
-+SMB_SUBSYSTEM(IDMAP, winbindd/idmap.o)
-+
-+SMB_MODULE(nss_info_template, winbindd/nss_info_template.o, "bin/template.$SHLIBEXT", NSS_INFO)
-+SMB_SUBSYSTEM(NSS_INFO, winbindd/nss_info.o)
-+
-+SMB_MODULE(auth_sam, \$(AUTH_SAM_OBJ), "bin/sam.$SHLIBEXT", AUTH)
-+SMB_MODULE(auth_unix, \$(AUTH_UNIX_OBJ), "bin/unix.$SHLIBEXT", AUTH)
-+SMB_MODULE(auth_winbind, \$(AUTH_WINBIND_OBJ), "bin/winbind.$SHLIBEXT", AUTH)
-+SMB_MODULE(auth_wbc, \$(AUTH_WBC_OBJ), "bin/wbc.$SHLIBEXT", AUTH)
-+SMB_MODULE(auth_domain, \$(AUTH_DOMAIN_OBJ), "bin/domain.$SHLIBEXT", AUTH)
-+SMB_MODULE(auth_builtin, \$(AUTH_BUILTIN_OBJ), "bin/builtin.$SHLIBEXT", AUTH)
-+SMB_MODULE(auth_script, \$(AUTH_SCRIPT_OBJ), "bin/script.$SHLIBEXT", AUTH)
-+SMB_SUBSYSTEM(AUTH,auth/auth.o)
-+
-+SMB_MODULE(vfs_default, \$(VFS_DEFAULT_OBJ), "bin/default.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_recycle, \$(VFS_RECYCLE_OBJ), "bin/recycle.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_audit, \$(VFS_AUDIT_OBJ), "bin/audit.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_extd_audit, \$(VFS_EXTD_AUDIT_OBJ), "bin/extd_audit.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_full_audit, \$(VFS_FULL_AUDIT_OBJ), "bin/full_audit.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_netatalk, \$(VFS_NETATALK_OBJ), "bin/netatalk.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_fake_perms, \$(VFS_FAKE_PERMS_OBJ), "bin/fake_perms.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_fake_acls, \$(VFS_FAKE_ACLS_OBJ), "bin/fake_acls.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_default_quota, \$(VFS_DEFAULT_QUOTA_OBJ), "bin/default_quota.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_readonly, \$(VFS_READONLY_OBJ), "bin/readonly.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_cap, \$(VFS_CAP_OBJ), "bin/cap.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_expand_msdfs, \$(VFS_EXPAND_MSDFS_OBJ), "bin/expand_msdfs.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_shadow_copy, \$(VFS_SHADOW_COPY_OBJ), "bin/shadow_copy.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_shadow_copy2, \$(VFS_SHADOW_COPY2_OBJ), "bin/shadow_copy2.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_afsacl, \$(VFS_AFSACL_OBJ), "bin/afsacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_xattr_tdb, \$(VFS_XATTR_TDB_OBJ), "bin/xattr_tdb.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_nfs4acl_xattr, \$(VFS_XATTR_TDB_OBJ), "bin/nfs4acl_xattr.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_posixacl, \$(VFS_POSIXACL_OBJ), "bin/posixacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_aixacl, \$(VFS_AIXACL_OBJ), "bin/aixacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_aixacl2, \$(VFS_AIXACL2_OBJ), "bin/aixacl2.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_solarisacl, \$(VFS_SOLARISACL_OBJ), "bin/solarisacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_hpuxacl, \$(VFS_HPUXACL_OBJ), "bin/hpuxacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_tru64acl, \$(VFS_TRU64ACL_OBJ), "bin/tru64acl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_catia, \$(VFS_CATIA_OBJ), "bin/catia.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_streams_xattr, \$(VFS_STREAMS_XATTR_OBJ), "bin/streams_xattr.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_streams_depot, \$(VFS_STREAMS_DEPOT_OBJ), "bin/streams_depot.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_cacheprime, \$(VFS_CACHEPRIME_OBJ), "bin/cacheprime.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_prealloc, \$(VFS_PREALLOC_OBJ), "bin/prealloc.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_commit, \$(VFS_COMMIT_OBJ), "bin/commit.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_gpfs, \$(VFS_GPFS_OBJ), "bin/gpfs.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_readahead, \$(VFS_READAHEAD_OBJ), "bin/readahead.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_tsmsm, \$(VFS_TSMSM_OBJ), "bin/tsmsm.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_fileid, \$(VFS_FILEID_OBJ), "bin/fileid.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_aio_fork, \$(VFS_AIO_FORK_OBJ), "bin/aio_fork.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_aio_pthread, \$(VFS_AIO_PTHREAD_OBJ), "bin/aio_pthread.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_aio_posix, \$(VFS_AIO_POSIX_OBJ), "bin/aio_posix.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_aio_linux, \$(VFS_AIO_LINUX_OBJ), "bin/aio_linux.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_preopen, \$(VFS_PREOPEN_OBJ), "bin/preopen.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_syncops, \$(VFS_SYNCOPS_OBJ), "bin/syncops.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_acl_xattr, \$(VFS_ACL_XATTR_OBJ), "bin/acl_xattr.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_acl_tdb, \$(VFS_ACL_TDB_OBJ), "bin/acl_tdb.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), "bin/smb_traffic_analyzer.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_dirsort, \$(VFS_DIRSORT_OBJ), "bin/dirsort.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_scannedonly, \$(VFS_SCANNEDONLY_OBJ), "bin/scannedonly.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_crossrename, \$(VFS_CROSSRENAME_OBJ), "bin/crossrename.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_linux_xfs_sgid, \$(VFS_LINUX_XFS_SGID_OBJ), "bin/linux_xfs_sgid.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_time_audit, \$(VFS_TIME_AUDIT_OBJ), "bin/time_audit.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_media_harmony, \$(VFS_MEDIA_HARMONY_OBJ), "bin/media_harmony.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_btrfs, \$(VFS_BTRFS_OBJ), "bin/btrfs.$SHLIBEXT", VFS)
-+SMB_MODULE(vfs_ceph, \$(VFS_CEPH_OBJ), "bin/ceph.$SHLIBEXT", VFS)
-+
-+SMB_SUBSYSTEM(VFS,smbd/vfs.o)
-+
-+SMB_MODULE(perfcount_test, \$(PERFCOUNT_TEST), "bin/pc_test.$SHLIBEXT", PERFCOUNT)
-+SMB_SUBSYSTEM(PERFCOUNT,smbd/perfcount.o)
-+
-+SMB_MODULE(gpext_registry, libgpo/gpext/registry.o, "bin/registry.$SHLIBEXT", GPEXT)
-+SMB_MODULE(gpext_scripts, libgpo/gpext/scripts.o, "bin/scripts.$SHLIBEXT", GPEXT)
-+SMB_MODULE(gpext_security, libgpo/gpext/security.o, "bin/security.$SHLIBEXT", GPEXT)
-+SMB_SUBSYSTEM(GPEXT, libgpo/gpext/gpext.o)
-+
-+AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
-+
-+#################################################
-+# do extra things if we are running insure
-+
-+if test "${ac_cv_prog_CC}" = "insure"; then
-+	CPPFLAGS="$CPPFLAGS -D__INSURE__"
-+fi
-+
-+#################################################
-+# If run from the build farm, enable NASTY hacks
-+#################################################
-+AC_MSG_CHECKING(whether to enable features for selftest)
-+if test x"$selftest" = x"yes"; then
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(ENABLE_SELFTEST, 1, [Support features needed for selftest])
-+	if test x"$selftest_possible" != xyes; then
-+		AC_MSG_ERROR(selftest support only possible with python, including development headers, and perl installed)
-+	fi
-+else
-+	AC_MSG_RESULT(no)
-+fi
-+
-+#################################################
-+# check for bad librt/libpthread interactions
-+
-+if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" = x"yes" -o \
-+    x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes" -o \
-+    x"$samba_cv_HAVE_AIO64" = x"yes" -o \
-+    x"$samba_cv_HAVE_AIO" = x"yes" ; then
-+
-+SMB_IF_RTSIGNAL_BUG(
-+	[
-+	    # Have RT_SIGNAL bug, need to check whether the problem will
-+	    # affect anything we have configured.
-+
-+	    rt_do_error=no
-+	    if test x"$samba_cv_HAVE_KERNEL_OPLOCKS_LINUX" = x"yes"; then
-+		if test x"$rt_signal_lease_ok" = x"no" ; then
-+		    rt_do_error=yes
-+		fi
-+	    fi
-+
-+	    if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then
-+		if test x"$rt_signal_notify_ok" = x"no" ; then
-+		    rt_do_error=yes
-+		fi
-+	    fi
-+
-+	    if test x"$samba_cv_HAVE_AIO64" = x"yes" -o \
-+		    x"$samba_cv_HAVE_AIO" = x"yes" ; then
-+		if test x"$rt_signal_aio_ok" = x"no" ; then
-+		    rt_do_error=yes
-+		fi
-+	    fi
-+
-+	    if test x"$rt_do_error" = x"yes" ; then
-+		SMB_IS_LIBPTHREAD_LINKED(
-+		    [
-+			cat<<MSG
-+
-+*** On this platforms, linking Samba against pthreads causes problems
-+*** with the oplock and change notification mechanisms. You may be
-+*** using pthreads as a side-effect of using the --with-aio-support
-+*** or --with-profiling-data options. Please remove these and try again.
-+
-+MSG
-+		    ],
-+		    [
-+			cat<<MSG
-+
-+*** On this platform, the oplock and change notification mechanisms do not
-+*** appear to work. Please report this problem to samba-technical@samba.org
-+*** and attach the config.log file from this directory.
-+
-+MSG
-+		    ])
-+		AC_MSG_ERROR(unable to use realtime signals on this platform)
-+	    fi
-+	],
-+	[
-+	    # no RT_SIGNAL bug, we are golden
-+	    SMB_IS_LIBPTHREAD_LINKED(
-+		[
-+		    AC_MSG_WARN(using libpthreads - this may degrade performance)
-+		])
-+
-+	],
-+	[
-+	    # cross compiling, I hope you know what you are doing
-+	    true
-+	])
-+
-+fi
-+
-+m4_include(../lib/zlib/zlib.m4)
-+
-+AC_SUBST(ZLIB_LIBS)
-+AC_SUBST(ZLIB_OBJS)
-+AC_ZLIB([ZLIB_OBJS=""], [
-+	ZLIB_LIBS=""
-+	for o in adler32.o compress.o crc32.o gzio.o uncompr.o \
-+		     deflate.o trees.o zutil.o inflate.o infback.o \
-+			 inftrees.o inffast.o
-+	do
-+		ZLIB_OBJS="$ZLIB_OBJS ../lib/zlib/$o"
-+	done
-+	CFLAGS="-I../lib/zlib $CFLAGS"
-+])
-+
-+AC_DEFINE(STATIC_gensec_MODULES, [gensec_spnego_init,gensec_ntlmssp_init,NULL],[gensec modules])
-+AC_DEFINE(STATIC_gensec_MODULES_PROTO, [_MODULE_PROTO(gensec_spnego_init)_MODULE_PROTO(gensec_ntlmssp_init)],[gensec protos])
-+
-+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
-+
-+if test "x$enable_dmalloc" = xyes
-+then
-+	AC_DEFINE(ENABLE_DMALLOC, 1, [Define to turn on dmalloc debugging])
-+	AC_DEFINE(DMALLOC_FUNC_CHECK, 1,
-+                  [Define to check invariants around some common functions])
-+	LIBS="$LIBS -ldmalloc"
-+fi
-+
-+dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
-+LIB_REMOVE_USR_LIB(LDFLAGS)
-+LIB_REMOVE_USR_LIB(LIBS)
-+
-+dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
-+CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
-+CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
-+
-+#################################################
-+# Display summary of libraries detected
-+
-+AC_MSG_RESULT([Using libraries:])
-+AC_MSG_RESULT([    LIBS = $LIBS])
-+if test x"$with_ads_support" != x"no"; then
-+    AC_MSG_RESULT([    KRB5_LIBS = $KRB5_LIBS])
-+fi
-+if test x"$with_ldap_support" != x"no"; then
-+    AC_MSG_RESULT([    LDAP_LIBS = $LDAP_LIBS])
-+fi
-+if test x"$have_dnssd_support" != x"no"; then
-+    AC_MSG_RESULT([    DNSSD_LIBS = $DNSSD_LIBS])
-+fi
-+AC_MSG_RESULT([    AUTH_LIBS = $AUTH_LIBS])
-+
-+#################################################
-+# final configure stuff
-+
-+AC_MSG_CHECKING([configure summary])
-+AC_TRY_RUN([#include "${srcdir-.}/../tests/summary.c"],
-+           AC_MSG_RESULT(yes),
-+	   AC_MSG_ERROR([summary failure. Aborting config]); exit 1;,
-+	   AC_MSG_WARN([cannot run when cross-compiling]))
-+
-+dnl Merge in developer cflags from now on
-+AC_SUBST(DEVELOPER_CFLAGS)
-+if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes" -o x"$picky_developer" = x"yes"; then
-+    CFLAGS="${CFLAGS} \$(DEVELOPER_CFLAGS) ${CFLAGS_APPEND}"
-+fi
-+
-+# Stuff the smbd-only libraries at the end of the smbd link
-+# path (if we have them).
-+SMBD_LIBS="$samba_dmapi_libs"
-+AC_SUBST(SMBD_LIBS)
-+
-+CFLAGS="${CFLAGS} \$(FLAGS)"
-+CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
-+
-+# If we had to expand the includes, make tsure the output file is moved back
-+AC_OUTPUT_COMMANDS([
-+if test -f Makefile-noincludes -a ! -f Makefile -a ! -h Makefile ; then
-+	ln -s Makefile-noincludes Makefile
-+fi
-+])
-+
-+AC_OUTPUT(Makefile
-+	  script/findsmb smbadduser script/installbin.sh script/uninstallbin.sh
-+	  lib/netapi/examples/Makefile
-+	  lib/netapi/tests/Makefile
-+	  pkgconfig/smbclient.pc
-+	  pkgconfig/wbclient.pc
-+	  pkgconfig/netapi.pc
-+	  pkgconfig/smbsharemodes.pc
-+	  ../examples/libsmbclient/Makefile.internal
-+	  )
-+
-+#################################################
-+# Print very concise instructions on building/use
-+if test "x$enable_dmalloc" = xyes
-+then
-+	AC_MSG_RESULT([Note: The dmalloc debug library will be included.  To turn it on use])
-+	AC_MSG_RESULT([      \$ eval \`dmalloc samba\`.])
-+fi
-diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
-new file mode 100644
-index 0000000..5d9ce30
---- /dev/null
-+++ b/source3/m4/aclocal.m4
-@@ -0,0 +1,899 @@
-+dnl test whether dirent has a d_off member
-+AC_DEFUN(AC_DIRENT_D_OFF,
-+[AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off,
-+[AC_TRY_COMPILE([
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <dirent.h>], [struct dirent d; d.d_off;],
-+ac_cv_dirent_d_off=yes, ac_cv_dirent_d_off=no)])
-+if test $ac_cv_dirent_d_off = yes; then
-+  AC_DEFINE(HAVE_DIRENT_D_OFF,1,[Whether dirent has a d_off member])
-+fi
-+])
-+
-+dnl Mark specified module as shared
-+dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared)
-+AC_DEFUN(SMB_MODULE,
-+[
-+	AC_MSG_CHECKING([how to build $1])
-+	if test "$[MODULE_][$1]"; then
-+		DEST=$[MODULE_][$1]
-+	elif test "$[MODULE_]translit([$4], [A-Z], [a-z])" -a "$[MODULE_DEFAULT_][$1]"; then
-+		DEST=$[MODULE_]translit([$4], [A-Z], [a-z])
-+	else
-+		DEST=$[MODULE_DEFAULT_][$1]
-+	fi
-+	
-+	if test x"$DEST" = xSHARED; then
-+		AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module])
-+		$4_MODULES="$$4_MODULES $3"
-+		AC_MSG_RESULT([shared])
-+		[$6]
-+		string_shared_modules="$string_shared_modules $1"
-+	elif test x"$DEST" = xSTATIC; then
-+		[init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z])  $1_init();"
-+		[decl_static_modules_]translit([$4], [A-Z], [a-z])="$[decl_static_modules_]translit([$4], [A-Z], [a-z]) extern NTSTATUS $1_init(void);"
-+		string_static_modules="$string_static_modules $1"
-+		$4_STATIC="$$4_STATIC $2"
-+		AC_SUBST($4_STATIC)
-+		[$5]
-+		AC_MSG_RESULT([static])
-+	else
-+	    string_ignored_modules="$string_ignored_modules $1"
-+		AC_MSG_RESULT([not])
-+	fi
-+])
-+
-+AC_DEFUN(SMB_SUBSYSTEM,
-+[
-+	AC_SUBST($1_STATIC)
-+	AC_SUBST($1_MODULES)
-+	AC_DEFINE_UNQUOTED([static_init_]translit([$1], [A-Z], [a-z]), [{$init_static_modules_]translit([$1], [A-Z], [a-z])[}], [Static init functions])
-+	AC_DEFINE_UNQUOTED([static_decl_]translit([$1], [A-Z], [a-z]), [$decl_static_modules_]translit([$1], [A-Z], [a-z]), [Decl of Static init functions])
-+    	ifelse([$2], , :, [rm -f $2])
-+])
-+
-+
-+dnl SMB_LIBRARY(name, soversion, fullversion, default, reason)
-+dnl
-+dnl configure build and use of an (internal) shared library
-+dnl
-+AC_DEFUN([SMB_LIBRARY],
-+[
-+m4_pushdef([LIBNAME], [lib$1])
-+m4_pushdef([LIBUC], [m4_toupper(LIBNAME)])
-+m4_pushdef([LIBLIBS], [-l$1])
-+
-+LIBUC[_SHARED_TARGET]=bin/LIBNAME.$SHLIBEXT
-+LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
-+LIBUC[_SHARED]=
-+LIBUC[_STATIC]=
-+LIBUC[_LIBS]=LIBLIBS
-+LIBUC[_TARGET]=
-+[INSTALL_]LIBUC=
-+[UNINSTALL_]LIBUC=
-+
-+m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
-+m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
-+
-+LIBUC[_SHARED_TARGET_SOVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_SOVER]
-+LIBUC[_SHARED_TARGET_FULLVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_FULLVER]
-+
-+AC_SUBST(LIBUC[_SHARED_TARGET])
-+AC_SUBST(LIBUC[_STATIC_TARGET])
-+AC_SUBST(LIBUC[_SHARED])
-+AC_SUBST(LIBUC[_STATIC])
-+AC_SUBST(LIBUC[_LIBS])
-+AC_SUBST(LIBUC[_TARGET])
-+AC_SUBST([INSTALL_]LIBUC)
-+AC_SUBST([UNINSTALL_]LIBUC)
-+AC_SUBST(LIBUC[_SOVER])
-+AC_SUBST(LIBUC[_FULLVER])
-+AC_SUBST(LIBUC[_SHARED_TARGET_SOVER])
-+AC_SUBST(LIBUC[_SHARED_TARGET_FULLVER])
-+
-+AC_MSG_CHECKING([whether to build the LIBNAME shared library])
-+m4_if([$4], [no], [
-+dnl set the default to not build the shared lib
-+AC_ARG_WITH(LIBNAME,
-+AS_HELP_STRING([--with-]LIBNAME,
-+	m4_if([$5], [],
-+		[Build the LIBNAME shared library (default=no)],
-+		[Build the LIBNAME shared library (default=no ($5))])),
-+[
-+case "$withval" in
-+	yes)
-+		build_lib=yes
-+		;;
-+	*)
-+		AC_MSG_RESULT(no)
-+		build_lib=no
-+		;;
-+esac
-+],
-+[
-+# if unspecified, default is not to build
-+AC_MSG_RESULT(no)
-+build_lib=no
-+]
-+)
-+],[
-+dnl by default, try to build the shared lib
-+AC_ARG_WITH(LIBNAME,
-+AS_HELP_STRING([--with-]LIBNAME,
-+	[Build the LIBNAME shared library (default=yes if shared libs supported)]),
-+[
-+case "$withval" in
-+	no)
-+		AC_MSG_RESULT(no)
-+		build_lib=no
-+		;;
-+	*)
-+		build_lib=yes
-+		;;
-+esac
-+],
-+[
-+# if unspecified, default is to build it if possible.
-+build_lib=yes
-+]
-+)
-+])
-+
-+if eval test x"$build_lib" = "xyes" ; then
-+	# only set the install targets if the user chose the library
-+	[INSTALL_]LIBUC=[install]LIBNAME
-+	[UNINSTALL_]LIBUC=[uninstall]LIBNAME
-+	if eval $BLDSHARED = true; then
-+		LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
-+		LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET]
-+
-+		AC_MSG_RESULT(yes)
-+		if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
-+			enable_static=yes
-+			LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
-+			LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
-+		else
-+			LIBUC[_LIBS]=LIBLIBS
-+		fi
-+	else
-+		enable_static=yes
-+		LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
-+		LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
-+		AC_MSG_RESULT(no shared library support -- will supply static library)
-+	fi
-+else
-+	enable_static=yes
-+	AC_MSG_RESULT(shared library not selected, but will supply static library)
-+fi
-+if test $enable_static = yes; then
-+	LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
-+fi
-+
-+m4_popdef([LIBNAME])
-+m4_popdef([LIBUC])
-+m4_popdef([LIBLIBS])
-+
-+])
-+
-+
-+dnl AC_LIBTESTFUNC(lib, function, [actions if found], [actions if not found])
-+dnl Check for a function in a library, but don't keep adding the same library
-+dnl to the LIBS variable.  Check whether the function is available in the
-+dnl current LIBS before adding the library which prevents us spuriously
-+dnl adding libraries for symbols that are in libc.
-+dnl
-+dnl On success, the default actions ensure that HAVE_FOO is defined. The lib
-+dnl is always added to $LIBS if it was found to be necessary. The caller
-+dnl can use SMB_REMOVE_LIB to strp this if necessary.
-+AC_DEFUN([AC_LIBTESTFUNC],
-+[
-+  AC_CHECK_FUNCS($2,
-+      [
-+        # $2 was found in libc or existing $LIBS
-+	m4_ifval([$3],
-+	    [
-+		$3
-+	    ],
-+	    [
-+		AC_DEFINE(translit([HAVE_$2], [a-z], [A-Z]), 1,
-+		    [Whether $2 is available])
-+	    ])
-+      ],
-+      [
-+        # $2 was not found, try adding lib$1
-+	case " $LIBS " in
-+          *\ -l$1\ *)
-+	    m4_ifval([$4],
-+		[
-+		    $4
-+		],
-+		[
-+		    # $2 was not found and we already had lib$1
-+		    # nothing to do here by default
-+		    true
-+		])
-+	    ;;
-+          *)
-+	    # $2 was not found, try adding lib$1
-+	    AC_CHECK_LIB($1, $2,
-+	      [
-+		LIBS="-l$1 $LIBS"
-+		m4_ifval([$3],
-+		    [
-+			$3
-+		    ],
-+		    [
-+			AC_DEFINE(translit([HAVE_$2], [a-z], [A-Z]), 1,
-+			    [Whether $2 is available])
-+		    ])
-+	      ],
-+	      [
-+		m4_ifval([$4],
-+		    [
-+			$4
-+		    ],
-+		    [
-+			# $2 was not found in lib$1
-+			# nothing to do here by default
-+			true
-+		    ])
-+	      ])
-+	  ;;
-+        esac
-+      ])
-+])
-+
-+# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
-+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
-+#              [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES])
-+# ------------------------------------------------------
-+#
-+# Use a cache variable name containing both the library and function name,
-+# because the test really is for library $1 defining function $3, not
-+# just for library $1.  Separate tests with the same $1 and different $3s
-+# may have different results.
-+#
-+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3])
-+# is asking for trouble, since AC_CHECK_LIB($lib, fun) would give
-+# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
-+# the AS_LITERAL_IF indirection.
-+#
-+# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
-+# whatever the FUNCTION, in addition to not being a *S macro.  Note
-+# that the cache does depend upon the function we are looking for.
-+#
-+# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just
-+# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
-+# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'.
-+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
-+# freedom.
-+AC_DEFUN([AC_CHECK_LIB_EXT],
-+[
-+AH_CHECK_LIB_EXT([$1])
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-l$1 $$2 $7 $LIBS"
-+AS_LITERAL_IF([$1],
-+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])],
-+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl
-+
-+m4_ifval([$3],
-+ [
-+    AH_CHECK_FUNC_EXT([$3])
-+    AS_LITERAL_IF([$1],
-+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])],
-+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl
-+    AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func,
-+	[AC_TRY_LINK_FUNC($3,
-+                 [AS_VAR_SET(ac_Lib_func, yes);
-+		  AS_VAR_SET(ac_Lib_ext, yes)],
-+                 [AS_VAR_SET(ac_Lib_func, no);
-+		  AS_VAR_SET(ac_Lib_ext, no)])
-+	])
-+    AS_IF([test AS_VAR_GET(ac_Lib_func) = yes],
-+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl
-+    AS_VAR_POPDEF([ac_Lib_func])dnl
-+ ],[
-+    AC_CACHE_CHECK([for -l$1], ac_Lib_ext,
-+	[AC_TRY_LINK_FUNC([main],
-+                 [AS_VAR_SET(ac_Lib_ext, yes)],
-+                 [AS_VAR_SET(ac_Lib_ext, no)])
-+	])
-+ ])
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes],
-+    [m4_default([$4], 
-+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
-+		case "$$2" in
-+		    *-l$1*)
-+			;;
-+		    *)
-+			$2="-l$1 $$2"
-+			;;
-+		esac])
-+		[$6]
-+	    ],
-+	    [$5])dnl
-+AS_VAR_POPDEF([ac_Lib_ext])dnl
-+])# AC_CHECK_LIB_EXT
-+
-+# AH_CHECK_LIB_EXT(LIBNAME)
-+# ---------------------
-+m4_define([AH_CHECK_LIB_EXT],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
-+             [Define to 1 if you have the `]$1[' library (-l]$1[).])])
-+
-+# AC_CHECK_FUNCS_EXT(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# -----------------------------------------------------------------
-+dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable.
-+dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE)
-+AC_DEFUN([AC_CHECK_FUNC_EXT],
-+[
-+    AH_CHECK_FUNC_EXT($1)	
-+    ac_check_func_ext_save_LIBS=$LIBS
-+    LIBS="$2 $LIBS"
-+    AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl
-+    AC_CACHE_CHECK([for $1], ac_var,
-+	[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
-+                [AS_VAR_SET(ac_var, yes)],
-+                [AS_VAR_SET(ac_var, no)])])
-+    LIBS=$ac_check_func_ext_save_LIBS
-+    AS_IF([test AS_VAR_GET(ac_var) = yes], 
-+	    [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], 
-+	    [$4])dnl
-+AS_VAR_POPDEF([ac_var])dnl
-+])# AC_CHECK_FUNC_EXT
-+
-+# AH_CHECK_FUNC_EXT(FUNCNAME)
-+# ---------------------
-+m4_define([AH_CHECK_FUNC_EXT],
-+[AH_TEMPLATE(AS_TR_CPP(HAVE_$1),
-+             [Define to 1 if you have the `]$1[' function.])])
-+
-+dnl Define an AC_DEFINE with ifndef guard.
-+dnl AC_N_DEFINE(VARIABLE [, VALUE])
-+define(AC_N_DEFINE,
-+[cat >> confdefs.h <<\EOF
-+[#ifndef] $1
-+[#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-+[#endif]
-+EOF
-+])
-+
-+dnl Add an #include
-+dnl AC_ADD_INCLUDE(VARIABLE)
-+define(AC_ADD_INCLUDE,
-+[cat >> confdefs.h <<\EOF
-+[#include] $1
-+EOF
-+])
-+
-+dnl Copied from libtool.m4
-+AC_DEFUN(AC_PROG_LD_GNU,
-+[AC_CACHE_CHECK([if the linker used by compiler is GNU ld], ac_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $CC -Wl,-v /dev/null 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  ac_cv_prog_gnu_ld=yes
-+else
-+  ac_cv_prog_gnu_ld=no
-+fi])
-+])
-+
-+dnl Removes -I/usr/include/? from given variable
-+AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
-+  ac_new_flags=""
-+  for i in [$]$1; do
-+    case [$]i in
-+    -I/usr/include|-I/usr/include/) ;;
-+    *) ac_new_flags="[$]ac_new_flags [$]i" ;;
-+    esac
-+  done
-+  $1=[$]ac_new_flags
-+])
-+
-+dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
-+dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
-+AC_DEFUN(LIB_REMOVE_USR_LIB,[
-+  ac_new_flags=""
-+  l=""
-+  for i in [$]$1; do
-+    case [$]l[$]i in
-+    -L/usr/lib) ;;
-+    -L/usr/lib/) ;;
-+    -L/usr/lib64) ;;
-+    -L/usr/lib64/) ;;
-+    -Wl,-rpath,/usr/lib) l="";;
-+    -Wl,-rpath,/usr/lib/) l="";;
-+    -Wl,-rpath,/usr/lib64) l="";;
-+    -Wl,-rpath,/usr/lib64/) l="";;
-+    -Wl,-rpath) l=[$]i;;
-+    -Wl,-rpath-Wl,/usr/lib) l="";;
-+    -Wl,-rpath-Wl,/usr/lib/) l="";;
-+    -Wl,-rpath-Wl,/usr/lib64) l="";;
-+    -Wl,-rpath-Wl,/usr/lib64/) l="";;
-+    -rpath=/usr/lib:*) l="-rpath=${i#-rpath=*:}";;
-+    *)
-+    	s=" "
-+        if test x"[$]ac_new_flags" = x""; then
-+            s="";
-+	fi
-+        if test x"[$]l" = x""; then
-+            ac_new_flags="[$]ac_new_flags[$]s[$]i";
-+        else
-+            ac_new_flags="[$]ac_new_flags[$]s[$]l [$]i";
-+        fi
-+        l=""
-+        ;;
-+    esac
-+  done
-+  $1=[$]ac_new_flags
-+])
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN(jm_ICONV,
-+[
-+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-+  dnl those with the standalone portable libiconv installed).
-+  AC_MSG_CHECKING(for iconv in $1)
-+    jm_cv_func_iconv="no"
-+    jm_cv_lib_iconv=""
-+    jm_cv_giconv=no
-+    jm_save_LIBS="$LIBS"
-+
-+  dnl Check for include in giconv.h but no lib needed
-+  if test "$jm_cv_func_iconv" != yes; then
-+    AC_TRY_LINK([#include <stdlib.h>
-+#include <giconv.h>],
-+      [iconv_t cd = iconv_open("","");
-+       iconv(cd,NULL,NULL,NULL,NULL);
-+       iconv_close(cd);],
-+       jm_cv_func_iconv=yes
-+       jm_cv_include="giconv.h"
-+       jm_cv_giconv="yes"
-+       jm_cv_lib_iconv="")
-+
-+    dnl Standard iconv.h include, lib in glibc or libc ...
-+    if test "$jm_cv_func_iconv" != yes; then
-+      AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+        [iconv_t cd = iconv_open("","");
-+         iconv(cd,NULL,NULL,NULL,NULL);
-+         iconv_close(cd);],
-+         jm_cv_include="iconv.h"
-+         jm_cv_func_iconv=yes
-+         jm_cv_lib_iconv="")
-+
-+      dnl Include in giconv.h, libgiconv needed to link
-+      if test "$jm_cv_func_iconv" != yes; then
-+        jm_save_LIBS="$LIBS"
-+        LIBS="$LIBS -lgiconv"
-+        AC_TRY_LINK([#include <stdlib.h>
-+#include <giconv.h>],
-+          [iconv_t cd = iconv_open("","");
-+           iconv(cd,NULL,NULL,NULL,NULL);
-+           iconv_close(cd);],
-+          jm_cv_lib_iconv=yes
-+          jm_cv_func_iconv=yes
-+          jm_cv_include="giconv.h"
-+          jm_cv_giconv=yes
-+          jm_cv_lib_iconv="giconv")
-+
-+        LIBS="$jm_save_LIBS"
-+
-+        dnl Include in iconv.h, libiconv needed to link
-+        if test "$jm_cv_func_iconv" != yes; then
-+          jm_save_LIBS="$LIBS"
-+          LIBS="$LIBS -liconv"
-+          AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+            [iconv_t cd = iconv_open("","");
-+             iconv(cd,NULL,NULL,NULL,NULL);
-+             iconv_close(cd);],
-+            jm_cv_include="iconv.h"
-+            jm_cv_func_iconv=yes
-+            jm_cv_lib_iconv="iconv")
-+          LIBS="$jm_save_LIBS"
-+
-+          dnl Include in biconv.h, libbiconv needed to link
-+          if test "$jm_cv_func_iconv" != yes; then
-+            jm_save_LIBS="$LIBS"
-+            LIBS="$LIBS -lbiconv"
-+            AC_TRY_LINK([#include <stdlib.h>
-+#include <biconv.h>],
-+              [iconv_t cd = iconv_open("","");
-+               iconv(cd,NULL,NULL,NULL,NULL);
-+               iconv_close(cd);],
-+              jm_cv_lib_iconv=yes
-+              jm_cv_func_iconv=yes
-+              jm_cv_include="biconv.h"
-+              jm_cv_biconv=yes
-+              jm_cv_lib_iconv="biconv")
-+
-+            LIBS="$jm_save_LIBS"
-+          fi
-+        fi
-+      fi
-+    fi
-+  fi
-+  if test "$jm_cv_func_iconv" = yes; then
-+    if test "$jm_cv_giconv" = yes; then
-+      AC_DEFINE(HAVE_GICONV, 1, [What header to include for iconv() function: giconv.h])
-+      AC_MSG_RESULT(yes)
-+      ICONV_FOUND=yes
-+    else
-+      if test "$jm_cv_biconv" = yes; then
-+        AC_DEFINE(HAVE_BICONV, 1, [What header to include for iconv() function: biconv.h])
-+        AC_MSG_RESULT(yes)
-+        ICONV_FOUND=yes
-+      else 
-+        AC_DEFINE(HAVE_ICONV, 1, [What header to include for iconv() function: iconv.h])
-+        AC_MSG_RESULT(yes)
-+        ICONV_FOUND=yes
-+      fi
-+    fi
-+  else
-+    AC_MSG_RESULT(no)
-+  fi
-+])
-+
-+AC_DEFUN(rjs_CHARSET,[
-+  dnl Find out if we can convert from $1 to UCS2-LE
-+  AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?])
-+  AC_TRY_RUN([
-+#include <$jm_cv_include>
-+main(){
-+    iconv_t cd = iconv_open("$1", "UCS-2LE");
-+    if (cd == 0 || cd == (iconv_t)-1) {
-+	return -1;
-+    }
-+    return 0;
-+}
-+  ],ICONV_CHARSET=$1,ICONV_CHARSET=no,ICONV_CHARSET=cross)
-+  AC_MSG_RESULT($ICONV_CHARSET)
-+])
-+
-+dnl AC_ENABLE_SHARED - implement the --enable-shared flag
-+dnl Usage: AC_ENABLE_SHARED[(DEFAULT)]
-+dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+dnl   `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(shared,
-+changequote(<<, >>)dnl
-+<<  --enable-shared[=PKGS]    build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_shared=yes ;;
-+no) enable_shared=no ;;
-+*)
-+  enable_shared=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_shared=yes
-+    fi
-+
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-+])
-+
-+dnl AC_ENABLE_STATIC - implement the --enable-static flag
-+dnl Usage: AC_ENABLE_STATIC[(DEFAULT)]
-+dnl   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+dnl   `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(static,
-+changequote(<<, >>)dnl
-+<<  --enable-static[=PKGS]    build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case $enableval in
-+yes) enable_static=yes ;;
-+no) enable_static=no ;;
-+*)
-+  enable_static=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_static=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-+])
-+
-+dnl AC_DISABLE_STATIC - set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)])
-+
-+dnl AC_TRY_COMMAND_NO_STDERR - also fail if there is output on stderr
-+AC_DEFUN( [AC_TRY_COMMAND_NO_STDERR],
-+[
-+	{ OUT=`($1) 3>&AS_MESSAGE_LOG_FD 2>&1 1>&3`
-+	RC=$?
-+	echo "\$?=$RC" >&AS_MESSAGE_LOG_FD
-+	if test x"$OUT" != x ; then
-+		echo "stderr:" >&AS_MESSAGE_LOG_FD
-+		echo "$OUT" >&AS_MESSAGE_LOG_FD
-+	fi
-+	test $RC -eq 0 -a x"$OUT" = x ; }
-+])
-+
-+dnl AC_TRY_RUN_STRICT(PROGRAM,CFLAGS,CPPFLAGS,LDFLAGS,
-+dnl		[ACTION-IF-TRUE],[ACTION-IF-FALSE],
-+dnl		[ACTION-IF-CROSS-COMPILING = RUNTIME-ERROR])
-+AC_DEFUN( [AC_TRY_RUN_STRICT],
-+[
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="$2";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$3";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$4";
-+	export LDFLAGS;
-+	AC_TRY_RUN([$1],[$5],[$6],[$7])
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
-+])
-+
-+dnl SMB_CHECK_SYSCONF(varname)
-+dnl Tests whether the sysconf(3) variable "varname" is available.
-+AC_DEFUN([SMB_CHECK_SYSCONF],
-+[
-+    AC_CACHE_CHECK([for sysconf($1)],
-+	samba_cv_SYSCONF$1,
-+	[
-+	    AC_TRY_LINK([#include <unistd.h>],
-+		[ return sysconf($1) == -1 ? 1 : 0; ],
-+		[ samba_cv_SYSCONF$1=yes ],
-+		[ samba_cv_SYSCONF$1=no ])
-+	])
-+
-+    if test x"$samba_cv_SYSCONF$1" = x"yes" ; then
-+	AC_DEFINE(SYSCONF$1, 1, [Whether sysconf($1) is available])
-+    fi
-+])
-+
-+dnl SMB_IS_LIBPTHREAD_LINKED([actions if true], [actions if false])
-+dnl Test whether the current LIBS results in libpthread being present.
-+dnl Execute the corresponding user action list.
-+AC_DEFUN([SMB_IS_LIBPTHREAD_LINKED],
-+[
-+    AC_MSG_CHECKING(if libpthread is linked)
-+    AC_TRY_LINK([],
-+	[return pthread_create(0, 0, 0, 0);],
-+	[
-+	    AC_MSG_RESULT(yes)
-+	    $1
-+	],
-+	[
-+	    AC_MSG_RESULT(no)
-+	    $2
-+	])
-+])
-+
-+dnl SMB_REMOVE_LIB(lib)
-+dnl Remove the given library from $LIBS
-+AC_DEFUN([SMB_REMOVE_LIB],
-+[
-+    LIBS=`echo $LIBS | sed '-es/-l$1//g'`
-+])
-+
-+dnl SMB_CHECK_DMAPI([actions if true], [actions if false])
-+dnl Check whether DMAPI is available and is a version that we know
-+dnl how to deal with. The default truth action is to set samba_dmapi_libs
-+dnl to the list of necessary libraries, and to define USE_DMAPI.
-+AC_DEFUN([SMB_CHECK_DMAPI],
-+[
-+    samba_dmapi_libs=""
-+
-+    if test x"$samba_dmapi_libs" = x"" ; then
-+	AC_CHECK_LIB(dm, dm_get_eventlist,
-+		[ samba_dmapi_libs="-ldm"], [])
-+    fi
-+
-+    if test x"$samba_dmapi_libs" = x"" ; then
-+	AC_CHECK_LIB(jfsdm, dm_get_eventlist,
-+		[samba_dmapi_libs="-ljfsdm"], [])
-+    fi
-+
-+    if test x"$samba_dmapi_libs" = x"" ; then
-+        AC_CHECK_LIB(dmapi, dm_get_eventlist,
-+                [samba_dmapi_libs="-ldmapi"], [])
-+    fi
-+
-+    if test x"$samba_dmapi_libs" = x"" ; then
-+	AC_CHECK_LIB(xdsm, dm_get_eventlist,
-+		[samba_dmapi_libs="-lxdsm"], [])
-+    fi
-+
-+
-+    # Only bother to test ehaders if we have a candidate DMAPI library
-+    if test x"$samba_dmapi_libs" != x"" ; then
-+	AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h)
-+    fi
-+
-+    if test x"$samba_dmapi_libs" != x"" ; then
-+	samba_dmapi_save_LIBS="$LIBS"
-+	LIBS="$LIBS $samba_dmapi_libs"
-+	AC_TRY_LINK(
-+		[
-+#include <time.h>      /* needed by Tru64 */
-+#include <sys/types.h> /* needed by AIX */
-+#ifdef HAVE_XFS_DMAPI_H
-+#include <xfs/dmapi.h>
-+#elif defined(HAVE_SYS_DMI_H)
-+#include <sys/dmi.h>
-+#elif defined(HAVE_SYS_JFSDMAPI_H)
-+#include <sys/jfsdmapi.h>
-+#elif defined(HAVE_SYS_DMAPI_H)
-+#include <sys/dmapi.h>
-+#elif defined(HAVE_DMAPI_H)
-+#include <dmapi.h>
-+#endif
-+		],
-+		[
-+/* This link test is designed to fail on IRI 6.4, but should
-+ * succeed on Linux, IRIX 6.5 and AIX.
-+ */
-+	char * version;
-+	dm_eventset_t events;
-+	/* This doesn't take an argument on IRIX 6.4. */
-+	dm_init_service(&version);
-+	/* IRIX 6.4 expects events to be a pointer. */
-+	DMEV_ISSET(DM_EVENT_READ, events);
-+		],
-+		[
-+		    true # DMAPI link test succeeded
-+		],
-+		[
-+		    # DMAPI link failure
-+		    samba_dmapi_libs=
-+		])
-+	LIBS="$samba_dmapi_save_LIBS"
-+    fi
-+
-+    if test x"$samba_dmapi_libs" = x"" ; then
-+	# DMAPI detection failure actions begin
-+	ifelse($2, [],
-+	    [
-+		AC_ERROR(Failed to detect a supported DMAPI implementation)
-+	    ],
-+	    [
-+		$2
-+	    ])
-+	# DMAPI detection failure actions end
-+    else
-+	# DMAPI detection success actions start
-+	ifelse($1, [],
-+	    [
-+		AC_DEFINE(USE_DMAPI, 1,
-+		    [Whether we should build DMAPI integration components])
-+		AC_MSG_NOTICE(Found DMAPI support in $samba_dmapi_libs)
-+	    ],
-+	    [
-+		$1
-+	    ])
-+	# DMAPI detection success actions end
-+    fi
-+
-+])
-+
-+dnl SMB_IF_RTSIGNAL_BUG([actions if true],
-+dnl			[actions if false],
-+dnl			[actions if cross compiling])
-+dnl Test whether we can call sigaction with RT_SIGNAL_NOTIFY and
-+dnl RT_SIGNAL_LEASE (also RT_SIGNAL_AIO for good measure, though
-+dnl I don't believe that triggers any bug.
-+dnl
-+dnl See the samba-technical thread titled "Failed to setup
-+dnl RT_SIGNAL_NOTIFY handler" for details on the bug in question.
-+AC_DEFUN([SMB_IF_RTSIGNAL_BUG],
-+[
-+    rt_signal_notify_works=yes
-+    rt_signal_lease_works=yes
-+    rt_signal_aio_works=yes
-+
-+    AC_MSG_CHECKING(if sigaction works with realtime signals)
-+    AC_TRY_RUN(
-+	[
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <signal.h>
-+
-+#ifndef SIGRTMIN
-+#define SIGRTMIN NSIG
-+#endif
-+/* from smbd/notify_kernel.c */
-+#ifndef RT_SIGNAL_NOTIFY
-+#define RT_SIGNAL_NOTIFY (SIGRTMIN+2)
-+#endif
-+
-+/* from smbd/aio.c */
-+#ifndef RT_SIGNAL_AIO
-+#define RT_SIGNAL_AIO (SIGRTMIN+3)
-+#endif
-+
-+/* from smbd/oplock_linux.c */
-+#ifndef RT_SIGNAL_LEASE
-+#define RT_SIGNAL_LEASE (SIGRTMIN+1)
-+#endif
-+
-+static void signal_handler(int sig, siginfo_t *info, void *unused)
-+{
-+    int do_nothing = 0;
-+}
-+
-+int main(void)
-+{
-+    int result = 0;
-+    struct sigaction act = {0};
-+
-+    act.sa_sigaction = signal_handler;
-+    act.sa_flags = SA_SIGINFO;
-+    sigemptyset( &act.sa_mask );
-+
-+    if (sigaction(RT_SIGNAL_LEASE, &act, 0) != 0) {
-+	    /* Failed to setup RT_SIGNAL_LEASE handler */
-+	    result += 1;
-+    }
-+
-+    if (sigaction(RT_SIGNAL_NOTIFY, &act, 0) != 0) {
-+	    /* Failed to setup RT_SIGNAL_NOTIFY handler */
-+	    result += 10;
-+    }
-+
-+    if (sigaction(RT_SIGNAL_AIO, &act, 0) != 0) {
-+	    /* Failed to setup RT_SIGNAL_AIO handler */
-+	    result += 100;
-+    }
-+
-+    /* zero on success */
-+    return result;
-+}
-+	],
-+	[
-+	    AC_MSG_RESULT(yes)
-+	    $2
-+	],
-+	[
-+	    AC_MSG_RESULT(no)
-+	    case "$ac_status" in
-+		1|11|101|111)  rt_signal_lease_ok=no ;;
-+	    esac
-+	    case "$ac_status" in
-+		10|11|110|111)  rt_signal_notify_ok=no ;;
-+	    esac
-+	    case "$ac_status" in
-+		100|110|101|111)  rt_signal_aio_ok=no ;;
-+	    esac
-+	    $2
-+	],
-+	[
-+	    AC_MSG_RESULT(cross)
-+	    $3
-+	])
-+])
-+
-+m4_include(../lib/replace/libreplace.m4)
-diff --git a/source3/m4/autoconf-2.60.m4 b/source3/m4/autoconf-2.60.m4
-new file mode 100644
-index 0000000..b2694fd
---- /dev/null
-+++ b/source3/m4/autoconf-2.60.m4
-@@ -0,0 +1,236 @@
-+# AC_GNU_SOURCE
-+# --------------
-+AC_DEFUN([AC_GNU_SOURCE],
-+[AH_VERBATIM([_GNU_SOURCE],
-+[/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif])dnl
-+AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-+AC_DEFINE([_GNU_SOURCE])
-+])
-+
-+# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST,
-+#		ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE)
-+# --------------------------------------------------------------
-+# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99')
-+# by trying to compile a program of TEST-PROLOGUE and TEST-BODY.  If this fails,
-+# try again with each compiler option in the space-separated OPTION-LIST; if one
-+# helps, append it to CC.  If eventually successful, run ACTION-IF-AVAILABLE,
-+# else ACTION-IF-UNAVAILABLE.
-+AC_DEFUN([_AC_C_STD_TRY],
-+[AC_MSG_CHECKING([for $CC option to accept ISO ]m4_translit($1, [c], [C]))
-+AC_CACHE_VAL(ac_cv_prog_cc_$1,
-+[ac_cv_prog_cc_$1=no
-+ac_save_CC=$CC
-+AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])])
-+for ac_arg in '' $4
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg])
-+  test "x$ac_cv_prog_cc_$1" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+])# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_$1" in
-+  x)
-+    AC_MSG_RESULT([none needed]) ;;
-+  xno)
-+    AC_MSG_RESULT([unsupported]) ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_$1"
-+    AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;;
-+esac
-+AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6])
-+])# _AC_C_STD_TRY
-+
-+# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE])
-+# ----------------------------------------------------------------
-+# If the C compiler is not in ISO C99 mode by default, try to add an
-+# option to output variable CC to make it so.  This macro tries
-+# various options that select ISO C99 on some system or another.  It
-+# considers the compiler to be in ISO C99 mode if it handles mixed
-+# code and declarations, _Bool, inline and restrict.
-+AC_DEFUN([_AC_PROG_CC_C99],
-+[_AC_C_STD_TRY([c99],
-+[[#include <stdarg.h>
-+#include <stdbool.h>
-+#include <stdlib.h>
-+#include <wchar.h>
-+#include <stdio.h>
-+
-+struct incomplete_array
-+{
-+  int datasize;
-+  double data[];
-+};
-+
-+struct named_init {
-+  int number;
-+  const wchar_t *name;
-+  double average;
-+};
-+
-+typedef const char *ccp;
-+
-+static inline int
-+test_restrict(ccp restrict text)
-+{
-+  // See if C++-style comments work.
-+  // Iterate through items via the restricted pointer.
-+  // Also check for declarations in for loops.
-+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
-+    continue;
-+  return 0;
-+}
-+
-+// Check varargs and va_copy work.
-+static void
-+test_varargs(const char *format, ...)
-+{
-+  va_list args;
-+  va_start(args, format);
-+  va_list args_copy;
-+  va_copy(args_copy, args);
-+
-+  const char *str;
-+  int number;
-+  float fnumber;
-+
-+  while (*format)
-+    {
-+      switch (*format++)
-+	{
-+	case 's': // string
-+	  str = va_arg(args_copy, const char *);
-+	  break;
-+	case 'd': // int
-+	  number = va_arg(args_copy, int);
-+	  break;
-+	case 'f': // float
-+	  fnumber = (float) va_arg(args_copy, double);
-+	  break;
-+	default:
-+	  break;
-+	}
-+    }
-+  va_end(args_copy);
-+  va_end(args);
-+}
-+]],
-+[[
-+  // Check bool and long long datatypes.
-+  _Bool success = false;
-+  long long int bignum = -1234567890LL;
-+  unsigned long long int ubignum = 1234567890uLL;
-+
-+  // Check restrict.
-+  if (test_restrict("String literal") != 0)
-+    success = true;
-+  char *restrict newvar = "Another string";
-+
-+  // Check varargs.
-+  test_varargs("s, d' f .", "string", 65, 34.234);
-+
-+  // Check incomplete arrays work.
-+  struct incomplete_array *ia =
-+    malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10));
-+  ia->datasize = 10;
-+  for (int i = 0; i < ia->datasize; ++i)
-+    ia->data[i] = (double) i * 1.234;
-+
-+  // Check named initialisers.
-+  struct named_init ni = {
-+    .number = 34,
-+    .name = L"Test wide string",
-+    .average = 543.34343,
-+  };
-+
-+  ni.number = 58;
-+
-+  int dynamic_array[ni.number];
-+  dynamic_array[43] = 543;
-+
-+  // work around unused variable warnings
-+  return  bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x';
-+]],
-+dnl Try
-+dnl GCC		-std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999)
-+dnl AIX		-qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99)
-+dnl Intel ICC	-c99
-+dnl IRIX	-c99
-+dnl Solaris	(unused because it causes the compiler to assume C99 semantics for
-+dnl		library functions, and this is invalid before Solaris 10: -xc99)
-+dnl Tru64	-c99
-+dnl with extended modes being tried first.
-+[[-std=gnu99 -c99 -qlanglvl=extc99]], [$1], [$2])[]dnl
-+])# _AC_PROG_CC_C99
-+
-+# AC_PROG_CC_C99
-+# --------------
-+AC_DEFUN([AC_PROG_CC_C99],
-+[ AC_REQUIRE([AC_PROG_CC])dnl
-+  _AC_PROG_CC_C99
-+])
-+
-+# AC_USE_SYSTEM_EXTENSIONS
-+# ------------------------
-+# Enable extensions on systems that normally disable them,
-+# typically due to standards-conformance issues.
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
-+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
-+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-+
-+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
-+  if test "$MINIX" = yes; then
-+    AC_DEFINE([_POSIX_SOURCE], [1],
-+      [Define to 1 if you need to in order for `stat' and other
-+       things to work.])
-+    AC_DEFINE([_POSIX_1_SOURCE], [2],
-+      [Define to 2 if the system does not provide POSIX.1 features
-+       except with this defined.])
-+    AC_DEFINE([_MINIX], [1],
-+      [Define to 1 if on MINIX.])
-+  fi
-+
-+  AH_VERBATIM([__EXTENSIONS__],
-+[/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+])
-+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-+    [ac_cv_safe_to_define___extensions__],
-+    [AC_COMPILE_IFELSE(
-+       [AC_LANG_PROGRAM([[
-+#	  define __EXTENSIONS__ 1
-+	  ]AC_INCLUDES_DEFAULT])],
-+       [ac_cv_safe_to_define___extensions__=yes],
-+       [ac_cv_safe_to_define___extensions__=no])])
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    AC_DEFINE([__EXTENSIONS__])
-+  AC_DEFINE([_ALL_SOURCE])
-+  AC_DEFINE([_GNU_SOURCE])
-+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-+  AC_DEFINE([_TANDEM_SOURCE])
-+])# AC_USE_SYSTEM_EXTENSIONS
-+])
-diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
-new file mode 100644
-index 0000000..94c36bc
---- /dev/null
-+++ b/source3/m4/check_path.m4
-@@ -0,0 +1,89 @@
-+dnl
-+dnl Samba3 build environment path checks
-+dnl
-+dnl Copyright (C) Michael Adam 2008
-+dnl
-+dnl Released under the GNU General Public License
-+dnl http://www.gnu.org/licenses/
-+dnl
-+
-+AC_LIBREPLACE_LOCATION_CHECKS
-+
-+m4_include(../dynconfig/config.m4)
-+
-+#################################################
-+# set prefix for 'make test'
-+selftest_prefix="./st"
-+AC_SUBST(selftest_prefix)
-+AC_ARG_WITH(selftest-prefix,
-+[AS_HELP_STRING([--with-selftest-prefix=DIR], [The prefix where make test will be run ($selftest_prefix)])],
-+[ case "$withval" in
-+  yes|no)
-+    AC_MSG_WARN([--with-selftest-prefix called without argument - will use default])
-+  ;;
-+  * )
-+    selftest_prefix="$withval"
-+    ;;
-+  esac
-+])
-+
-+## check for --enable-debug first before checking CFLAGS before
-+## so that we don't mix -O and -g
-+debug=no
-+AC_ARG_ENABLE(debug,
-+[AS_HELP_STRING([--enable-debug], [Turn on compiler debugging information (default=no)])],
-+    [if eval "test x$enable_debug = xyes"; then
-+	debug=yes
-+    fi])
-+
-+AC_SUBST(developer)
-+developer=no
-+AC_ARG_ENABLE(developer, [AS_HELP_STRING([--enable-developer], [Turn on developer warnings and debugging (default=no)])],
-+    [if eval "test x$enable_developer = xyes"; then
-+        debug=yes
-+        developer=yes
-+        selftest=yes
-+    fi])
-+
-+AC_SUBST(selftest)
-+selftest=no
-+AC_ARG_ENABLE(selftest, [AS_HELP_STRING([--enable-selftest], [Turn on selftest capability (default=no)])],
-+    [if eval "test x$enable_selftest = xyes"; then
-+        debug=yes
-+        selftest=yes
-+    fi])
-+
-+krb5developer=no
-+AC_ARG_ENABLE(krb5developer, [AS_HELP_STRING([--enable-krb5developer], [Turn on developer warnings and debugging, except -Wstrict-prototypes (default=no)])],
-+    [if eval "test x$enable_krb5developer = xyes"; then
-+        debug=yes
-+        developer=yes
-+	krb5_developer=yes
-+    fi])
-+
-+picky_developer=no
-+AC_ARG_ENABLE(picky-developer, [AS_HELP_STRING([--enable-picky-developer], [Halt compilation on warnings])],
-+    [if eval "test x$enable_picky_developer = xyes"; then
-+        debug=yes
-+        developer=yes
-+        picky_developer=yes
-+    fi])
-+
-+AC_ARG_WITH(cfenc,
-+[AS_HELP_STRING([--with-cfenc=HEADERDIR], [Use internal CoreFoundation encoding API for optimization (Mac OS X/Darwin only)])],
-+[
-+# May be in source $withval/CoreFoundation/StringEncodings.subproj.
-+# Should have been in framework $withval/CoreFoundation.framework/Headers.
-+for d in \
-+    $withval/CoreFoundation/StringEncodings.subproj \
-+    $withval/StringEncodings.subproj \
-+    $withval/CoreFoundation.framework/Headers \
-+    $withval/Headers \
-+    $withval
-+do
-+    if test -r $d/CFStringEncodingConverter.h; then
-+        ln -sfh $d include/CoreFoundation
-+    fi
-+done
-+])
-+
-diff --git a/source3/m4/samba_version.m4 b/source3/m4/samba_version.m4
-new file mode 100644
-index 0000000..f0e3b8a
---- /dev/null
-+++ b/source3/m4/samba_version.m4
-@@ -0,0 +1,29 @@
-+dnl
-+dnl Samba3 build environment - Samba version variables
-+dnl
-+dnl Copyright (C) Michael Adam 2008
-+dnl
-+dnl Released under the GNU General Public License
-+dnl http://www.gnu.org/licenses/
-+dnl
-+dnl
-+
-+SMB_VERSION_STRING=`cat $srcdir/include/autoconf/version.h | grep '#define SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
-+echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
-+
-+SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/autoconf/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2`
-+if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then
-+	echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}"
-+fi
-+SAMBA_VERSION_COMMIT_DATE=`cat $srcdir/include/autoconf/version.h | grep 'SAMBA_VERSION_COMMIT_DATE' | cut -d ' ' -f3-`
-+if test -n "${SAMBA_VERSION_COMMIT_DATE}";then
-+	echo "BUILD COMMIT DATE: ${SAMBA_VERSION_COMMIT_DATE}"
-+fi
-+SAMBA_VERSION_COMMIT_TIME=`cat $srcdir/include/autoconf/version.h | grep 'SAMBA_VERSION_COMMIT_TIME' | cut -d ' ' -f3-`
-+if test -n "${SAMBA_VERSION_COMMIT_TIME}";then
-+	echo "BUILD COMMIT TIME: ${SAMBA_VERSION_COMMIT_TIME}"
-+
-+	# just to keep the build-farm gui happy for now...
-+	echo "BUILD REVISION: ${SAMBA_VERSION_COMMIT_TIME}"
-+fi
-+
-
-From 9d86e15813409f163a2445624014140626e98183 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 17/19] Revert "build: Update md5.h detection in waf and
- autoconf to use sys/md5.h and -lmd"
-
-This reverts commit 30a224367595f9e2506e41053fc9c7cb96a90928.
----
- lib/crypto/md5.h             | 16 +++++++---------
- lib/crypto/wscript_build     |  4 ----
- lib/crypto/wscript_configure |  8 ++------
- source3/configure.in         |  4 ++--
- 4 files changed, 11 insertions(+), 21 deletions(-)
-
-diff --git a/lib/crypto/md5.h b/lib/crypto/md5.h
-index edae27f..388cdf8 100644
---- a/lib/crypto/md5.h
-+++ b/lib/crypto/md5.h
-@@ -6,16 +6,12 @@
- #define HEADER_MD5_H 
- #endif
- 
--#if defined(HAVE_BSD_MD5_H)
--/* Try to avoid clashes with BSD MD5 implementation (on linux) */
-+#ifdef HAVE_BSD_MD5_H
-+/* Try to avoid clashes with BSD MD5 implementation */
- #include <bsd/md5.h>
--
--#elif defined(HAVE_SYS_MD5_H)
--/* Try to avoid clashes with BSD MD5 implementation (on BSD) */
--#include <sys/md5.h>
--
-+#else
- /* Try to use CommonCrypto on Mac as otherwise we can get MD5Final twice */
--#elif defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
-+#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
- #include <CommonCrypto/CommonDigest.h>
- 
- #define MD5Init(c)					CC_MD5_Init(c)
-@@ -36,6 +32,8 @@ void MD5Init(MD5_CTX *context);
- void MD5Update(MD5_CTX *context, const uint8_t *buf,
- 	       size_t len);
- void MD5Final(uint8_t digest[MD5_DIGEST_LENGTH], MD5_CTX *context);
--#endif /* HAVE_*MD5_H */
-+#endif /* HAVE_COMMONCRYPTO_COMMONDIGEST_H */
-+
-+#endif /* HAVE_BSD_MD5_H */
- 
- #endif /* !MD5_H */
-diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
-index e056f65..cd7a466 100644
---- a/lib/crypto/wscript_build
-+++ b/lib/crypto/wscript_build
-@@ -4,10 +4,6 @@ extra_source = ''
- extra_deps = ''
- if bld.CONFIG_SET('HAVE_BSD_MD5_H'):
- 	extra_deps += ' bsd'
--elif bld.CONFIG_SET('HAVE_SYS_MD5_H') and bld.CONFIG_SET('HAVE_LIBMD5'):
--	extra_deps += ' md5'
--elif bld.CONFIG_SET('HAVE_SYS_MD5_H') and bld.CONFIG_SET('HAVE_LIBMD'):
--	extra_deps += ' md'
- elif not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'):
- 	extra_source += ' md5.c'
- 
-diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure
-index 21ec566..5fc00fb 100644
---- a/lib/crypto/wscript_configure
-+++ b/lib/crypto/wscript_configure
-@@ -1,8 +1,4 @@
--if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
--    checklibc=True):
--    conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h',
--                        checklibc=True)
--    conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h',
--                        checklibc=True)
-+conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
-+    checklibc=True)
- conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h',
-     checklibc=True)
-diff --git a/source3/configure.in b/source3/configure.in
-index 0e2f126..822c5f4 100644
---- a/source3/configure.in
-+++ b/source3/configure.in
-@@ -620,11 +620,11 @@ if test x"$samba_cv_md5lib" = x"none" ; then
- fi
- 
- if test x"$samba_cv_md5lib" != x"none" ; then
--	AC_CHECK_HEADERS(sys/md5.h)
-+	AC_CHECK_HEADERS(md5.h)
- fi
- 
- CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
--if test x"$ac_cv_header_sys_md5_h" = x"yes" -a \
-+if test x"$ac_cv_header_md5_h" = x"yes" -a \
-         x"$samba_cv_md5lib" != x"none" ; then
- 	if test x"$samba_cv_md5lib" != x ; then
- 		LIBS="${LIBS} -l${samba_cv_md5lib}"
-
-From c55d5d209c58ce49fe0f3beca21aba6fbe2b3ab6 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 18/19] Revert "swat: Remove swat."
-
-This reverts commit 61a2ad3c020424cead067cbdc89ea6f25708fde4.
----
- buildtools/wafsamba/samba_patterns.py       |    1 +
- dynconfig/config.m4                         |    3 +
- dynconfig/dynconfig.c                       |    1 +
- dynconfig/dynconfig.h                       |    1 +
- dynconfig/wscript                           |    4 +
- examples/misc/swat.pl                       |  122 ++
- source3/Makefile.in                         |   33 +-
- source3/configure.in                        |    2 +
- source3/lib/popt_common.c                   |   10 +
- source3/m4/swat.m4                          |   27 +
- source3/param/loadparm.c                    |    2 +-
- source3/po/de.msg                           |  616 ++++++++++
- source3/po/en.msg                           |  592 ++++++++++
- source3/po/fi.msg                           |  610 ++++++++++
- source3/po/fr.msg                           |  592 ++++++++++
- source3/po/genmsg                           |   40 +
- source3/po/it.msg                           |  592 ++++++++++
- source3/po/ja.msg                           |  594 ++++++++++
- source3/po/nl.msg                           |  592 ++++++++++
- source3/po/pl.msg                           |  592 ++++++++++
- source3/po/ru.msg                           |  606 ++++++++++
- source3/po/tr.msg                           |  593 ++++++++++
- source3/script/installmsg.sh                |   65 ++
- source3/script/installswat.sh               |  296 +++++
- source3/script/mkbuildoptions.awk           |    1 +
- source3/web/cgi.c                           |  798 +++++++++++++
- source3/web/diagnose.c                      |   80 ++
- source3/web/neg_lang.c                      |  120 ++
- source3/web/startstop.c                     |  130 +++
- source3/web/statuspage.c                    |  467 ++++++++
- source3/web/swat.c                          | 1683 ++++++++++++++++++++++++++-
- source3/web/swat_proto.h                    |   76 ++
- source3/wscript                             |    4 +
- source3/wscript_build                       |   33 +
- source4/smbd/server.c                       |    1 +
- swat/help/welcome-no-samba-doc.html         |    3 +
- swat/help/welcome.html                      |   63 +
- swat/include/footer.html                    |    3 +
- swat/include/header.html                    |   11 +
- swat/lang/ja/help/welcome.html              |   66 ++
- swat/lang/ru/help/welcome-no-samba-doc.html |    6 +
- swat/lang/ru/help/welcome.html              |   65 ++
- swat/lang/ru/include/header.html            |   14 +
- swat/lang/tr/help/welcome.html              |   66 ++
- 44 files changed, 10235 insertions(+), 41 deletions(-)
- create mode 100644 examples/misc/swat.pl
- create mode 100644 source3/m4/swat.m4
- create mode 100644 source3/po/de.msg
- create mode 100644 source3/po/en.msg
- create mode 100644 source3/po/fi.msg
- create mode 100644 source3/po/fr.msg
- create mode 100755 source3/po/genmsg
- create mode 100644 source3/po/it.msg
- create mode 100644 source3/po/ja.msg
- create mode 100644 source3/po/nl.msg
- create mode 100644 source3/po/pl.msg
- create mode 100644 source3/po/ru.msg
- create mode 100644 source3/po/tr.msg
- create mode 100644 source3/script/installmsg.sh
- create mode 100755 source3/script/installswat.sh
- create mode 100644 source3/web/cgi.c
- create mode 100644 source3/web/diagnose.c
- create mode 100644 source3/web/neg_lang.c
- create mode 100644 source3/web/startstop.c
- create mode 100644 source3/web/statuspage.c
- create mode 100644 source3/web/swat_proto.h
- create mode 100644 swat/help/welcome-no-samba-doc.html
- create mode 100644 swat/help/welcome.html
- create mode 100644 swat/include/footer.html
- create mode 100644 swat/include/header.html
- create mode 100644 swat/lang/ja/help/welcome.html
- create mode 100644 swat/lang/ru/help/welcome-no-samba-doc.html
- create mode 100644 swat/lang/ru/help/welcome.html
- create mode 100644 swat/lang/ru/include/header.html
- create mode 100644 swat/lang/tr/help/welcome.html
-
-diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
-index 62d988e..2504381 100644
---- a/buildtools/wafsamba/samba_patterns.py
-+++ b/buildtools/wafsamba/samba_patterns.py
-@@ -114,6 +114,7 @@ def write_build_options_header(fp):
-     fp.write("       output(screen,\"\\nPaths:\\n\");\n")
-     fp.write("       output(screen,\"   SBINDIR: %s\\n\", get_dyn_SBINDIR());\n")
-     fp.write("       output(screen,\"   BINDIR: %s\\n\", get_dyn_BINDIR());\n")
-+    fp.write("       output(screen,\"   SWATDIR: %s\\n\", get_dyn_SWATDIR());\n")
-     fp.write("       output(screen,\"   CONFIGFILE: %s\\n\", get_dyn_CONFIGFILE());\n")
-     fp.write("       output(screen,\"   LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());\n")
-     fp.write("       output(screen,\"   LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());\n")
-diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
-index fe69abe..6b5dfdb 100644
---- a/dynconfig/config.m4
-+++ b/dynconfig/config.m4
-@@ -27,6 +27,7 @@ if test x$enable_fhs != xyes; then
- 	INCLUDEDIR="${includedir}"
- 	SETUPDIR="${datadir}/setup"
- 	PKGCONFIGDIR="${libdir}/pkgconfig"
-+	SWATDIR="${datadir}/swat"
- 	CODEPAGEDIR="${datadir}/codepages"
- 	PAMMODULESDIR="${libdir}/security"
- 	CONFIGDIR="\${sysconfdir}"
-@@ -45,6 +46,7 @@ else
- 	INCLUDEDIR="${includedir}/samba-4.0"
- 	SETUPDIR="${datadir}/samba/setup"
- 	PKGCONFIGDIR="${libdir}/pkgconfig"
-+	SWATDIR="${datadir}/samba/swat"
- 	CODEPAGEDIR="${datadir}/samba/codepages"
- 	PAMMODULESDIR="${libdir}/security"
- 	CONFIGDIR="\${sysconfdir}/samba"
-@@ -277,6 +279,7 @@ AC_SUBST(MODULESDIR)
- AC_SUBST(INCLUDEDIR)
- AC_SUBST(SETUPDIR)
- AC_SUBST(PKGCONFIGDIR)
-+AC_SUBST(SWATDIR)
- AC_SUBST(CODEPAGEDIR)
- AC_SUBST(PAMMODULESDIR)
- AC_SUBST(CONFIGDIR)
-diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
-index 9fd7108..79332a2 100644
---- a/dynconfig/dynconfig.c
-+++ b/dynconfig/dynconfig.c
-@@ -86,6 +86,7 @@ const char *set_dyn_##name(const char *newpath) \
- /* these are in common with s3 */
- DEFINE_DYN_CONFIG_PARAM(SBINDIR)
- DEFINE_DYN_CONFIG_PARAM(BINDIR)
-+DEFINE_DYN_CONFIG_PARAM(SWATDIR)
- DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/
- DEFINE_DYN_CONFIG_PARAM(LOGFILEBASE) /** Log file directory. **/
- DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
-diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h
-index 4d24001..e53cd8f 100644
---- a/dynconfig/dynconfig.h
-+++ b/dynconfig/dynconfig.h
-@@ -33,6 +33,7 @@ bool is_default_dyn_##name(void);
- /* these are in common with s3 */
- DEFINE_DYN_CONFIG_PROTO(SBINDIR)
- DEFINE_DYN_CONFIG_PROTO(BINDIR)
-+DEFINE_DYN_CONFIG_PROTO(SWATDIR)
- DEFINE_DYN_CONFIG_PROTO(CONFIGFILE) /**< Location of smb.conf file. **/
- DEFINE_DYN_CONFIG_PROTO(LOGFILEBASE) /** Log file directory. **/
- DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/
-diff --git a/dynconfig/wscript b/dynconfig/wscript
-index 6410c38..dc4075a 100755
---- a/dynconfig/wscript
-+++ b/dynconfig/wscript
-@@ -138,6 +138,10 @@ dynconfig = {
-          'STD-PATH':  '${LIBDIR}/pkgconfig',
-          'FHS-PATH':  '${LIBDIR}/pkgconfig',
-     },
-+    'SWATDIR' : {
-+         'STD-PATH':  '${DATADIR}/swat',
-+         'FHS-PATH':  '${DATADIR}/samba/swat',
-+    },
-     'CODEPAGEDIR' : {
-          'STD-PATH':  '${DATADIR}/codepages',
-          'FHS-PATH':  '${DATADIR}/samba/codepages',
-diff --git a/examples/misc/swat.pl b/examples/misc/swat.pl
-new file mode 100644
-index 0000000..f6414b6
---- /dev/null
-+++ b/examples/misc/swat.pl
-@@ -0,0 +1,122 @@
-+#! /usr/bin/perl5
-+##
-+## This is a simple script written by Herb Lewis @ SGI <herb@samba.org>
-+## for reporting which parameters are supported by loadparm.c but 
-+## not by SWAT I just thought it looked fun and might be of interest to others
-+## --jerry@samba.org
-+##
-+## Here is a little info on the usage and output format so you don't have
-+## to dig through the code to understand what is printed.
-+##
-+## Useage: swat.pl [path_to_loadparm.c]
-+##
-+## The output consists of 4 columns of information
-+##     Option Name, Global Page, Share Page, Printer Page
-+## The section separaters will also be printed (preceded by 16 *) to show
-+## which options are grouped in the various sections.
-+##
-+## If the option name is preceded by an * it means this is a deprecated option.
-+## If the option name is preceded by 5 spaces it means this is an alias for the
-+## previous option.
-+##
-+## Under the Global Page, Share Page, and Printer Page columns there will be
-+## one of 3 entries, BASIC, ADVANCED, or no. "BASIC" indicates this option will
-+## show in the Basic View of that page in SWAT. "ADVANCED" indicates this
-+## option will show in the Advanced View of that page in SWAT. "No" indicates
-+## that this option is not available on that page in SWAT.
-+##
-+## Under the Global Page column, if an entry begins with an * it indicates that
-+## this is actually specified in Samba as a "service parameter" not a "global
-+## parameter" but you can set a default value for this on the Global Page in
-+## SWAT.
-+##
-+## --herb@samba.org
-+
-+$lastone = "nothing";
-+
-+if (@ARGV[0]) {
-+	$filename = @ARGV[0];
-+} else {
-+	$filename = "/usr3/samba20/samba/source/param/loadparm.c";
-+}
-+
-+open (INFILE,$filename) || die "unable to open $filename\n";
-+while (not eof(INFILE))
-+{
-+	$_ = <INFILE>;
-+	last if ( /^static struct parm_struct parm_table/) ;
-+}
-+print "Option Name                     Global Page  Share Page  Printer Page\n";
-+print "---------------------------------------------------------------------";
-+while (not eof(INFILE))
-+{
-+	$_ = <INFILE>;
-+	last if (/};/);
-+	@fields = split(/,/,$_);
-+	next if not ($fields[0] =~ /^.*{"/);
-+	$fields[0] =~ s/.*{"//;
-+	$fields[0] =~ s/"//;
-+	if ($fields[3] eq $lastone) {
-+		print "     $fields[0]\n";
-+		next;
-+	}
-+	$lastone = $fields[3];
-+	$fields[2] =~ s/^\s+//;
-+	$fields[2] =~ s/\s+$//;
-+	$fields[2] =~ s/}.*$//;
-+	$fields[6] =~ s/^\s+//;
-+	$fields[6] =~ s/\s+$//;
-+	$fields[6] =~ s/}.*$//;
-+	if ($fields[2] =~ /P_SEPARATOR/) {
-+		print "\n****************$fields[0]\n";
-+		next;
-+	}
-+	else {
-+		if ($fields[6] =~ /FLAG_DEPRECATED/) {
-+			print "*$fields[0]".' 'x(31-length($fields[0]));
-+		}
-+		else {
-+			print "$fields[0]".' 'x(32-length($fields[0]));
-+		}
-+	}
-+	if (($fields[2] =~ /P_GLOBAL/) || ($fields[6] =~ /FLAG_GLOBAL/)) {
-+		if ($fields[6] =~ /FLAG_GLOBAL/) {
-+			print "*";
-+		}
-+		else {
-+			print " ";
-+		}
-+		if ($fields[6] =~ /FLAG_BASIC/) {
-+			print "BASIC       ";
-+		}
-+		else {
-+			print "ADVANCED    ";
-+		}
-+	}
-+	else {
-+		print " no          ";
-+	}
-+	if ($fields[6] =~ /FLAG_SHARE/) {
-+		if ($fields[6] =~ /FLAG_BASIC/) {
-+			print "BASIC       ";
-+		}
-+		else {
-+			print "ADVANCED    ";
-+		}
-+	}
-+	else {
-+		print "no          ";
-+	}
-+	if ($fields[6] =~ /FLAG_PRINT/) {
-+		if ($fields[6] =~ /FLAG_BASIC/) {
-+			print "BASIC";
-+		}
-+		else {
-+			print "ADVANCED";
-+		}
-+	}
-+	else {
-+		print "no";
-+	}
-+	print "\n";
-+}
-diff --git a/source3/Makefile.in b/source3/Makefile.in
-index efe0694..d55a9cd 100644
---- a/source3/Makefile.in
-+++ b/source3/Makefile.in
-@@ -31,6 +31,7 @@ MODULESDIR=@MODULESDIR@
- INCLUDEDIR=@INCLUDEDIR@
- SETUPDIR=@SETUPDIR@
- #PKGCONFIGDIR=@PKGCONFIGDIR@
-+SWATDIR=@SWATDIR@
- CODEPAGEDIR=@CODEPAGEDIR@
- PAMMODULESDIR=@PAMMODULESDIR@
- CONFIGDIR=@CONFIGDIR@
-@@ -186,6 +187,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
- 	-DSBINDIR=\"$(SBINDIR)\" \
- 	-DBINDIR=\"$(BINDIR)\" \
- 	-DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
-+	-DSWATDIR=\"$(SWATDIR)\" \
- 	-DLOCKDIR=\"$(LOCKDIR)\" \
- 	-DPIDDIR=\"$(PIDDIR)\" \
- 	-DLIBDIR=\"$(LIBDIR)\" \
-@@ -211,7 +213,7 @@ TDBS_DEPS=$(TDB_DEPS) $(NTDB_DEPS)
- 
- # Note that all executable programs now provide for an optional executable suffix.
- 
--SBIN_PROGS = bin/smbd bin/nmbd @EXTRA_SBIN_PROGS@
-+SBIN_PROGS = bin/smbd bin/nmbd @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
- 
- BIN_PROGS1 = bin/smbclient bin/net bin/smbspool \
- 	bin/testparm bin/smbstatus bin/smbget \
-@@ -1059,6 +1061,10 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-            $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
- 	   $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
- 
-+SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
-+           web/swat.o web/neg_lang.o
-+
-+SWAT_OBJ = $(SWAT_OBJ1) $(SMBD_OBJ_BASE) $(PASSCHANGE_OBJ)
- 
- STATUS_OBJ = utils/status.o utils/status_profile.o $(SMBD_OBJ_BASE)
- 
-@@ -1875,6 +1881,14 @@ bin/nmbd: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(L
- 		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(ZLIB_LIBS)
- 
-+bin/swat: $(BINARY_PREREQS) $(SWAT_OBJ) $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT) @BUILD_POPT@
-+	@echo Linking $@
-+	@$(CC) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
-+		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-+		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
-+		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDBS_LIBS) \
-+		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-+
- bin/rpcclient: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDBS) $(LIBWBCLIENT)
- 	@echo Linking $@
- 	@$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
-@@ -3060,7 +3074,7 @@ bin/split_tokens: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC
- 		$(LIBTALLOC_LIBS) $(LIBTDBS_LIBS)
- 
- install:: installservers installbin installman \
--		installscripts installdat installmodules \
-+		installscripts installdat installmodules @SWAT_INSTALL_TARGETS@ \
- 		@INSTALL_PAM_MODULES@ installlibs installmo
- 
- install-everything:: install installmodules
-@@ -3110,6 +3124,12 @@ installscripts:: installdirs
- installdat:: installdirs
- 	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
- 
-+installmsg:: installdirs
-+	@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
-+
-+installswat:: installdirs installmsg
-+	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-+
- installpammodules:: $(PAM_MODULES)
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR)
- 	@for module in $(PAM_MODULES); do \
-@@ -3152,6 +3172,7 @@ showlayout::
- 	@echo " INCLUDEDIR:            $(INCLUDEDIR)"
- 	@echo " SETUPDIR:              $(SETUPDIR)"
- #	@echo " PKGCONFIGDIR:          $(PKGCONFIGDIR)"
-+	@echo " SWATDIR:               $(SWATDIR)"
- 	@echo " CODEPAGEDIR:           $(CODEPAGEDIR)"
- 	@echo " PAMMODULESDIR:         $(PAMMODULESDIR)"
- 	@echo " CONFIGDIR:             $(CONFIGDIR)"
-@@ -3173,7 +3194,7 @@ showlayout::
- 	@echo " SMB_PASSWD_FILE:       $(SMB_PASSWD_FILE)"
- 
- 
--uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
-+uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@
- 
- uninstallmo::
- 	@$(SHELL) $(srcdir)/script/uninstallmo.sh $(DESTDIR) $(LOCALEDIR) $(srcdir)
-@@ -3201,6 +3222,12 @@ uninstallscripts::
- uninstalldat::
- 	@$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
- 
-+uninstallmsg::
-+	@$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
-+
-+uninstallswat:: uninstallmsg
-+	@$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-+
- uninstallpammodules::
- 	@for module in $(PAM_MODULES); do \
- 		echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \
-diff --git a/source3/configure.in b/source3/configure.in
-index 822c5f4..8fef7b1 100644
---- a/source3/configure.in
-+++ b/source3/configure.in
-@@ -128,6 +128,8 @@ m4_include(../lib/socket_wrapper/config.m4)
- m4_include(../lib/nss_wrapper/config.m4)
- m4_include(../lib/uid_wrapper/config.m4)
- 
-+m4_include(m4/swat.m4)
-+
- DEVELOPER_CFLAGS="-DDEBUG_PASSWORD -DDEVELOPER"
- 
- # Probe the gcc version for extra CFLAGS. We always stash these in
-diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
-index e8eca57..bd5ca85 100644
---- a/source3/lib/popt_common.c
-+++ b/source3/lib/popt_common.c
-@@ -203,6 +203,7 @@ struct poptOption popt_common_option[] = {
- /* Handle command line options:
-  *		--sbindir
-  *		--bindir
-+ *		--swatdir
-  *		--lmhostsfile
-  *		--libdir
-  *		--modulesdir
-@@ -218,6 +219,7 @@ struct poptOption popt_common_option[] = {
- enum dyn_item{
- 	DYN_SBINDIR = 1,
- 	DYN_BINDIR,
-+	DYN_SWATDIR,
- 	DYN_LMHOSTSFILE,
- 	DYN_LIBDIR,
- 	DYN_MODULESDIR,
-@@ -250,6 +252,12 @@ static void popt_dynconfig_callback(poptContext con,
- 		}
- 		break;
- 
-+	case DYN_SWATDIR:
-+		if (arg) {
-+			set_dyn_SWATDIR(arg);
-+		}
-+		break;
-+
- 	case DYN_LMHOSTSFILE:
- 		if (arg) {
- 			set_dyn_LMHOSTSFILE(arg);
-@@ -321,6 +329,8 @@ const struct poptOption popt_common_dynconfig[] = {
- 	    "Path to sbin directory", "SBINDIR" },
- 	{ "bindir", '\0' , POPT_ARG_STRING, NULL, DYN_BINDIR,
- 	    "Path to bin directory", "BINDIR" },
-+	{ "swatdir", '\0' , POPT_ARG_STRING, NULL, DYN_SWATDIR,
-+	    "Path to SWAT installation directory", "SWATDIR" },
- 	{ "lmhostsfile", '\0' , POPT_ARG_STRING, NULL, DYN_LMHOSTSFILE,
- 	    "Path to lmhosts file", "LMHOSTSFILE" },
- 	{ "libdir", '\0' , POPT_ARG_STRING, NULL, DYN_LIBDIR,
-diff --git a/source3/m4/swat.m4 b/source3/m4/swat.m4
-new file mode 100644
-index 0000000..cfff8fb
---- /dev/null
-+++ b/source3/m4/swat.m4
-@@ -0,0 +1,27 @@
-+dnl
-+dnl Samba3 build environment SWAT configuration
-+dnl
-+dnl Copyright (C) Michael Adam 2008
-+dnl
-+dnl Released under the GNU General Public License
-+dnl http://www.gnu.org/licenses/
-+dnl
-+
-+
-+SWAT_SBIN_TARGETS='bin/swat'
-+SWAT_INSTALL_TARGETS=installswat
-+
-+AC_ARG_ENABLE(swat,
-+[AS_HELP_STRING([--enable-swat], [Build the SWAT tool (default=yes)])],
-+[
-+    case "$enable_swat" in
-+	no)
-+	    SWAT_SBIN_TARGETS=''
-+	    SWAT_INSTALL_TARGETS=''
-+	    ;;
-+    esac
-+])
-+
-+AC_SUBST(SWAT_SBIN_TARGETS)
-+AC_SUBST(SWAT_INSTALL_TARGETS)
-+
-diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
-index bed39a4..ac36413 100644
---- a/source3/param/loadparm.c
-+++ b/source3/param/loadparm.c
-@@ -4009,7 +4009,7 @@ void lp_killservice(int iServiceIn)
- 
- /***************************************************************************
-  Save the curent values of all global and sDefault parameters into the 
-- defaults union. This allows testparm to show only the
-+ defaults union. This allows swat and testparm to show only the
-  changed (ie. non-default) parameters.
- ***************************************************************************/
- 
-diff --git a/source3/po/de.msg b/source3/po/de.msg
-new file mode 100644
-index 0000000..31baaf7
---- /dev/null
-+++ b/source3/po/de.msg
-@@ -0,0 +1,616 @@
-+# German messages for international release of SWAT.
-+# Copyright (C) 2001 Andreas Moroder
-+# Copyright (C) 2007 Helge Kreutzmann, <debian@helgefjell.de>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: swat\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-04 18:15+0200\n"
-+"PO-Revision-Date: 2007-06-10 11:52+0200\n"
-+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#: ../web/swat.c:139
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr "FEHLER: Kann %s nicht öffnen"
-+
-+#: ../web/swat.c:223
-+msgid "Help"
-+msgstr "Hilfe"
-+
-+#: ../web/swat.c:229 ../web/swat.c:254 ../web/swat.c:275 ../web/swat.c:285
-+#: ../web/swat.c:294 ../web/swat.c:303 ../web/swat.c:309 ../web/swat.c:315
-+#: ../web/swat.c:328
-+msgid "Set Default"
-+msgstr "Standardwert setzen"
-+
-+#: ../web/swat.c:450
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr "konnte %s nicht zum Schreiben öffnen"
-+
-+#: ../web/swat.c:473
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr "Kann %s nicht erneut laden"
-+
-+#: ../web/swat.c:543
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Verbunden als <b>%s</b>"
-+
-+#: ../web/swat.c:547
-+msgid "Home"
-+msgstr "Home"
-+
-+#: ../web/swat.c:549
-+msgid "Globals"
-+msgstr "Globals"
-+
-+#: ../web/swat.c:550
-+msgid "Shares"
-+msgstr "Freigaben"
-+
-+#: ../web/swat.c:551
-+msgid "Printers"
-+msgstr "Drucker"
-+
-+#: ../web/swat.c:552
-+msgid "Wizard"
-+msgstr "Assistent"
-+
-+#: ../web/swat.c:556
-+msgid "Status"
-+msgstr "Status"
-+
-+#: ../web/swat.c:557
-+msgid "View Config"
-+msgstr "Zeige Konfiguration"
-+
-+#: ../web/swat.c:559
-+msgid "Password Management"
-+msgstr "Passwortverwaltung"
-+
-+#: ../web/swat.c:569
-+msgid "Current View Is"
-+msgstr "Aktuelle Ansicht lautet"
-+
-+#: ../web/swat.c:570 ../web/swat.c:573
-+msgid "Basic"
-+msgstr "Einfache Ansicht"
-+
-+#: ../web/swat.c:571 ../web/swat.c:574
-+msgid "Advanced"
-+msgstr "Erweiterte Ansicht"
-+
-+#: ../web/swat.c:572
-+msgid "Change View To"
-+msgstr "Ansicht ändern in"
-+
-+#: ../web/swat.c:601
-+msgid "Current Config"
-+msgstr "Aktuelle Konfiguration"
-+
-+#: ../web/swat.c:605
-+msgid "Normal View"
-+msgstr "Normale Ansicht"
-+
-+#: ../web/swat.c:607
-+msgid "Full View"
-+msgstr "Komplette Ansicht"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:626
-+msgid "Wizard Parameter Edit Page"
-+msgstr "Bearbeitungsseite der Assistenten-Parameter"
-+
-+#: ../web/swat.c:655
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr "Hinweis: smb.conf wurde gelesen und überschrieben"
-+
-+#. Here we go ...
-+#: ../web/swat.c:763
-+msgid "Samba Configuration Wizard"
-+msgstr "Samba-Konfigurationsassistent"
-+
-+#: ../web/swat.c:767
-+msgid ""
-+"The \"Rewrite smb.conf file\" button will clear the smb.conf file of all "
-+"default values and of comments."
-+msgstr ""
-+"Der Knopf »Schreibe smb.conf neu« wird alle Kommentare und Standardwerte "
-+"aus der smb.conf löschen."
-+
-+#: ../web/swat.c:768
-+msgid "The same will happen if you press the commit button."
-+msgstr "Das gleiche passiert beim Knopf »übernehmen«."
-+
-+#: ../web/swat.c:771
-+msgid "Rewrite smb.conf file"
-+msgstr "Schreibe smb.conf neu"
-+
-+#: ../web/swat.c:772
-+msgid "Commit"
-+msgstr "Übernehmen"
-+
-+#: ../web/swat.c:773
-+msgid "Edit Parameter Values"
-+msgstr "Bearbeite Parameterwerte"
-+
-+#: ../web/swat.c:779
-+msgid "Server Type"
-+msgstr "Server-Typ"
-+
-+#: ../web/swat.c:780
-+msgid "Stand Alone"
-+msgstr "Einzelserver"
-+
-+#: ../web/swat.c:781
-+msgid "Domain Member"
-+msgstr "Domänenmitglied"
-+
-+#: ../web/swat.c:782
-+msgid "Domain Controller"
-+msgstr "Domänencontroller"
-+
-+#: ../web/swat.c:785
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr ""
-+"Ungewöhnlicher Typ in der smb.conf - Bitte wählen Sie einen neuen Modus"
-+
-+#: ../web/swat.c:787
-+msgid "Configure WINS As"
-+msgstr "Konfiguriere WINS als"
-+
-+#: ../web/swat.c:788
-+msgid "Not Used"
-+msgstr "Nicht benutzt"
-+
-+#: ../web/swat.c:789
-+msgid "Server for client use"
-+msgstr "Server für Client-Verwendung"
-+
-+#: ../web/swat.c:790
-+msgid "Client of another WINS server"
-+msgstr "Client eines anderen WINS-Servers"
-+
-+#: ../web/swat.c:792
-+msgid "Remote WINS Server"
-+msgstr "Entfernter WINS-Server:"
-+
-+#: ../web/swat.c:803
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr ""
-+"Fehler: Sowohl WINS-Server-Modus als auch WINS-Unterstützung in smb.conf "
-+"aktiviert"
-+
-+#: ../web/swat.c:804
-+msgid "Please Select desired WINS mode above."
-+msgstr "Bitte wählen Sie den gewünschten WINS-Modus oben aus."
-+
-+#: ../web/swat.c:806
-+msgid "Expose Home Directories"
-+msgstr "Home-Verzeichnisse freigeben"
-+
-+#: ../web/swat.c:821
-+msgid ""
-+"The above configuration options will set multiple parameters and will "
-+"generally assist with rapid Samba deployment."
-+msgstr ""
-+"Die obigen Konfigurationsoptionen bearbeiten mehrere Parameter und dienen als "
-+"Hilfe zur schnellen Samba-Einrichtung."
-+
-+#: ../web/swat.c:834
-+msgid "Global Parameters"
-+msgstr "Globale Parameter"
-+
-+#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
-+msgid "Commit Changes"
-+msgstr "Änderungen speichern"
-+
-+#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
-+msgid "Reset Values"
-+msgstr "Werte zurücksetzen"
-+
-+#: ../web/swat.c:891
-+msgid "Share Parameters"
-+msgstr "Parameter der Freigabe"
-+
-+#: ../web/swat.c:934
-+msgid "Choose Share"
-+msgstr "Wähle Freigabe"
-+
-+#: ../web/swat.c:951
-+msgid "Delete Share"
-+msgstr "Lösche Freigabe"
-+
-+#: ../web/swat.c:958
-+msgid "Create Share"
-+msgstr "Erstelle Freigabe"
-+
-+#: ../web/swat.c:994
-+msgid "password change in demo mode rejected"
-+msgstr "Änderung des Passworts im Demo-Modus nicht möglich"
-+
-+#: ../web/swat.c:1007
-+msgid "Can't setup password database vectors."
-+msgstr "Kann Passwort-Datenbankvektoren nicht einrichten"
-+
-+#: ../web/swat.c:1033
-+msgid " Must specify \"User Name\" "
-+msgstr " »Benutzername« muss angegeben werden "
-+
-+#: ../web/swat.c:1049
-+msgid " Must specify \"Old Password\" "
-+msgstr " »Altes Passwort« muss angegeben werden "
-+
-+#: ../web/swat.c:1055
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " »Entfernter Server« muss angegeben werden "
-+
-+#: ../web/swat.c:1062
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr " »Neues/wiederholtes Passwort« muss angegeben werden "
-+
-+#: ../web/swat.c:1068
-+msgid " Re-typed password didn't match new password "
-+msgstr " Das wiederholte Passwort stimmt nicht mit dem neuen Passwort überein"
-+
-+#: ../web/swat.c:1101
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " Das Passwort für '%s' wurde geändert."
-+
-+#: ../web/swat.c:1104
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " Das Passwort für '%s' wurde NICHT geändert."
-+
-+#: ../web/swat.c:1129
-+msgid "Server Password Management"
-+msgstr "Verwaltung des Server-Passwortes"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1138 ../web/swat.c:1185
-+msgid "User Name"
-+msgstr "Benutzername"
-+
-+#: ../web/swat.c:1141 ../web/swat.c:1187
-+msgid "Old Password"
-+msgstr "Altes Passwort"
-+
-+#: ../web/swat.c:1144 ../web/swat.c:1189
-+msgid "New Password"
-+msgstr "Neues Passwort"
-+
-+#: ../web/swat.c:1146 ../web/swat.c:1191
-+msgid "Re-type New Password"
-+msgstr "Wiederhole neues Passwort"
-+
-+#: ../web/swat.c:1154 ../web/swat.c:1202
-+msgid "Change Password"
-+msgstr "Ändere Passwort"
-+
-+#: ../web/swat.c:1157
-+msgid "Add New User"
-+msgstr "Füge neuen Benutzer hinzu"
-+
-+#: ../web/swat.c:1159
-+msgid "Delete User"
-+msgstr "Lösche Benutzer"
-+
-+#: ../web/swat.c:1161
-+msgid "Disable User"
-+msgstr "Deaktiviere Benutzer"
-+
-+#: ../web/swat.c:1163
-+msgid "Enable User"
-+msgstr "Aktiviere Benutzer"
-+
-+#: ../web/swat.c:1176
-+msgid "Client/Server Password Management"
-+msgstr "Client/Server Passwort-Verwaltung"
-+
-+#: ../web/swat.c:1193
-+msgid "Remote Machine"
-+msgstr "Entfernte Maschine"
-+
-+#: ../web/swat.c:1232
-+msgid "Printer Parameters"
-+msgstr "Drucker-Parameter"
-+
-+#: ../web/swat.c:1234
-+msgid "Important Note:"
-+msgstr "Wichtiger Hinweis:"
-+
-+#: ../web/swat.c:1235
-+#, c-format
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Mit [*] gekennzeichnete Drucker in der »Wähle Drucker«-Auswahlliste "
-+
-+#: ../web/swat.c:1236
-+#, c-format
-+msgid "are autoloaded printers from "
-+msgstr "sind automatisch geladene Drucker aus "
-+
-+#: ../web/swat.c:1237
-+msgid "Printcap Name"
-+msgstr "Printcap-Name"
-+
-+#: ../web/swat.c:1238
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr ""
-+"Der Versuch, diese Drucker von SWAT aus zu löschen, wird keine Auswirkung "
-+"haben."
-+
-+#: ../web/swat.c:1284
-+msgid "Choose Printer"
-+msgstr "Wähle Drucker"
-+
-+#: ../web/swat.c:1303
-+msgid "Delete Printer"
-+msgstr "Lösche Drucker"
-+
-+#: ../web/swat.c:1310
-+msgid "Create Printer"
-+msgstr "Erstelle Drucker"
-+
-+#: ../web/statuspage.c:139
-+msgid "RDWR       "
-+msgstr "LESE/SCHREIBE "
-+
-+#: ../web/statuspage.c:141
-+msgid "WRONLY     "
-+msgstr "NUR SCHREIBE  "
-+
-+#: ../web/statuspage.c:143
-+msgid "RDONLY     "
-+msgstr "NUR LESE      "
-+
-+#: ../web/statuspage.c:330
-+msgid "Server Status"
-+msgstr "Server-Status"
-+
-+#: ../web/statuspage.c:335
-+msgid "Auto Refresh"
-+msgstr "Automatische Aktualisierung"
-+
-+#: ../web/statuspage.c:336 ../web/statuspage.c:341
-+msgid "Refresh Interval: "
-+msgstr "Aktualisierungsintervall: "
-+
-+#: ../web/statuspage.c:340
-+msgid "Stop Refreshing"
-+msgstr "Stoppe Aktualisierung"
-+
-+#: ../web/statuspage.c:355
-+msgid "version:"
-+msgstr "Version:"
-+
-+#: ../web/statuspage.c:358
-+msgid "smbd:"
-+msgstr "smbd:"
-+
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-+msgid "running"
-+msgstr "aktiv"
-+
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-+msgid "not running"
-+msgstr "inaktiv"
-+
-+#: ../web/statuspage.c:362
-+msgid "Stop smbd"
-+msgstr "Stoppe smbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "Start smbd"
-+msgstr "Starte smbd"
-+
-+#: ../web/statuspage.c:366
-+msgid "Restart smbd"
-+msgstr "Starte smbd neu"
-+
-+#: ../web/statuspage.c:371
-+msgid "nmbd:"
-+msgstr "nmbd:"
-+
-+#: ../web/statuspage.c:375
-+msgid "Stop nmbd"
-+msgstr "Stoppe nmbd"
-+
-+#: ../web/statuspage.c:377
-+msgid "Start nmbd"
-+msgstr "Starte nmbd"
-+
-+#: ../web/statuspage.c:379
-+msgid "Restart nmbd"
-+msgstr "Starte nmbd neu"
-+
-+#: ../web/statuspage.c:385
-+msgid "winbindd:"
-+msgstr "winbindd:"
-+
-+#: ../web/statuspage.c:389
-+msgid "Stop winbindd"
-+msgstr "Stoppe winbindd"
-+
-+#: ../web/statuspage.c:391
-+msgid "Start winbindd"
-+msgstr "Starte winbindd"
-+
-+#: ../web/statuspage.c:393
-+msgid "Restart winbindd"
-+msgstr "Starte winbindd neu"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:402
-+msgid "Stop All"
-+msgstr "Alle Stoppen"
-+
-+#: ../web/statuspage.c:403
-+msgid "Restart All"
-+msgstr "Alle neu starten"
-+
-+#. start all
-+#: ../web/statuspage.c:407
-+msgid "Start All"
-+msgstr "Alle starten"
-+
-+#: ../web/statuspage.c:414
-+msgid "Active Connections"
-+msgstr "Aktive Verbindungen"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-+msgid "PID"
-+msgstr "PID"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429
-+msgid "Client"
-+msgstr "Client"
-+
-+#: ../web/statuspage.c:416
-+msgid "IP address"
-+msgstr "IP-Adresse"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-+msgid "Date"
-+msgstr "Datum"
-+
-+#: ../web/statuspage.c:418
-+msgid "Kill"
-+msgstr "Töten"
-+
-+#: ../web/statuspage.c:426
-+msgid "Active Shares"
-+msgstr "Aktive Freigaben"
-+
-+#: ../web/statuspage.c:429
-+msgid "Share"
-+msgstr "Freigabe"
-+
-+#: ../web/statuspage.c:429
-+msgid "User"
-+msgstr "Benutzer"
-+
-+#: ../web/statuspage.c:429
-+msgid "Group"
-+msgstr "Gruppe"
-+
-+#: ../web/statuspage.c:435
-+msgid "Open Files"
-+msgstr "Offene Dateien"
-+
-+#: ../web/statuspage.c:437
-+msgid "Sharing"
-+msgstr "Freigeben"
-+
-+#: ../web/statuspage.c:437
-+msgid "R/W"
-+msgstr "Lese/Schreibe"
-+
-+#: ../web/statuspage.c:437
-+msgid "Oplock"
-+msgstr "Opportunistische Sperre (Lock)"
-+
-+#: ../web/statuspage.c:437
-+msgid "File"
-+msgstr "Datei"
-+
-+#: ../web/statuspage.c:446
-+msgid "Show Client in col 1"
-+msgstr "Zeige Client in Spalte 1"
-+
-+#: ../web/statuspage.c:447
-+msgid "Show PID in col 1"
-+msgstr "Zeige PID in Spalte 1"
-+
-+#: ../param/loadparm.c:836
-+msgid "Base Options"
-+msgstr "Basisoptionen"
-+
-+#: ../param/loadparm.c:855
-+msgid "Security Options"
-+msgstr "Sicherheitsoptionen"
-+
-+#: ../param/loadparm.c:945
-+msgid "Logging Options"
-+msgstr "Protokollier-Optionen"
-+
-+#: ../param/loadparm.c:962
-+msgid "Protocol Options"
-+msgstr "Protokoll-Optionen"
-+
-+#: ../param/loadparm.c:1008
-+msgid "Tuning Options"
-+msgstr "Optimierungsoptionen"
-+
-+#: ../param/loadparm.c:1037
-+msgid "Printing Options"
-+msgstr "Druckoptionen"
-+
-+#: ../param/loadparm.c:1075
-+msgid "Filename Handling"
-+msgstr "Dateinamen-Verwaltung"
-+
-+#: ../param/loadparm.c:1105
-+msgid "Domain Options"
-+msgstr "Domänen-Optionen"
-+
-+#: ../param/loadparm.c:1109
-+msgid "Logon Options"
-+msgstr "Anmelde-Optionen"
-+
-+#: ../param/loadparm.c:1130
-+msgid "Browse Options"
-+msgstr "Browsing-Optionen"
-+
-+#: ../param/loadparm.c:1144
-+msgid "WINS Options"
-+msgstr "WINS-Optionen"
-+
-+#: ../param/loadparm.c:1153
-+msgid "Locking Options"
-+msgstr "Locking-(Sperr-)Optionen"
-+
-+#: ../param/loadparm.c:1170
-+msgid "Ldap Options"
-+msgstr "LDAP-Optionen"
-+
-+#: ../param/loadparm.c:1186
-+msgid "Miscellaneous Options"
-+msgstr "Sonstige Optionen"
-+
-+#: ../param/loadparm.c:1191
-+#| msgid "Logon Options"
-+msgid "EventLog Options"
-+msgstr "EventLog-Optionen"
-+
-+#: ../param/loadparm.c:1258
-+msgid "VFS module options"
-+msgstr "VFS-Modul-Optionen"
-+
-+#: ../param/loadparm.c:1268
-+msgid "Winbind options"
-+msgstr "Winbind-Optionen"
-diff --git a/source3/po/en.msg b/source3/po/en.msg
-new file mode 100644
-index 0000000..01e6b69
---- /dev/null
-+++ b/source3/po/en.msg
-@@ -0,0 +1,592 @@
-+# English messages for international release of SWAT.
-+# Copyright (C) 2003 TAKAHASHI Motonobu <monyo@samba.org>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2000-02-08 12:48+09:00\n"
-+"Last-Translator: TAKAHASHI Motonobu <monyo@samba.org>\n"
-+"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: \n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr ""
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr ""
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr ""
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr ""
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr ""
-+
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr ""
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr ""
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr ""
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr ""
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr ""
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr ""
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr ""
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr ""
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr ""
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr ""
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr ""
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr ""
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr ""
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr ""
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr ""
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr ""
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr ""
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr ""
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr ""
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr ""
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr ""
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr ""
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr ""
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr ""
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr ""
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr ""
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr ""
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr ""
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr ""
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr ""
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr ""
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr ""
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr ""
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr ""
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr ""
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr ""
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr ""
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr ""
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr ""
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr ""
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr ""
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr ""
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr ""
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr ""
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr ""
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr ""
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr ""
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr ""
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr ""
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr ""
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr ""
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr ""
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr ""
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr ""
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr ""
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr ""
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr ""
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr ""
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr ""
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr ""
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr ""
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr ""
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr ""
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr ""
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr ""
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr ""
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr ""
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr ""
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr ""
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr ""
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr ""
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr ""
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr ""
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr ""
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr ""
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr ""
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr ""
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr ""
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr ""
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr ""
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr ""
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr ""
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr ""
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr ""
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr ""
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr ""
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr ""
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr ""
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr ""
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr ""
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr ""
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr ""
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr ""
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr ""
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr ""
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr ""
-diff --git a/source3/po/fi.msg b/source3/po/fi.msg
-new file mode 100644
-index 0000000..e039311
---- /dev/null
-+++ b/source3/po/fi.msg
-@@ -0,0 +1,610 @@
-+# Finnish messages for international release of SWAT.
-+# Copyright (C) 2007 Lauri Nurmi <lanurmi@iki.fi>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-01-02 01:56+0200\n"
-+"PO-Revision-Date: 2007-01-12 18:56+0200\n"
-+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
-+"Language-Team: Finnish <laatu@lokalisointi.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: \n"
-+
-+#: ../web/swat.c:139
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr "VIRHE: Avaaminen ei onnistu — %s"
-+
-+#: ../web/swat.c:223
-+msgid "Help"
-+msgstr "Ohje"
-+
-+#: ../web/swat.c:229 ../web/swat.c:254 ../web/swat.c:275 ../web/swat.c:285 ../web/swat.c:294 ../web/swat.c:303 ../web/swat.c:309 ../web/swat.c:315 ../web/swat.c:328
-+msgid "Set Default"
-+msgstr "Oletusarvo"
-+
-+#: ../web/swat.c:450
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr "avaaminen kirjoitustilassa ei onnistu — %s"
-+
-+#: ../web/swat.c:473
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr "Uudelleen lataaminen ei onnistu — %s"
-+
-+#: ../web/swat.c:543
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Sisäänkirjautuminen käyttäjänä <b>%s</b>"
-+
-+#: ../web/swat.c:547
-+msgid "Home"
-+msgstr "Koti"
-+
-+#: ../web/swat.c:549
-+msgid "Globals"
-+msgstr "Yleiset"
-+
-+#: ../web/swat.c:550
-+msgid "Shares"
-+msgstr "Jaot"
-+
-+#: ../web/swat.c:551
-+msgid "Printers"
-+msgstr "Tulostimet"
-+
-+#: ../web/swat.c:552
-+msgid "Wizard"
-+msgstr "Ohjatut asetukset"
-+
-+#: ../web/swat.c:556
-+msgid "Status"
-+msgstr "Tila"
-+
-+#: ../web/swat.c:557
-+msgid "View Config"
-+msgstr "Näytä asetukset"
-+
-+#: ../web/swat.c:559
-+msgid "Password Management"
-+msgstr "Salasanojen hallinta"
-+
-+#: ../web/swat.c:569
-+msgid "Current View Is"
-+msgstr "Näkymä nyt"
-+
-+#: ../web/swat.c:570 ../web/swat.c:573
-+msgid "Basic"
-+msgstr "Tavallinen"
-+
-+#: ../web/swat.c:571 ../web/swat.c:574
-+msgid "Advanced"
-+msgstr "Laajennettu"
-+
-+#: ../web/swat.c:572
-+msgid "Change View To"
-+msgstr "Vaihda näkymäksi"
-+
-+#: ../web/swat.c:601
-+msgid "Current Config"
-+msgstr "Nykyiset asetukset"
-+
-+#: ../web/swat.c:605
-+msgid "Normal View"
-+msgstr "Normaali näkymä"
-+
-+#: ../web/swat.c:607
-+msgid "Full View"
-+msgstr "Täysi näkymä"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:626
-+msgid "Wizard Parameter Edit Page"
-+msgstr "Ohjattujen asetusten muokkaussivu"
-+
-+#: ../web/swat.c:655
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr "Huom: smb.conf-tiedosto on luettu ja kirjoitettu uudelleen"
-+
-+#. Here we go ...
-+#: ../web/swat.c:763
-+msgid "Samba Configuration Wizard"
-+msgstr "Samban ohjatut asetukset"
-+
-+#: ../web/swat.c:767
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr "”Kirjoita uudelleen smb.conf-tiedosto”-painike tyhjentää oletusarvot ja kommentit smb.conf-tiedostosta."
-+
-+#: ../web/swat.c:768
-+msgid "The same will happen if you press the commit button."
-+msgstr "Samoin tapahtuu ”Tallenna”-painiketta painettaessa."
-+
-+#: ../web/swat.c:771
-+msgid "Rewrite smb.conf file"
-+msgstr "Kirjoita uudelleen smb.conf-tiedosto"
-+
-+#: ../web/swat.c:772
-+msgid "Commit"
-+msgstr "Tallenna"
-+
-+#: ../web/swat.c:773
-+msgid "Edit Parameter Values"
-+msgstr "Muokkaa asetusten arvoja"
-+
-+#: ../web/swat.c:779
-+msgid "Server Type"
-+msgstr "Palvelimen tyyppi"
-+
-+#: ../web/swat.c:780
-+msgid "Stand Alone"
-+msgstr "Itsenäinen"
-+
-+# lähde: Microsoftin käännökset
-+#: ../web/swat.c:781
-+msgid "Domain Member"
-+msgstr "Toimialuejäsen"
-+
-+# lähde: Microsoftin käännökset
-+#: ../web/swat.c:782
-+msgid "Domain Controller"
-+msgstr "Toimialueen ohjauskone"
-+
-+#: ../web/swat.c:785
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr "Epätavallinen tyyppi smb.confissa — Valitse uusi tila"
-+
-+#: ../web/swat.c:787
-+msgid "Configure WINS As"
-+msgstr "WINS"
-+
-+#: ../web/swat.c:788
-+msgid "Not Used"
-+msgstr "Ei käytössä"
-+
-+#: ../web/swat.c:789
-+msgid "Server for client use"
-+msgstr "Palvelimena"
-+
-+#: ../web/swat.c:790
-+msgid "Client of another WINS server"
-+msgstr "Käyttää WINS-etäpalvelinta"
-+
-+#: ../web/swat.c:792
-+msgid "Remote WINS Server"
-+msgstr "WINS-etäpalvelin"
-+
-+#: ../web/swat.c:803
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr "Virhe: Sekä WINS-palvelintila että WINS-tuki asetettu smb.confissa"
-+
-+#: ../web/swat.c:804
-+msgid "Please Select desired WINS mode above."
-+msgstr "Valitse haluttu WINSin tila yltä."
-+
-+#: ../web/swat.c:806
-+msgid "Expose Home Directories"
-+msgstr "Jaa kotihakemistot"
-+
-+#: ../web/swat.c:821
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr "Yllä olevat valinnat asettavat useita asetuksia, ja auttavat Samban nopeassa käyttöönotossa."
-+
-+#: ../web/swat.c:834
-+msgid "Global Parameters"
-+msgstr "Yleisasetukset"
-+
-+#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
-+msgid "Commit Changes"
-+msgstr "Tallenna muutokset"
-+
-+#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
-+msgid "Reset Values"
-+msgstr "Kumoa muutokset"
-+
-+#: ../web/swat.c:891
-+msgid "Share Parameters"
-+msgstr "Jakoasetukset"
-+
-+#: ../web/swat.c:934
-+msgid "Choose Share"
-+msgstr "Valitse jako"
-+
-+#: ../web/swat.c:951
-+msgid "Delete Share"
-+msgstr "Poista jako"
-+
-+#: ../web/swat.c:958
-+msgid "Create Share"
-+msgstr "Luo jako"
-+
-+#: ../web/swat.c:994
-+msgid "password change in demo mode rejected"
-+msgstr "salasanan muutos estetty esittelytilassa"
-+
-+#: ../web/swat.c:1007
-+msgid "Can't setup password database vectors."
-+msgstr "Salasanatietokannan alustus epäonnistui."
-+
-+#: ../web/swat.c:1033
-+msgid " Must specify \"User Name\" "
-+msgstr " Käyttäjätunnus on annettava "
-+
-+#: ../web/swat.c:1049
-+msgid " Must specify \"Old Password\" "
-+msgstr " Vanha salasana on annettava "
-+
-+#: ../web/swat.c:1055
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " Etäkone on annettava "
-+
-+#: ../web/swat.c:1062
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr " Uusi salasana on kirjoitettava kahdesti "
-+
-+#: ../web/swat.c:1068
-+msgid " Re-typed password didn't match new password "
-+msgstr " Salasanat eivät täsmää "
-+
-+#: ../web/swat.c:1101
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " Käyttäjän ”%s” salasana vaihdettu."
-+
-+#: ../web/swat.c:1104
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " Käyttäjän ”%s” salasanaa EI vaihdettu."
-+
-+#: ../web/swat.c:1129
-+msgid "Server Password Management"
-+msgstr "Palvelimen salasanojen hallinta"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1138 ../web/swat.c:1185
-+msgid "User Name"
-+msgstr "Käyttäjätunnus"
-+
-+#: ../web/swat.c:1141 ../web/swat.c:1187
-+msgid "Old Password"
-+msgstr "Vanha salasana"
-+
-+#: ../web/swat.c:1144 ../web/swat.c:1189
-+msgid "New Password"
-+msgstr "Uusi salasana"
-+
-+#: ../web/swat.c:1146 ../web/swat.c:1191
-+msgid "Re-type New Password"
-+msgstr "Uusi salasana uudelleen"
-+
-+#: ../web/swat.c:1154 ../web/swat.c:1202
-+msgid "Change Password"
-+msgstr "Vaihda salasana"
-+
-+#: ../web/swat.c:1157
-+msgid "Add New User"
-+msgstr "Lisää uusi käyttäjä"
-+
-+#: ../web/swat.c:1159
-+msgid "Delete User"
-+msgstr "Poista käyttäjä"
-+
-+# Joku suomenkielisempi olisi ehkä parempi.
-+#: ../web/swat.c:1161
-+msgid "Disable User"
-+msgstr "Passivoi käyttäjä"
-+
-+# Joku suomenkielisempi olisi ehkä parempi.
-+#: ../web/swat.c:1163
-+msgid "Enable User"
-+msgstr "Aktivoi käyttäjä"
-+
-+# hmm...
-+#: ../web/swat.c:1176
-+msgid "Client/Server Password Management"
-+msgstr "Asiakas-palvelin-salasanojen hallinta"
-+
-+#: ../web/swat.c:1193
-+msgid "Remote Machine"
-+msgstr "Etäkone"
-+
-+#: ../web/swat.c:1232
-+msgid "Printer Parameters"
-+msgstr "Tulostinasetukset"
-+
-+#: ../web/swat.c:1234
-+msgid "Important Note:"
-+msgstr "Tärkeä huomautus:"
-+
-+#: ../web/swat.c:1235
-+#, c-format
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Tähdellä [*] merkityt tulostimien nimet pudotusvalikossa ovat "
-+
-+#: ../web/swat.c:1236
-+#, c-format
-+msgid "are autoloaded printers from "
-+msgstr "automaattisesti ladattuja tulostimia "
-+
-+#: ../web/swat.c:1237
-+msgid "Printcap Name"
-+msgstr "Printcap Name -asetuksen osoittamasta paikasta"
-+
-+#: ../web/swat.c:1238
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "Näiden tulostimien poistaminen ei onnistu SWATin kautta."
-+
-+#: ../web/swat.c:1284
-+msgid "Choose Printer"
-+msgstr "Valitse tulostin"
-+
-+#: ../web/swat.c:1303
-+msgid "Delete Printer"
-+msgstr "Poista tulostin"
-+
-+#: ../web/swat.c:1310
-+msgid "Create Printer"
-+msgstr "Luo tulostin"
-+
-+#: ../web/statuspage.c:139
-+msgid "RDWR       "
-+msgstr "Luku+kirj. "
-+
-+#: ../web/statuspage.c:141
-+msgid "WRONLY     "
-+msgstr "Vain kirj. "
-+
-+#: ../web/statuspage.c:143
-+msgid "RDONLY     "
-+msgstr "Vain luku  "
-+
-+#: ../web/statuspage.c:330
-+msgid "Server Status"
-+msgstr "Palvelimen tila"
-+
-+#: ../web/statuspage.c:335
-+msgid "Auto Refresh"
-+msgstr "Automaattinen päivitys"
-+
-+#: ../web/statuspage.c:336 ../web/statuspage.c:341
-+msgid "Refresh Interval: "
-+msgstr "Päivitysväli: "
-+
-+#: ../web/statuspage.c:340
-+msgid "Stop Refreshing"
-+msgstr "Lopeta päivitys"
-+
-+#: ../web/statuspage.c:355
-+msgid "version:"
-+msgstr "versio:"
-+
-+#: ../web/statuspage.c:358
-+msgid "smbd:"
-+msgstr "smbd:"
-+
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-+msgid "running"
-+msgstr "käynnissä"
-+
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-+msgid "not running"
-+msgstr "pysäytetty"
-+
-+#: ../web/statuspage.c:362
-+msgid "Stop smbd"
-+msgstr "Pysäytä smbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "Start smbd"
-+msgstr "Käynnistä smbd"
-+
-+#: ../web/statuspage.c:366
-+msgid "Restart smbd"
-+msgstr "Käynnistä smbd uudelleen"
-+
-+#: ../web/statuspage.c:371
-+msgid "nmbd:"
-+msgstr "nmbd:"
-+
-+#: ../web/statuspage.c:375
-+msgid "Stop nmbd"
-+msgstr "Pysäytä nmbd"
-+
-+#: ../web/statuspage.c:377
-+msgid "Start nmbd"
-+msgstr "Käynnistä nmbd"
-+
-+#: ../web/statuspage.c:379
-+msgid "Restart nmbd"
-+msgstr "Käynnistä nmbd uudelleen"
-+
-+#: ../web/statuspage.c:385
-+msgid "winbindd:"
-+msgstr "winbindd:"
-+
-+#: ../web/statuspage.c:389
-+msgid "Stop winbindd"
-+msgstr "Pysäytä winbindd"
-+
-+#: ../web/statuspage.c:391
-+msgid "Start winbindd"
-+msgstr "Käynnistä winbindd"
-+
-+#: ../web/statuspage.c:393
-+msgid "Restart winbindd"
-+msgstr "Käynnistä winbindd uudelleen"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:402
-+msgid "Stop All"
-+msgstr "Pysäytä kaikki"
-+
-+#: ../web/statuspage.c:403
-+msgid "Restart All"
-+msgstr "Käynnistä kaikki uudelleen"
-+
-+#. start all
-+#: ../web/statuspage.c:407
-+msgid "Start All"
-+msgstr "Käynnistä kaikki"
-+
-+#: ../web/statuspage.c:414
-+msgid "Active Connections"
-+msgstr "Aktiiviset yhteydet"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-+msgid "PID"
-+msgstr "PID"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429
-+msgid "Client"
-+msgstr "Asiakas"
-+
-+#: ../web/statuspage.c:416
-+msgid "IP address"
-+msgstr "IP-osoite"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-+msgid "Date"
-+msgstr "Aika"
-+
-+#: ../web/statuspage.c:418
-+msgid "Kill"
-+msgstr "Sulje"
-+
-+#: ../web/statuspage.c:426
-+msgid "Active Shares"
-+msgstr "Aktiiviset jaot"
-+
-+#: ../web/statuspage.c:429
-+msgid "Share"
-+msgstr "Jako"
-+
-+#: ../web/statuspage.c:429
-+msgid "User"
-+msgstr "Käyttäjä"
-+
-+#: ../web/statuspage.c:429
-+msgid "Group"
-+msgstr "Ryhmä"
-+
-+#: ../web/statuspage.c:435
-+msgid "Open Files"
-+msgstr "Avoimet tiedostot"
-+
-+# Tämä on ilmeisesti palvelimen puolella vallitseva UID.
-+#: ../web/statuspage.c:437
-+msgid "Sharing"
-+msgstr "Jakaja"
-+
-+#: ../web/statuspage.c:437
-+msgid "R/W"
-+msgstr "Luku/kirj."
-+
-+# Selitys:
-+# "Oplocks is a unique Windows file locking feature. It is not really file 
-+# locking, but is included in most discussions of Windows file locking, so 
-+# is considered a de facto locking feature."
-+# Suomennos: ???
-+#: ../web/statuspage.c:437
-+msgid "Oplock"
-+msgstr "Oplock"
-+
-+#: ../web/statuspage.c:437
-+msgid "File"
-+msgstr "Tiedosto"
-+
-+#: ../web/statuspage.c:446
-+msgid "Show Client in col 1"
-+msgstr "Näytä asiakas 1. sarakkeessa"
-+
-+#: ../web/statuspage.c:447
-+msgid "Show PID in col 1"
-+msgstr "Näytä PID 1. sarakkeessa"
-+
-+#: ../param/loadparm.c:834
-+msgid "Base Options"
-+msgstr "Perusasetukset"
-+
-+#: ../param/loadparm.c:853
-+msgid "Security Options"
-+msgstr "Turvallisuusasetukset"
-+
-+#: ../param/loadparm.c:943
-+msgid "Logging Options"
-+msgstr "Lokiasetukset"
-+
-+#: ../param/loadparm.c:959
-+msgid "Protocol Options"
-+msgstr "Protokolla-asetukset"
-+
-+#: ../param/loadparm.c:1005
-+msgid "Tuning Options"
-+msgstr "Hienosäätöasetukset"
-+
-+#: ../param/loadparm.c:1035
-+msgid "Printing Options"
-+msgstr "Tulostusasetukset"
-+
-+#: ../param/loadparm.c:1072
-+msgid "Filename Handling"
-+msgstr "Tiedostonimien käsittely"
-+
-+#: ../param/loadparm.c:1102
-+msgid "Domain Options"
-+msgstr "Toimialueasetukset"
-+
-+#: ../param/loadparm.c:1106
-+msgid "Logon Options"
-+msgstr "Kirjautumisasetukset"
-+
-+#: ../param/loadparm.c:1127
-+msgid "Browse Options"
-+msgstr "Selausasetukset"
-+
-+#: ../param/loadparm.c:1141
-+msgid "WINS Options"
-+msgstr "WINS-asetukset"
-+
-+#: ../param/loadparm.c:1150
-+msgid "Locking Options"
-+msgstr "Lukitusasetukset"
-+
-+#: ../param/loadparm.c:1168
-+msgid "Ldap Options"
-+msgstr "LDAP-asetukset"
-+
-+#: ../param/loadparm.c:1184
-+msgid "Miscellaneous Options"
-+msgstr "Sekalaiset asetukset"
-+
-+#: ../param/loadparm.c:1189
-+msgid "EventLog Options"
-+msgstr "Tapahtumalokiasetukset"
-+
-+#: ../param/loadparm.c:1257
-+msgid "VFS module options"
-+msgstr "VFS-moduulin asetukset"
-+
-+#: ../param/loadparm.c:1267
-+msgid "Winbind options"
-+msgstr "Winbind-asetukset"
-diff --git a/source3/po/fr.msg b/source3/po/fr.msg
-new file mode 100644
-index 0000000..aac9002
---- /dev/null
-+++ b/source3/po/fr.msg
-@@ -0,0 +1,592 @@
-+# French messages for international release of SWAT.
-+# Copyright (C) 2001 François Le Lay <fanch@tuxfamily.org>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2000-02-08 14:45+0100\n"
-+"Last-Translator: François Le Lay <fanch@tuxfamily.org>\n"
-+"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: \n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr ""
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr "Aide"
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr "Définir par défaut"
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr ""
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr ""
-+
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Connecté en tant que <b>%s</b>"
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr "Home"
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr "Paramètres Généraux"
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr "Partages"
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr "Imprimantes"
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr "Statut"
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr "Voir Configuration"
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr "Gestion des mots de passe"
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr "Configuration Actuelle"
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr "Vue Basique"
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr "Vue Détaillée"
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr "Modifier le mot de passe"
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr "Configuration Actuelle"
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr "Vue Normale"
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr "Vue Complète"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr ""
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr ""
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr ""
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr ""
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr ""
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr "commentaire"
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr "Paramètres Imprimantes"
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr ""
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr ""
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr "master de domaine"
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr "master de domaine"
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr ""
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr ""
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr "ne pas descendre"
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr ""
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr ""
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr ""
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr ""
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr ""
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr ""
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr ""
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr "Variables Globales"
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr "Sauver les modifications"
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr "Réinitialiser Valeurs"
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr "Paramètres de partage"
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr "Choisir un partage"
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr "Supprimer un partage"
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr "Créer un partage"
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr "changement de mot de passe en mode démo rejeté"
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr ""
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr "  Le champ \"Nom d'utilisateur\" doit être spécifié"
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr " Le champ  \"Ancien mot de passe\" doît être spécifié"
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr "  Le champ \"Machine Distante\" doît être spécifié"
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr "Les champs \"Nouveau mot de passe\" et  \"Confirmation du nouveau mot de passe\" doivent être spécifiés \n"
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr " Echec de la confirmation du nouveau mot de passe"
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " Le mot de passe de '%s' a été modifié. "
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " Le mot de passe de '%s' n'a PAS été modifié. \n"
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr "Gestion des mots de passe serveur"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr " Nom d'utilisateur : "
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr " Ancien mot de passe : "
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr " Nouveau mot de passe : "
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr " Confirmation du nouveau mot de passe : "
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr "Modifier le mot de passe"
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr "Nouvel Utilisateur"
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr "Supprimer Utilisateur"
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr "Désactiver Utilisateur"
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr "Activer Utilisateur"
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr "Gestion des mots de passe Client/Serveur"
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr " Machine distante : "
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr "Paramètres Imprimantes"
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr "Note Importante:"
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Les Noms d'imprimantes marqués du signe [*] dans le menu déroulant Choisir Imprimante"
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr "désignent des imprimantes automatiquement chargées depuis le "
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr "Nom Printcap"
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "Essayer de supprimer ces imprimantes depuis SWAT n'aura aucun effet."
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr "Choisir Imprimante"
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr "Supprimer Imprimante"
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr "Créer Imprimante"
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr ""
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr "Statut du Serveur"
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr "Rafraîchissement Automatique"
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr "Intervalle de rafraîchissement: "
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr "Stopper Rafraîchissement"
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr "version:"
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr "actif"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr "non actif"
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr "Stopper smbd"
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr "Lancer smbd"
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr "Relancer smbd"
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr "Stopper nmbd"
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr "Lancer nmbd"
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr "Relancer nmbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr "Stopper nmbd"
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr "Lancer nmbd"
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr "Relancer nmbd"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr ""
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr "Relancer nmbd"
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr "Lancer nmbd"
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr "Connections Actives"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr "adresse IP"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr "Date"
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr "Terminer"
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr "Partages Actifs"
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr "Partager"
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr "Utilisateur"
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr "Groupe"
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr "Fichiers Ouverts"
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr "Fichier"
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr ""
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr ""
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr "Options de base"
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr "Options de Sécurité"
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr "Options de Logging"
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr "Options de Protocole"
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr "Options de réglage"
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr "Options d'impression"
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr "Gestion des noms de fichier"
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr "Options de Domaine"
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr "Options de Logon"
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr "Options de Navigation"
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr "Options WINS"
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr "Options de Verrouillage"
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr "Options Ldap"
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr "Options Diverses"
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr "Options VFS"
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr "Options Winbind"
-diff --git a/source3/po/genmsg b/source3/po/genmsg
-new file mode 100755
-index 0000000..9e9b53b
---- /dev/null
-+++ b/source3/po/genmsg
-@@ -0,0 +1,40 @@
-+#!/bin/sh
-+# Copyright (C) 2003 TAKAHASHI Motonobu <monyo@samba.org>
-+# Copyright (C) 2009 Kai Blin  <kai@samba.org>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+FILES='../web/swat.c ../web/statuspage.c ../param/loadparm.c'
-+LANGS='en ja tr pl fr de it ru'
-+
-+XGETTEXT=xgettext
-+MSGMERGE=msgmerge
-+
-+WIDTH=256
-+
-+$XGETTEXT --default-domain="i18n_swat" \
-+  --add-comments \
-+  --keyword=_ --keyword=N_  \
-+  --width=${WIDTH} \
-+  $FILES
-+
-+for lang in $LANGS; do
-+  printf "%s" "$lang"
-+  mv ${lang}.msg ${lang}.msg.old
-+  $MSGMERGE --width=${WIDTH} ${lang}.msg.old i18n_swat.po -o ${lang}.msg
-+done
-+
-+rm i18n_swat.po
-+
-diff --git a/source3/po/it.msg b/source3/po/it.msg
-new file mode 100644
-index 0000000..90c3ed5
---- /dev/null
-+++ b/source3/po/it.msg
-@@ -0,0 +1,592 @@
-+# Italian messages for international release of SWAT.
-+# Copyright (C) 2001 Simo Sorce <idra@samba.org>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2000-02-08 14:45+0100\n"
-+"Last-Translator: Simo Sorce <idra@samba.org>\n"
-+"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: \n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr ""
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr "Aiuto"
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr "Imposta Default"
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr ""
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr ""
-+
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Connesso come <b>%s</b><p>\n"
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr "Home"
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr "Globali"
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr "Condivisioni"
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr "Stampanti"
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr "Stato"
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr "Visualizza Configurazione"
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr "Gestione Password"
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr "Configurazione Attuale"
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr "Vista Semplice"
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr "Vista Avanzata"
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr "Cambia Password"
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr "Configurazione Attuale"
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr "Vista Normale"
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr "Vista Completa"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr ""
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr ""
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr ""
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr ""
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr ""
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr "commento"
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr "Parametri Stampante"
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr ""
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr ""
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr "master dominio"
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr "master dominio"
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr ""
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr ""
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr "non discendere"
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr ""
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr ""
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr ""
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr ""
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr ""
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr ""
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr ""
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr "Variabili Globali"
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr "Salva Modifiche"
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr "Resetta Valori"
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr "Parametri Condivisioni"
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr "Scegli Condivisione"
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr "Cancella Condivisione"
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr "Crea Condivisione"
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr "cambio password in modalita' demo rigettata"
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr ""
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr " \"Nome Utente\" deve essere specificato "
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr " \"Vecchia Password\" deve essere specificato "
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " \"Macchina Remota\" deve essere specificato "
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr " \"Nuova/Conferma Password\" devono essere specificati "
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr " la password di conferma non e' uguale alla nuova password "
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " La password per '%s' e' stata cambiata."
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " La password per '%s' non e' stata cambianta."
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr "Gestione Password del Server"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr " Nome Utente"
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr " Vecchia Password"
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr " Nuova Password"
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr " Conferma nuova Password"
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr "Cambia Password"
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr "Aggiungi Nuovo Utente"
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr "Cancella Utente"
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr "Disabilita Utente"
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr "Abilita Utente"
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr "Gestione Password Client/Server"
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr " Macchina Remota"
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr "Parametri Stampante"
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr "Nota Importante:"
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "nomi di stampante marcati con [*] nel riquadro a scomparsa Scegli Stampante"
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr "sono stampanti caricate automaticamente da "
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr "Nome Printcap"
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "Il tentativo di cancellare queste stampanti da sWAT non avara' effetto.\n"
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr "Scegli Stampante"
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr "Cancella Stampante"
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr "Crea Stampante"
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr ""
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr "Stato del Server"
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr "Rinfresco Automatico"
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr "Intervallo Rinfresco: "
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr "Ferma Rinfresco"
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr "versione:"
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr "attivo"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr "non attivo"
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr "Ferma smbd"
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr "Lancia smbd"
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr "Rilancia smbd"
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr "Ferma nmbd"
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr "Lancia nmbd"
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr "Rilancia nmbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr "Ferma nmbd"
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr "Lancia nmbd"
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr "Rilancia nmbd"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr ""
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr "Rilancia nmbd"
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr "Lancia nmbd"
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr "Connessioni Attive"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr "indirizzo IP"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr "Data"
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr "Termina"
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr "Condivisioni Attive"
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr "Condivisione"
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr "Utente"
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr "Gruppo"
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr "File Aperti"
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr ""
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr ""
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr ""
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr "Opzioni Basilari"
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr "Opzioni di Sicurezza"
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr "Opzioni di Log"
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr "Opzioni Protocollo"
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr "Opzioni Tuning"
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr "Opzioni di Stampa"
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr "Gestione Nomi File"
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr "Opzioni Dominio"
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr "Opzioni di Logon"
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr "Opzioni Browsing"
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr "opzioni WINS"
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr "Opzioni Locking"
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr "Opzioni Ldap"
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr "Opzioni Generiche"
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr "Opzioni VFS"
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr "Opzioni Winbind"
-diff --git a/source3/po/ja.msg b/source3/po/ja.msg
-new file mode 100644
-index 0000000..52ec571
---- /dev/null
-+++ b/source3/po/ja.msg
-@@ -0,0 +1,594 @@
-+# Japanese messages for international release of SWAT.
-+# Copyright (C) 2003 TAKAHASHI Motonobu <monyo@samba.org>
-+# Copyright (C) 2000 Ryo Kawahara <rkawa@lbe.co.jp>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n-swat\n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2003-09-23 04:38+900\n"
-+"Last-Translator: TAKAHASHI Motonobu <monyo@samba.org>\n"
-+"Language-Team: Samba Users Group Japan <sugj-tech@samba.gr.jp>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr "%s をオープンできません"
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr "ヘルプ"
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr "デフォルト値"
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr "%s を書き込み用にオープンできません"
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr "%s を再読み込みできません\n"
-+
-+# msgid "Logged in as <b>%s</b><p>\n"
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "<b>%s</b>としてログイン"
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr "ホーム"
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr "グローバル"
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr "ファイル共有"
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr "印刷共有"
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr "ウィザード"
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr "サーバの状態"
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr "現在の設定"
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr "パスワード管理"
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr "現在の表示モード"
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr "標準表示"
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr "詳細表示"
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr "表示モードの変更"
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr "現在の設定"
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr "標準表示"
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr "完全表示"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr "ウィザードによるパラメータ編集ページ"
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr "smb.conf ファイルが書き換えられました。"
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr "Samba 設定ウィザード"
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr "「smb.conf の書換」ボタンを押すと smb.conf ファイル中のすべてのデフォルト値やコメントは削除されます。"
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr "「commit」ボタンを押した場合にも同様の変更が行なわれます。"
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr "smb.conf の書換"
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr "設定を反映"
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr "各パラメータの編集"
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr "サーバタイプ"
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr "スタンドアロン"
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr "ドメインメンバ"
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr "ドメインコントローラ"
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr "通常の形式ではない - 新しいモードを選択のこと"
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr "WINS"
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr "使わない"
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr "サーバとして構成"
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr "別の WINS サーバのクライアントとして構成"
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr "別の WINS サーバ"
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr "エラー: wins server と wins support の両パラメータが smb.conf で指定されています"
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr "いずれかの WINS モードを選択してください。"
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr "ホームディレクトリの公開"
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr "上記の設定オプションにより、複数のパラメータが同期して設定されるため、 Samba の運用を迅速に開始する上での助けとなるでしょう。"
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr "Global パラメータ"
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr "変更を反映"
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr "変更を取消"
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr "ファイル共有 パラメータ"
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr "ファイル共有の選択"
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr "ファイル共有の削除"
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr "ファイル共有の作成"
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr "デモ・モードでのパスワード変更はできません"
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr "パスワード・データベースが見つけられません"
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr "「ユーザ名」欄に入力してください"
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr "「旧パスワード」欄に入力してください"
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr "「リモートマシン」欄に入力してください"
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr "「新パスワード」欄と「新パスワードの再入力」欄に入力してください"
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr "「新パスワードの再入力」欄の入力内容が「新パスワード」欄の入力と一致していません。"
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " %s のパスワードは変更されました。"
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " '%s' のパスワードは変更されませんでした。"
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr "ローカルマシンのパスワード管理"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr "ユーザ名"
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr "旧パスワード"
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr "新パスワード"
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr "新パスワードの再入力"
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr "パスワード変更"
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr "新規ユーザ追加"
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr "ユーザの削除"
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr "ユーザの無効化"
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr "ユーザの有効化"
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr "リモートマシンのパスワード管理"
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr "リモートマシン"
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr "印刷共有 パラメータ"
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr "*注"
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "名前の先頭に [*] がついたプリンタ"
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr "は"
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr "printcap name パラメータ"
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "から自動設定されたものですから、削除することはできません。"
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr "印刷共有の選択"
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr "印刷共有の削除"
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr "印刷共有の作成"
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr "参照のみ   "
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr "更新のみ   "
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr "参照/更新  "
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr "サーバの状態"
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr "自動更新の開始"
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr "更新間隔: "
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr "自動更新の停止"
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr "バージョン"
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr "実行中"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr "停止中"
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr "smbd の停止"
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr "smbd の起動"
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr "smbd の再起動"
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr "nmbd の停止"
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr "nmbd の起動"
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr "nmbd の再起動"
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr "winbindd の停止"
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr "winbindd の起動"
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr "winbindd の再起動"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr "すべて停止"
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr "すべて再起動"
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr "すべて起動"
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr "接続中のクライアント"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr "クライアント"
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr "IPアドレス"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr "日付"
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr "切断"
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr "接続中の共有"
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr "共有名"
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr "ユーザ"
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr "グループ"
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr "使用中のファイル"
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr "排他モード"
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr "参照/更新"
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr "ファイル名"
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr "クライアント名を先頭に表示"
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr "PIDを先頭に表示"
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr "基本 オプション"
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr "セキュリティ オプション"
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr "ロギング オプション"
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr "プロトコル オプション"
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr "チューニング オプション"
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr "印刷 オプション"
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr "ファイル名の取扱"
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr "ドメイン オプション"
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr "ログオン オプション"
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr "ブラウジング オプション"
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr "WINS オプション"
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr "ロッキング オプション"
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr "LDAP オプション"
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr "その他のオプション"
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr "VFS オプション"
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr "Winbind オプション"
-diff --git a/source3/po/nl.msg b/source3/po/nl.msg
-new file mode 100644
-index 0000000..c0aae12
---- /dev/null
-+++ b/source3/po/nl.msg
-@@ -0,0 +1,592 @@
-+# Dutch messages for international release of SWAT.
-+# Copyright (C) 2003 Jelmer Vernooij <jelmer@samba.org>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2000-02-08 12:48+09:00\n"
-+"Last-Translator: Jelmer Vernooij <jelmer@samba.org>\n"
-+"Language-Team: (Samba Team) <samba-technical@samba.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: \n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr "FOUT: Kan %s niet openen"
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr "Help"
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr "Stel Standaard In"
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr "kon %s niet openen voor schrijven"
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr "Kan %s niet herladen"
-+
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Ingelogd als <b>%s</b>"
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr "Home"
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr "Algemene Instellingen"
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr "Gedeelde Bronnen"
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr "Printers"
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr "Wizard"
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr "Status"
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr "Bekijk Configuratie"
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr "Wachtwoord Beheer"
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr "Huidige weergave is"
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr "Basis"
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr "Geadvanceerd"
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr "Verander Weergave In"
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr "Huidige Configuratie"
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr "Normale Weergave"
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr "Volledige Weergave"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr "Wizard Instellingen Veranderen Pagina"
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr "N.B.: het smb.conf bestand is gelezen en herschreven"
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr "Samba Configuratie Wizard"
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr "De \"Herschrijf smb.conf bestand\" knop zal alle standaardwaardes en alle commentaar verwijderen."
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr "Hetzelfde zal gebeuren als u de \"toepassen\" knop gebruikt."
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr "Herschrijf smb.conf bestand"
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr "Toepassen"
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr "Bewerk Configuratie Waardes"
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr "Server Type"
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr "Stand Alone"
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr "Domein Lid"
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr "Domein Controller"
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr "Ongebruikelijk Type in smb.conf - Selecteer een nieuwe modus"
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr "Configureer WINS Als"
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr "Niet gebruikt"
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr "Server voor client gebruik"
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr "Client van een andere WINS server"
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr "Naam of IP-adres WINS Server"
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr "Fout: WINS Server Modus en WINS Ondersteuning beiden ingesteld in smb.conf"
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr "Selecteer hierboven de gewenste WINS modus."
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr "Stel Home Directories Open"
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr "The configuratie hierboven zal meerdere variabelen veranderen en zal over het algemeen zorgen voor snelle installatie van Samba."
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr "Algemene Instellingen"
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr "Pas Veranderingen Toe"
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr "Beginwaarden"
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr "Instellingen Gedeelde Bronnen"
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr "Kies Bron"
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr "Verwijder Bron"
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr "Maak Bron"
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr "wachtwoord veranderen in demo modus geweigerd"
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr "Kan wachtwoord database vectors niet opzetten."
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr " \"Gebruikersnaam\" moet opgegeven worden "
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr " \"Oude wachtwoord\" moet opgegeven worden "
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " \"Server Naam of IP\" moet opgegeven worden "
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr " \"Nieuw, en bevestiging Wachtwoorden\" moeten opgegeven worden "
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr " Bevestigingswachtwoord was anders dan nieuwe wachtwoord "
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " Het wachtwoord voor '%s' is veranderd."
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " Het wachtwoord voor '%s' is niet veranderd."
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr "Server Wachtwoord Beheer"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr "Gebuikersnaam"
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr "Oud Wachtwoord"
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr "Nieuw Wachtwoord"
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr "Bevestiging Nieuw Wachtwoord"
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr "Verander Wachtwoord"
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr "Voeg Gebruiker Toe"
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr "Verwijder Gebruiker"
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr "Maak gebruiker inactief"
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr "Maak gebruiker actief"
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr "Client/Server Wachtwoord Beheer"
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr "Naam of IP Server"
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr "Printer Instellingen"
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr "Belangrijk:"
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Printer namen gemarkeerd met [*] in het Kies Printer veld "
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr "zijn automatisch geladen uit "
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr "Printcap Naam"
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "Proberen deze printers te verwijderen vanuit SWAT zal geen effect hebben."
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr "Kies Printer"
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr "Verwijder Printer"
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr "Maak Printer"
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr "RDONLY"
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr "WRONLY"
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr "RDWR"
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr "Server Status"
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr "Automatisch Verversen"
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr "Ververs Interval:"
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr "Stop met Verversen"
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr "versie:"
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr "smbd:"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr "draaiend"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr "niet draaiend"
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr "Stop smbd"
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr "Start smbd"
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr "Herstart smbd"
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr "nmbd:"
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr "Stop nmbd"
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr "Start nmbd"
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr "Herstart nmbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr "winbindd:"
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr "Stop winbindd"
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr "Start winbindd"
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr "Herstart winbindd"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr "Stop Alles"
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr "Herstart Alles"
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr "Start Alles"
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr "Actieve Verbindingen"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr "PID"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr "Client"
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr "IP adres"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr "Datum"
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr "Kill"
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr "Actieve Bronnen"
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr "Bron"
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr "Gebruiker"
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr "Groep"
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr "Geopende Bestanden"
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr "Gedeeld"
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr "Lees/Schrijf"
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr "Oplock"
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr "Bestand"
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr "Toon Client in kolom 1"
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr "Toon PID in kolom 1"
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr "Basis Opties"
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr "Veiligheidsopties"
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr "Log Opties"
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr "Protocol Opties"
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr "Fijntune Opties"
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr "Printer Opties"
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr "Bestandsnaam Afhandeling"
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr "Domein Opties"
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr "Logon Opties"
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr "Verken Opties"
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr "WINS Opties"
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr "Locking Opties"
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr "LDAP Opties"
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr "Verscheidene Opties"
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr "VFS module opties"
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr "Winbind opties"
-diff --git a/source3/po/pl.msg b/source3/po/pl.msg
-new file mode 100644
-index 0000000..aca5de6
---- /dev/null
-+++ b/source3/po/pl.msg
-@@ -0,0 +1,592 @@
-+# Polish messages for international release of SWAT.
-+# Copyright (C) 2001 Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2001-08-15 22:45+02:00\n"
-+"Last-Translator: Rafal Szczesniak <mimir@spin.ict.pwr.wroc.pl>\n"
-+"Language-Team: pl\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: \n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr ""
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr "Pomoc"
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr "Ustaw domyślnie"
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr ""
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr ""
-+
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Zalogowany jako <b>%s</b><p>\n"
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr "Strona domowa"
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr "Ustawienia globalne"
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr "Współudziały"
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr "Drukarki"
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr "Status"
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr "Przejrzyj Konfigurację"
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr "Zarządzanie Hasłami"
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr "Bieżąca Konfiguracja"
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr "Widok Podstawowy"
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr "Widok Zaawansowany"
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr "Zmień Hasło"
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr "Bieżąca Konfiguracja"
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr "Normalny Widok"
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr "Pełny Widok"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr ""
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr ""
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr ""
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr ""
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr ""
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr "Potwierdź Zmiany"
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr "Parametry Drukarki"
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr ""
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr "Uruchom nmbd"
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr ""
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr ""
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr ""
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr ""
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr ""
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr ""
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr ""
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr ""
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr ""
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr ""
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr ""
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr ""
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr "Zmienne Globalne"
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr "Potwierdź Zmiany"
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr "Zresetuj Wartości"
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr "Parametry Współudziału"
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr "Wybierz Współudział"
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr "Usuń Współudział"
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr "Utwórz Współudział"
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr "zmiana hasła w trybie demo odrzucona\n"
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr ""
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr " Musisz podać \"Nazwę Użytkownika\" \n"
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr " Musisz podać \"Stare Hasło\" \n"
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " Musisz podać \"Zdalną Maszynę\" \n"
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr " Musisz podać \"Nowe Hasło, i ponownie wpisane Nowe Hasło\" \n"
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr " Ponownie wpisane hasło nie pasuje do nowego hasła\n"
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " Hasło dla '%s' zostało zmienione. \n"
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " Hasło dla '%s' NIE zostało zmienione. \n"
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr "Zarządzanie Hasłami na Serwerze"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr " Nazwa Użytkownika"
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr " Stare Hasło"
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr " Nowe Hasło"
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr " Ponownie wpisz Nowe Hasło"
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr "Zmień Hasło"
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr "Dodaj Nowego Użytkownika"
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr "Usuń Użytkownika"
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr "Zablokuj Użytkownika"
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr "Odblokuj Użytkownika"
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr "Zarządzanie Hasłami Klient/Serwer"
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr " Zdalna Maszyna"
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr "Parametry Drukarki"
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr "Ważna Informacja:"
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Nazwy Drukarek zaznaczone [*] w rozwijanym polu Wybierz Drukarkę "
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr "są drukarkami automatycznie ładowanymi z "
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr "Nazwa Printcap"
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "Próby usunięcia tych drukarek ze SWAT nie przyniosą efektu.\n"
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr "Wybierz Drukarkę"
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr "Usuń Drukarkę"
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr "Utwórz Drukarkę"
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr ""
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr ""
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr "Status Serwera"
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr "Automatyczne Odświeżanie"
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr "Interwał Odświeżania: "
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr "Zatrzymaj Odświeżanie"
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr "wersja:"
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr "działa"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr "nie działa"
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr "Zatrzymaj smbd"
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr "Uruchom smbd"
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr "Zrestartuj smbd"
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr "Zatrzymaj nmbd"
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr "Uruchom nmbd"
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr "Zrestartuj nmbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr ""
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr "Zatrzymaj nmbd"
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr "Uruchom nmbd"
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr "Zrestartuj nmbd"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr ""
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr "Zrestartuj nmbd"
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr "Uruchom nmbd"
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr "Aktywne Połączenia"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr ""
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr "Klient"
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr "adres IP"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr "Data"
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr "Zatrzymaj"
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr "Aktywne Współudziały"
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr "Współudział"
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr "Użytkownik"
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr "Grupa"
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr "Otwarte Pliki"
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr "Współdzielenie"
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr ""
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr "Plik"
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr ""
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr ""
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr "Bazowe Opcje"
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr "Opcje Zabezpieczeń"
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr "Opcje Blokowania"
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr "Opcje Protokołu"
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr "Opcje Dostrajające"
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr "Opcje Drukowania"
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr "Obsługa Nazw Plików"
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr "Opcje Domeny"
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr "Opcje Logowania"
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr "Opcje Przeglądania"
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr "Opcje WINS"
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr "Opcje Blokowania"
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr "Opcje Ldap"
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr "Pozostałe Opcje"
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr "Opcje WINS"
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr "Opcje Drukowania"
-diff --git a/source3/po/ru.msg b/source3/po/ru.msg
-new file mode 100644
-index 0000000..d859406
---- /dev/null
-+++ b/source3/po/ru.msg
-@@ -0,0 +1,606 @@
-+# Russian messages for international release of SWAT.
-+# Copyright (C) 2007 Yuri Kozlov <kozlov.y@gmail.com>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: swat\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-04 18:15+0200\n"
-+"PO-Revision-Date: 2007-06-27 22:00+0400\n"
-+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.11.4\n"
-+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+
-+#: ../web/swat.c:139
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr "ОШИБКА: Не удалось открыть %s"
-+
-+#: ../web/swat.c:223
-+msgid "Help"
-+msgstr "Справка"
-+
-+#: ../web/swat.c:229 ../web/swat.c:254 ../web/swat.c:275 ../web/swat.c:285 ../web/swat.c:294 ../web/swat.c:303 ../web/swat.c:309 ../web/swat.c:315 ../web/swat.c:328
-+msgid "Set Default"
-+msgstr "Установить по умолчанию"
-+
-+#: ../web/swat.c:450
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr "не удалось открыть %s для записи"
-+
-+#: ../web/swat.c:473
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr "Невозможно перезагрузить %s"
-+
-+#: ../web/swat.c:543
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "Осуществлён вход под именем <b>%s</b>"
-+
-+#: ../web/swat.c:547
-+msgid "Home"
-+msgstr "Главная"
-+
-+#: ../web/swat.c:549
-+msgid "Globals"
-+msgstr "Глобальные"
-+
-+#: ../web/swat.c:550
-+msgid "Shares"
-+msgstr "Ресурсы"
-+
-+#: ../web/swat.c:551
-+msgid "Printers"
-+msgstr "Принтеры"
-+
-+#: ../web/swat.c:552
-+msgid "Wizard"
-+msgstr "Помощник"
-+
-+#: ../web/swat.c:556
-+msgid "Status"
-+msgstr "Состояние"
-+
-+#: ../web/swat.c:557
-+msgid "View Config"
-+msgstr "Настройки"
-+
-+#: ../web/swat.c:559
-+msgid "Password Management"
-+msgstr "Пароли"
-+
-+#: ../web/swat.c:569
-+msgid "Current View Is"
-+msgstr "Текущий вид"
-+
-+#: ../web/swat.c:570 ../web/swat.c:573
-+msgid "Basic"
-+msgstr "Простой"
-+
-+#: ../web/swat.c:571 ../web/swat.c:574
-+msgid "Advanced"
-+msgstr "Сложный"
-+
-+#: ../web/swat.c:572
-+msgid "Change View To"
-+msgstr "Сменить вид на"
-+
-+#: ../web/swat.c:601
-+msgid "Current Config"
-+msgstr "Текущий файл конфигурации"
-+
-+#: ../web/swat.c:605
-+msgid "Normal View"
-+msgstr "Обычный вид"
-+
-+#: ../web/swat.c:607
-+msgid "Full View"
-+msgstr "Полный вид"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:626
-+msgid "Wizard Parameter Edit Page"
-+msgstr "Страница редактирования параметров помощника"
-+
-+#: ../web/swat.c:655
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr "Замечание: файл smb.conf был прочитан и перезаписан"
-+
-+#. Here we go ...
-+#: ../web/swat.c:763
-+msgid "Samba Configuration Wizard"
-+msgstr "Помощник настройки Samba"
-+
-+#: ../web/swat.c:767
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr ""
-+"По кнопке \"Перезаписать файл smb.conf\" в файл smb.conf записываются все "
-+"значения по умолчанию с комментариями."
-+
-+#: ../web/swat.c:768
-+msgid "The same will happen if you press the commit button."
-+msgstr "То же самое произойдёт при нажатии кнопки сохранения."
-+
-+#: ../web/swat.c:771
-+msgid "Rewrite smb.conf file"
-+msgstr "Перезаписать файл smb.conf"
-+
-+#: ../web/swat.c:772
-+msgid "Commit"
-+msgstr "Сохранить"
-+
-+#: ../web/swat.c:773
-+msgid "Edit Parameter Values"
-+msgstr "Редактировать значения параметров"
-+
-+#: ../web/swat.c:779
-+msgid "Server Type"
-+msgstr "Тип сервера"
-+
-+#: ../web/swat.c:780
-+msgid "Stand Alone"
-+msgstr "Независимый"
-+
-+#: ../web/swat.c:781
-+msgid "Domain Member"
-+msgstr "Член домена"
-+
-+#: ../web/swat.c:782
-+msgid "Domain Controller"
-+msgstr "Контроллер домена"
-+
-+#: ../web/swat.c:785
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr "Необычный тип в smb.conf - Выберите новый режим"
-+
-+#: ../web/swat.c:787
-+msgid "Configure WINS As"
-+msgstr "Настроить WINS как"
-+
-+#: ../web/swat.c:788
-+msgid "Not Used"
-+msgstr "Не использовать"
-+
-+#: ../web/swat.c:789
-+msgid "Server for client use"
-+msgstr "Сервер для клиентов"
-+
-+#: ../web/swat.c:790
-+msgid "Client of another WINS server"
-+msgstr "Клиент другого сервера WINS"
-+
-+#: ../web/swat.c:792
-+msgid "Remote WINS Server"
-+msgstr "Удалённый сервер WINS"
-+
-+#: ../web/swat.c:803
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr "Ошибка: в smb.conf установлены одновременно режим сервера WINS и поддержка WINS"
-+
-+#: ../web/swat.c:804
-+msgid "Please Select desired WINS mode above."
-+msgstr "Выберите желаемый режим WINS."
-+
-+#: ../web/swat.c:806
-+msgid "Expose Home Directories"
-+msgstr "Сделать доступными домашние каталоги"
-+
-+#: ../web/swat.c:821
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr ""
-+"Выбор параметров выше приводит к автоматической настройке большего числа "
-+"параметров, и помогает в сокращении времени развёртывания Samba."
-+
-+#: ../web/swat.c:834
-+msgid "Global Parameters"
-+msgstr "Глобальные параметры"
-+
-+#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
-+msgid "Commit Changes"
-+msgstr "Сохранить изменения"
-+
-+#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
-+msgid "Reset Values"
-+msgstr "Реинициализировать значения"
-+
-+#: ../web/swat.c:891
-+msgid "Share Parameters"
-+msgstr "Параметры общих ресурсов"
-+
-+#: ../web/swat.c:934
-+msgid "Choose Share"
-+msgstr "Выбрать ресурс"
-+
-+#: ../web/swat.c:951
-+msgid "Delete Share"
-+msgstr "Удалить ресурс"
-+
-+#: ../web/swat.c:958
-+msgid "Create Share"
-+msgstr "Создать ресурс"
-+
-+#: ../web/swat.c:994
-+msgid "password change in demo mode rejected"
-+msgstr "смена пароля в демо-режиме не работает"
-+
-+#: ../web/swat.c:1007
-+msgid "Can't setup password database vectors."
-+msgstr "Не удалось настроить векторы базы данных паролей."
-+
-+#: ../web/swat.c:1033
-+msgid " Must specify \"User Name\" "
-+msgstr " Должно быть указано \"Имя пользователя\" "
-+
-+#: ../web/swat.c:1049
-+msgid " Must specify \"Old Password\" "
-+msgstr " Должен быть указан \"Старый пароль\" "
-+
-+#: ../web/swat.c:1055
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " Должна быть указана \"Удалённая машина\" "
-+
-+#: ../web/swat.c:1062
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr "  Должен быть указан \"Новый пароль, введённый дважды\" "
-+
-+#: ../web/swat.c:1068
-+msgid " Re-typed password didn't match new password "
-+msgstr " Повторно набранный новый пароль не совпадает с новым паролем "
-+
-+#: ../web/swat.c:1101
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " Был изменён пароль для '%s'."
-+
-+#: ../web/swat.c:1104
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " Пароль для '%s' НЕ был изменён."
-+
-+#: ../web/swat.c:1129
-+msgid "Server Password Management"
-+msgstr "Управление паролями сервера"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1138 ../web/swat.c:1185
-+msgid "User Name"
-+msgstr "Имя пользователя"
-+
-+#: ../web/swat.c:1141 ../web/swat.c:1187
-+msgid "Old Password"
-+msgstr "Старый пароль"
-+
-+#: ../web/swat.c:1144 ../web/swat.c:1189
-+msgid "New Password"
-+msgstr "Новый пароль"
-+
-+#: ../web/swat.c:1146 ../web/swat.c:1191
-+msgid "Re-type New Password"
-+msgstr "Новый пароль ещё раз"
-+
-+#: ../web/swat.c:1154 ../web/swat.c:1202
-+msgid "Change Password"
-+msgstr "Сменить пароль"
-+
-+#: ../web/swat.c:1157
-+msgid "Add New User"
-+msgstr "Добавить нового пользователя"
-+
-+#: ../web/swat.c:1159
-+msgid "Delete User"
-+msgstr "Удалить пользователя"
-+
-+#: ../web/swat.c:1161
-+msgid "Disable User"
-+msgstr "Заблокировать пользователя"
-+
-+#: ../web/swat.c:1163
-+msgid "Enable User"
-+msgstr "Разблокировать пользователя"
-+
-+#: ../web/swat.c:1176
-+msgid "Client/Server Password Management"
-+msgstr "Управление паролями в режиме клиент/сервер"
-+
-+#: ../web/swat.c:1193
-+msgid "Remote Machine"
-+msgstr "Удалённая машина"
-+
-+#: ../web/swat.c:1232
-+msgid "Printer Parameters"
-+msgstr "Параметры принтера"
-+
-+#: ../web/swat.c:1234
-+msgid "Important Note:"
-+msgstr "Важное замечание:"
-+
-+#: ../web/swat.c:1235
-+#, c-format
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Имена принтеров, помеченные [*] в выпадающем списке принтеров, "
-+
-+#: ../web/swat.c:1236
-+#, c-format
-+msgid "are autoloaded printers from "
-+msgstr "были автоматически загружены согласно параметру "
-+
-+#: ../web/swat.c:1237
-+msgid "Printcap Name"
-+msgstr "Printcap Name"
-+
-+#: ../web/swat.c:1238
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr ". Попытка удалить эти принтеры из SWAT ни к чему не приведёт."
-+
-+#: ../web/swat.c:1284
-+msgid "Choose Printer"
-+msgstr "Выбрать принтер"
-+
-+#: ../web/swat.c:1303
-+msgid "Delete Printer"
-+msgstr "Удалить принтер"
-+
-+#: ../web/swat.c:1310
-+msgid "Create Printer"
-+msgstr "Создать принтер"
-+
-+#: ../web/statuspage.c:139
-+msgid "RDWR       "
-+msgstr "RDWR       "
-+
-+#: ../web/statuspage.c:141
-+msgid "WRONLY     "
-+msgstr "WRONLY     "
-+
-+#: ../web/statuspage.c:143
-+msgid "RDONLY     "
-+msgstr "RDONLY     "
-+
-+#: ../web/statuspage.c:330
-+msgid "Server Status"
-+msgstr "Состояние сервера"
-+
-+#: ../web/statuspage.c:335
-+msgid "Auto Refresh"
-+msgstr "Включить автообновление"
-+
-+#: ../web/statuspage.c:336 ../web/statuspage.c:341
-+msgid "Refresh Interval: "
-+msgstr "Интервал автообновления: "
-+
-+#: ../web/statuspage.c:340
-+msgid "Stop Refreshing"
-+msgstr "Выключить автообновление"
-+
-+#: ../web/statuspage.c:355
-+msgid "version:"
-+msgstr "версия:"
-+
-+#: ../web/statuspage.c:358
-+msgid "smbd:"
-+msgstr "smbd:"
-+
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-+msgid "running"
-+msgstr "работает"
-+
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
-+msgid "not running"
-+msgstr "не работает"
-+
-+#: ../web/statuspage.c:362
-+msgid "Stop smbd"
-+msgstr "Остановить smbd"
-+
-+#: ../web/statuspage.c:364
-+msgid "Start smbd"
-+msgstr "Запустить smbd"
-+
-+#: ../web/statuspage.c:366
-+msgid "Restart smbd"
-+msgstr "Перезапустить smbd"
-+
-+#: ../web/statuspage.c:371
-+msgid "nmbd:"
-+msgstr "nmbd:"
-+
-+#: ../web/statuspage.c:375
-+msgid "Stop nmbd"
-+msgstr "Остановить nmbd"
-+
-+#: ../web/statuspage.c:377
-+msgid "Start nmbd"
-+msgstr "Запустить nmbd"
-+
-+#: ../web/statuspage.c:379
-+msgid "Restart nmbd"
-+msgstr "Перезапустить nmbd"
-+
-+#: ../web/statuspage.c:385
-+msgid "winbindd:"
-+msgstr "winbindd:"
-+
-+#: ../web/statuspage.c:389
-+msgid "Stop winbindd"
-+msgstr "Остановить winbindd"
-+
-+#: ../web/statuspage.c:391
-+msgid "Start winbindd"
-+msgstr "Запустить winbindd"
-+
-+#: ../web/statuspage.c:393
-+msgid "Restart winbindd"
-+msgstr "Перезапустить winbindd"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:402
-+msgid "Stop All"
-+msgstr "Остановить всё"
-+
-+#: ../web/statuspage.c:403
-+msgid "Restart All"
-+msgstr "Перезапустить всё"
-+
-+#. start all
-+#: ../web/statuspage.c:407
-+msgid "Start All"
-+msgstr "Запустить всё"
-+
-+#: ../web/statuspage.c:414
-+msgid "Active Connections"
-+msgstr "Активные подключения"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-+msgid "PID"
-+msgstr "PID"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429
-+msgid "Client"
-+msgstr "Клиент"
-+
-+#: ../web/statuspage.c:416
-+msgid "IP address"
-+msgstr "IP-адрес"
-+
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
-+msgid "Date"
-+msgstr "Дата"
-+
-+#: ../web/statuspage.c:418
-+msgid "Kill"
-+msgstr "Отключить"
-+
-+#: ../web/statuspage.c:426
-+msgid "Active Shares"
-+msgstr "Активные ресурсы"
-+
-+#: ../web/statuspage.c:429
-+msgid "Share"
-+msgstr "Ресурс"
-+
-+#: ../web/statuspage.c:429
-+msgid "User"
-+msgstr "Пользователь"
-+
-+#: ../web/statuspage.c:429
-+msgid "Group"
-+msgstr "Группа"
-+
-+#: ../web/statuspage.c:435
-+msgid "Open Files"
-+msgstr "Открытые файлы"
-+
-+#: ../web/statuspage.c:437
-+msgid "Sharing"
-+msgstr "Ресурс"
-+
-+#: ../web/statuspage.c:437
-+msgid "R/W"
-+msgstr "R/W"
-+
-+#: ../web/statuspage.c:437
-+msgid "Oplock"
-+msgstr "Oplock"
-+
-+#: ../web/statuspage.c:437
-+msgid "File"
-+msgstr "Файл"
-+
-+#: ../web/statuspage.c:446
-+msgid "Show Client in col 1"
-+msgstr "Показать клиента в колонке 1"
-+
-+#: ../web/statuspage.c:447
-+msgid "Show PID in col 1"
-+msgstr "Показать PID в колонке 1"
-+
-+#: ../param/loadparm.c:836
-+msgid "Base Options"
-+msgstr "Основные параметры"
-+
-+#: ../param/loadparm.c:855
-+msgid "Security Options"
-+msgstr "Параметры безопасности"
-+
-+#: ../param/loadparm.c:945
-+msgid "Logging Options"
-+msgstr "Параметры журнала"
-+
-+#: ../param/loadparm.c:962
-+msgid "Protocol Options"
-+msgstr "Параметры протокола"
-+
-+#: ../param/loadparm.c:1008
-+msgid "Tuning Options"
-+msgstr "Параметры детальной настройки"
-+
-+#: ../param/loadparm.c:1037
-+msgid "Printing Options"
-+msgstr "Параметры печати"
-+
-+#: ../param/loadparm.c:1075
-+msgid "Filename Handling"
-+msgstr "Обработка имён файлов"
-+
-+#: ../param/loadparm.c:1105
-+msgid "Domain Options"
-+msgstr "Параметры домена"
-+
-+#: ../param/loadparm.c:1109
-+msgid "Logon Options"
-+msgstr "Параметры входа"
-+
-+#: ../param/loadparm.c:1130
-+msgid "Browse Options"
-+msgstr "Параметры обзора"
-+
-+#: ../param/loadparm.c:1144
-+msgid "WINS Options"
-+msgstr "Параметры WINS"
-+
-+#: ../param/loadparm.c:1153
-+msgid "Locking Options"
-+msgstr "Параметры блокировки"
-+
-+#: ../param/loadparm.c:1170
-+msgid "Ldap Options"
-+msgstr "Параметры Ldap"
-+
-+#: ../param/loadparm.c:1186
-+msgid "Miscellaneous Options"
-+msgstr "Различные параметры"
-+
-+#: ../param/loadparm.c:1191
-+msgid "EventLog Options"
-+msgstr "Параметры EventLog"
-+
-+#: ../param/loadparm.c:1258
-+msgid "VFS module options"
-+msgstr "Параметры модуля VFS"
-+
-+#: ../param/loadparm.c:1268
-+msgid "Winbind options"
-+msgstr "Параметры Winbind"
-+
-diff --git a/source3/po/tr.msg b/source3/po/tr.msg
-new file mode 100644
-index 0000000..03b489d
---- /dev/null
-+++ b/source3/po/tr.msg
-@@ -0,0 +1,593 @@
-+# Turkish messages for international release of SWAT.
-+# Copyright (C) 2001 Deniz Akkus Kanca <deniz@arayan.com>
-+#
-+#   This program is free software; you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation; either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: i18n_swat \n"
-+"POT-Creation-Date: 2003-10-06 05:30+0900\n"
-+"PO-Revision-Date: 2001-09-20 22:51EEST\n"
-+"Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
-+"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 0.9.1\n"
-+
-+#: ../web/swat.c:117
-+#, c-format
-+msgid "ERROR: Can't open %s"
-+msgstr ""
-+
-+#: ../web/swat.c:200
-+msgid "Help"
-+msgstr "Yardım"
-+
-+#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+msgid "Set Default"
-+msgstr "Öntanımlıya Ayarla"
-+
-+#: ../web/swat.c:408
-+#, c-format
-+msgid "failed to open %s for writing"
-+msgstr ""
-+
-+#: ../web/swat.c:431
-+#, c-format
-+msgid "Can't reload %s"
-+msgstr ""
-+
-+#: ../web/swat.c:501
-+#, c-format
-+msgid "Logged in as <b>%s</b>"
-+msgstr "<b>%s</b> kimliği ile oturum açılmış"
-+
-+#: ../web/swat.c:505
-+msgid "Home"
-+msgstr "Ev"
-+
-+#: ../web/swat.c:507
-+msgid "Globals"
-+msgstr "Evrenseller"
-+
-+#: ../web/swat.c:508
-+msgid "Shares"
-+msgstr "Paylaşımlar"
-+
-+#: ../web/swat.c:509
-+msgid "Printers"
-+msgstr "Yazıcılar"
-+
-+#: ../web/swat.c:510
-+msgid "Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:513
-+msgid "Status"
-+msgstr "Durum"
-+
-+#: ../web/swat.c:514
-+msgid "View Config"
-+msgstr "Ayarlara Gözat"
-+
-+#: ../web/swat.c:516
-+msgid "Password Management"
-+msgstr "Şifre Yönetimi"
-+
-+#: ../web/swat.c:526
-+msgid "Current View Is"
-+msgstr "Şimdiki Ayarlar"
-+
-+#: ../web/swat.c:527 ../web/swat.c:530
-+msgid "Basic"
-+msgstr "Temel Görünüm"
-+
-+#: ../web/swat.c:528 ../web/swat.c:531
-+msgid "Advanced"
-+msgstr "Gelişmiş Görünüm"
-+
-+#: ../web/swat.c:529
-+msgid "Change View To"
-+msgstr "Şifre Değiştir"
-+
-+#: ../web/swat.c:554
-+msgid "Current Config"
-+msgstr "Şimdiki Ayarlar"
-+
-+#: ../web/swat.c:558
-+msgid "Normal View"
-+msgstr "Normal Görünüm"
-+
-+#: ../web/swat.c:560
-+msgid "Full View"
-+msgstr "Tam Görünüm"
-+
-+#. Here we first set and commit all the parameters that were selected
-+#. in the previous screen.
-+#: ../web/swat.c:579
-+msgid "Wizard Parameter Edit Page"
-+msgstr ""
-+
-+#: ../web/swat.c:608
-+msgid "Note: smb.conf file has been read and rewritten"
-+msgstr ""
-+
-+#. Here we go ...
-+#: ../web/swat.c:716
-+msgid "Samba Configuration Wizard"
-+msgstr ""
-+
-+#: ../web/swat.c:720
-+msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
-+msgstr ""
-+
-+#: ../web/swat.c:721
-+msgid "The same will happen if you press the commit button."
-+msgstr ""
-+
-+#: ../web/swat.c:724
-+msgid "Rewrite smb.conf file"
-+msgstr ""
-+
-+#: ../web/swat.c:725
-+msgid "Commit"
-+msgstr "açıklama"
-+
-+#: ../web/swat.c:726
-+msgid "Edit Parameter Values"
-+msgstr "Yazıcı Bilgileri"
-+
-+#: ../web/swat.c:732
-+msgid "Server Type"
-+msgstr ""
-+
-+#: ../web/swat.c:733
-+msgid "Stand Alone"
-+msgstr "Nmbd'yi çalıştır"
-+
-+#: ../web/swat.c:734
-+msgid "Domain Member"
-+msgstr "alan sunucusu"
-+
-+#: ../web/swat.c:735
-+msgid "Domain Controller"
-+msgstr "alan sunucusu"
-+
-+#: ../web/swat.c:738
-+msgid "Unusual Type in smb.conf - Please Select New Mode"
-+msgstr ""
-+
-+#: ../web/swat.c:740
-+msgid "Configure WINS As"
-+msgstr ""
-+
-+#: ../web/swat.c:741
-+msgid "Not Used"
-+msgstr "dont descend"
-+
-+#: ../web/swat.c:742
-+msgid "Server for client use"
-+msgstr ""
-+
-+#: ../web/swat.c:743
-+msgid "Client of another WINS server"
-+msgstr ""
-+
-+#: ../web/swat.c:745
-+msgid "Remote WINS Server"
-+msgstr ""
-+
-+#: ../web/swat.c:756
-+msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
-+msgstr ""
-+
-+#: ../web/swat.c:757
-+msgid "Please Select desired WINS mode above."
-+msgstr ""
-+
-+#: ../web/swat.c:759
-+msgid "Expose Home Directories"
-+msgstr ""
-+
-+#: ../web/swat.c:774
-+msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
-+msgstr ""
-+
-+#: ../web/swat.c:787
-+msgid "Global Parameters"
-+msgstr "Genel Değişkenler"
-+
-+#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+msgid "Commit Changes"
-+msgstr "Değişiklikleri Kaydet"
-+
-+#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+msgid "Reset Values"
-+msgstr "Değerleri İlk Haline Getir"
-+
-+#: ../web/swat.c:844
-+msgid "Share Parameters"
-+msgstr "Paylaşım Parametreleri"
-+
-+#: ../web/swat.c:887
-+msgid "Choose Share"
-+msgstr "Paylaşım Seçin"
-+
-+#: ../web/swat.c:901
-+msgid "Delete Share"
-+msgstr "Paylaşım Kaldır"
-+
-+#: ../web/swat.c:908
-+msgid "Create Share"
-+msgstr "Paylaşım Oluştur"
-+
-+#: ../web/swat.c:944
-+msgid "password change in demo mode rejected"
-+msgstr "demo kipinde şifre değişikliği kabul edilmedi\n"
-+
-+#: ../web/swat.c:957
-+msgid "Can't setup password database vectors."
-+msgstr ""
-+
-+#: ../web/swat.c:983
-+msgid " Must specify \"User Name\" "
-+msgstr " \"Kullanıcı Adı\" belirtilmeli \n"
-+
-+#: ../web/swat.c:999
-+msgid " Must specify \"Old Password\" "
-+msgstr " \"Eski Şifre\" belirtilmeli \n"
-+
-+#: ../web/swat.c:1005
-+msgid " Must specify \"Remote Machine\" "
-+msgstr " \"Uzak Makina\" belirtilmeli \n"
-+
-+#: ../web/swat.c:1012
-+msgid " Must specify \"New, and Re-typed Passwords\" "
-+msgstr " \"Yeni ve Tekrar Girilmiş Şifreler\" belirtilmeli \n"
-+
-+#: ../web/swat.c:1018
-+msgid " Re-typed password didn't match new password "
-+msgstr " Tekrar girilen şifre yeni şifre ile eşleşmedi\n"
-+
-+#: ../web/swat.c:1048
-+#, c-format
-+msgid " The passwd for '%s' has been changed."
-+msgstr " '%s' için şifre değiştirildi."
-+
-+#: ../web/swat.c:1051
-+#, c-format
-+msgid " The passwd for '%s' has NOT been changed."
-+msgstr " '%s' için şifre DEĞİŞTİRİLMEDİ."
-+
-+#: ../web/swat.c:1076
-+msgid "Server Password Management"
-+msgstr "Sunucu Şifre Yönetimi"
-+
-+#.
-+#. * Create all the dialog boxes for data collection
-+#.
-+#: ../web/swat.c:1085 ../web/swat.c:1132
-+msgid "User Name"
-+msgstr " Kullanıcı Adı"
-+
-+#: ../web/swat.c:1088 ../web/swat.c:1134
-+msgid "Old Password"
-+msgstr " Eski Şifre"
-+
-+#: ../web/swat.c:1091 ../web/swat.c:1136
-+msgid "New Password"
-+msgstr " Yeni Şifre"
-+
-+#: ../web/swat.c:1093 ../web/swat.c:1138
-+msgid "Re-type New Password"
-+msgstr " Yeni Şifre Tekrarı"
-+
-+#: ../web/swat.c:1101 ../web/swat.c:1149
-+msgid "Change Password"
-+msgstr "Şifre Değiştir"
-+
-+#: ../web/swat.c:1104
-+msgid "Add New User"
-+msgstr "Kull. Ekle"
-+
-+#: ../web/swat.c:1106
-+msgid "Delete User"
-+msgstr "Kull. Sil"
-+
-+#: ../web/swat.c:1108
-+msgid "Disable User"
-+msgstr "Kull. Etkisizleştir"
-+
-+#: ../web/swat.c:1110
-+msgid "Enable User"
-+msgstr "Kull. Etkinleştir"
-+
-+#: ../web/swat.c:1123
-+msgid "Client/Server Password Management"
-+msgstr "İstemci/Sunucu Şifre Yönetimi"
-+
-+#: ../web/swat.c:1140
-+msgid "Remote Machine"
-+msgstr " Uzak Makina"
-+
-+#: ../web/swat.c:1179
-+msgid "Printer Parameters"
-+msgstr "Yazıcı Bilgileri"
-+
-+#: ../web/swat.c:1181
-+msgid "Important Note:"
-+msgstr "Önemli Not:"
-+
-+#: ../web/swat.c:1182
-+msgid "Printer names marked with [*] in the Choose Printer drop-down box "
-+msgstr "Yazıcı Seç kutusunda [*] ile işaretlenmiş yazıcı isimleri "
-+
-+#: ../web/swat.c:1183
-+msgid "are autoloaded printers from "
-+msgstr "otomatik yüklenen yazıcılar "
-+
-+#: ../web/swat.c:1184
-+msgid "Printcap Name"
-+msgstr "Printcap Adı"
-+
-+#: ../web/swat.c:1185
-+msgid "Attempting to delete these printers from SWAT will have no effect."
-+msgstr "Bu yazıcıları SWAT'dan silmek etkisiz olacaktır.\n"
-+
-+#: ../web/swat.c:1231
-+msgid "Choose Printer"
-+msgstr "Yazıcı Seç"
-+
-+#: ../web/swat.c:1250
-+msgid "Delete Printer"
-+msgstr "Yazıcı Sil"
-+
-+#: ../web/swat.c:1257
-+msgid "Create Printer"
-+msgstr "Yazıcı Oluştur"
-+
-+#: ../web/statuspage.c:123
-+msgid "RDONLY     "
-+msgstr "SALTOKUNUR    "
-+
-+#: ../web/statuspage.c:124
-+msgid "WRONLY     "
-+msgstr "SALTYAZILIR    "
-+
-+#: ../web/statuspage.c:125
-+msgid "RDWR       "
-+msgstr "O/Y        "
-+
-+#: ../web/statuspage.c:309
-+msgid "Server Status"
-+msgstr "Sunucu Durumu"
-+
-+#: ../web/statuspage.c:314
-+msgid "Auto Refresh"
-+msgstr "Oto Tazele"
-+
-+#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+msgid "Refresh Interval: "
-+msgstr "Tazeleme Aralığı: "
-+
-+#: ../web/statuspage.c:319
-+msgid "Stop Refreshing"
-+msgstr "Tazelemeyi Durdur"
-+
-+#: ../web/statuspage.c:334
-+msgid "version:"
-+msgstr "sürüm:"
-+
-+#: ../web/statuspage.c:337
-+msgid "smbd:"
-+msgstr "smbd:"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "running"
-+msgstr "çalışıyor"
-+
-+#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+msgid "not running"
-+msgstr "çalışmıyor"
-+
-+#: ../web/statuspage.c:341
-+msgid "Stop smbd"
-+msgstr "Smbd'yi durdur"
-+
-+#: ../web/statuspage.c:343
-+msgid "Start smbd"
-+msgstr "Smbd'yi çalıştır"
-+
-+#: ../web/statuspage.c:345
-+msgid "Restart smbd"
-+msgstr "Smbd'yi yeniden çalıştır"
-+
-+#: ../web/statuspage.c:350
-+msgid "nmbd:"
-+msgstr "nmbd:"
-+
-+#: ../web/statuspage.c:354
-+msgid "Stop nmbd"
-+msgstr "Nmbd'yi durdur"
-+
-+#: ../web/statuspage.c:356
-+msgid "Start nmbd"
-+msgstr "Nmbd'yi çalıştır"
-+
-+#: ../web/statuspage.c:358
-+msgid "Restart nmbd"
-+msgstr "Nmbd'yi yeniden çalıştır"
-+
-+#: ../web/statuspage.c:364
-+msgid "winbindd:"
-+msgstr "winbind uid"
-+
-+#: ../web/statuspage.c:368
-+msgid "Stop winbindd"
-+msgstr "Nmbd'yi durdur"
-+
-+#: ../web/statuspage.c:370
-+msgid "Start winbindd"
-+msgstr "Nmbd'yi çalıştır"
-+
-+#: ../web/statuspage.c:372
-+msgid "Restart winbindd"
-+msgstr "Nmbd'yi yeniden çalıştır"
-+
-+#. stop, restart all
-+#: ../web/statuspage.c:381
-+msgid "Stop All"
-+msgstr ""
-+
-+#: ../web/statuspage.c:382
-+msgid "Restart All"
-+msgstr "Nmbd'yi yeniden çalıştır"
-+
-+#. start all
-+#: ../web/statuspage.c:386
-+msgid "Start All"
-+msgstr "Nmbd'yi çalıştır"
-+
-+#: ../web/statuspage.c:393
-+msgid "Active Connections"
-+msgstr "Aktif Bağlantılar"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "PID"
-+msgstr "PID"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+msgid "Client"
-+msgstr "İstemci"
-+
-+#: ../web/statuspage.c:395
-+msgid "IP address"
-+msgstr "IP numarası"
-+
-+#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+msgid "Date"
-+msgstr "Tarih"
-+
-+#: ../web/statuspage.c:397
-+msgid "Kill"
-+msgstr "Kapat"
-+
-+#: ../web/statuspage.c:405
-+msgid "Active Shares"
-+msgstr "Aktif Paylaşımlar"
-+
-+#: ../web/statuspage.c:408
-+msgid "Share"
-+msgstr "Paylaşım"
-+
-+#: ../web/statuspage.c:408
-+msgid "User"
-+msgstr "Kullanıcı"
-+
-+#: ../web/statuspage.c:408
-+msgid "Group"
-+msgstr "Grup"
-+
-+#: ../web/statuspage.c:414
-+msgid "Open Files"
-+msgstr "Açık Dosyalar"
-+
-+#: ../web/statuspage.c:416
-+msgid "Sharing"
-+msgstr "Paylaşılıyor"
-+
-+#: ../web/statuspage.c:416
-+msgid "R/W"
-+msgstr "O/Y"
-+
-+#: ../web/statuspage.c:416
-+msgid "Oplock"
-+msgstr "Oplock"
-+
-+#: ../web/statuspage.c:416
-+msgid "File"
-+msgstr "Dosya"
-+
-+#: ../web/statuspage.c:425
-+msgid "Show Client in col 1"
-+msgstr ""
-+
-+#: ../web/statuspage.c:426
-+msgid "Show PID in col 1"
-+msgstr ""
-+
-+#: ../param/loadparm.c:755
-+msgid "Base Options"
-+msgstr "Temel Seçenekler"
-+
-+#: ../param/loadparm.c:775
-+msgid "Security Options"
-+msgstr "Güvenlik Seçenekleri"
-+
-+#: ../param/loadparm.c:859
-+msgid "Logging Options"
-+msgstr "Günlük Kaydı Seçenekleri"
-+
-+#: ../param/loadparm.c:874
-+msgid "Protocol Options"
-+msgstr "Protokol Seçenekleri"
-+
-+#: ../param/loadparm.c:911
-+msgid "Tuning Options"
-+msgstr "Ayar Seçenekleri"
-+
-+#: ../param/loadparm.c:940
-+msgid "Printing Options"
-+msgstr "Yazdırma Seçenekleri"
-+
-+#: ../param/loadparm.c:970
-+msgid "Filename Handling"
-+msgstr "Dosyaadı İşlenmesi"
-+
-+#: ../param/loadparm.c:996
-+msgid "Domain Options"
-+msgstr "Alan Seçenekleri"
-+
-+#: ../param/loadparm.c:1000
-+msgid "Logon Options"
-+msgstr "Sistem Giriş Seçenekleri"
-+
-+#: ../param/loadparm.c:1019
-+msgid "Browse Options"
-+msgstr "Gözatma Seçenekleri"
-+
-+#: ../param/loadparm.c:1033
-+msgid "WINS Options"
-+msgstr "WINS Seçenekleri"
-+
-+#: ../param/loadparm.c:1043
-+msgid "Locking Options"
-+msgstr "Kilitleme Seçenekleri"
-+
-+#: ../param/loadparm.c:1061
-+msgid "Ldap Options"
-+msgstr "Ldap Seçenekleri"
-+
-+#: ../param/loadparm.c:1078
-+msgid "Miscellaneous Options"
-+msgstr "Diğer Seçenekler"
-+
-+#: ../param/loadparm.c:1138
-+msgid "VFS module options"
-+msgstr "VFS Seçenekleri"
-+
-+#: ../param/loadparm.c:1148
-+msgid "Winbind options"
-+msgstr "Winbind seçenekleri"
-diff --git a/source3/script/installmsg.sh b/source3/script/installmsg.sh
-new file mode 100644
-index 0000000..859e4c1
---- /dev/null
-+++ b/source3/script/installmsg.sh
-@@ -0,0 +1,65 @@
-+#!/bin/sh
-+# first version (Sept 2003) written by Shiro Yamada <shiro@miraclelinux.com>
-+# based on the first verion (March 2002) of installdat.sh written by Herb Lewis
-+
-+DESTDIR=$1
-+MSGDIR=`echo $2 | sed 's/\/\//\//g'`
-+SRCDIR=$3/
-+shift
-+shift
-+shift
-+
-+case $0 in
-+	*uninstall*)
-+		if test ! -d "$DESTDIR/$MSGDIR"; then
-+			echo "Directory $DESTDIR/$MSGDIR does not exist! "
-+			echo "Do a "make installmsg" or "make install" first. "
-+			exit 1
-+		fi
-+		mode='uninstall'
-+		;;
-+	*) mode='install' ;;
-+esac
-+
-+for f in $SRCDIR/po/*.msg; do
-+	FNAME="$DESTDIR/$MSGDIR/`basename $f`"
-+	if test "$mode" = 'install'; then
-+		echo "Installing $f as $FNAME "
-+		cp "$f" "$FNAME"
-+		if test ! -f "$FNAME"; then
-+			echo "Cannot install $FNAME.  Does $USER have privileges? "
-+			exit 1
-+		fi
-+		chmod 0644 "$FNAME"
-+	elif test "$mode" = 'uninstall'; then
-+		echo "Removing $FNAME "
-+		rm -f "$FNAME"
-+		if test -f "$FNAME"; then
-+			echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+			exit 1
-+		fi
-+	else
-+		echo "Unknown mode, $mode.  Script called as $0 "
-+		exit 1
-+	fi
-+done
-+
-+if test "$mode" = 'install'; then
-+	cat << EOF
-+==============================================================================
-+The SWAT msg files have been installed.  You may uninstall the msg files using
-+the command "make uninstallmsg" or "make uninstall" to uninstall binaries, man
-+pages, msg files, and shell scripts.
-+==============================================================================
-+EOF
-+else
-+	cat << EOF
-+=============================================================================
-+The SWAT msg files have been removed.  You may restore these files using the
-+command "make installmsg" or "make install" to install binaries, man pages,
-+modules, msg files, and shell scripts.
-+======================================================================
-+EOF
-+fi
-+
-+exit 0
-diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
-new file mode 100755
-index 0000000..40596f3
---- /dev/null
-+++ b/source3/script/installswat.sh
-@@ -0,0 +1,296 @@
-+#!/bin/sh
-+#first version March 1998, Andrew Tridgell
-+
-+DESTDIR=$1
-+SWATDIR=`echo $2 | sed 's/\/\//\//g'`
-+SRCDIR=$3/
-+BOOKDIR="$DESTDIR/$SWATDIR/using_samba"
-+
-+case $0 in
-+	*uninstall*)
-+		echo "Removing SWAT from $DESTDIR/$SWATDIR "
-+		echo "Removing the Samba Web Administration Tool "
-+		printf "%s" "Removed "
-+		mode='uninstall'
-+		;;
-+	*)
-+		echo "Installing SWAT in $DESTDIR/$SWATDIR "
-+		echo "Installing the Samba Web Administration Tool "
-+		printf "%s" "Installing "
-+		mode='install'
-+		;;
-+esac
-+
-+LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
-+echo "langs are `cd $SRCDIR../swat/lang/; /bin/echo ??` "
-+
-+if test "$mode" = 'install'; then
-+ for ln in $LANGS; do 
-+  SWATLANGDIR="$DESTDIR/$SWATDIR/$ln"
-+  for d in $SWATLANGDIR $SWATLANGDIR/help $SWATLANGDIR/images \
-+  $SWATLANGDIR/include $SWATLANGDIR/js; do
-+   if [ ! -d $d ]; then
-+    mkdir -p $d
-+    if [ ! -d $d ]; then
-+     echo "Failed to make directory $d, does $USER have privileges? "
-+     exit 1
-+    fi
-+   fi
-+  done
-+ done
-+fi
-+
-+for ln in $LANGS; do
-+
-+  # images
-+  for f in $SRCDIR../swat/$ln/images/*.gif; do
-+    if [ ! -f $f ] ; then
-+      continue
-+    fi
-+    FNAME="$DESTDIR/$SWATDIR/$ln/images/`basename $f`"
-+    echo $FNAME
-+    if test "$mode" = 'install'; then
-+      cp "$f" "$FNAME"
-+      if test ! -f "$FNAME"; then
-+        echo "Cannot install $FNAME. Does $USER have privileges? "
-+        exit 1
-+      fi
-+      chmod 0644 "$FNAME"
-+    elif test "$mode" = 'uninstall'; then
-+      rm -f "$FNAME"
-+      if test -f "$FNAME"; then
-+        echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+        exit 1
-+      fi
-+    else
-+      echo "Unknown mode, $mode.  Script called as $0 "
-+      exit 1
-+    fi
-+  done
-+
-+  # html help
-+  for f in $SRCDIR../swat/$ln/help/*.html; do
-+    if [ ! -f $f ] ; then
-+      continue
-+    fi
-+    FNAME="$DESTDIR/$SWATDIR/$ln/help/`basename $f`"
-+    echo $FNAME
-+    if test "$mode" = 'install'; then
-+      if [ "x$BOOKDIR" = "x" ]; then
-+        cat $f | sed 's/@BOOKDIR@.*$//' > $FNAME.tmp
-+      else
-+        cat $f | sed 's/@BOOKDIR@//' > $FNAME.tmp
-+      fi
-+      if test ! -f "$FNAME.tmp"; then
-+        echo "Cannot install $FNAME. Does $USER have privileges? "
-+        exit 1
-+      fi
-+      f=$FNAME.tmp
-+      cp "$f" "$FNAME"
-+      rm -f "$f"
-+      if test ! -f "$FNAME"; then
-+        echo "Cannot install $FNAME. Does $USER have privileges? "
-+        exit 1
-+      fi
-+      chmod 0644 "$FNAME"
-+    elif test "$mode" = 'uninstall'; then
-+      rm -f "$FNAME"
-+      if test -f "$FNAME"; then
-+        echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+        exit 1
-+      fi
-+    fi
-+  done
-+
-+  # "server-side" includes
-+  for f in $SRCDIR../swat/$ln/include/*; do
-+      if [ ! -f $f ] ; then
-+	continue
-+      fi
-+      FNAME="$DESTDIR/$SWATDIR/$ln/include/`basename $f`"
-+      echo $FNAME
-+      if test "$mode" = 'install'; then
-+        cp "$f" "$FNAME"
-+        if test ! -f "$FNAME"; then
-+          echo "Cannot install $FNAME. Does $USER have privileges? "
-+          exit 1
-+        fi
-+        chmod 0644 $FNAME
-+      elif test "$mode" = 'uninstall'; then
-+        rm -f "$FNAME"
-+        if test -f "$FNAME"; then
-+          echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+          exit 1
-+        fi
-+      fi
-+  done
-+
-+done
-+
-+# Install/ remove html documentation (if html documentation tree is here)
-+
-+if [ -d $SRCDIR../docs/htmldocs/ ]; then
-+
-+    for dir in htmldocs/manpages htmldocs/Samba3-ByExample  htmldocs/Samba3-Developers-Guide  htmldocs/Samba3-HOWTO
-+    do 
-+    
-+      if [ ! -d $SRCDIR../docs/$dir ]; then
-+        continue
-+      fi
-+      
-+      INSTALLDIR="$DESTDIR/$SWATDIR/help/`echo $dir | sed 's/htmldocs\///g'`"
-+      if test ! -d "$INSTALLDIR" -a "$mode" = 'install'; then
-+        mkdir "$INSTALLDIR"
-+        if test ! -d "$INSTALLDIR"; then
-+          echo "Failed to make directory $INSTALLDIR, does $USER have privileges? "
-+          exit 1
-+        fi
-+      fi
-+
-+      for f in $SRCDIR../docs/$dir/*.html; do
-+	  FNAME=$INSTALLDIR/`basename $f`
-+	  echo $FNAME
-+          if test "$mode" = 'install'; then
-+            cp "$f" "$FNAME"
-+            if test ! -f "$FNAME"; then
-+              echo "Cannot install $FNAME. Does $USER have privileges? "
-+              exit 1
-+            fi
-+            chmod 0644 $FNAME
-+          elif test "$mode" = 'uninstall'; then
-+            rm -f "$FNAME"
-+            if test -f "$FNAME"; then
-+              echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+              exit 1
-+            fi
-+          fi
-+      done
-+
-+      if test -d "$SRCDIR../docs/$dir/images/"; then
-+          if test ! -d "$INSTALLDIR/images/" -a "$mode" = 'install'; then
-+              mkdir "$INSTALLDIR/images"
-+              if test ! -d "$INSTALLDIR/images/"; then
-+                  echo "Failed to make directory $INSTALLDIR/images, does $USER have privileges? "
-+                  exit 1
-+              fi
-+          fi
-+          for f in $SRCDIR../docs/$dir/images/*.png; do
-+              FNAME=$INSTALLDIR/images/`basename $f`
-+              echo $FNAME
-+              if test "$mode" = 'install'; then
-+                cp "$f" "$FNAME"
-+                if test ! -f "$FNAME"; then
-+                  echo "Cannot install $FNAME. Does $USER have privileges? "
-+                  exit 1
-+                fi
-+                chmod 0644 $FNAME
-+              elif test "$mode" = 'uninstall'; then
-+                rm -f "$FNAME"
-+                if test -f "$FNAME"; then
-+                  echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+                  exit 1
-+                fi
-+              fi
-+          done
-+      fi
-+    done
-+fi
-+
-+# Install/ remove Using Samba book (but only if it is there)
-+
-+if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
-+
-+    # Create directories
-+
-+    for d in $BOOKDIR $BOOKDIR/figs ; do
-+        if test ! -d "$d" -a "$mode" = 'install'; then
-+            mkdir $d
-+            if test ! -d "$d"; then
-+                echo "Failed to make directory $d, does $USER have privileges? "
-+                exit 1
-+            fi
-+        fi
-+    done
-+
-+    # HTML files
-+
-+    for f in $SRCDIR../docs/htmldocs/using_samba/*.html; do
-+        FNAME=$BOOKDIR/`basename $f`
-+        echo $FNAME
-+        if test "$mode" = 'install'; then
-+          cp "$f" "$FNAME"
-+          if test ! -f "$FNAME"; then
-+            echo "Cannot install $FNAME. Does $USER have privileges? "
-+            exit 1
-+          fi
-+          chmod 0644 $FNAME
-+        elif test "$mode" = 'uninstall'; then
-+          rm -f "$FNAME"
-+          if test -f "$FNAME"; then
-+            echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+            exit 1
-+          fi
-+        fi
-+    done
-+
-+    for f in $SRCDIR../docs/htmldocs/using_samba/*.gif; do
-+        FNAME=$BOOKDIR/`basename $f`
-+        echo $FNAME
-+        if test "$mode" = 'install'; then
-+          cp "$f" "$FNAME"
-+          if test ! -f "$FNAME"; then
-+            echo "Cannot install $FNAME. Does $USER have privileges? "
-+            exit 1
-+          fi
-+          chmod 0644 $FNAME
-+        elif test "$mode" = 'uninstall'; then
-+          rm -f "$FNAME"
-+          if test -f "$FNAME"; then
-+            echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+            exit 1
-+          fi
-+        fi
-+    done
-+
-+    # Figures
-+
-+    for f in $SRCDIR../docs/htmldocs/using_samba/figs/*.gif; do
-+        FNAME=$BOOKDIR/figs/`basename $f`
-+        echo $FNAME
-+        if test "$mode" = 'install'; then
-+          cp "$f" "$FNAME"
-+          if test ! -f "$FNAME"; then
-+            echo "Cannot install $FNAME. Does $USER have privileges? "
-+            exit 1
-+          fi
-+          chmod 0644 $FNAME
-+        elif test "$mode" = 'uninstall'; then
-+          rm -f "$FNAME"
-+          if test -f "$FNAME"; then
-+            echo "Cannot remove $FNAME.  Does $USER have privileges? "
-+            exit 1
-+          fi
-+        fi
-+    done
-+
-+fi
-+
-+if test "$mode" = 'install'; then
-+  cat << EOF
-+======================================================================
-+The SWAT files have been installed. Remember to read the documentation
-+for information on enabling and using SWAT
-+======================================================================
-+EOF
-+else
-+  cat << EOF
-+======================================================================
-+The SWAT files have been removed.  You may restore these files using
-+the command "make installswat" or "make install" to install binaries, 
-+man pages, modules, SWAT, and shell scripts.
-+======================================================================
-+EOF
-+fi
-+
-+exit 0
-+
-diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
-index 1a32d7a..122489e 100644
---- a/source3/script/mkbuildoptions.awk
-+++ b/source3/script/mkbuildoptions.awk
-@@ -79,6 +79,7 @@ BEGIN {
- 
- 	print "       output(screen,\"   SBINDIR: %s\\n\", get_dyn_SBINDIR());";
- 	print "       output(screen,\"   BINDIR: %s\\n\", get_dyn_BINDIR());";
-+	print "       output(screen,\"   SWATDIR: %s\\n\", get_dyn_SWATDIR());";
- 
- 	print "       output(screen,\"   CONFIGFILE: %s\\n\", get_dyn_CONFIGFILE());";
- 	print "       output(screen,\"   LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());";
-diff --git a/source3/web/cgi.c b/source3/web/cgi.c
-new file mode 100644
-index 0000000..b97ed25
---- /dev/null
-+++ b/source3/web/cgi.c
-@@ -0,0 +1,798 @@
-+/* 
-+   some simple CGI helper routines
-+   Copyright (C) Andrew Tridgell 1997-1998
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+
-+#include "includes.h"
-+#include "system/passwd.h"
-+#include "system/filesys.h"
-+#include "web/swat_proto.h"
-+#include "intl/lang_tdb.h"
-+#include "auth.h"
-+#include "secrets.h"
-+#include "../lib/util/setid.h"
-+
-+#define MAX_VARIABLES 10000
-+
-+/* set the expiry on fixed pages */
-+#define EXPIRY_TIME (60*60*24*7)
-+
-+#ifdef DEBUG_COMMENTS
-+extern void print_title(char *fmt, ...);
-+#endif
-+
-+struct cgi_var {
-+	char *name;
-+	char *value;
-+};
-+
-+static struct cgi_var variables[MAX_VARIABLES];
-+static int num_variables;
-+static int content_length;
-+static int request_post;
-+static char *query_string;
-+static const char *baseurl;
-+static char *pathinfo;
-+static char *C_user;
-+static char *C_pass;
-+static bool inetd_server;
-+static bool got_request;
-+
-+static char *grab_line(FILE *f, int *cl)
-+{
-+	char *ret = NULL;
-+	int i = 0;
-+	int len = 0;
-+
-+	while ((*cl)) {
-+		int c;
-+
-+		if (i == len) {
-+			char *ret2;
-+			if (len == 0) len = 1024;
-+			else len *= 2;
-+			ret2 = (char *)SMB_REALLOC_KEEP_OLD_ON_ERROR(ret, len);
-+			if (!ret2) return ret;
-+			ret = ret2;
-+		}
-+
-+		c = fgetc(f);
-+		(*cl)--;
-+
-+		if (c == EOF) {
-+			(*cl) = 0;
-+			break;
-+		}
-+
-+		if (c == '\r') continue;
-+
-+		if (strchr_m("\n&", c)) break;
-+
-+		ret[i++] = c;
-+
-+	}
-+
-+	if (ret) {
-+		ret[i] = 0;
-+	}
-+	return ret;
-+}
-+
-+/**
-+ URL encoded strings can have a '+', which should be replaced with a space
-+
-+ (This was in rfc1738_unescape(), but that broke the squid helper)
-+**/
-+
-+static void plus_to_space_unescape(char *buf)
-+{
-+	char *p=buf;
-+
-+	while ((p=strchr_m(p,'+')))
-+		*p = ' ';
-+}
-+
-+/***************************************************************************
-+  load all the variables passed to the CGI program. May have multiple variables
-+  with the same name and the same or different values. Takes a file parameter
-+  for simulating CGI invocation eg loading saved preferences.
-+  ***************************************************************************/
-+void cgi_load_variables(void)
-+{
-+	static char *line;
-+	char *p, *s, *tok;
-+	int len, i;
-+	FILE *f = stdin;
-+
-+#ifdef DEBUG_COMMENTS
-+	char dummy[100]="";
-+	print_title(dummy);
-+	printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
-+#endif
-+
-+	if (!content_length) {
-+		p = getenv("CONTENT_LENGTH");
-+		len = p?atoi(p):0;
-+	} else {
-+		len = content_length;
-+	}
-+
-+
-+	if (len > 0 && 
-+	    (request_post ||
-+	     ((s=getenv("REQUEST_METHOD")) && 
-+	      strequal(s,"POST")))) {
-+		while (len && (line=grab_line(f, &len))) {
-+			p = strchr_m(line,'=');
-+			if (!p) continue;
-+
-+			*p = 0;
-+
-+			variables[num_variables].name = SMB_STRDUP(line);
-+			variables[num_variables].value = SMB_STRDUP(p+1);
-+
-+			SAFE_FREE(line);
-+
-+			if (!variables[num_variables].name || 
-+			    !variables[num_variables].value)
-+				continue;
-+
-+			plus_to_space_unescape(variables[num_variables].value);
-+			rfc1738_unescape(variables[num_variables].value);
-+			plus_to_space_unescape(variables[num_variables].name);
-+			rfc1738_unescape(variables[num_variables].name);
-+
-+#ifdef DEBUG_COMMENTS
-+			printf("<!== POST var %s has value \"%s\"  ==>\n",
-+			       variables[num_variables].name,
-+			       variables[num_variables].value);
-+#endif
-+
-+			num_variables++;
-+			if (num_variables == MAX_VARIABLES) break;
-+		}
-+	}
-+
-+	fclose(stdin);
-+	open("/dev/null", O_RDWR);
-+
-+	if ((s=query_string) || (s=getenv("QUERY_STRING"))) {
-+		char *saveptr;
-+		for (tok=strtok_r(s, "&;", &saveptr); tok;
-+		     tok=strtok_r(NULL, "&;", &saveptr)) {
-+			p = strchr_m(tok,'=');
-+			if (!p) continue;
-+
-+			*p = 0;
-+
-+			variables[num_variables].name = SMB_STRDUP(tok);
-+			variables[num_variables].value = SMB_STRDUP(p+1);
-+
-+			if (!variables[num_variables].name ||
-+			    !variables[num_variables].value)
-+				continue;
-+
-+			plus_to_space_unescape(variables[num_variables].value);
-+			rfc1738_unescape(variables[num_variables].value);
-+			plus_to_space_unescape(variables[num_variables].name);
-+			rfc1738_unescape(variables[num_variables].name);
-+
-+#ifdef DEBUG_COMMENTS
-+                        printf("<!== Commandline var %s has value \"%s\"  ==>\n",
-+                               variables[num_variables].name,
-+                               variables[num_variables].value);
-+#endif
-+			num_variables++;
-+			if (num_variables == MAX_VARIABLES) break;
-+		}
-+
-+	}
-+#ifdef DEBUG_COMMENTS
-+        printf("<!== End dump in cgi_load_variables() ==>\n");
-+#endif
-+
-+	/* variables from the client are in UTF-8 - convert them
-+	   to our internal unix charset before use */
-+	for (i=0;i<num_variables;i++) {
-+		TALLOC_CTX *frame = talloc_stackframe();
-+		char *dest = NULL;
-+		size_t dest_len;
-+
-+		convert_string_talloc(frame, CH_UTF8, CH_UNIX,
-+			       variables[i].name, strlen(variables[i].name),
-+			       &dest, &dest_len);
-+		SAFE_FREE(variables[i].name);
-+		variables[i].name = SMB_STRDUP(dest ? dest : "");
-+
-+		dest = NULL;
-+		convert_string_talloc(frame, CH_UTF8, CH_UNIX,
-+			       variables[i].value, strlen(variables[i].value),
-+			       &dest, &dest_len);
-+		SAFE_FREE(variables[i].value);
-+		variables[i].value = SMB_STRDUP(dest ? dest : "");
-+		TALLOC_FREE(frame);
-+	}
-+}
-+
-+
-+/***************************************************************************
-+  find a variable passed via CGI
-+  Doesn't quite do what you think in the case of POST text variables, because
-+  if they exist they might have a value of "" or even " ", depending on the
-+  browser. Also doesn't allow for variables[] containing multiple variables
-+  with the same name and the same or different values.
-+  ***************************************************************************/
-+
-+const char *cgi_variable(const char *name)
-+{
-+	int i;
-+
-+	for (i=0;i<num_variables;i++)
-+		if (strcmp(variables[i].name, name) == 0)
-+			return variables[i].value;
-+	return NULL;
-+}
-+
-+/***************************************************************************
-+ Version of the above that can't return a NULL pointer.
-+***************************************************************************/
-+
-+const char *cgi_variable_nonull(const char *name)
-+{
-+	const char *var = cgi_variable(name);
-+	if (var) {
-+		return var;
-+	} else {
-+		return "";
-+	}
-+}
-+
-+/***************************************************************************
-+tell a browser about a fatal error in the http processing
-+  ***************************************************************************/
-+static void cgi_setup_error(const char *err, const char *header, const char *info)
-+{
-+	if (!got_request) {
-+		/* damn browsers don't like getting cut off before they give a request */
-+		char line[1024];
-+		while (fgets(line, sizeof(line)-1, stdin)) {
-+			if (strnequal(line,"GET ", 4) || 
-+			    strnequal(line,"POST ", 5) ||
-+			    strnequal(line,"PUT ", 4)) {
-+				break;
-+			}
-+		}
-+	}
-+
-+	printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n\r\n", err, header, err, err, info);
-+	fclose(stdin);
-+	fclose(stdout);
-+	exit(0);
-+}
-+
-+
-+/***************************************************************************
-+tell a browser about a fatal authentication error
-+  ***************************************************************************/
-+static void cgi_auth_error(void)
-+{
-+	if (inetd_server) {
-+                cgi_setup_error("401 Authorization Required", 
-+                                "WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
-+                                "You must be authenticated to use this service");
-+	} else {
-+		printf("Content-Type: text/html\r\n");
-+
-+		printf("\r\n<HTML><HEAD><TITLE>SWAT</TITLE></HEAD>\n");
-+		printf("<BODY><H1>Installation Error</H1>\n");
-+		printf("SWAT must be installed via inetd. It cannot be run as a CGI script<p>\n");
-+		printf("</BODY></HTML>\r\n");
-+	}
-+	exit(0);
-+}
-+
-+/***************************************************************************
-+authenticate when we are running as a CGI
-+  ***************************************************************************/
-+static void cgi_web_auth(void)
-+{
-+	const char *user = getenv("REMOTE_USER");
-+	struct passwd *pwd;
-+	const char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n";
-+	const char *tail = "</BODY></HTML>\r\n";
-+
-+	if (!user) {
-+		printf("%sREMOTE_USER not set. Not authenticated by web server.<br>%s\n",
-+		       head, tail);
-+		exit(0);
-+	}
-+
-+	pwd = Get_Pwnam_alloc(talloc_tos(), user);
-+	if (!pwd) {
-+		printf("%sCannot find user %s<br>%s\n", head, user, tail);
-+		exit(0);
-+	}
-+
-+	C_user = SMB_STRDUP(user);
-+
-+	if (!samba_setuid(0)) {
-+		C_pass = secrets_fetch_generic("root", "SWAT");
-+		if (C_pass == NULL) {
-+			char *tmp_pass = NULL;
-+			tmp_pass = generate_random_password(talloc_tos(),
-+							    16, 16);
-+			if (tmp_pass == NULL) {
-+				printf("%sFailed to create random nonce for "
-+				       "SWAT session\n<br>%s\n", head, tail);
-+				exit(0);
-+			}
-+			secrets_store_generic("root", "SWAT", tmp_pass);
-+			C_pass = SMB_STRDUP(tmp_pass);
-+			TALLOC_FREE(tmp_pass);
-+		}
-+	}
-+	samba_setuid(pwd->pw_uid);
-+	if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) {
-+		printf("%sFailed to become user %s - uid=%d/%d<br>%s\n", 
-+		       head, user, (int)geteuid(), (int)getuid(), tail);
-+		exit(0);
-+	}
-+	TALLOC_FREE(pwd);
-+}
-+
-+
-+/***************************************************************************
-+handle a http authentication line
-+  ***************************************************************************/
-+static bool cgi_handle_authorization(char *line)
-+{
-+	char *p;
-+	fstring user, user_pass;
-+	struct passwd *pass = NULL;
-+	const char *rhost;
-+	char addr[INET6_ADDRSTRLEN];
-+	size_t size = 0;
-+
-+	if (!strnequal(line,"Basic ", 6)) {
-+		goto err;
-+	}
-+	line += 6;
-+	while (line[0] == ' ') line++;
-+	base64_decode_inplace(line);
-+	if (!(p=strchr_m(line,':'))) {
-+		/*
-+		 * Always give the same error so a cracker
-+		 * cannot tell why we fail.
-+		 */
-+		goto err;
-+	}
-+	*p = 0;
-+
-+	if (!convert_string(CH_UTF8, CH_UNIX,
-+		       line, -1, 
-+		       user, sizeof(user), &size)) {
-+		goto err;
-+	}
-+
-+	if (!convert_string(CH_UTF8, CH_UNIX,
-+		       p+1, -1, 
-+		       user_pass, sizeof(user_pass), &size)) {
-+		goto err;
-+	}
-+
-+	/*
-+	 * Try and get the user from the UNIX password file.
-+	 */
-+
-+	pass = Get_Pwnam_alloc(talloc_tos(), user);
-+
-+	rhost = client_name(1);
-+	if (strequal(rhost,"UNKNOWN"))
-+		rhost = client_addr(1, addr, sizeof(addr));
-+
-+	/*
-+	 * Validate the password they have given.
-+	 */
-+
-+	if NT_STATUS_IS_OK(pass_check(pass, user, rhost, user_pass, false)) {
-+		if (pass) {
-+			/*
-+			 * Password was ok.
-+			 */
-+
-+			if ( initgroups(pass->pw_name, pass->pw_gid) != 0 )
-+				goto err;
-+
-+			become_user_permanently(pass->pw_uid, pass->pw_gid);
-+
-+			/* Save the users name */
-+			C_user = SMB_STRDUP(user);
-+			C_pass = SMB_STRDUP(user_pass);
-+			TALLOC_FREE(pass);
-+			return True;
-+		}
-+	}
-+
-+err:
-+	cgi_setup_error("401 Bad Authorization", 
-+			"WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
-+			"username or password incorrect");
-+
-+	TALLOC_FREE(pass);
-+	return False;
-+}
-+
-+/***************************************************************************
-+is this root?
-+  ***************************************************************************/
-+bool am_root(void)
-+{
-+	if (geteuid() == 0) {
-+		return( True);
-+	} else {
-+		return( False);
-+	}
-+}
-+
-+/***************************************************************************
-+return a ptr to the users name
-+  ***************************************************************************/
-+char *cgi_user_name(void)
-+{
-+        return(C_user);
-+}
-+
-+/***************************************************************************
-+return a ptr to the users password
-+  ***************************************************************************/
-+char *cgi_user_pass(void)
-+{
-+        return(C_pass);
-+}
-+
-+/***************************************************************************
-+handle a file download
-+  ***************************************************************************/
-+static void cgi_download(char *file)
-+{
-+	SMB_STRUCT_STAT st;
-+	char buf[1024];
-+	int fd, l, i;
-+	char *p;
-+	char *lang;
-+
-+	/* sanitise the filename */
-+	for (i=0;file[i];i++) {
-+		if (!isalnum((int)file[i]) && !strchr_m("/.-_", file[i])) {
-+			cgi_setup_error("404 File Not Found","",
-+					"Illegal character in filename");
-+		}
-+	}
-+
-+	if (sys_stat(file, &st, false) != 0)	{
-+		cgi_setup_error("404 File Not Found","",
-+				"The requested file was not found");
-+	}
-+
-+	if (S_ISDIR(st.st_ex_mode))
-+	{
-+		snprintf(buf, sizeof(buf), "%s/index.html", file);
-+		if (!file_exist_stat(buf, &st, false)
-+		    || !S_ISREG(st.st_ex_mode))
-+		{
-+			cgi_setup_error("404 File Not Found","",
-+					"The requested file was not found");
-+		}
-+	}
-+	else if (S_ISREG(st.st_ex_mode))
-+	{
-+		snprintf(buf, sizeof(buf), "%s", file);
-+	}
-+	else
-+	{
-+		cgi_setup_error("404 File Not Found","",
-+				"The requested file was not found");
-+	}
-+
-+	fd = web_open(buf,O_RDONLY,0);
-+	if (fd == -1) {
-+		cgi_setup_error("404 File Not Found","",
-+				"The requested file was not found");
-+	}
-+	printf("HTTP/1.0 200 OK\r\n");
-+	if ((p=strrchr_m(buf, '.'))) {
-+		if (strcmp(p,".gif")==0) {
-+			printf("Content-Type: image/gif\r\n");
-+		} else if (strcmp(p,".jpg")==0) {
-+			printf("Content-Type: image/jpeg\r\n");
-+		} else if (strcmp(p,".png")==0) {
-+			printf("Content-Type: image/png\r\n");
-+		} else if (strcmp(p,".css")==0) {
-+			printf("Content-Type: text/css\r\n");
-+		} else if (strcmp(p,".txt")==0) {
-+			printf("Content-Type: text/plain\r\n");
-+		} else {
-+			printf("Content-Type: text/html\r\n");
-+		}
-+	}
-+	printf("Expires: %s\r\n", 
-+		   http_timestring(talloc_tos(), time(NULL)+EXPIRY_TIME));
-+
-+	lang = lang_tdb_current();
-+	if (lang) {
-+		printf("Content-Language: %s\r\n", lang);
-+	}
-+
-+	printf("Content-Length: %d\r\n\r\n", (int)st.st_ex_size);
-+	while ((l=read(fd,buf,sizeof(buf)))>0) {
-+		if (fwrite(buf, 1, l, stdout) != l) {
-+			break;
-+		}
-+	}
-+	close(fd);
-+	exit(0);
-+}
-+
-+
-+
-+/* return true if the char* contains ip addrs only.  Used to avoid
-+name lookup calls */
-+
-+static bool only_ipaddrs_in_list(const char **list)
-+{
-+	bool only_ip = true;
-+
-+	if (!list) {
-+		return true;
-+	}
-+
-+	for (; *list ; list++) {
-+		/* factor out the special strings */
-+		if (strequal(*list, "ALL") || strequal(*list, "FAIL") ||
-+		    strequal(*list, "EXCEPT")) {
-+			continue;
-+		}
-+
-+		if (!is_ipaddress(*list)) {
-+			/*
-+			 * If we failed, make sure that it was not because
-+			 * the token was a network/netmask pair. Only
-+			 * network/netmask pairs have a '/' in them.
-+			 */
-+			if ((strchr_m(*list, '/')) == NULL) {
-+				only_ip = false;
-+				DEBUG(3,("only_ipaddrs_in_list: list has "
-+					"non-ip address (%s)\n",
-+					*list));
-+				break;
-+			}
-+		}
-+	}
-+
-+	return only_ip;
-+}
-+
-+/* return true if access should be allowed to a service for a socket */
-+static bool check_access(int sock, const char **allow_list,
-+			 const char **deny_list)
-+{
-+	bool ret = false;
-+	bool only_ip = false;
-+	char addr[INET6_ADDRSTRLEN];
-+
-+	if ((!deny_list || *deny_list==0) && (!allow_list || *allow_list==0)) {
-+		return true;
-+	}
-+
-+	/* Bypass name resolution calls if the lists
-+	 * only contain IP addrs */
-+	if (only_ipaddrs_in_list(allow_list) &&
-+	    only_ipaddrs_in_list(deny_list)) {
-+		only_ip = true;
-+		DEBUG (3, ("check_access: no hostnames "
-+			   "in host allow/deny list.\n"));
-+		ret = allow_access(deny_list,
-+				   allow_list,
-+				   "",
-+				   get_peer_addr(sock,addr,sizeof(addr)));
-+	} else {
-+		DEBUG (3, ("check_access: hostnames in "
-+			   "host allow/deny list.\n"));
-+		ret = allow_access(deny_list,
-+				   allow_list,
-+				   get_peer_name(sock,true),
-+				   get_peer_addr(sock,addr,sizeof(addr)));
-+	}
-+
-+	if (ret) {
-+		DEBUG(2,("Allowed connection from %s (%s)\n",
-+			 only_ip ? "" : get_peer_name(sock,true),
-+			 get_peer_addr(sock,addr,sizeof(addr))));
-+	} else {
-+		DEBUG(0,("Denied connection from %s (%s)\n",
-+			 only_ip ? "" : get_peer_name(sock,true),
-+			 get_peer_addr(sock,addr,sizeof(addr))));
-+	}
-+
-+	return(ret);
-+}
-+
-+/**
-+ * @brief Setup the CGI framework.
-+ *
-+ * Setup the cgi framework, handling the possibility that this program
-+ * is either run as a true CGI program with a gateway to a web server, or
-+ * is itself a mini web server.
-+ **/
-+void cgi_setup(const char *rootdir, int auth_required)
-+{
-+	bool authenticated = False;
-+	char line[1024];
-+	char *url=NULL;
-+	char *p;
-+	char *lang;
-+
-+	if (chdir(rootdir)) {
-+		cgi_setup_error("500 Server Error", "",
-+				"chdir failed - the server is not configured correctly");
-+	}
-+
-+	/* Handle the possibility we might be running as non-root */
-+	sec_init();
-+
-+	if ((lang=getenv("HTTP_ACCEPT_LANGUAGE"))) {
-+		/* if running as a cgi program */
-+		web_set_lang(lang);
-+	}
-+
-+	/* maybe we are running under a web server */
-+	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
-+		if (auth_required) {
-+			cgi_web_auth();
-+		}
-+		return;
-+	}
-+
-+	inetd_server = True;
-+
-+	if (!check_access(1, lp_hostsallow(-1), lp_hostsdeny(-1))) {
-+		cgi_setup_error("403 Forbidden", "",
-+				"Samba is configured to deny access from this client\n<br>Check your \"hosts allow\" and \"hosts deny\" options in smb.conf ");
-+	}
-+
-+	/* we are a mini-web server. We need to read the request from stdin
-+	   and handle authentication etc */
-+	while (fgets(line, sizeof(line)-1, stdin)) {
-+		if (line[0] == '\r' || line[0] == '\n') break;
-+		if (strnequal(line,"GET ", 4)) {
-+			got_request = True;
-+			url = SMB_STRDUP(&line[4]);
-+		} else if (strnequal(line,"POST ", 5)) {
-+			got_request = True;
-+			request_post = 1;
-+			url = SMB_STRDUP(&line[5]);
-+		} else if (strnequal(line,"PUT ", 4)) {
-+			got_request = True;
-+			cgi_setup_error("400 Bad Request", "",
-+					"This server does not accept PUT requests");
-+		} else if (strnequal(line,"Authorization: ", 15)) {
-+			authenticated = cgi_handle_authorization(&line[15]);
-+		} else if (strnequal(line,"Content-Length: ", 16)) {
-+			content_length = atoi(&line[16]);
-+		} else if (strnequal(line,"Accept-Language: ", 17)) {
-+			web_set_lang(&line[17]);
-+		}
-+		/* ignore all other requests! */
-+	}
-+
-+	if (auth_required && !authenticated) {
-+		cgi_auth_error();
-+	}
-+
-+	if (!url) {
-+		cgi_setup_error("400 Bad Request", "",
-+				"You must specify a GET or POST request");
-+	}
-+
-+	/* trim the URL */
-+	if ((p = strchr_m(url,' ')) || (p=strchr_m(url,'\t'))) {
-+		*p = 0;
-+	}
-+	while (*url && strchr_m("\r\n",url[strlen(url)-1])) {
-+		url[strlen(url)-1] = 0;
-+	}
-+
-+	/* anything following a ? in the URL is part of the query string */
-+	if ((p=strchr_m(url,'?'))) {
-+		query_string = p+1;
-+		*p = 0;
-+	}
-+
-+	string_sub(url, "/swat/", "", 0);
-+
-+	if (url[0] != '/' && strstr(url,"..")==0) {
-+		cgi_download(url);
-+	}
-+
-+	printf("HTTP/1.0 200 OK\r\nConnection: close\r\n");
-+	printf("Date: %s\r\n", http_timestring(talloc_tos(), time(NULL)));
-+	baseurl = "";
-+	pathinfo = url+1;
-+}
-+
-+
-+/***************************************************************************
-+return the current pages URL
-+  ***************************************************************************/
-+const char *cgi_baseurl(void)
-+{
-+	if (inetd_server) {
-+		return baseurl;
-+	}
-+	return getenv("SCRIPT_NAME");
-+}
-+
-+/***************************************************************************
-+return the current pages path info
-+  ***************************************************************************/
-+const char *cgi_pathinfo(void)
-+{
-+	char *r;
-+	if (inetd_server) {
-+		return pathinfo;
-+	}
-+	r = getenv("PATH_INFO");
-+	if (!r) return "";
-+	if (*r == '/') r++;
-+	return r;
-+}
-+
-+/***************************************************************************
-+return the hostname of the client
-+  ***************************************************************************/
-+const char *cgi_remote_host(void)
-+{
-+	if (inetd_server) {
-+		return get_peer_name(1,False);
-+	}
-+	return getenv("REMOTE_HOST");
-+}
-+
-+/***************************************************************************
-+return the hostname of the client
-+  ***************************************************************************/
-+const char *cgi_remote_addr(void)
-+{
-+	if (inetd_server) {
-+		char addr[INET6_ADDRSTRLEN];
-+		get_peer_addr(1,addr,sizeof(addr));
-+		return talloc_strdup(talloc_tos(), addr);
-+	}
-+	return getenv("REMOTE_ADDR");
-+}
-+
-+
-+/***************************************************************************
-+return True if the request was a POST
-+  ***************************************************************************/
-+bool cgi_waspost(void)
-+{
-+	if (inetd_server) {
-+		return request_post;
-+	}
-+	return strequal(getenv("REQUEST_METHOD"), "POST");
-+}
-diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
-new file mode 100644
-index 0000000..955ff89
---- /dev/null
-+++ b/source3/web/diagnose.c
-@@ -0,0 +1,80 @@
-+/* 
-+   Unix SMB/CIFS implementation.
-+   diagnosis tools for web admin
-+   Copyright (C) Andrew Tridgell 1998
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include "includes.h"
-+#include "web/swat_proto.h"
-+#include "lib/winbind_util.h"
-+#include "libsmb/libsmb.h"
-+
-+#ifdef WITH_WINBIND
-+
-+/* check to see if winbind is running by pinging it */
-+
-+bool winbindd_running(void)
-+{
-+	return winbind_ping();
-+}	
-+#endif
-+
-+/* check to see if nmbd is running on localhost by looking for a __SAMBA__
-+   response */
-+bool nmbd_running(void)
-+{
-+	struct in_addr loopback_ip;
-+	int count;
-+	struct sockaddr_storage *ss_list;
-+	struct sockaddr_storage ss;
-+	NTSTATUS status;
-+
-+	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
-+	in_addr_to_sockaddr_storage(&ss, loopback_ip);
-+
-+	status = name_query("__SAMBA__", 0,
-+			    True, True, &ss,
-+			    talloc_tos(), &ss_list, &count,
-+			    NULL);
-+	if (NT_STATUS_IS_OK(status)) {
-+		TALLOC_FREE(ss_list);
-+		return True;
-+	}
-+
-+	return False;
-+}
-+
-+
-+/* check to see if smbd is running on localhost by trying to open a connection
-+   then closing it */
-+bool smbd_running(void)
-+{
-+	struct in_addr loopback_ip;
-+	NTSTATUS status;
-+	struct cli_state *cli;
-+	struct sockaddr_storage ss;
-+
-+	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
-+	in_addr_to_sockaddr_storage(&ss, loopback_ip);
-+
-+	status = cli_connect_nb("localhost", &ss, 0, 0x20, lp_netbios_name(),
-+				SMB_SIGNING_DEFAULT, 0, &cli);
-+	if (!NT_STATUS_IS_OK(status)) {
-+		return false;
-+	}
-+	cli_shutdown(cli);
-+	return True;
-+}
-diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
-new file mode 100644
-index 0000000..c415449
---- /dev/null
-+++ b/source3/web/neg_lang.c
-@@ -0,0 +1,120 @@
-+/*
-+   Unix SMB/CIFS implementation.
-+   SWAT language handling
-+   
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+   Created by Ryo Kawahara <rkawa@lbe.co.jp> 
-+*/
-+
-+#include "includes.h"
-+#include "web/swat_proto.h"
-+#include "intl/lang_tdb.h"
-+#include "system/filesys.h"
-+
-+/*
-+  during a file download we first check to see if there is a language
-+  specific file available. If there is then use that, otherwise 
-+  just open the specified file
-+*/
-+int web_open(const char *fname, int flags, mode_t mode)
-+{
-+	char *p = NULL;
-+	char *lang = lang_tdb_current();
-+	int fd;
-+	if (lang) {
-+		if (asprintf(&p, "lang/%s/%s", lang, fname) != -1) {
-+			fd = open(p, flags, mode);
-+			free(p);
-+			if (fd != -1) {
-+				return fd;
-+			}
-+		}
-+	}
-+
-+	/* fall through to default name */
-+	return open(fname, flags, mode);
-+}
-+
-+
-+struct pri_list {
-+	float pri;
-+	char *string;
-+};
-+
-+static int qsort_cmp_list(struct pri_list *a, struct pri_list *b)
-+{
-+	if (a->pri > b->pri) return -1;
-+	if (a->pri < b->pri) return 1;
-+	return 0;
-+}
-+
-+/*
-+  choose from a list of languages. The list can be comma or space
-+  separated
-+  Keep choosing until we get a hit 
-+  Changed to habdle priority -- Simo
-+*/
-+
-+void web_set_lang(const char *lang_string)
-+{
-+	char **lang_list, **count;
-+	struct pri_list *pl;
-+	int lang_num, i;
-+
-+	/* build the lang list */
-+	lang_list = str_list_make_v3(talloc_tos(), lang_string, ", \t\r\n");
-+	if (!lang_list) return;
-+	
-+	/* sort the list by priority */
-+	lang_num = 0;
-+	count = lang_list;
-+	while (*count && **count) {
-+		count++;
-+		lang_num++;
-+	}
-+	pl = SMB_MALLOC_ARRAY(struct pri_list, lang_num);
-+	if (!pl) {
-+		return;
-+	}
-+
-+	for (i = 0; i < lang_num; i++) {
-+		char *pri_code;
-+		if ((pri_code=strstr(lang_list[i], ";q="))) {
-+			*pri_code = '\0';
-+			pri_code += 3;
-+			sscanf(pri_code, "%f", &(pl[i].pri));
-+		} else {
-+			pl[i].pri = 1;
-+		}
-+		pl[i].string = SMB_STRDUP(lang_list[i]);
-+	}
-+	TALLOC_FREE(lang_list);
-+
-+	TYPESAFE_QSORT(pl, lang_num, qsort_cmp_list);
-+
-+	/* it's not an error to not initialise - we just fall back to 
-+	   the default */
-+
-+	for (i = 0; i < lang_num; i++) {
-+		if (lang_tdb_init(pl[i].string)) break;
-+	}
-+
-+	for (i = 0; i < lang_num; i++) {
-+		SAFE_FREE(pl[i].string);
-+	}
-+	SAFE_FREE(pl);
-+
-+	return;
-+}
-diff --git a/source3/web/startstop.c b/source3/web/startstop.c
-new file mode 100644
-index 0000000..ec8f802
---- /dev/null
-+++ b/source3/web/startstop.c
-@@ -0,0 +1,130 @@
-+/* 
-+   Unix SMB/CIFS implementation.
-+   start/stop nmbd and smbd
-+   Copyright (C) Andrew Tridgell 1998
-+   
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include "includes.h"
-+#include "web/swat_proto.h"
-+#include "dynconfig/dynconfig.h"
-+#include "../lib/util/pidfile.h"
-+
-+/** Startup smbd from web interface. */
-+void start_smbd(void)
-+{
-+	char *binfile = NULL;
-+
-+	if (geteuid() != 0) {
-+		 return;
-+	}
-+
-+	if (fork()) {
-+		return;
-+	}
-+
-+	if (asprintf(&binfile, "%s/smbd", get_dyn_SBINDIR()) > 0) {
-+		become_daemon(true, false, false);
-+		execl(binfile, binfile, "-D", NULL);
-+	}
-+	exit(0);
-+}
-+
-+/* startup nmbd */
-+void start_nmbd(void)
-+{
-+	char *binfile = NULL;
-+
-+	if (geteuid() != 0) {
-+		return;
-+	}
-+
-+	if (fork()) {
-+		return;
-+	}
-+
-+	if (asprintf(&binfile, "%s/nmbd", get_dyn_SBINDIR()) > 0) {
-+		become_daemon(true, false, false);
-+		execl(binfile, binfile, "-D", NULL);
-+	}
-+	exit(0);
-+}
-+
-+/** Startup winbindd from web interface. */
-+void start_winbindd(void)
-+{
-+	char *binfile = NULL;
-+
-+	if (geteuid() != 0) {
-+		return;
-+	}
-+
-+	if (fork()) {
-+		return;
-+	}
-+
-+	if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
-+		become_daemon(true, false, false);
-+		execl(binfile, binfile, NULL);
-+	}
-+	exit(0);
-+}
-+
-+
-+/* stop smbd */
-+void stop_smbd(void)
-+{
-+	pid_t pid = pidfile_pid(lp_piddir(), "smbd");
-+
-+	if (geteuid() != 0) return;
-+
-+	if (pid <= 0) return;
-+
-+	kill(pid, SIGTERM);
-+}
-+
-+/* stop nmbd */
-+void stop_nmbd(void)
-+{
-+	pid_t pid = pidfile_pid(lp_piddir(), "nmbd");
-+
-+	if (geteuid() != 0) return;
-+
-+	if (pid <= 0) return;
-+
-+	kill(pid, SIGTERM);
-+}
-+#ifdef WITH_WINBIND
-+/* stop winbindd */
-+void stop_winbindd(void)
-+{
-+	pid_t pid = pidfile_pid(lp_piddir(), "winbindd");
-+
-+	if (geteuid() != 0) return;
-+
-+	if (pid <= 0) return;
-+
-+	kill(pid, SIGTERM);
-+}
-+#endif
-+/* kill a specified process */
-+void kill_pid(struct server_id pid)
-+{
-+	if (geteuid() != 0) return;
-+
-+	if (procid_to_pid(&pid) <= 0) return;
-+
-+	kill(procid_to_pid(&pid), SIGTERM);
-+}
-diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
-new file mode 100644
-index 0000000..d257970
---- /dev/null
-+++ b/source3/web/statuspage.c
-@@ -0,0 +1,467 @@
-+/* 
-+   Unix SMB/CIFS implementation.
-+   web status page
-+   Copyright (C) Andrew Tridgell 1997-1998
-+   
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+   
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+   
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include "includes.h"
-+#include "web/swat_proto.h"
-+#include "libcli/security/security.h"
-+#include "locking/proto.h"
-+#include "librpc/gen_ndr/open_files.h"
-+#include "lib/conn_tdb.h"
-+#include "../lib/util/pidfile.h"
-+
-+#define _(x) lang_msg_rotate(talloc_tos(),x)
-+
-+#define PIDMAP		struct PidMap
-+
-+/* how long to wait for start/stops to take effect */
-+#define SLEEP_TIME 3
-+
-+PIDMAP {
-+	PIDMAP	*next, *prev;
-+	struct server_id pid;
-+	char	*machine;
-+};
-+
-+static PIDMAP	*pidmap;
-+static int	PID_or_Machine;		/* 0 = show PID, else show Machine name */
-+
-+static struct server_id smbd_pid;
-+
-+/* from 2nd call on, remove old list */
-+static void initPid2Machine (void)
-+{
-+	/* show machine name rather PID on table "Open Files"? */
-+	if (PID_or_Machine) {
-+		PIDMAP *p, *next;
-+
-+		for (p = pidmap; p != NULL; p = next) {
-+			next = p->next;
-+			DLIST_REMOVE(pidmap, p);
-+			SAFE_FREE(p->machine);
-+			SAFE_FREE(p);
-+		}
-+
-+		pidmap = NULL;
-+	}
-+}
-+
-+/* add new PID <-> Machine name mapping */
-+static void addPid2Machine (struct server_id pid, const char *machine)
-+{
-+	/* show machine name rather PID on table "Open Files"? */
-+	if (PID_or_Machine) {
-+		PIDMAP *newmap;
-+
-+		if ((newmap = SMB_MALLOC_P(PIDMAP)) == NULL) {
-+			/* XXX need error message for this?
-+			   if malloc fails, PID is always shown */
-+			return;
-+		}
-+
-+		newmap->pid = pid;
-+		newmap->machine = SMB_STRDUP(machine);
-+
-+		DLIST_ADD(pidmap, newmap);
-+	}
-+}
-+
-+/* lookup PID <-> Machine name mapping */
-+static char *mapPid2Machine (struct server_id pid)
-+{
-+	static char pidbuf [64];
-+	PIDMAP *map;
-+
-+	/* show machine name rather PID on table "Open Files"? */
-+	if (PID_or_Machine) {
-+		for (map = pidmap; map != NULL; map = map->next) {
-+			if (serverid_equal(&pid, &map->pid)) {
-+				if (map->machine == NULL)	/* no machine name */
-+					break;			/* show PID */
-+
-+				return map->machine;
-+			}
-+		}
-+	}
-+
-+	/* PID not in list or machine name NULL? return pid as string */
-+	snprintf (pidbuf, sizeof (pidbuf) - 1, "%s",
-+		  procid_str_static(&pid));
-+	return pidbuf;
-+}
-+
-+static const char *tstring(TALLOC_CTX *ctx, time_t t)
-+{
-+	char *buf;
-+	buf = talloc_strdup(ctx, time_to_asc(t));
-+	if (!buf) {
-+		return "";
-+	}
-+	buf = talloc_all_string_sub(ctx,
-+			buf,
-+			" ",
-+			"&nbsp;");
-+	if (!buf) {
-+		return "";
-+	}
-+	return buf;
-+}
-+
-+static void print_share_mode(const struct share_mode_entry *e,
-+			     const char *sharepath,
-+			     const char *fname,
-+			     void *dummy)
-+{
-+	char           *utf8_fname;
-+	char           *utf8_sharepath;
-+	int deny_mode;
-+	size_t converted_size;
-+
-+	if (!is_valid_share_mode_entry(e)) {
-+		return;
-+	}
-+
-+	deny_mode = map_share_mode_to_deny_mode(e->share_access,
-+						    e->private_options);
-+
-+	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
-+	printf("<td>%u</td>",(unsigned int)e->uid);
-+	printf("<td>");
-+	switch ((deny_mode>>4)&0xF) {
-+	case DENY_NONE: printf("DENY_NONE"); break;
-+	case DENY_ALL:  printf("DENY_ALL   "); break;
-+	case DENY_DOS:  printf("DENY_DOS   "); break;
-+	case DENY_FCB:  printf("DENY_FCB   "); break;
-+	case DENY_READ: printf("DENY_READ  "); break;
-+	case DENY_WRITE:printf("DENY_WRITE "); break;
-+	}
-+	printf("</td>");
-+
-+	printf("<td>");
-+	if (e->access_mask & (FILE_READ_DATA|FILE_WRITE_DATA)) {
-+		printf("%s", _("RDWR       "));
-+	} else if (e->access_mask & FILE_WRITE_DATA) {
-+		printf("%s", _("WRONLY     "));
-+	} else {
-+		printf("%s", _("RDONLY     "));
-+	}
-+	printf("</td>");
-+
-+	printf("<td>");
-+	if((e->op_type & 
-+	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
-+	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
-+		printf("EXCLUSIVE+BATCH ");
-+	else if (e->op_type & EXCLUSIVE_OPLOCK)
-+		printf("EXCLUSIVE       ");
-+	else if (e->op_type & BATCH_OPLOCK)
-+		printf("BATCH           ");
-+	else if (e->op_type & LEVEL_II_OPLOCK)
-+		printf("LEVEL_II        ");
-+	else
-+		printf("NONE            ");
-+	printf("</td>");
-+
-+	push_utf8_talloc(talloc_tos(), &utf8_fname, fname, &converted_size);
-+	push_utf8_talloc(talloc_tos(), &utf8_sharepath, sharepath,
-+			 &converted_size);
-+	printf("<td>%s</td><td>%s</td><td>%s</td></tr>\n",
-+	       utf8_sharepath,utf8_fname,tstring(talloc_tos(),e->time.tv_sec));
-+	TALLOC_FREE(utf8_fname);
-+}
-+
-+
-+/* kill off any connections chosen by the user */
-+static int traverse_fn1(const struct connections_key *key,
-+			const struct connections_data *crec,
-+			void *private_data)
-+{
-+	if (crec->cnum == TID_FIELD_INVALID && process_exists(crec->pid)) {
-+		char buf[30];
-+		slprintf(buf,sizeof(buf)-1,"kill_%s", procid_str_static(&crec->pid));
-+		if (cgi_variable(buf)) {
-+			kill_pid(crec->pid);
-+			sleep(SLEEP_TIME);
-+		}
-+	}
-+	return 0;
-+}
-+
-+/* traversal fn for showing machine connections */
-+static int traverse_fn2(const struct connections_key *key,
-+                        const struct connections_data *crec,
-+                        void *private_data)
-+{
-+	if (crec->cnum == TID_FIELD_INVALID || !process_exists(crec->pid) ||
-+	    serverid_equal(&crec->pid, &smbd_pid))
-+		return 0;
-+
-+	addPid2Machine (crec->pid, crec->machine);
-+
-+	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>\n",
-+	       procid_str_static(&crec->pid),
-+	       crec->machine, crec->addr,
-+	       tstring(talloc_tos(),crec->start));
-+	if (geteuid() == 0) {
-+		printf("<td><input type=submit value=\"X\" name=\"kill_%s\"></td>\n",
-+		       procid_str_static(&crec->pid));
-+	}
-+	printf("</tr>\n");
-+
-+	return 0;
-+}
-+
-+/* traversal fn for showing share connections */
-+static int traverse_fn3(const struct connections_key *key,
-+                        const struct connections_data *crec,
-+                        void *private_data)
-+{
-+	if (crec->cnum == TID_FIELD_INVALID || !process_exists(crec->pid))
-+		return 0;
-+
-+	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
-+	       crec->servicename, uidtoname(crec->uid),
-+	       gidtoname(crec->gid),procid_str_static(&crec->pid),
-+	       crec->machine,
-+	       tstring(talloc_tos(),crec->start));
-+	return 0;
-+}
-+
-+
-+/* show the current server status */
-+void status_page(void)
-+{
-+	const char *v;
-+	int autorefresh=0;
-+	int refresh_interval=30;
-+	int nr_running=0;
-+	bool waitup = False;
-+	TALLOC_CTX *ctx = talloc_stackframe();
-+	const char form_name[] = "status";
-+
-+	smbd_pid = pid_to_procid(pidfile_pid(lp_piddir(), "smbd"));
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
-+		stop_smbd();
-+		start_smbd();
-+		waitup=True;
-+	}
-+
-+	if (cgi_variable("smbd_start") || cgi_variable("all_start")) {
-+		start_smbd();
-+		waitup=True;
-+	}
-+
-+	if (cgi_variable("smbd_stop") || cgi_variable("all_stop")) {
-+		stop_smbd();
-+		waitup=True;
-+	}
-+
-+	if (cgi_variable("nmbd_restart") || cgi_variable("all_restart")) {
-+		stop_nmbd();
-+		start_nmbd();
-+		waitup=True;
-+	}
-+	if (cgi_variable("nmbd_start") || cgi_variable("all_start")) {
-+		start_nmbd();
-+		waitup=True;
-+	}
-+
-+	if (cgi_variable("nmbd_stop")|| cgi_variable("all_stop")) {
-+		stop_nmbd();
-+		waitup=True;
-+	}
-+
-+#ifdef WITH_WINBIND
-+	if (cgi_variable("winbindd_restart") || cgi_variable("all_restart")) {
-+		stop_winbindd();
-+		start_winbindd();
-+		waitup=True;
-+	}
-+
-+	if (cgi_variable("winbindd_start") || cgi_variable("all_start")) {
-+		start_winbindd();
-+		waitup=True;
-+	}
-+
-+	if (cgi_variable("winbindd_stop") || cgi_variable("all_stop")) {
-+		stop_winbindd();
-+		waitup=True;
-+	}
-+#endif
-+	/* wait for daemons to start/stop */
-+	if (waitup)
-+		sleep(SLEEP_TIME);
-+	
-+	if (cgi_variable("autorefresh")) {
-+		autorefresh = 1;
-+	} else if (cgi_variable("norefresh")) {
-+		autorefresh = 0;
-+	} else if (cgi_variable("refresh")) {
-+		autorefresh = 1;
-+	}
-+
-+	if ((v=cgi_variable("refresh_interval"))) {
-+		refresh_interval = atoi(v);
-+	}
-+
-+	if (cgi_variable("show_client_in_col_1")) {
-+		PID_or_Machine = 1;
-+	}
-+
-+	if (cgi_variable("show_pid_in_col_1")) {
-+		PID_or_Machine = 0;
-+	}
-+
-+	connections_forall_read(traverse_fn1, NULL);
-+
-+	initPid2Machine ();
-+
-+output_page:
-+	printf("<H2>%s</H2>\n", _("Server Status"));
-+
-+	printf("<FORM method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	if (!autorefresh) {
-+		printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
-+		printf("<br>%s", _("Refresh Interval: "));
-+		printf("<input type=text size=2 name=\"refresh_interval\" value=\"%d\">\n", 
-+		       refresh_interval);
-+	} else {
-+		printf("<input type=submit value=\"%s\" name=\"norefresh\">\n", _("Stop Refreshing"));
-+		printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
-+		printf("<input type=hidden name=\"refresh\" value=\"1\">\n");
-+	}
-+
-+	printf("<p>\n");
-+
-+	printf("<table>\n");
-+
-+	printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), samba_version_string());
-+
-+	fflush(stdout);
-+	printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
-+	if (geteuid() == 0) {
-+	    if (smbd_running()) {
-+		nr_running++;
-+		printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
-+	    } else {
-+		printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
-+	    }
-+	    printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
-+	}
-+	printf("</tr>\n");
-+
-+	fflush(stdout);
-+	printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
-+	if (geteuid() == 0) {
-+	    if (nmbd_running()) {
-+		nr_running++;
-+		printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
-+	    } else {
-+		printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
-+	    }
-+	    printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));    
-+	}
-+	printf("</tr>\n");
-+
-+#ifdef WITH_WINBIND
-+	fflush(stdout);
-+	printf("<tr><td>%s</td><td>%s</td>\n", _("winbindd:"), winbindd_running()?_("running"):_("not running"));
-+	if (geteuid() == 0) {
-+	    if (winbindd_running()) {
-+		nr_running++;
-+		printf("<td><input type=submit name=\"winbindd_stop\" value=\"%s\"></td>\n", _("Stop winbindd"));
-+	    } else {
-+		printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
-+	    }
-+	    printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
-+	}
-+	printf("</tr>\n");
-+#endif
-+
-+	if (geteuid() == 0) {
-+	    printf("<tr><td></td><td></td>\n");
-+	    if (nr_running >= 1) {
-+	        /* stop, restart all */
-+		printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
-+		printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
-+	    }
-+	    else if (nr_running == 0) {
-+	    	/* start all */
-+		printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
-+	    }
-+	    printf("</tr>\n");
-+	}
-+	printf("</table>\n");
-+	fflush(stdout);
-+
-+	printf("<p><h3>%s</h3>\n", _("Active Connections"));
-+	printf("<table border=1>\n");
-+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
-+	if (geteuid() == 0) {
-+		printf("<th>%s</th>\n", _("Kill"));
-+	}
-+	printf("</tr>\n");
-+
-+	connections_forall_read(traverse_fn2, NULL);
-+
-+	printf("</table><p>\n");
-+
-+	printf("<p><h3>%s</h3>\n", _("Active Shares"));
-+	printf("<table border=1>\n");
-+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
-+		_("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
-+
-+	connections_forall_read(traverse_fn3, NULL);
-+
-+	printf("</table><p>\n");
-+
-+	printf("<h3>%s</h3>\n", _("Open Files"));
-+	printf("<table border=1>\n");
-+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
-+		_("PID"), _("UID"), _("Sharing"), _("R/W"), _("Oplock"), _("Share"), _("File"), _("Date"));
-+
-+	locking_init_readonly();
-+	share_mode_forall(print_share_mode, NULL);
-+	locking_end();
-+	printf("</table>\n");
-+
-+	printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
-+	printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
-+
-+	printf("</FORM>\n");
-+
-+	if (autorefresh) {
-+		/* this little JavaScript allows for automatic refresh
-+                   of the page. There are other methods but this seems
-+                   to be the best alternative */
-+		printf("<script language=\"JavaScript\">\n");
-+		printf("\n</script>\n");
-+	}
-+	TALLOC_FREE(ctx);
-+}
-diff --git a/source3/web/swat.c b/source3/web/swat.c
-index bbacdd1..90e4af9 100644
---- a/source3/web/swat.c
-+++ b/source3/web/swat.c
-@@ -1,4 +1,4 @@
--/*
-+/* 
-    Unix SMB/CIFS implementation.
-    Samba Web Administration Tool
-    Version 3.0.0
-@@ -18,41 +18,1650 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-+
-+/**
-+ * @defgroup swat SWAT - Samba Web Administration Tool
-+ * @{ 
-+ * @file swat.c
-+ *
-+ * @brief Samba Web Administration Tool.
-+ **/
-+
-+#include "includes.h"
-+#include "system/filesys.h"
-+#include "popt_common.h"
-+#include "web/swat_proto.h"
-+#include "printing/pcap.h"
-+#include "printing/load.h"
-+#include "passdb.h"
-+#include "intl/lang_tdb.h"
-+#include "../lib/crypto/md5.h"
-+#include "lib/param/loadparm.h"
-+#include "messages.h"
-+
-+static int demo_mode = False;
-+static int passwd_only = False;
-+static bool have_write_access = False;
-+static bool have_read_access = False;
-+static int iNumNonAutoPrintServices = 0;
-+
- /*
-- * 1997 - 2013    SWAT
-- *       R.I.P.                                                    :,
-- *  Finally swatted, you will bug us no more.                     @,@
-- *                                                              +#`@
-- *                                                             @`:@
-- *              ,'                                           :@ #'
-- *             +   @                                        @: @.
-- *            @    +                                      ,@ .@
-- *           ;`     ;                                    @; #+
-- *   @@`     @      @                                  ;@  @`
-- *  #  :@   '       #                                 @, ##
-- * @     +.  #       `                              ## .@
-- *         #  #      '                            ;@  @;
-- *,         '  #     +                          ,@` @@
-- *'           ` +    :                        .@, #@
-- *#       `@@#.  :                          ;@: '@
-- *+.       #` ,#@@@@@@@@@@@@@             #@` @@
-- * .@@.    @ `#@+,`    `##@+ +         .@@ `@#
-- *     +@. @ ;@;. `:;#   '`:+@      `@@, +@:
-- *        :@,#,  +`:;;;#.@@.:'   :@@: '@#
-- *         + ,: '+@@@@@@@@@+ ;@@+  '@@
-- *         .: :@@;.  @: ;;+@@; ;@@'
-- *          # ,#@',  @# .`;#@ @
-- *          #  .@     ''    ; @
-- *          @  ,:@@@+;++..+,. @
-- *          @  @+;+@+@, .  ;` @'
-- *          @  :         . @,'@ '
-- *         .@@+#+''''++#@@@+;.,
-- *         .@ @'.    :  :++@@# .
-- *        + @:#@;'+@@@@@#;
-- *            ` :@;   .@ '#
-- *                 ,:    ,#
-- *               ,        +.
-- *           ,   :
-- *                `
-- *                +
-+ * Password Management Globals
-  */
-+#define SWAT_USER "username"
-+#define OLD_PSWD "old_passwd"
-+#define NEW_PSWD "new_passwd"
-+#define NEW2_PSWD "new2_passwd"
-+#define CHG_S_PASSWD_FLAG "chg_s_passwd_flag"
-+#define CHG_R_PASSWD_FLAG "chg_r_passwd_flag"
-+#define ADD_USER_FLAG "add_user_flag"
-+#define DELETE_USER_FLAG "delete_user_flag"
-+#define DISABLE_USER_FLAG "disable_user_flag"
-+#define ENABLE_USER_FLAG "enable_user_flag"
-+#define RHOST "remote_host"
-+#define XSRF_TOKEN "xsrf"
-+#define XSRF_TIME "xsrf_time"
-+#define XSRF_TIMEOUT 300
-+
-+#define _(x) lang_msg_rotate(talloc_tos(),x)
-+
-+/****************************************************************************
-+****************************************************************************/
-+static int enum_index(int value, const struct enum_list *enumlist)
-+{
-+	int i;
-+	for (i=0;enumlist[i].name;i++)
-+		if (value == enumlist[i].value) break;
-+	return(i);
-+}
-+
-+static char *fix_backslash(const char *str)
-+{
-+	static char newstring[1024];
-+	char *p = newstring;
-+
-+        while (*str) {
-+                if (*str == '\\') {*p++ = '\\';*p++ = '\\';}
-+                else *p++ = *str;
-+                ++str;
-+        }
-+	*p = '\0';
-+	return newstring;
-+}
-+
-+static const char *fix_quotes(TALLOC_CTX *ctx, char *str)
-+{
-+	char *newstring = NULL;
-+	char *p = NULL;
-+	size_t newstring_len;
-+	int quote_len = strlen("&quot;");
-+
-+	/* Count the number of quotes. */
-+	newstring_len = 1;
-+	p = (char *) str;
-+	while (*p) {
-+		if ( *p == '\"') {
-+			newstring_len += quote_len;
-+		} else {
-+			newstring_len++;
-+		}
-+		++p;
-+	}
-+	newstring = talloc_array(ctx, char, newstring_len);
-+	if (!newstring) {
-+		return "";
-+	}
-+	for (p = newstring; *str; str++) {
-+		if ( *str == '\"') {
-+			strncpy( p, "&quot;", quote_len);
-+			p += quote_len;
-+		} else {
-+			*p++ = *str;
-+		}
-+	}
-+	*p = '\0';
-+	return newstring;
-+}
-+
-+static char *stripspaceupper(const char *str)
-+{
-+	static char newstring[1024];
-+	char *p = newstring;
-+
-+	while (*str) {
-+		if (*str != ' ') *p++ = toupper_m(*str);
-+		++str;
-+	}
-+	*p = '\0';
-+	return newstring;
-+}
-+
-+static char *make_parm_name(const char *label)
-+{
-+	static char parmname[1024];
-+	char *p = parmname;
-+
-+	while (*label) {
-+		if (*label == ' ') *p++ = '_';
-+		else *p++ = *label;
-+		++label;
-+	}
-+	*p = '\0';
-+	return parmname;
-+}
-+
-+void get_xsrf_token(const char *username, const char *pass,
-+		    const char *formname, time_t xsrf_time, char token_str[33])
-+{
-+	struct MD5Context md5_ctx;
-+	uint8_t token[16];
-+	int i;
-+
-+	token_str[0] = '\0';
-+	ZERO_STRUCT(md5_ctx);
-+	MD5Init(&md5_ctx);
-+
-+	MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname));
-+	MD5Update(&md5_ctx, (uint8_t *)&xsrf_time, sizeof(time_t));
-+	if (username != NULL) {
-+		MD5Update(&md5_ctx, (uint8_t *)username, strlen(username));
-+	}
-+	if (pass != NULL) {
-+		MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass));
-+	}
-+
-+	MD5Final(token, &md5_ctx);
-+
-+	for(i = 0; i < sizeof(token); i++) {
-+		char tmp[3];
-+
-+		snprintf(tmp, sizeof(tmp), "%02x", token[i]);
-+		/* FIXME ! Truncate check. JRA. */
-+		(void)strlcat(token_str, tmp, sizeof(tmp));
-+	}
-+}
-+
-+void print_xsrf_token(const char *username, const char *pass,
-+		      const char *formname)
-+{
-+	char token[33];
-+	time_t xsrf_time = time(NULL);
-+
-+	get_xsrf_token(username, pass, formname, xsrf_time, token);
-+	printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n",
-+	       XSRF_TOKEN, token);
-+	printf("<input type=\"hidden\" name=\"%s\" value=\"%lld\">\n",
-+	       XSRF_TIME, (long long int)xsrf_time);
-+}
-+
-+bool verify_xsrf_token(const char *formname)
-+{
-+	char expected[33];
-+	const char *username = cgi_user_name();
-+	const char *pass = cgi_user_pass();
-+	const char *token = cgi_variable_nonull(XSRF_TOKEN);
-+	const char *time_str = cgi_variable_nonull(XSRF_TIME);
-+	char *p = NULL;
-+	long long xsrf_time_ll = 0;
-+	time_t xsrf_time = 0;
-+	time_t now = time(NULL);
-+
-+	errno = 0;
-+	xsrf_time_ll = strtoll(time_str, &p, 10);
-+	if (errno != 0) {
-+		return false;
-+	}
-+	if (p == NULL) {
-+		return false;
-+	}
-+	if (PTR_DIFF(p, time_str) > strlen(time_str)) {
-+		return false;
-+	}
-+	if (xsrf_time_ll > _TYPE_MAXIMUM(time_t)) {
-+		return false;
-+	}
-+	if (xsrf_time_ll < _TYPE_MINIMUM(time_t)) {
-+		return false;
-+	}
-+	xsrf_time = xsrf_time_ll;
-+
-+	if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
-+		return false;
-+	}
-+
-+	get_xsrf_token(username, pass, formname, xsrf_time, expected);
-+	return (strncmp(expected, token, sizeof(expected)) == 0);
-+}
-+
-+
-+/****************************************************************************
-+  include a lump of html in a page 
-+****************************************************************************/
-+static int include_html(const char *fname)
-+{
-+	int fd;
-+	char buf[1024];
-+	int ret;
-+
-+	fd = web_open(fname, O_RDONLY, 0);
-+
-+	if (fd == -1) {
-+		printf(_("ERROR: Can't open %s"), fname);
-+		printf("\n");
-+		return 0;
-+	}
-+
-+	while ((ret = read(fd, buf, sizeof(buf))) > 0) {
-+		if (write(1, buf, ret) == -1) {
-+			break;
-+		}
-+	}
-+
-+	close(fd);
-+	return 1;
-+}
-+
-+/****************************************************************************
-+  start the page with standard stuff 
-+****************************************************************************/
-+static void print_header(void)
-+{
-+	if (!cgi_waspost()) {
-+		printf("Expires: 0\r\n");
-+	}
-+	printf("Content-type: text/html\r\n\r\n");
-+
-+	if (!include_html("include/header.html")) {
-+		printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-+		printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
-+	}
-+}
-+
-+/* *******************************************************************
-+   show parameter label with translated name in the following form
-+   because showing original and translated label in one line looks
-+   too long, and showing translated label only is unusable for
-+   heavy users.
-+   -------------------------------
-+   HELP       security   [combo box][button]
-+   SECURITY
-+   -------------------------------
-+   (capital words are translated by gettext.)
-+   if no translation is available, then same form as original is
-+   used.
-+   "i18n_translated_parm" class is used to change the color of the
-+   translated parameter with CSS.
-+   **************************************************************** */
-+static const char *get_parm_translated(TALLOC_CTX *ctx,
-+	const char* pAnchor, const char* pHelp, const char* pLabel)
-+{
-+	const char *pTranslated = _(pLabel);
-+	char *output;
-+	if(strcmp(pLabel, pTranslated) != 0) {
-+		output = talloc_asprintf(ctx,
-+		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
-+		   pAnchor, pHelp, pLabel, pTranslated);
-+		return output;
-+	}
-+	output = talloc_asprintf(ctx,
-+	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
-+	  pAnchor, pHelp, pLabel);
-+	return output;
-+}
-+/****************************************************************************
-+ finish off the page
-+****************************************************************************/
-+static void print_footer(void)
-+{
-+	if (!include_html("include/footer.html")) {
-+		printf("\n</BODY>\n</HTML>\n");
-+	}
-+}
-+
-+/****************************************************************************
-+  display one editable parameter in a form
-+****************************************************************************/
-+static void show_parameter(int snum, struct parm_struct *parm)
-+{
-+	int i;
-+	void *ptr;
-+	char *utf8_s1, *utf8_s2;
-+	size_t converted_size;
-+	TALLOC_CTX *ctx = talloc_stackframe();
-+
-+	if (parm->p_class == P_LOCAL && snum >= 0) {
-+		ptr = lp_local_ptr_by_snum(snum, parm);
-+	} else {
-+		ptr = lp_parm_ptr(NULL, parm);
-+	}
-+
-+	printf("<tr><td>%s</td><td>", get_parm_translated(ctx,
-+				stripspaceupper(parm->label), _("Help"), parm->label));
-+	switch (parm->type) {
-+	case P_CHAR:
-+		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
-+		       make_parm_name(parm->label), *(char *)ptr);
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
-+			_("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue));
-+		break;
-+
-+	case P_LIST:
-+		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
-+			make_parm_name(parm->label));
-+		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
-+			char **list = *(char ***)ptr;
-+			for (;*list;list++) {
-+				/* enclose in HTML encoded quotes if the string contains a space */
-+				if ( strchr_m(*list, ' ') ) {
-+					push_utf8_talloc(talloc_tos(), &utf8_s1, *list, &converted_size);
-+					push_utf8_talloc(talloc_tos(), &utf8_s2, ((*(list+1))?", ":""), &converted_size);
-+					printf("&quot;%s&quot;%s", utf8_s1, utf8_s2);
-+				} else {
-+					push_utf8_talloc(talloc_tos(), &utf8_s1, *list, &converted_size);
-+					push_utf8_talloc(talloc_tos(), &utf8_s2, ((*(list+1))?", ":""), &converted_size);
-+					printf("%s%s", utf8_s1, utf8_s2);
-+				}
-+				TALLOC_FREE(utf8_s1);
-+				TALLOC_FREE(utf8_s2);
-+			}
-+		}
-+		printf("\">");
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
-+			_("Set Default"), make_parm_name(parm->label));
-+		if (parm->def.lvalue) {
-+			char **list = (char **)(parm->def.lvalue);
-+			for (; *list; list++) {
-+				/* enclose in HTML encoded quotes if the string contains a space */
-+				if ( strchr_m(*list, ' ') )
-+					printf("&quot;%s&quot;%s", *list, ((*(list+1))?", ":""));
-+				else
-+					printf("%s%s", *list, ((*(list+1))?", ":""));
-+			}
-+		}
-+		printf("\'\">");
-+		break;
-+
-+	case P_STRING:
-+	case P_USTRING:
-+		push_utf8_talloc(talloc_tos(), &utf8_s1, *(char **)ptr, &converted_size);
-+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-+		       make_parm_name(parm->label), fix_quotes(ctx, utf8_s1));
-+		TALLOC_FREE(utf8_s1);
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-+			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
-+		break;
-+
-+	case P_BOOL:
-+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-+		printf("<option %s>Yes", (*(bool *)ptr)?"selected":"");
-+		printf("<option %s>No", (*(bool *)ptr)?"":"selected");
-+		printf("</select>");
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-+			_("Set Default"), make_parm_name(parm->label),(bool)(parm->def.bvalue)?0:1);
-+		break;
-+
-+	case P_BOOLREV:
-+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-+		printf("<option %s>Yes", (*(bool *)ptr)?"":"selected");
-+		printf("<option %s>No", (*(bool *)ptr)?"selected":"");
-+		printf("</select>");
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-+			_("Set Default"), make_parm_name(parm->label),(bool)(parm->def.bvalue)?1:0);
-+		break;
-+
-+	case P_INTEGER:
-+	case P_BYTES:
-+		printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
-+			_("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
-+		break;
-+
-+	case P_OCTAL: {
-+		char *o;
-+		o = octal_string(*(int *)ptr);
-+		printf("<input type=text size=8 name=\"parm_%s\" value=%s>",
-+		       make_parm_name(parm->label), o);
-+		TALLOC_FREE(o);
-+		o = octal_string((int)(parm->def.ivalue));
-+		printf("<input type=button value=\"%s\" "
-+		       "onClick=\"swatform.parm_%s.value=\'%s\'\">",
-+		       _("Set Default"), make_parm_name(parm->label), o);
-+		TALLOC_FREE(o);
-+		break;
-+	}
-+
-+	case P_ENUM:
-+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-+		for (i=0;parm->enum_list[i].name;i++) {
-+			if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) {
-+				printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
-+			}
-+		}
-+		printf("</select>");
-+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-+			_("Set Default"), make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
-+		break;
-+	case P_SEP:
-+		break;
-+	}
-+	printf("</td></tr>\n");
-+	TALLOC_FREE(ctx);
-+}
-+
-+/****************************************************************************
-+  display a set of parameters for a service 
-+****************************************************************************/
-+static void show_parameters(int snum, int allparameters, unsigned int parm_filter, int printers)
-+{
-+	int i = 0;
-+	struct parm_struct *parm;
-+	const char *heading = NULL;
-+	const char *last_heading = NULL;
-+
-+	while ((parm = lp_next_parameter(snum, &i, allparameters))) {
-+		if (snum < 0 && parm->p_class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
-+			continue;
-+		if (parm->p_class == P_SEPARATOR) {
-+			heading = parm->label;
-+			continue;
-+		}
-+		if (parm->flags & FLAG_HIDE) continue;
-+		if (snum >= 0) {
-+			if (printers & !(parm->flags & FLAG_PRINT)) continue;
-+			if (!printers & !(parm->flags & FLAG_SHARE)) continue;
-+		}
-+
-+		if (!( parm_filter & FLAG_ADVANCED )) {
-+			if (!(parm->flags & FLAG_BASIC)) {
-+				void *ptr;
-+				if (parm->p_class == P_LOCAL && snum >= 0) {
-+					ptr = lp_local_ptr_by_snum(snum, parm);
-+				} else {
-+					ptr = lp_parm_ptr(NULL, parm);
-+				}
-+
-+				switch (parm->type) {
-+				case P_CHAR:
-+					if (*(char *)ptr == (char)(parm->def.cvalue)) continue;
-+					break;
-+
-+				case P_LIST:
-+					if (!str_list_equal(*(const char ***)ptr, 
-+							    (const char **)(parm->def.lvalue))) continue;
-+					break;
-+
-+				case P_STRING:
-+				case P_USTRING:
-+					if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
-+					break;
-+
-+				case P_BOOL:
-+				case P_BOOLREV:
-+					if (*(bool *)ptr == (bool)(parm->def.bvalue)) continue;
-+					break;
-+
-+				case P_INTEGER:
-+				case P_BYTES:
-+				case P_OCTAL:
-+					if (*(int *)ptr == (int)(parm->def.ivalue)) continue;
-+					break;
-+
-+
-+				case P_ENUM:
-+					if (*(int *)ptr == (int)(parm->def.ivalue)) continue;
-+					break;
-+				case P_SEP:
-+					continue;
-+					}
-+			}
-+			if (printers && !(parm->flags & FLAG_PRINT)) continue;
-+		}
-+
-+		if ((parm_filter & FLAG_WIZARD) && !(parm->flags & FLAG_WIZARD)) continue;
-+
-+		if ((parm_filter & FLAG_ADVANCED) && !(parm->flags & FLAG_ADVANCED)) continue;
-+
-+		if (heading && heading != last_heading) {
-+			printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
-+			last_heading = heading;
-+		}
-+		show_parameter(snum, parm);
-+	}
-+}
-+
-+/****************************************************************************
-+  load the smb.conf file into loadparm.
-+****************************************************************************/
-+static bool load_config(bool save_def)
-+{
-+	return lp_load(get_dyn_CONFIGFILE(),False,save_def,False,True);
-+}
-+
-+/****************************************************************************
-+  write a config file 
-+****************************************************************************/
-+static void write_config(FILE *f, bool show_defaults)
-+{
-+	TALLOC_CTX *ctx = talloc_stackframe();
-+
-+	fprintf(f, "# Samba config file created using SWAT\n");
-+	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
-+	fprintf(f, "# Date: %s\n\n", current_timestring(ctx, False));
-+
-+	lp_dump(f, show_defaults, iNumNonAutoPrintServices);
-+
-+	TALLOC_FREE(ctx);
-+}
-+
-+/****************************************************************************
-+  save and reload the smb.conf config file 
-+****************************************************************************/
-+static int save_reload(int snum)
-+{
-+	FILE *f;
-+	struct stat st;
-+
-+	f = fopen(get_dyn_CONFIGFILE(),"w");
-+	if (!f) {
-+		printf(_("failed to open %s for writing"), get_dyn_CONFIGFILE());
-+		printf("\n");
-+		return 0;
-+	}
-+
-+	/* just in case they have used the buggy xinetd to create the file */
-+	if (fstat(fileno(f), &st) == 0 &&
-+	    (st.st_mode & S_IWOTH)) {
-+#if defined HAVE_FCHMOD
-+		fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
-+#else
-+		chmod(get_dyn_CONFIGFILE(), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
-+#endif
-+	}
-+
-+	write_config(f, False);
-+	if (snum >= 0)
-+		lp_dump_one(f, False, snum);
-+	fclose(f);
-+
-+	lp_kill_all_services();
-+
-+	if (!load_config(False)) {
-+                printf(_("Can't reload %s"), get_dyn_CONFIGFILE());
-+		printf("\n");
-+                return 0;
-+        }
-+	iNumNonAutoPrintServices = lp_numservices();
-+	if (pcap_cache_loaded()) {
-+		struct tevent_context *ev_ctx;
-+		struct messaging_context *msg_ctx;
-+
-+		ev_ctx = s3_tevent_context_init(NULL);
-+		if (ev_ctx == NULL) {
-+			printf("s3_tevent_context_init() failed\n");
-+			return 0;
-+		}
-+		msg_ctx = messaging_init(ev_ctx, ev_ctx);
-+		if (msg_ctx == NULL) {
-+			printf("messaging_init() failed\n");
-+			return 0;
-+		}
-+
-+		load_printers(ev_ctx, msg_ctx);
-+
-+		talloc_free(ev_ctx);
-+	}
-+
-+	return 1;
-+}
-+
-+/****************************************************************************
-+  commit one parameter 
-+****************************************************************************/
-+static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
-+{
-+	int i;
-+	char *s;
-+
-+	if (snum < 0 && parm->p_class == P_LOCAL) {
-+		/* this handles the case where we are changing a local
-+		   variable globally. We need to change the parameter in 
-+		   all shares where it is currently set to the default */
-+		for (i=0;i<lp_numservices();i++) {
-+			s = lp_servicename(talloc_tos(), i);
-+			if (s && (*s) && lp_is_default(i, parm)) {
-+				lp_do_parameter(i, parm->label, v);
-+			}
-+		}
-+	}
-+
-+	lp_do_parameter(snum, parm->label, v);
-+}
-+
-+/****************************************************************************
-+  commit a set of parameters for a service 
-+****************************************************************************/
-+static void commit_parameters(int snum)
-+{
-+	int i = 0;
-+	struct parm_struct *parm;
-+	char *label;
-+	const char *v;
-+
-+	while ((parm = lp_next_parameter(snum, &i, 1))) {
-+		if (asprintf(&label, "parm_%s", make_parm_name(parm->label)) > 0) {
-+			if ((v = cgi_variable(label)) != NULL) {
-+				if (parm->flags & FLAG_HIDE)
-+					continue;
-+				commit_parameter(snum, parm, v);
-+			}
-+			SAFE_FREE(label);
-+		}
-+	}
-+}
-+
-+/****************************************************************************
-+  spit out the html for a link with an image 
-+****************************************************************************/
-+static void image_link(const char *name, const char *hlink, const char *src)
-+{
-+	printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
-+	       cgi_baseurl(), hlink, src, name);
-+}
-+
-+/****************************************************************************
-+  display the main navigation controls at the top of each page along
-+  with a title 
-+****************************************************************************/
-+static void show_main_buttons(void)
-+{
-+	char *p;
-+
-+	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-+		printf(_("Logged in as <b>%s</b>"), p);
-+		printf("<p>\n");
-+	}
-+
-+	image_link(_("Home"), "", "images/home.gif");
-+	if (have_write_access) {
-+		image_link(_("Globals"), "globals", "images/globals.gif");
-+		image_link(_("Shares"), "shares", "images/shares.gif");
-+		image_link(_("Printers"), "printers", "images/printers.gif");
-+		image_link(_("Wizard"), "wizard", "images/wizard.gif");
-+	}
-+   /* root always gets all buttons, otherwise look for -P */
-+	if ( have_write_access || (!passwd_only && have_read_access) ) {
-+		image_link(_("Status"), "status", "images/status.gif");
-+		image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
-+	}
-+	image_link(_("Password Management"), "passwd", "images/passwd.gif");
-+
-+	printf("<HR>\n");
-+}
-+
-+/****************************************************************************
-+ * Handle Display/Edit Mode CGI
-+ ****************************************************************************/
-+static void ViewModeBoxes(int mode)
-+{
-+	printf("<p>%s:&nbsp;\n", _("Current View Is"));
-+	printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
-+	printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
-+	printf("<br>%s:&nbsp;\n", _("Change View To"));
-+	printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
-+	printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
-+	printf("</p><br>\n");
-+}
-+
-+/****************************************************************************
-+  display a welcome page  
-+****************************************************************************/
-+static void welcome_page(void)
-+{
-+	if (file_exist("help/welcome.html")) {
-+		include_html("help/welcome.html");
-+	} else {
-+		include_html("help/welcome-no-samba-doc.html");
-+	}
-+}
-+
-+/****************************************************************************
-+  display the current smb.conf  
-+****************************************************************************/
-+static void viewconfig_page(void)
-+{
-+	int full_view=0;
-+	const char form_name[] = "viewconfig";
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (cgi_variable("full_view")) {
-+		full_view = 1;
-+	}
-+
-+output_page:
-+	printf("<H2>%s</H2>\n", _("Current Config"));
-+	printf("<form method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	if (full_view) {
-+		printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
-+	} else {
-+		printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
-+	}
-+
-+	printf("<p><pre>");
-+	write_config(stdout, full_view);
-+	printf("</pre>");
-+	printf("</form>\n");
-+}
-+
-+/****************************************************************************
-+  second screen of the wizard ... Fetch Configuration Parameters
-+****************************************************************************/
-+static void wizard_params_page(void)
-+{
-+	unsigned int parm_filter = FLAG_WIZARD;
-+	const char form_name[] = "wizard_params";
-+
-+	/* Here we first set and commit all the parameters that were selected
-+ 	   in the previous screen. */
-+
-+	printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (cgi_variable("Commit")) {
-+		commit_parameters(GLOBAL_SECTION_SNUM);
-+		save_reload(-1);
-+	}
-+
-+output_page:
-+	printf("<form name=\"swatform\" method=post action=wizard_params>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	if (have_write_access) {
-+		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
-+	}
-+
-+	printf("<input type=reset name=\"Reset Values\" value=\"Reset\">\n");
-+	printf("<p>\n");
-+
-+	printf("<table>\n");
-+	show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
-+	printf("</table>\n");
-+	printf("</form>\n");
-+}
-+
-+/****************************************************************************
-+  Utility to just rewrite the smb.conf file - effectively just cleans it up
-+****************************************************************************/
-+static void rewritecfg_file(void)
-+{
-+	commit_parameters(GLOBAL_SECTION_SNUM);
-+	save_reload(-1);
-+	printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
-+}
-+
-+/****************************************************************************
-+  wizard to create/modify the smb.conf file
-+****************************************************************************/
-+static void wizard_page(void)
-+{
-+	/* Set some variables to collect data from smb.conf */
-+	int role = 0;
-+	int winstype = 0;
-+	int have_home = -1;
-+	int HomeExpo = 0;
-+	int SerType = 0;
-+	const char form_name[] = "wizard";
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (cgi_variable("Rewrite")) {
-+		(void) rewritecfg_file();
-+		return;
-+	}
-+
-+	if (cgi_variable("GetWizardParams")){
-+		(void) wizard_params_page();
-+		return;
-+	}
-+
-+	if (cgi_variable("Commit")){
-+		SerType = atoi(cgi_variable_nonull("ServerType"));
-+		winstype = atoi(cgi_variable_nonull("WINSType"));
-+		have_home = lp_servicenumber(HOMES_NAME);
-+		HomeExpo = atoi(cgi_variable_nonull("HomeExpo"));
-+
-+		/* Plain text passwords are too badly broken - use encrypted passwords only */
-+		lp_do_parameter( GLOBAL_SECTION_SNUM, "encrypt passwords", "Yes");
-+
-+		switch ( SerType ){
-+			case 0:
-+				/* Stand-alone Server */
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
-+				break;
-+			case 1:
-+				/* Domain Member */
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "DOMAIN" );
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
-+				break;
-+			case 2:
-+				/* Domain Controller */
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "Yes" );
-+				break;
-+		}
-+		switch ( winstype ) {
-+			case 0:
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
-+				break;
-+			case 1:
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "Yes" );
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
-+				break;
-+			case 2:
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
-+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", cgi_variable_nonull("WINSAddr"));
-+				break;
-+		}
-+
-+		/* Have to create Homes share? */
-+		if ((HomeExpo == 1) && (have_home == -1)) {
-+			const char *unix_share = HOMES_NAME;
-+
-+			load_config(False);
-+			lp_copy_service(GLOBAL_SECTION_SNUM, unix_share);
-+			have_home = lp_servicenumber(HOMES_NAME);
-+			lp_do_parameter( have_home, "read only", "No");
-+			lp_do_parameter( have_home, "valid users", "%S");
-+			lp_do_parameter( have_home, "browseable", "No");
-+			commit_parameters(have_home);
-+			save_reload(have_home);
-+		}
-+
-+		/* Need to Delete Homes share? */
-+		if ((HomeExpo == 0) && (have_home != -1)) {
-+			lp_remove_service(have_home);
-+			have_home = -1;
-+		}
-+
-+		commit_parameters(GLOBAL_SECTION_SNUM);
-+		save_reload(-1);
-+	}
-+	else
-+	{
-+		/* Now determine smb.conf WINS settings */
-+		if (lp_we_are_a_wins_server())
-+			winstype = 1;
-+		if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
-+ 		        winstype = 2;
-+
-+		/* Do we have a homes share? */
-+		have_home = lp_servicenumber(HOMES_NAME);
-+	}
-+	if ((winstype == 2) && lp_we_are_a_wins_server())
-+		winstype = 3;
-+
-+	role = lp_server_role();
-+
-+output_page:
-+	/* Here we go ... */
-+	printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
-+	printf("<form method=post action=wizard>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	if (have_write_access) {
-+		printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
-+		printf("%s", _("The same will happen if you press the commit button."));
-+		printf("<br><br>\n");
-+		printf("<center>");
-+		printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
-+		printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
-+		printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
-+		printf("</center>\n");
-+	}
-+
-+	printf("<hr>");
-+	printf("<center><table border=0>");
-+	printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
-+	printf("<td><input type=radio name=\"ServerType\" value=\"0\" %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
-+	printf("<td><input type=radio name=\"ServerType\" value=\"1\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member")); 
-+	printf("<td><input type=radio name=\"ServerType\" value=\"2\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
-+	printf("</tr>\n");
-+	if (role == ROLE_DOMAIN_BDC) {
-+		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
-+	}
-+	printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
-+	printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
-+	printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
-+	printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
-+	printf("</tr>\n");
-+	printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
-+
-+	/* Print out the list of wins servers */
-+	if(lp_wins_server_list()) {
-+		int i;
-+		const char **wins_servers = lp_wins_server_list();
-+		for(i = 0; wins_servers[i]; i++) printf("%s ", wins_servers[i]);
-+	}
-+
-+	printf("\"></td></tr>\n");
-+	if (winstype == 3) {
-+		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
-+		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
-+	}
-+	printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
-+	printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
-+	printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
-+	printf("<td></td></tr>\n");
-+
-+	/* Enable this when we are ready ....
-+	 * printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
-+	 * printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
-+	 * printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
-+	 * printf("<td></td></tr>\n");
-+	 */
-+
-+	printf("</table></center>");
-+	printf("<hr>");
-+
-+	printf("%s\n", _("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."));
-+	printf("</form>\n");
-+}
-+
-+
-+/****************************************************************************
-+  display a globals editing page  
-+****************************************************************************/
-+static void globals_page(void)
-+{
-+	unsigned int parm_filter = FLAG_BASIC;
-+	int mode = 0;
-+	const char form_name[] = "globals";
-+
-+	printf("<H2>%s</H2>\n", _("Global Parameters"));
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (cgi_variable("Commit")) {
-+		commit_parameters(GLOBAL_SECTION_SNUM);
-+		save_reload(-1);
-+	}
-+
-+	if ( cgi_variable("ViewMode") )
-+		mode = atoi(cgi_variable_nonull("ViewMode"));
-+	if ( cgi_variable("BasicMode"))
-+		mode = 0;
-+	if ( cgi_variable("AdvMode"))
-+		mode = 1;
-+
-+output_page:
-+	printf("<form name=\"swatform\" method=post action=globals>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	ViewModeBoxes( mode );
-+	switch ( mode ) {
-+		case 0:
-+			parm_filter = FLAG_BASIC;
-+			break;
-+		case 1:
-+			parm_filter = FLAG_ADVANCED;
-+			break;
-+	}
-+	printf("<br>\n");
-+	if (have_write_access) {
-+		printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
-+			_("Commit Changes"));
-+	}
-+
-+	printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
-+		 _("Reset Values"));
-+
-+	printf("<p>\n");
-+	printf("<table>\n");
-+	show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
-+	printf("</table>\n");
-+	printf("</form>\n");
-+}
-+
-+/****************************************************************************
-+  display a shares editing page. share is in unix codepage, 
-+****************************************************************************/
-+static void shares_page(void)
-+{
-+	const char *share = cgi_variable("share");
-+	char *s;
-+	char *utf8_s;
-+	int snum = -1;
-+	int i;
-+	int mode = 0;
-+	unsigned int parm_filter = FLAG_BASIC;
-+	size_t converted_size;
-+	const char form_name[] = "shares";
-+
-+	printf("<H2>%s</H2>\n", _("Share Parameters"));
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (share)
-+		snum = lp_servicenumber(share);
-+
-+
-+	if (cgi_variable("Commit") && snum >= 0) {
-+		commit_parameters(snum);
-+		save_reload(-1);
-+		snum = lp_servicenumber(share);
-+	}
-+
-+	if (cgi_variable("Delete") && snum >= 0) {
-+		lp_remove_service(snum);
-+		save_reload(-1);
-+		share = NULL;
-+		snum = -1;
-+	}
-+
-+	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-+		snum = lp_servicenumber(share);
-+		if (snum < 0) {
-+			load_config(False);
-+			lp_copy_service(GLOBAL_SECTION_SNUM, share);
-+			snum = lp_servicenumber(share);
-+			save_reload(snum);
-+			snum = lp_servicenumber(share);
-+		}
-+	}
-+
-+	if ( cgi_variable("ViewMode") )
-+		mode = atoi(cgi_variable_nonull("ViewMode"));
-+	if ( cgi_variable("BasicMode"))
-+		mode = 0;
-+	if ( cgi_variable("AdvMode"))
-+		mode = 1;
-+
-+output_page:
-+	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	printf("<table>\n");
-+
-+	ViewModeBoxes( mode );
-+	switch ( mode ) {
-+		case 0:
-+			parm_filter = FLAG_BASIC;
-+			break;
-+		case 1:
-+			parm_filter = FLAG_ADVANCED;
-+			break;
-+	}
-+	printf("<br><tr>\n");
-+	printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
-+	printf("<td><select name=share>\n");
-+	if (snum < 0)
-+		printf("<option value=\" \"> \n");
-+	for (i=0;i<lp_numservices();i++) {
-+		s = lp_servicename(talloc_tos(), i);
-+		if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
-+			push_utf8_talloc(talloc_tos(), &utf8_s, s, &converted_size);
-+			printf("<option %s value=\"%s\">%s\n", 
-+			       (share && strcmp(share,s)==0)?"SELECTED":"",
-+			       utf8_s, utf8_s);
-+			TALLOC_FREE(utf8_s);
-+		}
-+	}
-+	printf("</select></td>\n");
-+	if (have_write_access) {
-+		printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
-+	}
-+	printf("</tr>\n");
-+	printf("</table>");
-+	printf("<table>");
-+	if (have_write_access) {
-+		printf("<tr>\n");
-+		printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
-+		printf("<td><input type=text size=30 name=newshare></td></tr>\n");
-+	}
-+	printf("</table>");
-+
-+
-+	if (snum >= 0) {
-+		if (have_write_access) {
-+			printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
-+		}
-+
-+		printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-+		printf("<p>\n");
-+	}
-+
-+	if (snum >= 0) {
-+		printf("<table>\n");
-+		show_parameters(snum, 1, parm_filter, 0);
-+		printf("</table>\n");
-+	}
-+
-+	printf("</FORM>\n");
-+}
-+
-+/*************************************************************
-+change a password either locally or remotely
-+*************************************************************/
-+static bool change_password(const char *remote_machine, const char *user_name, 
-+			    const char *old_passwd, const char *new_passwd, 
-+				int local_flags)
-+{
-+	NTSTATUS ret;
-+	char *err_str = NULL;
-+	char *msg_str = NULL;
-+
-+	if (demo_mode) {
-+		printf("%s\n<p>", _("password change in demo mode rejected"));
-+		return False;
-+	}
-+
-+	if (remote_machine != NULL) {
-+		ret = remote_password_change(remote_machine, user_name,
-+					     old_passwd, new_passwd, &err_str);
-+		if (err_str != NULL)
-+			printf("%s\n<p>", err_str);
-+		SAFE_FREE(err_str);
-+		return NT_STATUS_IS_OK(ret);
-+	}
-+
-+	if(!initialize_password_db(True, NULL)) {
-+		printf("%s\n<p>", _("Can't setup password database vectors."));
-+		return False;
-+	}
-+
-+	ret = local_password_change(user_name, local_flags, new_passwd,
-+					&err_str, &msg_str);
-+
-+	if(msg_str)
-+		printf("%s\n<p>", msg_str);
-+	if(err_str)
-+		printf("%s\n<p>", err_str);
-+
-+	SAFE_FREE(msg_str);
-+	SAFE_FREE(err_str);
-+	return NT_STATUS_IS_OK(ret);
-+}
-+
-+/****************************************************************************
-+  do the stuff required to add or change a password 
-+****************************************************************************/
-+static void chg_passwd(void)
-+{
-+	const char *host;
-+	bool rslt;
-+	int local_flags = 0;
-+
-+	/* Make sure users name has been specified */
-+	if (strlen(cgi_variable_nonull(SWAT_USER)) == 0) {
-+		printf("<p>%s\n", _(" Must specify \"User Name\" "));
-+		return;
-+	}
-+
-+	/*
-+	 * smbpasswd doesn't require anything but the users name to delete, disable or enable the user,
-+	 * so if that's what we're doing, skip the rest of the checks
-+	 */
-+	if (!cgi_variable(DISABLE_USER_FLAG) && !cgi_variable(ENABLE_USER_FLAG) && !cgi_variable(DELETE_USER_FLAG)) {
-+
-+		/*
-+		 * If current user is not root, make sure old password has been specified 
-+		 * If REMOTE change, even root must provide old password 
-+		 */
-+		if (((!am_root()) && (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0)) ||
-+		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0))) {
-+			printf("<p>%s\n", _(" Must specify \"Old Password\" "));
-+			return;
-+		}
-+
-+		/* If changing a users password on a remote hosts we have to know what host */
-+		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable_nonull(RHOST)) <= 0)) {
-+			printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
-+			return;
-+		}
-+
-+		/* Make sure new passwords have been specified */
-+		if ((strlen( cgi_variable_nonull(NEW_PSWD)) <= 0) ||
-+		    (strlen( cgi_variable_nonull(NEW2_PSWD)) <= 0)) {
-+			printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
-+			return;
-+		}
-+
-+		/* Make sure new passwords was typed correctly twice */
-+		if (strcmp(cgi_variable_nonull(NEW_PSWD), cgi_variable_nonull(NEW2_PSWD)) != 0) {
-+			printf("<p>%s\n", _(" Re-typed password didn't match new password "));
-+			return;
-+		}
-+	}
-+
-+	if (cgi_variable(CHG_R_PASSWD_FLAG)) {
-+		host = cgi_variable(RHOST);
-+	} else if (am_root()) {
-+		host = NULL;
-+	} else {
-+		host = "127.0.0.1";
-+	}
-+
-+	/*
-+	 * Set up the local flags.
-+	 */
-+
-+	local_flags |= (cgi_variable(ADD_USER_FLAG) ? LOCAL_ADD_USER : 0);
-+	local_flags |= (cgi_variable(ADD_USER_FLAG) ?  LOCAL_SET_PASSWORD : 0);
-+	local_flags |= (cgi_variable(CHG_S_PASSWD_FLAG) ? LOCAL_SET_PASSWORD : 0);
-+	local_flags |= (cgi_variable(DELETE_USER_FLAG) ? LOCAL_DELETE_USER : 0);
-+	local_flags |= (cgi_variable(ENABLE_USER_FLAG) ? LOCAL_ENABLE_USER : 0);
-+	local_flags |= (cgi_variable(DISABLE_USER_FLAG) ? LOCAL_DISABLE_USER : 0);
-+
-+	rslt = change_password(host,
-+			       cgi_variable_nonull(SWAT_USER),
-+			       cgi_variable_nonull(OLD_PSWD), cgi_variable_nonull(NEW_PSWD),
-+				   local_flags);
-+
-+	if(cgi_variable(CHG_S_PASSWD_FLAG)) {
-+		printf("<p>");
-+		if (rslt == True) {
-+			printf("%s\n", _(" The passwd has been changed."));
-+		} else {
-+			printf("%s\n", _(" The passwd has NOT been changed."));
-+		}
-+	}
-+
-+	return;
-+}
-+
-+/****************************************************************************
-+  display a password editing page  
-+****************************************************************************/
-+static void passwd_page(void)
-+{
-+	const char *new_name = cgi_user_name();
-+	const char passwd_form[] = "passwd";
-+	const char rpasswd_form[] = "rpasswd";
-+
-+	if (!new_name) new_name = "";
-+
-+	printf("<H2>%s</H2>\n", _("Server Password Management"));
-+
-+	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), passwd_form);
-+
-+	printf("<table>\n");
-+
-+	/* 
-+	 * Create all the dialog boxes for data collection
-+	 */
-+	printf("<tr><td> %s : </td>\n", _("User Name"));
-+	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
-+	if (!am_root()) {
-+		printf("<tr><td> %s : </td>\n", _("Old Password"));
-+		printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
-+	}
-+	printf("<tr><td> %s : </td>\n", _("New Password"));
-+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-+	printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
-+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-+	printf("</table>\n");
-+
-+	/*
-+	 * Create all the control buttons for requesting action
-+	 */
-+	printf("<input type=submit name=%s value=\"%s\">\n", 
-+	       CHG_S_PASSWD_FLAG, _("Change Password"));
-+	if (demo_mode || am_root()) {
-+		printf("<input type=submit name=%s value=\"%s\">\n",
-+		       ADD_USER_FLAG, _("Add New User"));
-+		printf("<input type=submit name=%s value=\"%s\">\n",
-+		       DELETE_USER_FLAG, _("Delete User"));
-+		printf("<input type=submit name=%s value=\"%s\">\n", 
-+		       DISABLE_USER_FLAG, _("Disable User"));
-+		printf("<input type=submit name=%s value=\"%s\">\n", 
-+		       ENABLE_USER_FLAG, _("Enable User"));
-+	}
-+	printf("<p></FORM>\n");
-+
-+	/*
-+	 * Do some work if change, add, disable or enable was
-+	 * requested. It could be this is the first time through this
-+	 * code, so there isn't anything to do.  */
-+	if (verify_xsrf_token(passwd_form) &&
-+	   ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
-+	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG)))) {
-+		chg_passwd();		
-+	}
-+
-+	printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
-+
-+	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), rpasswd_form);
-+
-+	printf("<table>\n");
-+
-+	/* 
-+	 * Create all the dialog boxes for data collection
-+	 */
-+	printf("<tr><td> %s : </td>\n", _("User Name"));
-+	printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
-+	printf("<tr><td> %s : </td>\n", _("Old Password"));
-+	printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
-+	printf("<tr><td> %s : </td>\n", _("New Password"));
-+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-+	printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
-+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-+	printf("<tr><td> %s : </td>\n", _("Remote Machine"));
-+	printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
-+
-+	printf("</table>");
-+
-+	/*
-+	 * Create all the control buttons for requesting action
-+	 */
-+	printf("<input type=submit name=%s value=\"%s\">", 
-+	       CHG_R_PASSWD_FLAG, _("Change Password"));
-+
-+	printf("<p></FORM>\n");
-+
-+	/*
-+	 * Do some work if a request has been made to change the
-+	 * password somewhere other than the server. It could be this
-+	 * is the first time through this code, so there isn't
-+	 * anything to do.  */
-+	if (verify_xsrf_token(passwd_form) && cgi_variable(CHG_R_PASSWD_FLAG)) {
-+		chg_passwd();		
-+	}
-+
-+}
-+
-+/****************************************************************************
-+  display a printers editing page  
-+****************************************************************************/
-+static void printers_page(void)
-+{
-+	const char *share = cgi_variable("share");
-+	char *s;
-+	int snum=-1;
-+	int i;
-+	int mode = 0;
-+	unsigned int parm_filter = FLAG_BASIC;
-+	const char form_name[] = "printers";
-+
-+	if (!verify_xsrf_token(form_name)) {
-+		goto output_page;
-+	}
-+
-+	if (share)
-+		snum = lp_servicenumber(share);
-+
-+	if (cgi_variable("Commit") && snum >= 0) {
-+		commit_parameters(snum);
-+		if (snum >= iNumNonAutoPrintServices)
-+		    save_reload(snum);
-+		else
-+		    save_reload(-1);
-+		snum = lp_servicenumber(share);
-+	}
-+
-+	if (cgi_variable("Delete") && snum >= 0) {
-+		lp_remove_service(snum);
-+		save_reload(-1);
-+		share = NULL;
-+		snum = -1;
-+	}
-+
-+	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-+		snum = lp_servicenumber(share);
-+		if (snum < 0 || snum >= iNumNonAutoPrintServices) {
-+			load_config(False);
-+			lp_copy_service(GLOBAL_SECTION_SNUM, share);
-+			snum = lp_servicenumber(share);
-+			lp_do_parameter(snum, "print ok", "Yes");
-+			save_reload(snum);
-+			snum = lp_servicenumber(share);
-+		}
-+	}
-+
-+	if ( cgi_variable("ViewMode") )
-+		mode = atoi(cgi_variable_nonull("ViewMode"));
-+        if ( cgi_variable("BasicMode"))
-+                mode = 0;
-+        if ( cgi_variable("AdvMode"))
-+                mode = 1;
-+
-+output_page:
-+        printf("<H2>%s</H2>\n", _("Printer Parameters"));
-+
-+        printf("<H3>%s</H3>\n", _("Important Note:"));
-+        printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
-+        printf("%s",_("are autoloaded printers from "));
-+        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-+        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
-+
-+
-+	printf("<FORM name=\"swatform\" method=post>\n");
-+	print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name);
-+
-+	ViewModeBoxes( mode );
-+	switch ( mode ) {
-+		case 0:
-+			parm_filter = FLAG_BASIC;
-+			break;
-+		case 1:
-+			parm_filter = FLAG_ADVANCED;
-+			break;
-+	}
-+	printf("<table>\n");
-+	printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
-+	printf("<td><select name=\"share\">\n");
-+	if (snum < 0 || !lp_print_ok(snum))
-+		printf("<option value=\" \"> \n");
-+	for (i=0;i<lp_numservices();i++) {
-+		s = lp_servicename(talloc_tos(), i);
-+		if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
-+                    if (i >= iNumNonAutoPrintServices)
-+                        printf("<option %s value=\"%s\">[*]%s\n",
-+                               (share && strcmp(share,s)==0)?"SELECTED":"",
-+                               s, s);
-+                    else
-+			printf("<option %s value=\"%s\">%s\n", 
-+			       (share && strcmp(share,s)==0)?"SELECTED":"",
-+			       s, s);
-+		}
-+	}
-+	printf("</select></td>");
-+	if (have_write_access) {
-+		printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
-+	}
-+	printf("</tr>");
-+	printf("</table>\n");
-+
-+	if (have_write_access) {
-+		printf("<table>\n");
-+		printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
-+		printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
-+		printf("</table>");
-+	}
-+
-+
-+	if (snum >= 0) {
-+		if (have_write_access) {
-+			printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
-+		}
-+		printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-+		printf("<p>\n");
-+	}
-+
-+	if (snum >= 0) {
-+		printf("<table>\n");
-+		show_parameters(snum, 1, parm_filter, 1);
-+		printf("</table>\n");
-+	}
-+	printf("</FORM>\n");
-+}
-+
-+/*
-+  when the _() translation macro is used there is no obvious place to free
-+  the resulting string and there is no easy way to give a static pointer.
-+  All we can do is rotate between some static buffers and hope a single d_printf()
-+  doesn't have more calls to _() than the number of buffers
-+*/
-+
-+const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid)
-+{
-+	const char *msgstr;
-+	const char *ret;
-+
-+	msgstr = lang_msg(msgid);
-+	if (!msgstr) {
-+		return msgid;
-+	}
-+
-+	ret = talloc_strdup(ctx, msgstr);
-+
-+	lang_msg_free(msgstr);
-+	if (!ret) {
-+		return msgid;
-+	}
-+
-+	return ret;
-+}
-+
-+/**
-+ * main function for SWAT.
-+ **/
-+ int main(int argc, char *argv[])
-+{
-+	const char *page;
-+	poptContext pc;
-+	struct poptOption long_options[] = {
-+		POPT_AUTOHELP
-+		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
-+        	{ "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
-+		POPT_COMMON_SAMBA
-+		POPT_TABLEEND
-+	};
-+	TALLOC_CTX *frame = talloc_stackframe();
-+
-+	fault_setup();
-+	umask(S_IWGRP | S_IWOTH);
-+
-+#if defined(HAVE_SET_AUTH_PARAMETERS)
-+	set_auth_parameters(argc, argv);
-+#endif /* HAVE_SET_AUTH_PARAMETERS */
-+
-+	/* just in case it goes wild ... */
-+	alarm(300);
-+
-+	setlinebuf(stdout);
-+
-+	/* we don't want any SIGPIPE messages */
-+	BlockSignals(True,SIGPIPE);
-+
-+	debug_set_logfile("/dev/null");
-+
-+	/* we don't want stderr screwing us up */
-+	close(2);
-+	open("/dev/null", O_WRONLY);
-+	setup_logging("swat", DEBUG_FILE);
-+
-+	load_case_tables();
-+	
-+	pc = poptGetContext("swat", argc, (const char **) argv, long_options, 0);
-+
-+	/* Parse command line options */
-+
-+	while(poptGetNextOpt(pc) != -1) { }
-+
-+	poptFreeContext(pc);
-+
-+	/* This should set a more apporiate log file */
-+	load_config(True);
-+	reopen_logs();
-+	load_interfaces();
-+	iNumNonAutoPrintServices = lp_numservices();
-+	if (pcap_cache_loaded()) {
-+		struct tevent_context *ev_ctx;
-+		struct messaging_context *msg_ctx;
-+
-+		ev_ctx = s3_tevent_context_init(NULL);
-+		if (ev_ctx == NULL) {
-+			printf("s3_tevent_context_init() failed\n");
-+			return 0;
-+		}
-+		msg_ctx = messaging_init(ev_ctx, ev_ctx);
-+		if (msg_ctx == NULL) {
-+			printf("messaging_init() failed\n");
-+			return 0;
-+		}
-+
-+		load_printers(ev_ctx, msg_ctx);
-+
-+		talloc_free(ev_ctx);
-+	}
-+
-+	cgi_setup(get_dyn_SWATDIR(), !demo_mode);
-+
-+	print_header();
-+
-+	cgi_load_variables();
-+
-+	if (!file_exist(get_dyn_CONFIGFILE())) {
-+		have_read_access = True;
-+		have_write_access = True;
-+	} else {
-+		/* check if the authenticated user has write access - if not then
-+		   don't show write options */
-+		have_write_access = (access(get_dyn_CONFIGFILE(),W_OK) == 0);
-+
-+		/* if the user doesn't have read access to smb.conf then
-+		   don't let them view it */
-+		have_read_access = (access(get_dyn_CONFIGFILE(),R_OK) == 0);
-+	}
-+
-+	show_main_buttons();
-+
-+	page = cgi_pathinfo();
-+
-+	/* Root gets full functionality */
-+	if (have_read_access && strcmp(page, "globals")==0) {
-+		globals_page();
-+	} else if (have_read_access && strcmp(page,"shares")==0) {
-+		shares_page();
-+	} else if (have_read_access && strcmp(page,"printers")==0) {
-+		printers_page();
-+	} else if (have_read_access && strcmp(page,"status")==0) {
-+		status_page();
-+	} else if (have_read_access && strcmp(page,"viewconfig")==0) {
-+		viewconfig_page();
-+	} else if (strcmp(page,"passwd")==0) {
-+		passwd_page();
-+	} else if (have_read_access && strcmp(page,"wizard")==0) {
-+		wizard_page();
-+	} else if (have_read_access && strcmp(page,"wizard_params")==0) {
-+		wizard_params_page();
-+	} else if (have_read_access && strcmp(page,"rewritecfg")==0) {
-+		rewritecfg_file();
-+	} else {
-+		welcome_page();
-+	}
-+
-+	print_footer();
-+
-+	TALLOC_FREE(frame);
-+	return 0;
-+}
-+
-+/** @} **/
-diff --git a/source3/web/swat_proto.h b/source3/web/swat_proto.h
-new file mode 100644
-index 0000000..424a3af
---- /dev/null
-+++ b/source3/web/swat_proto.h
-@@ -0,0 +1,76 @@
-+/*
-+ * Unix SMB/CIFS implementation.
-+ * collected prototypes header
-+ *
-+ * frozen from "make proto" in May 2008
-+ *
-+ * Copyright (C) Michael Adam 2008
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _SWAT_PROTO_H_
-+#define _SWAT_PROTO_H_
-+
-+
-+/* The following definitions come from web/cgi.c  */
-+
-+void cgi_load_variables(void);
-+const char *cgi_variable(const char *name);
-+const char *cgi_variable_nonull(const char *name);
-+bool am_root(void);
-+char *cgi_user_name(void);
-+char *cgi_user_pass(void);
-+void cgi_setup(const char *rootdir, int auth_required);
-+const char *cgi_baseurl(void);
-+const char *cgi_pathinfo(void);
-+const char *cgi_remote_host(void);
-+const char *cgi_remote_addr(void);
-+bool cgi_waspost(void);
-+
-+/* The following definitions come from web/diagnose.c  */
-+
-+bool winbindd_running(void);
-+bool nmbd_running(void);
-+bool smbd_running(void);
-+
-+/* The following definitions come from web/neg_lang.c  */
-+
-+int web_open(const char *fname, int flags, mode_t mode);
-+void web_set_lang(const char *lang_string);
-+
-+/* The following definitions come from web/startstop.c  */
-+
-+void start_smbd(void);
-+void start_nmbd(void);
-+void start_winbindd(void);
-+void stop_smbd(void);
-+void stop_nmbd(void);
-+void stop_winbindd(void);
-+void kill_pid(struct server_id pid);
-+
-+/* The following definitions come from web/statuspage.c  */
-+
-+void status_page(void);
-+
-+/* The following definitions come from web/swat.c  */
-+
-+const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
-+void get_xsrf_token(const char *username, const char *pass,
-+		    const char *formname, time_t xsrf_time, char token_str[33]);
-+void print_xsrf_token(const char *username, const char *pass,
-+		      const char *formname);
-+bool verify_xsrf_token(const char *formname);
-+
-+#endif /*  _SWAT_PROTO_H_  */
-diff --git a/source3/wscript b/source3/wscript
-index 10aa232..773bef0 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -23,6 +23,7 @@ def set_options(opt):
-                    action="store", dest='shared_modules', default=None)
- 
-     opt.SAMBA3_ADD_OPTION('winbind')
-+    opt.SAMBA3_ADD_OPTION('swat')
-     opt.SAMBA3_ADD_OPTION('ads', default=None) # None means autodetection
-     opt.SAMBA3_ADD_OPTION('ldap')
-     opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
-@@ -72,6 +73,9 @@ def configure(conf):
-         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
-         conf.env.developer = True
- 
-+    if Options.options.with_swat:
-+        conf.env['build_swat'] = True
-+
-     if sys.platform != 'openbsd5':
-         conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
- 
-diff --git a/source3/wscript_build b/source3/wscript_build
-index 061cc0d..b3a8336 100755
---- a/source3/wscript_build
-+++ b/source3/wscript_build
-@@ -424,6 +424,11 @@ NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
- 
- NMBD_SRC = '${NMBD_SRC1}'
- 
-+SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
-+               web/swat.c web/neg_lang.c'''
-+
-+SWAT_SRC = '''${SWAT_SRC1}'''
-+
- STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
- 
- SMBCONTROL_SRC = '''utils/smbcontrol.c'''
-@@ -1216,6 +1221,27 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
-                  install_path='${SBINDIR}',
-                  vars=locals())
- 
-+bld.SAMBA3_BINARY('web/swat',
-+                 source=SWAT_SRC,
-+                 deps='''
-+                 talloc
-+                 tevent
-+                 samba3core
-+                 libsmb
-+                 param
-+                 pdb
-+                 popt_samba3
-+                 smbd_base
-+                 LOCKING
-+                 PLAINTEXT_AUTH
-+                 PASSCHANGE
-+                 PRINTBASE
-+                 PRINTING
-+                 ''',
-+                 enabled=bld.env.build_swat,
-+                 install_path='${SBINDIR}',
-+                 vars=locals())
-+
- bld.SAMBA3_BINARY('rpcclient/rpcclient',
-                  source=RPCCLIENT_SRC,
-                  deps='''
-@@ -1624,6 +1650,13 @@ bld.SAMBA3_BINARY('samba-regedit',
-                   enabled=bld.env.build_regedit,
-                   vars=locals())
- 
-+swat_dir = os.path.join(bld.curdir, '../swat')
-+swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
-+swat_msg_dir = os.path.join(bld.curdir, 'po')
-+swat_msg_files = recursive_dirlist(swat_msg_dir, swat_msg_dir, '*.msg')
-+bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
-+bld.INSTALL_FILES('${CODEPAGEDIR}', swat_msg_files, base_name='po')
-+
- ########################## INCLUDES #################################
- 
- bld.RECURSE('auth')
-diff --git a/source4/smbd/server.c b/source4/smbd/server.c
-index d5d9d9c..28bfb2b 100644
---- a/source4/smbd/server.c
-+++ b/source4/smbd/server.c
-@@ -261,6 +261,7 @@ static void show_build(void)
- 		CONFIG_OPTION(CACHEDIR),
- 		CONFIG_OPTION(PIDDIR),
- 		CONFIG_OPTION(PRIVATE_DIR),
-+		CONFIG_OPTION(SWATDIR),
- 		CONFIG_OPTION(CODEPAGEDIR),
- 		CONFIG_OPTION(SETUPDIR),
- 		CONFIG_OPTION(WINBINDD_SOCKET_DIR),
-diff --git a/swat/help/welcome-no-samba-doc.html b/swat/help/welcome-no-samba-doc.html
-new file mode 100644
-index 0000000..67d7bb3a
---- /dev/null
-+++ b/swat/help/welcome-no-samba-doc.html
-@@ -0,0 +1,3 @@
-+<h3>Welcome to SWAT!</h3>
-+
-+More documentation is available at this point if you install the <b>samba-doc</b> package.
-diff --git a/swat/help/welcome.html b/swat/help/welcome.html
-new file mode 100644
-index 0000000..5f73793
---- /dev/null
-+++ b/swat/help/welcome.html
-@@ -0,0 +1,63 @@
-+<h3>Welcome to SWAT!</h3>
-+
-+Please choose a configuration action using one of the above buttons
-+
-+<h3><a href="/swat/help/manpages/samba.7.html" target="docs">Samba</a> Documentation</h3>
-+
-+<ul>
-+ <li><b>Daemons</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smbd.8.html" target="docs">smbd</a> - the SMB daemon
-+    <li><a href="/swat/help/manpages/nmbd.8.html" target="docs">nmbd</a> - the NetBIOS nameserver
-+    <li><a href="/swat/help/manpages/winbindd.8.html" target="docs">winbindd</a> - the winbind daemon
-+   </ul>
-+ <li><b>Configuration Files</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smb.conf.5.html" target="docs">smb.conf</a> - the main Samba configuration file
-+    <li><a href="/swat/help/manpages/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts file
-+    <li><a href="/swat/help/manpages/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB password file
-+   </ul>
-+ <li><b>Administrative Utilities</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smbcontrol.1.html" target="docs">smbcontrol</a> - send control messages to Samba daemons
-+    <li><a href="/swat/help/manpages/smbpasswd.8.html" target="docs">smbpasswd</a> - managing SMB passwords
-+    <li><a href="/swat/help/manpages/swat.8.html" target="docs">SWAT</a> - web configuration tool
-+    <li><a href="/swat/help/manpages/net.8.html" target="docs">net</a> - tool for administration of Samba and remote CIFS servers
-+    <li><a href="/swat/help/manpages/pdbedit.8.html" target="docs">pdbedit</a> - Samba user account management tool
-+    <li><a href="/swat/help/manpages/tdbbackup.8.html" target="docs">tdbbackup</a> - Tool for backing up TDB databases
-+   </ul>
-+ <li><b>Client Tools</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client
-+    <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool
-+    <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - command line SMB client
-+    <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication
-+    <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares
-+    <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer
-+    <li><a href="/swat/help/manpages/smbtree.1.html" target="docs">smbtree</a> - Text-based SMB network browsing
-+   </ul>
-+ <li><b>Diagnostic Utilities</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smbstatus.1.html" target="docs">smbstatus</a> - monitoring Samba
-+    <li><a href="/swat/help/manpages/testparm.1.html" target="docs">testparm</a> - validating your config file
-+    <li><a href="/swat/help/manpages/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS name query tool
-+    <li><a href="/swat/help/manpages/wbinfo.1.html" target="docs">wbinfo</a> - Tool for getting winbind information
-+   </ul>
-+ <li><b>Misc. Utilities</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/profiles.1.html" target="docs">profiles</a> - migrating profiles from one domain to another
-+    <li><a href="/swat/help/manpages/log2pcap.1.html" target="docs">log2pcap</a> - generate pcap files from samba log files
-+   </ul>
-+ <li><b>Books</b>
-+   <ul>
-+    <li><a href="/swat/help/using_samba/toc.html" target="docs">Using Samba, 2ed.</a> - by Jay Ts, Robert Eckstein, and David Collier-Brown
-+    <li><a href="/swat/help/Samba3-HOWTO/" target="docs">The Official Samba HOWTO and Reference Guide</a>
-+    <li><a href="/swat/help/Samba3-ByExample/" target="docs">Samba 3 by Example</a>
-+    <li><a href="/swat/help/Samba3-Developers-Guide/" target="docs">The Samba Developer Guide</a>
-+   </ul>
-+</ul>
-+ 
-+ <h3>Feedback</h3>
-+
-+ Please join the <A HREF="http://lists.samba.org/">samba</A> mailing
-+ list if you want to discuss issues with this release of SWAT.
-diff --git a/swat/include/footer.html b/swat/include/footer.html
-new file mode 100644
-index 0000000..7c3b483
---- /dev/null
-+++ b/swat/include/footer.html
-@@ -0,0 +1,3 @@
-+</TD></TR></TABLE></CENTER>
-+</BODY>
-+</HTML>
-diff --git a/swat/include/header.html b/swat/include/header.html
-new file mode 100644
-index 0000000..c482aed
---- /dev/null
-+++ b/swat/include/header.html
-@@ -0,0 +1,11 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-+<HTML>
-+<HEAD>
-+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-+<TITLE>Samba Web Administration Tool</TITLE>
-+</HEAD>
-+<BODY bgcolor="white">
-+<CENTER>
-+<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-+<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-+<TR><TD BGCOLOR="#ddddd0">
-diff --git a/swat/lang/ja/help/welcome.html b/swat/lang/ja/help/welcome.html
-new file mode 100644
-index 0000000..01d3f78
---- /dev/null
-+++ b/swat/lang/ja/help/welcome.html
-@@ -0,0 +1,66 @@
-+<h3>SWAT へようこそ!</h3>
-+
-+上のボタンをクリックして設定を行ってください。
-+
-+<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> ドキュメント</h3>
-+
-+<ul>
-+ <li><b>デーモン</b>
-+   <ul>
-+    <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - SMB デーモン
-+    <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS ネームサーバ
-+    <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind デーモン
-+   </ul>
-+ <li><b>設定ファイル</b>
-+   <ul>
-+    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - Samba 設定ファイル
-+    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS の hosts ファイル
-+    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB パスワードファイル
-+   </ul>
-+ <li><b>管理ユーティリティ</b>
-+   <ul>
-+    <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba デーモンへのコントロールメッセージの送出
-+    <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB パスワードの管理
-+    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - Web 設定ツール
-+    <li><a href="/swat/help/net.8.html" target="docs">net</a> - Samba およびリモートの CIFS サーバの管理ツール
-+    <li><a href="/swat/help/pdbedit.8.html" target="docs">pdbedit</a> - Samba のユーザアカウント管理ツール
-+    <li><a href="/swat/help/tdbbackup.8.html" target="docs">tdbbackup</a> - TDB データベースのバックアップツール
-+   </ul>
-+ <li><b>クライアントツール</b>
-+   <ul>
-+    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - コマンドラインの MS-RPC クライアント
-+    <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB バックアップツール
-+    <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - コマンドラインの SMB クライアント
-+    <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - コマンドラインの SMB 印刷クライアント
-+    <li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - 別プログラムからの NTLM 認証の使用を実現
-+    <li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - NTFS 5 共有のクォータ情報の設定と取得
-+    <li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - UNIX シェルを用いたリモート SMB 共有へのアクセスを実現
-+    <li><a href="/swat/help/smbtree.1.html" target="docs">smbtree</a> - テキストベースの SMB ネットワークブラウジング
-+    <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - 印刷ジョブを SMB プリンタに送信
-+   </ul>
-+ <li><b>診断ユーティリティ</b>
-+   <ul>
-+    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba の監視
-+    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - 設定ファイルの整合性の検査
-+    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - プリンタ設定の検査
-+    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS 名の検索ツール
-+    <li><a href="/swat/help/wbinfo.1.html" target="docs">wbinfo</a> - winbind 情報の取得ツール
-+   </ul>
-+ <li><b>その他のユーティリティ</b>
-+   <ul>
-+    <li><a href="/swat/help/profiles.1.html" target="docs">profiles</a> - 別ドメインへのプロファイルの移行
-+    <li><a href="/swat/help/editreg.1.html" target="docs">editreg</a> - Windows レジストリファイルの編集
-+    <li><a href="/swat/help/log2pcap.1.html" target="docs">log2pcap</a> - Samba のログファイルから pcap ファイルの生成
-+   </ul>
-+ <li><b>書籍</b>
-+   <ul>
-+    <li><a href="/swat/using_samba/toc.html" target="docs">Using Samba 第二版</a> - 著者: Jay Ts, Robert Eckstein, David Collier-Brown
-+    <li><a href="/swat/help/Samba-HOWTO-Collection.html">Samba HOWTO コレクション</a>
-+   </ul>
-+</ul>
-+ 
-+ <h3>フィードバック</h3>
-+
-+ このバージョンの SWAT に関する問題についての議論を行ないたい方は、
-+ <A HREF="http://lists.samba.org/">samba</A> メーリングリストへの参加をお願いします。
-+<small>(もしくは <A HREF="http://www.samba.gr.jp/ml/">sugj-tech</A> メーリングリストに日本語でお願いします)</small>
-diff --git a/swat/lang/ru/help/welcome-no-samba-doc.html b/swat/lang/ru/help/welcome-no-samba-doc.html
-new file mode 100644
-index 0000000..335560f
---- /dev/null
-+++ b/swat/lang/ru/help/welcome-no-samba-doc.html
-@@ -0,0 +1,6 @@
-+<h3>Добро пожаловать в SWAT!</h3>
-+<!--
-+samba-3.0.25a-2
-+--!>
-+
-+Здесь будут ссылки на документацию, если вы установите пакет <b>samba-doc</b>.
-diff --git a/swat/lang/ru/help/welcome.html b/swat/lang/ru/help/welcome.html
-new file mode 100644
-index 0000000..0e4b2c1
---- /dev/null
-+++ b/swat/lang/ru/help/welcome.html
-@@ -0,0 +1,65 @@
-+<h3>Добро пожаловать в SWAT!</h3>
-+<!--
-+samba-3.0.25a-2
-+--!>
-+
-+С помощью кнопок, расположенных выше, перейдите к желаемому действию
-+
-+<h3><a href="/swat/help/manpages/samba.7.html" target="docs">Samba</a> Документация</h3>
-+
-+<ul>
-+ <li><b>Демоны</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smbd.8.html" target="docs">smbd</a> - демон SMB
-+    <li><a href="/swat/help/manpages/nmbd.8.html" target="docs">nmbd</a> - сервер имён NetBIOS
-+    <li><a href="/swat/help/manpages/winbindd.8.html" target="docs">winbindd</a> - демон winbind
-+   </ul>
-+ <li><b>Файлы конфигурации</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smb.conf.5.html" target="docs">smb.conf</a> - главный файл конфигурации Samba
-+    <li><a href="/swat/help/manpages/lmhosts.5.html" target="docs">lmhosts</a> - файл хостов NetBIOS
-+    <li><a href="/swat/help/manpages/smbpasswd.5.html" target="docs">smbpasswd</a> - файл паролей SMB
-+   </ul>
-+ <li><b>Утилиты администрирования</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smbcontrol.1.html" target="docs">smbcontrol</a> - отправка управляющих сообщение демонам Samba
-+    <li><a href="/swat/help/manpages/smbpasswd.8.html" target="docs">smbpasswd</a> - управление паролями SMB
-+    <li><a href="/swat/help/manpages/swat.8.html" target="docs">SWAT</a> - инструмент настройки через веб
-+    <li><a href="/swat/help/manpages/net.8.html" target="docs">net</a> - инструмент администрирования Samba и удалённых серверов CIFS
-+    <li><a href="/swat/help/manpages/pdbedit.8.html" target="docs">pdbedit</a> - инструмент управления учётными записями Samba
-+    <li><a href="/swat/help/manpages/tdbbackup.8.html" target="docs">tdbbackup</a> - инструмент резервного копирования баз данных TDB
-+   </ul>
-+ <li><b>Клиентские утилиты</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - клиент MS-RPC с интерфейсом командной строки
-+    <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - инструмент резервного копирования SMB
-+    <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - клиент SMB с интерфейсом командной строки
-+    <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - позволяет внешним программам использовать аутентификацию NTLM
-+    <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - запрашивает или устанавливает квоты ресурсов на NTFS 5
-+    <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - отправляет задание на печать через SMB-принтер
-+    <li><a href="/swat/help/manpages/smbtree.1.html" target="docs">smbtree</a> - отображение сети SMB в текстовом виде
-+   </ul>
-+ <li><b>Утилиты диагностики</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/smbstatus.1.html" target="docs">smbstatus</a> - мониторинг Samba
-+    <li><a href="/swat/help/manpages/testparm.1.html" target="docs">testparm</a> - проверка правильности конфигурационного файла
-+    <li><a href="/swat/help/manpages/nmblookup.1.html" target="docs">nmblookup</a> - инструмент для поиска имён NetBIOS
-+    <li><a href="/swat/help/manpages/wbinfo.1.html" target="docs">wbinfo</a> - инструмент для получения информации о winbind
-+   </ul>
-+ <li><b>Различные утилиты</b>
-+   <ul>
-+    <li><a href="/swat/help/manpages/profiles.1.html" target="docs">profiles</a> - перевод профилей из одного домена в другой
-+    <li><a href="/swat/help/manpages/log2pcap.1.html" target="docs">log2pcap</a> - создание файлов pcap из журнальных файлов samba
-+   </ul>
-+ <li><b>Книги</b>
-+   <ul>
-+    <li><a href="/swat/help/using_samba/toc.html" target="docs">Использование Samba, 2-я редакция</a> - Джей Тс (Jay Ts), Роберт Экштейн (Robert Eckstein) и Дэвид Колье-Браун (David Collier-Brown)
-+    <li><a href="/swat/help/Samba3-HOWTO/" target="docs">Официальный Samba HOWTO и справочное руководство</a>
-+    <li><a href="/swat/help/Samba3-ByExample/" target="docs">Samba 3 на примерах</a>
-+    <li><a href="/swat/help/Samba3-Developers-Guide/" target="docs">Руководство разработчика Samba</a>
-+   </ul>
-+</ul>
-+
-+ <h3>Обратная связь</h3>
-+
-+ Если у вас возникли проблемы с этой версией SWAT, обращайтесь в список рассылки <A HREF="http://lists.samba.org/">samba</A>.
-diff --git a/swat/lang/ru/include/header.html b/swat/lang/ru/include/header.html
-new file mode 100644
-index 0000000..cfe53cb
---- /dev/null
-+++ b/swat/lang/ru/include/header.html
-@@ -0,0 +1,14 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-+<HTML>
-+<!--
-+samba-3.0.25a-2
-+--!>
-+<HEAD>
-+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-+<TITLE>Утилита администрирования Samba</TITLE>
-+</HEAD>
-+<BODY bgcolor="white">
-+<CENTER>
-+<IMG SRC="/swat/images/samba.gif" ALT="[ Samba ]" border=0><BR>
-+<TABLE WIDTH="98%" CELLSPACING=1 CELLPADDING=4 BORDER=1>
-+<TR><TD BGCOLOR="#ddddd0">
-diff --git a/swat/lang/tr/help/welcome.html b/swat/lang/tr/help/welcome.html
-new file mode 100644
-index 0000000..bc0d584
---- /dev/null
-+++ b/swat/lang/tr/help/welcome.html
-@@ -0,0 +1,66 @@
-+<h3>Swat'a Hoşgeldiniz!</h3>
-+
-+Yukarıdaki düğmelerden birini kullanarak bir ayar eylemi seçin.
-+
-+<h3><a href="/swat/help/samba.7.html" target="docs">Samba</a> Dökümantasyon</h3>
-+
-+<ul>
-+ <li><b>Sunucular</b>
-+   <ul>
-+    <li><a href="/swat/help/smbd.8.html" target="docs">smbd</a> - SMB sunucusu
-+    <li><a href="/swat/help/nmbd.8.html" target="docs">nmbd</a> - NetBIOS isim sunucusu
-+    <li><a href="/swat/help/winbindd.8.html" target="docs">winbindd</a> - winbind sunucusu
-+   </ul>
-+ <li><b>Ayar dosyaları</b>
-+   <ul>
-+    <li><a href="/swat/help/smb.conf.5.html" target="docs">smb.conf</a> - ana Samba ayar dosyası
-+    <li><a href="/swat/help/lmhosts.5.html" target="docs">lmhosts</a> - NetBIOS hosts dosyası
-+    <li><a href="/swat/help/smbpasswd.5.html" target="docs">smbpasswd</a> - SMB şifre dosyası
-+   </ul>
-+ <li><b>Yönetim Araçları</b>
-+   <ul>
-+    <li><a href="/swat/help/smbcontrol.1.html" target="docs">smbcontrol</a> - Samba sunucularına kontrol iletileri gönderir
-+    <li><a href="/swat/help/smbpasswd.8.html" target="docs">smbpasswd</a> - SMB şifrelerini düzenler
-+    <li><a href="/swat/help/swat.8.html" target="docs">SWAT</a> - web arayüzlü ayar aracı
-+    <li><a href="/swat/help/make_smbcodepage.1.html" target="docs">make_smbcodepage</a> - kod sayfası oluşturur
-+    <li><a href="/swat/help/make_unicodemap.1.html" target="docs">make_unicodemap</a> - unicode eşleşme dosyası oluşturur
-+    <li><a href="/swat/help/smbrun.1.html" target="docs">smbrun</a> - içsel smbd aracı
-+   </ul>
-+ <li><b>İstemci Araçları</b>
-+   <ul>
-+    <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - komut satırı MS-RPC istemcisi
-+    <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB yedekleme aracı
-+    <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - komut satırı SMB istemcisi
-+    <li><a href="/swat/help/smbspool.8.html"  target="docs">smbspool</a> - komut satırı SMB yazıcı istemcisi
-+   </ul>
-+ <li><b>Teşhis Araçları</b>
-+   <ul>
-+    <li><a href="/swat/help/smbstatus.1.html" target="docs">smbstatus</a> - Samba gözlemcisi
-+    <li><a href="/swat/help/testparm.1.html" target="docs">testparm</a> - ayar dosyasını kontrol eder
-+    <li><a href="/swat/help/testprns.1.html" target="docs">testprns</a> - yazıcı ayarlarını kontrol eder
-+    <li><a href="/swat/help/nmblookup.1.html" target="docs">nmblookup</a> - NetBIOS isim sorgulama aracı
-+   </ul>
-+ <li><b>Kitaplar</b>
-+   <ul>
-+    <li><a href="/swat/using_samba/index.html" target="docs">Samba'yı Kullanmak</a> - Yazan: Robert Eckstein, David Collier-Brown ve Peter Kelly
-+   </ul>
-+ <li><b>Samba HOWTO (Nasıl Yapılır?) Koleksiyonu</b></li>
-+   <ul>
-+     <li><a href="/swat/help/Samba-HOWTO-Collection.html">Bütün koleksiyon (tek dosya)</a>
-+     <li><a href="/swat/help/DOMAIN_MEMBER.html">Samba 2.x'de security = domain </a>
-+     <li><a href="/swat/help/winbind.html">Winbind Kullanarak Windows NT ve UNIX Arasında Birleşik Sistem Girişi</a>
-+     <li><a href="/swat/help/msdfs_setup.html">Samba'yı bir MS-DFS Sunucusu Olarak Ayarlamak</a>
-+     <li><a href="/swat/help/NT_Security.html">UNIX İzin Bitleri ve Samba 2.x</a>
-+     <li><a href="/swat/help/OS2-Client-HOWTO.html">OS/2 İstemcileri ve Samba</a>
-+     <li><a href="/swat/help/printer_driver2.html">Samba 2.2.x Altında Yazıcı Kullanımı</a>
-+     <li><a href="/swat/help/UNIX_INSTALL.html">Samba Nasıl Kurulur ve Kontrol Edilir?</a>
-+     <li><a href="/swat/help/Integrating-with-Windows.html">İsim Çözünme ve Yetkilendirme İşlemlerini Birleştirmek</a>
-+     <li><a href="/swat/help/CVS-Access.html">Samba yazılımlarına CVS Erişimi</a>
-+   </ul>
-+</ul>
-+
-+ <h3>İletişim</h3>
-+
-+ Eğer SWAT'ın bu sürümü ile ilgili konuları tartışmak istiyorsanız, lütfen
-+<A HREF="http://lists.samba.org/">samba</A> eposta listesine üye olun.
-+ 
-\ No newline at end of file
-
-From 8f5ff504e3e8c4f6a577e08652822216706483f7 Mon Sep 17 00:00:00 2001
-From: Rechi <Rechi@users.noreply.github.com>
-Date: Wed, 17 May 2017 16:04:20 +0200
-Subject: [PATCH 19/19] [libsmbclient] additional build fixes
-
----
- lib/param/loadparm.c          | 2 ++
- source3/Makefile.in           | 4 +++-
- source3/configure.in          | 2 ++
- source3/include/safe_string.h | 2 ++
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
-index 455c5e6..46eaa5f 100644
---- a/lib/param/loadparm.c
-+++ b/lib/param/loadparm.c
-@@ -2186,11 +2186,13 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
- 	lpcfg_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
- 	lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
- 	lpcfg_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR);
-+	#if 0
- 	lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
- 	lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
- 	lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);
- 	lpcfg_do_global_parameter_var(lp_ctx, "samba kcc command",
- 					"%s/samba_kcc", dyn_SCRIPTSBINDIR);
-+	#endif
- 	lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false");
- 	lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%");
- 
-diff --git a/source3/Makefile.in b/source3/Makefile.in
-index d55a9cd..af1aaa8 100644
---- a/source3/Makefile.in
-+++ b/source3/Makefile.in
-@@ -458,7 +458,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
- 	  lib/ctdb_conn.o \
- 	  lib/msg_channel.o \
- 	  lib/id_cache.o \
--	  ../lib/socket/interfaces.o lib/memcache.o \
-+	  lib/util_ea.o \
-+	  ../lib/socket/interfaces.o ../lib/util/memcache.o \
- 	  lib/talloc_dict.o \
- 	  lib/serverid.o \
- 	  lib/asys/asys.o \
-@@ -585,6 +586,7 @@ LIBSMB_OBJ0 = \
- 	       libsmb/auth_generic.o \
- 	       ../lib/krb5_wrap/krb5_samba.o \
- 	       libsmb/clispnego.o \
-+	       libsmb/cli_smb2_fnum.o \
- 	       ../auth/gensec/gensec.o \
- 	       ../auth/gensec/gensec_start.o \
- 	       ../auth/gensec/gensec_util.o \
-diff --git a/source3/configure.in b/source3/configure.in
-index 8fef7b1..90cb190 100644
---- a/source3/configure.in
-+++ b/source3/configure.in
-@@ -1047,6 +1047,8 @@ else
-     if test x"$CEPHFS_PATH_SPEC" = x"yes"; then
-         AC_MSG_ERROR([No valid libcephfs found in ${CEPHFS_PATH}])
-     fi
-+    save_CFLAGS="$CFLAGS"
-+    save_LDFLAGS="$LDFLAGS"
- fi
- 
- CFLAGS="$save_CFLAGS"
-diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
-index 03878b4..832e592 100644
---- a/source3/include/safe_string.h
-+++ b/source3/include/safe_string.h
-@@ -55,10 +55,12 @@
- #endif
- #define strcasecmp __ERROR__XX__NEVER_USE_STRCASECMP__;
- 
-+#if 0
- #ifdef strncasecmp
- #undef strncasecmp
- #endif
- #define strncasecmp __ERROR__XX__NEVER_USE_STRNCASECMP__;
-+#endif
- 
- #endif /* !_SPLINT_ */
-

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/configureEndian.patch Deleted

@@ -1,42 +0,0 @@
---- a/lib/ccan/libccan.m4
-+++ b/lib/ccan/libccan.m4
-@@ -121,16 +121,9 @@
- 	     [whether we can compile with __attribute__((used))])
- fi
- 
--# FIXME: We could use endian.h or sys/endian.h here, and __BYTE_ORDER for
--# cross-compiling.
--AC_CACHE_CHECK([whether we are big endian],samba_cv_big_endian,[
--AC_TRY_RUN([int main(void) {
--union { int i; char c[sizeof(int)]; } u;
--	  u.i = 0x01020304;
--	  return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;
--}],
--samba_cv_big_endian=yes,
--samba_cv_big_endian=no)])
-+AC_C_BIGENDIAN(
-+	samba_cv_big_endian=yes,
-+	samba_cv_big_endian=no)
- if test x"$samba_cv_big_endian" = xyes ; then
-    AC_DEFINE(HAVE_BIG_ENDIAN, 1,
- 	     [whether we are big endian])
-@@ -300,16 +293,9 @@
- 	     [whether we have isblank])
- fi
- 
--# FIXME: We could use endian.h or sys/endian.h here, and __BYTE_ORDER for
--# cross-compiling.
--AC_CACHE_CHECK([whether we are little endian],samba_cv_little_endian,[
--AC_TRY_RUN([int main(void) {
--union { int i; char c[sizeof(int)]; } u;
--	  u.i = 0x01020304;
--	  return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;
--}],
--samba_cv_little_endian=yes,
--samba_cv_little_endian=no)])
-+AC_C_BIGENDIAN(
-+	samba_cv_little_endian=no,
-+	samba_cv_little_endian=yes)
- if test x"$samba_cv_little_endian" = xyes ; then
-    AC_DEFINE(HAVE_LITTLE_ENDIAN, 1,
- 	     [whether we are little endian])

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/crt_extensions.patch Changed

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/no_fork_and_exec.patch Changed

@@ -1,17 +1,17 @@
 --- a/lib/util/become_daemon.c
 +++ b/lib/util/become_daemon.c
-@@ -80,7 +80,7 @@
+@@ -68,7 +68,7 @@
  {
  	pid_t newpid;
  	if (do_fork) {
 -		newpid = fork();
 +		newpid = -1;
- 		if (newpid) {
- #if HAVE_SYSTEMD
- 			sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid);
+ 		if (newpid == -1) {
+ 			exit_daemon("Fork failed", errno);
+ 		}
 --- a/lib/util/fault.c
 +++ b/lib/util/fault.c
-@@ -131,7 +131,7 @@
+@@ -147,7 +147,7 @@
  			snprintf(pidstr, sizeof(pidstr), "%d", (int) getpid());
  			all_string_sub(cmdstring, "%d", pidstr, sizeof(cmdstring));
  			DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmdstring));
@@ -20,6 +20,67 @@
  
  			if (result == -1)
  				DEBUG(0, ("smb_panic(): fork failed in panic action: %s\n",
+--- a/lib/util/sys_popen.c
++++ b/lib/util/sys_popen.c
+@@ -74,7 +74,7 @@
+ 		goto err_exit;
+ 	}
+ 
+-	entry->child_pid = fork();
++	entry->child_pid = -1;
+ 
+ 	if (entry->child_pid == -1) {
+ 		DBG_ERR("fork failed: %s\n", strerror(errno));
+@@ -105,7 +105,7 @@
+ 		for (p = popen_chain; p; p = p->next)
+ 			close(p->fd);
+ 
+-		ret = execv(argl[0], argl);
++		ret = -1;
+ 		if (ret == -1) {
+ 			DBG_ERR("ERROR executing command "
+ 			  "'%s': %s\n", command, strerror(errno));
+--- a/lib/util/tfork.c
++++ b/lib/util/tfork.c
+@@ -510,7 +510,7 @@
+ 	ready_pipe_worker_fd = p[0];
+ 	ready_pipe_caller_fd = p[1];
+ 
+-	pid = fork();
++	pid = -1;
+ 	if (pid == -1) {
+ 		close(status_sp_caller_fd);
+ 		close(status_sp_waiter_fd);
+@@ -578,7 +578,7 @@
+ 	close(event_pipe_caller_fd);
+ 	close(ready_pipe_caller_fd);
+ 
+-	pid = fork();
++	pid = -1;
+ 	if (pid == -1) {
+ 		state->waiter_errno = errno;
+ 		_exit(0);
+--- a/lib/util/util_runcmd.c
++++ b/lib/util/util_runcmd.c
+@@ -258,7 +258,6 @@
+ 	}
+ 	va_end(ap);
+ 
+-	(void)execvp(state->arg0, argv);
+ 	fprintf(stderr, "Failed to exec child - %s\n", strerror(errno));
+ 	_exit(255);
+ 	return NULL;
+--- a/source3/lib/background.c
++++ b/source3/lib/background.c
+@@ -159,7 +159,7 @@
+ 		return;
+ 	}
+ 
+-	res = fork();
++	res = -1;
+ 	if (res == -1) {
+ 		int err = errno;
+ 		close(fds[0]);
 --- a/source3/lib/server_prefork.c
 +++ b/source3/lib/server_prefork.c
 @@ -106,7 +106,7 @@
@@ -42,7 +103,7 @@
  			DEBUG(1, ("Failed to prefork child n. %d !\n", j));
 --- a/source3/lib/smbrun.c
 +++ b/source3/lib/smbrun.c
-@@ -97,7 +97,7 @@
+@@ -98,7 +98,7 @@
  
  	saved_handler = CatchChildLeaveStatus();
                                     	
@@ -51,18 +112,23 @@
  		DEBUG(0,("smbrun: fork failed with error %s\n", strerror(errno) ));
  		(void)CatchSignal(SIGCLD, saved_handler);
  		if (outfd) {
-@@ -197,8 +197,8 @@
+@@ -198,15 +198,6 @@
  				exit(82);
  		}
  
--		execl("/bin/sh","sh","-c",
--		    newcmd ? (const char *)newcmd : cmd, NULL);
-+		//execl("/bin/sh","sh","-c",
-+		//    newcmd ? (const char *)newcmd : cmd, NULL);
- 
+-		if (env != NULL) {
+-			execle("/bin/sh","sh","-c",
+-				newcmd ? (const char *)newcmd : cmd, NULL,
+-				env);
+-		} else {
+-			execl("/bin/sh","sh","-c",
+-				newcmd ? (const char *)newcmd : cmd, NULL);
+-		}
+-
  		SAFE_FREE(newcmd);
  	}
-@@ -261,7 +261,7 @@
+ 	
+@@ -268,7 +259,7 @@
  
  	saved_handler = CatchChildLeaveStatus();
                                     	
@@ -71,58 +137,18 @@
  		DEBUG(0, ("smbrunsecret: fork failed with error %s\n", strerror(errno)));
  		(void)CatchSignal(SIGCLD, saved_handler);
  		return errno;
-@@ -349,7 +349,7 @@
+@@ -356,8 +347,6 @@
  	}
  #endif
  
 -	execl("/bin/sh", "sh", "-c", cmd, NULL);  
-+	//execl("/bin/sh", "sh", "-c", cmd, NULL);  
- 
+-
  	/* not reached */
  	exit(82);
---- a/source3/lib/sock_exec.c
-+++ b/source3/lib/sock_exec.c
-@@ -101,7 +101,7 @@
- 		DEBUG(0,("socketpair_tcp failed (%s)\n", strerror(errno)));
- 		return -1;
- 	}
--	if (fork() == 0) {
-+	if (-1 == 0) {
- 		close(fd[0]);
- 		close(0);
- 		close(1);
-@@ -111,7 +111,7 @@
- 		if (dup(fd[1]) == -1) {
- 			exit(1);
- 		}
--		exit(system(prog));
-+		exit(-1);
- 	}
- 	close(fd[1]);
- 	return fd[0];
---- a/source3/lib/system.c
-+++ b/source3/lib/system.c
-@@ -1198,7 +1198,7 @@
- 		goto err_exit;
- 	}
- 
--	entry->child_pid = fork();
-+	entry->child_pid = -1;
- 
- 	if (entry->child_pid == -1) {
- 		DEBUG(0, ("sys_popen: fork failed: %s\n", strerror(errno)));
-@@ -1229,7 +1229,7 @@
- 		for (p = popen_chain; p; p = p->next)
- 			close(p->fd);
- 
--		ret = execv(argl[0], argl);
-+		ret = -1;
- 		if (ret == -1) {
- 			DEBUG(0, ("sys_popen: ERROR executing command "
- 				  "'%s': %s\n", command, strerror(errno)));
+ 	return 1;
 --- a/source3/lib/util.c
 +++ b/source3/lib/util.c
-@@ -795,7 +795,7 @@
+@@ -838,7 +838,7 @@
  	cmd = lp_panic_action(talloc_tos());
  	if (cmd && *cmd) {
  		DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmd));
@@ -131,3 +157,83 @@
  
  		if (result == -1)
  			DEBUG(0, ("smb_panic(): fork failed in panic action: %s\n",
+--- a/source4/heimdal/lib/roken/simple_exec.c
++++ b/source4/heimdal/lib/roken/simple_exec.c
+@@ -155,7 +155,7 @@
+ 	pipe(out_fd);
+     if(stderr_fd != NULL)
+ 	pipe(err_fd);
+-    pid = fork();
++    pid = -1;
+     switch(pid) {
+     case 0:
+ 	va_start(ap, file);
+@@ -196,7 +196,6 @@
+ 
+ 	closefrom(3);
+ 
+-	execv(file, argv);
+ 	exit((errno == ENOENT) ? EX_NOTFOUND : EX_NOEXEC);
+     case -1:
+ 	if(stdin_fd != NULL) {
+@@ -233,12 +232,11 @@
+ simple_execvp_timed(const char *file, char *const args[],
+ 		    time_t (*func)(void *), void *ptr, time_t timeout)
+ {
+-    pid_t pid = fork();
++    pid_t pid = -1;
+     switch(pid){
+     case -1:
+ 	return SE_E_FORKFAILED;
+     case 0:
+-	execvp(file, args);
+ 	exit((errno == ENOENT) ? EX_NOTFOUND : EX_NOEXEC);
+     default:
+ 	return wait_for_process_timed(pid, func, ptr, timeout);
+@@ -256,12 +254,11 @@
+ simple_execve_timed(const char *file, char *const args[], char *const envp[],
+ 		    time_t (*func)(void *), void *ptr, time_t timeout)
+ {
+-    pid_t pid = fork();
++    pid_t pid = -1;
+     switch(pid){
+     case -1:
+ 	return SE_E_FORKFAILED;
+     case 0:
+-	execve(file, args, envp);
+ 	exit((errno == ENOENT) ? EX_NOTFOUND : EX_NOEXEC);
+     default:
+ 	return wait_for_process_timed(pid, func, ptr, timeout);
+--- a/source4/libcli/resolve/dns_ex.c
++++ b/source4/libcli/resolve/dns_ex.c
+@@ -612,7 +612,7 @@
+ 	}
+ 	tevent_fd_set_auto_close(state->fde);
+ 
+-	state->child = fork();
++	state->child = -1;
+ 	if (state->child == (pid_t)-1) {
+ 		composite_error(c, map_nt_error_from_unix_common(errno));
+ 		return c;
+--- a/tests/fcntl_lock.c
++++ b/tests/fcntl_lock.c
+@@ -50,7 +50,7 @@
+ 
+ 	alarm(10);
+ 
+-	if (!(pid=fork())) {
++	if (!(pid=-1)) {
+ 		sleep(2);
+ 		fd = open(DATA, O_RDONLY);
+ 
+--- a/third_party/popt/popt.c
++++ b/third_party/popt/popt.c
+@@ -562,7 +562,7 @@
+ #endif
+ 
+ /*@-nullstate@*/
+-    rc = execvp(argv[0], (char *const *)argv);
++    rc = -1;
+ /*@=nullstate@*/
+ 
+ exit:

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/samba_android.patch Changed

@@ -1,52 +1,21 @@
---- a/lib/addns/dnsquery.c
-+++ b/lib/addns/dnsquery.c
-@@ -41,6 +41,16 @@
- 
- #define MAX_DNS_PACKET_SIZE 0xffff
- 
-+#if defined(ANDROID)
-+#  define NS_HFIXEDSZ   12
-+#  define C_IN          1
-+#  define T_A           1
-+#  define ns_t_srv      33
-+#  define ns_t_aaaa     28
-+#  define NS_PACKETSZ	512
-+#  define T_NS          2
-+#endif
-+
- #ifdef NS_HFIXEDSZ	/* Bind 8/9 interface */
- #if !defined(C_IN)	/* AIX 5.3 already defines C_IN */
- #  define C_IN		ns_c_in
---- a/lib/replace/system/network.h
-+++ b/lib/replace/system/network.h
-@@ -128,7 +128,7 @@
- struct hostent *rep_gethostbyname(const char *name);
- #endif
- 
--#ifdef HAVE_IFADDRS_H
-+#if defined(HAVE_IFADDRS_H) && (!defined(__ANDROID_API__) || __ANDROID_API__ >= 24)
- #include <ifaddrs.h>
- #endif
- 
 --- a/lib/util/charset/iconv.c
 +++ b/lib/util/charset/iconv.c
-@@ -24,6 +24,11 @@
- #include "system/filesys.h"
- #include "charset_proto.h"
+@@ -28,6 +28,10 @@
+ #include "libcli/util/ntstatus.h"
+ #include "lib/util/util_str_hex.h"
  
-+#if defined(ANDROID)
-+#include <stdint.h>
++#if defined(ANDROID) && (!defined(__ANDROID_API__) || __ANDROID_API__ < 28)
 +#include <byteswap.h>
 +#endif
 +
  #ifdef strcasecmp
  #undef strcasecmp
  #endif
-@@ -546,6 +551,19 @@
+@@ -592,6 +596,19 @@
  	return 0;
  }
  
-+#if defined(ANDROID)
++#if defined(ANDROID) && (!defined(__ANDROID_API__) || __ANDROID_API__ < 28)
 +void swab(const void *from, void*to, ssize_t n)
 +{
 +  ssize_t i;
@@ -62,35 +31,23 @@
  static size_t iconv_swab(void *cd, const char **inbuf, size_t *inbytesleft,
  			 char **outbuf, size_t *outbytesleft)
  {
---- a/lib/util/util_pw.c
-+++ b/lib/util/util_pw.c
-@@ -40,7 +40,9 @@
- 	ret->pw_passwd = talloc_strdup(ret, from->pw_passwd);
- 	ret->pw_uid = from->pw_uid;
- 	ret->pw_gid = from->pw_gid;
-+#if !defined(ANDROID)
- 	ret->pw_gecos = talloc_strdup(ret, from->pw_gecos);
-+#endif
- 	ret->pw_dir = talloc_strdup(ret, from->pw_dir);
- 	ret->pw_shell = talloc_strdup(ret, from->pw_shell);
- 
 --- a/nsswitch/libwbclient/wbc_pwd.c
 +++ b/nsswitch/libwbclient/wbc_pwd.c
-@@ -45,7 +45,9 @@
+@@ -46,7 +46,9 @@
  	struct passwd *pw = (struct passwd *)ptr;
  	free(pw->pw_name);
  	free(pw->pw_passwd);
-+#if !defined(ANDROID)
++#if !defined(ANDROID) || !defined(pw_gecos)
  	free(pw->pw_gecos);
 +#endif
  	free(pw->pw_shell);
  	free(pw->pw_dir);
  }
-@@ -67,10 +69,12 @@
+@@ -68,10 +70,12 @@
  	if (pw->pw_passwd == NULL) {
  		goto fail;
  	}
-+#if !defined(ANDROID)
++#if !defined(ANDROID) || !defined(pw_gecos)
  	pw->pw_gecos = strdup(p->pw_gecos);
  	if (pw->pw_gecos == NULL) {
  		goto fail;
@@ -101,13 +58,15 @@
  		goto fail;
 --- a/nsswitch/libwbclient/wbc_sid.c
 +++ b/nsswitch/libwbclient/wbc_sid.c
-@@ -957,9 +957,11 @@
+@@ -1052,9 +1052,13 @@
  
  		wbcFreeMemory(name);
  
-+#if !defined(ANDROID)
++#if !defined(ANDROID) || !defined(pw_gecos)
  		name = wbcStrDup(pwd->pw_gecos);
++#endif
  		wbcFreeMemory(pwd);
++#if !defined(ANDROID) || !defined(pw_gecos)
  		BAIL_ON_PTR_ERROR(name, wbc_status);
 +#endif
  	}
@@ -115,135 +74,26 @@
  	wbc_status = WBC_ERR_SUCCESS;
 --- a/nsswitch/winbind_struct_protocol.h
 +++ b/nsswitch/winbind_struct_protocol.h
-@@ -186,6 +186,10 @@
+@@ -188,6 +188,11 @@
  	WINBINDD_NUM_CMDS
  };
  
 +#if defined(ANDROID) && defined(pw_gecos)
++#define _pw_gecos pw_gecos
 +#undef pw_gecos
 +#endif
 +
  typedef struct winbindd_pw {
  	fstring pw_name;
  	fstring pw_passwd;
---- a/source3/Makefile.in
-+++ b/source3/Makefile.in
-@@ -2427,8 +2427,6 @@
- 		@SONAMEFLAG@`basename $@`
- 
- $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
--	@rm -f $@
--	@ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@
- 
- $(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1)
- 	@echo Linking non-shared library $@
-@@ -2445,11 +2443,6 @@
- installlibsmbclient:: installdirs libsmbclient
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
- 	-$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
--	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
--	-if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
--		ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
--			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
--	fi
- 	-$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
- 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
- 	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
---- a/source3/configure
-+++ b/source3/configure
-@@ -22426,7 +22426,7 @@
- LIBSMBCLIENT_SOVER=0
- LIBSMBCLIENT_FULLVER=$LIBSMBCLIENT_SOVER
- 
--LIBSMBCLIENT_SHARED_TARGET_SOVER=$LIBSMBCLIENT_SHARED_TARGET.$LIBSMBCLIENT_SOVER
-+LIBSMBCLIENT_SHARED_TARGET_SOVER=$LIBSMBCLIENT_SHARED_TARGET
- LIBSMBCLIENT_SHARED_TARGET_FULLVER=$LIBSMBCLIENT_SHARED_TARGET.$LIBSMBCLIENT_FULLVER
- 
- 
-@@ -37582,19 +37582,19 @@
- if test "x$ac_cv_lib_pthread_pthread_attr_init" = xyes; then :
- 
- 	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
--	     PTHREAD_LDFLAGS="-lpthread"
-+	     PTHREAD_LDFLAGS=""
- fi
+@@ -198,6 +203,10 @@
+ 	fstring pw_shell;
+ } WINBINDD_PW;
  
- fi
- 
- if test "x$PTHREAD_LDFLAGS" = xerror; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthreads" >&5
--$as_echo_n "checking for pthread_attr_init in -lpthreads... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in " >&5
-+$as_echo_n "checking for pthread_attr_init in ... " >&6; }
- if ${ac_cv_lib_pthreads_pthread_attr_init+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthreads  $LIBS"
-+LIBS="  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37627,7 +37627,7 @@
- if test "x$ac_cv_lib_pthreads_pthread_attr_init" = xyes; then :
- 
- 	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
--	     PTHREAD_LDFLAGS="-lpthreads"
-+	     PTHREAD_LDFLAGS=""
- fi
- 
- fi
---- a/source3/lib/dumpcore.c
-+++ b/source3/lib/dumpcore.c
-@@ -320,7 +320,7 @@
- 	umask(~(0700));
- 	dbgflush();
- 
--#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
-+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) && !defined(ANDROID)
- 	/* On Linux we lose the ability to dump core when we change our user
- 	 * ID. We know how to dump core safely, so let's make sure we have our
- 	 * dumpable flag set.
---- a/source3/passdb/passdb.c
-+++ b/source3/passdb/passdb.c
-@@ -163,6 +163,7 @@
- 
- 	fullname = NULL;
- 
-+#if !defined(ANDROID)
- 	if (count_commas(pwd->pw_gecos) == 3) {
- 		/*
- 		 * Heuristic: This seems to be a gecos field that has been
-@@ -173,11 +174,14 @@
- 			talloc_tos(), pwd->pw_gecos,
- 			strchr(pwd->pw_gecos, ',') - pwd->pw_gecos);
- 	}
-+#endif
- 
- 	if (fullname != NULL) {
- 		pdb_set_fullname(user, fullname, PDB_SET);
-+#if !defined(ANDROID)
- 	} else {
- 		pdb_set_fullname(user, pwd->pw_gecos, PDB_SET);
-+#endif
- 	}
- 	TALLOC_FREE(fullname);
- 
---- a/source3/passdb/pdb_interface.c
-+++ b/source3/passdb/pdb_interface.c
-@@ -1570,6 +1570,7 @@
- 	}
- 
- 	/* Primary group members */
-+#if !defined(ANDROID)
- 	setpwent();
- 	while ((pwd = getpwent()) != NULL) {
- 		if (pwd->pw_gid == gid) {
-@@ -1580,6 +1581,7 @@
- 		}
- 	}
- 	endpwent();
++#if defined(ANDROID) && defined(_pw_gecos)
++#define pw_gecos _pw_gecos
++#undef _pw_gecos
 +#endif
  
- 	/* Secondary group members */
- 	for (gr = grp->gr_mem; (*gr != NULL) && ((*gr)[0] != '\0'); gr += 1) {
+ typedef struct winbindd_gr {
+ 	fstring gr_name;

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/samba_off64_t.patch Deleted

@@ -1,1918 +0,0 @@
---- a/lib/dbwrap/dbwrap_ntdb.c
-+++ b/lib/dbwrap/dbwrap_ntdb.c
-@@ -208,7 +208,7 @@
- }
- 
- /* Proxy which sets waitflag to false so we never block. */
--static int lock_nonblock(int fd, int rw, off_t off, off_t len, bool waitflag,
-+static int lock_nonblock(int fd, int rw, off64_t off, off64_t len, bool waitflag,
- 			 void *_orig)
- {
- 	struct ntdb_attribute_flock *orig = _orig;
---- a/lib/ntdb/io.c
-+++ b/lib/ntdb/io.c
-@@ -101,7 +101,7 @@
- 	else
- 		mmap_flags = PROT_READ | PROT_WRITE;
- 
--	/* size_t can be smaller than off_t. */
-+	/* size_t can be smaller than off64_t. */
- 	if ((size_t)ntdb->file->map_size == ntdb->file->map_size) {
- 		ntdb->file->map_ptr = mmap(NULL, ntdb->file->map_size,
- 					  mmap_flags,
---- a/lib/ntdb/lock.c
-+++ b/lib/ntdb/lock.c
-@@ -60,7 +60,7 @@
- 	return false;
- }
- 
--int ntdb_fcntl_lock(int fd, int rw, off_t off, off_t len, bool waitflag,
-+int ntdb_fcntl_lock(int fd, int rw, off64_t off, off64_t len, bool waitflag,
- 		   void *unused)
- {
- 	struct flock fl;
-@@ -80,7 +80,7 @@
- 	return ret;
- }
- 
--int ntdb_fcntl_unlock(int fd, int rw, off_t off, off_t len, void *unused)
-+int ntdb_fcntl_unlock(int fd, int rw, off64_t off, off64_t len, void *unused)
- {
- 	struct flock fl;
- 	int ret;
-@@ -97,7 +97,7 @@
- }
- 
- static int lock(struct ntdb_context *ntdb,
--		      int rw, off_t off, off_t len, bool waitflag)
-+		      int rw, off64_t off, off64_t len, bool waitflag)
- {
- 	int ret;
- 	if (ntdb->file->allrecord_lock.count == 0
-@@ -116,7 +116,7 @@
- 	return ret;
- }
- 
--static int unlock(struct ntdb_context *ntdb, int rw, off_t off, off_t len)
-+static int unlock(struct ntdb_context *ntdb, int rw, off64_t off, off64_t len)
- {
- #if 0 /* Check they matched up locks and unlocks correctly. */
- 	char line[80];
-@@ -252,7 +252,7 @@
-   deadlock detection and claim a deadlock when progress can be
-   made. For those OSes we may loop for a while.
- */
--enum NTDB_ERROR ntdb_allrecord_upgrade(struct ntdb_context *ntdb, off_t start)
-+enum NTDB_ERROR ntdb_allrecord_upgrade(struct ntdb_context *ntdb, off64_t start)
- {
- 	int count = 1000;
- 
---- a/lib/ntdb/ntdb.h
-+++ b/lib/ntdb/ntdb.h
-@@ -867,8 +867,8 @@
-  */
- struct ntdb_attribute_flock {
- 	struct ntdb_attribute_base base; /* .attr = NTDB_ATTRIBUTE_FLOCK */
--	int (*lock)(int fd,int rw, off_t off, off_t len, bool waitflag, void *);
--	int (*unlock)(int fd, int rw, off_t off, off_t len, void *);
-+	int (*lock)(int fd,int rw, off64_t off, off64_t len, bool waitflag, void *);
-+	int (*unlock)(int fd, int rw, off64_t off, off64_t len, void *);
- 	void *data;
- };
- 
---- a/lib/ntdb/private.h
-+++ b/lib/ntdb/private.h
-@@ -287,7 +287,7 @@
- 
- struct ntdb_lock {
- 	struct ntdb_context *owner;
--	off_t off;
-+	off64_t off;
- 	uint32_t count;
- 	uint32_t ltype;
- };
-@@ -517,7 +517,7 @@
- enum NTDB_ERROR ntdb_allrecord_lock(struct ntdb_context *ntdb, int ltype,
- 				    enum ntdb_lock_flags flags, bool upgradable);
- void ntdb_allrecord_unlock(struct ntdb_context *ntdb, int ltype);
--enum NTDB_ERROR ntdb_allrecord_upgrade(struct ntdb_context *ntdb, off_t start);
-+enum NTDB_ERROR ntdb_allrecord_upgrade(struct ntdb_context *ntdb, off64_t start);
- 
- /* Serialize db open. */
- enum NTDB_ERROR ntdb_lock_open(struct ntdb_context *ntdb,
-@@ -534,8 +534,8 @@
- enum NTDB_ERROR ntdb_lock_and_recover(struct ntdb_context *ntdb);
- 
- /* Default lock and unlock functions. */
--int ntdb_fcntl_lock(int fd, int rw, off_t off, off_t len, bool waitflag, void *);
--int ntdb_fcntl_unlock(int fd, int rw, off_t off, off_t len, void *);
-+int ntdb_fcntl_lock(int fd, int rw, off64_t off, off64_t len, bool waitflag, void *);
-+int ntdb_fcntl_unlock(int fd, int rw, off64_t off, off64_t len, void *);
- 
- /* transaction.c: */
- enum NTDB_ERROR ntdb_transaction_recover(struct ntdb_context *ntdb);
-@@ -560,8 +560,8 @@
- 	int open_flags;
- 
- 	/* low level (fnctl) lock functions. */
--	int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
--	int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
-+	int (*lock_fn)(int fd, int rw, off64_t off, off64_t len, bool w, void *);
-+	int (*unlock_fn)(int fd, int rw, off64_t off, off64_t len, void *);
- 	void *lock_data;
- 
- 	/* the ntdb flags passed to ntdb_open. */
---- a/lib/replace/replace.c
-+++ b/lib/replace/replace.c
-@@ -44,7 +44,7 @@
-  /*******************************************************************
- ftruncate for operating systems that don't have it
- ********************************************************************/
--int rep_ftruncate(int f, off_t l)
-+int rep_ftruncate(int f, off64_t l)
- {
- #ifdef HAVE_CHSIZE
-       return chsize(f,l);
-@@ -429,7 +429,7 @@
- *****************************************************************/
- 
- #ifndef HAVE_PREAD
--ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset)
-+ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off64_t __offset)
- {
- 	if (lseek(__fd, __offset, SEEK_SET) != __offset) {
- 		return -1;
-@@ -443,7 +443,7 @@
- *****************************************************************/
- 
- #ifndef HAVE_PWRITE
--ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset)
-+ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off64_t __offset)
- {
- 	if (lseek(__fd, __offset, SEEK_SET) != __offset) {
- 		return -1;
---- a/lib/replace/replace.h
-+++ b/lib/replace/replace.h
-@@ -379,7 +379,7 @@
- 
- #ifndef HAVE_FTRUNCATE
- #define ftruncate rep_ftruncate
--int rep_ftruncate(int,off_t);
-+int rep_ftruncate(int,off64_t);
- #endif
- 
- #ifndef HAVE_INITGROUPS
-@@ -555,7 +555,7 @@
- 
- #ifndef HAVE_PREAD
- #define pread rep_pread
--ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset);
-+ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off64_t __offset);
- #define LIBREPLACE_PREAD_REPLACED 1
- #else
- #define LIBREPLACE_PREAD_NOT_REPLACED 1
-@@ -563,7 +563,7 @@
- 
- #ifndef HAVE_PWRITE
- #define pwrite rep_pwrite
--ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset);
-+ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off64_t __offset);
- #define LIBREPLACE_PWRITE_REPLACED 1
- #else
- #define LIBREPLACE_PWRITE_NOT_REPLACED 1
---- a/lib/tdb/common/lock.c
-+++ b/lib/tdb/common/lock.c
-@@ -33,7 +33,7 @@
- }
- 
- static int fcntl_lock(struct tdb_context *tdb,
--		      int rw, off_t off, off_t len, bool waitflag)
-+		      int rw, off64_t off, off64_t len, bool waitflag)
- {
- 	struct flock fl;
- 	int cmd;
-@@ -49,7 +49,7 @@
- 	return fcntl(tdb->fd, cmd, &fl);
- }
- 
--static int fcntl_unlock(struct tdb_context *tdb, int rw, off_t off, off_t len)
-+static int fcntl_unlock(struct tdb_context *tdb, int rw, off64_t off, off64_t len)
- {
- 	struct flock fl;
- #if 0 /* Check they matched up locks and unlocks correctly. */
---- a/lib/util/asn1.c
-+++ b/lib/util/asn1.c
-@@ -492,7 +492,7 @@
-  */
- bool asn1_peek_tag_needed_size(struct asn1_data *data, uint8_t tag, size_t *size)
- {
--	off_t start_ofs = data->ofs;
-+	off64_t start_ofs = data->ofs;
- 	uint8_t b;
- 	size_t taglen = 0;
- 
---- a/lib/util/asn1.h
-+++ b/lib/util/asn1.h
-@@ -21,7 +21,7 @@
- #define _ASN_1_H
- 
- struct nesting {
--	off_t start;
-+	off64_t start;
- 	size_t taglen; /* for parsing */
- 	struct nesting *next;
- };
-@@ -29,7 +29,7 @@
- struct asn1_data {
- 	uint8_t *data;
- 	size_t length;
--	off_t ofs;
-+	off64_t ofs;
- 	struct nesting *nesting;
- 	bool has_error;
- };
---- a/lib/util/samba_util.h
-+++ b/lib/util/samba_util.h
-@@ -680,7 +680,7 @@
-  Simple routine to do POSIX file locking. Cruft in NFS and 64->32 bit mapping
-  is dealt with in posix.c
- **/
--_PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
-+_PUBLIC_ bool fcntl_lock(int fd, int op, off64_t offset, off64_t count, int type);
- 
- /**
-  * Write dump of binary data to a callback
---- a/lib/util/util.c
-+++ b/lib/util/util.c
-@@ -383,7 +383,7 @@
-  is dealt with in posix.c
- **/
- 
--_PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type)
-+_PUBLIC_ bool fcntl_lock(int fd, int op, off64_t offset, off64_t count, int type)
- {
- 	struct flock lock;
- 	int ret;
---- a/lib/util/xfile.c
-+++ b/lib/util/xfile.c
-@@ -374,7 +374,7 @@
- /** 
-  * trivial seek, works only for SEEK_SET and SEEK_END if SEEK_CUR is
-  * set then an error is returned */
--off_t x_tseek(XFILE *f, off_t offset, int whence)
-+off64_t x_tseek(XFILE *f, off64_t offset, int whence)
- {
- 	if (f->flags & X_FLAG_ERROR)
- 		return -1;
---- a/lib/util/xfile.h
-+++ b/lib/util/xfile.h
-@@ -94,7 +94,7 @@
- /** 
-  * trivial seek, works only for SEEK_SET and SEEK_END if SEEK_CUR is
-  * set then an error is returned */
--off_t x_tseek(XFILE *f, off_t offset, int whence);
-+off64_t x_tseek(XFILE *f, off64_t offset, int whence);
- 
- XFILE *x_fdup(const XFILE *f);
- 
---- a/libcli/smb/smb_signing.c
-+++ b/libcli/smb/smb_signing.c
-@@ -339,7 +339,7 @@
- 			  const DATA_BLOB response)
- {
- 	size_t len;
--	off_t ofs;
-+	off64_t ofs;
- 
- 	if (!user_session_key.length) {
- 		return false;
---- a/librpc/rpc/dcerpc_util.c
-+++ b/librpc/rpc/dcerpc_util.c
-@@ -206,7 +206,7 @@
- 		talloc_get_type_abort(private_data,
- 		struct dcerpc_read_ncacn_packet_state);
- 	struct iovec *vector;
--	off_t ofs = 0;
-+	off64_t ofs = 0;
- 
- 	if (state->buffer.length == 0) {
- 		/* first get enough to read the fragment length */
---- a/source3/include/libsmb_internal.h
-+++ b/source3/include/libsmb_internal.h
-@@ -40,7 +40,7 @@
-  */
- typedef struct DOS_ATTR_DESC {
- 	int mode;
--	off_t size;
-+	off64_t size;
- 	time_t create_time;
- 	time_t access_time;
- 	time_t write_time;
-@@ -106,7 +106,7 @@
- 	 */
- 	struct cli_state *targetcli;
- 	char *fname;
--	off_t offset;
-+	off64_t offset;
- 	struct _SMBCSRV *srv;
- 	bool file;
- 	struct smbc_dir_list *dir_list, *dir_end, *dir_next;
-@@ -311,14 +311,14 @@
- SMBC_rmdir_ctx(SMBCCTX *context,
-                const char *fname);
- 
--off_t
-+off64_t
- SMBC_telldir_ctx(SMBCCTX *context,
-                  SMBCFILE *dir);
- 
- int
- SMBC_lseekdir_ctx(SMBCCTX *context,
-                   SMBCFILE *dir,
--                  off_t offset);
-+                  off64_t offset);
- 
- int
- SMBC_fstatdir_ctx(SMBCCTX *context,
-@@ -379,7 +379,7 @@
-             SMBCSRV *srv,
-             const char *path,
-             uint16 *mode,
--            off_t *size,
-+            off64_t *size,
-             struct timespec *create_time_ts,
-             struct timespec *access_time_ts,
-             struct timespec *write_time_ts,
-@@ -394,16 +394,16 @@
-             time_t change_time,
-             uint16 mode);
- 
--off_t
-+off64_t
- SMBC_lseek_ctx(SMBCCTX *context,
-                SMBCFILE *file,
--               off_t offset,
-+               off64_t offset,
-                int whence);
- 
- int
- SMBC_ftruncate_ctx(SMBCCTX *context,
-                    SMBCFILE *file,
--                   off_t length);
-+                   off64_t length);
- 
- 
- /* Functions in libsmb_misc.c */
---- a/source3/include/libsmbclient.h
-+++ b/source3/include/libsmbclient.h
-@@ -884,9 +884,9 @@
- smbc_rename_fn smbc_getFunctionRename(SMBCCTX *c);
- void smbc_setFunctionRename(SMBCCTX *c, smbc_rename_fn fn);
- 
--typedef off_t (*smbc_lseek_fn)(SMBCCTX *c,
-+typedef off64_t (*smbc_lseek_fn)(SMBCCTX *c,
-                                SMBCFILE * file,
--                               off_t offset,
-+                               off64_t offset,
-                                int whence);
- smbc_lseek_fn smbc_getFunctionLseek(SMBCCTX *c);
- void smbc_setFunctionLseek(SMBCCTX *c, smbc_lseek_fn fn);
-@@ -917,7 +917,7 @@
- 
- typedef int (*smbc_ftruncate_fn)(SMBCCTX *c,
-                                  SMBCFILE *f,
--                                 off_t size);
-+                                 off64_t size);
- smbc_ftruncate_fn smbc_getFunctionFtruncate(SMBCCTX *c);
- void smbc_setFunctionFtruncate(SMBCCTX *c, smbc_ftruncate_fn fn);
- 
-@@ -967,14 +967,14 @@
- smbc_rmdir_fn smbc_getFunctionRmdir(SMBCCTX *c);
- void smbc_setFunctionRmdir(SMBCCTX *c, smbc_rmdir_fn fn);
- 
--typedef off_t (*smbc_telldir_fn)(SMBCCTX *c,
-+typedef off64_t (*smbc_telldir_fn)(SMBCCTX *c,
-                                  SMBCFILE *dir);
- smbc_telldir_fn smbc_getFunctionTelldir(SMBCCTX *c);
- void smbc_setFunctionTelldir(SMBCCTX *c, smbc_telldir_fn fn);
- 
- typedef int (*smbc_lseekdir_fn)(SMBCCTX *c,
-                                 SMBCFILE *dir,
--                                off_t offset);
-+                                off64_t offset);
- smbc_lseekdir_fn smbc_getFunctionLseekdir(SMBCCTX *c);
- void smbc_setFunctionLseekdir(SMBCCTX *c, smbc_lseekdir_fn fn);
- 
-@@ -1346,7 +1346,7 @@
-  * @return          Upon successful completion, lseek returns the
-  *                  resulting offset location as measured in bytes
-  *                  from the beginning  of the file. Otherwise, a value
-- *                  of (off_t)-1 is returned and errno is set to
-+ *                  of (off64_t)-1 is returned and errno is set to 
-  *                  indicate the error:
-  *                  - EBADF  Fildes is not an open file descriptor.
-  *                  - EINVAL Whence is not a proper value or smbc_init
-@@ -1356,7 +1356,7 @@
-  *
-  * @todo Are errno values complete and correct?
-  */
--off_t smbc_lseek(int fd, off_t offset, int whence);
-+off64_t smbc_lseek(int fd, off64_t offset, int whence);
- 
- 
- /**@ingroup file
-@@ -1540,7 +1540,7 @@
-  * @see             smbc_readdir()
-  *
-  */
--off_t smbc_telldir(int dh);
-+off64_t smbc_telldir(int dh);
- 
- 
- /**@ingroup directory
-@@ -1565,7 +1565,7 @@
-  *
-  * @todo In what does the reture and errno values mean?
-  */
--int smbc_lseekdir(int fd, off_t offset);
-+int smbc_lseekdir(int fd, off64_t offset);
- 
- /**@ingroup directory
-  * Create a directory.
-@@ -1722,7 +1722,7 @@
-  * @see             , Unix ftruncate()
-  *
-  */
--int smbc_ftruncate(int fd, off_t size);
-+int smbc_ftruncate(int fd, off64_t size);
- 
- 
- /**@ingroup attribute
---- a/source3/include/proto.h
-+++ b/source3/include/proto.h
-@@ -161,17 +161,17 @@
- 
- ssize_t sys_recvfile(int fromfd,
- 			int tofd,
--			off_t offset,
-+			off64_t offset,
- 			size_t count);
- ssize_t sys_recvfile(int fromfd,
- 			int tofd,
--			off_t offset,
-+			off64_t offset,
- 			size_t count);
- ssize_t drain_socket(int sockfd, size_t count);
- 
- /* The following definitions come from lib/sendfile.c  */
- 
--ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count);
-+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off64_t offset, size_t count);
- 
- /* The following definitions come from lib/server_mutex.c  */
- 
-@@ -261,8 +261,8 @@
- ssize_t sys_read(int fd, void *buf, size_t count);
- ssize_t sys_write(int fd, const void *buf, size_t count);
- ssize_t sys_writev(int fd, const struct iovec *iov, int iovcnt);
--ssize_t sys_pread(int fd, void *buf, size_t count, off_t off);
--ssize_t sys_pwrite(int fd, const void *buf, size_t count, off_t off);
-+ssize_t sys_pread(int fd, void *buf, size_t count, off64_t off);
-+ssize_t sys_pwrite(int fd, const void *buf, size_t count, off64_t off);
- ssize_t sys_send(int s, const void *msg, size_t len, int flags);
- ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
- int sys_fcntl_ptr(int fd, int cmd, void *arg);
-@@ -275,8 +275,8 @@
- 	      bool fake_dir_create_times);
- int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf,
- 	      bool fake_dir_create_times);
--int sys_posix_fallocate(int fd, off_t offset, off_t len);
--int sys_fallocate(int fd, enum vfs_fallocate_mode mode, off_t offset, off_t len);
-+int sys_posix_fallocate(int fd, off64_t offset, off64_t len);
-+int sys_fallocate(int fd, enum vfs_fallocate_mode mode, off64_t offset, off64_t len);
- void kernel_flock(int fd, uint32 share_mode, uint32 access_mask);
- DIR *sys_fdopendir(int fd);
- int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
-@@ -389,7 +389,7 @@
- ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob);
- char *unix_clean_name(TALLOC_CTX *ctx, const char *s);
- char *clean_name(TALLOC_CTX *ctx, const char *s);
--ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos);
-+ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off64_t pos);
- int set_blocking(int fd, bool set);
- NTSTATUS init_before_fork(void);
- NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
-@@ -417,8 +417,8 @@
- bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive);
- void set_namearray(name_compare_entry **ppname_array, const char *namelist);
- void free_namearray(name_compare_entry *name_array);
--bool fcntl_lock(int fd, int op, off_t offset, off_t count, int type);
--bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid);
-+bool fcntl_lock(int fd, int op, off64_t offset, off64_t count, int type);
-+bool fcntl_getlock(int fd, off64_t *poffset, off64_t *pcount, int *ptype, pid_t *ppid);
- bool is_myname(const char *s);
- void ra_lanman_string( const char *native_lanman );
- const char *get_remote_arch_str(void);
---- a/source3/include/transfer_file.h
-+++ b/source3/include/transfer_file.h
-@@ -27,6 +27,6 @@
- 			       ssize_t (*read_fn)(void *, void *, size_t),
- 			       ssize_t (*write_fn)(void *, const void *, size_t));
- 
--off_t transfer_file(int infd, int outfd, off_t n);
-+off64_t transfer_file(int infd, int outfd, off64_t n);
- 
- #endif /* __TRANSFER_FILE_H__ */
---- a/source3/lib/asys/asys.c
-+++ b/source3/lib/asys/asys.c
-@@ -25,14 +25,14 @@
- 	int fildes;
- 	const void *buf;
- 	size_t nbyte;
--	off_t offset;
-+	off64_t offset;
- };
- 
- struct asys_pread_args {
- 	int fildes;
- 	void *buf;
- 	size_t nbyte;
--	off_t offset;
-+	off64_t offset;
- };
- 
- struct asys_fsync_args {
-@@ -156,7 +156,7 @@
- static void asys_pwrite_do(void *private_data);
- 
- int asys_pwrite(struct asys_context *ctx, int fildes, const void *buf,
--		size_t nbyte, off_t offset, void *private_data)
-+		size_t nbyte, off64_t offset, void *private_data)
- {
- 	struct asys_job *job;
- 	struct asys_pwrite_args *args;
-@@ -198,7 +198,7 @@
- static void asys_pread_do(void *private_data);
- 
- int asys_pread(struct asys_context *ctx, int fildes, void *buf,
--	       size_t nbyte, off_t offset, void *private_data)
-+	       size_t nbyte, off64_t offset, void *private_data)
- {
- 	struct asys_job *job;
- 	struct asys_pread_args *args;
---- a/source3/lib/asys/asys.h
-+++ b/source3/lib/asys/asys.h
-@@ -121,10 +121,10 @@
- void asys_cancel(struct asys_context *ctx, void *private_data);
- 
- int asys_pread(struct asys_context *ctx, int fildes, void *buf, size_t nbyte,
--	       off_t offset, void *private_data);
-+	       off64_t offset, void *private_data);
- int asys_pwrite(struct asys_context *ctx, int fildes, const void *buf,
--		size_t nbyte, off_t offset, void *private_data);
--int asys_ftruncate(struct asys_context *ctx, int filedes, off_t length,
-+		size_t nbyte, off64_t offset, void *private_data);
-+int asys_ftruncate(struct asys_context *ctx, int filedes, off64_t length,
- 		   void *private_data);
- int asys_fsync(struct asys_context *ctx, int fd, void *private_data);
- int asys_close(struct asys_context *ctx, int fd, void *private_data);
---- a/source3/lib/recvfile.c
-+++ b/source3/lib/recvfile.c
-@@ -44,7 +44,7 @@
- 
- static ssize_t default_sys_recvfile(int fromfd,
- 			int tofd,
--			off_t offset,
-+			off64_t offset,
- 			size_t count)
- {
- 	int saved_errno = 0;
-@@ -62,7 +62,7 @@
- 		return 0;
- 	}
- 
--	if (tofd != -1 && offset != (off_t)-1) {
-+	if (tofd != -1 && offset != (off64_t)-1) {
- 		if (lseek(tofd, offset, SEEK_SET) == -1) {
- 			if (errno != ESPIPE) {
- 				return -1;
-@@ -140,7 +140,7 @@
- 
- ssize_t sys_recvfile(int fromfd,
- 			int tofd,
--			off_t offset,
-+			off64_t offset,
- 			size_t count)
- {
- 	static int pipefd[2] = { -1, -1 };
-@@ -230,7 +230,7 @@
- 
- ssize_t sys_recvfile(int fromfd,
- 			int tofd,
--			off_t offset,
-+			off64_t offset,
- 			size_t count)
- {
- 	return default_sys_recvfile(fromfd, tofd, offset, count);
---- a/source3/lib/sendfile.c
-+++ b/source3/lib/sendfile.c
-@@ -33,7 +33,7 @@
- #define MSG_MORE 0x8000
- #endif
- 
--ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count)
-+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off64_t offset, size_t count)
- {
- 	size_t total=0;
- 	ssize_t ret;
-@@ -97,7 +97,7 @@
- 
- #include <sys/sendfile.h>
- 
--ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count)
-+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off64_t offset, size_t count)
- {
- 	int sfvcnt;
- 	size_t total, xferred;
-@@ -109,7 +109,7 @@
- 
- 		vec[0].sfv_fd = SFV_FD_SELF;
- 		vec[0].sfv_flag = 0;
--		vec[0].sfv_off = (off_t)header->data;
-+		vec[0].sfv_off = (off64_t)header->data;
- 		vec[0].sfv_len = hdr_len = header->length;
- 
- 		vec[1].sfv_fd = fromfd;
-@@ -183,7 +183,7 @@
- #include <sys/socket.h>
- #include <sys/uio.h>
- 
--ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count)
-+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off64_t offset, size_t count)
- {
- 	size_t total=0;
- 	struct iovec hdtrl[2];
-@@ -255,12 +255,12 @@
- #include <sys/uio.h>
- 
- ssize_t sys_sendfile(int tofd, int fromfd,
--	    const DATA_BLOB *header, off_t offset, size_t count)
-+	    const DATA_BLOB *header, off64_t offset, size_t count)
- {
- 	struct sf_hdtr	sf_header = {0};
- 	struct iovec	io_header = {0};
- 
--	off_t	nwritten;
-+	off64_t	nwritten;
- 	int	ret;
- 
- 	if (header) {
-@@ -325,7 +325,7 @@
- /* Contributed by William Jojo <jojowil@hvcc.edu> */
- #include <sys/socket.h>
- 
--ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count)
-+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off64_t offset, size_t count)
- {
- 	struct sf_parms hdtrl;
- 
-@@ -379,7 +379,7 @@
- 
- #else /* No sendfile implementation. Return error. */
- 
--ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t offset, size_t count)
-+ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off64_t offset, size_t count)
- {
- 	/* No sendfile syscall. */
- 	errno = ENOSYS;
---- a/source3/lib/system.c
-+++ b/source3/lib/system.c
-@@ -122,7 +122,7 @@
- ********************************************************************/
- 
- #if defined(HAVE_PREAD)
--ssize_t sys_pread(int fd, void *buf, size_t count, off_t off)
-+ssize_t sys_pread(int fd, void *buf, size_t count, off64_t off)
- {
- 	ssize_t ret;
- 
-@@ -138,7 +138,7 @@
- ********************************************************************/
- 
- #if defined(HAVE_PWRITE)
--ssize_t sys_pwrite(int fd, const void *buf, size_t count, off_t off)
-+ssize_t sys_pwrite(int fd, const void *buf, size_t count, off64_t off)
- {
- 	ssize_t ret;
- 
-@@ -538,14 +538,14 @@
- /*******************************************************************
-  An posix_fallocate() wrapper.
- ********************************************************************/
--int sys_posix_fallocate(int fd, off_t offset, off_t len)
-+int sys_posix_fallocate(int fd, off64_t offset, off64_t len)
- {
- #if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_BROKEN_POSIX_FALLOCATE)
- 	return posix_fallocate(fd, offset, len);
- #elif defined(F_RESVSP64)
- 	/* this handles XFS on IRIX */
- 	struct flock64 fl;
--	off_t new_len = offset + len;
-+	off64_t new_len = offset + len;
- 	int ret;
- 	struct stat64 sbuf;
- 
-@@ -580,7 +580,7 @@
- #include <linux/falloc.h>
- #endif
- 
--int sys_fallocate(int fd, enum vfs_fallocate_mode mode, off_t offset, off_t len)
-+int sys_fallocate(int fd, enum vfs_fallocate_mode mode, off64_t offset, off64_t len)
- {
- #if defined(HAVE_LINUX_FALLOCATE64) || defined(HAVE_LINUX_FALLOCATE)
- 	int lmode;
---- a/source3/lib/util.c
-+++ b/source3/lib/util.c
-@@ -350,12 +350,12 @@
-  Write data into an fd at a given offset. Ignore seek errors.
- ********************************************************************/
- 
--ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos)
-+ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off64_t pos)
- {
- 	size_t total=0;
- 	ssize_t ret;
- 
--	if (pos == (off_t)-1) {
-+	if (pos == (off64_t)-1) {
- 		return write_data(fd, buffer, N);
- 	}
- #if defined(HAVE_PWRITE) || defined(HAVE_PRWITE64)
-@@ -1144,7 +1144,7 @@
-  F_UNLCK in *ptype if the region is unlocked). False if the call failed.
- ****************************************************************************/
- 
--bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
-+bool fcntl_getlock(int fd, off64_t *poffset, off64_t *pcount, int *ptype, pid_t *ppid)
- {
- 	struct flock lock;
- 	int ret;
---- a/source3/lib/util_transfer_file.c
-+++ b/source3/lib/util_transfer_file.c
-@@ -108,8 +108,8 @@
- 	return sys_write(*fd, buf, len);
- }
- 
--off_t transfer_file(int infd, int outfd, off_t n)
-+off64_t transfer_file(int infd, int outfd, off64_t n)
- {
--	return (off_t)transfer_file_internal(&infd, &outfd, (size_t)n,
-+	return (off64_t)transfer_file_internal(&infd, &outfd, (size_t)n,
- 						 sys_read_fn, sys_write_fn);
- }
---- a/source3/libsmb/cli_np_tstream.c
-+++ b/source3/libsmb/cli_np_tstream.c
-@@ -66,7 +66,7 @@
- 	} trans;
- 
- 	struct {
--		off_t ofs;
-+		off64_t ofs;
- 		size_t left;
- 		uint8_t *buf;
- 	} read, write;
---- a/source3/libsmb/cli_smb2_fnum.c
-+++ b/source3/libsmb/cli_smb2_fnum.c
-@@ -918,7 +918,7 @@
- NTSTATUS cli_smb2_qfileinfo_basic(struct cli_state *cli,
- 			uint16_t fnum,
- 			uint16_t *mode,
--			off_t *size,
-+			off64_t *size,
- 			struct timespec *create_time,
- 			struct timespec *access_time,
- 			struct timespec *write_time,
-@@ -995,7 +995,7 @@
- 	}
- 	if (size) {
- 		uint64_t file_size = BVAL(outbuf.data, 0x30);
--		*size = (off_t)file_size;
-+		*size = (off64_t)file_size;
- 	}
- 	if (ino) {
- 		uint64_t file_index = BVAL(outbuf.data, 0x40);
-@@ -1017,7 +1017,7 @@
- NTSTATUS cli_smb2_getattrE(struct cli_state *cli,
- 			uint16_t fnum,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time)
-@@ -1059,7 +1059,7 @@
- NTSTATUS cli_smb2_getatr(struct cli_state *cli,
- 			const char *name,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *write_time)
- {
- 	NTSTATUS status;
-@@ -1128,7 +1128,7 @@
- 			struct timespec *access_time,
- 			struct timespec *write_time,
- 			struct timespec *change_time,
--			off_t *size,
-+			off64_t *size,
- 			uint16_t *mode,
- 			SMB_INO_T *ino)
- {
-@@ -2058,7 +2058,7 @@
- 				struct tevent_context *ev,
- 				struct cli_state *cli,
- 				uint16_t fnum,
--				off_t offset,
-+				off64_t offset,
- 				size_t size)
- {
- 	NTSTATUS status;
-@@ -2165,7 +2165,7 @@
- 					uint16_t fnum,
- 					uint16_t mode,
- 					const uint8_t *buf,
--					off_t offset,
-+					off64_t offset,
- 					size_t size)
- {
- 	NTSTATUS status;
-@@ -2280,7 +2280,7 @@
- 					uint16_t fnum,
- 					uint16_t mode,
- 					const uint8_t *buf,
--					off_t offset,
-+					off64_t offset,
- 					size_t size)
- {
- 	NTSTATUS status;
---- a/source3/libsmb/cli_smb2_fnum.h
-+++ b/source3/libsmb/cli_smb2_fnum.h
-@@ -58,7 +58,7 @@
- NTSTATUS cli_smb2_qfileinfo_basic(struct cli_state *cli,
- 			uint16_t fnum,
- 			uint16_t *mode,
--			off_t *size,
-+			off64_t *size,
- 			struct timespec *create_time,
- 			struct timespec *access_time,
- 			struct timespec *write_time,
-@@ -67,14 +67,14 @@
- NTSTATUS cli_smb2_getattrE(struct cli_state *cli,
- 			uint16_t fnum,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time);
- NTSTATUS cli_smb2_getatr(struct cli_state *cli,
- 			const char *name,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *write_time);
- NTSTATUS cli_smb2_qpathinfo2(struct cli_state *cli,
- 			const char *fname,
-@@ -82,7 +82,7 @@
- 			struct timespec *access_time,
- 			struct timespec *write_time,
- 			struct timespec *change_time,
--			off_t *size,
-+			off64_t *size,
- 			uint16_t *mode,
- 			SMB_INO_T *ino);
- NTSTATUS cli_smb2_qpathinfo_streams(struct cli_state *cli,
-@@ -134,7 +134,7 @@
- 				struct tevent_context *ev,
- 				struct cli_state *cli,
- 				uint16_t fnum,
--				off_t offset,
-+				off64_t offset,
- 				size_t size);
- NTSTATUS cli_smb2_read_recv(struct tevent_req *req,
- 				ssize_t *received,
-@@ -145,7 +145,7 @@
- 					uint16_t fnum,
- 					uint16_t mode,
- 					const uint8_t *buf,
--					off_t offset,
-+					off64_t offset,
- 					size_t size);
- NTSTATUS cli_smb2_write_recv(struct tevent_req *req,
- 			     size_t *pwritten);
-@@ -155,7 +155,7 @@
- 			uint16_t fnum,
- 			uint16_t mode,
- 			const uint8_t *buf,
--			off_t offset,
-+			off64_t offset,
- 			size_t size);
- NTSTATUS cli_smb2_writeall_recv(struct tevent_req *req,
- 			size_t *pwritten);
---- a/source3/libsmb/clifile.c
-+++ b/source3/libsmb/clifile.c
-@@ -3436,7 +3436,7 @@
- 	uint16_t vwv[1];
- 	int zone_offset;
- 	uint16_t attr;
--	off_t size;
-+	off64_t size;
- 	time_t change_time;
- 	time_t access_time;
- 	time_t write_time;
-@@ -3485,7 +3485,7 @@
- 		return;
- 	}
- 
--	state->size = (off_t)IVAL(vwv+6,0);
-+	state->size = (off64_t)IVAL(vwv+6,0);
- 	state->attr = SVAL(vwv+10,0);
- 	state->change_time = make_unix_date2(vwv+0, state->zone_offset);
- 	state->access_time = make_unix_date2(vwv+2, state->zone_offset);
-@@ -3496,7 +3496,7 @@
- 
- NTSTATUS cli_getattrE_recv(struct tevent_req *req,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time)
-@@ -3529,7 +3529,7 @@
- NTSTATUS cli_getattrE(struct cli_state *cli,
- 			uint16_t fnum,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time)
-@@ -3597,7 +3597,7 @@
- struct cli_getatr_state {
- 	int zone_offset;
- 	uint16_t attr;
--	off_t size;
-+	off64_t size;
- 	time_t write_time;
- };
- 
-@@ -3657,7 +3657,7 @@
- 	}
- 
- 	state->attr = SVAL(vwv+0,0);
--	state->size = (off_t)IVAL(vwv+3,0);
-+	state->size = (off64_t)IVAL(vwv+3,0);
- 	state->write_time = make_unix_date3(vwv+1, state->zone_offset);
- 
- 	tevent_req_done(req);
-@@ -3665,7 +3665,7 @@
- 
- NTSTATUS cli_getatr_recv(struct tevent_req *req,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *write_time)
- {
- 	struct cli_getatr_state *state = tevent_req_data(
-@@ -3690,7 +3690,7 @@
- NTSTATUS cli_getatr(struct cli_state *cli,
- 			const char *fname,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *write_time)
- {
- 	TALLOC_CTX *frame = NULL;
---- a/source3/libsmb/clirap.c
-+++ b/source3/libsmb/clirap.c
-@@ -625,7 +625,7 @@
- 			     time_t *change_time,
- 			     time_t *access_time,
- 			     time_t *write_time,
--			     off_t *size,
-+			     off64_t *size,
- 			     uint16 *mode)
- {
- 	struct cli_qpathinfo1_state *state = tevent_req_data(
-@@ -667,7 +667,7 @@
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time,
--			off_t *size,
-+			off64_t *size,
- 			uint16 *mode)
- {
- 	TALLOC_CTX *frame = talloc_stackframe();
-@@ -802,7 +802,7 @@
- 			     struct timespec *access_time,
- 			     struct timespec *write_time,
- 			     struct timespec *change_time,
--			     off_t *size, uint16 *mode,
-+			     off64_t *size, uint16 *mode,
- 			     SMB_INO_T *ino)
- {
- 	struct cli_qpathinfo2_state *state = tevent_req_data(
-@@ -842,7 +842,7 @@
- 			struct timespec *access_time,
- 			struct timespec *write_time,
- 			struct timespec *change_time,
--			off_t *size, uint16 *mode,
-+			off64_t *size, uint16 *mode,
- 			SMB_INO_T *ino)
- {
- 	TALLOC_CTX *frame = NULL;
-@@ -1138,7 +1138,7 @@
- ****************************************************************************/
- 
- NTSTATUS cli_qfileinfo_basic(struct cli_state *cli, uint16_t fnum,
--			     uint16 *mode, off_t *size,
-+			     uint16 *mode, off64_t *size,
- 			     struct timespec *create_time,
- 			     struct timespec *access_time,
- 			     struct timespec *write_time,
-@@ -1420,7 +1420,7 @@
- 			struct timespec *access_time,
- 			struct timespec *write_time,
- 			struct timespec *change_time,
--			off_t *size, uint16 *mode,
-+			off64_t *size, uint16 *mode,
- 			SMB_INO_T *ino)
- {
- 	NTSTATUS status = NT_STATUS_OK;
---- a/source3/libsmb/clirap.h
-+++ b/source3/libsmb/clirap.h
-@@ -49,14 +49,14 @@
- 			     time_t *change_time,
- 			     time_t *access_time,
- 			     time_t *write_time,
--			     off_t *size,
-+			     off64_t *size,
- 			     uint16 *mode);
- NTSTATUS cli_qpathinfo1(struct cli_state *cli,
- 			const char *fname,
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time,
--			off_t *size,
-+			off64_t *size,
- 			uint16 *mode);
- NTSTATUS cli_setpathinfo_basic(struct cli_state *cli, const char *fname,
- 			       time_t create_time,
-@@ -73,21 +73,21 @@
- 			     struct timespec *access_time,
- 			     struct timespec *write_time,
- 			     struct timespec *change_time,
--			     off_t *size, uint16 *mode,
-+			     off64_t *size, uint16 *mode,
- 			     SMB_INO_T *ino);
- NTSTATUS cli_qpathinfo2(struct cli_state *cli, const char *fname,
- 			struct timespec *create_time,
- 			struct timespec *access_time,
- 			struct timespec *write_time,
- 			struct timespec *change_time,
--			off_t *size, uint16 *mode,
-+			off64_t *size, uint16 *mode,
- 			SMB_INO_T *ino);
- NTSTATUS cli_qpathinfo3(struct cli_state *cli, const char *fname,
- 			struct timespec *create_time,
- 			struct timespec *access_time,
- 			struct timespec *write_time,
- 			struct timespec *change_time,
--			off_t *size, uint16 *mode,
-+			off64_t *size, uint16 *mode,
- 			SMB_INO_T *ino);
- struct tevent_req *cli_qpathinfo_streams_send(TALLOC_CTX *mem_ctx,
- 					      struct tevent_context *ev,
-@@ -108,7 +108,7 @@
- NTSTATUS cli_qfilename(struct cli_state *cli, uint16_t fnum,
- 		       TALLOC_CTX *mem_ctx, char **name);
- NTSTATUS cli_qfileinfo_basic(struct cli_state *cli, uint16_t fnum,
--			     uint16 *mode, off_t *size,
-+			     uint16 *mode, off64_t *size,
- 			     struct timespec *create_time,
- 			     struct timespec *access_time,
- 			     struct timespec *write_time,
---- a/source3/libsmb/clireadwrite.c
-+++ b/source3/libsmb/clireadwrite.c
-@@ -125,7 +125,7 @@
- struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx,
- 					struct tevent_context *ev,
- 					struct cli_state *cli, uint16_t fnum,
--					off_t offset, size_t size,
-+					off64_t offset, size_t size,
- 					struct tevent_req **psmbreq)
- {
- 	struct tevent_req *req, *subreq;
-@@ -176,7 +176,7 @@
- struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx,
- 				      struct tevent_context *ev,
- 				      struct cli_state *cli, uint16_t fnum,
--				      off_t offset, size_t size)
-+				      off64_t offset, size_t size)
- {
- 	struct tevent_req *req, *subreq;
- 	NTSTATUS status;
-@@ -275,20 +275,20 @@
- 	struct tevent_context *ev;
- 	struct cli_state *cli;
- 	uint16_t fnum;
--	off_t start_offset;
--	off_t size;
-+	off64_t start_offset;
-+	off64_t size;
- 
- 	NTSTATUS (*sink)(char *buf, size_t n, void *priv);
- 	void *priv;
- 
- 	size_t chunk_size;
--	off_t next_offset;
--	off_t remaining;
-+	off64_t next_offset;
-+	off64_t remaining;
- 
- 	/*
- 	 * How many bytes did we push into "sink"?
- 	 */
--	off_t pushed;
-+	off64_t pushed;
- 
- 	/*
- 	 * Outstanding requests
-@@ -308,7 +308,7 @@
- 	struct cli_pull_chunk *prev, *next;
- 	struct tevent_req *req;/* This is the main request! Not the subreq */
- 	struct tevent_req *subreq;
--	off_t ofs;
-+	off64_t ofs;
- 	uint8_t *buf;
- 	size_t total_size;
- 	size_t tmp_size;
-@@ -330,8 +330,8 @@
- struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx,
- 				 struct tevent_context *ev,
- 				 struct cli_state *cli,
--				 uint16_t fnum, off_t start_offset,
--				 off_t size, size_t window_size,
-+				 uint16_t fnum, off64_t start_offset,
-+				 off64_t size, size_t window_size,
- 				 NTSTATUS (*sink)(char *buf, size_t n,
- 						  void *priv),
- 				 void *priv)
-@@ -465,7 +465,7 @@
- 		tevent_req_data(req,
- 		struct cli_pull_state);
- 	bool ok;
--	off_t ofs;
-+	off64_t ofs;
- 	size_t size;
- 
- 	if (chunk->done) {
-@@ -644,7 +644,7 @@
- 	cli_pull_setup_chunks(req);
- }
- 
--NTSTATUS cli_pull_recv(struct tevent_req *req, off_t *received)
-+NTSTATUS cli_pull_recv(struct tevent_req *req, off64_t *received)
- {
- 	struct cli_pull_state *state = tevent_req_data(
- 		req, struct cli_pull_state);
-@@ -660,9 +660,9 @@
- }
- 
- NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum,
--		  off_t start_offset, off_t size, size_t window_size,
-+		  off64_t start_offset, off64_t size, size_t window_size,
- 		  NTSTATUS (*sink)(char *buf, size_t n, void *priv),
--		  void *priv, off_t *received)
-+		  void *priv, off64_t *received)
- {
- 	TALLOC_CTX *frame = talloc_stackframe();
- 	struct tevent_context *ev;
-@@ -710,11 +710,11 @@
- }
- 
- NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum,
--		 char *buf, off_t offset, size_t size,
-+		 char *buf, off64_t offset, size_t size,
- 		 size_t *nread)
- {
- 	NTSTATUS status;
--	off_t ret;
-+	off64_t ret;
- 
- 	status = cli_pull(cli, fnum, offset, size, size,
- 			  cli_read_sink, &buf, &ret);
-@@ -734,7 +734,7 @@
- ****************************************************************************/
- 
- NTSTATUS cli_smbwrite(struct cli_state *cli, uint16_t fnum, char *buf,
--		      off_t offset, size_t size1, size_t *ptotal)
-+		      off64_t offset, size_t size1, size_t *ptotal)
- {
- 	uint8_t *bytes;
- 	ssize_t total = 0;
-@@ -815,7 +815,7 @@
- 					 struct tevent_context *ev,
- 					 struct cli_state *cli, uint16_t fnum,
- 					 uint16_t mode, const uint8_t *buf,
--					 off_t offset, size_t size,
-+					 off64_t offset, size_t size,
- 					 struct tevent_req **reqs_before,
- 					 int num_reqs_before,
- 					 struct tevent_req **psmbreq)
-@@ -878,7 +878,7 @@
- 				       struct tevent_context *ev,
- 				       struct cli_state *cli, uint16_t fnum,
- 				       uint16_t mode, const uint8_t *buf,
--				       off_t offset, size_t size)
-+				       off64_t offset, size_t size)
- {
- 	struct tevent_req *req, *subreq;
- 	NTSTATUS status;
-@@ -950,7 +950,7 @@
- 	uint16_t fnum;
- 	uint16_t mode;
- 	const uint8_t *buf;
--	off_t offset;
-+	off64_t offset;
- 	size_t size;
- 	size_t written;
- };
-@@ -963,7 +963,7 @@
- 					    uint16_t fnum,
- 					    uint16_t mode,
- 					    const uint8_t *buf,
--					    off_t offset, size_t size)
-+					    off64_t offset, size_t size)
- {
- 	struct tevent_req *req, *subreq;
- 	struct cli_writeall_state *state;
-@@ -1047,7 +1047,7 @@
- }
- 
- NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode,
--		      const uint8_t *buf, off_t offset, size_t size,
-+		      const uint8_t *buf, off64_t offset, size_t size,
- 		      size_t *pwritten)
- {
- 	TALLOC_CTX *frame = talloc_stackframe();
-@@ -1097,7 +1097,7 @@
- 	struct cli_state *cli;
- 	uint16_t fnum;
- 	uint16_t mode;
--	off_t start_offset;
-+	off64_t start_offset;
- 
- 	size_t (*source)(uint8_t *buf, size_t n, void *priv);
- 	void *priv;
-@@ -1105,7 +1105,7 @@
- 	bool eof;
- 
- 	size_t chunk_size;
--	off_t next_offset;
-+	off64_t next_offset;
- 
- 	/*
- 	 * Outstanding requests
-@@ -1125,7 +1125,7 @@
- 	struct cli_push_chunk *prev, *next;
- 	struct tevent_req *req;/* This is the main request! Not the subreq */
- 	struct tevent_req *subreq;
--	off_t ofs;
-+	off64_t ofs;
- 	uint8_t *buf;
- 	size_t total_size;
- 	size_t tmp_size;
-@@ -1139,7 +1139,7 @@
- struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
- 				 struct cli_state *cli,
- 				 uint16_t fnum, uint16_t mode,
--				 off_t start_offset, size_t window_size,
-+				 off64_t start_offset, size_t window_size,
- 				 size_t (*source)(uint8_t *buf, size_t n,
- 						  void *priv),
- 				 void *priv)
-@@ -1281,7 +1281,7 @@
- 		struct cli_push_state);
- 	bool ok;
- 	const uint8_t *buf;
--	off_t ofs;
-+	off64_t ofs;
- 	size_t size;
- 
- 	if (chunk->done) {
-@@ -1405,7 +1405,7 @@
- }
- 
- NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode,
--		  off_t start_offset, size_t window_size,
-+		  off64_t start_offset, size_t window_size,
- 		  size_t (*source)(uint8_t *buf, size_t n, void *priv),
- 		  void *priv)
- {
---- a/source3/libsmb/libsmb_compat.c
-+++ b/source3/libsmb/libsmb_compat.c
-@@ -213,9 +213,9 @@
-         return smbc_getFunctionWrite(statcont)(statcont, file, buf, bufsize);
- }
- 
--off_t
-+off64_t
- smbc_lseek(int fd,
--           off_t offset,
-+           off64_t offset,
-            int whence)
- {
- 	SMBCFILE * file = find_fd(fd);
-@@ -285,7 +285,7 @@
-         return smbc_getFunctionReaddir(statcont)(statcont, file);
- }
- 
--off_t
-+off64_t
- smbc_telldir(int dh)
- {
- 	SMBCFILE * file = find_fd(dh);
-@@ -294,7 +294,7 @@
- 
- int
- smbc_lseekdir(int fd,
--              off_t offset)
-+              off64_t offset)
- {
- 	SMBCFILE * file = find_fd(fd);
-         return smbc_getFunctionLseekdir(statcont)(statcont, file, offset);
-@@ -345,7 +345,7 @@
- 
- int
- smbc_ftruncate(int fd,
--               off_t size)
-+               off64_t size)
- {
- 	SMBCFILE * file = find_fd(fd);
-         return smbc_getFunctionFtruncate(statcont)(statcont, file, size);
---- a/source3/libsmb/libsmb_dir.c
-+++ b/source3/libsmb/libsmb_dir.c
-@@ -1392,7 +1392,7 @@
-  * Routine to return the current directory position
-  */
- 
--off_t
-+off64_t
- SMBC_telldir_ctx(SMBCCTX *context,
-                  SMBCFILE *dir)
- {
-@@ -1433,7 +1433,7 @@
- 	 * We return the pointer here as the offset
- 	 */
- 	TALLOC_FREE(frame);
--        return (off_t)(long)dir->dir_next->dirent;
-+        return (off64_t)(long)dir->dir_next->dirent;
- }
- 
- /*
-@@ -1474,7 +1474,7 @@
- int
- SMBC_lseekdir_ctx(SMBCCTX *context,
-                   SMBCFILE *dir,
--                  off_t offset)
-+                  off64_t offset)
- {
- 	long int l_offset = offset;  /* Handle problems of size */
- 	struct smbc_dirent *dirent = (struct smbc_dirent *)l_offset;
-@@ -1831,7 +1831,7 @@
- 		if (errno == EACCES) { /* Check if the file is a directory */
- 
- 			int saverr = errno;
--			off_t size = 0;
-+			off64_t size = 0;
- 			uint16 mode = 0;
- 			struct timespec write_time_ts;
-                         struct timespec access_time_ts;
---- a/source3/libsmb/libsmb_file.c
-+++ b/source3/libsmb/libsmb_file.c
-@@ -243,12 +243,12 @@
-          * offset:
-          *
-          * Compiler bug (possibly) -- gcc (GCC) 3.3.5 (Debian 1:3.3.5-2) --
--         * appears to pass file->offset (which is type off_t) differently than
--         * a local variable of type off_t.  Using local variable "offset" in
-+         * appears to pass file->offset (which is type off64_t) differently than
-+         * a local variable of type off64_t.  Using local variable "offset" in
-          * the call to cli_read() instead of file->offset fixes a problem
-          * retrieving data at an offset greater than 4GB.
-          */
--        off_t offset;
-+        off64_t offset;
- 
- 	if (!context || !context->internal->initialized) {
- 		errno = EINVAL;
-@@ -300,7 +300,7 @@
-                const void *buf,
-                size_t count)
- {
--        off_t offset;
-+        off64_t offset;
- 	TALLOC_CTX *frame = talloc_stackframe();
- 	NTSTATUS status;
- 
-@@ -402,7 +402,7 @@
-             SMBCSRV *srv,
-             const char *path,
-             uint16 *mode,
--            off_t *size,
-+            off64_t *size,
-             struct timespec *create_time_ts,
-             struct timespec *access_time_ts,
-             struct timespec *write_time_ts,
-@@ -605,13 +605,13 @@
-  * A routine to lseek() a file
-  */
- 
--off_t
-+off64_t
- SMBC_lseek_ctx(SMBCCTX *context,
-                SMBCFILE *file,
--               off_t offset,
-+               off64_t offset,
-                int whence)
- {
--	off_t size;
-+	off64_t size;
- 	TALLOC_CTX *frame = talloc_stackframe();
- 
- 	if (!context || !context->internal->initialized) {
-@@ -644,7 +644,7 @@
- 					     file->targetcli, file->cli_fd, NULL,
- 					     &size, NULL, NULL, NULL, NULL,
- 					     NULL))) {
--                        off_t b_size = size;
-+                        off64_t b_size = size;
- 			if (!NT_STATUS_IS_OK(cli_getattrE(file->targetcli, file->cli_fd,
-                                           NULL, &b_size, NULL, NULL, NULL))) {
-                                 errno = EINVAL;
-@@ -672,9 +672,9 @@
- int
- SMBC_ftruncate_ctx(SMBCCTX *context,
-                    SMBCFILE *file,
--                   off_t length)
-+                   off64_t length)
- {
--	off_t size = length;
-+	off64_t size = length;
- 	TALLOC_CTX *frame = talloc_stackframe();
- 
- 	if (!context || !context->internal->initialized) {
---- a/source3/libsmb/libsmb_stat.c
-+++ b/source3/libsmb/libsmb_stat.c
-@@ -54,7 +54,7 @@
- setup_stat(SMBCCTX *context,
-            struct stat *st,
-            const char *fname,
--           off_t size,
-+           off64_t size,
-            int mode)
- {
- 	TALLOC_CTX *frame = talloc_stackframe();
-@@ -118,7 +118,7 @@
- 	struct timespec write_time_ts;
-         struct timespec access_time_ts;
-         struct timespec change_time_ts;
--	off_t size = 0;
-+	off64_t size = 0;
- 	uint16 mode = 0;
- 	uint16_t port = 0;
- 	SMB_INO_T ino = 0;
-@@ -206,7 +206,7 @@
- 	struct timespec change_time_ts;
-         struct timespec access_time_ts;
-         struct timespec write_time_ts;
--	off_t size;
-+	off64_t size;
- 	uint16 mode;
- 	char *server = NULL;
- 	char *share = NULL;
---- a/source3/libsmb/libsmb_xattr.c
-+++ b/source3/libsmb/libsmb_xattr.c
-@@ -556,7 +556,7 @@
-         struct timespec write_time_ts;
-         struct timespec access_time_ts;
-         struct timespec change_time_ts;
--        off_t size = 0;
-+        off64_t size = 0;
-         uint16 mode = 0;
- 	SMB_INO_T inode = 0;
-         DOS_ATTR_DESC *ret;
-@@ -652,7 +652,7 @@
- 		}
- 
- 		if (strncasecmp_m(tok, "SIZE:", 5) == 0) {
--                        dad->size = (off_t)atof(tok+5);
-+                        dad->size = (off64_t)atof(tok+5);
- 			continue;
- 		}
- 
-@@ -744,7 +744,7 @@
- 	time_t write_time = (time_t)0;
-         time_t access_time = (time_t)0;
-         time_t change_time = (time_t)0;
--	off_t size = 0;
-+	off64_t size = 0;
- 	uint16 mode = 0;
- 	SMB_INO_T ino = 0;
- 	struct cli_state *cli = srv->cli;
---- a/source3/libsmb/proto.h
-+++ b/source3/libsmb/proto.h
-@@ -467,14 +467,14 @@
-                                 uint16_t fnum);
- NTSTATUS cli_getattrE_recv(struct tevent_req *req,
-                         uint16_t *attr,
--                        off_t *size,
-+                        off64_t *size,
-                         time_t *change_time,
-                         time_t *access_time,
-                         time_t *write_time);
- NTSTATUS cli_getattrE(struct cli_state *cli,
- 			uint16_t fnum,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *change_time,
- 			time_t *access_time,
- 			time_t *write_time);
-@@ -497,12 +497,12 @@
- 				const char *fname);
- NTSTATUS cli_getatr_recv(struct tevent_req *req,
- 				uint16_t *attr,
--				off_t *size,
-+				off64_t *size,
- 				time_t *write_time);
- NTSTATUS cli_getatr(struct cli_state *cli,
- 			const char *fname,
- 			uint16_t *attr,
--			off_t *size,
-+			off64_t *size,
- 			time_t *write_time);
- struct tevent_req *cli_setatr_send(TALLOC_CTX *mem_ctx,
- 				struct tevent_context *ev,
-@@ -758,37 +758,37 @@
- struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx,
- 					struct tevent_context *ev,
- 					struct cli_state *cli, uint16_t fnum,
--					off_t offset, size_t size,
-+					off64_t offset, size_t size,
- 					struct tevent_req **psmbreq);
- struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx,
- 				      struct tevent_context *ev,
- 				      struct cli_state *cli, uint16_t fnum,
--				      off_t offset, size_t size);
-+				      off64_t offset, size_t size);
- NTSTATUS cli_read_andx_recv(struct tevent_req *req, ssize_t *received,
- 			    uint8_t **rcvbuf);
- struct tevent_req *cli_pull_send(TALLOC_CTX *mem_ctx,
- 				 struct tevent_context *ev,
- 				 struct cli_state *cli,
--				 uint16_t fnum, off_t start_offset,
--				 off_t size, size_t window_size,
-+				 uint16_t fnum, off64_t start_offset,
-+				 off64_t size, size_t window_size,
- 				 NTSTATUS (*sink)(char *buf, size_t n,
- 						  void *priv),
- 				 void *priv);
--NTSTATUS cli_pull_recv(struct tevent_req *req, off_t *received);
-+NTSTATUS cli_pull_recv(struct tevent_req *req, off64_t *received);
- NTSTATUS cli_pull(struct cli_state *cli, uint16_t fnum,
--		  off_t start_offset, off_t size, size_t window_size,
-+		  off64_t start_offset, off64_t size, size_t window_size,
- 		  NTSTATUS (*sink)(char *buf, size_t n, void *priv),
--		  void *priv, off_t *received);
-+		  void *priv, off64_t *received);
- NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum,
--		  char *buf, off_t offset, size_t size,
-+		  char *buf, off64_t offset, size_t size,
- 		  size_t *nread);
- NTSTATUS cli_smbwrite(struct cli_state *cli, uint16_t fnum, char *buf,
--		      off_t offset, size_t size1, size_t *ptotal);
-+		      off64_t offset, size_t size1, size_t *ptotal);
- struct tevent_req *cli_write_andx_create(TALLOC_CTX *mem_ctx,
- 					 struct tevent_context *ev,
- 					 struct cli_state *cli, uint16_t fnum,
- 					 uint16_t mode, const uint8_t *buf,
--					 off_t offset, size_t size,
-+					 off64_t offset, size_t size,
- 					 struct tevent_req **reqs_before,
- 					 int num_reqs_before,
- 					 struct tevent_req **psmbreq);
-@@ -796,23 +796,23 @@
- 				       struct tevent_context *ev,
- 				       struct cli_state *cli, uint16_t fnum,
- 				       uint16_t mode, const uint8_t *buf,
--				       off_t offset, size_t size);
-+				       off64_t offset, size_t size);
- NTSTATUS cli_write_andx_recv(struct tevent_req *req, size_t *pwritten);
- 
- NTSTATUS cli_writeall(struct cli_state *cli, uint16_t fnum, uint16_t mode,
--		      const uint8_t *buf, off_t offset, size_t size,
-+		      const uint8_t *buf, off64_t offset, size_t size,
- 		      size_t *pwritten);
- 
- struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
- 				 struct cli_state *cli,
- 				 uint16_t fnum, uint16_t mode,
--				 off_t start_offset, size_t window_size,
-+				 off64_t start_offset, size_t window_size,
- 				 size_t (*source)(uint8_t *buf, size_t n,
- 						  void *priv),
- 				 void *priv);
- NTSTATUS cli_push_recv(struct tevent_req *req);
- NTSTATUS cli_push(struct cli_state *cli, uint16_t fnum, uint16_t mode,
--		  off_t start_offset, size_t window_size,
-+		  off64_t start_offset, size_t window_size,
- 		  size_t (*source)(uint8_t *buf, size_t n, void *priv),
- 		  void *priv);
- 
---- a/source3/locking/posix.c
-+++ b/source3/locking/posix.c
-@@ -83,29 +83,29 @@
-  False if not.
- ****************************************************************************/
- 
--static bool posix_lock_in_range(off_t *offset_out, off_t *count_out,
-+static bool posix_lock_in_range(off64_t *offset_out, off64_t *count_out,
- 				uint64_t u_offset, uint64_t u_count)
- {
--	off_t offset = (off_t)u_offset;
--	off_t count = (off_t)u_count;
-+	off64_t offset = (off64_t)u_offset;
-+	off64_t count = (off64_t)u_count;
- 
- 	/*
- 	 * For the type of system we are, attempt to
--	 * find the maximum positive lock offset as an off_t.
-+	 * find the maximum positive lock offset as an off64_t.
- 	 */
- 
- #if defined(MAX_POSITIVE_LOCK_OFFSET) /* Some systems have arbitrary limits. */
- 
--	off_t max_positive_lock_offset = (MAX_POSITIVE_LOCK_OFFSET);
-+	off64_t max_positive_lock_offset = (MAX_POSITIVE_LOCK_OFFSET);
- #else
- 	/*
--	 * In this case off_t is 64 bits,
-+	 * In this case off64_t is 64 bits,
- 	 * and the underlying system can handle 64 bit signed locks.
- 	 */
- 
--	off_t mask2 = ((off_t)0x4) << (SMB_OFF_T_BITS-4);
--	off_t mask = (mask2<<1);
--	off_t max_positive_lock_offset = ~mask;
-+	off64_t mask2 = ((off64_t)0x4) << (SMB_OFF_T_BITS-4);
-+	off64_t mask = (mask2<<1);
-+	off64_t max_positive_lock_offset = ~mask;
- 
- #endif
- 	/*
-@@ -114,7 +114,7 @@
- 	 * any Win32 locks of length zero. JRA.
- 	 */
- 
--	if (count == (off_t)0) {
-+	if (count == (off64_t)0) {
- 		DEBUG(10,("posix_lock_in_range: count = 0, ignoring.\n"));
- 		return False;
- 	}
-@@ -170,8 +170,8 @@
- }
- 
- bool smb_vfs_call_lock(struct vfs_handle_struct *handle,
--		       struct files_struct *fsp, int op, off_t offset,
--		       off_t count, int type)
-+		       struct files_struct *fsp, int op, off64_t offset,
-+		       off64_t count, int type)
- {
- 	VFS_FIND(lock);
- 	return handle->fns->lock_fn(handle, fsp, op, offset, count, type);
-@@ -182,7 +182,7 @@
-  broken NFS implementations.
- ****************************************************************************/
- 
--static bool posix_fcntl_lock(files_struct *fsp, int op, off_t offset, off_t count, int type)
-+static bool posix_fcntl_lock(files_struct *fsp, int op, off64_t offset, off64_t count, int type)
- {
- 	bool ret;
- 
-@@ -202,12 +202,12 @@
- 		 * 32 bit NFS mounted filesystems. Just ignore it.
- 		 */
- 
--		if (offset & ~((off_t)0x7fffffff)) {
-+		if (offset & ~((off64_t)0x7fffffff)) {
- 			DEBUG(0,("Offset greater than 31 bits. Returning success.\n"));
- 			return True;
- 		}
- 
--		if (count & ~((off_t)0x7fffffff)) {
-+		if (count & ~((off64_t)0x7fffffff)) {
- 			/* 32 bit NFS file system, retry with smaller offset */
- 			DEBUG(0,("Count greater than 31 bits - retrying with 31 bit truncated length.\n"));
- 			errno = 0;
-@@ -221,8 +221,8 @@
- }
- 
- bool smb_vfs_call_getlock(struct vfs_handle_struct *handle,
--			  struct files_struct *fsp, off_t *poffset,
--			  off_t *pcount, int *ptype, pid_t *ppid)
-+			  struct files_struct *fsp, off64_t *poffset,
-+			  off64_t *pcount, int *ptype, pid_t *ppid)
- {
- 	VFS_FIND(getlock);
- 	return handle->fns->getlock_fn(handle, fsp, poffset, pcount, ptype, 
-@@ -234,7 +234,7 @@
-  broken NFS implementations.
- ****************************************************************************/
- 
--static bool posix_fcntl_getlock(files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype)
-+static bool posix_fcntl_getlock(files_struct *fsp, off64_t *poffset, off64_t *pcount, int *ptype)
- {
- 	pid_t pid;
- 	bool ret;
-@@ -256,12 +256,12 @@
- 		 * 32 bit NFS mounted filesystems. Just ignore it.
- 		 */
- 
--		if (*poffset & ~((off_t)0x7fffffff)) {
-+		if (*poffset & ~((off64_t)0x7fffffff)) {
- 			DEBUG(0,("Offset greater than 31 bits. Returning success.\n"));
- 			return True;
- 		}
- 
--		if (*pcount & ~((off_t)0x7fffffff)) {
-+		if (*pcount & ~((off64_t)0x7fffffff)) {
- 			/* 32 bit NFS file system, retry with smaller offset */
- 			DEBUG(0,("Count greater than 31 bits - retrying with 31 bit truncated length.\n"));
- 			errno = 0;
-@@ -285,8 +285,8 @@
- 			enum brl_type *plock_type,
- 			enum brl_flavour lock_flav)
- {
--	off_t offset;
--	off_t count;
-+	off64_t offset;
-+	off64_t count;
- 	int posix_lock_type = map_posix_lock_type(fsp,*plock_type);
- 
- 	DEBUG(10,("is_posix_locked: File %s, offset = %.0f, count = %.0f, "
-@@ -662,8 +662,8 @@
- struct lock_list {
- 	struct lock_list *next;
- 	struct lock_list *prev;
--	off_t start;
--	off_t size;
-+	off64_t start;
-+	off64_t size;
- };
- 
- /****************************************************************************
-@@ -901,8 +901,8 @@
- 			int num_locks,
- 			int *errno_ret)
- {
--	off_t offset;
--	off_t count;
-+	off64_t offset;
-+	off64_t count;
- 	int posix_lock_type = map_posix_lock_type(fsp,lock_type);
- 	bool ret = True;
- 	size_t lock_count;
-@@ -1039,8 +1039,8 @@
- 				const struct lock_struct *plocks,
- 				int num_locks)
- {
--	off_t offset;
--	off_t count;
-+	off64_t offset;
-+	off64_t count;
- 	bool ret = True;
- 	TALLOC_CTX *ul_ctx = NULL;
- 	struct lock_list *ulist = NULL;
-@@ -1161,8 +1161,8 @@
- 			enum brl_type lock_type,
- 			int *errno_ret)
- {
--	off_t offset;
--	off_t count;
-+	off64_t offset;
-+	off64_t count;
- 	int posix_lock_type = map_posix_lock_type(fsp,lock_type);
- 
- 	DEBUG(5,("set_posix_lock_posix_flavour: File %s, offset = %.0f, count "
-@@ -1205,8 +1205,8 @@
- 				int num_locks)
- {
- 	bool ret = True;
--	off_t offset;
--	off_t count;
-+	off64_t offset;
-+	off64_t count;
- 	TALLOC_CTX *ul_ctx = NULL;
- 	struct lock_list *ulist = NULL;
- 	struct lock_list *ul = NULL;
---- a/source3/passdb/pdb_smbpasswd.c
-+++ b/source3/passdb/pdb_smbpasswd.c
-@@ -642,7 +642,7 @@
- 	int fd;
- 	size_t new_entry_length;
- 	char *new_entry;
--	off_t offpos;
-+	off64_t offpos;
-  
- 	/* Open the smbpassword file - for update. */
- 	fp = startsmbfilepwent(pfile, PWF_UPDATE, &smbpasswd_state->pw_file_lock_depth);
-@@ -751,7 +751,7 @@
- 	bool found_entry = False;
- 	bool got_pass_last_set_time = False;
- 
--	off_t pwd_seekpos = 0;
-+	off64_t pwd_seekpos = 0;
- 
- 	int i;
- 	int wr_len;
---- a/source3/registry/regfio.c
-+++ b/source3/registry/regfio.c
-@@ -493,7 +493,7 @@
- /*******************************************************************
- *******************************************************************/
- 
--static REGF_HBIN* read_hbin_block( REGF_FILE *file, off_t offset )
-+static REGF_HBIN* read_hbin_block( REGF_FILE *file, off64_t offset )
- {
- 	REGF_HBIN *hbin;
- 	uint32 record_size, curr_off, block_size, header;
---- a/source3/rpc_client/rpc_transport_tstream.c
-+++ b/source3/rpc_client/rpc_transport_tstream.c
-@@ -88,7 +88,7 @@
- struct rpc_tstream_next_vector_state {
- 	uint8_t *buf;
- 	size_t len;
--	off_t ofs;
-+	off64_t ofs;
- 	size_t remaining;
- };
- 
---- a/source3/utils/smbget.c
-+++ b/source3/utils/smbget.c
-@@ -36,7 +36,7 @@
- 
- 
- static time_t total_start_time = 0;
--static off_t total_bytes = 0;
-+static off64_t total_bytes = 0;
- 
- #define SMB_MAXPATHLEN MAXPATHLEN
- 
-@@ -75,7 +75,7 @@
- 	columns = get_num_cols();
- }
- 
--static void human_readable(off_t s, char *buffer, int l)
-+static void human_readable(off64_t s, char *buffer, int l)
- {
- 	if (s > 1024 * 1024 * 1024) {
- 		snprintf(buffer, l, "%.2fGB", 1.0 * s / (1024 * 1024 * 1024));
-@@ -238,7 +238,7 @@
- 	return buffer;
- }
- 
--static void print_progress(const char *name, time_t start, time_t now, off_t start_pos, off_t pos, off_t total)
-+static void print_progress(const char *name, time_t start, time_t now, off64_t start_pos, off64_t pos, off64_t total)
- {
- 	double avg = 0.0;
- 	long  eta = -1; 
-@@ -286,7 +286,7 @@
- 	char path[SMB_MAXPATHLEN];
- 	char checkbuf[2][RESUME_CHECK_SIZE];
- 	char *readbuf = NULL;
--	off_t offset_download = 0, offset_check = 0, curpos = 0, start_offset = 0;
-+	off64_t offset_download = 0, offset_check = 0, curpos = 0, start_offset = 0;
- 	struct stat localstat, remotestat;
- 
- 	snprintf(path, SMB_MAXPATHLEN-1, "%s%s%s", base, (*base && *name && name[0] != '/' && base[strlen(base)-1] != '/')?"/":"", name);
-@@ -394,7 +394,7 @@
- 		}
- 
- 		if(offset_check) { 
--			off_t off1, off2;
-+			off64_t off1, off2;
- 			/* First, check all bytes from offset_check to offset_download */
- 			off1 = lseek(localhandle, offset_check, SEEK_SET);
- 			if(off1 < 0) {

_service:download_files:master.tar.gz/tools/depends/xbmc-addons.include Changed

_service:download_files:master.tar.gz/xbmc/Application.cpp Changed

@@ -45,49 +45,49 @@
 #ifdef HAS_PYTHON
 #include "interfaces/python/XBPython.h"
 #endif
-#include "input/actions/ActionTranslator.h"
-#include "input/ButtonTranslator.h"
-#include "guilib/GUIAudioManager.h"
+#include "GUILargeTextureManager.h"
 #include "GUIPassword.h"
-#include "input/InertialScrollingHandler.h"
-#include "messaging/ThreadMessage.h"
-#include "messaging/ApplicationMessenger.h"
-#include "messaging/helpers/DialogHelper.h"
-#include "messaging/helpers/DialogOKHelper.h"
+#include "GUIUserMessages.h"
 #include "SectionLoader.h"
+#include "SeekHandler.h"
+#include "ServiceBroker.h"
+#include "TextureCache.h"
 #include "cores/DllLoader/DllLoaderContainer.h"
-#include "GUIUserMessages.h"
 #include "filesystem/Directory.h"
 #include "filesystem/DirectoryCache.h"
-#include "filesystem/StackDirectory.h"
-#include "filesystem/SpecialProtocol.h"
 #include "filesystem/DllLibCurl.h"
 #include "filesystem/PluginDirectory.h"
-#include "utils/SystemInfo.h"
-#include "utils/TimeUtils.h"
-#include "GUILargeTextureManager.h"
-#include "TextureCache.h"
-#include "playlists/SmartPlayList.h"
+#include "filesystem/SpecialProtocol.h"
+#include "filesystem/StackDirectory.h"
+#include "guilib/GUIAudioManager.h"
+#include "guilib/LocalizeStrings.h"
+#include "input/ButtonTranslator.h"
+#include "input/InertialScrollingHandler.h"
+#include "input/KeyboardLayoutManager.h"
+#include "input/actions/ActionTranslator.h"
+#include "messaging/ApplicationMessenger.h"
+#include "messaging/ThreadMessage.h"
+#include "messaging/helpers/DialogHelper.h"
+#include "messaging/helpers/DialogOKHelper.h"
 #include "playlists/PlayList.h"
-#include "profiles/ProfileManager.h"
-#include "windowing/WinSystem.h"
+#include "playlists/SmartPlayList.h"
 #include "powermanagement/DPMSSupport.h"
 #include "powermanagement/PowerManager.h"
 #include "powermanagement/PowerTypes.h"
-#include "settings/Settings.h"
+#include "profiles/ProfileManager.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
 #include "settings/MediaSettings.h"
+#include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
 #include "settings/SkinSettings.h"
-#include "guilib/LocalizeStrings.h"
 #include "utils/CPUInfo.h"
 #include "utils/FileExtensionProvider.h"
+#include "utils/SystemInfo.h"
+#include "utils/TimeUtils.h"
+#include "utils/XTimeUtils.h"
 #include "utils/log.h"
-#include "SeekHandler.h"
-#include "ServiceBroker.h"
-
-#include "input/KeyboardLayoutManager.h"
+#include "windowing/WinSystem.h"
 
 #ifdef HAS_UPNP
 #include "network/upnp/UPnP.h"
@@ -169,7 +169,6 @@
 
 #ifdef TARGET_POSIX
 #include "platform/posix/XHandle.h"
-#include "platform/posix/XTimeUtils.h"
 #include "platform/posix/filesystem/PosixDirectory.h"
 #include "platform/posix/PlatformPosix.h"
 #endif
@@ -2103,7 +2102,8 @@
 
   case TMSG_SWITCHTOFULLSCREEN:
     if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO &&
-        CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() != WINDOW_FULLSCREEN_GAME)
+        CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() != WINDOW_FULLSCREEN_GAME &&
+        CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() != WINDOW_VISUALISATION)
       SwitchToFullScreen(true);
     break;
 
@@ -2262,6 +2262,17 @@
 
     break;
 
+  case TMSG_EVENT:
+  {
+    if (pMsg->lpVoid)
+    {
+      XBMC_Event* event = static_cast<XBMC_Event*>(pMsg->lpVoid);
+      OnEvent(*event);
+      delete event;
+    }
+  }
+  break;
+    
   default:
     CLog::Log(LOGERROR, "%s: Unhandled threadmessage sent, %u", __FUNCTION__, msg);
     break;
@@ -2360,7 +2371,7 @@
       if (!m_appPlayer.IsPlayingVideo() || m_appPlayer.IsPausedPlayback())
         max_sleep = 80;
       unsigned int sleepTime = std::max(static_cast<unsigned int>(2), std::min(m_ProcessedExternalCalls >> 2, max_sleep));
-      Sleep(sleepTime);
+      KODI::TIME::Sleep(sleepTime);
       m_frameMoveGuard.lock();
       m_ProcessedExternalDecay = 5;
     }
@@ -2520,7 +2531,7 @@
     XbmcThreads::EndTime timer(1000);
     while (m_pAppPort.use_count() > 1)
     {
-      Sleep(100);
+      KODI::TIME::Sleep(100);
       if (timer.IsTimePast())
       {
         CLog::Log(LOGERROR, "CApplication::Stop - CAppPort still in use, app may crash");
@@ -2630,7 +2641,7 @@
 
   cleanup_emu_environ();
 
-  Sleep(200);
+  KODI::TIME::Sleep(200);
 }
 
 bool CApplication::PlayMedia(CFileItem& item, const std::string &player, int iPlaylist)
@@ -2906,7 +2917,15 @@
   // this really aught to be inside !bRestart, but since PlayStack
   // uses that to init playback, we have to keep it outside
   int playlist = CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist();
-  if (item.IsVideo() && playlist == PLAYLIST_VIDEO && CServiceBroker::GetPlaylistPlayer().GetPlaylist(playlist).size() > 1)
+  if (item.IsAudio() && playlist == PLAYLIST_MUSIC)
+  { // playing from a playlist by the looks
+    // don't switch to fullscreen if we are not playing the first item...
+    options.fullscreen = !CServiceBroker::GetPlaylistPlayer().HasPlayedFirstFile() &&
+        CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+        CSettings::SETTING_MUSICFILES_SELECTACTION);
+  }
+  else if (item.IsVideo() && playlist == PLAYLIST_VIDEO &&
+      CServiceBroker::GetPlaylistPlayer().GetPlaylist(playlist).size() > 1)
   { // playing from a playlist by the looks
     // don't switch to fullscreen if we are not playing the first item...
     options.fullscreen = !CServiceBroker::GetPlaylistPlayer().HasPlayedFirstFile() && CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_fullScreenOnMovieStart && !CMediaSettings::GetInstance().DoesVideoStartWindowed();
@@ -4553,6 +4572,24 @@
     if (pDialog) pDialog->Close(true);
   }
 
+  // if playing from the album info window, close it first!
+  if (CServiceBroker::GetGUI()->GetWindowManager().IsModalDialogTopmost(WINDOW_DIALOG_MUSIC_INFO))
+  {
+    CGUIDialogVideoInfo* pDialog = CServiceBroker::GetGUI()->
+        GetWindowManager().GetWindow<CGUIDialogVideoInfo>(WINDOW_DIALOG_MUSIC_INFO);
+    if (pDialog)
+      pDialog->Close(true);
+  }
+
+  // if playing from the song info window, close it first!
+  if (CServiceBroker::GetGUI()->GetWindowManager().IsModalDialogTopmost(WINDOW_DIALOG_SONG_INFO))
+  {
+    CGUIDialogVideoInfo* pDialog = CServiceBroker::GetGUI()->
+        GetWindowManager().GetWindow<CGUIDialogVideoInfo>(WINDOW_DIALOG_SONG_INFO);
+    if (pDialog)
+      pDialog->Close(true);
+  }
+
   int windowID = WINDOW_INVALID;
 
   // See if we're playing a game, and are in GUI mode

_service:download_files:master.tar.gz/xbmc/Application.h Changed

_service:download_files:master.tar.gz/xbmc/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/FileItem.cpp Changed

_service:download_files:master.tar.gz/xbmc/FileItem.h Changed

@@ -209,6 +209,7 @@
   bool IsDVDFile(bool bVobs = true, bool bIfos = true) const;
   bool IsBDFile() const;
   bool IsBluray() const;
+  bool IsProtectedBlurayDisc() const;
   bool IsRAR() const;
   bool IsAPK() const;
   bool IsZIP() const;
@@ -757,12 +758,12 @@
 
   void ClearSortState();
 
-  VECFILEITEMS::const_iterator begin() { return m_items.cbegin(); }
-  VECFILEITEMS::const_iterator end() { return m_items.cend(); }
+  VECFILEITEMS::iterator begin() { return m_items.begin(); }
+  VECFILEITEMS::iterator end() { return m_items.end(); }
   VECFILEITEMS::const_iterator begin() const { return m_items.begin(); }
   VECFILEITEMS::const_iterator end() const { return m_items.end(); }
-  VECFILEITEMS::const_iterator cbegin() const { return m_items.begin(); }
-  VECFILEITEMS::const_iterator cend() const { return m_items.end(); }
+  VECFILEITEMS::const_iterator cbegin() const { return m_items.cbegin(); }
+  VECFILEITEMS::const_iterator cend() const { return m_items.cend(); }
 private:
   void Sort(FILEITEMLISTCOMPARISONFUNC func);
   void FillSortFields(FILEITEMFILLFUNC func);

_service:download_files:master.tar.gz/xbmc/GUIInfoManager.cpp Changed

@@ -1191,6 +1191,14 @@
 ///     @return **True** if Kodi is running on an IOS device.
 ///     <p>
 ///   }
+///   \table_row3{   <b>`System.Platform.TVOS`</b>,
+///                  \anchor System_PlatformTVOS
+///                  _boolean_,
+///     @return **True** if Kodi is running on a tvOS device.
+///     <p><hr>
+///     @skinning_v19 **[New Boolean Condition]** \link System_PlatformTVOS `System.Platform.TVOS`\endlink
+///     <p>
+///   }
 ///   \table_row3{   <b>`System.Platform.Darwin`</b>,
 ///                  \anchor System_PlatformDarwin
 ///                  _boolean_,
@@ -3995,6 +4003,22 @@
 ///     @return A review of the currently selected Album.
 ///     <p>
 ///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Totaldiscs)`</b>,
+///                  \anchor ListItem_Property_Album_Totaldiscs
+///                  _string_,
+///     @return The total number of discs belonging to an album.
+///     <p><hr>
+///     @skinning_v19 **[New Infolabel]** \link ListItem.Property(Album_Totaldiscs) `ListItem.Property(Album_Totaldiscs)`\endlink
+///     <p>
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Isboxset)`</b>,
+///                  \anchor ListItem_Property_Album_Isboxset
+///                  _string_,
+///     @return **True** if the album is a boxset.
+///     <p><hr>
+///     @skinning_v19 **[New Infobool]** \link ListItem.Property(Album_Isboxset) `ListItem.Property(Album_Isboxset)`\endlink
+///     <p>
+///   }
 ///   \table_row3{   <b>`ListItem.DiscNumber`</b>,
 ///                  \anchor ListItem_DiscNumber
 ///                  _string_,
@@ -9213,6 +9237,8 @@
         return SYSTEM_PLATFORM_DARWIN_OSX;
       else if (platform == "ios")
         return SYSTEM_PLATFORM_DARWIN_IOS;
+      else if (platform == "tvos")
+        return SYSTEM_PLATFORM_DARWIN_TVOS;
       else if (platform == "android")
         return SYSTEM_PLATFORM_ANDROID;
     }

_service:download_files:master.tar.gz/xbmc/GUIPassword.cpp Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2005-2018 Team Kodi
+ *  Copyright (C) 2005-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -18,6 +18,7 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
+#include "media/MediaLockState.h"
 #include "messaging/ApplicationMessenger.h"
 #include "messaging/helpers/DialogOKHelper.h"
 #include "profiles/ProfileManager.h"
@@ -28,6 +29,7 @@
 #include "settings/SettingsComponent.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
+#include "utils/log.h"
 #include "view/ViewStateSettings.h"
 
 #include <utility>
@@ -41,41 +43,33 @@
 }
 CGUIPassword::~CGUIPassword(void) = default;
 
-bool CGUIPassword::IsItemUnlocked(CFileItem* pItem, const std::string &strType)
+template<typename T>
+bool CGUIPassword::IsItemUnlocked(T pItem,
+                                  const std::string& strType,
+                                  const std::string& strLabel,
+                                  const std::string& strHeading)
 {
-  const std::shared_ptr<CProfileManager> profileManager = CServiceBroker::GetSettingsComponent()->GetProfileManager();
-
-  // \brief Tests if the user is allowed to access the share folder
-  // \param pItem The share folder item to access
-  // \param strType The type of share being accessed, e.g. "music", "video", etc. See CSettings::UpdateSources()
-  // \return If access is granted, returns \e true
+  const std::shared_ptr<CProfileManager> profileManager =
+      CServiceBroker::GetSettingsComponent()->GetProfileManager();
   if (profileManager->GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
     return true;
 
-  while (pItem->m_iHasLock > 1)
+  while (pItem->m_iHasLock > LOCK_STATE_LOCK_BUT_UNLOCKED)
   {
-    std::string strLockCode = pItem->m_strLockCode;
-    std::string strLabel = pItem->GetLabel();
-    int iResult = 0;  // init to user succeeded state, doing this to optimize switch statement below
-    char buffer[33]; // holds 32 places plus sign character
-    if(g_passwordManager.bMasterUser)// Check if we are the MasterUser!
-    {
-      iResult = 0;
-    }
-    else
+    const std::string strLockCode = pItem->m_strLockCode;
+    int iResult = 0; // init to user succeeded state, doing this to optimize switch statement below
+    if (!g_passwordManager.bMasterUser) // Check if we are the MasterUser!
     {
-      if (0 != CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES) && pItem->m_iBadPwdCount >= CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES))
-      { // user previously exhausted all retries, show access denied error
+      if (0 != CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+                   CSettings::SETTING_MASTERLOCK_MAXRETRIES) &&
+          pItem->m_iBadPwdCount >= CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+                                       CSettings::SETTING_MASTERLOCK_MAXRETRIES))
+      {
+        // user previously exhausted all retries, show access denied error
         HELPERS::ShowOKDialogText(CVariant{12345}, CVariant{12346});
         return false;
       }
       // show the appropriate lock dialog
-      std::string strHeading = "";
-      if (pItem->m_bIsFolder)
-        strHeading = g_localizeStrings.Get(12325);
-      else
-        strHeading = g_localizeStrings.Get(12348);
-
       iResult = VerifyPassword(pItem->m_iLockMode, strLockCode, strHeading);
     }
     switch (iResult)
@@ -89,20 +83,21 @@
       {
         // password entry succeeded
         pItem->m_iBadPwdCount = 0;
-        pItem->m_iHasLock = 1;
-        g_passwordManager.LockSource(strType,strLabel,false);
-        sprintf(buffer,"%i",pItem->m_iBadPwdCount);
-        CMediaSourceSettings::GetInstance().UpdateSource(strType, strLabel, "badpwdcount", buffer);
+        pItem->m_iHasLock = LOCK_STATE_LOCK_BUT_UNLOCKED;
+        g_passwordManager.LockSource(strType, strLabel, false);
+        CMediaSourceSettings::GetInstance().UpdateSource(strType, strLabel, "badpwdcount",
+                                                         std::to_string(pItem->m_iBadPwdCount));
         CMediaSourceSettings::GetInstance().Save();
         break;
       }
     case 1:
       {
         // password entry failed
-        if (0 != CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES))
+        if (0 != CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+                     CSettings::SETTING_MASTERLOCK_MAXRETRIES))
           pItem->m_iBadPwdCount++;
-        sprintf(buffer,"%i",pItem->m_iBadPwdCount);
-        CMediaSourceSettings::GetInstance().UpdateSource(strType, strLabel, "badpwdcount", buffer);
+        CMediaSourceSettings::GetInstance().UpdateSource(strType, strLabel, "badpwdcount",
+                                                         std::to_string(pItem->m_iBadPwdCount));
         CMediaSourceSettings::GetInstance().Save();
         break;
       }
@@ -117,12 +112,32 @@
   return true;
 }
 
+bool CGUIPassword::IsItemUnlocked(CFileItem* pItem, const std::string& strType)
+{
+  const std::string strLabel = pItem->GetLabel();
+  std::string strHeading;
+  if (pItem->m_bIsFolder)
+    strHeading = g_localizeStrings.Get(12325); // "Locked! Enter code..."
+  else
+    strHeading = g_localizeStrings.Get(12348); // "Item locked"
+
+  return IsItemUnlocked<CFileItem*>(pItem, strType, strLabel, strHeading);
+}
+
+bool CGUIPassword::IsItemUnlocked(CMediaSource* pItem, const std::string& strType)
+{
+  const std::string strLabel = pItem->strName;
+  std::string strHeading = g_localizeStrings.Get(12325); // "Locked! Enter code..."
+
+  return IsItemUnlocked<CMediaSource*>(pItem, strType, strLabel, strHeading);
+}
+
 bool CGUIPassword::CheckStartUpLock()
 {
   // prompt user for mastercode if the mastercode was set b4 or by xml
   int iVerifyPasswordResult = -1;
 
-  std::string strHeader = g_localizeStrings.Get(20075);
+  std::string strHeader = g_localizeStrings.Get(20075); // "Enter master lock code"
 
   if (iMasterLockRetriesLeft == -1)
     iMasterLockRetriesLeft = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES);
@@ -144,7 +159,7 @@
       if (iVerifyPasswordResult != 0 )
       {
         std::string strLabel1;
-        strLabel1 = g_localizeStrings.Get(12343);
+        strLabel1 = g_localizeStrings.Get(12343); // "retries left"
         int iLeft = g_passwordManager.iMasterLockRetriesLeft-i;
         std::string strLabel = StringUtils::Format("%i %s", iLeft, strLabel1.c_str());
 
@@ -176,6 +191,7 @@
   if (profile)
   {
     CProfile::CLock locks = profile->GetLocks();
+    // prompt user for master lock
     if (CGUIDialogLockSettings::ShowAndGetLock(locks, 12360, true, bDetails))
     {
       profile->SetLocks(locks);
@@ -225,6 +241,7 @@
     else
     {
       if (profileManager->GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
+        // prompt user for profile lock code
         return CheckLock(profile->getLockMode(),profile->getLockCode(),20095,bCanceled);
     }
   }
@@ -302,14 +319,14 @@
         g_passwordManager.iMasterLockRetriesLeft = 0;
         // Tell the user they ran out of retry attempts
         HELPERS::ShowOKDialogText(CVariant{12345}, CVariant{12346});
-        return ;
+        return;
       }
     }
     std::string dlgLine1 = "";
     if (0 < g_passwordManager.iMasterLockRetriesLeft)
-      dlgLine1 = StringUtils::Format("%d %s",
-                                     g_passwordManager.iMasterLockRetriesLeft,
-                                     g_localizeStrings.Get(12343).c_str());
+      dlgLine1 = StringUtils::Format("%d %s", g_passwordManager.iMasterLockRetriesLeft,
+                                     g_localizeStrings.Get(12343).c_str()); // "retries left"
+    // prompt user for master lock code
     HELPERS::ShowOKDialogLines(CVariant{20075}, CVariant{12345}, CVariant{std::move(dlgLine1)}, CVariant{0});
   }
   else
@@ -428,9 +445,13 @@
       break;
     case WINDOW_MUSIC_NAV:      // Music
       bCheckPW = profileManager->GetCurrentProfile().musicLocked();
+      if (!bCheckPW && strMediasourcePath != "") // check mediasource by path
+        return g_passwordManager.IsMediaPathUnlocked(strMediasourcePath, "music");
       break;
     case WINDOW_VIDEO_NAV:      // Video
       bCheckPW = profileManager->GetCurrentProfile().videoLocked();
+      if (!bCheckPW && strMediasourcePath != "") // check mediasource by path
+        return g_passwordManager.IsMediaPathUnlocked(strMediasourcePath, "video");
       break;
     case WINDOW_PICTURES:       // Pictures
       bCheckPW = profileManager->GetCurrentProfile().picturesLocked();
@@ -459,9 +480,9 @@
   {
     if (it->strName == strName)
     {
-      if (it->m_iHasLock > 0)
+      if (it->m_iHasLock > LOCK_STATE_NO_LOCK)
       {
-        it->m_iHasLock = bState?2:1;
+        it->m_iHasLock = bState ? LOCK_STATE_LOCKED : LOCK_STATE_LOCK_BUT_UNLOCKED;
         bResult = true;
       }
       break;
@@ -482,7 +503,7 @@
     VECSOURCES *shares = CMediaSourceSettings::GetInstance().GetSources(strType);
     for (IVECSOURCES it=shares->begin();it != shares->end();++it)
       if (it->m_iLockMode != LOCK_MODE_EVERYONE)
-        it->m_iHasLock = lock ? 2 : 1;
+        it->m_iHasLock = lock ? LOCK_STATE_LOCKED : LOCK_STATE_LOCK_BUT_UNLOCKED;
   }
   CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_SOURCES);
   CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg);
@@ -498,9 +519,11 @@
     for (IVECSOURCES it=shares->begin();it != shares->end();++it)
       if (it->m_iLockMode != LOCK_MODE_EVERYONE) // remove old info
       {
-        it->m_iHasLock = 0;
+        it->m_iHasLock = LOCK_STATE_NO_LOCK;
         it->m_iLockMode = LOCK_MODE_EVERYONE;
-        CMediaSourceSettings::GetInstance().UpdateSource(strType, it->strName, "lockmode", "0"); // removes locks from xml
+
+        // remove locks from xml
+        CMediaSourceSettings::GetInstance().UpdateSource(strType, it->strName, "lockmode", "0");
       }
   }
   CMediaSourceSettings::GetInstance().Save();
@@ -519,13 +542,40 @@
   bool bName = false;
   int iIndex = CUtil::GetMatchingSource(strPath, vecSources, bName);
 
-  if (iIndex > -1 && iIndex < (int)vecSources.size())
-    if (vecSources[iIndex].m_iHasLock < 2)
+  if (iIndex > -1 && iIndex < static_cast<int>(vecSources.size()))
+    if (vecSources[iIndex].m_iHasLock < LOCK_STATE_LOCKED)
       return true;
 
   return false;
 }
 
+bool CGUIPassword::IsMediaPathUnlocked(const std::string& strPath, const std::string& strType)
+{
+  if (StringUtils::StartsWithNoCase(strPath, "root") ||
+      StringUtils::StartsWithNoCase(strPath, "library://"))
+  {
+    // no mediasource-lookup needed
+    CLog::Log(LOGDEBUG, "CGUIPassword::IsMediaPathUnlocked - entering from {}", strPath);
+    return true;
+  }
+
+  const std::shared_ptr<CProfileManager> profileManager =
+      CServiceBroker::GetSettingsComponent()->GetProfileManager();
+  if (g_passwordManager.bMasterUser ||
+      profileManager->GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
+    return true;
+
+  VECSOURCES& vecSources = *CMediaSourceSettings::GetInstance().GetSources(strType);
+  bool bName = false;
+  int iIndex = CUtil::GetMatchingSource(strPath, vecSources, bName);
+  if (iIndex > -1 && iIndex < static_cast<int>(vecSources.size()))
+    return g_passwordManager.IsItemUnlocked(&vecSources[iIndex], strType);
+
+  // need to add a missing filter (root/library.. etc.)
+  CLog::Log(LOGERROR, "CGUIPassword::IsMediaPathUnlocked - missing filter: {}", strPath);
+  return true;
+}
+
 void CGUIPassword::OnSettingAction(std::shared_ptr<const CSetting> setting)
 {
   if (setting == NULL)

_service:download_files:master.tar.gz/xbmc/GUIPassword.h Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2005-2018 Team Kodi
+ *  Copyright (C) 2005-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -25,7 +25,22 @@
 public:
   CGUIPassword(void);
   ~CGUIPassword(void) override;
+  template<typename T>
+  bool IsItemUnlocked(T pItem,
+                      const std::string& strType,
+                      const std::string& strLabel,
+                      const std::string& strHeading);
+  /*! \brief Tests if the user is allowed to access the share folder
+   \param pItem The share folder item to access
+   \param strType The type of share being accessed, e.g. "music", "video", etc. See CSettings::UpdateSources()
+   \return If access is granted, returns \e true
+   */
   bool IsItemUnlocked(CFileItem* pItem, const std::string &strType);
+  /*! \brief Tests if the user is allowed to access the Mediasource
+   \param pItem The share folder item to access
+   \param strType The type of share being accessed, e.g. "music", "video", etc. See CSettings::UpdateSources()
+   \return If access is granted, returns \e true
+   */
   bool IsItemUnlocked(CMediaSource* pItem, const std::string &strType);
   bool CheckLock(LockType btnType, const std::string& strPassword, int iHeading);
   bool CheckLock(LockType btnType, const std::string& strPassword, int iHeading, bool& bCanceled);
@@ -49,11 +64,18 @@
   void LockSources(bool lock);
   void RemoveSourceLocks();
   bool IsDatabasePathUnlocked(const std::string& strPath, VECSOURCES& vecSources);
+  /*! \brief Tests if the user is allowed to access the path by looking up the matching Mediasource
+   \param strPath The folder path to access
+   \param strType The type of share being accessed, e.g. "music", "video", etc. See CSettings::UpdateSources()
+   \return If access is granted, returns \e true
+   */
+  bool IsMediaPathUnlocked(const std::string& strPath, const std::string& strType);
 
   void OnSettingAction(std::shared_ptr<const CSetting> setting) override;
 
   bool bMasterUser;
   int iMasterLockRetriesLeft;
+  std::string strMediasourcePath;
 
 private:
   int VerifyPassword(LockType btnType, const std::string& strPassword, const std::string& strHeading);

_service:download_files:master.tar.gz/xbmc/GUIUserMessages.h Changed

_service:download_files:master.tar.gz/xbmc/LockType.h Changed

_service:download_files:master.tar.gz/xbmc/MediaSource.cpp Changed

_service:download_files:master.tar.gz/xbmc/MediaSource.h Changed

_service:download_files:master.tar.gz/xbmc/PlayListPlayer.cpp Changed

_service:download_files:master.tar.gz/xbmc/TextureCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/TextureCacheJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/Util.cpp Changed

_service:download_files:master.tar.gz/xbmc/Util.h Changed

_service:download_files:master.tar.gz/xbmc/XBApplicationEx.cpp Changed

_service:download_files:master.tar.gz/xbmc/XBDateTime.cpp Changed

@@ -6,20 +6,16 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include <cstdlib>
-
 #include "XBDateTime.h"
+
 #include "LangInfo.h"
 #include "guilib/LocalizeStrings.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
 #include "utils/Archive.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#include "platform/posix/XFileUtils.h"
-#else
-#include <Windows.h>
-#endif
+#include "utils/StringUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
+#include <cstdlib>
 
 #define SECONDS_PER_DAY 86400UL
 #define SECONDS_PER_HOUR 3600UL
@@ -36,14 +32,14 @@
 
 CDateTimeSpan::CDateTimeSpan()
 {
-  m_timeSpan.dwHighDateTime=0;
-  m_timeSpan.dwLowDateTime=0;
+  m_timeSpan.highDateTime = 0;
+  m_timeSpan.lowDateTime = 0;
 }
 
 CDateTimeSpan::CDateTimeSpan(const CDateTimeSpan& span)
 {
-  m_timeSpan.dwHighDateTime=span.m_timeSpan.dwHighDateTime;
-  m_timeSpan.dwLowDateTime=span.m_timeSpan.dwLowDateTime;
+  m_timeSpan.highDateTime = span.m_timeSpan.highDateTime;
+  m_timeSpan.lowDateTime = span.m_timeSpan.lowDateTime;
 }
 
 CDateTimeSpan::CDateTimeSpan(int day, int hour, int minute, int second)
@@ -53,7 +49,7 @@
 
 bool CDateTimeSpan::operator >(const CDateTimeSpan& right) const
 {
-  return CompareFileTime(&m_timeSpan, &right.m_timeSpan)>0;
+  return KODI::TIME::CompareFileTime(&m_timeSpan, &right.m_timeSpan) > 0;
 }
 
 bool CDateTimeSpan::operator >=(const CDateTimeSpan& right) const
@@ -63,7 +59,7 @@
 
 bool CDateTimeSpan::operator <(const CDateTimeSpan& right) const
 {
-  return CompareFileTime(&m_timeSpan, &right.m_timeSpan)<0;
+  return KODI::TIME::CompareFileTime(&m_timeSpan, &right.m_timeSpan) < 0;
 }
 
 bool CDateTimeSpan::operator <=(const CDateTimeSpan& right) const
@@ -73,7 +69,7 @@
 
 bool CDateTimeSpan::operator ==(const CDateTimeSpan& right) const
 {
-  return CompareFileTime(&m_timeSpan, &right.m_timeSpan)==0;
+  return KODI::TIME::CompareFileTime(&m_timeSpan, &right.m_timeSpan) == 0;
 }
 
 bool CDateTimeSpan::operator !=(const CDateTimeSpan& right) const
@@ -147,14 +143,14 @@
 
 void CDateTimeSpan::ToULargeInt(ULARGE_INTEGER& time) const
 {
-  time.u.HighPart=m_timeSpan.dwHighDateTime;
-  time.u.LowPart=m_timeSpan.dwLowDateTime;
+  time.u.HighPart = m_timeSpan.highDateTime;
+  time.u.LowPart = m_timeSpan.lowDateTime;
 }
 
 void CDateTimeSpan::FromULargeInt(const ULARGE_INTEGER& time)
 {
-  m_timeSpan.dwHighDateTime=time.u.HighPart;
-  m_timeSpan.dwLowDateTime=time.u.LowPart;
+  m_timeSpan.highDateTime = time.u.HighPart;
+  m_timeSpan.lowDateTime = time.u.LowPart;
 }
 
 void CDateTimeSpan::SetDateTimeSpan(int day, int hour, int minute, int second)
@@ -247,13 +243,13 @@
   Reset();
 }
 
-CDateTime::CDateTime(const SYSTEMTIME &time)
+CDateTime::CDateTime(const KODI::TIME::SystemTime& time)
 {
-  // we store internally as a FILETIME
+  // we store internally as a FileTime
   m_state = ToFileTime(time, m_time) ? valid : invalid;
 }
 
-CDateTime::CDateTime(const FILETIME &time)
+CDateTime::CDateTime(const KODI::TIME::FileTime& time)
 {
   m_time=time;
   SetValid(true);
@@ -283,8 +279,8 @@
 CDateTime CDateTime::GetCurrentDateTime()
 {
   // get the current time
-  SYSTEMTIME time;
-  GetLocalTime(&time);
+  KODI::TIME::SystemTime time;
+  KODI::TIME::GetLocalTime(&time);
 
   return CDateTime(time);
 }
@@ -296,14 +292,14 @@
   return time;
 }
 
-const CDateTime& CDateTime::operator =(const SYSTEMTIME& right)
+const CDateTime& CDateTime::operator=(const KODI::TIME::SystemTime& right)
 {
   m_state = ToFileTime(right, m_time) ? valid : invalid;
 
   return *this;
 }
 
-const CDateTime& CDateTime::operator =(const FILETIME& right)
+const CDateTime& CDateTime::operator=(const KODI::TIME::FileTime& right)
 {
   m_time=right;
   SetValid(true);
@@ -355,78 +351,78 @@
   return !operator ==(right);
 }
 
-bool CDateTime::operator >(const FILETIME& right) const
+bool CDateTime::operator>(const KODI::TIME::FileTime& right) const
 {
-  return CompareFileTime(&m_time, &right)>0;
+  return KODI::TIME::CompareFileTime(&m_time, &right) > 0;
 }
 
-bool CDateTime::operator >=(const FILETIME& right) const
+bool CDateTime::operator>=(const KODI::TIME::FileTime& right) const
 {
   return operator >(right) || operator ==(right);
 }
 
-bool CDateTime::operator <(const FILETIME& right) const
+bool CDateTime::operator<(const KODI::TIME::FileTime& right) const
 {
-  return CompareFileTime(&m_time, &right)<0;
+  return KODI::TIME::CompareFileTime(&m_time, &right) < 0;
 }
 
-bool CDateTime::operator <=(const FILETIME& right) const
+bool CDateTime::operator<=(const KODI::TIME::FileTime& right) const
 {
   return operator <(right) || operator ==(right);
 }
 
-bool CDateTime::operator ==(const FILETIME& right) const
+bool CDateTime::operator==(const KODI::TIME::FileTime& right) const
 {
-  return CompareFileTime(&m_time, &right)==0;
+  return KODI::TIME::CompareFileTime(&m_time, &right) == 0;
 }
 
-bool CDateTime::operator !=(const FILETIME& right) const
+bool CDateTime::operator!=(const KODI::TIME::FileTime& right) const
 {
   return !operator ==(right);
 }
 
-bool CDateTime::operator >(const SYSTEMTIME& right) const
+bool CDateTime::operator>(const KODI::TIME::SystemTime& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator >(time);
 }
 
-bool CDateTime::operator >=(const SYSTEMTIME& right) const
+bool CDateTime::operator>=(const KODI::TIME::SystemTime& right) const
 {
   return operator >(right) || operator ==(right);
 }
 
-bool CDateTime::operator <(const SYSTEMTIME& right) const
+bool CDateTime::operator<(const KODI::TIME::SystemTime& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator <(time);
 }
 
-bool CDateTime::operator <=(const SYSTEMTIME& right) const
+bool CDateTime::operator<=(const KODI::TIME::SystemTime& right) const
 {
   return operator <(right) || operator ==(right);
 }
 
-bool CDateTime::operator ==(const SYSTEMTIME& right) const
+bool CDateTime::operator==(const KODI::TIME::SystemTime& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator ==(time);
 }
 
-bool CDateTime::operator !=(const SYSTEMTIME& right) const
+bool CDateTime::operator!=(const KODI::TIME::SystemTime& right) const
 {
   return !operator ==(right);
 }
 
 bool CDateTime::operator >(const time_t& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator >(time);
@@ -439,7 +435,7 @@
 
 bool CDateTime::operator <(const time_t& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator <(time);
@@ -452,7 +448,7 @@
 
 bool CDateTime::operator ==(const time_t& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator ==(time);
@@ -465,7 +461,7 @@
 
 bool CDateTime::operator >(const tm& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator >(time);
@@ -478,7 +474,7 @@
 
 bool CDateTime::operator <(const tm& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator <(time);
@@ -491,7 +487,7 @@
 
 bool CDateTime::operator ==(const tm& right) const
 {
-  FILETIME time;
+  KODI::TIME::FileTime time;
   ToFileTime(right, time);
 
   return operator ==(time);
@@ -586,7 +582,7 @@
   return left;
 }
 
-CDateTime::operator FILETIME() const
+CDateTime::operator KODI::TIME::FileTime() const
 {
   return m_time;
 }
@@ -598,7 +594,7 @@
     ar<<(int)m_state;
     if (m_state==valid)
     {
-      SYSTEMTIME st;
+      KODI::TIME::SystemTime st;
       GetAsSystemTime(st);
       ar<<st;
     }
@@ -611,7 +607,7 @@
     m_state = CDateTime::STATE(state);
     if (m_state==valid)
     {
-      SYSTEMTIME st;
+      KODI::TIME::SystemTime st;
       ar>>st;
       ToFileTime(st, m_time);
     }
@@ -634,49 +630,49 @@
   return m_state==valid;
 }
 
-bool CDateTime::ToFileTime(const SYSTEMTIME& time, FILETIME& fileTime) const
+bool CDateTime::ToFileTime(const KODI::TIME::SystemTime& time, KODI::TIME::FileTime& fileTime) const
 {
-  return SystemTimeToFileTime(&time, &fileTime) == 1 &&
-         (fileTime.dwLowDateTime > 0 || fileTime.dwHighDateTime > 0);
+  return KODI::TIME::SystemTimeToFileTime(&time, &fileTime) == 1 &&
+         (fileTime.lowDateTime > 0 || fileTime.highDateTime > 0);
 }
 
-bool CDateTime::ToFileTime(const time_t& time, FILETIME& fileTime) const
+bool CDateTime::ToFileTime(const time_t& time, KODI::TIME::FileTime& fileTime) const
 {
   long long ll = time;
   ll *= 10000000ll;
   ll += 0x19DB1DED53E8000LL;
 
-  fileTime.dwLowDateTime  = (DWORD)(ll & 0xFFFFFFFF);
-  fileTime.dwHighDateTime = (DWORD)(ll >> 32);
+  fileTime.lowDateTime = (DWORD)(ll & 0xFFFFFFFF);
+  fileTime.highDateTime = (DWORD)(ll >> 32);
 
   return true;
 }
 
-bool CDateTime::ToFileTime(const tm& time, FILETIME& fileTime) const
+bool CDateTime::ToFileTime(const tm& time, KODI::TIME::FileTime& fileTime) const
 {
-  SYSTEMTIME st = { 0 };
+  KODI::TIME::SystemTime st = {0};
 
-  st.wYear=time.tm_year+1900;
-  st.wMonth=time.tm_mon+1;
-  st.wDayOfWeek=time.tm_wday;
-  st.wDay=time.tm_mday;
-  st.wHour=time.tm_hour;
-  st.wMinute=time.tm_min;
-  st.wSecond=time.tm_sec;
+  st.year = time.tm_year + 1900;
+  st.month = time.tm_mon + 1;
+  st.dayOfWeek = time.tm_wday;
+  st.day = time.tm_mday;
+  st.hour = time.tm_hour;
+  st.minute = time.tm_min;
+  st.second = time.tm_sec;
 
   return SystemTimeToFileTime(&st, &fileTime) == 1;
 }
 
 void CDateTime::ToULargeInt(ULARGE_INTEGER& time) const
 {
-  time.u.HighPart=m_time.dwHighDateTime;
-  time.u.LowPart=m_time.dwLowDateTime;
+  time.u.HighPart = m_time.highDateTime;
+  time.u.LowPart = m_time.lowDateTime;
 }
 
 void CDateTime::FromULargeInt(const ULARGE_INTEGER& time)
 {
-  m_time.dwHighDateTime=time.u.HighPart;
-  m_time.dwLowDateTime=time.u.LowPart;
+  m_time.highDateTime = time.u.HighPart;
+  m_time.lowDateTime = time.u.LowPart;
 }
 
 bool CDateTime::SetFromDateString(const std::string &date)
@@ -720,77 +716,77 @@
 
 int CDateTime::GetDay() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wDay;
+  return st.day;
 }
 
 int CDateTime::GetMonth() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wMonth;
+  return st.month;
 }
 
 int CDateTime::GetYear() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wYear;
+  return st.year;
 }
 
 int CDateTime::GetHour() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wHour;
+  return st.hour;
 }
 
 int CDateTime::GetMinute() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wMinute;
+  return st.minute;
 }
 
 int CDateTime::GetSecond() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wSecond;
+  return st.second;
 }
 
 int CDateTime::GetDayOfWeek() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return st.wDayOfWeek;
+  return st.dayOfWeek;
 }
 
 int CDateTime::GetMinuteOfDay() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
-  return st.wHour*60+st.wMinute;
+  return st.hour * 60 + st.minute;
 }
 
 bool CDateTime::SetDateTime(int year, int month, int day, int hour, int minute, int second)
 {
-  SYSTEMTIME st = { 0 };
+  KODI::TIME::SystemTime st = {0};
 
-  st.wYear=year;
-  st.wMonth=month;
-  st.wDay=day;
-  st.wHour=hour;
-  st.wMinute=minute;
-  st.wSecond=second;
+  st.year = year;
+  st.month = month;
+  st.day = day;
+  st.hour = hour;
+  st.minute = minute;
+  st.second = second;
 
   m_state = ToFileTime(st, m_time) ? valid : invalid;
   return m_state == valid;
@@ -807,7 +803,7 @@
   return SetDateTime(1601, 1, 1, hour, minute, second);
 }
 
-void CDateTime::GetAsSystemTime(SYSTEMTIME& time) const
+void CDateTime::GetAsSystemTime(KODI::TIME::SystemTime& time) const
 {
   FileTimeToSystemTime(&m_time, &time);
 }
@@ -815,61 +811,63 @@
 #define UNIX_BASE_TIME 116444736000000000LL /* nanoseconds since epoch */
 void CDateTime::GetAsTime(time_t& time) const
 {
-  long long ll = (static_cast<long long>(m_time.dwHighDateTime) << 32) + m_time.dwLowDateTime;
+  long long ll = (static_cast<long long>(m_time.highDateTime) << 32) + m_time.lowDateTime;
   time=(time_t)((ll - UNIX_BASE_TIME) / 10000000);
 }
 
 void CDateTime::GetAsTm(tm& time) const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  time.tm_year=st.wYear-1900;
-  time.tm_mon=st.wMonth-1;
-  time.tm_wday=st.wDayOfWeek;
-  time.tm_mday=st.wDay;
-  time.tm_hour=st.wHour;
-  time.tm_min=st.wMinute;
-  time.tm_sec=st.wSecond;
+  time.tm_year = st.year - 1900;
+  time.tm_mon = st.month - 1;
+  time.tm_wday = st.dayOfWeek;
+  time.tm_mday = st.day;
+  time.tm_hour = st.hour;
+  time.tm_min = st.minute;
+  time.tm_sec = st.second;
 
   mktime(&time);
 }
 
-void CDateTime::GetAsTimeStamp(FILETIME& time) const
+void CDateTime::GetAsTimeStamp(KODI::TIME::FileTime& time) const
 {
-  ::LocalFileTimeToFileTime(&m_time, &time);
+  KODI::TIME::LocalFileTimeToFileTime(&m_time, &time);
 }
 
 std::string CDateTime::GetAsDBDate() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return StringUtils::Format("%04i-%02i-%02i", st.wYear, st.wMonth, st.wDay);
+  return StringUtils::Format("%04i-%02i-%02i", st.year, st.month, st.day);
 }
 
 std::string CDateTime::GetAsDBTime() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return StringUtils::Format("%02i:%02i:%02i", st.wHour, st.wMinute, st.wSecond);
+  return StringUtils::Format("%02i:%02i:%02i", st.hour, st.minute, st.second);
 }
 
 std::string CDateTime::GetAsDBDateTime() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return StringUtils::Format("%04i-%02i-%02i %02i:%02i:%02i", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+  return StringUtils::Format("%04i-%02i-%02i %02i:%02i:%02i", st.year, st.month, st.day, st.hour,
+                             st.minute, st.second);
 }
 
 std::string CDateTime::GetAsSaveString() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return StringUtils::Format("%04i%02i%02i_%02i%02i%02i", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+  return StringUtils::Format("%04i%02i%02i_%02i%02i%02i", st.year, st.month, st.day, st.hour,
+                             st.minute, st.second);
 }
 
 bool CDateTime::SetFromUTCDateTime(const CDateTime &dateTime)
@@ -896,17 +894,17 @@
   if (!bGotTimezoneBias)
   {
     bGotTimezoneBias = true;
-    TIME_ZONE_INFORMATION tz;
-    switch(GetTimeZoneInformation(&tz))
+    KODI::TIME::TimeZoneInformation tz;
+    switch (KODI::TIME::GetTimeZoneInformation(&tz))
     {
-      case TIME_ZONE_ID_DAYLIGHT:
-        timezoneBias = CDateTimeSpan(0, 0, tz.Bias + tz.DaylightBias, 0);
+      case KODI::TIME::KODI_TIME_ZONE_ID_DAYLIGHT:
+        timezoneBias = CDateTimeSpan(0, 0, tz.bias + tz.daylightBias, 0);
         break;
-      case TIME_ZONE_ID_STANDARD:
-        timezoneBias = CDateTimeSpan(0, 0, tz.Bias + tz.StandardBias, 0);
+      case KODI::TIME::KODI_TIME_ZONE_ID_STANDARD:
+        timezoneBias = CDateTimeSpan(0, 0, tz.bias + tz.standardBias, 0);
         break;
-      case TIME_ZONE_ID_UNKNOWN:
-        timezoneBias = CDateTimeSpan(0, 0, tz.Bias, 0);
+      case KODI::TIME::KODI_TIME_ZONE_ID_UNKNOWN:
+        timezoneBias = CDateTimeSpan(0, 0, tz.bias, 0);
         break;
     }
   }
@@ -1061,7 +1059,7 @@
 
   int hour;
   int minute;
-  
+
   int second = 0;
   // HH:MM or HH:MM:SS
   hour   = atoi(time.substr(0, 2).c_str());
@@ -1173,11 +1171,12 @@
   std::string strOut;
   const std::string& strFormat = format.empty() ? g_langInfo.GetTimeFormat() : format;
 
-  SYSTEMTIME dateTime;
+  KODI::TIME::SystemTime dateTime;
   GetAsSystemTime(dateTime);
 
   // Prefetch meridiem symbol
-  const std::string& strMeridiem = CLangInfo::MeridiemSymbolToString(dateTime.wHour > 11 ? MeridiemSymbolPM : MeridiemSymbolAM);
+  const std::string& strMeridiem =
+      CLangInfo::MeridiemSymbolToString(dateTime.hour > 11 ? MeridiemSymbolPM : MeridiemSymbolAM);
 
   size_t length = strFormat.size();
   for (size_t i=0; i < length; ++i)
@@ -1226,7 +1225,7 @@
         i=length;
       }
 
-      int hour=dateTime.wHour;
+      int hour = dateTime.hour;
       if (c=='h')
       { // recalc to 12 hour clock
         if (hour > 11)
@@ -1265,9 +1264,9 @@
       // Format minute string with the length of the mask
       std::string str;
       if (partLength==1)
-        str = StringUtils::Format("%d", dateTime.wMinute);
+        str = StringUtils::Format("%d", dateTime.minute);
       else
-        str = StringUtils::Format("%02d", dateTime.wMinute);
+        str = StringUtils::Format("%02d", dateTime.minute);
 
       strOut+=str;
     }
@@ -1294,9 +1293,9 @@
         // Format seconds string with the length of the mask
         std::string str;
         if (partLength==1)
-          str = StringUtils::Format("%d", dateTime.wSecond);
+          str = StringUtils::Format("%d", dateTime.second);
         else
-          str = StringUtils::Format("%02d", dateTime.wSecond);
+          str = StringUtils::Format("%02d", dateTime.second);
 
         strOut+=str;
       }
@@ -1335,7 +1334,7 @@
 {
   std::string strOut;
 
-  SYSTEMTIME dateTime;
+  KODI::TIME::SystemTime dateTime;
   GetAsSystemTime(dateTime);
 
   size_t length = strFormat.size();
@@ -1387,12 +1386,12 @@
       // Format string with the length of the mask
       std::string str;
       if (partLength==1) // single-digit number
-        str = StringUtils::Format("%d", dateTime.wDay);
+        str = StringUtils::Format("%d", dateTime.day);
       else if (partLength==2) // two-digit number
-        str = StringUtils::Format("%02d", dateTime.wDay);
+        str = StringUtils::Format("%02d", dateTime.day);
       else // Day of week string
       {
-        int wday = dateTime.wDayOfWeek;
+        int wday = dateTime.dayOfWeek;
         if (wday < 1 || wday > 7) wday = 7;
         str = g_localizeStrings.Get((c =='d' ? 40 : 10) + wday);
       }
@@ -1419,12 +1418,12 @@
       // Format string with the length of the mask
       std::string str;
       if (partLength==1) // single-digit number
-        str = StringUtils::Format("%d", dateTime.wMonth);
+        str = StringUtils::Format("%d", dateTime.month);
       else if (partLength==2) // two-digit number
-        str = StringUtils::Format("%02d", dateTime.wMonth);
+        str = StringUtils::Format("%02d", dateTime.month);
       else // Month string
       {
-        int wmonth = dateTime.wMonth;
+        int wmonth = dateTime.month;
         if (wmonth < 1 || wmonth > 12) wmonth = 12;
         str = g_localizeStrings.Get((c =='m' ? 50 : 20) + wmonth);
       }
@@ -1449,7 +1448,7 @@
       }
 
       // Format string with the length of the mask
-      std::string str = StringUtils::Format("%d", dateTime.wYear); // four-digit number
+      std::string str = StringUtils::Format("%d", dateTime.year); // four-digit number
       if (partLength <= 2)
         str.erase(0, 2); // two-digit number
 
@@ -1539,10 +1538,10 @@
 
 std::string CDateTime::GetAsW3CDate() const
 {
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   GetAsSystemTime(st);
 
-  return StringUtils::Format("%04i-%02i-%02i", st.wYear, st.wMonth, st.wDay);
+  return StringUtils::Format("%04i-%02i-%02i", st.year, st.month, st.day);
 }
 
 std::string CDateTime::GetAsW3CDateTime(bool asUtc /* = false */) const
@@ -1550,10 +1549,11 @@
   CDateTime w3cDate = *this;
   if (asUtc)
     w3cDate = GetAsUTCDateTime();
-  SYSTEMTIME st;
+  KODI::TIME::SystemTime st;
   w3cDate.GetAsSystemTime(st);
 
-  std::string result = StringUtils::Format("%04i-%02i-%02iT%02i:%02i:%02i", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+  std::string result = StringUtils::Format("%04i-%02i-%02iT%02i:%02i:%02i", st.year, st.month,
+                                           st.day, st.hour, st.minute, st.second);
   if (asUtc)
     return result + "Z";

_service:download_files:master.tar.gz/xbmc/XBDateTime.h Changed

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "utils/IArchivable.h"
+#include "utils/XTimeUtils.h"
 
 #include <string>
 
@@ -47,25 +48,30 @@
    - \link ListItem_NextDuration_format `ListItem.NextDuration(format)` \endlink
   <p>
  */
-enum TIME_FORMAT { TIME_FORMAT_GUESS       =  0, ///< usually used as the fallback value if the format value is empty
-                   TIME_FORMAT_SS          =  1, ///< <b>ss</b> - seconds only
-                   TIME_FORMAT_MM          =  2, ///< <b>mm</b> - minutes only (2-digit)
-                   TIME_FORMAT_MM_SS       =  3, ///< <b>mm:ss</b> - minutes and seconds
-                   TIME_FORMAT_HH          =  4, ///< <b>hh</b> - hours only (2-digit)
-                   TIME_FORMAT_HH_SS       =  5, ///< <b>hh:ss</b> - hours and seconds (this is not particularly useful)
-                   TIME_FORMAT_HH_MM       =  6, ///< <b>hh:mm</b> - hours and minutes
-                   TIME_FORMAT_HH_MM_SS    =  7, ///< <b>hh:mm:ss</b> - hours, minutes and seconds
-                   TIME_FORMAT_XX          =  8, ///<  <b>xx</b> - returns AM/PM for a 12-hour clock
-                   TIME_FORMAT_HH_MM_XX    = 14, ///< <b>hh:mm xx</b> - returns hours and minutes in a 12-hour clock format (AM/PM)
-                   TIME_FORMAT_HH_MM_SS_XX = 15, ///< <b>hh:mm:ss xx</b> - returns hours (2-digit), minutes and seconds in a 12-hour clock format (AM/PM) 
-                   TIME_FORMAT_H           = 16, ///< <b>h</b> - hours only (1-digit)
-                   TIME_FORMAT_H_MM_SS     = 19, ///< <b>hh:mm:ss</b> - hours, minutes and seconds
-                   TIME_FORMAT_H_MM_SS_XX  = 27, ///< <b>hh:mm:ss xx</b> - returns hours (1-digit), minutes and seconds in a 12-hour clock format (AM/PM) 
-                   TIME_FORMAT_SECS        = 32, ///<  <b>secs</b> - total time in seconds
-                   TIME_FORMAT_MINS        = 64, ///<  <b>mins</b> - total time in minutes
-                   TIME_FORMAT_HOURS       = 128, ///< <b>hours</b> - total time in hours
-                   TIME_FORMAT_M           = 256 ///< <b>m</b> - minutes only (1-digit)
-                   };
+enum TIME_FORMAT
+{
+  TIME_FORMAT_GUESS = 0, ///< usually used as the fallback value if the format value is empty
+  TIME_FORMAT_SS = 1, ///< <b>ss</b> - seconds only
+  TIME_FORMAT_MM = 2, ///< <b>mm</b> - minutes only (2-digit)
+  TIME_FORMAT_MM_SS = 3, ///< <b>mm:ss</b> - minutes and seconds
+  TIME_FORMAT_HH = 4, ///< <b>hh</b> - hours only (2-digit)
+  TIME_FORMAT_HH_SS = 5, ///< <b>hh:ss</b> - hours and seconds (this is not particularly useful)
+  TIME_FORMAT_HH_MM = 6, ///< <b>hh:mm</b> - hours and minutes
+  TIME_FORMAT_HH_MM_SS = 7, ///< <b>hh:mm:ss</b> - hours, minutes and seconds
+  TIME_FORMAT_XX = 8, ///<  <b>xx</b> - returns AM/PM for a 12-hour clock
+  TIME_FORMAT_HH_MM_XX =
+      14, ///< <b>hh:mm xx</b> - returns hours and minutes in a 12-hour clock format (AM/PM)
+  TIME_FORMAT_HH_MM_SS_XX =
+      15, ///< <b>hh:mm:ss xx</b> - returns hours (2-digit), minutes and seconds in a 12-hour clock format (AM/PM)
+  TIME_FORMAT_H = 16, ///< <b>h</b> - hours only (1-digit)
+  TIME_FORMAT_H_MM_SS = 19, ///< <b>hh:mm:ss</b> - hours, minutes and seconds
+  TIME_FORMAT_H_MM_SS_XX =
+      27, ///< <b>hh:mm:ss xx</b> - returns hours (1-digit), minutes and seconds in a 12-hour clock format (AM/PM)
+  TIME_FORMAT_SECS = 32, ///<  <b>secs</b> - total time in seconds
+  TIME_FORMAT_MINS = 64, ///<  <b>mins</b> - total time in minutes
+  TIME_FORMAT_HOURS = 128, ///< <b>hours</b> - total time in hours
+  TIME_FORMAT_M = 256 ///< <b>m</b> - minutes only (1-digit)
+};
 
 class CDateTime;
 
@@ -104,19 +110,19 @@
   void FromULargeInt(const ULARGE_INTEGER& time);
 
 private:
-  FILETIME m_timeSpan;
+  KODI::TIME::FileTime m_timeSpan;
 
   friend class CDateTime;
 };
 
-/// \brief DateTime class, which uses FILETIME as it's base.
+/// \brief DateTime class, which uses FileTime as it's base.
 class CDateTime final : public IArchivable
 {
 public:
   CDateTime();
   CDateTime(const CDateTime& time);
-  explicit CDateTime(const SYSTEMTIME& time);
-  explicit CDateTime(const FILETIME& time);
+  explicit CDateTime(const KODI::TIME::SystemTime& time);
+  explicit CDateTime(const KODI::TIME::FileTime& time);
   explicit CDateTime(const time_t& time);
   explicit CDateTime(const tm& time);
   CDateTime(int year, int month, int day, int hour, int minute, int second);
@@ -135,8 +141,8 @@
   static CDateTime FromUTCDateTime(const time_t &dateTime);
   static CDateTime FromRFC1123DateTime(const std::string &dateTime);
 
-  const CDateTime& operator =(const SYSTEMTIME& right);
-  const CDateTime& operator =(const FILETIME& right);
+  const CDateTime& operator=(const KODI::TIME::SystemTime& right);
+  const CDateTime& operator=(const KODI::TIME::FileTime& right);
   const CDateTime& operator =(const time_t& right);
   const CDateTime& operator =(const tm& right);
 
@@ -147,19 +153,19 @@
   bool operator ==(const CDateTime& right) const;
   bool operator !=(const CDateTime& right) const;
 
-  bool operator >(const FILETIME& right) const;
-  bool operator >=(const FILETIME& right) const;
-  bool operator <(const FILETIME& right) const;
-  bool operator <=(const FILETIME& right) const;
-  bool operator ==(const FILETIME& right) const;
-  bool operator !=(const FILETIME& right) const;
+  bool operator>(const KODI::TIME::FileTime& right) const;
+  bool operator>=(const KODI::TIME::FileTime& right) const;
+  bool operator<(const KODI::TIME::FileTime& right) const;
+  bool operator<=(const KODI::TIME::FileTime& right) const;
+  bool operator==(const KODI::TIME::FileTime& right) const;
+  bool operator!=(const KODI::TIME::FileTime& right) const;
 
-  bool operator >(const SYSTEMTIME& right) const;
-  bool operator >=(const SYSTEMTIME& right) const;
-  bool operator <(const SYSTEMTIME& right) const;
-  bool operator <=(const SYSTEMTIME& right) const;
-  bool operator ==(const SYSTEMTIME& right) const;
-  bool operator !=(const SYSTEMTIME& right) const;
+  bool operator>(const KODI::TIME::SystemTime& right) const;
+  bool operator>=(const KODI::TIME::SystemTime& right) const;
+  bool operator<(const KODI::TIME::SystemTime& right) const;
+  bool operator<=(const KODI::TIME::SystemTime& right) const;
+  bool operator==(const KODI::TIME::SystemTime& right) const;
+  bool operator!=(const KODI::TIME::SystemTime& right) const;
 
   bool operator >(const time_t& right) const;
   bool operator >=(const time_t& right) const;
@@ -183,7 +189,7 @@
 
   CDateTimeSpan operator -(const CDateTime& right) const;
 
-  operator FILETIME() const;
+  operator KODI::TIME::FileTime() const;
 
   void Archive(CArchive& ar) override;
 
@@ -216,10 +222,10 @@
    */
   bool SetFromDBDateTime(const std::string &dateTime);
 
-  void GetAsSystemTime(SYSTEMTIME& time) const;
+  void GetAsSystemTime(KODI::TIME::SystemTime& time) const;
   void GetAsTime(time_t& time) const;
   void GetAsTm(tm& time) const;
-  void GetAsTimeStamp(FILETIME& time) const;
+  void GetAsTimeStamp(KODI::TIME::FileTime& time) const;
 
   CDateTime GetAsUTCDateTime() const;
   std::string GetAsSaveString() const;
@@ -242,15 +248,15 @@
   static CDateTimeSpan GetTimezoneBias(void);
 
 private:
-  bool ToFileTime(const SYSTEMTIME& time, FILETIME& fileTime) const;
-  bool ToFileTime(const time_t& time, FILETIME& fileTime) const;
-  bool ToFileTime(const tm& time, FILETIME& fileTime) const;
+  bool ToFileTime(const KODI::TIME::SystemTime& time, KODI::TIME::FileTime& fileTime) const;
+  bool ToFileTime(const time_t& time, KODI::TIME::FileTime& fileTime) const;
+  bool ToFileTime(const tm& time, KODI::TIME::FileTime& fileTime) const;
 
   void ToULargeInt(ULARGE_INTEGER& time) const;
   void FromULargeInt(const ULARGE_INTEGER& time);
 
 private:
-  FILETIME m_time;
+  KODI::TIME::FileTime m_time;
 
   typedef enum _STATE
   {

_service:download_files:master.tar.gz/xbmc/addons/Addon.h Changed

@@ -33,9 +33,52 @@
   explicit CAddon(const AddonInfoPtr& addonInfo, TYPE addonType);
   ~CAddon() override = default;
 
-  TYPE Type() const override { return m_addonInfo->MainType(); }
-  TYPE FullType() const override { return Type(); }
-  bool IsType(TYPE type) const override { return type == m_addonInfo->MainType(); }
+  /**
+   * @brief To get the main type of this addon
+   *
+   * This is the first type defined in **addon.xml** and can be different to the
+   * on @ref Type() defined type.
+   *
+   * @return The used main type of addon
+   */
+  TYPE MainType() const override { return m_addonInfo->MainType(); }
+
+  /**
+   * @brief To get the on this CAddon class processed addon type
+   *
+   * @return For this class used addon type
+   */
+  TYPE Type() const override { return m_type; }
+
+  /**
+   * @brief To check complete addon (not only this) contains a type
+   *
+   * @note This can be overridden by a child e.g. plugin to check for subtype
+   * e.g. video or music.
+   *
+   * @param[in] type The to checked type identifier
+   * @return true in case the wanted type is supported, false if not
+   */
+  bool HasType(TYPE type) const override { return m_addonInfo->HasType(type); }
+
+  /**
+   * @brief The get for given addon type information and extension data
+   *
+   * @param[in] type The wanted type data
+   * @return addon type class with @ref CAddonExtensions as information
+   *
+   * @note This function return never a "nullptr", in case the wanted type is
+   * not supported, becomes a dummy of @ref CAddonType given.
+   *
+   * ------------------------------------------------------------------------
+   *
+   * **Example:**
+   * ~~~~~~~~~~~~~{.cpp}
+   * // To get e.g. <extension ... name="blablabla" /> from addon.xml
+   * std::string name = Type(ADDON_...)->GetValue("@name").asString();
+   * ~~~~~~~~~~~~~
+   *
+   */
   const CAddonType* Type(TYPE type) const { return m_addonInfo->Type(type); }
 
   std::string ID() const override{ return m_addonInfo->ID(); }

_service:download_files:master.tar.gz/xbmc/addons/AddonInstaller.cpp Changed

@@ -7,37 +7,36 @@
  */
 
 #include "AddonInstaller.h"
+
+#include "FilesystemInstaller.h"
+#include "GUIPassword.h"
+#include "GUIUserMessages.h" // for callback
 #include "ServiceBroker.h"
-#include "events/EventLog.h"
+#include "URL.h"
+#include "Util.h"
+#include "addons/AddonManager.h"
+#include "addons/Repository.h"
+#include "dialogs/GUIDialogExtendedProgressBar.h"
 #include "events/AddonManagementEvent.h"
+#include "events/EventLog.h"
 #include "events/NotificationEvent.h"
-#include "utils/log.h"
-#include "utils/FileUtils.h"
-#include "utils/URIUtils.h"
-#include "utils/Variant.h"
-#include "Util.h"
-#include "GUIPassword.h"
-#include "guilib/LocalizeStrings.h"
+#include "favourites/FavouritesService.h"
 #include "filesystem/Directory.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIWindowManager.h" // for callback
+#include "guilib/LocalizeStrings.h"
+#include "messaging/helpers/DialogHelper.h"
+#include "messaging/helpers/DialogOKHelper.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "messaging/helpers/DialogHelper.h"
-#include "messaging/helpers/DialogOKHelper.h"
-#include "favourites/FavouritesService.h"
-#include "FilesystemInstaller.h"
+#include "utils/FileUtils.h"
 #include "utils/JobManager.h"
-#include "addons/AddonManager.h"
-#include "addons/Repository.h"
-#include "guilib/GUIComponent.h"
-#include "guilib/GUIWindowManager.h"      // for callback
-#include "GUIUserMessages.h"              // for callback
 #include "utils/StringUtils.h"
-#include "dialogs/GUIDialogExtendedProgressBar.h"
-#include "URL.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/URIUtils.h"
+#include "utils/Variant.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 
 #include <functional>
 
@@ -750,7 +749,7 @@
         if (CAddonInstaller::GetInstance().HasJob(addonID))
         {
           while (CAddonInstaller::GetInstance().HasJob(addonID))
-            Sleep(50);
+            KODI::TIME::Sleep(50);
 
           if (!CServiceBroker::GetAddonMgr().IsAddonInstalled(addonID))
           {

_service:download_files:master.tar.gz/xbmc/addons/AddonManager.cpp Changed

@@ -131,6 +131,10 @@
 void CAddonMgr::DeInit()
 {
   m_database.Close();
+
+  /* If temporary directory was used from add-on, delete it */
+  if (XFILE::CDirectory::Exists(m_tempAddonBasePath))
+    XFILE::CDirectory::RemoveRecursive(CSpecialProtocol::TranslatePath(m_tempAddonBasePath));
 }
 
 bool CAddonMgr::HasAddons(const TYPE &type)
@@ -279,7 +283,7 @@
       bool bErase = false;
 
       // check if the addon matches the provided addon type
-      if (type != ADDON::ADDON_UNKNOWN && addon->Type() != type && !addon->IsType(type))
+      if (type != ADDON::ADDON_UNKNOWN && addon->Type() != type && !addon->HasType(type))
         bErase = true;
 
       if (!this->CanAddonBeInstalled(addon))
@@ -341,7 +345,7 @@
 
   for (const auto& addonInfo : m_installedAddons)
   {
-    if (type != ADDON_UNKNOWN && !addonInfo.second->IsType(type))
+    if (type != ADDON_UNKNOWN && !addonInfo.second->HasType(type))
       continue;
 
     if (enabledOnly && IsAddonDisabled(addonInfo.second->ID()))
@@ -783,7 +787,7 @@
   bool forUnknown = type == ADDON_UNKNOWN;
   for (auto& info : m_installedAddons)
   {
-    if (info.second->MainType() != ADDON_UNKNOWN && (forUnknown || info.second->IsType(type)))
+    if (info.second->MainType() != ADDON_UNKNOWN && (forUnknown || info.second->HasType(type)))
       addonInfos.push_back(info.second);
   }
 
@@ -796,7 +800,7 @@
 
   auto addon = m_installedAddons.find(id);
   if (addon != m_installedAddons.end())
-    if ((type == ADDON_UNKNOWN || addon->second->IsType(type)))
+    if ((type == ADDON_UNKNOWN || addon->second->HasType(type)))
       return addon->second;
 
   return nullptr;

_service:download_files:master.tar.gz/xbmc/addons/AddonManager.h Changed

_service:download_files:master.tar.gz/xbmc/addons/AddonProvider.h Changed

_service:download_files:master.tar.gz/xbmc/addons/GUIWindowAddonBrowser.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/IAddon.h Changed

_service:download_files:master.tar.gz/xbmc/addons/PluginSource.cpp Changed

@@ -21,13 +21,19 @@
 CPluginSource::CPluginSource(const AddonInfoPtr& addonInfo, TYPE addonType) : CAddon(addonInfo, addonType)
 {
   std::string provides = addonInfo->Type(addonType)->GetValue("provides").asString();
-  if (!provides.empty())
-    addonInfo->AddExtraInfo("provides", provides);
-  else
+  if (provides.empty())
   {
+    /*
+     * If "provides" was empty, check about them in addon extra info. This become
+     * needed for addons from repo content where the addon is stored inside a
+     * database and the related type classes are not created on addon info.
+     * The database add then "provides" to there.
+     */
     const auto& i = addonInfo->ExtraInfo().find("provides");
     if (i != addonInfo->ExtraInfo().end())
       provides = i->second;
+    else
+      provides = "executable"; // if nothing fall back to "executable"
   }
 
   for (auto values : addonInfo->Type(addonType)->GetValues())
@@ -80,29 +86,14 @@
     return CPluginSource::UNKNOWN;
 }
 
-TYPE CPluginSource::FullType() const
-{
-  if (Provides(VIDEO))
-    return ADDON_VIDEO;
-  if (Provides(AUDIO))
-    return ADDON_AUDIO;
-  if (Provides(IMAGE))
-    return ADDON_IMAGE;
-  if (Provides(GAME))
-    return ADDON_GAME;
-  if (Provides(EXECUTABLE))
-    return ADDON_EXECUTABLE;
-
-  return CAddon::FullType();
-}
-
-bool CPluginSource::IsType(TYPE type) const
+bool CPluginSource::HasType(TYPE type) const
 {
   return ((type == ADDON_VIDEO && Provides(VIDEO))
        || (type == ADDON_AUDIO && Provides(AUDIO))
        || (type == ADDON_IMAGE && Provides(IMAGE))
        || (type == ADDON_GAME && Provides(GAME))
-       || (type == ADDON_EXECUTABLE && Provides(EXECUTABLE)));
+       || (type == ADDON_EXECUTABLE && Provides(EXECUTABLE))
+       || (type == CAddon::Type()));
 }
 
 } /*namespace ADDON*/

_service:download_files:master.tar.gz/xbmc/addons/PluginSource.h Changed

_service:download_files:master.tar.gz/xbmc/addons/Scraper.cpp Changed

@@ -13,6 +13,7 @@
 #include "ServiceBroker.h"
 #include "URL.h"
 #include "Util.h"
+#include "addons/settings/AddonSettings.h"
 #include "filesystem/CurlFile.h"
 #include "filesystem/Directory.h"
 #include "filesystem/File.h"
@@ -25,6 +26,7 @@
 #include "music/infoscanner/MusicArtistInfo.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
+#include "settings/SettingsValueFlatJsonSerializer.h"
 #include "utils/CharsetConverter.h"
 #include "utils/ScraperParser.h"
 #include "utils/ScraperUrl.h"
@@ -326,6 +328,21 @@
   return m_parser.Parse(function, this);
 }
 
+std::string CScraper::GetPathSettingsAsJSON()
+{
+  static const std::string EmptyPathSettings = "{}";
+
+  if (!LoadSettings(false))
+    return EmptyPathSettings;
+
+  CSettingsValueFlatJsonSerializer jsonSerializer;
+  const auto json = jsonSerializer.SerializeValues(GetSettings()->GetSettingsManager());
+  if (json.empty())
+    return EmptyPathSettings;
+
+  return json;
+}
+
 bool CScraper::Load()
 {
   if (m_fLoaded || m_isPython)
@@ -410,8 +427,9 @@
   if (m_isPython)
   {
     std::stringstream str;
-    str << "plugin://" << ID() << "?action=NfoUrl&nfo="
-      << CURL::Encode(sNfoContent);
+    str << "plugin://" << ID() << "?action=NfoUrl&nfo=" << CURL::Encode(sNfoContent)
+        << "&pathSettings=" << CURL::Encode(GetPathSettingsAsJSON());
+
     CFileItemList items;
     if (!XFILE::CDirectory::GetDirectory(str.str(), items, "", DIR_FLAG_DEFAULTS))
       return scurlRet;
@@ -493,7 +511,8 @@
   if (m_isPython)
   {
     std::stringstream str;
-    str << "plugin://" << ID() << "?action=resolveid&key=" << CURL::Encode(externalID);
+    str << "plugin://" << ID() << "?action=resolveid&key=" << CURL::Encode(externalID)
+        << "&pathSettings=" << CURL::Encode(GetPathSettingsAsJSON());
 
     CFileItem item("resolve me", false);
 
@@ -800,10 +819,12 @@
                           const std::string &key,
                           const std::string &url,
                           const std::string &action,
+                          const std::string &pathSettings,
                           T &result)
 {
   std::stringstream str;
   str << "plugin://" << ID << "?action=" << action << "&" << key << "=" << CURL::Encode(url);
+  str << "&pathSettings=" << CURL::Encode(pathSettings);
 
   CFileItem item(url, false);
 
@@ -851,6 +872,7 @@
     std::map<std::string, std::string> additionals{{"title", sTitle}};
     if (!sYear.empty())
       additionals.insert({"year", sYear});
+    additionals.emplace("pathSettings", GetPathSettingsAsJSON());
     return PythonFind<CScraperUrl>(ID(), additionals);
   }
 
@@ -981,7 +1003,8 @@
     return vcali;
 
   if (m_isPython)
-    return PythonFind<CMusicAlbumInfo>(ID(), {{"title", sAlbum}, {"artist", sArtist}});
+    return PythonFind<CMusicAlbumInfo>(ID(),
+      {{"title", sAlbum}, {"artist", sArtist}, {"pathSettings", GetPathSettingsAsJSON()}});
 
   // scraper function is given the album and artist as parameters and
   // returns an XML <url> element parseable by CScraperUrl
@@ -1081,7 +1104,8 @@
     return vcari;
 
   if (m_isPython)
-    return PythonFind<CMusicArtistInfo>(ID(), {{"artist", sArtist}});
+    return PythonFind<CMusicArtistInfo>(ID(),
+      {{"artist", sArtist}, {"pathSettings", GetPathSettingsAsJSON()}});
 
   // scraper function is given the artist as parameter and
   // returns an XML <url> element parseable by CScraperUrl
@@ -1170,7 +1194,9 @@
   {
     std::stringstream str;
     str << "plugin://" << ID()
-        << "?action=getepisodelist&url=" << CURL::Encode(scurl.m_url.front().m_url);
+        << "?action=getepisodelist&url=" << CURL::Encode(scurl.m_url.front().m_url)
+        << "&pathSettings=" << CURL::Encode(GetPathSettingsAsJSON());
+
     CFileItemList items;
     if (!XFILE::CDirectory::GetDirectory(str.str(), items, "", DIR_FLAG_DEFAULTS))
       return vcep;
@@ -1264,7 +1290,7 @@
 
   if (m_isPython)
     return PythonDetails(ID(), "url", scurl.m_url.front().m_url,
-                         fMovie ? "getdetails" : "getepisodedetails", video);
+      fMovie ? "getdetails" : "getepisodedetails", GetPathSettingsAsJSON(), video);
 
   std::string sFunc = fMovie ? "GetDetails" : "GetEpisodeDetails";
   std::vector<std::string> vcsIn;
@@ -1307,7 +1333,8 @@
             ADDON::TranslateContent(Content()).c_str(), Version().asString().c_str());
 
   if (m_isPython)
-    return PythonDetails(ID(), "url", scurl.m_url.front().m_url, "getdetails", album);
+    return PythonDetails(ID(), "url", scurl.m_url.front().m_url,
+      "getdetails", GetPathSettingsAsJSON(), album);
 
   std::vector<std::string> vcsOut = RunNoThrow("GetAlbumDetails", scurl, fcurl);
 
@@ -1345,7 +1372,8 @@
             Version().asString().c_str());
 
   if (m_isPython)
-    return PythonDetails(ID(), "url", scurl.m_url.front().m_url, "getdetails", artist);
+    return PythonDetails(ID(), "url", scurl.m_url.front().m_url,
+      "getdetails", GetPathSettingsAsJSON(), artist);
 
   // pass in the original search string for chaining to search other sites
   std::vector<std::string> vcIn;
@@ -1383,7 +1411,8 @@
             ADDON::TranslateContent(Content()).c_str(), Version().asString().c_str());
 
   if (m_isPython)
-    return PythonDetails(ID(), "id", details.GetUniqueID(), "getartwork", details);
+    return PythonDetails(ID(), "id", details.GetUniqueID(),
+      "getartwork", GetPathSettingsAsJSON(), details);
 
   std::vector<std::string> vcsIn;
   CScraperUrl scurl;

_service:download_files:master.tar.gz/xbmc/addons/Scraper.h Changed

_service:download_files:master.tar.gz/xbmc/addons/addoninfo/AddonInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/addoninfo/AddonInfo.h Changed

@@ -70,9 +70,51 @@
 
   const std::string& ID() const { return m_id; }
 
+  /**
+   * @brief To get the main type of this addon
+   *
+   * This is the first type defined in addon.xml.
+   *
+   * @return The used main type of addon
+   */
   TYPE MainType() const { return m_mainType; }
-  bool IsType(TYPE type, bool mainOnly = false) const;
+
+  /**
+   * @brief To check addon contains a type
+   *
+   * @param[in] type The to checked type identifier
+   * @param[in] mainOnly to check only in first defined main addon inside addon.xml
+   * @return true in case the wanted type is supported, false if not
+   */
+  bool HasType(TYPE type, bool mainOnly = false) const;
+
+  /**
+   * @brief To get all available types inside the addon
+   *
+   * To have all `<extension point="..." />` defined in addon.xml inside a list.
+   *
+   * @return List of all supported types
+   */
   const std::vector<CAddonType>& Types() const { return m_types; }
+
+  /**
+   * @brief The get for given addon type information and extension data
+   *
+   * @param[in] type The wanted type data
+   * @return addon type class with @ref CAddonExtensions as information
+   *
+   * @note This function return never a "nullptr", in case the wanted type is
+   * not supported, becomes a dummy of @ref CAddonType given.
+   *
+   * ------------------------------------------------------------------------
+   *
+   * **Example:**
+   * ~~~~~~~~~~~~~{.cpp}
+   * // To get <extension ... name="blablabla" /> from addon.xml
+   * std::string name = Type(ADDON_...)->GetValue("@name").asString();
+   * ~~~~~~~~~~~~~
+   *
+   */
   const CAddonType* Type(TYPE type) const;
 
   bool ProvidesSubContent(const TYPE& content, const TYPE& mainType = ADDON_UNKNOWN) const;

_service:download_files:master.tar.gz/xbmc/addons/addoninfo/AddonInfoBuilder.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/AddonDll.cpp Changed

@@ -8,57 +8,30 @@
 
 #include "AddonDll.h"
 
+#include "ServiceBroker.h"
 #include "addons/AddonStatusHandler.h"
-#include "GUIUserMessages.h"
 #include "addons/binary-addons/BinaryAddonBase.h"
 #include "addons/settings/AddonSettings.h"
-#include "addons/settings/GUIDialogAddonSettings.h"
 #include "events/EventLog.h"
 #include "events/NotificationEvent.h"
-#include "guilib/GUIComponent.h"
-#include "guilib/GUIWindowManager.h"
-#include "utils/URIUtils.h"
 #include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
 #include "messaging/helpers/DialogOKHelper.h"
-#include "settings/lib/SettingSection.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
 #include "utils/Variant.h"
-#include "ServiceBroker.h"
-#include "Util.h"
-
-// Global addon callback handle classes
-#include "addons/interfaces/AudioEngine.h"
-#include "addons/interfaces/Filesystem.h"
-#include "addons/interfaces/General.h"
-#include "addons/interfaces/Network.h"
-#include "addons/interfaces/GUI/General.h"
+#include "utils/log.h"
 
 using namespace KODI::MESSAGING;
 
 namespace ADDON
 {
 
-std::vector<ADDON_GET_INTERFACE_FN> CAddonDll::s_registeredInterfaces;
-
 CAddonDll::CAddonDll(const AddonInfoPtr& addonInfo, BinaryAddonBasePtr addonBase)
-  : CAddon(addonInfo, addonBase->MainType()),
-    m_pHelpers(nullptr),
-    m_binaryAddonBase(addonBase),
-    m_pDll(nullptr),
-    m_initialized(false),
-    m_interface{0}
+  : CAddon(addonInfo, addonBase->MainType()), m_binaryAddonBase(addonBase)
 {
 }
 
-CAddonDll::CAddonDll(const AddonInfoPtr& addonInfo, TYPE addonType)
-  : CAddon(addonInfo, addonType),
-    m_pHelpers(nullptr),
-    m_binaryAddonBase(nullptr),
-    m_pDll(nullptr),
-    m_initialized(false),
-    m_interface{0}
+CAddonDll::CAddonDll(const AddonInfoPtr& addonInfo, TYPE addonType) : CAddon(addonInfo, addonType)
 {
 }
 
@@ -68,11 +41,6 @@
     Destroy();
 }
 
-void CAddonDll::RegisterInterface(ADDON_GET_INTERFACE_FN fn)
-{
-  s_registeredInterfaces.push_back(fn);
-}
-
 std::string CAddonDll::GetDllPath(const std::string &libPath)
 {
   std::string strFileName = libPath;
@@ -172,7 +140,7 @@
   if (!m_pDll->Load())
   {
     delete m_pDll;
-    m_pDll = NULL;
+    m_pDll = nullptr;
 
     std::string heading = StringUtils::Format("%s: %s", CAddonInfo::TranslateType(Type(), true).c_str(), Name().c_str());
     HELPERS::ShowOKDialogLines(CVariant{heading}, CVariant{24070}, CVariant{24071});
@@ -263,7 +231,7 @@
 
   /* Allocate the helper function class to allow crosstalk over
      helper add-on headers */
-  if (!InitInterface(firstKodiInstance))
+  if (!Interface_Base::InitInterface(this, m_interface, firstKodiInstance))
     return ADDON_STATUS_PERMANENT_FAILURE;
 
   /* Call Create to make connections, initializing data or whatever is
@@ -304,20 +272,24 @@
     m_pDll->Unload();
   }
 
-  DeInitInterface();
+  Interface_Base::DeInitInterface(m_interface);
 
   delete m_pHelpers;
-  m_pHelpers = NULL;
+  m_pHelpers = nullptr;
   if (m_pDll)
   {
     delete m_pDll;
-    m_pDll = NULL;
+    m_pDll = nullptr;
     CLog::Log(LOGINFO, "ADDON: Dll Destroyed - %s", Name().c_str());
   }
   m_initialized = false;
 }
 
-ADDON_STATUS CAddonDll::CreateInstance(ADDON_TYPE instanceType, const std::string& instanceID, KODI_HANDLE instance, KODI_HANDLE parentInstance)
+ADDON_STATUS CAddonDll::CreateInstance(ADDON_TYPE instanceType,
+                                       ADDON_INSTANCE_HANDLER instanceClass,
+                                       const std::string& instanceID,
+                                       KODI_HANDLE instance,
+                                       KODI_HANDLE parentInstance)
 {
   ADDON_STATUS status = ADDON_STATUS_OK;
 
@@ -330,7 +302,7 @@
   if (!CheckAPIVersion(instanceType))
     return ADDON_STATUS_PERMANENT_FAILURE;
 
-  KODI_HANDLE addonInstance;
+  KODI_HANDLE addonInstance = nullptr;
   if (!m_interface.toAddon->create_instance_ex)
     status = m_interface.toAddon->create_instance(instanceType, instanceID.c_str(), instance, &addonInstance, parentInstance);
   else
@@ -338,18 +310,18 @@
 
   if (status == ADDON_STATUS_OK)
   {
-    m_usedInstances[instanceID] = std::make_pair(instanceType, addonInstance);
+    m_usedInstances[instanceClass] = std::make_pair(instanceType, addonInstance);
   }
 
   return status;
 }
 
-void CAddonDll::DestroyInstance(const std::string& instanceID)
+void CAddonDll::DestroyInstance(ADDON_INSTANCE_HANDLER instanceClass)
 {
   if (m_usedInstances.empty())
     return;
 
-  auto it = m_usedInstances.find(instanceID);
+  auto it = m_usedInstances.find(instanceClass);
   if (it != m_usedInstances.end())
   {
     m_interface.toAddon->destroy_instance(it->second.first, it->second.second);
@@ -370,7 +342,7 @@
 
 bool CAddonDll::DllLoaded(void) const
 {
-  return m_pDll != NULL;
+  return m_pDll != nullptr;
 }
 
 AddonVersion CAddonDll::GetTypeVersionDll(int type) const
@@ -508,432 +480,4 @@
   return true;
 }
 
-bool CAddonDll::UpdateSettingInActiveDialog(const char* id, const std::string& value)
-{
-  if (!CServiceBroker::GetGUI()->GetWindowManager().IsWindowActive(WINDOW_DIALOG_ADDON_SETTINGS))
-    return false;
-
-  CGUIDialogAddonSettings* dialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogAddonSettings>(WINDOW_DIALOG_ADDON_SETTINGS);
-  if (dialog->GetCurrentAddonID() != m_addonInfo->ID())
-    return false;
-
-  CGUIMessage message(GUI_MSG_SETTING_UPDATED, 0, 0);
-  std::vector<std::string> params;
-  params.emplace_back(id);
-  params.push_back(value);
-  message.SetStringParams(params);
-  CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(message, WINDOW_DIALOG_ADDON_SETTINGS);
-
-  return true;
-}
-
-/*!
- * @brief Addon to Kodi basic callbacks below
- *
- * The amount of functions here are hold so minimal as possible. Only parts
- * where needed on nearly every add-on (e.g. addon_log_msg) are to add there.
- *
- * More specific parts like e.g. to open files should be added to a separate
- * part.
- */
-//@{
-
-bool CAddonDll::InitInterface(KODI_HANDLE firstKodiInstance)
-{
-  m_interface = {0};
-
-  m_interface.libBasePath = strdup(CSpecialProtocol::TranslatePath("special://xbmcbinaddons").c_str());
-  m_interface.addonBase = nullptr;
-  m_interface.globalSingleInstance = nullptr;
-  m_interface.firstKodiInstance = firstKodiInstance;
-
-  // Create function list from kodi to addon, generated with malloc to have
-  // compatible with other versions
-  m_interface.toKodi = (AddonToKodiFuncTable_Addon*) malloc(sizeof(AddonToKodiFuncTable_Addon));
-  m_interface.toKodi->kodiBase = this;
-  m_interface.toKodi->get_addon_path = get_addon_path;
-  m_interface.toKodi->get_base_user_path = get_base_user_path;
-  m_interface.toKodi->addon_log_msg = addon_log_msg;
-  m_interface.toKodi->get_setting_bool = get_setting_bool;
-  m_interface.toKodi->get_setting_int = get_setting_int;
-  m_interface.toKodi->get_setting_float = get_setting_float;
-  m_interface.toKodi->get_setting_string = get_setting_string;
-  m_interface.toKodi->set_setting_bool = set_setting_bool;
-  m_interface.toKodi->set_setting_int = set_setting_int;
-  m_interface.toKodi->set_setting_float = set_setting_float;
-  m_interface.toKodi->set_setting_string = set_setting_string;
-  m_interface.toKodi->free_string = free_string;
-  m_interface.toKodi->free_string_array = free_string_array;
-
-  // Create function list from addon to kodi, generated with calloc to have
-  // compatible with other versions and everything with "0"
-  // Related parts becomes set from addon headers.
-  m_interface.toAddon = (KodiToAddonFuncTable_Addon*) calloc(1, sizeof(KodiToAddonFuncTable_Addon));
-
-  Interface_General::Init(&m_interface);
-  Interface_AudioEngine::Init(&m_interface);
-  Interface_Filesystem::Init(&m_interface);
-  Interface_Network::Init(&m_interface);
-  Interface_GUIGeneral::Init(&m_interface);
-
-  m_interface.toKodi->get_interface = get_interface;
-
-  return true;
-}
-
-void CAddonDll::DeInitInterface()
-{
-  Interface_GUIGeneral::DeInit(&m_interface);
-  Interface_Network::DeInit(&m_interface);
-  Interface_Filesystem::DeInit(&m_interface);
-  Interface_AudioEngine::DeInit(&m_interface);
-  Interface_General::DeInit(&m_interface);
-
-  if (m_interface.libBasePath)
-    free(const_cast<char*>(m_interface.libBasePath));
-  if (m_interface.toKodi)
-    free((char*)m_interface.toKodi);
-  if (m_interface.toAddon)
-    free((char*)m_interface.toAddon);
-  m_interface = {0};
-}
-
-char* CAddonDll::get_addon_path(void* kodiBase)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr)
-  {
-    CLog::Log(LOGERROR, "get_addon_path(...) called with empty kodi instance pointer");
-    return nullptr;
-  }
-
-  return strdup(CSpecialProtocol::TranslatePath(addon->Path()).c_str());
-}
-
-char* CAddonDll::get_base_user_path(void* kodiBase)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr)
-  {
-    CLog::Log(LOGERROR, "get_base_user_path(...) called with empty kodi instance pointer");
-    return nullptr;
-  }
-
-  return strdup(CSpecialProtocol::TranslatePath(addon->Profile()).c_str());
-}
-
-void CAddonDll::addon_log_msg(void* kodiBase, const int addonLogLevel, const char* strMessage)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr)
-  {
-    CLog::Log(LOGERROR, "addon_log_msg(...) called with empty kodi instance pointer");
-    return;
-  }
-
-  int logLevel = LOGNONE;
-  switch (addonLogLevel)
-  {
-    case ADDON_LOG_FATAL:
-      logLevel = LOGFATAL;
-      break;
-    case ADDON_LOG_SEVERE:
-      logLevel = LOGSEVERE;
-      break;
-    case ADDON_LOG_ERROR:
-      logLevel = LOGERROR;
-      break;
-    case ADDON_LOG_WARNING:
-      logLevel = LOGWARNING;
-      break;
-    case ADDON_LOG_NOTICE:
-      logLevel = LOGNOTICE;
-      break;
-    case ADDON_LOG_INFO:
-      logLevel = LOGINFO;
-      break;
-    case ADDON_LOG_DEBUG:
-      logLevel = LOGDEBUG;
-      break;
-    default:
-      break;
-  }
-
-  CLog::Log(logLevel, "AddOnLog: %s: %s", addon->Name().c_str(), strMessage);
-}
-
-bool CAddonDll::get_setting_bool(void* kodiBase, const char* id, bool* value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr || value == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
-
-    return false;
-  }
-
-  if (!addon->ReloadSettings())
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - could't get settings for add-on '%s'", __FUNCTION__, addon->Name().c_str());
-    return false;
-  }
-
-  auto setting = addon->GetSettings()->GetSetting(id);
-  if (setting == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - can't find setting '%s' in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  if (setting->GetType() != SettingType::Boolean)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - setting '%s' is not a boolean in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  *value = std::static_pointer_cast<CSettingBool>(setting)->GetValue();
-  return true;
-}
-
-bool CAddonDll::get_setting_int(void* kodiBase, const char* id, int* value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr || value == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
-
-    return false;
-  }
-
-  if (!addon->ReloadSettings())
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - could't get settings for add-on '%s'", __FUNCTION__, addon->Name().c_str());
-    return false;
-  }
-
-  auto setting = addon->GetSettings()->GetSetting(id);
-  if (setting == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - can't find setting '%s' in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  if (setting->GetType() != SettingType::Integer && setting->GetType() != SettingType::Number)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - setting '%s' is not a integer in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  if (setting->GetType() == SettingType::Integer)
-    *value = std::static_pointer_cast<CSettingInt>(setting)->GetValue();
-  else
-    *value = static_cast<int>(std::static_pointer_cast<CSettingNumber>(setting)->GetValue());
-  return true;
-}
-
-bool CAddonDll::get_setting_float(void* kodiBase, const char* id, float* value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr || value == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
-
-    return false;
-  }
-
-  if (!addon->ReloadSettings())
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - could't get settings for add-on '%s'", __FUNCTION__, addon->Name().c_str());
-    return false;
-  }
-
-  auto setting = addon->GetSettings()->GetSetting(id);
-  if (setting == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - can't find setting '%s' in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  if (setting->GetType() != SettingType::Number)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - setting '%s' is not a number in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  *value = static_cast<float>(std::static_pointer_cast<CSettingNumber>(setting)->GetValue());
-  return true;
-}
-
-bool CAddonDll::get_setting_string(void* kodiBase, const char* id, char** value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr || value == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
-
-    return false;
-  }
-
-  if (!addon->ReloadSettings())
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - could't get settings for add-on '%s'", __FUNCTION__, addon->Name().c_str());
-    return false;
-  }
-
-  auto setting = addon->GetSettings()->GetSetting(id);
-  if (setting == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - can't find setting '%s' in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  if (setting->GetType() != SettingType::String)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - setting '%s' is not a string in '%s'", __FUNCTION__, id, addon->Name().c_str());
-    return false;
-  }
-
-  *value = strdup(std::static_pointer_cast<CSettingString>(setting)->GetValue().c_str());
-  return true;
-}
-
-bool CAddonDll::set_setting_bool(void* kodiBase, const char* id, bool value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id));
-
-    return false;
-  }
-
-  if (addon->UpdateSettingInActiveDialog(id, value ? "true" : "false"))
-    return true;
-
-  if (!addon->UpdateSettingBool(id, value))
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid setting type", __FUNCTION__);
-    return false;
-  }
-
-  addon->SaveSettings();
-
-  return true;
-}
-
-bool CAddonDll::set_setting_int(void* kodiBase, const char* id, int value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id));
-
-    return false;
-  }
-
-  if (addon->UpdateSettingInActiveDialog(id, StringUtils::Format("%d", value)))
-    return true;
-
-  if (!addon->UpdateSettingInt(id, value))
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid setting type", __FUNCTION__);
-    return false;
-  }
-
-  addon->SaveSettings();
-
-  return true;
-}
-
-bool CAddonDll::set_setting_float(void* kodiBase, const char* id, float value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id));
-
-    return false;
-  }
-
-  if (addon->UpdateSettingInActiveDialog(id, StringUtils::Format("%f", value)))
-    return true;
-
-  if (!addon->UpdateSettingNumber(id, value))
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid setting type", __FUNCTION__);
-    return false;
-  }
-
-  addon->SaveSettings();
-
-  return true;
-}
-
-bool CAddonDll::set_setting_string(void* kodiBase, const char* id, const char* value)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || id == nullptr || value == nullptr)
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
-                                        __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<const void*>(value));
-
-    return false;
-  }
-
-  if (addon->UpdateSettingInActiveDialog(id, value))
-    return true;
-
-  if (!addon->UpdateSettingString(id, value))
-  {
-    CLog::Log(LOGERROR, "kodi::General::%s - invalid setting type", __FUNCTION__);
-    return false;
-  }
-
-  addon->SaveSettings();
-
-  return true;
-}
-
-void CAddonDll::free_string(void* kodiBase, char* str)
-{
-  if (str)
-    free(str);
-}
-
-void CAddonDll::free_string_array(void* kodiBase, char** arr, int numElements)
-{
-  if (arr)
-  {
-    for (int i = 0; i < numElements; ++i)
-    {
-      free(arr[i]);
-    }
-    free(arr);
-  }
-}
-
-void* CAddonDll::get_interface(void* kodiBase, const char *name, const char *version)
-{
-  if (!name || !version)
-    return nullptr;
-
-  void *retval(nullptr);
-
-  for (auto fn : s_registeredInterfaces)
-    if ((retval = fn(name, version)))
-      break;
-
-  return retval;
-}
-
-//@}
-
-}; /* namespace ADDON */
-
+} /* namespace ADDON */

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/AddonDll.h Changed

@@ -14,148 +14,136 @@
 #include "addons/interfaces/AddonInterfaces.h"
 #include "utils/XMLUtils.h"
 
+// Global addon callback handle classes
+#include "addons/interfaces/AddonBase.h"
+
 namespace ADDON
 {
 
-  typedef void* (*ADDON_GET_INTERFACE_FN)(const std::string &name, const std::string &version);
-
-  class CAddonDll : public CAddon
-  {
-  public:
-    CAddonDll(const AddonInfoPtr& addonInfo, BinaryAddonBasePtr addonBase);
-    explicit CAddonDll(const AddonInfoPtr& addonInfo, TYPE addonType);
-    ~CAddonDll() override;
-
-    virtual ADDON_STATUS GetStatus();
-
-    static void RegisterInterface(ADDON_GET_INTERFACE_FN fn);
-
-    // Implementation of IAddon via CAddon
-    std::string LibPath() const override;
-
-    // addon settings
-    void SaveSettings() override;
-
-    ADDON_STATUS Create(ADDON_TYPE type, void* funcTable, void* info);
-    void Destroy();
-
-    bool DllLoaded(void) const;
-
-    /*!
-    * @brief Get api version of moduleType type
-    *
-    * @return The version of requested type, if dll is loaded and supported by addon.
-    *         If one of both do not match, an empty version is returned.
-    *
-    * @note This should only be called if the associated dll is loaded.
-    * Otherwise use @ref CAddonInfo::DependencyVersion(...)
-    */
-    AddonVersion GetTypeVersionDll(int type) const;
-
-    /*!
-    * @brief Get api min version of moduleType type
-    *
-    * @return The version of requested type, if dll is loaded and supported by addon.
-    *         If one of both do not match, an empty version is returned.
-    *
-    * @note This should only be called if the associated dll is loaded.
-    * Otherwise use @ref CAddonInfo::DependencyMinVersion(...)
-    */
-    AddonVersion GetTypeMinVersionDll(int type) const;
-
-    /*!
-     * @brief Function to create a addon instance class
-     *
-     * @param[in] instanceType The wanted instance type class to open on addon
-     * @param[in] instanceID The from Kodi used ID string of active instance
-     * @param[in] instance Pointer where the interface functions from addon
-     *                     becomes stored during his instance creation.
-     * @param[in] parentInstance In case the instance class is related to another
-     *                           addon instance class becomes with the pointer
-     *                           given to addon. Is optional and most addon types
-     *                           not use it.
-     * @return The status of addon after the creation.
-     */
-    ADDON_STATUS CreateInstance(ADDON_TYPE instanceType, const std::string& instanceID, KODI_HANDLE instance, KODI_HANDLE parentInstance = nullptr);
-
-    /*!
-     * @brief Function to destroy a on addon created instance class
-     *
-     * @param[in] instanceID The from Kodi used ID string of active instance
-     */
-    void DestroyInstance(const std::string& instanceID);
-
-    AddonPtr GetRunningInstance() const override;
-
-    bool Initialized() const { return m_initialized; }
-
-  protected:
-    static std::string GetDllPath(const std::string &strFileName);
-
-    CAddonInterfaces* m_pHelpers;
-    std::string m_parentLib;
-
-  private:
-    /*!
-     * @brief Main addon creation call function
-     *
-     * This becomes called only one time before a addon instance becomes created.
-     * If another instance becomes requested is this Create no more used. To see
-     * like a "int main()" on exe.
-     *
-     * @param[in] firstKodiInstance The first instance who becomes used.
-     *                              In case addon supports only one instance
-     *                              and not multiple together can addon use
-     *                              only one complete class for everything.
-     *                              This is used then to interact on interface.
-     * @return The status of addon after the creation.
-     */
-    ADDON_STATUS Create(KODI_HANDLE firstKodiInstance);
-
-    bool CheckAPIVersion(int type);
-
-    BinaryAddonBasePtr m_binaryAddonBase;
-    DllAddon* m_pDll;
-    bool m_initialized;
-    bool LoadDll();
-    std::map<std::string, std::pair<ADDON_TYPE, KODI_HANDLE>> m_usedInstances;
-
-    virtual ADDON_STATUS TransferSettings();
-
-    bool UpdateSettingInActiveDialog(const char* id, const std::string& value);
-
-    static std::vector<ADDON_GET_INTERFACE_FN> s_registeredInterfaces;
-
-    /// addon to kodi basic callbacks below
-    //@{
-
-    /*!
-     * This structure, which is fixed to the addon headers, makes use of the at
-     * least supposed parts for the interface.
-     * This structure is defined in:
-     * /xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
-     */
-    AddonGlobalInterface m_interface;
-
-    inline bool InitInterface(KODI_HANDLE firstKodiInstance);
-    inline void DeInitInterface();
-
-    static char* get_addon_path(void* kodiBase);
-    static char* get_base_user_path(void* kodiBase);
-    static void addon_log_msg(void* kodiBase, const int addonLogLevel, const char* strMessage);
-    static bool get_setting_bool(void* kodiBase, const char* id, bool* value);
-    static bool get_setting_int(void* kodiBase, const char* id, int* value);
-    static bool get_setting_float(void* kodiBase, const char* id, float* value);
-    static bool get_setting_string(void* kodiBase, const char* id, char** value);
-    static bool set_setting_bool(void* kodiBase, const char* id, bool value);
-    static bool set_setting_int(void* kodiBase, const char* id, int value);
-    static bool set_setting_float(void* kodiBase, const char* id, float value);
-    static bool set_setting_string(void* kodiBase, const char* id, const char* value);
-    static void free_string(void* kodiBase, char* str);
-    static void free_string_array(void* kodiBase, char** arr, int numElements);
-    static void* get_interface(void* kodiBase, const char* name, const char *version);
-    //@}
-  };
-
-}; /* namespace ADDON */
+/*!
+ * Addon instance handler, used as identify for std::map to find related
+ * addon instance. This class itself not accessed here.
+ *
+ * @todo As long game addon system use CAddonDll itself and not
+ * IAddonInstanceHandler as parent, is the set of this as "void*" needed.
+ * After game system is changed should by this also changed to
+ * "const IAddonInstanceHandler*" or direct in map below.
+ */
+using ADDON_INSTANCE_HANDLER = const void*;
 
+class CAddonDll : public CAddon
+{
+public:
+  CAddonDll(const AddonInfoPtr& addonInfo, BinaryAddonBasePtr addonBase);
+  explicit CAddonDll(const AddonInfoPtr& addonInfo, TYPE addonType);
+  ~CAddonDll() override;
+
+  virtual ADDON_STATUS GetStatus();
+
+  // Implementation of IAddon via CAddon
+  std::string LibPath() const override;
+
+  // addon settings
+  void SaveSettings() override;
+
+  ADDON_STATUS Create(ADDON_TYPE type, void* funcTable, void* info);
+  void Destroy();
+
+  bool DllLoaded(void) const;
+
+  /*!
+   * @brief Get api version of moduleType type
+   *
+   * @return The version of requested type, if dll is loaded and supported by addon.
+   *         If one of both do not match, an empty version is returned.
+   *
+   * @note This should only be called if the associated dll is loaded.
+   * Otherwise use @ref CAddonInfo::DependencyVersion(...)
+   */
+  AddonVersion GetTypeVersionDll(int type) const;
+
+  /*!
+   * @brief Get api min version of moduleType type
+   *
+   * @return The version of requested type, if dll is loaded and supported by addon.
+   *         If one of both do not match, an empty version is returned.
+   *
+   * @note This should only be called if the associated dll is loaded.
+   * Otherwise use @ref CAddonInfo::DependencyMinVersion(...)
+   */
+  AddonVersion GetTypeMinVersionDll(int type) const;
+
+  /*!
+   * @brief Function to create a addon instance class
+   *
+   * @param[in] instanceType The wanted instance type class to open on addon
+   * @param[in] instanceClass The from Kodi used class for active instance
+   * @param[in] instanceID The from addon used ID string of active instance
+   * @param[in] instance Pointer where the interface functions from addon
+   *                     becomes stored during his instance creation.
+   * @param[in] parentInstance In case the instance class is related to another
+   *                           addon instance class becomes with the pointer
+   *                           given to addon. Is optional and most addon types
+   *                           not use it.
+   * @return The status of addon after the creation.
+   */
+  ADDON_STATUS CreateInstance(ADDON_TYPE instanceType,
+                              ADDON_INSTANCE_HANDLER instanceClass,
+                              const std::string& instanceID,
+                              KODI_HANDLE instance,
+                              KODI_HANDLE parentInstance = nullptr);
+
+  /*!
+   * @brief Function to destroy a on addon created instance class
+   *
+   * @param[in] instanceClass The from Kodi used class for active instance
+   */
+  void DestroyInstance(ADDON_INSTANCE_HANDLER instanceClass);
+
+  AddonPtr GetRunningInstance() const override;
+
+  bool Initialized() const { return m_initialized; }
+
+protected:
+  static std::string GetDllPath(const std::string& strFileName);
+
+  CAddonInterfaces* m_pHelpers = nullptr;
+  std::string m_parentLib;
+
+private:
+  /*!
+   * @brief Main addon creation call function
+   *
+   * This becomes called only one time before a addon instance becomes created.
+   * If another instance becomes requested is this Create no more used. To see
+   * like a "int main()" on exe.
+   *
+   * @param[in] firstKodiInstance The first instance who becomes used.
+   *                              In case addon supports only one instance
+   *                              and not multiple together can addon use
+   *                              only one complete class for everything.
+   *                              This is used then to interact on interface.
+   * @return The status of addon after the creation.
+   */
+  ADDON_STATUS Create(KODI_HANDLE firstKodiInstance);
+
+  bool CheckAPIVersion(int type);
+
+  BinaryAddonBasePtr m_binaryAddonBase = nullptr;
+  DllAddon* m_pDll = nullptr;
+  bool m_initialized = false;
+  bool LoadDll();
+  std::map<ADDON_INSTANCE_HANDLER, std::pair<ADDON_TYPE, KODI_HANDLE>> m_usedInstances;
+
+  virtual ADDON_STATUS TransferSettings();
+
+  /*!
+   * This structure, which is fixed to the addon headers, makes use of the at
+   * least supposed parts for the interface.
+   * This structure is defined in:
+   * /xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
+   */
+  AddonGlobalInterface m_interface = {0};
+};
+
+} /* namespace ADDON */

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/AddonInstanceHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/BinaryAddonBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/BinaryAddonBase.h Changed

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/BinaryAddonManager.cpp Changed

@@ -18,11 +18,6 @@
 
 using namespace ADDON;
 
-CBinaryAddonManager::CBinaryAddonManager()
-  : m_tempAddonBasePath("special://temp/binary-addons")
-{
-}
-
 CBinaryAddonManager::~CBinaryAddonManager()
 {
   DeInit();
@@ -49,10 +44,6 @@
 
 void CBinaryAddonManager::DeInit()
 {
-  /* If temporary directory was used from addon delete them */
-  if (XFILE::CDirectory::Exists(m_tempAddonBasePath))
-    XFILE::CDirectory::RemoveRecursive(CSpecialProtocol::TranslatePath(m_tempAddonBasePath));
-
   CServiceBroker::GetAddonMgr().Events().Unsubscribe(this);
 }
 
@@ -61,7 +52,7 @@
   CSingleLock lock(m_critSection);
   for (auto info : m_installedAddons)
   {
-    if (info.second->IsType(type))
+    if (info.second->HasType(type))
       return true;
   }
   return false;
@@ -72,7 +63,7 @@
   CSingleLock lock(m_critSection);
   for (auto info : m_enabledAddons)
   {
-    if (info.second->IsType(type))
+    if (info.second->HasType(type))
       return true;
   }
   return false;
@@ -102,7 +93,7 @@
 
   for (auto info : *addons)
   {
-    if (type == ADDON_UNKNOWN || info.second->IsType(type))
+    if (type == ADDON_UNKNOWN || info.second->HasType(type))
     {
       addonInfos.push_back(info.second);
     }
@@ -115,7 +106,7 @@
 
   for (auto info : m_installedAddons)
   {
-    if (type == ADDON_UNKNOWN || info.second->IsType(type))
+    if (type == ADDON_UNKNOWN || info.second->HasType(type))
     {
       if (!IsAddonEnabled(info.second->ID(), type))
         addonInfos.push_back(info.second);
@@ -128,7 +119,7 @@
   CSingleLock lock(m_critSection);
 
   auto addon = m_installedAddons.find(addonId);
-  if (addon != m_installedAddons.end() && (type == ADDON_UNKNOWN || addon->second->IsType(type)))
+  if (addon != m_installedAddons.end() && (type == ADDON_UNKNOWN || addon->second->HasType(type)))
     return addon->second;
 
   CLog::Log(LOGERROR, "CBinaryAddonManager::%s: Requested addon '%s' unknown as binary", __FUNCTION__, addonId.c_str());

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/BinaryAddonManager.h Changed

@@ -28,7 +28,7 @@
   class CBinaryAddonManager
   {
   public:
-    CBinaryAddonManager();
+    CBinaryAddonManager() = default;
     CBinaryAddonManager(const CBinaryAddonManager&) = delete;
     ~CBinaryAddonManager();
 
@@ -119,16 +119,6 @@
      */
     AddonPtr GetRunningAddon(const std::string& addonId) const;
 
-    /*!
-     * @brief To get the path where temporary addon parts can be becomes stored
-     *
-     * @return the base path used for temporary addon paths
-     *
-     * @warning the folder and his contents becomes deleted during stop and
-     * close of Kodi
-     */
-    const std::string& GetTempAddonBasePath() { return m_tempAddonBasePath; }
-
   private:
     bool AddAddonBaseEntry(BINARY_ADDON_LIST_ENTRY& entry);
 
@@ -142,8 +132,6 @@
     typedef std::map<std::string, BinaryAddonBasePtr> BinaryAddonMgrBaseList;
     BinaryAddonMgrBaseList m_installedAddons;
     BinaryAddonMgrBaseList m_enabledAddons;
-
-    const std::string m_tempAddonBasePath;
   };
 
 } /* namespace ADDON */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/AddonBase.cpp Added

@@ -0,0 +1,483 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "AddonBase.h"
+
+#include "GUIUserMessages.h"
+#include "addons/binary-addons/AddonDll.h"
+#include "addons/settings/AddonSettings.h"
+#include "addons/settings/GUIDialogAddonSettings.h"
+#include "filesystem/SpecialProtocol.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIWindowManager.h"
+#include "utils/log.h"
+
+// "C" interface addon callback handle classes
+#include "AudioEngine.h"
+#include "Filesystem.h"
+#include "General.h"
+#include "Network.h"
+#include "gui/General.h"
+
+namespace ADDON
+{
+
+std::vector<ADDON_GET_INTERFACE_FN> Interface_Base::s_registeredInterfaces;
+
+bool Interface_Base::InitInterface(CAddonDll* addon,
+                                   AddonGlobalInterface& addonInterface,
+                                   KODI_HANDLE firstKodiInstance)
+{
+  addonInterface = {0};
+
+  addonInterface.libBasePath =
+      strdup(CSpecialProtocol::TranslatePath("special://xbmcbinaddons").c_str());
+  addonInterface.addonBase = nullptr;
+  addonInterface.globalSingleInstance = nullptr;
+  addonInterface.firstKodiInstance = firstKodiInstance;
+
+  // Create function list from kodi to addon, generated with malloc to have
+  // compatible with other versions
+  addonInterface.toKodi = new AddonToKodiFuncTable_Addon();
+  addonInterface.toKodi->kodiBase = addon;
+  addonInterface.toKodi->get_addon_path = get_addon_path;
+  addonInterface.toKodi->get_base_user_path = get_base_user_path;
+  addonInterface.toKodi->addon_log_msg = addon_log_msg;
+  addonInterface.toKodi->get_setting_bool = get_setting_bool;
+  addonInterface.toKodi->get_setting_int = get_setting_int;
+  addonInterface.toKodi->get_setting_float = get_setting_float;
+  addonInterface.toKodi->get_setting_string = get_setting_string;
+  addonInterface.toKodi->set_setting_bool = set_setting_bool;
+  addonInterface.toKodi->set_setting_int = set_setting_int;
+  addonInterface.toKodi->set_setting_float = set_setting_float;
+  addonInterface.toKodi->set_setting_string = set_setting_string;
+  addonInterface.toKodi->free_string = free_string;
+  addonInterface.toKodi->free_string_array = free_string_array;
+
+  // Related parts becomes set from addon headers, make here to nullptr to allow
+  // checks for right set of them
+  addonInterface.toAddon = new KodiToAddonFuncTable_Addon();
+
+  // Init the other interfaces
+  Interface_General::Init(&addonInterface);
+  Interface_AudioEngine::Init(&addonInterface);
+  Interface_Filesystem::Init(&addonInterface);
+  Interface_Network::Init(&addonInterface);
+  Interface_GUIGeneral::Init(&addonInterface);
+
+  addonInterface.toKodi->get_interface = get_interface;
+
+  return true;
+}
+
+void Interface_Base::DeInitInterface(AddonGlobalInterface& addonInterface)
+{
+  Interface_GUIGeneral::DeInit(&addonInterface);
+  Interface_Network::DeInit(&addonInterface);
+  Interface_Filesystem::DeInit(&addonInterface);
+  Interface_AudioEngine::DeInit(&addonInterface);
+  Interface_General::DeInit(&addonInterface);
+
+  if (addonInterface.libBasePath)
+    free(const_cast<char*>(addonInterface.libBasePath));
+
+  delete addonInterface.toKodi;
+  delete addonInterface.toAddon;
+  addonInterface = {0};
+}
+
+void Interface_Base::RegisterInterface(ADDON_GET_INTERFACE_FN fn)
+{
+  s_registeredInterfaces.push_back(fn);
+}
+
+bool Interface_Base::UpdateSettingInActiveDialog(CAddonDll* addon,
+                                                 const char* id,
+                                                 const std::string& value)
+{
+  if (!CServiceBroker::GetGUI()->GetWindowManager().IsWindowActive(WINDOW_DIALOG_ADDON_SETTINGS))
+    return false;
+
+  CGUIDialogAddonSettings* dialog =
+      CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogAddonSettings>(
+          WINDOW_DIALOG_ADDON_SETTINGS);
+  if (dialog->GetCurrentAddonID() != addon->ID())
+    return false;
+
+  CGUIMessage message(GUI_MSG_SETTING_UPDATED, 0, 0);
+  std::vector<std::string> params;
+  params.emplace_back(id);
+  params.push_back(value);
+  message.SetStringParams(params);
+  CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(message,
+                                                                 WINDOW_DIALOG_ADDON_SETTINGS);
+
+  return true;
+}
+
+/*!
+ * @brief Addon to Kodi basic callbacks below
+ *
+ * The amount of functions here are hold so minimal as possible. Only parts
+ * where needed on nearly every add-on (e.g. addon_log_msg) are to add there.
+ *
+ * More specific parts like e.g. to open files should be added to a separate
+ * part.
+ */
+//@{
+
+char* Interface_Base::get_addon_path(void* kodiBase)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr)
+  {
+    CLog::Log(LOGERROR, "get_addon_path(...) called with empty kodi instance pointer");
+    return nullptr;
+  }
+
+  return strdup(CSpecialProtocol::TranslatePath(addon->Path()).c_str());
+}
+
+char* Interface_Base::get_base_user_path(void* kodiBase)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr)
+  {
+    CLog::Log(LOGERROR, "get_base_user_path(...) called with empty kodi instance pointer");
+    return nullptr;
+  }
+
+  return strdup(CSpecialProtocol::TranslatePath(addon->Profile()).c_str());
+}
+
+void Interface_Base::addon_log_msg(void* kodiBase, const int addonLogLevel, const char* strMessage)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr)
+  {
+    CLog::Log(LOGERROR, "addon_log_msg(...) called with empty kodi instance pointer");
+    return;
+  }
+
+  int logLevel = LOGNONE;
+  switch (addonLogLevel)
+  {
+    case ADDON_LOG_FATAL:
+      logLevel = LOGFATAL;
+      break;
+    case ADDON_LOG_SEVERE:
+      logLevel = LOGSEVERE;
+      break;
+    case ADDON_LOG_ERROR:
+      logLevel = LOGERROR;
+      break;
+    case ADDON_LOG_WARNING:
+      logLevel = LOGWARNING;
+      break;
+    case ADDON_LOG_NOTICE:
+      logLevel = LOGNOTICE;
+      break;
+    case ADDON_LOG_INFO:
+      logLevel = LOGINFO;
+      break;
+    case ADDON_LOG_DEBUG:
+      logLevel = LOGDEBUG;
+      break;
+    default:
+      break;
+  }
+
+  CLog::Log(logLevel, "AddOnLog: {}: {}", addon->Name(), strMessage);
+}
+
+bool Interface_Base::get_setting_bool(void* kodiBase, const char* id, bool* value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr || value == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}', value='{}')",
+              __func__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
+
+    return false;
+  }
+
+  if (!addon->ReloadSettings())
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+              addon->Name());
+    return false;
+  }
+
+  auto setting = addon->GetSettings()->GetSetting(id);
+  if (setting == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - can't find setting '{}' in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  if (setting->GetType() != SettingType::Boolean)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - setting '{}' is not a boolean in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  *value = std::static_pointer_cast<CSettingBool>(setting)->GetValue();
+  return true;
+}
+
+bool Interface_Base::get_setting_int(void* kodiBase, const char* id, int* value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr || value == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}', value='{}')",
+              __func__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
+
+    return false;
+  }
+
+  if (!addon->ReloadSettings())
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+              addon->Name());
+    return false;
+  }
+
+  auto setting = addon->GetSettings()->GetSetting(id);
+  if (setting == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - can't find setting '{}' in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  if (setting->GetType() != SettingType::Integer && setting->GetType() != SettingType::Number)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - setting '{}' is not a integer in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  if (setting->GetType() == SettingType::Integer)
+    *value = std::static_pointer_cast<CSettingInt>(setting)->GetValue();
+  else
+    *value = static_cast<int>(std::static_pointer_cast<CSettingNumber>(setting)->GetValue());
+  return true;
+}
+
+bool Interface_Base::get_setting_float(void* kodiBase, const char* id, float* value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr || value == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}', value='{}')",
+              __func__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
+
+    return false;
+  }
+
+  if (!addon->ReloadSettings())
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+              addon->Name());
+    return false;
+  }
+
+  auto setting = addon->GetSettings()->GetSetting(id);
+  if (setting == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - can't find setting '{}' in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  if (setting->GetType() != SettingType::Number)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - setting '{}' is not a number in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  *value = static_cast<float>(std::static_pointer_cast<CSettingNumber>(setting)->GetValue());
+  return true;
+}
+
+bool Interface_Base::get_setting_string(void* kodiBase, const char* id, char** value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr || value == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}', value='{}')",
+              __func__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
+
+    return false;
+  }
+
+  if (!addon->ReloadSettings())
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - could't get settings for add-on '{}'", __func__,
+              addon->Name());
+    return false;
+  }
+
+  auto setting = addon->GetSettings()->GetSetting(id);
+  if (setting == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - can't find setting '{}' in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  if (setting->GetType() != SettingType::String)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - setting '{}' is not a string in '{}'", __func__, id,
+              addon->Name());
+    return false;
+  }
+
+  *value = strdup(std::static_pointer_cast<CSettingString>(setting)->GetValue().c_str());
+  return true;
+}
+
+bool Interface_Base::set_setting_bool(void* kodiBase, const char* id, bool value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}')", __func__,
+              kodiBase, static_cast<const void*>(id));
+
+    return false;
+  }
+
+  if (Interface_Base::UpdateSettingInActiveDialog(addon, id, value ? "true" : "false"))
+    return true;
+
+  if (!addon->UpdateSettingBool(id, value))
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid setting type", __func__);
+    return false;
+  }
+
+  addon->SaveSettings();
+
+  return true;
+}
+
+bool Interface_Base::set_setting_int(void* kodiBase, const char* id, int value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}')", __func__,
+              kodiBase, static_cast<const void*>(id));
+
+    return false;
+  }
+
+  if (Interface_Base::UpdateSettingInActiveDialog(addon, id, StringUtils::Format("%d", value)))
+    return true;
+
+  if (!addon->UpdateSettingInt(id, value))
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid setting type", __func__);
+    return false;
+  }
+
+  addon->SaveSettings();
+
+  return true;
+}
+
+bool Interface_Base::set_setting_float(void* kodiBase, const char* id, float value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}')", __func__,
+              kodiBase, static_cast<const void*>(id));
+
+    return false;
+  }
+
+  if (Interface_Base::UpdateSettingInActiveDialog(addon, id, StringUtils::Format("%f", value)))
+    return true;
+
+  if (!addon->UpdateSettingNumber(id, value))
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid setting type", __func__);
+    return false;
+  }
+
+  addon->SaveSettings();
+
+  return true;
+}
+
+bool Interface_Base::set_setting_string(void* kodiBase, const char* id, const char* value)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (addon == nullptr || id == nullptr || value == nullptr)
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid data (addon='{}', id='{}', value='{}')",
+              __func__, kodiBase, static_cast<const void*>(id), static_cast<const void*>(value));
+
+    return false;
+  }
+
+  if (Interface_Base::UpdateSettingInActiveDialog(addon, id, value))
+    return true;
+
+  if (!addon->UpdateSettingString(id, value))
+  {
+    CLog::Log(LOGERROR, "Interface_Base::{} - invalid setting type", __func__);
+    return false;
+  }
+
+  addon->SaveSettings();
+
+  return true;
+}
+
+void Interface_Base::free_string(void* kodiBase, char* str)
+{
+  if (str)
+    free(str);
+}
+
+void Interface_Base::free_string_array(void* kodiBase, char** arr, int numElements)
+{
+  if (arr)
+  {
+    for (int i = 0; i < numElements; ++i)
+    {
+      free(arr[i]);
+    }
+    free(arr);
+  }
+}
+
+void* Interface_Base::get_interface(void* kodiBase, const char* name, const char* version)
+{
+  if (!name || !version)
+    return nullptr;
+
+  void* retval(nullptr);
+
+  for (auto fn : s_registeredInterfaces)
+    if ((retval = fn(name, version)))
+      break;
+
+  return retval;
+}
+
+//@}
+
+} // namespace ADDON

_service:download_files:master.tar.gz/xbmc/addons/interfaces/AddonBase.h Added

@@ -0,0 +1,72 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "addons/kodi-addon-dev-kit/include/kodi/AddonBase.h"
+
+extern "C"
+{
+namespace ADDON
+{
+
+typedef void* (*ADDON_GET_INTERFACE_FN)(const std::string& name, const std::string& version);
+
+class CAddonDll;
+
+/*!
+ * @brief Global general Add-on to Kodi callback functions
+ *
+ * To hold general functions not related to a instance type and usable for
+ * every add-on type.
+ *
+ * Related add-on header is "./xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h"
+ */
+struct Interface_Base
+{
+  static bool InitInterface(CAddonDll* addon,
+                            AddonGlobalInterface& addonInterface,
+                            KODI_HANDLE firstKodiInstance);
+  static void DeInitInterface(AddonGlobalInterface& addonInterface);
+  static void RegisterInterface(ADDON_GET_INTERFACE_FN fn);
+  static bool UpdateSettingInActiveDialog(CAddonDll* addon,
+                                          const char* id,
+                                          const std::string& value);
+
+  static std::vector<ADDON_GET_INTERFACE_FN> s_registeredInterfaces;
+
+  /*!
+   * @brief callback functions from add-on to kodi
+   *
+   * @note To add a new function use the "_" style to directly identify an
+   * add-on callback function. Everything with CamelCase is only to be used
+   * in Kodi.
+   *
+   * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
+   * class.
+   */
+  //@{
+  static char* get_addon_path(void* kodiBase);
+  static char* get_base_user_path(void* kodiBase);
+  static void addon_log_msg(void* kodiBase, const int addonLogLevel, const char* strMessage);
+  static bool get_setting_bool(void* kodiBase, const char* id, bool* value);
+  static bool get_setting_int(void* kodiBase, const char* id, int* value);
+  static bool get_setting_float(void* kodiBase, const char* id, float* value);
+  static bool get_setting_string(void* kodiBase, const char* id, char** value);
+  static bool set_setting_bool(void* kodiBase, const char* id, bool value);
+  static bool set_setting_int(void* kodiBase, const char* id, int value);
+  static bool set_setting_float(void* kodiBase, const char* id, float value);
+  static bool set_setting_string(void* kodiBase, const char* id, const char* value);
+  static void free_string(void* kodiBase, char* str);
+  static void free_string_array(void* kodiBase, char** arr, int numElements);
+  static void* get_interface(void* kodiBase, const char* name, const char* version);
+  //@}
+};
+
+} /* namespace ADDON */
+} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/AddonInterfaces.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/AudioEngine.cpp Changed

@@ -69,7 +69,8 @@
 {
   if (!kodiBase || !streamFormat)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamFormat='%p')",
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamFormat='{}')",
               __FUNCTION__, kodiBase, static_cast<void*>(streamFormat));
     return nullptr;
   }
@@ -99,7 +100,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -112,7 +115,9 @@
 {
   if (!kodiBase || !format)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', format='%p')", __FUNCTION__, kodiBase, static_cast<void*>(format));
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', format='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(format));
     return false;
   }
 
@@ -145,7 +150,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return 0;
   }
 
@@ -158,7 +165,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return 0;
   }
 
@@ -176,7 +185,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return -1.0;
   }
 
@@ -190,7 +201,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return false;
   }
 
@@ -204,7 +217,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return -1.0;
   }
 
@@ -218,7 +233,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return -1.0;
   }
 
@@ -232,7 +249,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -246,7 +265,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -257,7 +278,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -271,7 +294,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return false;
   }
 
@@ -285,7 +310,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return false;
   }
 
@@ -299,7 +326,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -313,7 +342,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return -1.0f;
   }
 
@@ -327,7 +358,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -341,7 +374,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return -1.0f;
   }
 
@@ -355,7 +390,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }
 
@@ -369,7 +406,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return 0;
   }
 
@@ -383,7 +422,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return 0;
   }
 
@@ -397,7 +438,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return 0;
   }
 
@@ -411,7 +454,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return AE_FMT_INVALID;
   }
 
@@ -425,7 +470,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return -1.0f;
   }
 
@@ -439,7 +486,9 @@
 {
   if (!kodiBase || !streamHandle)
   {
-    CLog::Log(LOGERROR, "Interface_AudioEngine::{} - invalid stream data (kodiBase='%p', streamHandle='%p')", __FUNCTION__, kodiBase, streamHandle);
+    CLog::Log(LOGERROR,
+              "Interface_AudioEngine::{} - invalid stream data (kodiBase='{}', streamHandle='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(streamHandle));
     return;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/AudioEngine.h Changed

@@ -10,6 +10,8 @@
 
 #include "addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h"
 
+extern "C"
+{
 namespace ADDON
 {
 
@@ -19,163 +21,176 @@
   static void DeInit(AddonGlobalInterface* addonInterface);
 
   /**
-  * Creates and returns a new handle to an IAEStream in the format specified, this function should never fail
-  * @param[in] streamFormat Format to use for stream
-  * @param[in] options A bit field of stream options (see: enum AEStreamOptions)
-  * @return a new Handle to an IAEStream that will accept data in the requested format
-  */
-  static AEStreamHandle* audioengine_make_stream(void *kodiBase, AudioEngineFormat* streamFormat, unsigned int options);
+   * Creates and returns a new handle to an IAEStream in the format specified, this function should never fail
+   * @param[in] streamFormat Format to use for stream
+   * @param[in] options A bit field of stream options (see: enum AEStreamOptions)
+   * @return a new Handle to an IAEStream that will accept data in the requested format
+   */
+  static AEStreamHandle* audioengine_make_stream(void* kodiBase,
+                                                 AudioEngineFormat* streamFormat,
+                                                 unsigned int options);
 
   /**
-  * This method will remove the specifyed stream from the engine.
-  * For OSX/IOS this is essential to reconfigure the audio output.
-  * @param[in] streamHandle The stream to be altered
-  */
-  static void audioengine_free_stream(void *kodiBase, AEStreamHandle* streamHandle);
+   * This method will remove the specifyed stream from the engine.
+   * For OSX/IOS this is essential to reconfigure the audio output.
+   * @param[in] streamHandle The stream to be altered
+   */
+  static void audioengine_free_stream(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Get the current sink data format
-  *
-  * @param[in] sinkFormat sink data format. For more details see AudioEngineFormat.
-  * @return Returns true on success, else false.
-  */
-  static bool audioengine_get_current_sink_format(void* kodiBase, AudioEngineFormat *sinkFormat);
+   * Get the current sink data format
+   *
+   * @param[in] sinkFormat sink data format. For more details see AudioEngineFormat.
+   * @return Returns true on success, else false.
+   */
+  static bool audioengine_get_current_sink_format(void* kodiBase, AudioEngineFormat* sinkFormat);
 
   /**
-  * Returns the amount of space available in the stream
-  * @return The number of bytes AddData will consume
-  */
+   * Returns the amount of space available in the stream
+   * @return The number of bytes AddData will consume
+   */
   static unsigned int aestream_get_space(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Add planar or interleaved PCM data to the stream
-  * @param[in] data array of pointers to the planes
-  * @param[in] offset to frame in frames
-  * @param[in] frames number of frames
-  * @return The number of frames consumed
-  */
-  static unsigned int aestream_add_data(void* kodiBase, AEStreamHandle* streamHandle, uint8_t* const *data,
-                                        unsigned int offset, unsigned int frames,  double pts, bool hasDownmix,
+   * Add planar or interleaved PCM data to the stream
+   * @param[in] data array of pointers to the planes
+   * @param[in] offset to frame in frames
+   * @param[in] frames number of frames
+   * @return The number of frames consumed
+   */
+  static unsigned int aestream_add_data(void* kodiBase,
+                                        AEStreamHandle* streamHandle,
+                                        uint8_t* const* data,
+                                        unsigned int offset,
+                                        unsigned int frames,
+                                        double pts,
+                                        bool hasDownmix,
                                         double centerMixLevel);
 
   /**
-  * Returns the time in seconds that it will take
-  * for the next added packet to be heard from the speakers.
-  * @return seconds
-  */
+   * Returns the time in seconds that it will take
+   * for the next added packet to be heard from the speakers.
+   * @return seconds
+   */
   static double aestream_get_delay(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Returns if the stream is buffering
-  * @return True if the stream is buffering
-  */
+   * Returns if the stream is buffering
+   * @return True if the stream is buffering
+   */
   static bool aestream_is_buffering(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Returns the time in seconds that it will take
-  * to underrun the cache if no sample is added.
-  * @return seconds
-  */
+   * Returns the time in seconds that it will take
+   * to underrun the cache if no sample is added.
+   * @return seconds
+   */
   static double aestream_get_cache_time(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Returns the total time in seconds of the cache
-  * @return seconds
-  */
+   * Returns the total time in seconds of the cache
+   * @return seconds
+   */
   static double aestream_get_cache_total(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Pauses the stream playback
-  */
+   * Pauses the stream playback
+   */
   static void aestream_pause(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Resumes the stream after pausing
-  */
+   * Resumes the stream after pausing
+   */
   static void aestream_resume(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Start draining the stream
-  * @note Once called AddData will not consume more data.
-  */
+   * Start draining the stream
+   * @note Once called AddData will not consume more data.
+   */
   static void aestream_drain(void* kodiBase, AEStreamHandle* streamHandle, bool wait);
 
   /**
-  * Returns true if the is stream draining
-  */
+   * Returns true if the is stream draining
+   */
   static bool aestream_is_draining(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Returns true if the is stream has finished draining
-  */
+   * Returns true if the is stream has finished draining
+   */
   static bool aestream_is_drained(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Flush all buffers dropping the audio data
-  */
+   * Flush all buffers dropping the audio data
+   */
   static void aestream_flush(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Return the stream's current volume level
-  * @return The volume level between 0.0 and 1.0
-  */
+   * Return the stream's current volume level
+   * @return The volume level between 0.0 and 1.0
+   */
   static float aestream_get_volume(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Set the stream's volume level
-  * @param volume The new volume level between 0.0 and 1.0
-  */
-  static void  aestream_set_volume(void* kodiBase, AEStreamHandle* streamHandle, float volume);
+   * Set the stream's volume level
+   * @param volume The new volume level between 0.0 and 1.0
+   */
+  static void aestream_set_volume(void* kodiBase, AEStreamHandle* streamHandle, float volume);
 
   /**
-  * Gets the stream's volume amplification in linear units.
-  * @return The volume amplification factor between 1.0 and 1000.0
-  */
+   * Gets the stream's volume amplification in linear units.
+   * @return The volume amplification factor between 1.0 and 1000.0
+   */
   static float aestream_get_amplification(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Sets the stream's volume amplification in linear units.
-  * @param amplify The volume amplification factor between 1.0 and 1000.0
-  */
-  static void aestream_set_amplification(void* kodiBase, AEStreamHandle* streamHandle, float amplify);
+   * Sets the stream's volume amplification in linear units.
+   * @param amplify The volume amplification factor between 1.0 and 1000.0
+   */
+  static void aestream_set_amplification(void* kodiBase,
+                                         AEStreamHandle* streamHandle,
+                                         float amplify);
 
   /**
-  * Returns the size of one audio frame in bytes (channelCount * resolution)
-  * @return The size in bytes of one frame
-  */
+   * Returns the size of one audio frame in bytes (channelCount * resolution)
+   * @return The size in bytes of one frame
+   */
   static unsigned int aestream_get_frame_size(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Returns the number of channels the stream is configured to accept
-  * @return The channel count
-  */
+   * Returns the number of channels the stream is configured to accept
+   * @return The channel count
+   */
   static unsigned int aestream_get_channel_count(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Returns the stream's sample rate, if the stream is using a dynamic sample rate, this value will NOT reflect any changes made by calls to SetResampleRatio()
-  * @return The stream's sample rate (eg, 48000)
-  */
+   * Returns the stream's sample rate, if the stream is using a dynamic sample
+   * rate, this value will NOT reflect any changes made by calls to SetResampleRatio()
+   * @return The stream's sample rate (eg, 48000)
+   */
   static unsigned int aestream_get_sample_rate(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Return the data format the stream has been configured with
-  * @return The stream's data format (eg, AE_FMT_S16LE)
-  */
+   * Return the data format the stream has been configured with
+   * @return The stream's data format (eg, AE_FMT_S16LE)
+   */
   static AEDataFormat aestream_get_data_format(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Return the resample ratio
-  * @note This will return an undefined value if the stream is not resampling
-  * @return the current resample ratio or undefined if the stream is not resampling
-  */
+   * Return the resample ratio
+   * @note This will return an undefined value if the stream is not resampling
+   * @return the current resample ratio or undefined if the stream is not resampling
+   */
   static double aestream_get_resample_ratio(void* kodiBase, AEStreamHandle* streamHandle);
 
   /**
-  * Sets the resample ratio
-  * @note This function may return false if the stream is not resampling, if you wish to use this be sure to set the AESTREAM_FORCE_RESAMPLE option
-  * @param[in] ratio the new sample rate ratio, calculated by ((double)desiredRate / (double)GetSampleRate())
-  */
-  static void aestream_set_resample_ratio(void* kodiBase, AEStreamHandle* streamHandle, double ratio);
+   * Sets the resample ratio
+   * @note This function may return false if the stream is not resampling, if you wish to use this be sure to set the AESTREAM_FORCE_RESAMPLE option
+   * @param[in] ratio the new sample rate ratio, calculated by ((double)desiredRate / (double)GetSampleRate())
+   */
+  static void aestream_set_resample_ratio(void* kodiBase,
+                                          AEStreamHandle* streamHandle,
+                                          double ratio);
 };
 
 } /* namespace ADDON */
+} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/Filesystem.cpp Changed

@@ -85,7 +85,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || url == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, kodiBase, url);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', url='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(url));
     return false;
   }
 
@@ -98,7 +99,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || path == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, kodiBase, path);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', path='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(path));
     return false;
   }
 
@@ -110,7 +112,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || path == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, kodiBase, path);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', path='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(path));
     return false;
   }
 
@@ -122,7 +125,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || path == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, kodiBase, path);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', path='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(path));
     return false;
   }
 
@@ -154,9 +158,11 @@
   if (addon == nullptr || path == nullptr || mask == nullptr|| items == nullptr || num_items == nullptr)
   {
     CLog::Log(LOGERROR,
-              "Interface_Filesystem::%s - invalid data (addon='%p', path='%p', mask='%p', "
-              "items='%p', num_items='%p'",
-              __FUNCTION__, kodiBase, path, mask, static_cast<void*>(items), static_cast<void*>(num_items));
+              "Interface_Filesystem::{} - invalid data (addon='{}', path='{}', mask='{}', "
+              "items='{}', num_items='{}'",
+              __FUNCTION__, kodiBase, static_cast<const void*>(path),
+              static_cast<const void*>(mask), static_cast<void*>(items),
+              static_cast<void*>(num_items));
     return false;
   }
 
@@ -184,7 +190,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || items == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', items='%p')", __FUNCTION__, kodiBase, static_cast<void*>(items));
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', items='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(items));
     return;
   }
 
@@ -203,7 +210,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return false;
   }
 
@@ -216,8 +224,9 @@
   if (addon == nullptr || filename == nullptr || buffer == nullptr)
   {
     CLog::Log(LOGERROR,
-              "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', buffer='%p')",
-              __FUNCTION__, kodiBase, filename, static_cast<void*>(buffer));
+              "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}', buffer='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename),
+              static_cast<void*>(buffer));
     return false;
   }
 
@@ -229,7 +238,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return false;
   }
 
@@ -241,7 +251,11 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr || newFileName == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', newFileName='%p')", __FUNCTION__, kodiBase, filename, newFileName);
+    CLog::Log(
+        LOGERROR,
+        "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}', newFileName='{}')",
+        __FUNCTION__, kodiBase, static_cast<const void*>(filename),
+        static_cast<const void*>(newFileName));
     return false;
   }
 
@@ -253,7 +267,9 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr || dest == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', dest='%p')", __FUNCTION__, kodiBase, filename, dest);
+    CLog::Log(
+        LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}', dest='{}')",
+        __FUNCTION__, kodiBase, static_cast<const void*>(filename), static_cast<const void*>(dest));
     return false;
   }
 
@@ -265,7 +281,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{})",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return nullptr;
   }
 
@@ -279,7 +296,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{})",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return nullptr;
   }
 
@@ -295,7 +313,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{})",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return nullptr;
   }
 
@@ -309,7 +328,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || path == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p)", __FUNCTION__, kodiBase, path);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', path='{})",
+              __FUNCTION__, kodiBase, static_cast<const void*>(path));
     return nullptr;
   }
 
@@ -323,7 +343,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || strSource == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', strSource='%p)", __FUNCTION__, kodiBase, strSource);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', strSource='{})",
+              __FUNCTION__, kodiBase, static_cast<const void*>(strSource));
     return nullptr;
   }
 
@@ -337,7 +358,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return nullptr;
   }
 
@@ -354,7 +376,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || filename == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', filename='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(filename));
     return nullptr;
   }
 
@@ -371,7 +394,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr || ptr == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', ptr='%p')", __FUNCTION__, kodiBase, file, ptr);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}', ptr='{}')",
+              __FUNCTION__, kodiBase, file, ptr);
     return -1;
   }
 
@@ -381,9 +405,11 @@
 bool Interface_Filesystem::read_file_string(void* kodiBase, void* file, char *szLine, int lineLength)
 {
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || file == nullptr)
+  if (addon == nullptr || file == nullptr || szLine == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR,
+              "Interface_Filesystem::{} - invalid data (addon='{}', file='{}', szLine=='{}')",
+              __FUNCTION__, kodiBase, file, static_cast<void*>(szLine));
     return false;
   }
 
@@ -395,7 +421,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr || ptr == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', ptr='%p')", __FUNCTION__, kodiBase, file, ptr);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}', ptr='{}')",
+              __FUNCTION__, kodiBase, file, ptr);
     return -1;
   }
 
@@ -407,7 +434,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return;
   }
 
@@ -419,7 +447,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return -1;
   }
 
@@ -431,7 +460,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return -1;
   }
 
@@ -443,7 +473,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return -1;
   }
 
@@ -455,7 +486,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return -1;
   }
 
@@ -467,7 +499,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return 0.0f;
   }
 
@@ -479,7 +512,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return;
   }
 
@@ -492,19 +526,25 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_VFS::%s - invalid data (addon='%p', file='%p)", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_VFS::{} - invalid data (addon='{}', file='{})", __FUNCTION__,
+              kodiBase, file);
     return -1;
   }
 
   return static_cast<CFile*>(file)->GetChunkSize();
 }
 
-char** Interface_Filesystem::get_property_values(void* kodiBase, void* file, int type, const char *name, int *numValues)
+char** Interface_Filesystem::get_property_values(
+    void* kodiBase, void* file, int type, const char* name, int* numValues)
 {
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (addon == nullptr || file == nullptr || name == nullptr)
+  if (addon == nullptr || file == nullptr || name == nullptr || numValues == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR,
+              "Interface_Filesystem::{} - invalid data (addon='{}', file='{}', name='{}', "
+              "numValues='{}')",
+              __FUNCTION__, kodiBase, file, static_cast<const void*>(name),
+              static_cast<void*>(numValues));
     return nullptr;
   }
 
@@ -530,7 +570,8 @@
     internalType = XFILE::FILE_PROPERTY_EFFECTIVE_URL;
     break;
   default:
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return nullptr;
   };
   std::vector<std::string> values = static_cast<CFile*>(file)->GetPropertyValues(internalType, name);
@@ -548,7 +589,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || url == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, kodiBase, url);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', url='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(url));
     return nullptr;
   }
 
@@ -565,7 +607,11 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr || name == nullptr || value == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', name='%p', value='%p')", __FUNCTION__, kodiBase, file, name, value);
+    CLog::Log(
+        LOGERROR,
+        "Interface_Filesystem::{} - invalid data (addon='{}', file='{}', name='{}', value='{}')",
+        __FUNCTION__, kodiBase, file, static_cast<const void*>(name),
+        static_cast<const void*>(value));
     return false;
   }
 
@@ -597,7 +643,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || file == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
+    CLog::Log(LOGERROR, "Interface_Filesystem::{} - invalid data (addon='{}', file='{}')",
+              __FUNCTION__, kodiBase, file);
     return false;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/Filesystem.h Changed

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "FileItem.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/Filesystem.h"
 
 extern "C"
 {
@@ -19,60 +19,66 @@
 namespace ADDON
 {
 
-  struct Interface_Filesystem
-  {
-    static void Init(AddonGlobalInterface* addonInterface);
-    static void DeInit(AddonGlobalInterface* addonInterface);
+struct Interface_Filesystem
+{
+  static void Init(AddonGlobalInterface* addonInterface);
+  static void DeInit(AddonGlobalInterface* addonInterface);
 
-    /*!
-     * @brief callback functions from add-on to kodi
-     *
-     * @note For add of new functions use the "_" style to identify direct a
-     * add-on callback function. Everything with CamelCase is only for the
-     * usage in Kodi only.
-     *
-     * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
-     * class.
-     */
-    //@{
-    static bool can_open_directory(void* kodiBase, const char* url);
-    static bool create_directory(void* kodiBase, const char *path);
-    static bool directory_exists(void* kodiBase, const char *path);
-    static bool remove_directory(void* kodiBase, const char *path);
-    static bool get_directory(void* kodiBase, const char* path, const char* mask, VFSDirEntry** items, unsigned int* num_items);
-    static void free_directory(void* kodiBase, VFSDirEntry* items, unsigned int num_items);
+  /*!
+   * @brief callback functions from add-on to kodi
+   *
+   * @note For add of new functions use the "_" style to identify direct a
+   * add-on callback function. Everything with CamelCase is only for the
+   * usage in Kodi only.
+   *
+   * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
+   * class.
+   */
+  //@{
+  static bool can_open_directory(void* kodiBase, const char* url);
+  static bool create_directory(void* kodiBase, const char* path);
+  static bool directory_exists(void* kodiBase, const char* path);
+  static bool remove_directory(void* kodiBase, const char* path);
+  static bool get_directory(void* kodiBase,
+                            const char* path,
+                            const char* mask,
+                            VFSDirEntry** items,
+                            unsigned int* num_items);
+  static void free_directory(void* kodiBase, VFSDirEntry* items, unsigned int num_items);
 
-    static bool file_exists(void* kodiBase, const char *filename, bool useCache);
-    static int stat_file(void* kodiBase, const char *filename, struct __stat64* buffer);
-    static bool delete_file(void* kodiBase, const char *filename);
-    static bool rename_file(void* kodiBase, const char *filename, const char *newFileName);
-    static bool copy_file(void* kodiBase, const char *filename, const char *dest);
-    static char* get_file_md5(void* kodiBase, const char* filename);
-    static char* get_cache_thumb_name(void* kodiBase, const char* filename);
-    static char* make_legal_filename(void* kodiBase, const char* filename);
-    static char* make_legal_path(void* kodiBase, const char* path);
-    static char* translate_special_protocol(void* kodiBase, const char *strSource);
+  static bool file_exists(void* kodiBase, const char* filename, bool useCache);
+  static int stat_file(void* kodiBase, const char* filename, struct __stat64* buffer);
+  static bool delete_file(void* kodiBase, const char* filename);
+  static bool rename_file(void* kodiBase, const char* filename, const char* newFileName);
+  static bool copy_file(void* kodiBase, const char* filename, const char* dest);
+  static char* get_file_md5(void* kodiBase, const char* filename);
+  static char* get_cache_thumb_name(void* kodiBase, const char* filename);
+  static char* make_legal_filename(void* kodiBase, const char* filename);
+  static char* make_legal_path(void* kodiBase, const char* path);
+  static char* translate_special_protocol(void* kodiBase, const char* strSource);
 
-    static void* open_file(void* kodiBase, const char* filename, unsigned int flags);
-    static void* open_file_for_write(void* kodiBase, const char* filename, bool overwrite);
-    static ssize_t read_file(void* kodiBase, void* file, void* ptr, size_t size);
-    static bool read_file_string(void* kodiBase, void* file, char *szLine, int lineLength);
-    static ssize_t write_file(void* kodiBase, void* file, const void* ptr, size_t size);
-    static void flush_file(void* kodiBase, void* file);
-    static int64_t seek_file(void* kodiBase, void* file, int64_t position, int whence);
-    static int truncate_file(void* kodiBase, void* file, int64_t size);
-    static int64_t get_file_position(void* kodiBase, void* file);
-    static int64_t get_file_length(void* kodiBase, void* file);
-    static double get_file_download_speed(void* kodiBase, void* file);
-    static void close_file(void* kodiBase, void* file);
-    static int get_file_chunk_size(void* kodiBase, void* file);
-    static char** get_property_values(void* kodiBase, void* file, int type, const char *name, int *numValues);
+  static void* open_file(void* kodiBase, const char* filename, unsigned int flags);
+  static void* open_file_for_write(void* kodiBase, const char* filename, bool overwrite);
+  static ssize_t read_file(void* kodiBase, void* file, void* ptr, size_t size);
+  static bool read_file_string(void* kodiBase, void* file, char* szLine, int lineLength);
+  static ssize_t write_file(void* kodiBase, void* file, const void* ptr, size_t size);
+  static void flush_file(void* kodiBase, void* file);
+  static int64_t seek_file(void* kodiBase, void* file, int64_t position, int whence);
+  static int truncate_file(void* kodiBase, void* file, int64_t size);
+  static int64_t get_file_position(void* kodiBase, void* file);
+  static int64_t get_file_length(void* kodiBase, void* file);
+  static double get_file_download_speed(void* kodiBase, void* file);
+  static void close_file(void* kodiBase, void* file);
+  static int get_file_chunk_size(void* kodiBase, void* file);
+  static char** get_property_values(
+      void* kodiBase, void* file, int type, const char* name, int* numValues);
 
-    static void* curl_create(void* kodiBase, const char* url);
-    static bool curl_add_option(void* kodiBase, void* file, int type, const char* name, const char* value);
-    static bool curl_open(void* kodiBase, void* file, unsigned int flags);
-    //@}
-  };
+  static void* curl_create(void* kodiBase, const char* url);
+  static bool curl_add_option(
+      void* kodiBase, void* file, int type, const char* name, const char* value);
+  static bool curl_open(void* kodiBase, void* file, unsigned int flags);
+  //@}
+};
 
 } /* namespace ADDON */
 } /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI Deleted

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/AddonCallbacksGUI.cpp Deleted

@@ -1,1863 +0,0 @@
-/*
- *  Copyright (C) 2012-2018 Team Kodi
- *  Copyright (C) 2015-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "AddonCallbacksGUI.h"
-
-#include "AddonGUIRenderingControl.h"
-#include "AddonGUIWindow.h"
-#include "Application.h"
-#include "FileItem.h"
-#include "ServiceBroker.h"
-#include "addons/Addon.h"
-#include "addons/Skin.h"
-#include "dialogs/GUIDialogFileBrowser.h"
-#include "dialogs/GUIDialogNumeric.h"
-#include "dialogs/GUIDialogSelect.h"
-#include "dialogs/GUIDialogTextViewer.h"
-#include "filesystem/File.h"
-#include "guilib/GUIComponent.h"
-#include "guilib/GUIKeyboardFactory.h"
-#include "guilib/GUIProgressControl.h"
-#include "guilib/GUIRadioButtonControl.h"
-#include "guilib/GUIRenderingControl.h"
-#include "guilib/GUISettingsSliderControl.h"
-#include "guilib/GUISpinControlEx.h"
-#include "guilib/GUIWindowManager.h"
-#include "messaging/ApplicationMessenger.h"
-#include "messaging/helpers/DialogHelper.h"
-#include "messaging/helpers/DialogOKHelper.h"
-#include "utils/StringUtils.h"
-#include "utils/URIUtils.h"
-#include "utils/Variant.h"
-#include "utils/log.h"
-
-using namespace KODI::MESSAGING;
-using KODI::MESSAGING::HELPERS::DialogResponse;
-
-using namespace ADDON;
-
-namespace KodiAPI
-{
-namespace GUI
-{
-
-static int iXBMCGUILockRef = 0;
-
-CAddonCallbacksGUI::CAddonCallbacksGUI(CAddon* addon)
-  : m_addon(addon),
-    m_callbacks(new CB_GUILib)
-{
-  /* GUI Helper functions */
-  m_callbacks->Lock                           = CAddonCallbacksGUI::Lock;
-  m_callbacks->Unlock                         = CAddonCallbacksGUI::Unlock;
-  m_callbacks->GetScreenHeight                = CAddonCallbacksGUI::GetScreenHeight;
-  m_callbacks->GetScreenWidth                 = CAddonCallbacksGUI::GetScreenWidth;
-  m_callbacks->GetVideoResolution             = CAddonCallbacksGUI::GetVideoResolution;
-  m_callbacks->Window_New                     = CAddonCallbacksGUI::Window_New;
-  m_callbacks->Window_Delete                  = CAddonCallbacksGUI::Window_Delete;
-  m_callbacks->Window_SetCallbacks            = CAddonCallbacksGUI::Window_SetCallbacks;
-  m_callbacks->Window_Show                    = CAddonCallbacksGUI::Window_Show;
-  m_callbacks->Window_Close                   = CAddonCallbacksGUI::Window_Close;
-  m_callbacks->Window_DoModal                 = CAddonCallbacksGUI::Window_DoModal;
-  m_callbacks->Window_SetFocusId              = CAddonCallbacksGUI::Window_SetFocusId;
-  m_callbacks->Window_GetFocusId              = CAddonCallbacksGUI::Window_GetFocusId;
-  m_callbacks->Window_SetCoordinateResolution = CAddonCallbacksGUI::Window_SetCoordinateResolution;
-  m_callbacks->Window_SetProperty             = CAddonCallbacksGUI::Window_SetProperty;
-  m_callbacks->Window_SetPropertyInt          = CAddonCallbacksGUI::Window_SetPropertyInt;
-  m_callbacks->Window_SetPropertyBool         = CAddonCallbacksGUI::Window_SetPropertyBool;
-  m_callbacks->Window_SetPropertyDouble       = CAddonCallbacksGUI::Window_SetPropertyDouble;
-  m_callbacks->Window_GetProperty             = CAddonCallbacksGUI::Window_GetProperty;
-  m_callbacks->Window_GetPropertyInt          = CAddonCallbacksGUI::Window_GetPropertyInt;
-  m_callbacks->Window_GetPropertyBool         = CAddonCallbacksGUI::Window_GetPropertyBool;
-  m_callbacks->Window_GetPropertyDouble       = CAddonCallbacksGUI::Window_GetPropertyDouble;
-  m_callbacks->Window_ClearProperties         = CAddonCallbacksGUI::Window_ClearProperties;
-
-  m_callbacks->Window_GetListSize             = CAddonCallbacksGUI::Window_GetListSize;
-  m_callbacks->Window_ClearList               = CAddonCallbacksGUI::Window_ClearList;
-  m_callbacks->Window_AddItem                 = CAddonCallbacksGUI::Window_AddItem;
-  m_callbacks->Window_AddStringItem           = CAddonCallbacksGUI::Window_AddStringItem;
-  m_callbacks->Window_RemoveItem              = CAddonCallbacksGUI::Window_RemoveItem;
-  m_callbacks->Window_GetListItem             = CAddonCallbacksGUI::Window_GetListItem;
-  m_callbacks->Window_SetCurrentListPosition  = CAddonCallbacksGUI::Window_SetCurrentListPosition;
-  m_callbacks->Window_GetCurrentListPosition  = CAddonCallbacksGUI::Window_GetCurrentListPosition;
-
-  m_callbacks->Window_GetControl_Spin         = CAddonCallbacksGUI::Window_GetControl_Spin;
-  m_callbacks->Window_GetControl_Button       = CAddonCallbacksGUI::Window_GetControl_Button;
-  m_callbacks->Window_GetControl_RadioButton  = CAddonCallbacksGUI::Window_GetControl_RadioButton;
-  m_callbacks->Window_GetControl_Edit         = CAddonCallbacksGUI::Window_GetControl_Edit;
-  m_callbacks->Window_GetControl_Progress     = CAddonCallbacksGUI::Window_GetControl_Progress;
-  m_callbacks->Window_GetControl_RenderAddon  = CAddonCallbacksGUI::Window_GetControl_RenderAddon;
-  m_callbacks->Window_GetControl_Slider       = CAddonCallbacksGUI::Window_GetControl_Slider;
-  m_callbacks->Window_GetControl_SettingsSlider= CAddonCallbacksGUI::Window_GetControl_SettingsSlider;
-
-  m_callbacks->Window_SetControlLabel         = CAddonCallbacksGUI::Window_SetControlLabel;
-  m_callbacks->Window_MarkDirtyRegion         = CAddonCallbacksGUI::Window_MarkDirtyRegion;
-
-  m_callbacks->Control_Spin_SetVisible        = CAddonCallbacksGUI::Control_Spin_SetVisible;
-  m_callbacks->Control_Spin_SetText           = CAddonCallbacksGUI::Control_Spin_SetText;
-  m_callbacks->Control_Spin_Clear             = CAddonCallbacksGUI::Control_Spin_Clear;
-  m_callbacks->Control_Spin_AddLabel          = CAddonCallbacksGUI::Control_Spin_AddLabel;
-  m_callbacks->Control_Spin_GetValue          = CAddonCallbacksGUI::Control_Spin_GetValue;
-  m_callbacks->Control_Spin_SetValue          = CAddonCallbacksGUI::Control_Spin_SetValue;
-
-  m_callbacks->Control_RadioButton_SetVisible = CAddonCallbacksGUI::Control_RadioButton_SetVisible;
-  m_callbacks->Control_RadioButton_SetText    = CAddonCallbacksGUI::Control_RadioButton_SetText;
-  m_callbacks->Control_RadioButton_SetSelected= CAddonCallbacksGUI::Control_RadioButton_SetSelected;
-  m_callbacks->Control_RadioButton_IsSelected = CAddonCallbacksGUI::Control_RadioButton_IsSelected;
-
-  m_callbacks->Control_Progress_SetPercentage = CAddonCallbacksGUI::Control_Progress_SetPercentage;
-  m_callbacks->Control_Progress_GetPercentage = CAddonCallbacksGUI::Control_Progress_GetPercentage;
-  m_callbacks->Control_Progress_SetInfo       = CAddonCallbacksGUI::Control_Progress_SetInfo;
-  m_callbacks->Control_Progress_GetInfo       = CAddonCallbacksGUI::Control_Progress_GetInfo;
-  m_callbacks->Control_Progress_GetDescription= CAddonCallbacksGUI::Control_Progress_GetDescription;
-
-  m_callbacks->ListItem_Create                = CAddonCallbacksGUI::ListItem_Create;
-  m_callbacks->ListItem_GetLabel              = CAddonCallbacksGUI::ListItem_GetLabel;
-  m_callbacks->ListItem_SetLabel              = CAddonCallbacksGUI::ListItem_SetLabel;
-  m_callbacks->ListItem_GetLabel2             = CAddonCallbacksGUI::ListItem_GetLabel2;
-  m_callbacks->ListItem_SetLabel2             = CAddonCallbacksGUI::ListItem_SetLabel2;
-  m_callbacks->ListItem_SetInfo               = CAddonCallbacksGUI::ListItem_SetInfo;
-  m_callbacks->ListItem_SetProperty           = CAddonCallbacksGUI::ListItem_SetProperty;
-  m_callbacks->ListItem_GetProperty           = CAddonCallbacksGUI::ListItem_GetProperty;
-  m_callbacks->ListItem_SetPath               = CAddonCallbacksGUI::ListItem_SetPath;
-
-  m_callbacks->RenderAddon_SetCallbacks       = CAddonCallbacksGUI::RenderAddon_SetCallbacks;
-  m_callbacks->RenderAddon_Delete             = CAddonCallbacksGUI::RenderAddon_Delete;
-
-  m_callbacks->Control_Slider_SetVisible                    = CAddonCallbacksGUI::Control_Slider_SetVisible;
-  m_callbacks->Control_Slider_GetDescription                = CAddonCallbacksGUI::Control_Slider_GetDescription;
-  m_callbacks->Control_Slider_SetIntRange                   = CAddonCallbacksGUI::Control_Slider_SetIntRange;
-  m_callbacks->Control_Slider_SetIntValue                   = CAddonCallbacksGUI::Control_Slider_SetIntValue;
-  m_callbacks->Control_Slider_GetIntValue                   = CAddonCallbacksGUI::Control_Slider_GetIntValue;
-  m_callbacks->Control_Slider_SetIntInterval                = CAddonCallbacksGUI::Control_Slider_SetIntInterval;
-  m_callbacks->Control_Slider_SetPercentage                 = CAddonCallbacksGUI::Control_Slider_SetPercentage;
-  m_callbacks->Control_Slider_GetPercentage                 = CAddonCallbacksGUI::Control_Slider_GetPercentage;
-  m_callbacks->Control_Slider_SetFloatRange                 = CAddonCallbacksGUI::Control_Slider_SetFloatRange;
-  m_callbacks->Control_Slider_SetFloatValue                 = CAddonCallbacksGUI::Control_Slider_SetFloatValue;
-  m_callbacks->Control_Slider_GetFloatValue                 = CAddonCallbacksGUI::Control_Slider_GetFloatValue;
-  m_callbacks->Control_Slider_SetFloatInterval              = CAddonCallbacksGUI::Control_Slider_SetFloatInterval;
-
-  m_callbacks->Control_SettingsSlider_SetVisible            = CAddonCallbacksGUI::Control_SettingsSlider_SetVisible;
-  m_callbacks->Control_SettingsSlider_SetText               = CAddonCallbacksGUI::Control_SettingsSlider_SetText;
-  m_callbacks->Control_SettingsSlider_GetDescription        = CAddonCallbacksGUI::Control_SettingsSlider_GetDescription;
-  m_callbacks->Control_SettingsSlider_SetIntRange           = CAddonCallbacksGUI::Control_SettingsSlider_SetIntRange;
-  m_callbacks->Control_SettingsSlider_SetIntValue           = CAddonCallbacksGUI::Control_SettingsSlider_SetIntValue;
-  m_callbacks->Control_SettingsSlider_GetIntValue           = CAddonCallbacksGUI::Control_SettingsSlider_GetIntValue;
-  m_callbacks->Control_SettingsSlider_SetIntInterval        = CAddonCallbacksGUI::Control_SettingsSlider_SetIntInterval;
-  m_callbacks->Control_SettingsSlider_SetPercentage         = CAddonCallbacksGUI::Control_SettingsSlider_SetPercentage;
-  m_callbacks->Control_SettingsSlider_GetPercentage         = CAddonCallbacksGUI::Control_SettingsSlider_GetPercentage;
-  m_callbacks->Control_SettingsSlider_SetFloatRange         = CAddonCallbacksGUI::Control_SettingsSlider_SetFloatRange;
-  m_callbacks->Control_SettingsSlider_SetFloatValue         = CAddonCallbacksGUI::Control_SettingsSlider_SetFloatValue;
-  m_callbacks->Control_SettingsSlider_GetFloatValue         = CAddonCallbacksGUI::Control_SettingsSlider_GetFloatValue;
-  m_callbacks->Control_SettingsSlider_SetFloatInterval      = CAddonCallbacksGUI::Control_SettingsSlider_SetFloatInterval;
-
-  m_callbacks->Dialog_Keyboard_ShowAndGetInputWithHead      = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInputWithHead;
-  m_callbacks->Dialog_Keyboard_ShowAndGetInput              = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInput;
-  m_callbacks->Dialog_Keyboard_ShowAndGetNewPasswordWithHead = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPasswordWithHead;
-  m_callbacks->Dialog_Keyboard_ShowAndGetNewPassword        = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPassword;
-  m_callbacks->Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead;
-  m_callbacks->Dialog_Keyboard_ShowAndVerifyNewPassword     = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPassword;
-  m_callbacks->Dialog_Keyboard_ShowAndVerifyPassword        = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyPassword;
-  m_callbacks->Dialog_Keyboard_ShowAndGetFilter             = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetFilter;
-  m_callbacks->Dialog_Keyboard_SendTextToActiveKeyboard     = CAddonCallbacksGUI::Dialog_Keyboard_SendTextToActiveKeyboard;
-  m_callbacks->Dialog_Keyboard_isKeyboardActivated          = CAddonCallbacksGUI::Dialog_Keyboard_isKeyboardActivated;
-
-  m_callbacks->Dialog_Numeric_ShowAndVerifyNewPassword      = CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyNewPassword;
-  m_callbacks->Dialog_Numeric_ShowAndVerifyPassword         = CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyPassword;
-  m_callbacks->Dialog_Numeric_ShowAndVerifyInput            = CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyInput;
-  m_callbacks->Dialog_Numeric_ShowAndGetTime                = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetTime;
-  m_callbacks->Dialog_Numeric_ShowAndGetDate                = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetDate;
-  m_callbacks->Dialog_Numeric_ShowAndGetIPAddress           = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetIPAddress;
-  m_callbacks->Dialog_Numeric_ShowAndGetNumber              = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetNumber;
-  m_callbacks->Dialog_Numeric_ShowAndGetSeconds             = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetSeconds;
-
-  m_callbacks->Dialog_FileBrowser_ShowAndGetFile            = CAddonCallbacksGUI::Dialog_FileBrowser_ShowAndGetFile;
-
-  m_callbacks->Dialog_OK_ShowAndGetInputSingleText          = CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputSingleText;
-  m_callbacks->Dialog_OK_ShowAndGetInputLineText            = CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputLineText;
-
-  m_callbacks->Dialog_YesNo_ShowAndGetInputSingleText       = CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputSingleText;
-  m_callbacks->Dialog_YesNo_ShowAndGetInputLineText         = CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineText;
-  m_callbacks->Dialog_YesNo_ShowAndGetInputLineButtonText   = CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineButtonText;
-
-  m_callbacks->Dialog_TextViewer                            = CAddonCallbacksGUI::Dialog_TextViewer;
-
-  m_callbacks->Dialog_Select                                = CAddonCallbacksGUI::Dialog_Select;
-}
-
-CAddonCallbacksGUI::~CAddonCallbacksGUI()
-{
-  delete m_callbacks;
-}
-
-void CAddonCallbacksGUI::Lock()
-{
-  if (iXBMCGUILockRef == 0)
-    CServiceBroker::GetWinSystem()->GetGfxContext().lock();
-  iXBMCGUILockRef++;
-}
-
-void CAddonCallbacksGUI::Unlock()
-{
-  if (iXBMCGUILockRef > 0)
-  {
-    iXBMCGUILockRef--;
-    if (iXBMCGUILockRef == 0)
-      CServiceBroker::GetWinSystem()->GetGfxContext().unlock();
-  }
-}
-
-int CAddonCallbacksGUI::GetScreenHeight()
-{
-  return CServiceBroker::GetWinSystem()->GetGfxContext().GetHeight();
-}
-
-int CAddonCallbacksGUI::GetScreenWidth()
-{
-  return CServiceBroker::GetWinSystem()->GetGfxContext().GetWidth();
-}
-
-int CAddonCallbacksGUI::GetVideoResolution()
-{
-  return (int)CServiceBroker::GetWinSystem()->GetGfxContext().GetVideoResolution();
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_New(void *addonData, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return NULL;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  RESOLUTION_INFO res;
-  std::string strSkinPath;
-  if (!forceFallback)
-  {
-    /* Check to see if the XML file exists in current skin. If not use
-       fallback path to find a skin for the addon */
-    strSkinPath = g_SkinInfo->GetSkinPath(xmlFilename, &res);
-    if (!XFILE::CFile::Exists(strSkinPath))
-    {
-      /* Check for the matching folder for the skin in the fallback skins folder */
-      std::string basePath = URIUtils::AddFileToFolder(
-        guiHelper->m_addon->Path(),
-        "resources",
-        "skins",
-        URIUtils::GetFileName(g_SkinInfo->Path()));
-      strSkinPath = g_SkinInfo->GetSkinPath(xmlFilename, &res, basePath);
-      if (!XFILE::CFile::Exists(strSkinPath))
-      {
-        /* Finally fallback to the DefaultSkin as it didn't exist in either the
-           XBMC Skin folder or the fallback skin folder */
-        forceFallback = true;
-      }
-    }
-  }
-
-  if (forceFallback)
-  {
-    //FIXME make this static method of current skin?
-    std::string str("none");
-    AddonInfoPtr addonInfo = std::make_shared<CAddonInfo>(str, ADDON_SKIN);
-    addonInfo->SetPath(URIUtils::AddFileToFolder(
-      guiHelper->m_addon->Path(),
-      "resources",
-      "skins",
-      defaultSkin));
-
-    std::shared_ptr<CSkinInfo> skinInfo = std::make_shared<ADDON::CSkinInfo>(addonInfo);
-    skinInfo->Start();
-    strSkinPath = skinInfo->GetSkinPath(xmlFilename, &res, addonInfo->Path());
-
-    if (!XFILE::CFile::Exists(strSkinPath))
-    {
-      CLog::Log(LOGERROR, "Window_New: %s/%s - XML File '%s' for Window is missing, contact Developer '%s' of this AddOn", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str(), strSkinPath.c_str(), guiHelper->m_addon->Author().c_str());
-      return NULL;
-    }
-  }
-
-  // window id's 14000 - 14100 are reserved for addons
-  // get first window id that is not in use
-  int id = WINDOW_ADDON_START;
-  // if window 14099 is in use it means addon can't create more windows
-  Lock();
-  if (CServiceBroker::GetGUI()->GetWindowManager().GetWindow(WINDOW_ADDON_END))
-  {
-    Unlock();
-    CLog::Log(LOGERROR, "Window_New: %s/%s - maximum number of windows reached", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return NULL;
-  }
-  while(id < WINDOW_ADDON_END && CServiceBroker::GetGUI()->GetWindowManager().GetWindow(id) != NULL) id++;
-  Unlock();
-
-  CGUIWindow *window;
-  if (!asDialog)
-    window = new CGUIAddonWindow(id, strSkinPath, guiHelper->m_addon);
-  else
-    window = new CGUIAddonWindowDialog(id, strSkinPath, guiHelper->m_addon);
-
-  Lock();
-  CServiceBroker::GetGUI()->GetWindowManager().Add(window);
-  Unlock();
-
-  window->SetCoordsRes(res);
-
-  return window;
-}
-
-void CAddonCallbacksGUI::Window_Delete(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_Show: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return;
-
-  Lock();
-  // first change to an existing window
-  if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == pAddonWindow->m_iWindowId && !g_application.m_bStop)
-  {
-    if(CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iOldWindowId))
-      CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(pAddonWindow->m_iOldWindowId);
-    else // old window does not exist anymore, switch to home
-      CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(WINDOW_HOME);
-  }
-  // Free any window properties
-  pAddonWindow->ClearProperties();
-  // free the window's resources and unload it (free all guicontrols)
-  pAddonWindow->FreeResources(true);
-
-  CServiceBroker::GetGUI()->GetWindowManager().Remove(pAddonWindow->GetID());
-  delete pAddonWindow;
-  Unlock();
-}
-
-void CAddonCallbacksGUI::Window_SetCallbacks(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*initCB)(GUIHANDLE), bool (*clickCB)(GUIHANDLE, int), bool (*focusCB)(GUIHANDLE, int), bool (*onActionCB)(GUIHANDLE handle, int))
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  pAddonWindow->m_clientHandle  = clienthandle;
-  pAddonWindow->CBOnInit        = initCB;
-  pAddonWindow->CBOnClick       = clickCB;
-  pAddonWindow->CBOnFocus       = focusCB;
-  pAddonWindow->CBOnAction      = onActionCB;
-  Unlock();
-}
-
-bool CAddonCallbacksGUI::Window_Show(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return false;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_Show: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return false;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return false;
-
-  if (pAddonWindow->m_iOldWindowId != pAddonWindow->m_iWindowId && pAddonWindow->m_iWindowId != CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow())
-    pAddonWindow->m_iOldWindowId = CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow();
-
-  Lock();
-  if (pAddonWindow->IsDialog())
-    static_cast<CGUIAddonWindowDialog*>(pAddonWindow)->Show();
-  else
-    CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(pAddonWindow->m_iWindowId);
-  Unlock();
-
-  return true;
-}
-
-bool CAddonCallbacksGUI::Window_Close(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return false;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_Close: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return false;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return false;
-
-  pAddonWindow->m_bModal = false;
-  if (pAddonWindow->IsDialog())
-    static_cast<CGUIAddonWindowDialog*>(pAddonWindow)->PulseActionEvent();
-  else
-    pAddonWindow->PulseActionEvent();
-
-  Lock();
-  // if it's a dialog, we have to close it a bit different
-  if (pAddonWindow->IsDialog())
-    static_cast<CGUIAddonWindowDialog*>(pAddonWindow)->Show(false);
-  else
-    CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(pAddonWindow->m_iOldWindowId);
-  pAddonWindow->m_iOldWindowId = 0;
-
-  Unlock();
-
-  return true;
-}
-
-bool CAddonCallbacksGUI::Window_DoModal(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return false;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_DoModal: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return false;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return false;
-
-  pAddonWindow->m_bModal = true;
-
-  if (pAddonWindow->m_iWindowId != CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow())
-    Window_Show(addonData, handle);
-
-  return true;
-}
-
-bool CAddonCallbacksGUI::Window_SetFocusId(void *addonData, GUIHANDLE handle, int iControlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return false;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_SetFocusId: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return false;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return false;
-
-  if(!pWindow->GetControl(iControlId))
-  {
-    CLog::Log(LOGERROR, "Window_SetFocusId: %s/%s - Control does not exist in window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return false;
-  }
-
-  Lock();
-  CGUIMessage msg = CGUIMessage(GUI_MSG_SETFOCUS, pAddonWindow->m_iWindowId, iControlId);
-  pWindow->OnMessage(msg);
-  Unlock();
-
-  return true;
-}
-
-int CAddonCallbacksGUI::Window_GetFocusId(void *addonData, GUIHANDLE handle)
-{
-  int iControlId = -1;
-
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return iControlId;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_GetFocusId: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return iControlId;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return iControlId;
-
-  Lock();
-  iControlId = pWindow->GetFocusedControlID();
-  Unlock();
-
-  if (iControlId == -1)
-  {
-    CLog::Log(LOGERROR, "Window_GetFocusId: %s/%s - No control in this window has focus", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return iControlId;
-  }
-
-  return iControlId;
-}
-
-bool CAddonCallbacksGUI::Window_SetCoordinateResolution(void *addonData, GUIHANDLE handle, int res)
-{
-  CLog::Log(LOGERROR, "SetCoordinateResolution: not implemented");
-  return false;
-}
-
-void CAddonCallbacksGUI::Window_SetProperty(void *addonData, GUIHANDLE handle, const char *key, const char *value)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key || !value)
-  {
-    CLog::Log(LOGERROR, "Window_SetProperty: %s/%s - No Window or NULL key or value", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  pWindow->SetProperty(lowerKey, value);
-  Unlock();
-}
-
-void CAddonCallbacksGUI::Window_SetPropertyInt(void *addonData, GUIHANDLE handle, const char *key, int value)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_SetPropertyInt: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  pWindow->SetProperty(lowerKey, value);
-  Unlock();
-}
-
-void CAddonCallbacksGUI::Window_SetPropertyBool(void *addonData, GUIHANDLE handle, const char *key, bool value)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_SetPropertyBool: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  pWindow->SetProperty(lowerKey, value);
-  Unlock();
-}
-
-void CAddonCallbacksGUI::Window_SetPropertyDouble(void *addonData, GUIHANDLE handle, const char *key, double value)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_SetPropertyDouble: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  pWindow->SetProperty(lowerKey, value);
-  Unlock();
-}
-
-const char* CAddonCallbacksGUI::Window_GetProperty(void *addonData, GUIHANDLE handle, const char *key)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return NULL;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_GetProperty: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return NULL;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return NULL;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  std::string value = pWindow->GetProperty(lowerKey).asString();
-  Unlock();
-
-  return strdup(value.c_str());
-}
-
-int CAddonCallbacksGUI::Window_GetPropertyInt(void *addonData, GUIHANDLE handle, const char *key)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return -1;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_GetPropertyInt: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return -1;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return -1;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  int value = (int)pWindow->GetProperty(lowerKey).asInteger();
-  Unlock();
-
-  return value;
-}
-
-bool CAddonCallbacksGUI::Window_GetPropertyBool(void *addonData, GUIHANDLE handle, const char *key)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return false;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_GetPropertyBool: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return false;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return false;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  bool value = pWindow->GetProperty(lowerKey).asBoolean();
-  Unlock();
-
-  return value;
-}
-
-double CAddonCallbacksGUI::Window_GetPropertyDouble(void *addonData, GUIHANDLE handle, const char *key)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return 0.0;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle || !key)
-  {
-    CLog::Log(LOGERROR, "Window_GetPropertyDouble: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return 0.0;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return 0.0;
-
-  std::string lowerKey = key;
-  StringUtils::ToLower(lowerKey);
-
-  Lock();
-  double value = pWindow->GetProperty(lowerKey).asDouble();
-  Unlock();
-
-  return value;
-}
-
-void CAddonCallbacksGUI::Window_ClearProperties(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-
-  if (!handle)
-  {
-    CLog::Log(LOGERROR, "Window_ClearProperties: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return;
-  }
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
-  if (!pWindow)
-    return;
-
-  Lock();
-  pWindow->ClearProperties();
-  Unlock();
-}
-
-int CAddonCallbacksGUI::Window_GetListSize(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return -1;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  int listSize = pAddonWindow->GetListSize();
-  Unlock();
-
-  return listSize;
-}
-
-void CAddonCallbacksGUI::Window_ClearList(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  pAddonWindow->ClearList();
-  Unlock();
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_AddItem(void *addonData, GUIHANDLE handle, GUIHANDLE item, int itemPosition)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle || !item)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CFileItemPtr pItem(static_cast<CFileItem*>(item));
-  Lock();
-  pAddonWindow->AddItem(pItem, itemPosition);
-  Unlock();
-
-  return item;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_AddStringItem(void *addonData, GUIHANDLE handle, const char *itemName, int itemPosition)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle || !itemName)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CFileItemPtr item(new CFileItem(itemName));
-  Lock();
-  pAddonWindow->AddItem(item, itemPosition);
-  Unlock();
-
-  return item.get();
-}
-
-void CAddonCallbacksGUI::Window_RemoveItem(void *addonData, GUIHANDLE handle, int itemPosition)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  pAddonWindow->RemoveItem(itemPosition);
-  Unlock();
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetListItem(void *addonData, GUIHANDLE handle, int listPos)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  CFileItemPtr fi = pAddonWindow->GetListItem(listPos);
-  if (fi == NULL)
-  {
-    Unlock();
-    CLog::Log(LOGERROR, "Window_GetListItem: %s/%s - Index out of range", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
-    return NULL;
-  }
-  Unlock();
-
-  return fi.get();
-}
-
-void CAddonCallbacksGUI::Window_SetCurrentListPosition(void *addonData, GUIHANDLE handle, int listPos)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  pAddonWindow->SetCurrentListPosition(listPos);
-  Unlock();
-}
-
-int CAddonCallbacksGUI::Window_GetCurrentListPosition(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return -1;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  Lock();
-  int listPos = pAddonWindow->GetCurrentListPosition();
-  Unlock();
-
-  return listPos;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Spin(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_SPINEX)
-    return NULL;
-
-  return pGUIControl;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Button(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_BUTTON)
-    return NULL;
-
-  return pGUIControl;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_RadioButton(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_RADIO)
-    return NULL;
-
-  return pGUIControl;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Edit(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_EDIT)
-    return NULL;
-
-  return pGUIControl;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Progress(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_PROGRESS)
-    return NULL;
-
-  return pGUIControl;
-}
-
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_RenderAddon(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_RENDERADDON)
-    return NULL;
-
-  CGUIAddonRenderingControl *pProxyControl;
-  pProxyControl = new CGUIAddonRenderingControl(static_cast<CGUIRenderingControl*>(pGUIControl));
-  return pProxyControl;
-}
-
-void CAddonCallbacksGUI::Window_SetControlLabel(void *addonData, GUIHANDLE handle, int controlId, const char *label)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  CGUIMessage msg(GUI_MSG_LABEL_SET, pAddonWindow->m_iWindowId, controlId);
-  msg.SetLabel(label);
-  pAddonWindow->OnMessage(msg);
-}
-
-void CAddonCallbacksGUI::Window_MarkDirtyRegion(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-
-  pAddonWindow->MarkDirtyRegion();
-}
-
-void CAddonCallbacksGUI::Control_Spin_SetVisible(void *addonData, GUIHANDLE spinhandle, bool yesNo)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !spinhandle)
-    return;
-
-  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
-  pSpin->SetVisible(yesNo);
-}
-
-void CAddonCallbacksGUI::Control_Spin_SetText(void *addonData, GUIHANDLE spinhandle, const char *label)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !spinhandle)
-    return;
-
-  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
-  pSpin->SetText(label);
-}
-
-void CAddonCallbacksGUI::Control_Spin_Clear(void *addonData, GUIHANDLE spinhandle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !spinhandle)
-    return;
-
-  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
-  pSpin->Clear();
-}
-
-void CAddonCallbacksGUI::Control_Spin_AddLabel(void *addonData, GUIHANDLE spinhandle, const char *label, int iValue)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !spinhandle)
-    return;
-
-  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
-  pSpin->AddLabel(label, iValue);
-}
-
-int CAddonCallbacksGUI::Control_Spin_GetValue(void *addonData, GUIHANDLE spinhandle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !spinhandle)
-    return -1;
-
-  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
-  return pSpin->GetValue();
-}
-
-void CAddonCallbacksGUI::Control_Spin_SetValue(void *addonData, GUIHANDLE spinhandle, int iValue)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !spinhandle)
-    return;
-
-  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
-  pSpin->SetValue(iValue);
-}
-
-void CAddonCallbacksGUI::Control_RadioButton_SetVisible(void *addonData, GUIHANDLE handle, bool yesNo)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
-  pRadioButton->SetVisible(yesNo);
-}
-
-void CAddonCallbacksGUI::Control_RadioButton_SetText(void *addonData, GUIHANDLE handle, const char *label)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
-  pRadioButton->SetLabel(label);
-}
-
-void CAddonCallbacksGUI::Control_RadioButton_SetSelected(void *addonData, GUIHANDLE handle, bool yesNo)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
-  pRadioButton->SetSelected(yesNo);
-}
-
-bool CAddonCallbacksGUI::Control_RadioButton_IsSelected(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return false;
-
-  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
-  return pRadioButton->IsSelected();
-}
-
-void CAddonCallbacksGUI::Control_Progress_SetPercentage(void *addonData, GUIHANDLE handle, float fPercent)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
-  pControl->SetPercentage(fPercent);
-}
-
-float CAddonCallbacksGUI::Control_Progress_GetPercentage(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0.0;
-
-  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
-  return pControl->GetPercentage();
-}
-
-void CAddonCallbacksGUI::Control_Progress_SetInfo(void *addonData, GUIHANDLE handle, int iInfo)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
-  pControl->SetInfo(iInfo);
-}
-
-int CAddonCallbacksGUI::Control_Progress_GetInfo(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return -1;
-
-  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
-  return pControl->GetInfo();
-}
-
-const char* CAddonCallbacksGUI::Control_Progress_GetDescription(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
-  std::string string = pControl->GetDescription();
-
-  char *buffer = (char*) malloc (string.length()+1);
-  strcpy(buffer, string.c_str());
-  return buffer;
-}
-
-/*
- * GUI slider control callback functions
- */
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Slider(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_SLIDER)
-    return NULL;
-
-  return pGUIControl;
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetVisible(void *addonData, GUIHANDLE handle, bool yesNo)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIControl *pControl = static_cast<CGUIControl*>(handle);
-  pControl->SetVisible(yesNo);
-}
-
-const char* CAddonCallbacksGUI::Control_Slider_GetDescription(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  std::string string = pControl->GetDescription();
-
-  char *buffer = (char*) malloc (string.length()+1);
-  strcpy(buffer, string.c_str());
-  return buffer;
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetIntRange(void *addonData, GUIHANDLE handle, int iStart, int iEnd)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetRange(iStart, iEnd);
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetIntValue(void *addonData, GUIHANDLE handle, int iValue)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetType(SPIN_CONTROL_TYPE_INT);
-  pControl->SetIntValue(iValue);
-}
-
-int CAddonCallbacksGUI::Control_Slider_GetIntValue(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  return pControl->GetIntValue();
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetIntInterval(void *addonData, GUIHANDLE handle, int iInterval)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetIntInterval(iInterval);
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetPercentage(void *addonData, GUIHANDLE handle, float fPercent)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
-  pControl->SetPercentage(fPercent);
-}
-
-float CAddonCallbacksGUI::Control_Slider_GetPercentage(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0.0f;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  return pControl->GetPercentage();
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetFloatRange(void *addonData, GUIHANDLE handle, float fStart, float fEnd)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetFloatRange(fStart, fEnd);
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetFloatValue(void *addonData, GUIHANDLE handle, float iValue)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
-  pControl->SetFloatValue(iValue);
-}
-
-float CAddonCallbacksGUI::Control_Slider_GetFloatValue(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0.0f;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  return pControl->GetFloatValue();
-}
-
-void CAddonCallbacksGUI::Control_Slider_SetFloatInterval(void *addonData, GUIHANDLE handle, float fInterval)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
-  pControl->SetFloatInterval(fInterval);
-}
-
-/*
- * GUI settings slider control callback functions
- */
-GUIHANDLE CAddonCallbacksGUI::Window_GetControl_SettingsSlider(void *addonData, GUIHANDLE handle, int controlId)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
-  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
-  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_SETTINGS_SLIDER)
-    return NULL;
-
-  return pGUIControl;
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetVisible(void *addonData, GUIHANDLE handle, bool yesNo)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIControl *pControl = static_cast<CGUIControl*>(handle);
-  pControl->SetVisible(yesNo);
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetText(void *addonData, GUIHANDLE handle, const char *label)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetText(label);
-}
-
-const char* CAddonCallbacksGUI::Control_SettingsSlider_GetDescription(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  std::string string = pControl->GetDescription();
-
-  char *buffer = (char*) malloc (string.length()+1);
-  strcpy(buffer, string.c_str());
-  return buffer;
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetIntRange(void *addonData, GUIHANDLE handle, int iStart, int iEnd)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetRange(iStart, iEnd);
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetIntValue(void *addonData, GUIHANDLE handle, int iValue)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetType(SPIN_CONTROL_TYPE_INT);
-  pControl->SetIntValue(iValue);
-}
-
-int CAddonCallbacksGUI::Control_SettingsSlider_GetIntValue(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  return pControl->GetIntValue();
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetIntInterval(void *addonData, GUIHANDLE handle, int iInterval)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetIntInterval(iInterval);
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetPercentage(void *addonData, GUIHANDLE handle, float fPercent)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
-  pControl->SetPercentage(fPercent);
-}
-
-float CAddonCallbacksGUI::Control_SettingsSlider_GetPercentage(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0.0f;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  return pControl->GetPercentage();
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetFloatRange(void *addonData, GUIHANDLE handle, float fStart, float fEnd)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetFloatRange(fStart, fEnd);
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetFloatValue(void *addonData, GUIHANDLE handle, float fValue)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
-  pControl->SetFloatValue(fValue);
-}
-
-float CAddonCallbacksGUI::Control_SettingsSlider_GetFloatValue(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return 0.0f;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  return pControl->GetFloatValue();
-}
-
-void CAddonCallbacksGUI::Control_SettingsSlider_SetFloatInterval(void *addonData, GUIHANDLE handle, float fInterval)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
-  pControl->SetFloatInterval(fInterval);
-}
-
-/*
- * GUI list item control callback functions
- */
-GUIHANDLE CAddonCallbacksGUI::ListItem_Create(void *addonData, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper)
-    return NULL;
-
-  // create CFileItem
-  CFileItem *pItem = new CFileItem();
-  if (!pItem)
-    return NULL;
-
-  if (label)
-    pItem->SetLabel(label);
-  if (label2)
-    pItem->SetLabel2(label2);
-  if (iconImage)
-    pItem->SetArt("icon", iconImage);
-  if (thumbnailImage)
-    pItem->SetArt("thumb", thumbnailImage);
-  if (path)
-    pItem->SetPath(path);
-
-  return pItem;
-}
-
-const char* CAddonCallbacksGUI::ListItem_GetLabel(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  std::string string = static_cast<CFileItem*>(handle)->GetLabel();
-  char *buffer = (char*) malloc (string.length()+1);
-  strcpy(buffer, string.c_str());
-  return buffer;
-}
-
-void CAddonCallbacksGUI::ListItem_SetLabel(void *addonData, GUIHANDLE handle, const char *label)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  static_cast<CFileItem*>(handle)->SetLabel(label);
-}
-
-const char* CAddonCallbacksGUI::ListItem_GetLabel2(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  std::string string = static_cast<CFileItem*>(handle)->GetLabel2();
-
-  char *buffer = (char*) malloc (string.length()+1);
-  strcpy(buffer, string.c_str());
-  return buffer;
-}
-
-void CAddonCallbacksGUI::ListItem_SetLabel2(void *addonData, GUIHANDLE handle, const char *label)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  static_cast<CFileItem*>(handle)->SetLabel2(label);
-}
-
-void CAddonCallbacksGUI::ListItem_SetInfo(void *addonData, GUIHANDLE handle, const char *info)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-}
-
-void CAddonCallbacksGUI::ListItem_SetProperty(void *addonData, GUIHANDLE handle, const char *key, const char *value)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  static_cast<CFileItem*>(handle)->SetProperty(key, value);
-}
-
-const char* CAddonCallbacksGUI::ListItem_GetProperty(void *addonData, GUIHANDLE handle, const char *key)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return NULL;
-
-  std::string string = static_cast<CFileItem*>(handle)->GetProperty(key).asString();
-  char *buffer = (char*) malloc (string.length()+1);
-  strcpy(buffer, string.c_str());
-  return buffer;
-}
-
-void CAddonCallbacksGUI::ListItem_SetPath(void *addonData, GUIHANDLE handle, const char *path)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  static_cast<CFileItem*>(handle)->SetPath(path);
-}
-
-void CAddonCallbacksGUI::RenderAddon_SetCallbacks(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*createCB)(GUIHANDLE,int,int,int,int,void*), void (*renderCB)(GUIHANDLE), void (*stopCB)(GUIHANDLE), bool (*dirtyCB)(GUIHANDLE))
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonRenderingControl *pAddonControl = static_cast<CGUIAddonRenderingControl*>(handle);
-
-  Lock();
-  pAddonControl->m_clientHandle  = clienthandle;
-  pAddonControl->CBCreate        = createCB;
-  pAddonControl->CBRender        = renderCB;
-  pAddonControl->CBStop          = stopCB;
-  pAddonControl->CBDirty         = dirtyCB;
-  Unlock();
-
-  pAddonControl->m_pControl->InitCallback(pAddonControl);
-}
-
-void CAddonCallbacksGUI::RenderAddon_Delete(void *addonData, GUIHANDLE handle)
-{
-  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
-  if (!helper || !handle)
-    return;
-
-  CGUIAddonRenderingControl *pAddonControl = static_cast<CGUIAddonRenderingControl*>(handle);
-
-  Lock();
-  pAddonControl->Delete();
-  Unlock();
-}
-
-/*! @name GUI Keyboard functions */
-//@{
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInputWithHead(char &aTextString, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs)
-{
-  std::string str = &aTextString;
-  bool bRet = CGUIKeyboardFactory::ShowAndGetInput(str, CVariant{strHeading}, allowEmptyResult, hiddenInput, autoCloseMs);
-  if (bRet)
-    strncpy(&aTextString, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInput(char &aTextString, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs)
-{
-  std::string str = &aTextString;
-  bool bRet = CGUIKeyboardFactory::ShowAndGetInput(str, allowEmptyResult, autoCloseMs);
-  if (bRet)
-    strncpy(&aTextString, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPasswordWithHead(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs)
-{
-  std::string str = &strNewPassword;
-  bool bRet = CGUIKeyboardFactory::ShowAndGetNewPassword(str, strHeading, allowEmptyResult, autoCloseMs);
-  if (bRet)
-    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs)
-{
-  std::string str = &strNewPassword;
-  bool bRet = CGUIKeyboardFactory::ShowAndGetNewPassword(str, autoCloseMs);
-  if (bRet)
-    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs)
-{
-  std::string str = &strNewPassword;
-  bool bRet = CGUIKeyboardFactory::ShowAndVerifyNewPassword(str, strHeading, allowEmptyResult, autoCloseMs);
-  if (bRet)
-    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs)
-{
-  std::string str = &strNewPassword;
-  bool bRet = CGUIKeyboardFactory::ShowAndVerifyNewPassword(str, autoCloseMs);
-  if (bRet)
-    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-int CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs)
-{
-  std::string str = &strPassword;
-  int iRet = CGUIKeyboardFactory::ShowAndVerifyPassword(str, strHeading, iRetries, autoCloseMs);
-  if (iRet)
-    strncpy(&strPassword, str.c_str(), iMaxStringSize);
-  return iRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetFilter(char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs)
-{
-  std::string strText = &aTextString;
-  bool bRet = CGUIKeyboardFactory::ShowAndGetFilter(strText, searching, autoCloseMs);
-  if (bRet)
-    strncpy(&aTextString, strText.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_SendTextToActiveKeyboard(const char *aTextString, bool closeKeyboard)
-{
-  return CGUIKeyboardFactory::SendTextToActiveKeyboard(aTextString, closeKeyboard);
-}
-
-bool CAddonCallbacksGUI::Dialog_Keyboard_isKeyboardActivated()
-{
-  return CGUIKeyboardFactory::isKeyboardActivated();
-}
-//@}
-
-/*! @name GUI Numeric functions */
-//@{
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize)
-{
-  std::string str = &strNewPassword;
-  bool bRet = CGUIDialogNumeric::ShowAndVerifyNewPassword(str);
-  if (bRet)
-    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-int CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries)
-{
-  std::string str = &strPassword;
-  int bRet = CGUIDialogNumeric::ShowAndVerifyPassword(str, strHeading, iRetries);
-  if (bRet)
-    strncpy(&strPassword, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyInput(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput)
-{
-  std::string str = &strPassword;
-  if (CGUIDialogNumeric::ShowAndVerifyInput(str, strHeading, bGetUserInput) == InputVerificationResult::SUCCESS)
-  {
-    strncpy(&strPassword, str.c_str(), iMaxStringSize);
-    return true;
-  }
-  return false;
-}
-
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetTime(tm &time, const char *strHeading)
-{
-  SYSTEMTIME systemTime;
-  CDateTime dateTime(time);
-  dateTime.GetAsSystemTime(systemTime);
-  if (CGUIDialogNumeric::ShowAndGetTime(systemTime, strHeading))
-  {
-    dateTime = systemTime;
-    dateTime.GetAsTm(time);
-    return true;
-  }
-  return false;
-}
-
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetDate(tm &date, const char *strHeading)
-{
-  SYSTEMTIME systemTime;
-  CDateTime dateTime(date);
-  dateTime.GetAsSystemTime(systemTime);
-  if (CGUIDialogNumeric::ShowAndGetDate(systemTime, strHeading))
-  {
-    dateTime = systemTime;
-    dateTime.GetAsTm(date);
-    return true;
-  }
-  return false;
-}
-
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetIPAddress(char &strIPAddress, unsigned int iMaxStringSize, const char *strHeading)
-{
-  std::string strIP = &strIPAddress;
-  bool bRet = CGUIDialogNumeric::ShowAndGetIPAddress(strIP, strHeading);
-  if (bRet)
-    strncpy(&strIPAddress, strIP.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetNumber(char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs)
-{
-  std::string str = &strInput;
-  bool bRet = CGUIDialogNumeric::ShowAndGetNumber(str, strHeading, iAutoCloseTimeoutMs);
-  if (bRet)
-    strncpy(&strInput, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-
-bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetSeconds(char &timeString, unsigned int iMaxStringSize, const char *strHeading)
-{
-  std::string str = &timeString;
-  bool bRet = CGUIDialogNumeric::ShowAndGetSeconds(str, strHeading);
-  if (bRet)
-    strncpy(&timeString, str.c_str(), iMaxStringSize);
-  return bRet;
-}
-//@}
-
-/*! @name GUI File browser functions */
-//@{
-bool CAddonCallbacksGUI::Dialog_FileBrowser_ShowAndGetFile(const char *directory, const char *mask, const char *heading, char &path, unsigned int iMaxStringSize, bool useThumbs, bool useFileDirectories, bool singleList)
-{
-  std::string strPath = &path;
-  bool bRet = CGUIDialogFileBrowser::ShowAndGetFile(directory, mask, heading, strPath, useThumbs, useFileDirectories, singleList);
-  if (bRet)
-    strncpy(&path, strPath.c_str(), iMaxStringSize);
-  return bRet;
-}
-//@}
-
-/*! @name GUI OK Dialog */
-//@{
-void CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputSingleText(const char *heading, const char *text)
-{
-  HELPERS::ShowOKDialogText(CVariant{heading}, CVariant{text});
-}
-
-void CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputLineText(const char *heading, const char *line0, const char *line1, const char *line2)
-{
-  HELPERS::ShowOKDialogLines(CVariant{heading}, CVariant{line0}, CVariant{line1}, CVariant{line2});
-}
-//@}
-
-/*! @name GUI Yes No Dialog */
-//@{
-bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputSingleText(const char *heading, const char *text, bool& bCanceled, const char *noLabel, const char *yesLabel)
-{
-  DialogResponse result = HELPERS::ShowYesNoDialogText(heading, text, noLabel, yesLabel);
-  bCanceled = result == DialogResponse::CANCELLED;
-  return result == DialogResponse::YES;
-}
-
-bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineText(const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel)
-{
-  return HELPERS::ShowYesNoDialogLines(heading, line0, line1, line2, noLabel, yesLabel) ==
-    DialogResponse::YES;
-}
-
-bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineButtonText(const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel, const char *yesLabel)
-{
-  DialogResponse result = HELPERS::ShowYesNoDialogLines(heading, line0, line1, line2, noLabel, yesLabel);
-  bCanceled = result == DialogResponse::CANCELLED;
-  return result == DialogResponse::YES;
-}
-//@}
-
-/*! @name GUI Text viewer Dialog */
-//@{
-void CAddonCallbacksGUI::Dialog_TextViewer(const char *heading, const char *text)
-{
-  CGUIDialogTextViewer* pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogTextViewer>(WINDOW_DIALOG_TEXT_VIEWER);
-  pDialog->SetHeading(heading);
-  pDialog->SetText(text);
-  pDialog->Open();
-}
-//@}
-
-/*! @name GUI select Dialog */
-//@{
-int CAddonCallbacksGUI::Dialog_Select(const char *heading, const char *entries[], unsigned int size, int selected)
-{
-  CGUIDialogSelect* pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
-  pDialog->Reset();
-  pDialog->SetHeading(CVariant{heading});
-
-  for (unsigned int i = 0; i < size; i++)
-    pDialog->Add(entries[i]);
-
-  if (selected > 0)
-    pDialog->SetSelected(selected);
-
-  pDialog->Open();
-  return pDialog->GetSelectedItem();
-}
-//@}
-
-} /* namespace GUI */
-} /* namespace KodiAPI */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls Deleted

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Rendering.cpp Deleted

@@ -1,145 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "Rendering.h"
-
-#include "addons/binary-addons/AddonDll.h"
-#include "addons/interfaces/GUI/General.h"
-#include "addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h"
-#include "guilib/GUIRenderingControl.h"
-#include "utils/log.h"
-
-extern "C"
-{
-namespace ADDON
-{
-
-void Interface_GUIControlAddonRendering::Init(AddonGlobalInterface* addonInterface)
-{
-  addonInterface->toKodi->kodi_gui->control_rendering = static_cast<AddonToKodiFuncTable_kodi_gui_control_rendering*>(malloc(sizeof(AddonToKodiFuncTable_kodi_gui_control_rendering)));
-
-  addonInterface->toKodi->kodi_gui->control_rendering->set_callbacks = set_callbacks;
-  addonInterface->toKodi->kodi_gui->control_rendering->destroy = destroy;
-}
-
-void Interface_GUIControlAddonRendering::DeInit(AddonGlobalInterface* addonInterface)
-{
-  free(addonInterface->toKodi->kodi_gui->control_rendering);
-}
-
-void Interface_GUIControlAddonRendering::set_callbacks(
-                            void* kodiBase, void* handle, void* clienthandle,
-                            bool (*createCB)(void*,int,int,int,int,void*),
-                            void (*renderCB)(void*), void (*stopCB)(void*), bool (*dirtyCB)(void*))
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  CGUIAddonRenderingControl* control = static_cast<CGUIAddonRenderingControl*>(handle);
-  if (!addon || !control)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', "
-              "handle='%p') on addon '%s'",
-              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
-    return;
-  }
-
-  Interface_GUIGeneral::lock();
-  control->m_clientHandle = clienthandle;
-  control->CBCreate = createCB;
-  control->CBRender = renderCB;
-  control->CBStop = stopCB;
-  control->CBDirty = dirtyCB;
-  control->m_addon = addon;
-  Interface_GUIGeneral::unlock();
-
-  control->m_control->InitCallback(control);
-}
-
-void Interface_GUIControlAddonRendering::destroy(void* kodiBase, void* handle)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  CGUIAddonRenderingControl* control = static_cast<CGUIAddonRenderingControl*>(handle);
-  if (!addon || !control)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', "
-              "handle='%p') on addon '%s'",
-              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
-    return;
-  }
-
-  Interface_GUIGeneral::lock();
-  static_cast<CGUIAddonRenderingControl*>(handle)->Delete();
-  Interface_GUIGeneral::unlock();
-}
-
-
-CGUIAddonRenderingControl::CGUIAddonRenderingControl(CGUIRenderingControl *control)
-  : CBCreate{nullptr},
-    CBRender{nullptr},
-    CBStop{nullptr},
-    CBDirty{nullptr},
-    m_clientHandle{nullptr},
-    m_addon{nullptr},
-    m_control{control},
-    m_refCount{1}
-{
-}
-
-bool CGUIAddonRenderingControl::Create(int x, int y, int w, int h, void *device)
-{
-  if (CBCreate)
-  {
-    if (CBCreate(m_clientHandle, x, y, w, h, device))
-    {
-      ++m_refCount;
-      return true;
-    }
-  }
-  return false;
-}
-
-void CGUIAddonRenderingControl::Render()
-{
-  if (CBRender)
-  {
-    CBRender(m_clientHandle);
-  }
-}
-
-void CGUIAddonRenderingControl::Stop()
-{
-  if (CBStop)
-  {
-    CBStop(m_clientHandle);
-  }
-
-  --m_refCount;
-  if (m_refCount <= 0)
-    delete this;
-}
-
-void CGUIAddonRenderingControl::Delete()
-{
-  --m_refCount;
-  if (m_refCount <= 0)
-    delete this;
-}
-
-bool CGUIAddonRenderingControl::IsDirty()
-{
-  bool ret = true;
-  if (CBDirty)
-  {
-    ret = CBDirty(m_clientHandle);
-  }
-  return ret;
-}
-
-} /* namespace ADDON */
-} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs Deleted

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/Numeric.cpp Deleted

@@ -1,245 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "Numeric.h"
-
-#include "XBDateTime.h"
-#include "addons/binary-addons/AddonDll.h"
-#include "addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h"
-#include "dialogs/GUIDialogNumeric.h"
-#include "utils/log.h"
-
-extern "C"
-{
-namespace ADDON
-{
-
-void Interface_GUIDialogNumeric::Init(AddonGlobalInterface* addonInterface)
-{
-  addonInterface->toKodi->kodi_gui->dialogNumeric = static_cast<AddonToKodiFuncTable_kodi_gui_dialogNumeric*>(malloc(sizeof(AddonToKodiFuncTable_kodi_gui_dialogNumeric)));
-
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_verify_new_password = show_and_verify_new_password;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_verify_password = show_and_verify_password;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_verify_input = show_and_verify_input;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_time = show_and_get_time;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_date = show_and_get_date;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_ip_address = show_and_get_ip_address;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_number = show_and_get_number;
-  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_seconds = show_and_get_seconds;
-}
-
-void Interface_GUIDialogNumeric::DeInit(AddonGlobalInterface* addonInterface)
-{
-  free(addonInterface->toKodi->kodi_gui->dialogNumeric);
-}
-
-bool Interface_GUIDialogNumeric::show_and_verify_new_password(void* kodiBase, char** password)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  std::string str;
-  bool bRet = CGUIDialogNumeric::ShowAndVerifyNewPassword(str);
-  if (bRet)
-    *password = strdup(str.c_str());
-  return bRet;
-}
-
-int Interface_GUIDialogNumeric::show_and_verify_password(void* kodiBase, const char* password, const char* heading, int retries)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return -1;
-  }
-
-  if (!password || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (password='%p', heading='%p') "
-              "on addon '%s'",
-              __FUNCTION__, password, heading, addon->ID().c_str());
-    return -1;
-  }
-
-  std::string pw(password);
-  return CGUIDialogNumeric::ShowAndVerifyPassword(pw, heading, retries);
-}
-
-bool Interface_GUIDialogNumeric::show_and_verify_input(void* kodiBase, const char* verify_in, char** verify_out, const char* heading, bool verify_input)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  if (!verify_in || !verify_out || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (verify_in='%p', "
-              "verify_out='%p', heading='%p') on addon '%s'",
-              __FUNCTION__, verify_in, static_cast<void*>(verify_out), heading,
-              addon->ID().c_str());
-    return false;
-  }
-
-  std::string str = verify_in;
-  if (CGUIDialogNumeric::ShowAndVerifyInput(str, heading, verify_input) == InputVerificationResult::SUCCESS)
-  {
-    *verify_out = strdup(str.c_str());
-    return true;
-  }
-  return false;
-}
-
-bool Interface_GUIDialogNumeric::show_and_get_time(void* kodiBase, tm* time, const char* heading)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  if (!time || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (time='%p', heading='%p') on "
-              "addon '%s'",
-              __FUNCTION__, static_cast<void*>(time), heading, addon->ID().c_str());
-    return false;
-  }
-
-  SYSTEMTIME systemTime;
-  CDateTime dateTime(*time);
-  dateTime.GetAsSystemTime(systemTime);
-  if (CGUIDialogNumeric::ShowAndGetTime(systemTime, heading))
-  {
-    dateTime = systemTime;
-    dateTime.GetAsTm(*time);
-    return true;
-  }
-  return false;
-}
-
-bool Interface_GUIDialogNumeric::show_and_get_date(void* kodiBase, tm *date, const char *heading)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  if (!date || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (date='%p', heading='%p') on "
-              "addon '%s'",
-              __FUNCTION__, static_cast<void*>(date), heading, addon->ID().c_str());
-    return false;
-  }
-
-  SYSTEMTIME systemTime;
-  CDateTime dateTime(*date);
-  dateTime.GetAsSystemTime(systemTime);
-  if (CGUIDialogNumeric::ShowAndGetDate(systemTime, heading))
-  {
-    dateTime = systemTime;
-    dateTime.GetAsTm(*date);
-    return true;
-  }
-  return false;
-}
-
-bool Interface_GUIDialogNumeric::show_and_get_ip_address(void* kodiBase, const char* ip_address_in, char** ip_address_out, const char *heading)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  if (!ip_address_in || !ip_address_out || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (ip_address_in='%p', "
-              "ip_address_out='%p', heading='%p') on addon '%s'",
-              __FUNCTION__, ip_address_in, static_cast<void*>(ip_address_out), heading,
-              addon->ID().c_str());
-    return false;
-  }
-
-  std::string strIP = ip_address_in;
-  bool bRet = CGUIDialogNumeric::ShowAndGetIPAddress(strIP, heading);
-  if (bRet)
-    *ip_address_out = strdup(strIP.c_str());
-  return bRet;
-}
-
-bool Interface_GUIDialogNumeric::show_and_get_number(void* kodiBase, const char* number_in, char** number_out, const char *heading, unsigned int auto_close_ms)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  if (!number_in || !number_out || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (number_in='%p', "
-              "number_out='%p', heading='%p') on addon '%s'",
-              __FUNCTION__, number_in, static_cast<void*>(number_out), heading,
-              addon->ID().c_str());
-    return false;
-  }
-
-  std::string str = number_in;
-  bool bRet = CGUIDialogNumeric::ShowAndGetNumber(str, heading, auto_close_ms);
-  if (bRet)
-    *number_out = strdup(str.c_str());
-  return bRet;
-}
-
-bool Interface_GUIDialogNumeric::show_and_get_seconds(void* kodiBase, const char* time_in, char** time_out, const char *heading)
-{
-  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
-  if (!addon)
-  {
-    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
-    return false;
-  }
-
-  if (!time_in || !time_out || !heading)
-  {
-    CLog::Log(LOGERROR,
-              "Interface_GUIDialogNumeric::%s - invalid handler data (time_in='%p', time_out='%p', "
-              "heading='%p') on addon '%s'",
-              __FUNCTION__, time_in, static_cast<void*>(time_out), heading, addon->ID().c_str());
-    return false;
-  }
-
-  std::string str = time_in;
-  bool bRet = CGUIDialogNumeric::ShowAndGetSeconds(str, heading);
-  if (bRet)
-    *time_out = strdup(str.c_str());
-  return bRet;
-}
-
-} /* namespace ADDON */
-} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/General.cpp Changed

@@ -76,7 +76,7 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || id == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', id='%p')", __FUNCTION__,
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', id='{}')", __FUNCTION__,
               kodiBase, static_cast<const void*>(id));
     return nullptr;
   }
@@ -110,8 +110,8 @@
     str = addon->Version().asString();
   else
   {
-    CLog::Log(LOGERROR, "Interface_General::%s -  add-on '%s' requests invalid id '%s'",
-                          __FUNCTION__, addon->Name().c_str(), id);
+    CLog::Log(LOGERROR, "Interface_General::{} -  add-on '{}' requests invalid id '{}'",
+              __FUNCTION__, addon->Name(), id);
     return nullptr;
   }
 
@@ -124,7 +124,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}')", __FUNCTION__,
+              kodiBase);
     return false;
   }
 
@@ -132,7 +133,8 @@
   AddonPtr addonInfo;
   if (CServiceBroker::GetAddonMgr().GetAddon(addon->ID(), addonInfo))
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - Could not get addon information for '%s'", __FUNCTION__, addon->ID().c_str());
+    CLog::Log(LOGERROR, "Interface_General::{} - Could not get addon information for '{}'",
+              __FUNCTION__, addon->ID());
     return false;
   }
 
@@ -144,7 +146,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (!addon)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}')", __FUNCTION__,
+              kodiBase);
     return nullptr;
   }
 
@@ -163,7 +166,7 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (!addon || !source || !ret)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', source='%p', ret='%p')",
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', source='{}', ret='{}')",
               __FUNCTION__, kodiBase, static_cast<const void*>(source), static_cast<void*>(ret));
     return nullptr;
   }
@@ -179,7 +182,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (!addon)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}')", __FUNCTION__,
+              kodiBase);
     return nullptr;
   }
 
@@ -235,7 +239,7 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || message == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', message='%p')",
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', message='{}')",
               __FUNCTION__, kodiBase, static_cast<const void*>(message));
     return false;
   }
@@ -256,24 +260,30 @@
     case QueueMsg::QUEUE_WARNING:
       usedType = CGUIDialogKaiToast::Warning;
       withSound = true;
-      CLog::Log(LOGDEBUG, "Interface_General::%s - %s - Warning Message: '%s'", __FUNCTION__, addon->Name().c_str(), message);
+      CLog::Log(LOGDEBUG, "Interface_General::{} - {} - Warning Message: '{}'", __FUNCTION__,
+                addon->Name(), message);
       break;
     case QueueMsg::QUEUE_ERROR:
       usedType = CGUIDialogKaiToast::Error;
       withSound = true;
-      CLog::Log(LOGDEBUG, "Interface_General::%s - %s - Error Message : '%s'", __FUNCTION__, addon->Name().c_str(), message);
+      CLog::Log(LOGDEBUG, "Interface_General::{} - {} - Error Message : '{}'", __FUNCTION__,
+                addon->Name(), message);
       break;
     case QueueMsg::QUEUE_INFO:
     default:
       usedType = CGUIDialogKaiToast::Info;
       withSound = false;
-      CLog::Log(LOGDEBUG, "Interface_General::%s - %s - Info Message : '%s'", __FUNCTION__, addon->Name().c_str(), message);
+      CLog::Log(LOGDEBUG, "Interface_General::{} - {} - Info Message : '{}'", __FUNCTION__,
+                addon->Name(), message);
       break;
     }
 
     if (imageFile && strlen(imageFile) > 0)
     {
-      CLog::Log(LOGERROR, "Interface_General::%s - To use given image file '%s' must be type value set to 'QUEUE_OWN_STYLE'", __FUNCTION__, imageFile);
+      CLog::Log(LOGERROR,
+                "Interface_General::{} - To use given image file '{}' must be type value set to "
+                "'QUEUE_OWN_STYLE'",
+                __FUNCTION__, imageFile);
     }
 
     CGUIDialogKaiToast::QueueNotification(usedType, usedHeader, message, 3000, withSound);
@@ -290,7 +300,7 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || text == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', text='%p')",
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', text='{}')",
               __FUNCTION__, kodiBase, static_cast<const void*>(text));
     return;
   }
@@ -304,11 +314,13 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - called with empty kodi instance pointer", __FUNCTION__);
+    CLog::Log(LOGERROR, "Interface_General::{} - called with empty kodi instance pointer",
+              __FUNCTION__);
     return nullptr;
   }
 
-  std::string tempPath = URIUtils::AddFileToFolder(CServiceBroker::GetBinaryAddonManager().GetTempAddonBasePath(), addon->ID());
+  std::string tempPath =
+      URIUtils::AddFileToFolder(CServiceBroker::GetAddonMgr().GetTempAddonBasePath(), addon->ID());
   tempPath += "-temp";
   XFILE::CDirectory::Create(tempPath);
 
@@ -320,7 +332,7 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || id == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', id='%p')", __FUNCTION__,
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', id='{}')", __FUNCTION__,
               kodiBase, static_cast<const void*>(id));
     return nullptr;
   }
@@ -367,8 +379,8 @@
                                   g_langInfo.GetMeridiemSymbol(MeridiemSymbolPM).c_str());
   else
   {
-    CLog::Log(LOGERROR, "Interface_General::%s -  add-on '%s' requests invalid id '%s'",
-                          __FUNCTION__, addon->Name().c_str(), id);
+    CLog::Log(LOGERROR, "Interface_General::{} -  add-on '{}' requests invalid id '{}'",
+              __FUNCTION__, addon->Name(), id);
     return nullptr;
   }
 
@@ -381,7 +393,7 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || free == nullptr || total == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', free='%p', total='%p')",
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', free='{}', total='{}')",
               __FUNCTION__, kodiBase, static_cast<void*>(free), static_cast<void*>(total));
     return;
   }
@@ -402,7 +414,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}')", __FUNCTION__,
+              kodiBase);
     return -1;
   }
 
@@ -416,8 +429,8 @@
      revision == nullptr || tag == nullptr || tagversion == nullptr)
   {
     CLog::Log(LOGERROR,
-              "Interface_General::%s - invalid data (addon='%p', compile_name='%p', major='%p', "
-              "minor='%p', revision='%p', tag='%p', tagversion='%p')",
+              "Interface_General::{} - invalid data (addon='{}', compile_name='{}', major='{}', "
+              "minor='{}', revision='{}', tag='{}', tagversion='{}')",
               __FUNCTION__, kodiBase, static_cast<void*>(compile_name), static_cast<void*>(major),
               static_cast<void*>(minor), static_cast<void*>(revision), static_cast<void*>(tag),
               static_cast<void*>(tagversion));
@@ -455,7 +468,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}')", __FUNCTION__,
+              kodiBase);
     return nullptr;
   }
 
@@ -467,8 +481,10 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || c_layout == nullptr || layout_name == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', c_layout='%p', layout_name='%p')",
-              __FUNCTION__, kodiBase, static_cast<void*>(c_layout), static_cast<void*>(layout_name));
+    CLog::Log(LOGERROR,
+              "Interface_General::{} - invalid data (addon='{}', c_layout='{}', layout_name='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(c_layout),
+              static_cast<void*>(layout_name));
     return false;
   }
 
@@ -503,7 +519,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || layout_name == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', layout_name='%p')", __FUNCTION__, kodiBase, static_cast<void*>(layout_name));
+    CLog::Log(LOGERROR, "Interface_General::{} - invalid data (addon='{}', layout_name='{}')",
+              __FUNCTION__, kodiBase, static_cast<void*>(layout_name));
     return false;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/General.h Changed

@@ -17,47 +17,63 @@
 namespace ADDON
 {
 
+/*!
+ * @brief Global general Add-on to Kodi callback functions
+ *
+ * To hold general functions not related to a instance type and usable for
+ * every add-on type.
+ *
+ * Related add-on header is "./xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h"
+ */
+struct Interface_General
+{
+  static void Init(AddonGlobalInterface* addonInterface);
+  static void DeInit(AddonGlobalInterface* addonInterface);
+
   /*!
-   * @brief Global general Add-on to Kodi callback functions
+   * @brief callback functions from add-on to kodi
    *
-   * To hold general functions not related to a instance type and usable for
-   * every add-on type.
+   * @note To add a new function use the "_" style to directly identify an
+   * add-on callback function. Everything with CamelCase is only to be used
+   * in Kodi.
    *
-   * Related add-on header is "./xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h"
+   * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
+   * class.
    */
-  struct Interface_General
-  {
-    static void Init(AddonGlobalInterface* addonInterface);
-    static void DeInit(AddonGlobalInterface* addonInterface);
-
-    /*!
-     * @brief callback functions from add-on to kodi
-     *
-     * @note To add a new function use the "_" style to directly identify an
-     * add-on callback function. Everything with CamelCase is only to be used
-     * in Kodi.
-     *
-     * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
-     * class.
-     */
-    //@{
-    static char* get_addon_info(void* kodiBase, const char* id);
-    static bool open_settings_dialog(void* kodiBase);
-    static char* get_localized_string(void* kodiBase, long label_id);
-    static char* unknown_to_utf8(void* kodiBase, const char* source, bool* ret, bool failOnBadChar);
-    static char* get_language(void* kodiBase, int format, bool region);
-    static bool queue_notification(void* kodiBase, int type, const char* header, const char* message, const char* imageFile, unsigned int displayTime, bool withSound, unsigned int messageTime);
-    static void get_md5(void* kodiBase, const char* text, char* md5);
-    static char* get_temp_path(void* kodiBase);
-    static char* get_region(void* kodiBase, const char* id);
-    static void get_free_mem(void* kodiInstance, long* free, long* total, bool as_bytes);
-    static int  get_global_idle_time(void* kodiBase);
-    static void kodi_version(void* kodiBase, char** compile_name, int* major, int* minor, char** revision, char** tag, char** tagversion);
-    static char* get_current_skin_id(void* kodiBase);
-    static bool change_keyboard_layout(void* kodiBase, char** layout_name);
-    static bool get_keyboard_layout(void* kodiBase, char** layout_name, int modifier_key, AddonKeyboardKeyTable* c_layout);
-    //@}
-  };
+  //@{
+  static char* get_addon_info(void* kodiBase, const char* id);
+  static bool open_settings_dialog(void* kodiBase);
+  static char* get_localized_string(void* kodiBase, long label_id);
+  static char* unknown_to_utf8(void* kodiBase, const char* source, bool* ret, bool failOnBadChar);
+  static char* get_language(void* kodiBase, int format, bool region);
+  static bool queue_notification(void* kodiBase,
+                                 int type,
+                                 const char* header,
+                                 const char* message,
+                                 const char* imageFile,
+                                 unsigned int displayTime,
+                                 bool withSound,
+                                 unsigned int messageTime);
+  static void get_md5(void* kodiBase, const char* text, char* md5);
+  static char* get_temp_path(void* kodiBase);
+  static char* get_region(void* kodiBase, const char* id);
+  static void get_free_mem(void* kodiInstance, long* free, long* total, bool as_bytes);
+  static int get_global_idle_time(void* kodiBase);
+  static void kodi_version(void* kodiBase,
+                           char** compile_name,
+                           int* major,
+                           int* minor,
+                           char** revision,
+                           char** tag,
+                           char** tagversion);
+  static char* get_current_skin_id(void* kodiBase);
+  static bool change_keyboard_layout(void* kodiBase, char** layout_name);
+  static bool get_keyboard_layout(void* kodiBase,
+                                  char** layout_name,
+                                  int modifier_key,
+                                  AddonKeyboardKeyTable* c_layout);
+  //@}
+};
 
 } /* namespace ADDON */
 } /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/Network.cpp Changed

@@ -16,8 +16,6 @@
 #include "network/Network.h"
 #include "utils/log.h"
 
-using namespace kodi; // addon-dev-kit namespace
-
 namespace ADDON
 {
 
@@ -46,7 +44,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || mac == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', mac='%p')", __FUNCTION__, kodiBase, mac);
+    CLog::Log(LOGERROR, "Interface_Network::{} - invalid data (addon='{}', mac='{}')", __FUNCTION__,
+              kodiBase, static_cast<const void*>(mac));
     return false;
   }
 
@@ -58,7 +57,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
+    CLog::Log(LOGERROR, "Interface_Network::{} - invalid data (addon='{}')", __FUNCTION__,
+              kodiBase);
     return nullptr;
   }
 
@@ -80,8 +80,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || url == nullptr || ret == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', url='%p', ret='%p')",
-              __FUNCTION__, kodiBase, url, static_cast<void*>(ret));
+    CLog::Log(LOGERROR, "Interface_Network::{} - invalid data (addon='{}', url='{}', ret='{}')",
+              __FUNCTION__, kodiBase, static_cast<const void*>(url), static_cast<void*>(ret));
     return nullptr;
   }
 
@@ -98,8 +98,8 @@
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   if (addon == nullptr || url == nullptr)
   {
-    CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', url='%p')", __FUNCTION__,
-              kodiBase, url);
+    CLog::Log(LOGERROR, "Interface_Network::{} - invalid data (addon='{}', url='{}')", __FUNCTION__,
+              kodiBase, static_cast<const void*>(url));
     return nullptr;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/Network.h Changed

@@ -10,38 +10,41 @@
 
 struct AddonGlobalInterface;
 
+extern "C"
+{
 namespace ADDON
 {
 
+/*!
+ * @brief Global general Add-on to Kodi callback functions
+ *
+ * To hold network functions not related to a instance type and usable for
+ * every add-on type.
+ *
+ * Related add-on header is "./xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h"
+ */
+struct Interface_Network
+{
+  static void Init(AddonGlobalInterface* addonInterface);
+  static void DeInit(AddonGlobalInterface* addonInterface);
+
   /*!
-   * @brief Global general Add-on to Kodi callback functions
+   * @brief callback functions from add-on to kodi
    *
-   * To hold network functions not related to a instance type and usable for
-   * every add-on type.
+   * @note To add a new function use the "_" style to directly identify an
+   * add-on callback function. Everything with CamelCase is only to be used
+   * in Kodi.
    *
-   * Related add-on header is "./xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h"
+   * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
+   * class.
    */
-  struct Interface_Network
-  {
-    static void Init(AddonGlobalInterface* addonInterface);
-    static void DeInit(AddonGlobalInterface* addonInterface);
-
-    /*!
-     * @brief callback functions from add-on to kodi
-     *
-     * @note To add a new function use the "_" style to directly identify an
-     * add-on callback function. Everything with CamelCase is only to be used
-     * in Kodi.
-     *
-     * The parameter `kodiBase` is used to become the pointer for a `CAddonDll`
-     * class.
-     */
-    //@{
-    static bool wake_on_lan(void* kodiBase, const char* mac);
-    static char* get_ip_address(void* kodiBase);
-    static char* dns_lookup(void* kodiBase, const char* url, bool* ret);
-    static char* url_encode(void* kodiBase, const char* url);
-    //@}
-  };
+  //@{
+  static bool wake_on_lan(void* kodiBase, const char* mac);
+  static char* get_ip_address(void* kodiBase);
+  static char* dns_lookup(void* kodiBase, const char* url, bool* ret);
+  static char* url_encode(void* kodiBase, const char* url);
+  //@}
+};
 
 } /* namespace ADDON */
+} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui Added

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/AddonCallbacksGUI.cpp Added

@@ -0,0 +1,1863 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  Copyright (C) 2015-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "AddonCallbacksGUI.h"
+
+#include "AddonGUIRenderingControl.h"
+#include "AddonGUIWindow.h"
+#include "Application.h"
+#include "FileItem.h"
+#include "ServiceBroker.h"
+#include "addons/Addon.h"
+#include "addons/Skin.h"
+#include "dialogs/GUIDialogFileBrowser.h"
+#include "dialogs/GUIDialogNumeric.h"
+#include "dialogs/GUIDialogSelect.h"
+#include "dialogs/GUIDialogTextViewer.h"
+#include "filesystem/File.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIKeyboardFactory.h"
+#include "guilib/GUIProgressControl.h"
+#include "guilib/GUIRadioButtonControl.h"
+#include "guilib/GUIRenderingControl.h"
+#include "guilib/GUISettingsSliderControl.h"
+#include "guilib/GUISpinControlEx.h"
+#include "guilib/GUIWindowManager.h"
+#include "messaging/ApplicationMessenger.h"
+#include "messaging/helpers/DialogHelper.h"
+#include "messaging/helpers/DialogOKHelper.h"
+#include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
+#include "utils/Variant.h"
+#include "utils/log.h"
+
+using namespace KODI::MESSAGING;
+using KODI::MESSAGING::HELPERS::DialogResponse;
+
+using namespace ADDON;
+
+namespace KodiAPI
+{
+namespace GUI
+{
+
+static int iXBMCGUILockRef = 0;
+
+CAddonCallbacksGUI::CAddonCallbacksGUI(CAddon* addon)
+  : m_addon(addon),
+    m_callbacks(new CB_GUILib)
+{
+  /* GUI Helper functions */
+  m_callbacks->Lock                           = CAddonCallbacksGUI::Lock;
+  m_callbacks->Unlock                         = CAddonCallbacksGUI::Unlock;
+  m_callbacks->GetScreenHeight                = CAddonCallbacksGUI::GetScreenHeight;
+  m_callbacks->GetScreenWidth                 = CAddonCallbacksGUI::GetScreenWidth;
+  m_callbacks->GetVideoResolution             = CAddonCallbacksGUI::GetVideoResolution;
+  m_callbacks->Window_New                     = CAddonCallbacksGUI::Window_New;
+  m_callbacks->Window_Delete                  = CAddonCallbacksGUI::Window_Delete;
+  m_callbacks->Window_SetCallbacks            = CAddonCallbacksGUI::Window_SetCallbacks;
+  m_callbacks->Window_Show                    = CAddonCallbacksGUI::Window_Show;
+  m_callbacks->Window_Close                   = CAddonCallbacksGUI::Window_Close;
+  m_callbacks->Window_DoModal                 = CAddonCallbacksGUI::Window_DoModal;
+  m_callbacks->Window_SetFocusId              = CAddonCallbacksGUI::Window_SetFocusId;
+  m_callbacks->Window_GetFocusId              = CAddonCallbacksGUI::Window_GetFocusId;
+  m_callbacks->Window_SetCoordinateResolution = CAddonCallbacksGUI::Window_SetCoordinateResolution;
+  m_callbacks->Window_SetProperty             = CAddonCallbacksGUI::Window_SetProperty;
+  m_callbacks->Window_SetPropertyInt          = CAddonCallbacksGUI::Window_SetPropertyInt;
+  m_callbacks->Window_SetPropertyBool         = CAddonCallbacksGUI::Window_SetPropertyBool;
+  m_callbacks->Window_SetPropertyDouble       = CAddonCallbacksGUI::Window_SetPropertyDouble;
+  m_callbacks->Window_GetProperty             = CAddonCallbacksGUI::Window_GetProperty;
+  m_callbacks->Window_GetPropertyInt          = CAddonCallbacksGUI::Window_GetPropertyInt;
+  m_callbacks->Window_GetPropertyBool         = CAddonCallbacksGUI::Window_GetPropertyBool;
+  m_callbacks->Window_GetPropertyDouble       = CAddonCallbacksGUI::Window_GetPropertyDouble;
+  m_callbacks->Window_ClearProperties         = CAddonCallbacksGUI::Window_ClearProperties;
+
+  m_callbacks->Window_GetListSize             = CAddonCallbacksGUI::Window_GetListSize;
+  m_callbacks->Window_ClearList               = CAddonCallbacksGUI::Window_ClearList;
+  m_callbacks->Window_AddItem                 = CAddonCallbacksGUI::Window_AddItem;
+  m_callbacks->Window_AddStringItem           = CAddonCallbacksGUI::Window_AddStringItem;
+  m_callbacks->Window_RemoveItem              = CAddonCallbacksGUI::Window_RemoveItem;
+  m_callbacks->Window_GetListItem             = CAddonCallbacksGUI::Window_GetListItem;
+  m_callbacks->Window_SetCurrentListPosition  = CAddonCallbacksGUI::Window_SetCurrentListPosition;
+  m_callbacks->Window_GetCurrentListPosition  = CAddonCallbacksGUI::Window_GetCurrentListPosition;
+
+  m_callbacks->Window_GetControl_Spin         = CAddonCallbacksGUI::Window_GetControl_Spin;
+  m_callbacks->Window_GetControl_Button       = CAddonCallbacksGUI::Window_GetControl_Button;
+  m_callbacks->Window_GetControl_RadioButton  = CAddonCallbacksGUI::Window_GetControl_RadioButton;
+  m_callbacks->Window_GetControl_Edit         = CAddonCallbacksGUI::Window_GetControl_Edit;
+  m_callbacks->Window_GetControl_Progress     = CAddonCallbacksGUI::Window_GetControl_Progress;
+  m_callbacks->Window_GetControl_RenderAddon  = CAddonCallbacksGUI::Window_GetControl_RenderAddon;
+  m_callbacks->Window_GetControl_Slider       = CAddonCallbacksGUI::Window_GetControl_Slider;
+  m_callbacks->Window_GetControl_SettingsSlider= CAddonCallbacksGUI::Window_GetControl_SettingsSlider;
+
+  m_callbacks->Window_SetControlLabel         = CAddonCallbacksGUI::Window_SetControlLabel;
+  m_callbacks->Window_MarkDirtyRegion         = CAddonCallbacksGUI::Window_MarkDirtyRegion;
+
+  m_callbacks->Control_Spin_SetVisible        = CAddonCallbacksGUI::Control_Spin_SetVisible;
+  m_callbacks->Control_Spin_SetText           = CAddonCallbacksGUI::Control_Spin_SetText;
+  m_callbacks->Control_Spin_Clear             = CAddonCallbacksGUI::Control_Spin_Clear;
+  m_callbacks->Control_Spin_AddLabel          = CAddonCallbacksGUI::Control_Spin_AddLabel;
+  m_callbacks->Control_Spin_GetValue          = CAddonCallbacksGUI::Control_Spin_GetValue;
+  m_callbacks->Control_Spin_SetValue          = CAddonCallbacksGUI::Control_Spin_SetValue;
+
+  m_callbacks->Control_RadioButton_SetVisible = CAddonCallbacksGUI::Control_RadioButton_SetVisible;
+  m_callbacks->Control_RadioButton_SetText    = CAddonCallbacksGUI::Control_RadioButton_SetText;
+  m_callbacks->Control_RadioButton_SetSelected= CAddonCallbacksGUI::Control_RadioButton_SetSelected;
+  m_callbacks->Control_RadioButton_IsSelected = CAddonCallbacksGUI::Control_RadioButton_IsSelected;
+
+  m_callbacks->Control_Progress_SetPercentage = CAddonCallbacksGUI::Control_Progress_SetPercentage;
+  m_callbacks->Control_Progress_GetPercentage = CAddonCallbacksGUI::Control_Progress_GetPercentage;
+  m_callbacks->Control_Progress_SetInfo       = CAddonCallbacksGUI::Control_Progress_SetInfo;
+  m_callbacks->Control_Progress_GetInfo       = CAddonCallbacksGUI::Control_Progress_GetInfo;
+  m_callbacks->Control_Progress_GetDescription= CAddonCallbacksGUI::Control_Progress_GetDescription;
+
+  m_callbacks->ListItem_Create                = CAddonCallbacksGUI::ListItem_Create;
+  m_callbacks->ListItem_GetLabel              = CAddonCallbacksGUI::ListItem_GetLabel;
+  m_callbacks->ListItem_SetLabel              = CAddonCallbacksGUI::ListItem_SetLabel;
+  m_callbacks->ListItem_GetLabel2             = CAddonCallbacksGUI::ListItem_GetLabel2;
+  m_callbacks->ListItem_SetLabel2             = CAddonCallbacksGUI::ListItem_SetLabel2;
+  m_callbacks->ListItem_SetInfo               = CAddonCallbacksGUI::ListItem_SetInfo;
+  m_callbacks->ListItem_SetProperty           = CAddonCallbacksGUI::ListItem_SetProperty;
+  m_callbacks->ListItem_GetProperty           = CAddonCallbacksGUI::ListItem_GetProperty;
+  m_callbacks->ListItem_SetPath               = CAddonCallbacksGUI::ListItem_SetPath;
+
+  m_callbacks->RenderAddon_SetCallbacks       = CAddonCallbacksGUI::RenderAddon_SetCallbacks;
+  m_callbacks->RenderAddon_Delete             = CAddonCallbacksGUI::RenderAddon_Delete;
+
+  m_callbacks->Control_Slider_SetVisible                    = CAddonCallbacksGUI::Control_Slider_SetVisible;
+  m_callbacks->Control_Slider_GetDescription                = CAddonCallbacksGUI::Control_Slider_GetDescription;
+  m_callbacks->Control_Slider_SetIntRange                   = CAddonCallbacksGUI::Control_Slider_SetIntRange;
+  m_callbacks->Control_Slider_SetIntValue                   = CAddonCallbacksGUI::Control_Slider_SetIntValue;
+  m_callbacks->Control_Slider_GetIntValue                   = CAddonCallbacksGUI::Control_Slider_GetIntValue;
+  m_callbacks->Control_Slider_SetIntInterval                = CAddonCallbacksGUI::Control_Slider_SetIntInterval;
+  m_callbacks->Control_Slider_SetPercentage                 = CAddonCallbacksGUI::Control_Slider_SetPercentage;
+  m_callbacks->Control_Slider_GetPercentage                 = CAddonCallbacksGUI::Control_Slider_GetPercentage;
+  m_callbacks->Control_Slider_SetFloatRange                 = CAddonCallbacksGUI::Control_Slider_SetFloatRange;
+  m_callbacks->Control_Slider_SetFloatValue                 = CAddonCallbacksGUI::Control_Slider_SetFloatValue;
+  m_callbacks->Control_Slider_GetFloatValue                 = CAddonCallbacksGUI::Control_Slider_GetFloatValue;
+  m_callbacks->Control_Slider_SetFloatInterval              = CAddonCallbacksGUI::Control_Slider_SetFloatInterval;
+
+  m_callbacks->Control_SettingsSlider_SetVisible            = CAddonCallbacksGUI::Control_SettingsSlider_SetVisible;
+  m_callbacks->Control_SettingsSlider_SetText               = CAddonCallbacksGUI::Control_SettingsSlider_SetText;
+  m_callbacks->Control_SettingsSlider_GetDescription        = CAddonCallbacksGUI::Control_SettingsSlider_GetDescription;
+  m_callbacks->Control_SettingsSlider_SetIntRange           = CAddonCallbacksGUI::Control_SettingsSlider_SetIntRange;
+  m_callbacks->Control_SettingsSlider_SetIntValue           = CAddonCallbacksGUI::Control_SettingsSlider_SetIntValue;
+  m_callbacks->Control_SettingsSlider_GetIntValue           = CAddonCallbacksGUI::Control_SettingsSlider_GetIntValue;
+  m_callbacks->Control_SettingsSlider_SetIntInterval        = CAddonCallbacksGUI::Control_SettingsSlider_SetIntInterval;
+  m_callbacks->Control_SettingsSlider_SetPercentage         = CAddonCallbacksGUI::Control_SettingsSlider_SetPercentage;
+  m_callbacks->Control_SettingsSlider_GetPercentage         = CAddonCallbacksGUI::Control_SettingsSlider_GetPercentage;
+  m_callbacks->Control_SettingsSlider_SetFloatRange         = CAddonCallbacksGUI::Control_SettingsSlider_SetFloatRange;
+  m_callbacks->Control_SettingsSlider_SetFloatValue         = CAddonCallbacksGUI::Control_SettingsSlider_SetFloatValue;
+  m_callbacks->Control_SettingsSlider_GetFloatValue         = CAddonCallbacksGUI::Control_SettingsSlider_GetFloatValue;
+  m_callbacks->Control_SettingsSlider_SetFloatInterval      = CAddonCallbacksGUI::Control_SettingsSlider_SetFloatInterval;
+
+  m_callbacks->Dialog_Keyboard_ShowAndGetInputWithHead      = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInputWithHead;
+  m_callbacks->Dialog_Keyboard_ShowAndGetInput              = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInput;
+  m_callbacks->Dialog_Keyboard_ShowAndGetNewPasswordWithHead = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPasswordWithHead;
+  m_callbacks->Dialog_Keyboard_ShowAndGetNewPassword        = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPassword;
+  m_callbacks->Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead;
+  m_callbacks->Dialog_Keyboard_ShowAndVerifyNewPassword     = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPassword;
+  m_callbacks->Dialog_Keyboard_ShowAndVerifyPassword        = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyPassword;
+  m_callbacks->Dialog_Keyboard_ShowAndGetFilter             = CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetFilter;
+  m_callbacks->Dialog_Keyboard_SendTextToActiveKeyboard     = CAddonCallbacksGUI::Dialog_Keyboard_SendTextToActiveKeyboard;
+  m_callbacks->Dialog_Keyboard_isKeyboardActivated          = CAddonCallbacksGUI::Dialog_Keyboard_isKeyboardActivated;
+
+  m_callbacks->Dialog_Numeric_ShowAndVerifyNewPassword      = CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyNewPassword;
+  m_callbacks->Dialog_Numeric_ShowAndVerifyPassword         = CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyPassword;
+  m_callbacks->Dialog_Numeric_ShowAndVerifyInput            = CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyInput;
+  m_callbacks->Dialog_Numeric_ShowAndGetTime                = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetTime;
+  m_callbacks->Dialog_Numeric_ShowAndGetDate                = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetDate;
+  m_callbacks->Dialog_Numeric_ShowAndGetIPAddress           = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetIPAddress;
+  m_callbacks->Dialog_Numeric_ShowAndGetNumber              = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetNumber;
+  m_callbacks->Dialog_Numeric_ShowAndGetSeconds             = CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetSeconds;
+
+  m_callbacks->Dialog_FileBrowser_ShowAndGetFile            = CAddonCallbacksGUI::Dialog_FileBrowser_ShowAndGetFile;
+
+  m_callbacks->Dialog_OK_ShowAndGetInputSingleText          = CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputSingleText;
+  m_callbacks->Dialog_OK_ShowAndGetInputLineText            = CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputLineText;
+
+  m_callbacks->Dialog_YesNo_ShowAndGetInputSingleText       = CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputSingleText;
+  m_callbacks->Dialog_YesNo_ShowAndGetInputLineText         = CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineText;
+  m_callbacks->Dialog_YesNo_ShowAndGetInputLineButtonText   = CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineButtonText;
+
+  m_callbacks->Dialog_TextViewer                            = CAddonCallbacksGUI::Dialog_TextViewer;
+
+  m_callbacks->Dialog_Select                                = CAddonCallbacksGUI::Dialog_Select;
+}
+
+CAddonCallbacksGUI::~CAddonCallbacksGUI()
+{
+  delete m_callbacks;
+}
+
+void CAddonCallbacksGUI::Lock()
+{
+  if (iXBMCGUILockRef == 0)
+    CServiceBroker::GetWinSystem()->GetGfxContext().lock();
+  iXBMCGUILockRef++;
+}
+
+void CAddonCallbacksGUI::Unlock()
+{
+  if (iXBMCGUILockRef > 0)
+  {
+    iXBMCGUILockRef--;
+    if (iXBMCGUILockRef == 0)
+      CServiceBroker::GetWinSystem()->GetGfxContext().unlock();
+  }
+}
+
+int CAddonCallbacksGUI::GetScreenHeight()
+{
+  return CServiceBroker::GetWinSystem()->GetGfxContext().GetHeight();
+}
+
+int CAddonCallbacksGUI::GetScreenWidth()
+{
+  return CServiceBroker::GetWinSystem()->GetGfxContext().GetWidth();
+}
+
+int CAddonCallbacksGUI::GetVideoResolution()
+{
+  return (int)CServiceBroker::GetWinSystem()->GetGfxContext().GetVideoResolution();
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_New(void *addonData, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return NULL;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  RESOLUTION_INFO res;
+  std::string strSkinPath;
+  if (!forceFallback)
+  {
+    /* Check to see if the XML file exists in current skin. If not use
+       fallback path to find a skin for the addon */
+    strSkinPath = g_SkinInfo->GetSkinPath(xmlFilename, &res);
+    if (!XFILE::CFile::Exists(strSkinPath))
+    {
+      /* Check for the matching folder for the skin in the fallback skins folder */
+      std::string basePath = URIUtils::AddFileToFolder(
+        guiHelper->m_addon->Path(),
+        "resources",
+        "skins",
+        URIUtils::GetFileName(g_SkinInfo->Path()));
+      strSkinPath = g_SkinInfo->GetSkinPath(xmlFilename, &res, basePath);
+      if (!XFILE::CFile::Exists(strSkinPath))
+      {
+        /* Finally fallback to the DefaultSkin as it didn't exist in either the
+           XBMC Skin folder or the fallback skin folder */
+        forceFallback = true;
+      }
+    }
+  }
+
+  if (forceFallback)
+  {
+    //FIXME make this static method of current skin?
+    std::string str("none");
+    AddonInfoPtr addonInfo = std::make_shared<CAddonInfo>(str, ADDON_SKIN);
+    addonInfo->SetPath(URIUtils::AddFileToFolder(
+      guiHelper->m_addon->Path(),
+      "resources",
+      "skins",
+      defaultSkin));
+
+    std::shared_ptr<CSkinInfo> skinInfo = std::make_shared<ADDON::CSkinInfo>(addonInfo);
+    skinInfo->Start();
+    strSkinPath = skinInfo->GetSkinPath(xmlFilename, &res, addonInfo->Path());
+
+    if (!XFILE::CFile::Exists(strSkinPath))
+    {
+      CLog::Log(LOGERROR, "Window_New: %s/%s - XML File '%s' for Window is missing, contact Developer '%s' of this AddOn", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str(), strSkinPath.c_str(), guiHelper->m_addon->Author().c_str());
+      return NULL;
+    }
+  }
+
+  // window id's 14000 - 14100 are reserved for addons
+  // get first window id that is not in use
+  int id = WINDOW_ADDON_START;
+  // if window 14099 is in use it means addon can't create more windows
+  Lock();
+  if (CServiceBroker::GetGUI()->GetWindowManager().GetWindow(WINDOW_ADDON_END))
+  {
+    Unlock();
+    CLog::Log(LOGERROR, "Window_New: %s/%s - maximum number of windows reached", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return NULL;
+  }
+  while(id < WINDOW_ADDON_END && CServiceBroker::GetGUI()->GetWindowManager().GetWindow(id) != NULL) id++;
+  Unlock();
+
+  CGUIWindow *window;
+  if (!asDialog)
+    window = new CGUIAddonWindow(id, strSkinPath, guiHelper->m_addon);
+  else
+    window = new CGUIAddonWindowDialog(id, strSkinPath, guiHelper->m_addon);
+
+  Lock();
+  CServiceBroker::GetGUI()->GetWindowManager().Add(window);
+  Unlock();
+
+  window->SetCoordsRes(res);
+
+  return window;
+}
+
+void CAddonCallbacksGUI::Window_Delete(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_Show: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return;
+
+  Lock();
+  // first change to an existing window
+  if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == pAddonWindow->m_iWindowId && !g_application.m_bStop)
+  {
+    if(CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iOldWindowId))
+      CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(pAddonWindow->m_iOldWindowId);
+    else // old window does not exist anymore, switch to home
+      CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(WINDOW_HOME);
+  }
+  // Free any window properties
+  pAddonWindow->ClearProperties();
+  // free the window's resources and unload it (free all guicontrols)
+  pAddonWindow->FreeResources(true);
+
+  CServiceBroker::GetGUI()->GetWindowManager().Remove(pAddonWindow->GetID());
+  delete pAddonWindow;
+  Unlock();
+}
+
+void CAddonCallbacksGUI::Window_SetCallbacks(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*initCB)(GUIHANDLE), bool (*clickCB)(GUIHANDLE, int), bool (*focusCB)(GUIHANDLE, int), bool (*onActionCB)(GUIHANDLE handle, int))
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  pAddonWindow->m_clientHandle  = clienthandle;
+  pAddonWindow->CBOnInit        = initCB;
+  pAddonWindow->CBOnClick       = clickCB;
+  pAddonWindow->CBOnFocus       = focusCB;
+  pAddonWindow->CBOnAction      = onActionCB;
+  Unlock();
+}
+
+bool CAddonCallbacksGUI::Window_Show(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return false;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_Show: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return false;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return false;
+
+  if (pAddonWindow->m_iOldWindowId != pAddonWindow->m_iWindowId && pAddonWindow->m_iWindowId != CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow())
+    pAddonWindow->m_iOldWindowId = CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow();
+
+  Lock();
+  if (pAddonWindow->IsDialog())
+    static_cast<CGUIAddonWindowDialog*>(pAddonWindow)->Show();
+  else
+    CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(pAddonWindow->m_iWindowId);
+  Unlock();
+
+  return true;
+}
+
+bool CAddonCallbacksGUI::Window_Close(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return false;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_Close: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return false;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return false;
+
+  pAddonWindow->m_bModal = false;
+  if (pAddonWindow->IsDialog())
+    static_cast<CGUIAddonWindowDialog*>(pAddonWindow)->PulseActionEvent();
+  else
+    pAddonWindow->PulseActionEvent();
+
+  Lock();
+  // if it's a dialog, we have to close it a bit different
+  if (pAddonWindow->IsDialog())
+    static_cast<CGUIAddonWindowDialog*>(pAddonWindow)->Show(false);
+  else
+    CServiceBroker::GetGUI()->GetWindowManager().ActivateWindow(pAddonWindow->m_iOldWindowId);
+  pAddonWindow->m_iOldWindowId = 0;
+
+  Unlock();
+
+  return true;
+}
+
+bool CAddonCallbacksGUI::Window_DoModal(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return false;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_DoModal: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return false;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return false;
+
+  pAddonWindow->m_bModal = true;
+
+  if (pAddonWindow->m_iWindowId != CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow())
+    Window_Show(addonData, handle);
+
+  return true;
+}
+
+bool CAddonCallbacksGUI::Window_SetFocusId(void *addonData, GUIHANDLE handle, int iControlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return false;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_SetFocusId: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return false;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return false;
+
+  if(!pWindow->GetControl(iControlId))
+  {
+    CLog::Log(LOGERROR, "Window_SetFocusId: %s/%s - Control does not exist in window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return false;
+  }
+
+  Lock();
+  CGUIMessage msg = CGUIMessage(GUI_MSG_SETFOCUS, pAddonWindow->m_iWindowId, iControlId);
+  pWindow->OnMessage(msg);
+  Unlock();
+
+  return true;
+}
+
+int CAddonCallbacksGUI::Window_GetFocusId(void *addonData, GUIHANDLE handle)
+{
+  int iControlId = -1;
+
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return iControlId;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_GetFocusId: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return iControlId;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return iControlId;
+
+  Lock();
+  iControlId = pWindow->GetFocusedControlID();
+  Unlock();
+
+  if (iControlId == -1)
+  {
+    CLog::Log(LOGERROR, "Window_GetFocusId: %s/%s - No control in this window has focus", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return iControlId;
+  }
+
+  return iControlId;
+}
+
+bool CAddonCallbacksGUI::Window_SetCoordinateResolution(void *addonData, GUIHANDLE handle, int res)
+{
+  CLog::Log(LOGERROR, "SetCoordinateResolution: not implemented");
+  return false;
+}
+
+void CAddonCallbacksGUI::Window_SetProperty(void *addonData, GUIHANDLE handle, const char *key, const char *value)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key || !value)
+  {
+    CLog::Log(LOGERROR, "Window_SetProperty: %s/%s - No Window or NULL key or value", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  pWindow->SetProperty(lowerKey, value);
+  Unlock();
+}
+
+void CAddonCallbacksGUI::Window_SetPropertyInt(void *addonData, GUIHANDLE handle, const char *key, int value)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_SetPropertyInt: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  pWindow->SetProperty(lowerKey, value);
+  Unlock();
+}
+
+void CAddonCallbacksGUI::Window_SetPropertyBool(void *addonData, GUIHANDLE handle, const char *key, bool value)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_SetPropertyBool: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  pWindow->SetProperty(lowerKey, value);
+  Unlock();
+}
+
+void CAddonCallbacksGUI::Window_SetPropertyDouble(void *addonData, GUIHANDLE handle, const char *key, double value)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_SetPropertyDouble: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  pWindow->SetProperty(lowerKey, value);
+  Unlock();
+}
+
+const char* CAddonCallbacksGUI::Window_GetProperty(void *addonData, GUIHANDLE handle, const char *key)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return NULL;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_GetProperty: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return NULL;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return NULL;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  std::string value = pWindow->GetProperty(lowerKey).asString();
+  Unlock();
+
+  return strdup(value.c_str());
+}
+
+int CAddonCallbacksGUI::Window_GetPropertyInt(void *addonData, GUIHANDLE handle, const char *key)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return -1;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_GetPropertyInt: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return -1;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return -1;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  int value = (int)pWindow->GetProperty(lowerKey).asInteger();
+  Unlock();
+
+  return value;
+}
+
+bool CAddonCallbacksGUI::Window_GetPropertyBool(void *addonData, GUIHANDLE handle, const char *key)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return false;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_GetPropertyBool: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return false;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return false;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  bool value = pWindow->GetProperty(lowerKey).asBoolean();
+  Unlock();
+
+  return value;
+}
+
+double CAddonCallbacksGUI::Window_GetPropertyDouble(void *addonData, GUIHANDLE handle, const char *key)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return 0.0;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle || !key)
+  {
+    CLog::Log(LOGERROR, "Window_GetPropertyDouble: %s/%s - No Window or NULL key", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return 0.0;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return 0.0;
+
+  std::string lowerKey = key;
+  StringUtils::ToLower(lowerKey);
+
+  Lock();
+  double value = pWindow->GetProperty(lowerKey).asDouble();
+  Unlock();
+
+  return value;
+}
+
+void CAddonCallbacksGUI::Window_ClearProperties(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+
+  if (!handle)
+  {
+    CLog::Log(LOGERROR, "Window_ClearProperties: %s/%s - No Window", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return;
+  }
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIWindow      *pWindow      = CServiceBroker::GetGUI()->GetWindowManager().GetWindow(pAddonWindow->m_iWindowId);
+  if (!pWindow)
+    return;
+
+  Lock();
+  pWindow->ClearProperties();
+  Unlock();
+}
+
+int CAddonCallbacksGUI::Window_GetListSize(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return -1;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  int listSize = pAddonWindow->GetListSize();
+  Unlock();
+
+  return listSize;
+}
+
+void CAddonCallbacksGUI::Window_ClearList(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  pAddonWindow->ClearList();
+  Unlock();
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_AddItem(void *addonData, GUIHANDLE handle, GUIHANDLE item, int itemPosition)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle || !item)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CFileItemPtr pItem(static_cast<CFileItem*>(item));
+  Lock();
+  pAddonWindow->AddItem(pItem, itemPosition);
+  Unlock();
+
+  return item;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_AddStringItem(void *addonData, GUIHANDLE handle, const char *itemName, int itemPosition)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle || !itemName)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CFileItemPtr item(new CFileItem(itemName));
+  Lock();
+  pAddonWindow->AddItem(item, itemPosition);
+  Unlock();
+
+  return item.get();
+}
+
+void CAddonCallbacksGUI::Window_RemoveItem(void *addonData, GUIHANDLE handle, int itemPosition)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  pAddonWindow->RemoveItem(itemPosition);
+  Unlock();
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetListItem(void *addonData, GUIHANDLE handle, int listPos)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CAddonCallbacksGUI* guiHelper = static_cast<CAddonCallbacksGUI*>(helper->GUILib_GetHelper());
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  CFileItemPtr fi = pAddonWindow->GetListItem(listPos);
+  if (fi == NULL)
+  {
+    Unlock();
+    CLog::Log(LOGERROR, "Window_GetListItem: %s/%s - Index out of range", CAddonInfo::TranslateType(guiHelper->m_addon->Type()).c_str(), guiHelper->m_addon->Name().c_str());
+    return NULL;
+  }
+  Unlock();
+
+  return fi.get();
+}
+
+void CAddonCallbacksGUI::Window_SetCurrentListPosition(void *addonData, GUIHANDLE handle, int listPos)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  pAddonWindow->SetCurrentListPosition(listPos);
+  Unlock();
+}
+
+int CAddonCallbacksGUI::Window_GetCurrentListPosition(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return -1;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  Lock();
+  int listPos = pAddonWindow->GetCurrentListPosition();
+  Unlock();
+
+  return listPos;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Spin(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_SPINEX)
+    return NULL;
+
+  return pGUIControl;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Button(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_BUTTON)
+    return NULL;
+
+  return pGUIControl;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_RadioButton(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_RADIO)
+    return NULL;
+
+  return pGUIControl;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Edit(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_EDIT)
+    return NULL;
+
+  return pGUIControl;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Progress(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_PROGRESS)
+    return NULL;
+
+  return pGUIControl;
+}
+
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_RenderAddon(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_RENDERADDON)
+    return NULL;
+
+  CGUIAddonRenderingControl *pProxyControl;
+  pProxyControl = new CGUIAddonRenderingControl(static_cast<CGUIRenderingControl*>(pGUIControl));
+  return pProxyControl;
+}
+
+void CAddonCallbacksGUI::Window_SetControlLabel(void *addonData, GUIHANDLE handle, int controlId, const char *label)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  CGUIMessage msg(GUI_MSG_LABEL_SET, pAddonWindow->m_iWindowId, controlId);
+  msg.SetLabel(label);
+  pAddonWindow->OnMessage(msg);
+}
+
+void CAddonCallbacksGUI::Window_MarkDirtyRegion(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+
+  pAddonWindow->MarkDirtyRegion();
+}
+
+void CAddonCallbacksGUI::Control_Spin_SetVisible(void *addonData, GUIHANDLE spinhandle, bool yesNo)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !spinhandle)
+    return;
+
+  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
+  pSpin->SetVisible(yesNo);
+}
+
+void CAddonCallbacksGUI::Control_Spin_SetText(void *addonData, GUIHANDLE spinhandle, const char *label)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !spinhandle)
+    return;
+
+  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
+  pSpin->SetText(label);
+}
+
+void CAddonCallbacksGUI::Control_Spin_Clear(void *addonData, GUIHANDLE spinhandle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !spinhandle)
+    return;
+
+  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
+  pSpin->Clear();
+}
+
+void CAddonCallbacksGUI::Control_Spin_AddLabel(void *addonData, GUIHANDLE spinhandle, const char *label, int iValue)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !spinhandle)
+    return;
+
+  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
+  pSpin->AddLabel(label, iValue);
+}
+
+int CAddonCallbacksGUI::Control_Spin_GetValue(void *addonData, GUIHANDLE spinhandle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !spinhandle)
+    return -1;
+
+  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
+  return pSpin->GetValue();
+}
+
+void CAddonCallbacksGUI::Control_Spin_SetValue(void *addonData, GUIHANDLE spinhandle, int iValue)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !spinhandle)
+    return;
+
+  CGUISpinControlEx *pSpin = static_cast<CGUISpinControlEx*>(spinhandle);
+  pSpin->SetValue(iValue);
+}
+
+void CAddonCallbacksGUI::Control_RadioButton_SetVisible(void *addonData, GUIHANDLE handle, bool yesNo)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
+  pRadioButton->SetVisible(yesNo);
+}
+
+void CAddonCallbacksGUI::Control_RadioButton_SetText(void *addonData, GUIHANDLE handle, const char *label)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
+  pRadioButton->SetLabel(label);
+}
+
+void CAddonCallbacksGUI::Control_RadioButton_SetSelected(void *addonData, GUIHANDLE handle, bool yesNo)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
+  pRadioButton->SetSelected(yesNo);
+}
+
+bool CAddonCallbacksGUI::Control_RadioButton_IsSelected(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return false;
+
+  CGUIRadioButtonControl *pRadioButton = static_cast<CGUIRadioButtonControl*>(handle);
+  return pRadioButton->IsSelected();
+}
+
+void CAddonCallbacksGUI::Control_Progress_SetPercentage(void *addonData, GUIHANDLE handle, float fPercent)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
+  pControl->SetPercentage(fPercent);
+}
+
+float CAddonCallbacksGUI::Control_Progress_GetPercentage(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0.0;
+
+  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
+  return pControl->GetPercentage();
+}
+
+void CAddonCallbacksGUI::Control_Progress_SetInfo(void *addonData, GUIHANDLE handle, int iInfo)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
+  pControl->SetInfo(iInfo);
+}
+
+int CAddonCallbacksGUI::Control_Progress_GetInfo(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return -1;
+
+  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
+  return pControl->GetInfo();
+}
+
+const char* CAddonCallbacksGUI::Control_Progress_GetDescription(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIProgressControl *pControl = static_cast<CGUIProgressControl*>(handle);
+  std::string string = pControl->GetDescription();
+
+  char *buffer = (char*) malloc (string.length()+1);
+  strcpy(buffer, string.c_str());
+  return buffer;
+}
+
+/*
+ * GUI slider control callback functions
+ */
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_Slider(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_SLIDER)
+    return NULL;
+
+  return pGUIControl;
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetVisible(void *addonData, GUIHANDLE handle, bool yesNo)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIControl *pControl = static_cast<CGUIControl*>(handle);
+  pControl->SetVisible(yesNo);
+}
+
+const char* CAddonCallbacksGUI::Control_Slider_GetDescription(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  std::string string = pControl->GetDescription();
+
+  char *buffer = (char*) malloc (string.length()+1);
+  strcpy(buffer, string.c_str());
+  return buffer;
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetIntRange(void *addonData, GUIHANDLE handle, int iStart, int iEnd)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetRange(iStart, iEnd);
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetIntValue(void *addonData, GUIHANDLE handle, int iValue)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetType(SPIN_CONTROL_TYPE_INT);
+  pControl->SetIntValue(iValue);
+}
+
+int CAddonCallbacksGUI::Control_Slider_GetIntValue(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  return pControl->GetIntValue();
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetIntInterval(void *addonData, GUIHANDLE handle, int iInterval)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetIntInterval(iInterval);
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetPercentage(void *addonData, GUIHANDLE handle, float fPercent)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
+  pControl->SetPercentage(fPercent);
+}
+
+float CAddonCallbacksGUI::Control_Slider_GetPercentage(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0.0f;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  return pControl->GetPercentage();
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetFloatRange(void *addonData, GUIHANDLE handle, float fStart, float fEnd)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetFloatRange(fStart, fEnd);
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetFloatValue(void *addonData, GUIHANDLE handle, float iValue)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
+  pControl->SetFloatValue(iValue);
+}
+
+float CAddonCallbacksGUI::Control_Slider_GetFloatValue(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0.0f;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  return pControl->GetFloatValue();
+}
+
+void CAddonCallbacksGUI::Control_Slider_SetFloatInterval(void *addonData, GUIHANDLE handle, float fInterval)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISliderControl *pControl = static_cast<CGUISliderControl*>(handle);
+  pControl->SetFloatInterval(fInterval);
+}
+
+/*
+ * GUI settings slider control callback functions
+ */
+GUIHANDLE CAddonCallbacksGUI::Window_GetControl_SettingsSlider(void *addonData, GUIHANDLE handle, int controlId)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUIAddonWindow *pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
+  CGUIControl* pGUIControl = pAddonWindow->GetControl(controlId);
+  if (pGUIControl && pGUIControl->GetControlType() != CGUIControl::GUICONTROL_SETTINGS_SLIDER)
+    return NULL;
+
+  return pGUIControl;
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetVisible(void *addonData, GUIHANDLE handle, bool yesNo)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIControl *pControl = static_cast<CGUIControl*>(handle);
+  pControl->SetVisible(yesNo);
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetText(void *addonData, GUIHANDLE handle, const char *label)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetText(label);
+}
+
+const char* CAddonCallbacksGUI::Control_SettingsSlider_GetDescription(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  std::string string = pControl->GetDescription();
+
+  char *buffer = (char*) malloc (string.length()+1);
+  strcpy(buffer, string.c_str());
+  return buffer;
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetIntRange(void *addonData, GUIHANDLE handle, int iStart, int iEnd)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetRange(iStart, iEnd);
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetIntValue(void *addonData, GUIHANDLE handle, int iValue)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetType(SPIN_CONTROL_TYPE_INT);
+  pControl->SetIntValue(iValue);
+}
+
+int CAddonCallbacksGUI::Control_SettingsSlider_GetIntValue(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  return pControl->GetIntValue();
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetIntInterval(void *addonData, GUIHANDLE handle, int iInterval)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetIntInterval(iInterval);
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetPercentage(void *addonData, GUIHANDLE handle, float fPercent)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
+  pControl->SetPercentage(fPercent);
+}
+
+float CAddonCallbacksGUI::Control_SettingsSlider_GetPercentage(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0.0f;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  return pControl->GetPercentage();
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetFloatRange(void *addonData, GUIHANDLE handle, float fStart, float fEnd)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetFloatRange(fStart, fEnd);
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetFloatValue(void *addonData, GUIHANDLE handle, float fValue)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetType(SPIN_CONTROL_TYPE_FLOAT);
+  pControl->SetFloatValue(fValue);
+}
+
+float CAddonCallbacksGUI::Control_SettingsSlider_GetFloatValue(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return 0.0f;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  return pControl->GetFloatValue();
+}
+
+void CAddonCallbacksGUI::Control_SettingsSlider_SetFloatInterval(void *addonData, GUIHANDLE handle, float fInterval)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUISettingsSliderControl *pControl = static_cast<CGUISettingsSliderControl*>(handle);
+  pControl->SetFloatInterval(fInterval);
+}
+
+/*
+ * GUI list item control callback functions
+ */
+GUIHANDLE CAddonCallbacksGUI::ListItem_Create(void *addonData, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper)
+    return NULL;
+
+  // create CFileItem
+  CFileItem *pItem = new CFileItem();
+  if (!pItem)
+    return NULL;
+
+  if (label)
+    pItem->SetLabel(label);
+  if (label2)
+    pItem->SetLabel2(label2);
+  if (iconImage)
+    pItem->SetArt("icon", iconImage);
+  if (thumbnailImage)
+    pItem->SetArt("thumb", thumbnailImage);
+  if (path)
+    pItem->SetPath(path);
+
+  return pItem;
+}
+
+const char* CAddonCallbacksGUI::ListItem_GetLabel(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  std::string string = static_cast<CFileItem*>(handle)->GetLabel();
+  char *buffer = (char*) malloc (string.length()+1);
+  strcpy(buffer, string.c_str());
+  return buffer;
+}
+
+void CAddonCallbacksGUI::ListItem_SetLabel(void *addonData, GUIHANDLE handle, const char *label)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  static_cast<CFileItem*>(handle)->SetLabel(label);
+}
+
+const char* CAddonCallbacksGUI::ListItem_GetLabel2(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  std::string string = static_cast<CFileItem*>(handle)->GetLabel2();
+
+  char *buffer = (char*) malloc (string.length()+1);
+  strcpy(buffer, string.c_str());
+  return buffer;
+}
+
+void CAddonCallbacksGUI::ListItem_SetLabel2(void *addonData, GUIHANDLE handle, const char *label)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  static_cast<CFileItem*>(handle)->SetLabel2(label);
+}
+
+void CAddonCallbacksGUI::ListItem_SetInfo(void *addonData, GUIHANDLE handle, const char *info)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+}
+
+void CAddonCallbacksGUI::ListItem_SetProperty(void *addonData, GUIHANDLE handle, const char *key, const char *value)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  static_cast<CFileItem*>(handle)->SetProperty(key, value);
+}
+
+const char* CAddonCallbacksGUI::ListItem_GetProperty(void *addonData, GUIHANDLE handle, const char *key)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return NULL;
+
+  std::string string = static_cast<CFileItem*>(handle)->GetProperty(key).asString();
+  char *buffer = (char*) malloc (string.length()+1);
+  strcpy(buffer, string.c_str());
+  return buffer;
+}
+
+void CAddonCallbacksGUI::ListItem_SetPath(void *addonData, GUIHANDLE handle, const char *path)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  static_cast<CFileItem*>(handle)->SetPath(path);
+}
+
+void CAddonCallbacksGUI::RenderAddon_SetCallbacks(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*createCB)(GUIHANDLE,int,int,int,int,void*), void (*renderCB)(GUIHANDLE), void (*stopCB)(GUIHANDLE), bool (*dirtyCB)(GUIHANDLE))
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonRenderingControl *pAddonControl = static_cast<CGUIAddonRenderingControl*>(handle);
+
+  Lock();
+  pAddonControl->m_clientHandle  = clienthandle;
+  pAddonControl->CBCreate        = createCB;
+  pAddonControl->CBRender        = renderCB;
+  pAddonControl->CBStop          = stopCB;
+  pAddonControl->CBDirty         = dirtyCB;
+  Unlock();
+
+  pAddonControl->m_pControl->InitCallback(pAddonControl);
+}
+
+void CAddonCallbacksGUI::RenderAddon_Delete(void *addonData, GUIHANDLE handle)
+{
+  CAddonInterfaces* helper = (CAddonInterfaces*) addonData;
+  if (!helper || !handle)
+    return;
+
+  CGUIAddonRenderingControl *pAddonControl = static_cast<CGUIAddonRenderingControl*>(handle);
+
+  Lock();
+  pAddonControl->Delete();
+  Unlock();
+}
+
+/*! @name GUI Keyboard functions */
+//@{
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInputWithHead(char &aTextString, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs)
+{
+  std::string str = &aTextString;
+  bool bRet = CGUIKeyboardFactory::ShowAndGetInput(str, CVariant{strHeading}, allowEmptyResult, hiddenInput, autoCloseMs);
+  if (bRet)
+    strncpy(&aTextString, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetInput(char &aTextString, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs)
+{
+  std::string str = &aTextString;
+  bool bRet = CGUIKeyboardFactory::ShowAndGetInput(str, allowEmptyResult, autoCloseMs);
+  if (bRet)
+    strncpy(&aTextString, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPasswordWithHead(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs)
+{
+  std::string str = &strNewPassword;
+  bool bRet = CGUIKeyboardFactory::ShowAndGetNewPassword(str, strHeading, allowEmptyResult, autoCloseMs);
+  if (bRet)
+    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs)
+{
+  std::string str = &strNewPassword;
+  bool bRet = CGUIKeyboardFactory::ShowAndGetNewPassword(str, autoCloseMs);
+  if (bRet)
+    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs)
+{
+  std::string str = &strNewPassword;
+  bool bRet = CGUIKeyboardFactory::ShowAndVerifyNewPassword(str, strHeading, allowEmptyResult, autoCloseMs);
+  if (bRet)
+    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs)
+{
+  std::string str = &strNewPassword;
+  bool bRet = CGUIKeyboardFactory::ShowAndVerifyNewPassword(str, autoCloseMs);
+  if (bRet)
+    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+int CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs)
+{
+  std::string str = &strPassword;
+  int iRet = CGUIKeyboardFactory::ShowAndVerifyPassword(str, strHeading, iRetries, autoCloseMs);
+  if (iRet)
+    strncpy(&strPassword, str.c_str(), iMaxStringSize);
+  return iRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetFilter(char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs)
+{
+  std::string strText = &aTextString;
+  bool bRet = CGUIKeyboardFactory::ShowAndGetFilter(strText, searching, autoCloseMs);
+  if (bRet)
+    strncpy(&aTextString, strText.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_SendTextToActiveKeyboard(const char *aTextString, bool closeKeyboard)
+{
+  return CGUIKeyboardFactory::SendTextToActiveKeyboard(aTextString, closeKeyboard);
+}
+
+bool CAddonCallbacksGUI::Dialog_Keyboard_isKeyboardActivated()
+{
+  return CGUIKeyboardFactory::isKeyboardActivated();
+}
+//@}
+
+/*! @name GUI Numeric functions */
+//@{
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize)
+{
+  std::string str = &strNewPassword;
+  bool bRet = CGUIDialogNumeric::ShowAndVerifyNewPassword(str);
+  if (bRet)
+    strncpy(&strNewPassword, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+int CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries)
+{
+  std::string str = &strPassword;
+  int bRet = CGUIDialogNumeric::ShowAndVerifyPassword(str, strHeading, iRetries);
+  if (bRet)
+    strncpy(&strPassword, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndVerifyInput(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput)
+{
+  std::string str = &strPassword;
+  if (CGUIDialogNumeric::ShowAndVerifyInput(str, strHeading, bGetUserInput) == InputVerificationResult::SUCCESS)
+  {
+    strncpy(&strPassword, str.c_str(), iMaxStringSize);
+    return true;
+  }
+  return false;
+}
+
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetTime(tm &time, const char *strHeading)
+{
+  KODI::TIME::SystemTime systemTime;
+  CDateTime dateTime(time);
+  dateTime.GetAsSystemTime(systemTime);
+  if (CGUIDialogNumeric::ShowAndGetTime(systemTime, strHeading))
+  {
+    dateTime = systemTime;
+    dateTime.GetAsTm(time);
+    return true;
+  }
+  return false;
+}
+
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetDate(tm &date, const char *strHeading)
+{
+  KODI::TIME::SystemTime systemTime;
+  CDateTime dateTime(date);
+  dateTime.GetAsSystemTime(systemTime);
+  if (CGUIDialogNumeric::ShowAndGetDate(systemTime, strHeading))
+  {
+    dateTime = systemTime;
+    dateTime.GetAsTm(date);
+    return true;
+  }
+  return false;
+}
+
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetIPAddress(char &strIPAddress, unsigned int iMaxStringSize, const char *strHeading)
+{
+  std::string strIP = &strIPAddress;
+  bool bRet = CGUIDialogNumeric::ShowAndGetIPAddress(strIP, strHeading);
+  if (bRet)
+    strncpy(&strIPAddress, strIP.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetNumber(char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs)
+{
+  std::string str = &strInput;
+  bool bRet = CGUIDialogNumeric::ShowAndGetNumber(str, strHeading, iAutoCloseTimeoutMs);
+  if (bRet)
+    strncpy(&strInput, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+
+bool CAddonCallbacksGUI::Dialog_Numeric_ShowAndGetSeconds(char &timeString, unsigned int iMaxStringSize, const char *strHeading)
+{
+  std::string str = &timeString;
+  bool bRet = CGUIDialogNumeric::ShowAndGetSeconds(str, strHeading);
+  if (bRet)
+    strncpy(&timeString, str.c_str(), iMaxStringSize);
+  return bRet;
+}
+//@}
+
+/*! @name GUI File browser functions */
+//@{
+bool CAddonCallbacksGUI::Dialog_FileBrowser_ShowAndGetFile(const char *directory, const char *mask, const char *heading, char &path, unsigned int iMaxStringSize, bool useThumbs, bool useFileDirectories, bool singleList)
+{
+  std::string strPath = &path;
+  bool bRet = CGUIDialogFileBrowser::ShowAndGetFile(directory, mask, heading, strPath, useThumbs, useFileDirectories, singleList);
+  if (bRet)
+    strncpy(&path, strPath.c_str(), iMaxStringSize);
+  return bRet;
+}
+//@}
+
+/*! @name GUI OK Dialog */
+//@{
+void CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputSingleText(const char *heading, const char *text)
+{
+  HELPERS::ShowOKDialogText(CVariant{heading}, CVariant{text});
+}
+
+void CAddonCallbacksGUI::Dialog_OK_ShowAndGetInputLineText(const char *heading, const char *line0, const char *line1, const char *line2)
+{
+  HELPERS::ShowOKDialogLines(CVariant{heading}, CVariant{line0}, CVariant{line1}, CVariant{line2});
+}
+//@}
+
+/*! @name GUI Yes No Dialog */
+//@{
+bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputSingleText(const char *heading, const char *text, bool& bCanceled, const char *noLabel, const char *yesLabel)
+{
+  DialogResponse result = HELPERS::ShowYesNoDialogText(heading, text, noLabel, yesLabel);
+  bCanceled = result == DialogResponse::CANCELLED;
+  return result == DialogResponse::YES;
+}
+
+bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineText(const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel)
+{
+  return HELPERS::ShowYesNoDialogLines(heading, line0, line1, line2, noLabel, yesLabel) ==
+    DialogResponse::YES;
+}
+
+bool CAddonCallbacksGUI::Dialog_YesNo_ShowAndGetInputLineButtonText(const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel, const char *yesLabel)
+{
+  DialogResponse result = HELPERS::ShowYesNoDialogLines(heading, line0, line1, line2, noLabel, yesLabel);
+  bCanceled = result == DialogResponse::CANCELLED;
+  return result == DialogResponse::YES;
+}
+//@}
+
+/*! @name GUI Text viewer Dialog */
+//@{
+void CAddonCallbacksGUI::Dialog_TextViewer(const char *heading, const char *text)
+{
+  CGUIDialogTextViewer* pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogTextViewer>(WINDOW_DIALOG_TEXT_VIEWER);
+  pDialog->SetHeading(heading);
+  pDialog->SetText(text);
+  pDialog->Open();
+}
+//@}
+
+/*! @name GUI select Dialog */
+//@{
+int CAddonCallbacksGUI::Dialog_Select(const char *heading, const char *entries[], unsigned int size, int selected)
+{
+  CGUIDialogSelect* pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
+  pDialog->Reset();
+  pDialog->SetHeading(CVariant{heading});
+
+  for (unsigned int i = 0; i < size; i++)
+    pDialog->Add(entries[i]);
+
+  if (selected > 0)
+    pDialog->SetSelected(selected);
+
+  pDialog->Open();
+  return pDialog->GetSelectedItem();
+}
+//@}
+
+} /* namespace GUI */
+} /* namespace KodiAPI */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/AddonCallbacksGUI.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/AddonGUIRenderingControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/AddonGUIRenderingControl.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/AddonGUIWindow.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/AddonGUIWindow.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/General.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/General.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/ListItem.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/ListItem.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/Window.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/Window.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls Added

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Button.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Button.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Edit.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Edit.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/FadeLabel.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/FadeLabel.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Image.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Image.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Label.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Label.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Progress.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Progress.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/RadioButton.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/RadioButton.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Rendering.cpp Added

@@ -0,0 +1,145 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "Rendering.h"
+
+#include "addons/binary-addons/AddonDll.h"
+#include "addons/interfaces/gui/General.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h"
+#include "guilib/GUIRenderingControl.h"
+#include "utils/log.h"
+
+extern "C"
+{
+namespace ADDON
+{
+
+void Interface_GUIControlAddonRendering::Init(AddonGlobalInterface* addonInterface)
+{
+  addonInterface->toKodi->kodi_gui->control_rendering = static_cast<AddonToKodiFuncTable_kodi_gui_control_rendering*>(malloc(sizeof(AddonToKodiFuncTable_kodi_gui_control_rendering)));
+
+  addonInterface->toKodi->kodi_gui->control_rendering->set_callbacks = set_callbacks;
+  addonInterface->toKodi->kodi_gui->control_rendering->destroy = destroy;
+}
+
+void Interface_GUIControlAddonRendering::DeInit(AddonGlobalInterface* addonInterface)
+{
+  free(addonInterface->toKodi->kodi_gui->control_rendering);
+}
+
+void Interface_GUIControlAddonRendering::set_callbacks(
+                            void* kodiBase, void* handle, void* clienthandle,
+                            bool (*createCB)(void*,int,int,int,int,void*),
+                            void (*renderCB)(void*), void (*stopCB)(void*), bool (*dirtyCB)(void*))
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  CGUIAddonRenderingControl* control = static_cast<CGUIAddonRenderingControl*>(handle);
+  if (!addon || !control)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', "
+              "handle='%p') on addon '%s'",
+              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
+    return;
+  }
+
+  Interface_GUIGeneral::lock();
+  control->m_clientHandle = clienthandle;
+  control->CBCreate = createCB;
+  control->CBRender = renderCB;
+  control->CBStop = stopCB;
+  control->CBDirty = dirtyCB;
+  control->m_addon = addon;
+  Interface_GUIGeneral::unlock();
+
+  control->m_control->InitCallback(control);
+}
+
+void Interface_GUIControlAddonRendering::destroy(void* kodiBase, void* handle)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  CGUIAddonRenderingControl* control = static_cast<CGUIAddonRenderingControl*>(handle);
+  if (!addon || !control)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', "
+              "handle='%p') on addon '%s'",
+              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
+    return;
+  }
+
+  Interface_GUIGeneral::lock();
+  static_cast<CGUIAddonRenderingControl*>(handle)->Delete();
+  Interface_GUIGeneral::unlock();
+}
+
+
+CGUIAddonRenderingControl::CGUIAddonRenderingControl(CGUIRenderingControl *control)
+  : CBCreate{nullptr},
+    CBRender{nullptr},
+    CBStop{nullptr},
+    CBDirty{nullptr},
+    m_clientHandle{nullptr},
+    m_addon{nullptr},
+    m_control{control},
+    m_refCount{1}
+{
+}
+
+bool CGUIAddonRenderingControl::Create(int x, int y, int w, int h, void *device)
+{
+  if (CBCreate)
+  {
+    if (CBCreate(m_clientHandle, x, y, w, h, device))
+    {
+      ++m_refCount;
+      return true;
+    }
+  }
+  return false;
+}
+
+void CGUIAddonRenderingControl::Render()
+{
+  if (CBRender)
+  {
+    CBRender(m_clientHandle);
+  }
+}
+
+void CGUIAddonRenderingControl::Stop()
+{
+  if (CBStop)
+  {
+    CBStop(m_clientHandle);
+  }
+
+  --m_refCount;
+  if (m_refCount <= 0)
+    delete this;
+}
+
+void CGUIAddonRenderingControl::Delete()
+{
+  --m_refCount;
+  if (m_refCount <= 0)
+    delete this;
+}
+
+bool CGUIAddonRenderingControl::IsDirty()
+{
+  bool ret = true;
+  if (CBDirty)
+  {
+    ret = CBDirty(m_clientHandle);
+  }
+  return ret;
+}
+
+} /* namespace ADDON */
+} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Rendering.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/SettingsSlider.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/SettingsSlider.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Slider.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Slider.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Spin.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/Spin.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/TextBox.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/controls/TextBox.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs Added

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/ContextMenu.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/ContextMenu.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/ExtendedProgressBar.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/ExtendedProgressBar.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/FileBrowser.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/FileBrowser.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Keyboard.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Keyboard.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Numeric.cpp Added

@@ -0,0 +1,245 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "Numeric.h"
+
+#include "XBDateTime.h"
+#include "addons/binary-addons/AddonDll.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h"
+#include "dialogs/GUIDialogNumeric.h"
+#include "utils/log.h"
+
+extern "C"
+{
+namespace ADDON
+{
+
+void Interface_GUIDialogNumeric::Init(AddonGlobalInterface* addonInterface)
+{
+  addonInterface->toKodi->kodi_gui->dialogNumeric = static_cast<AddonToKodiFuncTable_kodi_gui_dialogNumeric*>(malloc(sizeof(AddonToKodiFuncTable_kodi_gui_dialogNumeric)));
+
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_verify_new_password = show_and_verify_new_password;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_verify_password = show_and_verify_password;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_verify_input = show_and_verify_input;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_time = show_and_get_time;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_date = show_and_get_date;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_ip_address = show_and_get_ip_address;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_number = show_and_get_number;
+  addonInterface->toKodi->kodi_gui->dialogNumeric->show_and_get_seconds = show_and_get_seconds;
+}
+
+void Interface_GUIDialogNumeric::DeInit(AddonGlobalInterface* addonInterface)
+{
+  free(addonInterface->toKodi->kodi_gui->dialogNumeric);
+}
+
+bool Interface_GUIDialogNumeric::show_and_verify_new_password(void* kodiBase, char** password)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  std::string str;
+  bool bRet = CGUIDialogNumeric::ShowAndVerifyNewPassword(str);
+  if (bRet)
+    *password = strdup(str.c_str());
+  return bRet;
+}
+
+int Interface_GUIDialogNumeric::show_and_verify_password(void* kodiBase, const char* password, const char* heading, int retries)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return -1;
+  }
+
+  if (!password || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (password='%p', heading='%p') "
+              "on addon '%s'",
+              __FUNCTION__, password, heading, addon->ID().c_str());
+    return -1;
+  }
+
+  std::string pw(password);
+  return CGUIDialogNumeric::ShowAndVerifyPassword(pw, heading, retries);
+}
+
+bool Interface_GUIDialogNumeric::show_and_verify_input(void* kodiBase, const char* verify_in, char** verify_out, const char* heading, bool verify_input)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  if (!verify_in || !verify_out || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (verify_in='%p', "
+              "verify_out='%p', heading='%p') on addon '%s'",
+              __FUNCTION__, verify_in, static_cast<void*>(verify_out), heading,
+              addon->ID().c_str());
+    return false;
+  }
+
+  std::string str = verify_in;
+  if (CGUIDialogNumeric::ShowAndVerifyInput(str, heading, verify_input) == InputVerificationResult::SUCCESS)
+  {
+    *verify_out = strdup(str.c_str());
+    return true;
+  }
+  return false;
+}
+
+bool Interface_GUIDialogNumeric::show_and_get_time(void* kodiBase, tm* time, const char* heading)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  if (!time || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (time='%p', heading='%p') on "
+              "addon '%s'",
+              __FUNCTION__, static_cast<void*>(time), heading, addon->ID().c_str());
+    return false;
+  }
+
+  KODI::TIME::SystemTime systemTime;
+  CDateTime dateTime(*time);
+  dateTime.GetAsSystemTime(systemTime);
+  if (CGUIDialogNumeric::ShowAndGetTime(systemTime, heading))
+  {
+    dateTime = systemTime;
+    dateTime.GetAsTm(*time);
+    return true;
+  }
+  return false;
+}
+
+bool Interface_GUIDialogNumeric::show_and_get_date(void* kodiBase, tm *date, const char *heading)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  if (!date || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (date='%p', heading='%p') on "
+              "addon '%s'",
+              __FUNCTION__, static_cast<void*>(date), heading, addon->ID().c_str());
+    return false;
+  }
+
+  KODI::TIME::SystemTime systemTime;
+  CDateTime dateTime(*date);
+  dateTime.GetAsSystemTime(systemTime);
+  if (CGUIDialogNumeric::ShowAndGetDate(systemTime, heading))
+  {
+    dateTime = systemTime;
+    dateTime.GetAsTm(*date);
+    return true;
+  }
+  return false;
+}
+
+bool Interface_GUIDialogNumeric::show_and_get_ip_address(void* kodiBase, const char* ip_address_in, char** ip_address_out, const char *heading)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  if (!ip_address_in || !ip_address_out || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (ip_address_in='%p', "
+              "ip_address_out='%p', heading='%p') on addon '%s'",
+              __FUNCTION__, ip_address_in, static_cast<void*>(ip_address_out), heading,
+              addon->ID().c_str());
+    return false;
+  }
+
+  std::string strIP = ip_address_in;
+  bool bRet = CGUIDialogNumeric::ShowAndGetIPAddress(strIP, heading);
+  if (bRet)
+    *ip_address_out = strdup(strIP.c_str());
+  return bRet;
+}
+
+bool Interface_GUIDialogNumeric::show_and_get_number(void* kodiBase, const char* number_in, char** number_out, const char *heading, unsigned int auto_close_ms)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  if (!number_in || !number_out || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (number_in='%p', "
+              "number_out='%p', heading='%p') on addon '%s'",
+              __FUNCTION__, number_in, static_cast<void*>(number_out), heading,
+              addon->ID().c_str());
+    return false;
+  }
+
+  std::string str = number_in;
+  bool bRet = CGUIDialogNumeric::ShowAndGetNumber(str, heading, auto_close_ms);
+  if (bRet)
+    *number_out = strdup(str.c_str());
+  return bRet;
+}
+
+bool Interface_GUIDialogNumeric::show_and_get_seconds(void* kodiBase, const char* time_in, char** time_out, const char *heading)
+{
+  CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
+  if (!addon)
+  {
+    CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid data", __FUNCTION__);
+    return false;
+  }
+
+  if (!time_in || !time_out || !heading)
+  {
+    CLog::Log(LOGERROR,
+              "Interface_GUIDialogNumeric::%s - invalid handler data (time_in='%p', time_out='%p', "
+              "heading='%p') on addon '%s'",
+              __FUNCTION__, time_in, static_cast<void*>(time_out), heading, addon->ID().c_str());
+    return false;
+  }
+
+  std::string str = time_in;
+  bool bRet = CGUIDialogNumeric::ShowAndGetSeconds(str, heading);
+  if (bRet)
+    *time_out = strdup(str.c_str());
+  return bRet;
+}
+
+} /* namespace ADDON */
+} /* extern "C" */

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Numeric.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/OK.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/OK.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Progress.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Progress.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Select.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/Select.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/TextViewer.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/TextViewer.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/YesNo.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/gui/dialogs/YesNo.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/platform/android/System.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/NOTE Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h Changed

@@ -70,6 +70,7 @@
 #define PVR_STREAM_PROPERTY_INPUTSTREAMCLASS  "inputstreamclass" /*!< @brief the name of the inputstream add-on that should be used by Kodi to play the stream denoted by PVR_STREAM_PROPERTY_STREAMURL. Leave blank to use Kodi's built-in playing capabilities or to allow ffmpeg to handle directly set to `inputstream.ffmpeg`. */
 #define PVR_STREAM_PROPERTY_MIMETYPE "mimetype" /*!< @brief the MIME type of the stream that should be played. */
 #define PVR_STREAM_PROPERTY_ISREALTIMESTREAM "isrealtimestream" /*!< @brief "true" to denote that the stream that should be played is a realtime stream. Any other value indicates that this is no realtime stream.*/
+#define PVR_STREAM_PROPERTY_EPGPLAYBACKASLIVE "epgplaybackaslive" /*!< @brief "true" to denote that if the stream is from an EPG tag that it should be played is a live stream. Otherwise if it's a EPG tag it will play as normal video.*/
 #define PVR_STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG  "inputstream.ffmpeg" /*!< @brief special value for PVR_STREAM_PROPERTY_INPUTSTREAMCLASS to use ffmpeg to directly play a stream URL. */
 
 /* using the default avformat's MAX_STREAMS value to be safe */

_service:download_files:master.tar.gz/xbmc/addons/test/TestAddonInfoBuilder.cpp Changed

@@ -63,8 +63,8 @@
   EXPECT_NE(nullptr, addon);
   EXPECT_EQ(addon->ID(), "foo.baz");
   EXPECT_EQ(addon->MainType(), ADDON_VIZ);
-  EXPECT_TRUE(addon->IsType(ADDON_VIZ));
-  EXPECT_FALSE(addon->IsType(ADDON_SCREENSAVER));
+  EXPECT_TRUE(addon->HasType(ADDON_VIZ));
+  EXPECT_FALSE(addon->HasType(ADDON_SCREENSAVER));
 }
 
 TEST_F(TestAddonInfoBuilder, TestGenerate_Repo)
@@ -79,13 +79,13 @@
   EXPECT_EQ(addon->ID(), "metadata.blablabla.org");
 
   EXPECT_EQ(addon->MainType(), ADDON_SCRAPER_MOVIES);
-  EXPECT_TRUE(addon->IsType(ADDON_SCRAPER_MOVIES));
+  EXPECT_TRUE(addon->HasType(ADDON_SCRAPER_MOVIES));
   EXPECT_EQ(addon->Type(ADDON_SCRAPER_MOVIES)->LibName(), "blablabla.xml");
   EXPECT_EQ(addon->Type(ADDON_SCRAPER_MOVIES)->GetValue("@language").asString(), "en");
 
-  EXPECT_TRUE(addon->IsType(ADDON_SCRIPT_MODULE));
+  EXPECT_TRUE(addon->HasType(ADDON_SCRIPT_MODULE));
   EXPECT_EQ(addon->Type(ADDON_SCRIPT_MODULE)->LibName(), "lib.so");
-  EXPECT_FALSE(addon->IsType(ADDON_SCRAPER_ARTISTS));
+  EXPECT_FALSE(addon->HasType(ADDON_SCRAPER_ARTISTS));
 
   EXPECT_EQ(addon->Name(), "The Bla Bla Bla Addon");
   EXPECT_EQ(addon->Author(), "Team Kodi");
@@ -150,10 +150,10 @@
   EXPECT_EQ(addon->ID(), "video.blablabla.org");
 
   EXPECT_EQ(addon->MainType(), ADDON_PLUGIN);
-  EXPECT_TRUE(addon->IsType(ADDON_PLUGIN));
-  EXPECT_TRUE(addon->IsType(ADDON_VIDEO));
-  EXPECT_TRUE(addon->IsType(ADDON_AUDIO));
-  EXPECT_FALSE(addon->IsType(ADDON_GAME));
+  EXPECT_TRUE(addon->HasType(ADDON_PLUGIN));
+  EXPECT_TRUE(addon->HasType(ADDON_VIDEO));
+  EXPECT_TRUE(addon->HasType(ADDON_AUDIO));
+  EXPECT_FALSE(addon->HasType(ADDON_GAME));
 
   EXPECT_EQ(addon->Name(), "The Bla Bla Bla Addon");
   EXPECT_EQ(addon->Author(), "Team Kodi");

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.cpp Changed

@@ -157,6 +157,7 @@
   m_needData = true;
   m_filterEof = false;
   m_started = false;
+  m_ptsInitialized = false;
 
   return true;
 }
@@ -182,6 +183,8 @@
 
   m_SamplesIn = 0;
   m_SamplesOut = 0;
+
+  m_ptsInitialized = false;
 }
 
 int CActiveAEFilter::ProcessFilter(uint8_t **dst_buffer, int dst_samples, uint8_t **src_buffer, int src_samples, int src_bufsize)
@@ -211,6 +214,11 @@
     frame->sample_rate = m_sampleRate;
     frame->nb_samples = src_samples;
     frame->format = m_sampleFormat;
+    if (!m_ptsInitialized)
+    {
+      frame->pts = 0;
+      m_ptsInitialized = true;
+    }
 
     m_SamplesIn += src_samples;
 
@@ -220,6 +228,7 @@
     {
       av_frame_free(&frame);
       CLog::Log(LOGERROR, "CActiveAEFilter::ProcessFilter - avcodec_fill_audio_frame failed");
+      m_filterEof = true;
       return -1;
     }
 
@@ -228,6 +237,7 @@
     if (result < 0)
     {
       CLog::Log(LOGERROR, "CActiveAEFilter::ProcessFilter - av_buffersrc_add_frame failed");
+      m_filterEof = true;
       return -1;
     }
 
@@ -239,6 +249,7 @@
     if (result < 0)
     {
       CLog::Log(LOGERROR, "CActiveAEFilter::ProcessFilter - av_buffersrc_add_frame");
+      m_filterEof = true;
       return -1;
     }
   }
@@ -265,6 +276,7 @@
     else if (result < 0)
     {
       CLog::Log(LOGERROR, "CActiveAEFilter::ProcessFilter - av_buffersink_get_frame");
+      m_filterEof = true;
       return -1;
     }
 
@@ -281,6 +293,7 @@
       if (result < 0)
       {
         CLog::Log(LOGERROR, "CActiveAEFilter::ProcessFilter - swr_convert_frame failed");
+        m_filterEof = true;
         return -1;
       }
     }
@@ -326,7 +339,7 @@
 
 bool CActiveAEFilter::IsActive() const
 {
-  return m_pFilterGraph != nullptr;
+  return m_pFilterGraph != nullptr && !m_filterEof;
 }
 
 int CActiveAEFilter::GetBufferedSamples() const

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp Changed

@@ -6,29 +6,28 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include <stdint.h>
-#include <limits.h>
-#include <sys/utsname.h>
-#include <set>
-#include <sstream>
-#include <string>
-#include <algorithm>
-
 #include "AESinkALSA.h"
+
 #include "ServiceBroker.h"
 #include "cores/AudioEngine/AESinkFactory.h"
-#include "cores/AudioEngine/Utils/AEUtil.h"
 #include "cores/AudioEngine/Utils/AEELDParser.h"
-#include "utils/log.h"
-#include "utils/MathUtils.h"
-#include "utils/SystemInfo.h"
-#include "threads/SingleLock.h"
+#include "cores/AudioEngine/Utils/AEUtil.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
+#include "threads/SingleLock.h"
+#include "utils/MathUtils.h"
+#include "utils/SystemInfo.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include <algorithm>
+#include <limits.h>
+#include <set>
+#include <sstream>
+#include <stdint.h>
+#include <string>
+
+#include <sys/utsname.h>
 
 #define ALSA_OPTIONS (SND_PCM_NO_AUTO_FORMAT | SND_PCM_NO_AUTO_CHANNELS | SND_PCM_NO_AUTO_RESAMPLE)
 
@@ -943,7 +942,7 @@
 
       /* try to resume the stream */
       while((err = snd_pcm_resume(m_pcm)) == -EAGAIN)
-        Sleep(1);
+        KODI::TIME::Sleep(1);
 
       /* if the hardware doesnt support resume, prepare the stream */
       if (err == -ENOSYS)

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm Changed

@@ -75,7 +75,7 @@
 class CAAudioUnitSink
 {
   public:
-    CAAudioUnitSink();
+    CAAudioUnitSink() = default;
    ~CAAudioUnitSink();
 
     bool         open(AudioStreamBasicDescription outputFormat);
@@ -110,10 +110,10 @@
                   AudioBufferList *ioData);
 
     bool                m_setup;
-    bool                m_activated;
+    bool m_activated = false;
     AudioUnit           m_audioUnit;
     AudioStreamBasicDescription m_outputFormat;
-    AERingBuffer       *m_buffer;
+    AERingBuffer* m_buffer = nullptr;
 
     bool                m_mute;
     Float32             m_outputVolume;
@@ -123,24 +123,14 @@
     unsigned int        m_sampleRate;
     unsigned int        m_frameSize;
 
-    bool                m_playing;
-    volatile bool       m_started;
+    bool m_playing = false;
+    volatile bool m_started = false;
 
     CAESpinSection      m_render_section;
-    volatile int64_t    m_render_timestamp;
-    volatile uint32_t   m_render_frames;
+    volatile int64_t m_render_timestamp = 0;
+    volatile uint32_t m_render_frames = 0;
 };
 
-CAAudioUnitSink::CAAudioUnitSink()
-: m_activated(false)
-, m_buffer(NULL)
-, m_playing(false)
-, m_started(false)
-, m_render_timestamp(0)
-, m_render_frames(0)
-{
-}
-
 CAAudioUnitSink::~CAAudioUnitSink()
 {
   close();

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h Changed

@@ -43,18 +43,20 @@
 
   CCoreAudioDevice   m_device;
   CCoreAudioStream   m_outputStream;
-  unsigned int       m_latentFrames;
-  unsigned int       m_outputBufferIndex;
+  unsigned int m_latentFrames = 0;
+  unsigned int m_outputBufferIndex = 0;
 
-  bool               m_outputBitstream;   ///< true if we're bistreaming into a LinearPCM stream rather than AC3 stream.
-  unsigned int       m_planes;            ///< number of audio planes (1 if non-planar)
-  unsigned int       m_frameSizePerPlane; ///< frame size (per plane) in bytes
-  unsigned int       m_framesPerSecond;   ///< sample rate
+  bool m_outputBitstream =
+      false; ///< true if we're bistreaming into a LinearPCM stream rather than AC3 stream.
+  unsigned int m_planes = 1; ///< number of audio planes (1 if non-planar)
+  unsigned int m_frameSizePerPlane = 0; ///< frame size (per plane) in bytes
+  unsigned int m_framesPerSecond = 0; ///< sample rate
 
-  AERingBuffer      *m_buffer;
-  volatile bool      m_started;     // set once we get a callback from CoreAudio, which can take a little while.
+  AERingBuffer* m_buffer = nullptr;
+  volatile bool m_started =
+      false; // set once we get a callback from CoreAudio, which can take a little while.
 
   CAESpinSection         m_render_locker;
-  volatile int64_t       m_render_tick;
-  volatile double        m_render_delay;
+  volatile int64_t m_render_tick = 0;
+  volatile double m_render_delay = 0.0;
 };

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINTVOS.h Added

@@ -0,0 +1,57 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "cores/AudioEngine/Interfaces/AESink.h"
+#include "cores/AudioEngine/Utils/AEDeviceInfo.h"
+
+#define DO_440HZ_TONE_TEST 0
+
+#if DO_440HZ_TONE_TEST
+typedef struct
+{
+  float currentPhase;
+  float phaseIncrement;
+} SineWaveGenerator;
+#endif
+
+class AERingBuffer;
+class CAAudioUnitSink;
+
+class CAESinkDARWINTVOS : public IAESink
+{
+public:
+  const char* GetName() override { return "DARWINTVOS"; }
+
+  CAESinkDARWINTVOS();
+  ~CAESinkDARWINTVOS() override = default;
+
+  static void Register();
+  static void EnumerateDevicesEx(AEDeviceInfoList& list, bool force);
+  static IAESink* Create(std::string& device, AEAudioFormat& desiredFormat);
+
+  bool Initialize(AEAudioFormat& format, std::string& device) override;
+  void Deinitialize() override;
+
+  void GetDelay(AEDelayStatus& status) override;
+  double GetCacheTotal() override;
+  unsigned int AddPackets(uint8_t** data, unsigned int frames, unsigned int offset) override;
+  void Drain() override;
+  bool HasVolume() override;
+
+private:
+  static AEDeviceInfoList m_devices;
+  CAEDeviceInfo m_info;
+  AEAudioFormat m_format;
+
+  CAAudioUnitSink* m_audioSink = nullptr;
+#if DO_440HZ_TONE_TEST
+  SineWaveGenerator m_SineWaveGenerator;
+#endif
+};

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINTVOS.mm Added

@@ -0,0 +1,894 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "AESinkDARWINTVOS.h"
+
+#include "ServiceBroker.h"
+#include "cores/AudioEngine/AESinkFactory.h"
+#include "cores/AudioEngine/Sinks/darwin/CoreAudioHelpers.h"
+#include "cores/AudioEngine/Utils/AERingBuffer.h"
+#include "cores/AudioEngine/Utils/AEUtil.h"
+#include "threads/Condition.h"
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+#include "windowing/WinSystem.h"
+
+#include "platform/darwin/DarwinUtils.h"
+
+#include <sstream>
+
+#import <AVFoundation/AVAudioSession.h>
+#include <AudioToolbox/AudioToolbox.h>
+
+enum CAChannelIndex
+{
+  CAChannel_PCM_6CHAN = 0,
+  CAChannel_PCM_8CHAN = 1,
+  CAChannel_PCM_DD5_1 = 2,
+};
+
+static enum AEChannel CAChannelMap[3][9] = {
+    {AE_CH_FL, AE_CH_FR, AE_CH_LFE, AE_CH_FC, AE_CH_BL, AE_CH_BR, AE_CH_NULL},
+    {AE_CH_FL, AE_CH_FR, AE_CH_LFE, AE_CH_FC, AE_CH_SL, AE_CH_SR, AE_CH_BL, AE_CH_BR, AE_CH_NULL},
+    {AE_CH_FL, AE_CH_FC, AE_CH_FR, AE_CH_BL, AE_CH_BR, AE_CH_LFE, AE_CH_NULL},
+};
+
+static std::string getAudioRoute()
+{
+  std::string route;
+  AVAudioSession* myAudioSession = [AVAudioSession sharedInstance];
+  AVAudioSessionRouteDescription* currentRoute = [myAudioSession currentRoute];
+  NSString* output = [[currentRoute.outputs firstObject] portType];
+  if (output)
+    route = [output UTF8String];
+
+  return route;
+}
+
+static void dumpAVAudioSessionProperties()
+{
+  std::string route = getAudioRoute();
+  CLog::Log(LOGNOTICE, "%s audio route = %s", __PRETTY_FUNCTION__,
+            route.empty() ? "NONE" : route.c_str());
+
+  AVAudioSession* mySession = [AVAudioSession sharedInstance];
+
+  CLog::Log(LOGNOTICE, "%s sampleRate %f", __PRETTY_FUNCTION__, [mySession sampleRate]);
+  CLog::Log(LOGNOTICE, "%s outputLatency %f", __PRETTY_FUNCTION__, [mySession outputLatency]);
+  CLog::Log(LOGNOTICE, "%s IOBufferDuration %f", __PRETTY_FUNCTION__, [mySession IOBufferDuration]);
+  CLog::Log(LOGNOTICE, "%s outputNumberOfChannels %ld", __PRETTY_FUNCTION__,
+            static_cast<long>([mySession outputNumberOfChannels]));
+  // maximumOutputNumberOfChannels provides hints to tvOS audio settings
+  // if 2, then audio is set to two channel stereo. iOS return this unless hdmi connected
+  // if 6, then audio is set to Digial Dolby 5.1 OR hdmi path detected sink can only handle 6 channels.
+  // if 8, then audio is set to Best Quality AND hdmi path detected sink can handle 8 channels.
+  CLog::Log(LOGNOTICE, "%s maximumOutputNumberOfChannels %ld", __PRETTY_FUNCTION__,
+            static_cast<long>([mySession maximumOutputNumberOfChannels]));
+
+  //CDarwinUtils::DumpAudioDescriptions(__PRETTY_FUNCTION__);
+}
+
+static bool deactivateAudioSession(int count)
+{
+  if (--count < 0)
+    return false;
+
+  bool rtn = false;
+  NSError* err = nullptr;
+  // deactvivate the session
+  AVAudioSession* mySession = [AVAudioSession sharedInstance];
+  if (![mySession setActive:NO error:&err])
+  {
+    CLog::Log(LOGWARNING, "AVAudioSession setActive NO failed, count %d", count);
+    usleep(10 * 1000);
+    rtn = deactivateAudioSession(count);
+  }
+  else
+  {
+    rtn = true;
+  }
+  return rtn;
+}
+
+static void setAVAudioSessionProperties(NSTimeInterval bufferseconds,
+                                        double samplerate,
+                                        int channels)
+{
+  // darwin docs and technotes say,
+  // deavtivate the session before changing the values
+  AVAudioSession* mySession = [AVAudioSession sharedInstance];
+
+  // need to fetch maximumOutputNumberOfChannels when active
+  NSInteger maxchannels = [mySession maximumOutputNumberOfChannels];
+
+  NSError* err = nil;
+  // deactvivate the session
+  if (!deactivateAudioSession(10))
+    CLog::Log(LOGWARNING, "AVAudioSession setActive NO failed: %ld", static_cast<long>(err.code));
+
+  // change the number of channels
+  if (channels > maxchannels)
+    channels = static_cast<UInt32>(maxchannels);
+  err = nil;
+  [mySession setPreferredOutputNumberOfChannels:channels error:&err];
+  if (err != nil)
+    CLog::Log(LOGWARNING, "%s setPreferredOutputNumberOfChannels failed", __PRETTY_FUNCTION__);
+
+  // change the sameple rate
+  err = nil;
+  [mySession setPreferredSampleRate:samplerate error:&err];
+  if (err != nil)
+    CLog::Log(LOGWARNING, "%s setPreferredSampleRate failed", __PRETTY_FUNCTION__);
+
+  // change the i/o buffer duration
+  err = nil;
+  [mySession setPreferredIOBufferDuration:bufferseconds error:&err];
+  if (err != nil)
+    CLog::Log(LOGWARNING, "%s setPreferredIOBufferDuration failed", __PRETTY_FUNCTION__);
+
+  // reactivate the session
+  err = nil;
+  if (![mySession setActive:YES error:&err])
+    CLog::Log(LOGWARNING, "AVAudioSession setActive YES failed: %ld", static_cast<long>(err.code));
+
+  // check that we got the samperate what we asked for
+  if (samplerate != [mySession sampleRate])
+    CLog::Log(LOGWARNING, "sampleRate does not match: asked %f, is %f", samplerate,
+              [mySession sampleRate]);
+
+  // check that we got the number of channels what we asked for
+  if (channels != [mySession outputNumberOfChannels])
+    CLog::Log(LOGWARNING, "number of channels do not match: asked %d, is %ld", channels,
+              static_cast<long>([mySession outputNumberOfChannels]));
+}
+
+#pragma mark - SineWaveGenerator
+/***************************************************************************************/
+/***************************************************************************************/
+#if DO_440HZ_TONE_TEST
+static void SineWaveGeneratorInitWithFrequency(SineWaveGenerator* ctx,
+                                               double frequency,
+                                               double samplerate)
+{
+  // Given:
+  //   frequency in cycles per second
+  //   2*PI radians per sine wave cycle
+  //   sample rate in samples per second
+  //
+  // Then:
+  //   cycles     radians     seconds     radians
+  //   ------  *  -------  *  -------  =  -------
+  //   second      cycle      sample      sample
+  ctx->currentPhase = 0.0;
+  ctx->phaseIncrement = frequency * 2 * M_PI / samplerate;
+}
+
+static int16_t SineWaveGeneratorNextSampleInt16(SineWaveGenerator* ctx)
+{
+  int16_t sample = INT16_MAX * sinf(ctx->currentPhase);
+
+  ctx->currentPhase += ctx->phaseIncrement;
+  // Keep the value between 0 and 2*M_PI
+  while (ctx->currentPhase > 2 * M_PI)
+    ctx->currentPhase -= 2 * M_PI;
+
+  return sample / 4;
+}
+static float SineWaveGeneratorNextSampleFloat(SineWaveGenerator* ctx)
+{
+  float sample = MAXFLOAT * sinf(ctx->currentPhase);
+
+  ctx->currentPhase += ctx->phaseIncrement;
+  // Keep the value between 0 and 2*M_PI
+  while (ctx->currentPhase > 2 * M_PI)
+    ctx->currentPhase -= 2 * M_PI;
+
+  return sample / 4;
+}
+#endif
+
+#pragma mark - CAAudioUnitSink
+/***************************************************************************************/
+/***************************************************************************************/
+class CAAudioUnitSink
+{
+public:
+  CAAudioUnitSink();
+  ~CAAudioUnitSink();
+
+  bool open(AudioStreamBasicDescription outputFormat, size_t buffer_size);
+  bool close();
+  bool activate();
+  bool deactivate();
+  void updatedelay(AEDelayStatus& status);
+  double buffertime();
+  unsigned int sampletrate() { return m_outputFormat.mSampleRate; };
+  unsigned int write(uint8_t* data, unsigned int frames, unsigned int framesize);
+  void drain();
+
+private:
+  bool setupAudio();
+
+  // callbacks
+  static OSStatus renderCallback(void* inRefCon,
+                                 AudioUnitRenderActionFlags* ioActionFlags,
+                                 const AudioTimeStamp* inTimeStamp,
+                                 UInt32 inOutputBusNumber,
+                                 UInt32 inNumberFrames,
+                                 AudioBufferList* ioData);
+
+  bool m_setup;
+  bool m_activated = false;
+  AudioUnit m_audioUnit;
+  AudioStreamBasicDescription m_outputFormat;
+  AERingBuffer* m_buffer = nullptr;
+
+  Float32 m_totalLatency;
+  Float32 m_inputLatency;
+  Float32 m_outputLatency;
+  Float32 m_bufferDuration;
+
+  unsigned int m_sampleRate;
+  unsigned int m_frameSize;
+
+  std::atomic<bool> m_started;
+
+  CAESpinSection m_render_section;
+  std::atomic<int64_t> m_render_timestamp;
+};
+
+CAAudioUnitSink::CAAudioUnitSink() : m_started(false), m_render_timestamp(0)
+{
+}
+
+CAAudioUnitSink::~CAAudioUnitSink()
+{
+  close();
+}
+
+bool CAAudioUnitSink::open(AudioStreamBasicDescription outputFormat, size_t buffer_size)
+{
+  m_setup = false;
+  m_outputFormat = outputFormat;
+  m_outputLatency = 0.0;
+  m_bufferDuration = 0.0;
+  m_sampleRate = static_cast<unsigned int>(outputFormat.mSampleRate);
+  m_frameSize = outputFormat.mChannelsPerFrame * outputFormat.mBitsPerChannel / 8;
+
+  m_buffer = new AERingBuffer(buffer_size);
+
+  return setupAudio();
+}
+
+bool CAAudioUnitSink::close()
+{
+  deactivate();
+  delete m_buffer;
+  m_buffer = NULL;
+
+  m_started = false;
+  return true;
+}
+
+bool CAAudioUnitSink::activate()
+{
+  if (!m_activated)
+  {
+    if (setupAudio())
+    {
+      AudioOutputUnitStart(m_audioUnit);
+      m_activated = true;
+    }
+  }
+
+  return m_activated;
+}
+
+bool CAAudioUnitSink::deactivate()
+{
+  if (m_activated)
+  {
+    AudioUnitReset(m_audioUnit, kAudioUnitScope_Global, 0);
+
+    // this is a delayed call, the OS will block here
+    // until the autio unit actually is stopped.
+    AudioOutputUnitStop(m_audioUnit);
+
+    // detach the render callback on the unit
+    AURenderCallbackStruct callbackStruct = {0};
+    AudioUnitSetProperty(m_audioUnit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input,
+                         0, &callbackStruct, sizeof(callbackStruct));
+
+    AudioUnitUninitialize(m_audioUnit);
+    AudioComponentInstanceDispose(m_audioUnit), m_audioUnit = nullptr;
+
+    m_setup = false;
+    m_activated = false;
+  }
+
+  return m_activated;
+}
+
+void CAAudioUnitSink::updatedelay(AEDelayStatus& status)
+{
+  // return the number of audio frames in buffer, in seconds
+  // use internal framesize, once written,
+  // bytes in buffer are owned by CAAudioUnitSink.
+  unsigned int size;
+  CAESpinLock lock(m_render_section);
+  do
+  {
+    status.tick = m_render_timestamp;
+    status.delay = 0;
+    if (m_buffer)
+      size = m_buffer->GetReadSize();
+    else
+      size = 0;
+  } while (lock.retry());
+
+  // bytes to seconds
+  status.delay += static_cast<double>(size) / static_cast<double>(m_frameSize) /
+                  static_cast<double>(m_sampleRate);
+  // add in hw delay and total latency (in seconds)
+  status.delay += m_totalLatency;
+}
+
+double CAAudioUnitSink::buffertime()
+{
+  // return the number of audio frames for the total buffer size, in seconds
+  // use internal framesize, buffer is owned by CAAudioUnitSink.
+  double buffertime;
+  buffertime =
+      static_cast<double>(m_buffer->GetMaxSize()) / static_cast<double>(m_frameSize * m_sampleRate);
+  return buffertime;
+}
+
+CCriticalSection mutex;
+XbmcThreads::ConditionVariable condVar;
+
+unsigned int CAAudioUnitSink::write(uint8_t* data, unsigned int frames, unsigned int framesize)
+{
+  // use the passed in framesize instead of internal,
+  // writes are relative to AE formats. once written,
+  // CAAudioUnitSink owns them.
+  if (m_buffer->GetWriteSize() < frames * framesize)
+  { // no space to write - wait for a bit
+    CSingleLock lock(mutex);
+    unsigned int timeout = 900 * frames / m_sampleRate;
+    if (!m_started)
+      timeout = 4500;
+
+    // we are using a timer here for beeing sure for timeouts
+    // condvar can be woken spuriously as signaled
+    XbmcThreads::EndTime timer(timeout);
+    condVar.wait(mutex, timeout);
+    if (!m_started && timer.IsTimePast())
+    {
+      CLog::Log(LOGERROR, "%s engine didn't start in %d ms!", __FUNCTION__, timeout);
+      return INT_MAX;
+    }
+  }
+
+  unsigned int write_frames = std::min(frames, m_buffer->GetWriteSize() / framesize);
+  if (write_frames)
+    m_buffer->Write(data, write_frames * framesize);
+
+  return write_frames;
+}
+
+void CAAudioUnitSink::drain()
+{
+  unsigned int bytes = m_buffer->GetReadSize();
+  unsigned int totalBytes = bytes;
+  int maxNumTimeouts = 3;
+  unsigned int timeout = buffertime();
+
+  while (bytes && maxNumTimeouts > 0)
+  {
+    CSingleLock lock(mutex);
+    XbmcThreads::EndTime timer(timeout);
+    condVar.wait(mutex, timeout);
+
+    bytes = m_buffer->GetReadSize();
+    // if we timeout and do not consume bytes,
+    // decrease maxNumTimeouts and try again.
+    if (timer.IsTimePast() && bytes == totalBytes)
+      maxNumTimeouts--;
+    totalBytes = bytes;
+  }
+}
+
+bool CAAudioUnitSink::setupAudio()
+{
+  if (m_setup && m_audioUnit)
+    return true;
+
+  // Audio Unit Setup
+  // Describe a default output unit.
+  AudioComponentDescription description = {};
+  description.componentType = kAudioUnitType_Output;
+  description.componentSubType = kAudioUnitSubType_RemoteIO;
+  description.componentManufacturer = kAudioUnitManufacturer_Apple;
+
+  // Get component
+  AudioComponent component;
+  component = AudioComponentFindNext(nullptr, &description);
+  OSStatus status = AudioComponentInstanceNew(component, &m_audioUnit);
+  if (status != noErr)
+  {
+    CLog::Log(LOGERROR, "%s error creating audioUnit (error: %d)", __PRETTY_FUNCTION__,
+              static_cast<int>(status));
+    return false;
+  }
+
+  // set the hw buffer size (in seconds), this affects the number of samples
+  // that get rendered every time the audio callback is fired.
+  double samplerate = m_outputFormat.mSampleRate;
+  int channels = m_outputFormat.mChannelsPerFrame;
+  NSTimeInterval bufferseconds =
+      1024 * m_outputFormat.mChannelsPerFrame / m_outputFormat.mSampleRate;
+  CLog::Log(LOGNOTICE, "%s setting channels %d", __PRETTY_FUNCTION__, channels);
+  CLog::Log(LOGNOTICE, "%s setting samplerate %f", __PRETTY_FUNCTION__, samplerate);
+  CLog::Log(LOGNOTICE, "%s setting buffer duration to %f", __PRETTY_FUNCTION__, bufferseconds);
+  setAVAudioSessionProperties(bufferseconds, samplerate, channels);
+
+  // Get the real output samplerate, the requested might not avaliable
+  Float64 realisedSampleRate = [[AVAudioSession sharedInstance] sampleRate];
+  if (m_outputFormat.mSampleRate != realisedSampleRate)
+  {
+    CLog::Log(LOGNOTICE,
+              "%s couldn't set requested samplerate %d, AudioUnit will resample to %d instead",
+              __PRETTY_FUNCTION__, static_cast<int>(m_outputFormat.mSampleRate),
+              static_cast<int>(realisedSampleRate));
+    // if we don't want AudioUnit to resample - but instead let activeae resample -
+    // reflect the realised samplerate to the output format here
+    // well maybe it is handy in the future - as of writing this
+    // AudioUnit was about 6 times faster then activeae ;)
+    //m_outputFormat.mSampleRate = realisedSampleRate;
+    //m_sampleRate = realisedSampleRate;
+  }
+
+  // Set the output stream format
+  UInt32 ioDataSize = sizeof(AudioStreamBasicDescription);
+  status = AudioUnitSetProperty(m_audioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input,
+                                0, &m_outputFormat, ioDataSize);
+  if (status != noErr)
+  {
+    CLog::Log(LOGERROR, "%s error setting stream format on audioUnit (error: %d)",
+              __PRETTY_FUNCTION__, static_cast<int>(status));
+    return false;
+  }
+
+  // Attach a render callback on the unit
+  AURenderCallbackStruct callbackStruct = {0};
+  callbackStruct.inputProc = renderCallback;
+  callbackStruct.inputProcRefCon = this;
+  status = AudioUnitSetProperty(m_audioUnit, kAudioUnitProperty_SetRenderCallback,
+                                kAudioUnitScope_Input, 0, &callbackStruct, sizeof(callbackStruct));
+  if (status != noErr)
+  {
+    CLog::Log(LOGERROR, "%s error setting render callback for AudioUnit (error: %d)",
+              __PRETTY_FUNCTION__, static_cast<int>(status));
+    return false;
+  }
+
+  status = AudioUnitInitialize(m_audioUnit);
+  if (status != noErr)
+  {
+    CLog::Log(LOGERROR, "%s error initializing AudioUnit (error: %d)", __PRETTY_FUNCTION__,
+              static_cast<int>(status));
+    return false;
+  }
+
+  AVAudioSession* mySession = [AVAudioSession sharedInstance];
+  m_inputLatency = [mySession inputLatency];
+  m_outputLatency = [mySession outputLatency];
+  m_bufferDuration = [mySession IOBufferDuration];
+  m_totalLatency = m_outputLatency + m_bufferDuration;
+  CLog::Log(LOGNOTICE, "%s total latency = %f", __PRETTY_FUNCTION__, m_totalLatency);
+
+  m_setup = true;
+  std::string formatString;
+  CLog::Log(LOGNOTICE, "%s setup audio format: %s", __PRETTY_FUNCTION__,
+            StreamDescriptionToString(m_outputFormat, formatString));
+
+  dumpAVAudioSessionProperties();
+
+  return m_setup;
+}
+
+inline void LogLevel(unsigned int got, unsigned int wanted)
+{
+  static unsigned int lastReported = INT_MAX;
+  if (got != wanted)
+  {
+    if (got != lastReported)
+    {
+      CLog::Log(LOGWARNING, "DARWINIOS: %sflow (%u vs %u bytes)", got > wanted ? "over" : "under",
+                got, wanted);
+      lastReported = got;
+    }
+  }
+  else
+    lastReported = INT_MAX; // indicate we were good at least once
+}
+
+OSStatus CAAudioUnitSink::renderCallback(void* inRefCon,
+                                         AudioUnitRenderActionFlags* ioActionFlags,
+                                         const AudioTimeStamp* inTimeStamp,
+                                         UInt32 inOutputBusNumber,
+                                         UInt32 inNumberFrames,
+                                         AudioBufferList* ioData)
+{
+  CAAudioUnitSink* sink = (CAAudioUnitSink*)inRefCon;
+
+  sink->m_render_section.enter();
+  sink->m_started = true;
+
+  for (unsigned int i = 0; i < ioData->mNumberBuffers; i++)
+  {
+    unsigned int wanted = ioData->mBuffers[i].mDataByteSize;
+    unsigned int bytes = std::min(sink->m_buffer->GetReadSize(), wanted);
+    sink->m_buffer->Read(static_cast<unsigned char*>(ioData->mBuffers[i].mData), bytes);
+    LogLevel(bytes, wanted);
+
+    if (bytes == 0)
+    {
+      // Apple iOS docs say kAudioUnitRenderAction_OutputIsSilence provides a hint to
+      // the audio unit that there is no audio to process. and you must also explicitly
+      // set the buffers contents pointed at by the ioData parameter to 0.
+      memset(ioData->mBuffers[i].mData, 0x00, ioData->mBuffers[i].mDataByteSize);
+      *ioActionFlags |= kAudioUnitRenderAction_OutputIsSilence;
+    }
+    else if (bytes < wanted)
+    {
+      // zero out what we did not copy over (underflow)
+      uint8_t* empty = static_cast<uint8_t*>(ioData->mBuffers[i].mData) + bytes;
+      memset(empty, 0x00, wanted - bytes);
+    }
+  }
+
+  sink->m_render_timestamp = inTimeStamp->mHostTime;
+  sink->m_render_section.leave();
+  // tell the sink we're good for more data
+  condVar.notifyAll();
+
+  return noErr;
+}
+
+#pragma mark - EnumerateDevices
+/***************************************************************************************/
+/***************************************************************************************/
+static void EnumerateDevices(AEDeviceInfoList& list)
+{
+  CAEDeviceInfo device;
+
+  device.m_deviceName = "default";
+  device.m_displayName = "Default";
+  device.m_displayNameExtra = "";
+
+  // if not hdmi,  CAESinkDARWINIOS::Initialize will kick back to 2 channel PCM
+  device.m_deviceType = AE_DEVTYPE_HDMI;
+  device.m_wantsIECPassthrough = true;
+
+  // Passthrough only working < tvos 11.2??
+  device.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_AC3);
+  device.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_EAC3);
+  device.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_512);
+  device.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_1024);
+  device.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_2048);
+  device.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_CORE);
+
+  device.m_sampleRates.push_back(44100);
+  device.m_sampleRates.push_back(48000);
+
+  device.m_dataFormats.push_back(AE_FMT_RAW);
+  device.m_dataFormats.push_back(AE_FMT_S16LE);
+  device.m_dataFormats.push_back(AE_FMT_FLOAT);
+
+  // add channel info
+  NSInteger maxChannels = [[AVAudioSession sharedInstance] maximumOutputNumberOfChannels];
+  if (maxChannels > 6)
+    device.m_channels = AE_CH_LAYOUT_7_1;
+  else
+    device.m_channels = AE_CH_LAYOUT_5_1;
+
+  CLog::Log(LOGDEBUG, "EnumerateDevices:Device(%s)", device.m_deviceName.c_str());
+
+  list.push_back(device);
+}
+
+#pragma mark - AEDeviceInfoList
+/***************************************************************************************/
+/***************************************************************************************/
+AEDeviceInfoList CAESinkDARWINTVOS::m_devices;
+
+CAESinkDARWINTVOS::CAESinkDARWINTVOS()
+{
+}
+
+void CAESinkDARWINTVOS::Register()
+{
+  AE::AESinkRegEntry reg;
+  reg.sinkName = "DARWINTVOS";
+  reg.createFunc = CAESinkDARWINTVOS::Create;
+  reg.enumerateFunc = CAESinkDARWINTVOS::EnumerateDevicesEx;
+  AE::CAESinkFactory::RegisterSink(reg);
+}
+
+IAESink* CAESinkDARWINTVOS::Create(std::string& device, AEAudioFormat& desiredFormat)
+{
+  IAESink* sink = new CAESinkDARWINTVOS();
+  if (sink->Initialize(desiredFormat, device))
+    return sink;
+
+  delete sink;
+  return nullptr;
+}
+
+bool CAESinkDARWINTVOS::Initialize(AEAudioFormat& format, std::string& device)
+{
+  std::string route = getAudioRoute();
+  // no route, no audio. bail and let AE kick back to NULL device
+  if (route.empty())
+    return false;
+
+  // no device, bail and let AE kick back to NULL device
+  bool found = false;
+  std::string devicelower = device;
+  StringUtils::ToLower(devicelower);
+  for (size_t i = 0; i < m_devices.size(); i++)
+  {
+    if (devicelower.find(m_devices[i].m_deviceName) != std::string::npos)
+    {
+      m_info = m_devices[i];
+      found = true;
+      break;
+    }
+  }
+  if (!found)
+    return false;
+
+  AudioStreamBasicDescription audioFormat = {0};
+  audioFormat.mFormatID = kAudioFormatLinearPCM;
+
+  // check if are we dealing with raw formats or pcm
+  bool passthrough = false;
+  switch (format.m_dataFormat)
+  {
+    case AE_FMT_RAW:
+      // this will be selected when AE wants AC3 or DTS or anything other then float
+      format.m_dataFormat = AE_FMT_S16LE;
+      audioFormat.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
+      if (route.find("HDMI") != std::string::npos)
+        passthrough = true;
+      else
+      {
+        // this should never happen but we cover it just in case
+        // for iOS/tvOS, if we are not hdmi, we cannot do raw
+        // so kick back to pcm.
+        format.m_dataFormat = AE_FMT_FLOAT;
+        audioFormat.mFormatFlags |= kLinearPCMFormatFlagIsFloat;
+      }
+      break;
+    default:
+      // AE lies, even when we register formats we can handle,
+      // it shoves everything down and it is up to the sink
+      // to check/verify and kick back to what the sink supports
+      format.m_dataFormat = AE_FMT_FLOAT;
+      audioFormat.mFormatFlags |= kLinearPCMFormatFlagIsFloat;
+      break;
+  }
+
+  // check and correct sample rates to what we support,
+  // remember, AE is a lier and we need to check/verify
+  // and kick back to what the sink supports
+  switch (format.m_sampleRate)
+  {
+    case 11025:
+    case 22050:
+    case 44100:
+    case 88200:
+    case 176400:
+      if (route.find("HDMI") != std::string::npos)
+        audioFormat.mSampleRate = 48000;
+      else
+        audioFormat.mSampleRate = 44100;
+      break;
+    default:
+    case 8000:
+    case 12000:
+    case 16000:
+    case 24000:
+    case 32000:
+    case 48000:
+    case 96000:
+    case 192000:
+    case 384000:
+      audioFormat.mSampleRate = 48000;
+      break;
+  }
+
+  if (passthrough)
+  {
+    // passthrough is special, PCM encapsulated IEC61937 packets.
+    // make sure input and output samplerate match for preventing resampling
+    audioFormat.mSampleRate = [[AVAudioSession sharedInstance] sampleRate];
+    audioFormat.mFramesPerPacket = 1; // must be 1
+    audioFormat.mChannelsPerFrame = 2; // passthrough needs 2 channels
+    audioFormat.mBitsPerChannel = 16;
+    audioFormat.mBytesPerFrame = audioFormat.mChannelsPerFrame * (audioFormat.mBitsPerChannel >> 3);
+    audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame * audioFormat.mFramesPerPacket;
+    audioFormat.mFormatFlags |= kLinearPCMFormatFlagIsPacked;
+  }
+  else
+  {
+    NSInteger maxChannels = [[AVAudioSession sharedInstance] maximumOutputNumberOfChannels];
+    audioFormat.mFramesPerPacket = 1; // must be 1
+
+    // tvos supports up to 8 channels
+    audioFormat.mChannelsPerFrame = format.m_channelLayout.Count();
+    // clamp number of channels to what tvOS reports
+    if (maxChannels == 2)
+      audioFormat.mChannelsPerFrame = (UInt32)maxChannels;
+
+    audioFormat.mBitsPerChannel = CAEUtil::DataFormatToBits(format.m_dataFormat);
+    audioFormat.mBytesPerFrame = audioFormat.mChannelsPerFrame * (audioFormat.mBitsPerChannel >> 3);
+    audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame * audioFormat.mFramesPerPacket;
+    audioFormat.mFormatFlags |= kLinearPCMFormatFlagIsPacked;
+
+    CAEChannelInfo channel_info;
+    CAChannelIndex channel_index = CAChannel_PCM_6CHAN;
+    if (maxChannels == 6 && format.m_channelLayout.Count() == 6)
+    {
+      // if 6, then audio is set to Digial Dolby 5.1, need to use DD mapping
+      channel_index = CAChannel_PCM_DD5_1;
+    }
+    else if (format.m_channelLayout.Count() == 5)
+    {
+      // if 5, then audio is set to Digial Dolby 5.0, need to use DD mapping
+      channel_index = CAChannel_PCM_DD5_1;
+    }
+    else
+    {
+      if (format.m_channelLayout.Count() > 6)
+        channel_index = CAChannel_PCM_8CHAN;
+    }
+    for (size_t chan = 0; chan < format.m_channelLayout.Count(); ++chan)
+    {
+      if (chan < maxChannels)
+        channel_info += CAChannelMap[channel_index][chan];
+    }
+    format.m_channelLayout = channel_info;
+  }
+
+  std::string formatString;
+  CLog::Log(LOGDEBUG, "%s: AudioStreamBasicDescription: %s %s", __PRETTY_FUNCTION__,
+            StreamDescriptionToString(audioFormat, formatString),
+            passthrough ? "passthrough" : "pcm");
+
+#if DO_440HZ_TONE_TEST
+  SineWaveGeneratorInitWithFrequency(&m_SineWaveGenerator, 440.0, audioFormat.mSampleRate);
+#endif
+
+  size_t buffer_size;
+  switch (format.m_streamInfo.m_type)
+  {
+    case CAEStreamInfo::STREAM_TYPE_AC3:
+      if (!format.m_streamInfo.m_ac3FrameSize)
+        format.m_streamInfo.m_ac3FrameSize = 1536;
+      format.m_frames = format.m_streamInfo.m_ac3FrameSize;
+      buffer_size = format.m_frames * 8;
+      break;
+    case CAEStreamInfo::STREAM_TYPE_EAC3:
+      if (!format.m_streamInfo.m_ac3FrameSize)
+        format.m_streamInfo.m_ac3FrameSize = 1536;
+      format.m_frames = format.m_streamInfo.m_ac3FrameSize;
+      buffer_size = format.m_frames * 8;
+      break;
+    case CAEStreamInfo::STREAM_TYPE_DTS_512:
+    case CAEStreamInfo::STREAM_TYPE_DTSHD_CORE:
+      format.m_frames = 512;
+      buffer_size = 16384;
+      break;
+    case CAEStreamInfo::STREAM_TYPE_DTS_1024:
+      format.m_frames = 1024;
+      buffer_size = 16384;
+      break;
+    case CAEStreamInfo::STREAM_TYPE_DTS_2048:
+      format.m_frames = 2048;
+      buffer_size = 16384;
+      break;
+    default:
+      format.m_frames = 1024;
+      buffer_size = (512 * audioFormat.mBytesPerFrame) * 8;
+      break;
+  }
+  m_audioSink = new CAAudioUnitSink;
+  m_audioSink->open(audioFormat, buffer_size);
+  // reset to the realised samplerate
+  format.m_sampleRate = m_audioSink->sampletrate();
+  format.m_frameSize =
+      format.m_channelLayout.Count() * (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3);
+
+  m_format = format;
+
+  if (!m_audioSink->activate())
+    return false;
+
+  return true;
+}
+
+void CAESinkDARWINTVOS::Deinitialize()
+{
+  delete m_audioSink;
+  m_audioSink = nullptr;
+}
+
+void CAESinkDARWINTVOS::GetDelay(AEDelayStatus& status)
+{
+  if (m_audioSink)
+    m_audioSink->updatedelay(status);
+  else
+    status.SetDelay(0.0);
+}
+
+double CAESinkDARWINTVOS::GetCacheTotal()
+{
+  if (m_audioSink)
+    return m_audioSink->buffertime();
+  return 0.0;
+}
+
+unsigned int CAESinkDARWINTVOS::AddPackets(uint8_t** data, unsigned int frames, unsigned int offset)
+{
+  uint8_t* buffer = data[0] + (offset * m_format.m_frameSize);
+#if DO_440HZ_TONE_TEST
+  if (m_format.m_dataFormat == AE_FMT_FLOAT)
+  {
+    float* samples = static_cast<float*>(buffer);
+    for (unsigned int j = 0; j < frames; j++)
+    {
+      float sample = SineWaveGeneratorNextSampleFloat(&m_SineWaveGenerator);
+      *samples++ = sample;
+      *samples++ = sample;
+    }
+  }
+  else
+  {
+    int16_t* samples = (int16_t*)buffer;
+    for (unsigned int j = 0; j < frames; j++)
+    {
+      int16_t sample = SineWaveGeneratorNextSampleInt16(&m_SineWaveGenerator);
+      *samples++ = sample;
+      *samples++ = sample;
+    }
+  }
+#endif
+  if (m_audioSink)
+    return m_audioSink->write(buffer, frames, m_format.m_frameSize);
+  return 0;
+}
+
+void CAESinkDARWINTVOS::Drain()
+{
+  if (m_audioSink)
+    m_audioSink->drain();
+}
+
+bool CAESinkDARWINTVOS::HasVolume()
+{
+  return false;
+}
+
+void CAESinkDARWINTVOS::EnumerateDevicesEx(AEDeviceInfoList& list, bool force)
+{
+  m_devices.clear();
+  EnumerateDevices(m_devices);
+  list = m_devices;
+}

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp Changed

@@ -10,23 +10,31 @@
 
 
 #include "AESinkDirectSound.h"
+
 #include "cores/AudioEngine/AESinkFactory.h"
 #include "cores/AudioEngine/Sinks/windows/AESinkFactoryWin.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
-#include "platform/win32/CharsetConverter.h"
 #include "threads/SingleLock.h"
 #include "threads/SystemClock.h"
-#include "utils/log.h"
 #include "utils/StringUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
+#include "platform/win32/CharsetConverter.h"
 
 #include <algorithm>
-#include <Audioclient.h>
-#include <initguid.h>
 #include <list>
+
+#include <Audioclient.h>
 #include <Mmreg.h>
+#include <Rpc.h>
+#include <initguid.h>
+
+// include order is important here
+// clang-format off
 #include <mmdeviceapi.h>
 #include <Functiondiscoverykeys_devpkey.h>
-#include <Rpc.h>
+// clang-format on
 
 #pragma comment(lib, "Rpcrt4.lib")
 
@@ -331,7 +339,7 @@
       return INT_MAX;
     else
     {
-      Sleep(total * 1000 / m_AvgBytesPerSec);
+      KODI::TIME::Sleep(total * 1000 / m_AvgBytesPerSec);
     }
   }

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkPi.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp Changed

@@ -20,31 +20,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // CCoreAudioDevice
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-CCoreAudioDevice::CCoreAudioDevice()  :
-  m_Started             (false    ),
-  m_DeviceId            (0        ),
-  m_MixerRestore        (-1       ),
-  m_IoProc              (NULL     ),
-  m_ObjectListenerProc  (NULL     ),
-  m_SampleRateRestore   (0.0f     ),
-  m_HogPid              (-1       ),
-  m_frameSize           (0        ),
-  m_OutputBufferIndex   (0        ),
-  m_BufferSizeRestore   (0        )
-{
-}
-
-CCoreAudioDevice::CCoreAudioDevice(AudioDeviceID deviceId) :
-  m_Started             (false    ),
-  m_DeviceId            (deviceId ),
-  m_MixerRestore        (-1       ),
-  m_IoProc              (NULL     ),
-  m_ObjectListenerProc  (NULL     ),
-  m_SampleRateRestore   (0.0f     ),
-  m_HogPid              (-1       ),
-  m_frameSize           (0        ),
-  m_OutputBufferIndex   (0        ),
-  m_BufferSizeRestore   (0        )
+CCoreAudioDevice::CCoreAudioDevice(AudioDeviceID deviceId) : m_DeviceId(deviceId)
 {
 }

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h Changed

@@ -24,7 +24,7 @@
 class CCoreAudioDevice
 {
 public:
-  CCoreAudioDevice();
+  CCoreAudioDevice() = default;
   explicit CCoreAudioDevice(AudioDeviceID deviceId);
   virtual ~CCoreAudioDevice();
 
@@ -70,18 +70,17 @@
   bool          AddIOProc(AudioDeviceIOProc ioProc, void* pCallbackData);
   bool          RemoveIOProc();
 protected:
-
-  bool              m_Started;
-  AudioDeviceID     m_DeviceId;
-  int               m_MixerRestore;
-  AudioDeviceIOProc m_IoProc;
-  AudioObjectPropertyListenerProc m_ObjectListenerProc;
-
-  Float64           m_SampleRateRestore;
-  pid_t             m_HogPid;
-  unsigned int      m_frameSize;
-  unsigned int      m_OutputBufferIndex;
-  unsigned int      m_BufferSizeRestore;
+  bool m_Started = false;
+  AudioDeviceID m_DeviceId = 0;
+  int m_MixerRestore = -1;
+  AudioDeviceIOProc m_IoProc = nullptr;
+  AudioObjectPropertyListenerProc m_ObjectListenerProc = nullptr;
+
+  Float64 m_SampleRateRestore = 0.0f;
+  pid_t m_HogPid = -1;
+  unsigned int m_frameSize = 0;
+  unsigned int m_OutputBufferIndex = 0;
+  unsigned int m_BufferSizeRestore = 0;
 
   static XbmcThreads::EndTime m_callbackSuppressTimer;
   static AudioObjectPropertyListenerProc m_defaultOutputDeviceChangedCB;

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AERingBuffer.h Changed

@@ -29,28 +29,9 @@
 class AERingBuffer {
 
 public:
-  AERingBuffer() :
-    m_iReadPos(0),
-    m_iWritePos(0),
-    m_iRead(0),
-    m_iWritten(0),
-    m_iSize(0),
-    m_planes(0),
-    m_Buffer(NULL)
-  {
-  }
+  AERingBuffer() = default;
 
-  AERingBuffer(unsigned int size, unsigned int planes = 1) :
-    m_iReadPos(0),
-    m_iWritePos(0),
-    m_iRead(0),
-    m_iWritten(0),
-    m_iSize(0),
-    m_planes(0),
-    m_Buffer(NULL)
-  {
-    Create(size, planes);
-  }
+  AERingBuffer(unsigned int size, unsigned int planes = 1) { Create(size, planes); }
 
   ~AERingBuffer()
   {
@@ -285,11 +266,11 @@
     m_iRead+=size;
   }
 
-  unsigned int m_iReadPos;
-  unsigned int m_iWritePos;
-  unsigned int m_iRead;
-  unsigned int m_iWritten;
-  unsigned int m_iSize;
-  unsigned int m_planes;
-  unsigned char **m_Buffer;
+  unsigned int m_iReadPos = 0;
+  unsigned int m_iWritePos = 0;
+  unsigned int m_iRead = 0;
+  unsigned int m_iWritten = 0;
+  unsigned int m_iSize = 0;
+  unsigned int m_planes = 0;
+  unsigned char** m_Buffer = nullptr;
 };

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp Changed

@@ -41,23 +41,21 @@
 #ifdef TARGET_POSIX
 #include "PlatformDefs.h" // for __stat64
 #include "platform/posix/XFileUtils.h"
-#include "platform/posix/XTimeUtils.h"
 #endif
+#include "FileItem.h"
 #include "ServiceBroker.h"
-#include "Util.h"
-#include "filesystem/SpecialProtocol.h"
 #include "URL.h"
+#include "Util.h"
+#include "emu_dummy.h"
+#include "emu_msvcrt.h"
+#include "filesystem/Directory.h"
 #include "filesystem/File.h"
+#include "filesystem/SpecialProtocol.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "FileItem.h"
-#include "filesystem/Directory.h"
-
-#include "emu_msvcrt.h"
-#include "emu_dummy.h"
+#include "threads/SingleLock.h"
 #include "util/EmuFileWrapper.h"
 #include "utils/log.h"
-#include "threads/SingleLock.h"
 #ifndef TARGET_POSIX
 #include "utils/CharsetConverter.h"
 #include "utils/URIUtils.h"
@@ -67,6 +65,7 @@
 #endif
 #include "platform/Environment.h"
 #include "utils/StringUtils.h"
+#include "utils/XTimeUtils.h"
 
 #if defined(TARGET_WINDOWS)
 #include "platform/win32/CharsetConverter.h"
@@ -276,10 +275,7 @@
 
 extern "C"
 {
-  void dll_sleep(unsigned long imSec)
-  {
-    Sleep(imSec);
-  }
+  void dll_sleep(unsigned long imSec) { KODI::TIME::Sleep(imSec); }
 
   // FIXME, XXX, !!!!!!
   void dllReleaseAll( )

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/ldt_keeper.c Changed

_service:download_files:master.tar.gz/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/RetroPlayerAutoSave.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/AudioSinkAE.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp Changed

@@ -22,6 +22,7 @@
 extern "C"
 {
 #include <libavcodec/avcodec.h>
+#include <libavutil/error.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
 }
@@ -203,6 +204,9 @@
   if (!m_pCodecContext)
     return true;
 
+  if (!packet.pData)
+    return true;
+
   AVPacket avpkt;
   av_init_packet(&avpkt);
   avpkt.data = packet.pData;
@@ -219,13 +223,14 @@
   int ret = avcodec_send_packet(m_pCodecContext, &avpkt);
   if (ret == AVERROR(EAGAIN))
     return false;
-  else if (ret == AVERROR_EOF)
-    return true;
   else if (ret)
   {
-    CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - send packet failed, ret:{}", __FUNCTION__,
-              ret);
-    return false;
+    char err[AV_ERROR_MAX_STRING_SIZE] = {};
+    av_strerror(ret, err, AV_ERROR_MAX_STRING_SIZE);
+    CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - send packet failed: {} ({})", __FUNCTION__,
+              err, ret);
+    if (ret != AVERROR_EOF && ret != AVERROR_INVALIDDATA)
+      return false;
   }
 
   return true;
@@ -236,9 +241,27 @@
   if (!m_pCodecContext)
     return;
 
+  Drain();
+
+  do
+  {
+    int ret = avcodec_receive_frame(m_pCodecContext, m_pFrame);
+    if (ret == AVERROR_EOF)
+      break;
+    else if (ret)
+    {
+      char err[AV_ERROR_MAX_STRING_SIZE] = {};
+      av_strerror(ret, err, AV_ERROR_MAX_STRING_SIZE);
+      CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - receive frame failed: {} ({})",
+                __FUNCTION__, err, ret);
+      break;
+    }
+    else
+      av_frame_unref(m_pFrame);
+  } while (true);
+
+  CLog::Log(LOGDEBUG, "CDVDVideoCodecDRMPRIME::{} - flush buffers", __FUNCTION__);
   avcodec_flush_buffers(m_pCodecContext);
-  av_frame_unref(m_pFrame);
-  m_codecControlFlags = 0;
 }
 
 void CDVDVideoCodecDRMPRIME::Drain()
@@ -247,7 +270,14 @@
   av_init_packet(&avpkt);
   avpkt.data = nullptr;
   avpkt.size = 0;
-  avcodec_send_packet(m_pCodecContext, &avpkt);
+  int ret = avcodec_send_packet(m_pCodecContext, &avpkt);
+  if (ret && ret != AVERROR_EOF)
+  {
+    char err[AV_ERROR_MAX_STRING_SIZE] = {};
+    av_strerror(ret, err, AV_ERROR_MAX_STRING_SIZE);
+    CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - send packet failed: {} ({})", __FUNCTION__,
+              err, ret);
+  }
 }
 
 void CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture)
@@ -275,7 +305,7 @@
   }
 
   pVideoPicture->color_range =
-      m_pFrame->color_range == AVCOL_RANGE_JPEG || m_hints.colorRange == AVCOL_RANGE_JPEG ? 1 : 0;
+      m_pFrame->color_range == AVCOL_RANGE_JPEG || m_hints.colorRange == AVCOL_RANGE_JPEG;
   pVideoPicture->color_primaries = m_pFrame->color_primaries == AVCOL_PRI_UNSPECIFIED
                                        ? m_hints.colorPrimaries
                                        : m_pFrame->color_primaries;
@@ -350,11 +380,21 @@
   if (ret == AVERROR(EAGAIN))
     return VC_BUFFER;
   else if (ret == AVERROR_EOF)
+  {
+    if (m_codecControlFlags & DVD_CODEC_CTRL_DRAIN)
+    {
+      CLog::Log(LOGDEBUG, "CDVDVideoCodecDRMPRIME::{} - flush buffers", __FUNCTION__);
+      avcodec_flush_buffers(m_pCodecContext);
+      SetCodecControl(m_codecControlFlags & ~DVD_CODEC_CTRL_DRAIN);
+    }
     return VC_EOF;
+  }
   else if (ret)
   {
-    CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - receive frame failed, ret:{}", __FUNCTION__,
-              ret);
+    char err[AV_ERROR_MAX_STRING_SIZE] = {};
+    av_strerror(ret, err, AV_ERROR_MAX_STRING_SIZE);
+    CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - receive frame failed: {} ({})", __FUNCTION__,
+              err, ret);
     return VC_ERROR;
   }
 
@@ -373,6 +413,7 @@
   {
     CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - videoBuffer:nullptr format:{}", __FUNCTION__,
               av_get_pix_fmt_name(static_cast<AVPixelFormat>(m_pFrame->format)));
+    av_frame_unref(m_pFrame);
     return VC_ERROR;
   }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp Changed

@@ -6,23 +6,27 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "system.h"
 #include "DVDVideoCodecFFmpeg.h"
-#include "DVDStreamInfo.h"
-#include "cores/VideoPlayer/Interface/Addon/TimingConstants.h"
+
 #include "DVDCodecs/DVDCodecs.h"
 #include "DVDCodecs/DVDFactoryCodec.h"
+#include "DVDStreamInfo.h"
 #include "ServiceBroker.h"
-#include "utils/CPUInfo.h"
+#include "cores/VideoPlayer/Interface/Addon/TimingConstants.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoSettings.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "cores/VideoSettings.h"
-#include "utils/log.h"
-#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
+#include "utils/CPUInfo.h"
 #include "utils/StringUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
 #include <memory>
 
+#include "system.h"
+
 extern "C" {
 #include <libavutil/opt.h>
 #include <libavutil/mastering_display_metadata.h>
@@ -36,7 +40,6 @@
 #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5)))
 #else
 #include <math.h>
-#include "platform/posix/XTimeUtils.h"
 #define RINT lrint
 #endif

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp Changed

@@ -7,25 +7,27 @@
  */
 
 #include "VAAPI.h"
-#include "ServiceBroker.h"
+
 #include "DVDVideoCodec.h"
+#include "ServiceBroker.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "cores/VideoPlayer/Interface/Addon/TimingConstants.h"
 #include "cores/VideoPlayer/Process/ProcessInfo.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-#include "threads/SingleLock.h"
+#include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
 #include "settings/lib/Setting.h"
+#include "threads/SingleLock.h"
+#include "utils/MemUtils.h"
+#include "utils/StringUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 #include "windowing/GraphicContext.h"
-#include "settings/AdvancedSettings.h"
+
+#include <drm_fourcc.h>
 #include <va/va_drm.h>
 #include <va/va_drmcommon.h>
-#include <drm_fourcc.h>
-#include "platform/posix/XTimeUtils.h"
-#include "utils/MemUtils.h"
 
 extern "C" {
 #include <libavutil/avutil.h>
@@ -1004,7 +1006,7 @@
   {
     // if there is no other error, sleep for a short while
     // in order not to drain player's message queue
-    Sleep(10);
+    KODI::TIME::Sleep(10);
 
     return CDVDVideoCodec::VC_NOBUFFER;
   }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp Changed

@@ -8,32 +8,29 @@
 
 #include "DVDDemuxFFmpeg.h"
 
-#include <sstream>
-#include <utility>
-
-#include "commons/Exception.h"
-#include "cores/FFmpeg.h"
-#include "cores/VideoPlayer/Interface/Addon/TimingConstants.h" // for DVD_TIME_BASE
 #include "DVDDemuxUtils.h"
 #include "DVDInputStreams/DVDInputStream.h"
 #include "DVDInputStreams/DVDInputStreamFFmpeg.h"
 #include "ServiceBroker.h"
+#include "URL.h"
+#include "commons/Exception.h"
+#include "cores/FFmpeg.h"
+#include "cores/VideoPlayer/Interface/Addon/TimingConstants.h" // for DVD_TIME_BASE
 #include "filesystem/CurlFile.h"
 #include "filesystem/Directory.h"
 #include "filesystem/File.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "threads/SystemClock.h"
 #include "threads/SingleLock.h"
-#include "URL.h"
-#include "utils/log.h"
+#include "threads/SystemClock.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include <sstream>
+#include <utility>
 
 #ifdef HAVE_LIBBLURAY
 #include "DVDInputStreams/DVDInputStreamBluray.h"
@@ -180,7 +177,7 @@
   m_pkt.result = -1;
   memset(&m_pkt.pkt, 0, sizeof(AVPacket));
   m_streaminfo = true; /* set to true if we want to look for streams before playback */
-  m_checkvideo = false;
+  m_checkTransportStream = false;
   m_dtsAtDisplayTime = DVD_NOPTS_VALUE;
 }
 
@@ -462,7 +459,7 @@
   if (iformat && (strcmp(iformat->name, "mpegts") == 0) && !fileinfo && !isBluray)
   {
     av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);
-    m_checkvideo = true;
+    m_checkTransportStream = true;
     skipCreateStreams = true;
   }
   else if (!iformat || (strcmp(iformat->name, "mpegts") != 0))
@@ -496,7 +493,7 @@
           m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY) ||
           (m_pFormatContext->nb_streams == 1 &&
            m_pFormatContext->streams[0]->codecpar->codec_id == AV_CODEC_ID_AC3) ||
-          m_checkvideo)
+          m_checkTransportStream)
       {
         // special case, our codecs can still handle it.
       }
@@ -511,7 +508,7 @@
     // print some extra information
     av_dump_format(m_pFormatContext, 0, CURL::GetRedacted(strFile).c_str(), 0);
 
-    if (m_checkvideo)
+    if (m_checkTransportStream)
     {
       // make sure we start video with an i-frame
       ResetVideoStreams();
@@ -520,7 +517,7 @@
   else
   {
     m_program = 0;
-    m_checkvideo = true;
+    m_checkTransportStream = true;
     skipCreateStreams = true;
   }
 
@@ -597,7 +594,7 @@
   m_startTime = 0;
   m_seekStream = -1;
 
-  if (m_checkvideo && m_streaminfo)
+  if (m_checkTransportStream && m_streaminfo)
   {
     int64_t duration = m_pFormatContext->duration;
     std::shared_ptr<CDVDInputStream> pInputStream = m_pInput;
@@ -928,12 +925,12 @@
   if (!menu && m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE)
     starttime = (double)m_pFormatContext->start_time / AV_TIME_BASE;
 
-  if (m_checkvideo)
+  if (m_checkTransportStream)
     starttime = m_startTime;
 
   if (!m_bSup)
   {
-    if (timestamp > starttime || m_checkvideo)
+    if (timestamp > starttime || m_checkTransportStream)
       timestamp -= starttime;
     // allow for largest possible difference in pts and dts for a single packet
     else if (timestamp + 0.5f > starttime)
@@ -1020,7 +1017,7 @@
 
       AVStream* stream = m_pFormatContext->streams[m_pkt.pkt.stream_index];
 
-      if (IsVideoReady())
+      if (IsTransportStreamReady())
       {
         if (m_program != UINT_MAX)
         {
@@ -1189,17 +1186,17 @@
   int64_t seek_pts = (int64_t)time * (AV_TIME_BASE / 1000);
   bool ismp3 = m_pFormatContext->iformat && (strcmp(m_pFormatContext->iformat->name, "mp3") == 0);
 
-  if (m_checkvideo)
+  if (m_checkTransportStream)
   {
     XbmcThreads::EndTime timer(1000);
 
-    while (!IsVideoReady())
+    while (!IsTransportStreamReady())
     {
       DemuxPacket* pkt = Read();
       if (pkt)
         CDVDDemuxUtils::FreeDemuxPacket(pkt);
       else
-        Sleep(10);
+        KODI::TIME::Sleep(10);
       m_pkt.result = -1;
       av_packet_unref(&m_pkt.pkt);
 
@@ -1211,7 +1208,8 @@
     }
 
     AVStream* st = m_pFormatContext->streams[m_seekStream];
-    seek_pts = av_rescale(m_startTime + time / 1000, st->time_base.den, st->time_base.num);
+    seek_pts = av_rescale(static_cast<int64_t>(m_startTime + time / 1000), st->time_base.den,
+                          st->time_base.num);
   }
   else if (m_pFormatContext->start_time != (int64_t)AV_NOPTS_VALUE && !ismp3 && !m_bSup)
     seek_pts += m_pFormatContext->start_time;
@@ -1224,10 +1222,11 @@
     if (ret < 0)
     {
       int64_t starttime = m_pFormatContext->start_time;
-      if (m_checkvideo)
+      if (m_checkTransportStream)
       {
         AVStream* st = m_pFormatContext->streams[m_seekStream];
-        starttime = av_rescale(m_startTime, st->time_base.num, st->time_base.den);
+        starttime =
+            av_rescale(static_cast<int64_t>(m_startTime), st->time_base.num, st->time_base.den);
       }
 
       // demuxer can return failure, if seeking behind eof
@@ -1340,7 +1339,7 @@
 
 int CDVDDemuxFFmpeg::GetNrOfStreams() const
 {
-  return m_streams.size();
+  return static_cast<int>(m_streams.size());
 }
 
 int CDVDDemuxFFmpeg::GetPrograms(std::vector<ProgramInfo>& programs)
@@ -1371,7 +1370,7 @@
     prog.name = os.str();
     programs.push_back(prog);
   }
-  return programs.size();
+  return static_cast<int>(programs.size());
 }
 
 void CDVDDemuxFFmpeg::SetProgram(int progId)
@@ -1668,7 +1667,7 @@
       default:
       {
         // if analyzing streams is skipped, unknown streams may become valid later
-        if (m_streaminfo && IsVideoReady())
+        if (m_streaminfo && IsTransportStreamReady())
         {
           CLog::Log(LOGDEBUG, "CDVDDemuxFFmpeg::AddStream - discarding unknown stream with id: %d", pStream->index);
           pStream->discard = AVDISCARD_ALL;
@@ -1725,6 +1724,15 @@
 #ifdef HAVE_LIBBLURAY
     if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY))
     {
+      // UHD BD have a secondary video stream called by Dolby as enhancement layer.
+      // This is not used by streaming services and devices (ATV, Nvidia Shield, XONE).
+      if (pStream->id == 0x1015)
+      {
+        CLog::Log(LOGDEBUG, "CDVDDemuxFFmpeg::AddStream - discarding Dolby Vision stream");
+        pStream->discard = AVDISCARD_ALL;
+        delete stream;
+        return nullptr;
+      }
       stream->dvdNavId = pStream->id;
 
       auto it = std::find_if(m_streams.begin(), m_streams.end(),
@@ -2157,16 +2165,10 @@
   }
 }
 
-bool CDVDDemuxFFmpeg::IsVideoReady()
+TRANSPORT_STREAM_STATE CDVDDemuxFFmpeg::TransportStreamAudioState()
 {
-  AVStream* st;
-  bool hasVideo = false;
-
-  if (!m_checkvideo)
-    return true;
-
-  if (m_program == 0 && !m_pFormatContext->nb_programs)
-    return false;
+  AVStream* st = nullptr;
+  bool hasAudio = false;
 
   if (m_program != UINT_MAX)
   {
@@ -2174,42 +2176,59 @@
     {
       int idx = m_pFormatContext->programs[m_program]->stream_index[i];
       st = m_pFormatContext->streams[idx];
-      if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
+      if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
       {
-        if (st->codecpar->extradata)
+        if (st->start_time != AV_NOPTS_VALUE)
         {
           if (!m_startTime)
           {
             m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001;
             m_seekStream = i;
           }
-          return true;
+          return TRANSPORT_STREAM_STATE::READY;
         }
-        hasVideo = true;
+        hasAudio = true;
       }
     }
-    // Workaround for live audio-only MPEG-TS streams: If there are no elementary video streams
-    // present attempt to set the start time from the first available elementary audio stream instead
-    if (!hasVideo && !m_startTime)
+  }
+  else
+  {
+    for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
     {
-      for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++)
+      st = m_pFormatContext->streams[i];
+      if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
       {
-        int idx = m_pFormatContext->programs[m_program]->stream_index[i];
-        st = m_pFormatContext->streams[idx];
-        if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+        if (st->start_time != AV_NOPTS_VALUE)
         {
-          m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001;
-          m_seekStream = i;
-          break;
+          if (!m_startTime)
+          {
+            m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001;
+            m_seekStream = i;
+          }
+          return TRANSPORT_STREAM_STATE::READY;
         }
+        hasAudio = true;
       }
     }
   }
-  else
+
+  return (hasAudio) ? TRANSPORT_STREAM_STATE::NOTREADY : TRANSPORT_STREAM_STATE::NONE;
+}
+
+TRANSPORT_STREAM_STATE CDVDDemuxFFmpeg::TransportStreamVideoState()
+{
+  AVStream* st = nullptr;
+  bool hasVideo = false;
+
+  if (m_program == 0 && !m_pFormatContext->nb_programs)
+    return TRANSPORT_STREAM_STATE::NONE;
+
+  if (m_program != UINT_MAX)
   {
-    for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
+    for (unsigned int i = 0; i < m_pFormatContext->programs[m_program]->nb_stream_indexes; i++)
     {
-      st = m_pFormatContext->streams[i];
+      int idx = m_pFormatContext->programs[m_program]->stream_index[i];
+      st = m_pFormatContext->streams[idx];
       if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
       {
         if (st->codecpar->extradata)
@@ -2219,28 +2238,49 @@
             m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001;
             m_seekStream = i;
           }
-          return true;
+          return TRANSPORT_STREAM_STATE::READY;
         }
         hasVideo = true;
       }
     }
-    // Workaround for live audio-only MPEG-TS streams: If there are no elementary video streams
-    // present attempt to set the start time from the first available elementary audio stream instead
-    if (!hasVideo && !m_startTime)
+  }
+  else
+  {
+    for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
     {
-      for (unsigned int i = 0; i < m_pFormatContext->nb_streams; i++)
+      st = m_pFormatContext->streams[i];
+      if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
       {
-        st = m_pFormatContext->streams[i];
-        if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+        if (st->codecpar->extradata)
         {
-          m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001;
-          m_seekStream = i;
-          break;
+          if (!m_startTime)
+          {
+            m_startTime = av_rescale(st->cur_dts, st->time_base.num, st->time_base.den) - 0.000001;
+            m_seekStream = i;
+          }
+          return TRANSPORT_STREAM_STATE::READY;
         }
+        hasVideo = true;
       }
     }
   }
-  return !hasVideo;
+
+  return (hasVideo) ? TRANSPORT_STREAM_STATE::NOTREADY : TRANSPORT_STREAM_STATE::NONE;
+}
+
+bool CDVDDemuxFFmpeg::IsTransportStreamReady()
+{
+  if (!m_checkTransportStream)
+    return true;
+
+  if (m_program == 0 && !m_pFormatContext->nb_programs)
+    return false;
+
+  TRANSPORT_STREAM_STATE state = TransportStreamVideoState();
+  if (state == TRANSPORT_STREAM_STATE::NONE)
+    state = TransportStreamAudioState();
+
+  return state == TRANSPORT_STREAM_STATE::READY;
 }
 
 void CDVDDemuxFFmpeg::ResetVideoStreams()

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp Changed

@@ -6,33 +6,31 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include <functional>
-#include <limits>
-
-#include "filesystem/BlurayCallback.h"
 #include "DVDInputStreamBluray.h"
-#include "IVideoPlayer.h"
+
 #include "DVDCodecs/Overlay/DVDOverlay.h"
 #include "DVDCodecs/Overlay/DVDOverlayImage.h"
-#include "settings/Settings.h"
-#include "settings/SettingsComponent.h"
+#include "IVideoPlayer.h"
 #include "LangInfo.h"
 #include "ServiceBroker.h"
-#include "utils/log.h"
-#include "utils/URIUtils.h"
-#include "filesystem/File.h"
-#include "filesystem/Directory.h"
 #include "URL.h"
-#include "utils/Geometry.h"
+#include "filesystem/BlurayCallback.h"
+#include "filesystem/Directory.h"
+#include "filesystem/File.h"
+#include "filesystem/SpecialProtocol.h"
 #include "guilib/LocalizeStrings.h"
 #include "settings/DiscSettings.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
+#include "utils/Geometry.h"
 #include "utils/LangCodeExpander.h"
-#include "filesystem/SpecialProtocol.h"
 #include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include <functional>
+#include <limits>
 
 #include <libbluray/bluray.h>
 #include <libbluray/log_control.h>
@@ -139,6 +137,7 @@
   std::string root;
 
   bool openStream = false;
+  bool openDisc = false;
 
   // The item was selected via the simple menu
   if (URIUtils::IsProtocol(strPath, "bluray"))
@@ -147,6 +146,11 @@
     root = url.GetHostName();
     filename = URIUtils::GetFileName(url.GetFileName());
 
+    // Check whether disc is AACS protected
+    CURL url3(root);
+    CFileItem base(url3, false);
+    openDisc = base.IsProtectedBlurayDisc();
+
     // check for a menu call for an image file
     if (StringUtils::EqualsNoCase(filename, "menu"))
     {
@@ -155,6 +159,11 @@
       std::string root2 = url2.GetHostName();
       CURL url(root2);
       CFileItem item(url, false);
+
+      // Check whether disc is AACS protected
+      if (!openDisc)
+        openDisc = item.IsProtectedBlurayDisc();
+
       if (item.IsDiscImage())
       {
         if (!OpenStream(item))
@@ -171,6 +180,10 @@
 
     openStream = true;
   }
+  else if (m_item.IsProtectedBlurayDisc())
+  {
+    openDisc = true;
+  }
   else
   {
     strPath = URIUtils::GetDirectory(strPath);
@@ -217,12 +230,25 @@
       return false;
     }
   }
+  else if (openDisc)
+  {
+    // This special case is required for opening original AACS protected Blu-ray discs. Otherwise
+    // things like Bus Encryption might not be handled properly and playback will fail.
+    m_rootPath = root;
+    if (!bd_open_disc(m_bd, root.c_str(), nullptr))
+    {
+      CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to open %s in disc mode",
+                CURL::GetRedacted(root).c_str());
+      return false;
+    }
+  }
   else
   {
     m_rootPath = root;
     if (!bd_open_files(m_bd, &m_rootPath, CBlurayCallback::dir_open, CBlurayCallback::file_open))
     {
-      CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to open %s", CURL::GetRedacted(root).c_str());
+      CLog::Log(LOGERROR, "CDVDInputStreamBluray::Open - failed to open %s in files mode",
+                CURL::GetRedacted(root).c_str());
       return false;
     }
   }
@@ -524,7 +550,7 @@
     break;
 
   case BD_EVENT_IDLE:
-    Sleep(100);
+    KODI::TIME::Sleep(100);
     break;
 
   case BD_EVENT_SOUND_EFFECT:
@@ -549,6 +575,8 @@
   case BD_EVENT_SECONDARY_VIDEO_SIZE:
   case BD_EVENT_SECONDARY_VIDEO_STREAM:
   case BD_EVENT_PLAYMARK:
+  case BD_EVENT_KEY_INTEREST_TABLE:
+  case BD_EVENT_UO_MASK_CHANGED:
     break;
 
   case BD_EVENT_PLAYLIST_STOP:
@@ -1133,8 +1161,15 @@
   }
   bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_REGION_CODE, static_cast<uint32_t>(region));
   bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_PARENTAL, 99);
-  bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_PLAYER_PROFILE, BLURAY_PLAYER_PROFILE_5_v2_4);
   bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_3D_CAP, 0xffffffff);
+#if (BLURAY_VERSION >= BLURAY_VERSION_CODE(1, 0, 2))  
+  bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_PLAYER_PROFILE, BLURAY_PLAYER_PROFILE_6_v3_1);
+  bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_UHD_CAP, 0xffffffff);
+  bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_UHD_DISPLAY_CAP, 0xffffffff);
+  bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_HDR_PREFERENCE, 0xffffffff);
+#else
+  bd_set_player_setting(m_bd, BLURAY_PLAYER_SETTING_PLAYER_PROFILE, BLURAY_PLAYER_PROFILE_5_v2_4);
+#endif
 
   std::string langCode;
   g_LangCodeExpander.ConvertToISO6392T(g_langInfo.GetDVDAudioLanguage(), langCode);

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp Changed

@@ -20,13 +20,15 @@
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 
-CInputStreamProvider::CInputStreamProvider(ADDON::BinaryAddonBasePtr addonBase, kodi::addon::IAddonInstance* parentInstance)
-  : m_addonBase(addonBase)
-  , m_parentInstance(parentInstance)
+CInputStreamProvider::CInputStreamProvider(ADDON::BinaryAddonBasePtr addonBase,
+                                           KODI_HANDLE parentInstance)
+  : m_addonBase(addonBase), m_parentInstance(parentInstance)
 {
 }
 
-void CInputStreamProvider::getAddonInstance(INSTANCE_TYPE instance_type, ADDON::BinaryAddonBasePtr& addonBase, kodi::addon::IAddonInstance*& parentInstance)
+void CInputStreamProvider::getAddonInstance(INSTANCE_TYPE instance_type,
+                                            ADDON::BinaryAddonBasePtr& addonBase,
+                                            KODI_HANDLE& parentInstance)
 {
   if (instance_type == ADDON::IAddonProvider::INSTANCE_VIDEOCODEC)
   {
@@ -55,7 +57,7 @@
     key = name + "." + key;
   }
   m_struct = {{ 0 }};
-  m_caps.m_mask = 0;
+  m_caps = { 0 };
 }
 
 CInputStreamAddon::~CInputStreamAddon()
@@ -120,7 +122,7 @@
   if (CreateInstance(&m_struct) != ADDON_STATUS_OK || !m_struct.toAddon.open)
     return false;
 
-  INPUTSTREAM props;
+  INPUTSTREAM props = { 0 };
   std::map<std::string, std::string> propsMap;
   for (auto &key : m_fileItemProps)
   {
@@ -153,7 +155,7 @@
   bool ret = m_struct.toAddon.open(&m_struct, &props);
   if (ret)
   {
-    memset(&m_caps, 0, sizeof(m_caps));
+    m_caps = { 0 };
     m_struct.toAddon.get_capabilities(&m_struct, &m_caps);
 
     m_subAddonProvider = std::shared_ptr<CInputStreamProvider>(new CInputStreamProvider(GetAddonBase(), m_struct.toAddon.addonInstance));
@@ -333,10 +335,16 @@
     return nullptr;
 
   std::string codecName(stream.m_codecName);
-  StringUtils::ToLower(codecName);
-  AVCodec *codec = avcodec_find_decoder_by_name(codecName.c_str());
-  if (!codec)
-    return nullptr;
+  AVCodec* codec = nullptr;
+
+  if (stream.m_streamType != INPUTSTREAM_INFO::TYPE_TELETEXT &&
+      stream.m_streamType != INPUTSTREAM_INFO::TYPE_RDS)
+  {
+    StringUtils::ToLower(codecName);
+    codec = avcodec_find_decoder_by_name(codecName.c_str());
+    if (!codec)
+      return nullptr;
+  }
 
   CDemuxStream *demuxStream;
 
@@ -403,11 +411,24 @@
     CDemuxStreamSubtitle *subtitleStream = new CDemuxStreamSubtitle();
     demuxStream = subtitleStream;
   }
+  else if (stream.m_streamType == INPUTSTREAM_INFO::TYPE_TELETEXT)
+  {
+    CDemuxStreamTeletext* teletextStream = new CDemuxStreamTeletext();
+    demuxStream = teletextStream;
+  }
+  else if (stream.m_streamType == INPUTSTREAM_INFO::TYPE_RDS)
+  {
+    CDemuxStreamRadioRDS* rdsStream = new CDemuxStreamRadioRDS();
+    demuxStream = rdsStream;
+  }
   else
     return nullptr;
 
   demuxStream->name = stream.m_name;
-  demuxStream->codec = codec->id;
+  if (codec)
+    demuxStream->codec = codec->id;
+  else
+    demuxStream->codec = AV_CODEC_ID_DVB_TELETEXT;
   demuxStream->codecName = stream.m_codecInternalName;
   demuxStream->uniqueId = streamId;
   demuxStream->flags = static_cast<StreamFlags>(stream.m_flags);

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Edl.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Interface/Addon/InputStreamConstants.h Changed

@@ -8,6 +8,23 @@
 
 #pragma once
 
-#define STREAM_PROPERTY_INPUTSTREAMCLASS  "inputstreamclass" /*!< @brief the name of the inputstream add-on that should be used by Kodi to play the stream denoted by STREAM_PROPERTY_STREAMURL. Leave blank to use Kodi's built-in playing capabilities or to allow ffmpeg to handle directly set to STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG. */
-#define STREAM_PROPERTY_ISREALTIMESTREAM "isrealtimestream" /*!< @brief "true" to denote that the stream that should be played is a realtime stream. Any other value indicates that this is not a realtime stream.*/
-#define STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG  "inputstream.ffmpeg" /*!< @brief special value for STREAM_PROPERTY_INPUTSTREAMCLASS to use ffmpeg to directly play a stream URL. */
+/*!
+ * @brief the name of the inputstream add-on that should be used by Kodi to
+ * play the stream denoted by STREAM_PROPERTY_STREAMURL. Leave blank to use
+ * Kodi's built-in playing capabilities or to allow ffmpeg to handle directly
+ * set to STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG.
+ */
+#define STREAM_PROPERTY_INPUTSTREAMCLASS "inputstreamclass"
+
+/*!
+ * @brief "true" to denote that the stream that should be played is a
+ * realtime stream. Any other value indicates that this is not a realtime
+ * stream.
+ */
+#define STREAM_PROPERTY_ISREALTIMESTREAM "isrealtimestream"
+
+/*!
+ * @brief special value for STREAM_PROPERTY_INPUTSTREAMCLASS to use
+ * ffmpeg to directly play a stream URL.
+ */
+#define STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG "inputstream.ffmpeg"

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/gbm/VideoBufferDRMPRIME.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayer.cpp Changed

@@ -649,7 +649,7 @@
 
   while (m_outboundEvents->IsProcessing())
   {
-    Sleep(10);
+    CThread::Sleep(10);
   }
 }
 
@@ -1314,7 +1314,7 @@
     // check display lost
     if (m_displayLost)
     {
-      Sleep(50);
+      CThread::Sleep(50);
       continue;
     }
 
@@ -1399,7 +1399,7 @@
           m_pDemuxer->SetSpeed(DVD_PLAYSPEED_PAUSE);
         m_demuxerSpeed = DVD_PLAYSPEED_PAUSE;
       }
-      Sleep(10);
+      CThread::Sleep(10);
       continue;
     }
 
@@ -1469,7 +1469,7 @@
       // input stream asked us to just retry
       if(next == CDVDInputStream::NEXTSTREAM_RETRY)
       {
-        Sleep(100);
+        CThread::Sleep(100);
         continue;
       }
 
@@ -1491,7 +1491,7 @@
       if (m_VideoPlayerAudio->HasData() ||
           m_VideoPlayerVideo->HasData())
       {
-        Sleep(100);
+        CThread::Sleep(100);
         continue;
       }
 
@@ -2808,10 +2808,13 @@
       }
 
       if (speed != DVD_PLAYSPEED_PAUSE && m_playSpeed != DVD_PLAYSPEED_PAUSE && speed != m_playSpeed)
+      {
         m_callback.OnPlayBackSpeedChanged(speed / DVD_PLAYSPEED_NORMAL);
 
-      // notify GUI, skins may want to show the seekbar
-      CServiceBroker::GetGUI()->GetInfoManager().GetInfoProviders().GetPlayerInfoProvider().SetDisplayAfterSeek();
+        // notify GUI, skins may want to show the seekbar
+        CServiceBroker::GetGUI()->
+          GetInfoManager().GetInfoProviders().GetPlayerInfoProvider().SetDisplayAfterSeek();
+      }
 
       if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER) && speed != m_playSpeed)
       {

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoReferenceClock.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp Changed

@@ -7,29 +7,25 @@
  */
 
 #include "RenderManager.h"
-#include "RenderFlags.h"
-#include "RenderFactory.h"
-#include "cores/VideoPlayer/Interface/Addon/TimingConstants.h"
-#include "windowing/GraphicContext.h"
-#include "utils/MathUtils.h"
-#include "threads/SingleLock.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-#include "windowing/WinSystem.h"
 
 #include "Application.h"
+#include "RenderCapture.h"
+#include "RenderFactory.h"
+#include "RenderFlags.h"
 #include "ServiceBroker.h"
+#include "cores/VideoPlayer/Interface/Addon/TimingConstants.h"
 #include "messaging/ApplicationMessenger.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-
-#if defined(TARGET_POSIX)
-#include "platform/posix/XTimeUtils.h"
-#endif
-
-#include "RenderCapture.h"
+#include "threads/SingleLock.h"
+#include "utils/MathUtils.h"
+#include "utils/StringUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
+#include "windowing/WinSystem.h"
 
 /* to use the same as player */
 #include "../VideoPlayer/DVDClock.h"
@@ -654,7 +650,7 @@
       entry.second->GetEvent().Set();
     }
     CSingleExit lockexit(m_captCritSect);
-    Sleep(10);
+    KODI::TIME::Sleep(10);
   }
 
   for (auto entry : m_captures)

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/cores/paplayer/PAPlayer.cpp Changed

@@ -17,6 +17,7 @@
 #include "cores/AudioEngine/Utils/AEUtil.h"
 #include "cores/DataCacheCore.h"
 #include "cores/VideoPlayer/Process/ProcessInfo.h"
+#include "messaging/ApplicationMessenger.h"
 #include "music/tags/MusicInfoTag.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
@@ -25,6 +26,8 @@
 #include "utils/log.h"
 #include "video/Bookmark.h"
 
+using namespace KODI::MESSAGING;
+
 #define TIME_TO_CACHE_NEXT_FILE 5000 /* 5 seconds before end of song, start caching the next song */
 #define FAST_XFADE_TIME           80 /* 80 milliseconds */
 #define MAX_SKIP_XFADE_TIME     2000 /* max 2 seconds crossfade on track skip */
@@ -87,7 +90,7 @@
   {
     /* wait for them to fade in */
     lock.Leave();
-    Sleep(FAST_XFADE_TIME);
+    CThread::Sleep(FAST_XFADE_TIME);
     lock.Enter();
 
     /* be sure they have faded in */
@@ -101,7 +104,7 @@
         {
           lock.Leave();
           wait = true;
-          Sleep(1);
+          CThread::Sleep(1);
           lock.Enter();
           break;
         }
@@ -136,7 +139,7 @@
 
     /* wait for them to fade out */
     lock.Leave();
-    Sleep(FAST_XFADE_TIME);
+    CThread::Sleep(FAST_XFADE_TIME);
     lock.Enter();
 
     /* be sure they have faded out */
@@ -150,7 +153,7 @@
         {
           lock.Leave();
           wait = true;
-          Sleep(1);
+          CThread::Sleep(1);
           lock.Enter();
           break;
         }
@@ -218,6 +221,7 @@
 bool PAPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
 {
   m_defaultCrossfadeMS = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_MUSICPLAYER_CROSSFADE) * 1000;
+  m_fullScreen = options.fullscreen;
 
   if (m_streams.size() > 1 || !m_defaultCrossfadeMS || m_isPaused)
   {
@@ -256,8 +260,10 @@
   m_isPlaying = true;
   m_startEvent.Set();
 
-  m_callback.OnPlayBackStarted(file);
+  // OnPlayBackStarted to be made only once. Callback processing may be slower than player process
+  // so clear signal flag first otherwise async stream processing could also make callback
   m_signalStarted = false;
+  m_callback.OnPlayBackStarted(file);
 
   return true;
 }
@@ -717,6 +723,11 @@
     if (m_signalStarted)
       m_callback.OnPlayBackStarted(si->m_fileItem);
     m_signalStarted = true;
+    if (m_fullScreen)
+    {
+      CApplicationMessenger::GetInstance().PostMsg(TMSG_SWITCHTOFULLSCREEN);
+      m_fullScreen = false;
+    }
     m_callback.OnAVStarted(si->m_fileItem);
   }

_service:download_files:master.tar.gz/xbmc/cores/paplayer/PAPlayer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp Changed

@@ -47,11 +47,18 @@
   m_tRemote = GetTristate(pRule->Attribute("remote"));
   m_tAudio = GetTristate(pRule->Attribute("audio"));
   m_tVideo = GetTristate(pRule->Attribute("video"));
+  m_tGame = GetTristate(pRule->Attribute("game"));
 
   m_tBD = GetTristate(pRule->Attribute("bd"));
   m_tDVD = GetTristate(pRule->Attribute("dvd"));
   m_tDVDFile = GetTristate(pRule->Attribute("dvdfile"));
-  m_tDVDImage = GetTristate(pRule->Attribute("dvdimage"));
+  m_tDiscImage = GetTristate(pRule->Attribute("discimage"));
+  if (m_tDiscImage < 0)
+  {
+    m_tDiscImage = GetTristate(pRule->Attribute("dvdimage"));
+    if (m_tDiscImage >= 0)
+      CLog::Log(LOGWARNING, "\"dvdimage\" tag is deprecated. use \"discimage\"");
+  }
 
   m_protocols = XMLUtils::GetAttribute(pRule, "protocols");
   m_fileTypes = XMLUtils::GetAttribute(pRule, "filetypes");
@@ -112,6 +119,8 @@
     return;
   if (m_tVideo >= 0 && (m_tVideo > 0) != item.IsVideo())
     return;
+  if (m_tGame >= 0 && (m_tGame > 0) != item.IsGame())
+    return;
   if (m_tInternetStream >= 0 && (m_tInternetStream > 0) != item.IsInternetStream())
     return;
   if (m_tRemote >= 0 && (m_tRemote > 0) != item.IsRemote())
@@ -123,7 +132,7 @@
     return;
   if (m_tDVDFile >= 0 && (m_tDVDFile > 0) != item.IsDVDFile())
     return;
-  if (m_tDVDImage >= 0 && (m_tDVDImage > 0) != item.IsDiscImage())
+  if (m_tDiscImage >= 0 && (m_tDiscImage > 0) != item.IsDiscImage())
     return;
 
   CRegExp regExp(false, CRegExp::autoUtf8);

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerSelectionRule.h Changed

_service:download_files:master.tar.gz/xbmc/dbwrappers/qry_dat.cpp Changed

_service:download_files:master.tar.gz/xbmc/dbwrappers/sqlitedataset.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogContextMenu.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogKeyboardTouch.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogNumeric.cpp Changed

@@ -44,7 +44,7 @@
   , m_lastblock{0}
   , m_dirty{false}
 {
-  memset(&m_datetime, 0, sizeof(SYSTEMTIME));
+  memset(&m_datetime, 0, sizeof(KODI::TIME::SystemTime));
   m_loadType = KEEP_IN_MEMORY;
 }
 
@@ -231,9 +231,9 @@
   else if (m_mode == INPUT_TIME)
   {
     if (m_block == 0)
-      m_datetime.wHour /= 10;
-    else if (m_datetime.wMinute)
-      m_datetime.wMinute /= 10;
+      m_datetime.hour /= 10;
+    else if (m_datetime.minute)
+      m_datetime.minute /= 10;
     else
     {
       m_block = 0;
@@ -243,19 +243,19 @@
   else if (m_mode == INPUT_TIME_SECONDS)
   {
     if (m_block == 0)
-      m_datetime.wHour /= 10;
+      m_datetime.hour /= 10;
     else if (m_block == 1)
     {
-      if (m_datetime.wMinute)
-        m_datetime.wMinute /= 10;
+      if (m_datetime.minute)
+        m_datetime.minute /= 10;
       else
       {
         m_block = 0;
         m_dirty = false;
       }
     }
-    else if (m_datetime.wSecond)
-      m_datetime.wMinute /= 10;
+    else if (m_datetime.second)
+      m_datetime.minute /= 10;
     else
     {
       m_block = 0;
@@ -265,19 +265,19 @@
   else if (m_mode == INPUT_DATE)
   {
     if (m_block == 0)
-      m_datetime.wDay /= 10;
+      m_datetime.day /= 10;
     else if (m_block == 1)
     {
-      if (m_datetime.wMonth)
-        m_datetime.wMonth /= 10;
+      if (m_datetime.month)
+        m_datetime.month /= 10;
       else
       {
         m_block = 0;
         m_dirty = false;
       }
     }
-    else if (m_datetime.wYear) // m_block == 2
-      m_datetime.wYear /= 10;
+    else if (m_datetime.year) // m_block == 2
+      m_datetime.year /= 10;
     else
     {
       m_block = 1;
@@ -316,19 +316,21 @@
     strLabel = m_number;
   else if (m_mode == INPUT_TIME)
   { // format up the time
-    strLabel = StringUtils::Format("%2d:%02d", m_datetime.wHour, m_datetime.wMinute);
+    strLabel = StringUtils::Format("%2d:%02d", m_datetime.hour, m_datetime.minute);
     start = m_block * 3;
     end = m_block * 3 + 2;
   }
   else if (m_mode == INPUT_TIME_SECONDS)
   { // format up the time
-    strLabel = StringUtils::Format("%2d:%02d:%02d", m_datetime.wHour, m_datetime.wMinute, m_datetime.wSecond);
+    strLabel =
+        StringUtils::Format("%2d:%02d:%02d", m_datetime.hour, m_datetime.minute, m_datetime.second);
     start = m_block * 3;
     end = m_block * 3 + 2;
   }
   else if (m_mode == INPUT_DATE)
   { // format up the date
-    strLabel = StringUtils::Format("%2d/%2d/%4d", m_datetime.wDay, m_datetime.wMonth, m_datetime.wYear);
+    strLabel =
+        StringUtils::Format("%2d/%2d/%4d", m_datetime.day, m_datetime.month, m_datetime.year);
     start = m_block * 3;
     end = m_block * 3 + 2;
     if (m_block == 2)
@@ -374,7 +376,7 @@
   }
 }
 
-void CGUIDialogNumeric::SetMode(INPUT_MODE mode, const SYSTEMTIME &initial)
+void CGUIDialogNumeric::SetMode(INPUT_MODE mode, const KODI::TIME::SystemTime& initial)
 {
   m_mode = mode;
   m_block = 0;
@@ -444,7 +446,7 @@
     m_number = initial;
 }
 
-SYSTEMTIME CGUIDialogNumeric::GetOutput() const
+KODI::TIME::SystemTime CGUIDialogNumeric::GetOutput() const
 {
   assert(m_mode == INPUT_TIME || m_mode == INPUT_TIME_SECONDS || m_mode == INPUT_DATE);
   return m_datetime;
@@ -455,11 +457,12 @@
   switch (m_mode)
   {
   case INPUT_DATE:
-    return StringUtils::Format("%02i/%02i/%04i", m_datetime.wDay, m_datetime.wMonth, m_datetime.wYear);
+    return StringUtils::Format("%02i/%02i/%04i", m_datetime.day, m_datetime.month, m_datetime.year);
   case INPUT_TIME:
-    return StringUtils::Format("%i:%02i", m_datetime.wHour, m_datetime.wMinute);
+    return StringUtils::Format("%i:%02i", m_datetime.hour, m_datetime.minute);
   case INPUT_TIME_SECONDS:
-    return StringUtils::Format("%i:%02i:%02i", m_datetime.wHour, m_datetime.wMinute, m_datetime.wSecond);
+    return StringUtils::Format("%i:%02i:%02i", m_datetime.hour, m_datetime.minute,
+                               m_datetime.second);
   case INPUT_IP_ADDRESS:
     return StringUtils::Format("%d.%d.%d.%d", m_ip[0], m_ip[1], m_ip[2], m_ip[3]);
   case INPUT_NUMBER:
@@ -476,22 +479,22 @@
   CGUIDialogNumeric *pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogNumeric>(WINDOW_DIALOG_NUMERIC);
   if (!pDialog) return false;
   int seconds = StringUtils::TimeStringToSeconds(timeString);
-  SYSTEMTIME time = {0};
-  time.wHour = seconds / 3600;
-  time.wMinute = (seconds - time.wHour * 3600) / 60;
-  time.wSecond = seconds - time.wHour * 3600 - time.wMinute * 60;
+  KODI::TIME::SystemTime time = {0};
+  time.hour = seconds / 3600;
+  time.minute = (seconds - time.hour * 3600) / 60;
+  time.second = seconds - time.hour * 3600 - time.minute * 60;
   pDialog->SetMode(INPUT_TIME_SECONDS, time);
   pDialog->SetHeading(heading);
   pDialog->Open();
   if (!pDialog->IsConfirmed() || pDialog->IsCanceled())
     return false;
   time = pDialog->GetOutput();
-  seconds = time.wHour * 3600 + time.wMinute * 60 + time.wSecond;
+  seconds = time.hour * 3600 + time.minute * 60 + time.second;
   timeString = StringUtils::SecondsToTimeString(seconds);
   return true;
 }
 
-bool CGUIDialogNumeric::ShowAndGetTime(SYSTEMTIME &time, const std::string &heading)
+bool CGUIDialogNumeric::ShowAndGetTime(KODI::TIME::SystemTime& time, const std::string& heading)
 {
   CGUIDialogNumeric *pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogNumeric>(WINDOW_DIALOG_NUMERIC);
   if (!pDialog) return false;
@@ -504,7 +507,7 @@
   return true;
 }
 
-bool CGUIDialogNumeric::ShowAndGetDate(SYSTEMTIME &date, const std::string &heading)
+bool CGUIDialogNumeric::ShowAndGetDate(KODI::TIME::SystemTime& date, const std::string& heading)
 {
   CGUIDialogNumeric *pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogNumeric>(WINDOW_DIALOG_NUMERIC);
   if (!pDialog) return false;
@@ -671,25 +674,26 @@
 
 void CGUIDialogNumeric::VerifyDate(bool checkYear)
 {
-  if (m_datetime.wDay == 0)
-    m_datetime.wDay = 1;
-  if (m_datetime.wMonth == 0)
-    m_datetime.wMonth = 1;
+  if (m_datetime.day == 0)
+    m_datetime.day = 1;
+  if (m_datetime.month == 0)
+    m_datetime.month = 1;
   // check for number of days in the month
-  if (m_datetime.wDay == 31)
+  if (m_datetime.day == 31)
   {
-    if (m_datetime.wMonth == 4 || m_datetime.wMonth == 6 || m_datetime.wMonth == 9 || m_datetime.wMonth == 11)
-      m_datetime.wDay = 30;
+    if (m_datetime.month == 4 || m_datetime.month == 6 || m_datetime.month == 9 ||
+        m_datetime.month == 11)
+      m_datetime.day = 30;
   }
-  if (m_datetime.wMonth == 2 && m_datetime.wDay > 28)
+  if (m_datetime.month == 2 && m_datetime.day > 28)
   {
-    m_datetime.wDay = 29;   // max in february.
+    m_datetime.day = 29; // max in february.
     if (checkYear)
     {
       // leap years occur when the year is divisible by 4 but not by 100, or the year is divisible by 400
       // thus they don't occur, if the year has a remainder when divided by 4, or when the year is divisible by 100 but not by 400
-      if ( (m_datetime.wYear % 4) || ( !(m_datetime.wYear % 100) && (m_datetime.wYear % 400) ) )
-        m_datetime.wDay = 28;
+      if ((m_datetime.year % 4) || (!(m_datetime.year % 100) && (m_datetime.year % 400)))
+        m_datetime.day = 28;
     }
   }
 }
@@ -733,15 +737,15 @@
 {
   if (m_block == 0) // day of month
   {
-    if (m_dirty && (m_datetime.wDay < 3 || num < 2))
+    if (m_dirty && (m_datetime.day < 3 || num < 2))
     {
-      m_datetime.wDay *= 10;
-      m_datetime.wDay += num;
+      m_datetime.day *= 10;
+      m_datetime.day += num;
     }
     else
-      m_datetime.wDay = num;
+      m_datetime.day = num;
 
-    if (m_datetime.wDay > 3)
+    if (m_datetime.day > 3)
     {
       m_block = 1;             // move to months
       m_dirty = false;
@@ -753,13 +757,13 @@
   {
     if (m_dirty && num < 3)
     {
-      m_datetime.wMonth *= 10;
-      m_datetime.wMonth += num;
+      m_datetime.month *= 10;
+      m_datetime.month += num;
     }
     else
-      m_datetime.wMonth = num;
+      m_datetime.month = num;
 
-    if (m_datetime.wMonth > 1)
+    if (m_datetime.month > 1)
     {
       VerifyDate(false);
       m_block = 2;             // move to year
@@ -770,15 +774,15 @@
   }
   else // year
   {
-    if (m_dirty && m_datetime.wYear < 1000)  // have taken input
+    if (m_dirty && m_datetime.year < 1000) // have taken input
     {
-      m_datetime.wYear *= 10;
-      m_datetime.wYear += num;
+      m_datetime.year *= 10;
+      m_datetime.year += num;
     }
     else
-      m_datetime.wYear = num;
+      m_datetime.year = num;
 
-    if (m_datetime.wYear > 1000)
+    if (m_datetime.year > 1000)
     {
       VerifyDate(true);
       m_block = 0;        // move to day of month
@@ -795,14 +799,14 @@
   {
     if (m_dirty) // have input the first digit
     {
-      m_datetime.wHour *= 10;
-      m_datetime.wHour += num;
+      m_datetime.hour *= 10;
+      m_datetime.hour += num;
       m_block = 1;             // move to minutes - allows up to 99 hours
       m_dirty = false;
     }
     else  // this is the first digit
     {
-      m_datetime.wHour = num;
+      m_datetime.hour = num;
       m_dirty = true;
     }
   }
@@ -810,14 +814,14 @@
   {
     if (m_dirty) // have input the first digit
     {
-      m_datetime.wMinute *= 10;
-      m_datetime.wMinute += num;
+      m_datetime.minute *= 10;
+      m_datetime.minute += num;
       m_block = 2;             // move to seconds - allows up to 99 minutes
       m_dirty = false;
     }
     else  // this is the first digit
     {
-      m_datetime.wMinute = num;
+      m_datetime.minute = num;
       if (num > 5)
       {
         m_block = 2;           // move to seconds
@@ -831,14 +835,14 @@
   {
     if (m_dirty) // have input the first digit
     {
-      m_datetime.wSecond *= 10;
-      m_datetime.wSecond += num;
+      m_datetime.second *= 10;
+      m_datetime.second += num;
       m_block = 0;             // move to hours
       m_dirty = false;
     }
     else  // this is the first digit
     {
-      m_datetime.wSecond = num;
+      m_datetime.second = num;
       if (num > 5)
       {
         m_block = 0;           // move to hours
@@ -856,20 +860,20 @@
   {
     if (m_dirty) // have input the first digit
     {
-      if (m_datetime.wHour < 2 || num < 4)
+      if (m_datetime.hour < 2 || num < 4)
       {
-        m_datetime.wHour *= 10;
-        m_datetime.wHour += num;
+        m_datetime.hour *= 10;
+        m_datetime.hour += num;
       }
       else
-        m_datetime.wHour = num;
+        m_datetime.hour = num;
 
       m_block = 1;             // move to minutes
       m_dirty = false;
     }
     else  // this is the first digit
     {
-      m_datetime.wHour = num;
+      m_datetime.hour = num;
 
       if (num > 2)
       {
@@ -884,14 +888,14 @@
   {
     if (m_dirty) // have input the first digit
     {
-      m_datetime.wMinute *= 10;
-      m_datetime.wMinute += num;
+      m_datetime.minute *= 10;
+      m_datetime.minute += num;
       m_block = 0;             // move to hours
       m_dirty = false;
     }
     else  // this is the first digit
     {
-      m_datetime.wMinute = num;
+      m_datetime.minute = num;
 
       if (num > 5)
       {

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogNumeric.h Changed

@@ -8,12 +8,11 @@
 
 #pragma once
 
+#include "XBDateTime.h"
 #include "guilib/GUIDialog.h"
 
 #include <cstdint>
 
-#include "PlatformDefs.h"
-
 enum class InputVerificationResult
 {
   CANCELED,
@@ -42,13 +41,13 @@
   static InputVerificationResult ShowAndVerifyInput(std::string& strPassword, const std::string& strHeading, bool bGetUserInput);
 
   void SetHeading(const std::string &strHeading);
-  void SetMode(INPUT_MODE mode, const SYSTEMTIME &initial);
+  void SetMode(INPUT_MODE mode, const KODI::TIME::SystemTime& initial);
   void SetMode(INPUT_MODE mode, const std::string &initial);
-  SYSTEMTIME GetOutput() const;
+  KODI::TIME::SystemTime GetOutput() const;
   std::string GetOutputString() const;
 
-  static bool ShowAndGetTime(SYSTEMTIME &time, const std::string &heading);
-  static bool ShowAndGetDate(SYSTEMTIME &date, const std::string &heading);
+  static bool ShowAndGetTime(KODI::TIME::SystemTime& time, const std::string& heading);
+  static bool ShowAndGetDate(KODI::TIME::SystemTime& date, const std::string& heading);
   static bool ShowAndGetIPAddress(std::string &IPAddress, const std::string &heading);
   static bool ShowAndGetNumber(std::string& strInput, const std::string &strHeading, unsigned int iAutoCloseTimeoutMs = 0);
   static bool ShowAndGetSeconds(std::string& timeString, const std::string &heading);
@@ -74,7 +73,7 @@
   bool m_bCanceled;
 
   INPUT_MODE m_mode;                // the current input mode
-  SYSTEMTIME m_datetime;            // for time and date modes
+  KODI::TIME::SystemTime m_datetime; // for time and date modes
   uint8_t m_ip[4];                  // for ip address mode
   uint32_t m_block;             // for time, date, and IP methods.
   uint32_t m_lastblock;

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSelect.cpp Changed

_service:download_files:master.tar.gz/xbmc/events/BaseEvent.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/AddonsDirectory.cpp Changed

@@ -120,7 +120,7 @@
 
 static bool IsGameProvider(const AddonPtr& addon)
 {
-  return addon->Type() == ADDON_PLUGIN && addon->IsType(ADDON_GAME);
+  return addon->Type() == ADDON_PLUGIN && addon->HasType(ADDON_GAME);
 }
 
 static bool IsGameResource(const AddonPtr& addon)
@@ -152,7 +152,7 @@
 static bool IsUserInstalled(const AddonPtr& addon)
 {
   return std::find_if(dependencyTypes.begin(), dependencyTypes.end(),
-      [&](TYPE type){ return addon->IsType(type); }) == dependencyTypes.end();
+                      [&](TYPE type) { return addon->HasType(type); }) == dependencyTypes.end();
 }
 
 static bool IsOrphaned(const AddonPtr& addon, const VECADDONS& all)
@@ -178,7 +178,7 @@
   {
     for (const auto& addon : addons)
     {
-      if (addon->IsType(type))
+      if (addon->HasType(type))
       {
         CFileItemPtr item(new CFileItem(CAddonInfo::TranslateType(type, true)));
         CURL itemPath = path;
@@ -341,7 +341,16 @@
   for (unsigned int i = ADDON_UNKNOWN + 1; i < ADDON_MAX - 1; ++i)
   {
     const TYPE type = (TYPE)i;
-    if (!IsInfoProviderType(type) && !IsLookAndFeelType(type) && !IsDependencyType(type) && !IsGameType(type))
+    /*
+     * Check and prevent insert for this cases:
+     * - By a provider, look and feel, dependency and game becomes given to
+     *   subdirectory to control the types
+     * - By ADDON_SCRIPT and ADDON_PLUGIN, them contains one of the possible
+     *   subtypes (audio, video, app or/and game) and not needed to show
+     *   together in a Script or Plugin list
+     */
+    if (!IsInfoProviderType(type) && !IsLookAndFeelType(type) && !IsDependencyType(type) &&
+        !IsGameType(type) && type != ADDON_SCRIPT && type != ADDON_PLUGIN)
       uncategorized.insert(static_cast<TYPE>(i));
   }
   GenerateTypeListing(path, uncategorized, addons, items);
@@ -410,7 +419,8 @@
     TYPE type = CAddonInfo::TranslateType(category);
     items.SetProperty("addoncategory", CAddonInfo::TranslateType(type, true));
     addons.erase(std::remove_if(addons.begin(), addons.end(),
-        [type](const AddonPtr& addon){ return !addon->IsType(type); }), addons.end());
+                                [type](const AddonPtr& addon) { return !addon->HasType(type); }),
+                 addons.end());
     CAddonsDirectory::GenerateAddonListing(path, addons, items, CAddonInfo::TranslateType(type, true));
   }
 }
@@ -785,8 +795,7 @@
     itemPath.SetFileName(addon->ID());
     CFileItemPtr pItem = FileItemFromAddon(addon, itemPath.Get(), false);
 
-    AddonPtr localAddon;
-    bool installed = CServiceBroker::GetAddonMgr().GetAddon(addon->ID(), localAddon, ADDON_UNKNOWN, false);
+    bool installed = CServiceBroker::GetAddonMgr().IsAddonInstalled(addon->ID());
     bool disabled = CServiceBroker::GetAddonMgr().IsAddonDisabled(addon->ID());
     bool hasUpdate = outdated.find(addon->ID()) != outdated.end();
 
@@ -883,34 +892,26 @@
     const bool bIsFolder = (addon->Type() == ADDON_PLUGIN);
 
     std::string path;
-    switch (addon->Type())
+    if (addon->HasType(ADDON_PLUGIN))
     {
-      case ADDON_PLUGIN:
+      path = "plugin://" + addon->ID();
+      PluginPtr plugin = std::dynamic_pointer_cast<CPluginSource>(addon);
+      if (plugin && plugin->ProvidesSeveral())
       {
-        path = "plugin://" + addon->ID();
-        PluginPtr plugin = std::dynamic_pointer_cast<CPluginSource>(addon);
-        if (plugin && plugin->ProvidesSeveral())
-        {
-          CURL url(path);
-          std::string opt = StringUtils::Format("?content_type=%s", content.c_str());
-          url.SetOptions(opt);
-          path = url.Get();
-        }
-        break;
-      }
-      case ADDON_SCRIPT:
-      {
-        path = "script://" + addon->ID();
-        break;
-      }
-      case ADDON_GAMEDLL:
-      {
-        // Kodi fails to launch games with empty path from home screen
-        path = "game://" + addon->ID();
-        break;
+        CURL url(path);
+        std::string opt = StringUtils::Format("?content_type=%s", content.c_str());
+        url.SetOptions(opt);
+        path = url.Get();
       }
-      default:
-        break;
+    }
+    else if (addon->HasType(ADDON_SCRIPT))
+    {
+      path = "script://" + addon->ID();
+    }
+    else if (addon->HasType(ADDON_GAMEDLL))
+    {
+      // Kodi fails to launch games with empty path from home screen
+      path = "game://" + addon->ID();
     }
 
     items.Add(FileItemFromAddon(addon, path, bIsFolder));

_service:download_files:master.tar.gz/xbmc/filesystem/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CacheStrategy.cpp Changed

@@ -119,7 +119,8 @@
   size_t written = 0;
   while (iSize > 0)
   {
-    const ssize_t lastWritten = m_cacheFileWrite->Write(pBuffer, (iSize > SSIZE_MAX) ? SSIZE_MAX : iSize);
+    const ssize_t lastWritten =
+        m_cacheFileWrite->Write(pBuffer, std::min(iSize, static_cast<size_t>(SSIZE_MAX)));
     if (lastWritten <= 0)
     {
       CLog::LogF(LOGERROR, "failed to write to file");
@@ -145,14 +146,16 @@
 {
   int64_t iAvailable = GetAvailableRead();
   if ( iAvailable <= 0 )
-    return m_bEndOfInput? 0 : CACHE_RC_WOULD_BLOCK;
+    return m_bEndOfInput ? 0 : CACHE_RC_WOULD_BLOCK;
 
-  size_t toRead = ((int64_t)iMaxSize > iAvailable) ? (size_t)iAvailable : iMaxSize;
+  size_t toRead = std::min(iMaxSize, static_cast<size_t>(iAvailable));
 
   size_t readBytes = 0;
   while (toRead > 0)
   {
-    const ssize_t lastRead = m_cacheFileRead->Read(pBuffer, (toRead > SSIZE_MAX) ? SSIZE_MAX : toRead);
+    const ssize_t lastRead =
+      m_cacheFileRead->Read(pBuffer, std::min(toRead, static_cast<size_t>(SSIZE_MAX)));
+
     if (lastRead == 0)
       break;
     if (lastRead < 0)

_service:download_files:master.tar.gz/xbmc/filesystem/CurlFile.cpp Changed

@@ -7,26 +7,27 @@
  */
 
 #include "CurlFile.h"
+
+#include "File.h"
 #include "ServiceBroker.h"
-#include "Util.h"
 #include "URL.h"
+#include "Util.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "File.h"
 #include "threads/SystemClock.h"
 #include "utils/Base64.h"
+#include "utils/XTimeUtils.h"
 
 #include <algorithm>
-#include <vector>
-#include <climits>
 #include <cassert>
+#include <climits>
+#include <vector>
 
 #ifdef TARGET_POSIX
 #include <errno.h>
 #include <inttypes.h>
 #include "platform/posix/XFileUtils.h"
-#include "platform/posix/XTimeUtils.h"
 #include "platform/posix/ConvUtils.h"
 #endif
 
@@ -959,7 +960,7 @@
 {
   m_state->m_cancelled = true;
   while (m_opened)
-    Sleep(1);
+    KODI::TIME::Sleep(1);
 }
 
 void CCurlFile::Reset()
@@ -1107,7 +1108,7 @@
                               &m_state->m_easyHandle,
                               &m_state->m_multiHandle);
 
-    // setup common curl options
+  // setup common curl options
   SetCommonOptions(m_state);
   SetRequestHeaders(m_state);
 
@@ -1122,7 +1123,6 @@
 
   assert(m_state->m_multiHandle);
 
-  SetCommonOptions(m_state);
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_UPLOAD, 1);
 
   g_curlInterface.multi_add_handle(m_state->m_multiHandle, m_state->m_easyHandle);
@@ -1255,24 +1255,24 @@
       {
         // If we get a Method Not Allowed response, retry with a GET Request
         g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOBODY, 0);
-        
+
         g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FILETIME, 1);
         g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_XFERINFOFUNCTION, transfer_abort_callback);
         g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOPROGRESS, 0);
-        
+
         curl_slist *list = NULL;
         list = g_curlInterface.slist_append(list, "Range: bytes=0-1"); /* try to only request 1 byte */
         g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_HTTPHEADER, list);
-        
+
         CURLcode result = g_curlInterface.easy_perform(m_state->m_easyHandle);
         g_curlInterface.slist_free_all(list);
-        
+
         if (result == CURLE_WRITE_ERROR || result == CURLE_OK)
         {
           g_curlInterface.easy_release(&m_state->m_easyHandle, NULL);
           return true;
         }
-        
+
         if (result == CURLE_HTTP_RETURNED_ERROR)
         {
           if (g_curlInterface.easy_getinfo(m_state->m_easyHandle, CURLINFO_RESPONSE_CODE, &code) == CURLE_OK && code != 404 )
@@ -1362,6 +1362,7 @@
 
   m_state->m_filePos = nextPos;
   m_state->m_sendRange = true;
+  m_state->m_bRetry = m_allowRetry;
 
   long response = m_state->Connect(m_bufferSize);
   if(response < 0 && (m_state->m_fileSize == 0 || m_state->m_fileSize != m_state->m_filePos))
@@ -1739,7 +1740,7 @@
              * socket. Instead use Windows' Sleep() and sleep for 100ms which is the
              * minimum suggested value in the curl_multi_fdset() doc.
              */
-            Sleep(100);
+            KODI::TIME::Sleep(100);
             rc = 0;
 #else
             /* Portable sleep for platforms other than Windows. */

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/File.cpp Changed

@@ -127,7 +127,7 @@
       return false;
     }
 
-    int iBufferSize = GetChunkSize(file.GetChunkSize(), 128 * 1024);
+    int iBufferSize = DetermineChunkSize(file.GetChunkSize(), 128 * 1024);
 
     auto_buffer buffer(iBufferSize);
     ssize_t iRead, iWrite;
@@ -414,6 +414,13 @@
   return false;
 }
 
+int CFile::DetermineChunkSize(const int srcChunkSize, const int reqChunkSize)
+{
+  // Determine cache chunk size: if source chunk size is bigger than 1
+  // use source chunk size else use requested chunk size
+  return (srcChunkSize > 1 ? srcChunkSize : reqChunkSize);
+}
+
 bool CFile::Exists(const std::string& strFileName, bool bUseCache /* = true */)
 {
   const CURL pathToUrl(strFileName);
@@ -1037,7 +1044,9 @@
   if (filesize > (int64_t)max_file_size)
     return 0; /* file is too large for this function */
 
-  size_t chunksize = (filesize > 0) ? (size_t)(filesize + 1) : (size_t) GetChunkSize(GetChunkSize(), min_chunk_size);
+  size_t chunksize = (filesize > 0) ? static_cast<size_t>(filesize + 1)
+                                    : static_cast<size_t>(DetermineChunkSize(GetChunkSize(),
+                                                                             min_chunk_size));
   size_t total_read = 0;
   while (true)
   {
@@ -1096,7 +1105,7 @@
 {
   m_file = file;
 
-  m_frontsize = CFile::GetChunkSize(m_file->GetChunkSize(), 64*1024);
+  m_frontsize = CFile::DetermineChunkSize(m_file->GetChunkSize(), 64 * 1024);
 
   m_buffer = new char[m_frontsize+m_backsize];
   setg(0,0,0);

_service:download_files:master.tar.gz/xbmc/filesystem/File.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FileCache.cpp Changed

@@ -23,8 +23,9 @@
 #include "platform/posix/ConvUtils.h"
 #endif
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
+#include <inttypes.h>
 #include <memory>
 
 #ifdef TARGET_POSIX
@@ -33,8 +34,6 @@
 
 using namespace XFILE;
 
-#define READ_CACHE_CHUNK_SIZE (128*1024)
-
 class CWriteRate
 {
 public:
@@ -92,7 +91,6 @@
   , m_writeRate(0)
   , m_writeRateActual(0)
   , m_forwardCacheSize(0)
-  , m_forward(0)
   , m_bFilling(false)
   , m_bLowSpeedDetected(false)
   , m_fileSize(0)
@@ -135,7 +133,14 @@
 
   // check if source can seek
   m_seekPossible = m_source.IoControl(IOCTRL_SEEK_POSSIBLE, NULL);
-  m_chunkSize = CFile::GetChunkSize(m_source.GetChunkSize(), READ_CACHE_CHUNK_SIZE);
+
+  // Determine the best chunk size we can use
+  m_chunkSize = CFile::DetermineChunkSize(
+      m_source.GetChunkSize(),
+      CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_cacheChunkSize);
+  CLog::Log(LOGDEBUG, "CFileCache::Open - Source chunk size is %i, setting cache chunk size to %i",
+            m_source.GetChunkSize(), m_chunkSize);
+
   m_fileSize = m_source.GetLength();
 
   if (!m_pCache)
@@ -151,23 +156,40 @@
       size_t cacheSize;
       if (m_fileSize > 0 && m_fileSize < CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_cacheMemSize && !(m_flags & READ_AUDIO_VIDEO))
       {
-        // NOTE: We don't need to take into account READ_MULTI_STREAM here as it's only used for audio/video
+        // Cap cache size by filesize, but not for audio/video files as those may grow.
+        // We don't need to take into account READ_MULTI_STREAM here as that's only used for audio/video
         cacheSize = m_fileSize;
+
+        // Cap chunk size by cache size
+        if (m_chunkSize > cacheSize)
+          m_chunkSize = cacheSize;
       }
       else
       {
         cacheSize = CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_cacheMemSize;
-      }
 
-      size_t back = cacheSize / 4;
-      size_t front = cacheSize - back;
+        // NOTE: READ_MULTI_STREAM is only used with READ_AUDIO_VIDEO
+        if (m_flags & READ_MULTI_STREAM)
+        {
+          // READ_MULTI_STREAM requires double buffering, so use half the amount of memory for each buffer
+          cacheSize /= 2;
+        }
 
-      if (m_flags & READ_MULTI_STREAM)
-      {
-        // READ_MULTI_STREAM requires double buffering, so use half the amount of memory for each buffer
-        front /= 2;
-        back /= 2;
+        // Make sure cache can at least hold 2 chunks
+        if (cacheSize < m_chunkSize * 2)
+          cacheSize = m_chunkSize * 2;
       }
+
+      if (m_flags & READ_MULTI_STREAM)
+        CLog::Log(LOGDEBUG, "CFileCache::Open - Using double memory cache each sized %i bytes",
+                  cacheSize);
+      else
+        CLog::Log(LOGDEBUG, "CFileCache::Open - Using single memory cache sized %i bytes",
+                  cacheSize);
+
+      const size_t back = cacheSize / 4;
+      const size_t front = cacheSize - back;
+
       m_pCache = std::unique_ptr<CCircularCache>(new CCircularCache(front, back)); // C++14 - Replace with std::make_unique
       m_forwardCacheSize = front;
     }
@@ -191,7 +213,6 @@
   m_writePos = 0;
   m_writeRate = 1024 * 1024;
   m_writeRateActual = 0;
-  m_forward = 0;
   m_bFilling = true;
   m_bLowSpeedDetected = false;
   m_seekEvent.Reset();
@@ -220,7 +241,6 @@
 
   CWriteRate limiter;
   CWriteRate average;
-  bool cacheReachEOF = false;
 
   while (!m_bStop)
   {
@@ -232,14 +252,15 @@
     {
       m_seekEvent.Reset();
       int64_t cacheMaxPos = m_pCache->CachedDataEndPosIfSeekTo(m_seekPos);
-      cacheReachEOF = (cacheMaxPos == m_fileSize);
+      const bool cacheReachEOF = (cacheMaxPos == m_fileSize);
       bool sourceSeekFailed = false;
       if (!cacheReachEOF)
       {
         m_nSeekResult = m_source.Seek(cacheMaxPos, SEEK_SET);
         if (m_nSeekResult != cacheMaxPos)
         {
-          CLog::Log(LOGERROR,"CFileCache::Process - Error %d seeking. Seek returned %" PRId64, (int)GetLastError(), m_nSeekResult);
+          CLog::Log(LOGERROR, "CFileCache::Process - Error %d seeking. Seek returned %" PRId64,
+                    static_cast<int>(GetLastError()), m_nSeekResult);
           m_seekPossible = m_source.IoControl(IOCTRL_SEEK_POSSIBLE, NULL);
           sourceSeekFailed = true;
         }
@@ -255,7 +276,9 @@
         m_nSeekResult = m_seekPos;
         if (bCompleteReset)
         {
-          m_forward = 0;
+          CLog::Log(LOGDEBUG,
+                    "CFileCache::Process - Cache completely reset for seek to position %" PRId64,
+                    m_seekPos);
           m_bFilling = true;
           m_bLowSpeedDetected = false;
         }
@@ -283,20 +306,25 @@
       }
     }
 
-    size_t maxWrite = m_pCache->GetMaxWriteSize(m_chunkSize);
+    const int64_t maxWrite = m_pCache->GetMaxWriteSize(m_chunkSize);
+    int64_t maxSourceRead = m_chunkSize;
+    // Cap source read size by space available between current write position and EOF
+    if (m_fileSize != 0)
+      maxSourceRead = std::min(maxSourceRead, m_fileSize - m_writePos);
 
     /* Only read from source if there's enough write space in the cache
      * else we may keep disposing data and seeking back on (slow) source
      */
-    if (maxWrite == 0 && !cacheReachEOF)
+    if (maxWrite < maxSourceRead)
     {
+      // Wait until sufficient cache write space is available
       m_pCache->m_space.WaitMSec(5);
       continue;
     }
 
     ssize_t iRead = 0;
-    if (!cacheReachEOF)
-      iRead = m_source.Read(buffer.get(), maxWrite);
+    if (maxSourceRead > 0)
+      iRead = m_source.Read(buffer.get(), maxSourceRead);
     if (iRead == 0)
     {
       // Check for actual EOF and retry as long as we still have data in our cache
@@ -335,6 +363,8 @@
     {
       CLog::Log(LOGDEBUG, "CFileCache::Process - Source read returned a fatal error! Will wait for buffer to empty.");
 
+      m_pCache->EndOfInput();
+
       while (m_pCache->WaitForData(0, 0) > 0)
       {
         if (m_seekEvent.WaitMSec(100))
@@ -382,11 +412,11 @@
     // avoid uncertainty at start of caching
     m_writeRateActual = average.Rate(m_writePos, 1000);
 
-    // Update forward cache size
-    m_forward = m_pCache->WaitForData(0, 0);
-
     // NOTE: Hysteresis (20-80%) for filling-logic
-    const float level = (m_forwardCacheSize == 0) ? 0.0 : (float) m_forward / m_forwardCacheSize;
+    const int64_t forward = m_pCache->WaitForData(0, 0);
+    const float level =
+        (m_forwardCacheSize == 0) ? 0.0 : static_cast<float>(forward / m_forwardCacheSize);
+
     if (level > 0.8f)
     {
      /* NOTE: We can only reliably test for low speed condition, when the cache is *really*
@@ -503,10 +533,11 @@
     m_seekPos = std::min(iTarget, std::max((int64_t)0, m_fileSize - m_chunkSize));
 
     m_seekEvent.Set();
-    if (!m_seekEnded.Wait())
+    while (!m_seekEnded.WaitMSec(100))
     {
-      CLog::Log(LOGWARNING,"%s - seek to %" PRId64" failed.", __FUNCTION__, m_seekPos);
-      return -1;
+      // SeekEnded will never be set if FileCache thread is not running
+      if (!CThread::IsRunning())
+        return -1;
     }
 
     /* wait for any remaining data */
@@ -571,7 +602,7 @@
   if (request == IOCTRL_CACHE_STATUS)
   {
     SCacheStatus* status = (SCacheStatus*)param;
-    status->forward = m_forward;
+    status->forward = m_pCache->WaitForData(0, 0);
     status->maxrate = m_writeRate;
     status->currate = m_writeRateActual;
     status->lowspeed = m_bLowSpeedDetected;

_service:download_files:master.tar.gz/xbmc/filesystem/FileCache.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FileDirectoryFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FileFactory.cpp Changed

@@ -39,6 +39,9 @@
 #if defined(TARGET_ANDROID)
 #include "platform/android/filesystem/AndroidAppFile.h"
 #endif
+#if defined(TARGET_DARWIN_TVOS)
+#include "platform/darwin/tvos/filesystem/TVOSFile.h"
+#endif // TARGET_DARWIN_TVOS
 #ifdef HAS_UPNP
 #include "UPnPFile.h"
 #endif
@@ -48,6 +51,7 @@
 #include "PipeFile.h"
 #include "MusicDatabaseFile.h"
 #include "VideoDatabaseFile.h"
+#include "PluginFile.h"
 #include "SpecialProtocolFile.h"
 #include "MultiPathFile.h"
 #include "UDFFile.h"
@@ -96,13 +100,21 @@
   else if (url.IsProtocol("xbt")) return new CXbtFile();
   else if (url.IsProtocol("musicdb")) return new CMusicDatabaseFile();
   else if (url.IsProtocol("videodb")) return new CVideoDatabaseFile();
+  else if (url.IsProtocol("plugin")) return new CPluginFile();
   else if (url.IsProtocol("library")) return nullptr;
   else if (url.IsProtocol("pvr")) return nullptr;
   else if (url.IsProtocol("special")) return new CSpecialProtocolFile();
   else if (url.IsProtocol("multipath")) return new CMultiPathFile();
   else if (url.IsProtocol("image")) return new CImageFile();
 #ifdef TARGET_POSIX
-  else if (url.IsProtocol("file") || url.GetProtocol().empty()) return new CPosixFile();
+  else if (url.IsProtocol("file") || url.GetProtocol().empty())
+  {
+#if defined(TARGET_DARWIN_TVOS)
+    if (CTVOSFile::WantsFile(url))
+      return new CTVOSFile();
+#endif
+    return new CPosixFile();
+  }
 #elif defined(TARGET_WINDOWS)
   else if (url.IsProtocol("file") || url.GetProtocol().empty())
   {

_service:download_files:master.tar.gz/xbmc/filesystem/ISO9660Directory.cpp Changed

@@ -7,15 +7,15 @@
  */
 
 #include "ISO9660Directory.h"
-#include "iso9660.h"
+
+#include "FileItem.h"
+#include "URL.h"
 #include "Util.h"
-#include "utils/URIUtils.h"
+#include "iso9660.h"
 #include "utils/StringUtils.h"
-#include "URL.h"
-#include "FileItem.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/URIUtils.h"
+#include "utils/XTimeUtils.h"
+
 #ifdef TARGET_WINDOWS
 #include "platform/win32/CharsetConverter.h"
 #endif
@@ -35,7 +35,7 @@
   if (!m_isoReader.IsScanned())
     m_isoReader.Scan();
 
-  WIN32_FIND_DATA wfd;
+  Win32FindData wfd;
   HANDLE hFind;
 
   memset(&wfd, 0, sizeof(wfd));
@@ -61,15 +61,11 @@
 
   do
   {
-    if (wfd.cFileName[0] != 0)
+    if (wfd.fileName[0] != 0)
     {
-      if ( (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
+      if ((wfd.fileAttributes & KODI_FILE_ATTRIBUTE_DIRECTORY))
       {
-#ifdef TARGET_WINDOWS
-        auto strDir = KODI::PLATFORM::WINDOWS::FromW(wfd.cFileName);
-#else
-        std::string strDir = wfd.cFileName;
-#endif
+        std::string strDir = wfd.fileName;
         if (strDir != "." && strDir != "..")
         {
           CFileItemPtr pItem(new CFileItem(strDir));
@@ -77,25 +73,21 @@
           URIUtils::AddSlashAtEnd(path);
           pItem->SetPath(path);
           pItem->m_bIsFolder = true;
-          FILETIME localTime;
-          FileTimeToLocalFileTime(&wfd.ftLastWriteTime, &localTime);
+          KODI::TIME::FileTime localTime;
+          KODI::TIME::FileTimeToLocalFileTime(&wfd.lastWriteTime, &localTime);
           pItem->m_dateTime=localTime;
           items.Add(pItem);
         }
       }
       else
       {
-#ifdef TARGET_WINDOWS
-        auto strDir = KODI::PLATFORM::WINDOWS::FromW(wfd.cFileName);
-#else
-        std::string strDir = wfd.cFileName;
-#endif
+        std::string strDir = wfd.fileName;
         CFileItemPtr pItem(new CFileItem(strDir));
         pItem->SetPath(strRoot + strDir);
         pItem->m_bIsFolder = false;
-        pItem->m_dwSize = CUtil::ToInt64(wfd.nFileSizeHigh, wfd.nFileSizeLow);
-        FILETIME localTime;
-        FileTimeToLocalFileTime(&wfd.ftLastWriteTime, &localTime);
+        pItem->m_dwSize = CUtil::ToInt64(wfd.fileSizeHigh, wfd.fileSizeLow);
+        KODI::TIME::FileTime localTime;
+        KODI::TIME::FileTimeToLocalFileTime(&wfd.lastWriteTime, &localTime);
         pItem->m_dateTime=localTime;
         items.Add(pItem);
       }

_service:download_files:master.tar.gz/xbmc/filesystem/NFSDirectory.cpp Changed

@@ -10,16 +10,18 @@
 #include <sys\stat.h>
 #endif
 
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
-
-#include "NFSDirectory.h"
 #include "FileItem.h"
-#include "utils/log.h"
-#include "utils/URIUtils.h"
-#include "utils/StringUtils.h"
+#include "NFSDirectory.h"
 #include "threads/SingleLock.h"
+#include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
+#ifdef TARGET_WINDOWS
+#include <sys\stat.h>
+#endif
+
 using namespace XFILE;
 #include <limits.h>
 #include <nfsc/libnfs.h>
@@ -76,7 +78,7 @@
   struct nfs_server_list *srv;
   bool ret = false;
 
-  srvrs = nfs_find_local_servers();	
+  srvrs = nfs_find_local_servers();
 
   for (srv=srvrs; srv; srv = srv->next)
   {
@@ -176,7 +178,7 @@
 {
   // We accept nfs://server/path[/file]]]]
   int ret = 0;
-  FILETIME fileTime, localTime;
+  KODI::TIME::FileTime fileTime, localTime;
   CSingleLock lock(gNfsConnection);
   std::string strDirName="";
   std::string myStrPath(url.Get());
@@ -251,9 +253,9 @@
       long long ll = lTimeDate & 0xffffffff;
       ll *= 10000000ll;
       ll += 116444736000000000ll;
-      fileTime.dwLowDateTime = (DWORD) (ll & 0xffffffff);
-      fileTime.dwHighDateTime = (DWORD)(ll >> 32);
-      FileTimeToLocalFileTime(&fileTime, &localTime);
+      fileTime.lowDateTime = (DWORD)(ll & 0xffffffff);
+      fileTime.highDateTime = (DWORD)(ll >> 32);
+      KODI::TIME::FileTimeToLocalFileTime(&fileTime, &localTime);
 
       CFileItemPtr pItem(new CFileItem(tmpDirent.name));
       pItem->m_dateTime=localTime;

_service:download_files:master.tar.gz/xbmc/filesystem/NFSFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PluginDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PluginFile.cpp Added

_service:download_files:master.tar.gz/xbmc/filesystem/PluginFile.h Added

_service:download_files:master.tar.gz/xbmc/filesystem/RSSDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ShoutcastFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SourcesDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/iso9660.cpp Changed

@@ -27,22 +27,27 @@
 
 
 */
+
 #include "iso9660.h"
+
+#include "IFile.h"
 #include "storage/IoSupport.h"
-#include "utils/CharsetConverter.h"
 #include "threads/SingleLock.h"
-#include "IFile.h"
+#include "utils/CharsetConverter.h"
+#include "utils/XTimeUtils.h"
 #include "utils/log.h"
 
 #ifndef TARGET_WINDOWS
 #include "storage/DetectDVDType.h"  // for MODE2_DATA_SIZE etc.
 #include "platform/posix/XFileUtils.h"
-#include "platform/posix/XTimeUtils.h"
 #else
 #include "platform/win32/CharsetConverter.h"
 #endif
-#include <stdlib.h>
+
 #include <algorithm>
+#include <cstring>
+#include <stdlib.h>
+
 #include <cdio/bytesex.h>
 //#define _DEBUG_OUTPUT 1
 
@@ -618,10 +623,12 @@
 }
 
 //******************************************************************************************************************
-HANDLE iso9660::FindFirstFile9660(const char *szLocalFolder, WIN32_FIND_DATA *wfdFile)
+HANDLE iso9660::FindFirstFile9660(const char* szLocalFolder, Win32FindData* wfdFile)
 {
-  if (m_info.ISO_HANDLE == nullptr) return static_cast<HANDLE>(nullptr);
-  memset( wfdFile, 0, sizeof(WIN32_FIND_DATA));
+  if (!m_info.ISO_HANDLE)
+    return static_cast<HANDLE>(nullptr);
+
+  memset(wfdFile, 0, sizeof(Win32FindData));
 
   m_searchpointer = FindFolder( szLocalFolder );
 
@@ -631,21 +638,17 @@
 
     if ( m_searchpointer )
     {
-#ifdef TARGET_WINDOWS
-      wcscpy_s(wfdFile->cFileName, MAX_PATH, KODI::PLATFORM::WINDOWS::ToW(m_searchpointer->name).c_str());
-#else
-      strncpy(wfdFile->cFileName, m_searchpointer->name, sizeof(wfdFile->cFileName) - 1);
-      wfdFile->cFileName[sizeof(wfdFile->cFileName) - 1] = '\0';
-#endif
+      std::strncpy(wfdFile->fileName, m_searchpointer->name, sizeof(wfdFile->fileName) - 1);
+      wfdFile->fileName[sizeof(wfdFile->fileName) - 1] = '\0';
 
       if ( m_searchpointer->type == 2 )
-        wfdFile->dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY;
+        wfdFile->fileAttributes |= KODI_FILE_ATTRIBUTE_DIRECTORY;
 
-      wfdFile->ftLastWriteTime = m_searchpointer->filetime;
-      wfdFile->ftLastAccessTime = m_searchpointer->filetime;
-      wfdFile->ftCreationTime = m_searchpointer->filetime;
+      wfdFile->lastWriteTime = m_searchpointer->filetime;
+      wfdFile->lastAccessTime = m_searchpointer->filetime;
+      wfdFile->creationTime = m_searchpointer->filetime;
 
-      wfdFile->nFileSizeLow = m_searchpointer->Length;
+      wfdFile->fileSizeLow = m_searchpointer->Length;
       return reinterpret_cast<HANDLE>(1);
     }
   }
@@ -653,30 +656,26 @@
 }
 
 //******************************************************************************************************************
-int iso9660::FindNextFile( HANDLE szLocalFolder, WIN32_FIND_DATA *wfdFile )
+int iso9660::FindNextFile(HANDLE szLocalFolder, Win32FindData* wfdFile)
 {
-  memset( wfdFile, 0, sizeof(WIN32_FIND_DATA));
+  memset(wfdFile, 0, sizeof(Win32FindData));
 
   if ( m_searchpointer )
     m_searchpointer = m_searchpointer->next;
 
   if ( m_searchpointer )
   {
-#ifdef TARGET_WINDOWS
-    wcscpy_s(wfdFile->cFileName, MAX_PATH, KODI::PLATFORM::WINDOWS::ToW(m_searchpointer->name).c_str());
-#else
-    strncpy(wfdFile->cFileName, m_searchpointer->name, sizeof(wfdFile->cFileName) - 1);
-    wfdFile->cFileName[sizeof(wfdFile->cFileName) - 1] = '\0';
-#endif
+    std::strncpy(wfdFile->fileName, m_searchpointer->name, sizeof(wfdFile->fileName) - 1);
+    wfdFile->fileName[sizeof(wfdFile->fileName) - 1] = '\0';
 
     if ( m_searchpointer->type == 2 )
-      wfdFile->dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY;
+      wfdFile->fileAttributes |= KODI_FILE_ATTRIBUTE_DIRECTORY;
 
-    wfdFile->ftLastWriteTime = m_searchpointer->filetime;
-    wfdFile->ftLastAccessTime = m_searchpointer->filetime;
-    wfdFile->ftCreationTime = m_searchpointer->filetime;
+    wfdFile->lastWriteTime = m_searchpointer->filetime;
+    wfdFile->lastAccessTime = m_searchpointer->filetime;
+    wfdFile->creationTime = m_searchpointer->filetime;
 
-    wfdFile->nFileSizeLow = m_searchpointer->Length;
+    wfdFile->fileSizeLow = m_searchpointer->Length;
     return 1;
   }
 
@@ -717,7 +716,7 @@
   if (!pContext)
     return INVALID_HANDLE_VALUE;
 
-  WIN32_FIND_DATA fileinfo;
+  Win32FindData fileinfo;
   char *pointer, *pointer2;
   char work[512];
   pContext->m_bUseMode2 = false;
@@ -738,16 +737,9 @@
 
   intptr_t loop = (intptr_t)FindFirstFile9660( work, &fileinfo );
 
-#ifdef TARGET_WINDOWS
-  auto wpointer = KODI::PLATFORM::WINDOWS::ToW(pointer);
-#endif
   while ( loop > 0)
   {
-#ifdef TARGET_WINDOWS
-    if (!_wcsicmp(fileinfo.cFileName, wpointer.c_str()))
-#else
-    if ( !stricmp(fileinfo.cFileName, pointer ) )
-#endif
+    if (!std::strcmp(fileinfo.fileName, pointer))
       loop = -1;
     else
       loop = FindNextFile( NULL, &fileinfo );
@@ -759,7 +751,7 @@
   }
 
   pContext->m_dwCurrentBlock = m_searchpointer->Location;
-  pContext->m_dwFileSize = m_info.curr_filesize = fileinfo.nFileSizeLow;
+  pContext->m_dwFileSize = m_info.curr_filesize = fileinfo.fileSizeLow;
   pContext->m_pBuffer = new uint8_t[CIRC_BUFFER_SIZE * BUFFER_SIZE];
   pContext->m_dwStartBlock = pContext->m_dwCurrentBlock;
   pContext->m_dwFilePos = 0;
@@ -1044,7 +1036,7 @@
 }
 
 //************************************************************************************
-void iso9660::IsoDateTimeToFileTime(iso9660_Datetime* isoDateTime, FILETIME* filetime)
+void iso9660::IsoDateTimeToFileTime(iso9660_Datetime* isoDateTime, KODI::TIME::FileTime* filetime)
 {
   tm t = { 0 };
   t.tm_year=isoDateTime->year;
@@ -1056,14 +1048,14 @@
   t.tm_isdst=-1;
   mktime(&t);
 
-  SYSTEMTIME time;
-  time.wYear=t.tm_year+1900;
-  time.wMonth=t.tm_mon+1;
-  time.wDayOfWeek=t.tm_wday;
-  time.wDay=t.tm_mday;
-  time.wHour=t.tm_hour;
-  time.wMinute=t.tm_min;
-  time.wSecond=t.tm_sec;
-  time.wMilliseconds=0;
-  SystemTimeToFileTime(&time, filetime);
+  KODI::TIME::SystemTime time;
+  time.year = t.tm_year + 1900;
+  time.month = t.tm_mon + 1;
+  time.dayOfWeek = t.tm_wday;
+  time.day = t.tm_mday;
+  time.hour = t.tm_hour;
+  time.minute = t.tm_min;
+  time.second = t.tm_sec;
+  time.milliseconds = 0;
+  KODI::TIME::SystemTimeToFileTime(&time, filetime);
 }

_service:download_files:master.tar.gz/xbmc/filesystem/iso9660.h Changed

@@ -9,9 +9,10 @@
 
 #pragma once
 
-#include <vector>
+#include "XBDateTime.h"
+
 #include <string>
-#include "PlatformDefs.h" // for win32 types
+#include <vector>
 
 #ifdef TARGET_WINDOWS
 // Ideally we should just be including iso9660.h, but it's not win32-ified at this point,
@@ -42,9 +43,9 @@
   DWORD dwPathTableLengthLE;     //132-135
   DWORD dwPathTableLengthBE;     //136-139
   DWORD wFirstPathTableStartSectorLE; //140-143
-  DWORD wSecondPathTableStartSectorLE; //144-147
+  DWORD secondPathTableStartSectorLE; //144-147
   DWORD wFirstPathTableStartSectorBE; //148-151
-  DWORD wSecondPathTableStartSectorBE; //152-155
+  DWORD secondPathTableStartSectorBE; //152-155
   unsigned char szRootDir[34];
   unsigned char szVolumeSetIdentifier[128];
   unsigned char szPublisherIdentifier[128];
@@ -131,7 +132,7 @@
   char type;  // bit 0 = no entry, bit 1 = file, bit 2 = dir
   DWORD Location; // number of the first sector of file data or directory
   DWORD Length;      // number of bytes of file data or length of directory
-  FILETIME filetime; // date time of the directory/file
+  KODI::TIME::FileTime filetime; // date time of the directory/file
 
   struct iso_dirtree *dirpointer; // if type is a dir, this will point to the list in that dir
   struct iso_dirtree *next;  // pointer to next file/dir in this directory
@@ -145,6 +146,22 @@
 };
 #define MAX_ISO_FILES 30
 
+struct Win32FindData
+{
+  unsigned int fileAttributes;
+  KODI::TIME::FileTime creationTime;
+  KODI::TIME::FileTime lastAccessTime;
+  KODI::TIME::FileTime lastWriteTime;
+  unsigned int fileSizeHigh;
+  unsigned int fileSizeLow;
+  unsigned int reserved0;
+  unsigned int reserved1;
+  char fileName[260];
+  char alternateFileName[14];
+};
+
+constexpr unsigned int KODI_FILE_ATTRIBUTE_DIRECTORY{0x10};
+
 class iso9660
 {
 public:
@@ -165,8 +182,8 @@
   iso9660( );
   virtual ~iso9660( );
 
-  HANDLE FindFirstFile9660(const char *szLocalFolder, WIN32_FIND_DATA *wfdFile );
-  int FindNextFile( HANDLE szLocalFolder, WIN32_FIND_DATA *wfdFile );
+  HANDLE FindFirstFile9660(const char* szLocalFolder, Win32FindData* wfdFile);
+  int FindNextFile(HANDLE szLocalFolder, Win32FindData* wfdFile);
   bool FindClose( HANDLE szLocalFolder );
   DWORD SetFilePointer(HANDLE hFile, long lDistanceToMove, long* lpDistanceToMoveHigh, DWORD dwMoveMethod );
   int64_t GetFileSize(HANDLE hFile);
@@ -180,7 +197,7 @@
   bool IsScanned();
 
 protected:
-  void IsoDateTimeToFileTime(iso9660_Datetime* isoDateTime, FILETIME* filetime);
+  void IsoDateTimeToFileTime(iso9660_Datetime* isoDateTime, KODI::TIME::FileTime* filetime);
   struct iso_dirtree* ReadRecursiveDirFromSector( DWORD sector, const char * );
   struct iso_dirtree* FindFolder(const char *Folder );
   std::string GetThinText(unsigned char* strTxt, int iLen );

_service:download_files:master.tar.gz/xbmc/games/GameUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClient.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/windows/GUIWindowGames.cpp Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2012-2018 Team Kodi
+ *  Copyright (C) 2012-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -23,6 +23,7 @@
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/WindowIDs.h"
+#include "media/MediaLockState.h"
 #include "settings/MediaSourceSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
@@ -265,6 +266,13 @@
   if (!content.empty())
     items.SetContent(content);
 
+  // Ensure a game info tag is created so that files are recognized as games
+  for (const CFileItemPtr& item : items)
+  {
+    if (!item->m_bIsFolder)
+      item->GetGameInfoTag();
+  }
+
   return true;
 }
 
@@ -285,7 +293,7 @@
   int iIndex = CUtil::GetMatchingSource(dir, shares, bIsSourceName);
   if (iIndex >= 0)
   {
-    if (iIndex < (int)shares.size() && shares[iIndex].m_iHasLock == 2)
+    if (iIndex < static_cast<int>(shares.size()) && shares[iIndex].m_iHasLock == LOCK_STATE_LOCKED)
     {
       CFileItem item(shares[iIndex]);
       if (!g_passwordManager.IsItemUnlocked(&item, "games"))

_service:download_files:master.tar.gz/xbmc/guilib/GUIEditControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIKeyboardFactory.cpp Changed

@@ -75,7 +75,6 @@
 bool CGUIKeyboardFactory::ShowAndGetInput(std::string& aTextString, CVariant heading, bool allowEmptyResult, bool hiddenInput /* = false */, unsigned int autoCloseMs /* = 0 */)
 {
   bool confirmed = false;
-  CGUIKeyboard *kb = NULL;
   //heading can be a string or a localization id
   std::string headingStr;
   if (heading.isString())
@@ -83,12 +82,25 @@
   else if (heading.isInteger() && heading.asInteger())
     headingStr = g_localizeStrings.Get((uint32_t)heading.asInteger());
 
+  bool useKodiKeyboard = true;
 #if defined(TARGET_DARWIN_EMBEDDED)
-  kb = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKeyboardTouch>(WINDOW_DIALOG_KEYBOARD_TOUCH);
+#if defined(TARGET_DARWIN_TVOS)
+  useKodiKeyboard = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+      CSettings::SETTING_INPUT_APPLEUSEKODIKEYBOARD);
 #else
-  kb = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKeyboardGeneric>(WINDOW_DIALOG_KEYBOARD);
+  useKodiKeyboard = false;
+#endif // defined(TARGET_DARWIN_TVOS)
 #endif
 
+  auto& winManager = CServiceBroker::GetGUI()->GetWindowManager();
+  CGUIKeyboard* kb = nullptr;
+  if (useKodiKeyboard)
+    kb = winManager.GetWindow<CGUIDialogKeyboardGeneric>(WINDOW_DIALOG_KEYBOARD);
+#if defined(TARGET_DARWIN_EMBEDDED)
+  else
+    kb = winManager.GetWindow<CGUIDialogKeyboardTouch>(WINDOW_DIALOG_KEYBOARD_TOUCH);
+#endif // defined(TARGET_DARWIN_EMBEDDED)
+
   if (kb)
   {
     g_activeKeyboard = kb;

_service:download_files:master.tar.gz/xbmc/guilib/GUIWindowManager.cpp Changed

@@ -771,9 +771,18 @@
   // debug
   CLog::Log(LOGDEBUG, "Activating window ID: %i", iWindowID);
 
+  // make sure we check mediasources from home
+  if (GetActiveWindow() == WINDOW_HOME)
+    g_passwordManager.strMediasourcePath = !params.empty() ? params[0] : "";
+  else
+    g_passwordManager.strMediasourcePath = "";
+
   if (!g_passwordManager.CheckMenuLock(iWindowID))
   {
-    CLog::Log(LOGERROR, "MasterCode is Wrong: Window with id %d will not be loaded! Enter a correct MasterCode!", iWindowID);
+    CLog::Log(LOGERROR,
+              "MasterCode or Mediasource-code is wrong: Window with id {} will not be loaded! "
+              "Enter a correct code!",
+              iWindowID);
     if (GetActiveWindow() == WINDOW_INVALID && iWindowID != WINDOW_HOME)
       ActivateWindow(WINDOW_HOME);
     return;
@@ -851,7 +860,8 @@
   auto activeDialogs = m_activeDialogs;
   for (const auto& window : activeDialogs)
   {
-    window->Close(forceClose);
+    if (window->IsModalDialog())
+      window->Close(forceClose);
   }
 }

_service:download_files:master.tar.gz/xbmc/guilib/TextureBundleXBT.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureManager.cpp Changed

@@ -26,11 +26,18 @@
 #include "utils/TimeUtils.h"
 #endif
 #if defined(TARGET_DARWIN_IOS)
+#define WIN_SYSTEM_CLASS CWinSystemIOS
 #include "ServiceBroker.h"
 #include "windowing/ios/WinSystemIOS.h" // for g_Windowing in CGUITextureManager::FreeUnusedTextures
+#elif defined(TARGET_DARWIN_TVOS)
+#define WIN_SYSTEM_CLASS CWinSystemTVOS
+#include "ServiceBroker.h"
+#include "windowing/tvos/WinSystemTVOS.h" // for g_Windowing in CGUITextureManager::FreeUnusedTextures
 #endif
 #include "FFmpegImage.h"
 
+#include <inttypes.h>
+
 /************************************************************************/
 /*                                                                      */
 /************************************************************************/
@@ -501,11 +508,11 @@
 #if defined(HAS_GL) || defined(HAS_GLES)
   for (unsigned int i = 0; i < m_unusedHwTextures.size(); ++i)
   {
-  // on ios the hw textures might be deleted from the os
-  // when XBMC is backgrounded (e.x. for backgrounded music playback)
-  // sanity check before delete in that case.
-#if defined(TARGET_DARWIN_IOS)
-    CWinSystemIOS* winSystem = dynamic_cast<CWinSystemIOS*>(CServiceBroker::GetWinSystem());
+    // on ios/tvos the hw textures might be deleted from the os
+    // when XBMC is backgrounded (e.x. for backgrounded music playback)
+    // sanity check before delete in that case.
+#if defined(TARGET_DARWIN_EMBEDDED)
+    auto winSystem = dynamic_cast<WIN_SYSTEM_CLASS*>(CServiceBroker::GetWinSystem());
     if (!winSystem->IsBackgrounded() || glIsTexture(m_unusedHwTextures[i]))
 #endif
       glDeleteTextures(1, (GLuint*) &m_unusedHwTextures[i]);

_service:download_files:master.tar.gz/xbmc/guilib/guiinfo/GUIInfoLabels.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/guiinfo/SystemGUIInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/guiinfo/VideoGUIInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/ButtonTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/ButtonTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/input/KeyboardLayoutManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/RumbleGenerator.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/LibraryBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/ScriptInvocationManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/AudioLibrary.cpp Changed

@@ -776,6 +776,8 @@
     album.strMusicBrainzAlbumID = parameterObject["musicbrainzalbumid"].asString();
   if (ParameterNotNull(parameterObject, "musicbrainzreleasegroupid"))
     album.strReleaseGroupMBID = parameterObject["musicbrainzreleasegroupid"].asString();
+  if (ParameterNotNull(parameterObject, "isboxset"))
+    album.bBoxedSet = parameterObject["isboxset"].asBoolean();
 
   // Update existing art. Any existing artwork that isn't specified in this request stays as is.
   // If the value is null then the existing art with that type is removed.
@@ -870,7 +872,9 @@
   if (ParameterNotNull(parameterObject, "lastplayed"))
     song.lastPlayed.SetFromDBDateTime(parameterObject["lastplayed"].asString());
   if (ParameterNotNull(parameterObject, "mood"))
-    song.strAlbum = parameterObject["mood"].asString();
+    song.strMood = parameterObject["mood"].asString();
+  if (ParameterNotNull(parameterObject, "disctitle"))
+    song.strDiscSubtitle = parameterObject["disctitle"].asString();
 
   // Update existing art. Any existing artwork that isn't specified in this request stays as is.
   // If the value is null then the existing art with that type is removed.

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/FileOperations.cpp Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2005-2018 Team Kodi
+ *  Copyright (C) 2005-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -17,6 +17,7 @@
 #include "VideoLibrary.h"
 #include "filesystem/Directory.h"
 #include "filesystem/File.h"
+#include "media/MediaLockState.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "settings/SettingsComponent.h"
@@ -41,7 +42,7 @@
     for (unsigned int i = 0; i < (unsigned int)sources->size(); i++)
     {
       // Do not show sources which are locked
-      if (sources->at(i).m_iHasLock == 2)
+      if (sources->at(i).m_iHasLock == LOCK_STATE_LOCKED)
         continue;
 
       items.Add(CFileItemPtr(new CFileItem(sources->at(i))));
@@ -174,10 +175,15 @@
   std::string path = URIUtils::GetDirectory(file);
 
   CFileItemList items;
-  if (path.empty() || !CDirectory::GetDirectory(path, items, "", DIR_FLAG_DEFAULTS) || !items.Contains(file))
+  if (path.empty())
     return InvalidParams;
 
-  CFileItemPtr item = items.Get(file);
+  CFileItemPtr item;
+  if (CDirectory::GetDirectory(path, items, "", DIR_FLAG_DEFAULTS) && items.Contains(file))
+    item = items.Get(file);
+  else
+    item = CFileItemPtr(new CFileItem(file, false));
+
   if (!URIUtils::IsUPnP(file))
     FillFileItem(item, item, parameterObject["media"].asString(), parameterObject);
 
@@ -247,7 +253,7 @@
   CVideoLibrary::UpdateResumePoint(parameterObject, infos, videodatabase);
 
   videodatabase.GetFileInfo("", infos, fileId);
-  CJSONRPCUtils::NotifyItemUpdated(infos);
+  CJSONRPCUtils::NotifyItemUpdated(infos, std::map<std::string, std::string>{});
   return ACK;
 }

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/InputOperations.cpp Changed

@@ -13,6 +13,7 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "guilib/GUIWindow.h"
 #include "guilib/GUIWindowManager.h"
+#include "input/ButtonTranslator.h"
 #include "input/Key.h"
 #include "input/actions/ActionTranslator.h"
 #include "messaging/ApplicationMessenger.h"
@@ -84,6 +85,36 @@
   return SendAction(action);
 }
 
+JSONRPC_STATUS CInputOperations::ButtonEvent(const std::string& method,
+                                             ITransportLayer* transport,
+                                             IClient* client,
+                                             const CVariant& parameterObject,
+                                             CVariant& result)
+{
+  std::string button = parameterObject["button"].asString();
+  std::string keymap = parameterObject["keymap"].asString();
+  int holdtime = static_cast<int>(parameterObject["holdtime"].asInteger());
+  if (holdtime < 0)
+  {
+    return InvalidParams;
+  }
+
+  uint32_t keycode = CButtonTranslator::TranslateString(keymap, button);
+  if (keycode == 0)
+  {
+    return InvalidParams;
+  }
+
+  XBMC_Event* newEvent = new XBMC_Event;
+  newEvent->type = XBMC_BUTTON;
+  newEvent->keybutton.button = keycode;
+  newEvent->keybutton.holdtime = holdtime;
+
+  CApplicationMessenger::GetInstance().PostMsg(TMSG_EVENT, -1, -1, static_cast<void*>(newEvent));
+
+  return ACK;
+}
+
 JSONRPC_STATUS CInputOperations::Left(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   return SendAction(ACTION_MOVE_LEFT);

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/InputOperations.h Changed

@@ -20,6 +20,12 @@
     static JSONRPC_STATUS SendText(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS ExecuteAction(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
+    static JSONRPC_STATUS ButtonEvent(const std::string& method,
+                                      ITransportLayer* transport,
+                                      IClient* client,
+                                      const CVariant& parameterObject,
+                                      CVariant& result);
+
     static JSONRPC_STATUS Left(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Right(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS Down(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/JSONRPCUtils.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/VideoLibrary.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/schema/methods.json Changed

@@ -1062,7 +1062,8 @@
       { "name": "sortartist", "$ref": "Optional.String" },
       { "name": "displayartist", "$ref": "Optional.String" },
       { "name": "musicbrainzalbumartistid", "type": [ "null", { "$ref": "Array.String", "required": true } ], "default": null },
-      { "name": "art", "type": [ "null", { "$ref": "Media.Artwork.Set", "required": true } ], "default": null }
+      { "name": "art", "type": [ "null", { "$ref": "Media.Artwork.Set", "required": true } ], "default": null },
+      { "name": "isboxset", "$ref": "Optional.Boolean" }
     ],
     "returns": "string"
   },
@@ -1091,7 +1092,8 @@
       { "name": "displayartist", "$ref": "Optional.String" },
       { "name": "sortartist", "$ref": "Optional.String" },
       { "name": "mood", "$ref": "Optional.String" },
-      { "name": "art", "type": [ "null", { "$ref": "Media.Artwork.Set", "required": true } ], "default": null }
+      { "name": "art", "type": [ "null", { "$ref": "Media.Artwork.Set", "required": true } ], "default": null },
+      { "name": "disctitle", "$ref": "Optional.String" }
     ],
     "returns": "string"
   },
@@ -2342,6 +2344,18 @@
     ],
     "returns": "string"
   },
+  "Input.ButtonEvent": {
+    "type": "method",
+    "description": "Send a button press event",
+    "transport": "Response",
+    "permission": "Navigate",
+    "params": [
+      { "name": "button", "type": "string", "required": true, "description": "Button name" },
+      { "name": "keymap", "type": "string", "required": true, "description": "Keymap name (KB, XG, R1, or R2)", "enum": [ "KB", "XG", "R1", "R2" ] },
+      { "name": "holdtime", "type": "integer", "required": false, "minimum" : 0, "default" : 0, "description": "Number of milliseconds to simulate button hold." }
+    ],
+    "returns": "string"
+  },
   "Input.Left": {
     "type": "method",
     "description": "Navigate left in GUI",

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/schema/types.json Changed

@@ -108,7 +108,7 @@
                   "album", "albumtype", "genre", "country", "year", "rating", "userrating", "votes", "top250", "programcount",
                   "playlist", "episode", "season", "totalepisodes", "watchedepisodes", "tvshowstatus", "tvshowtitle",
                   "sorttitle", "productioncode", "mpaa", "studio", "dateadded", "lastplayed", "playcount", "listeners",
-                  "bitrate", "random" ]
+                  "bitrate", "random", "totaldiscs" ]
       },
       "order": { "type": "string", "default": "ascending", "enum": [ "ascending", "descending" ] },
       "ignorearticle": { "type": "boolean", "default": false },
@@ -516,7 +516,7 @@
                 "playcount", "artistid", "displayartist",
                 "compilation", "releasetype", "dateadded",
                 "sortartist", "musicbrainzreleasegroupid", "songgenres", "art",
-                "lastplayed", "sourceid"]
+                "lastplayed", "sourceid","isboxset", "totaldiscs"]
     }
   },
   "Audio.Fields.Song": {
@@ -532,7 +532,7 @@
                 "albumartistid", "albumreleasetype", "dateadded",
                 "votes", "userrating", "mood", "contributors",
                 "displaycomposer", "displayconductor", "displayorchestra", "displaylyricist",
-                "sortartist", "art", "sourceid"]
+                "sortartist", "art", "sourceid", "disctitle"]
     }
   },
   "Audio.Album.ReleaseType": {
@@ -639,7 +639,9 @@
       "musicbrainzalbumid": { "type": "string" },
       "songgenres": {"$ref": "Audio.Details.Genres"},
       "lastplayed": { "type": "string" },
-      "sourceid": { "$ref": "Array.Integer" } 
+      "sourceid": { "$ref": "Array.Integer" }, 
+      "isboxset" : { "type": "boolean" },
+      "totaldiscs" : { "type": "integer"}
     }
   },
   "Audio.Details.Song": {
@@ -668,7 +670,8 @@
       "displayorchestra": { "type": "string"},
       "displaylyricist": { "type": "string"},
       "genreid": { "$ref": "Array.Integer"},
-      "sourceid": { "$ref": "Array.Integer" }
+      "sourceid": { "$ref": "Array.Integer" },
+      "disctitle": { "type": "string" }
     }
   },
   "Audio.Property.Name": {
@@ -1491,7 +1494,10 @@
       "displayorchestra": { "type": "string"},
       "displaylyricist": { "type": "string"},
       "mediapath": { "type": "string", "description": "Media source path that identifies the item"},
-      "dynpath": { "type": "string", "description": "An experimental property for debug purposes, often same as mediapath but when different gives the actual file playing that should also be in file property"}
+      "dynpath": { "type": "string", "description": "An experimental property for debug purposes, often same as mediapath but when different gives the actual file playing that should also be in file property"},
+      "isboxset": { "type": "boolean" },
+      "totaldiscs": { "type": "integer" },
+      "disctitle": { "type": "string" }
     }
   },
   "List.Fields.All": {
@@ -1512,7 +1518,8 @@
                 "locked", "channelnumber", "starttime", "endtime", "specialsortseason",
                 "specialsortepisode", "compilation", "releasetype", "albumreleasetype",
                 "contributors", "displaycomposer", "displayconductor", "displayorchestra", "displaylyricist",
-                "userrating", "votes", "sortartist", "musicbrainzreleasegroupid", "mediapath", "dynpath"]
+                "userrating", "votes", "sortartist", "musicbrainzreleasegroupid", "mediapath", "dynpath",
+                "isboxset", "totaldiscs", "disctitle"]
     }
   },
   "List.Item.All": {
@@ -1542,7 +1549,8 @@
                 "disc", "tag", "art", "genreid", "displayartist", "albumartistid",
                 "description", "theme", "mood", "style", "albumlabel", "sorttitle",
                 "episodeguide", "uniqueid", "dateadded", "size", "lastmodified", "mimetype",
-                "specialsortseason", "specialsortepisode", "sortartist", "musicbrainzreleasegroupid"]
+                "specialsortseason", "specialsortepisode", "sortartist", "musicbrainzreleasegroupid",
+                "isboxset", "totaldiscs", "disctitle"]
     }
   },
   "List.Item.File": {

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/schema/version.txt Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Dialog.cpp Changed

@@ -5,36 +5,34 @@
  *  SPDX-License-Identifier: GPL-2.0-or-later
  *  See LICENSES/README.md for more information.
  */
-#include "LanguageHook.h"
+#include "Dialog.h"
 
+#include "LanguageHook.h"
+#include "ListItem.h"
+#include "ModuleXbmcgui.h"
 #include "ServiceBroker.h"
-#include "dialogs/GUIDialogYesNo.h"
-#include "dialogs/GUIDialogSelect.h"
+#include "WindowException.h"
 #include "dialogs/GUIDialogContextMenu.h"
+#include "dialogs/GUIDialogFileBrowser.h"
+#include "dialogs/GUIDialogKaiToast.h"
+#include "dialogs/GUIDialogNumeric.h"
+#include "dialogs/GUIDialogSelect.h"
 #include "dialogs/GUIDialogTextViewer.h"
+#include "dialogs/GUIDialogYesNo.h"
 #include "guilib/GUIComponent.h"
+#include "guilib/GUIKeyboardFactory.h"
 #include "guilib/GUIWindowManager.h"
-#include "dialogs/GUIDialogFileBrowser.h"
-#include "dialogs/GUIDialogNumeric.h"
-#include "video/dialogs/GUIDialogVideoInfo.h"
+#include "messaging/helpers/DialogOKHelper.h"
 #include "music/dialogs/GUIDialogMusicInfo.h"
 #include "settings/MediaSourceSettings.h"
 #include "storage/MediaManager.h"
-#include "dialogs/GUIDialogKaiToast.h"
-#include "ModuleXbmcgui.h"
-#include "guilib/GUIKeyboardFactory.h"
-#include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
-#include "WindowException.h"
-#include "messaging/helpers/DialogOKHelper.h"
-#include "Dialog.h"
-#include "ListItem.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "video/dialogs/GUIDialogVideoInfo.h"
 
-using namespace KODI::MESSAGING;
+ using namespace KODI::MESSAGING;
 
 #define ACTIVE_WINDOW CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow()
 
@@ -283,8 +281,8 @@
     {
       DelayedCallGuard dcguard(languageHook);
       std::string value;
-      SYSTEMTIME timedate;
-      GetLocalTime(&timedate);
+      KODI::TIME::SystemTime timedate;
+      KODI::TIME::GetLocalTime(&timedate);
 
       if (!heading.empty())
       {
@@ -293,12 +291,12 @@
           if (!defaultt.empty() && defaultt.size() == 10)
           {
             std::string sDefault = defaultt;
-            timedate.wDay = atoi(sDefault.substr(0, 2).c_str());
-            timedate.wMonth = atoi(sDefault.substr(3, 4).c_str());
-            timedate.wYear = atoi(sDefault.substr(sDefault.size() - 4).c_str());
+            timedate.day = atoi(sDefault.substr(0, 2).c_str());
+            timedate.month = atoi(sDefault.substr(3, 4).c_str());
+            timedate.year = atoi(sDefault.substr(sDefault.size() - 4).c_str());
           }
           if (CGUIDialogNumeric::ShowAndGetDate(timedate, heading))
-            value = StringUtils::Format("%2d/%2d/%4d", timedate.wDay, timedate.wMonth, timedate.wYear);
+            value = StringUtils::Format("%2d/%2d/%4d", timedate.day, timedate.month, timedate.year);
           else
             return emptyString;
         }
@@ -307,11 +305,11 @@
           if (!defaultt.empty() && defaultt.size() == 5)
           {
             std::string sDefault = defaultt;
-            timedate.wHour = atoi(sDefault.substr(0, 2).c_str());
-            timedate.wMinute = atoi(sDefault.substr(3, 2).c_str());
+            timedate.hour = atoi(sDefault.substr(0, 2).c_str());
+            timedate.minute = atoi(sDefault.substr(3, 2).c_str());
           }
           if (CGUIDialogNumeric::ShowAndGetTime(timedate, heading))
-            value = StringUtils::Format("%2d:%02d", timedate.wHour, timedate.wMinute);
+            value = StringUtils::Format("%2d:%02d", timedate.hour, timedate.minute);
           else
             return emptyString;
         }
@@ -357,8 +355,8 @@
     {
       DelayedCallGuard dcguard(languageHook);
       std::string value(defaultt);
-      SYSTEMTIME timedate;
-      GetLocalTime(&timedate);
+      KODI::TIME::SystemTime timedate;
+      KODI::TIME::GetLocalTime(&timedate);
 
       switch (type)
       {
@@ -380,12 +378,13 @@
             if (!defaultt.empty() && defaultt.size() == 10)
             {
               std::string sDefault = defaultt;
-              timedate.wDay = atoi(sDefault.substr(0, 2).c_str());
-              timedate.wMonth = atoi(sDefault.substr(3, 4).c_str());
-              timedate.wYear = atoi(sDefault.substr(sDefault.size() - 4).c_str());
+              timedate.day = atoi(sDefault.substr(0, 2).c_str());
+              timedate.month = atoi(sDefault.substr(3, 4).c_str());
+              timedate.year = atoi(sDefault.substr(sDefault.size() - 4).c_str());
             }
             if (CGUIDialogNumeric::ShowAndGetDate(timedate, heading))
-              value = StringUtils::Format("%2d/%2d/%4d", timedate.wDay, timedate.wMonth, timedate.wYear);
+              value =
+                  StringUtils::Format("%2d/%2d/%4d", timedate.day, timedate.month, timedate.year);
             else
               value = emptyString;
           }
@@ -395,11 +394,11 @@
             if (!defaultt.empty() && defaultt.size() == 5)
             {
               std::string sDefault = defaultt;
-              timedate.wHour = atoi(sDefault.substr(0, 2).c_str());
-              timedate.wMinute = atoi(sDefault.substr(3, 2).c_str());
+              timedate.hour = atoi(sDefault.substr(0, 2).c_str());
+              timedate.minute = atoi(sDefault.substr(3, 2).c_str());
             }
             if (CGUIDialogNumeric::ShowAndGetTime(timedate, heading))
-              value = StringUtils::Format("%2d:%02d", timedate.wHour, timedate.wMinute);
+              value = StringUtils::Format("%2d:%02d", timedate.hour, timedate.minute);
             else
               value = emptyString;
           }

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Dialog.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmc.cpp Changed

@@ -8,46 +8,42 @@
 
 //! @todo Need a uniform way of returning an error status
 
-#include "network/Network.h"
-
 #include "ModuleXbmc.h"
 
+#include "AddonUtils.h"
 #include "Application.h"
-#include "ServiceBroker.h"
-#include "messaging/ApplicationMessenger.h"
-#include "aojsonrpc.h"
-#ifndef TARGET_WINDOWS
-#include "platform/posix/XTimeUtils.h"
-#endif
-#include "guilib/LocalizeStrings.h"
-#include "GUIInfoManager.h"
-#include "guilib/GUIAudioManager.h"
-#include "guilib/GUIWindowManager.h"
-#include "filesystem/File.h"
-#include "filesystem/SpecialProtocol.h"
-#include "utils/Crc32.h"
 #include "FileItem.h"
+#include "GUIInfoManager.h"
 #include "LangInfo.h"
+#include "LanguageHook.h"
 #include "PlayListPlayer.h"
-#include "settings/Settings.h"
-#include "settings/SettingsComponent.h"
-#include "guilib/TextureManager.h"
+#include "ServiceBroker.h"
 #include "Util.h"
+#include "aojsonrpc.h"
 #include "cores/AudioEngine/Interfaces/AE.h"
+#include "filesystem/File.h"
+#include "filesystem/SpecialProtocol.h"
+#include "guilib/GUIAudioManager.h"
+#include "guilib/GUIWindowManager.h"
+#include "guilib/LocalizeStrings.h"
+#include "guilib/TextureManager.h"
 #include "input/WindowTranslator.h"
+#include "messaging/ApplicationMessenger.h"
+#include "network/Network.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
 #include "storage/MediaManager.h"
+#include "threads/SystemClock.h"
+#include "utils/Crc32.h"
 #include "utils/FileExtensionProvider.h"
 #include "utils/LangCodeExpander.h"
 #include "utils/MemUtils.h"
 #include "utils/StringUtils.h"
 #include "utils/SystemInfo.h"
-#include "AddonUtils.h"
-
-#include "LanguageHook.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 
-#include "threads/SystemClock.h"
 #include <vector>
-#include "utils/log.h"
 
 using namespace KODI;
 using namespace KODI::MESSAGING;
@@ -150,7 +146,7 @@
           long nextSleep = endTime.MillisLeft();
           if (nextSleep > 100)
             nextSleep = 100; // only sleep for 100 millis
-          ::Sleep(nextSleep);
+          KODI::TIME::Sleep(nextSleep);
         }
         if (lh != NULL)
           lh->MakePendingCalls();
@@ -446,7 +442,10 @@
       else if (strcmpi(id, "time") == 0)
         {
           result = g_langInfo.GetTimeFormat();
-          StringUtils::Replace(result, "H", "%H");
+          if (StringUtils::StartsWith(result, "HH"))
+            StringUtils::Replace(result, "HH", "%H");
+          else
+            StringUtils::Replace(result, "H", "%H");
           StringUtils::Replace(result, "h", "%I");
           StringUtils::Replace(result, "mm", "%M");
           StringUtils::Replace(result, "ss", "%S");

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiResponse.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/PythonInvoker.cpp Changed

@@ -9,7 +9,6 @@
 // python.h should always be included first before any other includes
 #include <Python.h>
 #include <iterator>
-#include <osdefs.h>
 
 // This is a workaround to compile Kodi against python 3.8
 //! @todo implement a compliant way to get access to the chain of thread states
@@ -22,30 +21,36 @@
 # define HAVE_STD_ATOMIC
 #endif
 
-#include "PythonInvoker.h"
 #include "Application.h"
+#include "PythonInvoker.h"
 #include "ServiceBroker.h"
-#include "messaging/ApplicationMessenger.h"
 #include "addons/AddonManager.h"
 #include "dialogs/GUIDialogKaiToast.h"
 #include "filesystem/File.h"
 #include "filesystem/SpecialProtocol.h"
 #include "guilib/GUIComponent.h"
-#include "windowing/GraphicContext.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
 #include "interfaces/python/PyContext.h"
+#include "interfaces/python/XBPython.h"
 #include "interfaces/python/pythreadstate.h"
 #include "interfaces/python/swig.h"
-#include "interfaces/python/XBPython.h"
+#include "messaging/ApplicationMessenger.h"
 #include "threads/SingleLock.h"
 #include "utils/CharsetConverter.h"
-#include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
+
+// clang-format off
+// This breaks fmt because of SEP define, don't include
+// before anything that includes logging
+#include <osdefs.h>
+// clang-format on
+
+#include <cassert>
 
 #ifdef TARGET_WINDOWS
 extern "C" FILE *fopen_utf8(const char *_Filename, const char *_Mode);
@@ -422,7 +427,7 @@
 
       lock.Leave();
       CPyThreadState pyState;
-      Sleep(100);
+      KODI::TIME::Sleep(100);
       pyState.Restore();
       lock.Enter();
     }
@@ -431,6 +436,7 @@
   // pending calls must be cleared out
   XBMCAddon::RetardedAsyncCallbackHandler::clearPendingCalls(m_threadState);
 
+  assert(m_threadState != nullptr);
   PyEval_ReleaseThread(m_threadState);
 
   setState(stateToSet);
@@ -553,7 +559,6 @@
       pulseGlobalEvent();
 
       PyEval_ReleaseThread(m_threadState);
-      m_threadState = nullptr;
     }
     lock.Leave();

_service:download_files:master.tar.gz/xbmc/interfaces/python/typemaps/python.string.outtm Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmc.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcaddon.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcgui.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcvfs.i Changed

_service:download_files:master.tar.gz/xbmc/media/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/media/MediaLockState.h Added

_service:download_files:master.tar.gz/xbmc/messaging/ApplicationMessenger.cpp Changed

_service:download_files:master.tar.gz/xbmc/messaging/ApplicationMessenger.h Changed

_service:download_files:master.tar.gz/xbmc/music/Album.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/MusicDatabase.cpp Changed

@@ -525,7 +525,47 @@
   SetLibraryLastUpdated();
 
   const std::string itemSeparator = CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_musicItemSeparator;
+  bool isBoxset = false;
+  bool canBeBoxset = false;
 
+  if (album.bBoxedSet)
+  {
+    isBoxset = IsAlbumBoxset(album.idAlbum);
+    if (!isBoxset)
+    { // not a boxset already so make sure we have enough discs & they all have titles
+      std::string strSQL;
+      strSQL = PrepareSQL("SELECT iDiscTotal FROM album WHERE idAlbum = %i", album.idAlbum);
+      int numDiscs = static_cast<int>(strtol(GetSingleValue(strSQL).c_str(), nullptr, 10));
+      if (numDiscs >= 2)
+      {
+        canBeBoxset = true;
+        int discValue;
+        for (discValue = 1; discValue <= numDiscs; discValue++)
+        {
+          strSQL =
+              PrepareSQL("SELECT DISTINCT strDiscSubtitle FROM song WHERE song.idAlbum = %i AND "
+                         "song.iTrack >> 16 = %i",
+                         album.idAlbum, discValue);
+          std::string currentTitle = GetSingleValue(strSQL);
+          if (currentTitle.empty())
+          {
+            currentTitle = StringUtils::Format("%s %i", g_localizeStrings.Get(427), discValue);
+            strSQL =
+                PrepareSQL("UPDATE song SET strDiscSubtitle = '%s' WHERE song.idAlbum = %i AND "
+                           "song.iTrack >> 16 = %i",
+                           currentTitle.c_str(), album.idAlbum, discValue);
+            ExecuteQuery(strSQL);
+          }
+        }
+      }
+      if (!canBeBoxset && album.bBoxedSet)
+      {
+        CLog::Log(LOGNOTICE, "%s : Album with id [%i] does not meet the requirements for a boxset.",
+                  __FUNCTION__, album.idAlbum);
+        album.bBoxedSet = false;
+      }
+    }
+  }
   UpdateAlbum(album.idAlbum,
               album.strAlbum, album.strMusicBrainzAlbumID,
               album.strReleaseGroupMBID,
@@ -875,7 +915,9 @@
                           strArtist.c_str(),
                           strAlbum.c_str());
     m_pDS->query(strSQL);
-    if (strType.find("boxset") != std::string::npos) //boxset flagged in album type
+    std::string strCheckFlag = strType;
+    StringUtils::ToLower(strCheckFlag);
+    if (strCheckFlag.find("boxset") != std::string::npos) //boxset flagged in album type
       bBoxedSet = true;
     if (m_pDS->num_rows() == 0)
     {
@@ -2218,6 +2260,7 @@
   song.strComment = record->at(offset + song_comment).get_asString();
   song.strMood = record->at(offset + song_mood).get_asString();
   song.bCompilation = record->at(offset + song_bCompilation).get_asInt() == 1;
+  song.strDiscSubtitle = record->at(offset + song_strDiscSubtitle).get_asString();
   // Replay gain data (needed for songs from cuesheets, both separate .cue files and embedded metadata)
   song.replayGain.Set(record->at(offset + song_strReplayGain).get_asString());
   // Get filename with full path
@@ -2244,8 +2287,8 @@
   item->GetMusicInfoTag()->SetTrackAndDiscNumber(record->at(song_iTrack).get_asInt());
   item->GetMusicInfoTag()->SetDuration(record->at(song_iDuration).get_asInt());
   item->GetMusicInfoTag()->SetDatabaseId(record->at(song_idSong).get_asInt(), MediaTypeSong);
-  SYSTEMTIME stTime;
-  stTime.wYear = static_cast<unsigned short>(record->at(song_iYear).get_asInt());
+  KODI::TIME::SystemTime stTime;
+  stTime.year = static_cast<unsigned short>(record->at(song_iYear).get_asInt());
   item->GetMusicInfoTag()->SetReleaseDate(stTime);
   item->GetMusicInfoTag()->SetTitle(record->at(song_strTitle).get_asString());
   item->GetMusicInfoTag()->SetDiscSubtitle(record->at(song_strDiscSubtitle).get_asString());
@@ -2345,7 +2388,6 @@
   album.fRating = record->at(offset + album_fRating).get_asFloat();
   album.iUserrating = record->at(offset + album_iUserrating).get_asInt();
   album.iVotes = record->at(offset + album_iVotes).get_asInt();
-  album.iYear = record->at(offset + album_iYear).get_asInt();
   album.strReview = record->at(offset + album_strReview).get_asString();
   album.styles = StringUtils::Split(record->at(offset + album_strStyles).get_asString(), itemSeparator);
   album.moods = StringUtils::Split(record->at(offset + album_strMoods).get_asString(), itemSeparator);
@@ -4085,8 +4127,8 @@
     while (!m_pDS->eof())
     {
       CFileItemPtr pItem(new CFileItem(m_pDS->fv(0).get_asString()));
-      SYSTEMTIME stTime;
-      stTime.wYear = static_cast<unsigned short>(m_pDS->fv(0).get_asInt());
+      KODI::TIME::SystemTime stTime;
+      stTime.year = static_cast<unsigned short>(m_pDS->fv(0).get_asInt());
       pItem->GetMusicInfoTag()->SetReleaseDate(stTime);
       pItem->GetMusicInfoTag()->SetDatabaseId(-1, "year");
 
@@ -4814,8 +4856,8 @@
           itemUrl.AddOption("discid", discnum);
         CFileItemPtr pItem(new CFileItem(itemUrl.ToString(), album));
         pItem->SetLabel2(record->at(0).get_asString()); // GUI show label2 for disc sort order??
-        pItem->GetMusicInfoTag()->SetDiscNumber(
-            discnum); // Skins show discnumber for "albums"?? Confluence does.
+        pItem->GetMusicInfoTag()->SetDiscNumber(discnum);
+        pItem->GetMusicInfoTag()->SetTitle(strDiscSubtitle);
         pItem->SetLabel(strDiscSubtitle);
         pItem->SetArt("icon", "DefaultAlbumCover.png");
         items.Add(pItem);
@@ -5862,10 +5904,12 @@
   { "votes",                    "integer", true,  "iVotes",                 "" },
   { "userrating",              "unsigned", true,  "iUserrating",            "" },
   { "year",                     "integer", true,  "iYear",                  "" },
+  { "isboxset",                 "boolean", true,  "bBoxedSet",              "" },
   { "musicbrainzalbumid",        "string", true,  "strMusicBrainzAlbumID",  "" },
   { "displayartist",             "string", true,  "strArtists",             "" }, //strArtistDisp in album table
   { "compilation",              "boolean", true,  "bCompilation",           "" },
   { "releasetype",               "string", true,  "strReleaseType",         "" },
+  { "totaldiscs",               "integer", true,  "iDiscTotal",             "" },
   { "sortartist",                "string", true,  "strArtistSort",          "" },
   { "musicbrainzreleasegroupid", "string", true,  "strReleaseGroupMBID",    "" },
   { "playcount",                "integer", true,  "iTimesPlayed",           "" },  // Scalar subquery in view
@@ -6004,6 +6048,12 @@
       orderfields.emplace_back("strAlbum");
       orderfields.emplace_back("strArtists");
     }
+    else if (sortDescription.sortBy == SortByTotalDiscs)
+    {
+      orderfields.emplace_back("iDisctotal");
+      orderfields.emplace_back("strAlbum");
+      orderfields.emplace_back("strArtists");
+    }
     // Always sort by id to define order when other fields same
     if (sortDescription.sortBy != SortByRandom)
       orderfields.emplace_back("albumview.idAlbum");
@@ -6336,6 +6386,7 @@
   { "album",                     "string", true,  "strAlbum",               "album.strAlbum AS strAlbum" },
   { "albumreleasetype",          "string", true,  "strAlbumReleaseType",    "album.strReleaseType AS strAlbumReleaseType" },
   { "musicbrainzalbumid",        "string", true,  "strMusicBrainzAlbumID",  "album.strMusicBrainzAlbumID AS strMusicBrainzAlbumID" },
+  { "disctitle",                 "string", true,  "song.strDiscSubtitle",   "" },
 
   // JOIN fields (multivalue), same order as _JoinToSongFields 
   { "albumartistid",              "array", false, "idAlbumArtist",          "album_artist.idArtist AS idAlbumArtist" },
@@ -10823,10 +10874,8 @@
   if (album.iVotes > 0)
     item.SetProperty("album_votes", album.iVotes);
 
-  if (album.bBoxedSet)
-    item.SetProperty("album_bBoxedSet", true); //! @todo Set listItem the same way as totalDiscs ??
+  item.SetProperty("album_isboxset", album.bBoxedSet);
   item.SetProperty("album_totaldiscs", album.iTotalDiscs);
-  item.GetMusicInfoTag()->SetTotalDiscs(album.iTotalDiscs); // sets for ListItem.TotalDiscs
   item.SetProperty("album_releasetype", CAlbum::ReleaseTypeToString(album.releaseType));
 }

_service:download_files:master.tar.gz/xbmc/music/Song.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicInfoScanner.cpp Changed

@@ -300,7 +300,7 @@
   }
   else
   {
-    m_pathsToScan.insert(strDirectory);    
+    m_pathsToScan.insert(strDirectory);
     m_idSourcePath = m_musicDatabase.GetSourceFromPath(strDirectory);
   }
   m_musicDatabase.Close();
@@ -816,7 +816,7 @@
       {
         if (common[i] == VARIOUSARTISTS_MBID)
           /* Treat "various", "various artists" and the localized equivalent name as the same
-          album artist as the artist with Musicbrainz ID 89ad4ac3-39f7-470e-963a-56509c546377. 
+          album artist as the artist with Musicbrainz ID 89ad4ac3-39f7-470e-963a-56509c546377.
           If adding this artist for the first time then the name will be set to either the primary
           artist read from tags when 3a, or the localized value for "various artists" when not 3a.
           This means that tag values are no longer translated into the current langauge.
@@ -1260,8 +1260,8 @@
     const CFileItemPtr pItem = items[i];
     digest.Update(pItem->GetPath());
     digest.Update((unsigned char *)&pItem->m_dwSize, sizeof(pItem->m_dwSize));
-    FILETIME time = pItem->m_dateTime;
-    digest.Update((unsigned char *)&time, sizeof(FILETIME));
+    KODI::TIME::FileTime time = pItem->m_dateTime;
+    digest.Update((unsigned char*)&time, sizeof(KODI::TIME::FileTime));
     if (pItem->IsAudio() && !pItem->IsPlayList() && !pItem->IsNFO())
       count++;
   }
@@ -1476,7 +1476,7 @@
   CInfoScanner::INFO_TYPE result = CInfoScanner::NO_NFO;
   CNfoFile nfoReader;
   existsNFO = XFILE::CFile::Exists(strNfo);
-  // When on GUI ask user if they want to ignore nfo and refresh from Internet  
+  // When on GUI ask user if they want to ignore nfo and refresh from Internet
   if (existsNFO && pDialog && CGUIDialogYesNo::ShowAndGetInput(10523, 20446))
   {
     existsNFO = false;
@@ -1763,7 +1763,7 @@
       CLog::Log(LOGDEBUG, "%s not have path, nfo file not possible", artist.strArtist.c_str());
   }
 
-  // When on GUI ask user if they want to ignore nfo and refresh from Internet  
+  // When on GUI ask user if they want to ignore nfo and refresh from Internet
   if (existsNFO && pDialog && CGUIDialogYesNo::ShowAndGetInput(21891, 20446))
   {
     existsNFO = false;

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTag.cpp Changed

@@ -139,14 +139,14 @@
   return m_genre;
 }
 
-void CMusicInfoTag::GetReleaseDate(SYSTEMTIME& dateTime) const
+void CMusicInfoTag::GetReleaseDate(KODI::TIME::SystemTime& dateTime) const
 {
   memcpy(&dateTime, &m_dwReleaseDate, sizeof(m_dwReleaseDate));
 }
 
 int CMusicInfoTag::GetYear() const
 {
-  return m_dwReleaseDate.wYear;
+  return m_dwReleaseDate.year;
 }
 
 int CMusicInfoTag::GetDatabaseId() const
@@ -161,7 +161,8 @@
 
 std::string CMusicInfoTag::GetYearString() const
 {
-  return m_dwReleaseDate.wYear ? StringUtils::Format("%i", m_dwReleaseDate.wYear) : StringUtils::Empty;
+  return m_dwReleaseDate.year ? StringUtils::Format("%i", m_dwReleaseDate.year)
+                              : StringUtils::Empty;
 }
 
 const std::string &CMusicInfoTag::GetComment() const
@@ -362,7 +363,7 @@
 void CMusicInfoTag::SetYear(int year)
 {
   memset(&m_dwReleaseDate, 0, sizeof(m_dwReleaseDate) );
-  m_dwReleaseDate.wYear = year;
+  m_dwReleaseDate.year = year;
 }
 
 void CMusicInfoTag::SetDatabaseId(long id, const std::string &type)
@@ -371,7 +372,7 @@
   m_type = type;
 }
 
-void CMusicInfoTag::SetReleaseDate(SYSTEMTIME& dateTime)
+void CMusicInfoTag::SetReleaseDate(KODI::TIME::SystemTime& dateTime)
 {
   memcpy(&m_dwReleaseDate, &dateTime, sizeof(m_dwReleaseDate) );
 }
@@ -645,8 +646,8 @@
   SetUserrating(album.iUserrating);
   SetVotes(album.iVotes);
   SetCompilation(album.bCompilation);
-  SYSTEMTIME stTime;
-  stTime.wYear = album.iYear;
+  KODI::TIME::SystemTime stTime;
+  stTime.year = album.iYear;
   SetBoxset(album.bBoxedSet);
   SetReleaseDate(stTime);
   SetAlbumReleaseType(album.releaseType);
@@ -692,8 +693,8 @@
   SetUserrating(song.userrating);
   SetVotes(song.votes);
   SetURL(song.strFileName);
-  SYSTEMTIME stTime;
-  stTime.wYear = song.iYear;
+  KODI::TIME::SystemTime stTime;
+  stTime.year = song.iYear;
   SetReleaseDate(stTime);
   SetTrackAndDiscNumber(song.iTrack);
   SetDiscSubtitle(song.strDiscSubtitle);
@@ -740,7 +741,7 @@
   value["track"] = GetTrackNumber();
   value["disc"] = GetDiscNumber();
   value["loaded"] = m_bLoaded;
-  value["year"] = m_dwReleaseDate.wYear;
+  value["year"] = m_dwReleaseDate.year;
   value["musicbrainztrackid"] = m_strMusicBrainzTrackID;
   value["musicbrainzartistid"] = m_musicBrainzArtistID;
   value["musicbrainzalbumid"] = m_strMusicBrainzAlbumID;
@@ -777,6 +778,9 @@
     value["releasetype"] = CAlbum::ReleaseTypeToString(m_albumReleaseType);
   else if (m_type.compare(MediaTypeSong) == 0)
     value["albumreleasetype"] = CAlbum::ReleaseTypeToString(m_albumReleaseType);
+  value["isboxset"] = m_bBoxset;
+  value["totaldiscs"] = m_iDiscTotal;
+  value["disctitle"] = m_strDiscSubtitle;
 }
 
 void CMusicInfoTag::ToSortable(SortItem& sortable, Field field) const
@@ -801,7 +805,9 @@
   case FieldTotalDiscs:
     sortable[FieldTotalDiscs] = m_iDiscTotal;
     break;
-  case FieldYear:        sortable[FieldYear] = m_dwReleaseDate.wYear; break;
+  case FieldYear:
+    sortable[FieldYear] = m_dwReleaseDate.year;
+    break;
   case FieldComment:     sortable[FieldComment] = m_strComment; break;
   case FieldMoods:       sortable[FieldMoods] = m_strMood; break;
   case FieldRating:      sortable[FieldRating] = m_Rating; break;

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTag.h Changed

@@ -12,9 +12,6 @@
 class CArtist;
 class CVariant;
 
-#include <string>
-#include <vector>
-
 #include "ReplayGain.h"
 #include "XBDateTime.h"
 #include "music/Album.h"
@@ -22,6 +19,8 @@
 #include "utils/ISerializable.h"
 #include "utils/ISortable.h"
 
+#include <string>
+#include <vector>
 
 namespace MUSIC_INFO
 {
@@ -53,7 +52,7 @@
   const std::string &GetType() const;
   const std::string& GetDiscSubtitle() const;
 
-  void GetReleaseDate(SYSTEMTIME& dateTime) const;
+  void GetReleaseDate(KODI::TIME::SystemTime& dateTime) const;
   std::string GetYearString() const;
   const std::string& GetMusicBrainzTrackID() const;
   const std::vector<std::string>& GetMusicBrainzArtistID() const;
@@ -98,7 +97,7 @@
   void SetGenre(const std::vector<std::string>& genres, bool bTrim = false);
   void SetYear(int year);
   void SetDatabaseId(long id, const std::string &type);
-  void SetReleaseDate(SYSTEMTIME& dateTime);
+  void SetReleaseDate(KODI::TIME::SystemTime& dateTime);
   void SetTrackNumber(int iTrack);
   void SetDiscNumber(int iDiscNumber);
   void SetTrackAndDiscNumber(int iTrackAndDisc);
@@ -221,7 +220,7 @@
   int m_iAlbumId;
   int m_iDiscTotal;
   bool m_bBoxset;
-  SYSTEMTIME m_dwReleaseDate;
+  KODI::TIME::SystemTime m_dwReleaseDate;
   CAlbum::ReleaseType m_albumReleaseType;
 
   EmbeddedArtInfo m_coverArt; ///< art information

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicBase.cpp Changed

@@ -22,45 +22,42 @@
 #ifdef HAS_CDDA_RIPPER
 #include "cdrip/CDDARipper.h"
 #endif
+#include "Autorun.h"
+#include "FileItem.h"
+#include "GUIInfoManager.h"
 #include "GUIPassword.h"
 #include "PartyModeManager.h"
-#include "GUIInfoManager.h"
-#include "filesystem/Directory.h"
-#include "filesystem/MusicDatabaseDirectory.h"
+#include "URL.h"
 #include "addons/GUIDialogAddonInfo.h"
+#include "cores/IPlayer.h"
+#include "cores/playercorefactory/PlayerCoreFactory.h"
+#include "dialogs/GUIDialogProgress.h"
 #include "dialogs/GUIDialogSmartPlaylistEditor.h"
-#include "view/GUIViewState.h"
-#include "music/tags/MusicInfoTag.h"
+#include "dialogs/GUIDialogYesNo.h"
+#include "filesystem/Directory.h"
+#include "filesystem/MusicDatabaseDirectory.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
+#include "guilib/LocalizeStrings.h"
+#include "guilib/guiinfo/GUIInfoLabels.h"
 #include "input/Key.h"
-#include "dialogs/GUIDialogYesNo.h"
-#include "dialogs/GUIDialogProgress.h"
-#include "FileItem.h"
 #include "messaging/helpers/DialogHelper.h"
 #include "messaging/helpers/DialogOKHelper.h"
+#include "music/infoscanner/MusicInfoScanner.h"
+#include "music/tags/MusicInfoTag.h"
 #include "profiles/ProfileManager.h"
-#include "storage/MediaManager.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSourceSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "guilib/LocalizeStrings.h"
-#include "utils/log.h"
-#include "utils/URIUtils.h"
+#include "storage/MediaManager.h"
 #include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
 #include "utils/Variant.h"
-#include "URL.h"
-#include "music/infoscanner/MusicInfoScanner.h"
-#include "guilib/guiinfo/GUIInfoLabels.h"
-#include "cores/IPlayer.h"
-#include "cores/playercorefactory/PlayerCoreFactory.h"
-#include "Autorun.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 #include "video/dialogs/GUIDialogVideoInfo.h"
-
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "view/GUIViewState.h"
 
 #include <algorithm>
 
@@ -893,7 +890,7 @@
         m_dlgProgress->Progress();
       }
     } // if (bShowProgress)
-    Sleep(1);
+    KODI::TIME::Sleep(1);
   } // while (m_musicInfoLoader.IsLoading())
 
   if (bProgressVisible && m_dlgProgress)

_service:download_files:master.tar.gz/xbmc/network/AirPlayServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/EventClient.cpp Changed

@@ -13,6 +13,7 @@
 #include "dialogs/GUIDialogKaiToast.h"
 #include "filesystem/File.h"
 #include "guilib/LocalizeStrings.h"
+#include "input/ButtonTranslator.h"
 #include "input/GamepadTranslator.h"
 #include "input/IRTranslator.h"
 #include "input/Key.h"
@@ -59,30 +60,10 @@
   {
     if ( (m_mapName.length() > 0) && (m_buttonName.length() > 0) )
     {
-      if ( m_mapName.compare("KB") == 0 ) // standard keyboard map
+      m_iKeyCode = CButtonTranslator::TranslateString(m_mapName, m_buttonName);
+      if (m_iKeyCode == 0)
       {
-        m_iKeyCode = CKeyboardTranslator::TranslateString( m_buttonName.c_str() );
-      }
-      else if  ( m_mapName.compare("XG") == 0 ) // xbox gamepad map
-      {
-        m_iKeyCode = CGamepadTranslator::TranslateString( m_buttonName.c_str() );
-      }
-      else if  ( m_mapName.compare("R1") == 0 ) // xbox remote map
-      {
-        m_iKeyCode = CIRTranslator::TranslateString( m_buttonName.c_str() );
-      }
-      else if  ( m_mapName.compare("R2") == 0 ) // xbox universal remote map
-      {
-        m_iKeyCode = CIRTranslator::TranslateUniversalRemoteString( m_buttonName.c_str() );
-      }
-      else if ( (m_mapName.length() > 3) &&
-                (StringUtils::StartsWith(m_mapName, "LI:")) ) // starts with LI: ?
-      {
-        CLog::Log(LOGNOTICE, "ES: LIRC support not implemented");
-      }
-      else
-      {
-        Reset(); // disable key since its invalid
+        Reset();
         CLog::Log(LOGERROR, "ES: Could not map %s : %s to a key", m_mapName.c_str(),
                   m_buttonName.c_str());
       }

_service:download_files:master.tar.gz/xbmc/network/EventServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/Network.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/Network.h Changed

_service:download_files:master.tar.gz/xbmc/network/TCPServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/UdpClient.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/WakeOnAccess.cpp Changed

@@ -6,35 +6,34 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include <limits.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-
-#include "network/Network.h"
 #include "Application.h"
-#include "ServiceBroker.h"
 #include "DNSNameCache.h"
-#include "dialogs/GUIDialogProgress.h"
+#include "ServiceBroker.h"
 #include "dialogs/GUIDialogKaiToast.h"
+#include "dialogs/GUIDialogProgress.h"
 #include "filesystem/SpecialProtocol.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
+#include "network/Network.h"
 #include "settings/AdvancedSettings.h"
+#include "settings/MediaSourceSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "settings/MediaSourceSettings.h"
 #include "settings/lib/Setting.h"
 #include "utils/JobManager.h"
-#include "utils/log.h"
-#include "utils/XMLUtils.h"
-#include "utils/URIUtils.h"
 #include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
 #include "utils/Variant.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/XMLUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
+#include <limits.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 
 #ifdef HAS_UPNP
 #include "network/upnp/UPnP.h"
@@ -127,7 +126,7 @@
 {
 #ifdef HAS_UPNP
   while (CDateTime::GetCurrentDateTime() < upnpInitReady)
-    Sleep(1000);
+    KODI::TIME::Sleep(1000);
 
   PLT_SyncMediaBrowser* browser = UPNP::CUPnP::GetInstance()->m_MediaBrowser;
 
@@ -328,7 +327,7 @@
         m_dialog->SetPercentage(std::max(percentage, 1)); // avoid flickering , keep minimum 1%
       }
 
-      Sleep (m_dialog ? 20 : 200);
+      KODI::TIME::Sleep(m_dialog ? 20 : 200);
     }
 
     return TimedOut;
@@ -400,7 +399,7 @@
 
       if (host.empty())
       {
-        Sleep(timeOutMs);
+        KODI::TIME::Sleep(timeOutMs);
 
         host = LookupUPnPHost(server.upnpUuid);
       }

_service:download_files:master.tar.gz/xbmc/network/WebServer.cpp Changed

@@ -17,22 +17,24 @@
 #include <pthread.h>
 #endif
 
+#include "ServiceBroker.h"
+#include "Util.h"
+#include "XBDateTime.h"
 #include "filesystem/File.h"
 #include "network/httprequesthandler/HTTPRequestHandlerUtils.h"
 #include "network/httprequesthandler/IHTTPRequestHandler.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "ServiceBroker.h"
 #include "threads/SingleLock.h"
-#include "Util.h"
 #include "utils/FileUtils.h"
-#include "utils/log.h"
 #include "utils/Mime.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/Variant.h"
-#include "XBDateTime.h"
+#include "utils/log.h"
+
+#include <inttypes.h>
 
 #define MAX_POST_BUFFER_SIZE 2048
 
@@ -1303,5 +1305,11 @@
 
   CLog::Log(LOGDEBUG, LOGWEBSERVER, "CWebServer[%hu] [OUT] %s: %s", m_port, name.c_str(), value.c_str());
 
+#if MHD_VERSION >= 0x00096800
+  if (name == MHD_HTTP_HEADER_CONTENT_LENGTH)
+  {
+    MHD_set_response_options(response, MHD_RF_INSANITY_HEADER_CONTENT_LENGTH, MHD_RO_END);
+  }
+#endif
   return MHD_add_response_header(response, name.c_str(), value.c_str());
 }

_service:download_files:master.tar.gz/xbmc/network/Zeroconf.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/ZeroconfBrowser.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2011-2018 Team Kodi
+ *  Copyright (C) 2011-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -9,10 +9,14 @@
 #include "HTTPVfsHandler.h"
 
 #include "MediaSource.h"
+#include "ServiceBroker.h"
 #include "URL.h"
+#include "Util.h"
 #include "filesystem/File.h"
+#include "media/MediaLockState.h"
 #include "network/WebServer.h"
 #include "settings/MediaSourceSettings.h"
+#include "storage/MediaManager.h"
 #include "utils/URIUtils.h"
 
 CHTTPVfsHandler::CHTTPVfsHandler(const HTTPRequest &request)
@@ -40,6 +44,7 @@
         while (URIUtils::IsInArchive(realPath))
           realPath = CURL(realPath).GetHostName();
 
+        // Check manually configured sources
         VECSOURCES *sources = NULL;
         for (unsigned int index = 0; index < size && !accessible; index++)
         {
@@ -53,7 +58,7 @@
               break;
 
             // don't allow access to locked / disabled sharing sources
-            if (source.m_iHasLock == 2 || !source.m_allowSharing)
+            if (source.m_iHasLock == LOCK_STATE_LOCKED || !source.m_allowSharing)
               continue;
 
             for (const auto& path : source.vecPaths)
@@ -67,6 +72,19 @@
             }
           }
         }
+
+        // Check auto-mounted sources
+        if (!accessible)
+        {
+          bool isSource;
+          VECSOURCES removableSources;
+          CServiceBroker::GetMediaManager().GetRemovableDrives(removableSources);
+          int sourceIndex = CUtil::GetMatchingSource(realPath, removableSources, isSource);
+          if (sourceIndex >= 0 && sourceIndex < static_cast<int>(removableSources.size()) &&
+              removableSources.at(sourceIndex).m_iHasLock != LOCK_STATE_LOCKED &&
+              removableSources.at(sourceIndex).m_allowSharing)
+            accessible = true;
+        }
       }
 
       if (accessible)

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPInternal.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPRenderer.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralCecAdapter.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIWindowPictures.cpp Changed

@@ -1,45 +1,44 @@
 /*
- *  Copyright (C) 2005-2018 Team Kodi
+ *  Copyright (C) 2005-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  *  See LICENSES/README.md for more information.
  */
 
-#include "threads/SystemClock.h"
 #include "GUIWindowPictures.h"
+
+#include "Application.h"
+#include "Autorun.h"
+#include "GUIDialogPictureInfo.h"
+#include "GUIPassword.h"
+#include "GUIWindowSlideShow.h"
+#include "PictureInfoLoader.h"
+#include "PlayListPlayer.h"
 #include "ServiceBroker.h"
 #include "URL.h"
 #include "Util.h"
-#include "Application.h"
-#include "GUIPassword.h"
-#include "GUIDialogPictureInfo.h"
 #include "addons/GUIDialogAddonInfo.h"
 #include "dialogs/GUIDialogMediaSource.h"
 #include "dialogs/GUIDialogProgress.h"
-#include "playlists/PlayListFactory.h"
-#include "PictureInfoLoader.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
-#include "view/GUIViewState.h"
+#include "interfaces/AnnouncementManager.h"
+#include "media/MediaLockState.h"
 #include "messaging/helpers/DialogOKHelper.h"
-#include "PlayListPlayer.h"
 #include "playlists/PlayList.h"
+#include "playlists/PlayListFactory.h"
 #include "settings/MediaSourceSettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "utils/log.h"
-#include "utils/URIUtils.h"
-#include "utils/Variant.h"
-#include "Autorun.h"
-#include "interfaces/AnnouncementManager.h"
+#include "threads/SystemClock.h"
 #include "utils/SortUtils.h"
 #include "utils/StringUtils.h"
-#include "GUIWindowSlideShow.h"
-
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/URIUtils.h"
+#include "utils/Variant.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "view/GUIViewState.h"
 
 #define CONTROL_BTNVIEWASICONS      2
 #define CONTROL_BTNSORTBY           3
@@ -229,7 +228,7 @@
         m_dlgProgress->Progress();
       }
     } // if (bShowProgress)
-    Sleep(1);
+    KODI::TIME::Sleep(1);
   } // while (loader.IsLoading())
 
   if (bProgressVisible && m_dlgProgress)
@@ -602,7 +601,7 @@
   int iIndex = CUtil::GetMatchingSource(dir, shares, bIsSourceName);
   if (iIndex > -1)
   {
-    if (iIndex < (int)shares.size() && shares[iIndex].m_iHasLock == 2)
+    if (iIndex < static_cast<int>(shares.size()) && shares[iIndex].m_iHasLock == LOCK_STATE_LOCKED)
     {
       CFileItem item(shares[iIndex]);
       if (!g_passwordManager.IsItemUnlocked(&item,"pictures"))

_service:download_files:master.tar.gz/xbmc/pictures/GUIWindowSlideShow.cpp Changed

@@ -6,40 +6,40 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "threads/SystemClock.h"
 #include "GUIWindowSlideShow.h"
+
 #include "Application.h"
+#include "FileItem.h"
+#include "GUIDialogPictureInfo.h"
+#include "GUIInfoManager.h"
+#include "GUIUserMessages.h"
+#include "PlayListPlayer.h"
 #include "ServiceBroker.h"
-#include "messaging/ApplicationMessenger.h"
-#include "utils/URIUtils.h"
+#include "TextureDatabase.h"
 #include "URL.h"
+#include "filesystem/Directory.h"
 #include "guilib/GUIComponent.h"
-#include "guilib/TextureManager.h"
 #include "guilib/GUILabelControl.h"
-#include "input/Key.h"
-#include "GUIInfoManager.h"
-#include "filesystem/Directory.h"
-#include "GUIDialogPictureInfo.h"
-#include "GUIUserMessages.h"
 #include "guilib/GUIWindowManager.h"
+#include "guilib/LocalizeStrings.h"
+#include "guilib/Texture.h"
+#include "guilib/TextureManager.h"
+#include "input/Key.h"
+#include "interfaces/AnnouncementManager.h"
+#include "messaging/ApplicationMessenger.h"
+#include "pictures/GUIViewStatePictures.h"
+#include "pictures/PictureThumbLoader.h"
+#include "rendering/RenderSystem.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "FileItem.h"
-#include "guilib/Texture.h"
-#include "rendering/RenderSystem.h"
-#include "guilib/LocalizeStrings.h"
-#include "TextureDatabase.h"
-#include "utils/log.h"
+#include "threads/SystemClock.h"
 #include "utils/Random.h"
+#include "utils/URIUtils.h"
 #include "utils/Variant.h"
-#include "interfaces/AnnouncementManager.h"
-#include "pictures/GUIViewStatePictures.h"
-#include "pictures/PictureThumbLoader.h"
-#include "PlayListPlayer.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
 #include <random>
 
 using namespace XFILE;
@@ -245,7 +245,7 @@
       // sleep until the loader finishes loading the current pic
       CLog::Log(LOGDEBUG,"Waiting for BackgroundLoader thread to close");
       while (m_pBackgroundLoader->IsLoading())
-        Sleep(10);
+        KODI::TIME::Sleep(10);
       // stop the thread
       CLog::Log(LOGDEBUG,"Stopping BackgroundLoader thread");
       m_pBackgroundLoader->StopThread();

_service:download_files:master.tar.gz/xbmc/pictures/SlideShowPicture.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidMouse.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidMouse.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidTouch.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidTouch.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCFile.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCMediaSession.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCMediaSession.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCVideoView.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCVideoView.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/XBMCApp.cpp Changed

@@ -64,32 +64,34 @@
 #include "windowing/GraphicContext.h"
 #include "guilib/GUIWindowManager.h"
 // Audio Engine includes for Factory and interfaces
-#include "cores/AudioEngine/Interfaces/AE.h"
+#include "GUIInfoManager.h"
+#include "ServiceBroker.h"
+#include "TextureCache.h"
 #include "cores/AudioEngine/AESinkFactory.h"
+#include "cores/AudioEngine/Interfaces/AE.h"
 #include "cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h"
-
-#include "ServiceBroker.h"
-#include "GUIInfoManager.h"
-#include "guilib/guiinfo/GUIInfoLabels.h"
-#include "guilib/GUIComponent.h"
-#include "platform/android/activity/IInputDeviceCallbacks.h"
-#include "platform/android/activity/IInputDeviceEventHandler.h"
-#include "input/mouse/MouseStat.h"
-#include "input/Key.h"
-#include "utils/log.h"
-#include "utils/TimeUtils.h"
-#include "platform/android/network/NetworkAndroid.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "filesystem/SpecialProtocol.h"
-#include "TextureCache.h"
-#include "utils/StringUtils.h"
 #include "filesystem/VideoDatabaseFile.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/guiinfo/GUIInfoLabels.h"
+#include "input/Key.h"
+#include "input/mouse/MouseStat.h"
+#include "platform/xbmc.h"
+#include "powermanagement/PowerManager.h"
+#include "utils/StringUtils.h"
+#include "utils/TimeUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/Variant.h"
+#include "utils/log.h"
+#include "windowing/WinEvents.h"
 #include "windowing/android/VideoSyncAndroid.h"
 #include "windowing/android/WinSystemAndroid.h"
-#include "windowing/WinEvents.h"
-#include "platform/xbmc.h"
+
+#include "platform/android/activity/IInputDeviceCallbacks.h"
+#include "platform/android/activity/IInputDeviceEventHandler.h"
+#include "platform/android/network/NetworkAndroid.h"
+#include "platform/android/powermanagement/AndroidPowerSyscall.h"
 
 #define GIGABYTES       1073741824
 
@@ -245,6 +247,10 @@
   // Re-request Visible Behind
   if ((m_playback_state & PLAYBACK_STATE_PLAYING) && (m_playback_state & PLAYBACK_STATE_VIDEO))
     RequestVisibleBehind(true);
+
+  if (g_application.IsInitialized())
+    dynamic_cast<CAndroidPowerSyscall*>(CServiceBroker::GetPowerManager().GetPowerSyscall())
+        ->SetOnResume();
 }
 
 void CXBMCApp::onPause()
@@ -265,6 +271,9 @@
 
   EnableWakeLock(false);
   m_hasReqVisible = false;
+
+  dynamic_cast<CAndroidPowerSyscall*>(CServiceBroker::GetPowerManager().GetPowerSyscall())
+      ->SetOnPause();
 }
 
 void CXBMCApp::onStop()
@@ -579,8 +588,7 @@
   {
     m_displayChangeEvent.WaitMSec(5000);
     if (m_hdmiSource && g_application.GetAppPlayer().IsPlaying())
-      dynamic_cast<CWinSystemAndroid*>(CServiceBroker::GetWinSystem())
-          ->SetHDMIState(CWinSystemAndroid::HDMI_STATE_UNCONNECTED_TIMER);
+      dynamic_cast<CWinSystemAndroid*>(CServiceBroker::GetWinSystem())->InitiateModeChange();
   }
 }
 
@@ -608,8 +616,7 @@
   {
     m_displayChangeEvent.WaitMSec(5000);
     if (m_hdmiSource && g_application.GetAppPlayer().IsPlaying())
-      dynamic_cast<CWinSystemAndroid*>(CServiceBroker::GetWinSystem())
-          ->SetHDMIState(CWinSystemAndroid::HDMI_STATE_UNCONNECTED_TIMER);
+      dynamic_cast<CWinSystemAndroid*>(CServiceBroker::GetWinSystem())->InitiateModeChange();
   }
 }
 
@@ -1024,9 +1031,7 @@
     {
       CWinSystemBase* winSystem = CServiceBroker::GetWinSystem();
       if (winSystem && dynamic_cast<CWinSystemAndroid*>(winSystem))
-        dynamic_cast<CWinSystemAndroid*>(winSystem)->SetHDMIState(
-            m_hdmiPlugged ? CWinSystemAndroid::HDMI_STATE_CONNECTED
-                          : CWinSystemAndroid::HDMI_STATE_UNCONNECTED);
+        dynamic_cast<CWinSystemAndroid*>(winSystem)->SetHdmiState(m_hdmiPlugged);
     }
   }
   else if (action == "android.intent.action.SCREEN_OFF")

_service:download_files:master.tar.gz/xbmc/platform/android/peripherals/AndroidJoystickState.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/peripherals/AndroidJoystickState.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/powermanagement/AndroidPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/powermanagement/AndroidPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/DarwinNSUserDefaults.h Deleted

_service:download_files:master.tar.gz/xbmc/platform/darwin/DarwinNSUserDefaults.mm Deleted

@@ -1,147 +0,0 @@
-/*
- *  Copyright (C) 2015 Team MrMC
- *      https://github.com/MrMC
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#import "platform/darwin/DarwinNSUserDefaults.h"
-
-#import "filesystem/SpecialProtocol.h"
-#import "utils/log.h"
-
-#import <Foundation/NSString.h>
-#import <Foundation/NSUserDefaults.h>
-
-
-static bool translatePathIntoKey(const std::string &path, std::string &key)
-{
-  size_t pos;
-  std::string translated_key = CSpecialProtocol::TranslatePath(path);
-  if ((pos = translated_key.find("Caches/userdata")) != std::string::npos)
-  {
-    key = translated_key.erase(0, pos);
-    return true;
-  }
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::Synchronize()
-{
-  return [[NSUserDefaults standardUserDefaults] synchronize] == YES;
-}
-
-bool CDarwinNSUserDefaults::GetKey(const std::string &key, std::string &value)
-{
-  if (!key.empty())
-  {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSString *nsstring_key = [NSString stringWithUTF8String: key.c_str()];
-    NSString *nsstring_value = [defaults stringForKey:nsstring_key];
-    if (nsstring_value)
-    {
-      value = [nsstring_value UTF8String];
-      if (!value.empty())
-        return true;
-    }
-  }
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::SetKey(const std::string &key, const std::string &value, bool synchronize)
-{
-  if (!key.empty() && !value.empty())
-  {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
-    NSString *nsstring_key = [NSString stringWithUTF8String: key.c_str()];
-    NSString *nsstring_value = [NSString stringWithUTF8String: value.c_str()];
-
-    [defaults setObject:nsstring_value forKey:nsstring_key];
-    if (synchronize)
-      return [defaults synchronize] == YES;
-    else
-      return true;
-  }
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::DeleteKey(const std::string &key, bool synchronize)
-{
-  if (!key.empty())
-  {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSString *nsstring_key = [NSString stringWithUTF8String: key.c_str()];
-    [defaults removeObjectForKey:nsstring_key];
-    if (synchronize)
-      return [defaults synchronize] == YES;
-    else
-      return true;
-  }
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::KeyExists(const std::string &key)
-{
-  if (!key.empty())
-  {
-    NSString *nsstring_key = [NSString stringWithUTF8String: key.c_str()];
-    if ([[NSUserDefaults standardUserDefaults] objectForKey:nsstring_key])
-      return true;
-  }
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::IsKeyFromPath(const std::string &path)
-{
-  std::string translated_key;
-  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
-  {
-    CLog::Log(LOGDEBUG, "found key %s", translated_key.c_str());
-    return true;
-  }
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::GetKeyFromPath(const std::string &path, std::string &value)
-{
-  std::string translated_key;
-  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
-    return CDarwinNSUserDefaults::GetKey(translated_key, value);
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::SetKeyFromPath(const std::string &path, const std::string &value, bool synchronize)
-{
-  std::string translated_key;
-  if (translatePathIntoKey(path, translated_key) && !translated_key.empty() && !value.empty())
-    return CDarwinNSUserDefaults::SetKey(translated_key, value, synchronize);
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::DeleteKeyFromPath(const std::string &path, bool synchronize)
-{
-  std::string translated_key;
-  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
-    return CDarwinNSUserDefaults::DeleteKey(translated_key, synchronize);
-
-  return false;
-}
-
-bool CDarwinNSUserDefaults::KeyFromPathExists(const std::string &path)
-{
-  std::string translated_key;
-  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
-    return CDarwinNSUserDefaults::KeyExists(translated_key);
-
-  return false;
-}

_service:download_files:master.tar.gz/xbmc/platform/darwin/DarwinUtils.mm Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/AnnounceReceiver.mm Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/CPUInfoDarwinEmbed.cpp Added

@@ -0,0 +1,75 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "CPUInfoDarwinEmbed.h"
+
+#include "utils/Temperature.h"
+
+#include "platform/posix/PosixResourceCounter.h"
+
+#include <array>
+#include <string>
+
+#include <mach-o/arch.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+
+std::shared_ptr<CCPUInfo> CCPUInfo::GetCPUInfo()
+{
+  return std::make_shared<CCPUInfoDarwinEmbed>();
+}
+
+CCPUInfoDarwinEmbed::CCPUInfoDarwinEmbed() : m_resourceCounter(new CPosixResourceCounter())
+{
+  int count = 0;
+  size_t countLength = sizeof(count);
+  if (sysctlbyname("hw.activecpu", &count, &countLength, nullptr, 0) == 0)
+    m_cpuCount = count;
+  else
+    m_cpuCount = 1;
+
+  std::array<char, 512> buffer;
+  size_t length = buffer.size();
+  if (sysctlbyname("machdep.cpu.brand_string", buffer.data(), &length, nullptr, 0) == 0)
+    m_cpuModel = buffer.data();
+
+  buffer = {};
+  if (sysctlbyname("machdep.cpu.vendor", buffer.data(), &length, nullptr, 0) == 0)
+    m_cpuVendor = buffer.data();
+
+  for (int core = 0; core < m_cpuCount; core++)
+  {
+    CoreInfo coreInfo;
+    coreInfo.m_id = core;
+    m_cores.emplace_back(coreInfo);
+  }
+
+  m_cpuFeatures |= CPU_FEATURE_NEON;
+}
+
+int CCPUInfoDarwinEmbed::GetUsedPercentage()
+{
+  if (!m_nextUsedReadTime.IsTimePast())
+    return m_lastUsedPercentage;
+
+  m_lastUsedPercentage = m_resourceCounter->GetCPUUsage();
+  m_nextUsedReadTime.Set(MINIMUM_TIME_BETWEEN_READS);
+
+  return m_lastUsedPercentage;
+}
+
+float CCPUInfoDarwinEmbed::GetCPUFrequency()
+{
+  // Get CPU frequency, scaled to MHz.
+  long long hz = 0;
+  size_t len = sizeof(hz);
+  if (sysctlbyname("hw.cpufrequency", &hz, &len, nullptr, 0) < 0)
+    return 0.f;
+
+  return hz / 1000000.0;
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/CPUInfoDarwinEmbed.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinEmbedKeyboard.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinEmbedKeyboard.mm Added

@@ -0,0 +1,117 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "DarwinEmbedKeyboard.h"
+
+#include "platform/darwin/ios-common/DarwinEmbedKeyboardView.h"
+#if defined(TARGET_DARWIN_IOS)
+#include "platform/darwin/ios/IOSKeyboardView.h"
+#include "platform/darwin/ios/XBMCController.h"
+#define KEYBOARDVIEW_CLASS IOSKeyboardView
+#elif defined(TARGET_DARWIN_TVOS)
+#include "platform/darwin/tvos/TVOSKeyboardView.h"
+#include "platform/darwin/tvos/XBMCController.h"
+#define KEYBOARDVIEW_CLASS TVOSKeyboardView
+#endif
+
+struct CDarwinEmbedKeyboardImpl
+{
+  KEYBOARDVIEW_CLASS* g_pKeyboard = nil;
+};
+
+CDarwinEmbedKeyboard::CDarwinEmbedKeyboard()
+  : CGUIKeyboard(), m_impl{std::make_unique<CDarwinEmbedKeyboardImpl>()}
+{
+}
+
+bool CDarwinEmbedKeyboard::ShowAndGetInput(char_callback_t pCallback,
+                                           const std::string& initialString,
+                                           std::string& typedString,
+                                           const std::string& heading,
+                                           bool bHiddenInput)
+{
+  // we are in xbmc main thread or python module thread.
+  @autoreleasepool
+  {
+    @synchronized([KeyboardView class])
+    {
+      // in case twice open keyboard.
+      if (m_impl->g_pKeyboard)
+        return false;
+
+      //create the keyboardview
+      KEYBOARDVIEW_CLASS* __block keyboardView;
+      dispatch_sync(dispatch_get_main_queue(), ^{
+        // assume we are only drawn on the mainscreen ever!
+        auto keyboardFrame = [g_xbmcController fullscreenSubviewFrame];
+        keyboardView = [[KEYBOARDVIEW_CLASS alloc] initWithFrame:keyboardFrame];
+      });
+      ////////////////////////////////////////////
+      if (!keyboardView)
+        return false;
+      m_impl->g_pKeyboard = keyboardView;
+
+      // inform the controller that the native keyboard is active
+      // basically as long as m_impl->g_pKeyboard exists...
+      [g_xbmcController nativeKeyboardActive:true];
+    }
+
+    m_pCharCallback = pCallback;
+
+    // init keyboard stuff
+    SetTextToKeyboard(initialString);
+    [m_impl->g_pKeyboard setHidden:bHiddenInput];
+    [m_impl->g_pKeyboard setHeading:@(heading.c_str())];
+    m_impl->g_pKeyboard.darwinEmbedKeyboard = this; // for calling back
+    bool confirmed = false;
+    if (!m_canceled)
+    {
+      [m_impl->g_pKeyboard setCancelFlag:&m_canceled];
+      // workaround for multiple keyboardviews running quickly - race condition
+      sleep(1);
+
+      [m_impl->g_pKeyboard activate]; // blocks and shows keyboard
+      // user is done - get resulted text and confirmation
+      confirmed = [m_impl->g_pKeyboard isConfirmed];
+      if (confirmed)
+        typedString = m_impl->g_pKeyboard.text.UTF8String;
+    }
+    @synchronized([KeyboardView class])
+    {
+      m_impl->g_pKeyboard = nil;
+      [g_xbmcController nativeKeyboardActive:false];
+    }
+    return confirmed;
+  }
+}
+
+void CDarwinEmbedKeyboard::Cancel()
+{
+  m_canceled = true;
+}
+
+bool CDarwinEmbedKeyboard::SetTextToKeyboard(const std::string& text,
+                                             bool closeKeyboard /* = false */)
+{
+  if (!m_impl->g_pKeyboard)
+    return false;
+  [m_impl->g_pKeyboard setKeyboardText:@(text.c_str()) closeKeyboard:closeKeyboard ? YES : NO];
+  return true;
+}
+
+//wrap our callback between objc and c++
+void CDarwinEmbedKeyboard::fireCallback(const std::string& str)
+{
+  if (m_pCharCallback)
+    m_pCharCallback(this, str);
+}
+
+void CDarwinEmbedKeyboard::invalidateCallback()
+{
+  m_pCharCallback = nullptr;
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinEmbedKeyboardView.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinEmbedKeyboardView.mm Added

@@ -0,0 +1,164 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "DarwinEmbedKeyboardView.h"
+
+#include "Application.h"
+#include "guilib/GUIKeyboardFactory.h"
+#include "threads/Event.h"
+#include "utils/log.h"
+
+#if defined(TARGET_DARWIN_IOS)
+#include "platform/darwin/ios/XBMCController.h"
+#elif defined(TARGET_DARWIN_TVOS)
+#include "platform/darwin/tvos/XBMCController.h"
+#endif
+
+static CEvent keyboardFinishedEvent;
+
+@implementation KeyboardView
+
+@synthesize confirmed = m_confirmed;
+@synthesize darwinEmbedKeyboard = m_darwinEmbedKeyboard;
+@synthesize keyboardVisible = m_keyboardVisible;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  self = [super initWithFrame:frame];
+  if (!self)
+    return nil;
+
+  m_canceled = nullptr;
+  m_deactivated = NO;
+  m_keyboardVisible = false;
+
+  auto textField = [UITextField new];
+  textField.translatesAutoresizingMaskIntoConstraints = NO;
+  textField.clearButtonMode = UITextFieldViewModeAlways;
+  textField.borderStyle = UITextBorderStyleNone;
+  textField.returnKeyType = UIReturnKeyDone;
+  textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+  textField.backgroundColor = UIColor.whiteColor;
+  textField.delegate = self;
+  [self addSubview:textField];
+  m_inputTextField = textField;
+
+  self.userInteractionEnabled = YES;
+
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(textChanged:)
+                                               name:UITextFieldTextDidChangeNotification
+                                             object:m_inputTextField];
+  return self;
+}
+
+- (void)textFieldDidEndEditing:(UITextField*)textField
+{
+  [self deactivate];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField*)textField
+{
+  m_confirmed = YES;
+  [textField resignFirstResponder];
+  return YES;
+}
+
+- (BOOL)textFieldShouldEndEditing:(UITextField*)textField
+{
+  CLog::Log(LOGDEBUG, "{}: keyboard IsShowing {}", __PRETTY_FUNCTION__, self.isKeyboardVisible);
+  return YES;
+}
+
+- (NSString*)text
+{
+  NSString __block* result;
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    result = m_inputTextField.text;
+  });
+  return result;
+}
+
+- (void)activate
+{
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    [g_xbmcController activateKeyboard:self];
+    [self layoutIfNeeded];
+    [m_inputTextField becomeFirstResponder];
+    keyboardFinishedEvent.Reset();
+  });
+
+  // we are waiting on the user finishing the keyboard
+  while (!keyboardFinishedEvent.WaitMSec(500))
+  {
+  }
+}
+
+- (void)deactivate
+{
+  CLog::Log(LOGDEBUG, "{}: keyboard IsShowing {}", __PRETTY_FUNCTION__, self.isKeyboardVisible);
+  m_deactivated = YES;
+
+  // invalidate our callback object
+  if (m_darwinEmbedKeyboard)
+  {
+    m_darwinEmbedKeyboard->invalidateCallback();
+    m_darwinEmbedKeyboard = nil;
+  }
+  // give back the control to whoever
+  [m_inputTextField resignFirstResponder];
+
+  // delay closing view until text field finishes resigning first responder
+  dispatch_async(dispatch_get_main_queue(), ^{
+    // always called in the mainloop context
+    // detach the keyboard view from our main controller
+    [g_xbmcController deactivateKeyboard:self];
+
+    // no more notification we want to receive.
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+    keyboardFinishedEvent.Set();
+  });
+}
+
+- (void)setKeyboardText:(NSString*)aText closeKeyboard:(BOOL)closeKeyboard
+{
+  CLog::Log(LOGDEBUG, "{}: {}, {}", __PRETTY_FUNCTION__, aText.UTF8String, closeKeyboard);
+
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    m_inputTextField.text = aText;
+    [self textChanged:nil];
+  });
+}
+
+- (void)setHeading:(NSString*)heading
+{
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    m_inputTextField.placeholder = heading;
+  });
+}
+
+- (void)setHidden:(BOOL)hidden
+{
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    m_inputTextField.secureTextEntry = hidden;
+  });
+}
+
+- (void)textChanged:(NSNotification*)aNotification
+{
+  if (m_darwinEmbedKeyboard)
+    m_darwinEmbedKeyboard->fireCallback(m_inputTextField.text.UTF8String);
+}
+
+- (void)setCancelFlag:(bool*)cancelFlag
+{
+  m_canceled = cancelFlag;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinEmbedNowPlayingInfoManager.mm Changed

@@ -8,8 +8,13 @@
 
 #import "DarwinEmbedNowPlayingInfoManager.h"
 
-#import "platform/darwin/ios/XBMCController.h"
+#if defined(TARGET_DARWIN_IOS)
+#include "platform/darwin/ios/XBMCController.h"
+#elif defined(TARGET_DARWIN_TVOS)
+#include "platform/darwin/tvos/XBMCController.h"
+#endif
 
+#import <AVFoundation/AVFoundation.h>
 #import <MediaPlayer/MediaPlayer.h>
 
 @implementation DarwinEmbedNowPlayingInfoManager
@@ -45,10 +50,19 @@
   {
     if (auto image = [UIImage imageWithContentsOfFile:thumb])
     {
+      auto square_size = image.size.height;
+      if (image.size.width > square_size)
+        square_size = image.size.width;
+      auto rect = CGRectMake(0, 0, square_size, square_size);
+      UIGraphicsBeginImageContextWithOptions(rect.size, YES, 0.0);
+      [image drawInRect:AVMakeRectWithAspectRatioInsideRect(image.size, rect)];
+      image = UIGraphicsGetImageFromCurrentImageContext();
+      UIGraphicsEndImageContext();
       if (auto mArt =
-          [[MPMediaItemArtwork alloc] initWithBoundsSize:image.size
-                                          requestHandler:^UIImage* _Nonnull(CGSize aSize) {
-                                            return image;}])
+              [[MPMediaItemArtwork alloc] initWithBoundsSize:rect.size
+                                              requestHandler:^UIImage* _Nonnull(CGSize aSize) {
+                                                return image;
+                                              }])
       {
         dict[MPMediaItemPropertyArtwork] = mArt;
       }
@@ -80,7 +94,9 @@
 
   self.playbackState = DARWINEMBED_PLAYBACK_PLAYING;
 
+#if defined(TARGET_DARWIN_IOS)
   [g_xbmcController disableNetworkAutoSuspend];
+#endif
 }
 
 - (void)OnSpeedChanged:(NSDictionary*)item
@@ -98,8 +114,10 @@
 {
   self.playbackState = DARWINEMBED_PLAYBACK_PAUSED;
 
+#if defined(TARGET_DARWIN_IOS)
   // schedule set network auto suspend state for save power if idle.
   [g_xbmcController rescheduleNetworkAutoSuspend];
+#endif
 }
 
 - (void)onStop:(NSDictionary*)item
@@ -108,8 +126,10 @@
 
   self.playbackState = DARWINEMBED_PLAYBACK_STOPPED;
 
+#if defined(TARGET_DARWIN_IOS)
   // delay set network auto suspend state in case we are switching playing item.
   [g_xbmcController rescheduleNetworkAutoSuspend];
+#endif
 }
 
 - (void)observeValueForKeyPath:(NSString*)keyPath

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinNSUserDefaults.h Added

@@ -0,0 +1,38 @@
+#pragma once
+/*
+ *  Copyright (C) 2015 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include <string>
+
+class CDarwinNSUserDefaults
+{
+public:
+  static bool Synchronize();
+
+  static void GetDirectoryContents(const std::string& path, std::vector<std::string>& contents);
+  static bool GetKey(const std::string& key, std::string& value);
+  static bool GetKeyData(const std::string& key, void* lpBuf, size_t& uiBufSize);
+  static bool SetKey(const std::string& key, const std::string& value, bool synchronize);
+  static bool SetKeyData(const std::string& key,
+                         const void* lpBuf,
+                         size_t uiBufSize,
+                         bool synchronize);
+  static bool DeleteKey(const std::string& key, bool synchronize);
+  static bool KeyExists(const std::string& key);
+
+  static bool IsKeyFromPath(const std::string& key);
+  static bool GetKeyFromPath(const std::string& path, std::string& value);
+  static bool GetKeyDataFromPath(const std::string& path, void* lpBuf, size_t& uiBufSize);
+  static bool SetKeyFromPath(const std::string& path, const std::string& value, bool synchronize);
+  static bool SetKeyDataFromPath(const std::string& path,
+                                 const void* lpBuf,
+                                 size_t uiBufSize,
+                                 bool synchronize);
+  static bool DeleteKeyFromPath(const std::string& path, bool synchronize);
+  static bool KeyFromPathExists(const std::string& path);
+};

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/DarwinNSUserDefaults.mm Added

@@ -0,0 +1,298 @@
+/*
+ *  Copyright (C) 2015 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "DarwinNSUserDefaults.h"
+
+#import "filesystem/SpecialProtocol.h"
+#import "utils/URIUtils.h"
+#import "utils/log.h"
+
+#import "platform/darwin/ios-common/NSData+GZIP.h"
+#import "platform/darwin/tvos/filesystem/TVOSFileUtils.h"
+
+#import <string>
+
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
+
+static bool firstLookup = true;
+
+static bool translatePathIntoKey(const std::string& path, std::string& key)
+{
+  if (firstLookup)
+  {
+    NSDictionary<NSString*, id>* dict =
+        [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+    for (NSString* aKey in dict.allKeys)
+    {
+      // do something like a log:
+      if (![aKey hasPrefix:@"/userdata/"])
+        continue;
+
+      NSData* nsdata = [defaults dataForKey:aKey];
+      size_t size = nsdata.length;
+      CLog::Log(LOGNOTICE, "nsuserdefaults: %s with size %ld", aKey.UTF8String, size);
+    }
+    firstLookup = false;
+  }
+  size_t pos;
+  std::string translated_key = CSpecialProtocol::TranslatePath(path);
+  std::string userDataDir =
+      URIUtils::AddFileToFolder(CTVOSFileUtils::GetUserHomeDirectory(), "userdata");
+  if (translated_key.find(userDataDir) != std::string::npos)
+  {
+    if ((pos = translated_key.find("/userdata")) != std::string::npos)
+    {
+      key = translated_key.erase(0, pos);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::Synchronize()
+{
+  return [[NSUserDefaults standardUserDefaults] synchronize] == YES;
+}
+
+void CDarwinNSUserDefaults::GetDirectoryContents(const std::string& path,
+                                                 std::vector<std::string>& contents)
+{
+  // tvos path adds /private/../..
+  // We need to strip this as GetUserHomeDirectory() doesnt have private in the path
+  std::string subpath = path;
+  const std::string& str_private = "/private";
+  size_t pos = subpath.find(str_private.c_str(), 0, str_private.length());
+
+  if (pos != std::string::npos)
+    subpath.erase(pos, str_private.length());
+
+  std::string userDataDir =
+      URIUtils::AddFileToFolder(CTVOSFileUtils::GetUserHomeDirectory(), "userdata");
+
+  if (subpath.find(userDataDir) == std::string::npos)
+    return;
+
+  NSDictionary<NSString*, id>* dict =
+      [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
+  for (NSString* aKey in dict.allKeys)
+  {
+    // do something like a log:
+    if (![aKey hasPrefix:@"/userdata/"])
+      continue;
+
+    std::string keypath = aKey.UTF8String;
+    std::string fullKeyPath =
+        URIUtils::AddFileToFolder(CTVOSFileUtils::GetUserHomeDirectory(), keypath);
+    std::string endingDirectory = URIUtils::GetDirectory(fullKeyPath);
+    if (subpath == endingDirectory)
+    {
+      contents.push_back(fullKeyPath);
+    }
+  }
+}
+
+bool CDarwinNSUserDefaults::GetKey(const std::string& key, std::string& value)
+{
+  if (!key.empty())
+  {
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+    NSString* nsstring_key = @(key.c_str());
+    NSString* nsstring_value = [defaults stringForKey:nsstring_key];
+    if (nsstring_value)
+    {
+      value = nsstring_value.UTF8String;
+      if (!value.empty())
+        return true;
+    }
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::GetKeyData(const std::string& key, void* lpBuf, size_t& uiBufSize)
+{
+  if (key.empty())
+  {
+    uiBufSize = 0;
+    return false;
+  }
+
+  NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+  NSString* nsstring_key = @(key.c_str());
+  NSData* nsdata = [defaults dataForKey:nsstring_key];
+  if (!nsdata)
+  {
+    uiBufSize = 0;
+    return false;
+  }
+
+  NSData* decompressed = nsdata;
+  if ([nsdata isGzippedData])
+    decompressed = [nsdata gunzippedData];
+
+  uiBufSize = decompressed.length;
+
+  // call was to get size of file
+  if (lpBuf == nullptr)
+    return true;
+
+  memcpy(lpBuf, decompressed.bytes, decompressed.length);
+  return true;
+}
+
+bool CDarwinNSUserDefaults::SetKey(const std::string& key,
+                                   const std::string& value,
+                                   bool synchronize)
+{
+  if (!key.empty() && !value.empty())
+  {
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+
+    NSString* nsstring_key = @(key.c_str());
+    NSString* nsstring_value = @(value.c_str());
+
+    [defaults setObject:nsstring_value forKey:nsstring_key];
+    if (synchronize)
+      return [defaults synchronize] == YES;
+    else
+      return true;
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::SetKeyData(const std::string& key,
+                                       const void* lpBuf,
+                                       size_t uiBufSize,
+                                       bool synchronize)
+{
+  if (!key.empty() && lpBuf != nullptr && uiBufSize > 0)
+  {
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+    NSString* nsstring_key = @(key.c_str());
+    NSData* nsdata_value = [NSData dataWithBytes:lpBuf length:uiBufSize];
+
+    NSData* compressed = [nsdata_value gzippedData];
+    CLog::Log(LOGDEBUG, "NSUSerDefaults: compressed %s from %ld to %ld", key.c_str(), uiBufSize,
+              compressed.length);
+
+    [defaults setObject:compressed forKey:nsstring_key];
+    if (synchronize)
+      return [defaults synchronize] == YES;
+    else
+      return true;
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::DeleteKey(const std::string& key, bool synchronize)
+{
+  if (!key.empty())
+  {
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+    NSString* nsstring_key = @(key.c_str());
+    [defaults removeObjectForKey:nsstring_key];
+    if (synchronize)
+      return [defaults synchronize] == YES;
+    else
+      return true;
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::KeyExists(const std::string& key)
+{
+  if (!key.empty())
+  {
+    NSString* nsstring_key = @(key.c_str());
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:nsstring_key])
+      return true;
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::IsKeyFromPath(const std::string& path)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
+  {
+    CLog::Log(LOGDEBUG, "found key %s", translated_key.c_str());
+    return true;
+  }
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::GetKeyFromPath(const std::string& path, std::string& value)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
+    return CDarwinNSUserDefaults::GetKey(translated_key, value);
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::GetKeyDataFromPath(const std::string& path,
+                                               void* lpBuf,
+                                               size_t& uiBufSize)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
+    return CDarwinNSUserDefaults::GetKeyData(translated_key, lpBuf, uiBufSize);
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::SetKeyFromPath(const std::string& path,
+                                           const std::string& value,
+                                           bool synchronize)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty() && !value.empty())
+    return CDarwinNSUserDefaults::SetKey(translated_key, value, synchronize);
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::SetKeyDataFromPath(const std::string& path,
+                                               const void* lpBuf,
+                                               size_t uiBufSize,
+                                               bool synchronize)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
+    return CDarwinNSUserDefaults::SetKeyData(translated_key, lpBuf, uiBufSize, synchronize);
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::DeleteKeyFromPath(const std::string& path, bool synchronize)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
+    return CDarwinNSUserDefaults::DeleteKey(translated_key, synchronize);
+
+  return false;
+}
+
+bool CDarwinNSUserDefaults::KeyFromPathExists(const std::string& path)
+{
+  std::string translated_key;
+  if (translatePathIntoKey(path, translated_key) && !translated_key.empty())
+    return CDarwinNSUserDefaults::KeyExists(translated_key);
+
+  return false;
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/IOSKeyboard.h Deleted

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/IOSKeyboard.mm Deleted

@@ -1,100 +0,0 @@
-/*
- *  Copyright (C) 2012-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "platform/darwin/ios-common/IOSKeyboard.h"
-
-#include "platform/darwin/NSLogDebugHelpers.h"
-#include "platform/darwin/ios-common/IOSKeyboardView.h"
-#include "platform/darwin/ios/XBMCController.h"
-
-class CIOSKeyboardImpl
-{
-public:
-  KeyboardView* g_pIosKeyboard = nil;
-};
-
-CIOSKeyboard::CIOSKeyboard()
-  : CGUIKeyboard()
-  , m_pCharCallback{nullptr}
-  , m_bCanceled{false}
-  , m_impl{new CIOSKeyboardImpl}
-{
-}
-
-bool CIOSKeyboard::ShowAndGetInput(char_callback_t pCallback, const std::string &initialString, std::string &typedString, const std::string &heading, bool bHiddenInput)
-{
-  // we are in xbmc main thread or python module thread.
-  @autoreleasepool
-  {
-    @synchronized([KeyboardView class])
-    {
-      // in case twice open keyboard.
-      if (m_impl->g_pIosKeyboard)
-        return false;
-
-      // assume we are only drawn on the mainscreen ever!
-      auto keyboardFrame = [g_xbmcController fullscreenSubviewFrame];
-
-      //create the keyboardview
-      m_impl->g_pIosKeyboard = [[KeyboardView alloc] initWithFrame:keyboardFrame];
-      if (!m_impl->g_pIosKeyboard)
-        return false;
-
-      // inform the controller that the native keyboard is active
-      // basically as long as m_impl->g_pIosKeyboard exists...
-      [g_xbmcController nativeKeyboardActive:true];
-    }
-
-    m_pCharCallback = pCallback;
-
-    // init keyboard stuff
-    SetTextToKeyboard(initialString);
-    [m_impl->g_pIosKeyboard setHidden:bHiddenInput];
-    [m_impl->g_pIosKeyboard setHeading:[NSString stringWithUTF8String:heading.c_str()]];
-    [m_impl->g_pIosKeyboard registerKeyboard:this]; // for calling back
-    bool confirmed = false;
-    if (!m_bCanceled)
-    {
-      [m_impl->g_pIosKeyboard setCancelFlag:&m_bCanceled];
-      [m_impl->g_pIosKeyboard activate]; // blocks and shows keyboard
-      // user is done - get resulted text and confirmation
-      confirmed = m_impl->g_pIosKeyboard.isConfirmed;
-      if (confirmed)
-        typedString = [m_impl->g_pIosKeyboard.text UTF8String];
-    }
-    @synchronized([KeyboardView class])
-    {
-      m_impl->g_pIosKeyboard = nil;
-      [g_xbmcController nativeKeyboardActive:false];
-    }
-    return confirmed;
-  }
-}
-
-void CIOSKeyboard::Cancel()
-{
-  m_bCanceled = true;
-}
-
-bool CIOSKeyboard::SetTextToKeyboard(const std::string &text, bool closeKeyboard /* = false */)
-{
-  if (!m_impl->g_pIosKeyboard)
-    return false;
-  [m_impl->g_pIosKeyboard setKeyboardText:[NSString stringWithUTF8String:text.c_str()]
-                            closeKeyboard:closeKeyboard ? YES : NO];
-  return true;
-}
-
-//wrap our callback between objc and c++
-void CIOSKeyboard::fireCallback(const std::string &str)
-{
-  if(m_pCharCallback)
-  {
-    m_pCharCallback(this, str);
-  }
-}

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/IOSKeyboardView.h Deleted

@@ -1,40 +0,0 @@
-/*
- *  Copyright (C) 2012-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "platform/darwin/ios-common/IOSKeyboard.h"
-
-#import <UIKit/UIKit.h>
-
-@interface KeyboardView : UIView <UITextFieldDelegate>
-{
-  NSMutableString *text;
-  BOOL _confirmed;
-  CIOSKeyboard *_iosKeyboard;
-  bool *_canceled;
-  BOOL _deactivated;
-  UITextField *_textField;
-  UITextField *_heading;
-  int _keyboardIsShowing; // 0: not, 1: will show, 2: showing
-  CGRect _kbRect;
-}
-
-@property(nonatomic, strong) NSMutableString* text;
-@property (getter = isConfirmed) BOOL _confirmed;
-@property (assign, setter = registerKeyboard:) CIOSKeyboard *_iosKeyboard;
-@property CGRect _frame;
-
-- (void) setHeading:(NSString *)heading;
-- (void) setHidden:(BOOL)hidden;
-- (void) activate;
-- (void) deactivate;
-- (void) setKeyboardText:(NSString*)aText closeKeyboard:(BOOL)closeKeyboard;
-- (void) textChanged:(NSNotification*)aNotification;
-- (void) setCancelFlag:(bool *)cancelFlag;
-- (void) doDeactivate:(NSDictionary *)dict;
-- (id)initWithFrameInternal;
-@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/IOSKeyboardView.mm Deleted

@@ -1,351 +0,0 @@
-/*
- *  Copyright (C) 2012-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#import "platform/darwin/ios-common/IOSKeyboardView.h"
-
-#include "Application.h"
-#include "guilib/GUIKeyboardFactory.h"
-#include "threads/Event.h"
-
-#import "platform/darwin/NSLogDebugHelpers.h"
-#import "platform/darwin/ios-common/IOSKeyboard.h"
-#import "platform/darwin/ios/IOSScreenManager.h"
-#import "platform/darwin/ios/XBMCController.h"
-
-static CEvent keyboardFinishedEvent;
-
-#define INPUT_BOX_HEIGHT 30
-#define SPACE_BETWEEN_INPUT_AND_KEYBOARD 0
-
-@implementation KeyboardView
-@synthesize text;
-@synthesize _confirmed;
-@synthesize _iosKeyboard;
-@synthesize _frame;
-
-- (id)initWithFrame:(CGRect)frame
-{
-  _frame = frame;
-  if([NSThread currentThread] != [NSThread mainThread])
-  {
-    [self performSelectorOnMainThread:@selector(initWithFrameInternal) withObject:nil  waitUntilDone:YES];
-  }
-  else
-  {
-    self = [self initWithFrameInternal];
-  }
-  return self;
-}
-
-- (id)initWithFrameInternal
-{
-  CGRect frame = _frame;
-  self = [super initWithFrame:frame];
-  if (self)
-  {
-    _iosKeyboard = nil;
-    _keyboardIsShowing = 0;
-    _confirmed = NO;
-    _canceled = NULL;
-    _deactivated = NO;
-
-    self.text = [NSMutableString stringWithString:@""];
-
-   // default input box position above the half screen.
-    CGRect textFieldFrame = CGRectMake(frame.size.width/2,
-                                       frame.size.height/2-INPUT_BOX_HEIGHT-SPACE_BETWEEN_INPUT_AND_KEYBOARD,
-                                       frame.size.width/2,
-                                       INPUT_BOX_HEIGHT);
-    _textField = [[UITextField alloc] initWithFrame:textFieldFrame];
-    _textField.clearButtonMode = UITextFieldViewModeAlways;
-    // UITextBorderStyleRoundedRect; - with round rect we can't control backgroundcolor
-    _textField.borderStyle = UITextBorderStyleNone;
-    _textField.returnKeyType = UIReturnKeyDone;
-    _textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    _textField.backgroundColor = [UIColor whiteColor];
-    _textField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
-    _textField.delegate = self;
-
-    CGRect labelFrame = textFieldFrame;
-    labelFrame.origin.x = 0;
-    _heading = [[UITextField alloc] initWithFrame:labelFrame];
-    _heading.borderStyle = UITextBorderStyleNone;
-    _heading.backgroundColor = [UIColor whiteColor];
-    _heading.adjustsFontSizeToFitWidth = YES;
-    _heading.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
-    _heading.enabled = NO;
-
-    [self addSubview:_heading];
-    [self addSubview:_textField];
-
-    self.userInteractionEnabled = YES;
-
-    [self setAlpha:0.9];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(textChanged:)
-                                                 name:UITextFieldTextDidChangeNotification
-                                               object:_textField];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(keyboardDidHide:)
-                                                 name:UIKeyboardDidHideNotification
-                                               object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(keyboardDidChangeFrame:)
-                                                 name:UIKeyboardDidChangeFrameNotification
-                                               object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(keyboardWillShow:)
-                                                 name:UIKeyboardWillShowNotification
-                                               object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(keyboardDidShow:)
-                                                 name:UIKeyboardDidShowNotification
-                                               object:nil];
-  }
-  return self;
-}
-
-- (void)layoutSubviews
-{
-  CGFloat headingW = 0;
-  if (_heading.text and _heading.text.length > 0)
-  {
-    CGSize headingSize = [_heading.text sizeWithAttributes: @{NSFontAttributeName: [UIFont systemFontOfSize:[UIFont systemFontSize]]}];
-    headingW = MIN(self.bounds.size.width/2, headingSize.width+30);
-  }
-
-  CGFloat y = _kbRect.origin.y - INPUT_BOX_HEIGHT - SPACE_BETWEEN_INPUT_AND_KEYBOARD;
-
-  _heading.frame = CGRectMake(0, y, headingW, INPUT_BOX_HEIGHT);
-  _textField.frame = CGRectMake(headingW, y, self.bounds.size.width-headingW, INPUT_BOX_HEIGHT);
-}
-
--(void)keyboardWillShow:(NSNotification *) notification{
-  NSDictionary* info = [notification userInfo];
-  CGRect kbRect = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
-  LOG(@"keyboardWillShow: keyboard frame: %@", NSStringFromCGRect(kbRect));
-  _kbRect = kbRect;
-  [self setNeedsLayout];
-  _keyboardIsShowing = 1;
-}
-
--(void)keyboardDidShow:(NSNotification *) notification{
-  LOG(@"keyboardDidShow: deactivated: %d", _deactivated);
-  _keyboardIsShowing = 2;
-  if (_deactivated)
-    [self doDeactivate:nil];
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  PRINT_SIGNATURE();
-  [_textField resignFirstResponder];
-}
-
-- (BOOL)textFieldShouldEndEditing:(UITextField *)textField
-{
-  LOG(@"%s: keyboard IsShowing %d", __PRETTY_FUNCTION__, _keyboardIsShowing);
-  // Do not break the keyboard show up process, else we will lost
-  // keyboard did hide notification.
-  return _keyboardIsShowing != 1;
-}
-
-- (void)textFieldDidEndEditing:(UITextField *)textField
-{
-  PRINT_SIGNATURE();
-  [self deactivate];
-}
-
--(BOOL)textFieldShouldReturn:(UITextField *)textField{
-  PRINT_SIGNATURE();
-  _confirmed = YES;
-  [_textField resignFirstResponder];
-  return YES;
-}
-
-- (void)keyboardDidChangeFrame:(id)sender
-{
-}
-
-- (void)keyboardDidHide:(id)sender
-{
-  PRINT_SIGNATURE();
-
-  _keyboardIsShowing = 0;
-
-  if (_textField.editing)
-  {
-    LOG(@"kb hide when editing, it could be a language switch");
-    return;
-  }
-
-  [self deactivate];
-}
-
-- (void) doActivate:(NSDictionary *)dict
-{
-  PRINT_SIGNATURE();
-  [g_xbmcController activateKeyboard:self];
-  [_textField becomeFirstResponder];
-  [self setNeedsLayout];
-  keyboardFinishedEvent.Reset();
-}
-
-- (void)activate
-{
-  PRINT_SIGNATURE();
-  if([NSThread currentThread] != [NSThread mainThread])
-  {
-    [self performSelectorOnMainThread:@selector(doActivate:) withObject:nil  waitUntilDone:YES];
-  }
-  else
-  {
-    // this would be fatal! We never should be called from the ios mainthread
-    return;
-  }
-
-  // we are waiting on the user finishing the keyboard
-  while(!keyboardFinishedEvent.WaitMSec(500))
-  {
-    if (NULL != _canceled && *_canceled)
-    {
-      [self deactivate];
-      _canceled = NULL;
-    }
-  }
-}
-
-- (void) doDeactivate:(NSDictionary *)dict
-{
-  LOG(@"%s: keyboard IsShowing %d", __PRETTY_FUNCTION__, _keyboardIsShowing);
-  _deactivated = YES;
-
-  // Do not break keyboard show up process, if so there's a bug of ios4 will not
-  // notify us keyboard hide.
-  if (_keyboardIsShowing == 1)
-    return;
-
-  // invalidate our callback object
-  if(_iosKeyboard)
-  {
-    _iosKeyboard->invalidateCallback();
-    _iosKeyboard = nil;
-  }
-  // give back the control to whoever
-  [_textField resignFirstResponder];
-
-  // delay closing view until text field finishes resigning first responder
-  dispatch_async(dispatch_get_main_queue(), ^{
-    // always called in the mainloop context
-    // detach the keyboard view from our main controller
-    [g_xbmcController deactivateKeyboard:self];
-
-    // no more notification we want to receive.
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-    keyboardFinishedEvent.Set();
-  });
-}
-
-- (void) deactivate
-{
-  PRINT_SIGNATURE();
-  if([NSThread currentThread] != [NSThread mainThread])
-  {
-    [self performSelectorOnMainThread:@selector(doDeactivate:) withObject:nil  waitUntilDone:YES];
-  }
-  else
-  {
-    [self doDeactivate:nil];
-  }
-}
-
-- (void) setKeyboardText:(NSString*)aText closeKeyboard:(BOOL)closeKeyboard
-{
-  LOG(@"%s: %@, %d", __PRETTY_FUNCTION__, aText, closeKeyboard);
-  if([NSThread currentThread] != [NSThread mainThread])
-  {
-    [self performSelectorOnMainThread:@selector(setDefault:) withObject:aText  waitUntilDone:YES];
-  }
-  else
-  {
-    [self setDefault:aText];
-  }
-  if (closeKeyboard)
-  {
-    _confirmed = YES;
-    [self deactivate];
-  }
-}
-
-- (void) setHeading:(NSString *)heading
-{
-  if([NSThread currentThread] != [NSThread mainThread])
-  {
-    [self performSelectorOnMainThread:@selector(setHeadingInternal:) withObject:heading  waitUntilDone:YES];
-  }
-  else
-  {
-    [self setHeadingInternal:heading];
-  }
-}
-
-- (void) setHeadingInternal:(NSString *)heading
-{
-  if (heading && heading.length > 0) {
-    _heading.text = [NSString stringWithFormat:@" %@:", heading];
-  }
-  else {
-    _heading.text = nil;
-  }
-}
-
-- (void) setDefault:(NSString *)defaultText
-{
-  [_textField setText:defaultText];
-  [self textChanged:nil];
-}
-
-- (void) setHiddenInternal:(NSNumber *)hidden
-{
-  BOOL hiddenBool = [hidden boolValue];
-  [_textField setSecureTextEntry:hiddenBool];
-}
-
-- (void) setHidden:(BOOL)hidden
-{
-  NSNumber *passedValue = [NSNumber numberWithBool:hidden];
-
-  if([NSThread currentThread] != [NSThread mainThread])
-  {
-    [self performSelectorOnMainThread:@selector(setHiddenInternal:) withObject:passedValue  waitUntilDone:YES];
-  }
-  else
-  {
-    [self setHiddenInternal:passedValue];
-  }
-}
-
-- (void) textChanged:(NSNotification*)aNotification
-{
-  if (![self.text isEqualToString:_textField.text])
-  {
-    [self.text setString:_textField.text];
-    if (_iosKeyboard)
-    {
-      _iosKeyboard->fireCallback([self.text UTF8String]);
-    }
-  }
-}
-
-- (void) setCancelFlag:(bool *)cancelFlag
-{
-  _canceled = cancelFlag;
-}
-
-@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/NSData+GZIP.h Added

@@ -0,0 +1,43 @@
+//
+//  GZIP.h
+//
+//  Version 1.2.3
+//
+//  Created by Nick Lockwood on 03/06/2012.
+//  Copyright (C) 2012 Charcoal Design
+//
+//  Distributed under the permissive MIT license
+//  Get the latest version from here:
+//
+//  https://github.com/nicklockwood/GZIP
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface NSData (GZIP)
+
+- (nullable NSData *)gzippedDataWithCompressionLevel:(float)level;
+- (nullable NSData *)gzippedData;
+- (nullable NSData *)gunzippedData;
+- (BOOL)isGzippedData;
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/NSData+GZIP.m Added

@@ -0,0 +1,135 @@
+//
+//  GZIP.m
+//
+//  Version 1.2.3
+//
+//  Created by Nick Lockwood on 03/06/2012.
+//  Copyright (C) 2012 Charcoal Design
+//
+//  Distributed under the permissive MIT license
+//  Get the latest version from here:
+//
+//  https://github.com/nicklockwood/GZIP
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#import "NSData+GZIP.h"
+#import <zlib.h>
+
+
+#pragma clang diagnostic ignored "-Wcast-qual"
+
+
+@implementation NSData (GZIP)
+
+- (NSData *)gzippedDataWithCompressionLevel:(float)level
+{
+    if (self.length == 0 || [self isGzippedData])
+    {
+        return self;
+    }
+
+    z_stream stream;
+    stream.zalloc = Z_NULL;
+    stream.zfree = Z_NULL;
+    stream.opaque = Z_NULL;
+    stream.avail_in = (uint)self.length;
+    stream.next_in = (Bytef *)(void *)self.bytes;
+    stream.total_out = 0;
+    stream.avail_out = 0;
+
+    static const NSUInteger ChunkSize = 16384;
+
+    NSMutableData *output = nil;
+    int compression = (level < 0.0f)? Z_DEFAULT_COMPRESSION: (int)(roundf(level * 9));
+    if (deflateInit2(&stream, compression, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY) == Z_OK)
+    {
+        output = [NSMutableData dataWithLength:ChunkSize];
+        while (stream.avail_out == 0)
+        {
+            if (stream.total_out >= output.length)
+            {
+                output.length += ChunkSize;
+            }
+            stream.next_out = (uint8_t *)output.mutableBytes + stream.total_out;
+            stream.avail_out = (uInt)(output.length - stream.total_out);
+            deflate(&stream, Z_FINISH);
+        }
+        deflateEnd(&stream);
+        output.length = stream.total_out;
+    }
+
+    return output;
+}
+
+- (NSData *)gzippedData
+{
+    return [self gzippedDataWithCompressionLevel:-1.0f];
+}
+
+- (NSData *)gunzippedData
+{
+    if (self.length == 0 || ![self isGzippedData])
+    {
+        return self;
+    }
+
+    z_stream stream;
+    stream.zalloc = Z_NULL;
+    stream.zfree = Z_NULL;
+    stream.avail_in = (uint)self.length;
+    stream.next_in = (Bytef *)self.bytes;
+    stream.total_out = 0;
+    stream.avail_out = 0;
+
+    NSMutableData *output = nil;
+    if (inflateInit2(&stream, 47) == Z_OK)
+    {
+        int status = Z_OK;
+        output = [NSMutableData dataWithCapacity:self.length * 2];
+        while (status == Z_OK)
+        {
+            if (stream.total_out >= output.length)
+            {
+                output.length += self.length / 2;
+            }
+            stream.next_out = (uint8_t *)output.mutableBytes + stream.total_out;
+            stream.avail_out = (uInt)(output.length - stream.total_out);
+            status = inflate (&stream, Z_SYNC_FLUSH);
+        }
+        if (inflateEnd(&stream) == Z_OK)
+        {
+            if (status == Z_STREAM_END)
+            {
+                output.length = stream.total_out;
+            }
+        }
+    }
+
+    return output;
+}
+
+- (BOOL)isGzippedData
+{
+    const UInt8 *bytes = (const UInt8 *)self.bytes;
+    return (self.length >= 2 && bytes[0] == 0x1f && bytes[1] == 0x8b);
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/CPUInfoIos.cpp Deleted

@@ -1,75 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "CPUInfoIos.h"
-
-#include "utils/Temperature.h"
-
-#include "platform/posix/PosixResourceCounter.h"
-
-#include <array>
-#include <string>
-
-#include <mach-o/arch.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-
-std::shared_ptr<CCPUInfo> CCPUInfo::GetCPUInfo()
-{
-  return std::make_shared<CCPUInfoIos>();
-}
-
-CCPUInfoIos::CCPUInfoIos() : m_resourceCounter(new CPosixResourceCounter())
-{
-  int count = 0;
-  size_t countLength = sizeof(count);
-  if (sysctlbyname("hw.activecpu", &count, &countLength, nullptr, 0) == 0)
-    m_cpuCount = count;
-  else
-    m_cpuCount = 1;
-
-  std::array<char, 512> buffer;
-  size_t length = buffer.size();
-  if (sysctlbyname("machdep.cpu.brand_string", buffer.data(), &length, nullptr, 0) == 0)
-    m_cpuModel = buffer.data();
-
-  buffer = {};
-  if (sysctlbyname("machdep.cpu.vendor", buffer.data(), &length, nullptr, 0) == 0)
-    m_cpuVendor = buffer.data();
-
-  for (int core = 0; core < m_cpuCount; core++)
-  {
-    CoreInfo coreInfo;
-    coreInfo.m_id = core;
-    m_cores.emplace_back(coreInfo);
-  }
-
-  m_cpuFeatures |= CPU_FEATURE_NEON;
-}
-
-int CCPUInfoIos::GetUsedPercentage()
-{
-  if (!m_nextUsedReadTime.IsTimePast())
-    return m_lastUsedPercentage;
-
-  m_lastUsedPercentage = m_resourceCounter->GetCPUUsage();
-  m_nextUsedReadTime.Set(MINIMUM_TIME_BETWEEN_READS);
-
-  return m_lastUsedPercentage;
-}
-
-float CCPUInfoIos::GetCPUFrequency()
-{
-  // Get CPU frequency, scaled to MHz.
-  long long hz = 0;
-  size_t len = sizeof(hz);
-  if (sysctlbyname("hw.cpufrequency", &hz, &len, nullptr, 0) < 0)
-    return 0.f;
-
-  return hz / 1000000.0;
-}

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/CPUInfoIos.h Deleted

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSEAGLView.mm Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSKeyboardView.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSKeyboardView.mm Added

@@ -0,0 +1,134 @@
+/*
+ *  Copyright (C) 2019- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "IOSKeyboardView.h"
+
+#import "utils/log.h"
+
+static const CGFloat INPUT_BOX_HEIGHT = 30;
+
+@interface IOSKeyboardView ()
+@property(nonatomic, weak) UIView* textFieldContainer;
+@property(nonatomic, weak) NSLayoutConstraint* containerBottomConstraint;
+@end
+
+@implementation IOSKeyboardView
+
+@synthesize textFieldContainer = m_textFieldContainer;
+@synthesize containerBottomConstraint = m_containerBottomConstraint;
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  self = [super initWithFrame:frame];
+  if (!self)
+    return nil;
+
+  self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.1];
+
+  auto notificationCenter = NSNotificationCenter.defaultCenter;
+  [notificationCenter addObserver:self
+                         selector:@selector(keyboardDidHide:)
+                             name:UIKeyboardDidHideNotification
+                           object:nil];
+  [notificationCenter addObserver:self
+                         selector:@selector(keyboardDidChangeFrame:)
+                             name:UIKeyboardDidChangeFrameNotification
+                           object:nil];
+  [notificationCenter addObserver:self
+                         selector:@selector(keyboardWillShow:)
+                             name:UIKeyboardWillShowNotification
+                           object:nil];
+  [notificationCenter addObserver:self
+                         selector:@selector(keyboardDidShow:)
+                             name:UIKeyboardDidShowNotification
+                           object:nil];
+
+  [self addGestureRecognizer:[[UITapGestureRecognizer alloc]
+                                 initWithTarget:m_inputTextField
+                                         action:@selector(resignFirstResponder)]];
+
+  auto textFieldContainer = [UIView new];
+  textFieldContainer.translatesAutoresizingMaskIntoConstraints = NO;
+  textFieldContainer.backgroundColor = UIColor.whiteColor;
+  [textFieldContainer addSubview:m_inputTextField];
+  [self addSubview:textFieldContainer];
+  m_textFieldContainer = textFieldContainer;
+
+  auto bottomConstraint = [textFieldContainer.bottomAnchor constraintEqualToAnchor:self.topAnchor];
+  m_containerBottomConstraint = bottomConstraint;
+
+  [NSLayoutConstraint activateConstraints:@[
+    bottomConstraint,
+    [textFieldContainer.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+    [textFieldContainer.trailingAnchor constraintEqualToAnchor:self.trailingAnchor],
+    [textFieldContainer.heightAnchor constraintEqualToConstant:INPUT_BOX_HEIGHT],
+
+    [m_inputTextField.widthAnchor constraintEqualToAnchor:textFieldContainer.widthAnchor
+                                               multiplier:0.5],
+    [m_inputTextField.centerXAnchor constraintEqualToAnchor:textFieldContainer.centerXAnchor],
+    [m_inputTextField.topAnchor constraintEqualToAnchor:textFieldContainer.topAnchor],
+    [m_inputTextField.bottomAnchor constraintEqualToAnchor:textFieldContainer.bottomAnchor],
+  ]];
+
+  return self;
+}
+
+- (void)keyboardWillShow:(NSNotification*)notification
+{
+  CLog::Log(LOGDEBUG, "{} {}", __PRETTY_FUNCTION__, notification.userInfo.description.UTF8String);
+  if (!self.isKeyboardVisible)
+    self.textFieldContainer.hidden = YES;
+}
+
+- (void)keyboardDidShow:(NSNotification*)notification
+{
+  CLog::Log(LOGDEBUG, "{} deactivated: {}, {}", __PRETTY_FUNCTION__, m_deactivated,
+            notification.userInfo.description.UTF8String);
+  self.keyboardVisible = true;
+  self.textFieldContainer.hidden = NO;
+
+  if (m_deactivated)
+    [self deactivate];
+}
+
+- (void)keyboardDidChangeFrame:(NSNotification*)notification
+{
+  auto keyboardFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+  // although converting isn't really necessary in our case, as the holder view occupies
+  // the whole screen, technically it's more correct
+  auto convertedFrame = [self convertRect:keyboardFrame
+                      fromCoordinateSpace:UIScreen.mainScreen.coordinateSpace];
+  self.containerBottomConstraint.constant = CGRectGetMinY(convertedFrame);
+  [self layoutIfNeeded];
+}
+
+- (void)keyboardDidHide:(id)sender
+{
+  if (m_inputTextField.editing)
+  {
+    CLog::Log(LOGDEBUG, "kb hide when editing, it could be a language switch");
+    return;
+  }
+
+  self.keyboardVisible = false;
+  [self deactivate];
+}
+
+- (void)setKeyboardText:(NSString*)aText closeKeyboard:(BOOL)closeKeyboard
+{
+
+  [super setKeyboardText:aText closeKeyboard:closeKeyboard];
+
+  if (closeKeyboard)
+  {
+    self.confirmed = YES;
+    [self deactivate];
+  }
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/network/ZeroconfBrowserDarwin.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/network/ZeroconfBrowserDarwin.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/network/ZeroconfDarwin.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/network/ZeroconfDarwin.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/SDLMain.mm Changed

@@ -85,7 +85,7 @@
   [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
 
   menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
-  [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
+  [menuItem setKeyEquivalentModifierMask:(NSEventModifierFlagOption|NSEventModifierFlagCommand)];
 
   [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
 
@@ -115,6 +115,8 @@
 
   // "Full/Windowed Toggle" item
   menuItem = [[NSMenuItem alloc] initWithTitle:@"Full/Windowed Toggle" action:@selector(fullScreenToggle:) keyEquivalent:@"f"];
+  // this is just for display purposes, key handling is in CWinEventsSDL::ProcessOSXShortcuts()
+  menuItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagControl;
   [windowMenu addItem:menuItem];
 
   // "Full/Windowed Toggle" item
@@ -191,8 +193,8 @@
 - (void)titlebarToggle:(id)sender
 {
   NSWindow* window = [[[NSOpenGLContext currentContext] view] window];
-  [window setStyleMask: [window styleMask] ^ NSTitledWindowMask ];
-  BOOL isSet = [window styleMask] & NSTitledWindowMask;
+  [window setStyleMask: [window styleMask] ^ NSWindowStyleMaskTitled ];
+  BOOL isSet = [window styleMask] & NSWindowStyleMaskTitled;
   [window setMovableByWindowBackground: !isSet];
   [sender setState: isSet];
 
@@ -331,7 +333,7 @@
 
   //post a NOP event, so the run loop actually stops
   //see http://www.cocoabuilder.com/archive/cocoa/219842-nsapp-stop.html
-  NSEvent* event = [NSEvent otherEventWithType: NSApplicationDefined
+  NSEvent* event = [NSEvent otherEventWithType: NSEventTypeApplicationDefined
     location: NSMakePoint(0,0)
     modifierFlags: 0
     timestamp: 0.0

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/XBMCHelper.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/XBMCHelper.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/network Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/network/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/network/NetworkOsx.cpp Added

@@ -0,0 +1,234 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "NetworkOsx.h"
+
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+
+#include <errno.h>
+
+#include <arpa/inet.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <netinet/if_ether.h>
+#include <sys/sockio.h>
+
+#define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
+
+CNetworkInterfaceOsx::CNetworkInterfaceOsx(CNetworkPosix* network,
+                                           std::string interfaceName,
+                                           char interfaceMacAddrRaw[6])
+  : CNetworkInterfacePosix(network, interfaceName, interfaceMacAddrRaw)
+{
+}
+
+std::string CNetworkInterfaceOsx::GetCurrentDefaultGateway() const
+{
+  std::string result;
+
+  FILE* pipe = popen("echo \"show State:/Network/Global/IPv4\" | scutil | grep Router", "r");
+  usleep(100000);
+  if (pipe)
+  {
+    std::string tmpStr;
+    char buffer[256] = {'\0'};
+    if (fread(buffer, sizeof(char), sizeof(buffer), pipe) > 0 && !ferror(pipe))
+    {
+      tmpStr = buffer;
+      if (tmpStr.length() >= 11)
+        result = tmpStr.substr(11);
+    }
+    pclose(pipe);
+  }
+  if (result.empty())
+    CLog::Log(LOGWARNING, "Unable to determine gateway");
+
+  return result;
+}
+
+bool CNetworkInterfaceOsx::GetHostMacAddress(unsigned long host_ip, std::string& mac) const
+{
+  bool ret = false;
+  size_t needed;
+  char *buf, *next;
+  struct rt_msghdr* rtm;
+  struct sockaddr_inarp* sin;
+  struct sockaddr_dl* sdl;
+  int mib[6];
+
+  mac = "";
+
+  mib[0] = CTL_NET;
+  mib[1] = PF_ROUTE;
+  mib[2] = 0;
+  mib[3] = AF_INET;
+  mib[4] = NET_RT_FLAGS;
+  mib[5] = RTF_LLINFO;
+
+  if (sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == 0)
+  {
+    buf = (char*)malloc(needed);
+    if (buf)
+    {
+      if (sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == 0)
+      {
+        for (next = buf; next < buf + needed; next += rtm->rtm_msglen)
+        {
+
+          rtm = (struct rt_msghdr*)next;
+          sin = (struct sockaddr_inarp*)(rtm + 1);
+          sdl = (struct sockaddr_dl*)(sin + 1);
+
+          if (host_ip != sin->sin_addr.s_addr || sdl->sdl_alen < 6)
+            continue;
+
+          u_char* cp = (u_char*)LLADDR(sdl);
+
+          mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X", cp[0], cp[1], cp[2], cp[3],
+                                    cp[4], cp[5]);
+          ret = true;
+          break;
+        }
+      }
+      free(buf);
+    }
+  }
+  return ret;
+}
+
+CNetworkOsx::CNetworkOsx() : CNetworkPosix()
+{
+  queryInterfaceList();
+}
+
+
+void CNetworkOsx::GetMacAddress(const std::string& interfaceName, char rawMac[6])
+{
+  memset(rawMac, 0, 6);
+
+#if !defined(IFT_ETHER)
+#define IFT_ETHER 0x6 /* Ethernet CSMACD */
+#endif
+  const struct sockaddr_dl* dlAddr = NULL;
+  const uint8_t* base = NULL;
+  // Query the list of interfaces.
+  struct ifaddrs* list;
+  struct ifaddrs* interface;
+
+  if (getifaddrs(&list) < 0)
+  {
+    return;
+  }
+
+  for (interface = list; interface != NULL; interface = interface->ifa_next)
+  {
+    if (interfaceName == interface->ifa_name)
+    {
+      if ((interface->ifa_addr->sa_family == AF_LINK) &&
+          (((const struct sockaddr_dl*)interface->ifa_addr)->sdl_type == IFT_ETHER))
+      {
+        dlAddr = (const struct sockaddr_dl*)interface->ifa_addr;
+        base = (const uint8_t*)&dlAddr->sdl_data[dlAddr->sdl_nlen];
+
+        if (dlAddr->sdl_alen > 5)
+        {
+          memcpy(rawMac, base, 6);
+        }
+      }
+      break;
+    }
+  }
+
+  freeifaddrs(list);
+}
+
+void CNetworkOsx::queryInterfaceList()
+{
+  char macAddrRaw[6];
+  m_interfaces.clear();
+
+  // Query the list of interfaces.
+  struct ifaddrs* list;
+  if (getifaddrs(&list) < 0)
+    return;
+
+  struct ifaddrs* cur;
+  for (cur = list; cur != NULL; cur = cur->ifa_next)
+  {
+    if (cur->ifa_addr->sa_family != AF_INET)
+      continue;
+
+    GetMacAddress(cur->ifa_name, macAddrRaw);
+
+    // only add interfaces with non-zero mac addresses
+    if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] ||
+        macAddrRaw[5])
+      // Add the interface.
+      m_interfaces.push_back(new CNetworkInterfaceOsx(this, cur->ifa_name, macAddrRaw));
+  }
+
+  freeifaddrs(list);
+}
+
+std::vector<std::string> CNetworkOsx::GetNameServers()
+{
+  std::vector<std::string> result;
+
+  FILE* pipe = popen("scutil --dns | grep \"nameserver\" | tail -n2", "r");
+  usleep(100000);
+  if (pipe)
+  {
+    std::vector<std::string> tmpStr;
+    char buffer[256] = {'\0'};
+    if (fread(buffer, sizeof(char), sizeof(buffer), pipe) > 0 && !ferror(pipe))
+    {
+      tmpStr = StringUtils::Split(buffer, "\n");
+      for (unsigned int i = 0; i < tmpStr.size(); i++)
+      {
+        // result looks like this - > '  nameserver[0] : 192.168.1.1'
+        // 2 blank spaces + 13 in 'nameserver[0]' + blank + ':' + blank == 18 :)
+        if (tmpStr[i].length() >= 18)
+          result.push_back(tmpStr[i].substr(18));
+      }
+    }
+    pclose(pipe);
+  }
+  if (result.empty())
+    CLog::Log(LOGWARNING, "Unable to determine nameserver");
+
+  return result;
+}
+
+bool CNetworkOsx::PingHost(unsigned long remote_ip, unsigned int timeout_ms)
+{
+  char cmd_line[64];
+
+  struct in_addr host_ip;
+  host_ip.s_addr = remote_ip;
+
+  sprintf(cmd_line, "ping -c 1 -t %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0,
+          inet_ntoa(host_ip));
+
+  int status = -1;
+  status = system(cmd_line);
+  int result = WIFEXITED(status) ? WEXITSTATUS(status) : -1;
+
+  // http://linux.about.com/od/commands/l/blcmdl8_ping.htm ;
+  // 0 reply
+  // 1 no reply
+  // else some error
+
+  if (result < 0 || result > 1)
+    CLog::Log(LOGERROR, "Ping fail : status = %d, errno = %d : '%s'", status, errno, cmd_line);
+
+  return result == 0;
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/network/NetworkOsx.h Added

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "platform/posix/network/NetworkPosix.h"
+
+#include <string>
+#include <vector>
+
+class CNetworkInterfaceOsx : public CNetworkInterfacePosix
+{
+public:
+  CNetworkInterfaceOsx(CNetworkPosix* network,
+                       std::string interfaceName,
+                       char interfaceMacAddrRaw[6]);
+  ~CNetworkInterfaceOsx() override = default;
+
+  std::string GetCurrentDefaultGateway() const override;
+  bool GetHostMacAddress(unsigned long host, std::string& mac) const override;
+};
+
+class CNetworkOsx : public CNetworkPosix
+{
+public:
+  CNetworkOsx();
+  ~CNetworkOsx() override = default;
+
+  bool PingHost(unsigned long host, unsigned int timeout_ms = 2000) override;
+  std::vector<std::string> GetNameServers() override;
+
+private:
+  void GetMacAddress(const std::string& interfaceName, char macAddrRaw[6]) override;
+  void queryInterfaceList() override;
+};
+
+using CNetwork = CNetworkOsx;

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/smc.c Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer1.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer1.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer1.imagestacklayer/Content.imageset/.gitignore Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer1.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer1.imagestacklayer/Content.imageset/image@2x.png Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer1.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer2.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer2.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer2.imagestacklayer/Content.imageset/.gitignore Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer2.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer2.imagestacklayer/Content.imageset/image@2x.png Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer2.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer3.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer3.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer3.imagestacklayer/Content.imageset/.gitignore Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer3.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer3.imagestacklayer/Content.imageset/image@2x.png Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer3.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer4.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer4.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer4.imagestacklayer/Content.imageset/.gitignore Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer4.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer4.imagestacklayer/Content.imageset/image@2x.png Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon.imagestack/Layer4.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Back.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Back.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Back.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Back.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Front.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Front.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Front.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Front.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Middle.imagestacklayer Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Middle.imagestacklayer/Content.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/icon_appstore.imagestack/Middle.imagestacklayer/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/topshelf.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/topshelf.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/topshelf_wide.imageset Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/topshelf_wide.imageset/.gitignore Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/topshelf_wide.imageset/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Assets.brandassets/topshelf_wide.imageset/image.png Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/.gitignore Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/splash.jpg Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/FrameworkSeed_Info.plist Added

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+	<key>MinimumOSVersion</key>
+	<string>9.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+	<string>AppleTVOS</string>
+	</array>
+	<key>UIDeviceFamily</key>
+	<array>
+	<integer>3</integer>
+	</array></dict>
+</plist>

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Info.plist.in Added

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>@APP_NAME@</string>
+	<key>CFBundleExecutable</key>
+	<string>@APP_NAME@</string>
+	<key>CFBundleIdentifier</key>
+	<string>@PLATFORM_BUNDLE_IDENTIFIER@</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>@APP_NAME@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@APP_VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+	<dict>
+		<key>CFBundleURLName</key>
+		<string>@PLATFORM_BUNDLE_IDENTIFIER@</string>
+		<key>CFBundleURLSchemes</key>
+		<array>
+			<string>kodi</string>
+		</array>
+	</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>@APP_SCMID@</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>UIFileSharingEnabled</key>
+	<string>YES</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+		<string>opengles-3</string>
+	</array>
+</dict>
+</plist>

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/Kodi.entitlements.in Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/PreflightHandler.h Added

@@ -0,0 +1,31 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MrMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdint.h>
+
+class CPreflightHandler
+{
+public:
+  static uint64_t NSUserDefaultsSize();
+  static void NSUserDefaultsPurge(const char* prefix);
+  static void MigrateUserdataXMLToNSUserDefaults();
+  static void CheckForRemovedCacheFolder();
+};

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/PreflightHandler.mm Added

@@ -0,0 +1,191 @@
+/*
+ *      Copyright (C) 2016 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MrMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#import "PreflightHandler.h"
+
+#include "URL.h"
+#include "filesystem/File.h"
+#include "utils/log.h"
+
+#import "platform/darwin/ios-common/DarwinNSUserDefaults.h"
+#import "platform/darwin/tvos/filesystem/TVOSFile.h"
+#import "platform/darwin/tvos/filesystem/TVOSFileUtils.h"
+#include "platform/posix/filesystem/PosixFile.h"
+
+#import <UIKit/UIKit.h>
+
+uint64_t CPreflightHandler::NSUserDefaultsSize()
+{
+  auto libraryDir =
+      NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)[0];
+  auto filepath = [libraryDir
+      stringByAppendingPathComponent:[NSString
+                                         stringWithFormat:@"/Preferences/%@.plist",
+                                                          [NSBundle mainBundle].bundleIdentifier]];
+  auto fileSize =
+      [[[NSFileManager defaultManager] attributesOfItemAtPath:filepath error:nil][NSFileSize]
+          unsignedLongLongValue];
+
+  return fileSize;
+}
+
+void CPreflightHandler::NSUserDefaultsPurge(const char* prefix)
+{
+  auto defaults = [NSUserDefaults standardUserDefaults];
+  NSDictionary<NSString*, id>* dict = [defaults dictionaryRepresentation];
+  NSString* aKey;
+  for (aKey in dict.allKeys)
+  {
+    if ([aKey hasPrefix:@(prefix)])
+    {
+      [defaults removeObjectForKey:aKey];
+      CLog::Log(LOGDEBUG, "nsuserdefaults: removing {}", aKey.UTF8String);
+    }
+  }
+}
+
+void CPreflightHandler::CheckForRemovedCacheFolder()
+{
+  // if already migrated, "UserdataMigrated" key will be in UserDefaults
+  // if user home directory does not exist, Apple deleted cache from under us.
+  // we will mark it for possible restore if the backup exist
+  auto defaults = [NSUserDefaults standardUserDefaults];
+  auto migration_key = @"UserdataMigrated";
+  if (![defaults objectForKey:migration_key])
+  {
+    // no existing data, no need to check any further.
+    return;
+  }
+
+  //!@todo: implement some sort of backup/restore if folder no longer exists?
+}
+
+void CPreflightHandler::MigrateUserdataXMLToNSUserDefaults()
+{
+  CLog::Log(LOGDEBUG,
+            "MigrateUserdataXMLToNSUserDefaults: "
+            "NSUserDefaultsSize({})",
+            NSUserDefaultsSize());
+
+  auto defaults = [NSUserDefaults standardUserDefaults];
+
+  // if already migrated, we are done.
+  auto migration_key = @"UserdataMigrated";
+  if ([defaults objectForKey:migration_key])
+  {
+    // If we require forced update of data from cache check for migration_key value
+    return;
+  }
+
+  CLog::Log(LOGDEBUG, "MigrateUserdataXMLToNSUserDefaults: migration starting");
+
+  NSUserDefaultsPurge("/userdata");
+  // now search for all xxx.xml files in the
+  // user home directory and copy them into NSUserDefaults
+  auto userHome = CTVOSFileUtils::GetUserHomeDirectory();
+  auto nsPath = @(userHome);
+
+  NSDirectoryEnumerator* enumerator = [[NSFileManager defaultManager] enumeratorAtPath:nsPath];
+  NSString* file;
+  while (file = [enumerator nextObject])
+  {
+    auto fullPath = [nsPath stringByAppendingPathComponent:file];
+
+    // skip the Thumbnails directory, there are no xml files present
+    // and it can be very large.
+    if ([fullPath containsString:@"Thumbnails"])
+      continue;
+
+    // check if it's a directory
+    BOOL isDirectory = NO;
+    [[NSFileManager defaultManager] fileExistsAtPath:fullPath isDirectory:&isDirectory];
+    if (isDirectory)
+      continue;
+    // check if the file extension is 'xml'
+    if ([file.pathExtension isEqualToString:@"xml"])
+    {
+      // log what we are doing
+      CLog::Log(LOGDEBUG, "MigrateUserdataXMLToNSUserDefaults: Found -> {}}",
+                [fullPath UTF8String]);
+
+      // we cannot use a Cfile for src, it will get mapped into a CTVOSFile
+      const CURL srcUrl(fullPath.UTF8String);
+      XFILE::CPosixFile srcfile;
+      if (!srcfile.Open(srcUrl))
+      {
+        CLog::Log(LOGDEBUG, "MigrateUserdataXMLToNSUserDefaults: Failed opening file {}",
+                  srcUrl.Get().c_str());
+        continue;
+      }
+
+      const CURL dtsUrl(fullPath.UTF8String);
+      XFILE::CTVOSFile dstfile;
+      if (dstfile.OpenForWrite(dtsUrl, true))
+      {
+        auto iBufferSize = 128 * 1024;
+        XFILE::auto_buffer buffer(iBufferSize);
+
+        while (true)
+        {
+          // read data
+          auto iread = srcfile.Read(buffer.get(), iBufferSize);
+          if (iread == 0)
+            break;
+          else if (iread < 0)
+          {
+            CLog::Log(LOGERROR, "MigrateUserdataXMLToNSUserDefaults: Failed read from file {}",
+                      srcUrl.Get().c_str());
+            break;
+          }
+
+          // write data and make sure we write it all
+          auto iwrite = 0;
+          while (iwrite < iread)
+          {
+            auto iwrite2 = dstfile.Write(buffer.get() + iwrite, iread - iwrite);
+            if (iwrite2 <= 0)
+              break;
+            iwrite += iwrite2;
+          }
+
+          if (iwrite != iread)
+          {
+            CLog::Log(LOGERROR,
+                      "MigrateUserdataXMLToNSUserDefaults: "
+                      "Failed write to file {}",
+                      dtsUrl.Get().c_str());
+            break;
+          }
+        }
+        dstfile.Close();
+        srcfile.Close();
+        srcfile.Delete(srcUrl);
+      }
+    }
+  }
+
+  // set the migration_key to a known value and write it.
+  [defaults setObject:@"1" forKey:migration_key];
+  [defaults synchronize];
+
+  CLog::Log(LOGDEBUG, "MigrateUserdataXMLToNSUserDefaults: migration finished");
+  CLog::Log(LOGDEBUG, "MigrateUserdataXMLToNSUserDefaults: NSUserDefaultsSize({})",
+            NSUserDefaultsSize());
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSDisplayManager.h Added

@@ -0,0 +1,40 @@
+/*
+ *  Copyright (C) 2019 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import <CoreGraphics/CGBase.h>
+#import <CoreGraphics/CGGeometry.h>
+#import <Foundation/Foundation.h>
+
+@class CADisplayLink;
+
+class CWinSystemTVOS;
+
+@interface TVOSDisplayManager : NSObject
+{
+  CADisplayLink* m_displayLink;
+  CWinSystemTVOS* m_winSystem;
+  float m_displayRate;
+  CGSize m_screensize;
+}
+
+@property(readwrite) CGFloat screenScale;
+
+- (float)getDisplayRate;
+- (void)displayLinkTick:(CADisplayLink*)sender;
+- (void)displayRateSwitch:(float)refreshRate withDynamicRange:(int)dynamicRange;
+- (void)displayRateReset;
+- (void)removeModeSwitchObserver;
+- (void)addModeSwitchObserver;
+- (void)observeValueForKeyPath:(NSString*)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary*)change
+                       context:(void*)context;
+- (const char*)stringFromDynamicRange:(int)dynamicRange;
+- (CGSize)getScreenSize;
+- (instancetype)init;
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSDisplayManager.mm Added

@@ -0,0 +1,237 @@
+/*
+ *  Copyright (C) 2019 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "TVOSDisplayManager.h"
+
+#include "ServiceBroker.h"
+#include "settings/AdvancedSettings.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
+#import "windowing/tvos/WinSystemTVOS.h"
+
+#import "platform/darwin/tvos/TVOSEAGLView.h"
+#import "platform/darwin/tvos/XBMCController.h"
+
+#import <AVFoundation/AVDisplayCriteria.h>
+#import <AVKit/AVDisplayManager.h>
+#import <QuartzCore/CADisplayLink.h>
+
+#define DISPLAY_MODE_SWITCH_IN_PROGRESS NSStringFromSelector(@selector(displayModeSwitchInProgress))
+
+@interface AVDisplayCriteria ()
+@property(readonly) int videoDynamicRange;
+@property(readonly, nonatomic) float refreshRate;
+- (id)initWithRefreshRate:(float)arg1 videoDynamicRange:(int)arg2;
+@end
+
+@implementation TVOSDisplayManager
+
+@synthesize screenScale;
+
+#pragma mark - display switching routines
+- (float)getDisplayRate
+{
+  if (m_displayRate > 0.0f)
+    return m_displayRate;
+
+  return 60.0f;
+}
+
+- (void)displayLinkTick:(CADisplayLink*)sender
+{
+  auto duration = m_displayLink.duration;
+  if (duration > 0.0)
+  {
+    // we want fps, not duration in seconds.
+    m_displayRate = 1.0 / duration;
+  }
+}
+
+- (void)displayRateSwitch:(float)refreshRate withDynamicRange:(int)dynamicRange
+{
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+          CSettings::SETTING_VIDEOPLAYER_ADJUSTREFRESHRATE) == ADJUST_REFRESHRATE_OFF)
+    return;
+  if (@available(tvOS 11.2, *))
+  {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      auto avDisplayManager = [g_xbmcController avDisplayManager];
+      if (refreshRate > 0.0f)
+      {
+        // videoDynamicRange values are based on watching
+        // console log when forcing different values.
+        // search for "Native Mode Requested" and pray :)
+        // searches for "FBSDisplayConfiguration" and "currentMode" will show the actual
+        // for example, currentMode = <FBSDisplayMode: 0x1c4298100; 1920x1080@2x (3840x2160/2) 24Hz p3 HDR10>
+        // SDR == 0, 1
+        // HDR == 2, 3
+        // DoblyVision == 4
+        auto displayCriteria = [[AVDisplayCriteria alloc] initWithRefreshRate:refreshRate
+                                                            videoDynamicRange:dynamicRange];
+        // setting preferredDisplayCriteria will trigger a display rate switch
+        [self setDisplayCriteria:avDisplayManager displayCriteria:displayCriteria];
+      }
+      else
+      {
+        // switch back to tvOS defined user settings if we get
+        // zero or less than value for refreshRate. Should never happen :)
+        [self setDisplayCriteria:avDisplayManager displayCriteria:nil];
+      }
+    });
+    CLog::Log(LOGDEBUG, "displayRateSwitch request: refreshRate = {}, dynamicRange = {}",
+              refreshRate, [self stringFromDynamicRange:dynamicRange]);
+  }
+}
+
+- (void)displayRateReset
+{
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+          CSettings::SETTING_VIDEOPLAYER_ADJUSTREFRESHRATE) == ADJUST_REFRESHRATE_OFF)
+    return;
+  if (@available(tvOS 11.2, *))
+  {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      // setting preferredDisplayCriteria to nil will
+      // switch back to tvOS defined user settings
+      auto avDisplayManager = [g_xbmcController avDisplayManager];
+      [self setDisplayCriteria:avDisplayManager displayCriteria:nil];
+    });
+  }
+}
+
+- (void)setDisplayCriteria:(AVDisplayManager*)avDisplayManager
+           displayCriteria:(AVDisplayCriteria*)dispCriteria
+    __attribute__((availability(tvos, introduced = 11.2)))
+{
+  if (@available(tvOS 11.3, *))
+  {
+    if (avDisplayManager.displayCriteriaMatchingEnabled)
+      avDisplayManager.preferredDisplayCriteria = dispCriteria;
+  }
+  else
+  {
+    avDisplayManager.preferredDisplayCriteria = dispCriteria;
+  }
+}
+
+- (void)removeModeSwitchObserver
+{
+  if (@available(tvOS 11.2, *))
+  {
+    auto avDisplayManager = [g_xbmcController avDisplayManager];
+    [avDisplayManager removeObserver:self forKeyPath:DISPLAY_MODE_SWITCH_IN_PROGRESS];
+  }
+}
+
+- (void)addModeSwitchObserver
+{
+  if (@available(tvOS 11.2, *))
+  {
+    auto avDisplayManager = [g_xbmcController avDisplayManager];
+    [avDisplayManager addObserver:self
+                       forKeyPath:DISPLAY_MODE_SWITCH_IN_PROGRESS
+                          options:NSKeyValueObservingOptionNew
+                          context:nullptr];
+  }
+}
+
+- (void)observeValueForKeyPath:(NSString*)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary*)change
+                       context:(void*)context
+{
+  if (![keyPath isEqualToString:DISPLAY_MODE_SWITCH_IN_PROGRESS])
+    return;
+
+  // tracking displayModeSwitchInProgress via NSKeyValueObservingOptionNew,
+  // any changes in displayModeSwitchInProgress will fire this callback.
+  if (@available(tvOS 11.2, *))
+  {
+    std::string switchState = "NO";
+    int dynamicRange = 0;
+    float refreshRate;
+    auto avDisplayManager = [g_xbmcController avDisplayManager];
+    auto displayCriteria = avDisplayManager.preferredDisplayCriteria;
+    // preferredDisplayCriteria can be nil, this is NOT an error
+    // and just indicates tvOS defined user settings which we cannot see.
+    if (displayCriteria != nil)
+    {
+      refreshRate = displayCriteria.refreshRate;
+      dynamicRange = displayCriteria.videoDynamicRange;
+    }
+    if (avDisplayManager.displayModeSwitchInProgress)
+    {
+      switchState = "YES";
+      m_winSystem->AnnounceOnLostDevice();
+      m_winSystem->StartLostDeviceTimer();
+    }
+    else
+    {
+      switchState = "DONE";
+      m_winSystem->StartLostDeviceTimer();
+      m_winSystem->AnnounceOnLostDevice();
+      // displayLinkTick is tracking actual refresh duration.
+      // when isDisplayModeSwitchInProgress == NO, we have switched
+      // and stablized. We might have switched to some other
+      // rate than what we requested. setting preferredDisplayCriteria is
+      // only a request. For example, 30Hz might only be avaliable in HDR
+      // and asking for 30Hz/SDR might result in 60Hz/SDR and
+      // g_graphicsContext.SetFPS needs the actual refresh rate.
+      refreshRate = [self getDisplayRate];
+    }
+    //! @todo
+    //g_graphicsContext.SetFPS(refreshRate);
+    CLog::Log(LOGDEBUG, "displayModeSwitchInProgress = {}, refreshRate = {}, dynamicRange = {}",
+              switchState, refreshRate, [self stringFromDynamicRange:dynamicRange]);
+  }
+}
+
+- (const char*)stringFromDynamicRange:(int)dynamicRange
+{
+  switch (dynamicRange)
+  {
+    case 0 ... 1:
+      return "SDR";
+    case 2 ... 3:
+      return "HDR10";
+    case 4:
+      return "DolbyVision";
+    default:
+      return "Unknown";
+  }
+}
+
+- (CGSize)getScreenSize
+{
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    m_screensize.width = g_xbmcController.glView.bounds.size.width * self.screenScale;
+    m_screensize.height = g_xbmcController.glView.bounds.size.height * self.screenScale;
+  });
+  return m_screensize;
+}
+
+#pragma mark - init
+- (instancetype)init
+{
+  self = [super init];
+  if (!self)
+    return nil;
+
+  m_winSystem = dynamic_cast<CWinSystemTVOS*>(CServiceBroker::GetWinSystem());
+
+  m_displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkTick:)];
+  // we want the native cadence of the display hardware.
+  m_displayLink.preferredFramesPerSecond = 0;
+  [m_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+
+  return self;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSEAGLView.h Added

@@ -0,0 +1,36 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import <OpenGLES/EAGL.h>
+#import <OpenGLES/ES2/gl.h>
+#import <UIKit/UIKit.h>
+
+// This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
+// The view content is basically an EAGL surface you render your OpenGL scene into.
+// Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
+@interface TVOSEAGLView : UIView
+{
+  EAGLContext* m_context;
+  // The pixel dimensions of the CAEAGLLayer.
+  GLint m_framebufferWidth;
+  GLint m_framebufferHeight;
+  // The OpenGL ES names for the framebuffer and renderbuffer used to render to this view.
+  GLuint m_defaultFramebuffer, m_colorRenderbuffer, m_depthRenderbuffer;
+  UIScreen* m_currentScreen;
+  BOOL m_framebufferResizeRequested;
+}
+@property(readonly, getter=getCurrentEAGLContext) EAGLContext* m_context;
+@property(readonly, getter=getCurrentScreen) UIScreen* m_currentScreen;
+
+
+- (id)initWithFrame:(CGRect)frame withScreen:(UIScreen*)screen;
+- (void)setFramebuffer;
+- (bool)presentFramebuffer;
+- (CGFloat)getScreenScale:(UIScreen*)screen;
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSEAGLView.mm Added

@@ -0,0 +1,195 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "platform/darwin/tvos/TVOSEAGLView.h"
+
+#include "messaging/ApplicationMessenger.h"
+#include "settings/AdvancedSettings.h"
+#include "utils/log.h"
+
+#import "platform/darwin/DarwinUtils.h"
+#import "platform/darwin/tvos/XBMCController.h"
+
+#import <signal.h>
+#import <stdio.h>
+
+#import "system.h"
+
+using namespace KODI::MESSAGING;
+
+@implementation TVOSEAGLView
+@synthesize m_context;
+@synthesize m_currentScreen;
+
++ (Class)layerClass
+{
+  return [CAEAGLLayer class];
+}
+
+- (id)initWithFrame:(CGRect)frame withScreen:(UIScreen*)screen
+{
+  m_framebufferResizeRequested = FALSE;
+  if ((self = [super initWithFrame:frame]))
+  {
+    auto scaleFactor = [self getScreenScale:UIScreen.mainScreen];
+
+    // Get the layer
+    auto eaglLayer = static_cast<CAEAGLLayer*>(self.layer);
+    eaglLayer.contentsScale = scaleFactor;
+    self.contentScaleFactor = scaleFactor;
+
+    eaglLayer.opaque = TRUE;
+    eaglLayer.drawableProperties = @{
+      kEAGLDrawablePropertyRetainedBacking : @NO,
+      kEAGLDrawablePropertyColorFormat : kEAGLColorFormatRGBA8
+    };
+
+    // Try OpenGL ES 3.0
+    auto aContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
+
+    // Fallback to OpenGL ES 2.0
+    if (aContext == nullptr)
+      aContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+
+    if (!aContext)
+      CLog::Log(LOGERROR, "Failed to create ES context");
+    else if (![EAGLContext setCurrentContext:aContext])
+      CLog::Log(LOGERROR, "Failed to set ES context current");
+
+    m_context = aContext;
+
+    [self createFramebuffer];
+    [self setFramebuffer];
+  }
+
+  return self;
+}
+
+- (void)dealloc
+{
+  [self deleteFramebuffer];
+}
+
+- (BOOL)canBecomeFocused
+{
+  // need this or we do not get GestureRecognizers under tvos.
+  return YES;
+}
+
+- (void)setContext:(EAGLContext*)newContext
+{
+  if (m_context != newContext)
+  {
+    [self deleteFramebuffer];
+    m_context = newContext;
+    [EAGLContext setCurrentContext:nil];
+  }
+}
+
+- (void)createFramebuffer
+{
+  if (m_context && !m_defaultFramebuffer)
+  {
+    [EAGLContext setCurrentContext:m_context];
+
+    // Create default framebuffer object.
+    glGenFramebuffers(1, &m_defaultFramebuffer);
+    glBindFramebuffer(GL_FRAMEBUFFER, m_defaultFramebuffer);
+
+    // Create color render buffer and allocate backing store.
+    glGenRenderbuffers(1, &m_colorRenderbuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, m_colorRenderbuffer);
+    [m_context renderbufferStorage:GL_RENDERBUFFER
+                      fromDrawable:static_cast<CAEAGLLayer*>(self.layer)];
+    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &m_framebufferWidth);
+    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &m_framebufferHeight);
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
+                              m_colorRenderbuffer);
+
+    glGenRenderbuffers(1, &m_depthRenderbuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, m_depthRenderbuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, m_framebufferWidth,
+                          m_framebufferHeight);
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER,
+                              m_depthRenderbuffer);
+
+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+      CLog::Log(LOGERROR, "Failed to make complete framebuffer object {}",
+                glCheckFramebufferStatus(GL_FRAMEBUFFER));
+  }
+}
+
+- (void)deleteFramebuffer
+{
+  if (m_context)
+  {
+    [EAGLContext setCurrentContext:m_context];
+
+    if (m_defaultFramebuffer)
+    {
+      glDeleteFramebuffers(1, &m_defaultFramebuffer);
+      m_defaultFramebuffer = 0;
+    }
+
+    if (m_colorRenderbuffer)
+    {
+      glDeleteRenderbuffers(1, &m_colorRenderbuffer);
+      m_colorRenderbuffer = 0;
+    }
+
+    if (m_depthRenderbuffer)
+    {
+      glDeleteRenderbuffers(1, &m_depthRenderbuffer);
+      m_depthRenderbuffer = 0;
+    }
+  }
+}
+
+- (void)setFramebuffer
+{
+  if (m_context)
+  {
+    if ([EAGLContext currentContext] != m_context)
+      [EAGLContext setCurrentContext:m_context];
+
+    glBindFramebuffer(GL_FRAMEBUFFER, m_defaultFramebuffer);
+
+    if (m_framebufferHeight > m_framebufferWidth)
+    {
+      glViewport(0, 0, m_framebufferHeight, m_framebufferWidth);
+      glScissor(0, 0, m_framebufferHeight, m_framebufferWidth);
+    }
+    else
+    {
+      glViewport(0, 0, m_framebufferWidth, m_framebufferHeight);
+      glScissor(0, 0, m_framebufferWidth, m_framebufferHeight);
+    }
+  }
+}
+
+- (bool)presentFramebuffer
+{
+  bool success = FALSE;
+  if (m_context)
+  {
+    if ([EAGLContext currentContext] != m_context)
+      [EAGLContext setCurrentContext:m_context];
+
+    glBindRenderbuffer(GL_RENDERBUFFER, m_colorRenderbuffer);
+    success = [m_context presentRenderbuffer:GL_RENDERBUFFER];
+  }
+
+  return success;
+}
+
+- (CGFloat)getScreenScale:(UIScreen*)screen
+{
+  return screen.scale;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSKeyboardView.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSKeyboardView.mm Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSSettingsHandler.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSSettingsHandler.mm Added

@@ -0,0 +1,71 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "TVOSSettingsHandler.h"
+
+#include "ServiceBroker.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
+#include "settings/lib/Setting.h"
+#include "threads/Atomics.h"
+
+#import "platform/darwin/tvos/XBMCController.h"
+#import "platform/darwin/tvos/input/LibInputHandler.h"
+#import "platform/darwin/tvos/input/LibInputSettings.h"
+
+#import "system.h"
+
+static std::atomic_flag sg_singleton_lock_variable = ATOMIC_FLAG_INIT;
+CTVOSInputSettings* CTVOSInputSettings::m_instance = nullptr;
+
+CTVOSInputSettings& CTVOSInputSettings::GetInstance()
+{
+  CAtomicSpinLock lock(sg_singleton_lock_variable);
+  if (!m_instance)
+    m_instance = new CTVOSInputSettings();
+
+  return *m_instance;
+}
+
+void CTVOSInputSettings::Initialize()
+{
+  bool enable = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+      CSettings::SETTING_INPUT_APPLESIRI);
+  g_xbmcController.inputHandler.inputSettings.useSiriRemote = enable;
+  bool enableTimeout = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+      CSettings::SETTING_INPUT_APPLESIRITIMEOUTENABLED);
+  [g_xbmcController.inputHandler.inputSettings setRemoteIdleEnabled:enableTimeout];
+  int timeout = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+      CSettings::SETTING_INPUT_APPLESIRITIMEOUT);
+  [g_xbmcController.inputHandler.inputSettings setRemoteIdleTimeout:timeout];
+}
+
+void CTVOSInputSettings::OnSettingChanged(std::shared_ptr<const CSetting> setting)
+{
+  if (setting == nullptr)
+    return;
+
+  const std::string& settingId = setting->GetId();
+  if (settingId == CSettings::SETTING_INPUT_APPLESIRI)
+  {
+    bool enable = std::dynamic_pointer_cast<const CSettingBool>(setting)->GetValue();
+    g_xbmcController.inputHandler.inputSettings.useSiriRemote = enable;
+  }
+  else if (settingId == CSettings::SETTING_INPUT_APPLESIRITIMEOUTENABLED)
+  {
+    bool enableTimeout = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(
+        CSettings::SETTING_INPUT_APPLESIRITIMEOUTENABLED);
+    [g_xbmcController.inputHandler.inputSettings setRemoteIdleEnabled:enableTimeout];
+  }
+  else if (settingId == CSettings::SETTING_INPUT_APPLESIRITIMEOUT)
+  {
+    int timeout = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+        CSettings::SETTING_INPUT_APPLESIRITIMEOUT);
+    [g_xbmcController.inputHandler.inputSettings setRemoteIdleTimeout:timeout];
+  }
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSTopShelf.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TVOSTopShelf.mm Added

@@ -0,0 +1,181 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+
+#import "TVOSTopShelf.h"
+
+#include "Application.h"
+#include "DatabaseManager.h"
+#include "FileItem.h"
+#include "filesystem/File.h"
+#include "guilib/GUIWindowManager.h"
+#include "guilib/LocalizeStrings.h"
+#include "messaging/ApplicationMessenger.h"
+#include "tvosShared.h"
+#include "utils/Base64.h"
+#include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
+#include "utils/log.h"
+#include "video/VideoDatabase.h"
+#include "video/VideoInfoTag.h"
+#include "video/VideoThumbLoader.h"
+#include "video/dialogs/GUIDialogVideoInfo.h"
+#include "video/windows/GUIWindowVideoBase.h"
+#include "video/windows/GUIWindowVideoNav.h"
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <mach/mach_host.h>
+#import <sys/sysctl.h>
+
+#import "system.h"
+
+static const int MaxItems = 5;
+
+std::string CTVOSTopShelf::m_url;
+bool CTVOSTopShelf::m_handleUrl;
+
+CTVOSTopShelf& CTVOSTopShelf::GetInstance()
+{
+  static CTVOSTopShelf sTopShelf;
+  return sTopShelf;
+}
+
+void CTVOSTopShelf::SetTopShelfItems(CFileItemList& movies, CFileItemList& tv)
+{
+  @autoreleasepool
+  {
+    auto storeUrl = [tvosShared getSharedURL];
+    if (!storeUrl)
+      return;
+
+    storeUrl = [storeUrl URLByAppendingPathComponent:@"RA" isDirectory:YES];
+    const BOOL isJailbroken = [tvosShared isJailbroken];
+    CLog::Log(LOGDEBUG, "TopShelf: using shared path {} (jailbroken: {})\n",
+              storeUrl.path.UTF8String, isJailbroken ? "yes" : "no");
+
+    auto sharedDefaults = [[NSUserDefaults alloc] initWithSuiteName:[tvosShared getSharedID]];
+    auto sharedDictJailbreak = isJailbroken ? [[NSMutableDictionary alloc] initWithCapacity:2 + 2]
+                                            : nil; // for jailbroken devices
+
+    // store all old thumbs in array
+    auto fileManager = NSFileManager.defaultManager;
+    auto filePaths =
+        [NSMutableSet setWithArray:[fileManager contentsOfDirectoryAtPath:storeUrl.path error:nil]];
+    std::string raPath = storeUrl.path.UTF8String;
+    CVideoThumbLoader thumbLoader;
+
+    auto fillSharedDicts =
+        [&](CFileItemList& videoItems, NSString* videosKey, NSString* videosTitleKey,
+            uint32_t titleStringCode,
+            std::function<std::string(CFileItemPtr videoItem)> getThumbnailForItem,
+            std::function<std::string(CFileItemPtr videoItem)> getTitleForItem) {
+          if (videoItems.Size() <= 0)
+          {
+            // cleanup if there is no RA
+            [sharedDefaults removeObjectForKey:videosKey];
+            [sharedDefaults removeObjectForKey:videosTitleKey];
+            return;
+          }
+
+          const int topShelfSize = std::min(videoItems.Size(), MaxItems);
+          auto videosArray = [NSMutableArray arrayWithCapacity:topShelfSize];
+          for (int i = 0; i < topShelfSize; ++i)
+          {
+            @autoreleasepool
+            {
+              auto videoItem = videoItems.Get(i);
+              if (!videoItem->HasArt("thumb"))
+                thumbLoader.LoadItem(videoItem.get());
+
+              auto thumbnailPath = getThumbnailForItem(videoItem);
+              auto fileName = std::to_string(videoItem->GetVideoInfoTag()->m_iDbId) +
+                              URIUtils::GetFileName(thumbnailPath);
+              auto destPath = URIUtils::AddFileToFolder(raPath, fileName);
+              if (!XFILE::CFile::Exists(destPath))
+                XFILE::CFile::Copy(thumbnailPath, destPath);
+              else
+              {
+                // remove from array so it doesnt get deleted at the end
+                [filePaths removeObject:@(fileName.c_str())];
+              }
+
+              auto title = getTitleForItem(videoItem);
+              CLog::Log(LOGDEBUG, "TopShelf: - adding video to '{}' array: {}\n",
+                        videosKey.UTF8String, title.c_str());
+              [videosArray addObject:@{
+                @"title" : @(title.c_str()),
+                @"thumb" : @(fileName.c_str()),
+                @"url" : @(Base64::Encode(videoItem->GetVideoInfoTag()->GetPath()).c_str())
+              }];
+            }
+          }
+          [sharedDefaults setObject:videosArray forKey:videosKey];
+          sharedDictJailbreak[videosKey] = videosArray;
+
+          auto tvTitle = @(g_localizeStrings.Get(titleStringCode).c_str());
+          [sharedDefaults setObject:tvTitle forKey:videosTitleKey];
+          sharedDictJailbreak[videosTitleKey] = tvTitle;
+        };
+
+    fillSharedDicts(movies, @"movies", @"moviesTitle", 20386,
+                    [](CFileItemPtr videoItem) { return videoItem->GetArt("thumb"); },
+                    [](CFileItemPtr videoItem) { return videoItem->GetLabel(); });
+
+    CVideoDatabase videoDb;
+    videoDb.Open();
+    fillSharedDicts(tv, @"tv", @"tvTitle", 20387,
+                    [&videoDb](CFileItemPtr videoItem) {
+                      int season = videoItem->GetVideoInfoTag()->m_iIdSeason;
+                      return season > 0 ? videoDb.GetArtForItem(season, MediaTypeSeason, "poster")
+                                        : std::string{};
+                    },
+                    [](CFileItemPtr videoItem) {
+                      return StringUtils::Format(
+                          "%s s%02de%02d", videoItem->GetVideoInfoTag()->m_strShowTitle.c_str(),
+                          videoItem->GetVideoInfoTag()->m_iSeason,
+                          videoItem->GetVideoInfoTag()->m_iEpisode);
+                    });
+    videoDb.Close();
+
+    // remove unused thumbs from cache folder
+    NSString* strFiles;
+    for (strFiles in filePaths)
+      [fileManager removeItemAtURL:[storeUrl URLByAppendingPathComponent:strFiles isDirectory:NO]
+                             error:nil];
+
+    [sharedDictJailbreak writeToURL:[storeUrl URLByAppendingPathComponent:@"shared.dict"]
+                         atomically:YES];
+    [sharedDefaults synchronize];
+  }
+}
+
+void CTVOSTopShelf::RunTopShelf()
+{
+  if (!m_handleUrl)
+    return;
+
+  m_handleUrl = false;
+  std::vector<std::string> split = StringUtils::Split(m_url, "/");
+  std::string url = Base64::Decode(split[4]);
+
+  //!@Todo handle tvcontentitem.displayurl. Should show topshelf item video info
+  //  check split[2] for url type (display or play)
+
+  // its a bit ugly, but only way to get resume window to show
+  std::string cmd =
+      StringUtils::Format("PlayMedia(%s)", StringUtils::Paramify(url.c_str()).c_str());
+  KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_EXECUTE_BUILT_IN, -1, -1,
+                                                                nullptr, cmd);
+}
+
+void CTVOSTopShelf::HandleTopShelfUrl(const std::string& url, const bool run)
+{
+  m_url = url;
+  m_handleUrl = run;
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TopShelf Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TopShelf/Info.plist.in Added

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>TopShelf</string>
+	<key>CFBundleExecutable</key>
+	<string>@TOPSHELF_EXTENSION_NAME@</string>
+	<key>CFBundleIdentifier</key>
+	<string>@PLATFORM_BUNDLE_IDENTIFIER@.topshelf</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>TopShelf</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@APP_VERSION@</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>@APP_SCMID@</string>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>TVExtensionProtocols</key>
+			<array>
+				<string>TVTopShelfProvider</string>
+			</array>
+		</dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.tv-services</string>
+		<key>NSExtensionPrincipalClass</key>
+		<string>ServiceProvider</string>
+	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
+</dict>
+</plist>

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TopShelf/ServiceProvider.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TopShelf/ServiceProvider.m Added

@@ -0,0 +1,124 @@
+/*
+ *      Copyright (C) 2015 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MrMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#import "ServiceProvider.h"
+
+#import "../tvosShared.h"
+
+@implementation ServiceProvider
+
+#pragma mark - TVTopShelfProvider protocol
+
+- (TVTopShelfContentStyle)topShelfStyle
+{
+  return TVTopShelfContentStyleSectioned;
+}
+
+- (NSArray<TVContentItem*>*)topShelfItems
+{
+  __auto_type storeUrl = [tvosShared getSharedURL];
+  if (!storeUrl)
+    return @[];
+
+  __auto_type const sharedID = [tvosShared getSharedID];
+  __auto_type const shared = [[NSUserDefaults alloc] initWithSuiteName:sharedID];
+  __auto_type topShelfItems = [[NSMutableArray alloc] init];
+  __auto_type wrapperIdentifier =
+      [[TVContentIdentifier alloc] initWithIdentifier:@"shelf-wrapper" container:nil];
+
+  NSArray* movieArray = nil;
+  NSArray* tvArray = nil;
+  NSDictionary* sharedDict = nil;
+
+  if ([tvosShared isJailbroken])
+  {
+    __auto_type sharedDictUrl =
+        [storeUrl URLByAppendingPathComponent:@"shared.dict" isDirectory:NO];
+    sharedDict = [NSDictionary dictionaryWithContentsOfFile:[sharedDictUrl path]];
+
+    movieArray = [sharedDict valueForKey:@"movies"];
+    tvArray = [sharedDict valueForKey:@"tv"];
+  }
+  else
+  {
+    movieArray = [shared objectForKey:@"movies"];
+    tvArray = [shared valueForKey:@"tv"];
+  }
+
+  __auto_type mainAppBundle = [tvosShared mainAppBundle];
+  __auto_type kodiUrlScheme = @"kodi"; // fallback value
+  NSDictionary* dic;
+  for (dic in [mainAppBundle objectForInfoDictionaryKey:@"CFBundleURLTypes"])
+  {
+    if ([dic[@"CFBundleURLName"] isEqualToString:mainAppBundle.bundleIdentifier])
+    {
+      kodiUrlScheme = dic[@"CFBundleURLSchemes"][0];
+      break;
+    }
+  }
+
+  storeUrl = [storeUrl URLByAppendingPathComponent:@"RA" isDirectory:YES];
+  __auto_type contentItemsFrom = ^NSArray<TVContentItem*>*(NSArray* videosArray)
+  {
+    NSMutableArray<TVContentItem*>* contentItems =
+        [[NSMutableArray alloc] initWithCapacity:videosArray.count];
+    NSDictionary* videoDict;
+    for (videoDict in videosArray)
+    {
+      __auto_type identifier =
+          [[TVContentIdentifier alloc] initWithIdentifier:@"VOD" container:wrapperIdentifier];
+      __auto_type contentItem = [[TVContentItem alloc] initWithContentIdentifier:identifier];
+
+      [contentItem
+          setImageURL:[storeUrl URLByAppendingPathComponent:[videoDict valueForKey:@"thumb"]
+                                                isDirectory:NO]
+            forTraits:TVContentItemImageTraitScreenScale1x];
+      contentItem.imageShape = TVContentItemImageShapePoster;
+      contentItem.title = [videoDict valueForKey:@"title"];
+      NSString* url = [videoDict valueForKey:@"url"];
+      contentItem.displayURL = [NSURL
+          URLWithString:[NSString stringWithFormat:@"%@://display/movie/%@", kodiUrlScheme, url]];
+      contentItem.playURL = [NSURL
+          URLWithString:[NSString stringWithFormat:@"%@://play/movie/%@", kodiUrlScheme, url]];
+      [contentItems addObject:contentItem];
+    }
+    return contentItems;
+  };
+
+  if ([movieArray count] > 0)
+  {
+    __auto_type itemMovie = [[TVContentItem alloc] initWithContentIdentifier:wrapperIdentifier];
+    itemMovie.title = [(sharedDict ?: shared) valueForKey:@"moviesTitle"];
+    itemMovie.topShelfItems = contentItemsFrom(movieArray);
+    [topShelfItems addObject:itemMovie];
+  }
+
+  if ([tvArray count] > 0)
+  {
+    __auto_type itemTv = [[TVContentItem alloc] initWithContentIdentifier:wrapperIdentifier];
+    itemTv.title = [(sharedDict ?: shared) valueForKey:@"tvTitle"];
+    itemTv.topShelfItems = contentItemsFrom(tvArray);
+    [topShelfItems addObject:itemTv];
+  }
+
+  return topShelfItems;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/TopShelf/TopShelf.entitlements.in Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/XBMCApplication.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/XBMCApplication.mm Added

@@ -0,0 +1,130 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "platform/darwin/tvos/XBMCApplication.h"
+
+#import "platform/darwin/NSLogDebugHelpers.h"
+#import "platform/darwin/tvos/PreflightHandler.h"
+#import "platform/darwin/tvos/TVOSTopShelf.h"
+#import "platform/darwin/tvos/XBMCController.h"
+
+#import <AVFoundation/AVFoundation.h>
+
+@implementation XBMCApplicationDelegate
+
+- (XBMCController*)xbmcController
+{
+  return static_cast<XBMCController*>(self.window.rootViewController);
+}
+
+#pragma mark - Shutdown Procedures
+
+- (void)applicationWillResignActive:(UIApplication*)application
+{
+  [self.xbmcController pauseAnimation];
+  [self.xbmcController becomeInactive];
+}
+
+- (void)applicationDidEnterBackground:(UIApplication*)application
+{
+  if (application.applicationState == UIApplicationStateBackground)
+  {
+    // the app is turn into background, not in by screen lock which has app state inactive.
+    [self.xbmcController enterBackground];
+  }
+}
+
+- (void)applicationWillTerminate:(UIApplication*)application
+{
+  [self.xbmcController stopAnimation];
+}
+
+#pragma mark - Startup Procedures
+
+- (void)applicationDidBecomeActive:(UIApplication*)application
+{
+  [self.xbmcController resumeAnimation];
+  [self.xbmcController enterForeground];
+}
+
+- (BOOL)application:(UIApplication*)application
+    didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
+{
+  // check if apple removed our Cache folder first
+  // this will trigger the restore if there is a backup available
+  CPreflightHandler::CheckForRemovedCacheFolder();
+
+  // This needs to run before anything does any CLog::Log calls
+  // as they will directly cause guisetting to get accessed/created
+  // via debug log settings.
+  CPreflightHandler::MigrateUserdataXMLToNSUserDefaults();
+
+  // UI setup
+  self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
+  self.window.rootViewController = [XBMCController new];
+  [self.window makeKeyAndVisible];
+  [self.xbmcController startAnimation];
+
+  // audio session setup
+  auto audioSession = AVAudioSession.sharedInstance;
+  NSError* err = nil;
+  if (![audioSession setCategory:AVAudioSessionCategoryPlayback error:&err])
+    NSLog(@"audioSession setCategory failed: %@", err);
+
+  err = nil;
+  if (![audioSession setMode:AVAudioSessionModeMoviePlayback error:&err])
+    NSLog(@"audioSession setMode failed: %@", err);
+
+  err = nil;
+  if (![audioSession setActive:YES error:&err])
+    NSLog(@"audioSession setActive failed: %@", err);
+
+  return YES;
+}
+
+- (BOOL)application:(UIApplication*)app
+            openURL:(NSURL*)url
+            options:(NSDictionary<NSString*, id>*)options
+{
+  NSArray* urlComponents = [url.absoluteString componentsSeparatedByString:@"/"];
+  NSString* action = urlComponents[2];
+  if ([action isEqualToString:@"display"] || [action isEqualToString:@"play"])
+    CTVOSTopShelf::GetInstance().HandleTopShelfUrl(url.absoluteString.UTF8String, true);
+  return YES;
+}
+@end
+
+static void SigPipeHandler(int s)
+{
+  NSLog(@"We Got a Pipe Signal: %d____________", s);
+}
+
+int main(int argc, char* argv[])
+{
+  @autoreleasepool
+  {
+    signal(SIGPIPE, SigPipeHandler);
+
+    int retVal = 0;
+    @try
+    {
+      retVal =
+          UIApplicationMain(argc, argv, nil, NSStringFromClass([XBMCApplicationDelegate class]));
+    }
+    @catch (id theException)
+    {
+      ELOG(@"%@", theException);
+    }
+    @finally
+    {
+      ILOG(@"This always happens.");
+    }
+
+    return retVal;
+  }
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/XBMCController.h Added

@@ -0,0 +1,73 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include <memory>
+#include <string>
+
+#import <Foundation/Foundation.h>
+#import <OpenGLES/EAGL.h>
+#import <UIKit/UIKit.h>
+
+@class AVDisplayManager;
+@class DarwinEmbedNowPlayingInfoManager;
+@class TVOSEAGLView;
+@class TVOSLibInputHandler;
+@class TVOSDisplayManager;
+
+class CFileItem;
+
+@interface XBMCController : UIViewController
+{
+  BOOL m_isPlayingBeforeInactive;
+  UIBackgroundTaskIdentifier m_bgTask;
+  BOOL m_bgTaskActive;
+  bool m_nativeKeyboardActive;
+  BOOL m_pause;
+  BOOL m_animating;
+  NSConditionLock* m_animationThreadLock;
+  NSThread* m_animationThread;
+  std::unique_ptr<CFileItem> m_playingFileItemBeforeBackground;
+  std::string m_lastUsedPlayer;
+}
+
+@property(nonatomic) BOOL appAlive;
+@property(nonatomic, strong) DarwinEmbedNowPlayingInfoManager* MPNPInfoManager;
+@property(nonatomic, strong) TVOSDisplayManager* displayManager;
+@property(nonatomic, strong) TVOSEAGLView* glView;
+@property(nonatomic, strong) TVOSLibInputHandler* inputHandler;
+
+- (void)pauseAnimation;
+- (void)resumeAnimation;
+- (void)startAnimation;
+- (void)stopAnimation;
+
+- (void)enterBackground;
+- (void)enterForeground;
+- (void)becomeInactive;
+- (void)setFramebuffer;
+- (bool)presentFramebuffer;
+- (void)activateKeyboard:(UIView*)view;
+- (void)deactivateKeyboard:(UIView*)view;
+- (void)nativeKeyboardActive:(bool)active;
+
+- (UIBackgroundTaskIdentifier)enableBackGroundTask;
+- (void)disableBackGroundTask:(UIBackgroundTaskIdentifier)bgTaskID;
+
+- (void)disableScreenSaver;
+- (void)enableScreenSaver;
+- (bool)resetSystemIdleTimer;
+
+- (CGRect)fullscreenSubviewFrame;
+
+- (AVDisplayManager*)avDisplayManager __attribute__((availability(tvos, introduced = 11.2)));
+
+- (EAGLContext*)getEAGLContextObj;
+
+@end
+
+extern XBMCController* g_xbmcController;

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/XBMCController.mm Added

@@ -0,0 +1,577 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "platform/darwin/tvos/XBMCController.h"
+
+#include "AppParamParser.h"
+#include "Application.h"
+#include "CompileInfo.h"
+#include "FileItem.h"
+#include "ServiceBroker.h"
+#include "cores/AudioEngine/Interfaces/AE.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIWindowManager.h"
+#include "interfaces/AnnouncementManager.h"
+#include "messaging/ApplicationMessenger.h"
+#include "network/Network.h"
+#include "network/NetworkServices.h"
+#include "platform/xbmc.h"
+#include "pvr/PVRManager.h"
+#include "settings/AdvancedSettings.h"
+#include "settings/SettingsComponent.h"
+#include "utils/log.h"
+#import "windowing/tvos/WinEventsTVOS.h"
+#import "windowing/tvos/WinSystemTVOS.h"
+
+#import "platform/darwin/ios-common/AnnounceReceiver.h"
+#import "platform/darwin/ios-common/DarwinEmbedNowPlayingInfoManager.h"
+#import "platform/darwin/tvos/TVOSDisplayManager.h"
+#import "platform/darwin/tvos/TVOSEAGLView.h"
+#import "platform/darwin/tvos/TVOSTopShelf.h"
+#import "platform/darwin/tvos/XBMCApplication.h"
+#import "platform/darwin/tvos/input/LibInputHandler.h"
+#import "platform/darwin/tvos/input/LibInputRemote.h"
+#import "platform/darwin/tvos/input/LibInputTouch.h"
+
+#import <AVKit/AVDisplayManager.h>
+#import <AVKit/UIWindow.h>
+
+#import "system.h"
+
+using namespace KODI::MESSAGING;
+
+XBMCController* g_xbmcController;
+
+#pragma mark - XBMCController implementation
+@implementation XBMCController
+
+@synthesize appAlive = m_appAlive;
+@synthesize MPNPInfoManager;
+@synthesize displayManager;
+@synthesize inputHandler;
+@synthesize glView;
+
+#pragma mark - UIView Keyboard
+
+- (void)activateKeyboard:(UIView*)view
+{
+  [self.view addSubview:view];
+  glView.userInteractionEnabled = NO;
+}
+
+- (void)deactivateKeyboard:(UIView*)view
+{
+  [view removeFromSuperview];
+  glView.userInteractionEnabled = YES;
+  [self becomeFirstResponder];
+}
+
+- (void)nativeKeyboardActive:(bool)active;
+{
+  // Not used on tvOS
+}
+
+#pragma mark - View
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+
+  glView = [[TVOSEAGLView alloc] initWithFrame:self.view.bounds withScreen:[UIScreen mainScreen]];
+
+  // Check if screen is Retina
+  displayManager.screenScale = [glView getScreenScale:[UIScreen mainScreen]];
+
+  self.view.backgroundColor = UIColor.blackColor;
+  [self.view addSubview:glView];
+
+  [inputHandler.inputTouch createSwipeGestureRecognizers];
+  [inputHandler.inputTouch createPanGestureRecognizers];
+  [inputHandler.inputTouch createPressGesturecognizers];
+  [inputHandler.inputTouch createTapGesturecognizers];
+
+  [displayManager addModeSwitchObserver];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+  [self resumeAnimation];
+  [super viewWillAppear:animated];
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+  [super viewDidAppear:animated];
+  [self becomeFirstResponder];
+  [[UIApplication sharedApplication]
+      beginReceivingRemoteControlEvents]; // @todo MPRemoteCommandCenter
+}
+
+- (void)viewWillDisappear:(BOOL)animated
+{
+  [self pauseAnimation];
+  [super viewWillDisappear:animated];
+}
+
+- (void)viewDidUnload
+{
+  [[UIApplication sharedApplication] endReceivingRemoteControlEvents];
+  [self resignFirstResponder];
+  [super viewDidUnload];
+}
+
+- (UIView*)inputView
+{
+  // override our input view to an empty view
+  // this prevents the on screen keyboard
+  // which would be shown whenever this UIResponder
+  // becomes the first responder (which is always the case!)
+  // caused by implementing the UIKeyInput protocol
+  return [[UIView alloc] initWithFrame:CGRectZero];
+}
+
+#pragma mark - FirstResponder
+
+- (BOOL)canBecomeFirstResponder
+{
+  return YES;
+}
+
+#pragma mark - FrameBuffer
+
+- (void)setFramebuffer
+{
+  if (!m_pause)
+    [glView setFramebuffer];
+}
+
+- (bool)presentFramebuffer
+{
+  if (!m_pause)
+    return [glView presentFramebuffer];
+  else
+    return FALSE;
+}
+
+- (CGRect)fullscreenSubviewFrame
+{
+    return UIScreen.mainScreen.bounds;
+}
+
+- (void)didReceiveMemoryWarning
+{
+  // Releases the view if it doesn't have a superview.
+  [super didReceiveMemoryWarning];
+  // Release any cached data, images, etc. that aren't in use.
+}
+
+#pragma mark - BackgroundTask
+
+- (UIBackgroundTaskIdentifier)enableBackGroundTask;
+{
+  CLog::Log(LOGDEBUG, "%s: enableBackgroundTask created", __PRETTY_FUNCTION__);
+  // we have to alloc the background task for keep network working after screen lock and dark.
+  return [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:nil];
+}
+
+- (void)disableBackGroundTask:(UIBackgroundTaskIdentifier)bgTaskID;
+{
+  if (bgTaskID != UIBackgroundTaskInvalid)
+  {
+    CLog::Log(LOGDEBUG, "%s: endBackgroundTask closed", __PRETTY_FUNCTION__);
+    [[UIApplication sharedApplication] endBackgroundTask:bgTaskID];
+    bgTaskID = UIBackgroundTaskInvalid;
+  }
+}
+
+#pragma mark - AppFocus
+
+- (void)becomeInactive
+{
+  // if we were interrupted, already paused here
+  // else if user background us or lock screen, only pause video here, audio keep playing.
+  if (g_application.GetAppPlayer().IsPlayingVideo() && !g_application.GetAppPlayer().IsPaused())
+  {
+    m_isPlayingBeforeInactive = YES;
+    m_lastUsedPlayer = g_application.GetAppPlayer().GetCurrentPlayer();
+    m_playingFileItemBeforeBackground =
+        std::make_unique<CFileItem>(g_application.CurrentFileItem());
+    CApplicationMessenger::GetInstance().SendMsg(TMSG_MEDIA_PAUSE_IF_PLAYING);
+    g_application.CurrentFileItem().m_lStartOffset = g_application.GetAppPlayer().GetTime() - 2.50;
+  }
+}
+
+- (void)enterBackground
+{
+  m_bgTask = [self enableBackGroundTask];
+  m_bgTaskActive = YES;
+
+  CLog::Log(LOGNOTICE, "%s: Running sleep jobs", __FUNCTION__);
+
+  CWinSystemTVOS* winSystem = dynamic_cast<CWinSystemTVOS*>(CServiceBroker::GetWinSystem());
+  winSystem->OnAppFocusChange(false);
+
+  // Media was paused, Full background shutdown, so stop now.
+  // Only do for PVR? leave regular media paused?
+  if (g_application.GetAppPlayer().IsPaused())
+  {
+    if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_SLIDESHOW ||
+        CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO ||
+        CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_FULLSCREEN_GAME ||
+        CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_VISUALISATION)
+      CServiceBroker::GetGUI()->GetWindowManager().PreviousWindow();
+
+    g_application.StopPlaying();
+  }
+
+  CServiceBroker::GetPVRManager().OnSleep();
+  CServiceBroker::GetActiveAE()->Suspend();
+  CServiceBroker::GetNetwork().GetServices().Stop(true);
+
+  //  if (!m_isPlayingBeforeInactive)
+  g_application.CloseNetworkShares();
+
+  m_bgTaskActive = NO;
+  [self disableBackGroundTask:m_bgTask];
+}
+
+- (void)enterForeground
+{
+  // stop background task (if running)
+  if (m_bgTaskActive)
+  {
+    CLog::Log(LOGDEBUG, "%s: bgTask already running, closing", __PRETTY_FUNCTION__);
+    [self disableBackGroundTask:m_bgTask];
+  }
+
+  [NSThread detachNewThreadSelector:@selector(enterForegroundDelayed:)
+                           toTarget:self
+                         withObject:nil];
+}
+
+- (void)enterForegroundDelayed:(id)arg
+{
+
+  __block BOOL appstate = YES;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if ([UIApplication sharedApplication].applicationState != UIApplicationStateActive)
+      appstate = NO;
+  });
+
+  if (!appstate)
+    return;
+
+  // g_application.IsInitialized is only true if
+  // we were running and got moved to background
+  while (!g_application.IsInitialized())
+    usleep(50 * 1000);
+
+  CServiceBroker::GetNetwork().WaitForNet();
+  CServiceBroker::GetNetwork().GetServices().Start();
+
+  if (CServiceBroker::GetActiveAE())
+    if (CServiceBroker::GetActiveAE()->IsSuspended())
+      CServiceBroker::GetActiveAE()->Resume();
+
+  CServiceBroker::GetPVRManager().OnWake();
+
+  CWinSystemTVOS* winSystem = dynamic_cast<CWinSystemTVOS*>(CServiceBroker::GetWinSystem());
+  winSystem->OnAppFocusChange(true);
+
+  // when we come back, restore playing if we were.
+  if (m_isPlayingBeforeInactive)
+  {
+    if (m_playingFileItemBeforeBackground->IsLiveTV())
+    {
+      CLog::Log(LOGDEBUG, "%s: Live TV was playing before suspend. Restart channel",
+                __PRETTY_FUNCTION__);
+      // Restart player with lastused FileItem
+      g_application.PlayFile(*m_playingFileItemBeforeBackground, m_lastUsedPlayer, true);
+    }
+    else
+    {
+      if (g_application.GetAppPlayer().IsPaused() && g_application.GetAppPlayer().HasPlayer())
+      {
+        CApplicationMessenger::GetInstance().SendMsg(TMSG_MEDIA_UNPAUSE);
+      }
+      else
+      {
+        g_application.PlayFile(*m_playingFileItemBeforeBackground, m_lastUsedPlayer, true);
+      }
+    }
+    m_playingFileItemBeforeBackground = std::make_unique<CFileItem>();
+    m_lastUsedPlayer = "";
+    m_isPlayingBeforeInactive = NO;
+  }
+
+  // do not update if we are already updating
+  if (!(g_application.IsVideoScanning() || g_application.IsMusicScanning()))
+    g_application.UpdateLibraries();
+
+  // this will fire only if we are already alive and have 'menu'ed out and back
+  CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnWake");
+
+  // this handles what to do if we got pushed
+  // into foreground by a topshelf item select/play
+  CTVOSTopShelf::GetInstance().RunTopShelf();
+}
+
+#pragma mark - ScreenSaver Idletimer
+
+- (void)disableScreenSaver
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
+  });
+}
+
+- (void)enableScreenSaver
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
+  });
+}
+
+- (bool)resetSystemIdleTimer
+{
+  // this is silly :)
+  // when system screen saver kicks off, we switch to UIApplicationStateInactive, the only way
+  // to get out of the screensaver is to call ourself to open an custom URL that is registered
+  // in our Info.plist. The openURL method of UIApplication must be supported but we can just
+  // reply NO and we get restored to UIApplicationStateActive.
+  __block bool inActive = false;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    inActive = [UIApplication sharedApplication].applicationState == UIApplicationStateInactive;
+    if (inActive)
+    {
+      auto wakeupString =
+          [[NSArray arrayWithObjects:[NSString stringWithUTF8String:CCompileInfo::GetAppName()],
+                                     @"://wakeup", nil] componentsJoinedByString:@""];
+      NSURL* url = [NSURL URLWithString:wakeupString];
+      [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
+    }
+  });
+  return inActive;
+}
+
+#pragma mark - runtime routines
+
+- (void)pauseAnimation
+{
+  m_pause = YES;
+  g_application.SetRenderGUI(false);
+}
+
+- (void)resumeAnimation
+{
+  m_pause = NO;
+  g_application.SetRenderGUI(true);
+}
+
+- (void)startAnimation
+{
+  if (!m_animating && [glView getCurrentEAGLContext])
+  {
+    // kick off an animation thread
+    m_animationThreadLock = [[NSConditionLock alloc] initWithCondition:FALSE];
+    m_animationThread = [[NSThread alloc] initWithTarget:self
+                                                selector:@selector(runAnimation:)
+                                                  object:m_animationThreadLock];
+    [m_animationThread start];
+    m_animating = YES;
+  }
+}
+
+- (void)stopAnimation
+{
+  if (!m_animating && [glView getCurrentEAGLContext])
+  {
+    m_appAlive = NO;
+    m_animating = NO;
+    if (!g_application.m_bStop)
+    {
+      CApplicationMessenger::GetInstance().PostMsg(TMSG_QUIT);
+    }
+
+    CAnnounceReceiver::GetInstance()->DeInitialize();
+
+    // wait for animation thread to die
+    if (!m_animationThread.finished)
+      [m_animationThreadLock lockWhenCondition:TRUE];
+  }
+}
+
+- (void)runAnimation:(id)arg
+{
+  @autoreleasepool
+  {
+    [NSThread currentThread].name = @"XBMC_Run";
+
+    // signal the thread is alive
+    NSConditionLock* myLock = arg;
+    [myLock lock];
+
+    // Prevent child processes from becoming zombies on exit
+    // if not waited upon. See also Util::Command
+    struct sigaction sa;
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_flags = SA_NOCLDWAIT;
+    sa.sa_handler = SIG_IGN;
+    sigaction(SIGCHLD, &sa, NULL);
+
+    setlocale(LC_NUMERIC, "C");
+
+    int status = 0;
+    try
+    {
+      // set up some Kodi specific relationships
+      //    XBMC::Context run_context; //! @todo
+      m_appAlive = YES;
+      // start up with gui enabled
+      status = KODI_Run(true);
+      // we exited or died.
+      g_application.SetRenderGUI(false);
+    }
+    catch (...)
+    {
+      m_appAlive = FALSE;
+      CLog::Log(LOGERROR, "%sException caught on main loop status=%d. Exiting", __PRETTY_FUNCTION__,
+                status);
+    }
+
+    // signal the thread is dead
+    [myLock unlockWithCondition:TRUE];
+
+    [self enableScreenSaver];
+    [self performSelectorOnMainThread:@selector(CallExit) withObject:nil waitUntilDone:NO];
+  }
+}
+
+#pragma mark - KODI_Run
+
+int KODI_Run(bool renderGUI)
+{
+  int status = -1;
+
+  CAppParamParser appParamParser; //! @todo : proper params
+  if (!g_application.Create(appParamParser))
+  {
+    CLog::Log(LOGERROR, "ERROR: Unable to create application. Exiting");
+    return status;
+  }
+
+  //this can't be set from CAdvancedSettings::Initialize()
+  //because it will overwrite the loglevel set with the --debug flag
+#ifdef _DEBUG
+  CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_logLevel = LOG_LEVEL_DEBUG;
+  CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_logLevelHint = LOG_LEVEL_DEBUG;
+#else
+  CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_logLevel = LOG_LEVEL_NORMAL;
+  CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_logLevelHint = LOG_LEVEL_NORMAL;
+#endif
+  CLog::SetLogLevel(CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_logLevel);
+
+  // not a failure if returns false, just means someone
+  // did the init before us.
+  if (!CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->Initialized())
+  {
+    //CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->Initialize();
+    //! @todo
+  }
+
+  CAnnounceReceiver::GetInstance()->Initialize();
+
+  if (renderGUI && !g_application.CreateGUI())
+  {
+    CLog::Log(LOGERROR, "ERROR: Unable to create GUI. Exiting");
+    return status;
+  }
+  if (!g_application.Initialize())
+  {
+    CLog::Log(LOGERROR, "ERROR: Unable to Initialize. Exiting");
+    return status;
+  }
+
+  try
+  {
+    status = g_application.Run(appParamParser);
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "ERROR: Exception caught on main loop. Exiting");
+    status = -1;
+  }
+
+  return status;
+}
+
+- (void)CallExit
+{
+  exit(0);
+}
+
+- (AVDisplayManager*)avDisplayManager __attribute__((availability(tvos, introduced = 11.2)))
+{
+  return self.view.window.avDisplayManager;
+}
+
+#pragma mark - EAGLContext
+
+- (EAGLContext*)getEAGLContextObj
+{
+  return [glView getCurrentEAGLContext];
+}
+
+#pragma mark - remoteControlReceivedWithEvent forwarder
+//  remoteControlReceived requires subclassing of UIViewController
+//  Just implement as a forwarding class to CLibRemote so it doesnt need to subclass
+- (void)remoteControlReceivedWithEvent:(UIEvent*)receivedEvent
+{
+  if (receivedEvent.type == UIEventTypeRemoteControl)
+  {
+    [inputHandler.inputRemote remoteControlEvent:receivedEvent];
+  }
+}
+
+#pragma mark - init/deinit
+
+- (void)dealloc
+{
+  [displayManager removeModeSwitchObserver];
+  // stop background task (if running)
+  [self disableBackGroundTask:m_bgTask];
+
+  [self stopAnimation];
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (!self)
+    return nil;
+
+  m_pause = NO;
+  m_appAlive = NO;
+  m_animating = NO;
+
+  m_isPlayingBeforeInactive = NO;
+  m_bgTaskActive = NO;
+  m_bgTask = UIBackgroundTaskInvalid;
+
+  [self enableScreenSaver];
+
+  g_xbmcController = self;
+  MPNPInfoManager = [DarwinEmbedNowPlayingInfoManager new];
+  displayManager = [TVOSDisplayManager new];
+  inputHandler = [TVOSLibInputHandler new];
+
+  return self;
+}
+
+@end
+#undef BOOL

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/TVOSDirectory.cpp Added

@@ -0,0 +1,121 @@
+/*
+ *      Copyright (C) 2018 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MrMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "TVOSDirectory.h"
+
+#include "FileItem.h"
+#include "URL.h"
+#include "filesystem/SpecialProtocol.h"
+#include "utils/URIUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+
+#include "platform/darwin/ios-common/DarwinNSUserDefaults.h"
+#include "platform/darwin/tvos/filesystem/TVOSFile.h"
+#include "platform/darwin/tvos/filesystem/TVOSFileUtils.h"
+#include "platform/posix/filesystem/PosixDirectory.h"
+
+
+using namespace XFILE;
+
+bool CTVOSDirectory::WantsDirectory(const CURL& url)
+{
+  auto rootpath = CSpecialProtocol::TranslatePath(url);
+  auto found = rootpath.find(CTVOSFileUtils::GetUserHomeDirectory());
+  if (found == std::string::npos)
+    return false;
+
+  return true;
+}
+
+bool CTVOSDirectory::GetDirectory(const CURL& url, CFileItemList& items)
+{
+  // tvos keeps dirs and non-xml files in non-persistent Caches directory
+  // xml files are vectored into NSUserDefaults which is persistent, so
+  // we fetch dirs and non-xml files using CPosixDirectory, then fill
+  // in any missing xml files from NSUserDefaults. The incoming url
+  // will be a path, ending at some dir, so we only need to fetch any
+  // xml files that might be at that dir level.
+  bool rtn = CPosixDirectory::GetDirectory(url, items);
+  if (!rtn)
+    return false;
+
+  // To see user home xml files in the file manager,
+  // we have to populate a list on a directory request.
+  auto rootpath = CSpecialProtocol::TranslatePath(url);
+  // quick return check, we do not care if
+  // not going to user home.
+  auto found = rootpath.find(CTVOSFileUtils::GetUserHomeDirectory());
+  if (found == std::string::npos)
+    return rtn;
+
+  // The directory request will point to the right path '.../home/userdata/..'
+  // so we ask for files in ending directory, if we get xml file paths back
+  // then we are re-vectoring them to persistent storage and need to
+  // create CFileItems that will tranlate into CTVOSFile object later
+  // when accessed.
+
+  // GetDirectoryContents will return full paths
+  std::vector<std::string> contents;
+  CDarwinNSUserDefaults::GetDirectoryContents(rootpath, contents);
+  for (const auto& path : contents)
+  {
+    CFileItemPtr pItem(new CFileItem(URIUtils::GetFileName(path)));
+    // we only save files to persistent storage
+    pItem->m_bIsFolder = false;
+    // path must a full path, with no protocol
+    // or they will not get intercepted in CFileFactory
+    pItem->SetPath(path);
+    if (!(m_flags & DIR_FLAG_NO_FILE_INFO))
+    {
+      struct __stat64 buffer;
+      CTVOSFile tvOSFile;
+      CURL url2(pItem->GetPath());
+      if (tvOSFile.Stat(url2, &buffer) == 0)
+      {
+        // fake the datetime
+        KODI::TIME::FileTime fileTime, localTime;
+        KODI::TIME::TimeTToFileTime(buffer.st_mtime, &fileTime);
+        KODI::TIME::FileTimeToLocalFileTime(&fileTime, &localTime);
+        pItem->m_dateTime = localTime;
+        // all this to get the file size
+        pItem->m_dwSize = buffer.st_size;
+      }
+    }
+    items.Add(pItem);
+  }
+
+  return rtn || !contents.empty();
+}
+
+bool CTVOSDirectory::Create(const CURL& url)
+{
+  return CPosixDirectory::Create(url);
+}
+
+bool CTVOSDirectory::Exists(const CURL& url)
+{
+  return CPosixDirectory::Exists(url);
+}
+
+bool CTVOSDirectory::Remove(const CURL& url)
+{
+  return CPosixDirectory::Remove(url);
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/TVOSDirectory.h Added

@@ -0,0 +1,43 @@
+#pragma once
+/*
+ *      Copyright (C) 2018 Team MrMC
+ *      https://github.com/MrMC
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with MrMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "filesystem/IDirectory.h"
+
+#include "platform/posix/filesystem/PosixDirectory.h"
+
+class CFileItemList;
+
+namespace XFILE
+{
+class CTVOSDirectory : public CPosixDirectory
+{
+public:
+  CTVOSDirectory() = default;
+  ~CTVOSDirectory() = default;
+
+  bool static WantsDirectory(const CURL& url);
+
+  bool GetDirectory(const CURL& url, CFileItemList& items) override;
+  bool Create(const CURL& url) override;
+  bool Exists(const CURL& url) override;
+  bool Remove(const CURL& url) override;
+};
+} // namespace XFILE

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/TVOSFile.cpp Added

@@ -0,0 +1,268 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "TVOSFile.h"
+
+#include "filesystem/SpecialProtocol.h"
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+
+#include "platform/darwin/ios-common/DarwinNSUserDefaults.h"
+#include "platform/posix/filesystem/PosixFile.h"
+
+#include <sys/stat.h>
+
+using namespace XFILE;
+
+CTVOSFile::~CTVOSFile()
+{
+  Close();
+}
+
+bool CTVOSFile::WantsFile(const CURL& url)
+{
+  if (!StringUtils::EqualsNoCase(url.GetFileType(), "xml") ||
+      StringUtils::StartsWithNoCase(url.GetFileNameWithoutPath(), "customcontroller.SiriRemote"))
+    return false;
+  return CDarwinNSUserDefaults::IsKeyFromPath(url.Get());
+}
+
+int CTVOSFile::CacheStat(const CURL& url, struct __stat64* buffer)
+{
+  if (buffer != nullptr)
+  {
+    size_t size = 0;
+    // get the size from the data by passing in a nullptr
+    if (CDarwinNSUserDefaults::GetKeyDataFromPath(url.Get(), nullptr, size))
+    {
+      memset(buffer, 0, sizeof(struct __stat64));
+      // mimic stat
+      // rw for world
+      // regular file
+      buffer->st_flags = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWGRP | S_IWOTH | S_IFREG;
+      buffer->st_size = size;
+      buffer->st_blocks = 1; // we mimic one block
+      buffer->st_blksize = (blksize_t)size; // with full size
+      return 0;
+    }
+  }
+  errno = ENOENT;
+  return -1;
+}
+
+bool CTVOSFile::Open(const CURL& url)
+{
+  if (CDarwinNSUserDefaults::KeyFromPathExists(url.Get()))
+  {
+    m_url = url;
+    m_position = 0;
+    CacheStat(url, &m_cachedStat);
+    return true;
+  }
+  else
+  {
+    // fallback to posixfile
+    m_pFallbackFile = new CPosixFile();
+    return m_pFallbackFile->Open(url);
+  }
+}
+
+bool CTVOSFile::OpenForWrite(const CURL& url, bool bOverWrite /* = false */)
+{
+  if (CDarwinNSUserDefaults::KeyFromPathExists(url.Get()) && !bOverWrite)
+    return false; // no overwrite
+
+  bool ret = WantsFile(url); // if we want the file we can write it ...
+  if (ret)
+  {
+    m_url = url;
+    m_position = 0;
+  }
+  return ret;
+}
+
+bool CTVOSFile::Delete(const CURL& url)
+{
+  bool ret = CDarwinNSUserDefaults::DeleteKeyFromPath(url.Get(), true);
+
+  if (!ret)
+  {
+    CPosixFile posix;
+    ret = posix.Delete(url);
+  }
+  return ret;
+}
+
+bool CTVOSFile::Exists(const CURL& url)
+{
+  bool ret = CDarwinNSUserDefaults::KeyFromPathExists(url.Get());
+  if (!ret)
+  {
+    CPosixFile posix;
+    ret = posix.Exists(url);
+  }
+  return ret;
+}
+
+int CTVOSFile::Stat(const CURL& url, struct __stat64* buffer)
+{
+  int ret = CacheStat(url, buffer);
+  if (ret < 0)
+  {
+    CPosixFile posix;
+    ret = posix.Stat(url, buffer);
+  }
+  return ret;
+}
+
+bool CTVOSFile::Rename(const CURL& url, const CURL& urlnew)
+{
+  bool ret = false;
+  if (Exists(url) && !Exists(urlnew) && WantsFile(urlnew))
+  {
+    void* lpBuf = nullptr;
+    size_t uiBufSize = 0;
+    if (CDarwinNSUserDefaults::GetKeyDataFromPath(url.Get(), lpBuf,
+                                                  uiBufSize)) // get size from old file
+    {
+      lpBuf = static_cast<void*>(new char[uiBufSize]);
+      if (CDarwinNSUserDefaults::GetKeyDataFromPath(url.Get(), lpBuf, uiBufSize)) // read old file
+      {
+        if (CDarwinNSUserDefaults::SetKeyDataFromPath(urlnew.Get(), lpBuf, uiBufSize,
+                                                      true)) // write to new url
+        {
+          // remove old file
+          Delete(url);
+          ret = true;
+        }
+      }
+      delete[] static_cast<char*>(lpBuf);
+    }
+  }
+
+  if (!ret)
+  {
+    CPosixFile posix;
+    ret = posix.Rename(url, urlnew);
+  }
+  return ret;
+}
+
+int CTVOSFile::Stat(struct __stat64* buffer)
+{
+  memcpy(buffer, &m_cachedStat, sizeof(struct __stat64));
+  return 0;
+}
+
+ssize_t CTVOSFile::Read(void* lpBuf, size_t uiBufSize)
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->Read(lpBuf, uiBufSize);
+
+  void* lpBufInternal = nullptr;
+
+  if (m_position > 0 && m_position == GetLength())
+    return 0; // simulate read 0 bytes on EOF
+
+  if (CDarwinNSUserDefaults::GetKeyDataFromPath(m_url.Get(), lpBufInternal,
+                                                uiBufSize)) // read size of file
+  {
+    lpBufInternal = static_cast<void*>(new char[uiBufSize]);
+    if (CDarwinNSUserDefaults::GetKeyDataFromPath(m_url.Get(), lpBufInternal,
+                                                  uiBufSize)) // read file
+    {
+      memcpy(lpBuf, lpBufInternal, uiBufSize);
+    }
+    delete[] static_cast<char*>(lpBufInternal);
+    m_position = uiBufSize;
+  }
+  return uiBufSize;
+}
+
+ssize_t CTVOSFile::Write(const void* lpBuf, size_t uiBufSize)
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->Write(lpBuf, uiBufSize);
+
+  if (CDarwinNSUserDefaults::SetKeyDataFromPath(m_url.Get(), lpBuf, uiBufSize,
+                                                true)) // write to file
+  {
+    m_position = uiBufSize;
+    CacheStat(m_url, &m_cachedStat);
+    return uiBufSize;
+  }
+  return -1;
+}
+
+int64_t CTVOSFile::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/)
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->Seek(iFilePosition, iWhence);
+
+  errno = EINVAL;
+  return -1;
+}
+
+void CTVOSFile::Close()
+{
+  m_url.Reset();
+  m_position = -1;
+  memset(&m_cachedStat, 0, sizeof(m_cachedStat));
+  if (m_pFallbackFile != nullptr)
+  {
+    m_pFallbackFile->Close();
+    delete m_pFallbackFile;
+    m_pFallbackFile = nullptr;
+  }
+}
+
+int64_t CTVOSFile::GetPosition()
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->GetPosition();
+
+  return 0;
+}
+
+int64_t CTVOSFile::GetLength()
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->GetLength();
+  else
+    return m_cachedStat.st_size;
+}
+
+int CTVOSFile::GetChunkSize()
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->GetChunkSize();
+  else
+    return static_cast<int>(GetLength()); // only full file size can be read from nsuserdefaults...
+}
+
+int CTVOSFile::IoControl(EIoControl request, void* param)
+{
+  if (m_pFallbackFile != nullptr)
+    return m_pFallbackFile->IoControl(request, param);
+
+  if (request == IOCTRL_SEEK_POSSIBLE)
+    return 0; // no seek support
+  return -1;
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/TVOSFile.h Added

@@ -0,0 +1,62 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "URL.h"
+#include "filesystem/IFile.h"
+
+#include "platform/posix/filesystem/PosixFile.h"
+
+namespace XFILE
+{
+class CTVOSFile : public IFile
+{
+public:
+  CTVOSFile(){};
+  ~CTVOSFile();
+
+  bool static WantsFile(const CURL& url);
+
+  bool Open(const CURL& url) override;
+  bool Exists(const CURL& url) override;
+  int Stat(const CURL& url, struct __stat64* buffer) override;
+  int Stat(struct __stat64* buffer) override;
+  bool OpenForWrite(const CURL& url, bool bOverWrite = false) override;
+  bool Delete(const CURL& url) override;
+  bool Rename(const CURL& url, const CURL& urlnew) override;
+
+  ssize_t Read(void* lpBuf, size_t uiBufSize) override;
+  ssize_t Write(const void* lpBuf, size_t uiBufSize) override;
+  int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET) override;
+  void Close() override;
+  int64_t GetPosition() override;
+  int64_t GetLength() override;
+  int GetChunkSize() override;
+  int IoControl(EIoControl request, void* param) override;
+
+protected:
+  CURL m_url;
+  int64_t m_position = -1;
+  CPosixFile* m_pFallbackFile = nullptr;
+  struct __stat64 m_cachedStat;
+
+  int CacheStat(const CURL& url, struct __stat64* buffer);
+};
+} // namespace XFILE

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/TVOSFileUtils.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/filesystem/TVOSFileUtils.mm Added

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "TVOSFileUtils.h"
+
+#import "CompileInfo.h"
+#import "utils/URIUtils.h"
+
+#import <mutex>
+
+#import <Foundation/Foundation.h>
+
+const char* CTVOSFileUtils::GetUserHomeDirectory()
+{
+  static std::string appHomeFolder;
+  static std::once_flag dir_flag;
+
+  std::call_once(dir_flag, [] {
+    appHomeFolder = URIUtils::AddFileToFolder(GetOSCachesDirectory(), CCompileInfo::GetAppName());
+  });
+
+  return appHomeFolder.c_str();
+}
+
+const char* CTVOSFileUtils::GetOSCachesDirectory()
+{
+  static std::string cacheFolder;
+  static std::once_flag cache_flag;
+
+  std::call_once(cache_flag, [] {
+    NSString* cachePath =
+        NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).lastObject;
+    cacheFolder = cachePath.UTF8String;
+    URIUtils::RemoveSlashAtEnd(cacheFolder);
+  });
+  return cacheFolder.c_str();
+}

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputHandler.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputHandler.mm Added

@@ -0,0 +1,72 @@
+/*
+ *  Copyright (C) 2019- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "LibInputHandler.h"
+
+#include "Application.h"
+#include "ServiceBroker.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIWindowManager.h"
+#include "input/CustomControllerTranslator.h"
+#include "input/InputManager.h"
+#include "utils/log.h"
+
+#import "platform/darwin/tvos/input/LibInputRemote.h"
+#import "platform/darwin/tvos/input/LibInputSettings.h"
+#import "platform/darwin/tvos/input/LibInputTouch.h"
+
+@implementation TVOSLibInputHandler
+
+@synthesize inputRemote;
+@synthesize inputSettings;
+@synthesize inputTouch;
+
+#pragma mark - internal key press methods
+
+//! @Todo: factor out siriremote customcontroller to a setting?
+// allow to select multiple customcontrollers via setting list?
+- (void)sendButtonPressed:(int)buttonId
+{
+  int actionID;
+  std::string actionName;
+
+  // Translate using custom controller translator.
+  if (CServiceBroker::GetInputManager().TranslateCustomControllerString(
+          CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindowOrDialog(), "SiriRemote",
+          buttonId, actionID, actionName))
+  {
+    // break screensaver
+    g_application.ResetSystemIdleTimer();
+    g_application.ResetScreenSaver();
+
+    // in case we wokeup the screensaver or screen - eat that action...
+    if (g_application.WakeUpScreenSaverAndDPMS())
+      return;
+    CServiceBroker::GetInputManager().QueueAction(CAction(actionID, 1.0f, 0.0f, actionName));
+  }
+  else
+  {
+    CLog::Log(LOGDEBUG, "ERROR mapping customcontroller action. CustomController: %s %i",
+              "SiriRemote", buttonId);
+  }
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  if (!self)
+    return nil;
+
+  inputRemote = [TVOSLibInputRemote new];
+  inputSettings = [TVOSLibInputSettings new];
+  inputTouch = [TVOSLibInputTouch new];
+
+  return self;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputRemote.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputRemote.mm Added

@@ -0,0 +1,160 @@
+/*
+ *  Copyright (C) 2019- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "LibInputRemote.h"
+
+#include "Application.h"
+#include "ServiceBroker.h"
+#include "input/actions/Action.h"
+#include "messaging/ApplicationMessenger.h"
+#import "windowing/tvos/WinSystemTVOS.h"
+
+#import "platform/darwin/tvos/XBMCController.h"
+#import "platform/darwin/tvos/input/LibInputHandler.h"
+#import "platform/darwin/tvos/input/LibInputSettings.h"
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIEvent.h>
+
+@implementation TVOSLibInputRemote
+
+@synthesize remoteIdleState = m_remoteIdleState;
+
+// Default Timer values (seconds)
+NSTimeInterval REPEATED_KEYPRESS_DELAY_S = 0.50;
+NSTimeInterval REPEATED_KEYPRESS_PAUSE_S = 0.05;
+
+#pragma mark - remote idle timer
+
+- (void)startRemoteTimer
+{
+  m_remoteIdleState = false;
+
+  if (m_remoteIdleTimer != nil)
+    [self stopRemoteTimer];
+  if (g_xbmcController.inputHandler.inputSettings.remoteIdleEnabled)
+  {
+    auto fireDate = [NSDate
+        dateWithTimeIntervalSinceNow:g_xbmcController.inputHandler.inputSettings.remoteIdleTimeout];
+    auto timer = [[NSTimer alloc] initWithFireDate:fireDate
+                                          interval:0.0
+                                            target:self
+                                          selector:@selector(setRemoteIdleState)
+                                          userInfo:nil
+                                           repeats:NO];
+
+    [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
+    m_remoteIdleTimer = timer;
+  }
+}
+
+- (void)stopRemoteTimer
+{
+  [m_remoteIdleTimer invalidate];
+  m_remoteIdleTimer = nil;
+  m_remoteIdleState = NO;
+}
+
+- (void)setRemoteIdleState
+{
+  m_remoteIdleState = YES;
+}
+
+#pragma mark - key press auto-repeat methods
+
+- (void)startKeyPressTimer:(int)keyId
+{
+  [self startKeyPressTimer:keyId clickTime:REPEATED_KEYPRESS_PAUSE_S];
+}
+
+- (void)startKeyPressTimer:(int)keyId clickTime:(NSTimeInterval)interval
+{
+  if (m_pressAutoRepeatTimer != nil)
+    [self stopKeyPressTimer];
+
+  [g_xbmcController.inputHandler sendButtonPressed:keyId];
+
+  NSNumber* number = @(keyId);
+  auto fireDate = [NSDate dateWithTimeIntervalSinceNow:REPEATED_KEYPRESS_DELAY_S];
+
+  // schedule repeated timer which starts after REPEATED_KEYPRESS_DELAY_S
+  // and fires every REPEATED_KEYPRESS_PAUSE_S
+  auto timer = [[NSTimer alloc] initWithFireDate:fireDate
+                                        interval:interval
+                                          target:self
+                                        selector:@selector(keyPressTimerCallback:)
+                                        userInfo:number
+                                         repeats:YES];
+
+  // schedule the timer to the runloop
+  [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
+  m_pressAutoRepeatTimer = timer;
+}
+
+- (void)stopKeyPressTimer
+{
+  [m_pressAutoRepeatTimer invalidate];
+  m_pressAutoRepeatTimer = nil;
+}
+
+- (void)keyPressTimerCallback:(NSTimer*)theTimer
+{
+  // if queue is empty - skip this timer event before letting it process
+  CWinSystemTVOS* winSystem(dynamic_cast<CWinSystemTVOS*>(CServiceBroker::GetWinSystem()));
+  if (!winSystem->GetQueueSize())
+    [g_xbmcController.inputHandler sendButtonPressed:[theTimer.userInfo intValue]];
+}
+
+#pragma mark - remoteControlEventwith
+
+- (void)remoteControlEvent:(UIEvent*)receivedEvent
+{
+  switch (receivedEvent.subtype)
+  {
+    case UIEventSubtypeRemoteControlTogglePlayPause:
+      KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(
+          TMSG_GUI_ACTION, WINDOW_INVALID, -1,
+          static_cast<void*>(new CAction(ACTION_PLAYER_PLAYPAUSE)));
+      break;
+    case UIEventSubtypeRemoteControlPlay:
+      [g_xbmcController.inputHandler sendButtonPressed:13];
+      break;
+    case UIEventSubtypeRemoteControlPause:
+      [g_xbmcController.inputHandler sendButtonPressed:14];
+      break;
+    case UIEventSubtypeRemoteControlStop:
+      [g_xbmcController.inputHandler sendButtonPressed:15];
+      break;
+    case UIEventSubtypeRemoteControlNextTrack:
+      [g_xbmcController.inputHandler sendButtonPressed:16];
+      break;
+    case UIEventSubtypeRemoteControlPreviousTrack:
+      [g_xbmcController.inputHandler sendButtonPressed:17];
+      break;
+    case UIEventSubtypeRemoteControlBeginSeekingForward:
+      [g_xbmcController.inputHandler sendButtonPressed:18];
+      break;
+    case UIEventSubtypeRemoteControlBeginSeekingBackward:
+      [g_xbmcController.inputHandler sendButtonPressed:19];
+      break;
+    case UIEventSubtypeRemoteControlEndSeekingForward:
+    case UIEventSubtypeRemoteControlEndSeekingBackward:
+      // restore to normal playback speed.
+      if (g_application.GetAppPlayer().IsPlaying() && !g_application.GetAppPlayer().IsPaused())
+        KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(
+            TMSG_GUI_ACTION, WINDOW_INVALID, -1,
+            static_cast<void*>(new CAction(ACTION_PLAYER_PLAY)));
+      break;
+    default:
+      break;
+  }
+  // start remote timeout
+  [self startRemoteTimer];
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputSettings.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputSettings.mm Added

@@ -0,0 +1,39 @@
+/*
+ *  Copyright (C) 2019- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "LibInputSettings.h"
+
+#import "platform/darwin/tvos/XBMCController.h"
+#import "platform/darwin/tvos/input/LibInputHandler.h"
+#import "platform/darwin/tvos/input/LibInputRemote.h"
+
+#import <Foundation/Foundation.h>
+
+@implementation TVOSLibInputSettings
+
+@synthesize useSiriRemote = m_useSiriRemote;
+@synthesize remoteIdleEnabled = m_remoteIdleEnabled;
+@synthesize remoteIdleTimeout = m_remoteIdleTimeout;
+
+- (void)setRemoteIdleEnabled:(BOOL)idle
+{
+  if (m_remoteIdleEnabled != idle)
+  {
+    m_remoteIdleEnabled = idle;
+    if (m_remoteIdleEnabled == YES)
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+  }
+}
+
+- (void)setRemoteIdleTimeout:(int)timeout
+{
+  m_remoteIdleTimeout = timeout;
+  [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputTouch.h Added

@@ -0,0 +1,56 @@
+/*
+ *  Copyright (C) 2019- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSUInteger, UIPanGestureRecognizerDirection) {
+  UIPanGestureRecognizerDirectionUndefined,
+  UIPanGestureRecognizerDirectionUp,
+  UIPanGestureRecognizerDirectionDown,
+  UIPanGestureRecognizerDirectionLeft,
+  UIPanGestureRecognizerDirectionRight
+};
+
+@interface TVOSLibInputTouch : NSObject <UIGestureRecognizerDelegate>
+{
+  UIPanGestureRecognizerDirection m_direction;
+  BOOL m_directionOverride;
+  CGPoint m_lastGesturePoint;
+  unsigned long m_touchDirection;
+  BOOL m_touchBeginSignaled;
+}
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer
+    shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer*)otherGestureRecognizer;
+- (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer
+       shouldReceivePress:(UIPress*)press;
+- (void)createSwipeGestureRecognizers;
+- (void)createPanGestureRecognizers;
+- (void)createTapGesturecognizers;
+- (void)createPressGesturecognizers;
+- (void)menuPressed:(UITapGestureRecognizer*)sender;
+- (void)SiriLongSelectHandler:(UIGestureRecognizer*)sender;
+- (void)SiriSelectHandler:(UITapGestureRecognizer*)sender;
+- (void)playPausePressed:(UITapGestureRecognizer*)sender;
+- (void)longPlayPausePressed:(UILongPressGestureRecognizer*)sender;
+- (void)doublePlayPausePressed:(UITapGestureRecognizer*)sender;
+- (void)SiriDoubleSelectHandler:(UITapGestureRecognizer*)sender;
+- (IBAction)IRRemoteUpArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)IRRemoteDownArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)IRRemoteLeftArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)IRRemoteRightArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)tapUpArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)tapDownArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)tapLeftArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)tapRightArrowPressed:(UIGestureRecognizer*)sender;
+- (IBAction)handlePan:(UIPanGestureRecognizer*)sender;
+- (IBAction)handleSwipe:(UISwipeGestureRecognizer*)sender;
+- (UIPanGestureRecognizerDirection)getPanDirection:(CGPoint)translation;
+- (BOOL)shouldFastScroll;
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/input/LibInputTouch.mm Added

@@ -0,0 +1,646 @@
+/*
+ *  Copyright (C) 2019- Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "LibInputTouch.h"
+
+#include "Application.h"
+#include "ServiceBroker.h"
+#include "guilib/GUIComponent.h"
+#include "guilib/GUIWindowManager.h"
+#include "utils/log.h"
+
+#import "platform/darwin/tvos/TVOSEAGLView.h"
+#import "platform/darwin/tvos/XBMCController.h"
+#import "platform/darwin/tvos/input/LibInputHandler.h"
+#import "platform/darwin/tvos/input/LibInputRemote.h"
+#import "platform/darwin/tvos/input/LibInputSettings.h"
+
+#include <tuple>
+
+#import <UIKit/UIKit.h>
+
+@class XBMCController;
+
+@implementation TVOSLibInputTouch
+
+#pragma mark - gesture methods
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer
+    shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer*)otherGestureRecognizer
+{
+  if ([gestureRecognizer isKindOfClass:[UISwipeGestureRecognizer class]] &&
+      [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]])
+  {
+    return YES;
+  }
+  if ([gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] &&
+      [otherGestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]])
+  {
+    return YES;
+  }
+  if ([gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]] &&
+      [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]])
+  {
+    return YES;
+  }
+  return NO;
+}
+
+// called before pressesBegan:withEvent: is called on the gesture recognizer
+// for a new press. return NO to prevent the gesture recognizer from seeing this press
+- (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer shouldReceivePress:(UIPress*)press
+{
+  BOOL handled = YES;
+  switch (press.type)
+  {
+    // single press key, but also detect hold and back to tvos.
+    case UIPressTypeMenu:
+      // menu is special.
+      //  a) if at our home view, should return to atv home screen.
+      //  b) if not, let it pass to us.
+      if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_HOME &&
+          !CServiceBroker::GetGUI()->GetWindowManager().HasVisibleModalDialog() &&
+          !g_application.GetAppPlayer().IsPlaying())
+        handled = NO;
+      break;
+
+    // single press keys
+    case UIPressTypeSelect:
+    case UIPressTypePlayPause:
+      break;
+
+    // auto-repeat keys
+    case UIPressTypeUpArrow:
+    case UIPressTypeDownArrow:
+    case UIPressTypeLeftArrow:
+    case UIPressTypeRightArrow:
+      break;
+
+    default:
+      handled = NO;
+  }
+
+  return handled;
+}
+
+- (void)createSwipeGestureRecognizers
+{
+  for (auto swipeDirection :
+       {UISwipeGestureRecognizerDirectionLeft, UISwipeGestureRecognizerDirectionRight,
+        UISwipeGestureRecognizerDirectionUp, UISwipeGestureRecognizerDirectionDown})
+  {
+    auto swipeRecognizer =
+        [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleSwipe:)];
+    swipeRecognizer.delaysTouchesBegan = NO;
+    swipeRecognizer.direction = swipeDirection;
+    swipeRecognizer.delegate = self;
+    [g_xbmcController.glView addGestureRecognizer:swipeRecognizer];
+  }
+}
+
+- (void)createPanGestureRecognizers
+{
+  // for pan gestures with one finger
+  auto pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)];
+  pan.delegate = self;
+  [g_xbmcController.glView addGestureRecognizer:pan];
+}
+
+- (void)createTapGesturecognizers
+{
+  // tap side of siri remote pad
+  for (auto t : {
+         std::make_tuple(UIPressTypeUpArrow, @selector(tapUpArrowPressed:),
+                         @selector(IRRemoteUpArrowPressed:)),
+             std::make_tuple(UIPressTypeDownArrow, @selector(tapDownArrowPressed:),
+                             @selector(IRRemoteDownArrowPressed:)),
+             std::make_tuple(UIPressTypeLeftArrow, @selector(tapLeftArrowPressed:),
+                             @selector(IRRemoteLeftArrowPressed:)),
+             std::make_tuple(UIPressTypeRightArrow, @selector(tapRightArrowPressed:),
+                             @selector(IRRemoteRightArrowPressed:))
+       })
+  {
+    auto allowedPressTypes = @[ @(std::get<0>(t)) ];
+
+    auto arrowRecognizer =
+        [[UITapGestureRecognizer alloc] initWithTarget:self action:std::get<1>(t)];
+    arrowRecognizer.allowedPressTypes = allowedPressTypes;
+    arrowRecognizer.delegate = self;
+    [g_xbmcController.glView addGestureRecognizer:arrowRecognizer];
+
+    // @todo doesn't seem to work
+    // we need UILongPressGestureRecognizer here because it will give
+    // UIGestureRecognizerStateBegan AND UIGestureRecognizerStateEnded
+    // even if we hold down for a long time. UITapGestureRecognizer
+    // will eat the ending on long holds and we never see it.
+    auto longArrowRecognizer =
+        [[UILongPressGestureRecognizer alloc] initWithTarget:self action:std::get<2>(t)];
+    longArrowRecognizer.allowedPressTypes = allowedPressTypes;
+    longArrowRecognizer.minimumPressDuration = 0.01;
+    longArrowRecognizer.delegate = self;
+    [g_xbmcController.glView addGestureRecognizer:longArrowRecognizer];
+  }
+}
+
+- (void)createPressGesturecognizers
+{
+  auto menuRecognizer =
+      [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(menuPressed:)];
+  menuRecognizer.allowedPressTypes = @[ @(UIPressTypeMenu) ];
+  menuRecognizer.delegate = self;
+  [g_xbmcController.glView addGestureRecognizer:menuRecognizer];
+
+  auto playPauseTypes = @[ @(UIPressTypePlayPause) ];
+  auto playPauseRecognizer =
+      [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(playPausePressed:)];
+  playPauseRecognizer.allowedPressTypes = playPauseTypes;
+  playPauseRecognizer.delegate = self;
+  [g_xbmcController.glView addGestureRecognizer:playPauseRecognizer];
+
+  auto doublePlayPauseRecognizer =
+      [[UITapGestureRecognizer alloc] initWithTarget:self
+                                              action:@selector(doublePlayPausePressed:)];
+  doublePlayPauseRecognizer.allowedPressTypes = playPauseTypes;
+  doublePlayPauseRecognizer.numberOfTapsRequired = 2;
+  doublePlayPauseRecognizer.delegate = self;
+  [g_xbmcController.glView.gestureRecognizers.lastObject
+      requireGestureRecognizerToFail:doublePlayPauseRecognizer];
+  [g_xbmcController.glView addGestureRecognizer:doublePlayPauseRecognizer];
+
+  auto longPlayPauseRecognizer =
+      [[UILongPressGestureRecognizer alloc] initWithTarget:self
+                                                    action:@selector(longPlayPausePressed:)];
+  longPlayPauseRecognizer.allowedPressTypes = playPauseTypes;
+  longPlayPauseRecognizer.delegate = self;
+  [g_xbmcController.glView addGestureRecognizer:longPlayPauseRecognizer];
+
+  auto selectTypes = @[ @(UIPressTypeSelect) ];
+  auto longSelectRecognizer =
+      [[UILongPressGestureRecognizer alloc] initWithTarget:self
+                                                    action:@selector(SiriLongSelectHandler:)];
+  longSelectRecognizer.allowedPressTypes = selectTypes;
+  longSelectRecognizer.minimumPressDuration = 0.001;
+  longSelectRecognizer.delegate = self;
+  [g_xbmcController.glView addGestureRecognizer:longSelectRecognizer];
+
+  auto selectRecognizer =
+      [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(SiriSelectHandler:)];
+  selectRecognizer.allowedPressTypes = selectTypes;
+  selectRecognizer.delegate = self;
+  [longSelectRecognizer requireGestureRecognizerToFail:selectRecognizer];
+  [g_xbmcController.glView addGestureRecognizer:selectRecognizer];
+
+  auto doubleSelectRecognizer =
+      [[UITapGestureRecognizer alloc] initWithTarget:self
+                                              action:@selector(SiriDoubleSelectHandler:)];
+  doubleSelectRecognizer.allowedPressTypes = selectTypes;
+  doubleSelectRecognizer.numberOfTapsRequired = 2;
+  doubleSelectRecognizer.delegate = self;
+  [longSelectRecognizer requireGestureRecognizerToFail:doubleSelectRecognizer];
+  [g_xbmcController.glView.gestureRecognizers.lastObject
+      requireGestureRecognizerToFail:doubleSelectRecognizer];
+  [g_xbmcController.glView addGestureRecognizer:doubleSelectRecognizer];
+}
+
+- (void)menuPressed:(UITapGestureRecognizer*)sender
+{
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateBegan:
+      break;
+    case UIGestureRecognizerStateChanged:
+      break;
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler sendButtonPressed:6];
+
+      // start remote timeout
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+      break;
+    default:
+      break;
+  }
+}
+
+- (void)SiriLongSelectHandler:(UIGestureRecognizer*)sender
+{
+  if (sender.state == UIGestureRecognizerStateBegan)
+  {
+    [g_xbmcController.inputHandler sendButtonPressed:7];
+    [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+  }
+}
+
+- (void)SiriSelectHandler:(UITapGestureRecognizer*)sender
+{
+  CLog::Log(LOGDEBUG, "SiriSelectHandler");
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler sendButtonPressed:5];
+      break;
+    default:
+      break;
+  }
+}
+
+- (void)playPausePressed:(UITapGestureRecognizer*)sender
+{
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateBegan:
+      break;
+    case UIGestureRecognizerStateChanged:
+      break;
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler sendButtonPressed:12];
+      // start remote timeout
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+      break;
+    default:
+      break;
+  }
+}
+
+- (void)longPlayPausePressed:(UILongPressGestureRecognizer*)sender
+{
+  CLog::Log(LOGDEBUG, "Input: play/pause long press, state: %ld", static_cast<long>(sender.state));
+}
+
+- (void)doublePlayPausePressed:(UITapGestureRecognizer*)sender
+{
+  // state is only UIGestureRecognizerStateBegan and UIGestureRecognizerStateEnded
+  CLog::Log(LOGDEBUG, "Input: play/pause double press");
+}
+
+- (void)SiriDoubleSelectHandler:(UITapGestureRecognizer*)sender
+{
+  CLog::Log(LOGDEBUG, "Input: select double press");
+}
+
+#pragma mark - IR Arrows Pressed
+
+- (IBAction)IRRemoteUpArrowPressed:(UIGestureRecognizer*)sender
+{
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateBegan:
+      [g_xbmcController.inputHandler.inputRemote startKeyPressTimer:1];
+      break;
+    case UIGestureRecognizerStateChanged:
+      break;
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler.inputRemote stopKeyPressTimer];
+      // start remote timeout
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+      break;
+    default:
+      break;
+  }
+}
+
+- (IBAction)IRRemoteDownArrowPressed:(UIGestureRecognizer*)sender
+{
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateBegan:
+      [g_xbmcController.inputHandler.inputRemote startKeyPressTimer:2];
+      break;
+    case UIGestureRecognizerStateChanged:
+      break;
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler.inputRemote stopKeyPressTimer];
+      // start remote timeout
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+      break;
+    default:
+      break;
+  }
+}
+
+- (IBAction)IRRemoteLeftArrowPressed:(UIGestureRecognizer*)sender
+{
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateBegan:
+      [g_xbmcController.inputHandler.inputRemote startKeyPressTimer:3];
+      break;
+    case UIGestureRecognizerStateChanged:
+      break;
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler.inputRemote stopKeyPressTimer];
+      // start remote timeout
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+      break;
+    default:
+      break;
+  }
+}
+
+- (IBAction)IRRemoteRightArrowPressed:(UIGestureRecognizer*)sender
+{
+  switch (sender.state)
+  {
+    case UIGestureRecognizerStateBegan:
+      [g_xbmcController.inputHandler.inputRemote startKeyPressTimer:4];
+      break;
+    case UIGestureRecognizerStateChanged:
+      break;
+    case UIGestureRecognizerStateEnded:
+      [g_xbmcController.inputHandler.inputRemote stopKeyPressTimer];
+      // start remote timeout
+      [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+      break;
+    default:
+      break;
+  }
+}
+
+#pragma mark - Tap Arrows
+
+- (IBAction)tapUpArrowPressed:(UIGestureRecognizer*)sender
+{
+  if (!g_xbmcController.inputHandler.inputRemote.remoteIdleState)
+    [g_xbmcController.inputHandler sendButtonPressed:1];
+
+  [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+}
+
+- (IBAction)tapDownArrowPressed:(UIGestureRecognizer*)sender
+{
+  if (!g_xbmcController.inputHandler.inputRemote.remoteIdleState)
+    [g_xbmcController.inputHandler sendButtonPressed:2];
+
+  [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+}
+
+- (IBAction)tapLeftArrowPressed:(UIGestureRecognizer*)sender
+{
+  if (!g_xbmcController.inputHandler.inputRemote.remoteIdleState)
+    [g_xbmcController.inputHandler sendButtonPressed:3];
+
+  [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+}
+
+- (IBAction)tapRightArrowPressed:(UIGestureRecognizer*)sender
+{
+  if (!g_xbmcController.inputHandler.inputRemote.remoteIdleState)
+    [g_xbmcController.inputHandler sendButtonPressed:4];
+
+  [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+}
+
+#pragma mark - Pan
+
+- (IBAction)handlePan:(UIPanGestureRecognizer*)sender
+{
+  if (g_xbmcController.inputHandler.inputRemote.remoteIdleState)
+    return;
+
+  if (!g_xbmcController.appAlive) //NO GESTURES BEFORE WE ARE UP AND RUNNING
+    return;
+
+  if ([g_xbmcController.inputHandler.inputSettings useSiriRemote])
+  {
+    static UIPanGestureRecognizerDirection direction = UIPanGestureRecognizerDirectionUndefined;
+    // speed       == how many clicks full swipe will give us(1000x1000px)
+    // minVelocity == min velocity to trigger fast scroll, add this to settings?
+    float speed = 240.0f;
+    float minVelocity = 1300.0f;
+    switch (sender.state)
+    {
+
+      case UIGestureRecognizerStateBegan:
+      {
+
+        if (direction == UIPanGestureRecognizerDirectionUndefined)
+        {
+          m_lastGesturePoint = [sender translationInView:sender.view];
+          m_lastGesturePoint.x = m_lastGesturePoint.x / 1.92;
+          m_lastGesturePoint.y = m_lastGesturePoint.y / 1.08;
+
+          m_direction = [self getPanDirection:m_lastGesturePoint];
+          m_directionOverride = false;
+        }
+        break;
+      }
+      case UIGestureRecognizerStateChanged:
+      {
+        CGPoint gesturePoint = [sender translationInView:sender.view];
+        gesturePoint.x = gesturePoint.x / 1.92;
+        gesturePoint.y = gesturePoint.y / 1.08;
+
+        CGPoint gestureMovement;
+        gestureMovement.x = gesturePoint.x - m_lastGesturePoint.x;
+        gestureMovement.y = gesturePoint.y - m_lastGesturePoint.y;
+        direction = [self getPanDirection:gestureMovement];
+
+        CGPoint velocity = [sender velocityInView:sender.view];
+        CGFloat velocityX = (0.2 * velocity.x);
+        CGFloat velocityY = (0.2 * velocity.y);
+
+        if (ABS(velocityY) > minVelocity || ABS(velocityX) > minVelocity || m_directionOverride)
+        {
+          direction = m_direction;
+          // Override direction to correct swipe errors
+          m_directionOverride = true;
+        }
+        switch (direction)
+        {
+          case UIPanGestureRecognizerDirectionUp:
+          {
+            if ((ABS(m_lastGesturePoint.y - gesturePoint.y) > speed) ||
+                ABS(velocityY) > minVelocity)
+            {
+              [g_xbmcController.inputHandler sendButtonPressed:8];
+              if (ABS(velocityY) > minVelocity && [self shouldFastScroll])
+                [g_xbmcController.inputHandler sendButtonPressed:8];
+
+              m_lastGesturePoint = gesturePoint;
+            }
+            break;
+          }
+          case UIPanGestureRecognizerDirectionDown:
+          {
+            if ((ABS(m_lastGesturePoint.y - gesturePoint.y) > speed) ||
+                ABS(velocityY) > minVelocity)
+            {
+              [g_xbmcController.inputHandler sendButtonPressed:9];
+              if (ABS(velocityY) > minVelocity && [self shouldFastScroll])
+                [g_xbmcController.inputHandler sendButtonPressed:9];
+
+              m_lastGesturePoint = gesturePoint;
+            }
+            break;
+          }
+          case UIPanGestureRecognizerDirectionLeft:
+          {
+            // add 80 px to slow left/right swipes, it matched up down better
+            if ((ABS(m_lastGesturePoint.x - gesturePoint.x) > speed + 80) ||
+                ABS(velocityX) > minVelocity)
+            {
+              [g_xbmcController.inputHandler sendButtonPressed:10];
+              if (ABS(velocityX) > minVelocity && [self shouldFastScroll])
+                [g_xbmcController.inputHandler sendButtonPressed:10];
+
+              m_lastGesturePoint = gesturePoint;
+            }
+            break;
+          }
+          case UIPanGestureRecognizerDirectionRight:
+          {
+            // add 80 px to slow left/right swipes, it matched up down better
+            if ((ABS(m_lastGesturePoint.x - gesturePoint.x) > speed + 80) ||
+                ABS(velocityX) > minVelocity)
+            {
+              [g_xbmcController.inputHandler sendButtonPressed:11];
+              if (ABS(velocityX) > minVelocity && [self shouldFastScroll])
+                [g_xbmcController.inputHandler sendButtonPressed:11];
+
+              m_lastGesturePoint = gesturePoint;
+            }
+            break;
+          }
+          default:
+            break;
+        }
+      }
+      case UIGestureRecognizerStateEnded:
+      {
+        direction = UIPanGestureRecognizerDirectionUndefined;
+        // start remote idle timer
+        [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  else // dont mimic apple siri remote
+  {
+    switch (sender.state)
+    {
+      case UIGestureRecognizerStateBegan:
+      {
+        m_touchBeginSignaled = false;
+        break;
+      }
+      case UIGestureRecognizerStateChanged:
+      {
+        int keyId = 0;
+        if (!m_touchBeginSignaled && m_touchDirection)
+        {
+          switch (m_touchDirection)
+          {
+            case UISwipeGestureRecognizerDirectionRight:
+            {
+              keyId = 11;
+              break;
+            }
+            case UISwipeGestureRecognizerDirectionLeft:
+            {
+              keyId = 10;
+              break;
+            }
+            case UISwipeGestureRecognizerDirectionUp:
+            {
+              keyId = 8;
+              break;
+            }
+            case UISwipeGestureRecognizerDirectionDown:
+            {
+              keyId = 9;
+              break;
+            }
+            default:
+              break;
+          }
+          m_touchBeginSignaled = true;
+          [g_xbmcController.inputHandler.inputRemote startKeyPressTimer:keyId];
+        }
+        break;
+      }
+      case UIGestureRecognizerStateEnded:
+      case UIGestureRecognizerStateCancelled:
+      {
+        if (m_touchBeginSignaled)
+        {
+          m_touchBeginSignaled = false;
+          m_touchDirection = NULL;
+          [g_xbmcController.inputHandler.inputRemote stopKeyPressTimer];
+        }
+        // start remote idle timer
+        [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+        break;
+      }
+      default:
+        break;
+    }
+  }
+}
+
+- (IBAction)handleSwipe:(UISwipeGestureRecognizer*)sender
+{
+  if (!g_xbmcController.inputHandler.inputRemote.remoteIdleState)
+    m_touchDirection = sender.direction;
+
+  // start remote idle timer
+  [g_xbmcController.inputHandler.inputRemote startRemoteTimer];
+}
+
+- (UIPanGestureRecognizerDirection)getPanDirection:(CGPoint)translation
+{
+  int x = static_cast<int>(translation.x);
+  int y = static_cast<int>(translation.y);
+  int absX = x;
+  int absY = y;
+
+  if (absX < 0)
+    absX *= -1;
+
+  if (absY < 0)
+    absY *= -1;
+
+  bool horizontal, veritical;
+  horizontal = (absX > absY);
+  veritical = !horizontal;
+
+  // Determine up, down, right, or left:
+  bool swipe_up, swipe_down, swipe_left, swipe_right;
+  swipe_left = (horizontal && x < 0);
+  swipe_right = (horizontal && x >= 0);
+  swipe_up = (veritical && y < 0);
+  swipe_down = (veritical && y >= 0);
+
+  if (swipe_down)
+    return UIPanGestureRecognizerDirectionDown;
+  if (swipe_up)
+    return UIPanGestureRecognizerDirectionUp;
+  if (swipe_left)
+    return UIPanGestureRecognizerDirectionLeft;
+  if (swipe_right)
+    return UIPanGestureRecognizerDirectionRight;
+
+  return UIPanGestureRecognizerDirectionUndefined;
+}
+
+#pragma mark - Private Functions
+
+- (BOOL)shouldFastScroll
+{
+  // we dont want fast scroll in below windows, no point in going 15 places in home screen
+  int window = CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow();
+
+  if (window == WINDOW_HOME || window == WINDOW_FULLSCREEN_LIVETV ||
+      window == WINDOW_FULLSCREEN_VIDEO || window == WINDOW_FULLSCREEN_RADIO ||
+      (window >= WINDOW_SETTINGS_START && window <= WINDOW_SETTINGS_SERVICE))
+    return NO;
+
+  return YES;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/tvosShared.h Added

_service:download_files:master.tar.gz/xbmc/platform/darwin/tvos/tvosShared.m Added

@@ -0,0 +1,63 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#import "tvosShared.h"
+
+@implementation tvosShared
+
++ (NSString*)getSharedID
+{
+  return [@"group." stringByAppendingString:[self mainAppBundle].bundleIdentifier];
+}
+
++ (NSURL*)getSharedURL
+{
+  NSString* sharedID = [self getSharedID];
+  if ([self isJailbroken])
+    return [[NSURL fileURLWithPath:@"/var/mobile/Library/Caches"]
+        URLByAppendingPathComponent:sharedID];
+  else
+  {
+    NSFileManager* fileManager = [NSFileManager defaultManager];
+    NSURL* sharedUrl = [fileManager containerURLForSecurityApplicationGroupIdentifier:sharedID];
+    sharedUrl = [sharedUrl URLByAppendingPathComponent:@"Library" isDirectory:YES];
+    sharedUrl = [sharedUrl URLByAppendingPathComponent:@"Caches" isDirectory:YES];
+    return sharedUrl;
+  }
+}
+
++ (BOOL)IsTVOSSandboxed
+{
+  // @todo merge with CDarwinUtils::IsIosSandboxed
+  static BOOL ret;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // we re NOT sandboxed if we are installed in /var/mobile/Applications with greeng0blin jailbreak
+    ret = ![[self mainAppBundle].bundlePath containsString:@"/var/mobile/Applications/"];
+  });
+  return ret;
+}
+
++ (BOOL)isJailbroken
+{
+  return ![self IsTVOSSandboxed];
+}
+
++ (NSBundle*)mainAppBundle
+{
+  NSBundle* bundle = NSBundle.mainBundle;
+  if ([bundle.bundleURL.pathExtension isEqualToString:@"appex"])
+  { // We're in a extension
+    // Peel off two directory levels - Kodi.app/PlugIns/MY_APP_EXTENSION.appex
+    bundle = [NSBundle bundleWithURL:bundle.bundleURL.URLByDeletingLastPathComponent
+                                         .URLByDeletingLastPathComponent];
+  }
+  return bundle;
+}
+
+@end

_service:download_files:master.tar.gz/xbmc/platform/freebsd/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/freebsd/CPUInfoFreebsd.cpp Changed

@@ -14,6 +14,12 @@
 #include <array>
 #include <vector>
 
+#if defined(__i386__) || defined(__x86_64__)
+#include <cpuid.h>
+#elif __has_include(<sys/auxv.h>)
+#include <sys/auxv.h>
+#endif
+
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
@@ -54,12 +60,110 @@
   if (sysctlbyname("hw.model", cpuModel.data(), &length, nullptr, 0) == 0)
     m_cpuModel = cpuModel.data();
 
-  for (int i = 0; i < m_cpuCount; i++)
+  for (size_t i = 0; i < m_cpuCount; i++)
   {
     CoreInfo core;
     core.m_id = i;
     m_cores.emplace_back(core);
   }
+#if defined(__i386__) || defined(__x86_64__)
+  uint32_t eax, ebx, ecx, edx;
+
+  m_cpuVendor.clear();
+
+  if (__get_cpuid(CPUID_INFOTYPE_MANUFACTURER, &eax, &ebx, &ecx, &edx))
+  {
+    m_cpuVendor.append(reinterpret_cast<const char*>(&ebx), 4);
+    m_cpuVendor.append(reinterpret_cast<const char*>(&edx), 4);
+    m_cpuVendor.append(reinterpret_cast<const char*>(&ecx), 4);
+  }
+
+  if (__get_cpuid(CPUID_INFOTYPE_EXTENDED_IMPLEMENTED, &eax, &ebx, &ecx, &edx))
+  {
+    if (eax >= CPUID_INFOTYPE_PROCESSOR_3)
+    {
+      m_cpuModel.clear();
+
+      if (__get_cpuid(CPUID_INFOTYPE_PROCESSOR_1, &eax, &ebx, &ecx, &edx))
+      {
+        m_cpuModel.append(reinterpret_cast<const char*>(&eax), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&ebx), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&ecx), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&edx), 4);
+      }
+
+      if (__get_cpuid(CPUID_INFOTYPE_PROCESSOR_2, &eax, &ebx, &ecx, &edx))
+      {
+        m_cpuModel.append(reinterpret_cast<const char*>(&eax), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&ebx), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&ecx), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&edx), 4);
+      }
+
+      if (__get_cpuid(CPUID_INFOTYPE_PROCESSOR_3, &eax, &ebx, &ecx, &edx))
+      {
+        m_cpuModel.append(reinterpret_cast<const char*>(&eax), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&ebx), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&ecx), 4);
+        m_cpuModel.append(reinterpret_cast<const char*>(&edx), 4);
+      }
+    }
+  }
+
+  if (__get_cpuid(CPUID_INFOTYPE_STANDARD, &eax, &eax, &ecx, &edx))
+  {
+    if (edx & CPUID_00000001_EDX_MMX)
+      m_cpuFeatures |= CPU_FEATURE_MMX;
+
+    // Set MMX2 when SSE is present as SSE is a superset of MMX2 and Intel doesn't set the MMX2 cap
+    if (edx & CPUID_00000001_EDX_SSE)
+      m_cpuFeatures |= (CPU_FEATURE_SSE | CPU_FEATURE_MMX2);
+
+    if (edx & CPUID_00000001_EDX_SSE2)
+      m_cpuFeatures |= CPU_FEATURE_SSE2;
+
+    if (ecx & CPUID_00000001_ECX_SSE3)
+      m_cpuFeatures |= CPU_FEATURE_SSE3;
+
+    if (ecx & CPUID_00000001_ECX_SSSE3)
+      m_cpuFeatures |= CPU_FEATURE_SSSE3;
+
+    if (ecx & CPUID_00000001_ECX_SSE4)
+      m_cpuFeatures |= CPU_FEATURE_SSE4;
+
+    if (ecx & CPUID_00000001_ECX_SSE42)
+      m_cpuFeatures |= CPU_FEATURE_SSE42;
+  }
+
+  if (__get_cpuid(CPUID_INFOTYPE_EXTENDED_IMPLEMENTED, &eax, &eax, &ecx, &edx))
+  {
+    if (eax >= CPUID_INFOTYPE_EXTENDED)
+    {
+      if (edx & CPUID_80000001_EDX_MMX)
+        m_cpuFeatures |= CPU_FEATURE_MMX;
+
+      if (edx & CPUID_80000001_EDX_MMX2)
+        m_cpuFeatures |= CPU_FEATURE_MMX2;
+
+      if (edx & CPUID_80000001_EDX_3DNOW)
+        m_cpuFeatures |= CPU_FEATURE_3DNOW;
+
+      if (edx & CPUID_80000001_EDX_3DNOWEXT)
+        m_cpuFeatures |= CPU_FEATURE_3DNOWEXT;
+    }
+  }
+#endif
+
+#if defined(HAS_NEON)
+#if defined(__ARM_NEON)
+  m_cpuFeatures |= CPU_FEATURE_NEON;
+#elif __has_include(<sys/auxv.h>)
+  unsigned long hwcap = 0;
+  elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
+  if (hwcap & HWCAP_NEON)
+    m_cpuFeatures |= CPU_FEATURE_NEON;
+#endif
+#endif
 }
 
 int CCPUInfoFreebsd::GetUsedPercentage()
@@ -83,11 +187,11 @@
 
   std::vector<CpuData> cpuData;
 
-  for (int i = 0; i < m_cpuCount; i++)
+  for (size_t i = 0; i < m_cpuCount; i++)
   {
     CpuData info;
 
-    for (int state = 0; state < CPUSTATES; state++)
+    for (size_t state = 0; state < CPUSTATES; state++)
     {
       info.state[state] = cptimes[i * CPUSTATES + state];
     }
@@ -135,3 +239,18 @@
 
   return static_cast<float>(hz);
 }
+
+
+bool CCPUInfoFreebsd::GetTemperature(CTemperature& temperature)
+{
+  int value;
+  size_t len = sizeof(value);
+
+  /* Temperature is in Kelvin * 10 */
+  if (sysctlbyname("dev.cpu.0.temperature", &value, &len, nullptr, 0) != 0)
+    return CCPUInfoPosix::GetTemperature(temperature);
+  temperature = CTemperature::CreateFromKelvin(static_cast<double>(value) / 10.0);
+  temperature.SetValid(true);
+
+  return true;
+}

_service:download_files:master.tar.gz/xbmc/platform/freebsd/CPUInfoFreebsd.h Changed

_service:download_files:master.tar.gz/xbmc/platform/freebsd/network Added

_service:download_files:master.tar.gz/xbmc/platform/freebsd/network/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/freebsd/network/NetworkFreebsd.cpp Added

@@ -0,0 +1,248 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "NetworkFreebsd.h"
+
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+
+#include <errno.h>
+
+#include <arpa/inet.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/if_ether.h>
+#include <netinet/in.h>
+#include <resolv.h>
+#include <sys/sockio.h>
+#include <sys/wait.h>
+
+#define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
+
+CNetworkInterfaceFreebsd::CNetworkInterfaceFreebsd(CNetworkPosix* network,
+                                                   std::string interfaceName,
+                                                   char interfaceMacAddrRaw[6])
+  : CNetworkInterfacePosix(network, interfaceName, interfaceMacAddrRaw)
+{
+}
+
+std::string CNetworkInterfaceFreebsd::GetCurrentDefaultGateway() const
+{
+  std::string result;
+
+  size_t needed;
+  int mib[6];
+  char *buf, *next, *lim;
+  char line[16];
+  struct rt_msghdr* rtm;
+  struct sockaddr* sa;
+  struct sockaddr_in* sockin;
+
+  mib[0] = CTL_NET;
+  mib[1] = PF_ROUTE;
+  mib[2] = 0;
+  mib[3] = 0;
+  mib[4] = NET_RT_DUMP;
+  mib[5] = 0;
+  if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+    return result;
+
+  if ((buf = (char*)malloc(needed)) == NULL)
+    return result;
+
+  if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+  {
+    free(buf);
+    return result;
+  }
+
+  lim = buf + needed;
+  for (next = buf; next < lim; next += rtm->rtm_msglen)
+  {
+    rtm = (struct rt_msghdr*)next;
+    sa = (struct sockaddr*)(rtm + 1);
+    sa = (struct sockaddr*)(SA_SIZE(sa) + (char*)sa);
+    sockin = (struct sockaddr_in*)sa;
+    if (inet_ntop(AF_INET, &sockin->sin_addr.s_addr, line, sizeof(line)) == NULL)
+    {
+      free(buf);
+      return result;
+    }
+    result = line;
+    break;
+  }
+  free(buf);
+
+  return result;
+}
+
+bool CNetworkInterfaceFreebsd::GetHostMacAddress(unsigned long host_ip, std::string& mac) const
+{
+  bool ret = false;
+  size_t needed;
+  char *buf, *next;
+  struct rt_msghdr* rtm;
+  struct sockaddr_inarp* sin;
+  struct sockaddr_dl* sdl;
+  int mib[6];
+
+  mac = "";
+
+  mib[0] = CTL_NET;
+  mib[1] = PF_ROUTE;
+  mib[2] = 0;
+  mib[3] = AF_INET;
+  mib[4] = NET_RT_FLAGS;
+  mib[5] = RTF_LLINFO;
+
+  if (sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == 0)
+  {
+    buf = (char*)malloc(needed);
+    if (buf)
+    {
+      if (sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == 0)
+      {
+        for (next = buf; next < buf + needed; next += rtm->rtm_msglen)
+        {
+
+          rtm = (struct rt_msghdr*)next;
+          sin = (struct sockaddr_inarp*)(rtm + 1);
+          sdl = (struct sockaddr_dl*)(sin + 1);
+
+          if (host_ip != sin->sin_addr.s_addr || sdl->sdl_alen < 6)
+            continue;
+
+          u_char* cp = (u_char*)LLADDR(sdl);
+
+          mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X", cp[0], cp[1], cp[2], cp[3],
+                                    cp[4], cp[5]);
+          ret = true;
+          break;
+        }
+      }
+      free(buf);
+    }
+  }
+  return ret;
+}
+
+CNetworkFreebsd::CNetworkFreebsd() : CNetworkPosix()
+{
+  queryInterfaceList();
+}
+
+void CNetworkFreebsd::GetMacAddress(const std::string& interfaceName, char rawMac[6])
+{
+  memset(rawMac, 0, 6);
+
+#if !defined(IFT_ETHER)
+#define IFT_ETHER 0x6 /* Ethernet CSMACD */
+#endif
+  const struct sockaddr_dl* dlAddr = NULL;
+  const uint8_t* base = NULL;
+  // Query the list of interfaces.
+  struct ifaddrs* list;
+  struct ifaddrs* interface;
+
+  if (getifaddrs(&list) < 0)
+  {
+    return;
+  }
+
+  for (interface = list; interface != NULL; interface = interface->ifa_next)
+  {
+    if (interfaceName == interface->ifa_name)
+    {
+      if ((interface->ifa_addr->sa_family == AF_LINK) &&
+          (((const struct sockaddr_dl*)interface->ifa_addr)->sdl_type == IFT_ETHER))
+      {
+        dlAddr = (const struct sockaddr_dl*)interface->ifa_addr;
+        base = (const uint8_t*)&dlAddr->sdl_data[dlAddr->sdl_nlen];
+
+        if (dlAddr->sdl_alen > 5)
+        {
+          memcpy(rawMac, base, 6);
+        }
+      }
+      break;
+    }
+  }
+
+  freeifaddrs(list);
+}
+
+void CNetworkFreebsd::queryInterfaceList()
+{
+  char macAddrRaw[6];
+  m_interfaces.clear();
+
+  // Query the list of interfaces.
+  struct ifaddrs* list;
+  if (getifaddrs(&list) < 0)
+    return;
+
+  struct ifaddrs* cur;
+  for (cur = list; cur != NULL; cur = cur->ifa_next)
+  {
+    if (cur->ifa_addr->sa_family != AF_INET)
+      continue;
+
+    GetMacAddress(cur->ifa_name, macAddrRaw);
+
+    // only add interfaces with non-zero mac addresses
+    if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] ||
+        macAddrRaw[5])
+      // Add the interface.
+      m_interfaces.push_back(new CNetworkInterfaceFreebsd(this, cur->ifa_name, macAddrRaw));
+  }
+
+  freeifaddrs(list);
+}
+
+std::vector<std::string> CNetworkFreebsd::GetNameServers()
+{
+  std::vector<std::string> result;
+
+  res_init();
+
+  for (int i = 0; i < _res.nscount; i++)
+  {
+    std::string ns = inet_ntoa(_res.nsaddr_list[i].sin_addr);
+    result.push_back(ns);
+  }
+
+  return result;
+}
+
+bool CNetworkFreebsd::PingHost(unsigned long remote_ip, unsigned int timeout_ms)
+{
+  char cmd_line[64];
+
+  struct in_addr host_ip;
+  host_ip.s_addr = remote_ip;
+
+  sprintf(cmd_line, "ping -c 1 -t %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0,
+          inet_ntoa(host_ip));
+
+  int status = -1;
+  status = system(cmd_line);
+  int result = WIFEXITED(status) ? WEXITSTATUS(status) : -1;
+
+  // http://linux.about.com/od/commands/l/blcmdl8_ping.htm ;
+  // 0 reply
+  // 1 no reply
+  // else some error
+
+  if (result < 0 || result > 1)
+    CLog::Log(LOGERROR, "Ping fail : status = %d, errno = %d : '%s'", status, errno, cmd_line);
+
+  return result == 0;
+}

_service:download_files:master.tar.gz/xbmc/platform/freebsd/network/NetworkFreebsd.h Added

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "platform/posix/network/NetworkPosix.h"
+
+#include <string>
+#include <vector>
+
+class CNetworkInterfaceFreebsd : public CNetworkInterfacePosix
+{
+public:
+  CNetworkInterfaceFreebsd(CNetworkPosix* network,
+                           std::string interfaceName,
+                           char interfaceMacAddrRaw[6]);
+  ~CNetworkInterfaceFreebsd() override = default;
+
+  std::string GetCurrentDefaultGateway() const override;
+  bool GetHostMacAddress(unsigned long host, std::string& mac) const override;
+};
+
+class CNetworkFreebsd : public CNetworkPosix
+{
+public:
+  CNetworkFreebsd();
+  ~CNetworkFreebsd() override = default;
+
+  bool PingHost(unsigned long host, unsigned int timeout_ms = 2000) override;
+  std::vector<std::string> GetNameServers() override;
+
+private:
+  void GetMacAddress(const std::string& interfaceName, char macAddrRaw[6]) override;
+  void queryInterfaceList() override;
+};
+
+using CNetwork = CNetworkFreebsd;

_service:download_files:master.tar.gz/xbmc/platform/linux/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/CPUInfoLinux.cpp Changed

@@ -9,9 +9,10 @@
 #include "CPUInfoLinux.h"
 
 #include "utils/StringUtils.h"
-#include "utils/SysfsUtils.h"
 #include "utils/Temperature.h"
 
+#include "platform/linux/SysfsPath.h"
+
 #include <fstream>
 #include <regex>
 #include <sstream>
@@ -68,22 +69,56 @@
 
 CCPUInfoLinux::CCPUInfoLinux()
 {
-  // new socs use the sysfs soc interface to describe the hardware
-  if (SysfsUtils::Has("/sys/bus/soc/devices/soc0"))
+  CSysfsPath machinePath{"/sys/bus/soc/devices/soc0/machine"};
+  if (machinePath.Exists())
+    m_cpuHardware = machinePath.Get<std::string>();
+
+  CSysfsPath familyPath{"/sys/bus/soc/devices/soc0/family"};
+  if (familyPath.Exists())
+    m_cpuSoC = familyPath.Get<std::string>();
+
+  CSysfsPath socPath{"/sys/bus/soc/devices/soc0/soc_id"};
+  if (socPath.Exists())
+    m_cpuSoC += " " + socPath.Get<std::string>();
+
+  const std::string freqStr{"/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"};
+  CSysfsPath freqPath{freqStr};
+  if (freqPath.Exists())
+    m_freqPath = freqStr;
+
+  const std::array<std::string, 3> modules = {
+      "coretemp",
+      "k10temp",
+      "scpi_sensors",
+  };
+
+  for (int i = 0; i < 20; i++)
   {
-    std::string machine;
-    std::string family;
-    std::string socId;
-    if (SysfsUtils::Has("/sys/bus/soc/devices/soc0/machine"))
-      SysfsUtils::GetString("/sys/bus/soc/devices/soc0/machine", machine);
-    if (SysfsUtils::Has("/sys/bus/soc/devices/soc0/family"))
-      SysfsUtils::GetString("/sys/bus/soc/devices/soc0/family", family);
-    if (SysfsUtils::Has("/sys/bus/soc/devices/soc0/soc_id"))
-      SysfsUtils::GetString("/sys/bus/soc/devices/soc0/soc_id", socId);
-    if (m_cpuHardware.empty() && !machine.empty())
-      m_cpuHardware = machine;
-    if (!family.empty() && !socId.empty())
-      m_cpuSoC = family + " " + socId;
+    CSysfsPath path{"/sys/class/hwmon/hwmon" + std::to_string(i) + "/name"};
+    if (!path.Exists())
+      continue;
+
+    auto name = path.Get<std::string>();
+
+    if (name.empty())
+      continue;
+
+    for (const auto& module : modules)
+    {
+      if (module == name)
+      {
+        std::string tempStr{"/sys/class/hwmon/hwmon" + std::to_string(i) + "/temp1_input"};
+        CSysfsPath tempPath{tempStr};
+        if (!tempPath.Exists())
+          continue;
+
+        m_tempPath = tempStr;
+        break;
+      }
+    }
+
+    if (!m_tempPath.empty())
+      break;
   }
 
   m_cpuCount = sysconf(_SC_NPROCESSORS_ONLN);
@@ -284,34 +319,22 @@
 
 float CCPUInfoLinux::GetCPUFrequency()
 {
-  int value{-1};
-  if (SysfsUtils::Has("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"))
-    SysfsUtils::GetInt("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", value);
+  if (m_freqPath.empty())
+    return -1;
 
-  value /= 1000.0;
-
-  return value;
+  CSysfsPath path{m_freqPath};
+  return path.Get<float>() / 1000.0;
 }
 
 bool CCPUInfoLinux::GetTemperature(CTemperature& temperature)
 {
-  if (!SysfsUtils::Has("/sys/class/hwmon/hwmon0/temp1_input"))
+  if (m_tempPath.empty())
     return CCPUInfoPosix::GetTemperature(temperature);
 
-  int value{-1};
-  char scale{'c'};
-
-  SysfsUtils::GetInt("/sys/class/hwmon/hwmon0/temp1_input", value);
-  value = value / 1000.0;
-  scale = 'c';
-
-  if (scale == 'C' || scale == 'c')
-    temperature = CTemperature::CreateFromCelsius(value);
-  else if (scale == 'F' || scale == 'f')
-    temperature = CTemperature::CreateFromFahrenheit(value);
-  else
-    return false;
+  CSysfsPath path{m_tempPath};
+  double value = path.Get<double>() / 1000.0;
 
+  temperature = CTemperature::CreateFromCelsius(value);
   temperature.SetValid(true);
 
   return true;

_service:download_files:master.tar.gz/xbmc/platform/linux/CPUInfoLinux.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/PlatformConstants.h Deleted

_service:download_files:master.tar.gz/xbmc/platform/linux/SysfsPath.cpp Added

_service:download_files:master.tar.gz/xbmc/platform/linux/SysfsPath.h Added

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LIRC.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LibInputHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LibInputSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/network/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/network/NetworkLinux.cpp Added

@@ -0,0 +1,217 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "NetworkLinux.h"
+
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+
+#include <errno.h>
+
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <resolv.h>
+#include <sys/ioctl.h>
+
+CNetworkInterfaceLinux::CNetworkInterfaceLinux(CNetworkPosix* network,
+                                               std::string interfaceName,
+                                               char interfaceMacAddrRaw[6])
+  : CNetworkInterfacePosix(network, interfaceName, interfaceMacAddrRaw)
+{
+}
+
+std::string CNetworkInterfaceLinux::GetCurrentDefaultGateway() const
+{
+  std::string result;
+
+  FILE* fp = fopen("/proc/net/route", "r");
+  if (!fp)
+  {
+    // TBD: Error
+    return result;
+  }
+
+  char* line = NULL;
+  char iface[16];
+  char dst[128];
+  char gateway[128];
+  size_t linel = 0;
+  int n;
+  int linenum = 0;
+  while (getdelim(&line, &linel, '\n', fp) > 0)
+  {
+    // skip first two lines
+    if (linenum++ < 1)
+      continue;
+
+    // search where the word begins
+    n = sscanf(line, "%15s %127s %127s", iface, dst, gateway);
+
+    if (n < 3)
+      continue;
+
+    if (strcmp(iface, m_interfaceName.c_str()) == 0 && strcmp(dst, "00000000") == 0 &&
+        strcmp(gateway, "00000000") != 0)
+    {
+      unsigned char gatewayAddr[4];
+      int len = CNetworkBase::ParseHex(gateway, gatewayAddr);
+      if (len == 4)
+      {
+        struct in_addr in;
+        in.s_addr = (gatewayAddr[0] << 24) | (gatewayAddr[1] << 16) | (gatewayAddr[2] << 8) |
+                    (gatewayAddr[3]);
+        result = inet_ntoa(in);
+        break;
+      }
+    }
+  }
+  free(line);
+  fclose(fp);
+
+  return result;
+}
+
+bool CNetworkInterfaceLinux::GetHostMacAddress(unsigned long host_ip, std::string& mac) const
+{
+  struct arpreq areq;
+  struct sockaddr_in* sin;
+
+  memset(&areq, 0x0, sizeof(areq));
+
+  sin = (struct sockaddr_in*)&areq.arp_pa;
+  sin->sin_family = AF_INET;
+  sin->sin_addr.s_addr = host_ip;
+
+  sin = (struct sockaddr_in*)&areq.arp_ha;
+  sin->sin_family = ARPHRD_ETHER;
+
+  strncpy(areq.arp_dev, m_interfaceName.c_str(), sizeof(areq.arp_dev));
+  areq.arp_dev[sizeof(areq.arp_dev) - 1] = '\0';
+
+  int result = ioctl(m_network->GetSocket(), SIOCGARP, (caddr_t)&areq);
+
+  if (result != 0)
+  {
+    //  CLog::Log(LOGERROR, "%s - GetHostMacAddress/ioctl failed with errno (%d)", __FUNCTION__, errno);
+    return false;
+  }
+
+  struct sockaddr* res = &areq.arp_ha;
+  mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X", (uint8_t)res->sa_data[0],
+                            (uint8_t)res->sa_data[1], (uint8_t)res->sa_data[2],
+                            (uint8_t)res->sa_data[3], (uint8_t)res->sa_data[4],
+                            (uint8_t)res->sa_data[5]);
+
+  for (int i = 0; i < 6; ++i)
+    if (res->sa_data[i])
+      return true;
+
+  return false;
+}
+
+CNetworkLinux::CNetworkLinux() : CNetworkPosix()
+{
+  queryInterfaceList();
+}
+
+void CNetworkLinux::GetMacAddress(const std::string& interfaceName, char rawMac[6])
+{
+  memset(rawMac, 0, 6);
+
+  struct ifreq ifr;
+  strcpy(ifr.ifr_name, interfaceName.c_str());
+  if (ioctl(GetSocket(), SIOCGIFHWADDR, &ifr) >= 0)
+  {
+    memcpy(rawMac, ifr.ifr_hwaddr.sa_data, 6);
+  }
+}
+
+void CNetworkLinux::queryInterfaceList()
+{
+  char macAddrRaw[6];
+  m_interfaces.clear();
+
+  FILE* fp = fopen("/proc/net/dev", "r");
+  if (!fp)
+  {
+    // TBD: Error
+    return;
+  }
+
+  char* line = NULL;
+  size_t linel = 0;
+  int n;
+  char* p;
+  int linenum = 0;
+  while (getdelim(&line, &linel, '\n', fp) > 0)
+  {
+    // skip first two lines
+    if (linenum++ < 2)
+      continue;
+
+    // search where the word begins
+    p = line;
+    while (isspace(*p))
+      ++p;
+
+    // read word until :
+    n = strcspn(p, ": \t");
+    p[n] = 0;
+
+    // save the result
+    std::string interfaceName = p;
+    GetMacAddress(interfaceName, macAddrRaw);
+
+    // only add interfaces with non-zero mac addresses
+    if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] ||
+        macAddrRaw[5])
+      m_interfaces.push_back(new CNetworkInterfaceLinux(this, interfaceName, macAddrRaw));
+  }
+  free(line);
+  fclose(fp);
+}
+
+std::vector<std::string> CNetworkLinux::GetNameServers()
+{
+  std::vector<std::string> result;
+
+  res_init();
+
+  for (int i = 0; i < _res.nscount; i++)
+  {
+    std::string ns = inet_ntoa(_res.nsaddr_list[i].sin_addr);
+    result.push_back(ns);
+  }
+  return result;
+}
+
+bool CNetworkLinux::PingHost(unsigned long remote_ip, unsigned int timeout_ms)
+{
+  char cmd_line[64];
+
+  struct in_addr host_ip;
+  host_ip.s_addr = remote_ip;
+
+  sprintf(cmd_line, "ping -c 1 -w %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0,
+          inet_ntoa(host_ip));
+
+  int status = -1;
+  status = system(cmd_line);
+  int result = WIFEXITED(status) ? WEXITSTATUS(status) : -1;
+
+  // http://linux.about.com/od/commands/l/blcmdl8_ping.htm ;
+  // 0 reply
+  // 1 no reply
+  // else some error
+
+  if (result < 0 || result > 1)
+    CLog::Log(LOGERROR, "Ping fail : status = %d, errno = %d : '%s'", status, errno, cmd_line);
+
+  return result == 0;
+}

_service:download_files:master.tar.gz/xbmc/platform/linux/network/NetworkLinux.h Added

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "platform/posix/network/NetworkPosix.h"
+
+#include <string>
+#include <vector>
+
+class CNetworkInterfaceLinux : public CNetworkInterfacePosix
+{
+public:
+  CNetworkInterfaceLinux(CNetworkPosix* network,
+                         std::string interfaceName,
+                         char interfaceMacAddrRaw[6]);
+  ~CNetworkInterfaceLinux() override = default;
+
+  std::string GetCurrentDefaultGateway() const override;
+  bool GetHostMacAddress(unsigned long host, std::string& mac) const override;
+};
+
+class CNetworkLinux : public CNetworkPosix
+{
+public:
+  CNetworkLinux();
+  ~CNetworkLinux() override = default;
+
+  bool PingHost(unsigned long host, unsigned int timeout_ms = 2000) override;
+  std::vector<std::string> GetNameServers(void) override;
+
+private:
+  void GetMacAddress(const std::string& interfaceName, char macAddrRaw[6]) override;
+  void queryInterfaceList() override;
+};
+
+using CNetwork = CNetworkLinux;

_service:download_files:master.tar.gz/xbmc/platform/linux/network/zeroconf Added

_service:download_files:master.tar.gz/xbmc/platform/linux/network/zeroconf/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/linux/network/zeroconf/ZeroconfAvahi.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/network/zeroconf/ZeroconfAvahi.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/network/zeroconf/ZeroconfBrowserAvahi.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/network/zeroconf/ZeroconfBrowserAvahi.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/peripherals/PeripheralBusUSBLibUdev.cpp Changed

@@ -11,6 +11,7 @@
 extern "C" {
 #include <libudev.h>
 }
+#include <cassert>
 #include <poll.h>
 #include "utils/log.h"
 
@@ -72,29 +73,18 @@
 
   m_udev          = NULL;
   m_udevMon       = NULL;
-
-  if (!(m_udev = udev_new()))
-  {
-    CLog::Log(LOGERROR, "%s - failed to allocate udev context", __FUNCTION__);
-    return;
-  }
-
-  /* set up a devices monitor that listen for any device change */
-  m_udevMon = udev_monitor_new_from_netlink(m_udev, "udev");
-  udev_monitor_enable_receiving(m_udevMon);
-
-  CLog::Log(LOGDEBUG, "%s - initialised udev monitor", __FUNCTION__);
 }
 
 CPeripheralBusUSB::~CPeripheralBusUSB(void)
 {
   StopThread(true);
-  udev_monitor_unref(m_udevMon);
-  udev_unref(m_udev);
 }
 
 bool CPeripheralBusUSB::PerformDeviceScan(PeripheralScanResults &results)
 {
+  // We don't want this one to be called from outside world
+  assert(IsCurrentThread());
+
   struct udev_enumerate *enumerate;
   struct udev_list_entry *devices, *dev_list_entry;
   struct udev_device *dev(NULL), *parent(NULL);
@@ -188,6 +178,24 @@
 
 void CPeripheralBusUSB::Process(void)
 {
+  if (!(m_udev = udev_new()))
+  {
+    CLog::Log(LOGERROR, "%s - failed to allocate udev context", __FUNCTION__);
+    return;
+  }
+
+  /* set up a devices monitor that listen for any device change */
+  m_udevMon = udev_monitor_new_from_netlink(m_udev, "udev");
+
+  /* filter to only receive usb events */
+  if (udev_monitor_filter_add_match_subsystem_devtype(m_udevMon, "usb", nullptr) < 0)
+  {
+    CLog::Log(LOGERROR, "Could not limit filter on USB only");
+  }
+
+  CLog::Log(LOGDEBUG, "%s - initialised udev monitor", __FUNCTION__);
+
+  udev_monitor_enable_receiving(m_udevMon);
   bool bUpdated(false);
   ScanForDevices();
   while (!m_bStop)
@@ -196,6 +204,8 @@
     if (bUpdated && !m_bStop)
       ScanForDevices();
   }
+  udev_monitor_unref(m_udevMon);
+  udev_unref(m_udev);
 }
 
 void CPeripheralBusUSB::Clear(void)

_service:download_files:master.tar.gz/xbmc/platform/linux/test Added

_service:download_files:master.tar.gz/xbmc/platform/linux/test/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/platform/linux/test/TestSysfsPath.cpp Added

@@ -0,0 +1,65 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "platform/linux/SysfsPath.h"
+
+#include <fstream>
+
+#include <gtest/gtest.h>
+
+struct TestSysfsPath : public ::testing::Test
+{
+  ~TestSysfsPath() { std::remove("/tmp/kodi-test"); }
+
+  std::ofstream m_output{"/tmp/kodi-test"};
+};
+
+TEST_F(TestSysfsPath, SysfsPathTestInt)
+{
+  int temp{1234};
+  m_output << temp;
+  m_output.close();
+
+  CSysfsPath path("/tmp/kodi-test");
+  ASSERT_TRUE(path.Exists());
+  ASSERT_TRUE(path.Get<int>() == 1234);
+  ASSERT_TRUE(path.Get<float>() == 1234);
+  ASSERT_TRUE(path.Get<double>() == 1234);
+  ASSERT_TRUE(path.Get<uint64_t>() == 1234);
+  ASSERT_TRUE(path.Get<uint16_t>() == 1234);
+  ASSERT_TRUE(path.Get<unsigned int>() == 1234);
+  ASSERT_TRUE(path.Get<unsigned long int>() == 1234);
+}
+
+TEST_F(TestSysfsPath, SysfsPathTestString)
+{
+  std::string temp{"test"};
+  m_output << temp;
+  m_output.close();
+
+  CSysfsPath path("/tmp/kodi-test");
+  ASSERT_TRUE(path.Exists());
+  ASSERT_TRUE(path.Get<std::string>() == "test");
+}
+
+TEST_F(TestSysfsPath, SysfsPathTestLongString)
+{
+  std::string temp{"test with spaces"};
+  m_output << temp;
+  m_output.close();
+
+  CSysfsPath path("/tmp/kodi-test");
+  ASSERT_TRUE(path.Exists());
+  ASSERT_TRUE(path.Get<std::string>() == "test with spaces");
+}
+
+TEST_F(TestSysfsPath, SysfsPathTestPathDoesNotExist)
+{
+  CSysfsPath otherPath{"/thispathdoesnotexist"};
+  ASSERT_FALSE(otherPath.Exists());
+}

_service:download_files:master.tar.gz/xbmc/platform/posix/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/PlatformDefs.h Changed

@@ -21,7 +21,6 @@
 #ifndef __STDC_FORMAT_MACROS
   #define __STDC_FORMAT_MACROS
 #endif
-#include <inttypes.h>
 #include <sys/sysctl.h>
 #include <mach/mach.h>
 #if defined(TARGET_DARWIN_OSX)
@@ -52,41 +51,12 @@
 
 #include <stdint.h>
 
-#ifndef PRId64
-#ifdef TARGET_WINDOWS
-#define PRId64 "I64d"
-#else
-#if __WORDSIZE == 64
-#define PRId64 "ld"
-#else
-#define PRId64 "lld"
-#endif
-#endif
-#endif
-
-#ifndef PRIu64
-#ifdef TARGET_WINDOWS
-#define PRIu64 "I64u"
-#else
-#if __WORDSIZE == 64
-#define PRIu64 "lu"
-#else
-#define PRIu64 "llu"
-#endif
-#endif
-#endif
-
-#ifndef PRIdS
-#define PRIdS "zd"
-#endif
-
 #define _fdopen fdopen
 #define _vsnprintf vsnprintf
 #define _stricmp  strcasecmp
 #define stricmp   strcasecmp
 #define strcmpi strcasecmp
 #define strnicmp  strncasecmp
-#define _atoi64(x) atoll(x)
 
 #define __stdcall
 #define __cdecl
@@ -120,35 +90,6 @@
   unsigned long long QuadPart;
 } ULARGE_INTEGER;
 
-// Date / Time
-
-typedef struct _SYSTEMTIME
-{
-  unsigned short wYear;
-  unsigned short wMonth;
-  unsigned short wDayOfWeek;
-  unsigned short wDay;
-  unsigned short wHour;
-  unsigned short wMinute;
-  unsigned short wSecond;
-  unsigned short wMilliseconds;
-} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
-
-typedef struct _TIME_ZONE_INFORMATION {
-  long Bias;
-  wchar_t StandardName[32];
-  SYSTEMTIME StandardDate;
-  long StandardBias;
-  wchar_t DaylightName[32];
-  SYSTEMTIME DaylightDate;
-  long DaylightBias;
-} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION;
-
-#define TIME_ZONE_ID_INVALID    ((DWORD)0xFFFFFFFF)
-#define TIME_ZONE_ID_UNKNOWN    0
-#define TIME_ZONE_ID_STANDARD   1
-#define TIME_ZONE_ID_DAYLIGHT   2
-
 // Network
 #define SOCKET_ERROR (-1)
 #define INVALID_SOCKET (~0)
@@ -194,28 +135,6 @@
   time_t _st_ctime;
 };
 
-typedef struct _FILETIME
-{
-  DWORD dwLowDateTime;
-  DWORD dwHighDateTime;
-} FILETIME, *PFILETIME, *LPFILETIME;
-
-typedef struct _WIN32_FIND_DATA
-{
-    DWORD     dwFileAttributes;
-    FILETIME  ftCreationTime;
-    FILETIME  ftLastAccessTime;
-    FILETIME  ftLastWriteTime;
-    DWORD     nFileSizeHigh;
-    DWORD     nFileSizeLow;
-    DWORD     dwReserved0;
-    DWORD     dwReserved1;
-    char      cFileName[260];
-    char      cAlternateFileName[14];
-} WIN32_FIND_DATA, *PWIN32_FIND_DATA, *LPWIN32_FIND_DATA;
-
-#define FILE_ATTRIBUTE_DIRECTORY           0x00000010
-
 #define FILE_BEGIN              0
 #define FILE_CURRENT            1
 #define FILE_END                2

_service:download_files:master.tar.gz/xbmc/platform/posix/XFileUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/XFileUtils.h Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/XTimeUtils.cpp Changed

@@ -6,9 +6,17 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "XTimeUtils.h"
+#include "utils/XTimeUtils.h"
+
 #include "PosixTimezone.h"
 
+#include <errno.h>
+#include <time.h>
+
+#include <sched.h>
+#include <sys/times.h>
+#include <unistd.h>
+
 #if defined(TARGET_DARWIN)
 #include "threads/Atomics.h"
 #endif
@@ -17,70 +25,85 @@
 #include <time64.h>
 #endif
 
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/times.h>
-#include <sched.h>
-
 #define WIN32_TIME_OFFSET ((unsigned long long)(369 * 365 + 89) * 24 * 3600 * 10000000)
 
+namespace KODI
+{
+namespace TIME
+{
+
 /*
  * A Leap year is any year that is divisible by four, but not by 100 unless also
  * divisible by 400
  */
 #define IsLeapYear(y) ((!(y % 4)) ? (((!(y % 400)) && (y % 100)) ? 1 : 0) : 0)
 
-void WINAPI Sleep(uint32_t dwMilliSeconds)
+void Sleep(uint32_t milliSeconds)
 {
 #if _POSIX_PRIORITY_SCHEDULING
-  if(dwMilliSeconds == 0)
+  if (milliSeconds == 0)
   {
     sched_yield();
     return;
   }
 #endif
 
-  usleep(dwMilliSeconds * 1000);
+  usleep(milliSeconds * 1000);
+}
+
+uint32_t GetTimeZoneInformation(TimeZoneInformation* timeZoneInformation)
+{
+  if (!timeZoneInformation)
+    return KODI_TIME_ZONE_ID_INVALID;
+
+  struct tm t;
+  time_t tt = time(NULL);
+  if (localtime_r(&tt, &t))
+    timeZoneInformation->bias = -t.tm_gmtoff / 60;
+
+  timeZoneInformation->standardName = tzname[0];
+  timeZoneInformation->daylightName = tzname[1];
+
+  return KODI_TIME_ZONE_ID_UNKNOWN;
 }
 
-void GetLocalTime(LPSYSTEMTIME sysTime)
+void GetLocalTime(SystemTime* systemTime)
 {
   const time_t t = time(NULL);
   struct tm now;
 
   localtime_r(&t, &now);
-  sysTime->wYear = now.tm_year + 1900;
-  sysTime->wMonth = now.tm_mon + 1;
-  sysTime->wDayOfWeek = now.tm_wday;
-  sysTime->wDay = now.tm_mday;
-  sysTime->wHour = now.tm_hour;
-  sysTime->wMinute = now.tm_min;
-  sysTime->wSecond = now.tm_sec;
-  sysTime->wMilliseconds = 0;
+  systemTime->year = now.tm_year + 1900;
+  systemTime->month = now.tm_mon + 1;
+  systemTime->dayOfWeek = now.tm_wday;
+  systemTime->day = now.tm_mday;
+  systemTime->hour = now.tm_hour;
+  systemTime->minute = now.tm_min;
+  systemTime->second = now.tm_sec;
+  systemTime->milliseconds = 0;
   // NOTE: localtime_r() is not required to set this, but we Assume that it's set here.
   g_timezone.m_IsDST = now.tm_isdst;
 }
 
-int FileTimeToLocalFileTime(const FILETIME* lpFileTime, LPFILETIME lpLocalFileTime)
+int FileTimeToLocalFileTime(const FileTime* fileTime, FileTime* localFileTime)
 {
   ULARGE_INTEGER l;
-  l.u.LowPart = lpFileTime->dwLowDateTime;
-  l.u.HighPart = lpFileTime->dwHighDateTime;
+  l.u.LowPart = fileTime->lowDateTime;
+  l.u.HighPart = fileTime->highDateTime;
 
   time_t ft;
   struct tm tm_ft;
-  FileTimeToTimeT(lpFileTime, &ft);
+  FileTimeToTimeT(fileTime, &ft);
   localtime_r(&ft, &tm_ft);
 
   l.QuadPart += static_cast<unsigned long long>(tm_ft.tm_gmtoff) * 10000000;
 
-  lpLocalFileTime->dwLowDateTime = l.u.LowPart;
-  lpLocalFileTime->dwHighDateTime = l.u.HighPart;
+  localFileTime->lowDateTime = l.u.LowPart;
+  localFileTime->highDateTime = l.u.HighPart;
   return 1;
 }
 
-int SystemTimeToFileTime(const SYSTEMTIME* lpSystemTime,  LPFILETIME lpFileTime)
+int SystemTimeToFileTime(const SystemTime* systemTime, FileTime* fileTime)
 {
   static const int dayoffset[12] = {0, 31, 59, 90, 120, 151, 182, 212, 243, 273, 304, 334};
 #if defined(TARGET_DARWIN)
@@ -88,18 +111,18 @@
 #endif
 
   struct tm sysTime = {};
-  sysTime.tm_year = lpSystemTime->wYear - 1900;
-  sysTime.tm_mon = lpSystemTime->wMonth - 1;
-  sysTime.tm_wday = lpSystemTime->wDayOfWeek;
-  sysTime.tm_mday = lpSystemTime->wDay;
-  sysTime.tm_hour = lpSystemTime->wHour;
-  sysTime.tm_min = lpSystemTime->wMinute;
-  sysTime.tm_sec = lpSystemTime->wSecond;
+  sysTime.tm_year = systemTime->year - 1900;
+  sysTime.tm_mon = systemTime->month - 1;
+  sysTime.tm_wday = systemTime->dayOfWeek;
+  sysTime.tm_mday = systemTime->day;
+  sysTime.tm_hour = systemTime->hour;
+  sysTime.tm_min = systemTime->minute;
+  sysTime.tm_sec = systemTime->second;
   sysTime.tm_yday = dayoffset[sysTime.tm_mon] + (sysTime.tm_mday - 1);
   sysTime.tm_isdst = g_timezone.m_IsDST;
 
   // If this is a leap year, and we're past the 28th of Feb, increment tm_yday.
-  if (IsLeapYear(lpSystemTime->wYear) && (sysTime.tm_yday > 58))
+  if (IsLeapYear(systemTime->year) && (sysTime.tm_yday > 58))
     sysTime.tm_yday++;
 
 #if defined(TARGET_DARWIN)
@@ -113,24 +136,24 @@
 #endif
 
   LARGE_INTEGER result;
-  result.QuadPart = (long long) t * 10000000 + (long long) lpSystemTime->wMilliseconds * 10000;
+  result.QuadPart = (long long)t * 10000000 + (long long)systemTime->milliseconds * 10000;
   result.QuadPart += WIN32_TIME_OFFSET;
 
-  lpFileTime->dwLowDateTime = result.u.LowPart;
-  lpFileTime->dwHighDateTime = result.u.HighPart;
+  fileTime->lowDateTime = result.u.LowPart;
+  fileTime->highDateTime = result.u.HighPart;
 
   return 1;
 }
 
-long CompareFileTime(const FILETIME* lpFileTime1, const FILETIME* lpFileTime2)
+long CompareFileTime(const FileTime* fileTime1, const FileTime* fileTime2)
 {
   ULARGE_INTEGER t1;
-  t1.u.LowPart = lpFileTime1->dwLowDateTime;
-  t1.u.HighPart = lpFileTime1->dwHighDateTime;
+  t1.u.LowPart = fileTime1->lowDateTime;
+  t1.u.HighPart = fileTime1->highDateTime;
 
   ULARGE_INTEGER t2;
-  t2.u.LowPart = lpFileTime2->dwLowDateTime;
-  t2.u.HighPart = lpFileTime2->dwHighDateTime;
+  t2.u.LowPart = fileTime2->lowDateTime;
+  t2.u.HighPart = fileTime2->highDateTime;
 
   if (t1.QuadPart == t2.QuadPart)
      return 0;
@@ -140,55 +163,56 @@
      return 1;
 }
 
-int FileTimeToSystemTime( const FILETIME* lpFileTime, LPSYSTEMTIME lpSystemTime)
+int FileTimeToSystemTime(const FileTime* fileTime, SystemTime* systemTime)
 {
-  LARGE_INTEGER fileTime;
-  fileTime.u.LowPart = lpFileTime->dwLowDateTime;
-  fileTime.u.HighPart = lpFileTime->dwHighDateTime;
+  LARGE_INTEGER file;
+  file.u.LowPart = fileTime->lowDateTime;
+  file.u.HighPart = fileTime->highDateTime;
 
-  fileTime.QuadPart -= WIN32_TIME_OFFSET;
-  fileTime.QuadPart /= 10000; /* to milliseconds */
-  lpSystemTime->wMilliseconds = fileTime.QuadPart % 1000;
-  fileTime.QuadPart /= 1000; /* to seconds */
+  file.QuadPart -= WIN32_TIME_OFFSET;
+  file.QuadPart /= 10000; /* to milliseconds */
+  systemTime->milliseconds = file.QuadPart % 1000;
+  file.QuadPart /= 1000; /* to seconds */
 
-  time_t ft = fileTime.QuadPart;
+  time_t ft = file.QuadPart;
 
   struct tm tm_ft;
   gmtime_r(&ft,&tm_ft);
 
-  lpSystemTime->wYear = tm_ft.tm_year + 1900;
-  lpSystemTime->wMonth = tm_ft.tm_mon + 1;
-  lpSystemTime->wDayOfWeek = tm_ft.tm_wday;
-  lpSystemTime->wDay = tm_ft.tm_mday;
-  lpSystemTime->wHour = tm_ft.tm_hour;
-  lpSystemTime->wMinute = tm_ft.tm_min;
-  lpSystemTime->wSecond = tm_ft.tm_sec;
+  systemTime->year = tm_ft.tm_year + 1900;
+  systemTime->month = tm_ft.tm_mon + 1;
+  systemTime->dayOfWeek = tm_ft.tm_wday;
+  systemTime->day = tm_ft.tm_mday;
+  systemTime->hour = tm_ft.tm_hour;
+  systemTime->minute = tm_ft.tm_min;
+  systemTime->second = tm_ft.tm_sec;
 
   return 1;
 }
 
-int LocalFileTimeToFileTime( const FILETIME* lpLocalFileTime, LPFILETIME lpFileTime)
+int LocalFileTimeToFileTime(const FileTime* localFileTime, FileTime* fileTime)
 {
   ULARGE_INTEGER l;
-  l.u.LowPart = lpLocalFileTime->dwLowDateTime;
-  l.u.HighPart = lpLocalFileTime->dwHighDateTime;
+  l.u.LowPart = localFileTime->lowDateTime;
+  l.u.HighPart = localFileTime->highDateTime;
 
   l.QuadPart += (unsigned long long) timezone * 10000000;
 
-  lpFileTime->dwLowDateTime = l.u.LowPart;
-  lpFileTime->dwHighDateTime = l.u.HighPart;
+  fileTime->lowDateTime = l.u.LowPart;
+  fileTime->highDateTime = l.u.HighPart;
 
   return 1;
 }
 
-int FileTimeToTimeT(const FILETIME* lpLocalFileTime, time_t *pTimeT) {
 
-  if (lpLocalFileTime == NULL || pTimeT == NULL)
-  return false;
+int FileTimeToTimeT(const FileTime* localFileTime, time_t* pTimeT)
+{
+  if (!localFileTime || !pTimeT)
+    return false;
 
   ULARGE_INTEGER fileTime;
-  fileTime.u.LowPart  = lpLocalFileTime->dwLowDateTime;
-  fileTime.u.HighPart = lpLocalFileTime->dwHighDateTime;
+  fileTime.u.LowPart = localFileTime->lowDateTime;
+  fileTime.u.HighPart = localFileTime->highDateTime;
 
   fileTime.QuadPart -= WIN32_TIME_OFFSET;
   fileTime.QuadPart /= 10000; /* to milliseconds */
@@ -203,17 +227,20 @@
   return 1;
 }
 
-int TimeTToFileTime(time_t timeT, FILETIME* lpLocalFileTime) {
-
-  if (lpLocalFileTime == NULL)
-  return false;
+int TimeTToFileTime(time_t timeT, FileTime* localFileTime)
+{
+  if (!localFileTime)
+    return false;
 
   ULARGE_INTEGER result;
   result.QuadPart = (unsigned long long) timeT * 10000000;
   result.QuadPart += WIN32_TIME_OFFSET;
 
-  lpLocalFileTime->dwLowDateTime  = result.u.LowPart;
-  lpLocalFileTime->dwHighDateTime = result.u.HighPart;
+  localFileTime->lowDateTime = result.u.LowPart;
+  localFileTime->highDateTime = result.u.HighPart;
 
   return 1;
 }
+
+} // namespace TIME
+} // namespace KODI

_service:download_files:master.tar.gz/xbmc/platform/posix/XTimeUtils.h Deleted

_service:download_files:master.tar.gz/xbmc/platform/posix/filesystem/PosixDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/filesystem/SMBDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/filesystem/SMBFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/network/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/network/NetworkLinux.cpp Deleted

@@ -1,584 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include <cstdlib>
-
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#if defined(TARGET_LINUX)
-  #include <linux/if.h>
-  #include <linux/wireless.h>
-  #include <linux/sockios.h>
-#endif
-#ifdef TARGET_ANDROID
-#include "platform/android/bionic_supplement/bionic_supplement.h"
-
-#include <sys/system_properties.h>
-#include <sys/wait.h>
-#endif
-#include <errno.h>
-#include <resolv.h>
-#if defined(TARGET_DARWIN)
-  #include <sys/sockio.h>
-  #include <net/if.h>
-  #include <net/if_dl.h>
-  #include <net/if_types.h>
-  #include <net/route.h>
-  #include <netinet/if_ether.h>
-  #include <ifaddrs.h>
-#elif defined(TARGET_FREEBSD)
-  #include <sys/sockio.h>
-  #include <sys/wait.h>
-  #include <net/if.h>
-  #include <net/if_arp.h>
-  #include <net/if_dl.h>
-  #include <ifaddrs.h>
-  #include <net/route.h>
-  #include <netinet/if_ether.h>
-#else
-  #include <net/if_arp.h>
-#endif
-#include "PlatformDefs.h"
-#include "NetworkLinux.h"
-#include "Util.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-
-CNetworkInterfaceLinux::CNetworkInterfaceLinux(CNetworkLinux* network, std::string interfaceName, char interfaceMacAddrRaw[6]):
-  m_interfaceName(interfaceName),
-  m_interfaceMacAdr(StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
-                                        (uint8_t)interfaceMacAddrRaw[0],
-                                        (uint8_t)interfaceMacAddrRaw[1],
-                                        (uint8_t)interfaceMacAddrRaw[2],
-                                        (uint8_t)interfaceMacAddrRaw[3],
-                                        (uint8_t)interfaceMacAddrRaw[4],
-                                        (uint8_t)interfaceMacAddrRaw[5]))
-{
-   m_network = network;
-   memcpy(m_interfaceMacAddrRaw, interfaceMacAddrRaw, sizeof(m_interfaceMacAddrRaw));
-}
-
-CNetworkInterfaceLinux::~CNetworkInterfaceLinux(void) = default;
-
-bool CNetworkInterfaceLinux::IsEnabled() const
-{
-   struct ifreq ifr;
-   strcpy(ifr.ifr_name, m_interfaceName.c_str());
-   if (ioctl(m_network->GetSocket(), SIOCGIFFLAGS, &ifr) < 0)
-      return false;
-
-   return ((ifr.ifr_flags & IFF_UP) == IFF_UP);
-}
-
-bool CNetworkInterfaceLinux::IsConnected() const
-{
-   struct ifreq ifr;
-   int zero = 0;
-   memset(&ifr,0,sizeof(struct ifreq));
-   strcpy(ifr.ifr_name, m_interfaceName.c_str());
-   if (ioctl(m_network->GetSocket(), SIOCGIFFLAGS, &ifr) < 0)
-      return false;
-
-   // ignore loopback
-   int iRunning = ( (ifr.ifr_flags & IFF_RUNNING) && (!(ifr.ifr_flags & IFF_LOOPBACK)));
-
-   if (ioctl(m_network->GetSocket(), SIOCGIFADDR, &ifr) < 0)
-      return false;
-
-   // return only interfaces which has ip address
-   return iRunning && (0 != memcmp(ifr.ifr_addr.sa_data+sizeof(short), &zero, sizeof(int)));
-}
-
-std::string CNetworkInterfaceLinux::GetMacAddress() const
-{
-  return m_interfaceMacAdr;
-}
-
-void CNetworkInterfaceLinux::GetMacAddressRaw(char rawMac[6]) const
-{
-  memcpy(rawMac, m_interfaceMacAddrRaw, 6);
-}
-
-std::string CNetworkInterfaceLinux::GetCurrentIPAddress(void) const
-{
-   std::string result;
-
-   struct ifreq ifr;
-   strcpy(ifr.ifr_name, m_interfaceName.c_str());
-   ifr.ifr_addr.sa_family = AF_INET;
-   if (ioctl(m_network->GetSocket(), SIOCGIFADDR, &ifr) >= 0)
-   {
-      result = inet_ntoa((*((struct sockaddr_in *)&ifr.ifr_addr)).sin_addr);
-   }
-
-   return result;
-}
-
-std::string CNetworkInterfaceLinux::GetCurrentNetmask(void) const
-{
-   std::string result;
-
-   struct ifreq ifr;
-   strcpy(ifr.ifr_name, m_interfaceName.c_str());
-   ifr.ifr_addr.sa_family = AF_INET;
-   if (ioctl(m_network->GetSocket(), SIOCGIFNETMASK, &ifr) >= 0)
-   {
-      result = inet_ntoa((*((struct sockaddr_in*)&ifr.ifr_addr)).sin_addr);
-   }
-
-   return result;
-}
-
-std::string CNetworkInterfaceLinux::GetCurrentDefaultGateway(void) const
-{
-   std::string result;
-
-#if defined(TARGET_DARWIN)
-  FILE* pipe = popen("echo \"show State:/Network/Global/IPv4\" | scutil | grep Router", "r");
-  usleep(100000);
-  if (pipe)
-  {
-    std::string tmpStr;
-    char buffer[256] = {'\0'};
-    if (fread(buffer, sizeof(char), sizeof(buffer), pipe) > 0 && !ferror(pipe))
-    {
-      tmpStr = buffer;
-      if (tmpStr.length() >= 11)
-        result = tmpStr.substr(11);
-    }
-    pclose(pipe);
-  }
-  if (result.empty())
-    CLog::Log(LOGWARNING, "Unable to determine gateway");
-#elif defined(TARGET_FREEBSD)
-   size_t needed;
-   int mib[6];
-   char *buf, *next, *lim;
-   char line[16];
-   struct rt_msghdr *rtm;
-   struct sockaddr *sa;
-   struct sockaddr_in *sockin;
-
-   mib[0] = CTL_NET;
-   mib[1] = PF_ROUTE;
-   mib[2] = 0;
-   mib[3] = 0;
-   mib[4] = NET_RT_DUMP;
-   mib[5] = 0;
-   if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-      return result;
-
-   if ((buf = (char *)malloc(needed)) == NULL)
-      return result;
-
-   if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-      free(buf);
-      return result;
-   }
-
-   lim  = buf + needed;
-   for (next = buf; next < lim; next += rtm->rtm_msglen) {
-      rtm = (struct rt_msghdr *)next;
-      sa = (struct sockaddr *)(rtm + 1);
-      sa = (struct sockaddr *)(SA_SIZE(sa) + (char *)sa);
-      sockin = (struct sockaddr_in *)sa;
-      if (inet_ntop(AF_INET, &sockin->sin_addr.s_addr,
-         line, sizeof(line)) == NULL) {
-            free(buf);
-            return result;
-	  }
-	  result = line;
-      break;
-   }
-   free(buf);
-#else
-   FILE* fp = fopen("/proc/net/route", "r");
-   if (!fp)
-   {
-     // TBD: Error
-     return result;
-   }
-
-   char* line = NULL;
-   char iface[16];
-   char dst[128];
-   char gateway[128];
-   size_t linel = 0;
-   int n;
-   int linenum = 0;
-   while (getdelim(&line, &linel, '\n', fp) > 0)
-   {
-      // skip first two lines
-      if (linenum++ < 1)
-         continue;
-
-      // search where the word begins
-      n = sscanf(line,  "%15s %127s %127s",
-         iface, dst, gateway);
-
-      if (n < 3)
-         continue;
-
-      if (strcmp(iface, m_interfaceName.c_str()) == 0 &&
-          strcmp(dst, "00000000") == 0 &&
-          strcmp(gateway, "00000000") != 0)
-      {
-         unsigned char gatewayAddr[4];
-         int len = CNetworkBase::ParseHex(gateway, gatewayAddr);
-         if (len == 4)
-         {
-            struct in_addr in;
-            in.s_addr = (gatewayAddr[0] << 24) | (gatewayAddr[1] << 16) |
-                        (gatewayAddr[2] << 8) | (gatewayAddr[3]);
-            result = inet_ntoa(in);
-            break;
-         }
-      }
-   }
-   free(line);
-   fclose(fp);
-#endif
-
-   return result;
-}
-
-CNetworkLinux::CNetworkLinux()
- : CNetworkBase()
-{
-   m_sock = socket(AF_INET, SOCK_DGRAM, 0);
-   queryInterfaceList();
-}
-
-CNetworkLinux::~CNetworkLinux(void)
-{
-  if (m_sock != -1)
-    close(CNetworkLinux::m_sock);
-
-  std::vector<CNetworkInterface*>::iterator it = m_interfaces.begin();
-  while(it != m_interfaces.end())
-  {
-    CNetworkInterface* nInt = *it;
-    delete nInt;
-    it = m_interfaces.erase(it);
-  }
-}
-
-std::vector<CNetworkInterface*>& CNetworkLinux::GetInterfaceList(void)
-{
-   return m_interfaces;
-}
-
-//! @bug
-//! Overwrite the GetFirstConnectedInterface and requery
-//! the interface list if no connected device is found
-//! this fixes a bug when no network is available after first start of xbmc
-//! and the interface comes up during runtime
-CNetworkInterface* CNetworkLinux::GetFirstConnectedInterface(void)
-{
-    CNetworkInterface *pNetIf=CNetworkBase::GetFirstConnectedInterface();
-
-    // no connected Interfaces found? - requeryInterfaceList
-    if (!pNetIf)
-    {
-        CLog::Log(LOGDEBUG,"%s no connected interface found - requery list",__FUNCTION__);
-        queryInterfaceList();
-        //retry finding a connected if
-        pNetIf = CNetworkBase::GetFirstConnectedInterface();
-    }
-
-    return pNetIf;
-}
-
-
-void CNetworkLinux::GetMacAddress(const std::string& interfaceName, char rawMac[6])
-{
-  memset(rawMac, 0, 6);
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
-
-#if !defined(IFT_ETHER)
-#define IFT_ETHER 0x6/* Ethernet CSMACD */
-#endif
-  const struct sockaddr_dl* dlAddr = NULL;
-  const uint8_t * base = NULL;
-  // Query the list of interfaces.
-  struct ifaddrs *list;
-  struct ifaddrs *interface;
-
-  if( getifaddrs(&list) < 0 )
-  {
-    return;
-  }
-
-  for(interface = list; interface != NULL; interface = interface->ifa_next)
-  {
-    if(interfaceName == interface->ifa_name)
-    {
-      if ( (interface->ifa_addr->sa_family == AF_LINK) && (((const struct sockaddr_dl *) interface->ifa_addr)->sdl_type == IFT_ETHER) )
-      {
-        dlAddr = (const struct sockaddr_dl *) interface->ifa_addr;
-        base = (const uint8_t *) &dlAddr->sdl_data[dlAddr->sdl_nlen];
-
-        if( dlAddr->sdl_alen > 5 )
-        {
-          memcpy(rawMac, base, 6);
-        }
-      }
-      break;
-    }
-  }
-
-  freeifaddrs(list);
-
-#else
-
-   struct ifreq ifr;
-   strcpy(ifr.ifr_name, interfaceName.c_str());
-   if (ioctl(GetSocket(), SIOCGIFHWADDR, &ifr) >= 0)
-   {
-      memcpy(rawMac, ifr.ifr_hwaddr.sa_data, 6);
-   }
-#endif
-}
-
-void CNetworkLinux::queryInterfaceList()
-{
-  char macAddrRaw[6];
-  m_interfaces.clear();
-
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
-
-   // Query the list of interfaces.
-   struct ifaddrs *list;
-   if (getifaddrs(&list) < 0)
-     return;
-
-   struct ifaddrs *cur;
-   for(cur = list; cur != NULL; cur = cur->ifa_next)
-   {
-     if(cur->ifa_addr->sa_family != AF_INET)
-       continue;
-
-     GetMacAddress(cur->ifa_name, macAddrRaw);
-
-      // only add interfaces with non-zero mac addresses
-      if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] || macAddrRaw[5])
-         // Add the interface.
-         m_interfaces.push_back(new CNetworkInterfaceLinux(this, cur->ifa_name, macAddrRaw));
-   }
-
-   freeifaddrs(list);
-
-#else
-   FILE* fp = fopen("/proc/net/dev", "r");
-   if (!fp)
-   {
-     // TBD: Error
-     return;
-   }
-
-   char* line = NULL;
-   size_t linel = 0;
-   int n;
-   char* p;
-   int linenum = 0;
-   while (getdelim(&line, &linel, '\n', fp) > 0)
-   {
-      // skip first two lines
-      if (linenum++ < 2)
-         continue;
-
-    // search where the word begins
-      p = line;
-      while (isspace(*p))
-      ++p;
-
-      // read word until :
-      n = strcspn(p, ": \t");
-      p[n] = 0;
-
-      // save the result
-      std::string interfaceName = p;
-      GetMacAddress(interfaceName, macAddrRaw);
-
-      // only add interfaces with non-zero mac addresses
-      if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] || macAddrRaw[5])
-          m_interfaces.push_back(new CNetworkInterfaceLinux(this, interfaceName, macAddrRaw));
-   }
-   free(line);
-   fclose(fp);
-#endif
-}
-
-std::vector<std::string> CNetworkLinux::GetNameServers(void)
-{
-   std::vector<std::string> result;
-
-#if defined(TARGET_DARWIN)
-  FILE* pipe = popen("scutil --dns | grep \"nameserver\" | tail -n2", "r");
-  usleep(100000);
-  if (pipe)
-  {
-    std::vector<std::string> tmpStr;
-    char buffer[256] = {'\0'};
-    if (fread(buffer, sizeof(char), sizeof(buffer), pipe) > 0 && !ferror(pipe))
-    {
-      tmpStr = StringUtils::Split(buffer, "\n");
-      for (unsigned int i = 0; i < tmpStr.size(); i ++)
-      {
-        // result looks like this - > '  nameserver[0] : 192.168.1.1'
-        // 2 blank spaces + 13 in 'nameserver[0]' + blank + ':' + blank == 18 :)
-        if (tmpStr[i].length() >= 18)
-          result.push_back(tmpStr[i].substr(18));
-      }
-    }
-    pclose(pipe);
-  }
-  if (result.empty())
-    CLog::Log(LOGWARNING, "Unable to determine nameserver");
-#elif defined(TARGET_ANDROID)
-  char nameserver[PROP_VALUE_MAX];
-
-  if (__system_property_get("net.dns1",nameserver))
-    result.push_back(nameserver);
-  if (__system_property_get("net.dns2",nameserver))
-    result.push_back(nameserver);
-  if (__system_property_get("net.dns3",nameserver))
-    result.push_back(nameserver);
-
-  if (!result.size())
-       CLog::Log(LOGWARNING, "Unable to determine nameserver");
-#else
-   res_init();
-
-   for (int i = 0; i < _res.nscount; i ++)
-   {
-      std::string ns = inet_ntoa(_res.nsaddr_list[i].sin_addr);
-      result.push_back(ns);
-   }
-#endif
-   return result;
-}
-
-bool CNetworkLinux::PingHost(unsigned long remote_ip, unsigned int timeout_ms)
-{
-  char cmd_line [64];
-
-  struct in_addr host_ip;
-  host_ip.s_addr = remote_ip;
-
-#if defined (TARGET_DARWIN) || defined (TARGET_FREEBSD)
-  sprintf(cmd_line, "ping -c 1 -t %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0, inet_ntoa(host_ip));
-#else
-  sprintf(cmd_line, "ping -c 1 -w %d %s", timeout_ms / 1000 + (timeout_ms % 1000) != 0, inet_ntoa(host_ip));
-#endif
-
-  int status = -1;
-  status = system (cmd_line);
-  int result = WIFEXITED(status) ? WEXITSTATUS(status) : -1;
-
-  // http://linux.about.com/od/commands/l/blcmdl8_ping.htm ;
-  // 0 reply
-  // 1 no reply
-  // else some error
-
-  if (result < 0 || result > 1)
-    CLog::Log(LOGERROR, "Ping fail : status = %d, errno = %d : '%s'", status, errno, cmd_line);
-
-  return result == 0;
-}
-
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
-bool CNetworkInterfaceLinux::GetHostMacAddress(unsigned long host_ip, std::string& mac) const
-{
-  bool ret = false;
-  size_t needed;
-  char *buf, *next;
-  struct rt_msghdr *rtm;
-  struct sockaddr_inarp *sin;
-  struct sockaddr_dl *sdl;
-  int mib[6];
-
-  mac = "";
-
-  mib[0] = CTL_NET;
-  mib[1] = PF_ROUTE;
-  mib[2] = 0;
-  mib[3] = AF_INET;
-  mib[4] = NET_RT_FLAGS;
-  mib[5] = RTF_LLINFO;
-
-  if (sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == 0)
-  {
-    buf = (char*)malloc(needed);
-    if (buf)
-    {
-      if (sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == 0)
-      {
-        for (next = buf; next < buf + needed; next += rtm->rtm_msglen)
-        {
-
-          rtm = (struct rt_msghdr *)next;
-          sin = (struct sockaddr_inarp *)(rtm + 1);
-          sdl = (struct sockaddr_dl *)(sin + 1);
-
-          if (host_ip != sin->sin_addr.s_addr || sdl->sdl_alen < 6)
-            continue;
-
-          u_char *cp = (u_char*)LLADDR(sdl);
-
-          mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
-                                    cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
-          ret = true;
-          break;
-        }
-      }
-      free(buf);
-    }
-  }
-  return ret;
-}
-#else
-bool CNetworkInterfaceLinux::GetHostMacAddress(unsigned long host_ip, std::string& mac) const
-{
-  struct arpreq areq;
-  struct sockaddr_in* sin;
-
-  memset(&areq, 0x0, sizeof(areq));
-
-  sin = (struct sockaddr_in *) &areq.arp_pa;
-  sin->sin_family = AF_INET;
-  sin->sin_addr.s_addr = host_ip;
-
-  sin = (struct sockaddr_in *) &areq.arp_ha;
-  sin->sin_family = ARPHRD_ETHER;
-
-  strncpy(areq.arp_dev, m_interfaceName.c_str(), sizeof(areq.arp_dev));
-  areq.arp_dev[sizeof(areq.arp_dev)-1] = '\0';
-
-  int result = ioctl (m_network->GetSocket(), SIOCGARP, (caddr_t) &areq);
-
-  if (result != 0)
-  {
-//  CLog::Log(LOGERROR, "%s - GetHostMacAddress/ioctl failed with errno (%d)", __FUNCTION__, errno);
-    return false;
-  }
-
-  struct sockaddr* res = &areq.arp_ha;
-  mac = StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
-    (uint8_t) res->sa_data[0], (uint8_t) res->sa_data[1], (uint8_t) res->sa_data[2],
-    (uint8_t) res->sa_data[3], (uint8_t) res->sa_data[4], (uint8_t) res->sa_data[5]);
-
-  for (int i=0; i<6; ++i)
-    if (res->sa_data[i])
-      return true;
-
-  return false;
-}
-#endif

_service:download_files:master.tar.gz/xbmc/platform/posix/network/NetworkLinux.h Deleted

@@ -1,71 +0,0 @@
-/*
- *  Copyright (C) 2005-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include "network/Network.h"
-
-#include <cstdio>
-#include <string>
-#include <vector>
-
-class CNetworkLinux;
-
-class CNetworkInterfaceLinux : public CNetworkInterface
-{
-public:
-   CNetworkInterfaceLinux(CNetworkLinux* network, std::string interfaceName, char interfaceMacAddrRaw[6]);
-   ~CNetworkInterfaceLinux(void) override;
-
-   bool IsEnabled(void) const override;
-   bool IsConnected(void) const override;
-
-   std::string GetMacAddress(void) const override;
-   void GetMacAddressRaw(char rawMac[6]) const override;
-
-   bool GetHostMacAddress(unsigned long host, std::string& mac) const override;
-
-   std::string GetCurrentIPAddress() const override;
-   std::string GetCurrentNetmask() const override;
-   std::string GetCurrentDefaultGateway(void) const override;
-
-private:
-   std::string     m_interfaceName;
-   std::string     m_interfaceMacAdr;
-   char           m_interfaceMacAddrRaw[6];
-   CNetworkLinux* m_network;
-};
-
-class CNetworkLinux : public CNetworkBase
-{
-public:
-   CNetworkLinux();
-   ~CNetworkLinux(void) override;
-
-   // Return the list of interfaces
-   std::vector<CNetworkInterface*>& GetInterfaceList(void) override;
-   CNetworkInterface* GetFirstConnectedInterface(void) override;
-
-   // Ping remote host
-   bool PingHost(unsigned long host, unsigned int timeout_ms = 2000) override;
-
-   // Get/set the nameserver(s)
-   std::vector<std::string> GetNameServers(void) override;
-
-   friend class CNetworkInterfaceLinux;
-
-private:
-   int GetSocket() { return m_sock; }
-   void GetMacAddress(const std::string& interfaceName, char macAddrRaw[6]);
-   void queryInterfaceList();
-   std::vector<CNetworkInterface*> m_interfaces;
-   int m_sock;
-};
-
-using CNetwork = CNetworkLinux;
-

_service:download_files:master.tar.gz/xbmc/platform/posix/network/NetworkPosix.cpp Added

@@ -0,0 +1,148 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "NetworkPosix.h"
+
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+
+CNetworkInterfacePosix::CNetworkInterfacePosix(CNetworkPosix* network,
+                                               std::string interfaceName,
+                                               char interfaceMacAddrRaw[6])
+  : m_interfaceName(interfaceName),
+    m_interfaceMacAdr(StringUtils::Format("%02X:%02X:%02X:%02X:%02X:%02X",
+                                          (uint8_t)interfaceMacAddrRaw[0],
+                                          (uint8_t)interfaceMacAddrRaw[1],
+                                          (uint8_t)interfaceMacAddrRaw[2],
+                                          (uint8_t)interfaceMacAddrRaw[3],
+                                          (uint8_t)interfaceMacAddrRaw[4],
+                                          (uint8_t)interfaceMacAddrRaw[5]))
+{
+  m_network = network;
+  memcpy(m_interfaceMacAddrRaw, interfaceMacAddrRaw, sizeof(m_interfaceMacAddrRaw));
+}
+
+bool CNetworkInterfacePosix::IsEnabled() const
+{
+  struct ifreq ifr;
+  strcpy(ifr.ifr_name, m_interfaceName.c_str());
+  if (ioctl(m_network->GetSocket(), SIOCGIFFLAGS, &ifr) < 0)
+    return false;
+
+  return ((ifr.ifr_flags & IFF_UP) == IFF_UP);
+}
+
+bool CNetworkInterfacePosix::IsConnected() const
+{
+  struct ifreq ifr;
+  int zero = 0;
+  memset(&ifr, 0, sizeof(struct ifreq));
+  strcpy(ifr.ifr_name, m_interfaceName.c_str());
+  if (ioctl(m_network->GetSocket(), SIOCGIFFLAGS, &ifr) < 0)
+    return false;
+
+  // ignore loopback
+  int iRunning = ((ifr.ifr_flags & IFF_RUNNING) && (!(ifr.ifr_flags & IFF_LOOPBACK)));
+
+  if (ioctl(m_network->GetSocket(), SIOCGIFADDR, &ifr) < 0)
+    return false;
+
+  // return only interfaces which has ip address
+  return iRunning && (0 != memcmp(ifr.ifr_addr.sa_data + sizeof(short), &zero, sizeof(int)));
+}
+
+std::string CNetworkInterfacePosix::GetCurrentIPAddress() const
+{
+  std::string result;
+
+  struct ifreq ifr;
+  strcpy(ifr.ifr_name, m_interfaceName.c_str());
+  ifr.ifr_addr.sa_family = AF_INET;
+  if (ioctl(m_network->GetSocket(), SIOCGIFADDR, &ifr) >= 0)
+  {
+    result = inet_ntoa((*((struct sockaddr_in*)&ifr.ifr_addr)).sin_addr);
+  }
+
+  return result;
+}
+
+std::string CNetworkInterfacePosix::GetCurrentNetmask() const
+{
+  std::string result;
+
+  struct ifreq ifr;
+  strcpy(ifr.ifr_name, m_interfaceName.c_str());
+  ifr.ifr_addr.sa_family = AF_INET;
+  if (ioctl(m_network->GetSocket(), SIOCGIFNETMASK, &ifr) >= 0)
+  {
+    result = inet_ntoa((*((struct sockaddr_in*)&ifr.ifr_addr)).sin_addr);
+  }
+
+  return result;
+}
+
+std::string CNetworkInterfacePosix::GetMacAddress() const
+{
+  return m_interfaceMacAdr;
+}
+
+void CNetworkInterfacePosix::GetMacAddressRaw(char rawMac[6]) const
+{
+  memcpy(rawMac, m_interfaceMacAddrRaw, 6);
+}
+
+CNetworkPosix::CNetworkPosix() : CNetworkBase()
+{
+  m_sock = socket(AF_INET, SOCK_DGRAM, 0);
+}
+
+CNetworkPosix::~CNetworkPosix()
+{
+  if (m_sock != -1)
+    close(CNetworkPosix::m_sock);
+
+  std::vector<CNetworkInterface*>::iterator it = m_interfaces.begin();
+  while (it != m_interfaces.end())
+  {
+    CNetworkInterface* nInt = *it;
+    delete nInt;
+    it = m_interfaces.erase(it);
+  }
+}
+
+std::vector<CNetworkInterface*>& CNetworkPosix::GetInterfaceList()
+{
+  return m_interfaces;
+}
+
+//! @bug
+//! Overwrite the GetFirstConnectedInterface and requery
+//! the interface list if no connected device is found
+//! this fixes a bug when no network is available after first start of xbmc
+//! and the interface comes up during runtime
+CNetworkInterface* CNetworkPosix::GetFirstConnectedInterface()
+{
+  CNetworkInterface* pNetIf = CNetworkBase::GetFirstConnectedInterface();
+
+  // no connected Interfaces found? - requeryInterfaceList
+  if (!pNetIf)
+  {
+    CLog::Log(LOGDEBUG, "%s no connected interface found - requery list", __FUNCTION__);
+    queryInterfaceList();
+    //retry finding a connected if
+    pNetIf = CNetworkBase::GetFirstConnectedInterface();
+  }
+
+  return pNetIf;
+}

_service:download_files:master.tar.gz/xbmc/platform/posix/network/NetworkPosix.h Added

@@ -0,0 +1,69 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "network/Network.h"
+
+#include <string>
+#include <vector>
+
+class CNetworkPosix;
+
+class CNetworkInterfacePosix : public CNetworkInterface
+{
+public:
+  CNetworkInterfacePosix(CNetworkPosix* network,
+                         std::string interfaceName,
+                         char interfaceMacAddrRaw[6]);
+  virtual ~CNetworkInterfacePosix() override = default;
+
+  bool IsEnabled() const override;
+  bool IsConnected() const override;
+  std::string GetCurrentIPAddress() const override;
+  std::string GetCurrentNetmask() const override;
+
+  std::string GetMacAddress() const override;
+  void GetMacAddressRaw(char rawMac[6]) const override;
+
+protected:
+  std::string m_interfaceName;
+  CNetworkPosix* m_network;
+
+private:
+  std::string m_interfaceMacAdr;
+  char m_interfaceMacAddrRaw[6];
+};
+
+class CNetworkPosix : public CNetworkBase
+{
+public:
+  CNetworkPosix();
+  virtual ~CNetworkPosix() override;
+
+  std::vector<CNetworkInterface*>& GetInterfaceList() override;
+  CNetworkInterface* GetFirstConnectedInterface() override;
+
+  int GetSocket() { return m_sock; }
+
+protected:
+  std::vector<CNetworkInterface*> m_interfaces;
+
+private:
+  virtual void GetMacAddress(const std::string& interfaceName, char macAddrRaw[6]) = 0;
+  virtual void queryInterfaceList() = 0;
+  int m_sock;
+};
+
+#if defined(HAS_LINUX_NETWORK)
+#include "platform/linux/network/NetworkLinux.h"
+#elif defined(HAS_FREEBSD_NETWORK)
+#include "platform/freebsd/network/NetworkFreebsd.h"
+#elif defined(HAS_OSX_NETWORK)
+#include "platform/darwin/osx/network/NetworkOsx.h"
+#endif

_service:download_files:master.tar.gz/xbmc/platform/win10/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/win10/CPUInfoWin10.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win10/filesystem/WinLibraryDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win10/storage/Win10StorageProvider.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/CPUInfoWin32.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/XTimeUtils.cpp Added

@@ -0,0 +1,169 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "utils/XTimeUtils.h"
+
+#include "platform/win32/CharsetConverter.h"
+
+#include <FileAPI.h>
+#include <Windows.h>
+
+using KODI::PLATFORM::WINDOWS::FromW;
+
+namespace KODI
+{
+namespace TIME
+{
+namespace
+{
+void SystemTimeToKodiTime(const SYSTEMTIME& sst, SystemTime& st)
+{
+  st.day = sst.wDay;
+  st.dayOfWeek = sst.wDayOfWeek;
+  st.hour = sst.wHour;
+  st.milliseconds = sst.wMilliseconds;
+  st.minute = sst.wMinute;
+  st.month = sst.wMonth;
+  st.second = sst.wSecond;
+  st.year = sst.wYear;
+}
+
+void KodiTimeToSystemTime(const SystemTime& st, SYSTEMTIME& sst)
+{
+  sst.wDay = st.day;
+  sst.wDayOfWeek = st.dayOfWeek;
+  sst.wHour = st.hour;
+  sst.wMilliseconds = st.milliseconds;
+  sst.wMinute = st.minute;
+  sst.wMonth = st.month;
+  sst.wSecond = st.second;
+  sst.wYear = st.year;
+}
+} // namespace
+
+void Sleep(uint32_t milliSeconds)
+{
+  ::Sleep(milliSeconds);
+}
+
+uint32_t GetTimeZoneInformation(TimeZoneInformation* timeZoneInformation)
+{
+  if (!timeZoneInformation)
+    return KODI_TIME_ZONE_ID_INVALID;
+
+  TIME_ZONE_INFORMATION tzi;
+  uint32_t result = ::GetTimeZoneInformation(&tzi);
+  if (result == KODI_TIME_ZONE_ID_INVALID)
+    return result;
+
+  timeZoneInformation->bias = tzi.Bias;
+  timeZoneInformation->daylightBias = tzi.DaylightBias;
+  SystemTimeToKodiTime(tzi.DaylightDate, timeZoneInformation->daylightDate);
+  timeZoneInformation->daylightName = FromW(tzi.DaylightName);
+  timeZoneInformation->standardBias = tzi.StandardBias;
+  SystemTimeToKodiTime(tzi.StandardDate, timeZoneInformation->standardDate);
+  timeZoneInformation->standardName = FromW(tzi.StandardName);
+
+  return result;
+}
+
+void GetLocalTime(SystemTime* systemTime)
+{
+  SYSTEMTIME time;
+  ::GetLocalTime(&time);
+
+  systemTime->year = time.wYear;
+  systemTime->month = time.wMonth;
+  systemTime->dayOfWeek = time.wDayOfWeek;
+  systemTime->day = time.wDay;
+  systemTime->hour = time.wHour;
+  systemTime->minute = time.wMinute;
+  systemTime->second = time.wSecond;
+  systemTime->milliseconds = time.wMilliseconds;
+}
+
+int FileTimeToLocalFileTime(const FileTime* fileTime, FileTime* localFileTime)
+{
+  FILETIME file;
+  file.dwLowDateTime = fileTime->lowDateTime;
+  file.dwHighDateTime = fileTime->highDateTime;
+
+  FILETIME localFile;
+  int ret = ::FileTimeToLocalFileTime(&file, &localFile);
+
+  localFileTime->lowDateTime = localFile.dwLowDateTime;
+  localFileTime->highDateTime = localFile.dwHighDateTime;
+
+  return ret;
+}
+
+int SystemTimeToFileTime(const SystemTime* systemTime, FileTime* fileTime)
+{
+  SYSTEMTIME time;
+  time.wYear = systemTime->year;
+  time.wMonth = systemTime->month;
+  time.wDayOfWeek = systemTime->dayOfWeek;
+  time.wDay = systemTime->day;
+  time.wHour = systemTime->hour;
+  time.wMinute = systemTime->minute;
+  time.wSecond = systemTime->second;
+  time.wMilliseconds = systemTime->milliseconds;
+
+  FILETIME file;
+  int ret = ::SystemTimeToFileTime(&time, &file);
+
+  fileTime->lowDateTime = file.dwLowDateTime;
+  fileTime->highDateTime = file.dwHighDateTime;
+
+  return ret;
+}
+
+long CompareFileTime(const FileTime* fileTime1, const FileTime* fileTime2)
+{
+  FILETIME file1;
+  file1.dwLowDateTime = fileTime1->lowDateTime;
+  file1.dwHighDateTime = fileTime1->highDateTime;
+
+  FILETIME file2;
+  file2.dwLowDateTime = fileTime2->lowDateTime;
+  file2.dwHighDateTime = fileTime2->highDateTime;
+
+  return ::CompareFileTime(&file1, &file2);
+}
+
+int FileTimeToSystemTime(const FileTime* fileTime, SystemTime* systemTime)
+{
+  FILETIME file;
+  file.dwLowDateTime = fileTime->lowDateTime;
+  file.dwHighDateTime = fileTime->highDateTime;
+
+  SYSTEMTIME time;
+  int ret = ::FileTimeToSystemTime(&file, &time);
+  SystemTimeToKodiTime(time, *systemTime);
+
+  return ret;
+}
+
+int LocalFileTimeToFileTime(const FileTime* localFileTime, FileTime* fileTime)
+{
+  FILETIME localFile;
+  localFile.dwLowDateTime = localFileTime->lowDateTime;
+  localFile.dwHighDateTime = localFileTime->highDateTime;
+
+  FILETIME file;
+
+  int ret = ::LocalFileTimeToFileTime(&localFile, &file);
+
+  fileTime->lowDateTime = file.dwLowDateTime;
+  fileTime->highDateTime = file.dwHighDateTime;
+
+  return ret;
+}
+
+} // namespace TIME
+} // namespace KODI

_service:download_files:master.tar.gz/xbmc/platform/win32/filesystem/Win32Directory.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/filesystem/Win32SMBDirectory.cpp Changed

@@ -7,17 +7,19 @@
  */
 
 #include "Win32SMBDirectory.h"
+
 #include "FileItem.h"
-#include "platform/win32/WIN32Util.h"
-#include "platform/win32/CharsetConverter.h"
-#include "utils/CharsetConverter.h"
-#include "URL.h"
-#include "utils/log.h"
 #include "PasswordManager.h"
+#include "URL.h"
+#include "utils/CharsetConverter.h"
+#include "utils/XTimeUtils.h"
 #include "utils/auto_buffer.h"
+#include "utils/log.h"
 
-#include <Windows.h>
+#include "platform/win32/CharsetConverter.h"
+#include "platform/win32/WIN32Util.h"
 
+#include <Windows.h>
 #include <Winnetwk.h>
 #pragma comment(lib, "mpr.lib")
 
@@ -166,8 +168,11 @@
 
     // calculation of size and date costs a little on win32
     // so DIR_FLAG_NO_FILE_INFO flag is ignored
-    FILETIME localTime;
-    if (FileTimeToLocalFileTime(&findData.ftLastWriteTime, &localTime) == TRUE)
+    KODI::TIME::FileTime fileTime;
+    fileTime.lowDateTime = findData.ftLastWriteTime.dwLowDateTime;
+    fileTime.lowDateTime = findData.ftLastWriteTime.dwHighDateTime;
+    KODI::TIME::FileTime localTime;
+    if (KODI::TIME::FileTimeToLocalFileTime(&fileTime, &localTime) == TRUE)
       pItem->m_dateTime = localTime;
     else
       pItem->m_dateTime.SetValid(false);

_service:download_files:master.tar.gz/xbmc/platform/win32/utils/Win32InterfaceForCLog.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListXML.cpp Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2005-2018 Team Kodi
+ *  Copyright (C) 2005-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -10,6 +10,7 @@
 
 #include "Util.h"
 #include "filesystem/File.h"
+#include "media/MediaLockState.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/Variant.h"
@@ -136,7 +137,7 @@
        if ( !lockpass.empty() )
        {
          newItem->m_strLockCode = lockpass;
-         newItem->m_iHasLock = 2;
+         newItem->m_iHasLock = LOCK_STATE_LOCKED;
          newItem->m_iLockMode = LOCK_MODE_NUMERIC;
        }
 
@@ -181,7 +182,7 @@
     if ( !item->GetProperty("remotechannel").empty() )
       write += StringUtils::Format("    <channel>%s</channel>", item->GetProperty("remotechannel").c_str() );
 
-    if ( item->m_iHasLock > 0 )
+    if (item->m_iHasLock > LOCK_STATE_NO_LOCK)
       write += StringUtils::Format("    <lockpassword>%s<lockpassword>", item->m_strLockCode.c_str() );
 
     write += StringUtils::Format("  </stream>\n\n" );

_service:download_files:master.tar.gz/xbmc/powermanagement/PowerManager.h Changed

_service:download_files:master.tar.gz/xbmc/profiles/ProfileManager.cpp Changed

@@ -76,14 +76,7 @@
 
 static CProfile EmptyProfile;
 
-CProfileManager::CProfileManager() :
-    m_usingLoginScreen(false),
-    m_profileLoadedForLogin(false),
-    m_autoLoginProfile(-1),
-    m_lastUsedProfile(0),
-    m_currentProfile(0),
-    m_nextProfileId(0),
-    m_eventLogs(new CEventLogManager)
+CProfileManager::CProfileManager() : m_eventLogs(new CEventLogManager)
 {
 }
 
@@ -252,6 +245,7 @@
   CSingleLock lock(m_critical);
   m_usingLoginScreen = false;
   m_profileLoadedForLogin = false;
+  m_previousProfileLoadedForLogin = false;
   m_lastUsedProfile = 0;
   m_nextProfileId = 0;
   SetCurrentProfileId(0);
@@ -304,7 +298,7 @@
 
   // save any settings of the currently used skin but only if the (master)
   // profile hasn't just been loaded as a temporary profile for login
-  if (g_SkinInfo != nullptr && !m_profileLoadedForLogin)
+  if (g_SkinInfo != nullptr && !m_previousProfileLoadedForLogin)
     g_SkinInfo->SaveSettings();
 
   // @todo: why is m_settings not used here?
@@ -314,7 +308,7 @@
   settings->Unload();
 
   SetCurrentProfileId(index);
-  m_profileLoadedForLogin = false;
+  m_previousProfileLoadedForLogin = false;
 
   // load the new settings
   if (!settings->Load())
@@ -370,6 +364,8 @@
   Save();
   FinalizeLoadProfile();
 
+  m_profileLoadedForLogin = false;
+
   return true;
 }
 
@@ -414,14 +410,17 @@
   contextMenuManager.Init();
 
   // Restart PVR services if we are not just loading the master profile for the login screen
-  if (m_profileLoadedForLogin || m_currentProfile != 0 || m_lastUsedProfile == 0)
+  if (m_previousProfileLoadedForLogin || m_currentProfile != 0 || m_lastUsedProfile == 0)
     pvrManager.Init();
 
   favouritesManager.ReInit(GetProfileUserDataFolder());
 
-  serviceAddons.Start();
-
-  g_application.UpdateLibraries();
+  // Start these operations only when a profile is loaded, not on the login screen
+  if (!m_profileLoadedForLogin || (m_profileLoadedForLogin && m_lastUsedProfile == 0))
+  {
+    serviceAddons.Start();
+    g_application.UpdateLibraries();
+  }
 
   stereoscopicsManager.Initialize();
 
@@ -609,10 +608,13 @@
   m_lastUsedProfile = m_currentProfile;
   if (m_currentProfile != 0)
   {
+    // determines that the (master) profile has only been loaded for login
+    m_profileLoadedForLogin = true;
+
     LoadProfile(0);
 
     // remember that the (master) profile has only been loaded for login
-    m_profileLoadedForLogin = true;
+    m_previousProfileLoadedForLogin = true;
   }
 }

_service:download_files:master.tar.gz/xbmc/profiles/ProfileManager.h Changed

_service:download_files:master.tar.gz/xbmc/programs/GUIWindowPrograms.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRContextMenus.cpp Changed

@@ -15,6 +15,7 @@
 #include "pvr/addons/PVRClient.h"
 #include "pvr/addons/PVRClientMenuHooks.h"
 #include "pvr/channels/PVRChannel.h"
+#include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/epg/EpgInfoTag.h"
 #include "pvr/guilib/PVRGUIActions.h"
 #include "pvr/recordings/PVRRecording.h"
@@ -150,8 +151,8 @@
       if (channel)
         return channel->GetEPGNow().get() != nullptr;
 
-      if (item.GetEPGInfoTag())
-        return true;
+      if (item.HasEPGInfoTag())
+        return !item.GetEPGInfoTag()->IsGapTag();
 
       const std::shared_ptr<CPVRTimerInfoTag> timer(item.GetPVRTimerInfoTag());
       if (timer && !URIUtils::PathEquals(item.GetPath(), CPVRTimersPath::PATH_ADDTIMER))
@@ -197,8 +198,8 @@
       if (channel)
         return channel->GetEPGNow().get() != nullptr;
 
-      if (item.GetEPGInfoTag())
-        return true;
+      if (item.HasEPGInfoTag())
+        return !item.GetEPGInfoTag()->IsGapTag();
 
       const std::shared_ptr<CPVRTimerInfoTag> timer(item.GetPVRTimerInfoTag());
       if (timer && !URIUtils::PathEquals(item.GetPath(), CPVRTimersPath::PATH_ADDTIMER))
@@ -223,22 +224,49 @@
     {
       const std::shared_ptr<CPVRClient> client = CServiceBroker::GetPVRManager().GetClient(item);
 
-      const std::shared_ptr<CPVRChannel> channel = item.GetPVRChannelInfoTag();
+      std::shared_ptr<CPVRChannel> channel = item.GetPVRChannelInfoTag();
       if (channel)
         return client && client->GetClientCapabilities().SupportsTimers() &&
                !CServiceBroker::GetPVRManager().Timers()->IsRecordingOnChannel(*channel);
 
       const std::shared_ptr<CPVREpgInfoTag> epg = item.GetEPGInfoTag();
-      if (epg &&
-          !CServiceBroker::GetPVRManager().Timers()->GetTimerForEpgTag(epg) &&
-          epg->IsRecordable())
-        return client && client->GetClientCapabilities().SupportsTimers();
-
+      if (epg && epg->IsRecordable())
+      {
+        if (epg->IsGapTag())
+        {
+          channel = CServiceBroker::GetPVRManager().ChannelGroups()->GetChannelForEpgTag(epg);
+          if (channel)
+          {
+            return client && client->GetClientCapabilities().SupportsTimers() &&
+                !CServiceBroker::GetPVRManager().Timers()->IsRecordingOnChannel(*channel);
+          }
+        }
+        else
+        {
+          return client && client->GetClientCapabilities().SupportsTimers() &&
+              !CServiceBroker::GetPVRManager().Timers()->GetTimerForEpgTag(epg);
+        }
+      }
       return false;
     }
 
     bool StartRecording::Execute(const CFileItemPtr& item) const
     {
+      const std::shared_ptr<CPVREpgInfoTag> epgTag = item->GetEPGInfoTag();
+      if (!epgTag || epgTag->IsActive())
+      {
+        // instant recording
+        std::shared_ptr<CPVRChannel> channel;
+        if (epgTag)
+          channel = CServiceBroker::GetPVRManager().ChannelGroups()->GetChannelForEpgTag(epgTag);
+
+        if (!channel)
+          channel = item->GetPVRChannelInfoTag();
+
+        if (channel)
+          return CServiceBroker::GetPVRManager().GUIActions()->SetRecordingOnChannel(channel, true);
+      }
+
       return CServiceBroker::GetPVRManager().GUIActions()->AddTimer(item, false);
     }
 
@@ -251,7 +279,7 @@
       if (recording && recording->IsInProgress())
         return true;
 
-      const std::shared_ptr<CPVRChannel> channel(item.GetPVRChannelInfoTag());
+      std::shared_ptr<CPVRChannel> channel = item.GetPVRChannelInfoTag();
       if (channel)
         return CServiceBroker::GetPVRManager().Timers()->IsRecordingOnChannel(*channel);
 
@@ -259,11 +287,30 @@
       if (timer && !URIUtils::PathEquals(item.GetPath(), CPVRTimersPath::PATH_ADDTIMER))
         return timer->IsRecording();
 
+      const std::shared_ptr<CPVREpgInfoTag> epg = item.GetEPGInfoTag();
+      if (epg && epg->IsGapTag())
+      {
+        channel = CServiceBroker::GetPVRManager().ChannelGroups()->GetChannelForEpgTag(epg);
+        if (channel)
+          return CServiceBroker::GetPVRManager().Timers()->IsRecordingOnChannel(*channel);
+      }
+
       return false;
     }
 
     bool StopRecording::Execute(const CFileItemPtr& item) const
     {
+      const std::shared_ptr<CPVREpgInfoTag> epgTag = item->GetEPGInfoTag();
+      if (epgTag && epgTag->IsGapTag())
+      {
+        // instance recording
+        const std::shared_ptr<CPVRChannel> channel =
+            CServiceBroker::GetPVRManager().ChannelGroups()->GetChannelForEpgTag(epgTag);
+        if (channel)
+          return CServiceBroker::GetPVRManager().GUIActions()->SetRecordingOnChannel(channel,
+                                                                                     false);
+      }
+
       return CServiceBroker::GetPVRManager().GUIActions()->StopRecording(item);
     }
 
@@ -408,7 +455,8 @@
     bool AddTimerRule::IsVisible(const CFileItem& item) const
     {
       const std::shared_ptr<CPVREpgInfoTag> epg = item.GetEPGInfoTag();
-      if (epg && !CServiceBroker::GetPVRManager().Timers()->GetTimerForEpgTag(epg))
+      if (epg && !epg->IsGapTag() &&
+          !CServiceBroker::GetPVRManager().Timers()->GetTimerForEpgTag(epg))
       {
         const std::shared_ptr<CPVRClient> client = CServiceBroker::GetPVRManager().GetClient(item);
         return client && client->GetClientCapabilities().SupportsTimers();

_service:download_files:master.tar.gz/xbmc/pvr/PVRDatabase.cpp Changed

@@ -17,7 +17,6 @@
 #include "pvr/timers/PVRTimerInfoTag.h"
 #include "pvr/timers/PVRTimerType.h"
 #include "settings/AdvancedSettings.h"
-#include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
 #include "threads/SingleLock.h"
 #include "utils/StringUtils.h"
@@ -305,9 +304,7 @@
 
 int CPVRDatabase::Get(CPVRChannelGroup& results, bool bCompressDB)
 {
-  int iReturn(0);
-  bool bUseEpgDB = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_EPG_STOREEPGINDATABASE);
-
+  int iReturn = 0;
   std::string strQuery = PrepareSQL("SELECT channels.idChannel, channels.iUniqueId, channels.bIsRadio, channels.bIsHidden, channels.bIsUserSetIcon, channels.bIsUserSetName, "
       "channels.sIconPath, channels.sChannelName, channels.bIsVirtual, channels.bEPGEnabled, channels.sEPGScraper, channels.iLastWatched, channels.iClientId, channels.bIsLocked, "
       "map_channelgroups_channels.iChannelNumber, map_channelgroups_channels.iSubChannelNumber, map_channelgroups_channels.iOrder, map_channelgroups_channels.iClientChannelNumber, "
@@ -338,7 +335,7 @@
         channel->m_strEPGScraper = m_pDS->fv("sEPGScraper").get_asString();
         channel->m_iLastWatched = static_cast<time_t>(m_pDS->fv("iLastWatched").get_asInt());
         channel->m_iClientId = m_pDS->fv("iClientId").get_asInt();
-        channel->m_iEpgId = bUseEpgDB ? m_pDS->fv("idEpg").get_asInt() : -1;
+        channel->m_iEpgId = m_pDS->fv("idEpg").get_asInt();
         channel->m_bHasArchive = m_pDS->fv("bHasArchive").get_asBool();
         channel->UpdateEncryptionName();

_service:download_files:master.tar.gz/xbmc/pvr/PVRManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRManager.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRPlaybackState.cpp Changed

@@ -11,6 +11,7 @@
 #include "FileItem.h"
 #include "ServiceBroker.h"
 #include "XBDateTime.h"
+#include "cores/DataCacheCore.h"
 #include "pvr/PVRManager.h"
 #include "pvr/addons/PVRClient.h"
 #include "pvr/channels/PVRChannel.h"
@@ -64,7 +65,7 @@
   m_playingRecording.reset();
   m_playingEpgTag.reset();
   m_playingClientId = -1;
-  m_iplayingChannelUniqueID = -1;
+  m_playingChannelUniqueId = -1;
   m_strPlayingClientName.clear();
 
   if (item->HasPVRChannelInfoTag())
@@ -73,7 +74,7 @@
 
     m_playingChannel = channel;
     m_playingClientId = m_playingChannel->ClientID();
-    m_iplayingChannelUniqueID = m_playingChannel->UniqueID();
+    m_playingChannelUniqueId = m_playingChannel->UniqueID();
 
     SetPlayingGroup(channel);
 
@@ -142,7 +143,7 @@
     bChanged = true;
     m_playingChannel.reset();
     m_playingClientId = -1;
-    m_iplayingChannelUniqueID = -1;
+    m_playingChannelUniqueId = -1;
     m_strPlayingClientName.clear();
   }
   else if (item->HasPVRRecordingInfoTag() && item->GetPVRRecordingInfoTag() == m_playingRecording)
@@ -150,15 +151,15 @@
     bChanged = true;
     m_playingRecording.reset();
     m_playingClientId = -1;
-    m_iplayingChannelUniqueID = -1;
+    m_playingChannelUniqueId = -1;
     m_strPlayingClientName.clear();
   }
-  else if (item->HasEPGInfoTag() && item->GetEPGInfoTag() == m_playingEpgTag)
+  else if (item->HasEPGInfoTag() && m_playingEpgTag && *item->GetEPGInfoTag() == *m_playingEpgTag)
   {
     bChanged = true;
     m_playingEpgTag.reset();
     m_playingClientId = -1;
-    m_iplayingChannelUniqueID = -1;
+    m_playingChannelUniqueId = -1;
     m_strPlayingClientName.clear();
   }
 
@@ -203,7 +204,7 @@
 
 bool CPVRPlaybackState::IsPlayingChannel(int iClientID, int iUniqueChannelID) const
 {
-  return m_playingChannel && m_playingClientId == iClientID && m_iplayingChannelUniqueID == iUniqueChannelID;
+  return m_playingChannel && m_playingClientId == iClientID && m_playingChannelUniqueId == iUniqueChannelID;
 }
 
 bool CPVRPlaybackState::IsPlayingChannel(const std::shared_ptr<CPVRChannel>& channel) const
@@ -315,6 +316,16 @@
   return CServiceBroker::GetPVRManager().ChannelGroups()->GetSelectedGroup(bRadio);
 }
 
+CDateTime CPVRPlaybackState::GetPlaybackTime() const
+{
+  // start time valid?
+  time_t startTime = CServiceBroker::GetDataCacheCore().GetStartTime();
+  if (startTime > 0)
+    return CDateTime(startTime + CServiceBroker::GetDataCacheCore().GetPlayTime() / 1000);
+  else
+    return CDateTime::GetUTCDateTime();
+}
+
 void CPVRPlaybackState::UpdateLastWatched(const std::shared_ptr<CPVRChannel>& channel, const CDateTime& time)
 {
   time_t iTime;

_service:download_files:master.tar.gz/xbmc/pvr/PVRPlaybackState.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRStreamProperties.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRStreamProperties.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannel.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannel.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroup.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroup.h Changed

@@ -150,7 +150,7 @@
     /*!
      * @brief Add a channel to this container.
      * @param channel The channel to add.
-     * @param channelNumber The channel number of the channel to add. Use empty channel number to add it at the end.
+     * @param channelNumber The channel number of the channel to add. Use empty channel number if it's to be generated.
      * @param iOrder The value denoting the order of this member in the group, 0 if unknown and needs to be generated
      * @param bUseBackendChannelNumbers True, if channelNumber contains a backend channel number.
      * @param clientChannelNumber The client channel number of the channel to add. (optional)
@@ -159,6 +159,13 @@
     virtual bool AddToGroup(const std::shared_ptr<CPVRChannel>& channel, const CPVRChannelNumber& channelNumber, int iOrder, bool bUseBackendChannelNumbers, const CPVRChannelNumber& clientChannelNumber = {});
 
     /*!
+     * @brief Append a channel to this container.
+     * @param channel The channel to append.
+     * @return True if the channel was appended, false otherwise.
+     */
+    virtual bool AppendToGroup(const std::shared_ptr<CPVRChannel>& channel);
+
+    /*!
      * @brief Change the name of this group.
      * @param strGroupName The new group name.
      */

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroupInternal.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroupInternal.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp Changed

@@ -504,7 +504,7 @@
   const std::string& settingId = setting->GetId();
   if (settingId == SETTING_TMR_BEGIN)
   {
-    SYSTEMTIME timerStartTime;
+    KODI::TIME::SystemTime timerStartTime;
     m_startLocalTime.GetAsSystemTime(timerStartTime);
     if (CGUIDialogNumeric::ShowAndGetTime(timerStartTime, g_localizeStrings.Get(14066)))
     {
@@ -515,7 +515,7 @@
   }
   else if (settingId == SETTING_TMR_END)
   {
-    SYSTEMTIME timerEndTime;
+    KODI::TIME::SystemTime timerEndTime;
     m_endLocalTime.GetAsSystemTime(timerEndTime);
     if (CGUIDialogNumeric::ShowAndGetTime(timerEndTime, g_localizeStrings.Get(14066)))
     {
@@ -687,7 +687,8 @@
     datetime.GetHour(), datetime.GetMinute(), datetime.GetSecond());
 }
 
-void CGUIDialogPVRTimerSettings::SetTimeFromSystemTime(CDateTime& datetime, const SYSTEMTIME& time)
+void CGUIDialogPVRTimerSettings::SetTimeFromSystemTime(CDateTime& datetime,
+                                                       const KODI::TIME::SystemTime& time)
 {
   const CDateTime newTime(time);
   datetime.SetDateTime(

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/Epg.cpp Changed

@@ -27,21 +27,29 @@
 
 using namespace PVR;
 
-CPVREpg::CPVREpg(int iEpgID, const std::string& strName, const std::string& strScraperName)
-: m_bChanged(false),
-  m_iEpgID(iEpgID),
-  m_strName(strName),
-  m_strScraperName(strScraperName),
-  m_channelData(new CPVREpgChannelData)
+CPVREpg::CPVREpg(int iEpgID,
+                 const std::string& strName,
+                 const std::string& strScraperName,
+                 const std::shared_ptr<CPVREpgDatabase>& database)
+  : m_iEpgID(iEpgID),
+    m_strName(strName),
+    m_strScraperName(strScraperName),
+    m_channelData(new CPVREpgChannelData),
+    m_tags(m_iEpgID, m_channelData, database)
 {
 }
 
-CPVREpg::CPVREpg(int iEpgID, const std::string& strName, const std::string& strScraperName, const std::shared_ptr<CPVREpgChannelData>& channelData)
-: m_bChanged(true),
-  m_iEpgID(iEpgID),
-  m_strName(strName),
-  m_strScraperName(strScraperName),
-  m_channelData(channelData)
+CPVREpg::CPVREpg(int iEpgID,
+                 const std::string& strName,
+                 const std::string& strScraperName,
+                 const std::shared_ptr<CPVREpgChannelData>& channelData,
+                 const std::shared_ptr<CPVREpgDatabase>& database)
+  : m_bChanged(true),
+    m_iEpgID(iEpgID),
+    m_strName(strName),
+    m_strScraperName(strScraperName),
+    m_channelData(channelData),
+    m_tags(m_iEpgID, m_channelData, database)
 {
 }
 
@@ -60,18 +68,10 @@
   m_events.Publish(PVREvent::EpgUpdatePending);
 }
 
-bool CPVREpg::HasValidEntries() const
-{
-  CSingleLock lock(m_critSection);
-  return (m_iEpgID > 0 && /* valid EPG ID */
-          !m_tags.empty() && /* contains at least 1 tag */
-          m_tags.rbegin()->second->EndAsUTC() >= CDateTime::GetCurrentDateTime().GetAsUTCDateTime()); /* the last end time hasn't passed yet */
-}
-
 void CPVREpg::Clear()
 {
   CSingleLock lock(m_critSection);
-  m_tags.clear();
+  m_tags.Clear();
 }
 
 void CPVREpg::Cleanup(int iPastDays)
@@ -83,104 +83,25 @@
 void CPVREpg::Cleanup(const CDateTime& time)
 {
   CSingleLock lock(m_critSection);
-  for (auto it = m_tags.begin(); it != m_tags.end();)
-  {
-    if (it->second->EndAsUTC() < time)
-    {
-      if (m_nowActiveStart == it->first)
-        m_nowActiveStart.SetValid(false);
-
-      it = m_tags.erase(it);
-    }
-    else
-    {
-      ++it;
-    }
-  }
+  m_tags.Cleanup(time);
 }
 
 std::shared_ptr<CPVREpgInfoTag> CPVREpg::GetTagNow(bool bUpdateIfNeeded /* = true */) const
 {
   CSingleLock lock(m_critSection);
-  if (m_nowActiveStart.IsValid())
-  {
-    const auto it = m_tags.find(m_nowActiveStart);
-    if (it != m_tags.end() && it->second->IsActive())
-      return it->second;
-  }
-
-  if (bUpdateIfNeeded)
-  {
-    std::shared_ptr<CPVREpgInfoTag> lastActiveTag;
-
-    /* one of the first items will always match if the list is sorted */
-    for (const auto& tag : m_tags)
-    {
-      if (tag.second->IsActive())
-      {
-        m_nowActiveStart = tag.first;
-        return tag.second;
-      }
-      else if (tag.second->WasActive())
-        lastActiveTag = tag.second;
-    }
-
-    /* there might be a gap between the last and next event. return the last if found and it ended not more than 5 minutes ago */
-    if (lastActiveTag &&
-        lastActiveTag->EndAsUTC() + CDateTimeSpan(0, 0, 5, 0) >= CDateTime::GetUTCDateTime())
-      return lastActiveTag;
-  }
-
-  return std::shared_ptr<CPVREpgInfoTag>();
+  return m_tags.GetActiveTag(bUpdateIfNeeded);
 }
 
 std::shared_ptr<CPVREpgInfoTag> CPVREpg::GetTagNext() const
 {
-  const std::shared_ptr<CPVREpgInfoTag> nowTag = GetTagNow();
-  if (nowTag)
-  {
-    CSingleLock lock(m_critSection);
-    auto it = m_tags.find(nowTag->StartAsUTC());
-    if (it != m_tags.end() && ++it != m_tags.end())
-      return it->second;
-  }
-  else if (m_tags.size() > 0)
-  {
-    /* return the first event that is in the future */
-    for (const auto& tag : m_tags)
-    {
-      if (tag.second->IsUpcoming())
-        return tag.second;
-    }
-  }
-
-  return std::shared_ptr<CPVREpgInfoTag>();
+  CSingleLock lock(m_critSection);
+  return m_tags.GetNextStartingTag();
 }
 
 std::shared_ptr<CPVREpgInfoTag> CPVREpg::GetTagPrevious() const
 {
-  const std::shared_ptr<CPVREpgInfoTag> nowTag = GetTagNow();
-  if (nowTag)
-  {
-    CSingleLock lock(m_critSection);
-    auto it = m_tags.find(nowTag->StartAsUTC());
-    if (it != m_tags.end() && it != m_tags.begin())
-    {
-      --it;
-      return it->second;
-    }
-  }
-  else if (m_tags.size() > 0)
-  {
-    /* return the first event that is in the past */
-    for (auto it = m_tags.rbegin(); it != m_tags.rend(); ++it)
-    {
-      if (it->second->WasActive())
-        return it->second;
-    }
-  }
-
-  return std::shared_ptr<CPVREpgInfoTag>();
+  CSingleLock lock(m_critSection);
+  return m_tags.GetLastEndedTag();
 }
 
 bool CPVREpg::CheckPlayingEvent()
@@ -200,16 +121,8 @@
 
 std::shared_ptr<CPVREpgInfoTag> CPVREpg::GetTagByBroadcastId(unsigned int iUniqueBroadcastId) const
 {
-  if (iUniqueBroadcastId != EPG_TAG_INVALID_UID)
-  {
-    CSingleLock lock(m_critSection);
-    for (const auto& infoTag : m_tags)
-    {
-      if (infoTag.second->UniqueBroadcastID() == iUniqueBroadcastId)
-        return infoTag.second;
-    }
-  }
-  return std::shared_ptr<CPVREpgInfoTag>();
+  CSingleLock lock(m_critSection);
+  return m_tags.GetTag(iUniqueBroadcastId);
 }
 
 std::shared_ptr<CPVREpgInfoTag> CPVREpg::GetTagBetween(const CDateTime& beginTime, const CDateTime& endTime, bool bUpdateFromClient /* = false */)
@@ -217,14 +130,7 @@
   std::shared_ptr<CPVREpgInfoTag> tag;
 
   CSingleLock lock(m_critSection);
-  for (const auto& epgTag : m_tags)
-  {
-    if (epgTag.second->StartAsUTC() >= beginTime && epgTag.second->EndAsUTC() <= endTime)
-    {
-      tag = epgTag.second;
-      break;
-    }
-  }
+  tag = m_tags.GetTagBetween(beginTime, endTime);
 
   if (!tag && bUpdateFromClient)
   {
@@ -234,196 +140,34 @@
     time_t e;
     endTime.GetAsTime(e);
 
-    const std::shared_ptr<CPVREpg> tmpEpg = std::make_shared<CPVREpg>(m_iEpgID, m_strName, m_strScraperName, m_channelData);
+    const std::shared_ptr<CPVREpg> tmpEpg = std::make_shared<CPVREpg>(
+        m_iEpgID, m_strName, m_strScraperName, m_channelData, std::shared_ptr<CPVREpgDatabase>());
     if (tmpEpg->UpdateFromScraper(b, e, true))
       tag = tmpEpg->GetTagBetween(beginTime, endTime, false);
 
     if (tag)
-    {
-      m_tags.insert(std::make_pair(tag->StartAsUTC(), tag));
-      UpdateEntry(tag, CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_EPG_STOREEPGINDATABASE));
-    }
+      m_tags.UpdateEntry(tag);
   }
 
   return tag;
 }
 
-std::shared_ptr<CPVREpgInfoTag> CPVREpg::CreateGapTag(const CDateTime& start,
-                                                      const CDateTime& end) const
-{
-  return std::make_shared<CPVREpgInfoTag>(GetChannelData(), EpgID(), start, end, true);
-}
-
 std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpg::GetTimeline(
     const CDateTime& timelineStart,
     const CDateTime& timelineEnd,
     const CDateTime& minEventEnd,
     const CDateTime& maxEventStart) const
 {
-  static const CDateTimeSpan ONE_SECOND(0, 0, 0, 1);
-
-  std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
-
   CSingleLock lock(m_critSection);
-
-  CDateTime lastEnd = minEventEnd;
-  for (const auto& epgTag : m_tags)
-  {
-    if (epgTag.second->EndAsUTC() > minEventEnd)
-    {
-      const CDateTime start = epgTag.second->StartAsUTC();
-
-      if (start <= maxEventStart)
-      {
-        if (start > minEventEnd && (start - lastEnd) > ONE_SECOND &&
-            epgTag.second != (*m_tags.cbegin()).second)
-        {
-          // insert gap tag between two events
-          tags.emplace_back(CreateGapTag(lastEnd, start - ONE_SECOND));
-        }
-
-        tags.emplace_back(epgTag.second);
-      }
-      else
-      {
-        if (tags.empty())
-        {
-          if (epgTag.second != (*m_tags.cbegin()).second)
-          {
-            // insert gap tag spanning pred of last checked event end to next event start
-            tags.emplace_back(CreateGapTag(lastEnd, start - ONE_SECOND));
-          }
-        }
-        else
-        {
-          if (maxEventStart >= tags.back()->EndAsUTC() && (start - ONE_SECOND) <= timelineEnd)
-          {
-            // append gap tag spanning last found event end to next event start
-            tags.emplace_back(CreateGapTag(tags.back()->EndAsUTC(), start - ONE_SECOND));
-          }
-
-          if (minEventEnd <= tags.front()->StartAsUTC() - ONE_SECOND &&
-              tags.front() != (*m_tags.cbegin()).second)
-          {
-            // prepend gap tag spanning pred of first found event end to first found event start
-            tags.insert(tags.begin(),
-                        CreateGapTag(lastEnd, tags.front()->StartAsUTC() - ONE_SECOND));
-          }
-        }
-        break; // done. m_tags is sorted by date, ascending
-      }
-    }
-    lastEnd = epgTag.second->EndAsUTC();
-  }
-
-  if (tags.empty())
-  {
-    if (m_tags.empty())
-    {
-      // insert gap tag spanning whole timeline
-      tags.emplace_back(CreateGapTag(timelineStart, timelineEnd));
-    }
-    else if (maxEventStart <= (*m_tags.cbegin()).second->StartAsUTC())
-    {
-      // insert gap tag spanning timeline start to very first event start
-      tags.emplace_back(
-          CreateGapTag(timelineStart, (*m_tags.cbegin()).second->StartAsUTC() - ONE_SECOND));
-    }
-    else if (minEventEnd >= (*m_tags.crbegin()).second->EndAsUTC())
-    {
-      // insert gap tag spanning very last event end to timeline end
-      tags.emplace_back(CreateGapTag((*m_tags.crbegin()).second->EndAsUTC(), timelineEnd));
-    }
-    else
-    {
-      CLog::LogF(LOGERROR, "Could not find any epgtag for requested timeline");
-    }
-  }
-  else
-  {
-    if (tags.front() == (*m_tags.cbegin()).second && tags.front()->StartAsUTC() >= minEventEnd)
-    {
-      // prepend gap tag spanning timeline start to very first event start
-      tags.insert(tags.begin(), CreateGapTag(timelineStart,
-                                             (*m_tags.cbegin()).second->StartAsUTC() - ONE_SECOND));
-    }
-
-    if (tags.back() == (*m_tags.crbegin()).second && tags.back()->EndAsUTC() <= maxEventStart)
-    {
-      // append gap tag spanning very last event end to timeline end
-      tags.emplace_back(CreateGapTag((*m_tags.crbegin()).second->EndAsUTC(), timelineEnd));
-    }
-  }
-
-  return tags;
+  return m_tags.GetTimeline(timelineStart, timelineEnd, minEventEnd, maxEventStart);
 }
 
-void CPVREpg::AddEntry(const CPVREpgInfoTag& tag)
+bool CPVREpg::UpdateEntries(const CPVREpg& epg)
 {
-  std::shared_ptr<CPVREpgInfoTag> newTag;
-
   CSingleLock lock(m_critSection);
-  const auto it = m_tags.find(tag.StartAsUTC());
-  if (it != m_tags.end())
-    newTag = it->second;
-  else
-  {
-    newTag.reset(new CPVREpgInfoTag());
-    m_tags.insert(std::make_pair(tag.StartAsUTC(), newTag));
-  }
-
-  newTag->Update(tag);
-  newTag->SetChannelData(m_channelData);
-  newTag->SetEpgID(m_iEpgID);
-}
-
-bool CPVREpg::Load(const std::shared_ptr<CPVREpgDatabase>& database)
-{
-  bool bReturn = false;
-
-  if (!database)
-  {
-    CLog::LogF(LOGERROR, "Could not open the EPG database");
-    return bReturn;
-  }
-
-  const std::vector<std::shared_ptr<CPVREpgInfoTag>> result = database->Get(*this);
-
-  CSingleLock lock(m_critSection);
-  if (result.empty())
-  {
-    CLog::LogFC(LOGDEBUG, LOGEPG, "No database entries found for table '%s'.", m_strName.c_str());
-  }
-  else
-  {
-    for (const auto& entry : result)
-      AddEntry(*entry);
-
-    if (!m_lastScanTime.IsValid())
-      database->GetLastEpgScanTime(m_iEpgID, &m_lastScanTime);
-
-    if (!m_lastScanTime.IsValid())
-    {
-      m_lastScanTime.SetDateTime(1970, 1, 1, 0, 0, 0);
-      m_bUpdateLastScanTime = true;
-    }
-
-    bReturn = true;
-  }
-
-  m_bLoaded = true;
 
-  return bReturn;
-}
-
-bool CPVREpg::UpdateEntries(const CPVREpg& epg, bool bStoreInDb /* = true */)
-{
-  CSingleLock lock(m_critSection);
   /* copy over tags */
-  for (const auto& tag : epg.m_tags)
-    UpdateEntry(tag.second, bStoreInDb);
-
-  FixOverlappingEvents(bStoreInDb);
+  m_tags.UpdateEntries(epg.m_tags);
 
   /* update the last scan time of this table */
   m_lastScanTime = CDateTime::GetUTCDateTime();
@@ -433,78 +177,54 @@
   return true;
 }
 
-bool CPVREpg::UpdateEntry(const EPG_TAG* data, int iClientId)
+namespace
 {
-  if (!data)
-    return false;
 
-  const std::shared_ptr<CPVREpgInfoTag> tag = std::make_shared<CPVREpgInfoTag>(*data, iClientId, m_channelData, m_iEpgID);
-  return UpdateEntry(tag, CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_EPG_STOREEPGINDATABASE));
-}
-
-bool CPVREpg::UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag, bool bUpdateDatabase)
+bool IsTagExpired(const std::shared_ptr<CPVREpgInfoTag>& tag)
 {
-  std::shared_ptr<CPVREpgInfoTag> infoTag;
+  // Respect epg linger time.
+  const int iPastDays = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+      CSettings::SETTING_EPG_PAST_DAYSTODISPLAY);
+  const CDateTime cleanupTime(CDateTime::GetUTCDateTime() - CDateTimeSpan(iPastDays, 0, 0, 0));
 
-  CSingleLock lock(m_critSection);
-  const auto it = m_tags.find(tag->StartAsUTC());
-  bool bNewTag = false;
-  if (it != m_tags.end())
-  {
-    infoTag = it->second;
-  }
-  else
-  {
-    infoTag.reset(new CPVREpgInfoTag());
-    infoTag->SetUniqueBroadcastID(tag->UniqueBroadcastID());
-    m_tags.insert(std::make_pair(tag->StartAsUTC(), infoTag));
-    bNewTag = true;
-  }
+  return tag->EndAsUTC() < cleanupTime;
+}
 
-  infoTag->Update(*tag, bNewTag);
-  infoTag->SetChannelData(m_channelData);
-  infoTag->SetEpgID(m_iEpgID);
+} // unnamed namespace
 
-  if (bUpdateDatabase)
-    m_changedTags.insert(std::make_pair(infoTag->UniqueBroadcastID(), infoTag));
+bool CPVREpg::UpdateEntry(const EPG_TAG* data, int iClientId)
+{
+  if (!data)
+    return false;
 
-  return true;
+  const std::shared_ptr<CPVREpgInfoTag> tag =
+      std::make_shared<CPVREpgInfoTag>(*data, iClientId, m_channelData, m_iEpgID);
+
+  return !IsTagExpired(tag) && m_tags.UpdateEntry(tag);
 }
 
-bool CPVREpg::UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag, EPG_EVENT_STATE newState, bool bUpdateDatabase)
+bool CPVREpg::UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag, EPG_EVENT_STATE newState)
 {
   bool bRet = true;
   bool bNotify = true;
 
   if (newState == EPG_EVENT_CREATED || newState == EPG_EVENT_UPDATED)
   {
-    bRet = UpdateEntry(tag, bUpdateDatabase);
+    bRet = !IsTagExpired(tag) && m_tags.UpdateEntry(tag);
   }
   else if (newState == EPG_EVENT_DELETED)
   {
     CSingleLock lock(m_critSection);
-    auto it = m_tags.begin();
-    for (; it != m_tags.end(); ++it)
-    {
-      if (it->second->UniqueBroadcastID() == tag->UniqueBroadcastID())
-        break;
-    }
-
-    if (it == m_tags.end())
+    const std::shared_ptr<CPVREpgInfoTag> existingTag = m_tags.GetTag(tag->UniqueBroadcastID());
+    if (!existingTag)
     {
       bRet = false;
     }
     else
     {
-      // Respect epg linger time.
-      int iPastDays = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_EPG_PAST_DAYSTODISPLAY);
-      const CDateTime cleanupTime(CDateTime::GetUTCDateTime() - CDateTimeSpan(iPastDays, 0, 0, 0));
-      if (it->second->EndAsUTC() < cleanupTime)
+      if (IsTagExpired(existingTag))
       {
-        if (bUpdateDatabase)
-          m_deletedTags.insert(std::make_pair(it->second->UniqueBroadcastID(), it->second));
-
-        m_tags.erase(it);
+        m_tags.DeleteEntry(existingTag);
       }
       else
       {
@@ -534,16 +254,11 @@
   bool bGrabSuccess = true;
   bool bUpdate = false;
 
-  /* load the entries from the db first */
-  if (!m_bLoaded && database)
-    Load(database);
-
   /* clean up if needed */
-  if (m_bLoaded)
-    Cleanup(iPastDays);
+  Cleanup(iPastDays);
 
   /* enforce advanced settings update interval override for channels with no EPG data */
-  if (m_tags.empty() && !bUpdate && ChannelID() > 0)
+  if (m_tags.IsEmpty() && !bUpdate && ChannelID() > 0)
     iUpdateTime = CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_iEpgUpdateEmptyTagsInterval;
 
   if (!bForceUpdate)
@@ -561,9 +276,7 @@
   if (bUpdate)
     bGrabSuccess = LoadFromClients(start, end, bForceUpdate);
 
-  if (bGrabSuccess)
-    m_bLoaded = true;
-  else
+  if (!bGrabSuccess)
     CLog::LogF(LOGERROR, "Failed to update table '%s'", Name().c_str());
 
   CSingleLock lock(m_critSection);
@@ -574,13 +287,8 @@
 
 std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpg::GetTags() const
 {
-  std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
-
   CSingleLock lock(m_critSection);
-  for (const auto& tag : m_tags)
-    tags.emplace_back(tag.second);
-
-  return tags;
+  return m_tags.GetAllTags();
 }
 
 bool CPVREpg::Persist(const std::shared_ptr<CPVREpgDatabase>& database)
@@ -606,96 +314,55 @@
       }
     }
 
-    for (const auto& tag : m_deletedTags)
-      database->Delete(*tag.second);
-
-    for (const auto& tag : m_changedTags)
-      tag.second->Persist(database, false);
+    if (m_tags.NeedsSave())
+      m_tags.Persist(false);
 
     if (m_bUpdateLastScanTime)
       database->PersistLastEpgScanTime(m_iEpgID, m_lastScanTime, true);
 
     if (bEpgIdChanged)
-    {
-      for (const auto& tag : m_tags)
-        tag.second->SetEpgID(m_iEpgID);
-    }
+      m_tags.SetEpgID(m_iEpgID);
 
-    m_deletedTags.clear();
-    m_changedTags.clear();
     m_bChanged = false;
-    m_bTagsChanged = false;
     m_bUpdateLastScanTime = false;
   }
 
   bool bRet = database->CommitInsertQueries();
 
   database->Unlock();
+
   return bRet;
 }
 
-CDateTime CPVREpg::GetFirstDate() const
+bool CPVREpg::Delete(const std::shared_ptr<CPVREpgDatabase>& database)
 {
-  CDateTime first;
+  if (!database)
+  {
+    CLog::LogF(LOGERROR, "No EPG database");
+    return false;
+  }
 
-  CSingleLock lock(m_critSection);
-  if (!m_tags.empty())
-    first = m_tags.begin()->second->StartAsUTC();
+  // delete own epg db entry
+  database->Delete(*this);
+
+  // delete all tags for this epg from db
+  m_tags.Delete();
+
+  Clear();
 
-  return first;
+  return true;
 }
 
-CDateTime CPVREpg::GetLastDate() const
+CDateTime CPVREpg::GetFirstDate() const
 {
-  CDateTime last;
-
   CSingleLock lock(m_critSection);
-  if (!m_tags.empty())
-    last = m_tags.rbegin()->second->StartAsUTC();
-
-  return last;
+  return m_tags.GetFirstStartTime();
 }
 
-bool CPVREpg::FixOverlappingEvents(bool bUpdateDb /* = false */)
+CDateTime CPVREpg::GetLastDate() const
 {
-  bool bReturn = true;
-  std::shared_ptr<CPVREpgInfoTag> previousTag, currentTag;
-
-  for (auto it = m_tags.begin(); it != m_tags.end(); it != m_tags.end() ? it++ : it)
-  {
-    if (!previousTag)
-    {
-      previousTag = it->second;
-      continue;
-    }
-    currentTag = it->second;
-
-    if (previousTag->EndAsUTC() >= currentTag->EndAsUTC())
-    {
-      // delete the current tag. it's completely overlapped
-      if (bUpdateDb)
-        m_deletedTags.insert(std::make_pair(currentTag->UniqueBroadcastID(), currentTag));
-
-      if (m_nowActiveStart == it->first)
-        m_nowActiveStart.SetValid(false);
-
-      m_tags.erase(it++);
-    }
-    else if (previousTag->EndAsUTC() > currentTag->StartAsUTC())
-    {
-      previousTag->SetEndFromUTC(currentTag->StartAsUTC());
-      if (bUpdateDb)
-        m_changedTags.insert(std::make_pair(previousTag->UniqueBroadcastID(), previousTag));
-
-      previousTag = it->second;
-    }
-    else
-    {
-      previousTag = it->second;
-    }
-  }
-
-  return bReturn;
+  CSingleLock lock(m_critSection);
+  return m_tags.GetLastEndTime();
 }
 
 bool CPVREpg::UpdateFromScraper(time_t start, time_t end, bool bForceUpdate)
@@ -801,9 +468,10 @@
 {
   bool bReturn = false;
 
-  const std::shared_ptr<CPVREpg> tmpEpg = std::make_shared<CPVREpg>(m_iEpgID, m_strName, m_strScraperName, m_channelData);
+  const std::shared_ptr<CPVREpg> tmpEpg = std::make_shared<CPVREpg>(
+      m_iEpgID, m_strName, m_strScraperName, m_channelData, std::shared_ptr<CPVREpgDatabase>());
   if (tmpEpg->UpdateFromScraper(start, end, bForceUpdate))
-    bReturn = UpdateEntries(*tmpEpg, CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_EPG_STOREEPGINDATABASE));
+    bReturn = UpdateEntries(*tmpEpg);
 
   return bReturn;
 }
@@ -818,9 +486,7 @@
 {
   CSingleLock lock(m_critSection);
   m_channelData = data;
-
-  for (const auto& tag : m_tags)
-    tag.second->SetChannelData(data);
+  m_tags.SetChannelData(data);
 }
 
 int CPVREpg::ChannelID() const
@@ -856,7 +522,7 @@
 bool CPVREpg::NeedsSave() const
 {
   CSingleLock lock(m_critSection);
-  return !m_changedTags.empty() || !m_deletedTags.empty() || m_bChanged;
+  return m_bChanged || m_tags.NeedsSave();
 }
 
 bool CPVREpg::IsValid() const

_service:download_files:master.tar.gz/xbmc/pvr/epg/Epg.h Changed

@@ -10,6 +10,7 @@
 
 #include "XBDateTime.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
+#include "pvr/epg/EpgTagsContainer.h"
 #include "threads/CriticalSection.h"
 #include "utils/EventStream.h"
 
@@ -36,8 +37,12 @@
      * @param iEpgID The ID of this table or <= 0 to create a new ID.
      * @param strName The name of this table.
      * @param strScraperName The name of the scraper to use.
+     * @param database The EPG database
      */
-    CPVREpg(int iEpgID, const std::string& strName, const std::string& strScraperName);
+    CPVREpg(int iEpgID,
+            const std::string& strName,
+            const std::string& strScraperName,
+            const std::shared_ptr<CPVREpgDatabase>& database);
 
     /*!
      * @brief Create a new EPG instance.
@@ -45,8 +50,13 @@
      * @param strName The name of this table.
      * @param strScraperName The name of the scraper to use.
      * @param channelData The channel data.
+     * @param database The EPG database
      */
-    CPVREpg(int iEpgID, const std::string& strName, const std::string& strScraperName, const std::shared_ptr<CPVREpgChannelData>& channelData);
+    CPVREpg(int iEpgID,
+            const std::string& strName,
+            const std::string& strScraperName,
+            const std::shared_ptr<CPVREpgChannelData>& channelData,
+            const std::shared_ptr<CPVREpgDatabase>& database);
 
     /*!
      * @brief Destroy this EPG instance.
@@ -54,13 +64,6 @@
     virtual ~CPVREpg();
 
     /*!
-     * @brief Load all entries for this table from the given database.
-     * @param database The database.
-     * @return True if any entries were loaded, false otherwise.
-     */
-    bool Load(const std::shared_ptr<CPVREpgDatabase>& database);
-
-    /*!
      * @brief Get data for the channel associated with this EPG.
      * @return The data.
      */
@@ -108,12 +111,6 @@
     int EpgID() const;
 
     /*!
-     * @brief Check whether this EPG contains valid entries.
-     * @return True if it has valid entries, false if not.
-     */
-    bool HasValidEntries() const;
-
-    /*!
      * @brief Remove all entries from this EPG that finished before the given time.
      * @param time Delete entries with an end time before this time in UTC.
      */
@@ -169,19 +166,10 @@
     /*!
      * @brief Update an entry in this EPG.
      * @param tag The tag to update.
-     * @param bUpdateDatabase If set to true, this event will be persisted in the database.
-     * @return True if it was updated successfully, false otherwise.
-     */
-    bool UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag, bool bUpdateDatabase);
-
-    /*!
-     * @brief Update an entry in this EPG.
-     * @param tag The tag to update.
      * @param newState the new state of the event.
-     * @param bUpdateDatabase If set to true, this event will be persisted in the database.
      * @return True if it was updated successfully, false otherwise.
      */
-    bool UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag, EPG_EVENT_STATE newState, bool bUpdateDatabase);
+    bool UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag, EPG_EVENT_STATE newState);
 
     /*!
      * @brief Update the EPG from 'start' till 'end'.
@@ -222,6 +210,13 @@
     bool Persist(const std::shared_ptr<CPVREpgDatabase>& database);
 
     /*!
+     * @brief Delete this table from the given database
+     * @param database The database.
+     * @return True if the table was deleted, false otherwise.
+     */
+    bool Delete(const std::shared_ptr<CPVREpgDatabase>& database);
+
+    /*!
      * @brief Get the start time of the first entry in this table.
      * @return The first date in UTC.
      */
@@ -280,19 +275,6 @@
     bool UpdateFromScraper(time_t start, time_t end, bool bForceUpdate);
 
     /*!
-     * @brief Fix overlapping events from the tables.
-     * @param bUpdateDb If set to yes, any changes to tags during fixing will be persisted to database
-     * @return True if anything changed, false otherwise.
-     */
-    bool FixOverlappingEvents(bool bUpdateDb = false);
-
-    /*!
-     * @brief Add an infotag to this container.
-     * @param tag The tag to add.
-     */
-    void AddEntry(const CPVREpgInfoTag& tag);
-
-    /*!
      * @brief Load all EPG entries from clients into a temporary table and update this table with the contents of that temporary table.
      * @param start Only get entries after this start time. Use 0 to get all entries before "end".
      * @param end Only get entries before this end time. Use 0 to get all entries after "begin". If both "begin" and "end" are 0, all entries will be updated.
@@ -304,10 +286,9 @@
     /*!
      * @brief Update the contents of this table with the contents provided in "epg"
      * @param epg The updated contents.
-     * @param bStoreInDb True to store the updated contents in the db, false otherwise.
      * @return True if the update was successful, false otherwise.
      */
-    bool UpdateEntries(const CPVREpg& epg, bool bStoreInDb = true);
+    bool UpdateEntries(const CPVREpg& epg);
 
     /*!
      * @brief Remove all entries from this EPG that finished before the given amount of days.
@@ -315,31 +296,16 @@
      */
     void Cleanup(int iPastDays);
 
-    /*!
-     * @brief Create a "gap" tag
-     * @param start The start time of the gap.
-     * @param end The end time of the gap.
-     * @return The tag.
-     */
-    std::shared_ptr<CPVREpgInfoTag> CreateGapTag(const CDateTime& start,
-                                                 const CDateTime& end) const;
-
-    std::map<CDateTime, std::shared_ptr<CPVREpgInfoTag>> m_tags;
-    std::map<int, std::shared_ptr<CPVREpgInfoTag>> m_changedTags;
-    std::map<int, std::shared_ptr<CPVREpgInfoTag>> m_deletedTags;
     bool m_bChanged = false; /*!< true if anything changed that needs to be persisted, false otherwise */
-    bool m_bTagsChanged = false; /*!< true when any tags are changed and not persisted, false otherwise */
-    bool m_bLoaded = false; /*!< true when the initial entries have been loaded */
     bool m_bUpdatePending = false; /*!< true if manual update is pending */
     int m_iEpgID = 0; /*!< the database ID of this table */
     std::string m_strName; /*!< the name of this table */
     std::string m_strScraperName; /*!< the name of the scraper to use */
-    mutable CDateTime m_nowActiveStart; /*!< the start time of the tag that is currently active */
     CDateTime m_lastScanTime; /*!< the last time the EPG has been updated */
     mutable CCriticalSection m_critSection; /*!< critical section for changes in this table */
     bool m_bUpdateLastScanTime = false;
-
     std::shared_ptr<CPVREpgChannelData> m_channelData;
+    CPVREpgTagsContainer m_tags;
 
     CEventSource<PVREvent> m_events;
   };

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgContainer.cpp Changed

@@ -88,14 +88,13 @@
     m_epgtag->SetChannelData(epg->GetChannelData());
   }
 
-  epg->UpdateEntry(m_epgtag, m_state, epgContainer.UseDatabase());
+  epg->UpdateEntry(m_epgtag, m_state);
 }
 
 CPVREpgContainer::CPVREpgContainer() :
   CThread("EPGUpdater"),
   m_database(new CPVREpgDatabase),
   m_settings({
-    CSettings::SETTING_EPG_STOREEPGINDATABASE,
     CSettings::SETTING_EPG_EPGUPDATE,
     CSettings::SETTING_EPG_FUTURE_DAYSTODISPLAY,
     CSettings::SETTING_EPG_PAST_DAYSTODISPLAY,
@@ -115,8 +114,9 @@
 std::shared_ptr<CPVREpgDatabase> CPVREpgContainer::GetEpgDatabase() const
 {
   CSingleLock lock(m_critSection);
-  if (!m_database || !m_database->IsOpen())
-    CLog::LogF(LOGERROR, "Failed to open the EPG database");
+
+  if (!m_database->IsOpen())
+    m_database->Open();
 
   return m_database;
 }
@@ -188,8 +188,6 @@
   {
     CSingleLock lock(m_critSection);
 
-    m_database->Open();
-
     m_bIsInitialising = true;
     m_bStop = false;
 
@@ -254,58 +252,44 @@
 {
   CSingleLock lock(m_critSection);
 
-  if (m_bLoaded || !UseDatabase())
+  if (m_bLoaded)
     return;
 
-  bool bLoaded = true;
-  unsigned int iCounter = 0;
-
-  CPVRGUIProgressHandler* progressHandler = new CPVRGUIProgressHandler(g_localizeStrings.Get(19250)); // Loading guide from database
-  const CDateTime cleanupTime(CDateTime::GetUTCDateTime() - CDateTimeSpan(GetPastDaysToDisplay(), 0, 0, 0));
-
-  m_database->Lock();
-  m_iNextEpgId = m_database->GetLastEPGId();
-  m_database->DeleteEpgEntries(cleanupTime);
-  const std::vector<std::shared_ptr<CPVREpg>> result = m_database->GetAll();
-  m_database->Unlock();
+  const std::shared_ptr<CPVREpgDatabase> database = GetEpgDatabase();
+  database->Lock();
+  m_iNextEpgId = database->GetLastEPGId();
+  const std::vector<std::shared_ptr<CPVREpg>> result = database->GetAll();
+  database->Unlock();
 
   for (const auto& entry : result)
     InsertFromDB(entry);
 
-  for (const auto& epgEntry : m_epgIdToEpgMap)
-  {
-    if (m_bStop)
-      break;
-
-    progressHandler->UpdateProgress(epgEntry.second->Name(), ++iCounter, m_epgIdToEpgMap.size());
-
-    lock.Leave();
-    epgEntry.second->Load(GetEpgDatabase());
-    lock.Enter();
-  }
-
-  progressHandler->DestroyProgress();
-
-  m_bLoaded = bLoaded;
+  m_bLoaded = true;
 }
 
-bool CPVREpgContainer::PersistAll()
+bool CPVREpgContainer::PersistAll(unsigned int iMaxTimeslice) const
 {
-  bool bReturn = !UseDatabase();
+  bool bReturn = true;
 
-  if (!bReturn)
-  {
-    m_critSection.lock();
-    const auto epgs = m_epgIdToEpgMap;
-    m_critSection.unlock();
+  m_critSection.lock();
+  const auto epgs = m_epgIdToEpgMap;
+  m_critSection.unlock();
 
-    const std::shared_ptr<CPVREpgDatabase> database = GetEpgDatabase();
+  const std::shared_ptr<CPVREpgDatabase> database = GetEpgDatabase();
+  XbmcThreads::EndTime processTimeslice(iMaxTimeslice);
 
-    for (const auto& epg : epgs)
+  for (const auto& epg : epgs)
+  {
+    if (epg.second && epg.second->NeedsSave())
     {
-      if (epg.second && epg.second->NeedsSave())
-        bReturn &= epg.second->Persist(database);
+      CLog::Log(LOGNOTICE, "EPG Container: Persisting events for channel '%s'...",
+                epg.second->GetChannelData()->ChannelName().c_str());
+
+      bReturn &= epg.second->Persist(database);
     }
+
+    if (processTimeslice.IsTimePast())
+      break;
   }
 
   return bReturn;
@@ -318,6 +302,8 @@
   bool bUpdateEpg = true;
   bool bHasPendingUpdates = false;
 
+  SetPriority(GetMinPriority());
+
   while (!m_bStop)
   {
     CDateTime::GetCurrentDateTime().GetAsUTCDateTime().GetAsTime(iNow);
@@ -360,7 +346,7 @@
       unsigned int iProcessed = 0;
       XbmcThreads::EndTime processTimeslice(1000); // max 1 sec per cycle, regardless of how many events are in the queue
 
-      while (!m_bStop)
+      while (!InterruptUpdate())
       {
         CEpgTagStateChange change;
         {
@@ -411,17 +397,19 @@
     }
 
     /* check for changes that need to be saved every 60 seconds */
-    if (iNow - iLastSave > 60)
+    if ((iNow - iLastSave > 60) && !InterruptUpdate())
     {
-      PersistAll();
+      PersistAll(1000);
       iLastSave = iNow;
     }
 
-    Sleep(1000);
+    CThread::Sleep(1000);
   }
 
   // store data on exit
-  PersistAll();
+  CLog::Log(LOGNOTICE, "EPG Container: Persisting unsaved events...");
+  PersistAll(XbmcThreads::EndTime::InfiniteValue);
+  CLog::Log(LOGNOTICE, "EPG Container: Persisting events done");
 }
 
 std::vector<std::shared_ptr<CPVREpg>> CPVREpgContainer::GetAllEpgs() const
@@ -491,18 +479,23 @@
   return retval;
 }
 
-std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgContainer::GetAllTags() const
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgContainer::GetTags(
+    const PVREpgSearchData& searchData) const
 {
-  std::vector<std::shared_ptr<CPVREpgInfoTag>> allTags;
+  // make sure we have up-to-date data in the database.
+  PersistAll(XbmcThreads::EndTime::InfiniteValue);
 
-  CSingleLock lock(m_critSection);
-  for (const auto& epgEntry : m_epgIdToEpgMap)
+  const std::shared_ptr<CPVREpgDatabase> database = GetEpgDatabase();
+  const std::vector<std::shared_ptr<CPVREpgInfoTag>> results = database->GetEpgTags(searchData);
+
+  for (const auto& tag : results)
   {
-    const std::vector<std::shared_ptr<CPVREpgInfoTag>> epgTags = epgEntry.second->GetTags();
-    allTags.insert(allTags.end(), epgTags.begin(), epgTags.end());
+    const auto& it = m_epgIdToEpgMap.find(tag->EpgID());
+    if (it != m_epgIdToEpgMap.cend())
+      tag->SetChannelData((*it).second->GetChannelData());
   }
 
-  return allTags;
+  return results;
 }
 
 void CPVREpgContainer::InsertFromDB(const std::shared_ptr<CPVREpg>& newEpg)
@@ -533,7 +526,8 @@
     if (iEpgId <= 0)
       iEpgId = NextEpgId();
 
-    epg.reset(new CPVREpg(iEpgId, channelData->ChannelName(), strScraperName, channelData));
+    epg.reset(new CPVREpg(iEpgId, channelData->ChannelName(), strScraperName, channelData,
+                          GetEpgDatabase()));
 
     CSingleLock lock(m_critSection);
     m_epgIdToEpgMap.insert({iEpgId, epg});
@@ -566,17 +560,13 @@
   for (const auto& epgEntry : m_epgIdToEpgMap)
     epgEntry.second->Cleanup(cleanupTime);
 
-  /* remove the old entries from the database */
-  if (UseDatabase())
-    m_database->DeleteEpgEntries(cleanupTime);
-
   CSingleLock lock(m_critSection);
   CDateTime::GetCurrentDateTime().GetAsUTCDateTime().GetAsTime(m_iLastEpgCleanup);
 
   return true;
 }
 
-bool CPVREpgContainer::DeleteEpg(const std::shared_ptr<CPVREpg>& epg, bool bDeleteFromDatabase /* = false */)
+bool CPVREpgContainer::DeleteEpg(const std::shared_ptr<CPVREpg>& epg)
 {
   if (!epg || epg->EpgID() < 0)
     return false;
@@ -593,8 +583,8 @@
     m_channelUidToEpgMap.erase(epgEntry1);
 
   CLog::LogFC(LOGDEBUG, LOGEPG, "Deleting EPG table %s (%d)", epg->Name().c_str(), epg->EpgID());
-  if (bDeleteFromDatabase && UseDatabase())
-    m_database->Delete(*epgEntry->second);
+
+  epgEntry->second->Delete(GetEpgDatabase());
 
   epgEntry->second->Events().Unsubscribe(this);
   m_epgIdToEpgMap.erase(epgEntry);
@@ -602,11 +592,6 @@
   return true;
 }
 
-bool CPVREpgContainer::UseDatabase() const
-{
-  return m_settings.GetBoolValue(CSettings::SETTING_EPG_STOREEPGINDATABASE);
-}
-
 bool CPVREpgContainer::InterruptUpdate() const
 {
   CSingleLock lock(m_critSection);
@@ -664,7 +649,7 @@
 
   /* load or update all EPG tables */
   unsigned int iCounter = 0;
-  const std::shared_ptr<CPVREpgDatabase> database = UseDatabase() ? GetEpgDatabase() : nullptr;
+  const std::shared_ptr<CPVREpgDatabase> database = GetEpgDatabase();
   for (const auto& epgEntry : m_epgIdToEpgMap)
   {
     if (InterruptUpdate())
@@ -700,7 +685,7 @@
     progressHandler->DestroyProgress();
 
   for (const auto& epg : invalidTables)
-    DeleteEpg(epg, true);
+    DeleteEpg(epg);
 
   if (bInterrupted)
   {

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgContainer.h Changed

@@ -34,6 +34,8 @@
 
   enum class PVREvent;
 
+  struct PVREpgSearchData;
+
   class CPVREpgContainer : private CThread
   {
     friend class CPVREpgDatabase;
@@ -85,10 +87,9 @@
     /*!
      * @brief Delete an EPG table from this container.
      * @param epg The table to delete.
-     * @param bDeleteFromDatabase Delete this table from the database too if true.
      * @return True on success, false otherwise.
      */
-    bool DeleteEpg(const std::shared_ptr<CPVREpg>& epg, bool bDeleteFromDatabase = false);
+    bool DeleteEpg(const std::shared_ptr<CPVREpg>& epg);
 
     /*!
      * @brief CEventStream callback for PVR events.
@@ -147,16 +148,11 @@
     std::shared_ptr<CPVREpgInfoTag> GetTagById(const std::shared_ptr<CPVREpg>& epg, unsigned int iBroadcastId) const;
 
     /*!
-     * @brief Get all EPG tags.
-     * @return The tags.
-     */
-    std::vector<std::shared_ptr<CPVREpgInfoTag>> GetAllTags() const;
-
-    /*!
-     * @brief Check whether data should be persisted to the EPG database.
-     * @return True if data should be persisted to the EPG database, false otherwise.
+     * @brief Get all EPG tags matching the given search criteria.
+     * @param searchData The search criteria.
+     * @return The matching tags.
      */
-    bool UseDatabase() const;
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> GetTags(const PVREpgSearchData& searchData) const;
 
     /*!
      * @brief Notify EPG container that there are pending manual EPG updates
@@ -220,9 +216,11 @@
 
     /*!
      * @brief Call Persist() on each table
+     * @param iMaxTimeslice time in milliseconds for max processing. Return after this time
+     *        even if not all data was persisted, unless value is -1
      * @return True when they all were persisted, false otherwise.
      */
-    bool PersistAll();
+    bool PersistAll(unsigned int iMaxTimeslice) const;
 
     /*!
      * @brief Remove old EPG entries.

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgDatabase.cpp Changed

@@ -12,6 +12,7 @@
 #include "dbwrappers/dataset.h"
 #include "pvr/epg/Epg.h"
 #include "pvr/epg/EpgInfoTag.h"
+#include "pvr/epg/EpgSearchData.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
 #include "threads/SingleLock.h"
@@ -174,18 +175,6 @@
   return DeleteValues("epg", filter);
 }
 
-bool CPVREpgDatabase::DeleteEpgEntries(const CDateTime& maxEndTime)
-{
-  time_t iMaxEndTime;
-  maxEndTime.GetAsTime(iMaxEndTime);
-
-  Filter filter;
-
-  CSingleLock lock(m_critSection);
-  filter.AppendWhere(PrepareSQL("iEndTime < %u", iMaxEndTime));
-  return DeleteValues("epgtags", filter);
-}
-
 bool CPVREpgDatabase::Delete(const CPVREpgInfoTag& tag)
 {
   /* tag without a database ID was not persisted */
@@ -215,7 +204,7 @@
         std::string strName = m_pDS->fv("sName").get_asString().c_str();
         std::string strScraperName = m_pDS->fv("sScraperName").get_asString().c_str();
 
-        result.emplace_back(new CPVREpg(iEpgID, strName, strScraperName));
+        result.emplace_back(new CPVREpg(iEpgID, strName, strScraperName, shared_from_this()));
         m_pDS->next();
       }
       m_pDS->close();
@@ -229,75 +218,611 @@
   return result;
 }
 
-std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgDatabase::Get(const CPVREpg& epg)
+std::shared_ptr<CPVREpgInfoTag> CPVREpgDatabase::CreateEpgTag(
+    const std::unique_ptr<dbiplus::Dataset>& pDS)
+{
+  if (!pDS->eof())
+  {
+    const std::shared_ptr<CPVREpgInfoTag> newTag(new CPVREpgInfoTag());
+
+    time_t iStartTime;
+    iStartTime = static_cast<time_t>(m_pDS->fv("iStartTime").get_asInt());
+    const CDateTime startTime(iStartTime);
+    newTag->m_startTime = startTime;
+
+    time_t iEndTime = static_cast<time_t>(m_pDS->fv("iEndTime").get_asInt());
+    const CDateTime endTime(iEndTime);
+    newTag->m_endTime = endTime;
+
+    time_t iFirstAired = static_cast<time_t>(m_pDS->fv("iFirstAired").get_asInt());
+    if (iFirstAired > 0)
+    {
+      const CDateTime firstAired(iFirstAired);
+      newTag->m_firstAired = firstAired;
+    }
+
+    int iBroadcastUID = m_pDS->fv("iBroadcastUid").get_asInt();
+    // Compat: null value for broadcast uid changed from numerical -1 to 0 with PVR Addon API v4.0.0
+    newTag->m_iUniqueBroadcastID = iBroadcastUID == -1 ? EPG_TAG_INVALID_UID : iBroadcastUID;
+
+    newTag->m_iEpgID = m_pDS->fv("idEpg").get_asInt();
+    newTag->m_iDatabaseID = m_pDS->fv("idBroadcast").get_asInt();
+    newTag->m_strTitle = m_pDS->fv("sTitle").get_asString().c_str();
+    newTag->m_strPlotOutline = m_pDS->fv("sPlotOutline").get_asString().c_str();
+    newTag->m_strPlot = m_pDS->fv("sPlot").get_asString().c_str();
+    newTag->m_strOriginalTitle = m_pDS->fv("sOriginalTitle").get_asString().c_str();
+    newTag->m_cast = newTag->Tokenize(m_pDS->fv("sCast").get_asString());
+    newTag->m_directors = newTag->Tokenize(m_pDS->fv("sDirector").get_asString());
+    newTag->m_writers = newTag->Tokenize(m_pDS->fv("sWriter").get_asString());
+    newTag->m_iYear = m_pDS->fv("iYear").get_asInt();
+    newTag->m_strIMDBNumber = m_pDS->fv("sIMDBNumber").get_asString().c_str();
+    newTag->m_iParentalRating = m_pDS->fv("iParentalRating").get_asInt();
+    newTag->m_iStarRating = m_pDS->fv("iStarRating").get_asInt();
+    newTag->m_iEpisodeNumber = m_pDS->fv("iEpisodeId").get_asInt();
+    newTag->m_iEpisodePart = m_pDS->fv("iEpisodePart").get_asInt();
+    newTag->m_strEpisodeName = m_pDS->fv("sEpisodeName").get_asString().c_str();
+    newTag->m_iSeriesNumber = m_pDS->fv("iSeriesId").get_asInt();
+    newTag->m_strIconPath = m_pDS->fv("sIconPath").get_asString().c_str();
+    newTag->m_iFlags = m_pDS->fv("iFlags").get_asInt();
+    newTag->m_strSeriesLink = m_pDS->fv("sSeriesLink").get_asString().c_str();
+
+    newTag->SetGenre(m_pDS->fv("iGenreType").get_asInt(), m_pDS->fv("iGenreSubType").get_asInt(),
+                     m_pDS->fv("sGenre").get_asString().c_str());
+    return newTag;
+  }
+  return {};
+}
+
+CDateTime CPVREpgDatabase::GetFirstStartTime(int iEpgID)
+{
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT MIN(iStartTime) FROM epgtags WHERE idEpg = %u;", iEpgID);
+  std::string strValue = GetSingleValue(strQuery);
+  if (!strValue.empty())
+    return CDateTime(static_cast<time_t>(std::atoi(strValue.c_str())));
+
+  return {};
+}
+
+CDateTime CPVREpgDatabase::GetLastEndTime(int iEpgID)
 {
-  std::vector<std::shared_ptr<CPVREpgInfoTag>> result;
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT MAX(iEndTime) FROM epgtags WHERE idEpg = %u;", iEpgID);
+  std::string strValue = GetSingleValue(strQuery);
+  if (!strValue.empty())
+    return CDateTime(static_cast<time_t>(std::atoi(strValue.c_str())));
+
+  return {};
+}
+
+CDateTime CPVREpgDatabase::GetMinStartTime(int iEpgID, const CDateTime& minStart)
+{
+  time_t t;
+  minStart.GetAsTime(t);
+
+  CSingleLock lock(m_critSection);
+  const std::string strQuery = PrepareSQL("SELECT MIN(iStartTime) "
+                                          "FROM epgtags "
+                                          "WHERE idEpg = %u AND iStartTime > %u;",
+                                          iEpgID, static_cast<unsigned int>(t));
+  std::string strValue = GetSingleValue(strQuery);
+  if (!strValue.empty())
+    return CDateTime(static_cast<time_t>(std::atoi(strValue.c_str())));
+
+  return {};
+}
+
+CDateTime CPVREpgDatabase::GetMaxEndTime(int iEpgID, const CDateTime& maxEnd)
+{
+  time_t t;
+  maxEnd.GetAsTime(t);
+
+  CSingleLock lock(m_critSection);
+  const std::string strQuery = PrepareSQL("SELECT MAX(iEndTime) "
+                                          "FROM epgtags "
+                                          "WHERE idEpg = %u AND iEndTime <= %u;",
+                                          iEpgID, static_cast<unsigned int>(t));
+  std::string strValue = GetSingleValue(strQuery);
+  if (!strValue.empty())
+    return CDateTime(static_cast<time_t>(std::atoi(strValue.c_str())));
+
+  return {};
+}
+
+namespace
+{
+
+CDateTime ConvertLocalTimeToUTC(const CDateTime& local)
+{
+  time_t time = 0;
+  local.GetAsTime(time);
+
+  struct tm* tms;
+
+  // obtain dst flag for given datetime
+#ifdef HAVE_LOCALTIME_R
+  struct tm loc_buf;
+  tms = localtime_r(&time, &loc_buf);
+#else
+  tms = localtime(&time);
+#endif
+
+  int isdst = tms->tm_isdst;
+
+#ifdef HAVE_GMTIME_R
+  struct tm gm_buf;
+  tms = gmtime_r(&time, &gm_buf);
+#else
+  tms = gmtime(&time);
+#endif
+
+  tms->tm_isdst = isdst;
+  return CDateTime(mktime(tms));
+}
+
+class CSearchTermConverter
+{
+public:
+  CSearchTermConverter(const std::string& strSearchTerm) { Parse(strSearchTerm); }
+
+  std::string ToSQL(const std::string& strFieldName) const
+  {
+    std::string result = "(";
+
+    for (auto it = m_fragments.cbegin(); it != m_fragments.cend();)
+    {
+      result += (*it);
+
+      ++it;
+      if (it != m_fragments.cend())
+        result += strFieldName;
+    }
+
+    StringUtils::TrimRight(result);
+    result += ")";
+    return result;
+  }
+
+private:
+  void Parse(const std::string& strSearchTerm)
+  {
+    std::string strParsedSearchTerm(strSearchTerm);
+    StringUtils::Trim(strParsedSearchTerm);
+
+    std::string strFragment;
+
+    bool bNextOR = false;
+    while (!strParsedSearchTerm.empty())
+    {
+      StringUtils::TrimLeft(strParsedSearchTerm);
+
+      if (StringUtils::StartsWith(strParsedSearchTerm, "!") ||
+          StringUtils::StartsWithNoCase(strParsedSearchTerm, "not"))
+      {
+        std::string strDummy;
+        GetAndCutNextTerm(strParsedSearchTerm, strDummy);
+        strFragment += " NOT ";
+        bNextOR = false;
+      }
+      else if (StringUtils::StartsWith(strParsedSearchTerm, "+") ||
+               StringUtils::StartsWithNoCase(strParsedSearchTerm, "and"))
+      {
+        std::string strDummy;
+        GetAndCutNextTerm(strParsedSearchTerm, strDummy);
+        strFragment += " AND ";
+        bNextOR = false;
+      }
+      else if (StringUtils::StartsWith(strParsedSearchTerm, "|") ||
+               StringUtils::StartsWithNoCase(strParsedSearchTerm, "or"))
+      {
+        std::string strDummy;
+        GetAndCutNextTerm(strParsedSearchTerm, strDummy);
+        strFragment += " OR ";
+        bNextOR = false;
+      }
+      else
+      {
+        std::string strTerm;
+        GetAndCutNextTerm(strParsedSearchTerm, strTerm);
+        if (!strTerm.empty())
+        {
+          if (bNextOR && !m_fragments.empty())
+            strFragment += " OR "; // default operator
+
+          strFragment += "(UPPER(";
+
+          m_fragments.emplace_back(strFragment);
+          strFragment.clear();
+
+          strFragment += ") LIKE UPPER('%";
+          StringUtils::Replace(strTerm, "'", "''"); // escape '
+          strFragment += strTerm;
+          strFragment += "%')) ";
+
+          bNextOR = true;
+        }
+        else
+        {
+          break;
+        }
+      }
+
+      StringUtils::TrimLeft(strParsedSearchTerm);
+    }
+
+    if (!strFragment.empty())
+      m_fragments.emplace_back(strFragment);
+  }
+
+  static void GetAndCutNextTerm(std::string& strSearchTerm, std::string& strNextTerm)
+  {
+    std::string strFindNext(" ");
+
+    if (StringUtils::EndsWith(strSearchTerm, "\""))
+    {
+      strSearchTerm.erase(0, 1);
+      strFindNext = "\"";
+    }
+
+    const size_t iNextPos = strSearchTerm.find(strFindNext);
+    if (iNextPos != std::string::npos)
+    {
+      strNextTerm = strSearchTerm.substr(0, iNextPos);
+      strSearchTerm.erase(0, iNextPos + 1);
+    }
+    else
+    {
+      strNextTerm = strSearchTerm;
+      strSearchTerm.clear();
+    }
+  }
+
+  std::vector<std::string> m_fragments;
+};
+
+} // unnamed namespace
 
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgDatabase::GetEpgTags(
+    const PVREpgSearchData& searchData)
+{
   CSingleLock lock(m_critSection);
-  std::string strQuery = PrepareSQL("SELECT * FROM epgtags WHERE idEpg = %u;", epg.EpgID());
+
+  std::string strQuery = PrepareSQL("SELECT * FROM epgtags");
+
+  Filter filter;
+
+  /////////////////////////////////////////////////////////////////////////////////////////////
+  // broadcast UID
+  /////////////////////////////////////////////////////////////////////////////////////////////
+
+  if (searchData.m_iUniqueBroadcastId != EPG_TAG_INVALID_UID)
+  {
+    filter.AppendWhere(PrepareSQL("iBroadcastUid = %u", searchData.m_iUniqueBroadcastId));
+  }
+
+  /////////////////////////////////////////////////////////////////////////////////////////////
+  // min start datetime
+  /////////////////////////////////////////////////////////////////////////////////////////////
+
+  const CDateTime minStartTime = ConvertLocalTimeToUTC(searchData.m_startDateTime);
+  time_t minStart;
+  minStartTime.GetAsTime(minStart);
+  filter.AppendWhere(PrepareSQL("iStartTime >= %u", static_cast<unsigned int>(minStart)));
+
+  /////////////////////////////////////////////////////////////////////////////////////////////
+  // max end datetime
+  /////////////////////////////////////////////////////////////////////////////////////////////
+
+  const CDateTime maxEndTime = ConvertLocalTimeToUTC(searchData.m_endDateTime);
+  time_t maxEnd;
+  maxEndTime.GetAsTime(maxEnd);
+  filter.AppendWhere(PrepareSQL("iEndTime <= %u", static_cast<unsigned int>(maxEnd)));
+
+  /////////////////////////////////////////////////////////////////////////////////////////////
+  // genre type
+  /////////////////////////////////////////////////////////////////////////////////////////////
+
+  if (searchData.m_iGenreType != EPG_SEARCH_UNSET)
+  {
+    filter.AppendWhere(PrepareSQL("(iGenreType < %u) OR (iGenreType > %u) OR (iGenreType = %u)",
+                                  EPG_EVENT_CONTENTMASK_MOVIEDRAMA,
+                                  EPG_EVENT_CONTENTMASK_USERDEFINED, searchData.m_iGenreType));
+  }
+
+  /////////////////////////////////////////////////////////////////////////////////////////////
+  // search term
+  /////////////////////////////////////////////////////////////////////////////////////////////
+
+  if (!searchData.m_strSearchTerm.empty())
+  {
+    const CSearchTermConverter conv(searchData.m_strSearchTerm);
+
+    // title
+    std::string strWhere = conv.ToSQL("sTitle");
+
+    // plot outline
+    strWhere += " OR ";
+    strWhere += conv.ToSQL("sPlotOutline");
+
+    if (searchData.m_bSearchInDescription)
+    {
+      // plot
+      strWhere += " OR ";
+      strWhere += conv.ToSQL("sPlot");
+    }
+
+    filter.AppendWhere(strWhere);
+  }
+
+  if (BuildSQL(strQuery, filter, strQuery))
+  {
+    try
+    {
+      if (m_pDS->query(strQuery))
+      {
+        std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
+        while (!m_pDS->eof())
+        {
+          tags.emplace_back(CreateEpgTag(m_pDS));
+          m_pDS->next();
+        }
+        m_pDS->close();
+        return tags;
+      }
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR, "Could not load tags for given search criteria");
+    }
+  }
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgDatabase::GetEpgTagByUniqueBroadcastID(
+    int iEpgID, unsigned int iUniqueBroadcastId)
+{
+  CSingleLock lock(m_critSection);
+  const std::string strQuery = PrepareSQL("SELECT * "
+                                          "FROM epgtags "
+                                          "WHERE idEpg = %u AND iBroadcastUid = %u;",
+                                          iEpgID, iUniqueBroadcastId);
+
+  if (ResultQuery(strQuery))
+  {
+    try
+    {
+      const std::shared_ptr<CPVREpgInfoTag> tag = CreateEpgTag(m_pDS);
+      m_pDS->close();
+      return tag;
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR, "Could not load EPG tag with unique broadcast ID (%u) from the database",
+                 iUniqueBroadcastId);
+    }
+  }
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgDatabase::GetEpgTagByStartTime(int iEpgID,
+                                                                      const CDateTime& startTime)
+{
+  time_t start;
+  startTime.GetAsTime(start);
+
+  CSingleLock lock(m_critSection);
+  const std::string strQuery = PrepareSQL("SELECT * "
+                                          "FROM epgtags "
+                                          "WHERE idEpg = %u AND iStartTime = %u;",
+                                          iEpgID, static_cast<unsigned int>(start));
+
   if (ResultQuery(strQuery))
   {
     try
     {
+      const std::shared_ptr<CPVREpgInfoTag> tag = CreateEpgTag(m_pDS);
+      m_pDS->close();
+      return tag;
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR, "Could not load EPG tag with start time (%s) from the database",
+                 startTime.GetAsDBDateTime());
+    }
+  }
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgDatabase::GetEpgTagByMinStartTime(
+    int iEpgID, const CDateTime& minStartTime)
+{
+  time_t minStart;
+  minStartTime.GetAsTime(minStart);
+
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT * "
+                 "FROM epgtags "
+                 "WHERE idEpg = %u AND iStartTime > %u ORDER BY iStartTime ASC LIMIT 1;",
+                 iEpgID, static_cast<unsigned int>(minStart));
+
+  if (ResultQuery(strQuery))
+  {
+    try
+    {
+      const std::shared_ptr<CPVREpgInfoTag> tag = CreateEpgTag(m_pDS);
+      m_pDS->close();
+      return tag;
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR, "Could not load tags with min start time (%u) for EPG (%d)",
+                 minStartTime.GetAsDBDateTime(), iEpgID);
+    }
+  }
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgDatabase::GetEpgTagByMaxEndTime(int iEpgID,
+                                                                       const CDateTime& maxEndTime)
+{
+  time_t maxEnd;
+  maxEndTime.GetAsTime(maxEnd);
+
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT * "
+                 "FROM epgtags "
+                 "WHERE idEpg = %u AND iEndTime <= %u ORDER BY iStartTime DESC LIMIT 1;",
+                 iEpgID, static_cast<unsigned int>(maxEnd));
+
+  if (ResultQuery(strQuery))
+  {
+    try
+    {
+      const std::shared_ptr<CPVREpgInfoTag> tag = CreateEpgTag(m_pDS);
+      m_pDS->close();
+      return tag;
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR, "Could not load tags with max end time (%u) for EPG (%d)",
+                 maxEndTime.GetAsDBDateTime(), iEpgID);
+    }
+  }
+
+  return {};
+}
+
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgDatabase::GetEpgTagsByMinStartMaxEndTime(
+    int iEpgID, const CDateTime& minStartTime, const CDateTime& maxEndTime)
+{
+  time_t minStart;
+  minStartTime.GetAsTime(minStart);
+
+  time_t maxEnd;
+  maxEndTime.GetAsTime(maxEnd);
+
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT * "
+                 "FROM epgtags "
+                 "WHERE idEpg = %u AND iStartTime >= %u AND iEndTime <= %u ORDER BY iStartTime;",
+                 iEpgID, static_cast<unsigned int>(minStart), static_cast<unsigned int>(maxEnd));
+
+  if (ResultQuery(strQuery))
+  {
+    try
+    {
+      std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
       while (!m_pDS->eof())
       {
-        std::shared_ptr<CPVREpgInfoTag> newTag(new CPVREpgInfoTag());
+        tags.emplace_back(CreateEpgTag(m_pDS));
+        m_pDS->next();
+      }
+      m_pDS->close();
+      return tags;
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR,
+                 "Could not load tags with min start time (%u) and max end time (%u) for EPG (%d)",
+                 minStartTime.GetAsDBDateTime(), maxEndTime.GetAsDBDateTime(), iEpgID);
+    }
+  }
 
-        time_t iStartTime, iEndTime;
-        iStartTime = (time_t) m_pDS->fv("iStartTime").get_asInt();
-        CDateTime startTime(iStartTime);
-        newTag->m_startTime = startTime;
+  return {};
+}
 
-        iEndTime = (time_t) m_pDS->fv("iEndTime").get_asInt();
-        CDateTime endTime(iEndTime);
-        newTag->m_endTime = endTime;
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgDatabase::GetEpgTagsByMinEndMaxStartTime(
+    int iEpgID, const CDateTime& minEndTime, const CDateTime& maxStartTime)
+{
+  time_t minEnd;
+  minEndTime.GetAsTime(minEnd);
 
-        time_t iFirstAired = static_cast<time_t>(m_pDS->fv("iFirstAired").get_asInt());
-        if (iFirstAired > 0)
-        {
-          const CDateTime firstAired(iFirstAired);
-          newTag->m_firstAired = firstAired;
-        }
+  time_t maxStart;
+  maxStartTime.GetAsTime(maxStart);
 
-        int iBroadcastUID = m_pDS->fv("iBroadcastUid").get_asInt();
-        // Compat: null value for broadcast uid changed from numerical -1 to 0 with PVR Addon API v4.0.0
-        newTag->m_iUniqueBroadcastID = iBroadcastUID == -1 ? EPG_TAG_INVALID_UID : iBroadcastUID;
-
-        newTag->m_iDatabaseID = m_pDS->fv("idBroadcast").get_asInt();
-        newTag->m_strTitle = m_pDS->fv("sTitle").get_asString().c_str();
-        newTag->m_strPlotOutline = m_pDS->fv("sPlotOutline").get_asString().c_str();
-        newTag->m_strPlot = m_pDS->fv("sPlot").get_asString().c_str();
-        newTag->m_strOriginalTitle = m_pDS->fv("sOriginalTitle").get_asString().c_str();
-        newTag->m_cast = newTag->Tokenize(m_pDS->fv("sCast").get_asString());
-        newTag->m_directors = newTag->Tokenize(m_pDS->fv("sDirector").get_asString());
-        newTag->m_writers = newTag->Tokenize(m_pDS->fv("sWriter").get_asString());
-        newTag->m_iYear = m_pDS->fv("iYear").get_asInt();
-        newTag->m_strIMDBNumber = m_pDS->fv("sIMDBNumber").get_asString().c_str();
-        newTag->m_iGenreType = m_pDS->fv("iGenreType").get_asInt();
-        newTag->m_iGenreSubType = m_pDS->fv("iGenreSubType").get_asInt();
-        newTag->m_genre = newTag->Tokenize(m_pDS->fv("sGenre").get_asString());
-        newTag->m_iParentalRating = m_pDS->fv("iParentalRating").get_asInt();
-        newTag->m_iStarRating = m_pDS->fv("iStarRating").get_asInt();
-        newTag->m_iEpisodeNumber = m_pDS->fv("iEpisodeId").get_asInt();
-        newTag->m_iEpisodePart = m_pDS->fv("iEpisodePart").get_asInt();
-        newTag->m_strEpisodeName = m_pDS->fv("sEpisodeName").get_asString().c_str();
-        newTag->m_iSeriesNumber = m_pDS->fv("iSeriesId").get_asInt();
-        newTag->m_strIconPath = m_pDS->fv("sIconPath").get_asString().c_str();
-        newTag->m_iFlags = m_pDS->fv("iFlags").get_asInt();
-        newTag->m_strSeriesLink = m_pDS->fv("sSeriesLink").get_asString().c_str();
-
-        result.emplace_back(newTag);
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT * "
+                 "FROM epgtags "
+                 "WHERE idEpg = %u AND iEndTime > %u AND iStartTime <= %u ORDER BY iStartTime;",
+                 iEpgID, static_cast<unsigned int>(minEnd), static_cast<unsigned int>(maxStart));
 
+  if (ResultQuery(strQuery))
+  {
+    try
+    {
+      std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
+      while (!m_pDS->eof())
+      {
+        tags.emplace_back(CreateEpgTag(m_pDS));
         m_pDS->next();
       }
       m_pDS->close();
+      return tags;
     }
     catch (...)
     {
-      CLog::LogF(LOGERROR, "Could not load EPG data from the database");
+      CLog::LogF(LOGERROR,
+                 "Could not load tags with min end time (%u) and max start time (%u) for EPG (%d)",
+                 minEndTime.GetAsDBDateTime(), maxStartTime.GetAsDBDateTime(), iEpgID);
     }
   }
-  return result;
+
+  return {};
+}
+
+bool CPVREpgDatabase::DeleteEpgTagsByMinEndMaxStartTime(int iEpgID,
+                                                        const CDateTime& minEndTime,
+                                                        const CDateTime& maxStartTime)
+{
+  time_t minEnd;
+  minEndTime.GetAsTime(minEnd);
+
+  time_t maxStart;
+  maxStartTime.GetAsTime(maxStart);
+
+  Filter filter;
+
+  CSingleLock lock(m_critSection);
+  filter.AppendWhere(PrepareSQL("idEpg = %u AND iEndTime > %u AND iStartTime <= %u", iEpgID,
+                                static_cast<unsigned int>(minEnd),
+                                static_cast<unsigned int>(maxStart)));
+  return DeleteValues("epgtags", filter);
+}
+
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgDatabase::GetAllEpgTags(int iEpgID)
+{
+  CSingleLock lock(m_critSection);
+  const std::string strQuery =
+      PrepareSQL("SELECT * FROM epgtags WHERE idEpg = %u ORDER BY iStartTime;", iEpgID);
+  if (ResultQuery(strQuery))
+  {
+    try
+    {
+      std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
+      while (!m_pDS->eof())
+      {
+        tags.emplace_back(CreateEpgTag(m_pDS));
+        m_pDS->next();
+      }
+      m_pDS->close();
+      return tags;
+    }
+    catch (...)
+    {
+      CLog::LogF(LOGERROR, "Could not load tags for EPG (%d)", iEpgID);
+    }
+  }
+  return {};
 }
 
 bool CPVREpgDatabase::GetLastEpgScanTime(int iEpgId, CDateTime* lastScan)
@@ -357,6 +882,28 @@
   return iReturn;
 }
 
+bool CPVREpgDatabase::DeleteEpgTags(int iEpgId, const CDateTime& maxEndTime)
+{
+  time_t iMaxEndTime;
+  maxEndTime.GetAsTime(iMaxEndTime);
+
+  Filter filter;
+
+  CSingleLock lock(m_critSection);
+  filter.AppendWhere(
+      PrepareSQL("idEpg = %u AND iEndTime < %u", iEpgId, static_cast<unsigned int>(iMaxEndTime)));
+  return DeleteValues("epgtags", filter);
+}
+
+bool CPVREpgDatabase::DeleteEpgTags(int iEpgId)
+{
+  Filter filter;
+
+  CSingleLock lock(m_critSection);
+  filter.AppendWhere(PrepareSQL("idEpg = %u", iEpgId));
+  return DeleteValues("epgtags", filter);
+}
+
 int CPVREpgDatabase::Persist(const CPVREpgInfoTag& tag, bool bSingleUpdate /* = true */)
 {
   int iReturn(-1);

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgDatabase.h Changed

@@ -21,9 +21,11 @@
   class CPVREpg;
   class CPVREpgInfoTag;
 
+  struct PVREpgSearchData;
+
   /** The EPG database */
 
-  class CPVREpgDatabase : public CDatabase
+  class CPVREpgDatabase : public CDatabase, public std::enable_shared_from_this<CPVREpgDatabase>
   {
   public:
     /*!
@@ -86,13 +88,6 @@
     bool Delete(const CPVREpg& table);
 
     /*!
-     * @brief Erase all EPG entries with an end time less than the given time.
-     * @param maxEndTime The maximum allowed end time.
-     * @return True if the entries were removed successfully, false otherwise.
-     */
-    bool DeleteEpgEntries(const CDateTime& maxEndTime);
-
-    /*!
      * @brief Remove a single EPG entry.
      * @param tag The entry to remove.
      * @return True if it was removed successfully, false otherwise.
@@ -106,11 +101,113 @@
     std::vector<std::shared_ptr<CPVREpg>> GetAll();
 
     /*!
-     * @brief Get all EPG entries for a table.
-     * @param epg The EPG table to get the entries for.
+     * @brief Get all tags for a given EPG id.
+     * @param iEpgID The ID of the EPG.
      * @return The entries.
      */
-    std::vector<std::shared_ptr<CPVREpgInfoTag>> Get(const CPVREpg& epg);
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> GetAllEpgTags(int iEpgID);
+
+    /*!
+     * @brief Get the start time of the first tag in this EPG.
+     * @param iEpgID The ID of the EPG.
+     * @return The time.
+     */
+    CDateTime GetFirstStartTime(int iEpgID);
+
+    /*!
+     * @brief Get the end time of the last tag in this EPG.
+     * @param iEpgID The ID of the EPG.
+     * @return The time.
+     */
+    CDateTime GetLastEndTime(int iEpgID);
+
+    /*!
+     * @brief Get the start time of the first tag with a start time greater than the given min time.
+     * @param iEpgID The ID of the EPG.
+     * @param minStart The min start time.
+     * @return The time.
+     */
+    CDateTime GetMinStartTime(int iEpgID, const CDateTime& minStart);
+
+    /*!
+     * @brief Get the end time of the first tag with an end time less than the given max time.
+     * @param iEpgID The ID of the EPG.
+     * @param maxEnd The mx end time.
+     * @return The time.
+     */
+    CDateTime GetMaxEndTime(int iEpgID, const CDateTime& maxEnd);
+
+    /*!
+     * @brief Get all EPG tags matching the given search criteria.
+     * @param searchData The search criteria.
+     * @return The matching tags.
+     */
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> GetEpgTags(const PVREpgSearchData& searchData);
+
+    /*!
+     * @brief Get an EPG tag given its EPG id and unique broadcast ID.
+     * @param iEpgID The ID of the EPG for the tag to get.
+     * @param iUniqueBroadcastId The unique broadcast ID for the tag to get.
+     * @return The tag or nullptr, if not found.
+     */
+    std::shared_ptr<CPVREpgInfoTag> GetEpgTagByUniqueBroadcastID(int iEpgID,
+                                                                 unsigned int iUniqueBroadcastId);
+
+    /*!
+     * @brief Get an EPG tag given its EPG ID and start time.
+     * @param iEpgID The ID of the EPG for the tag to get.
+     * @param startTime The start time for the tag to get.
+     * @return The tag or nullptr, if not found.
+     */
+    std::shared_ptr<CPVREpgInfoTag> GetEpgTagByStartTime(int iEpgID, const CDateTime& startTime);
+
+    /*!
+     * @brief Get the next EPG tag matching the given EPG id and min start time.
+     * @param iEpgID The ID of the EPG for the tag to get.
+     * @param minStartTime The min start time for the tag to get.
+     * @return The tag or nullptr, if not found.
+     */
+    std::shared_ptr<CPVREpgInfoTag> GetEpgTagByMinStartTime(int iEpgID,
+                                                            const CDateTime& minStartTime);
+
+    /*!
+     * @brief Get the next EPG tag matching the given EPG id and max end time.
+     * @param iEpgID The ID of the EPG for the tag to get.
+     * @param maxEndTime The max end time for the tag to get.
+     * @return The tag or nullptr, if not found.
+     */
+    std::shared_ptr<CPVREpgInfoTag> GetEpgTagByMaxEndTime(int iEpgID, const CDateTime& maxEndTime);
+
+    /*!
+     * @brief Get all EPG tags matching the given EPG id, min start time and max end time.
+     * @param iEpgID The ID of the EPG for the tags to get.
+     * @param minStartTime The min start time for the tags to get.
+     * @param maxEndTime The max end time for the tags to get.
+     * @return The tags or empty vector, if no tags were found.
+     */
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> GetEpgTagsByMinStartMaxEndTime(
+        int iEpgID, const CDateTime& minStartTime, const CDateTime& maxEndTime);
+
+    /*!
+     * @brief Get all EPG tags matching the given EPG id, min end time and max start time.
+     * @param iEpgID The ID of the EPG for the tags to get.
+     * @param minEndTime The min end time for the tags to get.
+     * @param maxStartTime The max start time for the tags to get.
+     * @return The tags or empty vector, if no tags were found.
+     */
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> GetEpgTagsByMinEndMaxStartTime(
+        int iEpgID, const CDateTime& minEndTime, const CDateTime& maxStartTime);
+
+    /*!
+     * @brief Delete all EPG tags in range of given EPG id, min end time and max start time.
+     * @param iEpgID The ID of the EPG for the tags to delete.
+     * @param minEndTime The min end time for the tags to delete.
+     * @param maxStartTime The max start time for the tags to delete.
+     * @return True on success, false otherwise.
+     */
+    bool DeleteEpgTagsByMinEndMaxStartTime(int iEpgID,
+                                           const CDateTime& minEndTime,
+                                           const CDateTime& maxStartTime);
 
     /*!
      * @brief Get the last stored EPG scan time.
@@ -138,6 +235,21 @@
     int Persist(const CPVREpg& epg, bool bQueueWrite = false);
 
     /*!
+     * @brief Erase all EPG tags with the given epg ID and an end time less than the given time.
+     * @param iEpgID The ID of the EPG.
+     * @param maxEndTime The maximum allowed end time.
+     * @return True if the entries were removed successfully, false otherwise.
+     */
+    bool DeleteEpgTags(int iEpgId, const CDateTime& maxEndTime);
+
+    /*!
+     * @brief Erase all EPG tags with the given epg ID.
+     * @param iEpgID The ID of the EPG.
+     * @return True if the entries were removed successfully, false otherwise.
+     */
+    bool DeleteEpgTags(int iEpgId);
+
+    /*!
      * @brief Persist an infotag.
      * @param tag The tag to persist.
      * @param bSingleUpdate If true, this is a single update and the query will be executed immediately.
@@ -171,6 +283,8 @@
 
     int GetMinSchemaVersion() const override { return 4; }
 
+    std::shared_ptr<CPVREpgInfoTag> CreateEpgTag(const std::unique_ptr<dbiplus::Dataset>& pDS);
+
     CCriticalSection m_critSection;
   };
 }

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgInfoTag.cpp Changed

@@ -10,7 +10,6 @@
 
 #include "ServiceBroker.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
-#include "cores/DataCacheCore.h"
 #include "pvr/PVRManager.h"
 #include "pvr/PVRPlaybackState.h"
 #include "pvr/addons/PVRClient.h"
@@ -138,35 +137,10 @@
     return true;
 
   CSingleLock lock(m_critSection);
-  return (m_iDatabaseID == right.m_iDatabaseID &&
-          m_iGenreType == right.m_iGenreType &&
-          m_iGenreSubType == right.m_iGenreSubType &&
-          m_iParentalRating == right.m_iParentalRating &&
-          m_firstAired == right.m_firstAired &&
-          m_iStarRating == right.m_iStarRating &&
-          m_iSeriesNumber == right.m_iSeriesNumber &&
-          m_iEpisodeNumber == right.m_iEpisodeNumber &&
-          m_iEpisodePart == right.m_iEpisodePart &&
-          m_iUniqueBroadcastID == right.m_iUniqueBroadcastID &&
-          m_strTitle == right.m_strTitle &&
-          m_strPlotOutline == right.m_strPlotOutline &&
-          m_strPlot == right.m_strPlot &&
-          m_strOriginalTitle == right.m_strOriginalTitle &&
-          m_cast == right.m_cast &&
-          m_directors == right.m_directors &&
-          m_writers == right.m_writers &&
-          m_iYear == right.m_iYear &&
-          m_strIMDBNumber == right.m_strIMDBNumber &&
-          m_genre == right.m_genre &&
-          m_strEpisodeName == right.m_strEpisodeName &&
-          m_iEpgID == right.m_iEpgID &&
-          m_strIconPath == right.m_strIconPath &&
-          m_strFileNameAndPath == right.m_strFileNameAndPath &&
-          m_startTime == right.m_startTime &&
-          m_endTime == right.m_endTime &&
-          m_iFlags == right.m_iFlags &&
-          m_strSeriesLink == right.m_strSeriesLink &&
-          m_channelData == right.m_channelData);
+  return (m_iUniqueBroadcastID == right.m_iUniqueBroadcastID && m_channelData &&
+          right.m_channelData &&
+          m_channelData->UniqueClientChannelId() == right.m_channelData->UniqueClientChannelId() &&
+          m_channelData->ClientId() == right.m_channelData->ClientId());
 }
 
 bool CPVREpgInfoTag::operator !=(const CPVREpgInfoTag& right) const
@@ -222,17 +196,12 @@
 
 CDateTime CPVREpgInfoTag::GetCurrentPlayingTime() const
 {
-  if (CServiceBroker::GetPVRManager().PlaybackState()->IsPlayingChannel(ClientID(), UniqueChannelID()))
-  {
-    // start time valid?
-    time_t startTime = CServiceBroker::GetDataCacheCore().GetStartTime();
-    if (startTime > 0)
-    {
-      return CDateTime(startTime + CServiceBroker::GetDataCacheCore().GetPlayTime() / 1000);
-    }
-  }
-
-  return CDateTime::GetUTCDateTime();
+  const std::shared_ptr<CPVRPlaybackState> playbackState =
+      CServiceBroker::GetPVRManager().PlaybackState();
+  if (playbackState && playbackState->IsPlayingChannel(ClientID(), UniqueChannelID()))
+    return playbackState->GetPlaybackTime();
+  else
+    return CDateTime::GetUTCDateTime();
 }
 
 bool CPVREpgInfoTag::IsActive() const
@@ -424,11 +393,14 @@
        * EPG_GENRE_USE_STRING leaving type available for genre category, use the provided genre description for the text. */
       m_genre = Tokenize(strGenre);
     }
-    else
-    {
-      /* Determine the genre description from the type and subtype IDs */
-      m_genre = StringUtils::Split(CPVREpg::ConvertGenreIdToString(iGenreType, iGenreSubType), CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_videoItemSeparator);
-    }
+  }
+
+  if (m_genre.empty())
+  {
+    // Determine the genre description from the type and subtype IDs.
+    m_genre = StringUtils::Split(
+        CPVREpg::ConvertGenreIdToString(iGenreType, iGenreSubType),
+        CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_videoItemSeparator);
   }
 }

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgInfoTag.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgSearchData.cpp Added

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "EpgSearchData.h"
+
+#include "ServiceBroker.h"
+#include "pvr/PVRManager.h"
+#include "utils/log.h"
+
+using namespace PVR;
+
+void PVREpgSearchData::Reset()
+{
+  m_strSearchTerm.clear();
+  m_bSearchInDescription = false;
+  m_iGenreType = EPG_SEARCH_UNSET;
+
+  m_startDateTime.SetFromUTCDateTime(
+      CServiceBroker::GetPVRManager().EpgContainer().GetFirstEPGDate());
+  if (!m_startDateTime.IsValid())
+  {
+    CLog::Log(LOGWARNING, "No valid epg start time. Defaulting search start time to 'now'");
+    m_startDateTime.SetFromUTCDateTime(CDateTime::GetUTCDateTime()); // default to 'now'
+  }
+
+  m_endDateTime.SetFromUTCDateTime(CServiceBroker::GetPVRManager().EpgContainer().GetLastEPGDate());
+  if (!m_endDateTime.IsValid())
+  {
+    CLog::Log(
+        LOGWARNING,
+        "No valid epg end time. Defaulting search end time to search start time plus 10 days");
+    m_endDateTime.SetFromUTCDateTime(m_startDateTime +
+                                     CDateTimeSpan(10, 0, 0, 0)); // default to start + 10 days
+  }
+
+  m_iUniqueBroadcastId = EPG_TAG_INVALID_UID;
+}

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgSearchData.h Added

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgSearchFilter.cpp Changed

@@ -9,7 +9,6 @@
 #include "EpgSearchFilter.h"
 
 #include "ServiceBroker.h"
-#include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannel.h"
 #include "pvr/channels/PVRChannelGroup.h"
@@ -34,28 +33,12 @@
 
 void CPVREpgSearchFilter::Reset()
 {
-  m_strSearchTerm.clear();
+  m_searchData.Reset();
+  m_bEpgSearchDataFiltered = false;
+
   m_bIsCaseSensitive = false;
-  m_bSearchInDescription = false;
-  m_iGenreType = EPG_SEARCH_UNSET;
-  m_iGenreSubType = EPG_SEARCH_UNSET;
   m_iMinimumDuration = EPG_SEARCH_UNSET;
   m_iMaximumDuration = EPG_SEARCH_UNSET;
-
-  m_startDateTime.SetFromUTCDateTime(CServiceBroker::GetPVRManager().EpgContainer().GetFirstEPGDate());
-  if (!m_startDateTime.IsValid())
-  {
-    CLog::Log(LOGWARNING, "No valid epg start time. Defaulting search start time to 'now'");
-    m_startDateTime.SetFromUTCDateTime(CDateTime::GetUTCDateTime()); // default to 'now'
-  }
-
-  m_endDateTime.SetFromUTCDateTime(CServiceBroker::GetPVRManager().EpgContainer().GetLastEPGDate());
-  if (!m_endDateTime.IsValid())
-  {
-    CLog::Log(LOGWARNING, "No valid epg end time. Defaulting search end time to search start time plus 10 days");
-    m_endDateTime.SetFromUTCDateTime(m_startDateTime + CDateTimeSpan(10, 0, 0, 0)); // default to start + 10 days
-  }
-
   m_bIncludeUnknownGenres = false;
   m_bRemoveDuplicates = false;
 
@@ -65,18 +48,18 @@
   m_iChannelGroup = EPG_SEARCH_UNSET;
   m_bIgnorePresentTimers = true;
   m_bIgnorePresentRecordings = true;
-  m_iUniqueBroadcastId = EPG_TAG_INVALID_UID;
 }
 
 bool CPVREpgSearchFilter::MatchGenre(const std::shared_ptr<CPVREpgInfoTag>& tag) const
 {
   bool bReturn(true);
 
-  if (m_iGenreType != EPG_SEARCH_UNSET)
+  if (m_searchData.m_iGenreType != EPG_SEARCH_UNSET)
   {
     bool bIsUnknownGenre(tag->GenreType() > EPG_EVENT_CONTENTMASK_USERDEFINED ||
                          tag->GenreType() < EPG_EVENT_CONTENTMASK_MOVIEDRAMA);
-    bReturn = ((m_bIncludeUnknownGenres && bIsUnknownGenre) || tag->GenreType() == m_iGenreType);
+    bReturn = ((m_bIncludeUnknownGenres && bIsUnknownGenre) || m_bEpgSearchDataFiltered ||
+               tag->GenreType() == m_searchData.m_iGenreType);
   }
 
   return bReturn;
@@ -97,29 +80,35 @@
 
 bool CPVREpgSearchFilter::MatchStartAndEndTimes(const std::shared_ptr<CPVREpgInfoTag>& tag) const
 {
-  return (tag->StartAsLocalTime() >= m_startDateTime && tag->EndAsLocalTime() <= m_endDateTime);
+  if (m_bEpgSearchDataFiltered)
+    return true;
+
+  return (tag->StartAsLocalTime() >= m_searchData.m_startDateTime &&
+          tag->EndAsLocalTime() <= m_searchData.m_endDateTime);
 }
 
 void CPVREpgSearchFilter::SetSearchPhrase(const std::string& strSearchPhrase)
 {
   // match the exact phrase
-  m_strSearchTerm = "\"";
-  m_strSearchTerm.append(strSearchPhrase);
-  m_strSearchTerm.append("\"");
+  m_searchData.m_strSearchTerm = "\"";
+  m_searchData.m_strSearchTerm.append(strSearchPhrase);
+  m_searchData.m_strSearchTerm.append("\"");
 }
 
 bool CPVREpgSearchFilter::MatchSearchTerm(const std::shared_ptr<CPVREpgInfoTag>& tag) const
 {
   bool bReturn(true);
 
-  if (!m_strSearchTerm.empty())
+  if (!m_searchData.m_strSearchTerm.empty())
   {
-    CTextSearch search(m_strSearchTerm, m_bIsCaseSensitive, SEARCH_DEFAULT_OR);
     bReturn = !CServiceBroker::GetPVRManager().IsParentalLocked(tag);
-    if (bReturn)
-      bReturn = search.Search(tag->Title()) ||
-                search.Search(tag->PlotOutline()) ||
-                (m_bSearchInDescription && search.Search(tag->Plot()));
+    if (bReturn && (m_bIsCaseSensitive || !m_bEpgSearchDataFiltered))
+    {
+      CTextSearch search(m_searchData.m_strSearchTerm, m_bIsCaseSensitive, SEARCH_DEFAULT_OR);
+
+      bReturn = search.Search(tag->Title()) || search.Search(tag->PlotOutline()) ||
+                (m_searchData.m_bSearchInDescription && search.Search(tag->Plot()));
+    }
   }
 
   return bReturn;
@@ -127,8 +116,11 @@
 
 bool CPVREpgSearchFilter::MatchBroadcastId(const std::shared_ptr<CPVREpgInfoTag>& tag) const
 {
-  if (m_iUniqueBroadcastId != EPG_TAG_INVALID_UID)
-    return (tag->UniqueBroadcastID() == m_iUniqueBroadcastId);
+  if (m_bEpgSearchDataFiltered)
+    return true;
+
+  if (m_searchData.m_iUniqueBroadcastId != EPG_TAG_INVALID_UID)
+    return (tag->UniqueBroadcastID() == m_searchData.m_iUniqueBroadcastId);
 
   return true;
 }

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgSearchFilter.h Changed

@@ -10,6 +10,7 @@
 
 #include "XBDateTime.h"
 #include "pvr/channels/PVRChannelNumber.h"
+#include "pvr/epg/EpgSearchData.h"
 
 #include <memory>
 #include <string>
@@ -17,8 +18,6 @@
 
 namespace PVR
 {
-  #define EPG_SEARCH_UNSET (-1)
-
   class CPVREpgInfoTag;
 
   /** Filter to apply with on a CPVREpgInfoTag */
@@ -58,21 +57,24 @@
      */
     bool IsRadio() const { return m_bIsRadio; }
 
-    const std::string& GetSearchTerm() const { return m_strSearchTerm; }
-    void SetSearchTerm(const std::string& strSearchTerm) { m_strSearchTerm = strSearchTerm; }
+    const std::string& GetSearchTerm() const { return m_searchData.m_strSearchTerm; }
+    void SetSearchTerm(const std::string& strSearchTerm)
+    {
+      m_searchData.m_strSearchTerm = strSearchTerm;
+    }
     void SetSearchPhrase(const std::string& strSearchPhrase);
 
     bool IsCaseSensitive() const { return m_bIsCaseSensitive; }
     void SetCaseSensitive(bool bIsCaseSensitive) { m_bIsCaseSensitive = bIsCaseSensitive; }
 
-    bool ShouldSearchInDescription() const { return m_bSearchInDescription; }
-    void SetSearchInDescription(bool bSearchInDescription) {m_bSearchInDescription = bSearchInDescription; }
-
-    int GetGenreType() const { return m_iGenreType; }
-    void SetGenreType(int iGenreType) { m_iGenreType = iGenreType; }
+    bool ShouldSearchInDescription() const { return m_searchData.m_bSearchInDescription; }
+    void SetSearchInDescription(bool bSearchInDescription)
+    {
+      m_searchData.m_bSearchInDescription = bSearchInDescription;
+    }
 
-    int GetGenreSubType() const { return m_iGenreSubType; }
-    void SetGenreSubType(int iGenreSubType) { m_iGenreSubType = iGenreSubType; }
+    int GetGenreType() const { return m_searchData.m_iGenreType; }
+    void SetGenreType(int iGenreType) { m_searchData.m_iGenreType = iGenreType; }
 
     int GetMinimumDuration() const { return m_iMinimumDuration; }
     void SetMinimumDuration(int iMinimumDuration) { m_iMinimumDuration = iMinimumDuration; }
@@ -80,11 +82,14 @@
     int GetMaximumDuration() const { return m_iMaximumDuration; }
     void SetMaximumDuration(int iMaximumDuration) { m_iMaximumDuration = iMaximumDuration; }
 
-    const CDateTime& GetStartDateTime() const { return m_startDateTime; }
-    void SetStartDateTime(const CDateTime& startDateTime) { m_startDateTime = startDateTime; }
+    const CDateTime& GetStartDateTime() const { return m_searchData.m_startDateTime; }
+    void SetStartDateTime(const CDateTime& startDateTime)
+    {
+      m_searchData.m_startDateTime = startDateTime;
+    }
 
-    const CDateTime& GetEndDateTime() const  { return m_endDateTime; }
-    void SetEndDateTime(const CDateTime& endDateTime) { m_endDateTime = endDateTime; }
+    const CDateTime& GetEndDateTime() const { return m_searchData.m_endDateTime; }
+    void SetEndDateTime(const CDateTime& endDateTime) { m_searchData.m_endDateTime = endDateTime; }
 
     bool ShouldIncludeUnknownGenres() const { return m_bIncludeUnknownGenres; }
     void SetIncludeUnknownGenres(bool bIncludeUnknownGenres) { m_bIncludeUnknownGenres = bIncludeUnknownGenres; }
@@ -107,8 +112,14 @@
     bool ShouldIgnorePresentRecordings() const { return m_bIgnorePresentRecordings; }
     void SetIgnorePresentRecordings(bool bIgnorePresentRecordings) { m_bIgnorePresentRecordings = bIgnorePresentRecordings; }
 
-    unsigned int GetUniqueBroadcastId() const { return m_iUniqueBroadcastId; }
-    void SetUniqueBroadcastId(unsigned int iUniqueBroadcastId) { m_iUniqueBroadcastId = iUniqueBroadcastId; }
+    unsigned int GetUniqueBroadcastId() const { return m_searchData.m_iUniqueBroadcastId; }
+    void SetUniqueBroadcastId(unsigned int iUniqueBroadcastId)
+    {
+      m_searchData.m_iUniqueBroadcastId = iUniqueBroadcastId;
+    }
+
+    const PVREpgSearchData& GetEpgSearchData() const { return m_searchData; }
+    void SetEpgSearchDataFiltered() { m_bEpgSearchDataFiltered = true; }
 
   private:
     bool MatchGenre(const std::shared_ptr<CPVREpgInfoTag>& tag) const;
@@ -123,25 +134,21 @@
     bool MatchTimers(const std::shared_ptr<CPVREpgInfoTag>& tag) const;
     bool MatchRecordings(const std::shared_ptr<CPVREpgInfoTag>& tag) const;
 
-    std::string m_strSearchTerm; /*!< The term to search for */
+    PVREpgSearchData m_searchData;
+    bool m_bEpgSearchDataFiltered = false;
+
     bool m_bIsCaseSensitive; /*!< Do a case sensitive search */
-    bool m_bSearchInDescription; /*!< Search for strSearchTerm in the description too */
-    int m_iGenreType; /*!< The genre type for an entry */
-    int m_iGenreSubType; /*!< The genre subtype for an entry */
     int m_iMinimumDuration; /*!< The minimum duration for an entry */
     int m_iMaximumDuration; /*!< The maximum duration for an entry */
-    CDateTime m_startDateTime; /*!< The minimum start time for an entry */
-    CDateTime m_endDateTime; /*!< The maximum end time for an entry */
     bool m_bIncludeUnknownGenres; /*!< Include unknown genres or not */
     bool m_bRemoveDuplicates; /*!< True to remove duplicate events, false if not */
-    const bool m_bIsRadio; /*!< True to filter radio channels only, false to tv only */
 
-    /* PVR specific filters */
+    // PVR specific filters
+    const bool m_bIsRadio; /*!< True to filter radio channels only, false to tv only */
     CPVRChannelNumber m_channelNumber; /*!< The channel number in the selected channel group */
     bool m_bFreeToAirOnly; /*!< Include free to air channels only */
     int m_iChannelGroup; /*!< The group this channel belongs to */
     bool m_bIgnorePresentTimers; /*!< True to ignore currently present timers (future recordings), false if not */
     bool m_bIgnorePresentRecordings; /*!< True to ignore currently active recordings, false if not */
-    unsigned int m_iUniqueBroadcastId; /*!< The broadcastid to search for */
   };
 }

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgTagsCache.cpp Added

@@ -0,0 +1,168 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "EpgTagsCache.h"
+
+#include "ServiceBroker.h"
+#include "pvr/PVRManager.h"
+#include "pvr/PVRPlaybackState.h"
+#include "pvr/epg/EpgDatabase.h"
+#include "pvr/epg/EpgInfoTag.h"
+#include "utils/log.h"
+
+using namespace PVR;
+
+namespace
+{
+const CDateTimeSpan ONE_SECOND(0, 0, 0, 1);
+}
+
+void CPVREpgTagsCache::SetChannelData(const std::shared_ptr<CPVREpgChannelData>& data)
+{
+  m_channelData = data;
+
+  if (m_lastEndedTag)
+    m_lastEndedTag->SetChannelData(data);
+  if (m_nowActiveTag)
+    m_nowActiveTag->SetChannelData(data);
+  if (m_nextStartingTag)
+    m_nextStartingTag->SetChannelData(data);
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsCache::GetLastEndedTag()
+{
+  Refresh(true);
+  return m_lastEndedTag;
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsCache::GetNowActiveTag(bool bUpdateIfNeeded)
+{
+  Refresh(bUpdateIfNeeded);
+  return m_nowActiveTag;
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsCache::GetNextStartingTag()
+{
+  Refresh(true);
+  return m_nextStartingTag;
+}
+
+void CPVREpgTagsCache::Reset()
+{
+  m_lastEndedTag.reset();
+
+  m_nowActiveTag.reset();
+  m_nowActiveStart.Reset();
+  m_nowActiveEnd.Reset();
+
+  m_nextStartingTag.reset();
+}
+
+void CPVREpgTagsCache::Refresh(bool bUpdateIfNeeded)
+{
+  const CDateTime activeTime = CServiceBroker::GetPVRManager().PlaybackState()->GetPlaybackTime();
+
+  if (m_nowActiveStart.IsValid() && m_nowActiveEnd.IsValid() && m_nowActiveStart <= activeTime &&
+      m_nowActiveEnd > activeTime)
+    return;
+
+  if (bUpdateIfNeeded)
+  {
+    m_lastEndedTag.reset();
+    m_nowActiveTag.reset();
+    m_nextStartingTag.reset();
+
+    for (const auto& tag : m_changedTags)
+    {
+      if (tag.second->StartAsUTC() <= activeTime && tag.second->EndAsUTC() > activeTime)
+      {
+        m_nowActiveTag = tag.second;
+        m_nowActiveStart = m_nowActiveTag->StartAsUTC();
+        m_nowActiveEnd = m_nowActiveTag->EndAsUTC();
+        break;
+      }
+    }
+
+    if (!m_nowActiveTag && m_database)
+    {
+      const std::vector<std::shared_ptr<CPVREpgInfoTag>> tags =
+          m_database->GetEpgTagsByMinEndMaxStartTime(m_iEpgID, activeTime, activeTime);
+      if (!tags.empty())
+      {
+        if (tags.size() > 1)
+          CLog::LogF(LOGWARNING, "Got multiple results. Picking up the first.");
+
+        m_nowActiveTag = tags.front();
+        m_nowActiveTag->SetChannelData(m_channelData);
+        m_nowActiveStart = m_nowActiveTag->StartAsUTC();
+        m_nowActiveEnd = m_nowActiveTag->EndAsUTC();
+      }
+    }
+
+    RefreshLastEndedTag(activeTime);
+    RefreshNextStartingTag(activeTime);
+
+    if (!m_nowActiveTag)
+    {
+      // we're in a gap. remember start and end time of that gap to avoid unneeded db load.
+      if (m_lastEndedTag)
+        m_nowActiveStart = m_lastEndedTag->EndAsUTC() + ONE_SECOND;
+      else
+        m_nowActiveStart = activeTime - CDateTimeSpan(1000, 0, 0, 0); // fake start far in the past
+
+      if (m_nextStartingTag)
+        m_nowActiveEnd = m_nextStartingTag->StartAsUTC() - ONE_SECOND;
+      else
+        m_nowActiveEnd = activeTime + CDateTimeSpan(1000, 0, 0, 0); // fake end far in the future
+    }
+  }
+}
+
+void CPVREpgTagsCache::RefreshLastEndedTag(const CDateTime& activeTime)
+{
+  if (m_database)
+  {
+    m_lastEndedTag = m_database->GetEpgTagByMaxEndTime(m_iEpgID, activeTime - ONE_SECOND);
+    if (m_lastEndedTag)
+      m_lastEndedTag->SetChannelData(m_channelData);
+  }
+
+  for (auto it = m_changedTags.rbegin(); it != m_changedTags.rend(); ++it)
+  {
+    if (it->second->WasActive())
+    {
+      if (!m_lastEndedTag || m_lastEndedTag->EndAsUTC() < it->second->EndAsUTC())
+      {
+        m_lastEndedTag = it->second;
+        break;
+      }
+    }
+  }
+}
+
+void CPVREpgTagsCache::RefreshNextStartingTag(const CDateTime& activeTime)
+{
+  if (m_database)
+  {
+    m_nextStartingTag = m_database->GetEpgTagByMinStartTime(m_iEpgID, activeTime + ONE_SECOND);
+    if (m_nextStartingTag)
+      m_nextStartingTag->SetChannelData(m_channelData);
+  }
+
+  for (const auto& tag : m_changedTags)
+  {
+    if (tag.second->IsUpcoming())
+    {
+      if (!m_nextStartingTag || m_nextStartingTag->StartAsUTC() > tag.second->StartAsUTC())
+      {
+        m_nextStartingTag = tag.second;
+        break;
+      }
+    }
+  }
+}

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgTagsCache.h Added

@@ -0,0 +1,60 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "XBDateTime.h"
+
+#include <map>
+#include <memory>
+
+namespace PVR
+{
+class CPVREpgChannelData;
+class CPVREpgDatabase;
+class CPVREpgInfoTag;
+
+class CPVREpgTagsCache
+{
+public:
+  CPVREpgTagsCache() = delete;
+  CPVREpgTagsCache(int iEpgID,
+                   const std::shared_ptr<CPVREpgChannelData>& channelData,
+                   const std::shared_ptr<CPVREpgDatabase>& database,
+                   const std::map<CDateTime, std::shared_ptr<CPVREpgInfoTag>>& changedTags)
+    : m_iEpgID(iEpgID), m_channelData(channelData), m_database(database), m_changedTags(changedTags)
+  {
+  }
+
+  void SetChannelData(const std::shared_ptr<CPVREpgChannelData>& data);
+
+  void Reset();
+
+  std::shared_ptr<CPVREpgInfoTag> GetLastEndedTag();
+  std::shared_ptr<CPVREpgInfoTag> GetNowActiveTag(bool bUpdateIfNeeded);
+  std::shared_ptr<CPVREpgInfoTag> GetNextStartingTag();
+
+private:
+  void Refresh(bool bUpdateIfNeeded);
+  void RefreshLastEndedTag(const CDateTime& activeTime);
+  void RefreshNextStartingTag(const CDateTime& activeTime);
+
+  int m_iEpgID;
+  std::shared_ptr<CPVREpgChannelData> m_channelData;
+  std::shared_ptr<CPVREpgDatabase> m_database;
+  const std::map<CDateTime, std::shared_ptr<CPVREpgInfoTag>>& m_changedTags;
+
+  std::shared_ptr<CPVREpgInfoTag> m_lastEndedTag;
+  std::shared_ptr<CPVREpgInfoTag> m_nowActiveTag;
+  std::shared_ptr<CPVREpgInfoTag> m_nextStartingTag;
+
+  CDateTime m_nowActiveStart;
+  CDateTime m_nowActiveEnd;
+};
+
+} // namespace PVR

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgTagsContainer.cpp Added

@@ -0,0 +1,618 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "EpgTagsContainer.h"
+
+#include "addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h"
+#include "pvr/epg/EpgDatabase.h"
+#include "pvr/epg/EpgInfoTag.h"
+#include "pvr/epg/EpgTagsCache.h"
+#include "utils/log.h"
+
+using namespace PVR;
+
+namespace
+{
+const CDateTimeSpan ONE_SECOND(0, 0, 0, 1);
+}
+
+CPVREpgTagsContainer::CPVREpgTagsContainer(int iEpgID,
+                                           const std::shared_ptr<CPVREpgChannelData>& channelData,
+                                           const std::shared_ptr<CPVREpgDatabase>& database)
+  : m_iEpgID(iEpgID),
+    m_channelData(channelData),
+    m_database(database),
+    m_tagsCache(new CPVREpgTagsCache(iEpgID, channelData, database, m_changedTags))
+{
+}
+
+CPVREpgTagsContainer::~CPVREpgTagsContainer() = default;
+
+void CPVREpgTagsContainer::SetEpgID(int iEpgID)
+{
+  m_iEpgID = iEpgID;
+  for (const auto& tag : m_changedTags)
+    tag.second->SetEpgID(iEpgID);
+}
+
+void CPVREpgTagsContainer::SetChannelData(const std::shared_ptr<CPVREpgChannelData>& data)
+{
+  m_channelData = data;
+  m_tagsCache->SetChannelData(data);
+  for (const auto& tag : m_changedTags)
+    tag.second->SetChannelData(data);
+}
+
+namespace
+{
+
+void ResolveConflictingTags(const std::shared_ptr<CPVREpgInfoTag>& changedTag,
+                            std::vector<std::shared_ptr<CPVREpgInfoTag>>& tags)
+{
+  const CDateTime changedTagStart = changedTag->StartAsUTC();
+  const CDateTime changedTagEnd = changedTag->EndAsUTC();
+
+  for (auto it = tags.begin(); it != tags.end();)
+  {
+    bool bInsert = false;
+
+    if (changedTagEnd > (*it)->StartAsUTC() && changedTagStart < (*it)->EndAsUTC())
+    {
+      it = tags.erase(it);
+
+      if (it == tags.end())
+      {
+        bInsert = true;
+      }
+    }
+    else if ((*it)->StartAsUTC() >= changedTagEnd)
+    {
+      bInsert = true;
+    }
+    else
+    {
+      ++it;
+    }
+
+    if (bInsert)
+    {
+      tags.emplace(it, changedTag);
+      break;
+    }
+  }
+}
+
+} // unnamed namespace
+
+bool CPVREpgTagsContainer::UpdateEntries(const CPVREpgTagsContainer& tags)
+{
+  if (tags.m_changedTags.empty())
+    return false;
+
+  if (m_database)
+  {
+    const CDateTime minEventEnd = (*tags.m_changedTags.cbegin()).second->StartAsUTC();
+    const CDateTime maxEventStart = (*tags.m_changedTags.crbegin()).second->EndAsUTC();
+
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> existingTags =
+        m_database->GetEpgTagsByMinEndMaxStartTime(m_iEpgID, minEventEnd, maxEventStart);
+
+    if (!m_changedTags.empty())
+    {
+      // Fix data inconsistencies
+      for (const auto& changedTagsEntry : m_changedTags)
+      {
+        const auto& changedTag = changedTagsEntry.second;
+
+        if (changedTag->EndAsUTC() > minEventEnd && changedTag->StartAsUTC() <= maxEventStart)
+        {
+          // tag is in queried range, thus it could cause inconsistencies...
+          ResolveConflictingTags(changedTag, existingTags);
+        }
+      }
+    }
+
+    bool bResetCache = false;
+    for (const auto& tagsEntry : tags.m_changedTags)
+    {
+      const auto& tag = tagsEntry.second;
+
+      tag->SetChannelData(m_channelData);
+      tag->SetEpgID(m_iEpgID);
+
+      std::shared_ptr<CPVREpgInfoTag> existingTag;
+      for (const auto& t : existingTags)
+      {
+        if (t->StartAsUTC() == tag->StartAsUTC())
+        {
+          existingTag = t;
+          break;
+        }
+      }
+
+      if (existingTag)
+      {
+        existingTag->SetChannelData(m_channelData);
+        existingTag->SetEpgID(m_iEpgID);
+
+        if (existingTag->Update(*tag, false))
+        {
+          // tag differs from existing tag and must be persisted
+          m_changedTags.insert({existingTag->StartAsUTC(), existingTag});
+          bResetCache = true;
+        }
+      }
+      else
+      {
+        // new tags must always be persisted
+        m_changedTags.insert({tag->StartAsUTC(), tag});
+        bResetCache = true;
+      }
+    }
+
+    if (bResetCache)
+      m_tagsCache->Reset();
+  }
+  else
+  {
+    for (const auto& tag : tags.m_changedTags)
+      UpdateEntry(tag.second);
+  }
+
+  return true;
+}
+
+void CPVREpgTagsContainer::FixOverlappingEvents(
+    std::vector<std::shared_ptr<CPVREpgInfoTag>>& tags) const
+{
+  std::shared_ptr<CPVREpgInfoTag> previousTag;
+  for (auto it = tags.begin(); it != tags.end();)
+  {
+    const std::shared_ptr<CPVREpgInfoTag> currentTag = *it;
+    if (!previousTag)
+    {
+      previousTag = currentTag;
+      ++it;
+      continue;
+    }
+
+    if (previousTag->EndAsUTC() >= currentTag->EndAsUTC())
+    {
+      // delete the current tag. it's completely overlapped
+      CLog::LogF(LOGWARNING,
+                 "Erasing completely overlapped event from EPG timeline "
+                 "(%u - %s - %s - %s) "
+                 "(%u - %s - %s - %s).",
+                 previousTag->UniqueBroadcastID(), previousTag->Title().c_str(),
+                 previousTag->StartAsUTC().GetAsDBDateTime(),
+                 previousTag->EndAsUTC().GetAsDBDateTime(), currentTag->UniqueBroadcastID(),
+                 currentTag->Title().c_str(), currentTag->StartAsUTC().GetAsDBDateTime(),
+                 currentTag->EndAsUTC().GetAsDBDateTime());
+
+      it = tags.erase(it);
+      m_tagsCache->Reset();
+    }
+    else if (previousTag->EndAsUTC() > currentTag->StartAsUTC())
+    {
+      // fix the end time of the predecessor of the event
+      CLog::LogF(LOGWARNING,
+                 "Fixing partly overlapped event in EPG timeline "
+                 "(%u - %s - %s - %s) "
+                 "(%u - %s - %s - %s).",
+                 previousTag->UniqueBroadcastID(), previousTag->Title().c_str(),
+                 previousTag->StartAsUTC().GetAsDBDateTime(),
+                 previousTag->EndAsUTC().GetAsDBDateTime(), currentTag->UniqueBroadcastID(),
+                 currentTag->Title().c_str(), currentTag->StartAsUTC().GetAsDBDateTime(),
+                 currentTag->EndAsUTC().GetAsDBDateTime());
+
+      previousTag->SetEndFromUTC(currentTag->StartAsUTC() - ONE_SECOND);
+      previousTag = currentTag;
+      ++it;
+    }
+    else
+    {
+      previousTag = currentTag;
+      ++it;
+    }
+  }
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::CreateEntry(
+    const std::shared_ptr<CPVREpgInfoTag>& tag) const
+{
+  if (tag)
+  {
+    tag->SetChannelData(m_channelData);
+  }
+  return tag;
+}
+
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgTagsContainer::CreateEntries(
+    const std::vector<std::shared_ptr<CPVREpgInfoTag>>& tags) const
+{
+  for (auto& tag : tags)
+  {
+    tag->SetChannelData(m_channelData);
+  }
+  return tags;
+}
+
+bool CPVREpgTagsContainer::UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag)
+{
+  tag->SetChannelData(m_channelData);
+  tag->SetEpgID(m_iEpgID);
+
+  std::shared_ptr<CPVREpgInfoTag> existingTag = GetTag(tag->StartAsUTC());
+  if (existingTag)
+  {
+    if (existingTag->Update(*tag, false))
+    {
+      // tag differs from existing tag and must be persisted
+      m_changedTags.insert({existingTag->StartAsUTC(), existingTag});
+      m_tagsCache->Reset();
+    }
+  }
+  else
+  {
+    // new tags must always be persisted
+    m_changedTags.insert({tag->StartAsUTC(), tag});
+    m_tagsCache->Reset();
+  }
+
+  return true;
+}
+
+bool CPVREpgTagsContainer::DeleteEntry(const std::shared_ptr<CPVREpgInfoTag>& tag)
+{
+  m_changedTags.erase(tag->StartAsUTC());
+  m_deletedTags.insert({tag->StartAsUTC(), tag});
+  m_tagsCache->Reset();
+  return true;
+}
+
+void CPVREpgTagsContainer::Cleanup(const CDateTime& time)
+{
+  for (auto it = m_changedTags.begin(); it != m_changedTags.end();)
+  {
+    if (it->second->EndAsUTC() < time)
+    {
+      m_tagsCache->Reset();
+
+      const auto it1 = m_deletedTags.find(it->first);
+      if (it1 != m_deletedTags.end())
+        m_deletedTags.erase(it1);
+
+      it = m_changedTags.erase(it);
+    }
+    else
+    {
+      ++it;
+    }
+  }
+
+  if (m_database)
+    m_database->DeleteEpgTags(m_iEpgID, time);
+}
+
+void CPVREpgTagsContainer::Clear()
+{
+  m_changedTags.clear();
+}
+
+bool CPVREpgTagsContainer::IsEmpty() const
+{
+  if (!m_changedTags.empty())
+    return false;
+
+  if (m_database)
+    return !m_database->GetFirstStartTime(m_iEpgID).IsValid();
+
+  return true;
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::GetTag(const CDateTime& startTime) const
+{
+  const auto it = m_changedTags.find(startTime);
+  if (it != m_changedTags.cend())
+    return (*it).second;
+
+  if (m_database)
+    return CreateEntry(m_database->GetEpgTagByStartTime(m_iEpgID, startTime));
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::GetTag(unsigned int iUniqueBroadcastID) const
+{
+  if (iUniqueBroadcastID == EPG_TAG_INVALID_UID)
+    return {};
+
+  for (const auto& tag : m_changedTags)
+  {
+    if (tag.second->UniqueBroadcastID() == iUniqueBroadcastID)
+      return tag.second;
+  }
+
+  if (m_database)
+    return CreateEntry(m_database->GetEpgTagByUniqueBroadcastID(m_iEpgID, iUniqueBroadcastID));
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::GetTagBetween(const CDateTime& start,
+                                                                    const CDateTime& end) const
+{
+  for (const auto& tag : m_changedTags)
+  {
+    if (tag.second->StartAsUTC() >= start)
+    {
+      if (tag.second->EndAsUTC() <= end)
+        return tag.second;
+      else
+        break;
+    }
+  }
+
+  if (m_database)
+  {
+    const std::vector<std::shared_ptr<CPVREpgInfoTag>> tags =
+        CreateEntries(m_database->GetEpgTagsByMinStartMaxEndTime(m_iEpgID, start, end));
+    if (!tags.empty())
+    {
+      if (tags.size() > 1)
+        CLog::LogF(LOGWARNING, "Got multiple tags. Picking up the first.");
+
+      return tags.front();
+    }
+  }
+
+  return {};
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::GetActiveTag(bool bUpdateIfNeeded) const
+{
+  return m_tagsCache->GetNowActiveTag(bUpdateIfNeeded);
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::GetLastEndedTag() const
+{
+  return m_tagsCache->GetLastEndedTag();
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::GetNextStartingTag() const
+{
+  return m_tagsCache->GetNextStartingTag();
+}
+
+std::shared_ptr<CPVREpgInfoTag> CPVREpgTagsContainer::CreateGapTag(const CDateTime& start,
+                                                                   const CDateTime& end) const
+{
+  return std::make_shared<CPVREpgInfoTag>(m_channelData, m_iEpgID, start, end, true);
+}
+
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgTagsContainer::GetTimeline(
+    const CDateTime& timelineStart,
+    const CDateTime& timelineEnd,
+    const CDateTime& minEventEnd,
+    const CDateTime& maxEventStart) const
+{
+  if (m_database)
+  {
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
+
+    if (!m_changedTags.empty() && !m_database->GetFirstStartTime(m_iEpgID).IsValid())
+    {
+      // nothing in the db yet. take what we have in memory.
+      for (const auto& tag : m_changedTags)
+      {
+        if (tag.second->EndAsUTC() > minEventEnd && tag.second->StartAsUTC() <= maxEventStart)
+          tags.emplace_back(tag.second);
+      }
+
+      if (!tags.empty())
+        FixOverlappingEvents(tags);
+    }
+    else
+    {
+      tags = m_database->GetEpgTagsByMinEndMaxStartTime(m_iEpgID, minEventEnd, maxEventStart);
+
+      if (!m_changedTags.empty())
+      {
+        // Fix data inconsistencies
+        for (const auto& changedTagsEntry : m_changedTags)
+        {
+          const auto& changedTag = changedTagsEntry.second;
+
+          if (changedTag->EndAsUTC() > minEventEnd && changedTag->StartAsUTC() <= maxEventStart)
+          {
+            // tag is in queried range, thus it could cause inconsistencies...
+            ResolveConflictingTags(changedTag, tags);
+          }
+        }
+      }
+    }
+
+    tags = CreateEntries(tags);
+
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> result;
+
+    for (const auto& epgTag : tags)
+    {
+      if (!result.empty())
+      {
+        const CDateTime currStart = epgTag->StartAsUTC();
+        const CDateTime prevEnd = result.back()->EndAsUTC();
+        if ((currStart - prevEnd) > ONE_SECOND)
+        {
+          // insert gap tag before current tag
+          result.emplace_back(CreateGapTag(prevEnd, currStart - ONE_SECOND));
+        }
+      }
+
+      result.emplace_back(epgTag);
+    }
+
+    if (result.empty())
+    {
+      // create single gap tag
+      CDateTime maxEnd = m_database->GetMaxEndTime(m_iEpgID, minEventEnd);
+      if (!maxEnd.IsValid() || maxEnd < timelineStart)
+        maxEnd = timelineStart;
+
+      CDateTime minStart = m_database->GetMinStartTime(m_iEpgID, maxEventStart);
+      if (!minStart.IsValid() || minStart > timelineEnd)
+        minStart = timelineEnd;
+      else
+        minStart -= ONE_SECOND;
+
+      result.emplace_back(CreateGapTag(maxEnd, minStart));
+    }
+    else
+    {
+      if (result.front()->StartAsUTC() > minEventEnd)
+      {
+        // prepend gap tag
+        CDateTime maxEnd = m_database->GetMaxEndTime(m_iEpgID, minEventEnd);
+        if (!maxEnd.IsValid() || maxEnd < timelineStart)
+          maxEnd = timelineStart;
+
+        result.insert(result.begin(),
+                      CreateGapTag(maxEnd, result.front()->StartAsUTC() - ONE_SECOND));
+      }
+
+      if (result.back()->EndAsUTC() < maxEventStart)
+      {
+        // append gap tag
+        CDateTime minStart = m_database->GetMinStartTime(m_iEpgID, maxEventStart);
+        if (!minStart.IsValid() || minStart > timelineEnd)
+          minStart = timelineEnd;
+        else
+          minStart -= ONE_SECOND;
+
+        result.emplace_back(CreateGapTag(result.back()->EndAsUTC(), minStart));
+      }
+    }
+
+    return result;
+  }
+
+  return {};
+}
+
+std::vector<std::shared_ptr<CPVREpgInfoTag>> CPVREpgTagsContainer::GetAllTags() const
+{
+  if (m_database)
+  {
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> tags;
+    if (!m_changedTags.empty() && !m_database->GetFirstStartTime(m_iEpgID).IsValid())
+    {
+      // nothing in the db yet. take what we have in memory.
+      for (const auto& tag : m_changedTags)
+        tags.emplace_back(tag.second);
+
+      if (!tags.empty())
+        FixOverlappingEvents(tags);
+    }
+    else
+    {
+      tags = m_database->GetAllEpgTags(m_iEpgID);
+
+      if (!m_changedTags.empty())
+      {
+        // Fix data inconsistencies
+        for (const auto& changedTagsEntry : m_changedTags)
+        {
+          ResolveConflictingTags(changedTagsEntry.second, tags);
+        }
+      }
+    }
+
+    return CreateEntries(tags);
+  }
+
+  return {};
+}
+
+CDateTime CPVREpgTagsContainer::GetFirstStartTime() const
+{
+  CDateTime result;
+
+  if (!m_changedTags.empty())
+    result = (*m_changedTags.cbegin()).second->StartAsUTC();
+
+  if (m_database)
+  {
+    const CDateTime dbResult = m_database->GetFirstStartTime(m_iEpgID);
+    if (!result.IsValid() || (dbResult.IsValid() && dbResult < result))
+      result = dbResult;
+  }
+
+  return result;
+}
+
+CDateTime CPVREpgTagsContainer::GetLastEndTime() const
+{
+  CDateTime result;
+
+  if (!m_changedTags.empty())
+    result = (*m_changedTags.crbegin()).second->EndAsUTC();
+
+  if (m_database)
+  {
+    const CDateTime dbResult = m_database->GetLastEndTime(m_iEpgID);
+    if (result.IsValid() || (dbResult.IsValid() && dbResult > result))
+      result = dbResult;
+  }
+
+  return result;
+}
+
+bool CPVREpgTagsContainer::NeedsSave() const
+{
+  return !m_changedTags.empty() || !m_deletedTags.empty();
+}
+
+void CPVREpgTagsContainer::Persist(bool bCommit)
+{
+  if (m_database)
+  {
+    m_database->Lock();
+
+    CLog::Log(LOGNOTICE, "EPG Tags Container: Updating %d, deleting %d events...",
+              m_changedTags.size(), m_deletedTags.size());
+
+    for (const auto& tag : m_deletedTags)
+      m_database->Delete(*tag.second);
+
+    m_deletedTags.clear();
+
+    for (const auto& tag : m_changedTags)
+    {
+      // remove any conflicting events from database before persisting the new event
+      m_database->DeleteEpgTagsByMinEndMaxStartTime(m_iEpgID, tag.second->StartAsUTC(),
+                                                    tag.second->EndAsUTC() - ONE_SECOND);
+
+      tag.second->Persist(m_database, false);
+    }
+
+    m_changedTags.clear();
+
+    if (bCommit)
+      m_database->CommitInsertQueries();
+
+    m_database->Unlock();
+  }
+}
+
+void CPVREpgTagsContainer::Delete()
+{
+  if (m_database)
+    m_database->DeleteEpgTags(m_iEpgID);
+
+  Clear();
+}

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgTagsContainer.h Added

@@ -0,0 +1,211 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "XBDateTime.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace PVR
+{
+class CPVREpgTagsCache;
+class CPVREpgChannelData;
+class CPVREpgDatabase;
+class CPVREpgInfoTag;
+
+class CPVREpgTagsContainer
+{
+public:
+  CPVREpgTagsContainer() = delete;
+  CPVREpgTagsContainer(int iEpgID,
+                       const std::shared_ptr<CPVREpgChannelData>& channelData,
+                       const std::shared_ptr<CPVREpgDatabase>& database);
+  virtual ~CPVREpgTagsContainer();
+
+  /*!
+   * @brief Set the EPG id for this EPG.
+   * @param iEpgID The ID.
+   */
+  void SetEpgID(int iEpgID);
+
+  /*!
+   * @brief Set the channel data for this EPG.
+   * @param data The channel data.
+   */
+  void SetChannelData(const std::shared_ptr<CPVREpgChannelData>& data);
+
+  /*!
+   * @brief Update an entry.
+   * @param tag The tag to update.
+   * @return True if it was updated successfully, false otherwise.
+   */
+  bool UpdateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag);
+
+  /*!
+   * @brief Delete an entry.
+   * @param tag The tag to delete.
+   * @return True if it was deleted successfully, false otherwise.
+   */
+  bool DeleteEntry(const std::shared_ptr<CPVREpgInfoTag>& tag);
+
+  /*!
+   * @brief Update all entries with the provided tags.
+   * @param tags The  updated tags.
+   * @return True if the update was successful, false otherwise.
+   */
+  bool UpdateEntries(const CPVREpgTagsContainer& tags);
+
+  /*!
+   * @brief Release all entries.
+   */
+  void Clear();
+
+  /*!
+   * @brief Remove all entries which were finished before the given time.
+   * @param time Delete entries with an end time before this time.
+   */
+  void Cleanup(const CDateTime& time);
+
+  /*!
+   * @brief Check whether this container is empty.
+   * @return True if the container does not contain any entries, false otherwise.
+   */
+  bool IsEmpty() const;
+
+  /*!
+   * @brief Get an EPG tag given its start time.
+   * @param startTime The start time
+   * @return The tag or nullptr if no tag was found.
+   */
+  std::shared_ptr<CPVREpgInfoTag> GetTag(const CDateTime& startTime) const;
+
+  /*!
+   * @brief Get an EPG tag given its unique broadcast ID.
+   * @param iUniqueBroadcastID The ID.
+   * @return The tag or nullptr if no tag was found.
+   */
+  std::shared_ptr<CPVREpgInfoTag> GetTag(unsigned int iUniqueBroadcastID) const;
+
+  /*!
+   * @brief Get the event that occurs between the given begin and end time.
+   * @param start The start of the time interval.
+   * @param end The end of the time interval.
+   * @return The tag or nullptr if no tag was found.
+   */
+  std::shared_ptr<CPVREpgInfoTag> GetTagBetween(const CDateTime& start, const CDateTime& end) const;
+
+  /*!
+   * @brief Get the event that is occurring now
+   * @param bUpdateIfNeeded Whether the tag should be obtained if no one was cached before.
+   * @return The tag or nullptr if no tag was found.
+   */
+  std::shared_ptr<CPVREpgInfoTag> GetActiveTag(bool bUpdateIfNeeded) const;
+
+  /*!
+   * @brief Get the event that will occur next
+   * @return The tag or nullptr if no tag was found.
+   */
+  std::shared_ptr<CPVREpgInfoTag> GetNextStartingTag() const;
+
+  /*!
+   * @brief Get the event that occured previously
+   * @return The tag or nullptr if no tag was found.
+   */
+  std::shared_ptr<CPVREpgInfoTag> GetLastEndedTag() const;
+
+  /*!
+   * @brief Get all EPG tags for the given time frame, including "gap" tags.
+   * @param timelineStart Start of time line
+   * @param timelineEnd End of time line
+   * @param minEventEnd The minimum end time of the events to return
+   * @param maxEventStart The maximum start time of the events to return
+   * @return The matching tags.
+   */
+  std::vector<std::shared_ptr<CPVREpgInfoTag>> GetTimeline(const CDateTime& timelineStart,
+                                                           const CDateTime& timelineEnd,
+                                                           const CDateTime& minEventEnd,
+                                                           const CDateTime& maxEventStart) const;
+
+  /*!
+   * @brief Get all EPG tags.
+   * @return The tags.
+   */
+  std::vector<std::shared_ptr<CPVREpgInfoTag>> GetAllTags() const;
+
+  /*!
+   * @brief Get the start time of the first tag in this EPG.
+   * @return The time.
+   */
+  CDateTime GetFirstStartTime() const;
+
+  /*!
+   * @brief Get the end time of the last tag in this EPG.
+   * @return The time.
+   */
+  CDateTime GetLastEndTime() const;
+
+  /*!
+   * @brief Check whether this container has unsaved data.
+   * @return True if this container contains unsaved data, false otherwise.
+   */
+  bool NeedsSave() const;
+
+  /*!
+   * @brief Persist this container in its database.
+   * @param bCommit Whether to commit the data.
+   */
+  void Persist(bool bCommit);
+
+  /*!
+   * @brief Delete this container from its database.
+   */
+  void Delete();
+
+private:
+  /*!
+   * @brief Complete the instance data for the given tags.
+   * @param tags The tags to complete.
+   * @return The completed tags.
+   */
+  std::vector<std::shared_ptr<CPVREpgInfoTag>> CreateEntries(
+      const std::vector<std::shared_ptr<CPVREpgInfoTag>>& tags) const;
+
+  /*!
+   * @brief Complete the instance data for the given tag.
+   * @param tags The tag to complete.
+   * @return The completed tag.
+   */
+  std::shared_ptr<CPVREpgInfoTag> CreateEntry(const std::shared_ptr<CPVREpgInfoTag>& tag) const;
+
+  /*!
+   * @brief Create a "gap" tag
+   * @param start The start time of the gap.
+   * @param end The end time of the gap.
+   * @return The tag.
+   */
+  std::shared_ptr<CPVREpgInfoTag> CreateGapTag(const CDateTime& start, const CDateTime& end) const;
+
+  /*!
+   * @brief Fix overlapping events.
+   * @param tags The events to check/fix.
+   */
+  void FixOverlappingEvents(std::vector<std::shared_ptr<CPVREpgInfoTag>>& tags) const;
+
+  int m_iEpgID = 0;
+  std::shared_ptr<CPVREpgChannelData> m_channelData;
+  const std::shared_ptr<CPVREpgDatabase> m_database;
+  const std::unique_ptr<CPVREpgTagsCache> m_tagsCache;
+
+  std::map<CDateTime, std::shared_ptr<CPVREpgInfoTag>> m_changedTags;
+  std::map<CDateTime, std::shared_ptr<CPVREpgInfoTag>> m_deletedTags;
+};
+
+} // namespace PVR

_service:download_files:master.tar.gz/xbmc/pvr/guilib/GUIEPGGridContainer.cpp Changed

@@ -302,7 +302,9 @@
     return -1.0f;
 
   const CDateTimeSpan startDelta(CDateTime::GetUTCDateTime() - m_gridModel->GetGridStart());
-  float fPos = (startDelta.GetSecondsTotal() * m_blockSize) / (CGUIEPGGridContainerModel::MINSPERBLOCK * 60) - m_programmeScrollOffset;
+  const float fPos = (startDelta.GetSecondsTotal() * m_blockSize) /
+                         (CGUIEPGGridContainerModel::MINSPERBLOCK * 60) -
+                     GetProgrammeScrollOffsetPos();
   return std::min(fPos, m_orientation == VERTICAL ? m_gridWidth : m_gridHeight);
 }
 
@@ -708,9 +710,11 @@
     }
     else // "gap" tag selected
     {
-      const std::shared_ptr<CFileItem> currItem = GetItem();
-      if (currItem)
-        channelUid = currItem->GetEPGInfoTag()->UniqueChannelID();
+      channelUid = prevSelectedEpgTag->UniqueChannelID();
+
+      // As gap tags do not have a unique broadcast id, we will look for the real tag preceeding
+      // the gap tag and add the respective offset to restore the gap tag selection, assuming that
+      // the real tag is still the predecessor of the gap tag after the grid model update.
 
       const std::shared_ptr<CFileItem> prevItem = GetPrevItem().first;
       if (prevItem)
@@ -725,11 +729,8 @@
           }
           else
           {
-            // first block of previously selected gap tag is one block after last block of tag before previously selected gap tag.
-            int gapTagStartIndex = m_gridModel->GetLastEventBlock(tag) + 1;
-
-            newBlockIndex = m_gridModel->GetFirstEventBlock(tag); // points to tag before previously selected gap tag
-            eventOffset = gapTagStartIndex - newBlockIndex; // newBlockIndex + eventOffset points to first block of previously selected gap tag
+            newBlockIndex = m_gridModel->GetFirstEventBlock(tag);
+            eventOffset += m_gridModel->GetFirstEventBlock(prevSelectedEpgTag) - newBlockIndex;
           }
 
           broadcastUid = tag->UniqueBroadcastID();
@@ -754,14 +755,16 @@
       {
         // previous selection is no longer in grid.
         SetInvalid();
+        m_bEnableChannelScrolling = false;
         GoToChannel(newChannelIndex);
+        m_bEnableProgrammeScrolling = false;
         GoToNow();
         return;
       }
     }
   }
 
-  if (prevSelectedEpgTag && (oldChannelIndex != 0 || oldBlockIndex != 0))
+  if (prevSelectedEpgTag)
   {
     if (newChannelIndex >= m_gridModel->ChannelItemsSize() ||
         newBlockIndex >= m_gridModel->GridItemsSize() ||
@@ -807,20 +810,59 @@
       SetInvalid();
 
       if (newBlockIndex != oldBlockIndex)
+      {
+        m_bEnableProgrammeScrolling = false;
         GoToBlock(newBlockIndex);
+      }
 
       if (newChannelIndex != oldChannelIndex)
+      {
+        m_bEnableChannelScrolling = false;
         GoToChannel(newChannelIndex);
+      }
     }
   }
   else
   {
     // no previous selection, goto now
     SetInvalid();
+    m_bEnableProgrammeScrolling = false;
     GoToNow();
   }
 }
 
+float CGUIEPGGridContainer::GetChannelScrollOffsetPos() const
+{
+  if (m_bEnableChannelScrolling)
+    return m_channelScrollOffset;
+  else
+    return m_channelOffset * m_channelLayout->Size(m_orientation);
+}
+
+float CGUIEPGGridContainer::GetProgrammeScrollOffsetPos() const
+{
+  if (m_bEnableProgrammeScrolling)
+    return m_programmeScrollOffset;
+  else
+    return m_blockOffset * m_blockSize;
+}
+
+int CGUIEPGGridContainer::GetChannelScrollOffset(CGUIListItemLayout* layout) const
+{
+  if (m_bEnableChannelScrolling)
+    return MathUtils::round_int(m_channelScrollOffset / layout->Size(m_orientation));
+  else
+    return m_channelOffset;
+}
+
+int CGUIEPGGridContainer::GetProgrammeScrollOffset() const
+{
+  if (m_bEnableProgrammeScrolling)
+    return MathUtils::round_int(m_programmeScrollOffset / m_blockSize);
+  else
+    return m_blockOffset;
+}
+
 void CGUIEPGGridContainer::ChannelScroll(int amount)
 {
   // increase or decrease the vertical offset
@@ -1336,7 +1378,7 @@
 
   int item = m_channelCursor + m_channelOffset + offset;
   if (flag & INFOFLAG_LISTITEM_POSITION)
-    item = MathUtils::round_int(m_channelScrollOffset / m_channelLayout->Size(m_orientation));
+    item = GetChannelScrollOffset(m_channelLayout);
 
   if (flag & INFOFLAG_LISTITEM_WRAP)
   {
@@ -1615,6 +1657,12 @@
   return {};
 }
 
+void CGUIEPGGridContainer::JumpToNow()
+{
+  m_bEnableProgrammeScrolling = false;
+  GoToNow();
+}
+
 void CGUIEPGGridContainer::GoToBegin()
 {
   ScrollToBlockOffset(0);
@@ -1623,19 +1671,8 @@
 
 void CGUIEPGGridContainer::GoToEnd()
 {
-  const int blocksStart = m_gridModel->GetGridItemStartBlock(m_channelCursor + m_channelOffset,
-                                                             m_gridModel->GetLastBlock());
-  const int blocksEnd = m_gridModel->GetGridItemEndBlock(m_channelCursor + m_channelOffset,
-                                                         m_gridModel->GetLastBlock());
-
-  int blockOffset = 0;
-  if (blocksEnd - blocksStart > m_blocksPerPage)
-    blockOffset = blocksStart;
-  else if (blocksEnd > m_blocksPerPage)
-    blockOffset = blocksEnd - m_blocksPerPage;
-
-  ScrollToBlockOffset(blockOffset); // scroll to the start point of the last epg element
-  SetBlock(m_blocksPerPage - 1); // select the last epg element
+  ScrollToBlockOffset(m_gridModel->GetLastBlock() - m_blocksPerPage + 1);
+  SetBlock(m_blocksPerPage - 1);
 }
 
 void CGUIEPGGridContainer::GoToNow()
@@ -1885,6 +1922,7 @@
   {
     m_channelScrollOffset = m_channelOffset * m_programmeLayout->Size(m_orientation);
     m_channelScrollSpeed = 0;
+    m_bEnableChannelScrolling = true;
   }
 
   m_channelScrollLastTime = currentTime;
@@ -1895,6 +1933,7 @@
   {
     m_programmeScrollOffset = m_blockOffset * m_blockSize;
     m_programmeScrollSpeed = 0;
+    m_bEnableProgrammeScrolling = true;
   }
 
   m_programmeScrollLastTime = currentTime;
@@ -2037,7 +2076,7 @@
   if (!m_focusedChannelLayout || !m_channelLayout)
     return;
 
-  int chanOffset = MathUtils::round_int(m_channelScrollOffset / m_programmeLayout->Size(m_orientation));
+  const int chanOffset = GetChannelScrollOffset(m_programmeLayout);
 
   int cacheBeforeChannel, cacheAfterChannel;
   GetChannelCacheOffsets(cacheBeforeChannel, cacheAfterChannel);
@@ -2074,7 +2113,8 @@
 
   // we offset our draw position to take into account scrolling and whether or not our focused
   // item is offscreen "above" the list.
-  float drawOffset = (chanOffset - cacheBeforeChannel) * m_channelLayout->Size(m_orientation) - m_channelScrollOffset;
+  float drawOffset = (chanOffset - cacheBeforeChannel) * m_channelLayout->Size(m_orientation) -
+                     GetChannelScrollOffsetPos();
   if (m_channelOffset + m_channelCursor < chanOffset)
     drawOffset += m_focusedChannelLayout->Size(m_orientation) - m_channelLayout->Size(m_orientation);
 
@@ -2157,7 +2197,7 @@
   }
   else
   {
-    int rulerOffset = MathUtils::round_int(m_programmeScrollOffset / m_blockSize);
+    const int rulerOffset = GetProgrammeScrollOffset();
     item->SetLabel(m_gridModel->GetRulerItem(rulerOffset / m_rulerUnit + 1)->GetLabel2());
 
     CFileItemPtr lastitem;
@@ -2170,7 +2210,7 @@
   if (!m_rulerLayout || m_gridModel->RulerItemsSize() <= 1 || m_gridModel->IsZeroGridDuration())
     return;
 
-  int rulerOffset = MathUtils::round_int(m_programmeScrollOffset / m_blockSize);
+  int rulerOffset = GetProgrammeScrollOffset();
 
   CFileItemPtr item(m_gridModel->GetRulerItem(0));
   CFileItemPtr lastitem;
@@ -2226,7 +2266,8 @@
     end = m_posY + m_height;
   }
 
-  float drawOffset = (rulerOffset - cacheBeforeRuler) * m_blockSize - m_programmeScrollOffset;
+  const float drawOffset =
+      (rulerOffset - cacheBeforeRuler) * m_blockSize - GetProgrammeScrollOffsetPos();
   pos += drawOffset;
   end += cacheAfterRuler * m_rulerLayout->Size(m_orientation == VERTICAL ? HORIZONTAL : VERTICAL);
 
@@ -2278,9 +2319,8 @@
   if (!m_focusedProgrammeLayout || !m_programmeLayout || m_gridModel->RulerItemsSize() <= 1 || m_gridModel->IsZeroGridDuration())
     return;
 
-  const int blockOffset = MathUtils::round_int(m_programmeScrollOffset / m_blockSize);
-  const int chanOffset =
-      MathUtils::round_int(m_channelScrollOffset / m_programmeLayout->Size(m_orientation));
+  const int blockOffset = GetProgrammeScrollOffset();
+  const int chanOffset = GetChannelScrollOffset(m_programmeLayout);
 
   int cacheBeforeProgramme, cacheAfterProgramme;
   GetProgrammeCacheOffsets(cacheBeforeProgramme, cacheAfterProgramme);
@@ -2311,7 +2351,8 @@
     if (m_gridModel->FreeProgrammeMemory(firstChannel, lastChannel, firstBlock, lastBlock))
     {
       // announce changed viewport
-      const CGUIMessage msg(GUI_MSG_REFRESH_LIST, GetID(), 0, static_cast<int>(PVREvent::Epg));
+      const CGUIMessage msg(
+          GUI_MSG_REFRESH_LIST, GetParentID(), GetID(), static_cast<int>(PVREvent::Epg));
       KODI::MESSAGING::CApplicationMessenger::GetInstance().SendGUIMessage(msg);
     }
   }
@@ -2339,9 +2380,11 @@
 
   endA += cacheAfterProgramme * m_blockSize;
 
-  float drawOffsetA = blockOffset * m_blockSize - m_programmeScrollOffset;
+  const float drawOffsetA = blockOffset * m_blockSize - GetProgrammeScrollOffsetPos();
   posA += drawOffsetA;
-  float drawOffsetB = (chanOffset - cacheBeforeProgramme) * m_channelLayout->Size(m_orientation) - m_channelScrollOffset;
+  const float drawOffsetB =
+      (chanOffset - cacheBeforeProgramme) * m_channelLayout->Size(m_orientation) -
+      GetChannelScrollOffsetPos();
   posB += drawOffsetB;
 
   int channel = chanOffset - cacheBeforeProgramme;
@@ -2359,11 +2402,12 @@
       int block = blockOffset;
       float posA2 = posA;
 
-      if (blockOffset > 0 && m_gridModel->IsSameGridItem(channel, block, blockOffset - 1))
+      const int startBlock = blockOffset == 0 ? 0 : blockOffset - 1;
+      if (startBlock == 0 || m_gridModel->IsSameGridItem(channel, block, startBlock))
       {
         // First program starts before current view
-        block = m_gridModel->GetGridItemStartBlock(channel, blockOffset - 1);
-        int missingSection = blockOffset - block;
+        block = m_gridModel->GetGridItemStartBlock(channel, startBlock);
+        const int missingSection = blockOffset - block;
         posA2 -= missingSection * m_blockSize;
       }

_service:download_files:master.tar.gz/xbmc/pvr/guilib/GUIEPGGridContainer.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/guilib/GUIEPGGridContainerModel.cpp Changed

@@ -324,55 +324,28 @@
                                                          int& newChannelIndex,
                                                          int& newBlockIndex) const
 {
-  static const CDateTimeSpan blockDuration(0, 0, MINSPERBLOCK, 0);
-
   newChannelIndex = INVALID_INDEX;
   newBlockIndex = INVALID_INDEX;
 
-  // find the channel
+  // find the new channel index
   int iCurrentChannel = 0;
   for (const auto& channel : m_channelItems)
   {
     if (channel->GetPVRChannelInfoTag()->UniqueID() == channelUid)
     {
       newChannelIndex = iCurrentChannel;
-      break;
-    }
-    iCurrentChannel++;
-  }
-
-  if (newChannelIndex != INVALID_INDEX)
-  {
-    // find the block
-    GetItem(newChannelIndex, GetLastBlock()); // expensive; might fetch many EPG tags
-    const auto itEpg = m_epgItems.find(newChannelIndex);
-    if (itEpg != m_epgItems.end())
-    {
-      const int blocks = GridItemsSize();
 
-      CDateTime gridCursor = m_gridStart;
-      for (int block = 0; block < blocks; ++block)
+      // find the new block index
+      const std::shared_ptr<CPVREpg> epg = channel->GetPVRChannelInfoTag()->GetEPG();
+      if (epg)
       {
-        for (const auto& item : (*itEpg).second.tags)
-        {
-          const std::shared_ptr<CPVREpgInfoTag> tag = item->GetEPGInfoTag();
-
-          if (gridCursor < tag->StartAsUTC())
-            break; // next block
-
-          if (gridCursor < tag->EndAsUTC())
-          {
-            if (broadcastUid > 0 && tag->UniqueBroadcastID() == broadcastUid)
-            {
-              newBlockIndex = block + eventOffset;
-              return; // done.
-            }
-            break; // next block
-          }
-        }
-        gridCursor += blockDuration;
+        const std::shared_ptr<CPVREpgInfoTag> tag = epg->GetTagByBroadcastId(broadcastUid);
+        if (tag)
+          newBlockIndex = GetFirstEventBlock(tag) + eventOffset;
       }
+      break; // done
     }
+    iCurrentChannel++;
   }
 }
 
@@ -603,7 +576,11 @@
   // Note: Subtract 1 second from diff to ensure that events ending exactly at block boundary
   //       are unambigious. Example: An event ending at 5:00:00 shall be mapped to block 9 and
   //       an event starting at 5:00:00 shall be mapped to block 10, not both at block 10.
-  return (diff - 1) / 60 / MINSPERBLOCK;
+  //       Only exception is grid end, because there is no successor.
+  if (datetime >= m_gridEnd)
+    return diff / 60 / MINSPERBLOCK; // block is equal or after grid end
+  else
+    return (diff - 1) / 60 / MINSPERBLOCK;
 }
 
 int CGUIEPGGridContainerModel::GetNowBlock() const

_service:download_files:master.tar.gz/xbmc/pvr/guilib/PVRGUIActions.cpp Changed

@@ -414,8 +414,13 @@
     if (CheckParentalLock(channel) != ParentalCheckResult::SUCCESS)
       return false;
 
-    const std::shared_ptr<CPVREpgInfoTag> epgTag(CPVRItem(item).GetEpgInfoTag());
-    if (!epgTag && bCreateRule)
+    std::shared_ptr<CPVREpgInfoTag> epgTag = CPVRItem(item).GetEpgInfoTag();
+    if (epgTag)
+    {
+      if (epgTag->IsGapTag())
+        epgTag.reset(); // for gap tags, we can only create instant timers
+    }
+    else if (bCreateRule)
     {
       CLog::LogF(LOGERROR, "No epg tag!");
       return false;
@@ -669,6 +674,16 @@
               }
             }
 
+            if (ePreselect == RECORD_INSTANTRECORDTIME)
+            {
+              if (iDurationDefault == 30)
+                ePreselect = RECORD_30_MINUTES;
+              else if (iDurationDefault == 60)
+                ePreselect = RECORD_60_MINUTES;
+              else if (iDurationDefault == 120)
+                ePreselect = RECORD_120_MINUTES;
+            }
+
             selector.PreSelectAction(ePreselect);
 
             PVRRECORD_INSTANTRECORDACTION eSelected = selector.Select();
@@ -1210,7 +1225,9 @@
     }
   }
 
-  void CPVRGUIActions::StartPlayback(CFileItem* item, bool bFullscreen) const
+  void CPVRGUIActions::StartPlayback(CFileItem* item,
+                                     bool bFullscreen,
+                                     CPVRStreamProperties* epgProps) const
   {
     // Obtain dynamic playback url and properties from the respective pvr client
     const std::shared_ptr<CPVRClient> client = CServiceBroker::GetPVRManager().GetClient(*item);
@@ -1219,11 +1236,25 @@
       CPVRStreamProperties props;
 
       if (item->IsPVRChannel())
-        client->GetChannelStreamProperties(item->GetPVRChannelInfoTag(), props);
+      {
+        // If this was an EPG Tag to be played as live then PlayEpgTag() will create a channel
+        // fileitem instead and pass the epg tags props so we use those and skip the client call
+        if (epgProps)
+          props = *epgProps;
+        else
+          client->GetChannelStreamProperties(item->GetPVRChannelInfoTag(), props);
+      }
       else if (item->IsPVRRecording())
+      {
         client->GetRecordingStreamProperties(item->GetPVRRecordingInfoTag(), props);
+      }
       else if (item->IsEPG())
-        client->GetEpgTagStreamProperties(item->GetEPGInfoTag(), props);
+      {
+        if (epgProps) // we already have props from PlayEpgTag()
+          props = *epgProps;
+        else
+          client->GetEpgTagStreamProperties(item->GetEPGInfoTag(), props);
+      }
 
       if (props.size())
       {
@@ -1275,6 +1306,19 @@
     if (!epgTag)
       return false;
 
+    const std::shared_ptr<CPVRChannel> channelTag(CPVRItem(item).GetChannel());
+    if (!channelTag)
+      return false;
+
+    // Obtain dynamic playback url and properties from the respective pvr client
+    const std::shared_ptr<CPVRClient> client =
+        CServiceBroker::GetPVRManager().GetClient(epgTag->ClientID());
+    if (!client)
+      return false;
+
+    CPVRStreamProperties props;
+    client->GetEpgTagStreamProperties(epgTag, props);
+
     if (CServiceBroker::GetPVRManager().PlaybackState()->IsPlayingEpgTag(epgTag))
     {
       CGUIMessage msg(GUI_MSG_FULLSCREEN, 0, CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow());
@@ -1282,7 +1326,8 @@
       return true;
     }
 
-    StartPlayback(new CFileItem(epgTag), true);
+    StartPlayback(props.EPGPlaybackAsLive() ? new CFileItem(channelTag) : new CFileItem(epgTag),
+                  true, &props);
     return true;
   }

_service:download_files:master.tar.gz/xbmc/pvr/guilib/PVRGUIActions.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/guilib/PVRGUIChannelNavigator.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/guilib/PVRGUIProgressHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/guilib/guiinfo/PVRGUIInfo.cpp Changed

@@ -154,27 +154,27 @@
 
     if (!m_bStop)
       UpdateQualityData();
-    Sleep(0);
+    std::this_thread::yield();
 
     if (!m_bStop)
       UpdateDescrambleData();
-    Sleep(0);
+    std::this_thread::yield();
 
     if (!m_bStop)
       UpdateMisc();
-    Sleep(0);
+    std::this_thread::yield();
 
     if (!m_bStop)
       UpdateTimeshiftData();
-    Sleep(0);
+    std::this_thread::yield();
 
     if (!m_bStop)
       UpdateTimersToggle();
-    Sleep(0);
+    std::this_thread::yield();
 
     if (!m_bStop)
       UpdateNextTimer();
-    Sleep(0);
+    std::this_thread::yield();
 
     // Update the backend cache every toggleInterval seconds
     if (!m_bStop && iLoop % toggleInterval == 0)
@@ -184,7 +184,7 @@
       iLoop = 0;
 
     if (!m_bStop)
-      Sleep(500);
+      CThread::Sleep(500);
   }
 }
 
@@ -404,6 +404,8 @@
       case VIDEOPLAYER_EPISODENAME:
       case LISTITEM_EPISODENAME:
         strValue = recording->EpisodeName();
+        // fixup multiline episode name strings (which do not fit in any way in our GUI)
+        StringUtils::Replace(strValue, "\n", ", ");
         return true;
       case VIDEOPLAYER_CHANNEL_NAME:
       case LISTITEM_CHANNEL_NAME:
@@ -582,7 +584,11 @@
       case VIDEOPLAYER_EPISODENAME:
       case LISTITEM_EPISODENAME:
         if (!CServiceBroker::GetPVRManager().IsParentalLocked(epgTag))
+        {
           strValue = epgTag->EpisodeName();
+          // fixup multiline episode name strings (which do not fit in any way in our GUI)
+          StringUtils::Replace(strValue, "\n", ", ");
+        }
         return true;
       case VIDEOPLAYER_CAST:
       case LISTITEM_CAST:

_service:download_files:master.tar.gz/xbmc/pvr/guilib/guiinfo/PVRGUITimesInfo.cpp Changed

@@ -291,7 +291,7 @@
 {
   int iElapsed = 0;
   CSingleLock lock(m_critSection);
-  if (epgTag && epgTag != m_playingEpgTag)
+  if (epgTag && m_playingEpgTag && *epgTag != *m_playingEpgTag)
     iElapsed = epgTag->Progress();
   else
     iElapsed = GetElapsedTime();
@@ -336,7 +336,7 @@
 int CPVRGUITimesInfo::GetRemainingTime(const std::shared_ptr<CPVREpgInfoTag>& epgTag) const
 {
   CSingleLock lock(m_critSection);
-  if (epgTag && epgTag != m_playingEpgTag)
+  if (epgTag && m_playingEpgTag && *epgTag != *m_playingEpgTag)
     return epgTag->GetDuration() - epgTag->Progress();
   else
     return m_iDuration - GetElapsedTime();
@@ -399,7 +399,7 @@
 int CPVRGUITimesInfo::GetEpgEventDuration(const std::shared_ptr<CPVREpgInfoTag>& epgTag) const
 {
   CSingleLock lock(m_critSection);
-  if (epgTag && epgTag != m_playingEpgTag)
+  if (epgTag && m_playingEpgTag && *epgTag != *m_playingEpgTag)
     return epgTag->GetDuration();
   else
     return m_iDuration;
@@ -408,7 +408,7 @@
 int CPVRGUITimesInfo::GetEpgEventProgress(const std::shared_ptr<CPVREpgInfoTag>& epgTag) const
 {
   CSingleLock lock(m_critSection);
-  if (epgTag && epgTag != m_playingEpgTag)
+  if (epgTag && m_playingEpgTag && *epgTag != *m_playingEpgTag)
     return std::lrintf(epgTag->ProgressPercentage());
   else
     return std::lrintf(static_cast<float>(GetElapsedTime()) / m_iDuration * 100);

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecording.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecordings.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimerInfoTag.cpp Changed

@@ -590,6 +590,7 @@
   m_epgTag = tag->m_epgTag;
   m_strSummary = tag->m_strSummary;
   m_channel = tag->m_channel;
+  m_bProbedEpgTag = tag->m_bProbedEpgTag;
 
   m_iTVChildTimersActive = tag->m_iTVChildTimersActive;
   m_iTVChildTimersConflictNOK = tag->m_iTVChildTimersConflictNOK;
@@ -1191,18 +1192,20 @@
 {
   CSingleLock lock(m_critSection);
   m_epgTag = tag;
+  m_bProbedEpgTag = true;
 }
 
 void CPVRTimerInfoTag::UpdateEpgInfoTag()
 {
   CSingleLock lock(m_critSection);
   m_epgTag.reset();
+  m_bProbedEpgTag = false;
   GetEpgInfoTag();
 }
 
 std::shared_ptr<CPVREpgInfoTag> CPVRTimerInfoTag::GetEpgInfoTag(bool bCreate /* = true */) const
 {
-  if (!m_epgTag && bCreate && CServiceBroker::GetPVRManager().EpgsCreated())
+  if (!m_epgTag && !m_bProbedEpgTag && bCreate && CServiceBroker::GetPVRManager().EpgsCreated())
   {
     std::shared_ptr<CPVRChannel> channel(m_channel);
     if (!channel)
@@ -1219,18 +1222,13 @@
       if (epg)
       {
         CSingleLock lock(m_critSection);
-        if (!m_epgTag)
+        if (!m_epgTag && m_iEpgUid != EPG_TAG_INVALID_UID)
         {
-          if (m_iEpgUid != EPG_TAG_INVALID_UID)
-          {
-            m_epgTag = epg->GetTagByBroadcastId(m_iEpgUid);
-          }
+          m_epgTag = epg->GetTagByBroadcastId(m_iEpgUid);
         }
 
-        if (!IsTimerRule() && !m_epgTag && m_epTagRefetchTimeout.IsTimePast() && IsOwnedByClient())
+        if (!m_epgTag && !IsTimerRule() && IsOwnedByClient())
         {
-          m_epTagRefetchTimeout.Set(30000); // try to fetch missing epg tag from backend at most every 30 secs
-
           time_t startTime = 0;
           time_t endTime = 0;
 
@@ -1248,6 +1246,7 @@
         }
       }
     }
+    m_bProbedEpgTag = true;
   }
   return m_epgTag;
 }

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimerInfoTag.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimers.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimersPath.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRChannels.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.cpp Changed

@@ -75,7 +75,7 @@
   if (epgGridContainer)
   {
     m_bChannelSelectionRestored = epgGridContainer->SetChannel(CServiceBroker::GetPVRManager().GUIActions()->GetSelectedItemPath(m_bRadio));
-    epgGridContainer->GoToNow();
+    epgGridContainer->JumpToNow();
   }
 
   if (epgGridContainer && !epgGridContainer->HasData())
@@ -393,7 +393,7 @@
         }
 
         const std::shared_ptr<CFileItem> pItem = GetCurrentListItem();
-        if (pItem && !pItem->GetEPGInfoTag()->IsGapTag())
+        if (pItem)
         {
           switch (message.GetParam1())
           {
@@ -493,43 +493,6 @@
               break;
           }
         }
-        else
-        {
-          switch (message.GetParam1())
-          {
-            case ACTION_SELECT_ITEM:
-            case ACTION_MOUSE_LEFT_CLICK:
-            case ACTION_PLAYER_PLAY:
-            {
-              // EPG "gap" selected => switch to associated channel.
-              CGUIEPGGridContainer* epgGridContainer = GetGridControl();
-              if (epgGridContainer)
-              {
-                const CFileItemPtr item(epgGridContainer->GetSelectedGridItem());
-                if (item)
-                {
-                  CServiceBroker::GetPVRManager().GUIActions()->SwitchToChannel(item, true);
-                  bReturn = true;
-                }
-              }
-              break;
-            }
-            case ACTION_CONTEXT_MENU:
-            {
-              // EPG "gap" selected => create and process special context menu with item independent entries.
-              CContextButtons buttons;
-              GetContextButtons(-1, buttons);
-
-              int iButton = CGUIDialogContextMenu::ShowAndGetChoice(buttons);
-              if (iButton >= 0)
-              {
-                OnContextButton(-1, static_cast<CONTEXT_BUTTON>(iButton));
-              }
-              bReturn = true;
-              break;
-            }
-          }
-        }
       }
       else if (message.GetSenderId() == CONTROL_BTNVIEWASICONS ||
                message.GetSenderId() == CONTROL_BTNSORTBY)
@@ -575,6 +538,10 @@
       }
       break;
     }
+    case GUI_MSG_SYSTEM_WAKE:
+      GotoNow();
+      bReturn = true;
+      break;
   }
 
   return bReturn || CGUIWindowPVRBase::OnMessage(message);
@@ -756,7 +723,7 @@
 {
   bool bReturn = false;
 
-  SYSTEMTIME date;
+  KODI::TIME::SystemTime date;
   CGUIEPGGridContainer* epgGridContainer = GetGridControl();
   epgGridContainer->GetSelectedDate().GetAsSystemTime(date);

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRSearch.cpp Changed

@@ -20,6 +20,7 @@
 #include "pvr/PVRItem.h"
 #include "pvr/PVRManager.h"
 #include "pvr/dialogs/GUIDialogPVRGuideSearch.h"
+#include "pvr/epg/Epg.h"
 #include "pvr/epg/EpgContainer.h"
 #include "pvr/epg/EpgInfoTag.h"
 #include "pvr/epg/EpgSearchFilter.h"
@@ -61,13 +62,16 @@
 
   void AsyncSearchAction::Run()
   {
-    std::vector<std::shared_ptr<CPVREpgInfoTag>> results = CServiceBroker::GetPVRManager().EpgContainer().GetAllTags();
+    std::vector<std::shared_ptr<CPVREpgInfoTag>> results =
+        CServiceBroker::GetPVRManager().EpgContainer().GetTags(m_filter->GetEpgSearchData());
+    m_filter->SetEpgSearchDataFiltered();
+
+    // Tags can still contain false positives, for search criteria that cannot be handled via
+    // database. So, run extended search filters on what we got from the database.
     for (auto it = results.begin(); it != results.end();)
     {
-      it = results.erase(std::remove_if(results.begin(),
-                                        results.end(),
-                                        [this](const std::shared_ptr<CPVREpgInfoTag>& entry)
-                                        {
+      it = results.erase(std::remove_if(results.begin(), results.end(),
+                                        [this](const std::shared_ptr<CPVREpgInfoTag>& entry) {
                                           return !m_filter->FilterEntry(entry);
                                         }),
                          results.end());

_service:download_files:master.tar.gz/xbmc/rendering/dx/DeviceResources.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/RenderSystemGL.cpp Changed

@@ -7,20 +7,19 @@
  */
 
 #include "RenderSystemGL.h"
+
 #include "filesystem/File.h"
 #include "rendering/MatrixGL.h"
-#include "windowing/GraphicContext.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
-#include "utils/log.h"
 #include "utils/GLUtils.h"
-#include "utils/TimeUtils.h"
-#include "utils/SystemInfo.h"
 #include "utils/MathUtils.h"
 #include "utils/StringUtils.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/SystemInfo.h"
+#include "utils/TimeUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
 
 CRenderSystemGL::CRenderSystemGL() : CRenderSystemBase()
 {
@@ -287,7 +286,7 @@
   PresentRenderImpl(rendered);
 
   if (!rendered)
-    Sleep(40);
+    KODI::TIME::Sleep(40);
 }
 
 void CRenderSystemGL::SetVSync(bool enable)
@@ -401,20 +400,6 @@
     }
   }
 
-#ifdef TARGET_DARWIN_OSX
-  // Max Texture size reported on some apple machines seems incorrect
-  // Displaying a picture with that resolution results in a corrupted output
-  // So force it to a lower value
-  // Problem noticed on:
-  // iMac with ATI Radeon X1600, both on 10.5.8 (GL_VERSION: 2.0 ATI-1.5.48)
-  // and 10.6.2 (GL_VERSION: 2.0 ATI-1.6.6)
-  if (m_RenderRenderer == "ATI Radeon X1600 OpenGL Engine")
-    m_maxTextureSize = 2048;
-  // Mac mini G4 with ATI Radeon 9200 (GL_VERSION: 1.3 ATI-1.5.48)
-  else if (m_RenderRenderer == "ATI Radeon 9200 OpenGL Engine")
-    m_maxTextureSize = 1024;
-#endif
-
   CLog::Log(LOGINFO, "GL: Maximum texture width: %u", m_maxTextureSize);
 }

_service:download_files:master.tar.gz/xbmc/rendering/gles/RenderSystemGLES.cpp Changed

@@ -6,20 +6,19 @@
  *  See LICENSES/README.md for more information.
  */
 
+#include "RenderSystemGLES.h"
+
 #include "guilib/DirtyRegion.h"
-#include "windowing/GraphicContext.h"
+#include "rendering/MatrixGL.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
-#include "RenderSystemGLES.h"
-#include "rendering/MatrixGL.h"
 #include "utils/GLUtils.h"
-#include "utils/log.h"
-#include "utils/TimeUtils.h"
-#include "utils/SystemInfo.h"
 #include "utils/MathUtils.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/SystemInfo.h"
+#include "utils/TimeUtils.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
 
 #if defined(TARGET_LINUX)
 #include "utils/EGLUtils.h"
@@ -228,7 +227,7 @@
 
   // if video is rendered to a separate layer, we should not block this thread
   if (!rendered && !videoLayer)
-    Sleep(40);
+    KODI::TIME::Sleep(40);
 }
 
 void CRenderSystemGLES::SetVSync(bool enable)

_service:download_files:master.tar.gz/xbmc/settings/AdvancedSettings.cpp Changed

@@ -381,8 +381,9 @@
   m_iPVRTimeshiftThreshold = 10;
   m_bPVRTimeshiftSimpleOSD = true;
 
-  m_cacheMemSize = 1024 * 1024 * 20;
+  m_cacheMemSize = 1024 * 1024 * 20; // 20 MiB
   m_cacheBufferMode = CACHE_BUFFER_MODE_INTERNET; // Default (buffer all internet streams/filesystems)
+  m_cacheChunkSize = 128 * 1024; // 128 KiB
   // the following setting determines the readRate of a player data
   // as multiply of the default data read rate
   m_cacheReadFactor = 4.0f;
@@ -822,6 +823,7 @@
   {
     XMLUtils::GetUInt(pElement, "memorysize", m_cacheMemSize);
     XMLUtils::GetUInt(pElement, "buffermode", m_cacheBufferMode, 0, 4);
+    XMLUtils::GetUInt(pElement, "chunksize", m_cacheChunkSize, 256, 1024 * 1024);
     XMLUtils::GetFloat(pElement, "readfactor", m_cacheReadFactor);
   }
 
@@ -856,7 +858,7 @@
     // as altering it will do nothing - we don't write to advancedsettings.xml
     XMLUtils::GetInt(pRootElement, "loglevel", m_logLevelHint, LOG_LEVEL_NONE, LOG_LEVEL_MAX);
     const char* hide = pElement->Attribute("hide");
-    if (hide == NULL || strnicmp("false", hide, 4) != 0)
+    if (hide == NULL || strnicmp("false", hide, 5) != 0)
     {
       SettingPtr setting = CServiceBroker::GetSettingsComponent()->GetSettings()->GetSetting(CSettings::SETTING_DEBUG_SHOWLOGINFO);
       if (setting != NULL)

_service:download_files:master.tar.gz/xbmc/settings/AdvancedSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/settings/DisplaySettings.cpp Changed

@@ -38,14 +38,23 @@
 #include "windowing/WinSystem.h"
 
 #if defined(HAVE_X11)
+#define WIN_SYSTEM_CLASS CWinSystemX11
 #include "windowing/X11/WinSystemX11.h"
 #elif defined(TARGET_DARWIN_OSX)
+#define WIN_SYSTEM_CLASS CWinSystemOSX
 #include "windowing/osx/WinSystemOSX.h"
+#elif defined(TARGET_ANDROID)
 #elif defined(TARGET_DARWIN_IOS)
+#define WIN_SYSTEM_CLASS CWinSystemIOS
 #include "windowing/ios/WinSystemIOS.h"
+#elif defined(TARGET_DARWIN_TVOS)
+#define WIN_SYSTEM_CLASS CWinSystemTVOS
+#include "windowing/tvos/WinSystemTVOS.h"
 #elif defined(HAVE_WAYLAND)
+#define WIN_SYSTEM_CLASS KODI::WINDOWING::WAYLAND::CWinSystemWayland
 #include "windowing/wayland/WinSystemWayland.h"
 #elif defined(TARGET_WINDOWS_DESKTOP)
+#define WIN_SYSTEM_CLASS CWinSystemWin32DX
 #include "windowing/windows/WinSystemWin32DX.h"
 #endif
 
@@ -822,19 +831,14 @@
 
 void CDisplaySettings::SettingOptionsMonitorsFiller(SettingConstPtr setting, std::vector<StringSettingOption> &list, std::string &current, void *data)
 {
-#if defined(HAVE_X11) || defined(TARGET_DARWIN)
+#if defined(HAVE_X11) || defined(TARGET_DARWIN) || defined(HAVE_WAYLAND) || \
+    defined(TARGET_WINDOWS_DESKTOP)
   std::vector<std::string> monitors;
-
-#if defined(HAVE_X11)
-  CWinSystemX11 *winSystem = dynamic_cast<CWinSystemX11*>(CServiceBroker::GetWinSystem());
-#elif defined(TARGET_DARWIN_OSX)
-  CWinSystemOSX *winSystem = dynamic_cast<CWinSystemOSX*>(CServiceBroker::GetWinSystem());
-#elif defined(TARGET_DARWIN_IOS)
-  CWinSystemIOS *winSystem = dynamic_cast<CWinSystemIOS*>(CServiceBroker::GetWinSystem());
-#endif
+  auto winSystem = dynamic_cast<WIN_SYSTEM_CLASS*>(CServiceBroker::GetWinSystem());
   winSystem->GetConnectedOutputs(&monitors);
   std::string currentMonitor = CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(CSettings::SETTING_VIDEOSCREEN_MONITOR);
-  for (unsigned int i=0; i<monitors.size(); ++i)
+#if defined(HAVE_X11) || defined(TARGET_DARWIN)
+  for (unsigned int i = 0; i < monitors.size(); ++i)
   {
     if(currentMonitor.compare("Default") != 0 &&
        StringUtils::EqualsNoCase(CDisplaySettings::GetInstance().GetResolutionInfo(RES_DESKTOP).strOutput, monitors[i]))
@@ -844,15 +848,7 @@
     list.emplace_back(monitors[i], monitors[i]);
   }
 #elif defined(HAVE_WAYLAND) || defined(TARGET_WINDOWS_DESKTOP)
-  std::vector<std::string> monitors;
-#if defined(HAVE_WAYLAND)
-  KODI::WINDOWING::WAYLAND::CWinSystemWayland *winSystem = dynamic_cast<KODI::WINDOWING::WAYLAND::CWinSystemWayland*>(CServiceBroker::GetWinSystem());
-#elif defined(TARGET_WINDOWS_DESKTOP)
-  CWinSystemWin32DX *winSystem = dynamic_cast<CWinSystemWin32DX*>(CServiceBroker::GetWinSystem());
-#endif
-  winSystem->GetConnectedOutputs(&monitors);
   bool foundMonitor = false;
-  std::string currentMonitor = CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(CSettings::SETTING_VIDEOSCREEN_MONITOR);
   for (auto const& monitor : monitors)
   {
     if(monitor == currentMonitor)
@@ -869,6 +865,7 @@
     list.emplace_back(current, current);
   }
 #endif
+#endif
 }
 
 void CDisplaySettings::ClearCustomResolutions()

_service:download_files:master.tar.gz/xbmc/settings/DisplaySettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/ISubSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/MediaSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/MediaSourceSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingConditions.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/Settings.cpp Changed

@@ -27,6 +27,9 @@
 #if defined(TARGET_DARWIN_OSX)
 #include "platform/darwin/osx/XBMCHelper.h"
 #endif // defined(TARGET_DARWIN_OSX)
+#if defined(TARGET_DARWIN_TVOS)
+#include "platform/darwin/tvos/TVOSSettingsHandler.h"
+#endif // defined(TARGET_DARWIN_TVOS)
 #if defined(TARGET_DARWIN_EMBEDDED)
 #include "SettingAddon.h"
 #endif
@@ -114,6 +117,7 @@
 const std::string CSettings::SETTING_VIDEOLIBRARY_EXPORT = "videolibrary.export";
 const std::string CSettings::SETTING_VIDEOLIBRARY_IMPORT = "videolibrary.import";
 const std::string CSettings::SETTING_VIDEOLIBRARY_SHOWEMPTYTVSHOWS = "videolibrary.showemptytvshows";
+const std::string CSettings::SETTING_VIDEOLIBRARY_MOVIESETSFOLDER = "videolibrary.moviesetsfolder";
 const std::string CSettings::SETTING_LOCALE_AUDIOLANGUAGE = "locale.audiolanguage";
 const std::string CSettings::SETTING_VIDEOPLAYER_PREFERDEFAULTFLAG = "videoplayer.preferdefaultflag";
 const std::string CSettings::SETTING_VIDEOPLAYER_AUTOPLAYNEXTITEM = "videoplayer.autoplaynextitem";
@@ -200,7 +204,6 @@
 const std::string CSettings::SETTING_EPG_HIDENOINFOAVAILABLE = "epg.hidenoinfoavailable";
 const std::string CSettings::SETTING_EPG_EPGUPDATE = "epg.epgupdate";
 const std::string CSettings::SETTING_EPG_PREVENTUPDATESWHILEPLAYINGTV = "epg.preventupdateswhileplayingtv";
-const std::string CSettings::SETTING_EPG_STOREEPGINDATABASE = "epg.storeepgindatabase";
 const std::string CSettings::SETTING_EPG_RESETEPG = "epg.resetepg";
 const std::string CSettings::SETTING_PVRPLAYBACK_SWITCHTOFULLSCREEN = "pvrplayback.switchtofullscreen";
 const std::string CSettings::SETTING_PVRPLAYBACK_SIGNALQUALITY = "pvrplayback.signalquality";
@@ -260,6 +263,7 @@
 const std::string CSettings::SETTING_MUSICPLAYER_CROSSFADE = "musicplayer.crossfade";
 const std::string CSettings::SETTING_MUSICPLAYER_CROSSFADEALBUMTRACKS = "musicplayer.crossfadealbumtracks";
 const std::string CSettings::SETTING_MUSICPLAYER_VISUALISATION = "musicplayer.visualisation";
+const std::string CSettings::SETTING_MUSICFILES_SELECTACTION = "musicfiles.selectaction";
 const std::string CSettings::SETTING_MUSICFILES_USETAGS = "musicfiles.usetags";
 const std::string CSettings::SETTING_MUSICFILES_TRACKFORMAT = "musicfiles.trackformat";
 const std::string CSettings::SETTING_MUSICFILES_NOWPLAYINGTRACKFORMAT = "musicfiles.nowplayingtrackformat";
@@ -364,6 +368,11 @@
 const std::string CSettings::SETTING_INPUT_APPLEREMOTEMODE = "input.appleremotemode";
 const std::string CSettings::SETTING_INPUT_APPLEREMOTEALWAYSON = "input.appleremotealwayson";
 const std::string CSettings::SETTING_INPUT_APPLEREMOTESEQUENCETIME = "input.appleremotesequencetime";
+const std::string CSettings::SETTING_INPUT_APPLESIRI = "input.applesiri";
+const std::string CSettings::SETTING_INPUT_APPLESIRITIMEOUT = "input.applesiritimeout";
+const std::string CSettings::SETTING_INPUT_APPLESIRITIMEOUTENABLED =
+    "input.applesiritimeoutenabled";
+const std::string CSettings::SETTING_INPUT_APPLEUSEKODIKEYBOARD = "input.appleusekodikeyboard";
 const std::string CSettings::SETTING_NETWORK_USEHTTPPROXY = "network.usehttpproxy";
 const std::string CSettings::SETTING_NETWORK_HTTPPROXYTYPE = "network.httpproxytype";
 const std::string CSettings::SETTING_NETWORK_HTTPPROXYSERVER = "network.httpproxyserver";
@@ -440,6 +449,24 @@
   return true;
 }
 
+void CSettings::RegisterSubSettings(ISubSettings* subSettings)
+{
+  if (subSettings == nullptr)
+    return;
+
+  CSingleLock lock(m_critical);
+  m_subSettings.insert(subSettings);
+}
+
+void CSettings::UnregisterSubSettings(ISubSettings* subSettings)
+{
+  if (subSettings == nullptr)
+    return;
+
+  CSingleLock lock(m_critical);
+  m_subSettings.erase(subSettings);
+}
+
 bool CSettings::Load()
 {
   const std::shared_ptr<CProfileManager> profileManager = CServiceBroker::GetSettingsComponent()->GetProfileManager();
@@ -452,7 +479,7 @@
   CXBMCTinyXML xmlDoc;
   bool updated = false;
   if (!XFILE::CFile::Exists(file) || !xmlDoc.LoadFile(file) ||
-      !LoadValuesFromXml(xmlDoc, updated))
+      !Load(xmlDoc.RootElement(), updated) || !Load(xmlDoc.RootElement()))
   {
     CLog::Log(LOGERROR, "CSettings: unable to load settings from %s, creating new default settings", file.c_str());
     if (!Reset())
@@ -468,6 +495,12 @@
   return true;
 }
 
+bool CSettings::Load(const TiXmlElement* root)
+{
+  bool updated = false;
+  return Load(root, updated);
+}
+
 bool CSettings::Save()
 {
   const std::shared_ptr<CProfileManager> profileManager = CServiceBroker::GetSettingsComponent()->GetProfileManager();
@@ -481,9 +514,29 @@
   if (!SaveValuesToXml(xmlDoc))
     return false;
 
+  TiXmlElement* root = xmlDoc.RootElement();
+  if (root == nullptr)
+    return false;
+
+  if (!Save(root))
+    return false;
+
   return xmlDoc.SaveFile(file);
 }
 
+bool CSettings::Save(TiXmlNode* root) const
+{
+  CSingleLock lock(m_critical);
+  // save any ISubSettings implementations
+  for (const auto& subSetting : m_subSettings)
+  {
+    if (!subSetting->Save(root))
+      return false;
+  }
+
+  return true;
+}
+
 bool CSettings::LoadSetting(const TiXmlNode *node, const std::string &settingId)
 {
   return GetSettingsManager()->LoadSetting(node, settingId);
@@ -498,6 +551,41 @@
   return CSettingsBase::GetBool(id);
 }
 
+void CSettings::Clear()
+{
+  CSingleLock lock(m_critical);
+  if (!m_initialized)
+    return;
+
+  GetSettingsManager()->Clear();
+
+  for (auto& subSetting : m_subSettings)
+    subSetting->Clear();
+
+  m_initialized = false;
+}
+
+bool CSettings::Load(const TiXmlElement* root, bool& updated)
+{
+  if (root == nullptr)
+    return false;
+
+  if (!CSettingsBase::LoadValuesFromXml(root, updated))
+    return false;
+
+  return Load(static_cast<const TiXmlNode*>(root));
+}
+
+bool CSettings::Load(const TiXmlNode* settings)
+{
+  bool ok = true;
+  CSingleLock lock(m_critical);
+  for (const auto& subSetting : m_subSettings)
+    ok &= subSetting->Load(settings);
+
+  return ok;
+}
+
 bool CSettings::Initialize(const std::string &file)
 {
   CXBMCTinyXML xmlDoc;
@@ -552,6 +640,10 @@
 #elif defined(TARGET_DARWIN_IOS)
   if (CFile::Exists(SETTINGS_XML_FOLDER "darwin_ios.xml") && !Initialize(SETTINGS_XML_FOLDER "darwin_ios.xml"))
     CLog::Log(LOGFATAL, "Unable to load ios-specific settings definitions");
+#elif defined(TARGET_DARWIN_TVOS)
+  if (CFile::Exists(SETTINGS_XML_FOLDER "darwin_tvos.xml") &&
+      !Initialize(SETTINGS_XML_FOLDER "darwin_tvos.xml"))
+    CLog::Log(LOGFATAL, "Unable to load tvos-specific settings definitions");
 #endif
 #endif
 
@@ -785,23 +877,23 @@
 void CSettings::InitializeISubSettings()
 {
   // register ISubSettings implementations
-  GetSettingsManager()->RegisterSubSettings(&g_application);
-  GetSettingsManager()->RegisterSubSettings(&CDisplaySettings::GetInstance());
-  GetSettingsManager()->RegisterSubSettings(&CMediaSettings::GetInstance());
-  GetSettingsManager()->RegisterSubSettings(&CSkinSettings::GetInstance());
-  GetSettingsManager()->RegisterSubSettings(&g_sysinfo);
-  GetSettingsManager()->RegisterSubSettings(&CViewStateSettings::GetInstance());
+  RegisterSubSettings(&g_application);
+  RegisterSubSettings(&CDisplaySettings::GetInstance());
+  RegisterSubSettings(&CMediaSettings::GetInstance());
+  RegisterSubSettings(&CSkinSettings::GetInstance());
+  RegisterSubSettings(&g_sysinfo);
+  RegisterSubSettings(&CViewStateSettings::GetInstance());
 }
 
 void CSettings::UninitializeISubSettings()
 {
   // unregister ISubSettings implementations
-  GetSettingsManager()->UnregisterSubSettings(&g_application);
-  GetSettingsManager()->UnregisterSubSettings(&CDisplaySettings::GetInstance());
-  GetSettingsManager()->UnregisterSubSettings(&CMediaSettings::GetInstance());
-  GetSettingsManager()->UnregisterSubSettings(&CSkinSettings::GetInstance());
-  GetSettingsManager()->UnregisterSubSettings(&g_sysinfo);
-  GetSettingsManager()->UnregisterSubSettings(&CViewStateSettings::GetInstance());
+  UnregisterSubSettings(&g_application);
+  UnregisterSubSettings(&CDisplaySettings::GetInstance());
+  UnregisterSubSettings(&CMediaSettings::GetInstance());
+  UnregisterSubSettings(&CSkinSettings::GetInstance());
+  UnregisterSubSettings(&g_sysinfo);
+  UnregisterSubSettings(&CViewStateSettings::GetInstance());
 }
 
 void CSettings::InitializeISettingCallbacks()
@@ -906,6 +998,14 @@
   GetSettingsManager()->RegisterCallback(&XBMCHelper::GetInstance(), settingSet);
 #endif
 
+#if defined(TARGET_DARWIN_TVOS)
+  settingSet.clear();
+  settingSet.insert(CSettings::SETTING_INPUT_APPLESIRI);
+  settingSet.insert(CSettings::SETTING_INPUT_APPLESIRITIMEOUT);
+  settingSet.insert(CSettings::SETTING_INPUT_APPLESIRITIMEOUTENABLED);
+  GetSettingsManager()->RegisterCallback(&CTVOSInputSettings::GetInstance(), settingSet);
+#endif
+
   settingSet.clear();
   settingSet.insert(CSettings::SETTING_ADDONS_SHOW_RUNNING);
   settingSet.insert(CSettings::SETTING_ADDONS_MANAGE_DEPENDENCIES);

_service:download_files:master.tar.gz/xbmc/settings/Settings.h Changed

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "settings/ISubSettings.h"
 #include "settings/SettingControl.h"
 #include "settings/SettingCreator.h"
 #include "settings/SettingsBase.h"
@@ -24,6 +25,7 @@
  \sa CSettingsManager
  */
 class CSettings : public CSettingsBase, public CSettingCreator, public CSettingControlCreator
+                , private ISubSettings
 {
 public:
   static const std::string SETTING_LOOKANDFEEL_SKIN;
@@ -80,6 +82,7 @@
   static const std::string SETTING_VIDEOLIBRARY_EXPORT;
   static const std::string SETTING_VIDEOLIBRARY_IMPORT;
   static const std::string SETTING_VIDEOLIBRARY_SHOWEMPTYTVSHOWS;
+  static const std::string SETTING_VIDEOLIBRARY_MOVIESETSFOLDER;
   static const std::string SETTING_LOCALE_AUDIOLANGUAGE;
   static const std::string SETTING_VIDEOPLAYER_PREFERDEFAULTFLAG;
   static const std::string SETTING_VIDEOPLAYER_AUTOPLAYNEXTITEM;
@@ -166,7 +169,6 @@
   static const std::string SETTING_EPG_HIDENOINFOAVAILABLE;
   static const std::string SETTING_EPG_EPGUPDATE;
   static const std::string SETTING_EPG_PREVENTUPDATESWHILEPLAYINGTV;
-  static const std::string SETTING_EPG_STOREEPGINDATABASE;
   static const std::string SETTING_EPG_RESETEPG;
   static const std::string SETTING_PVRPLAYBACK_SWITCHTOFULLSCREEN;
   static const std::string SETTING_PVRPLAYBACK_SIGNALQUALITY;
@@ -226,6 +228,7 @@
   static const std::string SETTING_MUSICPLAYER_CROSSFADE;
   static const std::string SETTING_MUSICPLAYER_CROSSFADEALBUMTRACKS;
   static const std::string SETTING_MUSICPLAYER_VISUALISATION;
+  static const std::string SETTING_MUSICFILES_SELECTACTION;
   static const std::string SETTING_MUSICFILES_USETAGS;
   static const std::string SETTING_MUSICFILES_TRACKFORMAT;
   static const std::string SETTING_MUSICFILES_NOWPLAYINGTRACKFORMAT;
@@ -330,6 +333,10 @@
   static const std::string SETTING_INPUT_APPLEREMOTEMODE;
   static const std::string SETTING_INPUT_APPLEREMOTEALWAYSON;
   static const std::string SETTING_INPUT_APPLEREMOTESEQUENCETIME;
+  static const std::string SETTING_INPUT_APPLESIRI;
+  static const std::string SETTING_INPUT_APPLESIRITIMEOUT;
+  static const std::string SETTING_INPUT_APPLESIRITIMEOUTENABLED;
+  static const std::string SETTING_INPUT_APPLEUSEKODIKEYBOARD;
   static const std::string SETTING_NETWORK_USEHTTPPROXY;
   static const std::string SETTING_NETWORK_HTTPPROXYTYPE;
   static const std::string SETTING_NETWORK_HTTPPROXYSERVER;
@@ -393,6 +400,19 @@
   // specialization of CSettingsBase
   bool Initialize() override;
 
+  /*!
+   \brief Registers the given ISubSettings implementation.
+
+   \param subSettings ISubSettings implementation
+   */
+  void RegisterSubSettings(ISubSettings* subSettings);
+  /*!
+   \brief Unregisters the given ISubSettings implementation.
+
+   \param subSettings ISubSettings implementation
+   */
+  void UnregisterSubSettings(ISubSettings* subSettings);
+
   // implementations of CSettingsBase
   bool Load() override;
   bool Save() override;
@@ -410,7 +430,7 @@
   \param root XML element containing setting values
   \return True if the setting values were successfully loaded, false otherwise
   */
-  bool Load(const TiXmlElement *root) { bool updated; return CSettingsBase::LoadValuesFromXml(root, updated); }
+  bool Load(const TiXmlElement* root);
   /*!
    \brief Loads setting values from the given XML element.
 
@@ -427,6 +447,13 @@
    \return True if the setting values were successfully saved, false otherwise
    */
   bool Save(const std::string &file);
+  /*!
+   \brief Saves the setting values to the given XML node.
+
+   \param root XML node
+   \return True if the setting values were successfully saved, false otherwise
+   */
+  bool Save(TiXmlNode* root) const override;
 
   /*!
    \brief Loads the setting being represented by the given XML node with the
@@ -441,6 +468,15 @@
   // overwrite (not override) from CSettingsBase
   bool GetBool(const std::string& id) const;
 
+  /*!
+   \brief Clears the complete settings.
+
+   This removes all initialized settings, groups, categories and sections and
+   returns to the uninitialized state. Any registered callbacks or
+   implementations stay registered.
+   */
+  void Clear() override;
+
 protected:
   // specializations of CSettingsBase
   void InitializeSettingTypes() override;
@@ -465,6 +501,13 @@
   CSettings(const CSettings&) = delete;
   CSettings const& operator=(CSettings const&) = delete;
 
+  bool Load(const TiXmlElement* root, bool& updated);
+
+  // implementation of ISubSettings
+  bool Load(const TiXmlNode* settings) override;
+
   bool Initialize(const std::string &file);
   bool Reset();
+
+  std::set<ISubSettings*> m_subSettings;
 };

_service:download_files:master.tar.gz/xbmc/settings/SettingsBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingsValueFlatJsonSerializer.cpp Added

@@ -0,0 +1,139 @@
+/*
+ *  Copyright (C) 2019 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "SettingsValueFlatJsonSerializer.h"
+
+#include "settings/lib/Setting.h"
+#include "settings/lib/SettingDefinitions.h"
+#include "settings/lib/SettingSection.h"
+#include "settings/lib/SettingType.h"
+#include "settings/lib/SettingsManager.h"
+#include "utils/JSONVariantWriter.h"
+#include "utils/log.h"
+
+CSettingsValueFlatJsonSerializer::CSettingsValueFlatJsonSerializer(bool compact /* = true */)
+  : m_compact(compact)
+{ }
+
+std::string CSettingsValueFlatJsonSerializer::SerializeValues(
+  const CSettingsManager* settingsManager) const
+{
+  if (settingsManager == nullptr)
+    return "";
+
+  CVariant root(CVariant::VariantTypeObject);
+
+  const auto sections = settingsManager->GetSections();
+  for (const auto& section : sections)
+    SerializeSection(root, section);
+
+  std::string result;
+  if (!CJSONVariantWriter::Write(root, result, m_compact))
+  {
+    CLog::Log(LOGWARNING,
+      "CSettingsValueFlatJsonSerializer: failed to serialize settings into JSON");
+    return "";
+  }
+
+  return result;
+}
+
+void CSettingsValueFlatJsonSerializer::SerializeSection(
+  CVariant& parent, std::shared_ptr<CSettingSection> section) const
+{
+  if (section == nullptr)
+    return;
+
+  const auto categories = section->GetCategories();
+  for (const auto& category : categories)
+    SerializeCategory(parent, category);
+}
+
+void CSettingsValueFlatJsonSerializer::SerializeCategory(
+  CVariant& parent, std::shared_ptr<CSettingCategory> category) const
+{
+  if (category == nullptr)
+    return;
+
+  const auto groups = category->GetGroups();
+  for (const auto& group : groups)
+    SerializeGroup(parent, group);
+}
+
+void CSettingsValueFlatJsonSerializer::SerializeGroup(
+  CVariant& parent, std::shared_ptr<CSettingGroup> group) const
+{
+  if (group == nullptr)
+    return;
+
+  const auto settings = group->GetSettings();
+  for (const auto& setting : settings)
+    SerializeSetting(parent, setting);
+}
+
+void CSettingsValueFlatJsonSerializer::SerializeSetting(
+  CVariant& parent, std::shared_ptr<CSetting> setting) const
+{
+  if (setting == nullptr)
+    return;
+
+  // ignore references and action settings (which don't have a value)
+  if (setting->IsReference() || setting->GetType() == SettingType::Action)
+    return;
+
+  const auto valueObj = SerializeSettingValue(setting);
+  if (valueObj.isNull())
+    return;
+
+  parent[setting->GetId()] = valueObj;
+}
+
+CVariant CSettingsValueFlatJsonSerializer::SerializeSettingValue(
+  std::shared_ptr<CSetting> setting) const
+{
+  switch (setting->GetType())
+  {
+    case SettingType::Action:
+      return CVariant::ConstNullVariant;
+
+    case SettingType::Boolean:
+      return CVariant(std::static_pointer_cast<CSettingBool>(setting)->GetValue());
+
+    case SettingType::Integer:
+      return CVariant(std::static_pointer_cast<CSettingInt>(setting)->GetValue());
+
+    case SettingType::Number:
+      return CVariant(std::static_pointer_cast<CSettingNumber>(setting)->GetValue());
+
+    case SettingType::String:
+      return CVariant(std::static_pointer_cast<CSettingString>(setting)->GetValue());
+
+    case SettingType::List:
+    {
+      const auto settingList = std::static_pointer_cast<CSettingList>(setting);
+
+      CVariant settingListValuesObj(CVariant::VariantTypeArray);
+      const auto settingListValues = settingList->GetValue();
+      for (const auto& settingListValue : settingListValues)
+      {
+        const auto valueObj = SerializeSettingValue(settingListValue);
+        if (!valueObj.isNull())
+          settingListValuesObj.push_back(valueObj);
+      }
+
+      return settingListValuesObj;
+    }
+
+    case SettingType::Unknown:
+    default:
+      CLog::Log(LOGWARNING,
+        "CSettingsValueFlatJsonSerializer: failed to serialize setting \"{}\" with value \"{}\" " \
+        "of unknown type", setting->GetId(), setting->ToString());
+      return CVariant::ConstNullVariant;
+  }
+}

_service:download_files:master.tar.gz/xbmc/settings/SettingsValueFlatJsonSerializer.h Added

@@ -0,0 +1,40 @@
+/*
+ *  Copyright (C) 2019 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "settings/lib/ISettingsValueSerializer.h"
+#include "utils/Variant.h"
+
+#include <memory>
+
+class CSetting;
+class CSettingCategory;
+class CSettingGroup;
+class CSettingSection;
+
+class CSettingsValueFlatJsonSerializer : public ISettingsValueSerializer
+{
+public:
+  explicit CSettingsValueFlatJsonSerializer(bool compact = true);
+  ~CSettingsValueFlatJsonSerializer() = default;
+
+  void SetCompact(bool compact = true) { m_compact = compact; }
+
+  // implementation of ISettingsValueSerializer
+  std::string SerializeValues(const CSettingsManager* settingsManager) const override;
+
+private:
+  void SerializeSection(CVariant& parent, std::shared_ptr<CSettingSection> section) const;
+  void SerializeCategory(CVariant& parent, std::shared_ptr<CSettingCategory> category) const;
+  void SerializeGroup(CVariant& parent, std::shared_ptr<CSettingGroup> group) const;
+  void SerializeSetting(CVariant& parent, std::shared_ptr<CSetting> setting) const;
+  CVariant SerializeSettingValue(std::shared_ptr<CSetting> setting) const;
+
+  bool m_compact;
+};

_service:download_files:master.tar.gz/xbmc/settings/SettingsValueXmlSerializer.cpp Added

@@ -0,0 +1,101 @@
+/*
+ *  Copyright (C) 2019 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "SettingsValueXmlSerializer.h"
+
+#include "settings/lib/SettingDefinitions.h"
+#include "settings/lib/SettingSection.h"
+#include "settings/lib/SettingsManager.h"
+#include "utils/XBMCTinyXML.h"
+#include "utils/XMLUtils.h"
+#include "utils/log.h"
+
+static constexpr char SETTINGS_XML_ROOT[] = "settings";
+
+std::string CSettingsValueXmlSerializer::SerializeValues(
+  const CSettingsManager* settingsManager) const
+{
+  if (settingsManager == nullptr)
+    return "";
+
+  CXBMCTinyXML xmlDoc;
+  TiXmlElement rootElement(SETTINGS_XML_ROOT);
+  rootElement.SetAttribute(SETTING_XML_ROOT_VERSION, settingsManager->GetVersion());
+  TiXmlNode* xmlRoot = xmlDoc.InsertEndChild(rootElement);
+  if (xmlRoot == nullptr)
+    return "";
+
+  const auto sections = settingsManager->GetSections();
+  for (const auto& section : sections)
+    SerializeSection(xmlRoot, section);
+
+  std::stringstream stream;
+  stream << *xmlDoc.RootElement();
+
+  return stream.str();
+}
+
+void CSettingsValueXmlSerializer::SerializeSection(
+  TiXmlNode* parent, std::shared_ptr<CSettingSection> section) const
+{
+  if (section == nullptr)
+    return;
+
+  const auto categories = section->GetCategories();
+  for (const auto& category : categories)
+    SerializeCategory(parent, category);
+}
+
+void CSettingsValueXmlSerializer::SerializeCategory(
+  TiXmlNode* parent, std::shared_ptr<CSettingCategory> category) const
+{
+  if (category == nullptr)
+    return;
+
+  const auto groups = category->GetGroups();
+  for (const auto& group : groups)
+    SerializeGroup(parent, group);
+}
+
+void CSettingsValueXmlSerializer::SerializeGroup(
+  TiXmlNode* parent, std::shared_ptr<CSettingGroup> group) const
+{
+  if (group == nullptr)
+    return;
+
+  const auto settings = group->GetSettings();
+  for (const auto& setting : settings)
+    SerializeSetting(parent, setting);
+}
+
+void CSettingsValueXmlSerializer::SerializeSetting(
+  TiXmlNode* parent, std::shared_ptr<CSetting> setting) const
+{
+  if (setting == nullptr)
+    return;
+
+  // ignore references and action settings (which don't have a value)
+  if (setting->IsReference() || setting->GetType() == SettingType::Action)
+    return;
+
+  TiXmlElement settingElement(SETTING_XML_ELM_SETTING);
+  settingElement.SetAttribute(SETTING_XML_ATTR_ID, setting->GetId());
+
+  // add the default attribute
+  if (setting->IsDefault())
+    settingElement.SetAttribute(SETTING_XML_ELM_DEFAULT, "true");
+
+  // add the value
+  TiXmlText value(setting->ToString());
+  settingElement.InsertEndChild(value);
+
+  if (parent->InsertEndChild(settingElement) == nullptr)
+    CLog::Log(LOGWARNING,
+      "CSettingsValueXmlSerializer: unable to write <" SETTING_XML_ELM_SETTING " id=\"{}\"> tag",
+      setting->GetId());
+}

_service:download_files:master.tar.gz/xbmc/settings/SettingsValueXmlSerializer.h Added

@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 2019 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "settings/lib/ISettingsValueSerializer.h"
+
+#include <memory>
+
+class CSetting;
+class CSettingCategory;
+class CSettingGroup;
+class CSettingSection;
+class TiXmlNode;
+
+class CSettingsValueXmlSerializer : public ISettingsValueSerializer
+{
+public:
+  CSettingsValueXmlSerializer() = default;
+  ~CSettingsValueXmlSerializer() = default;
+
+  // implementation of ISettingsValueSerializer
+  std::string SerializeValues(const CSettingsManager* settingsManager) const override;
+
+private:
+  void SerializeSection(TiXmlNode* parent, std::shared_ptr<CSettingSection> section) const;
+  void SerializeCategory(TiXmlNode* parent, std::shared_ptr<CSettingCategory> category) const;
+  void SerializeGroup(TiXmlNode* parent, std::shared_ptr<CSettingGroup> group) const;
+  void SerializeSetting(TiXmlNode* parent, std::shared_ptr<CSetting> setting) const;
+};

_service:download_files:master.tar.gz/xbmc/settings/SkinSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingsValueSerializer.h Added

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingsManager.cpp Changed

@@ -55,7 +55,6 @@
   // first clear all registered settings handler and subsettings
   // implementations because we can't be sure that they are still valid
   m_settingsHandlers.clear();
-  m_subSettings.clear();
   m_settingCreators.clear();
   m_settingControlCreators.clear();
 
@@ -157,48 +156,27 @@
   if (!Deserialize(root, updated, loadedSettings))
     return false;
 
-  bool ret = true;
-  // load any ISubSettings implementations
-  if (triggerEvents)
-    ret = Load(root);
-
   if (triggerEvents)
     OnSettingsLoaded();
 
-  return ret;
+  return true;
 }
 
-bool CSettingsManager::Save(TiXmlNode *root) const
+bool CSettingsManager::Save(
+  const ISettingsValueSerializer* serializer, std::string& serializedValues) const
 {
+  if (serializer == nullptr)
+    return false;
+
   CSharedLock lock(m_critical);
   CSharedLock settingsLock(m_settingsCritical);
-  if (!m_initialized || root == nullptr)
+  if (!m_initialized)
     return false;
 
   if (!OnSettingsSaving())
     return false;
 
-  // save the current version
-  auto rootElement = root->ToElement();
-  if (rootElement == nullptr)
-  {
-    CLog::Log(LOGERROR, "CSettingsManager: failed to save settings");
-    return false;
-  }
-  rootElement->SetAttribute(SETTING_XML_ROOT_VERSION, Version);
-
-  if (!Serialize(root))
-  {
-    CLog::Log(LOGERROR, "CSettingsManager: failed to save settings");
-    return false;
-  }
-
-  // save any ISubSettings implementations
-  for (const auto& subSetting : m_subSettings)
-  {
-    if (!subSetting->Save(root))
-      return false;
-  }
+  serializedValues = serializer->SerializeValues(this);
 
   OnSettingsSaved();
 
@@ -231,9 +209,6 @@
 
   OnSettingsCleared();
 
-  for (auto& subSetting : m_subSettings)
-    subSetting->Clear();
-
   m_initialized = false;
 }
 
@@ -451,24 +426,6 @@
     m_settingsHandlers.erase(it);
 }
 
-void CSettingsManager::RegisterSubSettings(ISubSettings *subSettings)
-{
-  CExclusiveLock lock(m_critical);
-  if (subSettings == nullptr)
-    return;
-
-  m_subSettings.insert(subSettings);
-}
-
-void CSettingsManager::UnregisterSubSettings(ISubSettings *subSettings)
-{
-  CExclusiveLock lock(m_critical);
-  if (subSettings == nullptr)
-    return;
-
-  m_subSettings.erase(subSettings);
-}
-
 void CSettingsManager::RegisterSettingOptionsFiller(const std::string &identifier, IntegerSettingOptionsFiller optionsFiller)
 {
   if (identifier.empty() || optionsFiller == nullptr)
@@ -1080,16 +1037,6 @@
     settingsHandler->OnSettingsCleared();
 }
 
-bool CSettingsManager::Load(const TiXmlNode *settings)
-{
-  bool ok = true;
-  CSharedLock lock(m_critical);
-  for (const auto& subSetting : m_subSettings)
-    ok &= subSetting->Load(settings);
-
-  return ok;
-}
-
 bool CSettingsManager::LoadSetting(const TiXmlNode *node, SettingPtr setting, bool &updated)
 {
   updated = false;

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingsManager.h Changed

@@ -12,7 +12,7 @@
 #include "ISettingControlCreator.h"
 #include "ISettingCreator.h"
 #include "ISettingsHandler.h"
-#include "ISubSettings.h"
+#include "ISettingsValueSerializer.h"
 #include "Setting.h"
 #include "SettingConditions.h"
 #include "SettingDefinitions.h"
@@ -38,8 +38,7 @@
  all settings.
  */
 class CSettingsManager : public ISettingCreator, public ISettingControlCreator,
-                         private ISettingCallback, private ISettingsHandler,
-                         private ISubSettings
+                         private ISettingCallback, private ISettingsHandler
 {
 public:
   /*!
@@ -57,6 +56,9 @@
   // implementation of ISettingControlCreator
   std::shared_ptr<ISettingControl> CreateControl(const std::string &controlType) const override;
 
+  uint32_t GetVersion() const { return Version; }
+  uint32_t GetMinimumSupportedVersion() const { return MinimumSupportedVersion; }
+
   /*!
    \brief Try to get the version of the setting definitions/values represented by the given XML element.
 
@@ -84,12 +86,12 @@
    */
   bool Load(const TiXmlElement *root, bool &updated, bool triggerEvents = true, std::map<std::string, std::shared_ptr<CSetting>> *loadedSettings = nullptr);
   /*!
-   \brief Saves the setting values to the given XML node.
+   \brief Saves the setting values using the given serializer.
 
-   \param root XML node
-   \return True if the setting values were successfully saved, false otherwise
+   \param serializer Settings value serializer to use
+   \return True if the setting values were successfully serialized, false otherwise
    */
-  bool Save(TiXmlNode *root) const override;
+  bool Save(const ISettingsValueSerializer* serializer, std::string& serializedValues) const;
   /*!
    \brief Unloads the previously loaded setting values.
 
@@ -103,7 +105,7 @@
    returns to the uninitialized state. Any registered callbacks or
    implementations stay registered.
    */
-  void Clear() override;
+  void Clear();
 
   /*!
   \brief Loads the setting being represented by the given XML node with the
@@ -235,19 +237,6 @@
   void UnregisterSettingsHandler(ISettingsHandler *settingsHandler);
 
   /*!
-   \brief Registers the given ISubSettings implementation.
-
-   \param subSettings ISubSettings implementation
-   */
-  void RegisterSubSettings(ISubSettings *subSettings);
-  /*!
-   \brief Unregisters the given ISubSettings implementation.
-
-   \param subSettings ISubSettings implementation
-   */
-  void UnregisterSubSettings(ISubSettings *subSettings);
-
-  /*!
    \brief Registers the given integer setting options filler under the given identifier.
 
    \param identifier Setting options filler identifier
@@ -483,9 +472,6 @@
   void OnSettingsSaved() const override;
   void OnSettingsCleared() override;
 
-  // implementation of ISubSettings
-  bool Load(const TiXmlNode *settings) override;
-
   bool Serialize(TiXmlNode *parent) const;
   bool Deserialize(const TiXmlNode *node, bool &updated, std::map<std::string, std::shared_ptr<CSetting>> *loadedSettings = nullptr);
 
@@ -538,7 +524,6 @@
   using SettingControlCreatorMap = std::map<std::string, ISettingControlCreator*>;
   SettingControlCreatorMap m_settingControlCreators;
 
-  std::set<ISubSettings*> m_subSettings;
   using SettingsHandlers = std::vector<ISettingsHandler*>;
   SettingsHandlers m_settingsHandlers;

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIControlSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/storage/DetectDVDType.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/ThreadImpl.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/win/Win32Exception.cpp Changed

@@ -65,13 +65,12 @@
   bool returncode = false;
   std::string dumpFileName;
   std::wstring dumpFileNameW;
-  SYSTEMTIME stLocalTime;
-  GetLocalTime(&stLocalTime);
+  KODI::TIME::SystemTime stLocalTime;
+  KODI::TIME::GetLocalTime(&stLocalTime);
 
-  dumpFileName = StringUtils::Format("kodi_crashlog-%s-%04d%02d%02d-%02d%02d%02d.dmp",
-                      mVersion.c_str(),
-                      stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay,
-                      stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond);
+  dumpFileName = StringUtils::Format(
+      "kodi_crashlog-%s-%04d%02d%02d-%02d%02d%02d.dmp", mVersion.c_str(), stLocalTime.year,
+      stLocalTime.month, stLocalTime.day, stLocalTime.hour, stLocalTime.minute, stLocalTime.second);
 
   dumpFileName = CWIN32Util::SmbToUnc(URIUtils::AddFileToFolder(CWIN32Util::GetProfilePath(), CUtil::MakeLegalFileName(dumpFileName)));
 
@@ -136,8 +135,8 @@
   std::wstring dumpFileNameW;
   CHAR cTemp[STACKWALK_MAX_NAMELEN];
   DWORD dwBytes;
-  SYSTEMTIME stLocalTime;
-  GetLocalTime(&stLocalTime);
+  KODI::TIME::SystemTime stLocalTime;
+  KODI::TIME::GetLocalTime(&stLocalTime);
   bool returncode = false;
   STACKFRAME64 frame = { 0 };
   HANDLE hCurProc = GetCurrentProcess();
@@ -166,10 +165,9 @@
      pSFTA == NULL || pSGMB == NULL)
     goto cleanup;
 
-  dumpFileName = StringUtils::Format("kodi_stacktrace-%s-%04d%02d%02d-%02d%02d%02d.txt",
-                                      mVersion.c_str(),
-                                      stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay,
-                                      stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond);
+  dumpFileName = StringUtils::Format(
+      "kodi_stacktrace-%s-%04d%02d%02d-%02d%02d%02d.txt", mVersion.c_str(), stLocalTime.year,
+      stLocalTime.month, stLocalTime.day, stLocalTime.hour, stLocalTime.minute, stLocalTime.second);
 
   dumpFileName = CWIN32Util::SmbToUnc(URIUtils::AddFileToFolder(CWIN32Util::GetProfilePath(), CUtil::MakeLegalFileName(dumpFileName)));

_service:download_files:master.tar.gz/xbmc/utils/AlarmClock.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Archive.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Archive.h Changed

_service:download_files:master.tar.gz/xbmc/utils/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/utils/CPUInfo.h Changed

_service:download_files:master.tar.gz/xbmc/utils/FileUtils.cpp Changed

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2018 Team Kodi
+ *  Copyright (C) 2010-2020 Team Kodi
  *  This file is part of Kodi - https://kodi.tv
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
@@ -144,17 +144,20 @@
   {
     VECSOURCES* sources = CMediaSourceSettings::GetInstance().GetSources(sourceName);
     int sourceIndex = CUtil::GetMatchingSource(realPath, *sources, isSource);
-    if (sourceIndex >= 0 && sourceIndex < (int)sources->size() && sources->at(sourceIndex).m_iHasLock != 2 && sources->at(sourceIndex).m_allowSharing)
+    if (sourceIndex >= 0 && sourceIndex < static_cast<int>(sources->size()) &&
+        sources->at(sourceIndex).m_iHasLock != LOCK_STATE_LOCKED &&
+        sources->at(sourceIndex).m_allowSharing)
       return true;
-  }  
+  }
   // Check auto-mounted sources
   VECSOURCES sources;
   CServiceBroker::GetMediaManager().GetRemovableDrives(
       sources); // Sources returned allways have m_allowsharing = true
   //! @todo Make sharing of auto-mounted sources user configurable
   int sourceIndex = CUtil::GetMatchingSource(realPath, sources, isSource);
-  if (sourceIndex >= 0 && sourceIndex < static_cast<int>(sources.size()) && 
-      sources.at(sourceIndex).m_iHasLock != 2 && sources.at(sourceIndex).m_allowSharing)
+  if (sourceIndex >= 0 && sourceIndex < static_cast<int>(sources.size()) &&
+      sources.at(sourceIndex).m_iHasLock != LOCK_STATE_LOCKED &&
+      sources.at(sourceIndex).m_allowSharing)
     return true;
 
   return false;

_service:download_files:master.tar.gz/xbmc/utils/HttpRangeUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/JobManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/LabelFormatter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Mime.cpp Changed

@@ -21,6 +21,7 @@
 const std::map<std::string, std::string> CMime::m_mimetypes = 
     {{{"3dm",       "x-world/x-3dmf"},
       {"3dmf",      "x-world/x-3dmf"},
+      {"3fr",       "image/3fr"},
       {"a",         "application/octet-stream"},
       {"aab",       "application/x-authorware-bin"},
       {"aam",       "application/x-authorware-map"},
@@ -79,6 +80,7 @@
       {"crl",       "application/pkcs-crl"},
       {"crt",       "application/pkix-cert"},
       {"cr2",       "image/cr2"},
+      {"crw",       "image/crw"},
       {"csh",       "application/x-csh"},
       {"css",       "text/css"},
       {"cxx",       "text/plain"},
@@ -107,6 +109,7 @@
       {"elc",       "application/x-elc"},
       {"env",       "application/x-envoy"},
       {"eps",       "application/postscript"},
+      {"erf",       "image/erf"},
       {"es",        "application/x-esrehber"},
       {"etx",       "text/x-setext"},
       {"evy",       "application/envoy"},
@@ -189,6 +192,7 @@
       {"json",      "application/json"},
       {"jut",       "image/jutvision"},
       {"kar",       "music/x-karaoke"},
+      {"kdc",       "image/kdc"},
       {"ksh",       "text/x-script.ksh"},
       {"la",        "audio/nspaudio"},
       {"lam",       "audio/x-liveaudio"},
@@ -217,7 +221,9 @@
       {"mcd",       "application/x-mathcad"},
       {"mcf",       "text/mcf"},
       {"mcp",       "application/netmc"},
+      {"mdc",       "image/mdc"},
       {"me",        "application/x-troff-me"},
+      {"mef",       "image/mef"},
       {"mht",       "message/rfc822"},
       {"mhtml",     "message/rfc822"},
       {"mid",       "audio/midi"},
@@ -235,6 +241,7 @@
       {"moov",      "video/quicktime"},
       {"mov",       "video/quicktime"},
       {"movie",     "video/x-sgi-movie"},
+      {"mos",       "image/mos"},
       {"mp2",       "audio/mpeg"},
       {"mp3",       "audio/mpeg3"},
       {"mp4",       "video/mp4"},
@@ -249,6 +256,7 @@
       {"mpv",       "application/x-project"},
       {"mpx",       "application/x-project"},
       {"mrc",       "application/marc"},
+      {"mrw",       "image/mrw"},
       {"ms",        "application/x-troff-ms"},
       {"mv",        "video/x-sgi-movie"},
       {"my",        "audio/make"},
@@ -262,6 +270,7 @@
       {"nif",       "image/x-niff"},
       {"niff",      "image/x-niff"},
       {"nix",       "application/x-mix-transfer"},
+      {"nrw",       "image/nrw"},
       {"nsc",       "application/x-conference"},
       {"nvd",       "application/x-navidoc"},
       {"o",         "application/octet-stream"},
@@ -270,6 +279,7 @@
       {"omc",       "application/x-omc"},
       {"omcd",      "application/x-omcdatamaker"},
       {"omcr",      "application/x-omcregerator"},
+      {"orf",       "image/orf"},
       {"p",         "text/x-pascal"},
       {"p10",       "application/pkcs10"},
       {"p12",       "application/pkcs-12"},
@@ -286,6 +296,7 @@
       {"pcx",       "image/x-pcx"},
       {"pdb",       "chemical/x-pdb"},
       {"pdf",       "application/pdf"},
+      {"pef",       "image/pef"},
       {"pfunk",     "audio/make.my.funk"},
       {"pgm",       "image/x-portable-greymap"},
       {"pic",       "image/pict"},
@@ -323,9 +334,11 @@
       {"qti",       "image/x-quicktime"},
       {"qtif",      "image/x-quicktime"},
       {"ra",        "audio/x-realaudio"},
+      {"raf",       "image/raf"},
       {"ram",       "audio/x-pn-realaudio"},
       {"ras",       "image/cmu-raster"},
       {"rast",      "image/cmu-raster"},
+      {"raw",       "image/raw"},
       {"rexx",      "text/x-script.rexx"},
       {"rf",        "image/vnd.rn-realflash"},
       {"rgb",       "image/x-rgb"},
@@ -342,6 +355,7 @@
       {"rtf",       "text/richtext"},
       {"rtx",       "text/richtext"},
       {"rv",        "video/vnd.rn-realvideo"},
+      {"rw2",       "image/rw2"},
       {"s",         "text/x-asm"},
       {"s3m",       "audio/s3m"},
       {"saveme",    "application/octet-stream"},
@@ -373,6 +387,7 @@
       {"spr",       "application/x-sprite"},
       {"sprite",    "application/x-sprite"},
       {"src",       "application/x-wais-source"},
+      {"srw",       "image/srw"},
       {"ssi",       "text/x-server-parsed-html"},
       {"ssm",       "application/streamingmedia"},
       {"sst",       "application/vnd.ms-pki.certstore"},
@@ -463,6 +478,7 @@
       {"wsc",       "text/scriplet"},
       {"wsrc",      "application/x-wais-source"},
       {"wtk",       "application/x-wintalk"},
+      {"x3f",       "image/x3f"},
       {"xbm",       "image/xbm"},
       {"xdr",       "video/x-amt-demorun"},
       {"xgz",       "xgl/drawing"},

_service:download_files:master.tar.gz/xbmc/utils/RecentlyAddedJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/RssReader.cpp Changed

@@ -6,24 +6,23 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "network/Network.h"
-#include "threads/SystemClock.h"
 #include "RssReader.h"
-#include "ServiceBroker.h"
-#include "utils/HTMLUtil.h"
+
 #include "CharsetConverter.h"
+#include "ServiceBroker.h"
 #include "URL.h"
-#include "filesystem/File.h"
 #include "filesystem/CurlFile.h"
+#include "filesystem/File.h"
+#include "guilib/GUIRSSControl.h"
+#include "guilib/LocalizeStrings.h"
+#include "log.h"
+#include "network/Network.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
-#include "guilib/LocalizeStrings.h"
-#include "guilib/GUIRSSControl.h"
 #include "threads/SingleLock.h"
-#include "log.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "threads/SystemClock.h"
+#include "utils/HTMLUtil.h"
+#include "utils/XTimeUtils.h"
 
 #define RSS_COLOR_BODY      0
 #define RSS_COLOR_HEADLINE  1
@@ -72,8 +71,8 @@
   for (unsigned int i = 0; i < m_vecUpdateTimes.size(); ++i)
   {
     AddToQueue(i);
-    SYSTEMTIME* time = new SYSTEMTIME;
-    GetLocalTime(time);
+    KODI::TIME::SystemTime* time = new KODI::TIME::SystemTime;
+    KODI::TIME::GetLocalTime(time);
     m_vecTimeStamps.push_back(time);
   }
 }
@@ -168,7 +167,7 @@
             break;
           }
           else if (nRetries > 0)
-            Sleep(5000); // Network problems? Retry, but not immediately.
+            CThread::Sleep(5000); // Network problems? Retry, but not immediately.
           else
             CLog::Log(LOGERROR, "Unable to obtain rss feed: %s", strUrl.c_str());
         }
@@ -394,16 +393,18 @@
 
 void CRssReader::CheckForUpdates()
 {
-  SYSTEMTIME time;
-  GetLocalTime(&time);
+  KODI::TIME::SystemTime time;
+  KODI::TIME::GetLocalTime(&time);
 
   for (unsigned int i = 0;i < m_vecUpdateTimes.size(); ++i )
   {
-    if (m_requestRefresh ||
-       ((time.wDay * 24 * 60) + (time.wHour * 60) + time.wMinute) - ((m_vecTimeStamps[i]->wDay * 24 * 60) + (m_vecTimeStamps[i]->wHour * 60) + m_vecTimeStamps[i]->wMinute) > m_vecUpdateTimes[i])
+    if (m_requestRefresh || ((time.day * 24 * 60) + (time.hour * 60) + time.minute) -
+                                    ((m_vecTimeStamps[i]->day * 24 * 60) +
+                                     (m_vecTimeStamps[i]->hour * 60) + m_vecTimeStamps[i]->minute) >
+                                m_vecUpdateTimes[i])
     {
       CLog::Log(LOGDEBUG, "Updating RSS");
-      GetLocalTime(m_vecTimeStamps[i]);
+      KODI::TIME::GetLocalTime(m_vecTimeStamps[i]);
       AddToQueue(i);
     }
   }

_service:download_files:master.tar.gz/xbmc/utils/RssReader.h Changed

_service:download_files:master.tar.gz/xbmc/utils/SortUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/StringUtils.cpp Changed

@@ -16,29 +16,40 @@
 //
 //------------------------------------------------------------------------
 
+#ifdef HAVE_NEW_CROSSGUID
+#include <guid.hpp>
+#else
 #include <guid.h>
+#endif
 
 #if defined(TARGET_ANDROID)
 #include <androidjni/JNIThreading.h>
 #endif
 
-#include "StringUtils.h"
 #include "CharsetConverter.h"
 #include "LangInfo.h"
+#include "StringUtils.h"
 #include "Util.h"
-#include <fstrcmp.h>
-#include <functional>
+
+#include <algorithm>
 #include <array>
-#include <iomanip>
 #include <assert.h>
+#include <functional>
+#include <inttypes.h>
+#include <iomanip>
 #include <math.h>
-#include <time.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <time.h>
+
+#include <fstrcmp.h>
 #include <memory.h>
-#include <algorithm>
-#include "utils/RegExp.h" // don't move or std functions end up in PCRE namespace
+
+// don't move or std functions end up in PCRE namespace
+// clang-format off
+#include "utils/RegExp.h"
+// clang-format on
 
 #define FORMAT_BLOCK_SIZE 512 // # of bytes for initial allocation for printf
 
@@ -1126,11 +1137,15 @@
 
 std::string StringUtils::CreateUUID()
 {
+#ifdef HAVE_NEW_CROSSGUID
+  return xg::newGuid().str();
+#else
   static GuidGenerator guidGenerator;
   auto guid = guidGenerator.newGuid();
 
   std::stringstream strGuid; strGuid << guid;
   return strGuid.str();
+#endif
 }
 
 bool StringUtils::ValidateUUID(const std::string &uuid)

_service:download_files:master.tar.gz/xbmc/utils/StringUtils.h Changed

@@ -19,21 +19,17 @@
 //
 //------------------------------------------------------------------------
 
+#include "XBDateTime.h"
+#include "utils/params_check_macros.h"
+
+#include <locale>
+#include <ostream>
+#include <sstream>
 #include <stdarg.h>
 #include <stdint.h>
 #include <string>
+#include <type_traits>
 #include <vector>
-#include <sstream>
-#include <locale>
-
-#include <fmt/format.h>
-
-#if FMT_VERSION >= 40000
-#include <fmt/printf.h>
-#endif
-
-#include "XBDateTime.h"
-#include "utils/params_check_macros.h"
 
 /*! \brief  C-processor Token stringification
 
@@ -51,16 +47,39 @@
 #define DEF_TO_STR_NAME(x) #x
 #define DEF_TO_STR_VALUE(x) DEF_TO_STR_NAME(x)
 
+// clang-format off
+// This is required to format enum classes with fmt as they're not implicitly
+// convertible to int.
+// This operator has to be declared before including format.h and ostream.h.
+// We keep clang format disabled to avoid reordering and breaking things
+// https://github.com/fmtlib/fmt/issues/391
+template<typename T, typename std::enable_if_t<std::is_enum<T>::value, int> = 0>
+std::ostream& operator<<(std::ostream& os, const T& value)
+{
+  return os << static_cast<int>(value);
+}
+
+// workaround for broken [[deprecated]] in coverity
+#if defined(__COVERITY__)
+#undef FMT_DEPRECATED
+#define FMT_DEPRECATED
+#endif
+#include <fmt/format.h>
+
+#if FMT_VERSION >= 30000
+#include <fmt/ostream.h>
+#endif
+
+#if FMT_VERSION >= 40000
+#include <fmt/printf.h>
+#endif
+// clang-format on
+
 class StringUtils
 {
 public:
   /*! \brief Get a formatted string similar to sprintf
 
-  Beware that this does not support directly passing in
-  std::string objects. You need to call c_str() to pass
-  the const char* buffer representing the value of the
-  std::string object.
-
   \param fmt Format of the resulting string
   \param ... variable number of value type arguments
   \return Formatted string

_service:download_files:master.tar.gz/xbmc/utils/SysfsUtils.cpp Deleted

@@ -1,120 +0,0 @@
-/*
- *  Copyright (C) 2011-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#include "SysfsUtils.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <string.h>
-
-#ifdef TARGET_WINDOWS_STORE
-#include <io.h>
-#endif
-
-int SysfsUtils::SetString(const std::string& path, const std::string& valstr)
-{
-  int fd = open(path.c_str(), O_RDWR, 0644);
-  int ret = 0;
-  if (fd >= 0)
-  {
-    if (write(fd, valstr.c_str(), valstr.size()) < 0)
-      ret = -1;
-    close(fd);
-  }
-  if (ret)
-    CLog::Log(LOGERROR, "%s: error writing %s",__FUNCTION__, path.c_str());
-
-  return ret;
-}
-
-int SysfsUtils::GetString(const std::string& path, std::string& valstr)
-{
-  int len;
-  char buf[256] = {0};
-
-  int fd = open(path.c_str(), O_RDONLY);
-  if (fd >= 0)
-  {
-    valstr.clear();
-    while ((len = read(fd, buf, 256)) > 0)
-      valstr.append(buf, len);
-    close(fd);
-
-    StringUtils::Trim(valstr);
-
-    return 0;
-  }
-
-  CLog::Log(LOGERROR, "%s: error reading %s",__FUNCTION__, path.c_str());
-  valstr = "fail";
-  return -1;
-}
-
-int SysfsUtils::SetInt(const std::string& path, const int val)
-{
-  int fd = open(path.c_str(), O_RDWR, 0644);
-  int ret = 0;
-  if (fd >= 0)
-  {
-    char bcmd[16];
-    sprintf(bcmd, "%d", val);
-    if (write(fd, bcmd, strlen(bcmd)) < 0)
-      ret = -1;
-    close(fd);
-  }
-  if (ret)
-    CLog::Log(LOGERROR, "%s: error writing %s",__FUNCTION__, path.c_str());
-
-  return ret;
-}
-
-int SysfsUtils::GetInt(const std::string& path, int& val)
-{
-  int fd = open(path.c_str(), O_RDONLY);
-  int ret = 0;
-  if (fd >= 0)
-  {
-    char bcmd[16];
-    if (read(fd, bcmd, sizeof(bcmd)) < 0)
-      ret = -1;
-    else
-      val = strtol(bcmd, NULL, 16);
-
-    close(fd);
-  }
-  if (ret)
-    CLog::Log(LOGERROR, "%s: error reading %s",__FUNCTION__, path.c_str());
-
-  return ret;
-}
-
-bool SysfsUtils::Has(const std::string &path)
-{
-  int fd = open(path.c_str(), O_RDONLY);
-  if (fd >= 0)
-  {
-    close(fd);
-    return true;
-  }
-  return false;
-}
-
-bool SysfsUtils::HasRW(const std::string &path)
-{
-  int fd = open(path.c_str(), O_RDWR);
-  if (fd >= 0)
-  {
-    close(fd);
-    return true;
-  }
-  return false;
-}

_service:download_files:master.tar.gz/xbmc/utils/SysfsUtils.h Deleted

_service:download_files:master.tar.gz/xbmc/utils/SystemInfo.cpp Changed

@@ -68,8 +68,9 @@
 #elif defined(TARGET_FREEBSD)
 #include <sys/param.h>
 #elif defined(TARGET_LINUX)
+#include "platform/linux/SysfsPath.h"
+
 #include <linux/version.h>
-#include "utils/SysfsUtils.h"
 #endif
 
 #include <system_error>
@@ -557,6 +558,8 @@
     osName = GetKernelName(true); // FIXME: for FreeBSD OS name is a kernel name
 #elif defined(TARGET_DARWIN_IOS)
     osName = "iOS";
+#elif defined(TARGET_DARWIN_TVOS)
+    osName = "tvOS";
 #elif defined(TARGET_DARWIN_OSX)
     osName = "OS X";
 #elif defined (TARGET_ANDROID)
@@ -721,19 +724,10 @@
     auto manufacturer = eas.SystemManufacturer();
     g_charsetConverter.wToUTF8(std::wstring(manufacturer.c_str()), manufName);
 #elif defined(TARGET_LINUX)
-    if (SysfsUtils::Has("/sys/bus/soc/devices/soc0/family"))
-    {
-      std::string family;
-      SysfsUtils::GetString("/sys/bus/soc/devices/soc0/family", family);
-      if (SysfsUtils::Has("/sys/bus/soc/devices/soc0/soc_id"))
-      {
-        std::string soc_id;
-        SysfsUtils::GetString("/sys/bus/soc/devices/soc0/soc_id", soc_id);
-        manufName = family + " " + soc_id;
-      }
-      else
-        manufName = family;
-    }
+
+    auto cpuInfo = CServiceBroker::GetCPUInfo();
+    manufName = cpuInfo->GetCPUSoC();
+
 #elif defined(TARGET_WINDOWS)
     // We just don't care, might be useful on embedded
 #endif
@@ -768,8 +762,8 @@
     auto manufacturer = eas.SystemProductName();
     g_charsetConverter.wToUTF8(std::wstring(manufacturer.c_str()), modelName);
 #elif defined(TARGET_LINUX)
-    if (SysfsUtils::Has("/sys/bus/soc/devices/soc0/machine"))
-      SysfsUtils::GetString("/sys/bus/soc/devices/soc0/machine", modelName);
+    auto cpuInfo = CServiceBroker::GetCPUInfo();
+    modelName = cpuInfo->GetCPUHardware();
 #elif defined(TARGET_WINDOWS)
     // We just don't care, might be useful on embedded
 #endif
@@ -920,8 +914,6 @@
         kernelCpuFamily = "x86";
       else if (cpuType == CPU_TYPE_ARM)
         kernelCpuFamily = "ARM";
-      else if (cpuType == CPU_TYPE_POWERPC)
-        kernelCpuFamily = "PowerPC";
 #ifdef CPU_TYPE_MIPS
       else if (cpuType == CPU_TYPE_MIPS)
         kernelCpuFamily = "MIPS";
@@ -1058,8 +1050,18 @@
       && iOSVersion.find_first_not_of('0', lastDotPos + 1) == std::string::npos)
     iOSVersion.erase(lastDotPos);
   StringUtils::Replace(iOSVersion, '.', '_');
-  if (iDev == "iPad" || iDev == "AppleTV")
-    result += "CPU OS ";
+  if (iDev == "AppleTV")
+  {
+    // check if it's ATV4 (AppleTV5,3) or later
+    auto modelMajorNumberEndPos = iDevStr.find_first_of(',', iDevStrDigit);
+    std::string s{iDevStr, iDevStrDigit, modelMajorNumberEndPos - iDevStrDigit};
+    if (stoi(s) >= 5)
+      result += "CPU TVOS";
+    else
+      result += "CPU OS";
+  }
+  else if (iDev == "iPad")
+    result += "CPU OS";
   else
     result += "CPU iPhone OS ";
   result += iOSVersion + " like Mac OS X";
@@ -1068,8 +1070,6 @@
   std::string cpuFam(GetBuildTargetCpuFamily());
   if (cpuFam == "x86")
     result += "Intel ";
-  else if (cpuFam == "PowerPC")
-    result += "PPC ";
   result += "Mac OS X ";
   std::string OSXVersion(GetOsVersion());
   StringUtils::Replace(OSXVersion, '.', '_');
@@ -1199,6 +1199,8 @@
   return "OS X";
 #elif defined(TARGET_DARWIN_IOS)
   return "iOS";
+#elif defined(TARGET_DARWIN_TVOS)
+  return "tvOS";
 #elif defined(TARGET_FREEBSD)
   return "FreeBSD";
 #elif defined(TARGET_ANDROID)
@@ -1222,6 +1224,8 @@
   return XSTR_MACRO(__MAC_OS_X_VERSION_MIN_REQUIRED);
 #elif defined(TARGET_DARWIN_IOS)
   return XSTR_MACRO(__IPHONE_OS_VERSION_MIN_REQUIRED);
+#elif defined(TARGET_DARWIN_TVOS)
+  return XSTR_MACRO(__TV_OS_VERSION_MIN_REQUIRED);
 #elif defined(TARGET_FREEBSD)
   return XSTR_MACRO(__FreeBSD_version);
 #elif defined(TARGET_ANDROID)
@@ -1242,22 +1246,19 @@
 std::string CSysInfo::GetBuildTargetPlatformVersionDecoded(void)
 {
 #if defined(TARGET_DARWIN_OSX)
-#if defined(MAC_OS_X_VERSION_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
-  if (__MAC_OS_X_VERSION_MIN_REQUIRED % 10)
-    return StringUtils::Format("version %d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 1000) % 100, (__MAC_OS_X_VERSION_MIN_REQUIRED / 10) % 100);
+  if (__MAC_OS_X_VERSION_MIN_REQUIRED % 100)
+    return StringUtils::Format("version %d.%d.%d", __MAC_OS_X_VERSION_MIN_REQUIRED / 10000,
+                               (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100,
+                               __MAC_OS_X_VERSION_MIN_REQUIRED % 100);
   else
-    return StringUtils::Format("version %d.%d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 1000) % 100,
-    (__MAC_OS_X_VERSION_MIN_REQUIRED / 10) % 100, __MAC_OS_X_VERSION_MIN_REQUIRED % 10);
-#else  // defined(MAC_OS_X_VERSION_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
-  if (__MAC_OS_X_VERSION_MIN_REQUIRED % 10)
-    return StringUtils::Format("version %d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100, (__MAC_OS_X_VERSION_MIN_REQUIRED / 10) % 10);
-  else
-    return StringUtils::Format("version %d.%d.%d", (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100,
-      (__MAC_OS_X_VERSION_MIN_REQUIRED / 10) % 10, __MAC_OS_X_VERSION_MIN_REQUIRED % 10);
-#endif // defined(MAC_OS_X_VERSION_10_10) && __MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10
-#elif defined(TARGET_DARWIN_IOS)
-  return StringUtils::Format("version %d.%d.%d", (__IPHONE_OS_VERSION_MIN_REQUIRED / 10000) % 100,
-                             (__IPHONE_OS_VERSION_MIN_REQUIRED / 100) % 100, __IPHONE_OS_VERSION_MIN_REQUIRED % 100);
+    return StringUtils::Format("version %d.%d", __MAC_OS_X_VERSION_MIN_REQUIRED / 10000,
+                               (__MAC_OS_X_VERSION_MIN_REQUIRED / 100) % 100);
+#elif defined(TARGET_DARWIN_EMBEDDED)
+  std::string versionStr = GetBuildTargetPlatformVersion();
+  static const int major = (std::stoi(versionStr) / 10000) % 100;
+  static const int minor = (std::stoi(versionStr) / 100) % 100;
+  static const int rev = std::stoi(versionStr) % 100;
+  return StringUtils::Format("version %d.%d.%d", major, minor, rev);
 #elif defined(TARGET_FREEBSD)
   // FIXME: should works well starting from FreeBSD 8.1
   static const int major = (__FreeBSD_version / 100000) % 100;

_service:download_files:master.tar.gz/xbmc/utils/SystemInfo.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Temperature.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/XTimeUtils.h Added

@@ -0,0 +1,76 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include <string>
+
+#if !defined(TARGET_WINDOWS)
+#include "PlatformDefs.h"
+#else
+// This is needed, a forward declaration of FILETIME
+// breaks everything
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <Windows.h>
+#endif
+
+namespace KODI
+{
+namespace TIME
+{
+struct SystemTime
+{
+  unsigned short year;
+  unsigned short month;
+  unsigned short dayOfWeek;
+  unsigned short day;
+  unsigned short hour;
+  unsigned short minute;
+  unsigned short second;
+  unsigned short milliseconds;
+};
+
+struct TimeZoneInformation
+{
+  long bias;
+  std::string standardName;
+  SystemTime standardDate;
+  long standardBias;
+  std::string daylightName;
+  SystemTime daylightDate;
+  long daylightBias;
+};
+
+constexpr int KODI_TIME_ZONE_ID_INVALID{-1};
+constexpr int KODI_TIME_ZONE_ID_UNKNOWN{0};
+constexpr int KODI_TIME_ZONE_ID_STANDARD{1};
+constexpr int KODI_TIME_ZONE_ID_DAYLIGHT{2};
+
+struct FileTime
+{
+  unsigned int lowDateTime;
+  unsigned int highDateTime;
+};
+
+void GetLocalTime(SystemTime* systemTime);
+uint32_t GetTimeZoneInformation(TimeZoneInformation* timeZoneInformation);
+
+void Sleep(uint32_t milliSeconds);
+
+int FileTimeToLocalFileTime(const FileTime* fileTime, FileTime* localFileTime);
+int SystemTimeToFileTime(const SystemTime* systemTime, FileTime* fileTime);
+long CompareFileTime(const FileTime* fileTime1, const FileTime* fileTime2);
+int FileTimeToSystemTime(const FileTime* fileTime, SystemTime* systemTime);
+int LocalFileTimeToFileTime(const FileTime* LocalFileTime, FileTime* fileTime);
+
+int FileTimeToTimeT(const FileTime* localFileTime, time_t* pTimeT);
+int TimeTToFileTime(time_t timeT, FileTime* localFileTime);
+} // namespace TIME
+} // namespace KODI

_service:download_files:master.tar.gz/xbmc/utils/log.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestArchive.cpp Changed

@@ -220,22 +220,22 @@
   EXPECT_STREQ(string_ref.c_str(), string_var.c_str());
 }
 
-TEST_F(TestArchive, SYSTEMTIMEArchive)
+TEST_F(TestArchive, SystemTimeArchive)
 {
   ASSERT_NE(nullptr, file);
-  SYSTEMTIME SYSTEMTIME_ref = { 1, 2, 3, 4, 5, 6, 7, 8 };
-  SYSTEMTIME SYSTEMTIME_var = { 0, 0, 0, 0, 0, 0, 0, 0 };
+  KODI::TIME::SystemTime SystemTime_ref = {1, 2, 3, 4, 5, 6, 7, 8};
+  KODI::TIME::SystemTime SystemTime_var = {0, 0, 0, 0, 0, 0, 0, 0};
 
   CArchive arstore(file, CArchive::store);
-  arstore << SYSTEMTIME_ref;
+  arstore << SystemTime_ref;
   arstore.Close();
 
   ASSERT_EQ(0, file->Seek(0, SEEK_SET));
   CArchive arload(file, CArchive::load);
-  arload >> SYSTEMTIME_var;
+  arload >> SystemTime_var;
   arload.Close();
 
-  EXPECT_TRUE(!memcmp(&SYSTEMTIME_ref, &SYSTEMTIME_var, sizeof(SYSTEMTIME)));
+  EXPECT_TRUE(!memcmp(&SystemTime_ref, &SystemTime_var, sizeof(KODI::TIME::SystemTime)));
 }
 
 TEST_F(TestArchive, CVariantArchive)
@@ -335,8 +335,8 @@
   char char_ref = 'A', char_var = '\0';
   std::string string_ref = "test string", string_var;
   std::wstring wstring_ref = L"test wstring", wstring_var;
-  SYSTEMTIME SYSTEMTIME_ref = { 1, 2, 3, 4, 5, 6, 7, 8 };
-  SYSTEMTIME SYSTEMTIME_var = { 0, 0, 0, 0, 0, 0, 0, 0 };
+  KODI::TIME::SystemTime SystemTime_ref = {1, 2, 3, 4, 5, 6, 7, 8};
+  KODI::TIME::SystemTime SystemTime_var = {0, 0, 0, 0, 0, 0, 0, 0};
   CVariant CVariant_ref((int)1), CVariant_var;
   std::vector<std::string> strArray_ref, strArray_var;
   strArray_ref.emplace_back("test strArray_ref 0");
@@ -362,7 +362,7 @@
   arstore << char_ref;
   arstore << string_ref;
   arstore << wstring_ref;
-  arstore << SYSTEMTIME_ref;
+  arstore << SystemTime_ref;
   arstore << CVariant_ref;
   arstore << strArray_ref;
   arstore << iArray_ref;
@@ -382,7 +382,7 @@
   arload >> char_var;
   arload >> string_var;
   arload >> wstring_var;
-  arload >> SYSTEMTIME_var;
+  arload >> SystemTime_var;
   arload >> CVariant_var;
   arload >> strArray_var;
   arload >> iArray_var;
@@ -398,7 +398,7 @@
   EXPECT_EQ(char_ref, char_var);
   EXPECT_STREQ(string_ref.c_str(), string_var.c_str());
   EXPECT_STREQ(wstring_ref.c_str(), wstring_var.c_str());
-  EXPECT_TRUE(!memcmp(&SYSTEMTIME_ref, &SYSTEMTIME_var, sizeof(SYSTEMTIME)));
+  EXPECT_TRUE(!memcmp(&SystemTime_ref, &SystemTime_var, sizeof(KODI::TIME::SystemTime)));
   EXPECT_TRUE(CVariant_var.isInteger());
   EXPECT_STREQ("test strArray_ref 0", strArray_var.at(0).c_str());
   EXPECT_STREQ("test strArray_ref 1", strArray_var.at(1).c_str());

_service:download_files:master.tar.gz/xbmc/utils/test/TestCPUInfo.cpp Changed

@@ -10,15 +10,12 @@
 #  include <windows.h>
 #endif
 
-#include "utils/CPUInfo.h"
-#include "utils/Temperature.h"
 #include "ServiceBroker.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
-
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include "utils/CPUInfo.h"
+#include "utils/Temperature.h"
+#include "utils/XTimeUtils.h"
 
 #include <gtest/gtest.h>
 
@@ -56,36 +53,6 @@
   EXPECT_TRUE(t.IsValid());
 }
 
-TEST_F(TestCPUInfo, GetCPUModel)
-{
-  std::string s = CServiceBroker::GetCPUInfo()->GetCPUModel();
-  EXPECT_STRNE("", s.c_str());
-}
-
-TEST_F(TestCPUInfo, GetCPUBogoMips)
-{
-  std::string s = CServiceBroker::GetCPUInfo()->GetCPUBogoMips();
-  EXPECT_STRNE("", s.c_str());
-}
-
-TEST_F(TestCPUInfo, GetCPUHardware)
-{
-  std::string s = CServiceBroker::GetCPUInfo()->GetCPUHardware();
-  EXPECT_STRNE("", s.c_str());
-}
-
-TEST_F(TestCPUInfo, GetCPURevision)
-{
-  std::string s = CServiceBroker::GetCPUInfo()->GetCPURevision();
-  EXPECT_STRNE("", s.c_str());
-}
-
-TEST_F(TestCPUInfo, GetCPUSerial)
-{
-  std::string s = CServiceBroker::GetCPUInfo()->GetCPUSerial();
-  EXPECT_STRNE("", s.c_str());
-}
-
 TEST_F(TestCPUInfo, CoreInfo)
 {
   ASSERT_TRUE(CServiceBroker::GetCPUInfo()->HasCoreId(0));

_service:download_files:master.tar.gz/xbmc/utils/test/TestJobManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestStringUtils.cpp Changed

@@ -11,18 +11,61 @@
 #include <algorithm>
 
 #include <gtest/gtest.h>
+enum class ECG
+{
+  A,
+  B
+};
+
+enum EG
+{
+  C,
+  D
+};
 
+namespace test_enum
+{
+enum class ECN
+{
+  A = 1,
+  B
+};
+enum EN
+{
+  C = 1,
+  D
+};
+}
 TEST(TestStringUtils, Format)
 {
   std::string refstr = "test 25 2.7 ff FF";
 
-  std::string varstr = StringUtils::Format("%s %d %.1f %x %02X", "test", 25, 2.743f, 0x00ff, 0x00ff);
+  std::string varstr =
+      StringUtils::Format("%s %d %.1f %x %02X", "test", 25, 2.743f, 0x00ff, 0x00ff);
   EXPECT_STREQ(refstr.c_str(), varstr.c_str());
 
   varstr = StringUtils::Format("", "test", 25, 2.743f, 0x00ff, 0x00ff);
   EXPECT_STREQ("", varstr.c_str());
 }
 
+TEST(TestStringUtils, FormatEnum)
+{
+  const char* zero = "0";
+  const char* one = "1";
+
+  std::string varstr = StringUtils::Format("{}", ECG::A);
+  EXPECT_STREQ(zero, varstr.c_str());
+
+  varstr = StringUtils::Format("{}", EG::C);
+  EXPECT_STREQ(zero, varstr.c_str());
+
+  varstr = StringUtils::Format("{}", test_enum::ECN::A);
+  EXPECT_STREQ(one, varstr.c_str());
+
+  varstr = StringUtils::Format("{}", test_enum::EN::C);
+  EXPECT_STREQ(one, varstr.c_str());
+}
+
 TEST(TestStringUtils, ToUpper)
 {
   std::string refstr = "TEST";

_service:download_files:master.tar.gz/xbmc/utils/test/TestSystemInfo.cpp Changed

@@ -6,9 +6,11 @@
  *  See LICENSES/README.md for more information.
  */
 
-#include "utils/SystemInfo.h"
-#include "settings/Settings.h"
 #include "GUIInfoManager.h"
+#include "ServiceBroker.h"
+#include "settings/Settings.h"
+#include "utils/CPUInfo.h"
+#include "utils/SystemInfo.h"
 #if defined(TARGET_WINDOWS)
 #include "platform/win32/CharsetConverter.h"
 #endif
@@ -18,10 +20,8 @@
 class TestSystemInfo : public testing::Test
 {
 protected:
-  TestSystemInfo()
-  = default;
-  ~TestSystemInfo() override
-  = default;
+  TestSystemInfo() { CServiceBroker::RegisterCPUInfo(CCPUInfo::GetCPUInfo()); }
+  ~TestSystemInfo() { CServiceBroker::UnregisterCPUInfo(); }
 };
 
 TEST_F(TestSystemInfo, Print_System_Info)
@@ -102,6 +102,10 @@
 #elif defined(TARGET_DARWIN_IOS)
   EXPECT_STREQ("iOS", g_sysinfo.GetOsName(true).c_str()) << "'GetOsName(true)' must return 'iOS'";
   EXPECT_STREQ("iOS", g_sysinfo.GetOsName(false).c_str()) << "'GetOsName(false)' must return 'iOS'";
+#elif defined(TARGET_DARWIN_TVOS)
+  EXPECT_STREQ("tvOS", g_sysinfo.GetOsName(true).c_str()) << "'GetOsName(true)' must return 'tvOS'";
+  EXPECT_STREQ("tvOS", g_sysinfo.GetOsName(false).c_str())
+      << "'GetOsName(false)' must return 'tvOS'";
 #elif defined(TARGET_DARWIN_OSX)
   EXPECT_STREQ("OS X", g_sysinfo.GetOsName(true).c_str()) << "'GetOsName(true)' must return 'OS X'";
   EXPECT_STREQ("OS X", g_sysinfo.GetOsName(false).c_str()) << "'GetOsName(false)' must return 'OS X'";
@@ -217,6 +221,11 @@
 #elif defined(TARGET_DARWIN_IOS)
   EXPECT_NE(std::string::npos, g_sysinfo.GetUserAgent().find("like Mac OS X")) << "'GetUserAgent()' must contain ' like Mac OS X'";
   EXPECT_TRUE(g_sysinfo.GetUserAgent().find("CPU OS ") != std::string::npos || g_sysinfo.GetUserAgent().find("CPU iPhone OS ") != std::string::npos) << "'GetUserAgent()' must contain 'CPU OS ' or 'CPU iPhone OS '";
+#elif defined(TARGET_DARWIN_TVOS)
+  EXPECT_NE(std::string::npos, g_sysinfo.GetUserAgent().find("like Mac OS X"))
+      << "'GetUserAgent()' must contain ' like Mac OS X'";
+  EXPECT_TRUE(g_sysinfo.GetUserAgent().find("CPU TVOS ") != std::string::npos)
+      << "'GetUserAgent()' must contain 'CPU TVOS '";
 #elif defined(TARGET_DARWIN_OSX)
   EXPECT_EQ(g_sysinfo.GetUserAgent().find('('), g_sysinfo.GetUserAgent().find("(Macintosh; ")) << "Second parameter in 'GetUserAgent()' string must start from 'Macintosh; '";
 #elif defined(TARGET_ANDROID)

_service:download_files:master.tar.gz/xbmc/video/VideoDatabase.cpp Changed

@@ -2431,7 +2431,7 @@
     details.m_iIdRating = AddRatings(idMovie, MediaTypeMovie, details.m_ratings, details.GetDefaultRating());
 
     // add unique ids
-    details.m_iIdUniqueID = AddUniqueIDs(idMovie, MediaTypeMovie, details);
+    details.m_iIdUniqueID = UpdateUniqueIDs(idMovie, MediaTypeMovie, details);
 
     // add set...
     int idSet = -1;
@@ -2441,13 +2441,11 @@
       // add art if not available
       if (!HasArtForItem(idSet, MediaTypeVideoCollection))
       {
-        std::map<std::string, std::string> setArt;
         for (const auto &it : artwork)
         {
           if (StringUtils::StartsWith(it.first, "set."))
-            setArt[it.first.substr(4)] = it.second;
+            SetArtForItem(idSet, MediaTypeVideoCollection, it.first.substr(4), it.second);
         }
-        SetArtForItem(idSet, MediaTypeVideoCollection, setArt.empty() ? artwork : setArt);
       }
     }
 
@@ -2559,9 +2557,6 @@
       if (!details.m_set.title.empty())
       {
         idSet = AddSet(details.m_set.title, details.m_set.overview);
-        // add art if not available
-        if (!HasArtForItem(idSet, MediaTypeVideoCollection))
-          SetArtForItem(idSet, MediaTypeVideoCollection, artwork);
       }
     }
 
@@ -4832,23 +4827,13 @@
     {
       CVideoInfoTag* pTag = item->GetVideoInfoTag();
       pTag->m_strPictureURL.Parse();
-      //! @todo artwork: fanart stored separately, doesn't need to be
-      pTag->m_fanart.Unpack();
-      if (pTag->m_fanart.GetNumFanarts() &&
-        std::find(result.cbegin(), result.cend(), "fanart") == result.cend())
-      {
-        result.emplace_back("fanart");
-      }
 
-      // all other images
       for (const auto& urlEntry : pTag->m_strPictureURL.m_url)
       {
-        std::string artType = urlEntry.m_aspect;
-        if (artType.empty())
-          artType = "poster";
-        else if (StringUtils::StartsWith(artType, "set."))
-          artType = artType.substr(4);
+        if (!StringUtils::StartsWith(urlEntry.m_aspect, "set."))
+          continue;
 
+        std::string artType = urlEntry.m_aspect.substr(4);
         if (std::find(result.cbegin(), result.cend(), artType) == result.cend())
           result.push_back(artType);
       }
@@ -7151,7 +7136,13 @@
   if (StringUtils::EqualsNoCase(itemType, "movies") && (mediaType == VIDEODB_CONTENT_MOVIES || mediaType == VIDEODB_CONTENT_MOVIE_SETS))
     return GetMoviesByWhere(strBaseDir, filter, items, sortDescription);
   else if (StringUtils::EqualsNoCase(itemType, "tvshows") && mediaType == VIDEODB_CONTENT_TVSHOWS)
-    return GetTvShowsByWhere(strBaseDir, filter, items, sortDescription);
+  {
+    Filter extFilter = filter;
+    if (!CServiceBroker::GetSettingsComponent()->GetSettings()->
+        GetBool(CSettings::SETTING_VIDEOLIBRARY_SHOWEMPTYTVSHOWS))
+      extFilter.AppendWhere("totalCount IS NOT NULL AND totalCount > 0");
+    return GetTvShowsByWhere(strBaseDir, extFilter, items, sortDescription);
+  }
   else if (StringUtils::EqualsNoCase(itemType, "musicvideos") && mediaType == VIDEODB_CONTENT_MUSICVIDEOS)
     return GetMusicVideosByWhere(strBaseDir, filter, items, true, sortDescription);
   else if (StringUtils::EqualsNoCase(itemType, "episodes") && mediaType == VIDEODB_CONTENT_EPISODES)
@@ -8943,6 +8934,9 @@
       sql += PrepareSQL(" AND path.idPath IN (%s)", strPaths.substr(1).c_str());
     }
 
+    // For directory caching to work properly, we need to sort the files by path
+    sql += " ORDER BY path.strPath";
+
     m_pDS2->query(sql);
     if (m_pDS2->num_rows() == 0) return;
 
@@ -8972,6 +8966,8 @@
 
     int total = m_pDS2->num_rows();
     int current = 0;
+    std::string lastDir;
+    bool gotDir = true;
 
     while (!m_pDS2->eof())
     {
@@ -8999,11 +8995,26 @@
       }
       else
       {
-        // remove optical, non-existing files, files with no matching source
+        // Only consider keeping this file if not optical and belonging to a (matching) source
         bool bIsSource;
-        if (!URIUtils::IsOnDVD(fullPath) && CFile::Exists(fullPath, false) &&
+        if (!URIUtils::IsOnDVD(fullPath) &&
             CUtil::GetMatchingSource(fullPath, videoSources, bIsSource) >= 0)
-          del = false;
+        {
+          const std::string pathDir = URIUtils::GetDirectory(fullPath);
+
+          // Cache file's directory in case it's different from the previous file
+          if (lastDir != pathDir)
+          {
+            lastDir = pathDir;
+            CFileItemList items; // Dummy list
+            gotDir = CDirectory::GetDirectory(pathDir, items, "", DIR_FLAG_NO_FILE_DIRS |
+                                              DIR_FLAG_NO_FILE_INFO);
+          }
+
+          // Keep existing files
+          if (gotDir && CFile::Exists(fullPath, true))
+            del = false;
+        }
       }
       if (del)
         filesToTestForDelete += m_pDS2->fv("files.idFile").get_asString() + ",";
@@ -9462,6 +9473,7 @@
     std::string xmlFile = URIUtils::AddFileToFolder(exportRoot, "videodb.xml");
     std::string actorsDir = URIUtils::AddFileToFolder(exportRoot, "actors");
     std::string moviesDir = URIUtils::AddFileToFolder(exportRoot, "movies");
+    std::string movieSetsDir = URIUtils::AddFileToFolder(exportRoot, "moviesets");
     std::string musicvideosDir = URIUtils::AddFileToFolder(exportRoot, "musicvideos");
     std::string tvshowsDir = URIUtils::AddFileToFolder(exportRoot, "tvshows");
     if (singleFile)
@@ -9473,6 +9485,7 @@
       CDirectory::Create(exportRoot);
       CDirectory::Create(actorsDir);
       CDirectory::Create(moviesDir);
+      CDirectory::Create(movieSetsDir);
       CDirectory::Create(musicvideosDir);
       CDirectory::Create(tvshowsDir);
     }
@@ -9603,6 +9616,58 @@
     }
     m_pDS->close();
 
+    if (!singleFile)
+      movieSetsDir = CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(
+          CSettings::SETTING_VIDEOLIBRARY_MOVIESETSFOLDER);
+    if (images && !movieSetsDir.empty())
+    {
+      // find all movie sets
+      sql = "select idSet, strSet from sets";
+
+      m_pDS->query(sql);
+
+      total = m_pDS->num_rows();
+      current = 0;
+
+      while (!m_pDS->eof())
+      {
+        std::string title = m_pDS->fv("strSet").get_asString();
+
+        if (progress)
+        {
+          progress->SetLine(1, CVariant{title});
+          progress->SetPercentage(current * 100 / total);
+          progress->Progress();
+          if (progress->IsCanceled())
+          {
+            progress->Close();
+            m_pDS->close();
+            return;
+          }
+        }
+
+        std::string itemPath = URIUtils::AddFileToFolder(movieSetsDir,
+            CUtil::MakeLegalFileName(title, LEGAL_WIN32_COMPAT));
+        if (CDirectory::Exists(itemPath) || CDirectory::Create(itemPath))
+        {
+          std::map<std::string, std::string> artwork;
+          GetArtForItem(m_pDS->fv("idSet").get_asInt(), MediaTypeVideoCollection, artwork);
+          for (const auto& art : artwork)
+          {
+            std::string savedThumb = URIUtils::AddFileToFolder(itemPath, art.first);
+            CTextureCache::GetInstance().Export(art.second, savedThumb, overwrite);
+          }
+        }
+        else
+          CLog::Log(LOGDEBUG,
+            "CVideoDatabase::%s - Not exporting movie set '%s' as could not create folder '%s'",
+            __FUNCTION__, title.c_str(), itemPath.c_str());
+        m_pDS->next();
+        current++;
+      }
+      m_pDS->close();
+    }
+
     // find all musicvideos
     sql = "select * from musicvideo_view";
 
@@ -10015,6 +10080,7 @@
 
     std::string actorsDir(URIUtils::AddFileToFolder(path, "actors"));
     std::string moviesDir(URIUtils::AddFileToFolder(path, "movies"));
+    std::string movieSetsDir(URIUtils::AddFileToFolder(path, "moviesets"));
     std::string musicvideosDir(URIUtils::AddFileToFolder(path, "musicvideos"));
     std::string tvshowsDir(URIUtils::AddFileToFolder(path, "tvshows"));
     CVideoInfoScanner scanner;
@@ -10062,6 +10128,25 @@
         artItem.SetPath(GetSafeFile(moviesDir, filename) + ".avi");
         scanner.GetArtwork(&artItem, CONTENT_MOVIES, useFolders, true, actorsDir);
         item.SetArt(artItem.GetArt());
+        if (!item.GetVideoInfoTag()->m_set.title.empty())
+        {
+          std::string setPath = URIUtils::AddFileToFolder(movieSetsDir,
+              CUtil::MakeLegalFileName(item.GetVideoInfoTag()->m_set.title, LEGAL_WIN32_COMPAT));
+          if (CDirectory::Exists(setPath))
+          {
+            CGUIListItem::ArtMap setArt;
+            CFileItem artItem(setPath, true);
+            for (const auto& artType : CVideoThumbLoader::GetArtTypes(MediaTypeVideoCollection))
+            {
+              std::string artPath = CVideoThumbLoader::GetLocalArt(artItem, artType, true);
+              if (!artPath.empty())
+              {
+                setArt[artType] = artPath;
+              }
+            }
+            item.AppendArt(setArt, "set");
+          }
+        }
         scanner.AddVideo(&item, CONTENT_MOVIES, useFolders, true, NULL, true);
         current++;
       }

_service:download_files:master.tar.gz/xbmc/video/VideoInfoDownloader.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoScanner.cpp Changed

@@ -1432,6 +1432,52 @@
     return type;
   }
 
+  std::string CVideoInfoScanner::GetMovieSetInfoFolder(const std::string& setTitle)
+  {
+    if (setTitle.empty())
+      return "";
+    std::string path = CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(
+        CSettings::SETTING_VIDEOLIBRARY_MOVIESETSFOLDER);
+    if (path.empty())
+      return "";
+    path = URIUtils::AddFileToFolder(path, CUtil::MakeLegalFileName(setTitle, LEGAL_WIN32_COMPAT));
+    CLog::Log(LOGDEBUG,
+        "VideoInfoScanner: Looking for local artwork for movie set '{}' in folder '{}'",
+        setTitle,
+        CURL::GetRedacted(path));
+    return CDirectory::Exists(path) ? path : "";
+  }
+
+  void CVideoInfoScanner::GetLocalMovieSetArtwork(CGUIListItem::ArtMap& art,
+      const std::vector<std::string>& artTypes, const std::string& setTitle)
+  {
+    std::string path = GetMovieSetInfoFolder(setTitle);
+    if (path.empty())
+      return;
+
+    CFileItemList availableArtFiles;
+    CDirectory::GetDirectory(path, availableArtFiles,
+        CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(),
+        DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
+
+    for (const auto& artFile : availableArtFiles)
+    {
+      std::string candidate = URIUtils::GetFileName(artFile->GetPath());
+      URIUtils::RemoveExtension(candidate);
+      for (const auto& artType : artTypes)
+      {
+        if (!StringUtils::StartsWith(artType, "set."))
+          continue;
+        std::string realType = artType.substr(4);
+        if (StringUtils::EqualsNoCase(candidate, realType))
+        {
+          art[artType] = artFile->GetPath();
+          break;
+        }
+      }
+    }
+  }
+
   void CVideoInfoScanner::GetArtwork(CFileItem *pItem, const CONTENT_TYPE &content, bool bApplyToDir, bool useLocal, const std::string &actorArtPath)
   {
     CVideoInfoTag &movieDetails = *pItem->GetVideoInfoTag();
@@ -1444,7 +1490,8 @@
     std::vector<std::string> artTypes = CVideoThumbLoader::GetArtTypes(ContentToMediaType(content, pItem->m_bIsFolder));
     bool lookForThumb = find(artTypes.begin(), artTypes.end(), "thumb") == artTypes.end() &&
                         art.find("thumb") == art.end();
-    if (content == CONTENT_MOVIES)
+    bool moviePartOfSet = content == CONTENT_MOVIES && !movieDetails.m_set.title.empty();
+    if (moviePartOfSet)
     {
       for (std::string artType : CVideoThumbLoader::GetArtTypes(MediaTypeVideoCollection))
         artTypes.push_back("set." + artType);
@@ -1461,6 +1508,8 @@
             art.insert(std::make_pair(*i, image));
         }
       }
+      if (moviePartOfSet)
+        GetLocalMovieSetArtwork(art, artTypes, movieDetails.m_set.title);
       // find and classify the local thumb (backcompat) if available
       if (lookForThumb)
       {
@@ -1823,8 +1872,8 @@
       else
       {
         digest.Update(&pItem->m_dwSize, sizeof(pItem->m_dwSize));
-        FILETIME time = pItem->m_dateTime;
-        digest.Update(&time, sizeof(FILETIME));
+        KODI::TIME::FileTime time = pItem->m_dateTime;
+        digest.Update(&time, sizeof(KODI::TIME::FileTime));
       }
       if (pItem->IsVideo() && !pItem->IsPlayList() && !pItem->IsNFO())
         count++;

_service:download_files:master.tar.gz/xbmc/video/VideoInfoScanner.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoTag.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoThumbLoader.cpp Changed

@@ -84,6 +84,7 @@
   ||  URIUtils::IsPVRRecording(m_item.GetDynPath())
   ||  URIUtils::IsUPnP(m_item.GetPath())
   ||  URIUtils::IsBluray(m_item.GetPath())
+  ||  URIUtils::IsPlugin(m_item.GetDynPath()) // plugin path not fully resolved
   ||  m_item.IsBDFile()
   ||  m_item.IsDVD()
   ||  m_item.IsDiscImage()
@@ -347,7 +348,7 @@
       if (!art.empty())
         artwork.insert(std::make_pair(type, art));
     }
-    SetArt(*pItem, artwork);
+    pItem->AppendArt(artwork);
   }
 
   // hide thumb if episode is unwatched 
@@ -426,7 +427,7 @@
       }
     }
   }
-  SetArt(*pItem, artwork);
+  pItem->AppendArt(artwork);
 
   // We can only extract flags/thumbs for file-like items
   if (!pItem->m_bIsFolder && pItem->IsVideo())
@@ -490,18 +491,6 @@
   return true;
 }
 
-void CVideoThumbLoader::SetArt(CFileItem &item, const std::map<std::string, std::string> &artwork)
-{
-  item.SetArt(artwork);
-  if (artwork.find("thumb") == artwork.end())
-  { // set fallback for "thumb"
-    if (artwork.find("poster") != artwork.end())
-      item.SetArtFallback("thumb", "poster");
-    else if (artwork.find("banner") != artwork.end())
-      item.SetArtFallback("thumb", "banner");
-  }
-}
-
 bool CVideoThumbLoader::FillLibraryArt(CFileItem &item)
 {
   CVideoInfoTag &tag = *item.GetVideoInfoTag();
@@ -510,7 +499,7 @@
     std::map<std::string, std::string> artwork;
     m_videoDatabase->Open();
     if (m_videoDatabase->GetArtForItem(tag.m_iDbId, tag.m_type, artwork))
-      SetArt(item, artwork);
+      item.AppendArt(artwork);
     else if (tag.m_type == "actor" && !tag.m_artist.empty())
     { // we retrieve music video art from the music database (no backward compat)
       CMusicDatabase database;

_service:download_files:master.tar.gz/xbmc/video/VideoThumbLoader.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoInfo.cpp Changed

@@ -41,6 +41,7 @@
 #include "settings/SettingsComponent.h"
 #include "settings/lib/Setting.h"
 #include "storage/MediaManager.h"
+#include "utils/FileExtensionProvider.h"
 #include "utils/FileUtils.h"
 #include "utils/SortUtils.h"
 #include "utils/StringUtils.h"
@@ -616,7 +617,7 @@
 
 void CGUIDialogVideoInfo::Play(bool resume)
 {
-  if (!m_movieItem->GetVideoInfoTag()->m_strEpisodeGuide.empty())
+  if (m_movieItem->GetVideoInfoTag()->m_type == MediaTypeTvShow)
   {
     std::string strPath = StringUtils::Format("videodb://tvshows/titles/%i/",m_movieItem->GetVideoInfoTag()->m_iDbId);
     Close();
@@ -1084,7 +1085,7 @@
   item.GetVideoInfoTag()->m_strTitle = StringUtils::Format("%s (%s)",
                                                            m_movieItem->GetVideoInfoTag()->m_strTitle.c_str(),
                                                            g_localizeStrings.Get(20410).c_str());
-  CVideoThumbLoader::SetArt(item, m_movieItem->GetArt());
+  item.SetArt(m_movieItem->GetArt());
   item.GetVideoInfoTag()->m_iDbId = -1;
   item.GetVideoInfoTag()->m_iFileId = -1;
 
@@ -1118,13 +1119,14 @@
   return m_movieItem->GetArt("thumb");
 }
 
-void CGUIDialogVideoInfo::AddItemPathToFileBrowserSources(VECSOURCES &sources, const CFileItem &item)
+namespace
+{
+std::string GetItemPathForBrowserSource(const CFileItem& item)
 {
   if (!item.HasVideoInfoTag())
-    return;
+    return "";
 
   std::string itemDir = item.GetVideoInfoTag()->m_basePath;
-
   //season
   if (itemDir.empty())
     itemDir = item.GetVideoInfoTag()->GetPath();
@@ -1133,14 +1135,28 @@
   if (itemTmp.IsVideo())
     itemDir = URIUtils::GetParentPath(itemDir);
 
+  return itemDir;
+}
+
+void AddItemPathStringToFileBrowserSources(VECSOURCES& sources,
+    const std::string& itemDir, const std::string& label)
+{
   if (!itemDir.empty() && CDirectory::Exists(itemDir))
   {
     CMediaSource itemSource;
-    itemSource.strName = g_localizeStrings.Get(36041);
+    itemSource.strName = label;
     itemSource.strPath = itemDir;
     sources.push_back(itemSource);
   }
 }
+} // namespace
+
+void CGUIDialogVideoInfo::AddItemPathToFileBrowserSources(VECSOURCES& sources,
+    const CFileItem& item)
+{
+  std::string itemDir = GetItemPathForBrowserSource(item);
+  AddItemPathStringToFileBrowserSources(sources, itemDir, g_localizeStrings.Get(36041));
+}
 
 int CGUIDialogVideoInfo::ManageVideoItem(const CFileItemPtr &item)
 {
@@ -1840,6 +1856,29 @@
   return true;
 }
 
+namespace
+{
+std::string FindLocalMovieSetArtworkFile(const CFileItemPtr& item, const std::string& artType)
+{
+  std::string infoFolder = VIDEO::CVideoInfoScanner::GetMovieSetInfoFolder(item->GetLabel());
+  if (infoFolder.empty())
+    return "";
+
+  CFileItemList availableArtFiles;
+  CDirectory::GetDirectory(infoFolder, availableArtFiles,
+      CServiceBroker::GetFileExtensionProvider().GetPictureExtensions(),
+      DIR_FLAG_NO_FILE_DIRS | DIR_FLAG_READ_CACHE | DIR_FLAG_NO_FILE_INFO);
+  for (const auto& artFile : availableArtFiles)
+  {
+    std::string candidate = URIUtils::GetFileName(artFile->GetPath());
+    URIUtils::RemoveExtension(candidate);
+    if (StringUtils::EqualsNoCase(candidate, artType))
+      return artFile->GetPath();
+  }
+  return "";
+}
+} // namespace
+
 bool CGUIDialogVideoInfo::ManageVideoItemArtwork(const CFileItemPtr &item, const MediaType &type)
 {
   if (item == nullptr || !item->HasVideoInfoTag() || type.empty())
@@ -1885,7 +1924,7 @@
     if (artType.empty())
       return false;
 
-    if (artType == "fanart")
+    if (artType == "fanart" && type != MediaTypeVideoCollection)
       return OnGetFanart(item);
 
     if (item->HasArt(artType))
@@ -1920,15 +1959,12 @@
       std::string baseDir = StringUtils::Format("videodb://movies/sets/%d", item->GetVideoInfoTag()->m_iDbId);
       if (videodb.GetMoviesNav(baseDir, items))
       {
-        std::vector<std::string> allMovieThumbs;
         for (int i=0; i < items.Size(); i++)
         {
           CVideoInfoTag* pTag = items[i]->GetVideoInfoTag();
           pTag->m_strPictureURL.Parse();
-          pTag->m_strPictureURL.GetThumbURLs(allMovieThumbs, artType);
           pTag->m_strPictureURL.GetThumbURLs(thumbs, "set." + artType, -1, true);
         }
-        std::copy(allMovieThumbs.begin(), allMovieThumbs.end(), std::back_inserter(thumbs));
       }
     }
     else
@@ -1966,7 +2002,19 @@
     }
 
     if (type == MediaTypeVideoCollection)
-      noneitem->SetArt("icon", "DefaultVideo.png");
+    {
+      std::string localFile = FindLocalMovieSetArtworkFile(item, artType);
+      if (!localFile.empty())
+      {
+        CFileItemPtr pItem(new CFileItem(localFile, false));
+        pItem->SetLabel(g_localizeStrings.Get(13514));
+        pItem->SetArt("thumb", localFile);
+        items.Add(pItem);
+        local = true;
+      }
+      else
+        noneitem->SetArt("icon", "DefaultVideo.png");
+    }
   }
   else
   {
@@ -2003,7 +2051,18 @@
   std::string result;
   VECSOURCES sources=*CMediaSourceSettings::GetInstance().GetSources("video");
   CServiceBroker::GetMediaManager().GetLocalDrives(sources);
-  AddItemPathToFileBrowserSources(sources, *item);
+  if (type == MediaTypeVideoCollection)
+  {
+    AddItemPathStringToFileBrowserSources(sources,
+        VIDEO::CVideoInfoScanner::GetMovieSetInfoFolder(item->GetLabel()),
+        g_localizeStrings.Get(36041));
+    AddItemPathStringToFileBrowserSources(sources,
+        CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(
+            CSettings::SETTING_VIDEOLIBRARY_MOVIESETSFOLDER),
+        "* " + g_localizeStrings.Get(20226));
+  }
+  else
+    AddItemPathToFileBrowserSources(sources, *item);
   if (!CGUIDialogFileBrowser::ShowAndGetImage(items, sources, g_localizeStrings.Get(13511), result))
     return false;   // user cancelled
 
@@ -2177,49 +2236,6 @@
     items.Add(itemCurrent);
   }
 
-  std::vector<std::string> thumbs;
-  if (videoItem->GetVideoInfoTag()->m_type == MediaTypeVideoCollection)
-  {
-    CFileItemList movies;
-    std::string baseDir = StringUtils::Format("videodb://movies/sets/%d", videoItem->GetVideoInfoTag()->m_iDbId);
-    if (videodb.GetMoviesNav(baseDir, movies))
-    {
-      int iFanart = 0;
-      for (int i=0; i < movies.Size(); i++)
-      {
-        movies[i]->GetVideoInfoTag()->m_strPictureURL.Parse();
-        movies[i]->GetVideoInfoTag()->m_strPictureURL.GetThumbURLs(thumbs, "set.fanart", -1, true);
-      }
-      for (auto &fanart : thumbs)
-      {
-        CFileItemPtr item(new CFileItem(StringUtils::Format("fanart://Remote{0}", iFanart++), false));
-        item->SetArt("thumb", fanart);
-        item->SetArt("icon", "DefaultPicture.png");
-        item->SetLabel(g_localizeStrings.Get(20441)); // "Remote fanart"
-        items.Add(item);
-      }
-      for (int i=0; i < movies.Size(); i++)
-      {
-        // ensure the fanart is unpacked
-        movies[i]->GetVideoInfoTag()->m_fanart.Unpack();
-
-        // Grab the thumbnails from the web
-        for (unsigned int j = 0; j < movies[i]->GetVideoInfoTag()->m_fanart.GetNumFanarts(); j++)
-        {
-          std::string strItemPath = StringUtils::Format("fanart://Remote%i",iFanart++);
-          CFileItemPtr item(new CFileItem(strItemPath, false));
-          std::string thumb = movies[i]->GetVideoInfoTag()->m_fanart.GetPreviewURL(j);
-          item->SetArt("thumb", CTextureUtils::GetWrappedThumbURL(thumb));
-          item->SetArt("icon", "DefaultPicture.png");
-          item->SetLabel(g_localizeStrings.Get(20441));
-          thumbs.push_back(movies[i]->GetVideoInfoTag()->m_fanart.GetImageURL(j));
-
-          items.Add(item);
-        }
-      }
-    }
-  }
-
   // add the none option
   {
     CFileItemPtr itemNone(new CFileItem("fanart://None", false));
@@ -2237,11 +2253,6 @@
       StringUtils::EqualsNoCase(result, "fanart://Current"))
     return false;
 
-  if (StringUtils::StartsWith(result, "fanart://Remote"))
-  {
-    int iFanart = atoi(result.substr(15).c_str());
-    result = thumbs[iFanart];
-  }
   else if (StringUtils::EqualsNoCase(result, "fanart://None") || !CFile::Exists(result))
     result.clear();
   if (!result.empty() && flip)

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowFullScreen.cpp Changed

_service:download_files:master.tar.gz/xbmc/view/ViewStateSettings.h Changed

_service:download_files:master.tar.gz/xbmc/weather/WeatherJob.cpp Changed

@@ -8,26 +8,24 @@
 
 #include "WeatherJob.h"
 
+#include "GUIUserMessages.h"
+#include "LangInfo.h"
+#include "ServiceBroker.h"
 #include "addons/AddonManager.h"
 #include "guilib/GUIComponent.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
-#include "GUIUserMessages.h"
-#include "LangInfo.h"
 #include "interfaces/generic/ScriptInvocationManager.h"
 #include "network/Network.h"
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
-#include "ServiceBroker.h"
-#include "settings/lib/Setting.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "utils/log.h"
+#include "settings/lib/Setting.h"
 #include "utils/POUtils.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/Variant.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 
 #define LOCALIZED_TOKEN_FIRSTID    370
 #define LOCALIZED_TOKEN_LASTID     395
@@ -72,7 +70,7 @@
     {
       if (!CScriptInvocationManager::GetInstance().IsRunning(scriptId))
         break;
-      Sleep(100);
+      KODI::TIME::Sleep(100);
     }
 
     SetFromProperties();

_service:download_files:master.tar.gz/xbmc/windowing/X11/VideoSyncGLX.cpp Changed

@@ -7,18 +7,17 @@
  */
 
 #include "VideoSyncGLX.h"
-#include <sstream>
-#include <X11/extensions/Xrandr.h>
-#include "windowing/X11/WinSystemX11GLContext.h"
-#include "windowing/GraphicContext.h"
+
 #include "threads/SingleLock.h"
-#include "utils/log.h"
 #include "utils/TimeUtils.h"
-#include <string>
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
+#include "windowing/X11/WinSystemX11GLContext.h"
 
-#ifdef TARGET_POSIX
-#include "platform/posix/XTimeUtils.h"
-#endif
+#include <sstream>
+
+#include <X11/extensions/Xrandr.h>
 
 Display* CVideoSyncGLX::m_Dpy = NULL;
 
@@ -215,7 +214,7 @@
       }
 
       //sleep here so we don't busy spin when this constantly happens, for example when the display went to sleep
-      Sleep(1000);
+      KODI::TIME::Sleep(1000);
 
       CLog::Log(LOGDEBUG, "CVideoReferenceClock: Attaching glX context");
       ReturnV = glXMakeCurrent(m_Dpy, m_Window, m_Context);
@@ -234,7 +233,7 @@
   m_lostEvent.Set();
   while(!stopEvent.Signaled() && m_displayLost && !m_displayReset)
   {
-    Sleep(10);
+    KODI::TIME::Sleep(10);
   }
 }

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinSystemX11.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/XRandR.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/AndroidUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/VideoSyncAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinEventsAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroid.cpp Changed

@@ -52,7 +52,6 @@
 
   m_stereo_mode = RENDER_STEREO_MODE_OFF;
 
-  m_dispResetState = 0;
   m_dispResetTimer = new CTimer(this);
 
   m_android = nullptr;
@@ -132,11 +131,8 @@
     return true;
   }
 
-  {
-    CSingleLock lock(m_resourceSection);
-    m_dispResetTimer->Stop();
-    m_dispResetState = 0;
-  }
+  m_dispResetTimer->Stop();
+  m_HdmiModeTriggered = false;
 
   m_stereo_mode = stereo_mode;
   m_bFullScreen = fullScreen;
@@ -215,70 +211,58 @@
       CDisplaySettings::GetInstance().GetResolutionInfo(RES_WINDOW) = res;
     }
   }
+
+  CDisplaySettings::GetInstance().ApplyCalibrations();
 }
 
 void CWinSystemAndroid::OnTimeout()
 {
-  // We don't trigger OnResetDisplay if we wait for HDMI connect
-  {
-    CSingleLock lock(m_resourceSection);
-    if (m_dispResetState & RESET_WAIT_HDMIPLUG)
-    {
-      // Let HDMI_PLUG trigger the reset
-      m_dispResetState &= ~RESET_WAIT_HDMIPLUG;
-      return;
-    }
-  }
-  SetHDMIState(HDMI_STATE_CONNECTED);
+  m_HdmiModeTriggered = true;
 }
 
-void CWinSystemAndroid::SetHDMIState(uint8_t state)
+void CWinSystemAndroid::InitiateModeChange()
 {
-  CSingleLock lock(m_resourceSection);
-  CLog::Log(LOGDEBUG, "CWinSystemAndroid::SetHDMIState: state: %d, dispResetState: %d",
-            static_cast<int>(state), m_dispResetState);
   int delay = CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
                   "videoscreen.delayrefreshchange") *
               100;
-  if (state & HDMI_STATE_CONNECTED)
+
+  if (delay < 2000)
+    delay = 2000;
+  m_dispResetTimer->Stop();
+  m_dispResetTimer->Start(delay);
+
+  SetHdmiState(false);
+}
+
+void CWinSystemAndroid::SetHdmiState(bool connected)
+{
+  CSingleLock lock(m_resourceSection);
+  CLog::Log(LOGDEBUG, "CWinSystemAndroid::SetHdmiState: state: %d", static_cast<int>(connected));
+
+  if (connected)
   {
-    if (m_dispResetState & RESET_WAIT_HDMIPLUG)
+    if (m_dispResetTimer->IsRunning())
     {
-      m_dispResetState &= ~RESET_WAIT_HDMIPLUG;
-
-      if (m_dispResetTimer->GetElapsedMilliseconds() >= delay)
-        // Most probably a pseudo (2 sec) timer -> signal now
+      // We stop the timer if OS supports HDMI_AUDIO_PLUG intent
+      // and configured delay is smaller than the time HDMI_PLUG took.
+      // Note that timer is always started with minimum of 2 seconds
+      // regardless if the configured delay is smaller
+      if (m_dispResetTimer->GetElapsedMilliseconds() >=
+          CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(
+              "videoscreen.delayrefreshchange") *
+              100)
         m_dispResetTimer->Stop();
       else
-        // Let the timer signal end of switch
         return;
     }
-    if (m_dispResetState == RESET_WAIT_TIMER)
-    {
-      for (auto resource : m_resources)
-        resource->OnResetDisplay();
-      m_dispResetState = 0;
-      m_dispResetTimer->Stop();
-    }
+
+    for (auto resource : m_resources)
+      resource->OnResetDisplay();
+    m_dispResetTimer->Stop();
+    m_HdmiModeTriggered = false;
   }
   else
   {
-    // Second call of !connected is called from HDMI_PLUG
-    if (m_dispResetState & RESET_WAIT_TIMER)
-    {
-      m_dispResetState |= RESET_WAIT_HDMIPLUG;
-      return;
-    }
-    m_dispResetState = RESET_WAIT_TIMER;
-
-    if (state & HDMI_STATE_UNCONNECTED_TIMER)
-    {
-      if (delay < 2000)
-        delay = 2000;
-      m_dispResetTimer->Stop();
-      m_dispResetTimer->Start(delay);
-    }
-
     for (auto resource : m_resources)
       resource->OnLostDisplay();
   }

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroid.h Changed

@@ -35,7 +35,9 @@
   bool DestroyWindow() override;
   void UpdateResolutions() override;
 
-  void SetHDMIState(uint8_t state);
+  void InitiateModeChange();
+  bool IsHdmiModeTriggered() const { return m_HdmiModeTriggered; };
+  void SetHdmiState(bool connected);
 
   void UpdateDisplayModes();
 
@@ -52,13 +54,6 @@
   bool MessagePump() override;
   bool IsHDRDisplay() override;
 
-  enum HDMISTATE : uint8_t
-  {
-    HDMI_STATE_UNCONNECTED = 0,
-    HDMI_STATE_CONNECTED = 1,
-    HDMI_STATE_UNCONNECTED_TIMER = 2,
-  };
-
 protected:
   std::unique_ptr<KODI::WINDOWING::IOSScreenSaver> GetOSScreenSaverImpl() override;
   void OnTimeout() override;
@@ -73,13 +68,6 @@
 
   RENDER_STEREO_MODE m_stereo_mode;
 
-  enum RESETSTATE : uint8_t
-  {
-    RESET_WAIT_TIMER = 1U << 0,
-    RESET_WAIT_HDMIPLUG = 1U << 1,
-  };
-
-  uint8_t m_dispResetState;
   CTimer *m_dispResetTimer;
 
   CCriticalSection m_resourceSection;
@@ -87,5 +75,6 @@
   CDecoderFilterManager *m_decoderFilterManager;
 
 private:
+  bool m_HdmiModeTriggered = false;
   void UpdateResolutions(bool bUpdateDesktopRes);
 };

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroidGLESContext.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMAtomic.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbm.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbm.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbmGLContext.cpp Changed

@@ -16,10 +16,9 @@
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
 #include "rendering/gl/ScreenshotSurfaceGL.h"
+#include "utils/XTimeUtils.h"
 #include "utils/log.h"
 
-#include "platform/posix/XTimeUtils.h"
-
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
@@ -81,14 +80,6 @@
   CWinSystemGbm::SetFullScreen(fullScreen, res, blankOtherDisplays);
   CRenderSystemGL::ResetRenderSystem(res.iWidth, res.iHeight);
 
-  if (!m_delayDispReset)
-  {
-    CSingleLock lock(m_resourceSection);
-
-    for (auto resource : m_resources)
-      resource->OnResetDisplay();
-  }
-
   return true;
 }
 
@@ -108,19 +99,21 @@
       }
     }
     CWinSystemGbm::FlipPage(rendered, videoLayer);
+
+    if (m_dispReset && m_dispResetTimer.IsTimePast())
+    {
+      CLog::Log(LOGDEBUG, "CWinSystemGbmGLContext::%s - Sending display reset to all clients",
+                __FUNCTION__);
+      m_dispReset = false;
+      CSingleLock lock(m_resourceSection);
+
+      for (auto resource : m_resources)
+        resource->OnResetDisplay();
+    }
   }
   else
   {
-    Sleep(10);
-  }
-
-  if (m_delayDispReset && m_dispResetTimer.IsTimePast())
-  {
-    m_delayDispReset = false;
-    CSingleLock lock(m_resourceSection);
-
-    for (auto resource : m_resources)
-      resource->OnResetDisplay();
+    KODI::TIME::Sleep(10);
   }
 }

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp Changed

@@ -20,10 +20,9 @@
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
 #include "rendering/gles/ScreenshotSurfaceGLES.h"
+#include "utils/XTimeUtils.h"
 #include "utils/log.h"
 
-#include "platform/posix/XTimeUtils.h"
-
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <gbm.h>
@@ -92,14 +91,6 @@
   CWinSystemGbm::SetFullScreen(fullScreen, res, blankOtherDisplays);
   CRenderSystemGLES::ResetRenderSystem(res.iWidth, res.iHeight);
 
-  if (!m_delayDispReset)
-  {
-    CSingleLock lock(m_resourceSection);
-
-    for (auto resource : m_resources)
-      resource->OnResetDisplay();
-  }
-
   return true;
 }
 
@@ -119,19 +110,21 @@
       }
     }
     CWinSystemGbm::FlipPage(rendered, videoLayer);
+
+    if (m_dispReset && m_dispResetTimer.IsTimePast())
+    {
+      CLog::Log(LOGDEBUG, "CWinSystemGbmGLESContext::%s - Sending display reset to all clients",
+                __FUNCTION__);
+      m_dispReset = false;
+      CSingleLock lock(m_resourceSection);
+
+      for (auto resource : m_resources)
+        resource->OnResetDisplay();
+    }
   }
   else
   {
-    Sleep(10);
-  }
-
-  if (m_delayDispReset && m_dispResetTimer.IsTimePast())
-  {
-    m_delayDispReset = false;
-    CSingleLock lock(m_resourceSection);
-
-    for (auto resource : m_resources)
-      resource->OnResetDisplay();
+    KODI::TIME::Sleep(10);
   }
 }

_service:download_files:master.tar.gz/xbmc/windowing/linux/OSScreenSaverFreedesktop.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinEventsSDL.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/tvos Added

_service:download_files:master.tar.gz/xbmc/windowing/tvos/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/windowing/tvos/OSScreenSaverTVOS.h Added

_service:download_files:master.tar.gz/xbmc/windowing/tvos/OSScreenSaverTVOS.mm Added

_service:download_files:master.tar.gz/xbmc/windowing/tvos/VideoSyncTVos.cpp Added

@@ -0,0 +1,93 @@
+/*
+ *  Copyright (C) 2015-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "VideoSyncTVos.h"
+
+#include "cores/VideoPlayer/VideoReferenceClock.h"
+#include "utils/MathUtils.h"
+#include "utils/TimeUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
+#import "windowing/tvos/WinSystemTVOS.h"
+
+bool CVideoSyncTVos::Setup(PUPDATECLOCK func)
+{
+  CLog::Log(LOGDEBUG, "CVideoSyncTVos::{} setting up TVOS", __FUNCTION__);
+
+  //init the vblank timestamp
+  m_LastVBlankTime = CurrentHostCounter();
+  UpdateClock = func;
+  m_abortEvent.Reset();
+
+  bool setupOk = InitDisplayLink();
+  if (setupOk)
+  {
+    m_winSystem.Register(this);
+  }
+
+  return setupOk;
+}
+
+void CVideoSyncTVos::Run(CEvent& stopEvent)
+{
+  //because cocoa has a vblank callback, we just keep sleeping until we're asked to stop the thread
+  XbmcThreads::CEventGroup waitGroup{&stopEvent, &m_abortEvent};
+  waitGroup.wait();
+}
+
+void CVideoSyncTVos::Cleanup()
+{
+  CLog::Log(LOGDEBUG, "CVideoSyncTVos::{} cleaning up TVOS", __FUNCTION__);
+  DeinitDisplayLink();
+  m_winSystem.Unregister(this);
+}
+
+float CVideoSyncTVos::GetFps()
+{
+  m_fps = CServiceBroker::GetWinSystem()->GetGfxContext().GetFPS();
+  CLog::Log(LOGDEBUG, "CVideoSyncTVos::{} Detected refreshrate: {} hertz", __FUNCTION__, m_fps);
+  return m_fps;
+}
+
+void CVideoSyncTVos::OnResetDisplay()
+{
+  m_abortEvent.Set();
+}
+
+void CVideoSyncTVos::TVosVblankHandler()
+{
+  int64_t nowtime = CurrentHostCounter();
+
+  //calculate how many vblanks happened
+  double VBlankTime =
+      static_cast<double>(nowtime - m_LastVBlankTime) / static_cast<double>(CurrentHostFrequency());
+  int NrVBlanks = MathUtils::round_int(VBlankTime * m_fps);
+
+  //save the timestamp of this vblank so we can calculate how many happened next time
+  m_LastVBlankTime = nowtime;
+
+  //update the vblank timestamp, update the clock and send a signal that we got a vblank
+  UpdateClock(NrVBlanks, nowtime, m_refClock);
+}
+
+bool CVideoSyncTVos::InitDisplayLink()
+{
+  bool ret = true;
+  CLog::Log(LOGDEBUG, "CVideoSyncTVos: setting up displaylink");
+  if (!m_winSystem.InitDisplayLink(this))
+  {
+    CLog::Log(LOGDEBUG, "CVideoSyncTVos: InitDisplayLink failed");
+    ret = false;
+  }
+  return ret;
+}
+
+void CVideoSyncTVos::DeinitDisplayLink()
+{
+  m_winSystem.DeinitDisplayLink();
+}

_service:download_files:master.tar.gz/xbmc/windowing/tvos/VideoSyncTVos.h Added

@@ -0,0 +1,43 @@
+/*
+ *  Copyright (C) 2015-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "guilib/DispResource.h"
+#include "windowing/VideoSync.h"
+
+class CWinSystemTVOS;
+
+class CVideoSyncTVos : public CVideoSync, IDispResource
+{
+public:
+  CVideoSyncTVos(void* clock, CWinSystemTVOS& winSystem)
+    : CVideoSync(clock), m_winSystem(winSystem){};
+
+  // CVideoSync interface
+  bool Setup(PUPDATECLOCK func) override;
+  void Run(CEvent& stopEvent) override;
+  void Cleanup() override;
+  float GetFps() override;
+
+  // IDispResource interface
+  void OnResetDisplay() override;
+
+  // used in the displaylink callback
+  void TVosVblankHandler();
+
+private:
+  // CVideoSyncDarwin interface
+  virtual bool InitDisplayLink();
+  virtual void DeinitDisplayLink();
+
+  //timestamp of the last vblank, used for calculating how many vblanks happened
+  int64_t m_LastVBlankTime = 0;
+  CEvent m_abortEvent;
+  CWinSystemTVOS& m_winSystem;
+};

_service:download_files:master.tar.gz/xbmc/windowing/tvos/WinEventsTVOS.h Added

_service:download_files:master.tar.gz/xbmc/windowing/tvos/WinEventsTVOS.mm Added

@@ -0,0 +1,76 @@
+/*
+ *  Copyright (C) 2012-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+
+#include "WinEventsTVOS.h"
+
+#include "AppInboundProtocol.h"
+#include "ServiceBroker.h"
+#include "guilib/GUIWindowManager.h"
+#include "input/InputManager.h"
+#include "input/XBMC_vkeys.h"
+#include "threads/CriticalSection.h"
+#include "utils/log.h"
+
+#include <list>
+
+static CCriticalSection g_inputCond;
+
+static std::list<XBMC_Event> events;
+
+CWinEventsTVOS::CWinEventsTVOS() : CThread("CWinEventsTVOS")
+{
+  CLog::Log(LOGDEBUG, "CWinEventsTVOS::CWinEventsTVOS");
+  Create();
+}
+
+CWinEventsTVOS::~CWinEventsTVOS()
+{
+  m_bStop = true;
+  StopThread(true);
+}
+
+void CWinEventsTVOS::MessagePush(XBMC_Event* newEvent)
+{
+  CSingleLock lock(m_eventsCond);
+
+  m_events.push_back(*newEvent);
+}
+
+size_t CWinEventsTVOS::GetQueueSize()
+{
+  CSingleLock lock(g_inputCond);
+  return events.size();
+}
+
+
+bool CWinEventsTVOS::MessagePump()
+{
+  bool ret = false;
+  std::shared_ptr<CAppInboundProtocol> appPort = CServiceBroker::GetAppPort();
+
+  // Do not always loop, only pump the initial queued count events. else if ui keep pushing
+  // events the loop won't finish then it will block xbmc main message loop.
+  for (size_t pumpEventCount = GetQueueSize(); pumpEventCount > 0; --pumpEventCount)
+  {
+    // Pop up only one event per time since in App::OnEvent it may init modal dialog which init
+    // deeper message loop and call the deeper MessagePump from there.
+    XBMC_Event pumpEvent;
+    {
+      CSingleLock lock(g_inputCond);
+      if (events.empty())
+        return ret;
+      pumpEvent = events.front();
+      events.pop_front();
+    }
+
+    if (appPort)
+      ret = appPort->OnEvent(pumpEvent);
+  }
+  return ret;
+}

_service:download_files:master.tar.gz/xbmc/windowing/tvos/WinSystemTVOS.h Added

@@ -0,0 +1,103 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "rendering/gles/RenderSystemGLES.h"
+#include "threads/CriticalSection.h"
+#include "threads/Timer.h"
+#include "windowing/OSScreenSaver.h"
+#include "windowing/WinSystem.h"
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <CoreVideo/CVOpenGLESTextureCache.h>
+
+class IDispResource;
+class CVideoSyncTVos;
+struct CADisplayLinkWrapper;
+
+class CWinSystemTVOS : public CWinSystemBase, public CRenderSystemGLES, public ITimerCallback
+{
+public:
+  CWinSystemTVOS();
+  virtual ~CWinSystemTVOS();
+
+  // ITimerCallback interface
+  virtual void OnTimeout() override {}
+
+  void MessagePush(XBMC_Event* newEvent);
+  size_t GetQueueSize();
+  void AnnounceOnLostDevice();
+  void AnnounceOnResetDevice();
+  void StartLostDeviceTimer();
+  void StopLostDeviceTimer();
+  int GetDisplayIndexFromSettings();
+  // Implementation of CWinSystemBase
+  CRenderSystemBase* GetRenderSystem() override { return this; }
+  bool InitWindowSystem() override;
+  bool DestroyWindowSystem() override;
+  bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res) override;
+  bool DestroyWindow() override;
+  bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop) override;
+  bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
+  void UpdateResolutions() override;
+  bool CanDoWindowed() override { return false; }
+
+  void ShowOSMouse(bool show) override {}
+  bool HasCursor() override;
+
+  void NotifyAppActiveChange(bool bActivated) override;
+
+  bool Minimize() override;
+  bool Restore() override;
+  bool Hide() override;
+  bool Show(bool raise = true) override;
+
+  bool IsExtSupported(const char* extension) const override;
+
+  bool BeginRender() override;
+  bool EndRender() override;
+
+  void Register(IDispResource* resource) override;
+  void Unregister(IDispResource* resource) override;
+
+  //virtual std::unique_ptr<CVideoSync> GetVideoSync(void* clock) override;
+
+  bool InitDisplayLink(CVideoSyncTVos* syncImpl);
+  void DeinitDisplayLink(void);
+  void OnAppFocusChange(bool focus);
+  bool IsBackgrounded() const { return m_bIsBackgrounded; }
+  CVEAGLContext GetEAGLContextObj();
+  void GetConnectedOutputs(std::vector<std::string>* outputs);
+
+  // winevents override
+  bool MessagePump() override;
+
+protected:
+  virtual std::unique_ptr<KODI::WINDOWING::IOSScreenSaver> GetOSScreenSaverImpl() override;
+  void PresentRenderImpl(bool rendered) override;
+  void SetVSyncImpl(bool enable) override {}
+
+  void* m_glView; // EAGLView opaque
+  void* m_WorkingContext; // shared EAGLContext opaque
+  bool m_bWasFullScreenBeforeMinimize;
+  std::string m_eglext;
+  CCriticalSection m_resourceSection;
+  std::vector<IDispResource*> m_resources;
+  bool m_bIsBackgrounded;
+  CTimer m_lostDeviceTimer;
+
+private:
+  bool GetScreenResolution(int* w, int* h, double* fps, int screenIdx);
+  void FillInVideoModes(int screenIdx);
+  bool SwitchToVideoMode(int width, int height, double refreshrate);
+  CADisplayLinkWrapper* m_pDisplayLink;
+};

_service:download_files:master.tar.gz/xbmc/windowing/tvos/WinSystemTVOS.mm Added

@@ -0,0 +1,442 @@
+/*
+ *  Copyright (C) 2010-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#include "WinSystemTVOS.h"
+
+#import "cores/AudioEngine/Sinks/AESinkDARWINTVOS.h"
+#include "cores/RetroPlayer/process/ios/RPProcessInfoIOS.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
+#include "cores/VideoPlayer/DVDCodecs/Video/VTB.h"
+#include "cores/VideoPlayer/Process/ios/ProcessInfoIOS.h"
+#include "cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.h"
+#include "cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
+#include "filesystem/SpecialProtocol.h"
+#include "guilib/DispResource.h"
+#include "guilib/Texture.h"
+#include "messaging/ApplicationMessenger.h"
+#include "settings/DisplaySettings.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
+#include "threads/SingleLock.h"
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+#include "windowing/GraphicContext.h"
+#include "windowing/OSScreenSaver.h"
+#import "windowing/tvos/OSScreenSaverTVOS.h"
+#import "windowing/tvos/VideoSyncTVos.h"
+#import "windowing/tvos/WinEventsTVOS.h"
+
+#import "platform/darwin/DarwinUtils.h"
+#import "platform/darwin/tvos/TVOSDisplayManager.h"
+#import "platform/darwin/tvos/XBMCController.h"
+
+#include <memory>
+#include <vector>
+
+#import <Foundation/Foundation.h>
+#import <OpenGLES/ES2/gl.h>
+#import <OpenGLES/ES2/glext.h>
+#import <QuartzCore/CADisplayLink.h>
+
+#define CONST_HDMI "HDMI"
+
+// if there was a devicelost callback
+// but no device reset for 3 secs
+// a timeout fires the reset callback
+// (for ensuring that e.x. AE isn't stuck)
+constexpr uint32_t LOST_DEVICE_TIMEOUT_MS{3000};
+
+// TVOSDisplayLinkCallback is defined in the lower part of the file
+@interface TVOSDisplayLinkCallback : NSObject
+{
+@private
+  CVideoSyncTVos* videoSyncImpl;
+}
+@property(nonatomic, setter=SetVideoSyncImpl:) CVideoSyncTVos* videoSyncImpl;
+- (void)runDisplayLink;
+@end
+
+using namespace KODI;
+using namespace MESSAGING;
+
+struct CADisplayLinkWrapper
+{
+  CADisplayLink* impl;
+  TVOSDisplayLinkCallback* callbackClass;
+};
+
+std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
+{
+  std::unique_ptr<CWinSystemBase> winSystem = std::make_unique<CWinSystemTVOS>();
+  return winSystem;
+}
+
+void CWinSystemTVOS::MessagePush(XBMC_Event* newEvent)
+{
+  dynamic_cast<CWinEventsTVOS&>(*m_winEvents).MessagePush(newEvent);
+}
+
+size_t CWinSystemTVOS::GetQueueSize()
+{
+  return dynamic_cast<CWinEventsTVOS&>(*m_winEvents).GetQueueSize();
+}
+
+void CWinSystemTVOS::AnnounceOnLostDevice()
+{
+  CSingleLock lock(m_resourceSection);
+  // tell any shared resources
+  CLog::Log(LOGDEBUG, "CWinSystemTVOS::AnnounceOnLostDevice");
+  for (auto dispResource : m_resources)
+    dispResource->OnLostDisplay();
+}
+
+void CWinSystemTVOS::AnnounceOnResetDevice()
+{
+  CSingleLock lock(m_resourceSection);
+  // tell any shared resources
+  CLog::Log(LOGDEBUG, "CWinSystemTVOS::AnnounceOnResetDevice");
+  for (auto dispResource : m_resources)
+    dispResource->OnResetDisplay();
+}
+
+void CWinSystemTVOS::StartLostDeviceTimer()
+{
+  if (m_lostDeviceTimer.IsRunning())
+    m_lostDeviceTimer.Restart();
+  else
+    m_lostDeviceTimer.Start(LOST_DEVICE_TIMEOUT_MS, false);
+}
+
+void CWinSystemTVOS::StopLostDeviceTimer()
+{
+  m_lostDeviceTimer.Stop();
+}
+
+
+int CWinSystemTVOS::GetDisplayIndexFromSettings()
+{
+  // ATV only supports 1 screen with id = 0
+  return 0;
+}
+
+CWinSystemTVOS::CWinSystemTVOS() : CWinSystemBase(), m_lostDeviceTimer(this)
+{
+  m_bIsBackgrounded = false;
+  m_pDisplayLink = new CADisplayLinkWrapper;
+  m_pDisplayLink->callbackClass = [[TVOSDisplayLinkCallback alloc] init];
+
+  m_winEvents.reset(new CWinEventsTVOS());
+
+  CAESinkDARWINTVOS::Register();
+}
+
+CWinSystemTVOS::~CWinSystemTVOS()
+{
+  m_pDisplayLink->callbackClass = nil;
+  delete m_pDisplayLink;
+}
+
+bool CWinSystemTVOS::InitWindowSystem()
+{
+  return CWinSystemBase::InitWindowSystem();
+}
+
+bool CWinSystemTVOS::DestroyWindowSystem()
+{
+  return true;
+}
+
+std::unique_ptr<KODI::WINDOWING::IOSScreenSaver> CWinSystemTVOS::GetOSScreenSaverImpl()
+{
+  std::unique_ptr<KODI::WINDOWING::IOSScreenSaver> screensaver =
+      std::make_unique<COSScreenSaverTVOS>();
+  return screensaver;
+}
+
+bool CWinSystemTVOS::CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res)
+{
+  if (!SetFullScreen(fullScreen, res, false))
+    return false;
+
+  [g_xbmcController setFramebuffer];
+
+  m_bWindowCreated = true;
+
+  m_eglext = " ";
+
+  const char* tmpExtensions = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
+  if (tmpExtensions != nullptr)
+  {
+    m_eglext += tmpExtensions;
+    m_eglext += " ";
+  }
+
+  CLog::Log(LOGDEBUG, "EGL_EXTENSIONS: {}", m_eglext.c_str());
+
+  // register platform dependent objects
+  CDVDFactoryCodec::ClearHWAccels();
+  VTB::CDecoder::Register();
+  VIDEOPLAYER::CRendererFactory::ClearRenderer();
+  CLinuxRendererGLES::Register();
+  CRendererVTB::Register();
+  VIDEOPLAYER::CProcessInfoIOS::Register();
+  RETRO::CRPProcessInfoIOS::Register();
+  RETRO::CRPProcessInfoIOS::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
+
+  return true;
+}
+
+bool CWinSystemTVOS::DestroyWindow()
+{
+  return true;
+}
+
+bool CWinSystemTVOS::ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop)
+{
+  if (m_nWidth != newWidth || m_nHeight != newHeight)
+  {
+    m_nWidth = newWidth;
+    m_nHeight = newHeight;
+  }
+
+  CRenderSystemGLES::ResetRenderSystem(newWidth, newHeight);
+
+  return true;
+}
+
+bool CWinSystemTVOS::SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays)
+{
+  m_nWidth = res.iWidth;
+  m_nHeight = res.iHeight;
+  m_bFullScreen = fullScreen;
+
+  CLog::Log(LOGDEBUG, "About to switch to {} x {} @ {}", m_nWidth, m_nHeight, res.fRefreshRate);
+  SwitchToVideoMode(res.iWidth, res.iHeight, res.fRefreshRate);
+  CRenderSystemGLES::ResetRenderSystem(res.iWidth, res.iHeight);
+
+  return true;
+}
+
+bool CWinSystemTVOS::SwitchToVideoMode(int width, int height, double refreshrate)
+{
+  /*! @todo Currently support SDR dynamic range only. HDR shouldnt be done during a
+   *  modeswitch. Look to create supplemental method to handle sdr/hdr enable
+   */
+  [g_xbmcController.displayManager displayRateSwitch:refreshrate
+                                    withDynamicRange:0 /*dynamicRange*/];
+  return true;
+}
+
+bool CWinSystemTVOS::GetScreenResolution(int* w, int* h, double* fps, int screenIdx)
+{
+  *w = [g_xbmcController.displayManager getScreenSize].width;
+  *h = [g_xbmcController.displayManager getScreenSize].height;
+  *fps = [g_xbmcController.displayManager getDisplayRate];
+
+  CLog::Log(LOGDEBUG, "Current resolution Screen: {} with {} x {} @ {}", screenIdx, *w, *h, *fps);
+  return true;
+}
+
+void CWinSystemTVOS::UpdateResolutions()
+{
+  // Add display resolution
+  int w, h;
+  double fps;
+  CWinSystemBase::UpdateResolutions();
+
+  int screenIdx = GetDisplayIndexFromSettings();
+
+  //first screen goes into the current desktop mode
+  if (GetScreenResolution(&w, &h, &fps, screenIdx))
+    UpdateDesktopResolution(CDisplaySettings::GetInstance().GetResolutionInfo(RES_DESKTOP),
+                            CONST_HDMI, w, h, fps, 0);
+
+  CDisplaySettings::GetInstance().ClearCustomResolutions();
+
+  //now just fill in the possible resolutions for the attached screens
+  //and push to the resolution info vector
+  FillInVideoModes(screenIdx);
+}
+
+void CWinSystemTVOS::FillInVideoModes(int screenIdx)
+{
+  // Potential refresh rates
+  std::vector<float> supportedDispRefreshRates = {23.976f, 24.000f, 25.000f, 29.970f,
+                                                  30.000f, 50.000f, 59.940f, 60.000f};
+
+  UIScreen* aScreen = UIScreen.screens[screenIdx];
+  UIScreenMode* mode = aScreen.currentMode;
+  int w = mode.size.width;
+  int h = mode.size.height;
+
+  //! @Todo handle different resolutions than native (ie 720p/1080p on a 4k display)
+
+  for (float refreshrate : supportedDispRefreshRates)
+  {
+    RESOLUTION_INFO res;
+    UpdateDesktopResolution(res, CONST_HDMI, w, h, refreshrate, 0);
+    CLog::Log(LOGNOTICE, "Found possible resolution for display {} with {} x {} RefreshRate:{} \n",
+              screenIdx, w, h, refreshrate);
+
+    CServiceBroker::GetWinSystem()->GetGfxContext().ResetOverscan(res);
+    CDisplaySettings::GetInstance().AddResolutionInfo(res);
+  }
+}
+
+bool CWinSystemTVOS::IsExtSupported(const char* extension) const
+{
+  if (strncmp(extension, "EGL_", 4) != 0)
+    return CRenderSystemGLES::IsExtSupported(extension);
+
+  std::string name = ' ' + std::string(extension) + ' ';
+
+  return m_eglext.find(name) != std::string::npos;
+}
+
+
+bool CWinSystemTVOS::BeginRender()
+{
+  bool rtn;
+
+  [g_xbmcController setFramebuffer];
+
+  rtn = CRenderSystemGLES::BeginRender();
+  return rtn;
+}
+
+bool CWinSystemTVOS::EndRender()
+{
+  bool rtn;
+
+  rtn = CRenderSystemGLES::EndRender();
+  return rtn;
+}
+
+void CWinSystemTVOS::Register(IDispResource* resource)
+{
+  CSingleLock lock(m_resourceSection);
+  m_resources.push_back(resource);
+}
+
+void CWinSystemTVOS::Unregister(IDispResource* resource)
+{
+  CSingleLock lock(m_resourceSection);
+  std::vector<IDispResource*>::iterator i = find(m_resources.begin(), m_resources.end(), resource);
+  if (i != m_resources.end())
+    m_resources.erase(i);
+}
+
+void CWinSystemTVOS::OnAppFocusChange(bool focus)
+{
+  CSingleLock lock(m_resourceSection);
+  m_bIsBackgrounded = !focus;
+  CLog::Log(LOGDEBUG, "CWinSystemTVOS::OnAppFocusChange: %d", focus ? 1 : 0);
+  for (auto dispResource : m_resources)
+    dispResource->OnAppFocusChange(focus);
+}
+
+//--------------------------------------------------------------
+//-------------------DisplayLink stuff
+@implementation TVOSDisplayLinkCallback
+@synthesize videoSyncImpl;
+//--------------------------------------------------------------
+- (void)runDisplayLink
+{
+  @autoreleasepool
+  {
+    if (videoSyncImpl != nullptr)
+      videoSyncImpl->TVosVblankHandler();
+  }
+}
+@end
+
+bool CWinSystemTVOS::InitDisplayLink(CVideoSyncTVos* syncImpl)
+{
+  unsigned int currentScreenIdx = GetDisplayIndexFromSettings();
+  UIScreen* currentScreen = UIScreen.screens[currentScreenIdx];
+  m_pDisplayLink->callbackClass.videoSyncImpl = syncImpl;
+  m_pDisplayLink->impl = [currentScreen displayLinkWithTarget:m_pDisplayLink->callbackClass
+                                                     selector:@selector(runDisplayLink)];
+
+  [m_pDisplayLink->impl addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+  return m_pDisplayLink->impl != nil;
+}
+
+void CWinSystemTVOS::DeinitDisplayLink(void)
+{
+  if (m_pDisplayLink->impl)
+  {
+    [m_pDisplayLink->impl invalidate];
+    m_pDisplayLink->impl = nil;
+    [m_pDisplayLink->callbackClass SetVideoSyncImpl:nil];
+  }
+}
+//------------DisplayLink stuff end
+//--------------------------------------------------------------
+
+void CWinSystemTVOS::PresentRenderImpl(bool rendered)
+{
+  //glFlush;
+  if (rendered)
+    [g_xbmcController presentFramebuffer];
+}
+
+bool CWinSystemTVOS::HasCursor()
+{
+  return false;
+}
+
+void CWinSystemTVOS::NotifyAppActiveChange(bool bActivated)
+{
+  if (bActivated && m_bWasFullScreenBeforeMinimize &&
+      !CServiceBroker::GetWinSystem()->GetGfxContext().IsFullScreenRoot())
+    CApplicationMessenger::GetInstance().PostMsg(TMSG_TOGGLEFULLSCREEN);
+}
+
+bool CWinSystemTVOS::Minimize()
+{
+  m_bWasFullScreenBeforeMinimize =
+      CServiceBroker::GetWinSystem()->GetGfxContext().IsFullScreenRoot();
+  if (m_bWasFullScreenBeforeMinimize)
+    CApplicationMessenger::GetInstance().PostMsg(TMSG_TOGGLEFULLSCREEN);
+
+  return true;
+}
+
+bool CWinSystemTVOS::Restore()
+{
+  return false;
+}
+
+bool CWinSystemTVOS::Hide()
+{
+  return true;
+}
+
+bool CWinSystemTVOS::Show(bool raise)
+{
+  return true;
+}
+
+CVEAGLContext CWinSystemTVOS::GetEAGLContextObj()
+{
+  return [g_xbmcController getEAGLContextObj];
+}
+
+void CWinSystemTVOS::GetConnectedOutputs(std::vector<std::string>* outputs)
+{
+  outputs->push_back("Default");
+  outputs->push_back(CONST_HDMI);
+}
+
+bool CWinSystemTVOS::MessagePump()
+{
+  return m_winEvents->MessagePump();
+}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWayland.cpp Changed

@@ -8,12 +8,20 @@
 
 #include "WinSystemWayland.h"
 
-#include <algorithm>
-#include <limits>
-#include <numeric>
-
 #include "Application.h"
+#include "CompileInfo.h"
 #include "Connection.h"
+#include "OSScreenSaverIdleInhibitUnstableV1.h"
+#include "OptionalsReg.h"
+#include "Registry.h"
+#include "ServiceBroker.h"
+#include "ShellSurfaceWlShell.h"
+#include "ShellSurfaceXdgShell.h"
+#include "ShellSurfaceXdgShellUnstableV6.h"
+#include "Util.h"
+#include "VideoSyncWpPresentation.h"
+#include "WinEventsWayland.h"
+#include "WindowDecorator.h"
 #include "cores/RetroPlayer/process/wayland/RPProcessInfoWayland.h"
 #include "cores/VideoPlayer/Process/wayland/ProcessInfoWayland.h"
 #include "guilib/DispResource.h"
@@ -21,34 +29,27 @@
 #include "input/InputManager.h"
 #include "input/touch/generic/GenericTouchActionHandler.h"
 #include "input/touch/generic/GenericTouchInputHandler.h"
-#include "platform/freebsd/OptionalsReg.h"
-#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
-#include "platform/linux/OptionalsReg.h"
-#include "platform/linux/PlatformConstants.h"
-#include "platform/linux/TimeUtils.h"
 #include "messaging/ApplicationMessenger.h"
-#include "OptionalsReg.h"
-#include "OSScreenSaverIdleInhibitUnstableV1.h"
-#include "Registry.h"
-#include "ServiceBroker.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "ShellSurfaceWlShell.h"
-#include "ShellSurfaceXdgShell.h"
-#include "ShellSurfaceXdgShellUnstableV6.h"
 #include "threads/SingleLock.h"
-#include "Util.h"
-#include "utils/log.h"
+#include "utils/ActorProtocol.h"
 #include "utils/MathUtils.h"
 #include "utils/StringUtils.h"
-#include "VideoSyncWpPresentation.h"
-#include "WindowDecorator.h"
-#include "WinEventsWayland.h"
-#include "windowing/linux/OSScreenSaverFreedesktop.h"
-#include "utils/ActorProtocol.h"
 #include "utils/TimeUtils.h"
+#include "utils/log.h"
+#include "windowing/linux/OSScreenSaverFreedesktop.h"
+
+#include "platform/freebsd/OptionalsReg.h"
+#include "platform/linux/OptionalsReg.h"
+#include "platform/linux/TimeUtils.h"
+#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
+
+#include <algorithm>
+#include <limits>
+#include <numeric>
 
 #if defined(HAS_DBUS)
 # include "windowing/linux/OSScreenSaverFreedesktop.h"
@@ -327,15 +328,19 @@
   // Try with this resolution if compositor does not say otherwise
   UpdateSizeVariables({res.iWidth, res.iHeight}, m_scale, m_shellSurfaceState, false);
 
-  m_shellSurface.reset(CShellSurfaceXdgShell::TryCreate(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
+  // Use AppName as the desktop file name. This is required to lookup the app icon of the same name.
+  m_shellSurface.reset(CShellSurfaceXdgShell::TryCreate(*this, *m_connection, m_surface, name,
+                                                        std::string(CCompileInfo::GetAppName())));
   if (!m_shellSurface)
   {
-    m_shellSurface.reset(CShellSurfaceXdgShellUnstableV6::TryCreate(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
+    m_shellSurface.reset(CShellSurfaceXdgShellUnstableV6::TryCreate(
+        *this, *m_connection, m_surface, name, std::string(CCompileInfo::GetAppName())));
   }
   if (!m_shellSurface)
   {
     CLog::LogF(LOGWARNING, "Compositor does not support xdg_shell protocol (stable or unstable v6) - falling back to wl_shell, not all features might work");
-    m_shellSurface.reset(new CShellSurfaceWlShell(*this, *m_connection, m_surface, name, KODI::LINUX::DESKTOP_FILE_NAME));
+    m_shellSurface.reset(new CShellSurfaceWlShell(*this, *m_connection, m_surface, name,
+                                                  std::string(CCompileInfo::GetAppName())));
   }
 
   if (fullScreen)

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10DX.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/VideoSyncD3D.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinSystemWin32DX.cpp Changed

@@ -7,28 +7,37 @@
  */
 
 #include "WinSystemWin32DX.h"
+
 #include "commons/ilog.h"
-#include "platform/win32/CharsetConverter.h"
 #include "rendering/dx/RenderContext.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/SettingsComponent.h"
-#include "utils/log.h"
 #include "utils/SystemInfo.h"
+#include "utils/XTimeUtils.h"
+#include "utils/log.h"
 #include "windowing/GraphicContext.h"
 
+#include "platform/win32/CharsetConverter.h"
+
 #include "system.h"
 
 #ifndef _M_X64
-#pragma comment(lib, "EasyHook32.lib")
 #include "utils/SystemInfo.h"
+#endif
+#if _DEBUG
+#pragma comment(lib, "detoursd.lib")
 #else
-#pragma comment(lib, "EasyHook64.lib")
+#pragma comment(lib, "detours.lib")
 #endif
 #pragma comment(lib, "dxgi.lib")
+#include <windows.h>
+#include <winnt.h>
+#include <winternl.h>
 #pragma warning(disable: 4091)
 #include <d3d10umddi.h>
 #pragma warning(default: 4091)
+#include <detours.h>
 
 using KODI::PLATFORM::WINDOWS::FromW;
 
@@ -48,7 +57,6 @@
 
 CWinSystemWin32DX::CWinSystemWin32DX() : CRenderSystemDX()
   , m_hDriverModule(nullptr)
-  , m_hHook(nullptr)
 {
 }
 
@@ -68,7 +76,7 @@
   }
 
   if (!rendered)
-    Sleep(40);
+    KODI::TIME::Sleep(40);
 }
 
 bool CWinSystemWin32DX::CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res)
@@ -200,10 +208,13 @@
 void CWinSystemWin32DX::UninitHooks()
 {
   // uninstall
-  LhUninstallAllHooks();
-  // we need to wait for memory release
-  LhWaitForPendingRemovals();
-  SAFE_DELETE(m_hHook);
+  if (!s_fnOpenAdapter10_2)
+    return;
+
+  DetourTransactionBegin();
+  DetourUpdateThread(GetCurrentThread());
+  DetourDetach(reinterpret_cast<void**>(&s_fnOpenAdapter10_2), HookOpenAdapter10_2);
+  DetourTransactionCommit();
   if (m_hDriverModule)
   {
     FreeLibrary(m_hDriverModule);
@@ -223,7 +234,8 @@
   bool deviceFound = false;
 
   // delete exiting hooks.
-  UninitHooks();
+  if (s_fnOpenAdapter10_2)
+    UninitHooks();
 
   // enum devices to find matched
   while (EnumDisplayDevicesW(nullptr, adapter, &displayDevice, 0))
@@ -280,11 +292,11 @@
         s_fnOpenAdapter10_2 = reinterpret_cast<PFND3D10DDI_OPENADAPTER>(GetProcAddress(m_hDriverModule, "OpenAdapter10_2"));
         if (s_fnOpenAdapter10_2 != nullptr)
         {
-          ULONG ACLEntries[1] = { 0 };
-          m_hHook = new HOOK_TRACE_INFO();
+          DetourTransactionBegin();
+          DetourUpdateThread(GetCurrentThread());
+          DetourAttach(reinterpret_cast<void**>(&s_fnOpenAdapter10_2), HookOpenAdapter10_2);
+          if (NO_ERROR == DetourTransactionCommit())
           // install and activate hook into a driver
-          if (SUCCEEDED(LhInstallHook(s_fnOpenAdapter10_2, HookOpenAdapter10_2, nullptr, m_hHook))
-            && SUCCEEDED(LhSetInclusiveACL(ACLEntries, 1, m_hHook)))
           {
             CLog::LogF(LOGDEBUG, "D3D11 hook installed and activated.");
             break;
@@ -292,7 +304,7 @@
           else
           {
             CLog::Log(LOGDEBUG, __FUNCTION__": Unable ot install and activate D3D11 hook.");
-            SAFE_DELETE(m_hHook);
+            s_fnOpenAdapter10_2 = nullptr;
             FreeLibrary(m_hDriverModule);
             m_hDriverModule = nullptr;
           }

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinSystemWin32DX.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowDebugInfo.cpp Changed